chore: capture whitespaces for meta-commands

piotr-semenov · May 15, 2024 · 6283166 · 6283166
1 parent 858c890
commit 6283166
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/support.YAML-tmLanguage.j2 b/src/support.YAML-tmLanguage.j2
@@ -4,7 +4,9 @@ repository:
     meta-commands:
         patterns:
             -
-                match: '^\s*(##(?!\b)|#(?!\b)|\{{ scopes["support.function"] | join("|\\") }})'
+                match: '^(\s*)(##(?=\s*$)|#(?=\s*$)|\{{ scopes["support.function"] | join("|\\") }})'
                 captures:
                     1:
+                        name: constant.character.whitespace.parigp
+                    2:
                         name: support.function.parigp
diff --git a/src/type-hints.YAML-tmLanguage.j2 b/src/type-hints.YAML-tmLanguage.j2
@@ -3,7 +3,9 @@ repository:
     type-hints:
         patterns:
             -
-                match: '\s*\b({{ scopes["support.type"] | join("|") }})\b'
+                match: '(\s*)\b({{ scopes["support.type"] | join("|") }})\b'
                 captures:
                     1:
+                        name: keyword.operator.cardinality.parigp
+                    2:
                         name: support.type.parigp
diff --git a/tests/functions.test.gp b/tests/functions.test.gp
@@ -125,8 +125,9 @@
 ##                                       ^^ source.parigp meta.parens.parigp constant.numeric.int.parigp
 ##                                         ^ source.parigp meta.parens.parigp punctuation.section.parens.end.parigp
 
-  \q
-##^^ source.parigp support.function.parigp
+    \q
+##^^ source.parigp constant.character.whitespace.parigp
+##  ^^ source.parigp support.function.parigp
 
   \w "output.txt"
 ##^^ source.parigp support.function.parigp

diff --git a/tests/others/subgroups.test.gp b/tests/others/subgroups.test.gp
@@ -239,7 +239,6 @@
 ##     ^ source.parigp meta.block.parigp meta.parens.parigp meta.parens.parigp punctuation.section.parens.end.parigp
   ,
 ##^ source.parigp meta.block.parigp meta.parens.parigp markup.punctuation.separator.parigp
-## ^ source.parigp meta.block.parigp meta.parens.parigp constant.character.whitespace.parigp
     M = G[1];
 ##^^ ^ ^ source.parigp meta.block.parigp meta.parens.parigp constant.character.whitespace.parigp
 ##  ^   ^ source.parigp meta.block.parigp meta.parens.parigp variable.name.parigp