Merge pull request #11066 from jimeh/add-syntax-highlighting-for-additional-languages

feat(diff/syntax-highlight): support 12 more languages

Author: krlvi

packages/shared/package.json

@@ -52,7 +52,7 @@
 		"@codemirror/lang-xml": "^6.1.0",
 		"@codemirror/lang-yaml": "^6.1.2",
 		"@codemirror/language": "^6.11.2",
-		"@codemirror/legacy-modes": "^6.5.1",
+		"@codemirror/legacy-modes": "^6.5.2",
 		"@csstools/postcss-bundler": "^1.0.15",
 		"@gitbutler/core": "workspace:*",
 		"@gitbutler/ui": "workspace:*",

packages/ui/package.json

@@ -31,6 +31,7 @@
 	"devDependencies": {
 		"@codemirror/lang-cpp": "^6.0.3",
 		"@codemirror/lang-css": "^6.3.1",
+		"@codemirror/lang-go": "^6.0.1",
 		"@codemirror/lang-html": "^6.4.9",
 		"@codemirror/lang-java": "^6.0.2",
 		"@codemirror/lang-javascript": "^6.2.4",
@@ -42,13 +43,15 @@
 		"@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.11.2",
-		"@codemirror/legacy-modes": "^6.5.1",
+		"@codemirror/legacy-modes": "^6.5.2",
 		"@csstools/postcss-bundler": "^2.0.8",
 		"@gitbutler/design-core": "^1.2.6",
 		"@lezer/common": "^1.2.3",
 		"@lezer/highlight": "^1.2.1",
 		"@playwright/experimental-ct-svelte": "^1.56.1",
+		"@replit/codemirror-lang-nix": "^6.0.1",
 		"@replit/codemirror-lang-svelte": "^6.0.0",
 		"@storybook/addon-docs": "^10.0.2",
 		"@storybook/addon-links": "^10.0.2",
@@ -62,6 +65,8 @@
 		"@types/postcss-pxtorem": "^6.1.0",
 		"@vitest/browser": "catalog:",
 		"autoprefixer": "^10.4.21",
+		"codemirror-lang-elixir": "^4.0.0",
+		"codemirror-lang-hcl": "^0.1.0",
 		"cpy-cli": "^5.0.0",
 		"cssnano": "^7.1.0",
 		"dayjs": "^1.11.13",

packages/ui/src/lib/utils/diffParsing.ts

@@ -1,5 +1,6 @@
 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';
@@ -12,13 +13,24 @@ 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 { kotlin } from '@codemirror/legacy-modes/mode/clike';
+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 { powerShell } from '@codemirror/legacy-modes/mode/powershell';
 import { protobuf } from '@codemirror/legacy-modes/mode/protobuf';
 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';
+import { nix } from '@replit/codemirror-lang-nix';
+import { elixir } from 'codemirror-lang-elixir';
+import { hcl } from 'codemirror-lang-hcl';
 import diff_match_patch from 'diff-match-patch';
 import type { BrandedId } from '$lib/utils/branding';
 
@@ -266,19 +278,44 @@ export function parserFromExtension(extension: string): Parser | undefined {
 		case 'h++':
 			return cpp().language.parser;
 
-		// case 'text/x-go':
-		//     return new LanguageSupport(await CodeMirror.go());
+		case 'ex':
+		case 'exs':
+			return elixir().language.parser;
+
+		case 'go':
+			return go().language.parser;
+
+		case 'hcl':
+		case 'hcl2':
+		case 'nomad':
+		case 'tf':
+		case 'tfvars':
+			return hcl().language.parser;
 
 		case 'java':
 			return java().language.parser;
 
+		case 'j2':
+		case 'jinja':
+		case 'jinja2':
+			return StreamLanguage.define(jinja2).parser;
+
 		case 'kt':
 		case 'kts':
 			return StreamLanguage.define(kotlin).parser;
 
 		case 'json':
 			return json().language.parser;
 
+		case 'lisp':
+		case 'lsp':
+		case 'cl': // Common Lisp
+		case 'el': // Emacs Lisp
+			return StreamLanguage.define(commonLisp).parser;
+
+		case 'lua':
+			return StreamLanguage.define(lua).parser;
+
 		case 'php':
 			return php().language.parser;
 
@@ -292,8 +329,8 @@ export function parserFromExtension(extension: string): Parser | undefined {
 		case 'md':
 			return markdown().language.parser;
 
-		// case 'text/x-sh':
-		//     return new LanguageSupport(await CodeMirror.shell());
+		case 'nix':
+			return nix().language.parser;
 
 		// case 'text/x-coffeescript':
 		//     return new LanguageSupport(await CodeMirror.coffeescript());
@@ -326,6 +363,14 @@ export function parserFromExtension(extension: string): Parser | undefined {
 			// 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;
 
@@ -335,13 +380,27 @@ export function parserFromExtension(extension: string): Parser | undefined {
 		case 'rb':
 			return StreamLanguage.define(ruby).parser;
 
+		case 'toml':
+			return StreamLanguage.define(toml).parser;
+
+		case 'yml':
+		case 'yaml':
+			return yaml().language.parser;
+
 		default:
 			return undefined;
 	}
 }
 
 export function parserFromFilename(filename: string): Parser | undefined {
-	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;
+	}
+
 	if (!ext) return undefined;
 	return parserFromExtension(ext);
 }