Merge pull request #284 from JuliaEditorSupport/sp/more-robust-as-tok…

…enziation fix: make `as` tokenziation more robust
JuliaEditorSupport · Jul 8, 2024 · f98e33a · f98e33a
2 parents 34d2de2 + c686684
commit f98e33a
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/grammars/julia.cson b/grammars/julia.cson
@@ -298,7 +298,7 @@ repository:
         name: 'keyword.control.using.julia'
       }
       {
-        match: '(?<=\\w\\s)\\b(as)\\b(?=\\s\\w)'
+        match: '(?<=\\S\\s+)\\b(as)\\b(?=\\s+\\S)'
         name: 'keyword.control.as.julia'
       }
       {

diff --git a/grammars/julia.json b/grammars/julia.json
@@ -330,7 +330,7 @@
           "name": "keyword.control.using.julia"
         },
         {
-          "match": "(?<=\\w\\s)\\b(as)\\b(?=\\s\\w)",
+          "match": "(?<=\\S\\s+)\\b(as)\\b(?=\\s+\\S)",
           "name": "keyword.control.as.julia"
         },
         {

diff --git a/grammars/julia.template.json b/grammars/julia.template.json
@@ -330,7 +330,7 @@
           "name": "keyword.control.using.julia"
         },
         {
-          "match": "(?<=\\w\\s)\\b(as)\\b(?=\\s\\w)",
+          "match": "(?<=\\S\\s+)\\b(as)\\b(?=\\s+\\S)",
           "name": "keyword.control.as.julia"
         },
         {

diff --git a/grammars/julia_vscode.json b/grammars/julia_vscode.json
@@ -330,7 +330,7 @@
           "name": "keyword.control.using.julia"
         },
         {
-          "match": "(?<=\\w\\s)\\b(as)\\b(?=\\s\\w)",
+          "match": "(?<=\\S\\s+)\\b(as)\\b(?=\\s+\\S)",
           "name": "keyword.control.as.julia"
         },
         {

diff --git a/test/test.js b/test/test.js
@@ -3273,7 +3273,7 @@ describe('Julia grammar', function () {
                 scopes: []
             },
         ])
-        tokens = tokenize(grammar, 'import Foo: x as y, z as yy')
+        tokens = tokenize(grammar, 'import Foo: x as y, z!  as yy')
         compareTokens(tokens, [
             {
                 value: 'import',
@@ -3304,7 +3304,7 @@ describe('Julia grammar', function () {
                 scopes: ["punctuation.separator.comma.julia"]
             },
             {
-                value: ' z ',
+                value: ' z!  ',
                 scopes: []
             },
             {