@theia/scm 1.77.0-next.49 → 1.77.0-next.57
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-navigator-decorator.js +1 -1
- package/lib/browser/decorations/scm-navigator-decorator.js.map +1 -1
- package/lib/browser/dirty-diff/content-lines.spec.js +2 -1
- package/lib/browser/dirty-diff/content-lines.spec.js.map +1 -1
- package/lib/browser/dirty-diff/diff-computer.js +2 -1
- package/lib/browser/dirty-diff/diff-computer.js.map +1 -1
- package/lib/browser/dirty-diff/diff-computer.spec.js +2 -1
- package/lib/browser/dirty-diff/diff-computer.spec.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-navigator.js.map +1 -1
- package/lib/browser/dirty-diff/dirty-diff-widget.js +1 -1
- package/lib/browser/dirty-diff/dirty-diff-widget.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor-contribution.d.ts +1 -1
- package/lib/browser/merge-editor/merge-editor-contribution.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor-dev-contribution.d.ts +1 -1
- package/lib/browser/merge-editor/merge-editor-dev-contribution.d.ts.map +1 -1
- package/lib/browser/merge-editor/view/merge-editor-panes/merge-editor-pane-header.js +1 -1
- 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-view-zones.js +1 -1
- package/lib/browser/merge-editor/view/merge-editor-view-zones.js.map +1 -1
- package/lib/browser/multi-diff-editor/multi-diff-editor-module.d.ts +4 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-module.d.ts.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-module.js +34 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-module.js.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-uri.d.ts +15 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-uri.d.ts.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-uri.js +68 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-uri.js.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.d.ts +18 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.d.ts.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.js +76 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget-factory.js.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.d.ts +2 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.d.ts.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.js +835 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor-widget.spec.js.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.d.ts +163 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.d.ts.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.js +563 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.js.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.spec.d.ts +2 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.spec.d.ts.map +1 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.spec.js +167 -0
- package/lib/browser/multi-diff-editor/multi-diff-editor.spec.js.map +1 -0
- package/lib/browser/scm-action-button-widget.js +1 -1
- package/lib/browser/scm-action-button-widget.js.map +1 -1
- package/lib/browser/scm-amend-component.js +2 -1
- package/lib/browser/scm-amend-component.js.map +1 -1
- package/lib/browser/scm-amend-widget.js +1 -1
- package/lib/browser/scm-amend-widget.js.map +1 -1
- package/lib/browser/scm-commit-widget.js +2 -2
- package/lib/browser/scm-commit-widget.js.map +1 -1
- package/lib/browser/scm-contribution.js +1 -1
- package/lib/browser/scm-contribution.js.map +1 -1
- package/lib/browser/scm-frontend-module.d.ts.map +1 -1
- package/lib/browser/scm-frontend-module.js +2 -0
- package/lib/browser/scm-frontend-module.js.map +1 -1
- package/lib/browser/scm-history-graph-widget.js +2 -2
- package/lib/browser/scm-history-graph-widget.js.map +1 -1
- package/lib/browser/scm-history-graph-widget.spec.js +2 -1
- package/lib/browser/scm-history-graph-widget.spec.js.map +1 -1
- package/lib/browser/scm-input.js +3 -2
- package/lib/browser/scm-input.js.map +1 -1
- package/lib/browser/scm-provider.d.ts +2 -0
- package/lib/browser/scm-provider.d.ts.map +1 -1
- package/lib/browser/scm-quick-open-service.js +1 -1
- package/lib/browser/scm-quick-open-service.js.map +1 -1
- package/lib/browser/scm-repositories-widget.js +2 -2
- package/lib/browser/scm-repositories-widget.js.map +1 -1
- package/lib/browser/scm-repositories-widget.spec.js +2 -1
- package/lib/browser/scm-repositories-widget.spec.js.map +1 -1
- package/lib/browser/scm-service.js +1 -1
- package/lib/browser/scm-service.js.map +1 -1
- package/lib/browser/scm-tree-label-provider.js +1 -1
- package/lib/browser/scm-tree-label-provider.js.map +1 -1
- package/lib/browser/scm-tree-model.js +1 -1
- package/lib/browser/scm-tree-model.js.map +1 -1
- package/lib/browser/scm-tree-widget.js +2 -2
- package/lib/browser/scm-tree-widget.js.map +1 -1
- package/package.json +6 -6
- package/src/browser/dirty-diff/dirty-diff-navigator.ts +1 -1
- package/src/browser/multi-diff-editor/multi-diff-editor-module.ts +35 -0
- package/src/browser/multi-diff-editor/multi-diff-editor-uri.ts +83 -0
- package/src/browser/multi-diff-editor/multi-diff-editor-widget-factory.ts +81 -0
- package/src/browser/multi-diff-editor/multi-diff-editor-widget.spec.ts +878 -0
- package/src/browser/multi-diff-editor/multi-diff-editor.spec.ts +189 -0
- package/src/browser/multi-diff-editor/multi-diff-editor.ts +628 -0
- package/src/browser/scm-frontend-module.ts +3 -0
- package/src/browser/scm-input.ts +1 -1
- package/src/browser/scm-provider.ts +2 -0
- package/src/browser/style/multi-diff-editor.css +113 -0
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// *****************************************************************************
|
|
3
|
+
// Copyright (C) 2026 EclipseSource and others.
|
|
4
|
+
//
|
|
5
|
+
// This program and the accompanying materials are made available under the
|
|
6
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
7
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
8
|
+
//
|
|
9
|
+
// This Source Code may also be made available under the following Secondary
|
|
10
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
11
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
12
|
+
// with the GNU Classpath Exception which is available at
|
|
13
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
14
|
+
//
|
|
15
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
|
+
// *****************************************************************************
|
|
17
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
exports.MultiDiffEditorWidgetFactory = void 0;
|
|
19
|
+
const inversify_1 = require("@theia/core/shared/inversify");
|
|
20
|
+
const browser_1 = require("@theia/core/lib/browser");
|
|
21
|
+
const browser_2 = require("@theia/editor/lib/browser");
|
|
22
|
+
const monaco_editor_1 = require("@theia/monaco/lib/browser/monaco-editor");
|
|
23
|
+
const monaco_diff_editor_1 = require("@theia/monaco/lib/browser/monaco-diff-editor");
|
|
24
|
+
const multi_diff_editor_1 = require("./multi-diff-editor");
|
|
25
|
+
/** Options shared by embedded diff and code editors. */
|
|
26
|
+
const EMBEDDED_EDITOR_OPTIONS = {
|
|
27
|
+
folding: false,
|
|
28
|
+
codeLens: false,
|
|
29
|
+
scrollBeyondLastLine: false,
|
|
30
|
+
stickyScroll: { enabled: false },
|
|
31
|
+
minimap: { enabled: false }
|
|
32
|
+
};
|
|
33
|
+
class MultiDiffEditorWidgetFactory {
|
|
34
|
+
constructor(container, editorManager = container.get(browser_2.EditorManager), labelProvider = container.get(browser_1.LabelProvider)) {
|
|
35
|
+
this.container = container;
|
|
36
|
+
this.editorManager = editorManager;
|
|
37
|
+
this.labelProvider = labelProvider;
|
|
38
|
+
}
|
|
39
|
+
/** Create placeholders immediately; embedded editors load as entries approach the viewport. */
|
|
40
|
+
createMultiDiffEditor(uri) {
|
|
41
|
+
const data = multi_diff_editor_1.MultiDiffEditorUri.decode(uri);
|
|
42
|
+
const editor = this.instantiateMultiDiffEditor(data);
|
|
43
|
+
for (const resource of data.resources) {
|
|
44
|
+
const headerWidget = new multi_diff_editor_1.DiffEntryHeaderWidget(resource, this.labelProvider);
|
|
45
|
+
editor.addDiffEntry(resource, headerWidget, () => this.createEmbeddedEditorWidget(resource));
|
|
46
|
+
}
|
|
47
|
+
return editor;
|
|
48
|
+
}
|
|
49
|
+
instantiateMultiDiffEditor(data) {
|
|
50
|
+
const child = new inversify_1.Container({ defaultScope: 'Singleton' });
|
|
51
|
+
child.parent = this.container;
|
|
52
|
+
child.bind(multi_diff_editor_1.MultiDiffEditorData).toConstantValue(data);
|
|
53
|
+
child.bind(multi_diff_editor_1.MultiDiffEditor).toSelf();
|
|
54
|
+
return child.get(multi_diff_editor_1.MultiDiffEditor);
|
|
55
|
+
}
|
|
56
|
+
async createEmbeddedEditorWidget(resource) {
|
|
57
|
+
const diffUri = browser_1.DiffUris.encode(resource.originalUri, resource.modifiedUri);
|
|
58
|
+
const editorWidget = await this.editorManager.createByUri(diffUri);
|
|
59
|
+
this.configureEmbeddedEditor(editorWidget);
|
|
60
|
+
return editorWidget;
|
|
61
|
+
}
|
|
62
|
+
configureEmbeddedEditor(editorWidget) {
|
|
63
|
+
const monacoEditor = monaco_editor_1.MonacoEditor.get(editorWidget);
|
|
64
|
+
if (monacoEditor) {
|
|
65
|
+
monacoEditor.detachModelOnHide = false;
|
|
66
|
+
}
|
|
67
|
+
if (monacoEditor instanceof monaco_diff_editor_1.MonacoDiffEditor) {
|
|
68
|
+
monacoEditor.diffEditor.updateOptions({ ...EMBEDDED_EDITOR_OPTIONS, hideUnchangedRegions: { enabled: true } });
|
|
69
|
+
}
|
|
70
|
+
else if (monacoEditor) {
|
|
71
|
+
monacoEditor.getControl().updateOptions(EMBEDDED_EDITOR_OPTIONS);
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
exports.MultiDiffEditorWidgetFactory = MultiDiffEditorWidgetFactory;
|
|
76
|
+
//# sourceMappingURL=multi-diff-editor-widget-factory.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"multi-diff-editor-widget-factory.js","sourceRoot":"","sources":["../../../src/browser/multi-diff-editor/multi-diff-editor-widget-factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"multi-diff-editor-widget.spec.d.ts","sourceRoot":"","sources":["../../../src/browser/multi-diff-editor/multi-diff-editor-widget.spec.ts"],"names":[],"mappings":""}
|