@theia/core 1.28.0-next.7 → 1.28.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/README.md +6 -6
- package/i18n/nls.cs.json +33 -2
- package/i18n/nls.de.json +33 -2
- package/i18n/nls.es.json +33 -2
- package/i18n/nls.fr.json +33 -2
- package/i18n/nls.hu.json +33 -2
- package/i18n/nls.it.json +33 -2
- package/i18n/nls.ja.json +33 -2
- package/i18n/nls.json +35 -4
- package/i18n/nls.pl.json +33 -2
- package/i18n/nls.pt-br.json +33 -2
- package/i18n/nls.pt-pt.json +33 -2
- package/i18n/nls.ru.json +33 -2
- package/i18n/nls.zh-cn.json +33 -2
- package/lib/browser/common-frontend-contribution.d.ts +1 -1
- package/lib/browser/common-frontend-contribution.d.ts.map +1 -1
- package/lib/browser/common-frontend-contribution.js +6 -5
- package/lib/browser/common-frontend-contribution.js.map +1 -1
- package/lib/browser/context-key-service.d.ts +3 -1
- package/lib/browser/context-key-service.d.ts.map +1 -1
- package/lib/browser/context-menu-renderer.d.ts +5 -0
- package/lib/browser/context-menu-renderer.d.ts.map +1 -1
- package/lib/browser/frontend-application-module.d.ts.map +1 -1
- package/lib/browser/frontend-application-module.js +2 -0
- package/lib/browser/frontend-application-module.js.map +1 -1
- package/lib/browser/frontend-application.d.ts +3 -2
- package/lib/browser/frontend-application.d.ts.map +1 -1
- package/lib/browser/frontend-application.js.map +1 -1
- package/lib/browser/keybinding.d.ts.map +1 -1
- package/lib/browser/keybinding.js +9 -7
- package/lib/browser/keybinding.js.map +1 -1
- package/lib/browser/keybinding.spec.js +13 -3
- package/lib/browser/keybinding.spec.js.map +1 -1
- package/lib/browser/menu/browser-context-menu-renderer.d.ts +1 -1
- package/lib/browser/menu/browser-context-menu-renderer.d.ts.map +1 -1
- package/lib/browser/menu/browser-context-menu-renderer.js +2 -2
- package/lib/browser/menu/browser-context-menu-renderer.js.map +1 -1
- package/lib/browser/menu/browser-menu-plugin.d.ts +23 -24
- package/lib/browser/menu/browser-menu-plugin.d.ts.map +1 -1
- package/lib/browser/menu/browser-menu-plugin.js +62 -79
- package/lib/browser/menu/browser-menu-plugin.js.map +1 -1
- package/lib/browser/resource-context-key.d.ts +1 -0
- package/lib/browser/resource-context-key.d.ts.map +1 -1
- package/lib/browser/resource-context-key.js +8 -6
- package/lib/browser/resource-context-key.js.map +1 -1
- package/lib/browser/shell/shell-layout-restorer.d.ts.map +1 -1
- package/lib/browser/shell/shell-layout-restorer.js +2 -1
- package/lib/browser/shell/shell-layout-restorer.js.map +1 -1
- package/lib/browser/shell/side-panel-toolbar.d.ts.map +1 -1
- package/lib/browser/shell/side-panel-toolbar.js +0 -1
- package/lib/browser/shell/side-panel-toolbar.js.map +1 -1
- package/lib/browser/shell/tab-bar-toolbar/index.d.ts +4 -0
- package/lib/browser/shell/tab-bar-toolbar/index.d.ts.map +1 -0
- package/lib/browser/shell/tab-bar-toolbar/index.js +31 -0
- package/lib/browser/shell/tab-bar-toolbar/index.js.map +1 -0
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.d.ts +16 -0
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.d.ts.map +1 -0
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.js +36 -0
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.js.map +1 -0
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.d.ts +51 -0
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.d.ts.map +1 -0
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.js +173 -0
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.js.map +1 -0
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.d.ts +119 -0
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.d.ts.map +1 -0
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.js +67 -0
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.js.map +1 -0
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar.d.ts +53 -0
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar.d.ts.map +1 -0
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar.js +264 -0
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar.js.map +1 -0
- package/lib/browser/shell/{tab-bar-toolbar.spec.d.ts → tab-bar-toolbar/tab-bar-toolbar.spec.d.ts} +0 -0
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar.spec.d.ts.map +1 -0
- package/lib/browser/shell/{tab-bar-toolbar.spec.js → tab-bar-toolbar/tab-bar-toolbar.spec.js} +3 -3
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar.spec.js.map +1 -0
- package/lib/browser/view-container.d.ts.map +1 -1
- package/lib/browser/view-container.js +1 -10
- package/lib/browser/view-container.js.map +1 -1
- package/lib/browser/widget-manager.d.ts.map +1 -1
- package/lib/browser/widget-manager.js +2 -1
- package/lib/browser/widget-manager.js.map +1 -1
- package/lib/browser/widget-manager.spec.js +13 -0
- package/lib/browser/widget-manager.spec.js.map +1 -1
- package/lib/browser/window/default-window-service.d.ts +2 -1
- package/lib/browser/window/default-window-service.d.ts.map +1 -1
- package/lib/browser/window/default-window-service.js +9 -4
- package/lib/browser/window/default-window-service.js.map +1 -1
- package/lib/browser/window/window-service.d.ts +2 -1
- package/lib/browser/window/window-service.d.ts.map +1 -1
- package/lib/browser/window/window-service.js.map +1 -1
- package/lib/common/color.d.ts +3 -0
- package/lib/common/color.d.ts.map +1 -1
- package/lib/common/frontend-application-state.d.ts +14 -0
- package/lib/common/frontend-application-state.d.ts.map +1 -1
- package/lib/common/frontend-application-state.js +16 -0
- package/lib/common/frontend-application-state.js.map +1 -1
- package/lib/common/menu/action-menu-node.d.ts +20 -0
- package/lib/common/menu/action-menu-node.d.ts.map +1 -0
- package/lib/common/menu/action-menu-node.js +57 -0
- package/lib/common/menu/action-menu-node.js.map +1 -0
- package/lib/common/menu/composite-menu-node.d.ts +52 -0
- package/lib/common/menu/composite-menu-node.d.ts.map +1 -0
- package/lib/common/menu/composite-menu-node.js +102 -0
- package/lib/common/menu/composite-menu-node.js.map +1 -0
- package/lib/common/menu/index.d.ts +6 -0
- package/lib/common/menu/index.d.ts.map +1 -0
- package/lib/common/menu/index.js +33 -0
- package/lib/common/menu/index.js.map +1 -0
- package/lib/common/menu/menu-adapter.d.ts +36 -0
- package/lib/common/menu/menu-adapter.d.ts.map +1 -0
- package/lib/common/menu/menu-adapter.js +101 -0
- package/lib/common/menu/menu-adapter.js.map +1 -0
- package/lib/common/{menu.d.ts → menu/menu-model-registry.d.ts} +22 -124
- package/lib/common/menu/menu-model-registry.d.ts.map +1 -0
- package/lib/common/{menu.js → menu/menu-model-registry.js} +71 -147
- package/lib/common/menu/menu-model-registry.js.map +1 -0
- package/lib/common/menu/menu-types.d.ts +120 -0
- package/lib/common/menu/menu-types.d.ts.map +1 -0
- package/lib/common/menu/menu-types.js +84 -0
- package/lib/common/menu/menu-types.js.map +1 -0
- package/lib/common/{menu.spec.d.ts → menu/menu.spec.d.ts} +0 -0
- package/lib/common/menu/menu.spec.d.ts.map +1 -0
- package/lib/common/{menu.spec.js → menu/menu.spec.js} +3 -3
- package/lib/common/menu/menu.spec.js.map +1 -0
- package/lib/common/message-rpc/rpc-message-encoder.d.ts +12 -11
- package/lib/common/message-rpc/rpc-message-encoder.d.ts.map +1 -1
- package/lib/common/message-rpc/rpc-message-encoder.js +21 -12
- package/lib/common/message-rpc/rpc-message-encoder.js.map +1 -1
- package/lib/common/messaging/abstract-connection-provider.d.ts +1 -1
- package/lib/common/messaging/abstract-connection-provider.js +3 -3
- package/lib/common/quick-pick-service.d.ts +1 -0
- package/lib/common/quick-pick-service.d.ts.map +1 -1
- package/lib/common/quick-pick-service.js.map +1 -1
- package/lib/electron-browser/menu/electron-context-menu-renderer.js +2 -2
- package/lib/electron-browser/menu/electron-context-menu-renderer.js.map +1 -1
- package/lib/electron-browser/menu/electron-main-menu-factory.d.ts +14 -5
- package/lib/electron-browser/menu/electron-main-menu-factory.d.ts.map +1 -1
- package/lib/electron-browser/menu/electron-main-menu-factory.js +71 -82
- package/lib/electron-browser/menu/electron-main-menu-factory.js.map +1 -1
- package/lib/electron-browser/menu/electron-menu-contribution.d.ts.map +1 -1
- package/lib/electron-browser/menu/electron-menu-contribution.js +6 -0
- package/lib/electron-browser/menu/electron-menu-contribution.js.map +1 -1
- package/lib/electron-browser/messaging/electron-ws-connection-provider.js +1 -1
- package/lib/electron-browser/window/electron-window-service.js +1 -1
- package/lib/electron-browser/window/electron-window-service.js.map +1 -1
- package/lib/electron-common/messaging/electron-messages.d.ts +3 -14
- package/lib/electron-common/messaging/electron-messages.d.ts.map +1 -1
- package/lib/electron-common/messaging/electron-messages.js +3 -16
- package/lib/electron-common/messaging/electron-messages.js.map +1 -1
- package/lib/electron-main/messaging/electron-messaging-contribution.d.ts +3 -3
- package/lib/electron-main/messaging/electron-messaging-contribution.js +6 -6
- package/package.json +7 -6
- package/src/browser/common-frontend-contribution.ts +6 -5
- package/src/browser/context-key-service.ts +1 -1
- package/src/browser/context-menu-renderer.ts +5 -0
- package/src/browser/frontend-application-module.ts +7 -1
- package/src/browser/frontend-application.ts +3 -2
- package/src/browser/keybinding.spec.ts +13 -3
- package/src/browser/keybinding.ts +8 -9
- package/src/browser/menu/browser-context-menu-renderer.ts +2 -2
- package/src/browser/menu/browser-menu-plugin.ts +74 -86
- package/src/browser/resource-context-key.ts +9 -6
- package/src/browser/shell/shell-layout-restorer.ts +2 -1
- package/src/browser/shell/side-panel-toolbar.ts +0 -1
- package/src/browser/shell/tab-bar-toolbar/index.ts +19 -0
- package/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-menu-adapters.ts +31 -0
- package/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-registry.ts +170 -0
- package/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar-types.ts +186 -0
- package/src/browser/shell/{tab-bar-toolbar.spec.ts → tab-bar-toolbar/tab-bar-toolbar.spec.ts} +2 -2
- package/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.tsx +261 -0
- package/src/browser/style/alert-messages.css +6 -0
- package/src/browser/view-container.ts +1 -10
- package/src/browser/widget-manager.spec.ts +14 -0
- package/src/browser/widget-manager.ts +2 -1
- package/src/browser/window/default-window-service.ts +9 -4
- package/src/browser/window/window-service.ts +2 -1
- package/src/common/color.ts +3 -0
- package/src/common/frontend-application-state.ts +15 -0
- package/src/common/menu/action-menu-node.ts +65 -0
- package/src/common/menu/composite-menu-node.ts +121 -0
- package/src/common/menu/index.ts +21 -0
- package/src/common/menu/menu-adapter.ts +103 -0
- package/src/common/{menu.ts → menu/menu-model-registry.ts} +61 -222
- package/src/common/menu/menu-types.ts +183 -0
- package/src/common/{menu.spec.ts → menu/menu.spec.ts} +3 -2
- package/src/common/message-rpc/rpc-message-encoder.ts +24 -13
- package/src/common/messaging/abstract-connection-provider.ts +4 -4
- package/src/common/quick-pick-service.ts +1 -0
- package/src/electron-browser/menu/electron-context-menu-renderer.ts +2 -2
- package/src/electron-browser/menu/electron-main-menu-factory.ts +82 -96
- package/src/electron-browser/menu/electron-menu-contribution.ts +8 -0
- package/src/electron-browser/messaging/electron-ws-connection-provider.ts +1 -1
- package/src/electron-browser/window/electron-window-service.ts +1 -1
- package/src/electron-common/messaging/electron-messages.ts +4 -15
- package/src/electron-main/messaging/electron-messaging-contribution.ts +8 -8
- package/lib/browser/shell/tab-bar-toolbar.d.ts +0 -186
- package/lib/browser/shell/tab-bar-toolbar.d.ts.map +0 -1
- package/lib/browser/shell/tab-bar-toolbar.js +0 -362
- package/lib/browser/shell/tab-bar-toolbar.js.map +0 -1
- package/lib/browser/shell/tab-bar-toolbar.spec.d.ts.map +0 -1
- package/lib/browser/shell/tab-bar-toolbar.spec.js.map +0 -1
- package/lib/common/menu.d.ts.map +0 -1
- package/lib/common/menu.js.map +0 -1
- package/lib/common/menu.spec.d.ts.map +0 -1
- package/lib/common/menu.spec.js.map +0 -1
- package/src/browser/shell/tab-bar-toolbar.tsx +0 -495
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-menu-contribution.js","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-menu-contribution.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"electron-menu-contribution.js","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-menu-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,7 @@ let ElectronWebSocketConnectionProvider = class ElectronWebSocketConnectionProvi
|
|
|
43
43
|
// Manually close the websocket connections `onStop`. Otherwise, the channels will be closed with 30 sec (`MessagingContribution#checkAliveTimeout`) delay.
|
|
44
44
|
// https://github.com/eclipse-theia/theia/issues/6499
|
|
45
45
|
// `1001` indicates that an endpoint is "going away", such as a server going down or a browser having navigated away from a page.
|
|
46
|
-
(_a = this.
|
|
46
|
+
(_a = this.channelMultiplexer) === null || _a === void 0 ? void 0 : _a.onUnderlyingChannelClose({ reason: 'The frontend is "going away"', code: 1001 });
|
|
47
47
|
}
|
|
48
48
|
async openChannel(path, handler, options) {
|
|
49
49
|
if (!this.stopping) {
|
|
@@ -69,7 +69,7 @@ let ElectronWindowService = class ElectronWindowService extends default_window_s
|
|
|
69
69
|
* after running FrontendApplication `onWillStop` handlers or on the `cancelChannel` if it is not safe to exit.
|
|
70
70
|
*/
|
|
71
71
|
async handleCloseRequestedEvent(event) {
|
|
72
|
-
const safeToClose = await this.isSafeToShutDown();
|
|
72
|
+
const safeToClose = await this.isSafeToShutDown(event.reason);
|
|
73
73
|
if (safeToClose) {
|
|
74
74
|
console.debug(`Shutting down because of ${electron_messages_1.StopReason[event.reason]} request.`);
|
|
75
75
|
electron.ipcRenderer.send(event.confirmChannel);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-window-service.js","sourceRoot":"","sources":["../../../src/electron-browser/window/electron-window-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,4EAA4E;AAC5E,yCAA8D;AAC9D,8DAA8D;AAE9D,wFAAmF;AACnF,qGAA+F;AAC/F,+EAA0E;AAC1E,yFAAuJ;AAGvJ,IAAa,qBAAqB,GAAlC,MAAa,qBAAsB,SAAQ,6CAAoB;IAA/D;;QAEI;;WAEG;QACO,gBAAW,GAAY,KAAK,CAAC;QAEvC;;WAEG;QACO,kBAAa,GAAY,KAAK,CAAC;IA6D7C,CAAC;IArDY,aAAa,CAAC,GAAW,EAAE,EAAE,QAAQ,KAAuB,EAAE;QACnE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC/C,OAAO,SAAS,CAAC;IACrB,CAAC;IAEQ,oBAAoB;QACzB,IAAI,CAAC,QAAQ,CAAC,oBAAoB,EAAE,CAAC;IACzC,CAAC;IAGS,IAAI;QACV,gFAAgF;QAChF,IAAI,CAAC,yBAAyB,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE;YACnD,IAAI,CAAC,CAAC,cAAc,KAAK,kBAAkB,EAAE;gBACzC,IAAI,CAAC,qBAAqB,EAAE,CAAC;aAChC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAEkB,uBAAuB;QACtC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,0CAAsB,EAAE,CAAC,MAAM,EAAE,iBAAwC,EAAE,EAAE,CAAC,IAAI,CAAC,yBAAyB,CAAC,iBAAiB,CAAC,CAAC,CAAC;QACzJ,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC;IACzE,CAAC;IAED;;;;OAIG;IACO,KAAK,CAAC,yBAAyB,CAAC,KAA4B;QAClE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,
|
|
1
|
+
{"version":3,"file":"electron-window-service.js","sourceRoot":"","sources":["../../../src/electron-browser/window/electron-window-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,4EAA4E;AAC5E,yCAA8D;AAC9D,8DAA8D;AAE9D,wFAAmF;AACnF,qGAA+F;AAC/F,+EAA0E;AAC1E,yFAAuJ;AAGvJ,IAAa,qBAAqB,GAAlC,MAAa,qBAAsB,SAAQ,6CAAoB;IAA/D;;QAEI;;WAEG;QACO,gBAAW,GAAY,KAAK,CAAC;QAEvC;;WAEG;QACO,kBAAa,GAAY,KAAK,CAAC;IA6D7C,CAAC;IArDY,aAAa,CAAC,GAAW,EAAE,EAAE,QAAQ,KAAuB,EAAE;QACnE,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC/C,OAAO,SAAS,CAAC;IACrB,CAAC;IAEQ,oBAAoB;QACzB,IAAI,CAAC,QAAQ,CAAC,oBAAoB,EAAE,CAAC;IACzC,CAAC;IAGS,IAAI;QACV,gFAAgF;QAChF,IAAI,CAAC,yBAAyB,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE;YACnD,IAAI,CAAC,CAAC,cAAc,KAAK,kBAAkB,EAAE;gBACzC,IAAI,CAAC,qBAAqB,EAAE,CAAC;aAChC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAEkB,uBAAuB;QACtC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,0CAAsB,EAAE,CAAC,MAAM,EAAE,iBAAwC,EAAE,EAAE,CAAC,IAAI,CAAC,yBAAyB,CAAC,iBAAiB,CAAC,CAAC,CAAC;QACzJ,MAAM,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC;IACzE,CAAC;IAED;;;;OAIG;IACO,KAAK,CAAC,yBAAyB,CAAC,KAA4B;QAClE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC9D,IAAI,WAAW,EAAE;YACb,OAAO,CAAC,KAAK,CAAC,4BAA4B,8BAAU,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAC/E,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;SACnD;aAAM;YACH,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;SAClD;IACL,CAAC;IAED;;OAEG;IACO,qBAAqB;QAC3B,MAAM,kBAAkB,GAAG,IAAI,CAAC,yBAAyB,CAAC,kBAAkB,CAAC,CAAC;QAC9E,MAAM,WAAW,GAAG,cAAc,CAAC,gBAAgB,EAAE,CAAC,WAAW,CAAC;QAClE,IAAI,WAAW,CAAC,YAAY,EAAE,KAAK,kBAAkB,EAAE;YACnD,WAAW,CAAC,YAAY,CAAC,kBAAkB,CAAC,CAAC;SAChD;IACL,CAAC;IAEQ,MAAM;QACX,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,2CAAuB,CAAC,CAAC;IACvD,CAAC;CACJ,CAAA;AA1DG;IADC,IAAA,kBAAM,EAAC,wDAAyB,CAAC;;uDACqB;AAGvD;IADC,IAAA,kBAAM,EAAC,uDAAyB,CAAC;;wEACsC;AAYxE;IADC,IAAA,yBAAa,GAAE;;;;iDAQf;AAnCQ,qBAAqB;IADjC,IAAA,sBAAU,GAAE;GACA,qBAAqB,CAuEjC;AAvEY,sDAAqB"}
|
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import { StopReason } from '../../common/frontend-application-state';
|
|
2
|
+
/** @deprecated @since 1.28 import from common/frontend-application-state instead */
|
|
3
|
+
export { StopReason };
|
|
1
4
|
export declare const RequestTitleBarStyle = "requestTitleBarStyle";
|
|
2
5
|
export declare const TitleBarStyleChanged = "titleBarStyleChanged";
|
|
3
6
|
export declare const TitleBarStyleAtStartup = "titleBarStyleAtStartup";
|
|
@@ -14,20 +17,6 @@ export declare const RELOAD_REQUESTED_SIGNAL = "reload-requested";
|
|
|
14
17
|
* Emitted by the window when the application changes state
|
|
15
18
|
*/
|
|
16
19
|
export declare const APPLICATION_STATE_CHANGE_SIGNAL = "application-state-changed";
|
|
17
|
-
export declare enum StopReason {
|
|
18
|
-
/**
|
|
19
|
-
* Closing the window with no prospect of restart.
|
|
20
|
-
*/
|
|
21
|
-
Close = 0,
|
|
22
|
-
/**
|
|
23
|
-
* Reload without closing the window.
|
|
24
|
-
*/
|
|
25
|
-
Reload = 1,
|
|
26
|
-
/**
|
|
27
|
-
* Reload that includes closing the window.
|
|
28
|
-
*/
|
|
29
|
-
Restart = 2
|
|
30
|
-
}
|
|
31
20
|
export interface CloseRequestArguments {
|
|
32
21
|
confirmChannel: string;
|
|
33
22
|
cancelChannel: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-messages.d.ts","sourceRoot":"","sources":["../../../src/electron-common/messaging/electron-messages.ts"],"names":[],"mappings":"AAgBA,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAC3D,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAC3D,eAAO,MAAM,sBAAsB,2BAA2B,CAAC;AAC/D,eAAO,MAAM,OAAO,YAAY,CAAC;AACjC;;GAEG;AACH,eAAO,MAAM,sBAAsB,oBAAoB,CAAC;AACxD;;GAEG;AACH,eAAO,MAAM,uBAAuB,qBAAqB,CAAC;AAC1D;;GAEG;AACH,eAAO,MAAM,+BAA+B,8BAA8B,CAAC;AAE3E,
|
|
1
|
+
{"version":3,"file":"electron-messages.d.ts","sourceRoot":"","sources":["../../../src/electron-common/messaging/electron-messages.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,yCAAyC,CAAC;AACrE,oFAAoF;AACpF,OAAO,EAAE,UAAU,EAAE,CAAC;AAEtB,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAC3D,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAC3D,eAAO,MAAM,sBAAsB,2BAA2B,CAAC;AAC/D,eAAO,MAAM,OAAO,YAAY,CAAC;AACjC;;GAEG;AACH,eAAO,MAAM,sBAAsB,oBAAoB,CAAC;AACxD;;GAEG;AACH,eAAO,MAAM,uBAAuB,qBAAqB,CAAC;AAC1D;;GAEG;AACH,eAAO,MAAM,+BAA+B,8BAA8B,CAAC;AAE3E,MAAM,WAAW,qBAAqB;IAClC,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,UAAU,CAAC;CACtB"}
|
|
@@ -15,7 +15,9 @@
|
|
|
15
15
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
16
16
|
// *****************************************************************************
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.
|
|
18
|
+
exports.APPLICATION_STATE_CHANGE_SIGNAL = exports.RELOAD_REQUESTED_SIGNAL = exports.CLOSE_REQUESTED_SIGNAL = exports.Restart = exports.TitleBarStyleAtStartup = exports.TitleBarStyleChanged = exports.RequestTitleBarStyle = exports.StopReason = void 0;
|
|
19
|
+
const frontend_application_state_1 = require("../../common/frontend-application-state");
|
|
20
|
+
Object.defineProperty(exports, "StopReason", { enumerable: true, get: function () { return frontend_application_state_1.StopReason; } });
|
|
19
21
|
exports.RequestTitleBarStyle = 'requestTitleBarStyle';
|
|
20
22
|
exports.TitleBarStyleChanged = 'titleBarStyleChanged';
|
|
21
23
|
exports.TitleBarStyleAtStartup = 'titleBarStyleAtStartup';
|
|
@@ -32,19 +34,4 @@ exports.RELOAD_REQUESTED_SIGNAL = 'reload-requested';
|
|
|
32
34
|
* Emitted by the window when the application changes state
|
|
33
35
|
*/
|
|
34
36
|
exports.APPLICATION_STATE_CHANGE_SIGNAL = 'application-state-changed';
|
|
35
|
-
var StopReason;
|
|
36
|
-
(function (StopReason) {
|
|
37
|
-
/**
|
|
38
|
-
* Closing the window with no prospect of restart.
|
|
39
|
-
*/
|
|
40
|
-
StopReason[StopReason["Close"] = 0] = "Close";
|
|
41
|
-
/**
|
|
42
|
-
* Reload without closing the window.
|
|
43
|
-
*/
|
|
44
|
-
StopReason[StopReason["Reload"] = 1] = "Reload";
|
|
45
|
-
/**
|
|
46
|
-
* Reload that includes closing the window.
|
|
47
|
-
*/
|
|
48
|
-
StopReason[StopReason["Restart"] = 2] = "Restart";
|
|
49
|
-
})(StopReason = exports.StopReason || (exports.StopReason = {}));
|
|
50
37
|
//# sourceMappingURL=electron-messages.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-messages.js","sourceRoot":"","sources":["../../../src/electron-common/messaging/electron-messages.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;
|
|
1
|
+
{"version":3,"file":"electron-messages.js","sourceRoot":"","sources":["../../../src/electron-common/messaging/electron-messages.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAEhF,wFAAqE;AAE5D,2FAFA,uCAAU,OAEA;AAEN,QAAA,oBAAoB,GAAG,sBAAsB,CAAC;AAC9C,QAAA,oBAAoB,GAAG,sBAAsB,CAAC;AAC9C,QAAA,sBAAsB,GAAG,wBAAwB,CAAC;AAClD,QAAA,OAAO,GAAG,SAAS,CAAC;AACjC;;GAEG;AACU,QAAA,sBAAsB,GAAG,iBAAiB,CAAC;AACxD;;GAEG;AACU,QAAA,uBAAuB,GAAG,kBAAkB,CAAC;AAC1D;;GAEG;AACU,QAAA,+BAA+B,GAAG,2BAA2B,CAAC"}
|
|
@@ -18,17 +18,17 @@ export declare class ElectronMessagingContribution implements ElectronMainApplic
|
|
|
18
18
|
protected readonly connectionHandlers: ContributionProvider<ElectronConnectionHandler>;
|
|
19
19
|
protected readonly channelHandlers: MessagingContribution.ConnectionHandlers<Channel>;
|
|
20
20
|
/**
|
|
21
|
-
* Each electron window has a main
|
|
21
|
+
* Each electron window has a main channel and its own multiplexer to route multiple client messages the same IPC connection.
|
|
22
22
|
*/
|
|
23
23
|
protected readonly windowChannelMultiplexer: Map<number, {
|
|
24
24
|
channel: ElectronWebContentChannel;
|
|
25
|
-
|
|
25
|
+
multiplexer: ChannelMultiplexer;
|
|
26
26
|
}>;
|
|
27
27
|
protected init(): void;
|
|
28
28
|
protected handleIpcEvent(event: IpcMainEvent, data: Uint8Array): void;
|
|
29
29
|
protected createWindowChannelData(sender: Electron.WebContents): {
|
|
30
30
|
channel: ElectronWebContentChannel;
|
|
31
|
-
|
|
31
|
+
multiplexer: ChannelMultiplexer;
|
|
32
32
|
};
|
|
33
33
|
/**
|
|
34
34
|
* Creates the main channel to a window.
|
|
@@ -45,7 +45,7 @@ let ElectronMessagingContribution = class ElectronMessagingContribution {
|
|
|
45
45
|
constructor() {
|
|
46
46
|
this.channelHandlers = new messaging_contribution_1.MessagingContribution.ConnectionHandlers();
|
|
47
47
|
/**
|
|
48
|
-
* Each electron window has a main
|
|
48
|
+
* Each electron window has a main channel and its own multiplexer to route multiple client messages the same IPC connection.
|
|
49
49
|
*/
|
|
50
50
|
this.windowChannelMultiplexer = new Map();
|
|
51
51
|
}
|
|
@@ -69,17 +69,17 @@ let ElectronMessagingContribution = class ElectronMessagingContribution {
|
|
|
69
69
|
// Creates a new multiplexer for a given sender/window
|
|
70
70
|
createWindowChannelData(sender) {
|
|
71
71
|
const mainChannel = this.createWindowMainChannel(sender);
|
|
72
|
-
const
|
|
73
|
-
|
|
72
|
+
const multiplexer = new channel_1.ChannelMultiplexer(mainChannel);
|
|
73
|
+
multiplexer.onDidOpenChannel(openEvent => {
|
|
74
74
|
const { channel, id } = openEvent;
|
|
75
75
|
if (this.channelHandlers.route(id, channel)) {
|
|
76
76
|
console.debug(`Opening channel for service path '${id}'.`);
|
|
77
77
|
channel.onClose(() => console.debug(`Closing channel on service path '${id}'.`));
|
|
78
78
|
}
|
|
79
79
|
});
|
|
80
|
-
sender.once('did-navigate', () =>
|
|
81
|
-
sender.once('destroyed', () =>
|
|
82
|
-
const data = { channel: mainChannel,
|
|
80
|
+
sender.once('did-navigate', () => multiplexer.onUnderlyingChannelClose({ reason: 'Window was refreshed' })); // When refreshing the browser window.
|
|
81
|
+
sender.once('destroyed', () => multiplexer.onUnderlyingChannelClose({ reason: 'Window was closed' })); // When closing the browser window.
|
|
82
|
+
const data = { channel: mainChannel, multiplexer };
|
|
83
83
|
this.windowChannelMultiplexer.set(sender.id, data);
|
|
84
84
|
return data;
|
|
85
85
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/core",
|
|
3
|
-
"version": "1.28.0
|
|
3
|
+
"version": "1.28.0",
|
|
4
4
|
"description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
|
|
5
5
|
"main": "lib/common/index.js",
|
|
6
6
|
"typings": "lib/common/index.d.ts",
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
"@phosphor/signaling": "1",
|
|
17
17
|
"@phosphor/virtualdom": "1",
|
|
18
18
|
"@phosphor/widgets": "1",
|
|
19
|
-
"@theia/application-package": "1.28.0
|
|
20
|
-
"@theia/request": "1.28.0
|
|
19
|
+
"@theia/application-package": "1.28.0",
|
|
20
|
+
"@theia/request": "1.28.0",
|
|
21
21
|
"@types/body-parser": "^1.16.4",
|
|
22
22
|
"@types/cookie": "^0.3.3",
|
|
23
23
|
"@types/dompurify": "^2.2.2",
|
|
@@ -41,6 +41,7 @@
|
|
|
41
41
|
"drivelist": "^9.0.2",
|
|
42
42
|
"es6-promise": "^4.2.4",
|
|
43
43
|
"express": "^4.16.3",
|
|
44
|
+
"fast-json-stable-stringify": "^2.1.0",
|
|
44
45
|
"file-icons-js": "~1.0.3",
|
|
45
46
|
"font-awesome": "^4.7.0",
|
|
46
47
|
"fs-extra": "^4.0.2",
|
|
@@ -193,12 +194,12 @@
|
|
|
193
194
|
"watch": "theiaext watch"
|
|
194
195
|
},
|
|
195
196
|
"devDependencies": {
|
|
196
|
-
"@theia/ext-scripts": "1.
|
|
197
|
-
"@theia/re-exports": "1.
|
|
197
|
+
"@theia/ext-scripts": "1.28.0",
|
|
198
|
+
"@theia/re-exports": "1.28.0",
|
|
198
199
|
"minimist": "^1.2.0"
|
|
199
200
|
},
|
|
200
201
|
"nyc": {
|
|
201
202
|
"extends": "../../configs/nyc.json"
|
|
202
203
|
},
|
|
203
|
-
"gitHead": "
|
|
204
|
+
"gitHead": "79d58c87a7bd76f435000a2ac59803b04e1c78be"
|
|
204
205
|
}
|
|
@@ -272,10 +272,10 @@ export namespace CommonCommands {
|
|
|
272
272
|
category: VIEW_CATEGORY,
|
|
273
273
|
label: 'Show Menu Bar'
|
|
274
274
|
});
|
|
275
|
-
export const
|
|
275
|
+
export const NEW_UNTITLED_FILE = Command.toDefaultLocalizedCommand({
|
|
276
276
|
id: 'workbench.action.files.newUntitledFile',
|
|
277
277
|
category: FILE_CATEGORY,
|
|
278
|
-
label: 'New File'
|
|
278
|
+
label: 'New Untitled File'
|
|
279
279
|
});
|
|
280
280
|
export const SAVE = Command.toDefaultLocalizedCommand({
|
|
281
281
|
id: 'core.save',
|
|
@@ -721,7 +721,8 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
|
|
|
721
721
|
registry.registerSubmenu(CommonMenus.VIEW_APPEARANCE_SUBMENU, nls.localizeByDefault('Appearance'));
|
|
722
722
|
|
|
723
723
|
registry.registerMenuAction(CommonMenus.FILE_NEW, {
|
|
724
|
-
commandId: CommonCommands.
|
|
724
|
+
commandId: CommonCommands.NEW_UNTITLED_FILE.id,
|
|
725
|
+
label: nls.localizeByDefault('New File'),
|
|
725
726
|
order: 'a'
|
|
726
727
|
});
|
|
727
728
|
}
|
|
@@ -963,7 +964,7 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
|
|
|
963
964
|
commandRegistry.registerCommand(CommonCommands.CONFIGURE_DISPLAY_LANGUAGE, {
|
|
964
965
|
execute: () => this.configureDisplayLanguage()
|
|
965
966
|
});
|
|
966
|
-
commandRegistry.registerCommand(CommonCommands.
|
|
967
|
+
commandRegistry.registerCommand(CommonCommands.NEW_UNTITLED_FILE, {
|
|
967
968
|
execute: async () => {
|
|
968
969
|
const untitledUri = this.untitledResourceResolver.createUntitledURI('', await this.workingDirProvider.getUserWorkingDir());
|
|
969
970
|
this.untitledResourceResolver.resolve(untitledUri);
|
|
@@ -1104,7 +1105,7 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
|
|
|
1104
1105
|
when: 'activeEditorIsPinned'
|
|
1105
1106
|
},
|
|
1106
1107
|
{
|
|
1107
|
-
command: CommonCommands.
|
|
1108
|
+
command: CommonCommands.NEW_UNTITLED_FILE.id,
|
|
1108
1109
|
keybinding: this.isElectron() ? 'ctrlcmd+n' : 'alt+n',
|
|
1109
1110
|
}
|
|
1110
1111
|
);
|
|
@@ -112,5 +112,10 @@ export interface RenderContextMenuOptions {
|
|
|
112
112
|
* Default is `true`.
|
|
113
113
|
*/
|
|
114
114
|
includeAnchorArg?: boolean;
|
|
115
|
+
/**
|
|
116
|
+
* A DOM context to use when evaluating any `when` clauses
|
|
117
|
+
* of menu items registered for this item.
|
|
118
|
+
*/
|
|
119
|
+
context?: HTMLElement;
|
|
115
120
|
onHide?: () => void;
|
|
116
121
|
}
|
|
@@ -31,7 +31,11 @@ import {
|
|
|
31
31
|
InMemoryResources,
|
|
32
32
|
messageServicePath,
|
|
33
33
|
InMemoryTextResourceResolver,
|
|
34
|
-
UntitledResourceResolver
|
|
34
|
+
UntitledResourceResolver,
|
|
35
|
+
MenuCommandAdapterRegistry,
|
|
36
|
+
MenuCommandExecutor,
|
|
37
|
+
MenuCommandAdapterRegistryImpl,
|
|
38
|
+
MenuCommandExecutorImpl
|
|
35
39
|
} from '../common';
|
|
36
40
|
import { KeybindingRegistry, KeybindingContext, KeybindingContribution } from './keybinding';
|
|
37
41
|
import { FrontendApplication, FrontendApplicationContribution, DefaultFrontendApplicationContribution } from './frontend-application';
|
|
@@ -241,6 +245,8 @@ export const frontendApplicationModule = new ContainerModule((bind, _unbind, _is
|
|
|
241
245
|
|
|
242
246
|
bind(MenuModelRegistry).toSelf().inSingletonScope();
|
|
243
247
|
bindContributionProvider(bind, MenuContribution);
|
|
248
|
+
bind(MenuCommandAdapterRegistry).to(MenuCommandAdapterRegistryImpl).inSingletonScope();
|
|
249
|
+
bind(MenuCommandExecutor).to(MenuCommandExecutorImpl).inSingletonScope();
|
|
244
250
|
|
|
245
251
|
bind(KeyboardLayoutService).toSelf().inSingletonScope();
|
|
246
252
|
bind(KeybindingRegistry).toSelf().inSingletonScope();
|
|
@@ -26,6 +26,7 @@ import { preventNavigation, parseCssTime, animationFrame } from './browser';
|
|
|
26
26
|
import { CorePreferences } from './core-preferences';
|
|
27
27
|
import { WindowService } from './window/window-service';
|
|
28
28
|
import { TooltipService } from './tooltip-service';
|
|
29
|
+
import { StopReason } from '../common/frontend-application-state';
|
|
29
30
|
|
|
30
31
|
/**
|
|
31
32
|
* Clients can implement to get a callback for contributing widgets to a shell on start.
|
|
@@ -81,11 +82,11 @@ export interface OnWillStopAction<T = unknown> {
|
|
|
81
82
|
/**
|
|
82
83
|
* @resolves to a prepared value to be passed into the `action` function.
|
|
83
84
|
*/
|
|
84
|
-
prepare?: () => MaybePromise<T>;
|
|
85
|
+
prepare?: (stopReason?: StopReason) => MaybePromise<T>;
|
|
85
86
|
/**
|
|
86
87
|
* @resolves to `true` if it is safe to close the application; `false` otherwise.
|
|
87
88
|
*/
|
|
88
|
-
action: (prepared: T) => MaybePromise<boolean>;
|
|
89
|
+
action: (prepared: T, stopReason?: StopReason) => MaybePromise<boolean>;
|
|
89
90
|
/**
|
|
90
91
|
* A descriptive string for the reason preventing close.
|
|
91
92
|
*/
|
|
@@ -165,20 +165,30 @@ describe('keybindings', () => {
|
|
|
165
165
|
}
|
|
166
166
|
});
|
|
167
167
|
|
|
168
|
-
it('should remove all keybindings from a command that has multiple keybindings', () => {
|
|
168
|
+
it('should remove all disabled keybindings from a command that has multiple keybindings', () => {
|
|
169
169
|
const keybindings: Keybinding[] = [{
|
|
170
170
|
command: TEST_COMMAND2.id,
|
|
171
171
|
keybinding: 'F3'
|
|
172
|
-
}
|
|
172
|
+
},
|
|
173
|
+
{
|
|
174
|
+
command: '-' + TEST_COMMAND2.id,
|
|
175
|
+
context: 'testContext',
|
|
176
|
+
keybinding: 'ctrl+f1'
|
|
177
|
+
},
|
|
178
|
+
];
|
|
173
179
|
|
|
174
180
|
keybindingRegistry.setKeymap(KeybindingScope.USER, keybindings);
|
|
175
181
|
|
|
176
182
|
const bindings = keybindingRegistry.getKeybindingsForCommand(TEST_COMMAND2.id);
|
|
177
183
|
if (bindings) {
|
|
178
|
-
|
|
184
|
+
// a USER one and a DEFAULT one
|
|
185
|
+
expect(bindings.length).to.be.equal(2);
|
|
179
186
|
const keyCode = KeyCode.parse(bindings[0].keybinding);
|
|
180
187
|
expect(keyCode.key).to.be.equal(Key.F3);
|
|
181
188
|
expect(keyCode.ctrl).to.be.false;
|
|
189
|
+
const keyCode2 = KeyCode.parse(bindings[1].keybinding);
|
|
190
|
+
expect(keyCode2.key).to.be.equal(Key.F2);
|
|
191
|
+
expect(keyCode2.ctrl).to.be.true;
|
|
182
192
|
}
|
|
183
193
|
});
|
|
184
194
|
|
|
@@ -434,20 +434,19 @@ export class KeybindingRegistry {
|
|
|
434
434
|
*/
|
|
435
435
|
getKeybindingsForCommand(commandId: string): ScopedKeybinding[] {
|
|
436
436
|
const result: ScopedKeybinding[] = [];
|
|
437
|
-
|
|
437
|
+
const disabledBindings: ScopedKeybinding[] = [];
|
|
438
438
|
for (let scope = KeybindingScope.END - 1; scope >= KeybindingScope.DEFAULT; scope--) {
|
|
439
439
|
this.keymaps[scope].forEach(binding => {
|
|
440
|
+
if (binding.command?.startsWith('-')) {
|
|
441
|
+
disabledBindings.push(binding);
|
|
442
|
+
}
|
|
440
443
|
const command = this.commandRegistry.getCommand(binding.command);
|
|
441
|
-
if (command
|
|
442
|
-
|
|
443
|
-
|
|
444
|
-
}
|
|
444
|
+
if (command
|
|
445
|
+
&& command.id === commandId
|
|
446
|
+
&& !disabledBindings.some(disabled => common.Keybinding.equals(disabled, { ...binding, command: '-' + binding.command }, false, true))) {
|
|
447
|
+
result.push({ ...binding, scope });
|
|
445
448
|
}
|
|
446
449
|
});
|
|
447
|
-
|
|
448
|
-
if (result.length > 0) {
|
|
449
|
-
return result;
|
|
450
|
-
}
|
|
451
450
|
}
|
|
452
451
|
return result;
|
|
453
452
|
}
|
|
@@ -36,8 +36,8 @@ export class BrowserContextMenuRenderer extends ContextMenuRenderer {
|
|
|
36
36
|
super();
|
|
37
37
|
}
|
|
38
38
|
|
|
39
|
-
protected doRender({ menuPath, anchor, args, onHide }: RenderContextMenuOptions): ContextMenuAccess {
|
|
40
|
-
const contextMenu = this.menuFactory.createContextMenu(menuPath, args);
|
|
39
|
+
protected doRender({ menuPath, anchor, args, onHide, context }: RenderContextMenuOptions): ContextMenuAccess {
|
|
40
|
+
const contextMenu = this.menuFactory.createContextMenu(menuPath, args, context);
|
|
41
41
|
const { x, y } = coordinateFromAnchor(anchor);
|
|
42
42
|
if (onHide) {
|
|
43
43
|
contextMenu.aboutToClose.connect(() => onHide!());
|