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

fix: make `as` tokenziation more robust

Author: pfitzseb

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'
       }
       {

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"
         },
         {

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"
         },
         {

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"
         },
         {

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: []
             },
             {