[shell mode] Correctly highlight strings ending in dollar sign

Closes codemirror#5197
evs-chris · Jan 19, 2018 · d0dca65 · d0dca65
1 parent 945c967
commit d0dca65
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/mode/shell/shell.js b/mode/shell/shell.js
@@ -89,7 +89,7 @@ CodeMirror.defineMode('shell', function() {
         if (next === close && !escaped) {
           state.tokens.shift();
           break;
-        } else if (next === '$' && !escaped && quote !== "'") {
+        } else if (next === '$' && !escaped && quote !== "'" && stream.peek() != close) {
           escaped = true;
           stream.backUp(1);
           state.tokens.unshift(tokenDollar);

diff --git a/mode/shell/test.js b/mode/shell/test.js
@@ -64,4 +64,10 @@
 
   MT("strings in parens",
      "[def FOO][operator =]([quote $(<][string \"][def $MYDIR][string \"][quote /myfile grep ][string 'hello$'][quote )])")
+
+  MT ("string ending in dollar",
+     '[def a][operator =][string "xyz$"]; [def b][operator =][string "y"]')
+
+  MT ("quote ending in dollar",
+     "[quote $(echo a$)]")
 })();