development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 04:49:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #186396 - Revert arrows reverting the wrong chunk (#186532)

Browse source
This commit is contained in:
Henning Dieterichs 2023-06-28 19:56:35 +02:00 committed by GitHub
parent fafacea79c
commit 74065aada5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/vs/editor/browser/widget/diffEditorWidget2/diffEditorWidget2.ts
View file

@ -34,6 +34,7 @@ import { LineRangeMapping } from 'vs/editor/common/diff/linesDiffComputer';
import { IDiffComputationResult, ILineChange } from 'vs/editor/common/diff/smartLinesDiffComputer';
import { EditorType, IDiffEditorModel, IDiffEditorViewModel, IDiffEditorViewState } from 'vs/editor/common/editorCommon';
import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
import { IIdentifiedSingleEditOperation } from 'vs/editor/common/model';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
@ -366,13 +367,21 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
revert(diff: LineRangeMapping): void {
const model = this._diffModel.get()?.model;
if (!model) {
return;
}
const originalText = model.original.getValueInRange(diff.originalRange.toExclusiveRange());
this._editors.modified.executeEdits('diffEditor', [
{ range: diff.modifiedRange.toExclusiveRange(), text: originalText }
]);
if (!model) { return; }
const changes: IIdentifiedSingleEditOperation[] = diff.innerChanges
? diff.innerChanges.map<IIdentifiedSingleEditOperation>(c => ({
range: c.modifiedRange,
text: model.original.getValueInRange(c.originalRange)
}))
: [
{
range: diff.modifiedRange.toExclusiveRange(),
text: model.original.getValueInRange(diff.originalRange.toExclusiveRange())
}
];
this._editors.modified.executeEdits('diffEditor', changes);
}
private _goTo(diff: DiffMapping): void {