BashLexer: Significantly improve handling of quoted strings (and ${})

Fixes #994

1 files changed, 16 insertions, 7 deletions

diff --git a/pygments/lexers/shell.py b/pygments/lexers/shell.py
index df9b56f4..097ca624 100644
--- a/pygments/lexers/shell.py
+++ b/pygments/lexers/shell.py
@@ -39,12 +39,16 @@ class BashLexer(RegexLexer):
     tokens = {
         'root': [
             include('basic'),
-            (r'\$\(\(', Keyword, 'math'),
-            (r'\$\(', Keyword, 'paren'),
-            (r'\${#?', Keyword, 'curly'),
             (r'`', String.Backtick, 'backticks'),
+            include('interp'),
             include('data'),
         ],
+        'interp': [
+            (r'\$\(\(', Keyword, 'math'),
+            (r'\$\(', Keyword, 'paren'),
+            (r'\${#?', String.Interpol, 'curly'),
+            (r'\$#?(\w+|.)', Name.Variable),
+        ],
         'basic': [
             (r'\b(if|fi|else|while|do|done|for|then|return|function|case|'
              r'select|continue|until|esac|elif)(\s*)\b',
@@ -65,7 +69,8 @@ class BashLexer(RegexLexer):
             (r'&&|\|\|', Operator),
         ],
         'data': [
-            (r'(?s)\$?"(\\\\|\\[0-7]+|\\.|[^"\\])*"', String.Double),
+            (r'(?s)\$?"(\\\\|\\[0-7]+|\\.|[^"\\$])*"', String.Double),
+            (r'"', String.Double, 'string'),
             (r"(?s)\$?'(\\\\|\\[0-7]+|\\.|[^'\\])*'", String.Single),
             (r';', Punctuation),
             (r'&', Punctuation),
@@ -73,14 +78,18 @@ class BashLexer(RegexLexer):
             (r'\s+', Text),
             (r'\d+(?= |\Z)', Number),
             (r'[^=\s\[\]{}()$"\'`\\<&|;]+', Text),
-            (r'\$#?(\w+|.)', Name.Variable),
             (r'<', Text),
         ],
+        'string': [
+            (r'"', String.Double, '#pop'),
+            (r'(\\\\|\\[0-7]+|\\[\w\W]|[^"\\$])+', String.Double),
+            include('interp'),
+        ],
         'curly': [
-            (r'}', Keyword, '#pop'),
+            (r'}', String.Interpol, '#pop'),
             (r':-', Keyword),
             (r'\w+', Name.Variable),
-            (r'[^}:"\'`$]+', Punctuation),
+            (r'[^}:"\'`$\\]+', Punctuation),
             (r':', Punctuation),
             include('root'),
         ],