Added support for Shell sessions

RunDevelopment · web-flow · commit 31fb8bc5c318 · 2019-06-12T15:50:04.000+02:00
This adds support for a Shell session pseudo language.
diff --git a/components.js b/components.js
diff --git a/components.json b/components.json
@@ -804,6 +804,11 @@
 			"title": "Scheme",
 			"owner": "bacchus123"
 		},
+		"shell-session": {
+			"title": "Shell session",
+			"require": "bash",
+			"owner": "RunDevelopment"
+		},
 		"smalltalk": {
 			"title": "Smalltalk",
 			"owner": "Golmote"
diff --git a/components/prism-bash.js b/components/prism-bash.js
@@ -192,6 +192,6 @@
 	for(var i = 0; i < toBeCopied.length; i++) {
 		inside[toBeCopied[i]] = Prism.languages.bash[toBeCopied[i]];
 	}
-	
+
 	Prism.languages.shell = Prism.languages.bash;
 })(Prism);
diff --git a/components/prism-shell-session.js b/components/prism-shell-session.js
@@ -0,0 +1,21 @@
+Prism.languages['shell-session'] = {
+	'command': {
+		pattern: /\$(?:[^\r\n'"<]|(["'])(?:\\[\s\S]|\$\([^)]+\)|`[^`]+`|(?!\1)[^\\])*\1|((?:^|[^<])<<\s*)["']?(\w+?)["']?\s*(?:\r\n?|\n)(?:[\s\S])*?(?:\r\n?|\n)\3)+/,
+		inside: {
+			'bash': {
+				pattern: /(\$\s*)[\s\S]+/,
+				lookbehind: true,
+				alias: 'language-bash',
+				inside: Prism.languages.bash
+			},
+			'sh': {
+				pattern: /^\$/,
+				alias: 'important'
+			}
+		}
+	},
+	'output': {
+		pattern: /.(?:.*(?:\r\n?|\n|.$))*/
+		// output highlighting?
+	}
+}
diff --git a/components/prism-shell-session.min.js b/components/prism-shell-session.min.js
diff --git a/examples/prism-shell-session.html b/examples/prism-shell-session.html
@@ -0,0 +1,10 @@
+<h2>Full example</h2>
+<pre><code>$ git checkout master
+Switched to branch 'master'
+Your branch is up-to-date with 'origin/master'.
+$ git push
+Everything up-to-date
+$ echo "Foo
+> Bar"
+Foo
+Bar</code></pre>
diff --git a/plugins/autoloader/prism-autoloader.js b/plugins/autoloader/prism-autoloader.js
@@ -92,6 +92,7 @@
 		"sass": "css",
 		"scss": "css",
 		"scala": "java",
+		"shell-session": "bash",
 		"smarty": "markup-templating",
 		"soy": "markup-templating",
 		"swift": "clike",
diff --git a/plugins/autoloader/prism-autoloader.min.js b/plugins/autoloader/prism-autoloader.min.js
diff --git a/plugins/show-language/prism-show-language.js b/plugins/show-language/prism-show-language.js
@@ -112,6 +112,7 @@
 		"sas": "SAS",
 		"sass": "Sass (Sass)",
 		"scss": "Sass (Scss)",
+		"shell-session": "Shell session",
 		"sql": "SQL",
 		"soy": "Soy (Closure Template)",
 		"tap": "TAP",
diff --git a/plugins/show-language/prism-show-language.min.js b/plugins/show-language/prism-show-language.min.js
diff --git a/tests/languages/scss/atrule_feature.test b/tests/languages/scss/atrule_feature.test
@@ -12,9 +12,9 @@
 		["punctuation", ")"]
 	]],
 	["punctuation", "{"],
-    ["punctuation", "}"]
+	["punctuation", "}"]
 ]
 
 ----------------------------------------------------
 
-Checks for at-rules.
+Checks for at-rules.
diff --git a/tests/languages/shell-session/command_feature.test b/tests/languages/shell-session/command_feature.test
@@ -0,0 +1,31 @@
+$ git checkout master
+Switched to branch 'master'
+Your branch is up-to-date with 'origin/master'.
+$ git push
+Everything up-to-date
+
+----------------------------------------------------
+
+[
+	["command", [
+		["sh", "$"],
+		["bash", [
+			["function", "git"],
+			" checkout master"
+		]]
+	]],
+	["output", "Switched to branch 'master'\nYour branch is up-to-date with 'origin/master'.\n"],
+
+	["command", [
+		["sh", "$"],
+		["bash", [
+			["function", "git"],
+			" push"
+		]]
+	]],
+	["output", "Everything up-to-date"]
+]
+
+----------------------------------------------------
+
+Checks for commands.
diff --git a/tests/languages/shell-session/command_string_feature.test b/tests/languages/shell-session/command_string_feature.test
@@ -0,0 +1,32 @@
+$ echo 'Foo
+> Bar'
+$ echo "Foo
+> Bar"
+
+----------------------------------------------------
+
+[
+	["command", [
+		["sh", "$"],
+		["bash", [
+			["builtin", "echo"],
+			["string", [
+				"'Foo\n> Bar'"
+			]]
+		]]
+	]],
+
+	["command", [
+		["sh", "$"],
+		["bash", [
+			["builtin", "echo"],
+			["string", [
+				"\"Foo\n> Bar\""
+			]]
+		]]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for multi-line strings inside commands.

Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,6 @@`
`192`	`192`	`for(var i = 0; i < toBeCopied.length; i++) {`
`193`	`193`	`inside[toBeCopied[i]] = Prism.languages.bash[toBeCopied[i]];`
`194`	`194`	`}`
`195`		`-`
	`195`	`+`
`196`	`196`	`Prism.languages.shell = Prism.languages.bash;`
`197`	`197`	`})(Prism);`