Shell-session: Added support for the percent sign as shell symbol (#3010)

knu · web-flow · commit 4492b62b7709 · 2021-07-26T13:17:37.000+02:00
diff --git a/components/prism-shell-session.js b/components/prism-shell-session.js
@@ -18,9 +18,9 @@
 		'command': {
 			pattern: RegExp(
 				// user info
-				/^(?:[^\s@:$#*!/\\]+@[^\r\n@:$#*!/\\]+(?::[^\0-\x1F$#*?"<>:;|]+)?|[^\0-\x1F$#*?"<>@:;|]+)?/.source +
+				/^(?:[^\s@:$#%*!/\\]+@[^\r\n@:$#%*!/\\]+(?::[^\0-\x1F$#%*?"<>:;|]+)?|[^\0-\x1F$#%*?"<>@:;|]+)?/.source +
 				// shell symbol
-				/[$#]/.source +
+				/[$#%]/.source +
 				// bash command
 				/(?:[^\\\r\n'"<$]|\\(?:[^\r]|\r\n?)|\$(?!')|<<str>>)+/.source.replace(/<<str>>/g, function () { return strings; }),
 				'm'
@@ -31,22 +31,22 @@
 					// foo@bar:~/files$ exit
 					// foo@bar$ exit
 					// ~/files$ exit
-					pattern: /^[^#$]+/,
+					pattern: /^[^#$%]+/,
 					alias: 'punctuation',
 					inside: {
-						'user': /^[^\s@:$#*!/\\]+@[^\r\n@:$#*!/\\]+/,
+						'user': /^[^\s@:$#%*!/\\]+@[^\r\n@:$#%*!/\\]+/,
 						'punctuation': /:/,
 						'path': /[\s\S]+/
 					}
 				},
 				'bash': {
-					pattern: /(^[$#]\s*)\S[\s\S]*/,
+					pattern: /(^[$#%]\s*)\S[\s\S]*/,
 					lookbehind: true,
 					alias: 'language-bash',
 					inside: Prism.languages.bash
 				},
 				'shell-symbol': {
-					pattern: /^[$#]/,
+					pattern: /^[$#%]/,
 					alias: 'important'
 				}
 			}
diff --git a/components/prism-shell-session.min.js b/components/prism-shell-session.min.js
diff --git a/tests/languages/shell-session/info_feature.test b/tests/languages/shell-session/info_feature.test
@@ -4,7 +4,8 @@ foo@bar:~$ sudo -i
 root@bar:~# echo "hello!"
 hello!
 
-foo@bar$ exit
+foo@bar$ zsh
+foo@bar% exit
 
 ----------------------------------------------------
 
@@ -54,6 +55,15 @@ foo@bar$ exit
 			["user", "foo@bar"]
 		]],
 		["shell-symbol", "$"],
+		["bash", [
+			["function", "zsh"]
+		]]
+	]],
+	["command", [
+		["info", [
+			["user", "foo@bar"]
+		]],
+		["shell-symbol", "%"],
 		["bash", [
 			["builtin", "exit"]
 		]]
