Do not tokenize equal signs within strings

atom · Feb 26, 2019 · ecae330 · ecae330
1 parent 28ce891
commit ecae330
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/grammars/toml.cson b/grammars/toml.cson
@@ -29,7 +29,7 @@
       '2': 'name': 'keyword.operator.assignment.toml'
   }
   {
-    'match': '((")(.*)("))\\s*(=)' # This one is .* because " can be escaped
+    'match': '^((")(.*?)("))\\s*(=)' # This one is .* because " can be escaped
     'captures':
       '1': 'name': 'string.quoted.double.toml'
       '2': 'name': 'punctuation.definition.string.begin.toml'

diff --git a/spec/toml-spec.coffee b/spec/toml-spec.coffee
@@ -52,6 +52,10 @@ describe "TOML grammar", ->
     expect(tokens[1]).toEqual value: 'Equal sign ahead = no problem', scopes: ["source.toml", "string.quoted.double.toml"]
     expect(tokens[2]).toEqual value: '"', scopes: ["source.toml", "string.quoted.double.toml", "punctuation.definition.string.end.toml"]
 
+  it "does not tokenize equal signs within strings", ->
+    {tokens} = grammar.tokenizeLine('pywinusb = { version = "*", os_name = "==\'nt\'", index="pypi"}')
+    expect(tokens[17]).toEqual value: "=='nt'", scopes: ["source.toml", "string.quoted.double.toml"]
+
   it "tokenizes multiline strings", ->
     lines = grammar.tokenizeLines '''
       """