Fix heredoc expansion

Author: mohd-akram

grammars/shell-unix-bash.cson

@@ -548,7 +548,7 @@
         ]
       }
       {
-        'begin': '(<<)-\\s*("|\'|)\\s*\\\\?([^;&<\\s]+)\\2'
+        'begin': '(<<)-\\s*("|\')\\s*\\\\?([^;&<\\s]+)\\2'
         'beginCaptures':
           '1':
             'name': 'keyword.operator.heredoc.shell'
@@ -561,7 +561,7 @@
         'name': 'string.unquoted.heredoc.no-indent.shell'
       }
       {
-        'begin': '(<<)\\s*("|\'|)\\s*\\\\?([^;&<\\s]+)\\2'
+        'begin': '(<<)\\s*("|\')\\s*\\\\?([^;&<\\s]+)\\2'
         'beginCaptures':
           '1':
             'name': 'keyword.operator.heredoc.shell'
@@ -573,6 +573,56 @@
             'name': 'keyword.control.heredoc-token.shell'
         'name': 'string.unquoted.heredoc.shell'
       }
+      {
+        'begin': '(<<)-\\s*\\\\?([^;&<\\s]+)'
+        'beginCaptures':
+          '1':
+            'name': 'keyword.operator.heredoc.shell'
+          '2':
+            'name': 'keyword.control.heredoc-token.shell'
+        'end': '^\\t*(\\2)(?=\\s|;|&|$)'
+        'endCaptures':
+          '1':
+            'name': 'keyword.control.heredoc-token.shell'
+        'name': 'string.unquoted.heredoc.expanded.no-indent.shell'
+        'patterns': [
+          {
+            'match': '\\\\[\\$`\\\\\\n]'
+            'name': 'constant.character.escape.shell'
+          }
+          {
+            'include': '#variable'
+          }
+          {
+            'include': '#interpolation'
+          }
+        ]
+      }
+      {
+        'begin': '(<<)\\s*\\\\?([^;&<\\s]+)'
+        'beginCaptures':
+          '1':
+            'name': 'keyword.operator.heredoc.shell'
+          '2':
+            'name': 'keyword.control.heredoc-token.shell'
+        'end': '^(\\2)(?=\\s|;|&|$)'
+        'endCaptures':
+          '1':
+            'name': 'keyword.control.heredoc-token.shell'
+        'name': 'string.unquoted.heredoc.expanded.shell'
+        'patterns': [
+          {
+            'match': '\\\\[\\$`\\\\\\n]'
+            'name': 'constant.character.escape.shell'
+          }
+          {
+            'include': '#variable'
+          }
+          {
+            'include': '#interpolation'
+          }
+        ]
+      }
     ]
   'herestring':
     'patterns': [

spec/shell-unix-bash-spec.coffee

@@ -220,10 +220,10 @@ describe "Shell script grammar", ->
         stuff
         #{delim}
       """
-      expect(tokens[0][0]).toEqual value: '<<', scopes: ['source.shell', 'string.unquoted.heredoc.shell', 'keyword.operator.heredoc.shell']
-      expect(tokens[0][1]).toEqual value: delim, scopes: ['source.shell', 'string.unquoted.heredoc.shell', 'keyword.control.heredoc-token.shell']
-      expect(tokens[1][0]).toEqual value: 'stuff', scopes: ['source.shell', 'string.unquoted.heredoc.shell']
-      expect(tokens[2][0]).toEqual value: delim, scopes: ['source.shell', 'string.unquoted.heredoc.shell', 'keyword.control.heredoc-token.shell']
+      expect(tokens[0][0]).toEqual value: '<<', scopes: ['source.shell', 'string.unquoted.heredoc.expanded.shell', 'keyword.operator.heredoc.shell']
+      expect(tokens[0][1]).toEqual value: delim, scopes: ['source.shell', 'string.unquoted.heredoc.expanded.shell', 'keyword.control.heredoc-token.shell']
+      expect(tokens[1][0]).toEqual value: 'stuff', scopes: ['source.shell', 'string.unquoted.heredoc.expanded.shell']
+      expect(tokens[2][0]).toEqual value: delim, scopes: ['source.shell', 'string.unquoted.heredoc.expanded.shell', 'keyword.control.heredoc-token.shell']
 
     for delim in delims
       tokens = grammar.tokenizeLines """