From a4041c82bd712dc19674b7e62faa39b9679a8eea Mon Sep 17 00:00:00 2001
From: Julian <macjuul@users.noreply.github.com>
Date: Wed, 22 Jan 2025 12:53:57 +0100
Subject: [PATCH] Improve highlight tool (#659)

---
 src/components/App/modals/highlight-tool.tsx | 40 +++++++++++++++++---
 src/util/highlighting.tsx                    |  6 +--
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/components/App/modals/highlight-tool.tsx b/src/components/App/modals/highlight-tool.tsx
index 3bd692f58..2e30c4663 100644
--- a/src/components/App/modals/highlight-tool.tsx
+++ b/src/components/App/modals/highlight-tool.tsx
@@ -1,15 +1,16 @@
-import { Button, Divider, Modal, SimpleGrid, Stack } from "@mantine/core";
+import { Button, Divider, Group, Modal, Select, SimpleGrid, Stack } from "@mantine/core";
 import { surrealql } from "@surrealdb/codemirror";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { s } from "surrealdb";
 import { CodeEditor } from "~/components/CodeEditor";
 import { PrimaryTitle } from "~/components/PrimaryTitle";
 import { RadioSelect } from "~/components/RadioSelect";
+import { DRIVERS } from "~/constants";
 import { useBoolean } from "~/hooks/boolean";
 import { useIntent } from "~/hooks/routing";
 import { useStable } from "~/hooks/stable";
 import { useConfigStore } from "~/stores/config";
-import type { ColorScheme, SyntaxTheme } from "~/types";
+import { CodeLang, type ColorScheme, type SyntaxTheme } from "~/types";
 import { useFeatureFlags } from "~/util/feature-flags";
 import { renderHighlighting } from "~/util/highlighting";
 import { formatQuery } from "~/util/surrealql";
@@ -17,10 +18,11 @@ import { formatQuery } from "~/util/surrealql";
 function Render({
 	value,
 	theme,
+	lang,
 	syntaxTheme,
-}: { value: string; theme: ColorScheme; syntaxTheme: SyntaxTheme }) {
+}: { value: string; theme: ColorScheme; lang: CodeLang; syntaxTheme: SyntaxTheme }) {
 	const render = useStable(() => {
-		const rendered = renderHighlighting(value, "surrealql", theme, syntaxTheme);
+		const rendered = renderHighlighting(value, lang, theme, syntaxTheme);
 		const clipboardItem = new ClipboardItem({
 			"text/html": new Blob([rendered], { type: "text/html" }),
 			"text/plain": new Blob([rendered], { type: "text/plain" }),
@@ -42,11 +44,20 @@ function Render({
 
 export function HighlightToolModal() {
 	const [value, onChange] = useState("");
+	const [lang, setLang] = useState<CodeLang>("cli");
 	const [isOpen, openedHandle] = useBoolean();
 	const [_, setFeatureFlags] = useFeatureFlags();
 	const [theme, setTheme] = useState<ColorScheme>("dark");
 	const syntaxTheme = useConfigStore((state) => state.settings.appearance.syntaxTheme);
 
+	const languages = useMemo(() => {
+		return DRIVERS.map((driver) => ({
+			label: driver.name,
+			value: driver.id,
+			icon: driver.icon,
+		}));
+	}, []);
+
 	const format = useCallback(() => {
 		onChange(formatQuery(value));
 	}, [value]);
@@ -57,7 +68,7 @@ export function HighlightToolModal() {
 		}
 	}, [isOpen]);
 
-	const extensions = useMemo(() => [surrealql()], []);
+	const extensions = useMemo(() => (lang === "cli" ? [surrealql()] : []), [lang]);
 
 	useIntent("highlight-tool", () => {
 		openedHandle.open();
@@ -74,7 +85,23 @@ export function HighlightToolModal() {
 				trapFocus={false}
 				withCloseButton
 				size="xl"
-				title={<PrimaryTitle>Highlight Tool</PrimaryTitle>}
+				title={
+					<>
+						<PrimaryTitle flex={1}>Highlight Tool</PrimaryTitle>
+						<Select
+							data={languages}
+							value={lang}
+							onChange={setLang as any}
+							mr="xl"
+						/>
+					</>
+				}
+				styles={{
+					title: {
+						flex: 1,
+						display: "flex",
+					},
+				}}
 			>
 				<Stack>
 					<CodeEditor
@@ -104,6 +131,7 @@ export function HighlightToolModal() {
 						<Render
 							value={value}
 							theme={theme}
+							lang={lang}
 							syntaxTheme={syntaxTheme}
 						/>
 					</SimpleGrid>
diff --git a/src/util/highlighting.tsx b/src/util/highlighting.tsx
index 1e58db4b0..d8fac41b9 100644
--- a/src/util/highlighting.tsx
+++ b/src/util/highlighting.tsx
@@ -1,7 +1,7 @@
 import { highlightCode } from "@lezer/highlight";
 import { adapter } from "~/adapter";
 import { createStyleHighlighter } from "~/editor";
-import type { ColorScheme, SyntaxTheme } from "~/types";
+import type { CodeLang, ColorScheme, SyntaxTheme } from "~/types";
 
 import { StreamLanguage } from "@codemirror/language";
 import { csharp, java } from "@codemirror/legacy-modes/mode/clike";
@@ -67,9 +67,7 @@ export function renderHighlighting(
 	}
 
 	const rendered = document.createElement("pre");
-	const textColor = getComputedStyle(document.documentElement).getPropertyValue(
-		"--mantine-color-text",
-	);
+	const textColor = colorScheme === "dark" ? "#c9c9c9" : "#000000";
 
 	function emit(text: string, classes?: string) {
 		const textNode = document.createTextNode(text);