resolve #2860 add support for multiline command

highlightjs · Nov 13, 2020 · 036b4b5 · 036b4b5
1 parent e8a8216
commit 036b4b5
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/src/languages/shell.js b/src/languages/shell.js
@@ -14,7 +14,7 @@ export default function(hljs) {
         className: 'meta',
         begin: '^\\s{0,3}[/\\w\\d\\[\\]()@-]*[>%$#]',
         starts: {
-          end: '$', subLanguage: 'bash'
+          end: '[^\\\\]\\s*$', subLanguage: 'bash'
         }
       }
     ]

diff --git a/test/markup/shell/command-continuation.expect.txt b/test/markup/shell/command-continuation.expect.txt
@@ -0,0 +1,10 @@
+<span class="hljs-meta">$</span><span class="bash"> docker run \
+      --publish=7474:7474 --publish=7687:7687 \
+      --volume=/neo4j/data:/data \
+      --volume=/neo4j/plugins:/plugins \
+      --volume=/neo4j/conf:/conf \
+      --volume=/logs/neo4j:/logs \
+      --user=<span class="hljs-string">&quot;<span class="hljs-subst">$(id -u neo4j)</span>:<span class="hljs-subst">$(id -g neo4j)</span>&quot;</span> \
+      --group-add=<span class="hljs-variable">$groups</span> \
+      neo4j:3.4
+</span>
diff --git a/test/markup/shell/command-continuation.txt b/test/markup/shell/command-continuation.txt
@@ -0,0 +1,9 @@
+$ docker run \
+      --publish=7474:7474 --publish=7687:7687 \
+      --volume=/neo4j/data:/data \
+      --volume=/neo4j/plugins:/plugins \
+      --volume=/neo4j/conf:/conf \
+      --volume=/logs/neo4j:/logs \
+      --user="$(id -u neo4j):$(id -g neo4j)" \
+      --group-add=$groups \
+      neo4j:3.4
diff --git a/test/markup/shell/plain-prompt.expect.txt b/test/markup/shell/plain-prompt.expect.txt
@@ -1,2 +1,3 @@
 <span class="hljs-meta">&gt;</span><span class="bash"> foo</span>
-<span class="hljs-meta">&gt;</span><span class="bash"> /bin/sh</span>
+<span class="hljs-meta">&gt;</span><span class="bash"> /bin/sh
+</span>