fix panic when no extra spaces in layout item, but line comment in de…

…flayer item (#16)
rszyma · Jan 18, 2024 · fd7c547 · fd7c547
1 parent eb2dbd6
commit fd7c547
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 30 deletions.
diff --git a/kls/src/formatter/ext_tree.rs b/kls/src/formatter/ext_tree.rs
@@ -541,32 +541,6 @@ mod tests {
         }};
     }
 
-    #[test]
-    fn test_macros() {
-        // use ParseTreeNode::*;
-        // assert_eq!(Tree!(), ExtParseTree(NodeList(vec![])));
-
-        // assert_eq!(
-        //     Tree!(List!()),
-        //     ExtParseTree(NodeList(vec![NodeList(vec![])]))
-        // );
-
-        // assert_eq!(
-        //     Tree!(
-        //         Atom!("test"),
-        //         Whitespace!(" "),
-        //         LineComment!("# test"),
-        //         BlockComment!("#| test |#")
-        //     ),
-        //     ExtParseTree(NodeList(vec![
-        //         Atom("test".to_string()),
-        //         Whitespace(" ".to_string()),
-        //         LineComment("# test".to_string()),
-        //         BlockComment("#| test |#".to_string())
-        //     ]))
-        // );
-    }
-
     #[test]
     fn test_parse_into_ext_tree() {
         #[rustfmt::skip]

diff --git a/kls/src/formatter/use_defsrc_layout_on_deflayers.rs b/kls/src/formatter/use_defsrc_layout_on_deflayers.rs
@@ -247,10 +247,7 @@ fn collect_comments_into_metadata_vec(
             Comment::LineComment(_) => {
                 if !is_the_last_expr_in_deflayer {
                     result.push(Metadata::Whitespace(
-                        " ".repeat(
-                            next_line_indent
-                                .expect("line comment inside deflayer should always have newline"),
-                        ),
+                        " ".repeat(next_line_indent.unwrap_or(0)),
                     ));
                 }
             }
@@ -403,6 +400,11 @@ mod tests {
         should_not_format("(defsrc 1  2 \n  3) (deflayer base 4  5 \n  6)");
         // and also with line comment
         should_not_format("(defsrc 1  2 \n  3) (deflayer base 4  5 ;;\n  6)");
+        // https://github.com/rszyma/vscode-kanata/issues/15
+        formats_correctly(
+            "(defsrc\n  a b c\n)\n(deflayer base\n  a b ;;\n  c\n)",
+            "(defsrc\n  a b c\n)\n(deflayer base\n  a b ;;\nc\n)",
+        );
     }
 
     #[test]