@theia/scm 1.68.0-next.9 → 1.69.0-next.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/decorations/scm-decorations-service.js +1 -2
- package/lib/browser/decorations/scm-decorations-service.js.map +1 -1
- package/lib/browser/decorations/scm-navigator-decorator.d.ts.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-module.js +1 -2
- package/lib/browser/dirty-diff/dirty-diff-module.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-navigator.js +26 -49
- package/lib/browser/dirty-diff/dirty-diff-navigator.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-widget.js +3 -6
- package/lib/browser/dirty-diff/dirty-diff-widget.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor-contribution.js +12 -12
- package/lib/browser/merge-editor/merge-editor-contribution.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor-dev-contribution.js +2 -3
- package/lib/browser/merge-editor/merge-editor-dev-contribution.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor-module.js +2 -2
- package/lib/browser/merge-editor/merge-editor-module.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor.js +25 -23
- package/lib/browser/merge-editor/merge-editor.js.map +1 -1
- package/lib/browser/merge-editor/model/line-range.d.ts +1 -1
- package/lib/browser/merge-editor/model/line-range.js +1 -1
- package/lib/browser/merge-editor/model/live-diff.js +1 -4
- package/lib/browser/merge-editor/model/live-diff.js.map +1 -1
- package/lib/browser/merge-editor/model/merge-editor-model.d.ts +8 -1
- package/lib/browser/merge-editor/model/merge-editor-model.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/merge-editor-model.js +45 -8
- package/lib/browser/merge-editor/model/merge-editor-model.js.map +1 -1
- package/lib/browser/merge-editor/model/merge-range.js +2 -2
- package/lib/browser/merge-editor/model/merge-range.js.map +1 -1
- package/lib/browser/merge-editor/model/range-mapping.js +2 -2
- package/lib/browser/merge-editor/model/range-mapping.js.map +1 -1
- package/lib/browser/merge-editor/model/range-utils.d.ts +5 -1
- package/lib/browser/merge-editor/model/range-utils.d.ts.map +1 -1
- package/lib/browser/merge-editor/model/range-utils.js +9 -2
- package/lib/browser/merge-editor/model/range-utils.js.map +1 -1
- package/lib/browser/merge-editor/view/diff-spacers.js +3 -4
- package/lib/browser/merge-editor/view/diff-spacers.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.d.ts +0 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.js +1 -2
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.js +2 -3
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-view-zones.js +1 -1
- package/lib/browser/merge-editor/view/merge-editor-view-zones.js.map +1 -1
- package/lib/browser/merge-editor/view/merge-range-actions.d.ts +1 -0
- package/lib/browser/merge-editor/view/merge-range-actions.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-range-actions.js +28 -1
- package/lib/browser/merge-editor/view/merge-range-actions.js.map +1 -1
- package/lib/browser/scm-action-button-widget.d.ts +41 -0
- package/lib/browser/scm-action-button-widget.d.ts.map +1 -0
- package/lib/browser/scm-action-button-widget.js +221 -0
- package/lib/browser/scm-action-button-widget.js.map +1 -0
- package/lib/browser/scm-amend-component.d.ts +0 -1
- package/lib/browser/scm-amend-component.d.ts.map +1 -1
- package/lib/browser/scm-amend-widget.d.ts +0 -1
- package/lib/browser/scm-amend-widget.d.ts.map +1 -1
- package/lib/browser/scm-amend-widget.js +3 -2
- package/lib/browser/scm-amend-widget.js.map +1 -1
- package/lib/browser/scm-commit-widget.d.ts +0 -1
- package/lib/browser/scm-commit-widget.d.ts.map +1 -1
- package/lib/browser/scm-commit-widget.js +4 -4
- package/lib/browser/scm-commit-widget.js.map +1 -1
- package/lib/browser/scm-frontend-module.d.ts.map +1 -1
- package/lib/browser/scm-frontend-module.js +8 -3
- package/lib/browser/scm-frontend-module.js.map +1 -1
- package/lib/browser/scm-groups-tree-model.d.ts.map +1 -1
- package/lib/browser/scm-groups-tree-model.js +6 -3
- package/lib/browser/scm-groups-tree-model.js.map +1 -1
- package/lib/browser/scm-input.js +2 -4
- package/lib/browser/scm-input.js.map +1 -1
- package/lib/browser/scm-no-repository-widget.d.ts +0 -1
- package/lib/browser/scm-no-repository-widget.d.ts.map +1 -1
- package/lib/browser/scm-no-repository-widget.js +3 -2
- package/lib/browser/scm-no-repository-widget.js.map +1 -1
- package/lib/browser/scm-provider.d.ts +8 -0
- package/lib/browser/scm-provider.d.ts.map +1 -1
- package/lib/browser/scm-provider.js.map +1 -1
- package/lib/browser/scm-quick-open-service.js +1 -2
- package/lib/browser/scm-quick-open-service.js.map +1 -1
- package/lib/browser/scm-tree-model.d.ts.map +1 -1
- package/lib/browser/scm-tree-model.js +1 -2
- package/lib/browser/scm-tree-model.js.map +1 -1
- package/lib/browser/scm-tree-widget.d.ts +0 -1
- package/lib/browser/scm-tree-widget.d.ts.map +1 -1
- package/lib/browser/scm-tree-widget.js +15 -15
- package/lib/browser/scm-tree-widget.js.map +1 -1
- package/lib/browser/scm-widget.d.ts +2 -0
- package/lib/browser/scm-widget.d.ts.map +1 -1
- package/lib/browser/scm-widget.js +15 -7
- package/lib/browser/scm-widget.js.map +1 -1
- package/lib/common/scm-preferences.js +3 -3
- package/lib/common/scm-preferences.js.map +1 -1
- package/package.json +7 -7
- package/src/browser/merge-editor/merge-editor.ts +9 -4
- package/src/browser/merge-editor/model/line-range.ts +1 -1
- package/src/browser/merge-editor/model/merge-editor-model.ts +58 -8
- package/src/browser/merge-editor/model/range-mapping.ts +2 -2
- package/src/browser/merge-editor/model/range-utils.ts +8 -1
- package/src/browser/merge-editor/view/merge-range-actions.ts +29 -1
- package/src/browser/scm-action-button-widget.tsx +262 -0
- package/src/browser/scm-frontend-module.ts +7 -0
- package/src/browser/scm-groups-tree-model.ts +7 -4
- package/src/browser/scm-provider.ts +10 -0
- package/src/browser/scm-widget.tsx +8 -2
- package/src/browser/style/index.css +47 -0
|
@@ -74,9 +74,8 @@ let ScmDecorationsService = class ScmDecorationsService {
|
|
|
74
74
|
}
|
|
75
75
|
};
|
|
76
76
|
this.scmService.onDidAddRepository(({ provider }) => {
|
|
77
|
-
var _a;
|
|
78
77
|
provider.onDidChange(runUpdateTasks);
|
|
79
|
-
|
|
78
|
+
provider.onDidChangeResources?.(runUpdateTasks);
|
|
80
79
|
});
|
|
81
80
|
this.scmService.onDidChangeSelectedRepository(runUpdateTasks);
|
|
82
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scm-decorations-service.js","sourceRoot":"","sources":["../../../src/browser/decorations/scm-decorations-service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"scm-decorations-service.js","sourceRoot":"","sources":["../../../src/browser/decorations/scm-decorations-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scm-navigator-decorator.d.ts","sourceRoot":"","sources":["../../../src/browser/decorations/scm-navigator-decorator.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAI5F,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AAE7F;;;GAGG;AACH,qBACa,qBAAsB,YAAW,aAAa;IAUf,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB;IARjG,QAAQ,CAAC,EAAE,yBAAyB;IACpC,OAAO,CAAC,cAAc,CAAsC;IAE3C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;gBAEkB,kBAAkB,EAAE,kBAAkB;IAOjG,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,IAAI,CAAC;IAkBzE,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,GAAG,cAAc,CAAC,IAAI;IAe9D,SAAS,CAAC,QAAQ,CAAC,OAAO,iBAAsB,IAAI,KAAK,
|
|
1
|
+
{"version":3,"file":"scm-navigator-decorator.d.ts","sourceRoot":"","sources":["../../../src/browser/decorations/scm-navigator-decorator.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,IAAI,EAAE,MAAM,mCAAmC,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,6CAA6C,CAAC;AAI5F,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AAE7F;;;GAGG;AACH,qBACa,qBAAsB,YAAW,aAAa;IAUf,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB;IARjG,QAAQ,CAAC,EAAE,yBAAyB;IACpC,OAAO,CAAC,cAAc,CAAsC;IAE3C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;gBAEkB,kBAAkB,EAAE,kBAAkB;IAOjG,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,IAAI,GAAG,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,IAAI,CAAC;IAkBzE,SAAS,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,GAAG,cAAc,CAAC,IAAI;IAe9D,SAAS,CAAC,QAAQ,CAAC,OAAO,iBAAsB,IAAI,KAAK,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,IAAI,CAAC,EAAI;IAEvF,WAAW,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC;IAQxE,SAAS,CAAC,sBAAsB,CAAC,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC;IAoBlG,IAAI,sBAAsB,IAAI,KAAK,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,CAEpF;IAED,wBAAwB,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,IAAI,CAAC,GAAG,IAAI;CAI1F"}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
16
|
// *****************************************************************************
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.bindDirtyDiff =
|
|
18
|
+
exports.bindDirtyDiff = bindDirtyDiff;
|
|
19
19
|
const dirty_diff_decorator_1 = require("./dirty-diff-decorator");
|
|
20
20
|
const dirty_diff_navigator_1 = require("./dirty-diff-navigator");
|
|
21
21
|
const dirty_diff_widget_1 = require("./dirty-diff-widget");
|
|
@@ -30,5 +30,4 @@ function bindDirtyDiff(bind) {
|
|
|
30
30
|
return child.get(dirty_diff_widget_1.DirtyDiffWidget);
|
|
31
31
|
});
|
|
32
32
|
}
|
|
33
|
-
exports.bindDirtyDiff = bindDirtyDiff;
|
|
34
33
|
//# sourceMappingURL=dirty-diff-module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dirty-diff-module.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF
|
|
1
|
+
{"version":3,"file":"dirty-diff-module.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-module.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAShF,sCASC;AAfD,iEAA4D;AAC5D,iEAA4D;AAC5D,2DAAoG;AAEpG,qDAAmD;AAEnD,SAAgB,aAAa,CAAC,IAAqB;IAC/C,IAAI,CAAC,yCAAkB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACrD,IAAI,CAAC,yCAAkB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACrD,IAAI,CAAC,0CAAsB,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE;QAC9D,MAAM,KAAK,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC;QACtC,KAAK,CAAC,IAAI,CAAC,wCAAoB,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QACxD,KAAK,CAAC,IAAI,CAAC,mCAAe,CAAC,CAAC,MAAM,EAAE,CAAC;QACrC,OAAO,KAAK,CAAC,GAAG,CAAC,mCAAe,CAAC,CAAC;IACtC,CAAC,CAAC,CAAC;AACP,CAAC"}
|
|
@@ -31,8 +31,7 @@ let DirtyDiffNavigator = class DirtyDiffNavigator {
|
|
|
31
31
|
init() {
|
|
32
32
|
const dirtyDiffVisible = this.contextKeyService.createKey('dirtyDiffVisible', false);
|
|
33
33
|
this.editorManager.onActiveEditorChanged(editorWidget => {
|
|
34
|
-
|
|
35
|
-
dirtyDiffVisible.set(editorWidget && ((_a = this.controllers.get(editorWidget.editor)) === null || _a === void 0 ? void 0 : _a.isShowingChange()));
|
|
34
|
+
dirtyDiffVisible.set(editorWidget && this.controllers.get(editorWidget.editor)?.isShowingChange());
|
|
36
35
|
});
|
|
37
36
|
this.editorManager.onCreated(editorWidget => {
|
|
38
37
|
const { editor } = editorWidget;
|
|
@@ -41,14 +40,12 @@ let DirtyDiffNavigator = class DirtyDiffNavigator {
|
|
|
41
40
|
}
|
|
42
41
|
const controller = this.createController(editor);
|
|
43
42
|
controller.widgetFactory = props => {
|
|
44
|
-
var _a;
|
|
45
43
|
const widget = this.widgetFactory(props);
|
|
46
|
-
if (widget.editor ===
|
|
44
|
+
if (widget.editor === this.editorManager.activeEditor?.editor) {
|
|
47
45
|
dirtyDiffVisible.set(true);
|
|
48
46
|
}
|
|
49
47
|
widget.onDidClose(() => {
|
|
50
|
-
|
|
51
|
-
if (widget.editor === ((_a = this.editorManager.activeEditor) === null || _a === void 0 ? void 0 : _a.editor)) {
|
|
48
|
+
if (widget.editor === this.editorManager.activeEditor?.editor) {
|
|
52
49
|
dirtyDiffVisible.set(false);
|
|
53
50
|
}
|
|
54
51
|
});
|
|
@@ -63,43 +60,34 @@ let DirtyDiffNavigator = class DirtyDiffNavigator {
|
|
|
63
60
|
}
|
|
64
61
|
handleDirtyDiffUpdate(update) {
|
|
65
62
|
const controller = this.controllers.get(update.editor);
|
|
66
|
-
controller
|
|
63
|
+
controller?.handleDirtyDiffUpdate(update);
|
|
67
64
|
}
|
|
68
65
|
canNavigate() {
|
|
69
|
-
|
|
70
|
-
return !!((_a = this.activeController) === null || _a === void 0 ? void 0 : _a.canNavigate());
|
|
66
|
+
return !!this.activeController?.canNavigate();
|
|
71
67
|
}
|
|
72
68
|
gotoNextChange() {
|
|
73
|
-
|
|
74
|
-
(_a = this.activeController) === null || _a === void 0 ? void 0 : _a.gotoNextChange();
|
|
69
|
+
this.activeController?.gotoNextChange();
|
|
75
70
|
}
|
|
76
71
|
gotoPreviousChange() {
|
|
77
|
-
|
|
78
|
-
(_a = this.activeController) === null || _a === void 0 ? void 0 : _a.gotoPreviousChange();
|
|
72
|
+
this.activeController?.gotoPreviousChange();
|
|
79
73
|
}
|
|
80
74
|
canShowChange() {
|
|
81
|
-
|
|
82
|
-
return !!((_a = this.activeController) === null || _a === void 0 ? void 0 : _a.canShowChange());
|
|
75
|
+
return !!this.activeController?.canShowChange();
|
|
83
76
|
}
|
|
84
77
|
showNextChange() {
|
|
85
|
-
|
|
86
|
-
(_a = this.activeController) === null || _a === void 0 ? void 0 : _a.showNextChange();
|
|
78
|
+
this.activeController?.showNextChange();
|
|
87
79
|
}
|
|
88
80
|
showPreviousChange() {
|
|
89
|
-
|
|
90
|
-
(_a = this.activeController) === null || _a === void 0 ? void 0 : _a.showPreviousChange();
|
|
81
|
+
this.activeController?.showPreviousChange();
|
|
91
82
|
}
|
|
92
83
|
isShowingChange() {
|
|
93
|
-
|
|
94
|
-
return !!((_a = this.activeController) === null || _a === void 0 ? void 0 : _a.isShowingChange());
|
|
84
|
+
return !!this.activeController?.isShowingChange();
|
|
95
85
|
}
|
|
96
86
|
closeChangePeekView() {
|
|
97
|
-
|
|
98
|
-
(_a = this.activeController) === null || _a === void 0 ? void 0 : _a.closeWidget();
|
|
87
|
+
this.activeController?.closeWidget();
|
|
99
88
|
}
|
|
100
89
|
get activeController() {
|
|
101
|
-
|
|
102
|
-
const editor = (_a = this.editorManager.activeEditor) === null || _a === void 0 ? void 0 : _a.editor;
|
|
90
|
+
const editor = this.editorManager.activeEditor?.editor;
|
|
103
91
|
return editor && this.controllers.get(editor);
|
|
104
92
|
}
|
|
105
93
|
createController(editor) {
|
|
@@ -147,14 +135,12 @@ class DirtyDiffController {
|
|
|
147
135
|
}
|
|
148
136
|
}
|
|
149
137
|
canNavigate() {
|
|
150
|
-
|
|
151
|
-
return !!((_a = this.changes) === null || _a === void 0 ? void 0 : _a.length);
|
|
138
|
+
return !!this.changes?.length;
|
|
152
139
|
}
|
|
153
140
|
gotoNextChange() {
|
|
154
|
-
var _a;
|
|
155
141
|
const { editor } = this;
|
|
156
142
|
const index = this.findNextClosestChange(editor.cursor.line, false);
|
|
157
|
-
const change =
|
|
143
|
+
const change = this.changes?.[index];
|
|
158
144
|
if (change) {
|
|
159
145
|
const position = diff_computer_1.LineRange.getStartPosition(change.currentRange);
|
|
160
146
|
editor.cursor = position;
|
|
@@ -162,10 +148,9 @@ class DirtyDiffController {
|
|
|
162
148
|
}
|
|
163
149
|
}
|
|
164
150
|
gotoPreviousChange() {
|
|
165
|
-
var _a;
|
|
166
151
|
const { editor } = this;
|
|
167
152
|
const index = this.findPreviousClosestChange(editor.cursor.line, false);
|
|
168
|
-
const change =
|
|
153
|
+
const change = this.changes?.[index];
|
|
169
154
|
if (change) {
|
|
170
155
|
const position = diff_computer_1.LineRange.getStartPosition(change.currentRange);
|
|
171
156
|
editor.cursor = position;
|
|
@@ -173,25 +158,22 @@ class DirtyDiffController {
|
|
|
173
158
|
}
|
|
174
159
|
}
|
|
175
160
|
canShowChange() {
|
|
176
|
-
|
|
177
|
-
return !!(this.widget || this.widgetFactory && this.editor instanceof monaco_editor_1.MonacoEditor && ((_a = this.changes) === null || _a === void 0 ? void 0 : _a.length) && this.previousRevisionUri);
|
|
161
|
+
return !!(this.widget || this.widgetFactory && this.editor instanceof monaco_editor_1.MonacoEditor && this.changes?.length && this.previousRevisionUri);
|
|
178
162
|
}
|
|
179
163
|
showNextChange() {
|
|
180
|
-
var _a;
|
|
181
164
|
if (this.widget) {
|
|
182
165
|
this.widget.showNextChange();
|
|
183
166
|
}
|
|
184
167
|
else {
|
|
185
|
-
(
|
|
168
|
+
(this.widget = this.createWidget())?.showChange(this.findNextClosestChange(this.editor.cursor.line, true));
|
|
186
169
|
}
|
|
187
170
|
}
|
|
188
171
|
showPreviousChange() {
|
|
189
|
-
var _a;
|
|
190
172
|
if (this.widget) {
|
|
191
173
|
this.widget.showPreviousChange();
|
|
192
174
|
}
|
|
193
175
|
else {
|
|
194
|
-
(
|
|
176
|
+
(this.widget = this.createWidget())?.showChange(this.findPreviousClosestChange(this.editor.cursor.line, true));
|
|
195
177
|
}
|
|
196
178
|
}
|
|
197
179
|
isShowingChange() {
|
|
@@ -204,16 +186,14 @@ class DirtyDiffController {
|
|
|
204
186
|
}
|
|
205
187
|
}
|
|
206
188
|
get changes() {
|
|
207
|
-
|
|
208
|
-
return (_a = this.dirtyDiff) === null || _a === void 0 ? void 0 : _a.changes;
|
|
189
|
+
return this.dirtyDiff?.changes;
|
|
209
190
|
}
|
|
210
191
|
get previousRevisionUri() {
|
|
211
|
-
|
|
212
|
-
return (_a = this.dirtyDiff) === null || _a === void 0 ? void 0 : _a.previousRevisionUri;
|
|
192
|
+
return this.dirtyDiff?.previousRevisionUri;
|
|
213
193
|
}
|
|
214
194
|
createWidget() {
|
|
215
195
|
const { widgetFactory, editor, changes, previousRevisionUri } = this;
|
|
216
|
-
if (widgetFactory && editor instanceof monaco_editor_1.MonacoEditor &&
|
|
196
|
+
if (widgetFactory && editor instanceof monaco_editor_1.MonacoEditor && changes?.length && previousRevisionUri) {
|
|
217
197
|
const widget = widgetFactory({ editor, previousRevisionUri });
|
|
218
198
|
widget.changes = changes;
|
|
219
199
|
widget.onDidClose(() => {
|
|
@@ -223,8 +203,7 @@ class DirtyDiffController {
|
|
|
223
203
|
}
|
|
224
204
|
}
|
|
225
205
|
findNextClosestChange(line, inclusive) {
|
|
226
|
-
|
|
227
|
-
const length = (_a = this.changes) === null || _a === void 0 ? void 0 : _a.length;
|
|
206
|
+
const length = this.changes?.length;
|
|
228
207
|
if (!length) {
|
|
229
208
|
return -1;
|
|
230
209
|
}
|
|
@@ -244,8 +223,7 @@ class DirtyDiffController {
|
|
|
244
223
|
return 0;
|
|
245
224
|
}
|
|
246
225
|
findPreviousClosestChange(line, inclusive) {
|
|
247
|
-
|
|
248
|
-
const length = (_a = this.changes) === null || _a === void 0 ? void 0 : _a.length;
|
|
226
|
+
const length = this.changes?.length;
|
|
249
227
|
if (!length) {
|
|
250
228
|
return -1;
|
|
251
229
|
}
|
|
@@ -265,7 +243,6 @@ class DirtyDiffController {
|
|
|
265
243
|
return length - 1;
|
|
266
244
|
}
|
|
267
245
|
handleEditorMouseDown({ event, target }) {
|
|
268
|
-
var _a, _b;
|
|
269
246
|
if (event.button !== 0) {
|
|
270
247
|
return;
|
|
271
248
|
}
|
|
@@ -281,14 +258,14 @@ class DirtyDiffController {
|
|
|
281
258
|
if (index < 0) {
|
|
282
259
|
return;
|
|
283
260
|
}
|
|
284
|
-
if (index ===
|
|
261
|
+
if (index === this.widget?.currentChangeIndex) {
|
|
285
262
|
this.closeWidget();
|
|
286
263
|
return;
|
|
287
264
|
}
|
|
288
265
|
if (!this.widget) {
|
|
289
266
|
this.widget = this.createWidget();
|
|
290
267
|
}
|
|
291
|
-
|
|
268
|
+
this.widget?.showChange(index);
|
|
292
269
|
}
|
|
293
270
|
}
|
|
294
271
|
exports.DirtyDiffController = DirtyDiffController;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dirty-diff-navigator.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-navigator.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,6CAA6C;AAC7C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAiF;AACjF,sCAAoE;AACpE,qFAA4F;AAC5F,uDAAyG;AACzG,2EAAuE;AACvE,mDAAoD;AAEpD,2DAA8E;AAGvE,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAAxB;QAEgB,gBAAW,GAAG,IAAI,GAAG,EAAmC,CAAC;IAwFhF,CAAC;IA5Ea,IAAI;QACV,MAAM,gBAAgB,GAAwB,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;QAC1G,IAAI,CAAC,aAAa,CAAC,qBAAqB,CAAC,YAAY,CAAC,EAAE
|
|
1
|
+
{"version":3,"file":"dirty-diff-navigator.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-navigator.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,8 +48,7 @@ let DirtyDiffWidget = class DirtyDiffWidget {
|
|
|
48
48
|
this.diffEditorPromise = this.peekView.create();
|
|
49
49
|
}
|
|
50
50
|
get changes() {
|
|
51
|
-
|
|
52
|
-
return (_a = this._changes) !== null && _a !== void 0 ? _a : [];
|
|
51
|
+
return this._changes ?? [];
|
|
53
52
|
}
|
|
54
53
|
set changes(changes) {
|
|
55
54
|
this.handleChangedChanges(changes);
|
|
@@ -125,8 +124,7 @@ let DirtyDiffWidget = class DirtyDiffWidget {
|
|
|
125
124
|
return applyChanges(changes, diffEditorModel.original, diffEditorModel.modified);
|
|
126
125
|
}
|
|
127
126
|
dispose() {
|
|
128
|
-
|
|
129
|
-
(_a = this.peekView) === null || _a === void 0 ? void 0 : _a.dispose();
|
|
127
|
+
this.peekView?.dispose();
|
|
130
128
|
this.onDidCloseEmitter.dispose();
|
|
131
129
|
}
|
|
132
130
|
showCurrentChange() {
|
|
@@ -347,8 +345,7 @@ class DirtyDiffPeekView extends monaco_editor_peek_view_widget_1.MonacoEditorPee
|
|
|
347
345
|
}
|
|
348
346
|
}
|
|
349
347
|
layout(height, width) {
|
|
350
|
-
|
|
351
|
-
(_a = this.diffEditor) === null || _a === void 0 ? void 0 : _a.diffEditor.layout({ height, width });
|
|
348
|
+
this.diffEditor?.diffEditor.layout({ height, width });
|
|
352
349
|
}
|
|
353
350
|
doRevealRange(range) {
|
|
354
351
|
this.editor.revealPosition(vscode_languageserver_protocol_1.Position.create(range.end.line, 0), { vertical: 'centerIfOutsideViewport' });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dirty-diff-widget.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-widget.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dirty-diff-widget.js","sourceRoot":"","sources":["../../../src/browser/dirty-diff/dirty-diff-widget.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,7 +75,7 @@ let MergeEditorContribution = class MergeEditorContribution {
|
|
|
75
75
|
this.settings.save();
|
|
76
76
|
}
|
|
77
77
|
getMergeEditor(widget = this.shell.currentWidget) {
|
|
78
|
-
return widget instanceof merge_editor_1.MergeEditor ? widget : (
|
|
78
|
+
return widget instanceof merge_editor_1.MergeEditor ? widget : (widget?.parent ? this.getMergeEditor(widget.parent) : undefined);
|
|
79
79
|
}
|
|
80
80
|
registerCommands(commands) {
|
|
81
81
|
commands.registerCommand(MergeEditorCommands.ACCEPT_MERGE, {
|
|
@@ -137,7 +137,7 @@ let MergeEditorContribution = class MergeEditorContribution {
|
|
|
137
137
|
},
|
|
138
138
|
isEnabled: widget => !!this.getMergeEditor(widget),
|
|
139
139
|
isVisible: widget => !!this.getMergeEditor(widget),
|
|
140
|
-
isToggled: widget =>
|
|
140
|
+
isToggled: widget => this.getMergeEditor(widget)?.layoutKind === 'mixed',
|
|
141
141
|
});
|
|
142
142
|
commands.registerCommand(MergeEditorCommands.SET_COLUMN_LAYOUT, {
|
|
143
143
|
execute: widget => {
|
|
@@ -149,7 +149,7 @@ let MergeEditorContribution = class MergeEditorContribution {
|
|
|
149
149
|
},
|
|
150
150
|
isEnabled: widget => !!this.getMergeEditor(widget),
|
|
151
151
|
isVisible: widget => !!this.getMergeEditor(widget),
|
|
152
|
-
isToggled: widget =>
|
|
152
|
+
isToggled: widget => this.getMergeEditor(widget)?.layoutKind === 'columns'
|
|
153
153
|
});
|
|
154
154
|
commands.registerCommand(MergeEditorCommands.SHOW_BASE, {
|
|
155
155
|
execute: widget => {
|
|
@@ -159,9 +159,9 @@ let MergeEditorContribution = class MergeEditorContribution {
|
|
|
159
159
|
editor.activate();
|
|
160
160
|
}
|
|
161
161
|
},
|
|
162
|
-
isEnabled: widget =>
|
|
163
|
-
isVisible: widget =>
|
|
164
|
-
isToggled: widget =>
|
|
162
|
+
isEnabled: widget => this.getMergeEditor(widget)?.layoutKind === 'columns',
|
|
163
|
+
isVisible: widget => this.getMergeEditor(widget)?.layoutKind === 'columns',
|
|
164
|
+
isToggled: widget => !!this.getMergeEditor(widget)?.isShowingBase
|
|
165
165
|
});
|
|
166
166
|
commands.registerCommand(MergeEditorCommands.SHOW_BASE_TOP, {
|
|
167
167
|
execute: widget => {
|
|
@@ -171,9 +171,9 @@ let MergeEditorContribution = class MergeEditorContribution {
|
|
|
171
171
|
editor.activate();
|
|
172
172
|
}
|
|
173
173
|
},
|
|
174
|
-
isEnabled: widget =>
|
|
175
|
-
isVisible: widget =>
|
|
176
|
-
isToggled: widget =>
|
|
174
|
+
isEnabled: widget => this.getMergeEditor(widget)?.layoutKind === 'mixed',
|
|
175
|
+
isVisible: widget => this.getMergeEditor(widget)?.layoutKind === 'mixed',
|
|
176
|
+
isToggled: widget => !!this.getMergeEditor(widget)?.isShowingBaseAtTop
|
|
177
177
|
});
|
|
178
178
|
commands.registerCommand(MergeEditorCommands.SHOW_BASE_CENTER, {
|
|
179
179
|
execute: widget => {
|
|
@@ -183,11 +183,11 @@ let MergeEditorContribution = class MergeEditorContribution {
|
|
|
183
183
|
editor.activate();
|
|
184
184
|
}
|
|
185
185
|
},
|
|
186
|
-
isEnabled: widget =>
|
|
187
|
-
isVisible: widget =>
|
|
186
|
+
isEnabled: widget => this.getMergeEditor(widget)?.layoutKind === 'mixed',
|
|
187
|
+
isVisible: widget => this.getMergeEditor(widget)?.layoutKind === 'mixed',
|
|
188
188
|
isToggled: widget => {
|
|
189
189
|
const editor = this.getMergeEditor(widget);
|
|
190
|
-
return !!(
|
|
190
|
+
return !!(editor?.isShowingBase && !editor.isShowingBaseAtTop);
|
|
191
191
|
}
|
|
192
192
|
});
|
|
193
193
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor-contribution.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,6CAA6C;AAC7C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAkE;AAClE,sCAAsH;AAEtH,qDAQiC;AAGjC,wDAAqD;AACrD,8CAA0C;AAC1C,iDAAkE;AAElE,IAAiB,mBAAmB,CA0CnC;AA1CD,WAAiB,mBAAmB;IACnB,yCAAqB,GAAG,cAAc,CAAC;IACvC,gCAAY,GAAG,cAAO,CAAC,yBAAyB,CAAC;QAC1D,EAAE,EAAE,yBAAyB,EAAE,uCAAuC;QACtE,KAAK,EAAE,gBAAgB;QACvB,QAAQ,EAAE,oBAAA,qBAAqB;KAClC,CAAC,CAAC;IACU,iDAA6B,GAAG,cAAO,CAAC,yBAAyB,CAAC;QAC3E,EAAE,EAAE,uCAAuC;QAC3C,KAAK,EAAE,+BAA+B;QACtC,QAAQ,EAAE,oBAAA,qBAAqB;KAClC,CAAC,CAAC;IACU,qDAAiC,GAAG,cAAO,CAAC,yBAAyB,CAAC;QAC/E,EAAE,EAAE,2CAA2C;QAC/C,KAAK,EAAE,mCAAmC;QAC1C,QAAQ,EAAE,oBAAA,qBAAqB;KAClC,CAAC,CAAC;IACU,oCAAgB,GAAG,cAAO,CAAC,yBAAyB,CAAC;QAC9D,EAAE,EAAE,4BAA4B;QAChC,KAAK,EAAE,cAAc;QACrB,QAAQ,EAAE,oBAAA,qBAAqB;KAClC,CAAC,CAAC;IACU,qCAAiB,GAAG,cAAO,CAAC,yBAAyB,CAAC;QAC/D,EAAE,EAAE,6BAA6B;QACjC,KAAK,EAAE,eAAe;QACtB,QAAQ,EAAE,oBAAA,qBAAqB;KAClC,CAAC,CAAC;IACU,6BAAS,GAAG,cAAO,CAAC,yBAAyB,CAAC;QACvD,EAAE,EAAE,sBAAsB;QAC1B,KAAK,EAAE,WAAW;QAClB,QAAQ,EAAE,oBAAA,qBAAqB;KAClC,CAAC,CAAC;IACU,iCAAa,GAAG,cAAO,CAAC,yBAAyB,CAAC;QAC3D,EAAE,EAAE,yBAAyB;QAC7B,KAAK,EAAE,eAAe;QACtB,QAAQ,EAAE,oBAAA,qBAAqB;KAClC,CAAC,CAAC;IACU,oCAAgB,GAAG,cAAO,CAAC,yBAAyB,CAAC;QAC9D,EAAE,EAAE,4BAA4B;QAChC,KAAK,EAAE,kBAAkB;QACzB,QAAQ,EAAE,oBAAA,qBAAqB;KAClC,CAAC,CAAC;AACP,CAAC,EA1CgB,mBAAmB,mCAAnB,mBAAmB,QA0CnC;AAGM,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAYhC,OAAO;QACH,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC;IAED,MAAM;QACF,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC;IAES,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa;QACtD,OAAO,MAAM,YAAY,0BAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACtH,CAAC;IAED,gBAAgB,CAAC,QAAyB;QACtC,QAAQ,CAAC,eAAe,CAAC,mBAAmB,CAAC,YAAY,EAAE;YACvD,OAAO,EAAE,KAAK,EAAC,MAAM,EAAC,EAAE;gBACpB,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;gBAC3C,IAAI,MAAM,EAAE,CAAC;oBACT,IAAI,QAAQ,GAAG,KAAK,CAAC;oBACrB,IAAI,MAAM,CAAC,KAAK,CAAC,yBAAyB,GAAG,CAAC,EAAE,CAAC;wBAC7C,QAAQ,GAAG,CAAC,CAAC,MAAM,IAAI,uBAAa,CAAC;4BACjC,KAAK,EAAE,UAAG,CAAC,iBAAiB,CAAC,2CAA2C,EAAE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;4BACvH,GAAG,EAAE,UAAG,CAAC,iBAAiB,CAAC,wCAAwC,CAAC;4BACpE,EAAE,EAAE,UAAG,CAAC,iBAAiB,CAAC,yBAAyB,CAAC;yBACvD,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;oBACf,CAAC;oBACD,IAAI,CAAC,QAAQ,EAAE,CAAC;wBACZ,MAAM,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;wBACzC,MAAM,CAAC,KAAK,EAAE,CAAC;wBACf,OAAO;4BACH,UAAU,EAAE,IAAI;yBACnB,CAAC;oBACN,CAAC;gBACL,CAAC;gBACD,OAAO;oBACH,UAAU,EAAE,KAAK;iBACpB,CAAC;YACN,CAAC;YACD,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;YAClD,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;SACrD,CAAC,CAAC;QACH,QAAQ,CAAC,eAAe,CAAC,mBAAmB,CAAC,6BAA6B,EAAE;YACxE,OAAO,EAAE,MAAM,CAAC,EAAE;gBACd,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;gBAC3C,IAAI,MAAM,EAAE,CAAC;oBACT,MAAM,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,CAAC;oBACvF,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACtB,CAAC;YACL,CAAC;YACD,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;YAClD,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;SACrD,CAAC,CAAC;QACH,QAAQ,CAAC,eAAe,CAAC,mBAAmB,CAAC,iCAAiC,EAAE;YAC5E,OAAO,EAAE,MAAM,CAAC,EAAE;gBACd,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;gBAC3C,IAAI,MAAM,EAAE,CAAC;oBACT,MAAM,CAAC,sBAAsB,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,CAAC;oBAC3F,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACtB,CAAC;YACL,CAAC;YACD,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;YAClD,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;SACrD,CAAC,CAAC;QACH,QAAQ,CAAC,eAAe,CAAC,mBAAmB,CAAC,gBAAgB,EAAE;YAC3D,OAAO,EAAE,MAAM,CAAC,EAAE;gBACd,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;gBAC3C,IAAI,MAAM,EAAE,CAAC;oBACT,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC;oBAC5B,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACtB,CAAC;YACL,CAAC;YACD,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;YAClD,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;YAClD,SAAS,EAAE,MAAM,CAAC,EAAE,WAAC,OAAA,CAAA,MAAA,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,0CAAE,UAAU,MAAK,OAAO,CAAA,EAAA;SAC3E,CAAC,CAAC;QACH,QAAQ,CAAC,eAAe,CAAC,mBAAmB,CAAC,iBAAiB,EAAE;YAC5D,OAAO,EAAE,MAAM,CAAC,EAAE;gBACd,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;gBAC3C,IAAI,MAAM,EAAE,CAAC;oBACT,MAAM,CAAC,UAAU,GAAG,SAAS,CAAC;oBAC9B,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACtB,CAAC;YACL,CAAC;YACD,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;YAClD,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC;YAClD,SAAS,EAAE,MAAM,CAAC,EAAE,WAAC,OAAA,CAAA,MAAA,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,0CAAE,UAAU,MAAK,SAAS,CAAA,EAAA;SAC7E,CAAC,CAAC;QACH,QAAQ,CAAC,eAAe,CAAC,mBAAmB,CAAC,SAAS,EAAE;YACpD,OAAO,EAAE,MAAM,CAAC,EAAE;gBACd,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;gBAC3C,IAAI,MAAM,EAAE,CAAC;oBACT,MAAM,CAAC,cAAc,EAAE,CAAC;oBACxB,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACtB,CAAC;YACL,CAAC;YACD,SAAS,EAAE,MAAM,CAAC,EAAE,WAAC,OAAA,CAAA,MAAA,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,0CAAE,UAAU,MAAK,SAAS,CAAA,EAAA;YAC1E,SAAS,EAAE,MAAM,CAAC,EAAE,WAAC,OAAA,CAAA,MAAA,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,0CAAE,UAAU,MAAK,SAAS,CAAA,EAAA;YAC1E,SAAS,EAAE,MAAM,CAAC,EAAE,WAAC,OAAA,CAAC,CAAC,CAAA,MAAA,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,0CAAE,aAAa,CAAA,CAAA,EAAA;SACpE,CAAC,CAAC;QACH,QAAQ,CAAC,eAAe,CAAC,mBAAmB,CAAC,aAAa,EAAE;YACxD,OAAO,EAAE,MAAM,CAAC,EAAE;gBACd,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;gBAC3C,IAAI,MAAM,EAAE,CAAC;oBACT,MAAM,CAAC,iBAAiB,EAAE,CAAC;oBAC3B,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACtB,CAAC;YACL,CAAC;YACD,SAAS,EAAE,MAAM,CAAC,EAAE,WAAC,OAAA,CAAA,MAAA,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,0CAAE,UAAU,MAAK,OAAO,CAAA,EAAA;YACxE,SAAS,EAAE,MAAM,CAAC,EAAE,WAAC,OAAA,CAAA,MAAA,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,0CAAE,UAAU,MAAK,OAAO,CAAA,EAAA;YACxE,SAAS,EAAE,MAAM,CAAC,EAAE,WAAC,OAAA,CAAC,CAAC,CAAA,MAAA,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,0CAAE,kBAAkB,CAAA,CAAA,EAAA;SACzE,CAAC,CAAC;QACH,QAAQ,CAAC,eAAe,CAAC,mBAAmB,CAAC,gBAAgB,EAAE;YAC3D,OAAO,EAAE,MAAM,CAAC,EAAE;gBACd,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;gBAC3C,IAAI,MAAM,EAAE,CAAC;oBACT,MAAM,CAAC,oBAAoB,EAAE,CAAC;oBAC9B,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACtB,CAAC;YACL,CAAC;YACD,SAAS,EAAE,MAAM,CAAC,EAAE,WAAC,OAAA,CAAA,MAAA,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,0CAAE,UAAU,MAAK,OAAO,CAAA,EAAA;YACxE,SAAS,EAAE,MAAM,CAAC,EAAE,WAAC,OAAA,CAAA,MAAA,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,0CAAE,UAAU,MAAK,OAAO,CAAA,EAAA;YACxE,SAAS,EAAE,MAAM,CAAC,EAAE;gBAChB,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;gBAC3C,OAAO,CAAC,CAAC,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,aAAa,KAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;YACnE,CAAC;SACJ,CAAC,CAAC;IACP,CAAC;IAED,aAAa,CAAC,KAAwB;IACtC,CAAC;IAED,oBAAoB,CAAC,QAA+B;QAChD,QAAQ,CAAC,YAAY,CAAC;YAClB,EAAE,EAAE,mBAAmB,CAAC,6BAA6B,CAAC,EAAE;YACxD,OAAO,EAAE,mBAAmB,CAAC,6BAA6B,CAAC,EAAE;YAC7D,IAAI,EAAE,IAAA,iBAAO,EAAC,YAAY,EAAE,IAAI,CAAC;YACjC,KAAK,EAAE,YAAY;YACnB,KAAK,EAAE,GAAG;SACb,CAAC,CAAC;QACH,QAAQ,CAAC,YAAY,CAAC;YAClB,EAAE,EAAE,mBAAmB,CAAC,iCAAiC,CAAC,EAAE;YAC5D,OAAO,EAAE,mBAAmB,CAAC,iCAAiC,CAAC,EAAE;YACjE,IAAI,EAAE,IAAA,iBAAO,EAAC,UAAU,EAAE,IAAI,CAAC;YAC/B,KAAK,EAAE,YAAY;YACnB,KAAK,EAAE,GAAG;SACb,CAAC,CAAC;QACH,QAAQ,CAAC,YAAY,CAAC;YAClB,EAAE,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAAE;YAC3C,OAAO,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAAE;YAChD,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,GAAG;SACb,CAAC,CAAC;QACH,QAAQ,CAAC,YAAY,CAAC;YAClB,EAAE,EAAE,mBAAmB,CAAC,iBAAiB,CAAC,EAAE;YAC5C,OAAO,EAAE,mBAAmB,CAAC,iBAAiB,CAAC,EAAE;YACjD,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,GAAG;SACb,CAAC,CAAC;QACH,QAAQ,CAAC,YAAY,CAAC;YAClB,EAAE,EAAE,mBAAmB,CAAC,SAAS,CAAC,EAAE;YACpC,OAAO,EAAE,mBAAmB,CAAC,SAAS,CAAC,EAAE;YACzC,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,GAAG;SACb,CAAC,CAAC;QACH,QAAQ,CAAC,YAAY,CAAC;YAClB,EAAE,EAAE,mBAAmB,CAAC,aAAa,CAAC,EAAE;YACxC,OAAO,EAAE,mBAAmB,CAAC,aAAa,CAAC,EAAE;YAC7C,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,GAAG;SACb,CAAC,CAAC;QACH,QAAQ,CAAC,YAAY,CAAC;YAClB,EAAE,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAAE;YAC3C,OAAO,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAAE;YAChD,KAAK,EAAE,SAAS;YAChB,KAAK,EAAE,GAAG;SACb,CAAC,CAAC;IACP,CAAC;IAED,mBAAmB,CAAC,WAA+B;IACnD,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,MAAqB;QAChC,MAAM,CAAC,QAAQ,CAAC;YACZ,EAAE,EAAE,+BAA+B;YACnC,WAAW,EAAE,mCAAmC;YAChD,QAAQ,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE;SACjG,EAAE;YACC,EAAE,EAAE,oCAAoC;YACxC,WAAW,EAAE,wCAAwC;YACrD,QAAQ,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE;SACjG,EAAE;YACC,EAAE,EAAE,mCAAmC;YACvC,WAAW,EAAE,2CAA2C;YACxD,QAAQ,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE;SACjG,EAAE;YACC,EAAE,EAAE,wCAAwC;YAC5C,WAAW,EAAE,gDAAgD;YAC7D,QAAQ,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE;SACjG,EAAE;YACC,EAAE,EAAE,gDAAgD;YACpD,WAAW,EAAE,oDAAoD;YACjE,QAAQ,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE;SACjG,EAAE;YACC,EAAE,EAAE,oDAAoD;YACxD,WAAW,EAAE,wDAAwD;YACrE,QAAQ,EAAE;gBACN,IAAI,EAAE,aAAK,CAAC,WAAW,CAAC,gDAAgD,EAAE,IAAI,CAAC;gBAC/E,KAAK,EAAE,aAAK,CAAC,WAAW,CAAC,gDAAgD,EAAE,IAAI,CAAC;aACnF;SACJ,EAAE;YACC,EAAE,EAAE,8CAA8C;YAClD,WAAW,EAAE,kDAAkD;YAC/D,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE;SACzF,EAAE;YACC,EAAE,EAAE,kDAAkD;YACtD,WAAW,EAAE,sDAAsD;YACnE,QAAQ,EAAE;gBACN,IAAI,EAAE,aAAK,CAAC,WAAW,CAAC,8CAA8C,EAAE,IAAI,CAAC;gBAC7E,KAAK,EAAE,aAAK,CAAC,WAAW,CAAC,8CAA8C,EAAE,IAAI,CAAC;aACjF;SACJ,EAAE;YACC,EAAE,EAAE,8CAA8C;YAClD,WAAW,EAAE,kDAAkD;YAC/D,QAAQ,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE;SACjG,EAAE;YACC,EAAE,EAAE,kDAAkD;YACtD,WAAW,EAAE,sDAAsD;YACnE,QAAQ,EAAE;gBACN,IAAI,EAAE,aAAK,CAAC,WAAW,CAAC,8CAA8C,EAAE,GAAG,CAAC;gBAC5E,KAAK,EAAE,aAAK,CAAC,WAAW,CAAC,8CAA8C,EAAE,GAAG,CAAC;aAChF;SACJ,EAAE;YACC,EAAE,EAAE,4CAA4C;YAChD,WAAW,EAAE,gDAAgD;YAC7D,QAAQ,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE;SACjG,EAAE;YACC,EAAE,EAAE,gDAAgD;YACpD,WAAW,EAAE,oDAAoD;YACjE,QAAQ,EAAE;gBACN,IAAI,EAAE,aAAK,CAAC,WAAW,CAAC,4CAA4C,EAAE,GAAG,CAAC;gBAC1E,KAAK,EAAE,aAAK,CAAC,WAAW,CAAC,4CAA4C,EAAE,GAAG,CAAC;aAC9E;SACJ,EAAE;YACC,EAAE,EAAE,sBAAS,CAAC,wCAAwC;YACtD,WAAW,EAAE,uEAAuE;YACpF,QAAQ,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE;SACjG,EAAE;YACC,EAAE,EAAE,sBAAS,CAAC,0CAA0C;YACxD,WAAW,EAAE,yEAAyE;YACtF,QAAQ,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE;SACjG,CAAC,CAAC;IACP,CAAC;CACJ,CAAA;AA1QY,0DAAuB;AAIb;IADlB,IAAA,kBAAM,EAAC,kCAAmB,CAAC;sCACC,kCAAmB;yDAAC;AAG9B;IADlB,IAAA,kBAAM,EAAC,0BAAgB,CAAC;sCACC,0BAAgB;sDAAC;AAGxB;IADlB,IAAA,kBAAM,EAAC,uBAAa,CAAC;sCACY,uBAAa;8DAAC;kCAVvC,uBAAuB;IADnC,IAAA,sBAAU,GAAE;GACA,uBAAuB,CA0QnC"}
|
|
1
|
+
{"version":3,"file":"merge-editor-contribution.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,7 @@ var MergeEditorDevCommands;
|
|
|
39
39
|
})(MergeEditorDevCommands || (exports.MergeEditorDevCommands = MergeEditorDevCommands = {}));
|
|
40
40
|
let MergeEditorDevContribution = class MergeEditorDevContribution {
|
|
41
41
|
getMergeEditor(widget = this.shell.currentWidget) {
|
|
42
|
-
return widget instanceof merge_editor_1.MergeEditor ? widget : (
|
|
42
|
+
return widget instanceof merge_editor_1.MergeEditor ? widget : (widget?.parent ? this.getMergeEditor(widget.parent) : undefined);
|
|
43
43
|
}
|
|
44
44
|
registerCommands(commands) {
|
|
45
45
|
commands.registerCommand(MergeEditorDevCommands.COPY_CONTENTS_TO_JSON, {
|
|
@@ -69,7 +69,6 @@ let MergeEditorDevContribution = class MergeEditorDevContribution {
|
|
|
69
69
|
this.messageService.info(core_1.nls.localizeByDefault('Successfully copied merge editor state'));
|
|
70
70
|
}
|
|
71
71
|
async openContentsFromJSON() {
|
|
72
|
-
var _a, _b;
|
|
73
72
|
const inputText = await this.quickInputService.input({
|
|
74
73
|
prompt: core_1.nls.localizeByDefault('Enter JSON'),
|
|
75
74
|
value: await this.clipboardService.readText()
|
|
@@ -84,7 +83,7 @@ let MergeEditorDevContribution = class MergeEditorDevContribution {
|
|
|
84
83
|
result: '',
|
|
85
84
|
languageId: 'plaintext'
|
|
86
85
|
}, JSON.parse(inputText));
|
|
87
|
-
const extension = Array.from(
|
|
86
|
+
const extension = Array.from(this.languageService.getLanguage(languageId)?.extensions ?? [''])[0];
|
|
88
87
|
const parentUri = new core_1.URI('merge-editor-dev://' + (0, core_1.generateUuid)());
|
|
89
88
|
const baseUri = parentUri.resolve('base' + extension);
|
|
90
89
|
const side1Uri = parentUri.resolve('side1' + extension);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor-dev-contribution.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-dev-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,6CAA6C;AAC7C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAkE;AAClE,sCAAgL;AAChL,qDAAgF;AAChF,iFAA6E;AAC7E,+EAA2E;AAC3E,iDAAuF;AAEvF,IAAiB,sBAAsB,CAYtC;AAZD,WAAiB,sBAAsB;IACtB,gDAAyB,GAAG,oBAAoB,CAAC;IACjD,4CAAqB,GAAG,cAAO,CAAC,yBAAyB,CAAC;QACnE,EAAE,EAAE,oCAAoC;QACxC,KAAK,EAAE,iCAAiC;QACxC,QAAQ,EAAE,uBAAA,yBAAyB;KACtC,CAAC,CAAC;IACU,8CAAuB,GAAG,cAAO,CAAC,yBAAyB,CAAC;QACrE,EAAE,EAAE,sCAAsC;QAC1C,KAAK,EAAE,mCAAmC;QAC1C,QAAQ,EAAE,uBAAA,yBAAyB;KACtC,CAAC,CAAC;AACP,CAAC,EAZgB,sBAAsB,sCAAtB,sBAAsB,QAYtC;AAGM,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IAuBzB,cAAc,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa;QACtD,OAAO,MAAM,YAAY,0BAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"merge-editor-dev-contribution.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-dev-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,8 @@
|
|
|
15
15
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
16
|
// *****************************************************************************
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.MergeEditorFactory =
|
|
18
|
+
exports.MergeEditorFactory = void 0;
|
|
19
|
+
exports.bindMergeEditor = bindMergeEditor;
|
|
19
20
|
require("../../../src/browser/style/merge-editor.css");
|
|
20
21
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
21
22
|
const core_1 = require("@theia/core");
|
|
@@ -47,7 +48,6 @@ function bindMergeEditor(bind) {
|
|
|
47
48
|
bind(merge_editor_dev_contribution_1.MergeEditorDevContribution).toSelf().inSingletonScope();
|
|
48
49
|
bind(core_1.CommandContribution).toService(merge_editor_dev_contribution_1.MergeEditorDevContribution);
|
|
49
50
|
}
|
|
50
|
-
exports.bindMergeEditor = bindMergeEditor;
|
|
51
51
|
class MergeEditorFactory {
|
|
52
52
|
constructor(container, editorManager = container.get(browser_2.EditorManager)) {
|
|
53
53
|
this.container = container;
|