@opensumi/ide-core-browser 2.16.7-next-1649326301.0 → 2.16.7
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/application/application.service.d.ts +4 -4
- package/lib/application/application.service.d.ts.map +1 -1
- package/lib/application/application.service.js.map +1 -1
- package/lib/authentication/authentication.service.d.ts +0 -2
- package/lib/authentication/authentication.service.d.ts.map +1 -1
- package/lib/authentication/authentication.service.js +2 -23
- package/lib/authentication/authentication.service.js.map +1 -1
- package/lib/common/common.command.d.ts +2 -4
- package/lib/common/common.command.d.ts.map +1 -1
- package/lib/common/common.command.js +17 -23
- package/lib/common/common.command.js.map +1 -1
- package/lib/common/common.contribution.d.ts.map +1 -1
- package/lib/common/common.contribution.js +0 -17
- package/lib/common/common.contribution.js.map +1 -1
- package/lib/components/actions/index.d.ts.map +1 -1
- package/lib/components/actions/index.js +4 -5
- package/lib/components/actions/index.js.map +1 -1
- package/lib/components/actions/styles.module.less +1 -1
- package/lib/components/index.d.ts +0 -1
- package/lib/components/index.d.ts.map +1 -1
- package/lib/components/index.js +0 -1
- package/lib/components/index.js.map +1 -1
- package/lib/core-preferences.d.ts.map +1 -1
- package/lib/core-preferences.js +3 -14
- package/lib/core-preferences.js.map +1 -1
- package/lib/dom/index.js +4 -4
- package/lib/dom/index.js.map +1 -1
- package/lib/encoding-registry.d.ts.map +1 -1
- package/lib/encoding-registry.js +4 -4
- package/lib/encoding-registry.js.map +1 -1
- package/lib/hash-calculate/hash-calculate.contribution.d.ts +1 -1
- package/lib/hash-calculate/hash-calculate.contribution.d.ts.map +1 -1
- package/lib/hash-calculate/hash-calculate.contribution.js +1 -1
- package/lib/hash-calculate/hash-calculate.contribution.js.map +1 -1
- package/lib/keyboard/keys.js +2 -2
- package/lib/keyboard/keys.js.map +1 -1
- package/lib/layout/layout-state.js +2 -2
- package/lib/layout/layout-state.js.map +1 -1
- package/lib/markdown/index.d.ts.map +1 -1
- package/lib/markdown/index.js +9 -8
- package/lib/markdown/index.js.map +1 -1
- package/lib/menu/next/ctxmenu-service.d.ts +2 -1
- package/lib/menu/next/ctxmenu-service.d.ts.map +1 -1
- package/lib/menu/next/ctxmenu-service.js +6 -5
- package/lib/menu/next/ctxmenu-service.js.map +1 -1
- package/lib/menu/next/menu.interface.d.ts +3 -1
- package/lib/menu/next/menu.interface.d.ts.map +1 -1
- package/lib/menu/next/menu.interface.js +1 -1
- package/lib/menu/next/menu.interface.js.map +1 -1
- package/lib/menu/next/menubar-service.d.ts +2 -1
- package/lib/menu/next/menubar-service.d.ts.map +1 -1
- package/lib/menu/next/menubar-service.js +9 -8
- package/lib/menu/next/menubar-service.js.map +1 -1
- package/lib/menu/next/renderer/ctxmenu/browser.js +2 -2
- package/lib/menu/next/renderer/ctxmenu/browser.js.map +1 -1
- package/lib/menu/next/renderer/ctxmenu/electron.d.ts +1 -2
- package/lib/menu/next/renderer/ctxmenu/electron.d.ts.map +1 -1
- package/lib/menu/next/renderer/ctxmenu/electron.js +6 -6
- package/lib/menu/next/renderer/ctxmenu/electron.js.map +1 -1
- package/lib/menu/next/toolbar-action.service.d.ts +1 -1
- package/lib/menu/next/toolbar-action.service.d.ts.map +1 -1
- package/lib/menu/next/toolbar-action.service.js +3 -3
- package/lib/menu/next/toolbar-action.service.js.map +1 -1
- package/lib/monaco/index.d.ts +21 -12
- package/lib/monaco/index.d.ts.map +1 -1
- package/lib/monaco/index.js.map +1 -1
- package/lib/preferences/index.d.ts +0 -1
- package/lib/preferences/index.d.ts.map +1 -1
- package/lib/preferences/index.js +0 -1
- package/lib/preferences/index.js.map +1 -1
- package/lib/preferences/preference-provider.d.ts +7 -3
- package/lib/preferences/preference-provider.d.ts.map +1 -1
- package/lib/preferences/preference-provider.js +5 -6
- package/lib/preferences/preference-provider.js.map +1 -1
- package/lib/preferences/preference-proxy.d.ts +1 -1
- package/lib/preferences/preference-proxy.d.ts.map +1 -1
- package/lib/preferences/preference-service.d.ts +68 -7
- package/lib/preferences/preference-service.d.ts.map +1 -1
- package/lib/preferences/preference-service.js +5 -5
- package/lib/preferences/preference-service.js.map +1 -1
- package/lib/preferences/settings.d.ts +1 -5
- package/lib/preferences/settings.d.ts.map +1 -1
- package/lib/progress/progress.service.d.ts.map +1 -1
- package/lib/progress/progress.service.js +8 -9
- package/lib/progress/progress.service.js.map +1 -1
- package/lib/quick-open/recent-files.d.ts +1 -1
- package/lib/quick-open/recent-files.d.ts.map +1 -1
- package/lib/quick-open/recent-files.js +2 -2
- package/lib/quick-open/recent-files.js.map +1 -1
- package/lib/react-providers/config-provider.d.ts +3 -3
- package/lib/react-providers/config-provider.d.ts.map +1 -1
- package/lib/services/label-service.d.ts.map +1 -1
- package/lib/services/label-service.js +1 -2
- package/lib/services/label-service.js.map +1 -1
- package/lib/services/status-bar-service.d.ts +1 -2
- package/lib/services/status-bar-service.d.ts.map +1 -1
- package/lib/services/status-bar-service.js.map +1 -1
- package/lib/style/icon/icon.d.ts +2 -2
- package/lib/style/icon/icon.d.ts.map +1 -1
- package/lib/style/icon/icon.js +3 -3
- package/lib/style/icon/icon.js.map +1 -1
- package/lib/style/icon/ide-iconfont.d.ts +1 -1
- package/lib/style/icon/ide-iconfont.js +1 -1
- package/lib/style/monaco-override.less +0 -1
- package/lib/style/override.less +1 -1
- package/lib/toolbar/toolbar.d.ts.map +1 -1
- package/lib/toolbar/toolbar.js +2 -2
- package/lib/toolbar/toolbar.js.map +1 -1
- package/lib/toolbar/toolbar.popover.registry.d.ts +1 -1
- package/lib/toolbar/toolbar.popover.registry.d.ts.map +1 -1
- package/lib/toolbar/toolbar.popover.registry.js +2 -1
- package/lib/toolbar/toolbar.popover.registry.js.map +1 -1
- package/lib/toolbar/toolbar.registry.d.ts +5 -3
- package/lib/toolbar/toolbar.registry.d.ts.map +1 -1
- package/lib/toolbar/toolbar.registry.js +5 -0
- package/lib/toolbar/toolbar.registry.js.map +1 -1
- package/lib/utils/index.d.ts +0 -1
- package/lib/utils/index.d.ts.map +1 -1
- package/lib/utils/index.js +0 -1
- package/lib/utils/index.js.map +1 -1
- package/lib/utils/react-hooks.d.ts.map +1 -1
- package/lib/utils/react-hooks.js +4 -5
- package/lib/utils/react-hooks.js.map +1 -1
- package/lib/window/window.service.d.ts +1 -0
- package/lib/window/window.service.d.ts.map +1 -1
- package/lib/window/window.service.js +5 -2
- package/lib/window/window.service.js.map +1 -1
- package/package.json +8 -7
- package/lib/components/scroll/index.d.ts +0 -68
- package/lib/components/scroll/index.d.ts.map +0 -1
- package/lib/components/scroll/index.js +0 -279
- package/lib/components/scroll/index.js.map +0 -1
- package/lib/components/scroll/scroll.module.less +0 -108
- package/lib/preferences/types.d.ts +0 -72
- package/lib/preferences/types.d.ts.map +0 -1
- package/lib/preferences/types.js +0 -6
- package/lib/preferences/types.js.map +0 -1
- package/lib/utils/json.d.ts +0 -76
- package/lib/utils/json.d.ts.map +0 -1
- package/lib/utils/json.js +0 -188
- package/lib/utils/json.js.map +0 -1
|
@@ -49,7 +49,7 @@ let MenuItemNode = class MenuItemNode extends base_1.MenuNode {
|
|
|
49
49
|
// 取 priority 最高的 keybinding 作展示
|
|
50
50
|
const highPriorityKeybinding = keybindings.reduce((a, b) => ((a.priority || 0) > (b.priority || 0) ? a : b));
|
|
51
51
|
const isKeyCombination = Array.isArray(highPriorityKeybinding.resolved) && highPriorityKeybinding.resolved.length > 1;
|
|
52
|
-
let keybinding = this.keybindings.acceleratorFor(highPriorityKeybinding, ide_core_common_1.
|
|
52
|
+
let keybinding = this.keybindings.acceleratorFor(highPriorityKeybinding, ide_core_common_1.isOSX ? '' : '+').join(' ');
|
|
53
53
|
if (isKeyCombination) {
|
|
54
54
|
keybinding = `[${keybinding}]`;
|
|
55
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu.interface.js","sourceRoot":"","sources":["../../../src/menu/next/menu.interface.ts"],"names":[],"mappings":";;;;;AAAA,qCAA+D;AAC/D,+
|
|
1
|
+
{"version":3,"file":"menu.interface.js","sourceRoot":"","sources":["../../../src/menu/next/menu.interface.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { Disposable
|
|
1
|
+
import { Disposable } from '@opensumi/ide-core-common/lib/disposable';
|
|
2
|
+
import { Event } from '@opensumi/ide-core-common/lib/event';
|
|
2
3
|
import { IMenubarItem, MenuNode } from './base';
|
|
3
4
|
export declare abstract class AbstractMenubarService extends Disposable {
|
|
4
5
|
readonly onDidMenubarChange: Event<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menubar-service.d.ts","sourceRoot":"","sources":["../../../src/menu/next/menubar-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,UAAU,EAAE,KAAK,EAAW,MAAM,
|
|
1
|
+
{"version":3,"file":"menubar-service.d.ts","sourceRoot":"","sources":["../../../src/menu/next/menubar-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,UAAU,EAAE,MAAM,0CAA0C,CAAC;AACnF,OAAO,EAAE,KAAK,EAAW,MAAM,qCAAqC,CAAC;AAErE,OAAO,EAAE,YAAY,EAAiB,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAI/D,8BAAsB,sBAAuB,SAAQ,UAAU;IAC7D,QAAQ,CAAC,kBAAkB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IACzC,QAAQ,CAAC,eAAe,IAAI,YAAY,EAAE;IAC1C,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAEjE,QAAQ,CAAC,eAAe,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACxC,QAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,EAAE;IACjD,QAAQ,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;CAChD;AAED,qBACa,kBAAmB,SAAQ,UAAW,YAAW,sBAAsB;IAElF,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAsB;IAGlD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAE7C;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAuB;IAC3D,IAAW,kBAAkB,IAAI,KAAK,CAAC,IAAI,CAAC,CAE3C;IAED,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAyB;IAC1D,IAAW,eAAe,IAAI,KAAK,CAAC,MAAM,CAAC,CAE1C;IAED,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAyB;IAEvD,OAAO,KAAK,YAAY,GAEvB;IAED,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,MAAM,CAAiC;IAE/C,OAAO,CAAC,aAAa,CAAsB;IAC3C,OAAO,CAAC,UAAU,CAAsC;IAExD,OAAO,CAAC,cAAc,CAAuC;;IAmB7D,OAAO,CAAC,MAAM;IAsBd,OAAO,CAAC,uBAAuB;IAK/B;;;;OAIG;IACH,OAAO,CAAC,WAAW;IA4BnB;;;;;OAKG;IACH,OAAO,CAAC,kBAAkB;IAgCnB,OAAO;IAQP,eAAe;IAIf,cAAc,CAAC,MAAM,EAAE,MAAM;IAQ7B,YAAY,CAAC,MAAM,EAAE,MAAM;IAM3B,gBAAgB,CAAC,MAAM,EAAE,MAAM;CAGvC"}
|
|
@@ -3,14 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.MenubarServiceImpl = exports.AbstractMenubarService = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const di_1 = require("@opensumi/di");
|
|
6
|
-
const
|
|
6
|
+
const disposable_1 = require("@opensumi/ide-core-common/lib/disposable");
|
|
7
|
+
const event_1 = require("@opensumi/ide-core-common/lib/event");
|
|
7
8
|
const base_1 = require("./base");
|
|
8
9
|
const menu_util_1 = require("./menu-util");
|
|
9
10
|
const menu_interface_1 = require("./menu.interface");
|
|
10
|
-
class AbstractMenubarService extends
|
|
11
|
+
class AbstractMenubarService extends disposable_1.Disposable {
|
|
11
12
|
}
|
|
12
13
|
exports.AbstractMenubarService = AbstractMenubarService;
|
|
13
|
-
let MenubarServiceImpl = class MenubarServiceImpl extends
|
|
14
|
+
let MenubarServiceImpl = class MenubarServiceImpl extends disposable_1.Disposable {
|
|
14
15
|
constructor() {
|
|
15
16
|
super();
|
|
16
17
|
/**
|
|
@@ -18,9 +19,9 @@ let MenubarServiceImpl = class MenubarServiceImpl extends ide_core_common_1.Disp
|
|
|
18
19
|
* undefined 表示整个都需要刷新
|
|
19
20
|
* 带了 menuId 只需要刷新单个 MenuBarItem
|
|
20
21
|
*/
|
|
21
|
-
this._onDidMenuBarChange = new
|
|
22
|
-
this._onDidMenuChange = new
|
|
23
|
-
this._onMenuChange = new
|
|
22
|
+
this._onDidMenuBarChange = new event_1.Emitter();
|
|
23
|
+
this._onDidMenuChange = new event_1.Emitter();
|
|
24
|
+
this._onMenuChange = new event_1.Emitter();
|
|
24
25
|
this._menubarIds = new Set();
|
|
25
26
|
this._menus = new Map();
|
|
26
27
|
this._menubarItems = [];
|
|
@@ -28,9 +29,9 @@ let MenubarServiceImpl = class MenubarServiceImpl extends ide_core_common_1.Disp
|
|
|
28
29
|
this._menusListener = new Map();
|
|
29
30
|
this._build();
|
|
30
31
|
// 监听 menubar 刷新事件
|
|
31
|
-
this.addDispose(
|
|
32
|
+
this.addDispose(event_1.Event.debounce(this.menuRegistry.onDidChangeMenubar, () => { }, 50)(this._build, this));
|
|
32
33
|
// 监听内部的 onMenuChange 刷新单个 menubarItem 下的所有节点
|
|
33
|
-
this.addDispose(
|
|
34
|
+
this.addDispose(event_1.Event.debounce(this.onMenuChange, (l, menuId) => menuId, 50)(this._rebuildSingleRootMenus, this));
|
|
34
35
|
this.addDispose(this._onDidMenuBarChange);
|
|
35
36
|
this.addDispose(this._onDidMenuChange);
|
|
36
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menubar-service.js","sourceRoot":"","sources":["../../../src/menu/next/menubar-service.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,+
|
|
1
|
+
{"version":3,"file":"menubar-service.js","sourceRoot":"","sources":["../../../src/menu/next/menubar-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.BrowserCtxMenuRenderer = exports.IBrowserCtxMenu = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const
|
|
5
|
+
const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
|
|
6
6
|
const di_1 = require("@opensumi/di");
|
|
7
7
|
const menu_interface_1 = require("../../menu.interface");
|
|
8
8
|
const base_1 = require("./base");
|
|
@@ -22,7 +22,7 @@ let BrowserCtxMenuRenderer = class BrowserCtxMenuRenderer {
|
|
|
22
22
|
payload.menuNodes = menus.getMergedMenuNodes();
|
|
23
23
|
menus.dispose();
|
|
24
24
|
}
|
|
25
|
-
this.browserCtxMenu.show((0,
|
|
25
|
+
this.browserCtxMenu.show((0, lodash_omit_1.default)(payload, ['contextKeyService']));
|
|
26
26
|
}
|
|
27
27
|
};
|
|
28
28
|
tslib_1.__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../../../src/menu/next/renderer/ctxmenu/browser.ts"],"names":[],"mappings":";;;;AAAA
|
|
1
|
+
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../../../../src/menu/next/renderer/ctxmenu/browser.ts"],"names":[],"mappings":";;;;AAAA,sEAA+B;AAE/B,qCAAqD;AAGrD,yDAAkE;AAElE,iCAA+D;AAE/D,MAAsB,eAAgB,SAAQ,uBAAgB;CAU7D;AAVD,0CAUC;AAGD,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAO1B,IAAI,CAAC,OAA4B;QACtC,IAAI,OAAO,OAAO,CAAC,SAAS,KAAK,QAAQ,EAAE;YACzC,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC;gBACxC,EAAE,EAAE,OAAO,CAAC,SAAS;gBACrB,MAAM,EAAE;oBACN,IAAI,EAAE,OAAO,CAAC,IAAI;iBACnB;gBACD,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;aAC7C,CAAC,CAAC;YACH,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC,kBAAkB,EAAE,CAAC;YAC/C,KAAK,CAAC,OAAO,EAAE,CAAC;SACjB;QAED,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAA,qBAAI,EAAC,OAAO,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;IACjE,CAAC;CACF,CAAA;AApBC;IADC,IAAA,cAAS,EAAC,eAAe,CAAC;sCACQ,eAAe;8DAAC;AAGnD;IADC,IAAA,cAAS,EAAC,2CAA0B,CAAC;sCACR,2CAA0B;2DAAC;AAL9C,sBAAsB;IADlC,IAAA,eAAU,GAAE;GACA,sBAAsB,CAsBlC;AAtBY,wDAAsB"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import { INativeMenuTemplate, CommandService } from '@opensumi/ide-core-common';
|
|
2
|
-
import { Disposable } from '@opensumi/ide-core-common';
|
|
1
|
+
import { Disposable, INativeMenuTemplate, CommandService } from '@opensumi/ide-core-common';
|
|
3
2
|
import { MenuNode } from '../../base';
|
|
4
3
|
import { AbstractMenubarService } from '../../menubar-service';
|
|
5
4
|
import { CtxMenuRenderParams, ICtxMenuRenderer } from './base';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron.d.ts","sourceRoot":"","sources":["../../../../../src/menu/next/renderer/ctxmenu/electron.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAA4B,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"electron.d.ts","sourceRoot":"","sources":["../../../../../src/menu/next/renderer/ctxmenu/electron.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,cAAc,EAA4B,MAAM,2BAA2B,CAAC;AAItH,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAE/D,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAE/D,8BAAsB,wBAAyB,SAAQ,gBAAgB;CAAG;AAE1E,eAAO,MAAM,oBAAoB,eAAiC,CAAC;AAEnE,eAAO,MAAM,uBAAuB,eAAoC,CAAC;AAEzE,MAAM,WAAW,uBAAuB;IACtC,KAAK,QAAG;CACT;AAED,qBACa,mBAAoB,SAAQ,UAAU;IAC1C,WAAW,CAChB,SAAS,EAAE,QAAQ,EAAE,EACrB,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,EAC5B,OAAO,CAAC,EAAE,GAAG,EAAE,GACd,mBAAmB,EAAE,GAAG,SAAS;IA8BpC,OAAO,CAAC,UAAU;CAOnB;AAED,qBACa,uBAAwB,YAAW,wBAAwB;IACtE,OAAO,CAAC,kBAAkB,CAAiC;IAEhC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAG7E,OAAO,CAAC,uBAAuB,CAA2B;IAG1D,OAAO,EAAE,mBAAmB,CAAC;IAG7B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA6B;IAElD,IAAI,CAAC,OAAO,EAAE,mBAAmB;IAwBxC,uBAAuB,CAAC,QAAQ,EAAE,mBAAmB,EAAE,MAAM,CAAC,EAAE,CAAC,QAAQ,KAAA,KAAK,IAAI;CA+BnF;AAMD,qBACa,sBAAuB,YAAW,uBAAuB;IACpE,OAAO,CAAC,cAAc,CAAiC;IAE5B,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAG7E,cAAc,EAAE,sBAAsB,CAAC;IAGvC,OAAO,CAAC,uBAAuB,CAA2B;IAG1D,OAAO,EAAE,mBAAmB,CAAC;IAE7B,KAAK;IAoBL,aAAa;CAqBd"}
|
|
@@ -4,7 +4,7 @@ exports.ElectronMenuBarService = exports.ElectronCtxMenuRenderer = exports.Elect
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const di_1 = require("@opensumi/di");
|
|
6
6
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
7
|
-
const
|
|
7
|
+
const strings_1 = require("@opensumi/ide-core-common/lib/utils/strings");
|
|
8
8
|
const utils_1 = require("../../../../utils");
|
|
9
9
|
const menu_interface_1 = require("../../menu.interface");
|
|
10
10
|
const menubar_service_1 = require("../../menubar-service");
|
|
@@ -14,7 +14,7 @@ class IElectronCtxMenuRenderer extends base_1.ICtxMenuRenderer {
|
|
|
14
14
|
exports.IElectronCtxMenuRenderer = IElectronCtxMenuRenderer;
|
|
15
15
|
exports.IElectronMenuFactory = Symbol('IElectronMenuFactory');
|
|
16
16
|
exports.IElectronMenuBarService = Symbol('IElectronMenuBarService');
|
|
17
|
-
let ElectronMenuFactory = class ElectronMenuFactory extends
|
|
17
|
+
let ElectronMenuFactory = class ElectronMenuFactory extends ide_core_common_1.Disposable {
|
|
18
18
|
getTemplate(menuNodes, map, context) {
|
|
19
19
|
return menuNodes.map((menuNode) => {
|
|
20
20
|
if (menuNode.id === menu_interface_1.SeparatorMenuItemNode.ID) {
|
|
@@ -23,7 +23,7 @@ let ElectronMenuFactory = class ElectronMenuFactory extends ide_core_common_2.Di
|
|
|
23
23
|
if (menuNode.id === menu_interface_1.SubmenuItemNode.ID) {
|
|
24
24
|
const submenuTemplate = this.getTemplate(menuNode.children, map, context);
|
|
25
25
|
return {
|
|
26
|
-
label: `${
|
|
26
|
+
label: `${(0, strings_1.mnemonicButtonLabel)(menuNode.label, true)}`,
|
|
27
27
|
submenu: Array.isArray(submenuTemplate) && submenuTemplate.length ? submenuTemplate : undefined,
|
|
28
28
|
};
|
|
29
29
|
}
|
|
@@ -32,7 +32,7 @@ let ElectronMenuFactory = class ElectronMenuFactory extends ide_core_common_2.Di
|
|
|
32
32
|
return {
|
|
33
33
|
type: menuNode.checked ? 'checkbox' : undefined,
|
|
34
34
|
checked: menuNode.checked ? menuNode.checked : false,
|
|
35
|
-
label: `${
|
|
35
|
+
label: `${(0, strings_1.mnemonicButtonLabel)(menuNode.label, true)} ${menuNode.isKeyCombination ? menuNode.keybinding : ''}`,
|
|
36
36
|
id: menuNode.id,
|
|
37
37
|
action: true,
|
|
38
38
|
role: menuNode.nativeRole,
|
|
@@ -84,7 +84,7 @@ let ElectronCtxMenuRenderer = class ElectronCtxMenuRenderer {
|
|
|
84
84
|
}
|
|
85
85
|
createNativeContextMenu(template, onHide) {
|
|
86
86
|
this.electronMainMenuService.showContextMenu(template, utils_1.electronEnv.currentWebContentsId);
|
|
87
|
-
const disposer = new
|
|
87
|
+
const disposer = new ide_core_common_1.Disposable();
|
|
88
88
|
disposer.addDispose(this.electronMainMenuService.on('menuClose', (targetId, contextMenuId) => {
|
|
89
89
|
if (targetId !== utils_1.electronEnv.currentWebContentsId + '-context') {
|
|
90
90
|
return;
|
|
@@ -165,7 +165,7 @@ let ElectronMenuBarService = class ElectronMenuBarService {
|
|
|
165
165
|
const templates = this.factory.getTemplate(menuNodes, this.menuBarActions);
|
|
166
166
|
if (templates && templates.length > 0) {
|
|
167
167
|
const template = {
|
|
168
|
-
label:
|
|
168
|
+
label: (0, strings_1.mnemonicButtonLabel)(item.label, true),
|
|
169
169
|
submenu: templates,
|
|
170
170
|
};
|
|
171
171
|
if (item.nativeRole) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron.js","sourceRoot":"","sources":["../../../../../src/menu/next/renderer/ctxmenu/electron.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,+
|
|
1
|
+
{"version":3,"file":"electron.js","sourceRoot":"","sources":["../../../../../src/menu/next/renderer/ctxmenu/electron.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolbar-action.service.d.ts","sourceRoot":"","sources":["../../../src/menu/next/toolbar-action.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"toolbar-action.service.d.ts","sourceRoot":"","sources":["../../../src/menu/next/toolbar-action.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,0CAA0C,CAAC;AAEnF,OAAO,EAAE,gBAAgB,EAA0B,MAAM,eAAe,CAAC;AAGzE,UAAU,WAAW;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;GAEG;AACH,UAAU,cAAe,SAAQ,WAAW;IAC1C,IAAI,EAAE,QAAQ,CAAC;IACf,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;GAEG;AACH,UAAU,cAAe,SAAQ,WAAW;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,oBAAY,mBAAmB,GAAG,KAAK,CAAC,cAAc,GAAG,cAAc,CAAC,CAAC;AAEzE;;GAEG;AACH,eAAO,MAAM,qBAAqB,eAAmC,CAAC;AAEtE;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,mBAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,GAAG,WAAW,CAAC;IAC1E,qBAAqB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;CACzC;AAED;;GAEG;AACH,qBACa,oBAAqB,SAAQ,UAAW,YAAW,qBAAqB;IACnF,OAAO,CAAC,MAAM,CAAkC;IAGhD,QAAQ,EAAE,gBAAgB,CAAC;;IAMpB,mBAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,mBAAmB,GAAG,WAAW;IAgExE,qBAAqB,CAAC,EAAE,EAAE,MAAM;CAKxC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.ToolbarActionService = exports.IToolbarActionService = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const di_1 = require("@opensumi/di");
|
|
6
|
-
const
|
|
6
|
+
const disposable_1 = require("@opensumi/ide-core-common/lib/disposable");
|
|
7
7
|
const toolbar_1 = require("../../toolbar");
|
|
8
8
|
const select_1 = require("../../toolbar/components/select");
|
|
9
9
|
/**
|
|
@@ -13,13 +13,13 @@ exports.IToolbarActionService = Symbol('IToolBarActionsService');
|
|
|
13
13
|
/**
|
|
14
14
|
* @deprecated 使用 IToolbarRegistry 执行相关能力
|
|
15
15
|
*/
|
|
16
|
-
let ToolbarActionService = class ToolbarActionService extends
|
|
16
|
+
let ToolbarActionService = class ToolbarActionService extends disposable_1.Disposable {
|
|
17
17
|
constructor() {
|
|
18
18
|
super();
|
|
19
19
|
this.groups = new Map();
|
|
20
20
|
}
|
|
21
21
|
registryActionGroup(id, group) {
|
|
22
|
-
const disposer = new
|
|
22
|
+
const disposer = new disposable_1.Disposable();
|
|
23
23
|
disposer.addDispose(this.registry.registerToolbarActionGroup({
|
|
24
24
|
id,
|
|
25
25
|
preferredLocation: 'menu-right',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolbar-action.service.js","sourceRoot":"","sources":["../../../src/menu/next/toolbar-action.service.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD
|
|
1
|
+
{"version":3,"file":"toolbar-action.service.js","sourceRoot":"","sources":["../../../src/menu/next/toolbar-action.service.ts"],"names":[],"mappings":"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"}
|
package/lib/monaco/index.d.ts
CHANGED
|
@@ -1,12 +1,9 @@
|
|
|
1
1
|
import type { ICodeEditor, IDiffEditor, IEditorConstructionOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
|
|
2
|
-
import
|
|
3
|
-
import
|
|
4
|
-
import
|
|
5
|
-
import
|
|
6
|
-
import
|
|
7
|
-
import type { ISelectedSuggestion, SuggestWidget } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/suggest/suggestWidget';
|
|
8
|
-
import type { BrandedService } from '@opensumi/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation';
|
|
9
|
-
import { Event, IJSONSchema, IDisposable, BasicEvent } from '..';
|
|
2
|
+
import { IDiffEditorConstructionOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
|
|
3
|
+
import { ITextModel } from '@opensumi/monaco-editor-core/esm/vs/editor/common/model';
|
|
4
|
+
import * as suggest from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/suggest/suggestWidget';
|
|
5
|
+
import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
|
|
6
|
+
import { Event, IJSONSchema, IContextKeyService, IDisposable, BasicEvent } from '..';
|
|
10
7
|
export declare enum ServiceNames {
|
|
11
8
|
CODE_EDITOR_SERVICE = "codeEditorService",
|
|
12
9
|
TEXT_MODEL_SERVICE = "textModelService",
|
|
@@ -17,9 +14,12 @@ export declare enum ServiceNames {
|
|
|
17
14
|
OPENER_SERVICE = "openerService"
|
|
18
15
|
}
|
|
19
16
|
export declare abstract class MonacoService {
|
|
17
|
+
abstract onMonacoLoaded: Event<boolean>;
|
|
18
|
+
abstract monacoLoaded: Promise<void>;
|
|
20
19
|
abstract createCodeEditor(monacoContainer: HTMLElement, options?: IEditorConstructionOptions, overrides?: {
|
|
21
20
|
[key: string]: any;
|
|
22
21
|
}): ICodeEditor;
|
|
22
|
+
abstract loadMonaco(): Promise<void>;
|
|
23
23
|
abstract createDiffEditor(monacoContainer: HTMLElement, options?: IDiffEditorConstructionOptions, overrides?: {
|
|
24
24
|
[key: string]: any;
|
|
25
25
|
}): IDiffEditor;
|
|
@@ -35,11 +35,20 @@ export declare abstract class MonacoOverrideServiceRegistry {
|
|
|
35
35
|
};
|
|
36
36
|
}
|
|
37
37
|
export declare const MonacoContribution: unique symbol;
|
|
38
|
-
export declare type FormattingSelectorType = (formatters: Array<DocumentFormattingEditProvider | DocumentRangeFormattingEditProvider>, document: ITextModel) => DocumentFormattingEditProvider | DocumentRangeFormattingEditProvider;
|
|
38
|
+
export declare type FormattingSelectorType = (formatters: Array<monaco.languages.DocumentFormattingEditProvider | monaco.languages.DocumentRangeFormattingEditProvider>, document: ITextModel) => monaco.languages.DocumentFormattingEditProvider | monaco.languages.DocumentRangeFormattingEditProvider;
|
|
39
39
|
export interface MonacoContribution {
|
|
40
|
+
/**
|
|
41
|
+
* @deprecated 请勿依赖 onMonacoLoaded
|
|
42
|
+
* @param monacoService
|
|
43
|
+
*/
|
|
44
|
+
onMonacoLoaded?(monacoService: MonacoService): any;
|
|
45
|
+
/**
|
|
46
|
+
* @deprecated 请勿依赖 onContextKeyServiceReady
|
|
47
|
+
* @param contextKeyService
|
|
48
|
+
*/
|
|
49
|
+
onContextKeyServiceReady?(contextKeyService: IContextKeyService): any;
|
|
40
50
|
registerOverrideService?(registry: MonacoOverrideServiceRegistry): void;
|
|
41
|
-
registerMonacoDefaultFormattingSelector?(registry: (selector:
|
|
42
|
-
registerEditorExtensionContribution?<Services extends BrandedService[]>(register: (id: string, contribCtor: new (editor: ICodeEditor, ...services: Services) => IEditorContribution) => void): void;
|
|
51
|
+
registerMonacoDefaultFormattingSelector?(registry: (selector: FormattingSelectorType) => void): void;
|
|
43
52
|
}
|
|
44
53
|
export declare const Extensions: {
|
|
45
54
|
JSONContribution: string;
|
|
@@ -83,7 +92,7 @@ export interface IMimeService {
|
|
|
83
92
|
}
|
|
84
93
|
export interface SuggestEventPayload {
|
|
85
94
|
eventType: 'onDidSelect' | 'onDidHide' | 'onDidShow' | 'onDidFocus';
|
|
86
|
-
data: ISelectedSuggestion | SuggestWidget;
|
|
95
|
+
data: suggest.ISelectedSuggestion | suggest.SuggestWidget;
|
|
87
96
|
}
|
|
88
97
|
export declare class SuggestEvent extends BasicEvent<SuggestEventPayload> {
|
|
89
98
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/monaco/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EACX,0BAA0B,EAC3B,MAAM,kEAAkE,CAAC;AAC1E,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/monaco/index.ts"],"names":[],"mappings":"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"}
|
package/lib/monaco/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/monaco/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/monaco/index.ts"],"names":[],"mappings":";;;AAUA,0BAAqF;AACrF,IAAY,YAQX;AARD,WAAY,YAAY;IACtB,yDAAyC,CAAA;IACzC,uDAAuC,CAAA;IACvC,2DAA2C,CAAA;IAC3C,kDAAkC,CAAA;IAClC,yDAAyC,CAAA;IACzC,2DAA2C,CAAA;IAC3C,gDAAgC,CAAA;AAClC,CAAC,EARW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAQvB;AAED,MAAsB,aAAa;CAuBlC;AAvBD,sCAuBC;AAED,MAAsB,6BAA6B;CAMlD;AAND,sEAMC;AAEY,QAAA,kBAAkB,GAAG,MAAM,CAAC,oBAAoB,CAAC,CAAC;AA0BlD,QAAA,UAAU,GAAG;IACxB,gBAAgB,EAAE,yBAAyB;CAC5C,CAAC;AAgBW,QAAA,mBAAmB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAEpD,QAAA,sBAAsB,GAAG,MAAM,CAAC,wBAAwB,CAAC,CAAC;AAc1D,QAAA,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAOtC,QAAA,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AAYnD,MAAa,YAAa,SAAQ,cAA+B;CAAG;AAApE,oCAAoE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/preferences/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAC5C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/preferences/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAC5C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC"}
|
package/lib/preferences/index.js
CHANGED
|
@@ -8,6 +8,5 @@ tslib_1.__exportStar(require("./preference-scope"), exports);
|
|
|
8
8
|
tslib_1.__exportStar(require("./preference-service"), exports);
|
|
9
9
|
tslib_1.__exportStar(require("./preference-proxy"), exports);
|
|
10
10
|
tslib_1.__exportStar(require("./early-preferences"), exports);
|
|
11
|
-
tslib_1.__exportStar(require("./types"), exports);
|
|
12
11
|
tslib_1.__exportStar(require("./settings"), exports);
|
|
13
12
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/preferences/index.ts"],"names":[],"mappings":";;;AAAA,sEAA4C;AAC5C,oEAA0C;AAC1C,gEAAsC;AACtC,6DAAmC;AACnC,+DAAqC;AACrC,6DAAmC;AACnC,8DAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/preferences/index.ts"],"names":[],"mappings":";;;AAAA,sEAA4C;AAC5C,oEAA0C;AAC1C,gEAAsC;AACtC,6DAAmC;AACnC,+DAAqC;AACrC,6DAAmC;AACnC,8DAAoC;AACpC,qDAA2B"}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
import { IDisposable, DisposableCollection, Event, URI, Deferred, FileStat } from '@opensumi/ide-core-common';
|
|
1
|
+
import { IDisposable, DisposableCollection, Event, URI, Deferred, JSONValue, FileStat } from '@opensumi/ide-core-common';
|
|
2
2
|
import { PreferenceScope } from '@opensumi/ide-core-common/lib/preferences/preference-scope';
|
|
3
|
-
import { JSONValue } from '../utils';
|
|
4
|
-
import { PreferenceResolveResult } from './types';
|
|
5
3
|
export interface IResolvedPreferences {
|
|
6
4
|
default: {
|
|
7
5
|
[key: string]: any;
|
|
@@ -30,6 +28,12 @@ export interface ILanguagePreferenceProviderDataChanges {
|
|
|
30
28
|
[preferenceName: string]: PreferenceProviderDataChange;
|
|
31
29
|
};
|
|
32
30
|
}
|
|
31
|
+
export interface PreferenceResolveResult<T> {
|
|
32
|
+
configUri?: URI;
|
|
33
|
+
value?: T;
|
|
34
|
+
scope?: PreferenceScope;
|
|
35
|
+
languageSpecific?: boolean;
|
|
36
|
+
}
|
|
33
37
|
export declare abstract class PreferenceProvider implements IDisposable {
|
|
34
38
|
readonly name: string;
|
|
35
39
|
private readonly onDidPreferencesChangedEmitter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-provider.d.ts","sourceRoot":"","sources":["../../src/preferences/preference-provider.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,oBAAoB,EAEpB,KAAK,EACL,GAAG,EACH,QAAQ,EAER,QAAQ,EACT,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,4DAA4D,CAAC;
|
|
1
|
+
{"version":3,"file":"preference-provider.d.ts","sourceRoot":"","sources":["../../src/preferences/preference-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@ exports.PreferenceProvider = void 0;
|
|
|
5
5
|
const tslib_1 = require("tslib");
|
|
6
6
|
const di_1 = require("@opensumi/di");
|
|
7
7
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
8
|
-
const utils_1 = require("../utils");
|
|
9
8
|
const early_preferences_1 = require("./early-preferences");
|
|
10
9
|
function transformReverse(delegates) {
|
|
11
10
|
const res = {};
|
|
@@ -244,21 +243,21 @@ let PreferenceProvider = PreferenceProvider_1 = class PreferenceProvider {
|
|
|
244
243
|
return undefined;
|
|
245
244
|
}
|
|
246
245
|
static merge(source, target) {
|
|
247
|
-
if (source === undefined || !
|
|
248
|
-
return
|
|
246
|
+
if (source === undefined || !ide_core_common_1.JSONUtils.isObject(source)) {
|
|
247
|
+
return ide_core_common_1.JSONUtils.deepCopy(target);
|
|
249
248
|
}
|
|
250
|
-
if (
|
|
249
|
+
if (ide_core_common_1.JSONUtils.isPrimitive(target)) {
|
|
251
250
|
return {};
|
|
252
251
|
}
|
|
253
252
|
for (const key of Object.keys(target)) {
|
|
254
253
|
const value = target[key];
|
|
255
254
|
if (key in source) {
|
|
256
|
-
if (
|
|
255
|
+
if (ide_core_common_1.JSONUtils.isObject(source[key]) && ide_core_common_1.JSONUtils.isObject(value)) {
|
|
257
256
|
this.merge(source[key], value);
|
|
258
257
|
continue;
|
|
259
258
|
}
|
|
260
259
|
}
|
|
261
|
-
source[key] =
|
|
260
|
+
source[key] = ide_core_common_1.JSONUtils.deepCopy(value);
|
|
262
261
|
}
|
|
263
262
|
return source;
|
|
264
263
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-provider.js","sourceRoot":"","sources":["../../src/preferences/preference-provider.ts"],"names":[],"mappings":";;;;;AAAA,qCAA0C;AAC1C,+
|
|
1
|
+
{"version":3,"file":"preference-provider.js","sourceRoot":"","sources":["../../src/preferences/preference-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Disposable, Event } from '@opensumi/ide-core-common';
|
|
2
2
|
import { PreferenceSchema } from './preference-contribution';
|
|
3
|
-
import { PreferenceService } from './
|
|
3
|
+
import { PreferenceService } from './preference-service';
|
|
4
4
|
export interface PreferenceChangeEvent<T> {
|
|
5
5
|
readonly preferenceName: keyof T;
|
|
6
6
|
readonly newValue?: T[keyof T];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-proxy.d.ts","sourceRoot":"","sources":["../../src/preferences/preference-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,EAA0C,MAAM,2BAA2B,CAAC;AAEtG,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"preference-proxy.d.ts","sourceRoot":"","sources":["../../src/preferences/preference-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,EAA0C,MAAM,2BAA2B,CAAC;AAEtG,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAEzD,MAAM,WAAW,qBAAqB,CAAC,CAAC;IACtC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IACjC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/B,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/B,OAAO,CAAC,WAAW,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACrE;AAED,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;;;;;;OAOG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;CAClC;AAED,MAAM,WAAW,sBAAsB,CAAC,CAAC;IACvC,QAAQ,CAAC,mBAAmB,EAAE,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9D,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,mBAAmB,CAAC,CAAC;IACpC,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;CAC5F;AAED,oBAAY,eAAe,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG,UAAU,GAAG,sBAAsB,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;AAE/G,wBAAgB,qBAAqB,CAAC,CAAC,EACrC,WAAW,EAAE,iBAAiB,EAC9B,MAAM,EAAE,gBAAgB,EACxB,OAAO,CAAC,EAAE,sBAAsB,GAC/B,eAAe,CAAC,CAAC,CAAC,CA6OpB"}
|