highlight ts and env

Author: pngwn

dist/action.js

@@ -21579,6 +21579,49 @@ Prism.languages.js = Prism.languages.javascript;
 
 }(Prism));
 
+(function (Prism) {
+
+	Prism.languages.typescript = Prism.languages.extend('javascript', {
+		'class-name': {
+			pattern: /(\b(?:class|extends|implements|instanceof|interface|new|type)\s+)(?!keyof\b)(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?:\s*<(?:[^<>]|<(?:[^<>]|<[^<>]*>)*>)*>)?/,
+			lookbehind: true,
+			greedy: true,
+			inside: null // see below
+		},
+		// From JavaScript Prism keyword list and TypeScript language spec: https://github.com/Microsoft/TypeScript/blob/master/doc/spec.md#221-reserved-words
+		'keyword': /\b(?:abstract|as|asserts|async|await|break|case|catch|class|const|constructor|continue|debugger|declare|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|is|keyof|let|module|namespace|new|null|of|package|private|protected|public|readonly|return|require|set|static|super|switch|this|throw|try|type|typeof|undefined|var|void|while|with|yield)\b/,
+		'builtin': /\b(?:string|Function|any|number|boolean|Array|symbol|console|Promise|unknown|never)\b/,
+	});
+
+	// doesn't work with TS because TS is too complex
+	delete Prism.languages.typescript['parameter'];
+
+	// a version of typescript specifically for highlighting types
+	var typeInside = Prism.languages.extend('typescript', {});
+	delete typeInside['class-name'];
+
+	Prism.languages.typescript['class-name'].inside = typeInside;
+
+	Prism.languages.insertBefore('typescript', 'function', {
+		'generic-function': {
+			// e.g. foo<T extends "bar" | "baz">( ...
+			pattern: /#?(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*\s*<(?:[^<>]|<(?:[^<>]|<[^<>]*>)*>)*>(?=\s*\()/,
+			greedy: true,
+			inside: {
+				'function': /^#?(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*/,
+				'generic': {
+					pattern: /<[\s\S]+/, // everything after the first <
+					alias: 'class-name',
+					inside: typeInside
+				}
+			}
+		}
+	});
+
+	Prism.languages.ts = Prism.languages.typescript;
+
+}(Prism));
+
 const blocks = '(if|else if|await|then|catch|each|html|debug)';
 
 Prism.languages.svelte = Prism.languages.extend('markup', {
@@ -21724,6 +21767,7 @@ Prism.languages.svelte.tag.addInlined('script', 'javascript');
 
 var LanguageMap; (function (LanguageMap) {
 	const bash = "bash"; LanguageMap["bash"] = bash;
+	const env = "bash"; LanguageMap["env"] = env;
 	const html = "markup"; LanguageMap["html"] = html;
 	const sv = "svelte"; LanguageMap["sv"] = sv;
 	const js = "javascript"; LanguageMap["js"] = js;

dist/cli.js

@@ -20342,6 +20342,49 @@ Prism.languages.js = Prism.languages.javascript;
 
 }(Prism));
 
+(function (Prism) {
+
+	Prism.languages.typescript = Prism.languages.extend('javascript', {
+		'class-name': {
+			pattern: /(\b(?:class|extends|implements|instanceof|interface|new|type)\s+)(?!keyof\b)(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*(?:\s*<(?:[^<>]|<(?:[^<>]|<[^<>]*>)*>)*>)?/,
+			lookbehind: true,
+			greedy: true,
+			inside: null // see below
+		},
+		// From JavaScript Prism keyword list and TypeScript language spec: https://github.com/Microsoft/TypeScript/blob/master/doc/spec.md#221-reserved-words
+		'keyword': /\b(?:abstract|as|asserts|async|await|break|case|catch|class|const|constructor|continue|debugger|declare|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|is|keyof|let|module|namespace|new|null|of|package|private|protected|public|readonly|return|require|set|static|super|switch|this|throw|try|type|typeof|undefined|var|void|while|with|yield)\b/,
+		'builtin': /\b(?:string|Function|any|number|boolean|Array|symbol|console|Promise|unknown|never)\b/,
+	});
+
+	// doesn't work with TS because TS is too complex
+	delete Prism.languages.typescript['parameter'];
+
+	// a version of typescript specifically for highlighting types
+	var typeInside = Prism.languages.extend('typescript', {});
+	delete typeInside['class-name'];
+
+	Prism.languages.typescript['class-name'].inside = typeInside;
+
+	Prism.languages.insertBefore('typescript', 'function', {
+		'generic-function': {
+			// e.g. foo<T extends "bar" | "baz">( ...
+			pattern: /#?(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*\s*<(?:[^<>]|<(?:[^<>]|<[^<>]*>)*>)*>(?=\s*\()/,
+			greedy: true,
+			inside: {
+				'function': /^#?(?!\s)[_$a-zA-Z\xA0-\uFFFF](?:(?!\s)[$\w\xA0-\uFFFF])*/,
+				'generic': {
+					pattern: /<[\s\S]+/, // everything after the first <
+					alias: 'class-name',
+					inside: typeInside
+				}
+			}
+		}
+	});
+
+	Prism.languages.ts = Prism.languages.typescript;
+
+}(Prism));
+
 const blocks = '(if|else if|await|then|catch|each|html|debug)';
 
 Prism.languages.svelte = Prism.languages.extend('markup', {
@@ -20487,6 +20530,7 @@ Prism.languages.svelte.tag.addInlined('script', 'javascript');
 
 var LanguageMap; (function (LanguageMap) {
 	const bash = "bash"; LanguageMap["bash"] = bash;
+	const env = "bash"; LanguageMap["env"] = env;
 	const html = "markup"; LanguageMap["html"] = html;
 	const sv = "svelte"; LanguageMap["sv"] = sv;
 	const js = "javascript"; LanguageMap["js"] = js;

src/format/code.test.ts

@@ -57,6 +57,14 @@ _highlight("highlights javascript", () => {
 	);
 });
 
+_highlight("highlights typescript", () => {
+	const highlighted = highlight(`console.log('boo')`, "ts");
+	assert.snapshot(
+		highlighted,
+		`<div class="code-block"><pre class='language-typescript'><code><span class="token builtin">console</span><span class="token punctuation">.</span><span class="token function">log</span><span class="token punctuation">(</span><span class="token string">'boo'</span><span class="token punctuation">)</span></code></pre></div>`
+	);
+});
+
 _highlight("highlights css", () => {
 	const highlighted = highlight(`.thing { color: pink; }`, "css");
 	assert.snapshot(

src/format/code.ts

@@ -5,12 +5,15 @@ import visit from "unist-util-visit";
 import PrismJS from "prismjs";
 import "prismjs/components/prism-bash.js";
 import "prismjs/components/prism-diff.js";
+import "prismjs/components/prism-typescript.js";
+
 import "prism-svelte";
 
 export type language = keyof typeof LanguageMap;
 
 enum LanguageMap {
 	bash = "bash",
+	env = "bash",
 	html = "markup",
 	sv = "svelte",
 	js = "javascript",