Skip to content

fix(editor): prevent file editing issues when git diff views are open #8676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 16, 2025
Merged

fix(editor): prevent file editing issues when git diff views are open #8676

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cec1f3
fix(editor): prevent file editing issues when git diff views are open
hassoncs Oct 16, 2025
4a107b7
Remove the warnings
hassoncs Oct 16, 2025
6feb3e5
fix(editor): enforce file:// scheme in editor lookups to prevent git …
daniel-lxs Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/integrations/editor/DiffViewProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,18 +509,21 @@ export class DiffViewProvider {
// Listen for document open events - more efficient than scanning all tabs
disposables.push(
vscode.workspace.onDidOpenTextDocument(async (document) => {
if (arePathsEqual(document.uri.fsPath, uri.fsPath)) {
// Only match file:// scheme documents to avoid git diffs
if (document.uri.scheme === "file" && arePathsEqual(document.uri.fsPath, uri.fsPath)) {
// Wait a tick for the editor to be available
await new Promise((r) => setTimeout(r, 0))

// Find the editor for this document
const editor = vscode.window.visibleTextEditors.find((e) =>
arePathsEqual(e.document.uri.fsPath, uri.fsPath),
const editor = vscode.window.visibleTextEditors.find(
(e) => e.document.uri.scheme === "file" && arePathsEqual(e.document.uri.fsPath, uri.fsPath),
)

if (editor) {
cleanup()
resolve(editor)
} else {
console.error(`[DiffViewProvider] Failed to find valid editor for ${fileName}`)
}
}
}),
Expand All @@ -529,10 +532,16 @@ export class DiffViewProvider {
// Also listen for visible editor changes as a fallback
disposables.push(
vscode.window.onDidChangeVisibleTextEditors((editors) => {
const editor = editors.find((e) => arePathsEqual(e.document.uri.fsPath, uri.fsPath))
const editor = editors.find((e) => {
const isFileScheme = e.document.uri.scheme === "file"
const pathMatches = arePathsEqual(e.document.uri.fsPath, uri.fsPath)
return isFileScheme && pathMatches
})
if (editor) {
cleanup()
resolve(editor)
} else {
console.error(`[DiffViewProvider] Failed to find valid editor for ${fileName}`)
}
}),
)
Expand Down
4 changes: 2 additions & 2 deletions src/integrations/editor/__tests__/DiffViewProvider.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ describe("DiffViewProvider", () => {
// Setup
const mockEditor = {
document: {
uri: { fsPath: `${mockCwd}/test.md` },
uri: { fsPath: `${mockCwd}/test.md`, scheme: "file" },
getText: vi.fn().mockReturnValue(""),
lineCount: 0,
},
Expand Down Expand Up @@ -220,7 +220,7 @@ describe("DiffViewProvider", () => {
vi.mocked(vscode.workspace.onDidOpenTextDocument).mockImplementation((callback) => {
// Trigger the callback immediately with the document
setTimeout(() => {
callback({ uri: { fsPath: `${mockCwd}/test.md` } } as any)
callback({ uri: { fsPath: `${mockCwd}/test.md`, scheme: "file" } } as any)
}, 0)
return { dispose: vi.fn() }
})
Expand Down