1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
|
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { DisposableStore } from 'vs/base/common/lifecycle';
import { isEqual } from 'vs/base/common/resources';
import Severity from 'vs/base/common/severity';
import { URI } from 'vs/base/common/uri';
import { ITextModelService } from 'vs/editor/common/services/resolverService';
import { localize } from 'vs/nls';
import { ConfirmResult, IDialogService } from 'vs/platform/dialogs/common/dialogs';
import { IFileService } from 'vs/platform/files/common/files';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { ILabelService } from 'vs/platform/label/common/label';
import { EditorInputCapabilities, IEditorIdentifier, IResourceMergeEditorInput, isResourceMergeEditorInput, IUntypedEditorInput } from 'vs/workbench/common/editor';
import { EditorInput, IEditorCloseHandler } from 'vs/workbench/common/editor/editorInput';
import { AbstractTextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
import { EditorWorkerServiceDiffComputer } from 'vs/workbench/contrib/mergeEditor/browser/model/diffComputer';
import { MergeEditorModel } from 'vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { ILanguageSupport, ITextFileEditorModel, ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
import { autorun } from 'vs/base/common/observable';
export class MergeEditorInputData {
constructor(
readonly uri: URI,
readonly title: string | undefined,
readonly detail: string | undefined,
readonly description: string | undefined,
) { }
}
export class MergeEditorInput extends AbstractTextResourceEditorInput implements ILanguageSupport {
static readonly ID = 'mergeEditor.Input';
private _model?: MergeEditorModel;
private _outTextModel?: ITextFileEditorModel;
override closeHandler: MergeEditorCloseHandler | undefined;
constructor(
public readonly base: URI,
public readonly input1: MergeEditorInputData,
public readonly input2: MergeEditorInputData,
public readonly result: URI,
@IInstantiationService private readonly _instaService: IInstantiationService,
@ITextModelService private readonly _textModelService: ITextModelService,
@IEditorService editorService: IEditorService,
@ITextFileService textFileService: ITextFileService,
@ILabelService labelService: ILabelService,
@IFileService fileService: IFileService
) {
super(result, undefined, editorService, textFileService, labelService, fileService);
const modelListener = new DisposableStore();
const handleDidCreate = (model: ITextFileEditorModel) => {
// TODO@jrieken copied from fileEditorInput.ts
if (isEqual(result, model.resource)) {
modelListener.clear();
this._outTextModel = model;
modelListener.add(model.onDidChangeDirty(() => this._onDidChangeDirty.fire()));
modelListener.add(model.onDidSaveError(() => this._onDidChangeDirty.fire()));
modelListener.add(model.onDidChangeReadonly(() => this._onDidChangeCapabilities.fire()));
modelListener.add(model.onWillDispose(() => {
this._outTextModel = undefined;
modelListener.clear();
}));
}
};
textFileService.files.onDidCreate(handleDidCreate, this, modelListener);
textFileService.files.models.forEach(handleDidCreate);
this._store.add(modelListener);
}
override dispose(): void {
super.dispose();
}
get typeId(): string {
return MergeEditorInput.ID;
}
override get capabilities(): EditorInputCapabilities {
return super.capabilities | EditorInputCapabilities.MultipleEditors;
}
override getName(): string {
return localize('name', "Merging: {0}", super.getName());
}
override async resolve(): Promise<MergeEditorModel> {
if (!this._model) {
const base = await this._textModelService.createModelReference(this.base);
const input1 = await this._textModelService.createModelReference(this.input1.uri);
const input2 = await this._textModelService.createModelReference(this.input2.uri);
const result = await this._textModelService.createModelReference(this.result);
this._model = this._instaService.createInstance(
MergeEditorModel,
base.object.textEditorModel,
input1.object.textEditorModel,
this.input1.title,
this.input1.detail,
this.input1.description,
input2.object.textEditorModel,
this.input2.title,
this.input2.detail,
this.input2.description,
result.object.textEditorModel,
this._instaService.createInstance(EditorWorkerServiceDiffComputer),
{
resetUnknownOnInitialization: true
},
);
// set/unset the closeHandler whenever unhandled conflicts are detected
const closeHandler = this._instaService.createInstance(MergeEditorCloseHandler, this._model);
this._store.add(autorun('closeHandler', reader => {
const value = this._model!.hasUnhandledConflicts.read(reader);
this.closeHandler = value ? closeHandler : undefined;
}));
await this._model.onInitialized;
this._store.add(this._model);
this._store.add(base);
this._store.add(input1);
this._store.add(input2);
this._store.add(result);
}
return this._model;
}
override toUntyped(): IResourceMergeEditorInput {
return {
input1: { resource: this.input1.uri, label: this.input1.title, description: this.input1.description },
input2: { resource: this.input2.uri, label: this.input2.title, description: this.input2.description },
base: { resource: this.base },
result: { resource: this.result },
options: {
override: this.typeId
}
};
}
override matches(otherInput: EditorInput | IUntypedEditorInput): boolean {
if (this === otherInput) {
return true;
}
if (otherInput instanceof MergeEditorInput) {
return isEqual(this.base, otherInput.base)
&& isEqual(this.input1.uri, otherInput.input1.uri)
&& isEqual(this.input2.uri, otherInput.input2.uri)
&& isEqual(this.result, otherInput.result);
}
if (isResourceMergeEditorInput(otherInput)) {
return this.editorId === otherInput.options?.override
&& isEqual(this.base, otherInput.base.resource)
&& isEqual(this.input1.uri, otherInput.input1.resource)
&& isEqual(this.input2.uri, otherInput.input2.resource)
&& isEqual(this.result, otherInput.result.resource);
}
return false;
}
// ---- FileEditorInput
override isDirty(): boolean {
return Boolean(this._outTextModel?.isDirty());
}
setLanguageId(languageId: string, _setExplicitly?: boolean): void {
this._model?.setLanguageId(languageId);
}
// implement get/set languageId
// implement get/set encoding
}
class MergeEditorCloseHandler implements IEditorCloseHandler {
private _ignoreUnhandledConflicts: boolean = false;
constructor(
private readonly _model: MergeEditorModel,
@IDialogService private readonly _dialogService: IDialogService,
) { }
showConfirm(): boolean {
// unhandled conflicts -> 3wm asks to confirm UNLESS we explicitly set this input
// to ignore unhandled conflicts. This happens only after confirming to ignore unhandled changes
return !this._ignoreUnhandledConflicts && this._model.hasUnhandledConflicts.get();
}
async confirm(editors: readonly IEditorIdentifier[]): Promise<ConfirmResult> {
const handler: MergeEditorCloseHandler[] = [];
let someAreDirty = false;
for (const { editor } of editors) {
if (editor.closeHandler instanceof MergeEditorCloseHandler && editor.closeHandler._model.hasUnhandledConflicts.get()) {
handler.push(editor.closeHandler);
someAreDirty = someAreDirty || editor.isDirty();
}
}
if (handler.length === 0) {
// shouldn't happen
return ConfirmResult.SAVE;
}
const actions: string[] = [
someAreDirty ? localize('unhandledConflicts.saveAndIgnore', "Save & Continue with Conflicts") : localize('unhandledConflicts.ignore', "Continue with Conflicts"),
localize('unhandledConflicts.discard', "Discard Merge Changes"),
localize('unhandledConflicts.cancel', "Cancel"),
];
const options = {
cancelId: 2,
detail: handler.length > 1
? localize('unhandledConflicts.detailN', 'Merge conflicts in {0} editors will remain unhandled.', handler.length)
: localize('unhandledConflicts.detail1', 'Merge conflicts in this editor will remain unhandled.')
};
const { choice } = await this._dialogService.show(
Severity.Info,
localize('unhandledConflicts.msg', 'Do you want to continue with unhandled conflicts?'), // 1
actions,
options
);
if (choice === options.cancelId) {
// cancel: stay in editor
return ConfirmResult.CANCEL;
}
// save or revert: in both cases we tell the inputs to ignore unhandled conflicts
// for the dirty state computation.
for (const input of handler) {
input._ignoreUnhandledConflicts = true;
}
if (choice === 0) {
// conflicts: continue with remaining conflicts
return ConfirmResult.SAVE;
} else if (choice === 1) {
// discard: undo all changes and save original (pre-merge) state
for (const input of handler) {
input._discardMergeChanges();
}
return ConfirmResult.SAVE;
} else {
// don't save
return ConfirmResult.DONT_SAVE;
}
}
private _discardMergeChanges(): void {
const chunks: string[] = [];
while (true) {
const chunk = this._model.resultSnapshot.read();
if (chunk === null) {
break;
}
chunks.push(chunk);
}
this._model.result.setValue(chunks.join());
}
}
|