Refactor line break logic in JacFormatPass

Jaseci-Labs · Jan 7, 2025 · 62f8bd7 · 62f8bd7
1 parent f53efae
commit 62f8bd7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/jac/jaclang/compiler/passes/tool/jac_formatter_pass.py b/jac/jaclang/compiler/passes/tool/jac_formatter_pass.py
@@ -1549,7 +1549,8 @@ def exit_bool_expr(self, node: ast.BoolExpr) -> None:
                 test_str += f" {node.op.value} "
 
         # Check if line break is needed
-        if self.is_line_break_needed(test_str):
+        adjusted_line_length = self.MAX_LINE_LENGTH * 2 - self.indent_size * 2
+        if self.is_line_break_needed(test_str, max_line_length=adjusted_line_length):
             for i in node.values:
                 if i != end:
                     self.emit_ln(node, f"{i.gen.jac}")

diff --git a/jac/jaclang/compiler/passes/tool/tests/fixtures/corelib.jac b/jac/jaclang/compiler/passes/tool/tests/fixtures/corelib.jac
@@ -130,8 +130,7 @@ obj JacPlugin {
 :obj:Memory:can:get_obj
 (caller_id: UUID, item_id: UUID, override: bool=False) -> Element {
     ret = item_id |> self.index.get;
-    if override
-        or (ret is not None and caller_id |> ret.__is_readable) {
+    if override or (ret is not None and caller_id |> ret.__is_readable) {
         return ret;
     }
 }

diff --git a/jac/jaclang/compiler/passes/tool/tests/fixtures/corelib_fmt.jac b/jac/jaclang/compiler/passes/tool/tests/fixtures/corelib_fmt.jac
@@ -129,8 +129,7 @@ obj JacPlugin {
 :obj:Memory:can:get_obj
 (caller_id: UUID, item_id: UUID, override: bool=False) -> Element {
     ret = item_id |> self.index.get;
-    if override
-        or (ret is not None and caller_id |> ret.__is_readable) {
+    if override or (ret is not None and caller_id |> ret.__is_readable) {
         return ret;
     }
 }