From 4305bf2e94ba25233748e41cb8492e2496521661 Mon Sep 17 00:00:00 2001 From: AshishMahendra Date: Mon, 20 Nov 2023 17:11:36 +0000 Subject: [PATCH] Jac Formatter Update --- jaclang/jac/passes/tool/jac_formatter_pass.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jaclang/jac/passes/tool/jac_formatter_pass.py b/jaclang/jac/passes/tool/jac_formatter_pass.py index eea695b50..617f5e504 100644 --- a/jaclang/jac/passes/tool/jac_formatter_pass.py +++ b/jaclang/jac/passes/tool/jac_formatter_pass.py @@ -130,7 +130,7 @@ def exit_sub_node_list(self, node: ast.SubNodeList) -> None: """ count = 0 for stmt in node.kid: - if isinstance(node.parent, ast.EnumDef) and stmt.gen.jac == ",": + if isinstance(node.parent, (ast.EnumDef, ast.Enum)) and stmt.gen.jac == ",": self.indent_level -= 1 self.emit_ln(node, f"{stmt.gen.jac}") self.indent_level += 1 @@ -376,6 +376,8 @@ def exit_ability(self, node: ast.Ability) -> None: self.emit_ln(node, node.doc.gen.jac) start = True for i in node.kid: + if isinstance(i, ast.String): + continue if isinstance(i, ast.CommentToken): if i.is_inline: self.emit(node, f" {i.gen.jac}") @@ -463,7 +465,9 @@ def exit_enum(self, node: ast.Enum) -> None: self.emit_ln(node, node.doc.value) start = True for i in node.kid: - if isinstance(i, ast.CommentToken): + if isinstance(i, ast.String): + continue + elif isinstance(i, ast.CommentToken): if i.is_inline: self.emit(node, f" {i.gen.jac}") else: