Handle nested groups with string concatenation

Closes #22
Beaglefoot · Sep 4, 2024 · 16fd79b · 16fd79b
1 parent ba74721
commit 16fd79b
Show file tree

Hide file tree

Showing 6 changed files with 57,902 additions and 57,958 deletions.
diff --git a/grammar.d.ts b/grammar.d.ts
@@ -2,6 +2,7 @@ declare interface IExternals {
   concatenating_space: ($: IExternals) => any;
   _if_else_separator: ($: IExternals) => any;
   _no_space: ($: IExternals) => any;
+  _func_call: ($: IExternals) => any;
 }
 
 declare interface IRules {

diff --git a/grammar.js b/grammar.js
@@ -3,7 +3,7 @@ module.exports = grammar({
 
   extras: $ => [/[\s\t]/, '\\\n', '\\\r\n'],
 
-  externals: $ => [$.concatenating_space, $._if_else_separator, $._no_space],
+  externals: $ => [$.concatenating_space, $._if_else_separator, $._no_space, $._func_call],
 
   precedences: $ => [
     [
@@ -447,6 +447,8 @@ module.exports = grammar({
     func_call: $ =>
       seq(
         field('name', choice($.identifier, $.ns_qualified_name)),
+        // Otherwise $.concatenating_space takes precedence
+        $._func_call,
         token.immediate('('),
         optional($.args),
         ')'

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