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
|
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { CompareResult } from 'vs/base/common/arrays';
import { IModelDeltaDecoration, MinimapPosition, OverviewRulerLane } from 'vs/editor/common/model';
import { localize } from 'vs/nls';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { autorun, derivedObservable } from 'vs/workbench/contrib/audioCues/browser/observable';
import { LineRange } from 'vs/workbench/contrib/mergeEditor/browser/model/lineRange';
import { applyObservableDecorations, join } from 'vs/workbench/contrib/mergeEditor/browser/utils';
import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor } from 'vs/workbench/contrib/mergeEditor/browser/view/colors';
import { CodeEditorView } from './codeEditorView';
export class ResultCodeEditorView extends CodeEditorView {
private readonly decorations = derivedObservable('decorations', reader => {
const viewModel = this.viewModel.read(reader);
if (!viewModel) {
return [];
}
const model = viewModel.model;
const result = new Array<IModelDeltaDecoration>();
const baseRangeWithStoreAndTouchingDiffs = join(
model.modifiedBaseRanges.read(reader),
model.resultDiffs.read(reader),
(baseRange, diff) => baseRange.baseRange.touches(diff.inputRange)
? CompareResult.neitherLessOrGreaterThan
: LineRange.compareByStart(
baseRange.baseRange,
diff.inputRange
)
);
const activeModifiedBaseRange = viewModel.activeModifiedBaseRange.read(reader);
for (const m of baseRangeWithStoreAndTouchingDiffs) {
const modifiedBaseRange = m.left;
if (modifiedBaseRange) {
const range = model.getRangeInResult(modifiedBaseRange.baseRange, reader).toInclusiveRange();
if (range) {
const blockClassNames = ['merge-editor-block'];
const isHandled = model.isHandled(modifiedBaseRange).read(reader);
if (isHandled) {
blockClassNames.push('handled');
}
if (modifiedBaseRange === activeModifiedBaseRange) {
blockClassNames.push('focused');
}
blockClassNames.push('result');
result.push({
range,
options: {
isWholeLine: true,
blockClassName: blockClassNames.join(' '),
description: 'Result Diff',
minimap: {
position: MinimapPosition.Gutter,
color: { id: isHandled ? handledConflictMinimapOverViewRulerColor : unhandledConflictMinimapOverViewRulerColor },
},
overviewRuler: {
position: OverviewRulerLane.Center,
color: { id: isHandled ? handledConflictMinimapOverViewRulerColor : unhandledConflictMinimapOverViewRulerColor },
}
}
});
}
}
for (const diff of m.rights) {
const range = diff.outputRange.toInclusiveRange();
if (range) {
result.push({
range,
options: {
className: `merge-editor-diff result`,
description: 'Merge Editor',
isWholeLine: true,
}
});
}
if (diff.rangeMappings) {
for (const d of diff.rangeMappings) {
result.push({
range: d.outputRange,
options: {
className: `merge-editor-diff-word result`,
description: 'Merge Editor'
}
});
}
}
}
}
return result;
});
constructor(
@IInstantiationService instantiationService: IInstantiationService
) {
super(instantiationService);
this._register(applyObservableDecorations(this.editor, this.decorations));
this._register(autorun(reader => {
const model = this.model.read(reader);
if (!model) {
return;
}
const count = model.unhandledConflictsCount.read(reader);
this._detail.setLabel(count === 1
? localize(
'mergeEditor.remainingConflicts',
'{0} Remaining Conflict',
count
)
: localize(
'mergeEditor.remainingConflict',
'{0} Remaining Conflicts',
count
));
}, 'update label'));
}
}
|
