Shell session: Commands prefixed with a path are now detected (#2686)

RunDevelopment · web-flow · commit c83fd0b8c236 · 2021-01-01T18:19:06.000+01:00
diff --git a/components/prism-shell-session.js b/components/prism-shell-session.js
@@ -15,21 +15,19 @@
 
 	Prism.languages['shell-session'] = {
 		'command': {
-			pattern: RegExp(/^(?:[^\s@:$#*!/\\]+@[^\s@:$#*!/\\]+(?::[^\0-\x1F$#*?"<>:;|]+)?)?[$#](?:[^\\\r\n'"<]|\\.|<<str>>)+/.source.replace(/<<str>>/g, function () { return strings; }), 'm'),
+			pattern: RegExp(/^(?:[^\s@:$#*!/\\]+@[^\s@:$#*!/\\]+(?::[^\0-\x1F$#*?"<>:;|]+)?|[^\0-\x1F$#*?"<>:;|]+)?[$#](?:[^\\\r\n'"<]|\\.|<<str>>)+/.source.replace(/<<str>>/g, function () { return strings; }), 'm'),
 			greedy: true,
 			inside: {
 				'info': {
 					// foo@bar:~/files$ exit
 					// foo@bar$ exit
+					// ~/files$ exit
 					pattern: /^[^#$]+/,
 					alias: 'punctuation',
 					inside: {
-						'path': {
-							pattern: /(:)[\s\S]+/,
-							lookbehind: true
-						},
-						'user': /^[^:]+/,
-						'punctuation': /:/
+						'user': /^[^\s@:$#*!/\\]+@[^\s@:$#*!/\\]+/,
+						'punctuation': /:/,
+						'path': /[\s\S]+/
 					}
 				},
 				'bash': {
diff --git a/components/prism-shell-session.min.js b/components/prism-shell-session.min.js
diff --git a/tests/languages/shell-session/issue2685.test b/tests/languages/shell-session/issue2685.test
@@ -0,0 +1,29 @@
+/home/user$ echo "Hello World"
+Hello World
+/home/user$ exit
+
+----------------------------------------------------
+
+[
+	["command", [
+		["info", [
+			["path", "/home/user"]
+		]],
+		["shell-symbol", "$"],
+		["bash", [
+			["builtin", "echo"],
+			["string", ["\"Hello World\""]]
+		]]
+	]],
+
+	["output", "Hello World\r\n"],
+	["command", [
+		["info", [
+			["path", "/home/user"]
+		]],
+		["shell-symbol", "$"],
+		["bash", [
+			["builtin", "exit"]
+		]]
+	]]
+]
