development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-13 13:46:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #79125 (#168588)

Browse source
This commit is contained in:
Henning Dieterichs 2022-12-09 14:06:55 +01:00 committed by GitHub
parent 95d8fd7c14
commit 5597167c4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
extensions/merge-conflict/src/documentMergeConflict.ts
View file

@ -13,6 +13,7 @@ export class DocumentMergeConflict implements interfaces.IDocumentMergeConflict
public incoming: interfaces.IMergeRegion;
public commonAncestors: interfaces.IMergeRegion[];
public splitter: vscode.Range;
private applied = false;
constructor(descriptor: interfaces.IDocumentMergeConflictDescriptor, private readonly telemetryReporter: TelemetryReporter) {
this.range = descriptor.range;
@ -53,6 +54,10 @@ export class DocumentMergeConflict implements interfaces.IDocumentMergeConflict
}
public applyEdit(type: interfaces.CommitType, document: vscode.TextDocument, edit: { replace(range: vscode.Range, newText: string): void }): void {
if (this.applied) {
return;
}
this.applied = true;
// Each conflict is a set of ranges as follows, note placements or newlines
// which may not in spans