Merge pull request #7915 from jimeh/add-additional-syntax-highlight-languages

feat(shared/codeHighlight): add additional syntax highlight languages

Author: krlvi

packages/shared/package.json

@@ -63,6 +63,7 @@
 		"@reduxjs/toolkit": "catalog:redux",
 		"@codemirror/lang-cpp": "^6.0.2",
 		"@codemirror/lang-css": "^6.2.1",
+		"@codemirror/lang-go": "^6.0.1",
 		"@codemirror/lang-html": "^6.4.9",
 		"@codemirror/lang-java": "^6.0.1",
 		"@codemirror/lang-javascript": "^6.2.2",
@@ -74,6 +75,7 @@
 		"@codemirror/lang-vue": "^0.1.3",
 		"@codemirror/lang-wast": "^6.0.2",
 		"@codemirror/lang-xml": "^6.1.0",
+		"@codemirror/lang-yaml": "^6.1.2",
 		"@codemirror/language": "^6.10.2",
 		"@codemirror/legacy-modes": "^6.4.0",
 		"@lezer/common": "^1.2.1",

packages/shared/src/lib/codeHighlight.ts

@@ -4,6 +4,7 @@
 
 import { cpp } from '@codemirror/lang-cpp';
 import { css } from '@codemirror/lang-css';
+import { go } from '@codemirror/lang-go';
 import { html } from '@codemirror/lang-html';
 import { java } from '@codemirror/lang-java';
 import { javascript } from '@codemirror/lang-javascript';
@@ -16,8 +17,16 @@ import { rust } from '@codemirror/lang-rust';
 import { vue } from '@codemirror/lang-vue';
 import { wast } from '@codemirror/lang-wast';
 import { xml } from '@codemirror/lang-xml';
+import { yaml } from '@codemirror/lang-yaml';
 import { HighlightStyle, StreamLanguage } from '@codemirror/language';
+import { commonLisp } from '@codemirror/legacy-modes/mode/commonlisp';
+import { dockerFile } from '@codemirror/legacy-modes/mode/dockerfile';
+import { jinja2 } from '@codemirror/legacy-modes/mode/jinja2';
+import { lua } from '@codemirror/legacy-modes/mode/lua';
 import { ruby } from '@codemirror/legacy-modes/mode/ruby';
+import { shell } from '@codemirror/legacy-modes/mode/shell';
+import { swift } from '@codemirror/legacy-modes/mode/swift';
+import { toml } from '@codemirror/legacy-modes/mode/toml';
 import { NodeType, Tree, Parser } from '@lezer/common';
 import { tags, highlightTree } from '@lezer/highlight';
 
@@ -84,7 +93,14 @@ export function highlightNode(node: Element, mimeType: string): void {
 }
 
 export function parserFromFilename(filename: string): Parser | null {
-	const ext = filename.split('.').pop();
+	const basename = filename.split('/').pop() || '';
+	const ext = basename.split('.').pop()?.toLowerCase();
+
+	// Handle Dockerfiles (with common variations).
+	if (basename === 'Dockerfile' || basename.startsWith('Dockerfile.') || ext === 'dockerfile') {
+		return StreamLanguage.define(dockerFile).parser;
+	}
+
 	switch (ext) {
 		case 'jsx':
 		case 'js':
@@ -116,8 +132,12 @@ export function parserFromFilename(filename: string): Parser | null {
 		case 'h++':
 			return cpp().language.parser;
 
-		// case 'text/x-go':
-		//     return new LanguageSupport(await CodeMirror.go());
+		case 'go':
+			return go().language.parser;
+
+		case 'j2':
+		case 'jinja2':
+			return StreamLanguage.define(jinja2).parser;
 
 		case 'java':
 			return java().language.parser;
@@ -128,6 +148,14 @@ export function parserFromFilename(filename: string): Parser | null {
 		case 'json':
 			return json().language.parser;
 
+		case 'lisp':
+		case 'cl':
+		case 'el': // Also catches Emacs Lisp files
+			return StreamLanguage.define(commonLisp).parser;
+
+		case 'lua':
+			return StreamLanguage.define(lua).parser;
+
 		case 'php':
 			return php().language.parser;
 
@@ -172,6 +200,14 @@ export function parserFromFilename(filename: string): Parser | null {
 			// highlighting svelte with js + jsx works much better than the above
 			return javascript({ typescript: true, jsx: true }).language.parser;
 
+		case 'sh':
+		case 'bash':
+		case 'zsh':
+			return StreamLanguage.define(shell).parser;
+
+		case 'swift':
+			return StreamLanguage.define(swift).parser;
+
 		case 'vue':
 			return vue().language.parser;
 
@@ -181,6 +217,13 @@ export function parserFromFilename(filename: string): Parser | null {
 		case 'rb':
 			return StreamLanguage.define(ruby).parser;
 
+		case 'toml':
+			return StreamLanguage.define(toml).parser;
+
+		case 'yml':
+		case 'yaml':
+			return yaml().language.parser;
+
 		default:
 			return null;
 	}