Added syntax highlighting

gitbutlerapp · Jan 24, 2025 · 0510989 · 0510989
1 parent 4b000a1
commit 0510989
Show file tree

Hide file tree

Showing 13 changed files with 802 additions and 315 deletions.
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
@@ -18,28 +18,10 @@
 	},
 	"devDependencies": {
 		"@anthropic-ai/sdk": "^0.27.3",
-		"@codemirror/lang-cpp": "^6.0.2",
-		"@codemirror/lang-css": "^6.2.1",
-		"@codemirror/lang-html": "^6.4.9",
-		"@codemirror/lang-java": "^6.0.1",
-		"@codemirror/lang-javascript": "^6.2.2",
-		"@codemirror/lang-json": "^6.0.1",
-		"@codemirror/lang-markdown": "^6.2.5",
-		"@codemirror/lang-php": "^6.0.1",
-		"@codemirror/lang-python": "^6.1.6",
-		"@codemirror/lang-rust": "^6.0.1",
-		"@codemirror/lang-vue": "^0.1.3",
-		"@codemirror/lang-wast": "^6.0.2",
-		"@codemirror/lang-xml": "^6.1.0",
-		"@codemirror/language": "^6.10.2",
-		"@codemirror/legacy-modes": "^6.4.0",
 		"@gitbutler/shared": "workspace:*",
 		"@gitbutler/ui": "workspace:*",
-		"@lezer/common": "^1.2.1",
-		"@lezer/highlight": "^1.2.0",
 		"@octokit/rest": "^20.1.1",
 		"@reduxjs/toolkit": "catalog:redux",
-		"@replit/codemirror-lang-svelte": "^6.0.0",
 		"@sentry/sveltekit": "catalog:svelte",
 		"@sveltejs/adapter-static": "catalog:svelte",
 		"@sveltejs/kit": "catalog:svelte",

diff --git a/apps/desktop/src/components/HunkDiff.svelte b/apps/desktop/src/components/HunkDiff.svelte
@@ -2,13 +2,13 @@
 	import ScrollableContainer from '$components/ScrollableContainer.svelte';
 	import { SelectedOwnership } from '$lib/branches/ownership';
 	import { type Hunk } from '$lib/hunks/hunk';
-	import { create } from '$lib/utils/codeHighlight';
 	import {
 		type ContentSection,
 		SectionType,
 		type Line,
 		CountColumnSide
 	} from '$lib/utils/fileSections';
+	import { create } from '@gitbutler/shared/codeHighlight';
 	import { maybeGetContextStore } from '@gitbutler/shared/context';
 	import Checkbox from '@gitbutler/ui/Checkbox.svelte';
 	import Icon from '@gitbutler/ui/Icon.svelte';

diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json
@@ -36,6 +36,8 @@
 		"src/**/*.svelte",
 		"e2e/tests/**/*.js",
 		"e2e/tests/**/*.ts",
-		"e2e/tests/**/*.svelte"
+		"e2e/tests/**/*.svelte",
+		"../../packages/shared/src/lib/codeHighlight.ts",
+		"../../packages/shared/src/lib/codeHighlight.ts"
 	]
 }
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -26,7 +26,9 @@
 		"svelte": "catalog:svelte",
 		"svelte-check": "catalog:svelte",
 		"svelte-french-toast": "^1.2.0",
-		"vite": "catalog:"
+		"vite": "catalog:",
+		"diff-match-patch": "^1.0.5",
+		"@types/diff-match-patch": "^1.0.36"
 	},
 	"dependencies": {
 		"@ethercorps/sveltekit-og": "^3.0.0",