scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-08-28 05:27:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: preserve viewport when applying diffs to active editor

Browse source 
- Check if file is already the active editor before re-opening
- Prevents viewport jump to top when applying diffs
- Applied fix to saveChanges, revertChanges, and saveDirectly methods
- Addresses issue #8112
This commit is contained in:
Roo Code 2025-09-18 01:05:29 +00:00
parent 87b45def18
commit 54c49168f4
1 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/integrations/editor/DiffViewProvider.ts
View file

@ -207,7 +207,15 @@ export class DiffViewProvider {
await updatedDocument.save()
}
await vscode.window.showTextDocument(vscode.Uri.file(absolutePath), { preview: false, preserveFocus: true })
// Check if the file is already the active editor to avoid viewport jump
const activeEditor = vscode.window.activeTextEditor
const isAlreadyActive = activeEditor && arePathsEqual(activeEditor.document.uri.fsPath, absolutePath)
if (!isAlreadyActive) {
// Only show the document if it's not already the active editor
await vscode.window.showTextDocument(vscode.Uri.file(absolutePath), { preview: false, preserveFocus: true })
}
await this.closeAllDiffViews()
// Getting diagnostics before and after the file edit is a better approach than
@ -405,10 +413,17 @@ export class DiffViewProvider {
await updatedDocument.save()
if (this.documentWasOpen) {
await vscode.window.showTextDocument(vscode.Uri.file(absolutePath), {
preview: false,
preserveFocus: true,
})
// Check if the file is already the active editor to avoid viewport jump
const activeEditor = vscode.window.activeTextEditor
const isAlreadyActive = activeEditor && arePathsEqual(activeEditor.document.uri.fsPath, absolutePath)
if (!isAlreadyActive) {
// Only show the document if it's not already the active editor
await vscode.window.showTextDocument(vscode.Uri.file(absolutePath), {
preview: false,
preserveFocus: true,
})
}
}
await this.closeAllDiffViews()
@ -661,11 +676,17 @@ export class DiffViewProvider {
// Open the document to ensure diagnostics are loaded
// When openFile is false (PREVENT_FOCUS_DISRUPTION enabled), we only open in memory
if (openFile) {
// Show the document in the editor
await vscode.window.showTextDocument(vscode.Uri.file(absolutePath), {
preview: false,
preserveFocus: true,
})
// Check if the file is already the active editor to avoid viewport jump
const activeEditor = vscode.window.activeTextEditor
const isAlreadyActive = activeEditor && arePathsEqual(activeEditor.document.uri.fsPath, absolutePath)
if (!isAlreadyActive) {
// Only show the document if it's not already the active editor
await vscode.window.showTextDocument(vscode.Uri.file(absolutePath), {
preview: false,
preserveFocus: true,
})
}
} else {
// Just open the document in memory to trigger diagnostics without showing it
const doc = await vscode.workspace.openTextDocument(vscode.Uri.file(absolutePath))