@opensumi/ide-editor 2.27.3-rc-1710489030.0 → 2.27.3-rc-1711022312.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/diff/compare.d.ts +2 -1
- package/lib/browser/diff/compare.d.ts.map +1 -1
- package/lib/browser/diff/compare.js +26 -4
- package/lib/browser/diff/compare.js.map +1 -1
- package/lib/browser/doc-model/editor-document-model.d.ts.map +1 -1
- package/lib/browser/doc-model/editor-document-model.js +1 -1
- package/lib/browser/doc-model/editor-document-model.js.map +1 -1
- package/lib/browser/editor.contribution.d.ts +2 -0
- package/lib/browser/editor.contribution.d.ts.map +1 -1
- package/lib/browser/editor.contribution.js +34 -0
- package/lib/browser/editor.contribution.js.map +1 -1
- package/lib/browser/editor.module.less +49 -3
- package/lib/browser/merge-editor/MergeEditorFloatComponents.d.ts.map +1 -1
- package/lib/browser/merge-editor/MergeEditorFloatComponents.js +60 -1
- package/lib/browser/merge-editor/MergeEditorFloatComponents.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor.contribution.d.ts +0 -1
- package/lib/browser/merge-editor/merge-editor.contribution.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor.contribution.js +2 -6
- package/lib/browser/merge-editor/merge-editor.contribution.js.map +1 -1
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.service.d.ts +1 -3
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.service.d.ts.map +1 -1
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.service.js.map +1 -1
- package/lib/browser/preference/converter.d.ts.map +1 -1
- package/lib/browser/preference/converter.js +51 -2
- package/lib/browser/preference/converter.js.map +1 -1
- package/lib/browser/preference/schema.d.ts +17 -0
- package/lib/browser/preference/schema.d.ts.map +1 -1
- package/lib/browser/preference/schema.js +74 -19
- package/lib/browser/preference/schema.js.map +1 -1
- package/lib/browser/workbench-editor.service.d.ts.map +1 -1
- package/lib/browser/workbench-editor.service.js +3 -0
- package/lib/browser/workbench-editor.service.js.map +1 -1
- package/package.json +13 -13
- package/src/browser/diff/compare.ts +38 -21
- package/src/browser/doc-model/editor-document-model.ts +2 -1
- package/src/browser/editor.contribution.ts +36 -0
- package/src/browser/editor.module.less +49 -3
- package/src/browser/merge-editor/MergeEditorFloatComponents.tsx +101 -4
- package/src/browser/merge-editor/merge-editor.contribution.ts +4 -8
- package/src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts +1 -2
- package/src/browser/preference/converter.ts +56 -3
- package/src/browser/preference/schema.ts +75 -18
- package/src/browser/workbench-editor.service.ts +2 -0
|
@@ -7,8 +7,26 @@ const ide_components_1 = require("@opensumi/ide-components");
|
|
|
7
7
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
8
8
|
const editor_module_less_1 = tslib_1.__importDefault(require("../editor.module.less"));
|
|
9
9
|
const MergeEditorFloatComponents = ({ resource }) => {
|
|
10
|
+
const aiNativeConfigService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.AINativeConfigService);
|
|
10
11
|
const commandService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.CommandService);
|
|
11
12
|
const commandRegistry = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.CommandRegistry);
|
|
13
|
+
const contextKeyService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.IContextKeyService);
|
|
14
|
+
const [isVisiable, setIsVisiable] = (0, react_1.useState)(false);
|
|
15
|
+
const gitMergeChangesSet = new Set(['git.mergeChanges']);
|
|
16
|
+
(0, react_1.useEffect)(() => {
|
|
17
|
+
const run = () => {
|
|
18
|
+
const mergeChanges = contextKeyService.getValue('git.mergeChanges') || [];
|
|
19
|
+
setIsVisiable(mergeChanges.some((value) => value.toString() === resource.uri.toString()));
|
|
20
|
+
};
|
|
21
|
+
const disposed = contextKeyService.onDidChangeContext(({ payload }) => {
|
|
22
|
+
if (payload.affectsSome(gitMergeChangesSet)) {
|
|
23
|
+
run();
|
|
24
|
+
}
|
|
25
|
+
});
|
|
26
|
+
run();
|
|
27
|
+
return () => disposed.dispose();
|
|
28
|
+
}, [resource]);
|
|
29
|
+
const [isAiResolving, setIsAiResolving] = (0, react_1.useState)(false);
|
|
12
30
|
const handleOpenMergeEditor = (0, react_1.useCallback)(async () => {
|
|
13
31
|
const { uri } = resource;
|
|
14
32
|
[ide_core_browser_1.SCM_COMMANDS.GIT_OPEN_MERGE_EDITOR, ide_core_browser_1.SCM_COMMANDS._GIT_OPEN_MERGE_EDITOR].forEach(({ id: command }) => {
|
|
@@ -17,8 +35,49 @@ const MergeEditorFloatComponents = ({ resource }) => {
|
|
|
17
35
|
}
|
|
18
36
|
});
|
|
19
37
|
}, [resource]);
|
|
38
|
+
const isSupportAiResolve = (0, react_1.useCallback)(() => aiNativeConfigService.capabilities.supportsConflictResolve, [aiNativeConfigService]);
|
|
39
|
+
const handlePrev = () => {
|
|
40
|
+
commandService.tryExecuteCommand('merge-conflict.previous');
|
|
41
|
+
};
|
|
42
|
+
const handleNext = () => {
|
|
43
|
+
commandService.tryExecuteCommand('merge-conflict.next');
|
|
44
|
+
};
|
|
45
|
+
const handleAIResolve = (0, react_1.useCallback)(async () => {
|
|
46
|
+
setIsAiResolving(true);
|
|
47
|
+
if (isAiResolving) {
|
|
48
|
+
await commandService.executeCommand('merge-conflict.ai.all-accept-stop', resource.uri);
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
await commandService.executeCommand('merge-conflict.ai.all-accept', resource.uri);
|
|
52
|
+
}
|
|
53
|
+
setIsAiResolving(false);
|
|
54
|
+
}, [resource, isAiResolving]);
|
|
55
|
+
const handleReset = (0, react_1.useCallback)(() => {
|
|
56
|
+
commandService.executeCommand('merge-conflict.ai.all-reset', resource.uri);
|
|
57
|
+
}, [resource]);
|
|
58
|
+
if (!isVisiable) {
|
|
59
|
+
return null;
|
|
60
|
+
}
|
|
20
61
|
return (react_1.default.createElement("div", { className: editor_module_less_1.default.merge_editor_float_container },
|
|
21
|
-
react_1.default.createElement(
|
|
62
|
+
react_1.default.createElement("div", { id: 'merge.editor.action.button.accept' },
|
|
63
|
+
react_1.default.createElement(ide_components_1.Button, { className: editor_module_less_1.default.merge_conflict_bottom_btn, size: 'large', onClick: handlePrev },
|
|
64
|
+
react_1.default.createElement(ide_components_1.Icon, { icon: 'left' }),
|
|
65
|
+
react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.conflict.prev'))),
|
|
66
|
+
react_1.default.createElement(ide_components_1.Button, { className: editor_module_less_1.default.merge_conflict_bottom_btn, size: 'large', onClick: handleNext },
|
|
67
|
+
react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.conflict.next')),
|
|
68
|
+
react_1.default.createElement(ide_components_1.Icon, { icon: 'right' }))),
|
|
69
|
+
react_1.default.createElement("span", { className: editor_module_less_1.default.line_vertical }),
|
|
70
|
+
react_1.default.createElement(ide_components_1.Button, { id: 'merge.editor.open.tradition', className: editor_module_less_1.default.merge_conflict_bottom_btn, size: 'large', onClick: handleOpenMergeEditor },
|
|
71
|
+
react_1.default.createElement(ide_components_1.Icon, { icon: 'swap' }),
|
|
72
|
+
react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.open.3way'))),
|
|
73
|
+
react_1.default.createElement(ide_components_1.Button, { id: 'merge.editor.rest', className: editor_module_less_1.default.merge_conflict_bottom_btn, size: 'large', onClick: handleReset },
|
|
74
|
+
react_1.default.createElement(ide_components_1.Icon, { icon: 'discard' }),
|
|
75
|
+
react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.reset'))),
|
|
76
|
+
isSupportAiResolve() && (react_1.default.createElement(ide_components_1.Button, { id: 'merge.editor.conflict.resolve.all', size: 'large', className: `${editor_module_less_1.default.merge_conflict_bottom_btn} ${editor_module_less_1.default.magic_btn}`, onClick: handleAIResolve }, isAiResolving ? (react_1.default.createElement(react_1.default.Fragment, null,
|
|
77
|
+
react_1.default.createElement(ide_components_1.Icon, { icon: 'circle-pause' }),
|
|
78
|
+
react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.conflict.resolve.all.stop')))) : (react_1.default.createElement(react_1.default.Fragment, null,
|
|
79
|
+
react_1.default.createElement(ide_components_1.Icon, { icon: 'magic-wand' }),
|
|
80
|
+
react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.conflict.resolve.all'))))))));
|
|
22
81
|
};
|
|
23
82
|
exports.MergeEditorFloatComponents = MergeEditorFloatComponents;
|
|
24
83
|
//# sourceMappingURL=MergeEditorFloatComponents.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MergeEditorFloatComponents.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"MergeEditorFloatComponents.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,6 @@ import { ResourceService } from '../../common';
|
|
|
3
3
|
import { BrowserEditorContribution, EditorComponentRegistry } from '../types';
|
|
4
4
|
export declare class MergeEditorContribution extends Disposable implements BrowserEditorContribution {
|
|
5
5
|
private readonly mergeEditorResourceProvider;
|
|
6
|
-
private readonly contextKeyService;
|
|
7
6
|
registerResource(resourceService: ResourceService): void;
|
|
8
7
|
registerEditorComponent(registry: EditorComponentRegistry): void;
|
|
9
8
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor.contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.contribution.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"merge-editor.contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.contribution.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAmB,MAAM,4BAA4B,CAAC;AAEzE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAkB,MAAM,UAAU,CAAC;AAO9F,qBACa,uBAAwB,SAAQ,UAAW,YAAW,yBAAyB;IAE1F,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAA8B;IAE1E,gBAAgB,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI;IAIxD,uBAAuB,CAAC,QAAQ,EAAE,uBAAuB;CAoB1D"}
|
|
@@ -26,8 +26,8 @@ let MergeEditorContribution = class MergeEditorContribution extends ide_core_bro
|
|
|
26
26
|
if (uri.scheme !== ide_core_browser_1.Schemes.file) {
|
|
27
27
|
return false;
|
|
28
28
|
}
|
|
29
|
-
|
|
30
|
-
return
|
|
29
|
+
// 由于存在时序问题，具体是否显示的逻辑由组件内部处理
|
|
30
|
+
return true;
|
|
31
31
|
},
|
|
32
32
|
});
|
|
33
33
|
}
|
|
@@ -36,10 +36,6 @@ tslib_1.__decorate([
|
|
|
36
36
|
(0, di_1.Autowired)(),
|
|
37
37
|
tslib_1.__metadata("design:type", merge_editor_provider_1.MergeEditorResourceProvider)
|
|
38
38
|
], MergeEditorContribution.prototype, "mergeEditorResourceProvider", void 0);
|
|
39
|
-
tslib_1.__decorate([
|
|
40
|
-
(0, di_1.Autowired)(ide_core_browser_1.IContextKeyService),
|
|
41
|
-
tslib_1.__metadata("design:type", Object)
|
|
42
|
-
], MergeEditorContribution.prototype, "contextKeyService", void 0);
|
|
43
39
|
MergeEditorContribution = tslib_1.__decorate([
|
|
44
40
|
(0, ide_core_browser_1.Domain)(types_1.BrowserEditorContribution)
|
|
45
41
|
], MergeEditorContribution);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor.contribution.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAAyC;AACzC,
|
|
1
|
+
{"version":3,"file":"merge-editor.contribution.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAAyC;AACzC,iEAAyE;AAGzE,oCAA8F;AAE9F,mEAAsE;AACtE,6EAA0E;AAE1E,MAAM,4BAA4B,GAAG,8BAA8B,CAAC;AAG7D,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,6BAAU;IAIrD,gBAAgB,CAAC,eAAgC;QAC/C,eAAe,CAAC,wBAAwB,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IAC7E,CAAC;IAED,uBAAuB,CAAC,QAAiC;QACvD,QAAQ,CAAC,+BAA+B,CAAC,sBAAc,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE;YAClF,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,sBAAc,CAAC,WAAW;aACjC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,wBAAwB,CAAC;YAChC,EAAE,EAAE,4BAA4B;YAChC,SAAS,EAAE,uDAA0B;YACrC,kBAAkB,EAAE,CAAC,QAAQ,EAAE,EAAE;gBAC/B,MAAM,EAAE,GAAG,EAAE,GAAG,QAAQ,CAAC;gBACzB,IAAI,GAAG,CAAC,MAAM,KAAK,0BAAO,CAAC,IAAI,EAAE;oBAC/B,OAAO,KAAK,CAAC;iBACd;gBACD,4BAA4B;gBAC5B,OAAO,IAAI,CAAC;YACd,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA3BC;IAAC,IAAA,cAAS,GAAE;sCACkC,mDAA2B;4EAAC;AAF/D,uBAAuB;IADnC,IAAA,yBAAM,EAAC,iCAAyB,CAAC;GACrB,uBAAuB,CA4BnC;AA5BY,0DAAuB"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { CancellationToken, IPosition, RefCountedDisposable, Uri } from '@opensumi/ide-core-common';
|
|
2
2
|
import { CallHierarchyItem, CallHierarchyProvider, ICallHierarchyService, IncomingCall, OutgoingCall } from '@opensumi/ide-monaco/lib/browser/contrib/callHierarchy';
|
|
3
|
-
import { ITextModel, Position } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
|
|
3
|
+
import { ITextModel, Position, ProviderResult } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
|
|
4
4
|
import { IEditorDocumentModelService } from '../../doc-model/types';
|
|
5
|
-
declare type ProviderResult<T> = T | undefined | null | Thenable<T | undefined | null>;
|
|
6
5
|
export declare class CallHierarchyModel {
|
|
7
6
|
readonly id: string;
|
|
8
7
|
readonly provider: CallHierarchyProvider;
|
|
@@ -24,5 +23,4 @@ export declare class CallHierarchyService implements ICallHierarchyService {
|
|
|
24
23
|
provideIncomingCalls(item: CallHierarchyItem): ProviderResult<IncomingCall[]>;
|
|
25
24
|
provideOutgoingCalls(item: CallHierarchyItem): ProviderResult<OutgoingCall[]>;
|
|
26
25
|
}
|
|
27
|
-
export {};
|
|
28
26
|
//# sourceMappingURL=callHierarchy.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callHierarchy.service.d.ts","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAEjB,SAAS,EACT,oBAAoB,EAEpB,GAAG,EAGJ,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EAErB,qBAAqB,EACrB,YAAY,EACZ,YAAY,EACb,MAAM,wDAAwD,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,mDAAmD,CAAC;
|
|
1
|
+
{"version":3,"file":"callHierarchy.service.d.ts","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAEjB,SAAS,EACT,oBAAoB,EAEpB,GAAG,EAGJ,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EAErB,qBAAqB,EACrB,YAAY,EACZ,YAAY,EACb,MAAM,wDAAwD,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,mDAAmD,CAAC;AAEzG,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAUpE,qBAAa,kBAAkB;IAyB3B,QAAQ,CAAC,EAAE,EAAE,MAAM;IACnB,QAAQ,CAAC,QAAQ,EAAE,qBAAqB;IACxC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,EAAE;IACnC,QAAQ,CAAC,GAAG,EAAE,oBAAoB;WA3BvB,MAAM,CACjB,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,SAAS,EACnB,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAiB1C,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC;IAEjC,OAAO;IASP,OAAO,IAAI,IAAI;IAIf,IAAI,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAS3C,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAYhG,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAWvG;AAED,qBACa,oBAAqB,YAAW,qBAAqB;IAEhE,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,2BAA2B,CAAC;IAE7D,OAAO,CAAC,MAAM,CAA0E;IAExF,6BAA6B,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,qBAAqB;IAItE,4BAA4B,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ;IA4BpE,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,GAAG,cAAc,CAAC,YAAY,EAAE,CAAC;IAS7E,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,GAAG,cAAc,CAAC,YAAY,EAAE,CAAC;CAQ9E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callHierarchy.service.js","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,+DASmC;AACnC,0FAOgE;AAGhE,iDAAoE;AAEpE,MAAM,EAAE,eAAe,EAAE,GAAG,wBAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"callHierarchy.service.js","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"converter.d.ts","sourceRoot":"","sources":["../../../src/browser/preference/converter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iFAAiF,CAAC;AAExH,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAInD;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,oBAAoB,EAAE,qBAAqB,EAC3C,WAAW,CAAC,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,MAAM,EAAE,GACrB,uBAAuB,
|
|
1
|
+
{"version":3,"file":"converter.d.ts","sourceRoot":"","sources":["../../../src/browser/preference/converter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iFAAiF,CAAC;AAExH,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAInD;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,oBAAoB,EAAE,qBAAqB,EAC3C,WAAW,CAAC,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,MAAM,EAAE,GACrB,uBAAuB,CAiFzB;AAED,KAAK,WAAW,GAAG,KAAK,CAAC;AACzB,KAAK,oBAAoB,GAAG,MAAM,CAAC;AACnC,KAAK,mBAAmB,GAAG,MAAM,CAAC;AAClC;;GAEG;AACH,UAAU,uBAAuB;IAC/B;;OAEG;IACH,MAAM,EAAE,mBAAmB,CAAC;IAC5B;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;CAC/B;AACD;;GAEG;AACH,eAAO,MAAM,uBAAuB,EAAE,GAAG,CAAC,oBAAoB,EAAE,WAAW,GAAG,uBAAuB,CAmoBnG,CAAC;AAEH,eAAO,MAAM,gCAAgC,EAAE,GAAG,CAAC,oBAAoB,EAAE,WAAW,GAAG,uBAAuB,CAM1G,CAAC;AAEL,eAAO,MAAM,2BAA2B,EAAE,GAAG,CAAC,oBAAoB,EAAE,WAAW,GAAG,uBAAuB,CA8EvG,CAAC;AAkBH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,WAMzC;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEvD"}
|
|
@@ -34,7 +34,12 @@ function getConvertedMonacoOptions(configurationService, resourceUri, language,
|
|
|
34
34
|
}
|
|
35
35
|
else {
|
|
36
36
|
const converter = exports.editorOptionsConverters.get(key);
|
|
37
|
-
editorOptions[converter.monaco]
|
|
37
|
+
if (!editorOptions[converter.monaco]) {
|
|
38
|
+
editorOptions[converter.monaco] = converter.convert ? converter.convert(value) : value;
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
editorOptions[converter.monaco] = Object.assign(Object.assign({}, editorOptions[converter.monaco]), (converter.convert ? converter.convert(value) : value));
|
|
42
|
+
}
|
|
38
43
|
}
|
|
39
44
|
});
|
|
40
45
|
textModelUpdateOptionsKeys.forEach((key) => {
|
|
@@ -66,7 +71,12 @@ function getConvertedMonacoOptions(configurationService, resourceUri, language,
|
|
|
66
71
|
}
|
|
67
72
|
else {
|
|
68
73
|
const converter = exports.diffEditorOptionsConverters.get(key);
|
|
69
|
-
diffOptions[converter.monaco]
|
|
74
|
+
if (diffOptions[converter.monaco]) {
|
|
75
|
+
diffOptions[converter.monaco] = Object.assign(Object.assign({}, diffOptions[converter.monaco]), (converter.convert ? converter.convert(value) : value));
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
diffOptions[converter.monaco] = converter.convert ? converter.convert(value) : value;
|
|
79
|
+
}
|
|
70
80
|
}
|
|
71
81
|
});
|
|
72
82
|
return {
|
|
@@ -661,6 +671,45 @@ exports.diffEditorOptionsConverters = new Map([
|
|
|
661
671
|
}),
|
|
662
672
|
},
|
|
663
673
|
],
|
|
674
|
+
/**
|
|
675
|
+
* Controls whether the diff editor shows unchanged regions.
|
|
676
|
+
*/
|
|
677
|
+
[
|
|
678
|
+
'diffEditor.hideUnchangedRegions.enabled',
|
|
679
|
+
{ monaco: 'hideUnchangedRegions', convert: (value) => ({ enabled: value }) },
|
|
680
|
+
],
|
|
681
|
+
/**
|
|
682
|
+
* Controls how many lines are used for unchanged regions.
|
|
683
|
+
*/
|
|
684
|
+
[
|
|
685
|
+
'diffEditor.hideUnchangedRegions.revealLineCount',
|
|
686
|
+
{ monaco: 'hideUnchangedRegions', convert: (value) => ({ revealLineCount: value }) },
|
|
687
|
+
],
|
|
688
|
+
/**
|
|
689
|
+
* Controls how many lines are used as a minimum for unchanged regions.
|
|
690
|
+
*/
|
|
691
|
+
[
|
|
692
|
+
'diffEditor.hideUnchangedRegions.minimumLineCount',
|
|
693
|
+
{ monaco: 'hideUnchangedRegions', convert: (value) => ({ minimumLineCount: value }) },
|
|
694
|
+
],
|
|
695
|
+
/**
|
|
696
|
+
* Controls how many lines are used as context when comparing unchanged regions.
|
|
697
|
+
*/
|
|
698
|
+
[
|
|
699
|
+
'diffEditor.hideUnchangedRegions.contextLineCount',
|
|
700
|
+
{ monaco: 'hideUnchangedRegions', convert: (value) => ({ contextLineCount: value }) },
|
|
701
|
+
],
|
|
702
|
+
/**
|
|
703
|
+
* Controls whether the diff editor should show detected code moves.
|
|
704
|
+
*/
|
|
705
|
+
['diffEditor.experimental.showMoves', { monaco: 'experimental', convert: (value) => ({ showMoves: value }) }],
|
|
706
|
+
/**
|
|
707
|
+
* Controls whether the diff editor shows empty decorations to see where characters got inserted or deleted.
|
|
708
|
+
*/
|
|
709
|
+
[
|
|
710
|
+
'diffEditor.experimental.showEmptyDecorations',
|
|
711
|
+
{ monaco: 'experimental', convert: (value) => ({ showEmptyDecorations: value }) },
|
|
712
|
+
],
|
|
664
713
|
]);
|
|
665
714
|
function isContainOptionKey(key, optionMap) {
|
|
666
715
|
if (optionMap.has(key)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../../src/browser/preference/converter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"converter.js","sourceRoot":"","sources":["../../../src/browser/preference/converter.ts"],"names":[],"mappings":"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"}
|
|
@@ -221,6 +221,23 @@ export declare const EDITOR_DEFAULTS: {
|
|
|
221
221
|
codeActionsOnSaveTimeout: number;
|
|
222
222
|
};
|
|
223
223
|
};
|
|
224
|
+
export declare const DIFF_EDITOR_DEFAULTS: {
|
|
225
|
+
renderIndicators: boolean;
|
|
226
|
+
minimap: boolean;
|
|
227
|
+
renderSideBySide: boolean;
|
|
228
|
+
ignoreTrimWhitespace: boolean;
|
|
229
|
+
hideUnchangedRegions: {
|
|
230
|
+
enabled: boolean;
|
|
231
|
+
revealLineCount: number;
|
|
232
|
+
minimumLineCount: number;
|
|
233
|
+
contextLineCount: number;
|
|
234
|
+
};
|
|
235
|
+
experimental: {
|
|
236
|
+
showMoves: boolean;
|
|
237
|
+
showEmptyDecorations: boolean;
|
|
238
|
+
collapseUnchangedRegions: boolean;
|
|
239
|
+
};
|
|
240
|
+
};
|
|
224
241
|
export declare const editorPreferenceSchema: PreferenceSchema;
|
|
225
242
|
export declare const EditorPreferences: unique symbol;
|
|
226
243
|
export type EditorPreferences = PreferenceProxy<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/browser/preference/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,gBAAgB,EAKjB,MAAM,4BAA4B,CAAC;AAEpC,eAAO,MAAM,qBAAqB,sCAAsC,CAAC;AAMzE,eAAO,MAAM,oBAAoB;;;;;;;;;;;;CAYhC,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;;;;;CAOjC,CAAC;AAEF,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwCnC,CAAC;AAEF,eAAO,MAAM,8BAA8B;;;CAG1C,CAAC;AAEF,0BAAkB,cAAc;IAC9B;;OAEG;IACH,IAAI,IAAI;IACR;;OAEG;IACH,IAAI,IAAI;IACR;;OAEG;IACH,MAAM,IAAI;IACV;;OAEG;IACH,UAAU,IAAI;CACf;AAED,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuI3B,CAAC;
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/browser/preference/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,gBAAgB,EAKjB,MAAM,4BAA4B,CAAC;AAEpC,eAAO,MAAM,qBAAqB,sCAAsC,CAAC;AAMzE,eAAO,MAAM,oBAAoB;;;;;;;;;;;;CAYhC,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;;;;;CAOjC,CAAC;AAEF,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwCnC,CAAC;AAEF,eAAO,MAAM,8BAA8B;;;CAG1C,CAAC;AAEF,0BAAkB,cAAc;IAC9B;;OAEG;IACH,IAAI,IAAI;IACR;;OAEG;IACH,IAAI,IAAI;IACR;;OAEG;IACH,MAAM,IAAI;IACV;;OAEG;IACH,UAAU,IAAI;CACf;AAED,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuI3B,CAAC;AAEF,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;CAgBhC,CAAC;AAs6CF,eAAO,MAAM,sBAAsB,EAAE,gBAMpC,CAAC;AAEF,eAAO,MAAM,iBAAiB,eAA6B,CAAC;AAC5D,MAAM,MAAM,iBAAiB,GAAG,eAAe,CAAC;IAC9C,sBAAsB,EAAE,MAAM,EAAE,CAAC;IACjC,oBAAoB,EAAE,OAAO,CAAC;IAC9B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.EditorPreferences = exports.editorPreferenceSchema = exports.EDITOR_DEFAULTS = exports.EDITOR_INLINE_SUGGEST_DEFAULTS = exports.EDITOR_SUGGEST_DEFAULTS = exports.EDITOR_MODEL_DEFAULTS = exports.EDITOR_FONT_DEFAULTS = exports.USUAL_WORD_SEPARATORS = void 0;
|
|
3
|
+
exports.EditorPreferences = exports.editorPreferenceSchema = exports.DIFF_EDITOR_DEFAULTS = exports.EDITOR_DEFAULTS = exports.EDITOR_INLINE_SUGGEST_DEFAULTS = exports.EDITOR_SUGGEST_DEFAULTS = exports.EDITOR_MODEL_DEFAULTS = exports.EDITOR_FONT_DEFAULTS = exports.USUAL_WORD_SEPARATORS = void 0;
|
|
4
4
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
5
5
|
exports.USUAL_WORD_SEPARATORS = '`~!@#$%^&*()-=+[{]}\\|;:\'",.<>/?';
|
|
6
6
|
const DEFAULT_WINDOWS_FONT_FAMILY = "Consolas, 'Courier New', monospace";
|
|
@@ -105,7 +105,7 @@ exports.EDITOR_DEFAULTS = {
|
|
|
105
105
|
extraEditorClassName: '',
|
|
106
106
|
disableMonospaceOptimizations: false,
|
|
107
107
|
rulers: [],
|
|
108
|
-
ariaLabel: (0, ide_core_browser_1.localize)('editorViewAccessibleLabel', 'Editor
|
|
108
|
+
ariaLabel: (0, ide_core_browser_1.localize)('editorViewAccessibleLabel', 'Editor Content'),
|
|
109
109
|
renderLineNumbers: 0,
|
|
110
110
|
renderCustomLineNumbers: null,
|
|
111
111
|
renderFinalNewline: true,
|
|
@@ -205,6 +205,23 @@ exports.EDITOR_DEFAULTS = {
|
|
|
205
205
|
codeActionsOnSaveTimeout: 750,
|
|
206
206
|
},
|
|
207
207
|
};
|
|
208
|
+
exports.DIFF_EDITOR_DEFAULTS = {
|
|
209
|
+
renderIndicators: true,
|
|
210
|
+
minimap: false,
|
|
211
|
+
renderSideBySide: true,
|
|
212
|
+
ignoreTrimWhitespace: false,
|
|
213
|
+
hideUnchangedRegions: {
|
|
214
|
+
enabled: true,
|
|
215
|
+
revealLineCount: 20,
|
|
216
|
+
minimumLineCount: 3,
|
|
217
|
+
contextLineCount: 3,
|
|
218
|
+
},
|
|
219
|
+
experimental: {
|
|
220
|
+
showMoves: false,
|
|
221
|
+
showEmptyDecorations: true,
|
|
222
|
+
collapseUnchangedRegions: true,
|
|
223
|
+
},
|
|
224
|
+
};
|
|
208
225
|
const monacoEditorSchema = {
|
|
209
226
|
'editor.ariaLabel': {
|
|
210
227
|
type: 'string',
|
|
@@ -1278,15 +1295,6 @@ const monacoEditorSchema = {
|
|
|
1278
1295
|
default: exports.EDITOR_MODEL_DEFAULTS.largeFileOptimizations,
|
|
1279
1296
|
description: '%editor.configuration.largeFileOptimizations%',
|
|
1280
1297
|
},
|
|
1281
|
-
'diffEditor.renderIndicators': {
|
|
1282
|
-
type: 'boolean',
|
|
1283
|
-
default: true,
|
|
1284
|
-
description: '%editor.configuration.renderIndicators%',
|
|
1285
|
-
},
|
|
1286
|
-
'diffEditor.minimap': {
|
|
1287
|
-
type: 'boolean',
|
|
1288
|
-
default: false,
|
|
1289
|
-
},
|
|
1290
1298
|
'editor.defaultFormatter': {
|
|
1291
1299
|
type: 'string',
|
|
1292
1300
|
description: '%editor.configuration.defaultFormatter%',
|
|
@@ -1296,6 +1304,15 @@ const monacoEditorSchema = {
|
|
|
1296
1304
|
default: true,
|
|
1297
1305
|
description: '%editor.configuration.unicodeHighlight.ambiguousCharacters%',
|
|
1298
1306
|
},
|
|
1307
|
+
'diffEditor.renderIndicators': {
|
|
1308
|
+
type: 'boolean',
|
|
1309
|
+
default: exports.DIFF_EDITOR_DEFAULTS.renderIndicators,
|
|
1310
|
+
description: '%editor.configuration.renderIndicators%',
|
|
1311
|
+
},
|
|
1312
|
+
'diffEditor.minimap': {
|
|
1313
|
+
type: 'boolean',
|
|
1314
|
+
default: exports.DIFF_EDITOR_DEFAULTS.minimap,
|
|
1315
|
+
},
|
|
1299
1316
|
};
|
|
1300
1317
|
const customEditorSchema = {
|
|
1301
1318
|
'editor.tokenColorCustomizations': {
|
|
@@ -1481,25 +1498,63 @@ const customEditorSchema = {
|
|
|
1481
1498
|
type: 'string',
|
|
1482
1499
|
},
|
|
1483
1500
|
},
|
|
1484
|
-
'
|
|
1501
|
+
'editor.experimental.stickyScroll.enabled': {
|
|
1502
|
+
type: 'boolean',
|
|
1503
|
+
default: false,
|
|
1504
|
+
description: '%editor.configuration.experimental.stickyScroll.enabled%',
|
|
1505
|
+
},
|
|
1506
|
+
'editor.mouseBackForwardToNavigate': {
|
|
1485
1507
|
type: 'boolean',
|
|
1486
1508
|
default: true,
|
|
1509
|
+
description: '%editor.configuration.mouseBackForwardToNavigate%',
|
|
1510
|
+
},
|
|
1511
|
+
'diffEditor.renderSideBySide': {
|
|
1512
|
+
type: 'boolean',
|
|
1513
|
+
default: exports.DIFF_EDITOR_DEFAULTS.renderSideBySide,
|
|
1487
1514
|
description: '%diffEditor.configuration.renderSideBySide%',
|
|
1488
1515
|
},
|
|
1489
1516
|
'diffEditor.ignoreTrimWhitespace': {
|
|
1490
1517
|
type: 'boolean',
|
|
1491
|
-
default:
|
|
1518
|
+
default: exports.DIFF_EDITOR_DEFAULTS.ignoreTrimWhitespace,
|
|
1492
1519
|
description: '%diffEditor.configuration.ignoreTrimWhitespace%',
|
|
1493
1520
|
},
|
|
1494
|
-
'
|
|
1521
|
+
'diffEditor.hideUnchangedRegions.enabled': {
|
|
1495
1522
|
type: 'boolean',
|
|
1496
|
-
default:
|
|
1497
|
-
description: '
|
|
1523
|
+
default: exports.DIFF_EDITOR_DEFAULTS.hideUnchangedRegions.enabled,
|
|
1524
|
+
description: 'Controls whether the diff editor shows unchanged regions.',
|
|
1498
1525
|
},
|
|
1499
|
-
'
|
|
1526
|
+
'diffEditor.hideUnchangedRegions.revealLineCount': {
|
|
1527
|
+
type: 'integer',
|
|
1528
|
+
default: exports.DIFF_EDITOR_DEFAULTS.hideUnchangedRegions.revealLineCount,
|
|
1529
|
+
description: 'Controls how many lines are used for unchanged regions.',
|
|
1530
|
+
minimum: 1,
|
|
1531
|
+
},
|
|
1532
|
+
'diffEditor.hideUnchangedRegions.minimumLineCount': {
|
|
1533
|
+
type: 'integer',
|
|
1534
|
+
default: exports.DIFF_EDITOR_DEFAULTS.hideUnchangedRegions.minimumLineCount,
|
|
1535
|
+
description: 'Controls how many lines are used as a minimum for unchanged regions.',
|
|
1536
|
+
minimum: 1,
|
|
1537
|
+
},
|
|
1538
|
+
'diffEditor.hideUnchangedRegions.contextLineCount': {
|
|
1539
|
+
type: 'integer',
|
|
1540
|
+
default: exports.DIFF_EDITOR_DEFAULTS.hideUnchangedRegions.contextLineCount,
|
|
1541
|
+
description: 'Controls how many lines are used as context when comparing unchanged regions.',
|
|
1542
|
+
minimum: 1,
|
|
1543
|
+
},
|
|
1544
|
+
'diffEditor.experimental.showMoves': {
|
|
1500
1545
|
type: 'boolean',
|
|
1501
|
-
default:
|
|
1502
|
-
description: '
|
|
1546
|
+
default: exports.DIFF_EDITOR_DEFAULTS.experimental.showMoves,
|
|
1547
|
+
description: 'Controls whether the diff editor should show detected code moves.',
|
|
1548
|
+
},
|
|
1549
|
+
'diffEditor.experimental.showEmptyDecorations': {
|
|
1550
|
+
type: 'boolean',
|
|
1551
|
+
default: exports.DIFF_EDITOR_DEFAULTS.experimental.showEmptyDecorations,
|
|
1552
|
+
description: 'Controls whether the diff editor shows empty decorations to see where characters got inserted or deleted.',
|
|
1553
|
+
},
|
|
1554
|
+
'diffEditor.experimental.collapseUnchangedRegions': {
|
|
1555
|
+
type: 'boolean',
|
|
1556
|
+
default: exports.DIFF_EDITOR_DEFAULTS.experimental.collapseUnchangedRegions,
|
|
1557
|
+
description: 'Controls whether the diff editor shows unchanged regions.',
|
|
1503
1558
|
},
|
|
1504
1559
|
};
|
|
1505
1560
|
exports.editorPreferenceSchema = {
|