From 0c1a5d82d1f0213827f185330e9e0cc2f082796e Mon Sep 17 00:00:00 2001 From: Kiet Ho Date: Sun, 8 Feb 2026 16:16:17 -0800 Subject: [PATCH 1/3] Better diff viewer --- .../components/DiffViewer/DiffViewer.tsx | 8 ++++++++ .../src/renderer/stores/theme/utils/monaco-theme.ts | 12 ++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/DiffViewer/DiffViewer.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/DiffViewer/DiffViewer.tsx index 2ea0e5b6e32..f975a987a4f 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/DiffViewer/DiffViewer.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/DiffViewer/DiffViewer.tsx @@ -285,6 +285,14 @@ export function DiffViewer({ glyphMargin: false, diffWordWrap: "on", contextmenu: !contextMenuProps, + renderLineHighlight: "none", + folding: false, + renderIndicators: false, + guides: { + indentation: false, + bracketPairs: false, + highlightActiveIndentation: false, + }, hideUnchangedRegions: { enabled: hideUnchangedRegions, }, diff --git a/apps/desktop/src/renderer/stores/theme/utils/monaco-theme.ts b/apps/desktop/src/renderer/stores/theme/utils/monaco-theme.ts index 56f55fec787..8961c6645a3 100644 --- a/apps/desktop/src/renderer/stores/theme/utils/monaco-theme.ts +++ b/apps/desktop/src/renderer/stores/theme/utils/monaco-theme.ts @@ -35,12 +35,12 @@ function createEditorColors(theme: Theme): editor.IColors { "editorGutter.background": hex(terminal.background), "editorCursor.foreground": hex(terminal.cursor), - "diffEditor.insertedTextBackground": alpha(terminal.green, 0.13), - "diffEditor.removedTextBackground": alpha(terminal.red, 0.13), - "diffEditor.insertedLineBackground": alpha(terminal.green, 0.08), - "diffEditor.removedLineBackground": alpha(terminal.red, 0.08), - "diffEditorGutter.insertedLineBackground": alpha(terminal.green, 0.2), - "diffEditorGutter.removedLineBackground": alpha(terminal.red, 0.2), + "diffEditor.insertedTextBackground": alpha(terminal.green, 0.22), + "diffEditor.removedTextBackground": alpha(terminal.red, 0.22), + "diffEditor.insertedLineBackground": alpha(terminal.green, 0.15), + "diffEditor.removedLineBackground": alpha(terminal.red, 0.15), + "diffEditorGutter.insertedLineBackground": alpha(terminal.green, 0.25), + "diffEditorGutter.removedLineBackground": alpha(terminal.red, 0.25), "diffEditor.diagonalFill": hex(ui.border), "scrollbar.shadow": "#00000000", From b06e1ec78beac82bda6e95adeb5dcb4ec09ebb1b Mon Sep 17 00:00:00 2001 From: Kiet Ho Date: Sun, 8 Feb 2026 16:23:05 -0800 Subject: [PATCH 2/3] More suited theme --- .../src/renderer/stores/theme/utils/monaco-theme.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/desktop/src/renderer/stores/theme/utils/monaco-theme.ts b/apps/desktop/src/renderer/stores/theme/utils/monaco-theme.ts index 8961c6645a3..4527a9087a6 100644 --- a/apps/desktop/src/renderer/stores/theme/utils/monaco-theme.ts +++ b/apps/desktop/src/renderer/stores/theme/utils/monaco-theme.ts @@ -35,12 +35,12 @@ function createEditorColors(theme: Theme): editor.IColors { "editorGutter.background": hex(terminal.background), "editorCursor.foreground": hex(terminal.cursor), - "diffEditor.insertedTextBackground": alpha(terminal.green, 0.22), - "diffEditor.removedTextBackground": alpha(terminal.red, 0.22), - "diffEditor.insertedLineBackground": alpha(terminal.green, 0.15), - "diffEditor.removedLineBackground": alpha(terminal.red, 0.15), - "diffEditorGutter.insertedLineBackground": alpha(terminal.green, 0.25), - "diffEditorGutter.removedLineBackground": alpha(terminal.red, 0.25), + "diffEditor.insertedTextBackground": alpha(terminal.green, 0.2), + "diffEditor.removedTextBackground": alpha(terminal.red, 0.2), + "diffEditor.insertedLineBackground": alpha(terminal.green, 0.2), + "diffEditor.removedLineBackground": alpha(terminal.red, 0.2), + "diffEditorGutter.insertedLineBackground": alpha(terminal.green, 0.15), + "diffEditorGutter.removedLineBackground": alpha(terminal.red, 0.15), "diffEditor.diagonalFill": hex(ui.border), "scrollbar.shadow": "#00000000", From 0badc5cd9332751e97fa40fe7a048f4a6bcc3515 Mon Sep 17 00:00:00 2001 From: Kiet Ho Date: Sun, 8 Feb 2026 16:24:16 -0800 Subject: [PATCH 3/3] style(desktop): move clean editor options to shared MONACO_EDITOR_OPTIONS Move renderLineHighlight, folding, and guides options from DiffViewer into the shared options for consistency between file editor and diff editor. --- .../renderer/providers/MonacoProvider/MonacoProvider.tsx | 7 +++++++ .../ChangesContent/components/DiffViewer/DiffViewer.tsx | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/desktop/src/renderer/providers/MonacoProvider/MonacoProvider.tsx b/apps/desktop/src/renderer/providers/MonacoProvider/MonacoProvider.tsx index 04e3d1899bf..3264e271422 100644 --- a/apps/desktop/src/renderer/providers/MonacoProvider/MonacoProvider.tsx +++ b/apps/desktop/src/renderer/providers/MonacoProvider/MonacoProvider.tsx @@ -118,6 +118,13 @@ export const MONACO_EDITOR_OPTIONS = { verticalScrollbarSize: 8, horizontalScrollbarSize: 8, }, + renderLineHighlight: "none" as const, + folding: false, + guides: { + indentation: false, + bracketPairs: false, + highlightActiveIndentation: false, + }, }; export function registerSaveAction( diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/DiffViewer/DiffViewer.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/DiffViewer/DiffViewer.tsx index f975a987a4f..483d9489caa 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/DiffViewer/DiffViewer.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ChangesContent/components/DiffViewer/DiffViewer.tsx @@ -285,14 +285,7 @@ export function DiffViewer({ glyphMargin: false, diffWordWrap: "on", contextmenu: !contextMenuProps, - renderLineHighlight: "none", - folding: false, renderIndicators: false, - guides: { - indentation: false, - bracketPairs: false, - highlightActiveIndentation: false, - }, hideUnchangedRegions: { enabled: hideUnchangedRegions, },