format_update: removed extra line at last

Jaseci-Labs · Jan 26, 2024 · 69b23e7 · 69b23e7
1 parent c8212af
commit 69b23e7
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/jaclang/compiler/passes/tool/jac_formatter_pass.py b/jaclang/compiler/passes/tool/jac_formatter_pass.py
@@ -95,7 +95,8 @@ def exit_module(self, node: ast.Module) -> None:
                     self.emit(node, j.gen.jac)
             prev_token = i
         last_element = None
-        for i in node.body:
+        for counter, i in enumerate(node.body):
+            counter += 1
             if isinstance(i, ast.Import):
                 self.emit_ln(node, i.gen.jac)
             else:
@@ -104,7 +105,8 @@ def exit_module(self, node: ast.Module) -> None:
                 self.emit_ln(node, i.gen.jac)
                 if not node.gen.jac.endswith("\n"):
                     self.emit_ln(node, "")
-                self.emit_ln(node, "")
+                if counter <= len(node.body) - 1:
+                    self.emit_ln(node, "")
             last_element = i
 
     def exit_global_vars(self, node: ast.GlobalVars) -> None:
@@ -628,10 +630,7 @@ def exit_arch_has(self, node: ast.ArchHas) -> None:
                     self.emit(node, f" {i.gen.jac}")
                     self.emit_ln(node, "")
                 elif not node.gen.jac.endswith("\n"):
-                    self.indent_level -= 2
-                    self.emit_ln(node, "")
-                    self.emit_ln(node, "")
-                    self.indent_level += 2
+                    self.emit(node, "\n")
                     self.emit_ln(node, i.gen.jac)
                 else:
                     self.emit_ln(node, i.gen.jac)

diff --git a/jaclang/compiler/passes/tool/tests/fixtures/corelib_fmt.jac b/jaclang/compiler/passes/tool/tests/fixtures/corelib_fmt.jac
@@ -10,13 +10,11 @@ enum AccessMode;
 obj Memory {
     has index: dict[UUID, Element] = {},
         save_queue: list[Element] = [];
-
     #* Main Accessors *#
     can get_obj(caller_id: UUID, item_id: UUID, override: bool=False) -> Element;
     can has_obj(item_id: UUID) -> bool;
     can save_obj(caller_id: UUID, item: Element);
     can del_obj(caller_id: UUID, item: Element);
-
     #* Utility Functions *#
     can get_object_distribution -> dict;
     can get_mem_size -> float;

diff --git a/jaclang/compiler/passes/tool/tests/test_jac_format_pass.py b/jaclang/compiler/passes/tool/tests/test_jac_format_pass.py
@@ -67,8 +67,8 @@ def test_jac_file_compr(self) -> None:
 
         # Testing the core_lib
         self.compare_files(
-            "core_lib.jac",
-            "jaclang/compiler/passes/tool/tests/fixtures/core_lib_fmt.jac",
+            "corelib.jac",
+            "jaclang/compiler/passes/tool/tests/fixtures/corelib_fmt.jac",
         )
 
     def micro_suite_test(self, filename: str) -> None: