From 949273e16260a82572a71a562e241b40e71e32e1 Mon Sep 17 00:00:00 2001 From: Adam Bowker Date: Tue, 31 Mar 2026 12:24:18 -0700 Subject: [PATCH] feat(code): disable editing in diff viewer --- .../features/code-editor/components/CodeMirrorDiffEditor.tsx | 2 +- .../renderer/features/code-editor/hooks/useEditorExtensions.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/code/src/renderer/features/code-editor/components/CodeMirrorDiffEditor.tsx b/apps/code/src/renderer/features/code-editor/components/CodeMirrorDiffEditor.tsx index abe820823..fa76880f6 100644 --- a/apps/code/src/renderer/features/code-editor/components/CodeMirrorDiffEditor.tsx +++ b/apps/code/src/renderer/features/code-editor/components/CodeMirrorDiffEditor.tsx @@ -38,7 +38,7 @@ export function CodeMirrorDiffEditor({ const toggleHideWhitespaceChanges = useDiffViewerStore( (s) => s.toggleHideWhitespaceChanges, ); - const extensions = useEditorExtensions(filePath, !onContentChange, true); + const extensions = useEditorExtensions(filePath, true, true); const options = useMemo( () => ({ original: originalContent, diff --git a/apps/code/src/renderer/features/code-editor/hooks/useEditorExtensions.ts b/apps/code/src/renderer/features/code-editor/hooks/useEditorExtensions.ts index d957114fb..b9e29ab2b 100644 --- a/apps/code/src/renderer/features/code-editor/hooks/useEditorExtensions.ts +++ b/apps/code/src/renderer/features/code-editor/hooks/useEditorExtensions.ts @@ -39,7 +39,7 @@ export function useEditorExtensions( theme, mergeViewTheme, EditorView.editable.of(!readOnly), - ...(readOnly ? [EditorState.readOnly.of(true)] : []), + ...(readOnly && !isDiff ? [EditorState.readOnly.of(true)] : []), ...(languageExtension ? [languageExtension] : []), ]; }, [filePath, isDarkMode, readOnly, isDiff, wordWrap]);