@opensumi/ide-core-browser 2.22.3-next-1676346868.0 → 2.22.3
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.
|
@@ -40,12 +40,14 @@ export interface IOpenMergeEditorArgs {
|
|
|
40
40
|
textModel: IEditorModel;
|
|
41
41
|
};
|
|
42
42
|
}
|
|
43
|
-
interface
|
|
44
|
-
ancestor: URI;
|
|
43
|
+
interface IBaseValidateOpenArgs {
|
|
45
44
|
input1: MergeEditorInputData;
|
|
46
45
|
input2: MergeEditorInputData;
|
|
47
46
|
output: URI;
|
|
48
47
|
}
|
|
48
|
+
interface IValidateOpenArgs extends IBaseValidateOpenArgs {
|
|
49
|
+
ancestor: URI;
|
|
50
|
+
}
|
|
49
51
|
export declare namespace IRelaxedOpenMergeEditorArgs {
|
|
50
52
|
const validate: (args: unknown) => IValidateOpenArgs;
|
|
51
53
|
const toString: (args: IValidateOpenArgs) => string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor-widget.d.ts","sourceRoot":"","sources":["../../src/monaco/merge-editor-widget.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAiB,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kEAAkE,CAAC;AACpG,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gEAAgE,CAAC;AAC9F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gEAAgE,CAAC;AAEnG,MAAM,WAAW,kBAAmB,SAAQ,OAAO;IACjD,aAAa,IAAI,WAAW,CAAC;IAC7B,eAAe,IAAI,WAAW,CAAC;IAC/B,eAAe,IAAI,WAAW,CAAC;IAC/B,IAAI,CAAC,mBAAmB,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChE;AAED,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,GAAG,CAAC;IACT,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,oBAAqB,YAAW,qBAAqB;IAgB9D,QAAQ,CAAC,GAAG,EAAE,GAAG;IACjB,QAAQ,CAAC,KAAK,CAAC;IACf,QAAQ,CAAC,MAAM,CAAC;IAChB,QAAQ,CAAC,WAAW,CAAC;IAlBvB,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB;IAS/C,OAAO,CAAC,UAAU,CAAe;IACjC,IAAW,SAAS,IAAI,YAAY,CAEnC;gBAGU,GAAG,EAAE,GAAG,EACR,KAAK,CAAC,oBAAQ,EACd,MAAM,CAAC,oBAAoB,EAC3B,WAAW,CAAC,oBAAoB;IAGpC,MAAM,IAAI,qBAAqB;IAS/B,QAAQ,IAAI,MAAM;IASlB,YAAY,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI;CAI/C;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE;QACR,GAAG,EAAE,GAAG,CAAC;QACT,SAAS,EAAE,YAAY,CAAC;QACxB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IACF,MAAM,EAAE,oBAAoB,CAAC;IAC7B,MAAM,EAAE,oBAAoB,CAAC;IAC7B,MAAM,EAAE;QACN,GAAG,EAAE,GAAG,CAAC;QACT,SAAS,EAAE,YAAY,CAAC;KACzB,CAAC;CACH;AAED,UAAU,
|
|
1
|
+
{"version":3,"file":"merge-editor-widget.d.ts","sourceRoot":"","sources":["../../src/monaco/merge-editor-widget.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAiB,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kEAAkE,CAAC;AACpG,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gEAAgE,CAAC;AAC9F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gEAAgE,CAAC;AAEnG,MAAM,WAAW,kBAAmB,SAAQ,OAAO;IACjD,aAAa,IAAI,WAAW,CAAC;IAC7B,eAAe,IAAI,WAAW,CAAC;IAC/B,eAAe,IAAI,WAAW,CAAC;IAC/B,IAAI,CAAC,mBAAmB,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChE;AAED,MAAM,WAAW,qBAAqB;IACpC,GAAG,EAAE,GAAG,CAAC;IACT,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,qBAAa,oBAAqB,YAAW,qBAAqB;IAgB9D,QAAQ,CAAC,GAAG,EAAE,GAAG;IACjB,QAAQ,CAAC,KAAK,CAAC;IACf,QAAQ,CAAC,MAAM,CAAC;IAChB,QAAQ,CAAC,WAAW,CAAC;IAlBvB,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB;IAS/C,OAAO,CAAC,UAAU,CAAe;IACjC,IAAW,SAAS,IAAI,YAAY,CAEnC;gBAGU,GAAG,EAAE,GAAG,EACR,KAAK,CAAC,oBAAQ,EACd,MAAM,CAAC,oBAAoB,EAC3B,WAAW,CAAC,oBAAoB;IAGpC,MAAM,IAAI,qBAAqB;IAS/B,QAAQ,IAAI,MAAM;IASlB,YAAY,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI;CAI/C;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE;QACR,GAAG,EAAE,GAAG,CAAC;QACT,SAAS,EAAE,YAAY,CAAC;QACxB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IACF,MAAM,EAAE,oBAAoB,CAAC;IAC7B,MAAM,EAAE,oBAAoB,CAAC;IAC7B,MAAM,EAAE;QACN,GAAG,EAAE,GAAG,CAAC;QACT,SAAS,EAAE,YAAY,CAAC;KACzB,CAAC;CACH;AAED,UAAU,qBAAqB;IAC7B,MAAM,EAAE,oBAAoB,CAAC;IAC7B,MAAM,EAAE,oBAAoB,CAAC;IAC7B,MAAM,EAAE,GAAG,CAAC;CACb;AAED,UAAU,iBAAkB,SAAQ,qBAAqB;IACvD,QAAQ,EAAE,GAAG,CAAC;CACf;AAUD,yBAAiB,2BAA2B,CAAC;IACpC,MAAM,QAAQ,SAAU,OAAO,KAAG,iBAiBxC,CAAC;IAEK,MAAM,QAAQ,SAAU,iBAAiB,KAAG,MASlD,CAAC;CA4CH"}
|
|
@@ -51,7 +51,7 @@ var IRelaxedOpenMergeEditorArgs;
|
|
|
51
51
|
throw new TypeError('invalid argument');
|
|
52
52
|
}
|
|
53
53
|
const obj = args;
|
|
54
|
-
const ancestor = toUri(obj.ancestor);
|
|
54
|
+
const ancestor = toUri(obj.ancestor || obj.base);
|
|
55
55
|
const output = toUri(obj.output);
|
|
56
56
|
const input1 = toInputData(Object.assign(Object.assign({}, obj.input1), { title: (_a = obj.input1.title) !== null && _a !== void 0 ? _a : 'Current' }));
|
|
57
57
|
const input2 = toInputData(Object.assign(Object.assign({}, obj.input2), { title: (_b = obj.input2.title) !== null && _b !== void 0 ? _b : 'Incoming' }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor-widget.js","sourceRoot":"","sources":["../../src/monaco/merge-editor-widget.ts"],"names":[],"mappings":";;;AAAA,+DAA+D;AAmB/D,MAAa,oBAAoB;IAC/B,MAAM,CAAC,IAAI,CAAC,IAAY;QACtB,IAAI;YACF,MAAM,GAAG,GAAyB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACnD,OAAO,IAAI,oBAAoB,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;SAClF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAC,oCAAoC,CAAC,CAAC;SACnD;IACH,CAAC;IAGD,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,YACW,GAAQ,EACR,KAAc,EACd,MAA2B,EAC3B,WAAgC;QAHhC,QAAG,GAAH,GAAG,CAAK;QACR,UAAK,GAAL,KAAK,CAAS;QACd,WAAM,GAAN,MAAM,CAAqB;QAC3B,gBAAW,GAAX,WAAW,CAAqB;IACxC,CAAC;IAEG,MAAM;QACX,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,GAAG;YACb,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAC;IACJ,CAAC;IAEM,QAAQ;QACb,OAAO,IAAI,CAAC,SAAS,CAAC;YACpB,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE;YACxB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAC,CAAC;IACL,CAAC;IAEM,YAAY,CAAC,KAAmB;QACrC,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA5CD,oDA4CC;
|
|
1
|
+
{"version":3,"file":"merge-editor-widget.js","sourceRoot":"","sources":["../../src/monaco/merge-editor-widget.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-core-browser",
|
|
3
|
-
"version": "2.22.3
|
|
3
|
+
"version": "2.22.3",
|
|
4
4
|
"description": "@opensumi/ide-core-browser",
|
|
5
5
|
"files": [
|
|
6
6
|
"lib",
|
|
@@ -18,9 +18,9 @@
|
|
|
18
18
|
"build": "tsc --build ../../configs/ts/references/tsconfig.core-browser.json"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@opensumi/ide-components": "2.22.3
|
|
22
|
-
"@opensumi/ide-connection": "2.22.3
|
|
23
|
-
"@opensumi/ide-core-common": "2.22.3
|
|
21
|
+
"@opensumi/ide-components": "2.22.3",
|
|
22
|
+
"@opensumi/ide-connection": "2.22.3",
|
|
23
|
+
"@opensumi/ide-core-common": "2.22.3",
|
|
24
24
|
"@opensumi/vscode-debugprotocol": "1.49.0-beta.1",
|
|
25
25
|
"@vscode/codicons": "0.0.27",
|
|
26
26
|
"ajv": "^6.10.0",
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"strip-json-comments": "3.0.1",
|
|
46
46
|
"vscode-textmate": "7.0.1"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "628daa791b629280ea3bf2aa0ea2f4609a942767"
|
|
49
49
|
}
|
|
@@ -77,21 +77,32 @@ export interface IOpenMergeEditorArgs {
|
|
|
77
77
|
};
|
|
78
78
|
}
|
|
79
79
|
|
|
80
|
-
interface
|
|
81
|
-
ancestor: URI;
|
|
80
|
+
interface IBaseValidateOpenArgs {
|
|
82
81
|
input1: MergeEditorInputData;
|
|
83
82
|
input2: MergeEditorInputData;
|
|
84
83
|
output: URI;
|
|
85
84
|
}
|
|
86
85
|
|
|
86
|
+
interface IValidateOpenArgs extends IBaseValidateOpenArgs {
|
|
87
|
+
ancestor: URI;
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
/**
|
|
91
|
+
* vscode 1.69 + 版本中
|
|
92
|
+
* `ancestor` 改为了 `base`
|
|
93
|
+
*/
|
|
94
|
+
interface IValidateOpenArgs2 extends IBaseValidateOpenArgs {
|
|
95
|
+
base: URI;
|
|
96
|
+
}
|
|
97
|
+
|
|
87
98
|
export namespace IRelaxedOpenMergeEditorArgs {
|
|
88
99
|
export const validate = (args: unknown): IValidateOpenArgs => {
|
|
89
100
|
if (!args || typeof args !== 'object') {
|
|
90
101
|
throw new TypeError('invalid argument');
|
|
91
102
|
}
|
|
92
103
|
|
|
93
|
-
const obj = args as IValidateOpenArgs;
|
|
94
|
-
const ancestor = toUri(obj.ancestor);
|
|
104
|
+
const obj = args as IValidateOpenArgs | IValidateOpenArgs2;
|
|
105
|
+
const ancestor = toUri((obj as IValidateOpenArgs).ancestor || (obj as IValidateOpenArgs2).base);
|
|
95
106
|
const output = toUri(obj.output);
|
|
96
107
|
const input1 = toInputData({
|
|
97
108
|
...obj.input1,
|