@theia/toolbar 1.63.0-next.52 → 1.63.1
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/toolbar-command-contribution.d.ts +3 -8
- package/lib/browser/toolbar-command-contribution.d.ts.map +1 -1
- package/lib/browser/toolbar-command-contribution.js +8 -25
- package/lib/browser/toolbar-command-contribution.js.map +1 -1
- package/lib/browser/toolbar-controller.d.ts +3 -4
- package/lib/browser/toolbar-controller.d.ts.map +1 -1
- package/lib/browser/toolbar-controller.js +30 -29
- package/lib/browser/toolbar-controller.js.map +1 -1
- package/lib/browser/toolbar-storage-provider.d.ts +4 -2
- package/lib/browser/toolbar-storage-provider.d.ts.map +1 -1
- package/lib/browser/toolbar-storage-provider.js +13 -16
- package/lib/browser/toolbar-storage-provider.js.map +1 -1
- package/package.json +10 -10
- package/src/browser/toolbar-command-contribution.ts +9 -15
- package/src/browser/toolbar-controller.ts +33 -28
- package/src/browser/toolbar-storage-provider.ts +14 -17
|
@@ -1,19 +1,14 @@
|
|
|
1
|
-
import { CommandContribution, CommandRegistry,
|
|
2
|
-
import { KeybindingContribution, KeybindingRegistry, PreferenceService
|
|
1
|
+
import { CommandContribution, CommandRegistry, MenuContribution, MenuModelRegistry } from '@theia/core';
|
|
2
|
+
import { KeybindingContribution, KeybindingRegistry, PreferenceService } from '@theia/core/lib/browser';
|
|
3
3
|
import { interfaces } from '@theia/core/shared/inversify';
|
|
4
|
-
import { EditorManager } from '@theia/editor/lib/browser';
|
|
5
4
|
import { ToolbarCommandQuickInputService } from './toolbar-command-quick-input-service';
|
|
6
5
|
import { ToolbarController } from './toolbar-controller';
|
|
7
6
|
import { JsonSchemaContribution, JsonSchemaDataStore, JsonSchemaRegisterContext } from '@theia/core/lib/browser/json-schema-store';
|
|
8
7
|
import URI from '@theia/core/lib/common/uri';
|
|
9
8
|
export declare class ToolbarCommandContribution implements CommandContribution, KeybindingContribution, MenuContribution, JsonSchemaContribution {
|
|
10
|
-
protected readonly
|
|
11
|
-
protected readonly quickInputService: QuickInputService;
|
|
9
|
+
protected readonly controller: ToolbarController;
|
|
12
10
|
protected toolbarCommandPickService: ToolbarCommandQuickInputService;
|
|
13
|
-
protected readonly commandService: CommandService;
|
|
14
|
-
protected readonly editorManager: EditorManager;
|
|
15
11
|
protected readonly preferenceService: PreferenceService;
|
|
16
|
-
protected readonly toolbarModel: ToolbarController;
|
|
17
12
|
protected readonly schemaStore: JsonSchemaDataStore;
|
|
18
13
|
protected readonly schemaURI: URI;
|
|
19
14
|
registerSchemas(context: JsonSchemaRegisterContext): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolbar-command-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/toolbar-command-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,EAEH,mBAAmB,EACnB,eAAe,EACf,
|
|
1
|
+
{"version":3,"file":"toolbar-command-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/toolbar-command-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,EAEH,mBAAmB,EACnB,eAAe,EACf,gBAAgB,EAChB,iBAAiB,EACpB,MAAM,aAAa,CAAC;AACrB,OAAO,EAGH,sBAAsB,EACtB,kBAAkB,EAGlB,iBAAiB,EAEpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAsB,UAAU,EAAa,MAAM,8BAA8B,CAAC;AAWzF,OAAO,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAC;AAExF,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAIzD,OAAO,EAAE,sBAAsB,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,2CAA2C,CAAC;AAEnI,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAE7C,qBACa,0BAA2B,YAAW,mBAAmB,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,sBAAsB;IACzG,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,iBAAiB,CAAC;IACnC,SAAS,CAAC,yBAAyB,EAAE,+BAA+B,CAAC;IACnF,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACtD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,mBAAmB,CAAC;IAEjF,SAAS,CAAC,QAAQ,CAAC,SAAS,MAA4B;IAExD,eAAe,CAAC,OAAO,EAAE,yBAAyB,GAAG,IAAI;IAQzD,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IA8CjD,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO;IAIhD,mBAAmB,CAAC,IAAI,EAAE,kBAAkB,GAAG,IAAI;IAOnD,aAAa,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;CAwCnD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAiCvD"}
|
|
@@ -20,7 +20,6 @@ const tslib_1 = require("tslib");
|
|
|
20
20
|
const core_1 = require("@theia/core");
|
|
21
21
|
const browser_1 = require("@theia/core/lib/browser");
|
|
22
22
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
23
|
-
const browser_2 = require("@theia/editor/lib/browser");
|
|
24
23
|
const toolbar_1 = require("./toolbar");
|
|
25
24
|
const toolbar_icon_selector_dialog_1 = require("./toolbar-icon-selector-dialog");
|
|
26
25
|
const toolbar_interfaces_1 = require("./toolbar-interfaces");
|
|
@@ -46,10 +45,10 @@ let ToolbarCommandContribution = class ToolbarCommandContribution {
|
|
|
46
45
|
}
|
|
47
46
|
registerCommands(registry) {
|
|
48
47
|
registry.registerCommand(toolbar_constants_1.ToolbarCommands.CUSTOMIZE_TOOLBAR, {
|
|
49
|
-
execute: () => this.
|
|
48
|
+
execute: () => this.controller.openOrCreateJSONFile(true),
|
|
50
49
|
});
|
|
51
50
|
registry.registerCommand(toolbar_constants_1.ToolbarCommands.RESET_TOOLBAR, {
|
|
52
|
-
execute: () => this.
|
|
51
|
+
execute: () => this.controller.restoreToolbarDefaults(),
|
|
53
52
|
});
|
|
54
53
|
registry.registerCommand(toolbar_constants_1.ToolbarCommands.TOGGLE_TOOLBAR, {
|
|
55
54
|
execute: () => {
|
|
@@ -58,26 +57,26 @@ let ToolbarCommandContribution = class ToolbarCommandContribution {
|
|
|
58
57
|
},
|
|
59
58
|
});
|
|
60
59
|
registry.registerCommand(toolbar_constants_1.ToolbarCommands.REMOVE_COMMAND_FROM_TOOLBAR, {
|
|
61
|
-
execute: async (_widget, position, id) => position && this.
|
|
60
|
+
execute: async (_widget, position, id) => position && this.controller.removeItem(position, id),
|
|
62
61
|
isVisible: (...args) => this.isToolbarWidget(args[0]),
|
|
63
62
|
});
|
|
64
63
|
registry.registerCommand(toolbar_constants_1.ToolbarCommands.INSERT_GROUP_LEFT, {
|
|
65
|
-
execute: async (_widget, position) => position && this.
|
|
64
|
+
execute: async (_widget, position) => position && this.controller.insertGroup(position, 'left'),
|
|
66
65
|
isVisible: (widget, position) => {
|
|
67
66
|
if (position) {
|
|
68
67
|
const { alignment, groupIndex, itemIndex } = position;
|
|
69
|
-
const owningGroupLength = this.
|
|
68
|
+
const owningGroupLength = this.controller.toolbarItems.items[alignment][groupIndex].length;
|
|
70
69
|
return this.isToolbarWidget(widget) && (owningGroupLength > 1) && (itemIndex > 0);
|
|
71
70
|
}
|
|
72
71
|
return false;
|
|
73
72
|
},
|
|
74
73
|
});
|
|
75
74
|
registry.registerCommand(toolbar_constants_1.ToolbarCommands.INSERT_GROUP_RIGHT, {
|
|
76
|
-
execute: async (_widget, position) => position && this.
|
|
75
|
+
execute: async (_widget, position) => position && this.controller.insertGroup(position, 'right'),
|
|
77
76
|
isVisible: (widget, position) => {
|
|
78
77
|
if (position) {
|
|
79
78
|
const { alignment, groupIndex, itemIndex } = position;
|
|
80
|
-
const owningGroupLength = this.
|
|
79
|
+
const owningGroupLength = this.controller.toolbarItems.items[alignment][groupIndex].length;
|
|
81
80
|
const isNotLastItem = itemIndex < (owningGroupLength - 1);
|
|
82
81
|
return this.isToolbarWidget(widget) && owningGroupLength > 1 && isNotLastItem;
|
|
83
82
|
}
|
|
@@ -140,31 +139,15 @@ exports.ToolbarCommandContribution = ToolbarCommandContribution;
|
|
|
140
139
|
tslib_1.__decorate([
|
|
141
140
|
(0, inversify_1.inject)(toolbar_controller_1.ToolbarController),
|
|
142
141
|
tslib_1.__metadata("design:type", toolbar_controller_1.ToolbarController)
|
|
143
|
-
], ToolbarCommandContribution.prototype, "
|
|
144
|
-
tslib_1.__decorate([
|
|
145
|
-
(0, inversify_1.inject)(browser_1.QuickInputService),
|
|
146
|
-
tslib_1.__metadata("design:type", Object)
|
|
147
|
-
], ToolbarCommandContribution.prototype, "quickInputService", void 0);
|
|
142
|
+
], ToolbarCommandContribution.prototype, "controller", void 0);
|
|
148
143
|
tslib_1.__decorate([
|
|
149
144
|
(0, inversify_1.inject)(toolbar_command_quick_input_service_1.ToolbarCommandQuickInputService),
|
|
150
145
|
tslib_1.__metadata("design:type", toolbar_command_quick_input_service_1.ToolbarCommandQuickInputService)
|
|
151
146
|
], ToolbarCommandContribution.prototype, "toolbarCommandPickService", void 0);
|
|
152
|
-
tslib_1.__decorate([
|
|
153
|
-
(0, inversify_1.inject)(core_1.CommandService),
|
|
154
|
-
tslib_1.__metadata("design:type", Object)
|
|
155
|
-
], ToolbarCommandContribution.prototype, "commandService", void 0);
|
|
156
|
-
tslib_1.__decorate([
|
|
157
|
-
(0, inversify_1.inject)(browser_2.EditorManager),
|
|
158
|
-
tslib_1.__metadata("design:type", browser_2.EditorManager)
|
|
159
|
-
], ToolbarCommandContribution.prototype, "editorManager", void 0);
|
|
160
147
|
tslib_1.__decorate([
|
|
161
148
|
(0, inversify_1.inject)(browser_1.PreferenceService),
|
|
162
149
|
tslib_1.__metadata("design:type", Object)
|
|
163
150
|
], ToolbarCommandContribution.prototype, "preferenceService", void 0);
|
|
164
|
-
tslib_1.__decorate([
|
|
165
|
-
(0, inversify_1.inject)(toolbar_controller_1.ToolbarController),
|
|
166
|
-
tslib_1.__metadata("design:type", toolbar_controller_1.ToolbarController)
|
|
167
|
-
], ToolbarCommandContribution.prototype, "toolbarModel", void 0);
|
|
168
151
|
tslib_1.__decorate([
|
|
169
152
|
(0, inversify_1.inject)(json_schema_store_1.JsonSchemaDataStore),
|
|
170
153
|
tslib_1.__metadata("design:type", json_schema_store_1.JsonSchemaDataStore)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolbar-command-contribution.js","sourceRoot":"","sources":["../../src/browser/toolbar-command-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,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,
|
|
1
|
+
{"version":3,"file":"toolbar-command-contribution.js","sourceRoot":"","sources":["../../src/browser/toolbar-command-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,6 @@ export declare class ToolbarController {
|
|
|
10
10
|
protected readonly storageProvider: ToolbarStorageProvider;
|
|
11
11
|
protected readonly appState: FrontendApplicationStateService;
|
|
12
12
|
protected readonly messageService: MessageService;
|
|
13
|
-
protected readonly defaultsFactory: () => DeflatedToolbarTree;
|
|
14
13
|
commandRegistry: CommandRegistry;
|
|
15
14
|
contextKeyService: ContextKeyService;
|
|
16
15
|
keybindingRegistry: KeybindingRegistry;
|
|
@@ -24,13 +23,13 @@ export declare class ToolbarController {
|
|
|
24
23
|
protected _toolbarItems: ToolbarTreeSchema;
|
|
25
24
|
get toolbarItems(): ToolbarTreeSchema;
|
|
26
25
|
set toolbarItems(newTree: ToolbarTreeSchema);
|
|
27
|
-
protected inflateItems(schema
|
|
26
|
+
protected inflateItems(schema?: DeflatedToolbarTree): ToolbarTreeSchema;
|
|
28
27
|
getContributionByID(id: string): ToolbarContribution | undefined;
|
|
29
28
|
protected init(): void;
|
|
30
29
|
protected doInit(): Promise<void>;
|
|
31
|
-
protected resolveToolbarItems(): Promise<ToolbarTreeSchema>;
|
|
30
|
+
protected resolveToolbarItems(promptUserOnInvalidConfig?: boolean): Promise<ToolbarTreeSchema>;
|
|
32
31
|
swapValues(oldPosition: ToolbarItemPosition, newPosition: ToolbarItemPosition, direction: 'location-left' | 'location-right'): Promise<boolean>;
|
|
33
|
-
|
|
32
|
+
restoreToolbarDefaults(): Promise<boolean>;
|
|
34
33
|
openOrCreateJSONFile(doOpen?: boolean): Promise<Widget | undefined>;
|
|
35
34
|
addItem(command: Command, area: ToolbarAlignment): Promise<boolean>;
|
|
36
35
|
removeItem(position: ToolbarItemPosition, id?: string): Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolbar-controller.d.ts","sourceRoot":"","sources":["../../src/browser/toolbar-controller.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,OAAO,EAAE,YAAY,EAAE,cAAc,
|
|
1
|
+
{"version":3,"file":"toolbar-controller.d.ts","sourceRoot":"","sources":["../../src/browser/toolbar-controller.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAO,MAAM,aAAa,CAAC;AACzH,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,+BAA+B,EAAE,MAAM,oDAAoD,CAAC;AACrG,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAE/D,OAAO,EACH,mBAAmB,EACnB,mBAAmB,EACnB,iBAAiB,EACjB,gBAAgB,EAChB,mBAAmB,EACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,sBAAsB,EAAkC,MAAM,4BAA4B,CAAC;AAEpG,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAGnE,qBACa,iBAAiB;IACM,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,sBAAsB,CAAC;IAClD,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,+BAA+B,CAAC;IAC9E,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACjD,eAAe,EAAE,eAAe,CAAC;IAC/B,iBAAiB,EAAE,iBAAiB,CAAC;IACpC,kBAAkB,EAAE,kBAAkB,CAAC;IAC9C,WAAW,EAAE,WAAW,CAAC;IAG9C,SAAS,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;IAEzE,SAAS,CAAC,4BAA4B,gBAAuB;IAC7D,QAAQ,CAAC,uBAAuB,oCAA2C;IAE3E,SAAS,CAAC,0BAA0B,mBAA0B;IAC9D,QAAQ,CAAC,2BAA2B,uCAAyC;IAE7E,QAAQ,CAAC,KAAK,iBAAwB;IAEtC,SAAS,CAAC,aAAa,EAAE,iBAAiB,CAAC;IAC3C,IAAI,YAAY,IAAI,iBAAiB,CAEpC;IAED,IAAI,YAAY,CAAC,OAAO,EAAE,iBAAiB,EAG1C;IAED,SAAS,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,mBAAmB,GAAG,iBAAiB;IAgCvE,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS;IAKhE,SAAS,CAAC,IAAI,IAAI,IAAI;cAIN,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;cAevB,mBAAmB,CAAC,yBAAyB,UAAQ,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAiB5F,UAAU,CACZ,WAAW,EAAE,mBAAmB,EAChC,WAAW,EAAE,mBAAmB,EAChC,SAAS,EAAE,eAAe,GAAG,gBAAgB,GAC9C,OAAO,CAAC,OAAO,CAAC;IAOb,sBAAsB,IAAI,OAAO,CAAC,OAAO,CAAC;IAI1C,oBAAoB,CAAC,MAAM,UAAQ,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAIjE,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAOnE,UAAU,CAAC,QAAQ,EAAE,mBAAmB,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAOxE,oBAAoB,CACtB,mBAAmB,EAAE,mBAAmB,EACxC,MAAM,EAAE,gBAAgB,EACxB,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,GAClC,OAAO,CAAC,OAAO,CAAC;IAOb,WAAW,CAAC,QAAQ,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAO/F,QAAQ,CAAC,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;CAMzE"}
|
|
@@ -22,12 +22,12 @@ const browser_1 = require("@theia/core/lib/browser");
|
|
|
22
22
|
const frontend_application_state_1 = require("@theia/core/lib/browser/frontend-application-state");
|
|
23
23
|
const promise_util_1 = require("@theia/core/lib/common/promise-util");
|
|
24
24
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
25
|
-
const toolbar_defaults_1 = require("./toolbar-defaults");
|
|
26
25
|
const toolbar_interfaces_1 = require("./toolbar-interfaces");
|
|
27
26
|
const toolbar_storage_provider_1 = require("./toolbar-storage-provider");
|
|
28
27
|
const tab_toolbar_item_1 = require("@theia/core/lib/browser/shell/tab-bar-toolbar/tab-toolbar-item");
|
|
29
28
|
const context_key_service_1 = require("@theia/core/lib/browser/context-key-service");
|
|
30
29
|
const label_parser_1 = require("@theia/core/lib/browser/label-parser");
|
|
30
|
+
const toolbar_constants_1 = require("./toolbar-constants");
|
|
31
31
|
let ToolbarController = class ToolbarController {
|
|
32
32
|
constructor() {
|
|
33
33
|
this.toolbarModelDidUpdateEmitter = new core_1.Emitter();
|
|
@@ -51,24 +51,26 @@ let ToolbarController = class ToolbarController {
|
|
|
51
51
|
[toolbar_interfaces_1.ToolbarAlignment.RIGHT]: [],
|
|
52
52
|
},
|
|
53
53
|
};
|
|
54
|
-
|
|
55
|
-
const
|
|
56
|
-
|
|
57
|
-
const
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
54
|
+
if (schema) {
|
|
55
|
+
for (const column of Object.keys(schema.items)) {
|
|
56
|
+
const currentColumn = schema.items[column];
|
|
57
|
+
for (const group of currentColumn) {
|
|
58
|
+
const newGroup = [];
|
|
59
|
+
for (const item of group) {
|
|
60
|
+
if (item.group === 'contributed') {
|
|
61
|
+
const contribution = this.getContributionByID(item.id);
|
|
62
|
+
if (contribution) {
|
|
63
|
+
newGroup.push(new tab_toolbar_item_1.ReactToolbarItemImpl(this.commandRegistry, this.contextKeyService, contribution));
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
newGroup.push(new tab_toolbar_item_1.RenderedToolbarItemImpl(this.commandRegistry, this.contextKeyService, this.keybindingRegistry, this.labelParser, item));
|
|
63
68
|
}
|
|
64
69
|
}
|
|
65
|
-
|
|
66
|
-
|
|
70
|
+
if (newGroup.length) {
|
|
71
|
+
newTree.items[column].push(newGroup);
|
|
67
72
|
}
|
|
68
73
|
}
|
|
69
|
-
if (newGroup.length) {
|
|
70
|
-
newTree.items[column].push(newGroup);
|
|
71
|
-
}
|
|
72
74
|
}
|
|
73
75
|
}
|
|
74
76
|
return newTree;
|
|
@@ -84,7 +86,7 @@ let ToolbarController = class ToolbarController {
|
|
|
84
86
|
await this.storageProvider.ready;
|
|
85
87
|
this.toolbarItems = await this.resolveToolbarItems();
|
|
86
88
|
this.storageProvider.onToolbarItemsChanged(async () => {
|
|
87
|
-
this.toolbarItems = await this.resolveToolbarItems();
|
|
89
|
+
this.toolbarItems = await this.resolveToolbarItems(true);
|
|
88
90
|
});
|
|
89
91
|
this.ready.resolve();
|
|
90
92
|
this.widgetContributions.getContributions().forEach(contribution => {
|
|
@@ -93,17 +95,20 @@ let ToolbarController = class ToolbarController {
|
|
|
93
95
|
}
|
|
94
96
|
});
|
|
95
97
|
}
|
|
96
|
-
async resolveToolbarItems() {
|
|
98
|
+
async resolveToolbarItems(promptUserOnInvalidConfig = false) {
|
|
97
99
|
await this.storageProvider.ready;
|
|
98
|
-
if (this.storageProvider.toolbarItems) {
|
|
99
|
-
|
|
100
|
-
|
|
100
|
+
if (!this.storageProvider.toolbarItems) {
|
|
101
|
+
let restoreDefaults = true;
|
|
102
|
+
if (promptUserOnInvalidConfig) {
|
|
103
|
+
const resetLabel = toolbar_constants_1.ToolbarCommands.RESET_TOOLBAR.label;
|
|
104
|
+
const answer = await this.messageService.error(core_1.nls.localize('theia/toolbar/jsonError', toolbar_storage_provider_1.TOOLBAR_BAD_JSON_ERROR_MESSAGE), resetLabel);
|
|
105
|
+
restoreDefaults = answer === resetLabel;
|
|
101
106
|
}
|
|
102
|
-
|
|
103
|
-
this.
|
|
107
|
+
if (restoreDefaults) {
|
|
108
|
+
await this.restoreToolbarDefaults();
|
|
104
109
|
}
|
|
105
110
|
}
|
|
106
|
-
return this.inflateItems(this.
|
|
111
|
+
return this.inflateItems(this.storageProvider.toolbarItems);
|
|
107
112
|
}
|
|
108
113
|
async swapValues(oldPosition, newPosition, direction) {
|
|
109
114
|
return this.withBusy(async () => {
|
|
@@ -111,8 +116,8 @@ let ToolbarController = class ToolbarController {
|
|
|
111
116
|
return this.storageProvider.swapValues(oldPosition, newPosition, direction);
|
|
112
117
|
});
|
|
113
118
|
}
|
|
114
|
-
async
|
|
115
|
-
return this.withBusy(() => this.storageProvider.
|
|
119
|
+
async restoreToolbarDefaults() {
|
|
120
|
+
return this.withBusy(() => this.storageProvider.restoreToolbarDefaults());
|
|
116
121
|
}
|
|
117
122
|
async openOrCreateJSONFile(doOpen = false) {
|
|
118
123
|
return this.storageProvider.openOrCreateJSONFile(this.toolbarItems, doOpen);
|
|
@@ -161,10 +166,6 @@ tslib_1.__decorate([
|
|
|
161
166
|
(0, inversify_1.inject)(core_1.MessageService),
|
|
162
167
|
tslib_1.__metadata("design:type", core_1.MessageService)
|
|
163
168
|
], ToolbarController.prototype, "messageService", void 0);
|
|
164
|
-
tslib_1.__decorate([
|
|
165
|
-
(0, inversify_1.inject)(toolbar_defaults_1.ToolbarDefaultsFactory),
|
|
166
|
-
tslib_1.__metadata("design:type", Function)
|
|
167
|
-
], ToolbarController.prototype, "defaultsFactory", void 0);
|
|
168
169
|
tslib_1.__decorate([
|
|
169
170
|
(0, inversify_1.inject)(core_1.CommandRegistry),
|
|
170
171
|
tslib_1.__metadata("design:type", core_1.CommandRegistry)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolbar-controller.js","sourceRoot":"","sources":["../../src/browser/toolbar-controller.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,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,
|
|
1
|
+
{"version":3,"file":"toolbar-controller.js","sourceRoot":"","sources":["../../src/browser/toolbar-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ export declare class ToolbarStorageProvider implements Disposable {
|
|
|
19
19
|
protected readonly messageService: MessageService;
|
|
20
20
|
protected lateInjector: <T>(id: interfaces.ServiceIdentifier<T>) => T;
|
|
21
21
|
protected readonly USER_TOOLBAR_URI: URI;
|
|
22
|
+
protected readonly defaultsFactory: () => DeflatedToolbarTree;
|
|
22
23
|
get ready(): Promise<void>;
|
|
23
24
|
protected readonly _ready: Deferred<void>;
|
|
24
25
|
protected monacoWorkspace: MonacoWorkspace;
|
|
@@ -27,7 +28,8 @@ export declare class ToolbarStorageProvider implements Disposable {
|
|
|
27
28
|
protected toDispose: DisposableCollection;
|
|
28
29
|
protected toolbarItemsUpdatedEmitter: Emitter<void>;
|
|
29
30
|
readonly onToolbarItemsChanged: import("@theia/core").Event<void>;
|
|
30
|
-
|
|
31
|
+
protected _toolbarItems: DeflatedToolbarTree | undefined;
|
|
32
|
+
get toolbarItems(): DeflatedToolbarTree | undefined;
|
|
31
33
|
protected init(): void;
|
|
32
34
|
protected doInit(): Promise<void>;
|
|
33
35
|
protected readConfiguration(): void;
|
|
@@ -38,7 +40,7 @@ export declare class ToolbarStorageProvider implements Disposable {
|
|
|
38
40
|
moveItemToEmptySpace(oldPosition: ToolbarItemPosition, newAlignment: ToolbarAlignment, centerPosition?: 'left' | 'right'): Promise<boolean>;
|
|
39
41
|
insertGroup(position: ToolbarItemPosition, insertDirection: 'left' | 'right'): Promise<boolean>;
|
|
40
42
|
protected removeEmptyGroupsFromToolbar(toolbarItems: DeflatedToolbarTree | undefined): DeflatedToolbarTree | undefined;
|
|
41
|
-
|
|
43
|
+
restoreToolbarDefaults(): Promise<boolean>;
|
|
42
44
|
protected writeToFile(path: jsoncParser.JSONPath, value: unknown, insertion?: boolean): Promise<boolean>;
|
|
43
45
|
protected parseContent(fileContent: string): DeflatedToolbarTree | undefined;
|
|
44
46
|
protected parse(fileContent: string): DeflatedToolbarTree | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolbar-storage-provider.d.ts","sourceRoot":"","sources":["../../src/browser/toolbar-storage-provider.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,WAAW,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAa,UAAU,EAAE,oBAAoB,EAAE,OAAO,EAAE,cAAc,EAAO,MAAM,aAAa,CAAC;AACjH,OAAO,EAAqC,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAE7E,OAAO,EAAE,+BAA+B,EAAE,MAAM,oDAAoD,CAAC;AACrG,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AACzE,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EACH,mBAAmB,EACnB,iBAAiB,EAEjB,mBAAmB,EACnB,gBAAgB,EAChB,mBAAmB,EAEtB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"toolbar-storage-provider.d.ts","sourceRoot":"","sources":["../../src/browser/toolbar-storage-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,7 @@ const uri_1 = require("@theia/core/lib/common/uri");
|
|
|
31
31
|
const toolbar_interfaces_1 = require("./toolbar-interfaces");
|
|
32
32
|
const toolbar_constants_1 = require("./toolbar-constants");
|
|
33
33
|
const toolbar_preference_schema_1 = require("./toolbar-preference-schema");
|
|
34
|
+
const toolbar_defaults_1 = require("./toolbar-defaults");
|
|
34
35
|
exports.TOOLBAR_BAD_JSON_ERROR_MESSAGE = 'There was an error reading your toolbar.json file. Please check if it is corrupt'
|
|
35
36
|
+ ' by right-clicking the toolbar and selecting "Customize Toolbar". You can also reset it to its defaults by selecting'
|
|
36
37
|
+ ' "Restore Toolbar Defaults"';
|
|
@@ -44,6 +45,9 @@ let ToolbarStorageProvider = class ToolbarStorageProvider {
|
|
|
44
45
|
get ready() {
|
|
45
46
|
return this._ready.promise;
|
|
46
47
|
}
|
|
48
|
+
get toolbarItems() {
|
|
49
|
+
return this._toolbarItems;
|
|
50
|
+
}
|
|
47
51
|
init() {
|
|
48
52
|
this.doInit();
|
|
49
53
|
}
|
|
@@ -71,10 +75,10 @@ let ToolbarStorageProvider = class ToolbarStorageProvider {
|
|
|
71
75
|
try {
|
|
72
76
|
if (this.model.valid) {
|
|
73
77
|
const content = this.model.getText();
|
|
74
|
-
this.
|
|
78
|
+
this._toolbarItems = this.parseContent(content);
|
|
75
79
|
}
|
|
76
80
|
else {
|
|
77
|
-
this.
|
|
81
|
+
this._toolbarItems = undefined;
|
|
78
82
|
}
|
|
79
83
|
this.toolbarItemsUpdatedEmitter.fire();
|
|
80
84
|
}
|
|
@@ -219,20 +223,9 @@ let ToolbarStorageProvider = class ToolbarStorageProvider {
|
|
|
219
223
|
}
|
|
220
224
|
return undefined;
|
|
221
225
|
}
|
|
222
|
-
async
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
await this.monacoWorkspace.applyBackgroundEdit(this.model, [
|
|
226
|
-
{
|
|
227
|
-
range: textModel.getFullModelRange(),
|
|
228
|
-
// eslint-disable-next-line no-null/no-null
|
|
229
|
-
text: null,
|
|
230
|
-
forceMoveMarkers: false,
|
|
231
|
-
},
|
|
232
|
-
]);
|
|
233
|
-
}
|
|
234
|
-
this.toolbarItemsUpdatedEmitter.fire();
|
|
235
|
-
return true;
|
|
226
|
+
async restoreToolbarDefaults() {
|
|
227
|
+
this._toolbarItems = this.defaultsFactory();
|
|
228
|
+
return this.writeToFile([], this._toolbarItems);
|
|
236
229
|
}
|
|
237
230
|
async writeToFile(path, value, insertion = false) {
|
|
238
231
|
if (this.model) {
|
|
@@ -338,6 +331,10 @@ tslib_1.__decorate([
|
|
|
338
331
|
(0, inversify_1.inject)(toolbar_constants_1.UserToolbarURI),
|
|
339
332
|
tslib_1.__metadata("design:type", uri_1.default)
|
|
340
333
|
], ToolbarStorageProvider.prototype, "USER_TOOLBAR_URI", void 0);
|
|
334
|
+
tslib_1.__decorate([
|
|
335
|
+
(0, inversify_1.inject)(toolbar_defaults_1.ToolbarDefaultsFactory),
|
|
336
|
+
tslib_1.__metadata("design:type", Function)
|
|
337
|
+
], ToolbarStorageProvider.prototype, "defaultsFactory", void 0);
|
|
341
338
|
tslib_1.__decorate([
|
|
342
339
|
(0, inversify_1.postConstruct)(),
|
|
343
340
|
tslib_1.__metadata("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"toolbar-storage-provider.js","sourceRoot":"","sources":["../../src/browser/toolbar-storage-provider.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"toolbar-storage-provider.js","sourceRoot":"","sources":["../../src/browser/toolbar-storage-provider.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/toolbar",
|
|
3
|
-
"version": "1.63.
|
|
3
|
+
"version": "1.63.1",
|
|
4
4
|
"description": "Theia - Toolbar",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"theia-extension"
|
|
@@ -27,15 +27,15 @@
|
|
|
27
27
|
"watch": "theiaext watch"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@theia/core": "1.63.
|
|
31
|
-
"@theia/editor": "1.63.
|
|
32
|
-
"@theia/file-search": "1.63.
|
|
33
|
-
"@theia/filesystem": "1.63.
|
|
34
|
-
"@theia/monaco": "1.63.
|
|
30
|
+
"@theia/core": "1.63.1",
|
|
31
|
+
"@theia/editor": "1.63.1",
|
|
32
|
+
"@theia/file-search": "1.63.1",
|
|
33
|
+
"@theia/filesystem": "1.63.1",
|
|
34
|
+
"@theia/monaco": "1.63.1",
|
|
35
35
|
"@theia/monaco-editor-core": "1.96.302",
|
|
36
|
-
"@theia/search-in-workspace": "1.63.
|
|
37
|
-
"@theia/userstorage": "1.63.
|
|
38
|
-
"@theia/workspace": "1.63.
|
|
36
|
+
"@theia/search-in-workspace": "1.63.1",
|
|
37
|
+
"@theia/userstorage": "1.63.1",
|
|
38
|
+
"@theia/workspace": "1.63.1",
|
|
39
39
|
"ajv": "^6.5.3",
|
|
40
40
|
"jsonc-parser": "^2.2.0",
|
|
41
41
|
"perfect-scrollbar": "1.5.5",
|
|
@@ -49,5 +49,5 @@
|
|
|
49
49
|
"publishConfig": {
|
|
50
50
|
"access": "public"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "c1f24d58391fec06087b0c4526ce97aa248c3405"
|
|
53
53
|
}
|
|
@@ -18,7 +18,6 @@ import {
|
|
|
18
18
|
bindContributionProvider,
|
|
19
19
|
CommandContribution,
|
|
20
20
|
CommandRegistry,
|
|
21
|
-
CommandService,
|
|
22
21
|
MenuContribution,
|
|
23
22
|
MenuModelRegistry,
|
|
24
23
|
} from '@theia/core';
|
|
@@ -30,11 +29,9 @@ import {
|
|
|
30
29
|
PreferenceContribution,
|
|
31
30
|
PreferenceScope,
|
|
32
31
|
PreferenceService,
|
|
33
|
-
QuickInputService,
|
|
34
32
|
Widget,
|
|
35
33
|
} from '@theia/core/lib/browser';
|
|
36
34
|
import { injectable, inject, interfaces, Container } from '@theia/core/shared/inversify';
|
|
37
|
-
import { EditorManager } from '@theia/editor/lib/browser';
|
|
38
35
|
import { ToolbarImpl } from './toolbar';
|
|
39
36
|
import { bindToolbarIconDialog } from './toolbar-icon-selector-dialog';
|
|
40
37
|
import {
|
|
@@ -57,14 +54,11 @@ import URI from '@theia/core/lib/common/uri';
|
|
|
57
54
|
|
|
58
55
|
@injectable()
|
|
59
56
|
export class ToolbarCommandContribution implements CommandContribution, KeybindingContribution, MenuContribution, JsonSchemaContribution {
|
|
60
|
-
@inject(ToolbarController) protected readonly
|
|
61
|
-
@inject(QuickInputService) protected readonly quickInputService: QuickInputService;
|
|
57
|
+
@inject(ToolbarController) protected readonly controller: ToolbarController;
|
|
62
58
|
@inject(ToolbarCommandQuickInputService) protected toolbarCommandPickService: ToolbarCommandQuickInputService;
|
|
63
|
-
@inject(CommandService) protected readonly commandService: CommandService;
|
|
64
|
-
@inject(EditorManager) protected readonly editorManager: EditorManager;
|
|
65
59
|
@inject(PreferenceService) protected readonly preferenceService: PreferenceService;
|
|
66
|
-
@inject(ToolbarController) protected readonly toolbarModel: ToolbarController;
|
|
67
60
|
@inject(JsonSchemaDataStore) protected readonly schemaStore: JsonSchemaDataStore;
|
|
61
|
+
|
|
68
62
|
protected readonly schemaURI = new URI(toolbarSchemaId);
|
|
69
63
|
|
|
70
64
|
registerSchemas(context: JsonSchemaRegisterContext): void {
|
|
@@ -77,10 +71,10 @@ export class ToolbarCommandContribution implements CommandContribution, Keybindi
|
|
|
77
71
|
|
|
78
72
|
registerCommands(registry: CommandRegistry): void {
|
|
79
73
|
registry.registerCommand(ToolbarCommands.CUSTOMIZE_TOOLBAR, {
|
|
80
|
-
execute: () => this.
|
|
74
|
+
execute: () => this.controller.openOrCreateJSONFile(true),
|
|
81
75
|
});
|
|
82
76
|
registry.registerCommand(ToolbarCommands.RESET_TOOLBAR, {
|
|
83
|
-
execute: () => this.
|
|
77
|
+
execute: () => this.controller.restoreToolbarDefaults(),
|
|
84
78
|
});
|
|
85
79
|
registry.registerCommand(ToolbarCommands.TOGGLE_TOOLBAR, {
|
|
86
80
|
execute: () => {
|
|
@@ -90,26 +84,26 @@ export class ToolbarCommandContribution implements CommandContribution, Keybindi
|
|
|
90
84
|
});
|
|
91
85
|
|
|
92
86
|
registry.registerCommand(ToolbarCommands.REMOVE_COMMAND_FROM_TOOLBAR, {
|
|
93
|
-
execute: async (_widget, position: ToolbarItemPosition | undefined, id?: string) => position && this.
|
|
87
|
+
execute: async (_widget, position: ToolbarItemPosition | undefined, id?: string) => position && this.controller.removeItem(position, id),
|
|
94
88
|
isVisible: (...args) => this.isToolbarWidget(args[0]),
|
|
95
89
|
});
|
|
96
90
|
registry.registerCommand(ToolbarCommands.INSERT_GROUP_LEFT, {
|
|
97
|
-
execute: async (_widget: Widget, position: ToolbarItemPosition | undefined) => position && this.
|
|
91
|
+
execute: async (_widget: Widget, position: ToolbarItemPosition | undefined) => position && this.controller.insertGroup(position, 'left'),
|
|
98
92
|
isVisible: (widget: Widget, position: ToolbarItemPosition | undefined) => {
|
|
99
93
|
if (position) {
|
|
100
94
|
const { alignment, groupIndex, itemIndex } = position;
|
|
101
|
-
const owningGroupLength = this.
|
|
95
|
+
const owningGroupLength = this.controller.toolbarItems.items[alignment][groupIndex].length;
|
|
102
96
|
return this.isToolbarWidget(widget) && (owningGroupLength > 1) && (itemIndex > 0);
|
|
103
97
|
}
|
|
104
98
|
return false;
|
|
105
99
|
},
|
|
106
100
|
});
|
|
107
101
|
registry.registerCommand(ToolbarCommands.INSERT_GROUP_RIGHT, {
|
|
108
|
-
execute: async (_widget: Widget, position: ToolbarItemPosition | undefined) => position && this.
|
|
102
|
+
execute: async (_widget: Widget, position: ToolbarItemPosition | undefined) => position && this.controller.insertGroup(position, 'right'),
|
|
109
103
|
isVisible: (widget: Widget, position: ToolbarItemPosition | undefined) => {
|
|
110
104
|
if (position) {
|
|
111
105
|
const { alignment, groupIndex, itemIndex } = position;
|
|
112
|
-
const owningGroupLength = this.
|
|
106
|
+
const owningGroupLength = this.controller.toolbarItems.items[alignment][groupIndex].length;
|
|
113
107
|
const isNotLastItem = itemIndex < (owningGroupLength - 1);
|
|
114
108
|
return this.isToolbarWidget(widget) && owningGroupLength > 1 && isNotLastItem;
|
|
115
109
|
}
|
|
@@ -14,12 +14,11 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { Command, CommandRegistry, ContributionProvider, Emitter, MaybePromise, MessageService } from '@theia/core';
|
|
17
|
+
import { Command, CommandRegistry, ContributionProvider, Emitter, MaybePromise, MessageService, nls } from '@theia/core';
|
|
18
18
|
import { KeybindingRegistry, Widget } from '@theia/core/lib/browser';
|
|
19
19
|
import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
|
|
20
20
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
21
21
|
import { injectable, inject, postConstruct, named } from '@theia/core/shared/inversify';
|
|
22
|
-
import { ToolbarDefaultsFactory } from './toolbar-defaults';
|
|
23
22
|
import {
|
|
24
23
|
DeflatedToolbarTree,
|
|
25
24
|
ToolbarContribution,
|
|
@@ -31,13 +30,13 @@ import { ToolbarStorageProvider, TOOLBAR_BAD_JSON_ERROR_MESSAGE } from './toolba
|
|
|
31
30
|
import { ReactToolbarItemImpl, RenderedToolbarItemImpl, TabBarToolbarItem } from '@theia/core/lib/browser/shell/tab-bar-toolbar/tab-toolbar-item';
|
|
32
31
|
import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
|
|
33
32
|
import { LabelParser } from '@theia/core/lib/browser/label-parser';
|
|
33
|
+
import { ToolbarCommands } from './toolbar-constants';
|
|
34
34
|
|
|
35
35
|
@injectable()
|
|
36
36
|
export class ToolbarController {
|
|
37
37
|
@inject(ToolbarStorageProvider) protected readonly storageProvider: ToolbarStorageProvider;
|
|
38
38
|
@inject(FrontendApplicationStateService) protected readonly appState: FrontendApplicationStateService;
|
|
39
39
|
@inject(MessageService) protected readonly messageService: MessageService;
|
|
40
|
-
@inject(ToolbarDefaultsFactory) protected readonly defaultsFactory: () => DeflatedToolbarTree;
|
|
41
40
|
@inject(CommandRegistry) commandRegistry: CommandRegistry;
|
|
42
41
|
@inject(ContextKeyService) contextKeyService: ContextKeyService;
|
|
43
42
|
@inject(KeybindingRegistry) keybindingRegistry: KeybindingRegistry;
|
|
@@ -64,7 +63,7 @@ export class ToolbarController {
|
|
|
64
63
|
this.toolbarModelDidUpdateEmitter.fire();
|
|
65
64
|
}
|
|
66
65
|
|
|
67
|
-
protected inflateItems(schema
|
|
66
|
+
protected inflateItems(schema?: DeflatedToolbarTree): ToolbarTreeSchema {
|
|
68
67
|
const newTree: ToolbarTreeSchema = {
|
|
69
68
|
items: {
|
|
70
69
|
[ToolbarAlignment.LEFT]: [],
|
|
@@ -72,22 +71,24 @@ export class ToolbarController {
|
|
|
72
71
|
[ToolbarAlignment.RIGHT]: [],
|
|
73
72
|
},
|
|
74
73
|
};
|
|
75
|
-
|
|
76
|
-
const
|
|
77
|
-
|
|
78
|
-
const
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
74
|
+
if (schema) {
|
|
75
|
+
for (const column of Object.keys(schema.items)) {
|
|
76
|
+
const currentColumn = schema.items[column as ToolbarAlignment];
|
|
77
|
+
for (const group of currentColumn) {
|
|
78
|
+
const newGroup: TabBarToolbarItem[] = [];
|
|
79
|
+
for (const item of group) {
|
|
80
|
+
if (item.group === 'contributed') {
|
|
81
|
+
const contribution = this.getContributionByID(item.id);
|
|
82
|
+
if (contribution) {
|
|
83
|
+
newGroup.push(new ReactToolbarItemImpl(this.commandRegistry, this.contextKeyService, contribution));
|
|
84
|
+
}
|
|
85
|
+
} else {
|
|
86
|
+
newGroup.push(new RenderedToolbarItemImpl(this.commandRegistry, this.contextKeyService, this.keybindingRegistry, this.labelParser, item));
|
|
84
87
|
}
|
|
85
|
-
} else {
|
|
86
|
-
newGroup.push(new RenderedToolbarItemImpl(this.commandRegistry, this.contextKeyService, this.keybindingRegistry, this.labelParser, item));
|
|
87
88
|
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
89
|
+
if (newGroup.length) {
|
|
90
|
+
newTree.items[column as ToolbarAlignment].push(newGroup);
|
|
91
|
+
}
|
|
91
92
|
}
|
|
92
93
|
}
|
|
93
94
|
}
|
|
@@ -108,7 +109,7 @@ export class ToolbarController {
|
|
|
108
109
|
await this.storageProvider.ready;
|
|
109
110
|
this.toolbarItems = await this.resolveToolbarItems();
|
|
110
111
|
this.storageProvider.onToolbarItemsChanged(async () => {
|
|
111
|
-
this.toolbarItems = await this.resolveToolbarItems();
|
|
112
|
+
this.toolbarItems = await this.resolveToolbarItems(true);
|
|
112
113
|
});
|
|
113
114
|
this.ready.resolve();
|
|
114
115
|
this.widgetContributions.getContributions().forEach(contribution => {
|
|
@@ -118,17 +119,21 @@ export class ToolbarController {
|
|
|
118
119
|
});
|
|
119
120
|
}
|
|
120
121
|
|
|
121
|
-
protected async resolveToolbarItems(): Promise<ToolbarTreeSchema> {
|
|
122
|
+
protected async resolveToolbarItems(promptUserOnInvalidConfig = false): Promise<ToolbarTreeSchema> {
|
|
122
123
|
await this.storageProvider.ready;
|
|
123
124
|
|
|
124
|
-
if (this.storageProvider.toolbarItems) {
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
this.messageService.error(TOOLBAR_BAD_JSON_ERROR_MESSAGE);
|
|
125
|
+
if (!this.storageProvider.toolbarItems) {
|
|
126
|
+
let restoreDefaults = true;
|
|
127
|
+
if (promptUserOnInvalidConfig) {
|
|
128
|
+
const resetLabel = ToolbarCommands.RESET_TOOLBAR.label!;
|
|
129
|
+
const answer = await this.messageService.error(nls.localize('theia/toolbar/jsonError', TOOLBAR_BAD_JSON_ERROR_MESSAGE), resetLabel);
|
|
130
|
+
restoreDefaults = answer === resetLabel;
|
|
131
|
+
}
|
|
132
|
+
if (restoreDefaults) {
|
|
133
|
+
await this.restoreToolbarDefaults();
|
|
129
134
|
}
|
|
130
135
|
}
|
|
131
|
-
return this.inflateItems(this.
|
|
136
|
+
return this.inflateItems(this.storageProvider.toolbarItems);
|
|
132
137
|
}
|
|
133
138
|
|
|
134
139
|
async swapValues(
|
|
@@ -142,8 +147,8 @@ export class ToolbarController {
|
|
|
142
147
|
});
|
|
143
148
|
}
|
|
144
149
|
|
|
145
|
-
async
|
|
146
|
-
return this.withBusy<boolean>(() => this.storageProvider.
|
|
150
|
+
async restoreToolbarDefaults(): Promise<boolean> {
|
|
151
|
+
return this.withBusy<boolean>(() => this.storageProvider.restoreToolbarDefaults());
|
|
147
152
|
}
|
|
148
153
|
|
|
149
154
|
async openOrCreateJSONFile(doOpen = false): Promise<Widget | undefined> {
|
|
@@ -38,10 +38,12 @@ import {
|
|
|
38
38
|
} from './toolbar-interfaces';
|
|
39
39
|
import { UserToolbarURI } from './toolbar-constants';
|
|
40
40
|
import { isToolbarPreferences } from './toolbar-preference-schema';
|
|
41
|
+
import { ToolbarDefaultsFactory } from './toolbar-defaults';
|
|
41
42
|
|
|
42
43
|
export const TOOLBAR_BAD_JSON_ERROR_MESSAGE = 'There was an error reading your toolbar.json file. Please check if it is corrupt'
|
|
43
44
|
+ ' by right-clicking the toolbar and selecting "Customize Toolbar". You can also reset it to its defaults by selecting'
|
|
44
45
|
+ ' "Restore Toolbar Defaults"';
|
|
46
|
+
|
|
45
47
|
@injectable()
|
|
46
48
|
export class ToolbarStorageProvider implements Disposable {
|
|
47
49
|
@inject(FrontendApplicationStateService) protected readonly appState: FrontendApplicationStateService;
|
|
@@ -50,6 +52,7 @@ export class ToolbarStorageProvider implements Disposable {
|
|
|
50
52
|
@inject(MessageService) protected readonly messageService: MessageService;
|
|
51
53
|
@inject(LateInjector) protected lateInjector: <T>(id: interfaces.ServiceIdentifier<T>) => T;
|
|
52
54
|
@inject(UserToolbarURI) protected readonly USER_TOOLBAR_URI: URI;
|
|
55
|
+
@inject(ToolbarDefaultsFactory) protected readonly defaultsFactory: () => DeflatedToolbarTree;
|
|
53
56
|
|
|
54
57
|
get ready(): Promise<void> {
|
|
55
58
|
return this._ready.promise;
|
|
@@ -65,7 +68,12 @@ export class ToolbarStorageProvider implements Disposable {
|
|
|
65
68
|
protected toDispose = new DisposableCollection();
|
|
66
69
|
protected toolbarItemsUpdatedEmitter = new Emitter<void>();
|
|
67
70
|
readonly onToolbarItemsChanged = this.toolbarItemsUpdatedEmitter.event;
|
|
68
|
-
|
|
71
|
+
|
|
72
|
+
protected _toolbarItems: DeflatedToolbarTree | undefined;
|
|
73
|
+
|
|
74
|
+
get toolbarItems(): DeflatedToolbarTree | undefined {
|
|
75
|
+
return this._toolbarItems;
|
|
76
|
+
}
|
|
69
77
|
|
|
70
78
|
@postConstruct()
|
|
71
79
|
protected init(): void {
|
|
@@ -97,9 +105,9 @@ export class ToolbarStorageProvider implements Disposable {
|
|
|
97
105
|
try {
|
|
98
106
|
if (this.model.valid) {
|
|
99
107
|
const content = this.model.getText();
|
|
100
|
-
this.
|
|
108
|
+
this._toolbarItems = this.parseContent(content);
|
|
101
109
|
} else {
|
|
102
|
-
this.
|
|
110
|
+
this._toolbarItems = undefined;
|
|
103
111
|
}
|
|
104
112
|
this.toolbarItemsUpdatedEmitter.fire();
|
|
105
113
|
} catch (e) {
|
|
@@ -253,20 +261,9 @@ export class ToolbarStorageProvider implements Disposable {
|
|
|
253
261
|
return undefined;
|
|
254
262
|
}
|
|
255
263
|
|
|
256
|
-
async
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
await this.monacoWorkspace.applyBackgroundEdit(this.model, [
|
|
260
|
-
{
|
|
261
|
-
range: textModel.getFullModelRange(),
|
|
262
|
-
// eslint-disable-next-line no-null/no-null
|
|
263
|
-
text: null,
|
|
264
|
-
forceMoveMarkers: false,
|
|
265
|
-
},
|
|
266
|
-
]);
|
|
267
|
-
}
|
|
268
|
-
this.toolbarItemsUpdatedEmitter.fire();
|
|
269
|
-
return true;
|
|
264
|
+
async restoreToolbarDefaults(): Promise<boolean> {
|
|
265
|
+
this._toolbarItems = this.defaultsFactory();
|
|
266
|
+
return this.writeToFile([], this._toolbarItems);
|
|
270
267
|
}
|
|
271
268
|
|
|
272
269
|
protected async writeToFile(path: jsoncParser.JSONPath, value: unknown, insertion = false): Promise<boolean> {
|