fix: only tokenize public at line start as kw

JuliaEditorSupport · Apr 23, 2024 · 663bf8d · 663bf8d
1 parent 0735fb8
commit 663bf8d
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 4 deletions.
diff --git a/grammars/julia.cson b/grammars/julia.cson
@@ -286,7 +286,7 @@ repository:
         name: 'keyword.control.export.julia'
       }
       {
-        match: '\\b(?<![:_])(?:public)\\b'
+        match: '^(?:public)\\b'
         name: 'keyword.control.public.julia'
       }
       {

diff --git a/grammars/julia.json b/grammars/julia.json
@@ -318,7 +318,7 @@
           "name": "keyword.control.export.julia"
         },
         {
-          "match": "\\b(?<![:_])(?:public)\\b",
+          "match": "^(?:public)\\b",
           "name": "keyword.control.public.julia"
         },
         {

diff --git a/grammars/julia.template.json b/grammars/julia.template.json
@@ -318,7 +318,7 @@
           "name": "keyword.control.export.julia"
         },
         {
-          "match": "\\b(?<![:_])(?:public)\\b",
+          "match": "^(?:public)\\b",
           "name": "keyword.control.public.julia"
         },
         {

diff --git a/grammars/julia_vscode.json b/grammars/julia_vscode.json
@@ -318,7 +318,7 @@
           "name": "keyword.control.export.julia"
         },
         {
-          "match": "\\b(?<![:_])(?:public)\\b",
+          "match": "^(?:public)\\b",
           "name": "keyword.control.public.julia"
         },
         {

diff --git a/test/test.js b/test/test.js
@@ -756,6 +756,27 @@ describe('Julia grammar', function () {
             },
         ])
     })
+    it("does not tokenize public in non-toplevel scopes", function () {
+        const tokens = tokenize(grammar, "2 + public")
+        compareTokens(tokens, [
+            {
+                value: "2",
+                scopes: ["constant.numeric.julia"]
+            },
+            {
+                value: " ",
+                scopes: []
+            },
+            {
+                value: "+",
+                scopes: ["keyword.operator.arithmetic.julia"]
+            },
+            {
+                value: " public",
+                scopes: []
+            },
+        ])
+    })
     it("tokenizes symbols", function () {
         const tokens = tokenize(grammar, ":à_b9!")
         compareTokens(tokens, [