refactor: remove config/list if item newline format

Signed-off-by: peefy <[email protected]>
kcl-lang · Sep 11, 2024 · 1644547 · 1644547
1 parent ded5e87
commit 1644547
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 7 deletions.
diff --git a/kclvm/ast_pretty/src/node.rs b/kclvm/ast_pretty/src/node.rs
@@ -513,8 +513,9 @@ impl<'p, 'ctx> MutSelfTypedResultWalker<'ctx> for Printer<'p> {
             |expr| self.expr(expr),
             list_if_item_expr.exprs
         );
-        self.write_indentation(Indentation::DedentWithNewline);
+        self.write_indentation(Indentation::Dedent);
         if let Some(orelse) = &list_if_item_expr.orelse {
+            self.write_newline();
             match &orelse.node {
                 ast::Expr::List(list_expr) => {
                     self.write("else:");
@@ -571,8 +572,9 @@ impl<'p, 'ctx> MutSelfTypedResultWalker<'ctx> for Printer<'p> {
             |entry: &ast::NodeRef<ast::ConfigEntry>| self.write_entry(entry),
             config_if_entry_expr.items
         );
-        self.write_indentation(Indentation::DedentWithNewline);
+        self.write_indentation(Indentation::Dedent);
         if let Some(orelse) = &config_if_entry_expr.orelse {
+            self.write_newline();
             match &orelse.node {
                 ast::Expr::Config(config_expr) => {
                     self.write("else:");

diff --git a/kclvm/ast_pretty/src/test_data/codelayout.input b/kclvm/ast_pretty/src/test_data/codelayout.input
@@ -143,4 +143,28 @@ c =3
 
 d  =  4
 e = 5
-}
+}
+config_if_entry = {
+  if True: a = 1
+  elif False:
+    b = 2
+  else:
+    c = 3
+    d = 4
+    **e
+  if a > 3:
+    e = 5
+  elif a < 2:
+    f =6
+  if True:
+    g = 7
+}
+list_if_item = [
+  if True: 1
+  elif False:
+    2
+  else:
+    3, 4
+    *[5, 6]
+  if False: 2
+]
diff --git a/kclvm/ast_pretty/src/test_data/codelayout.output b/kclvm/ast_pretty/src/test_data/codelayout.output
@@ -137,3 +137,31 @@ f = lambda {
     d = 4
     e = 5
 }
+config_if_entry = {
+    if True:
+        a = 1
+    elif False:
+        b = 2
+    else:
+        c = 3
+        d = 4
+        **e
+    if a > 3:
+        e = 5
+    elif a < 2:
+        f = 6
+    if True:
+        g = 7
+}
+list_if_item = [
+    if True:
+        1
+    elif False:
+        2
+    else:
+        3
+        4
+        *[5, 6]
+    if False:
+        2
+]
diff --git a/kclvm/ast_pretty/src/test_data/orelse.output b/kclvm/ast_pretty/src/test_data/orelse.output
@@ -13,19 +13,15 @@ d = [
     else:
         if True:
             2
-
         if True:
             3
-
 ]
 e = {
     if True:
         a = 1
     else:
         if True:
             b = 2
-
         if True:
             c = 3
-
 }