fix: newline before module elements (#73)

* fix: newline before module elements * fix: Failing tests for newline before module elems
ionide · Jul 24, 2024 · 331d5c9 · 331d5c9
1 parent d056cfd
commit 331d5c9
Show file tree

Hide file tree

Showing 6 changed files with 394,478 additions and 438,278 deletions.
diff --git a/grammar.js b/grammar.js
@@ -165,10 +165,23 @@ module.exports = grammar({
           optional($.access_modifier),
           $.identifier,
           "=",
-          scoped(repeat1($._module_elem), $._indent, $._dedent),
+          scoped($._module_body, $._indent, $._dedent),
         ),
       ),
 
+    _module_body: ($) =>
+      seq(
+        $._module_elem,
+        repeat(
+          prec(
+            // Make sure to parse a module node before a sequential expression
+            // NOTE: This removes all sequential expressions from module bodies
+            PREC.SEQ_EXPR + 1,
+            seq(alias($._newline, ";"), $._module_elem)
+          )
+        )
+      ),
+
     import_decl: ($) => seq("open", $.long_identifier),
 
     //

diff --git a/src/grammar.json b/src/grammar.json
diff --git a/src/node-types.json b/src/node-types.json