@theia/scm 1.70.0 → 1.70.1
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/merge-editor/merge-editor-module.d.ts +6 -0
- package/lib/browser/merge-editor/merge-editor-module.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor-module.js +18 -1
- package/lib/browser/merge-editor/merge-editor-module.js.map +1 -1
- package/package.json +7 -7
- package/src/browser/merge-editor/merge-editor-module.ts +21 -5
|
@@ -9,6 +9,12 @@ export declare class MergeEditorFactory {
|
|
|
9
9
|
protected readonly editorManager: EditorManager;
|
|
10
10
|
constructor(container: interfaces.Container, editorManager?: EditorManager);
|
|
11
11
|
createMergeEditor({ baseUri, side1Uri, side2Uri, resultUri }: MergeUris): Promise<MergeEditor>;
|
|
12
|
+
/**
|
|
13
|
+
* Creates an editor widget backed by an empty in-memory resource.
|
|
14
|
+
* Used as a fallback when the base URI cannot be resolved, e.g. in BOTH_ADDED
|
|
15
|
+
* merge conflicts where there is no common ancestor (git index stage 1).
|
|
16
|
+
*/
|
|
17
|
+
protected createEmptyFallbackEditorWidget(originalUri: URI, disposables: DisposableCollection): Promise<EditorWidget>;
|
|
12
18
|
protected createEditorWidget(uri: URI, disposables: DisposableCollection): Promise<EditorWidget>;
|
|
13
19
|
protected createMergeEditorContainer({ baseEditorWidget, side1EditorWidget, side2EditorWidget, resultEditorWidget, options }: MergeEditorContainerProps): interfaces.Container;
|
|
14
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor-module.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-module.ts"],"names":[],"mappings":"AAgBA,OAAO,6CAA6C,CAAC;AAErD,OAAO,EAAa,UAAU,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAuB,oBAAoB,
|
|
1
|
+
{"version":3,"file":"merge-editor-module.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-module.ts"],"names":[],"mappings":"AAgBA,OAAO,6CAA6C,CAAC;AAErD,OAAO,EAAa,UAAU,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAuB,oBAAoB,EAAwD,GAAG,EAAE,MAAM,aAAa,CAAC;AAInI,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAMxE,OAAO,EAAE,WAAW,EAA+D,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAIrH,wBAAgB,eAAe,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAmB3D;AAED,qBAAa,kBAAkB;IAGvB,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS;IAClD,SAAS,CAAC,QAAQ,CAAC,aAAa;gBADb,SAAS,EAAE,UAAU,CAAC,SAAS,EAC/B,aAAa,gBAA+B;IAG7D,iBAAiB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC;IA8BpG;;;;OAIG;cACa,+BAA+B,CAAC,WAAW,EAAE,GAAG,EAAE,WAAW,EAAE,oBAAoB,GAAG,OAAO,CAAC,YAAY,CAAC;cAK3G,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,WAAW,EAAE,oBAAoB,GAAG,OAAO,CAAC,YAAY,CAAC;IAYtG,SAAS,CAAC,0BAA0B,CAAC,EACjC,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,OAAO,EACV,EAAE,yBAAyB,GAAG,UAAU,CAAC,SAAS;CAoBtD;AAED,MAAM,WAAW,yBAAyB;IACtC,gBAAgB,EAAE,YAAY,CAAC;IAC/B,iBAAiB,EAAE,YAAY,CAAC;IAChC,iBAAiB,EAAE,YAAY,CAAC;IAChC,kBAAkB,EAAE,YAAY,CAAC;IACjC,OAAO,CAAC,EAAE;QACN,WAAW,CAAC,EAAE,OAAO,CAAC;KACzB,CAAA;CACJ"}
|
|
@@ -57,7 +57,15 @@ class MergeEditorFactory {
|
|
|
57
57
|
const toDisposeOnError = new core_1.DisposableCollection();
|
|
58
58
|
const createEditorWidget = (uri) => this.createEditorWidget(uri, toDisposeOnError);
|
|
59
59
|
try {
|
|
60
|
-
const [baseEditorWidget, side1EditorWidget, side2EditorWidget, resultEditorWidget] = await Promise.all([
|
|
60
|
+
const [baseEditorWidget, side1EditorWidget, side2EditorWidget, resultEditorWidget] = await Promise.all([
|
|
61
|
+
createEditorWidget(baseUri).catch(e => {
|
|
62
|
+
console.warn('Base URI resolution failed, using empty fallback:', e);
|
|
63
|
+
return this.createEmptyFallbackEditorWidget(baseUri, toDisposeOnError);
|
|
64
|
+
}),
|
|
65
|
+
createEditorWidget(side1Uri),
|
|
66
|
+
createEditorWidget(side2Uri),
|
|
67
|
+
createEditorWidget(resultUri)
|
|
68
|
+
]);
|
|
61
69
|
const resultDocument = monaco_editor_1.MonacoEditor.get(resultEditorWidget).document;
|
|
62
70
|
const hasConflictMarkers = resultDocument.textEditorModel.getLinesContent().some(lineContent => lineContent.startsWith('<<<<<<<'));
|
|
63
71
|
return this.createMergeEditorContainer({
|
|
@@ -75,6 +83,15 @@ class MergeEditorFactory {
|
|
|
75
83
|
throw error;
|
|
76
84
|
}
|
|
77
85
|
}
|
|
86
|
+
/**
|
|
87
|
+
* Creates an editor widget backed by an empty in-memory resource.
|
|
88
|
+
* Used as a fallback when the base URI cannot be resolved, e.g. in BOTH_ADDED
|
|
89
|
+
* merge conflicts where there is no common ancestor (git index stage 1).
|
|
90
|
+
*/
|
|
91
|
+
async createEmptyFallbackEditorWidget(originalUri, disposables) {
|
|
92
|
+
const fallbackUri = new core_1.URI().withScheme(core_1.MEMORY_TEXT_READONLY).withPath(`${(0, core_1.generateUuid)()}/${originalUri.path.base}`);
|
|
93
|
+
return this.createEditorWidget(fallbackUri, disposables);
|
|
94
|
+
}
|
|
78
95
|
async createEditorWidget(uri, disposables) {
|
|
79
96
|
const editorWidget = await this.editorManager.createByUri(uri);
|
|
80
97
|
disposables.push(editorWidget);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor-module.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-module.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;;;AAmBhF,0CAmBC;AApCD,uDAAqD;AAErD,4DAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"merge-editor-module.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor-module.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/scm",
|
|
3
|
-
"version": "1.70.
|
|
3
|
+
"version": "1.70.1",
|
|
4
4
|
"description": "Theia - Source control Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.70.
|
|
7
|
-
"@theia/editor": "1.70.
|
|
8
|
-
"@theia/filesystem": "1.70.
|
|
9
|
-
"@theia/monaco": "1.70.
|
|
6
|
+
"@theia/core": "1.70.1",
|
|
7
|
+
"@theia/editor": "1.70.1",
|
|
8
|
+
"@theia/filesystem": "1.70.1",
|
|
9
|
+
"@theia/monaco": "1.70.1",
|
|
10
10
|
"@theia/monaco-editor-core": "1.108.201",
|
|
11
11
|
"@types/diff": "^5.2.1",
|
|
12
12
|
"diff": "^5.2.0",
|
|
@@ -50,10 +50,10 @@
|
|
|
50
50
|
"watch": "theiaext watch"
|
|
51
51
|
},
|
|
52
52
|
"devDependencies": {
|
|
53
|
-
"@theia/ext-scripts": "1.70.
|
|
53
|
+
"@theia/ext-scripts": "1.70.1"
|
|
54
54
|
},
|
|
55
55
|
"nyc": {
|
|
56
56
|
"extends": "../../configs/nyc.json"
|
|
57
57
|
},
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "12f45264d4bbdaaa6275621256057fb384e4474a"
|
|
59
59
|
}
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
import '../../../src/browser/style/merge-editor.css';
|
|
18
18
|
|
|
19
19
|
import { Container, interfaces } from '@theia/core/shared/inversify';
|
|
20
|
-
import { CommandContribution, DisposableCollection, MenuContribution, URI } from '@theia/core';
|
|
20
|
+
import { CommandContribution, DisposableCollection, MEMORY_TEXT_READONLY, MenuContribution, generateUuid, URI } from '@theia/core';
|
|
21
21
|
import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
22
22
|
import { FrontendApplicationContribution, KeybindingContribution, NavigatableWidgetOptions, OpenHandler, WidgetFactory } from '@theia/core/lib/browser';
|
|
23
23
|
import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
|
|
@@ -56,16 +56,22 @@ export class MergeEditorFactory {
|
|
|
56
56
|
|
|
57
57
|
constructor(
|
|
58
58
|
protected readonly container: interfaces.Container,
|
|
59
|
-
protected readonly editorManager = container.get(EditorManager)
|
|
59
|
+
protected readonly editorManager = container.get(EditorManager),
|
|
60
60
|
) { }
|
|
61
61
|
|
|
62
62
|
async createMergeEditor({ baseUri, side1Uri, side2Uri, resultUri }: MergeUris): Promise<MergeEditor> {
|
|
63
63
|
const toDisposeOnError = new DisposableCollection();
|
|
64
64
|
const createEditorWidget = (uri: URI) => this.createEditorWidget(uri, toDisposeOnError);
|
|
65
65
|
try {
|
|
66
|
-
const [baseEditorWidget, side1EditorWidget, side2EditorWidget, resultEditorWidget] = await Promise.all(
|
|
67
|
-
|
|
68
|
-
|
|
66
|
+
const [baseEditorWidget, side1EditorWidget, side2EditorWidget, resultEditorWidget] = await Promise.all([
|
|
67
|
+
createEditorWidget(baseUri).catch(e => {
|
|
68
|
+
console.warn('Base URI resolution failed, using empty fallback:', e);
|
|
69
|
+
return this.createEmptyFallbackEditorWidget(baseUri, toDisposeOnError);
|
|
70
|
+
}),
|
|
71
|
+
createEditorWidget(side1Uri),
|
|
72
|
+
createEditorWidget(side2Uri),
|
|
73
|
+
createEditorWidget(resultUri)
|
|
74
|
+
]);
|
|
69
75
|
const resultDocument = MonacoEditor.get(resultEditorWidget)!.document;
|
|
70
76
|
const hasConflictMarkers = resultDocument.textEditorModel.getLinesContent().some(lineContent => lineContent.startsWith('<<<<<<<'));
|
|
71
77
|
return this.createMergeEditorContainer({
|
|
@@ -83,6 +89,16 @@ export class MergeEditorFactory {
|
|
|
83
89
|
}
|
|
84
90
|
}
|
|
85
91
|
|
|
92
|
+
/**
|
|
93
|
+
* Creates an editor widget backed by an empty in-memory resource.
|
|
94
|
+
* Used as a fallback when the base URI cannot be resolved, e.g. in BOTH_ADDED
|
|
95
|
+
* merge conflicts where there is no common ancestor (git index stage 1).
|
|
96
|
+
*/
|
|
97
|
+
protected async createEmptyFallbackEditorWidget(originalUri: URI, disposables: DisposableCollection): Promise<EditorWidget> {
|
|
98
|
+
const fallbackUri = new URI().withScheme(MEMORY_TEXT_READONLY).withPath(`${generateUuid()}/${originalUri.path.base}`);
|
|
99
|
+
return this.createEditorWidget(fallbackUri, disposables);
|
|
100
|
+
}
|
|
101
|
+
|
|
86
102
|
protected async createEditorWidget(uri: URI, disposables: DisposableCollection): Promise<EditorWidget> {
|
|
87
103
|
const editorWidget = await this.editorManager.createByUri(uri);
|
|
88
104
|
disposables.push(editorWidget);
|