@opensumi/ide-editor 3.9.1-next-1749610621.0 → 3.9.1-next-1749781809.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multi-diff-editor.d.ts","sourceRoot":"","sources":["../../../src/browser/multi-diff/multi-diff-editor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE/E,OAAO,EAGL,KAAK,EAEL,OAAO,EAEP,GAAG,EACH,YAAY,EAEb,MAAM,2BAA2B,CAAC;AAanC,OAAO,EAAE,SAAS,EAAE,MAAM,sDAAsD,CAAC;AAEjF,OAAO,EAAE,WAAW,EAAE,MAAM,kEAAkE,CAAC;AAE/F,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EACtB,MAAM,iFAAiF,CAAC;AACzF,OAAO,EAAE,qBAAqB,EAAE,MAAM,iGAAiG,CAAC;AACxI,OAAO,EAAE,oBAAoB,EAAE,MAAM,qGAAqG,CAAC;AAC3I,OAAO,EAAE,KAAK,EAAE,MAAM,8DAA8D,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,gEAAgE,CAAC;AAE7F,OAAO,EAAuC,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAChG,OAAO,EAAE,gBAAgB,EAA6D,MAAM,yBAAyB,CAAC;AAEtH,OAAO,EAAE,sCAAsC,EAA+B,MAAM,oBAAoB,CAAC;AACzG,OAAO,EAAE,uBAAuB,EAAE,SAAS,EAAqC,MAAM,UAAU,CAAC;AAEjG,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAEhF,qBACa,sBAAuB,SAAQ,YAAa,YAAW,gBAAgB;aA4BhE,eAAe,EAAE,qBAAqB;IACtD,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,uBAAuB;IA5BjC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAGtC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkB;IAGjD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA8B;IAGnE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAGtD,OAAO,CAAC,QAAQ,CAAC,8BAA8B,CAAkC;IAGjF,MAAM,EAAE,OAAO,CAAC;IAEhB,OAAO,CAAC,2BAA2B,CAAwC;IAC3E,SAAgB,sBAAsB,+BAA0C;IAEhF,OAAO,CAAC,YAAY,CAA+B;IACnD,OAAO,CAAC,UAAU,CAAkB;IAEpC,OAAO,CAAC,cAAc,CAAsC;gBAG1C,eAAe,EAAE,qBAAqB,EAC9C,gBAAgB,EAAE,uBAAuB,EACzC,uBAAuB,EAAE,2BAA2B;IAO9D,6BAA6B,CAAC,CAAC,EAAE,sCAAsC;IAwBvE,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,4BAA4B;IA6B9B,eAAe,CAAC,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"multi-diff-editor.d.ts","sourceRoot":"","sources":["../../../src/browser/multi-diff/multi-diff-editor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE/E,OAAO,EAGL,KAAK,EAEL,OAAO,EAEP,GAAG,EACH,YAAY,EAEb,MAAM,2BAA2B,CAAC;AAanC,OAAO,EAAE,SAAS,EAAE,MAAM,sDAAsD,CAAC;AAEjF,OAAO,EAAE,WAAW,EAAE,MAAM,kEAAkE,CAAC;AAE/F,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EACtB,MAAM,iFAAiF,CAAC;AACzF,OAAO,EAAE,qBAAqB,EAAE,MAAM,iGAAiG,CAAC;AACxI,OAAO,EAAE,oBAAoB,EAAE,MAAM,qGAAqG,CAAC;AAC3I,OAAO,EAAE,KAAK,EAAE,MAAM,8DAA8D,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,gEAAgE,CAAC;AAE7F,OAAO,EAAuC,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAChG,OAAO,EAAE,gBAAgB,EAA6D,MAAM,yBAAyB,CAAC;AAEtH,OAAO,EAAE,sCAAsC,EAA+B,MAAM,oBAAoB,CAAC;AACzG,OAAO,EAAE,uBAAuB,EAAE,SAAS,EAAqC,MAAM,UAAU,CAAC;AAEjG,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,8BAA8B,CAAC;AAEhF,qBACa,sBAAuB,SAAQ,YAAa,YAAW,gBAAgB;aA4BhE,eAAe,EAAE,qBAAqB;IACtD,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,uBAAuB;IA5BjC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAGtC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkB;IAGjD,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA8B;IAGnE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAGtD,OAAO,CAAC,QAAQ,CAAC,8BAA8B,CAAkC;IAGjF,MAAM,EAAE,OAAO,CAAC;IAEhB,OAAO,CAAC,2BAA2B,CAAwC;IAC3E,SAAgB,sBAAsB,+BAA0C;IAEhF,OAAO,CAAC,YAAY,CAA+B;IACnD,OAAO,CAAC,UAAU,CAAkB;IAEpC,OAAO,CAAC,cAAc,CAAsC;gBAG1C,eAAe,EAAE,qBAAqB,EAC9C,gBAAgB,EAAE,uBAAuB,EACzC,uBAAuB,EAAE,2BAA2B;IAO9D,6BAA6B,CAAC,CAAC,EAAE,sCAAsC;IAwBvE,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,4BAA4B;IA6B9B,eAAe,CAAC,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoInH,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,iBAAiB,GAAG,SAAS;IAIrD,mBAAmB,IAAI,iBAAiB,GAAG,SAAS;IAYpD,MAAM,CAAC,QAAQ,EAAE,oBAAoB,EAAE,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,KAAK,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI;IAI7F;;OAEG;IACH,WAAW,IAAI,IAAI;IAwBnB;;OAEG;IACH,SAAS,IAAI,IAAI;IAwBjB,MAAM,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAIlC,KAAK,IAAI,IAAI;IAOb,gBAAgB,CAAC,GAAG,EAAE,GAAG,GAAG;QAAE,UAAU,EAAE,WAAW,CAAC;QAAC,MAAM,EAAE,WAAW,CAAA;KAAE,GAAG,SAAS;IAIxF,OAAO,IAAI,IAAI;CAIhB"}
|
|
@@ -129,12 +129,12 @@ let BrowserMultiDiffEditor = class BrowserMultiDiffEditor extends ide_core_commo
|
|
|
129
129
|
contextKeys: r.contextKeys,
|
|
130
130
|
options: {
|
|
131
131
|
readOnly: (_b = (modified || original)) === null || _b === void 0 ? void 0 : _b.instance.readonly,
|
|
132
|
-
|
|
132
|
+
...options,
|
|
133
133
|
...this.convertedOptions.diffOptions,
|
|
134
134
|
},
|
|
135
|
-
// TODO: 监听配置变化验证
|
|
136
135
|
onOptionsDidChange: (h) => this.preferenceService.onPreferenceChanged((e) => {
|
|
137
|
-
if (e.affects(uri.toString()) &&
|
|
136
|
+
if (e.affects(uri.toString()) &&
|
|
137
|
+
(e.preferenceName.startsWith('editor') || e.preferenceName.startsWith('diffEditor'))) {
|
|
138
138
|
h();
|
|
139
139
|
}
|
|
140
140
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multi-diff-editor.js","sourceRoot":"","sources":["../../../src/browser/multi-diff/multi-diff-editor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"multi-diff-editor.js","sourceRoot":"","sources":["../../../src/browser/multi-diff/multi-diff-editor.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-editor",
|
|
3
|
-
"version": "3.9.1-next-
|
|
3
|
+
"version": "3.9.1-next-1749781809.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src"
|
|
@@ -17,21 +17,21 @@
|
|
|
17
17
|
"url": "git@github.com:opensumi/core.git"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@opensumi/ide-core-common": "3.9.1-next-
|
|
21
|
-
"@opensumi/ide-core-node": "3.9.1-next-
|
|
22
|
-
"@opensumi/ide-file-service": "3.9.1-next-
|
|
23
|
-
"@opensumi/ide-monaco": "3.9.1-next-
|
|
24
|
-
"@opensumi/ide-utils": "3.9.1-next-
|
|
20
|
+
"@opensumi/ide-core-common": "3.9.1-next-1749781809.0",
|
|
21
|
+
"@opensumi/ide-core-node": "3.9.1-next-1749781809.0",
|
|
22
|
+
"@opensumi/ide-file-service": "3.9.1-next-1749781809.0",
|
|
23
|
+
"@opensumi/ide-monaco": "3.9.1-next-1749781809.0",
|
|
24
|
+
"@opensumi/ide-utils": "3.9.1-next-1749781809.0",
|
|
25
25
|
"vscode-oniguruma": "1.5.1"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
|
-
"@opensumi/ide-components": "3.9.1-next-
|
|
29
|
-
"@opensumi/ide-core-browser": "3.9.1-next-
|
|
30
|
-
"@opensumi/ide-dev-tool": "3.9.1-next-
|
|
31
|
-
"@opensumi/ide-overlay": "3.9.1-next-
|
|
32
|
-
"@opensumi/ide-quick-open": "3.9.1-next-
|
|
33
|
-
"@opensumi/ide-theme": "3.9.1-next-
|
|
34
|
-
"@opensumi/ide-workspace": "3.9.1-next-
|
|
28
|
+
"@opensumi/ide-components": "3.9.1-next-1749781809.0",
|
|
29
|
+
"@opensumi/ide-core-browser": "3.9.1-next-1749781809.0",
|
|
30
|
+
"@opensumi/ide-dev-tool": "3.9.1-next-1749781809.0",
|
|
31
|
+
"@opensumi/ide-overlay": "3.9.1-next-1749781809.0",
|
|
32
|
+
"@opensumi/ide-quick-open": "3.9.1-next-1749781809.0",
|
|
33
|
+
"@opensumi/ide-theme": "3.9.1-next-1749781809.0",
|
|
34
|
+
"@opensumi/ide-workspace": "3.9.1-next-1749781809.0"
|
|
35
35
|
},
|
|
36
|
-
"gitHead": "
|
|
36
|
+
"gitHead": "ae16f994cada10b19546875ae08594e7b81043cf"
|
|
37
37
|
}
|
|
@@ -203,13 +203,15 @@ export class BrowserMultiDiffEditor extends WithEventBus implements IMultiDiffEd
|
|
|
203
203
|
contextKeys: r.contextKeys,
|
|
204
204
|
options: {
|
|
205
205
|
readOnly: (modified || original)?.instance.readonly,
|
|
206
|
-
|
|
206
|
+
...options,
|
|
207
207
|
...this.convertedOptions.diffOptions,
|
|
208
208
|
},
|
|
209
|
-
// TODO: 监听配置变化验证
|
|
210
209
|
onOptionsDidChange: (h) =>
|
|
211
210
|
this.preferenceService.onPreferenceChanged((e) => {
|
|
212
|
-
if (
|
|
211
|
+
if (
|
|
212
|
+
e.affects(uri.toString()) &&
|
|
213
|
+
(e.preferenceName.startsWith('editor') || e.preferenceName.startsWith('diffEditor'))
|
|
214
|
+
) {
|
|
213
215
|
h();
|
|
214
216
|
}
|
|
215
217
|
}),
|
|
@@ -220,7 +222,6 @@ export class BrowserMultiDiffEditor extends WithEventBus implements IMultiDiffEd
|
|
|
220
222
|
);
|
|
221
223
|
|
|
222
224
|
const documents = observableValue<readonly RefCounted<IDocumentDiffItem>[] | 'loading'>('documents', 'loading');
|
|
223
|
-
|
|
224
225
|
const updateDocuments = derived(async (reader) => {
|
|
225
226
|
const docsPromises = documentsWithPromises.read(reader);
|
|
226
227
|
const docs = await Promise.all(docsPromises);
|