@theia/core 1.77.0-next.84 → 1.77.0-next.89
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/catalog.json +33 -4
- package/lib/browser/color-application-contribution.d.ts +2 -2
- package/lib/browser/color-application-contribution.d.ts.map +1 -1
- package/lib/browser/color-application-contribution.js +7 -8
- package/lib/browser/color-application-contribution.js.map +1 -1
- package/lib/browser/common-frontend-contribution.d.ts.map +1 -1
- package/lib/browser/common-frontend-contribution.js +7 -0
- package/lib/browser/common-frontend-contribution.js.map +1 -1
- package/lib/browser/frontend-application-module.d.ts.map +1 -1
- package/lib/browser/frontend-application-module.js +6 -0
- package/lib/browser/frontend-application-module.js.map +1 -1
- package/lib/browser/quick-input/quick-command-service.d.ts +2 -0
- package/lib/browser/quick-input/quick-command-service.d.ts.map +1 -1
- package/lib/browser/quick-input/quick-command-service.js +10 -2
- package/lib/browser/quick-input/quick-command-service.js.map +1 -1
- package/lib/browser/saveable-service.d.ts +4 -0
- package/lib/browser/saveable-service.d.ts.map +1 -1
- package/lib/browser/saveable-service.js +7 -0
- package/lib/browser/saveable-service.js.map +1 -1
- package/lib/browser/secondary-window-handler.d.ts +126 -3
- package/lib/browser/secondary-window-handler.d.ts.map +1 -1
- package/lib/browser/secondary-window-handler.js +354 -30
- package/lib/browser/secondary-window-handler.js.map +1 -1
- package/lib/browser/shell/application-shell-mouse-tracker.d.ts +2 -0
- package/lib/browser/shell/application-shell-mouse-tracker.d.ts.map +1 -1
- package/lib/browser/shell/application-shell-mouse-tracker.js +10 -0
- package/lib/browser/shell/application-shell-mouse-tracker.js.map +1 -1
- package/lib/browser/shell/application-shell.d.ts +11 -0
- package/lib/browser/shell/application-shell.d.ts.map +1 -1
- package/lib/browser/shell/application-shell.js +33 -4
- package/lib/browser/shell/application-shell.js.map +1 -1
- package/lib/browser/shell/index.d.ts +1 -0
- package/lib/browser/shell/index.d.ts.map +1 -1
- package/lib/browser/shell/index.js +1 -0
- package/lib/browser/shell/index.js.map +1 -1
- package/lib/browser/shell/native-tab-drag-service.d.ts +141 -0
- package/lib/browser/shell/native-tab-drag-service.d.ts.map +1 -0
- package/lib/browser/shell/native-tab-drag-service.js +349 -0
- package/lib/browser/shell/native-tab-drag-service.js.map +1 -0
- package/lib/browser/shell/native-tab-drag-service.spec.d.ts +2 -0
- package/lib/browser/shell/native-tab-drag-service.spec.d.ts.map +1 -0
- package/lib/browser/shell/native-tab-drag-service.spec.js +71 -0
- package/lib/browser/shell/native-tab-drag-service.spec.js.map +1 -0
- package/lib/browser/shell/shell-layout-restorer.d.ts +3 -0
- package/lib/browser/shell/shell-layout-restorer.d.ts.map +1 -1
- package/lib/browser/shell/shell-layout-restorer.js +20 -0
- package/lib/browser/shell/shell-layout-restorer.js.map +1 -1
- package/lib/browser/shell/shell-layout-restorer.spec.js +31 -0
- package/lib/browser/shell/shell-layout-restorer.spec.js.map +1 -1
- package/lib/browser/shell/side-panel-handler.d.ts +8 -0
- package/lib/browser/shell/side-panel-handler.d.ts.map +1 -1
- package/lib/browser/shell/side-panel-handler.js +14 -0
- package/lib/browser/shell/side-panel-handler.js.map +1 -1
- package/lib/browser/shell/tab-bars.d.ts +39 -0
- package/lib/browser/shell/tab-bars.d.ts.map +1 -1
- package/lib/browser/shell/tab-bars.js +127 -2
- package/lib/browser/shell/tab-bars.js.map +1 -1
- package/lib/browser/shell/tab-bars.spec.js +48 -0
- package/lib/browser/shell/tab-bars.spec.js.map +1 -1
- package/lib/browser/shell/tab-drop-helper.d.ts +32 -0
- package/lib/browser/shell/tab-drop-helper.d.ts.map +1 -0
- package/lib/browser/shell/tab-drop-helper.js +75 -0
- package/lib/browser/shell/tab-drop-helper.js.map +1 -0
- package/lib/browser/shell/theia-dock-panel.d.ts +25 -0
- package/lib/browser/shell/theia-dock-panel.d.ts.map +1 -1
- package/lib/browser/shell/theia-dock-panel.js +107 -11
- package/lib/browser/shell/theia-dock-panel.js.map +1 -1
- package/lib/browser/styling-service.d.ts +2 -2
- package/lib/browser/styling-service.d.ts.map +1 -1
- package/lib/browser/styling-service.js +7 -8
- package/lib/browser/styling-service.js.map +1 -1
- package/lib/browser/widget-open-handler.d.ts +10 -0
- package/lib/browser/widget-open-handler.d.ts.map +1 -1
- package/lib/browser/widget-open-handler.js +24 -1
- package/lib/browser/widget-open-handler.js.map +1 -1
- package/lib/browser/window/default-secondary-window-service.d.ts +17 -3
- package/lib/browser/window/default-secondary-window-service.d.ts.map +1 -1
- package/lib/browser/window/default-secondary-window-service.js +76 -23
- package/lib/browser/window/default-secondary-window-service.js.map +1 -1
- package/lib/browser/window/default-secondary-window-service.spec.d.ts +2 -0
- package/lib/browser/window/default-secondary-window-service.spec.d.ts.map +1 -0
- package/lib/browser/window/default-secondary-window-service.spec.js +49 -0
- package/lib/browser/window/default-secondary-window-service.spec.js.map +1 -0
- package/lib/browser/window/secondary-window-close-contribution.d.ts +23 -0
- package/lib/browser/window/secondary-window-close-contribution.d.ts.map +1 -0
- package/lib/browser/window/secondary-window-close-contribution.js +39 -0
- package/lib/browser/window/secondary-window-close-contribution.js.map +1 -0
- package/lib/browser/window/secondary-window-service.d.ts +24 -1
- package/lib/browser/window/secondary-window-service.d.ts.map +1 -1
- package/lib/browser/window/secondary-window-service.js.map +1 -1
- package/lib/browser/window/window-focus-service.d.ts +4 -0
- package/lib/browser/window/window-focus-service.d.ts.map +1 -1
- package/lib/browser/window/window-focus-service.js +8 -2
- package/lib/browser/window/window-focus-service.js.map +1 -1
- package/lib/common/core-preferences.d.ts +2 -0
- package/lib/common/core-preferences.d.ts.map +1 -1
- package/lib/common/core-preferences.js +15 -0
- package/lib/common/core-preferences.js.map +1 -1
- package/lib/common/preferences/preference-schema-service.d.ts.map +1 -1
- package/lib/common/preferences/preference-schema-service.js +9 -5
- package/lib/common/preferences/preference-schema-service.js.map +1 -1
- package/lib/common/preferences/preference-schema-service.spec.d.ts +2 -0
- package/lib/common/preferences/preference-schema-service.spec.d.ts.map +1 -0
- package/lib/common/preferences/preference-schema-service.spec.js +80 -0
- package/lib/common/preferences/preference-schema-service.spec.js.map +1 -0
- package/lib/electron-browser/menu/electron-context-menu-renderer.d.ts.map +1 -1
- package/lib/electron-browser/menu/electron-context-menu-renderer.js +2 -1
- package/lib/electron-browser/menu/electron-context-menu-renderer.js.map +1 -1
- package/lib/electron-browser/window/electron-secondary-window-service.d.ts.map +1 -1
- package/lib/electron-browser/window/electron-secondary-window-service.js +1 -0
- package/lib/electron-browser/window/electron-secondary-window-service.js.map +1 -1
- package/package.json +4 -4
- package/src/browser/color-application-contribution.ts +6 -7
- package/src/browser/common-frontend-contribution.ts +8 -0
- package/src/browser/frontend-application-module.ts +6 -0
- package/src/browser/quick-input/quick-command-service.ts +8 -2
- package/src/browser/saveable-service.ts +8 -0
- package/src/browser/secondary-window-handler.ts +397 -34
- package/src/browser/shell/application-shell-mouse-tracker.ts +10 -0
- package/src/browser/shell/application-shell.ts +38 -5
- package/src/browser/shell/index.ts +1 -0
- package/src/browser/shell/native-tab-drag-service.spec.ts +86 -0
- package/src/browser/shell/native-tab-drag-service.ts +402 -0
- package/src/browser/shell/shell-layout-restorer.spec.ts +42 -0
- package/src/browser/shell/shell-layout-restorer.ts +20 -0
- package/src/browser/shell/side-panel-handler.ts +15 -0
- package/src/browser/shell/tab-bars.spec.ts +56 -2
- package/src/browser/shell/tab-bars.ts +146 -3
- package/src/browser/shell/tab-drop-helper.ts +79 -0
- package/src/browser/shell/theia-dock-panel.ts +122 -11
- package/src/browser/style/dockpanel.css +9 -0
- package/src/browser/styling-service.ts +6 -7
- package/src/browser/widget-open-handler.ts +24 -3
- package/src/browser/window/default-secondary-window-service.spec.ts +54 -0
- package/src/browser/window/default-secondary-window-service.ts +78 -26
- package/src/browser/window/secondary-window-close-contribution.ts +47 -0
- package/src/browser/window/secondary-window-service.ts +20 -1
- package/src/browser/window/window-focus-service.ts +9 -2
- package/src/common/core-preferences.ts +19 -0
- package/src/common/preferences/preference-schema-service.spec.ts +99 -0
- package/src/common/preferences/preference-schema-service.ts +9 -5
- package/src/electron-browser/menu/electron-context-menu-renderer.ts +2 -1
- package/src/electron-browser/window/electron-secondary-window-service.ts +1 -0
|
@@ -211,7 +211,7 @@ let PreferenceSchemaServiceImpl = class PreferenceSchemaServiceImpl {
|
|
|
211
211
|
this.defaultOverrides.set(key, overrides);
|
|
212
212
|
}
|
|
213
213
|
const oldValue = this.getDefaultValue(key, overrideIdentifier);
|
|
214
|
-
const overrideValueId = this.nextOverrideValueId
|
|
214
|
+
const overrideValueId = this.nextOverrideValueId++;
|
|
215
215
|
let override = overrides.get(overrideId);
|
|
216
216
|
if (!override) {
|
|
217
217
|
override = [];
|
|
@@ -254,9 +254,12 @@ let PreferenceSchemaServiceImpl = class PreferenceSchemaServiceImpl {
|
|
|
254
254
|
const values = overrides.get(overrideId);
|
|
255
255
|
if (values) {
|
|
256
256
|
const index = values.findIndex(v => v[0] === overrideValueId);
|
|
257
|
-
if (index) {
|
|
257
|
+
if (index >= 0) {
|
|
258
258
|
const oldValue = this.getDefaultValue(key, overrideIdentifier);
|
|
259
259
|
values.splice(index, 1);
|
|
260
|
+
if (values.length === 0) {
|
|
261
|
+
overrides.delete(overrideId);
|
|
262
|
+
}
|
|
260
263
|
const newValue = this.getDefaultValue(key, overrideIdentifier);
|
|
261
264
|
if (!preference_provider_1.PreferenceUtils.deepEqual(oldValue, newValue)) {
|
|
262
265
|
const affectedOverrides = [];
|
|
@@ -275,9 +278,10 @@ let PreferenceSchemaServiceImpl = class PreferenceSchemaServiceImpl {
|
|
|
275
278
|
newValue
|
|
276
279
|
});
|
|
277
280
|
}
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
+
const property = this.properties.get(key);
|
|
282
|
+
if (property) {
|
|
283
|
+
this.setJSONSchemasProperty(key, property);
|
|
284
|
+
}
|
|
281
285
|
}
|
|
282
286
|
}
|
|
283
287
|
if (overrides.size === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-schema-service.js","sourceRoot":"","sources":["../../../src/common/preferences/preference-schema-service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"preference-schema-service.js","sourceRoot":"","sources":["../../../src/common/preferences/preference-schema-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"preference-schema-service.spec.d.ts","sourceRoot":"","sources":["../../../src/common/preferences/preference-schema-service.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// *****************************************************************************
|
|
3
|
+
// Copyright (C) 2026 CodeSignal and others.
|
|
4
|
+
//
|
|
5
|
+
// This program and the accompanying materials are made available under the
|
|
6
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
7
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
8
|
+
//
|
|
9
|
+
// This Source Code may also be made available under the following Secondary
|
|
10
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
11
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
12
|
+
// with the GNU Classpath Exception which is available at
|
|
13
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
14
|
+
//
|
|
15
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
|
+
// *****************************************************************************
|
|
17
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
const chai_1 = require("chai");
|
|
19
|
+
const inversify_1 = require("inversify");
|
|
20
|
+
const contribution_provider_1 = require("../contribution-provider");
|
|
21
|
+
const logger_1 = require("../logger");
|
|
22
|
+
const mock_logger_1 = require("../test/mock-logger");
|
|
23
|
+
const preference_schema_1 = require("./preference-schema");
|
|
24
|
+
const preference_schema_service_1 = require("./preference-schema-service");
|
|
25
|
+
const preference_scope_1 = require("./preference-scope");
|
|
26
|
+
const KEY = 'test.value';
|
|
27
|
+
describe('PreferenceSchemaServiceImpl', () => {
|
|
28
|
+
let service;
|
|
29
|
+
beforeEach(() => {
|
|
30
|
+
const container = new inversify_1.Container();
|
|
31
|
+
container.bind(preference_scope_1.ValidPreferenceScopes).toConstantValue([preference_scope_1.PreferenceScope.Default, preference_scope_1.PreferenceScope.User]);
|
|
32
|
+
(0, contribution_provider_1.bindContributionProvider)(container, preference_schema_1.PreferenceContribution);
|
|
33
|
+
container.bind(logger_1.ILogger).to(mock_logger_1.MockLogger).inSingletonScope();
|
|
34
|
+
container.bind(preference_schema_service_1.PreferenceSchemaServiceImpl).toSelf().inSingletonScope();
|
|
35
|
+
service = container.get(preference_schema_service_1.PreferenceSchemaServiceImpl);
|
|
36
|
+
service.addSchema({ properties: { [KEY]: { type: 'string', default: 'schema', overridable: true } } });
|
|
37
|
+
});
|
|
38
|
+
afterEach(() => service.dispose());
|
|
39
|
+
it('should restore the previous default when the newest override is removed', () => {
|
|
40
|
+
service.registerOverride(KEY, undefined, 'first');
|
|
41
|
+
const newest = service.registerOverride(KEY, undefined, 'second');
|
|
42
|
+
const events = [];
|
|
43
|
+
service.onDidChangeDefaultValue(event => events.push(event));
|
|
44
|
+
newest.dispose();
|
|
45
|
+
(0, chai_1.expect)(service.getDefaultValue(KEY, undefined)).to.equal('first');
|
|
46
|
+
(0, chai_1.expect)(events.map(({ oldValue, newValue }) => [oldValue, newValue])).to.deep.equal([['second', 'first']]);
|
|
47
|
+
});
|
|
48
|
+
it('should restore the previous default when the newest language override is removed', () => {
|
|
49
|
+
service.registerOverrideIdentifier('typescript');
|
|
50
|
+
service.registerOverride(KEY, 'typescript', 'first');
|
|
51
|
+
const newest = service.registerOverride(KEY, 'typescript', 'second');
|
|
52
|
+
newest.dispose();
|
|
53
|
+
(0, chai_1.expect)(service.getDefaultValue(KEY, 'typescript')).to.equal('first');
|
|
54
|
+
});
|
|
55
|
+
it('should remove only the override that is disposed', () => {
|
|
56
|
+
const oldest = service.registerOverride(KEY, undefined, 'first');
|
|
57
|
+
const newest = service.registerOverride(KEY, undefined, 'second');
|
|
58
|
+
const events = [];
|
|
59
|
+
service.onDidChangeDefaultValue(event => events.push(event));
|
|
60
|
+
oldest.dispose();
|
|
61
|
+
(0, chai_1.expect)(service.getDefaultValue(KEY, undefined)).to.equal('second');
|
|
62
|
+
newest.dispose();
|
|
63
|
+
(0, chai_1.expect)(service.getDefaultValue(KEY, undefined)).to.equal('schema');
|
|
64
|
+
(0, chai_1.expect)(events.map(({ oldValue, newValue }) => [oldValue, newValue])).to.deep.equal([['second', 'schema']]);
|
|
65
|
+
});
|
|
66
|
+
it('should show the restored default in the JSON schema', () => {
|
|
67
|
+
const override = service.registerOverride(KEY, undefined, 'first');
|
|
68
|
+
(0, chai_1.expect)(service.getJSONSchema(preference_scope_1.PreferenceScope.User).properties[KEY]).to.have.property('default', 'first');
|
|
69
|
+
override.dispose();
|
|
70
|
+
(0, chai_1.expect)(service.getJSONSchema(preference_scope_1.PreferenceScope.User).properties[KEY]).to.have.property('default', 'schema');
|
|
71
|
+
});
|
|
72
|
+
it('should keep the other overrides when one is disposed twice', () => {
|
|
73
|
+
const oldest = service.registerOverride(KEY, undefined, 'first');
|
|
74
|
+
service.registerOverride(KEY, undefined, 'second');
|
|
75
|
+
oldest.dispose();
|
|
76
|
+
oldest.dispose();
|
|
77
|
+
(0, chai_1.expect)(service.getDefaultValue(KEY, undefined)).to.equal('second');
|
|
78
|
+
});
|
|
79
|
+
});
|
|
80
|
+
//# sourceMappingURL=preference-schema-service.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"preference-schema-service.spec.js","sourceRoot":"","sources":["../../../src/common/preferences/preference-schema-service.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-context-menu-renderer.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-context-menu-renderer.ts"],"names":[],"mappings":"AAmBA,OAAO,EACH,mBAAmB,EAAE,iBAAiB,EAAE,+BAA+B,EACvE,MAAM,EACT,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAA4B,0BAA0B,EAAE,MAAM,kDAAkD,CAAC;AACxH,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACpG,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,qBAAa,yBAA0B,SAAQ,iBAAiB;IAChD,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC;gBAA3B,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC;CAKnD;AAED,yBAAiB,4BAA4B,CAAC;IACnC,MAAM,SAAS,EAAE,QAAkC,CAAC;IACpD,MAAM,oBAAoB,UAAsC,CAAC;IACjE,MAAM,UAAU,UAAiC,CAAC;IAClD,MAAM,YAAY,UAAmC,CAAC;CAChE;AAED,qBACa,wCAAyC,YAAW,+BAA+B,EAAE,gBAAgB;IAG9G,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAExD,OAAO,IAAI,IAAI;IAmBf,aAAa,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;CASnD;AAED,qBACa,2BAA4B,SAAQ,0BAA0B;IAGvE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;IAG/C,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,uBAAuB,CAAC;IAEhE,SAAS,CAAC,cAAc,EAAE,OAAO,CAAQ;;IAOzC,SAAS,CAAC,IAAI,IAAI,IAAI;cAIN,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;cAIpB,QAAQ,CAAC,MAAM,EAAE;QAChC,QAAQ,EAAE,QAAQ,CAAC;QACnB,IAAI,EAAE,gBAAgB,CAAC;QACvB,MAAM,EAAE,MAAM,CAAC;QACf,cAAc,EAAE,cAAc,CAAC;QAC/B,IAAI,CAAC,EAAE,GAAG,CAAC;QACX,OAAO,CAAC,EAAE,WAAW,CAAC;QACtB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAA;KACtB,GAAG,iBAAiB;
|
|
1
|
+
{"version":3,"file":"electron-context-menu-renderer.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-context-menu-renderer.ts"],"names":[],"mappings":"AAmBA,OAAO,EACH,mBAAmB,EAAE,iBAAiB,EAAE,+BAA+B,EACvE,MAAM,EACT,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yCAAyC,CAAC;AAC7E,OAAO,EAA4B,0BAA0B,EAAE,MAAM,kDAAkD,CAAC;AACxH,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACpG,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACtF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,qBAAa,yBAA0B,SAAQ,iBAAiB;IAChD,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC;gBAA3B,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC;CAKnD;AAED,yBAAiB,4BAA4B,CAAC;IACnC,MAAM,SAAS,EAAE,QAAkC,CAAC;IACpD,MAAM,oBAAoB,UAAsC,CAAC;IACjE,MAAM,UAAU,UAAiC,CAAC;IAClD,MAAM,YAAY,UAAmC,CAAC;CAChE;AAED,qBACa,wCAAyC,YAAW,+BAA+B,EAAE,gBAAgB;IAG9G,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAExD,OAAO,IAAI,IAAI;IAmBf,aAAa,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;CASnD;AAED,qBACa,2BAA4B,SAAQ,0BAA0B;IAGvE,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC;IAG/C,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,uBAAuB,CAAC;IAEhE,SAAS,CAAC,cAAc,EAAE,OAAO,CAAQ;;IAOzC,SAAS,CAAC,IAAI,IAAI,IAAI;cAIN,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;cAIpB,QAAQ,CAAC,MAAM,EAAE;QAChC,QAAQ,EAAE,QAAQ,CAAC;QACnB,IAAI,EAAE,gBAAgB,CAAC;QACvB,MAAM,EAAE,MAAM,CAAC;QACf,cAAc,EAAE,cAAc,CAAC;QAC/B,IAAI,CAAC,EAAE,GAAG,CAAC;QACX,OAAO,CAAC,EAAE,WAAW,CAAC;QACtB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAA;KACtB,GAAG,iBAAiB;CA8BxB"}
|
|
@@ -96,7 +96,8 @@ let ElectronContextMenuRenderer = class ElectronContextMenuRenderer extends brow
|
|
|
96
96
|
if (this.useNativeStyle) {
|
|
97
97
|
const contextMenu = this.electronMenuFactory.createElectronContextMenu(params.menuPath, params.menu, params.contextMatcher, params.args, params.context);
|
|
98
98
|
const { x, y } = (0, browser_1.coordinateFromAnchor)(params.anchor);
|
|
99
|
-
|
|
99
|
+
// the name of the window, e.g. of a secondary window, in which the menu is to be shown; empty for the main window
|
|
100
|
+
const windowName = params.context?.ownerDocument.defaultView?.name;
|
|
100
101
|
const menuHandle = window.electronTheiaCore.popup(contextMenu, x, y, () => {
|
|
101
102
|
if (params.onHide) {
|
|
102
103
|
params.onHide();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-context-menu-renderer.js","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-context-menu-renderer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"electron-context-menu-renderer.js","sourceRoot":"","sources":["../../../src/electron-browser/menu/electron-context-menu-renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-secondary-window-service.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/window/electron-secondary-window-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,6BAA6B,EAAE,MAAM,uDAAuD,CAAC;AACtG,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAGpE,OAAO,EAAE,yBAAyB,EAA0B,MAAM,mDAAmD,CAAC;AAEtH,qBACa,8BAA+B,SAAQ,6BAA6B;IAG7E,SAAS,CAAC,QAAQ,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;IAG/D,IAAI,IAAI,IAAI;cAeL,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9D,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIxB,yBAAyB,IAAI,IAAI;
|
|
1
|
+
{"version":3,"file":"electron-secondary-window-service.d.ts","sourceRoot":"","sources":["../../../src/electron-browser/window/electron-secondary-window-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,6BAA6B,EAAE,MAAM,uDAAuD,CAAC;AACtG,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAGpE,OAAO,EAAE,yBAAyB,EAA0B,MAAM,mDAAmD,CAAC;AAEtH,qBACa,8BAA+B,SAAQ,6BAA6B;IAG7E,SAAS,CAAC,QAAQ,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;IAG/D,IAAI,IAAI,IAAI;cAeL,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9D,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIxB,yBAAyB,IAAI,IAAI;cAqBvB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,KAAK,EAAE,gBAAgB,GAAG,IAAI;YAW/F,QAAQ;CAIzB"}
|
|
@@ -46,6 +46,7 @@ let ElectronSecondaryWindowService = class ElectronSecondaryWindowService extend
|
|
|
46
46
|
registerShutdownListeners() {
|
|
47
47
|
// Close all open windows when the main window is closed.
|
|
48
48
|
this.windowService.onWillShutDown(() => {
|
|
49
|
+
this.shuttingDown = true;
|
|
49
50
|
const promises = [];
|
|
50
51
|
// Iterate backwards because calling window.close might remove the window from the array
|
|
51
52
|
for (let i = this.secondaryWindows.length - 1; i >= 0; i--) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"electron-secondary-window-service.js","sourceRoot":"","sources":["../../../src/electron-browser/window/electron-secondary-window-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,kFAAkF;AAClF,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,yCAA8D;AAC9D,4GAAsG;AAGtG,4DAA8D;AAC9D,mGAAsH;AAG/G,IAAM,8BAA8B,GAApC,MAAM,8BAA+B,SAAQ,gEAA6B;IAMpE,IAAI;QACT,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;YAC3C,MAAM,gBAAgB,GAAG,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,oDAAsB,CAAC,CAAC;YACpF,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;YAE7C,IAAI,CAAC,yBAAyB,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE;gBACnD,IAAI,CAAC,CAAC,cAAc,KAAK,oDAAsB,EAAE,CAAC;oBAC9C,MAAM,SAAS,GAAG,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,oDAAsB,EAAE,CAAC,CAAC,CAAC;oBAChF,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC;gBAC1C,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAES,KAAK,CAAC,qBAAqB,CAAC,SAAiB;QACnD,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,GAAW,EAAE,EAAE;YAC1C,MAAM,CAAC,iBAAiB,CAAC,YAAY,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;IACP,CAAC;IAEQ,KAAK,CAAC,GAAW;QACtB,MAAM,CAAC,iBAAiB,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACnD,CAAC;IAEQ,yBAAyB;QAC9B,yDAAyD;QACxD,IAAI,CAAC,aAAuC,CAAC,cAAc,CAAC,GAAG,EAAE;YAC9D,MAAM,QAAQ,GAAG,EAAE,CAAC;YACpB,wFAAwF;YACxF,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBACzD,MAAM,YAAY,GAAG,IAAI,uBAAQ,EAAQ,CAAC;gBAC1C,MAAM,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;gBACrC,GAAG,CAAC,gBAAgB,CAAC,UAAU,EAAE,GAAG,EAAE;oBAClC,YAAY,CAAC,OAAO,EAAE,CAAC;gBAC3B,CAAC,CAAC,CAAC;gBACH,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YACxC,CAAC;YACD,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBACzD,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;YACrC,CAAC;YACD,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,IAAA,sBAAO,EAAC,IAAI,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAChF,CAAC,CAAC,CAAC;IACP,CAAC;IAEkB,aAAa,CAAC,SAAiB,EAAE,MAAyB,EAAE,KAAuB;QAClG,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;QAClE,MAAM,CAAC,iBAAiB,CAAC,qCAAqC,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;QAE9H,6DAA6D;QAC7D,MAAM,gBAAgB,GAAG,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,oDAAsB,EAAE,CAAC,CAAC,CAAC;QACvF,MAAM,CAAC,iBAAiB,CAAC,YAAY,CAAC,gBAAgB,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;QAExE,+DAA+D;QAC/D,kEAAkE;IACtE,CAAC;IACO,KAAK,CAAC,QAAQ,CAAC,iBAAoC,EAAE,KAAuB,EAAE,SAAiB;QACnG,OAAO,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,iBAAiB,EAAE,KAAK,CAAC,CAAC;IACpE,CAAC;CAEJ,CAAA;
|
|
1
|
+
{"version":3,"file":"electron-secondary-window-service.js","sourceRoot":"","sources":["../../../src/electron-browser/window/electron-secondary-window-service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/core",
|
|
3
|
-
"version": "1.77.0-next.
|
|
3
|
+
"version": "1.77.0-next.89+f8803521d",
|
|
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",
|
|
@@ -17,8 +17,8 @@
|
|
|
17
17
|
"@lumino/virtualdom": "^2.0.5",
|
|
18
18
|
"@lumino/widgets": "2.7.5",
|
|
19
19
|
"@parcel/watcher": "^2.6.0",
|
|
20
|
-
"@theia/application-package": "1.77.0-next.
|
|
21
|
-
"@theia/request": "1.77.0-next.
|
|
20
|
+
"@theia/application-package": "1.77.0-next.89+f8803521d",
|
|
21
|
+
"@theia/request": "1.77.0-next.89+f8803521d",
|
|
22
22
|
"@types/body-parser": "^1.19.6",
|
|
23
23
|
"@types/express": "^4.17.25",
|
|
24
24
|
"@types/fs-extra": "^4.0.15",
|
|
@@ -233,5 +233,5 @@
|
|
|
233
233
|
"nyc": {
|
|
234
234
|
"extends": "../../configs/nyc.json"
|
|
235
235
|
},
|
|
236
|
-
"gitHead": "
|
|
236
|
+
"gitHead": "f8803521dea069bef0e4d7e5449b3918c5e5cee2"
|
|
237
237
|
}
|
|
@@ -22,7 +22,7 @@ import { FrontendApplicationContribution } from './frontend-application-contribu
|
|
|
22
22
|
import { ContributionProvider } from '../common/contribution-provider';
|
|
23
23
|
import { Disposable, DisposableCollection } from '../common/disposable';
|
|
24
24
|
import { DEFAULT_BACKGROUND_COLOR_STORAGE_KEY } from './frontend-application-config-provider';
|
|
25
|
-
import {
|
|
25
|
+
import { SecondaryWindowService } from './window/secondary-window-service';
|
|
26
26
|
|
|
27
27
|
export const ColorContribution = Symbol('ColorContribution');
|
|
28
28
|
export interface ColorContribution {
|
|
@@ -44,8 +44,8 @@ export class ColorApplicationContribution implements FrontendApplicationContribu
|
|
|
44
44
|
|
|
45
45
|
@inject(ThemeService) protected readonly themeService: ThemeService;
|
|
46
46
|
|
|
47
|
-
@inject(
|
|
48
|
-
protected readonly
|
|
47
|
+
@inject(SecondaryWindowService)
|
|
48
|
+
protected readonly secondaryWindowService: SecondaryWindowService;
|
|
49
49
|
|
|
50
50
|
onStart(): void {
|
|
51
51
|
for (const contribution of this.colorContributions.getContributions()) {
|
|
@@ -59,10 +59,9 @@ export class ColorApplicationContribution implements FrontendApplicationContribu
|
|
|
59
59
|
this.colors.onDidChange(() => this.update());
|
|
60
60
|
|
|
61
61
|
this.registerWindow(window);
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
this.secondaryWindowHandler.onWillRemoveWidget(([widget, window]) => {
|
|
62
|
+
// registered per window rather than per widget, as a window may contain several widgets
|
|
63
|
+
this.secondaryWindowService.onWindowLoaded(win => this.registerWindow(win));
|
|
64
|
+
this.secondaryWindowService.onWindowClosed(window => {
|
|
66
65
|
this.windows.delete(window);
|
|
67
66
|
});
|
|
68
67
|
}
|
|
@@ -1606,6 +1606,14 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
|
|
|
1606
1606
|
id: 'tab.hoverBorder',
|
|
1607
1607
|
description: 'Border to highlight tabs when hovering. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups.'
|
|
1608
1608
|
},
|
|
1609
|
+
{
|
|
1610
|
+
id: 'tab.dragAndDropBorder', defaults: {
|
|
1611
|
+
dark: 'tab.activeForeground',
|
|
1612
|
+
light: 'tab.activeForeground',
|
|
1613
|
+
hcDark: 'contrastActiveBorder',
|
|
1614
|
+
hcLight: 'contrastActiveBorder'
|
|
1615
|
+
}, description: 'Border between tabs to indicate that a tab can be inserted between two tabs. Tabs are the containers for editors in the editor area. Multiple tabs can be opened in one editor group. There can be multiple editor groups.'
|
|
1616
|
+
},
|
|
1609
1617
|
{
|
|
1610
1618
|
id: 'tab.unfocusedHoverBorder', defaults: {
|
|
1611
1619
|
dark: Color.transparent('tab.hoverBorder', 0.5),
|
|
@@ -131,10 +131,12 @@ import { BackendRequestService, RequestService, REQUEST_SERVICE_PATH } from '@th
|
|
|
131
131
|
import { bindFrontendStopwatch, bindBackendStopwatch } from './performance';
|
|
132
132
|
import { SaveableService, SaveErrorChecker } from './saveable-service';
|
|
133
133
|
import { SecondaryWindowHandler } from './secondary-window-handler';
|
|
134
|
+
import { SaveableSecondaryWindowCloseContribution, SecondaryWindowCloseContribution } from './window/secondary-window-close-contribution';
|
|
134
135
|
import { UserWorkingDirectoryProvider } from './user-working-directory-provider';
|
|
135
136
|
import { WindowTitleService } from './window/window-title-service';
|
|
136
137
|
import { WindowTitleUpdater } from './window/window-title-updater';
|
|
137
138
|
import { TheiaDockPanel } from './shell/theia-dock-panel';
|
|
139
|
+
import { NativeTabDragService } from './shell/native-tab-drag-service';
|
|
138
140
|
import { bindStatusBar } from './status-bar';
|
|
139
141
|
import { CoreMarkdownRenderer, MarkdownRenderer, MarkdownRendererFactory, MarkdownRendererImpl } from './markdown-rendering/markdown-renderer';
|
|
140
142
|
import { StylingParticipant, StylingService } from './styling-service';
|
|
@@ -212,6 +214,7 @@ export const frontendApplicationModule = new ContainerModule((bind, _unbind, _is
|
|
|
212
214
|
return renderer;
|
|
213
215
|
});
|
|
214
216
|
bind(DockPanelRenderer).toSelf();
|
|
217
|
+
bind(NativeTabDragService).toSelf().inSingletonScope();
|
|
215
218
|
bind(TabBarRendererFactory).toFactory(({ container }) => () => {
|
|
216
219
|
const contextMenuRenderer = container.get(ContextMenuRenderer);
|
|
217
220
|
const tabBarDecoratorService = container.get(TabBarDecoratorService);
|
|
@@ -486,6 +489,9 @@ export const frontendApplicationModule = new ContainerModule((bind, _unbind, _is
|
|
|
486
489
|
bind(FrontendApplicationContribution).toService(StylingService);
|
|
487
490
|
|
|
488
491
|
bind(SecondaryWindowHandler).toSelf().inSingletonScope();
|
|
492
|
+
bindRootContributionProvider(bind, SecondaryWindowCloseContribution);
|
|
493
|
+
bind(SaveableSecondaryWindowCloseContribution).toSelf().inSingletonScope();
|
|
494
|
+
bind(SecondaryWindowCloseContribution).toService(SaveableSecondaryWindowCloseContribution);
|
|
489
495
|
bind(ViewColumnService).toSelf().inSingletonScope();
|
|
490
496
|
|
|
491
497
|
bind(UndoRedoHandlerService).toSelf().inSingletonScope();
|
|
@@ -23,6 +23,7 @@ import { QuickAccessContribution, QuickAccessProvider, QuickAccessRegistry } fro
|
|
|
23
23
|
import { filterItems, QuickInputService, QuickPickItem, QuickPicks } from './quick-input-service';
|
|
24
24
|
import { KeySequence } from '../keys';
|
|
25
25
|
import { codiconArray } from '../widgets';
|
|
26
|
+
import { WindowFocusService } from '../window/window-focus-service';
|
|
26
27
|
|
|
27
28
|
export const quickCommand: Command = {
|
|
28
29
|
id: 'workbench.action.showCommands'
|
|
@@ -59,6 +60,9 @@ export class QuickCommandService implements QuickAccessContribution, QuickAccess
|
|
|
59
60
|
@inject(QuickInputService) @optional()
|
|
60
61
|
protected readonly quickInputService: QuickInputService | undefined;
|
|
61
62
|
|
|
63
|
+
@inject(WindowFocusService) @optional()
|
|
64
|
+
protected readonly windowFocusService: WindowFocusService | undefined;
|
|
65
|
+
|
|
62
66
|
// The list of exempted commands not to be displayed in the recently used list.
|
|
63
67
|
readonly exemptedCommands: Command[] = [
|
|
64
68
|
CLEAR_COMMAND_HISTORY,
|
|
@@ -146,8 +150,10 @@ export class QuickCommandService implements QuickAccessContribution, QuickAccess
|
|
|
146
150
|
|
|
147
151
|
protected updateCommandContextElement(): void {
|
|
148
152
|
// When the palette is opened directly, the picks are computed before the quick input is shown and focused.
|
|
149
|
-
|
|
150
|
-
|
|
153
|
+
// The palette may be opened in a secondary window, use the active element of the focused window.
|
|
154
|
+
const element = this.quickInputService?.previousFocusElement ?? (this.windowFocusService?.focusedWindow ?? window).document.activeElement;
|
|
155
|
+
// not using `instanceof HTMLElement`, the element may have been created in a secondary window, i.e. in another JavaScript realm
|
|
156
|
+
this.commandContextElement = element && typeof (element as HTMLElement).focus === 'function' ? element as HTMLElement : undefined;
|
|
151
157
|
}
|
|
152
158
|
|
|
153
159
|
protected withCommandContext<T>(callback: () => T): T {
|
|
@@ -86,6 +86,14 @@ export class SaveableService implements FrontendApplicationContribution {
|
|
|
86
86
|
this.updateAutoSaveMode(value);
|
|
87
87
|
}
|
|
88
88
|
|
|
89
|
+
/**
|
|
90
|
+
* @returns whether closing the given widget would discard changes, i.e. whether it is dirty and not saved automatically
|
|
91
|
+
*/
|
|
92
|
+
wouldLoseChangesOnClose(widget: Widget): boolean {
|
|
93
|
+
const saveable = Saveable.get(widget);
|
|
94
|
+
return !!saveable && saveable.dirty && this.autoSave === 'off';
|
|
95
|
+
}
|
|
96
|
+
|
|
89
97
|
get autoSaveDelay(): number {
|
|
90
98
|
return this.saveDelay;
|
|
91
99
|
}
|