Merge pull request #91 from atom/wl-herestring-end

End herestrings when parentheses are reached
atom · Nov 14, 2017 · 1fd9027 · 1fd9027
2 parents 152ffbd + 5206d24
commit 1fd9027
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/grammars/shell-unix-bash.cson b/grammars/shell-unix-bash.cson
@@ -623,7 +623,7 @@
                 'include': '$self'
               }
             ]
-        'match': '(<<<)\\s*(([^\\s\\\\]|\\\\.)+)'
+        'match': '(<<<)\\s*(([^\\s)\\\\]|\\\\.)+)'
         'name': 'meta.herestring.shell'
       }
     ]

diff --git a/spec/shell-unix-bash-spec.coffee b/spec/shell-unix-bash-spec.coffee
@@ -150,6 +150,12 @@ describe "Shell script grammar", ->
     expect(tokens[5]).toEqual value: 'TEST', scopes: ['source.shell', 'meta.herestring.shell', 'string.unquoted.herestring.shell']
     expect(tokens[6]).toEqual value: ' 1 2', scopes: ['source.shell']
 
+    {tokens} = grammar.tokenizeLine '$cmd = "$(3 / x <<< $WORD)"'
+    expect(tokens[6]).toEqual value: '<<<', scopes: ['source.shell', 'string.quoted.double.shell', 'string.interpolated.dollar.shell', 'meta.herestring.shell', 'keyword.operator.herestring.shell']
+    expect(tokens[8]).toEqual value: '$', scopes: ['source.shell', 'string.quoted.double.shell', 'string.interpolated.dollar.shell', 'meta.herestring.shell', 'string.unquoted.herestring.shell', 'variable.other.normal.shell', 'punctuation.definition.variable.shell']
+    expect(tokens[9]).toEqual value: 'WORD', scopes: ['source.shell', 'string.quoted.double.shell', 'string.interpolated.dollar.shell', 'meta.herestring.shell', 'string.unquoted.herestring.shell', 'variable.other.normal.shell']
+    expect(tokens[10]).toEqual value: ')', scopes: ['source.shell', 'string.quoted.double.shell', 'string.interpolated.dollar.shell', 'punctuation.definition.string.end.shell']
+
   it "tokenizes heredocs", ->
     delimsByScope =
       "ruby": "RUBY"