@theia/preferences 1.75.0-next.21 → 1.75.0-next.28
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/preferences-contribution.d.ts +2 -1
- package/lib/browser/preferences-contribution.d.ts.map +1 -1
- package/lib/browser/preferences-contribution.js +10 -10
- package/lib/browser/preferences-contribution.js.map +1 -1
- package/package.json +8 -8
- package/src/browser/preferences-contribution.ts +11 -7
|
@@ -3,6 +3,7 @@ import { AbstractViewContribution, KeybindingRegistry, Widget, QuickInputService
|
|
|
3
3
|
import { TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
|
|
4
4
|
import { EditorManager } from '@theia/editor/lib/browser';
|
|
5
5
|
import { PreferencesWidget } from './views/preference-widget';
|
|
6
|
+
import { Preference } from './util/preference-types';
|
|
6
7
|
import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
|
|
7
8
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
8
9
|
import { WorkspaceService } from '@theia/workspace/lib/browser';
|
|
@@ -12,10 +13,10 @@ export declare class PreferencesContribution extends AbstractViewContribution<Pr
|
|
|
12
13
|
protected readonly editorManager: EditorManager;
|
|
13
14
|
protected readonly preferenceService: PreferenceService;
|
|
14
15
|
protected readonly clipboardService: ClipboardService;
|
|
15
|
-
protected readonly scopeTracker: PreferencesWidget;
|
|
16
16
|
protected readonly workspaceService: WorkspaceService;
|
|
17
17
|
protected readonly quickInputService: QuickInputService;
|
|
18
18
|
constructor();
|
|
19
|
+
protected get currentScope(): Preference.SelectedScopeDetails;
|
|
19
20
|
registerCommands(commands: CommandRegistry): void;
|
|
20
21
|
registerMenus(menus: MenuModelRegistry): void;
|
|
21
22
|
registerKeybindings(keybindings: KeybindingRegistry): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preferences-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/preferences-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAO,eAAe,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAC1G,OAAO,EAEH,wBAAwB,EAExB,kBAAkB,EAClB,MAAM,EACN,iBAAiB,EAGpB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AACtF,OAAO,EAAE,aAAa,EAAgB,MAAM,2BAA2B,CAAC;AAExE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"preferences-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/preferences-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAO,eAAe,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAC1G,OAAO,EAEH,wBAAwB,EAExB,kBAAkB,EAClB,MAAM,EACN,iBAAiB,EAGpB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AACtF,OAAO,EAAE,aAAa,EAAgB,MAAM,2BAA2B,CAAC;AAExE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAwC,MAAM,yBAAyB,CAAC;AAC3F,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAE9D,qBACa,uBAAwB,SAAQ,wBAAwB,CAAC,iBAAiB,CAAC;IAE/D,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAC1C,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAC5C,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IACzD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IACtD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IACzC,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;;IAY/F,SAAS,KAAK,YAAY,IAAI,UAAU,CAAC,oBAAoB,CAE5D;IAEQ,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IA4EjD,aAAa,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI;IA4B7C,mBAAmB,CAAC,WAAW,EAAE,kBAAkB,GAAG,IAAI;IAOnE,oBAAoB,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI;cAS1C,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC;cA2BtE,QAAQ,CAAC,KAAK,EAAE,eAAe,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOlF;;OAEG;cACa,qBAAqB,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;YAc7E,eAAe;IAgB7B;;OAEG;IACH,SAAS,CAAC,UAAU,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,SAA+B,EAAE,EAAE,EAAE,CAAC,MAAM,EAAE,iBAAiB,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK;CAM7H"}
|
|
@@ -37,6 +37,9 @@ let PreferencesContribution = class PreferencesContribution extends browser_1.Ab
|
|
|
37
37
|
},
|
|
38
38
|
});
|
|
39
39
|
}
|
|
40
|
+
get currentScope() {
|
|
41
|
+
return this.tryGetWidget()?.currentScope ?? preference_types_1.Preference.DEFAULT_SCOPE;
|
|
42
|
+
}
|
|
40
43
|
registerCommands(commands) {
|
|
41
44
|
commands.registerCommand(browser_1.CommonCommands.OPEN_PREFERENCES, {
|
|
42
45
|
execute: async (query) => {
|
|
@@ -72,7 +75,8 @@ let PreferencesContribution = class PreferencesContribution extends browser_1.Ab
|
|
|
72
75
|
isEnabled: preference_types_1.Preference.EditorCommandArgs.is,
|
|
73
76
|
isVisible: preference_types_1.Preference.EditorCommandArgs.is,
|
|
74
77
|
execute: ({ id }) => {
|
|
75
|
-
|
|
78
|
+
const { scope, uri } = this.currentScope;
|
|
79
|
+
return this.preferenceService.set(id, undefined, Number(scope), uri);
|
|
76
80
|
}
|
|
77
81
|
});
|
|
78
82
|
commands.registerCommand(preference_types_1.PreferencesCommands.OPEN_USER_PREFERENCES, {
|
|
@@ -92,9 +96,9 @@ let PreferencesContribution = class PreferencesContribution extends browser_1.Ab
|
|
|
92
96
|
commands.registerCommand(preference_types_1.PreferencesCommands.OPEN_FOLDER_PREFERENCES, {
|
|
93
97
|
isEnabled: () => !!this.workspaceService.isMultiRootWorkspaceOpened && this.workspaceService.tryGetRoots().length > 0,
|
|
94
98
|
isVisible: () => !!this.workspaceService.isMultiRootWorkspaceOpened && this.workspaceService.tryGetRoots().length > 0,
|
|
95
|
-
execute: () => this.openFolderPreferences(root => {
|
|
96
|
-
this.openView({ activate: true });
|
|
97
|
-
|
|
99
|
+
execute: () => this.openFolderPreferences(async (root) => {
|
|
100
|
+
const widget = await this.openView({ activate: true });
|
|
101
|
+
widget.setScope(root.resource);
|
|
98
102
|
})
|
|
99
103
|
});
|
|
100
104
|
commands.registerCommand(preference_types_1.PreferencesCommands.OPEN_USER_PREFERENCES_JSON, {
|
|
@@ -153,7 +157,7 @@ let PreferencesContribution = class PreferencesContribution extends browser_1.Ab
|
|
|
153
157
|
});
|
|
154
158
|
}
|
|
155
159
|
async openPreferencesJSON(opener) {
|
|
156
|
-
const { scope, activeScopeIsFolder, uri } = this.
|
|
160
|
+
const { scope, activeScopeIsFolder, uri } = this.currentScope;
|
|
157
161
|
const scopeID = Number(scope);
|
|
158
162
|
let preferenceId = '';
|
|
159
163
|
if (typeof opener === 'string') {
|
|
@@ -188,7 +192,7 @@ let PreferencesContribution = class PreferencesContribution extends browser_1.Ab
|
|
|
188
192
|
async openFolderPreferences(callback) {
|
|
189
193
|
const roots = this.workspaceService.tryGetRoots();
|
|
190
194
|
if (roots.length === 1) {
|
|
191
|
-
callback(roots[0]);
|
|
195
|
+
await callback(roots[0]);
|
|
192
196
|
}
|
|
193
197
|
else {
|
|
194
198
|
const items = roots.map(root => ({
|
|
@@ -241,10 +245,6 @@ tslib_1.__decorate([
|
|
|
241
245
|
(0, inversify_1.inject)(clipboard_service_1.ClipboardService),
|
|
242
246
|
tslib_1.__metadata("design:type", Object)
|
|
243
247
|
], PreferencesContribution.prototype, "clipboardService", void 0);
|
|
244
|
-
tslib_1.__decorate([
|
|
245
|
-
(0, inversify_1.inject)(preference_widget_1.PreferencesWidget),
|
|
246
|
-
tslib_1.__metadata("design:type", preference_widget_1.PreferencesWidget)
|
|
247
|
-
], PreferencesContribution.prototype, "scopeTracker", void 0);
|
|
248
248
|
tslib_1.__decorate([
|
|
249
249
|
(0, inversify_1.inject)(browser_3.WorkspaceService),
|
|
250
250
|
tslib_1.__metadata("design:type", browser_3.WorkspaceService)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preferences-contribution.js","sourceRoot":"","sources":["../../src/browser/preferences-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,4DAA4E;AAC5E,sCAA0G;AAC1G,qDASiC;AACjC,kDAAkD;AAElD,uDAAwE;AAExE,iEAA8D;AAC9D,8DAA2F;AAC3F,iFAA6E;AAC7E,6EAAyE;AACzE,0DAAgE;AAIzD,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,kCAA2C;
|
|
1
|
+
{"version":3,"file":"preferences-contribution.js","sourceRoot":"","sources":["../../src/browser/preferences-contribution.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/preferences",
|
|
3
|
-
"version": "1.75.0-next.
|
|
3
|
+
"version": "1.75.0-next.28+ba1005c0bf8",
|
|
4
4
|
"description": "Theia - Preferences Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.75.0-next.
|
|
7
|
-
"@theia/editor": "1.75.0-next.
|
|
8
|
-
"@theia/filesystem": "1.75.0-next.
|
|
9
|
-
"@theia/monaco": "1.75.0-next.
|
|
6
|
+
"@theia/core": "1.75.0-next.28+ba1005c0bf8",
|
|
7
|
+
"@theia/editor": "1.75.0-next.28+ba1005c0bf8",
|
|
8
|
+
"@theia/filesystem": "1.75.0-next.28+ba1005c0bf8",
|
|
9
|
+
"@theia/monaco": "1.75.0-next.28+ba1005c0bf8",
|
|
10
10
|
"@theia/monaco-editor-core": "1.108.201",
|
|
11
|
-
"@theia/userstorage": "1.75.0-next.
|
|
12
|
-
"@theia/workspace": "1.75.0-next.
|
|
11
|
+
"@theia/userstorage": "1.75.0-next.28+ba1005c0bf8",
|
|
12
|
+
"@theia/workspace": "1.75.0-next.28+ba1005c0bf8",
|
|
13
13
|
"async-mutex": "^0.3.2",
|
|
14
14
|
"fast-deep-equal": "^3.1.3",
|
|
15
15
|
"jsonc-parser": "^3.3.1",
|
|
@@ -55,5 +55,5 @@
|
|
|
55
55
|
"nyc": {
|
|
56
56
|
"extends": "../../configs/nyc.json"
|
|
57
57
|
},
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "ba1005c0bf87bd848c6ec51ce1b4e6bb06748e3c"
|
|
59
59
|
}
|
|
@@ -44,7 +44,6 @@ export class PreferencesContribution extends AbstractViewContribution<Preference
|
|
|
44
44
|
@inject(EditorManager) protected readonly editorManager: EditorManager;
|
|
45
45
|
@inject(PreferenceService) protected readonly preferenceService: PreferenceService;
|
|
46
46
|
@inject(ClipboardService) protected readonly clipboardService: ClipboardService;
|
|
47
|
-
@inject(PreferencesWidget) protected readonly scopeTracker: PreferencesWidget;
|
|
48
47
|
@inject(WorkspaceService) protected readonly workspaceService: WorkspaceService;
|
|
49
48
|
@inject(QuickInputService) @optional() protected readonly quickInputService: QuickInputService;
|
|
50
49
|
|
|
@@ -58,6 +57,10 @@ export class PreferencesContribution extends AbstractViewContribution<Preference
|
|
|
58
57
|
});
|
|
59
58
|
}
|
|
60
59
|
|
|
60
|
+
protected get currentScope(): Preference.SelectedScopeDetails {
|
|
61
|
+
return this.tryGetWidget()?.currentScope ?? Preference.DEFAULT_SCOPE;
|
|
62
|
+
}
|
|
63
|
+
|
|
61
64
|
override registerCommands(commands: CommandRegistry): void {
|
|
62
65
|
commands.registerCommand(CommonCommands.OPEN_PREFERENCES, {
|
|
63
66
|
execute: async (query?: string) => {
|
|
@@ -93,7 +96,8 @@ export class PreferencesContribution extends AbstractViewContribution<Preference
|
|
|
93
96
|
isEnabled: Preference.EditorCommandArgs.is,
|
|
94
97
|
isVisible: Preference.EditorCommandArgs.is,
|
|
95
98
|
execute: ({ id }: Preference.EditorCommandArgs) => {
|
|
96
|
-
|
|
99
|
+
const { scope, uri } = this.currentScope;
|
|
100
|
+
return this.preferenceService.set(id, undefined, Number(scope), uri);
|
|
97
101
|
}
|
|
98
102
|
});
|
|
99
103
|
commands.registerCommand(PreferencesCommands.OPEN_USER_PREFERENCES, {
|
|
@@ -113,9 +117,9 @@ export class PreferencesContribution extends AbstractViewContribution<Preference
|
|
|
113
117
|
commands.registerCommand(PreferencesCommands.OPEN_FOLDER_PREFERENCES, {
|
|
114
118
|
isEnabled: () => !!this.workspaceService.isMultiRootWorkspaceOpened && this.workspaceService.tryGetRoots().length > 0,
|
|
115
119
|
isVisible: () => !!this.workspaceService.isMultiRootWorkspaceOpened && this.workspaceService.tryGetRoots().length > 0,
|
|
116
|
-
execute: () => this.openFolderPreferences(root => {
|
|
117
|
-
this.openView({ activate: true });
|
|
118
|
-
|
|
120
|
+
execute: () => this.openFolderPreferences(async root => {
|
|
121
|
+
const widget = await this.openView({ activate: true });
|
|
122
|
+
widget.setScope(root.resource);
|
|
119
123
|
})
|
|
120
124
|
});
|
|
121
125
|
commands.registerCommand(PreferencesCommands.OPEN_USER_PREFERENCES_JSON, {
|
|
@@ -178,7 +182,7 @@ export class PreferencesContribution extends AbstractViewContribution<Preference
|
|
|
178
182
|
}
|
|
179
183
|
|
|
180
184
|
protected async openPreferencesJSON(opener: string | PreferencesWidget): Promise<void> {
|
|
181
|
-
const { scope, activeScopeIsFolder, uri } = this.
|
|
185
|
+
const { scope, activeScopeIsFolder, uri } = this.currentScope;
|
|
182
186
|
const scopeID = Number(scope);
|
|
183
187
|
let preferenceId = '';
|
|
184
188
|
if (typeof opener === 'string') {
|
|
@@ -217,7 +221,7 @@ export class PreferencesContribution extends AbstractViewContribution<Preference
|
|
|
217
221
|
protected async openFolderPreferences(callback: (root: FileStat) => unknown): Promise<void> {
|
|
218
222
|
const roots = this.workspaceService.tryGetRoots();
|
|
219
223
|
if (roots.length === 1) {
|
|
220
|
-
callback(roots[0]);
|
|
224
|
+
await callback(roots[0]);
|
|
221
225
|
} else {
|
|
222
226
|
const items: QuickPickItem[] = roots.map(root => ({
|
|
223
227
|
label: root.name,
|