Merge pull request #59 from MrWangJustToDo/fix/theme

update

Author: MrWangJustToDo

packages/core/src/parse/template.ts

@@ -81,6 +81,8 @@ export const getPlainDiffTemplateByFastDiff = ({
   rawLine: string;
   operator: "add" | "del";
 }) => {
+  if (diffLine.plainTemplate && diffLine.plainTemplateMode === 'fast-diff') return;
+
   const changes = diffLine.diffChanges;
 
   if (!changes || !changes.hasLineChange || !rawLine) return;

packages/react/src/components/DiffView.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unnecessary-type-constraint */
 /* eslint-disable @typescript-eslint/ban-ts-comment */
-import { DiffFile, _cacheMap, SplitSide, highlighter as buildInHighlighter } from "@git-diff-view/core";
+import { DiffFile, _cacheMap, SplitSide } from "@git-diff-view/core";
 import { diffFontSizeName, DiffModeEnum } from "@git-diff-view/utils";
 import { memo, useEffect, useMemo, forwardRef, useImperativeHandle, useRef } from "react";
 import * as React from "react";
@@ -315,17 +315,18 @@ const DiffViewWithRef = <T extends unknown>(
     if (!diffFile) return;
 
     if (props.diffViewHighlight) {
-      const finalHighlighter = registerHighlighter || buildInHighlighter;
-
-      if (
-        finalHighlighter.name !== diffFile._getHighlighterName() ||
-        finalHighlighter.type !== diffFile._getHighlighterType()
-      ) {
-        diffFile.initSyntax({ registerHighlighter: finalHighlighter });
+      if (registerHighlighter) {
+        if (
+          registerHighlighter.name !== diffFile._getHighlighterName() ||
+          registerHighlighter.type !== diffFile._getHighlighterType() ||
+          registerHighlighter.type !== "class"
+        ) {
+          diffFile.initSyntax({ registerHighlighter: registerHighlighter });
+          diffFile.notifyAll();
+        }
+      } else if (diffFile._getHighlighterType() !== "class") {
+        diffFile.initSyntax();
         diffFile.notifyAll();
-      } else {
-        diffFile.initSyntax({ registerHighlighter: finalHighlighter });
-        if (finalHighlighter.type !== "class") diffFile.notifyAll();
       }
     }
   }, [diffFile, props.diffViewHighlight, registerHighlighter, diffViewTheme]);

packages/solid/src/components/DiffView.tsx

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unnecessary-type-constraint */
-import { _cacheMap, DiffFile, SplitSide, highlighter as buildInHighlighter } from "@git-diff-view/core";
+import { _cacheMap, DiffFile, SplitSide } from "@git-diff-view/core";
 import { diffFontSizeName, DiffModeEnum } from "@git-diff-view/utils";
 import { type JSXElement, type JSX, createSignal, createEffect, createMemo, onCleanup, Show } from "solid-js";
 
@@ -196,16 +196,19 @@ const InternalDiffView = <T extends unknown>(props: DiffViewProps<T>) => {
     props.diffViewTheme;
     if (mounted && currentDiffFile) {
       if (props.diffViewHighlight) {
-        const finalHighlighter = props.registerHighlighter || buildInHighlighter;
-        if (
-          finalHighlighter.name !== currentDiffFile._getHighlighterName() ||
-          finalHighlighter.type !== currentDiffFile._getHighlighterType()
-        ) {
-          currentDiffFile.initSyntax({ registerHighlighter: finalHighlighter });
+        const registerHighlighter = props.registerHighlighter;
+        if (registerHighlighter) {
+          if (
+            registerHighlighter.name !== currentDiffFile._getHighlighterName() ||
+            registerHighlighter.type !== currentDiffFile._getHighlighterType() ||
+            registerHighlighter.type !== "class"
+          ) {
+            currentDiffFile.initSyntax({ registerHighlighter: registerHighlighter });
+            currentDiffFile.notifyAll();
+          }
+        } else if (currentDiffFile._getHighlighterType() !== "class") {
+          currentDiffFile.initSyntax();
           currentDiffFile.notifyAll();
-        } else {
-          currentDiffFile.initSyntax({ registerHighlighter: finalHighlighter });
-          if (finalHighlighter.type !== "class") currentDiffFile.notifyAll();
         }
       }
     }

packages/svelte/src/lib/components/DiffView.svelte

@@ -167,20 +167,21 @@
 		theme;
 
 		if (enableHighlight) {
-			const finalHighlighter = props.registerHighlighter || buildInHighlighter;
-			if (
-				finalHighlighter.name !== diffFile._getHighlighterName() ||
-				finalHighlighter.type !== diffFile._getHighlighterType()
-			) {
-				diffFile.initSyntax({
-					registerHighlighter: finalHighlighter
-				});
+			const registerHighlighter = props.registerHighlighter;
+			if (registerHighlighter) {
+				if (
+					registerHighlighter.name !== diffFile._getHighlighterName() ||
+					registerHighlighter.type !== diffFile._getHighlighterType() ||
+					registerHighlighter.type !== 'class'
+				) {
+					diffFile.initSyntax({
+						registerHighlighter: registerHighlighter
+					});
+					diffFile.notifyAll();
+				}
+			} else if (diffFile._getHighlighterType() !== 'class') {
+				diffFile.initSyntax();
 				diffFile.notifyAll();
-			} else {
-				diffFile.initSyntax({
-					registerHighlighter: finalHighlighter
-				});
-				if (finalHighlighter.type !== 'class') diffFile.notifyAll();
 			}
 		}
 	};

packages/vue/src/components/DiffView.tsx

@@ -1,4 +1,4 @@
-import { DiffFile, _cacheMap, SplitSide, highlighter as buildInHighlighter } from "@git-diff-view/core";
+import { DiffFile, _cacheMap, SplitSide } from "@git-diff-view/core";
 import { diffFontSizeName, DiffModeEnum } from "@git-diff-view/utils";
 import { defineComponent, provide, ref, watch, watchEffect, computed, onUnmounted } from "vue";
 
@@ -163,21 +163,21 @@ export const DiffView = defineComponent<
       theme.value;
 
       if (enableHighlight.value) {
-        const finalHighlighter = props.registerHighlighter || buildInHighlighter;
-        if (
-          finalHighlighter.name !== instance._getHighlighterName() ||
-          finalHighlighter.type !== instance._getHighlighterType()
-        ) {
-          instance.initSyntax({
-            registerHighlighter: finalHighlighter,
-          });
-          instance.notifyAll();
-        } else {
-          instance.initSyntax({
-            registerHighlighter: finalHighlighter,
-          });
-
-          if (finalHighlighter.type !== "class") instance.notifyAll();
+        const registerHighlighter = props.registerHighlighter;
+        if (registerHighlighter) {
+          if (
+            registerHighlighter.name !== instance._getHighlighterName() ||
+            registerHighlighter.type !== instance._getHighlighterType() ||
+            registerHighlighter.type !== "class"
+          ) {
+            instance.initSyntax({
+              registerHighlighter: registerHighlighter,
+            });
+            instance.notifyAll();
+          } else if (instance._getHighlighterType() !== "class") {
+            instance.initSyntax({});
+            instance.notifyAll();
+          }
         }
       }
     };

ui/vue-example/package.json

@@ -4,7 +4,7 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "dev": "vite",
+    "dev": "vite --force",
     "build": "vue-tsc && vite build",
     "preview": "vite preview"
   },