Merge pull request #247 from JuliaEditorSupport/sp/string-macro-suffix

Distinct token for string macro suffixes
JuliaEditorSupport · Jul 26, 2021 · 2b53ba2 · 2b53ba2
2 parents 97abf64 + d8faa46
commit 2b53ba2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/grammars/julia.cson b/grammars/julia.cson
@@ -800,7 +800,7 @@ repository:
           "1":
             name: "punctuation.definition.string.end.julia"
           "2":
-            name: "punctuation.definition.string.end.julia"
+            name: "support.function.macro.julia"
         name: "string.quoted.other.julia"
         patterns: [
           {
@@ -820,7 +820,7 @@ repository:
           "1":
             name: "punctuation.definition.string.end.julia"
           "2":
-            name: "punctuation.definition.string.end.julia"
+            name: "support.function.macro.julia"
         name: "string.quoted.other.julia"
         patterns: [
           {
@@ -840,7 +840,7 @@ repository:
           "1":
             name: "punctuation.definition.string.end.julia"
           "2":
-            name: "punctuation.definition.string.end.julia"
+            name: "support.function.macro.julia"
         name: "string.interpolated.backtick.julia"
         patterns: [
           {
@@ -860,7 +860,7 @@ repository:
           "1":
             name: "punctuation.definition.string.end.julia"
           "2":
-            name: "punctuation.definition.string.end.julia"
+            name: "support.function.macro.julia"
         name: "string.interpolated.backtick.julia"
         patterns: [
           {

diff --git a/grammars/julia.json b/grammars/julia.json
@@ -942,7 +942,7 @@
               "name": "punctuation.definition.string.end.julia"
             },
             "2": {
-              "name": "punctuation.definition.string.end.julia"
+              "name": "support.function.macro.julia"
             }
           },
           "name": "string.quoted.other.julia",
@@ -968,7 +968,7 @@
               "name": "punctuation.definition.string.end.julia"
             },
             "2": {
-              "name": "punctuation.definition.string.end.julia"
+              "name": "support.function.macro.julia"
             }
           },
           "name": "string.quoted.other.julia",
@@ -994,7 +994,7 @@
               "name": "punctuation.definition.string.end.julia"
             },
             "2": {
-              "name": "punctuation.definition.string.end.julia"
+              "name": "support.function.macro.julia"
             }
           },
           "name": "string.interpolated.backtick.julia",
@@ -1020,7 +1020,7 @@
               "name": "punctuation.definition.string.end.julia"
             },
             "2": {
-              "name": "punctuation.definition.string.end.julia"
+              "name": "support.function.macro.julia"
             }
           },
           "name": "string.interpolated.backtick.julia",

diff --git a/grammars/julia_vscode.json b/grammars/julia_vscode.json
@@ -942,7 +942,7 @@
               "name": "punctuation.definition.string.end.julia"
             },
             "2": {
-              "name": "punctuation.definition.string.end.julia"
+              "name": "support.function.macro.julia"
             }
           },
           "name": "string.quoted.other.julia",
@@ -968,7 +968,7 @@
               "name": "punctuation.definition.string.end.julia"
             },
             "2": {
-              "name": "punctuation.definition.string.end.julia"
+              "name": "support.function.macro.julia"
             }
           },
           "name": "string.quoted.other.julia",
@@ -994,7 +994,7 @@
               "name": "punctuation.definition.string.end.julia"
             },
             "2": {
-              "name": "punctuation.definition.string.end.julia"
+              "name": "support.function.macro.julia"
             }
           },
           "name": "string.interpolated.backtick.julia",
@@ -1020,7 +1020,7 @@
               "name": "punctuation.definition.string.end.julia"
             },
             "2": {
-              "name": "punctuation.definition.string.end.julia"
+              "name": "support.function.macro.julia"
             }
           },
           "name": "string.interpolated.backtick.julia",

diff --git a/spec/julia-spec.coffee b/spec/julia-spec.coffee
@@ -523,7 +523,7 @@ describe "Julia grammar", ->
     expect(tokens[1]).toEqual value: '"', scopes: ["source.julia", "string.quoted.other.julia", "punctuation.definition.string.begin.julia"]
     expect(tokens[2]).toEqual value: "asdf", scopes: ["source.julia", "string.quoted.other.julia"]
     expect(tokens[3]).toEqual value: '"', scopes: ["source.julia", "string.quoted.other.julia", "punctuation.definition.string.end.julia"]
-    expect(tokens[4]).toEqual value: '_a9Ñ', scopes: ["source.julia", "string.quoted.other.julia", "punctuation.definition.string.end.julia"]
+    expect(tokens[4]).toEqual value: '_a9Ñ', scopes: ["source.julia", "string.quoted.other.julia", "support.function.macro.julia"]
 
   it "tokenizes Cxx.jl multiline string macros", ->
     tokens = grammar.tokenizeLines('''