@codingame/monaco-vscode-a3eaa464-944c-5b8f-8886-213068ba4897-common 17.2.1 → 18.0.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/package.json +2 -2
- package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingWidgets.js +3 -3
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesIcons.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesIcons.js +14 -13
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.js +26 -26
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@codingame/monaco-vscode-a3eaa464-944c-5b8f-8886-213068ba4897-common",
|
3
|
-
"version": "
|
3
|
+
"version": "18.0.1",
|
4
4
|
"private": false,
|
5
5
|
"description": "VSCode public API plugged on the monaco editor - common package (keybindings, preferences)",
|
6
6
|
"keywords": [],
|
@@ -15,7 +15,7 @@
|
|
15
15
|
},
|
16
16
|
"type": "module",
|
17
17
|
"dependencies": {
|
18
|
-
"@codingame/monaco-vscode-api": "
|
18
|
+
"@codingame/monaco-vscode-api": "18.0.1"
|
19
19
|
},
|
20
20
|
"exports": {
|
21
21
|
".": {
|
@@ -133,7 +133,7 @@ let DefineKeybindingWidget = class DefineKeybindingWidget extends Widget {
|
|
133
133
|
this._domNode.setClassName('defineKeybindingWidget');
|
134
134
|
this._domNode.setWidth(DefineKeybindingWidget_1.WIDTH);
|
135
135
|
this._domNode.setHeight(DefineKeybindingWidget_1.HEIGHT);
|
136
|
-
const message = ( localize(
|
136
|
+
const message = ( localize(8766, "Press desired key combination and then press ENTER."));
|
137
137
|
append(this._domNode.domNode, $('.message', undefined, message));
|
138
138
|
this._domNode.domNode.style.backgroundColor = asCssVariable(editorWidgetBackground);
|
139
139
|
this._domNode.domNode.style.color = asCssVariable(editorWidgetForeground);
|
@@ -181,7 +181,7 @@ let DefineKeybindingWidget = class DefineKeybindingWidget extends Widget {
|
|
181
181
|
printExisting(numberOfExisting) {
|
182
182
|
if (numberOfExisting > 0) {
|
183
183
|
const existingElement = $('span.existingText');
|
184
|
-
const text = numberOfExisting === 1 ? ( localize(
|
184
|
+
const text = numberOfExisting === 1 ? ( localize(8767, "1 existing command has this keybinding", numberOfExisting)) : ( localize(8768, "{0} existing commands have this keybinding", numberOfExisting));
|
185
185
|
append(existingElement, document.createTextNode(text));
|
186
186
|
alert(text);
|
187
187
|
this._showExistingKeybindingsNode.appendChild(existingElement);
|
@@ -199,7 +199,7 @@ let DefineKeybindingWidget = class DefineKeybindingWidget extends Widget {
|
|
199
199
|
firstLabel.set(this._chords?.[0] ?? undefined);
|
200
200
|
if (this._chords) {
|
201
201
|
for (let i = 1; i < this._chords.length; i++) {
|
202
|
-
this._outputNode.appendChild(document.createTextNode(( localize(
|
202
|
+
this._outputNode.appendChild(document.createTextNode(( localize(8769, "chord to"))));
|
203
203
|
const chordLabel = this._keybindingDisposables.add(( new KeybindingLabel(this._outputNode, OS, defaultKeybindingLabelStyles)));
|
204
204
|
chordLabel.set(this._chords[i]);
|
205
205
|
}
|
@@ -8,5 +8,6 @@ export declare const settingsEditIcon: import("@codingame/monaco-vscode-api/vsco
|
|
8
8
|
export declare const settingsRemoveIcon: import("@codingame/monaco-vscode-api/vscode/vs/base/common/themables").ThemeIcon;
|
9
9
|
export declare const settingsDiscardIcon: import("@codingame/monaco-vscode-api/vscode/vs/base/common/themables").ThemeIcon;
|
10
10
|
export declare const preferencesClearInputIcon: import("@codingame/monaco-vscode-api/vscode/vs/base/common/themables").ThemeIcon;
|
11
|
+
export declare const preferencesAiResultsIcon: import("@codingame/monaco-vscode-api/vscode/vs/base/common/themables").ThemeIcon;
|
11
12
|
export declare const preferencesFilterIcon: import("@codingame/monaco-vscode-api/vscode/vs/base/common/themables").ThemeIcon;
|
12
13
|
export declare const preferencesOpenSettingsIcon: import("@codingame/monaco-vscode-api/vscode/vs/base/common/themables").ThemeIcon;
|
@@ -4,19 +4,20 @@ import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
|
|
4
4
|
import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/iconRegistry';
|
5
5
|
|
6
6
|
const settingsScopeDropDownIcon = registerIcon('settings-folder-dropdown', Codicon.triangleDown, ( localize(
|
7
|
-
|
7
|
+
8864,
|
8
8
|
'Icon for the folder dropdown button in the split JSON Settings editor.'
|
9
9
|
)));
|
10
|
-
const settingsMoreActionIcon = registerIcon('settings-more-action', Codicon.gear, ( localize(
|
11
|
-
const keybindingsRecordKeysIcon = registerIcon('keybindings-record-keys', Codicon.recordKeys, ( localize(
|
12
|
-
const keybindingsSortIcon = registerIcon('keybindings-sort', Codicon.sortPrecedence, ( localize(
|
13
|
-
const keybindingsEditIcon = registerIcon('keybindings-edit', Codicon.edit, ( localize(
|
14
|
-
const keybindingsAddIcon = registerIcon('keybindings-add', Codicon.add, ( localize(
|
15
|
-
const settingsEditIcon = registerIcon('settings-edit', Codicon.edit, ( localize(
|
16
|
-
const settingsRemoveIcon = registerIcon('settings-remove', Codicon.close, ( localize(
|
17
|
-
const settingsDiscardIcon = registerIcon('settings-discard', Codicon.discard, ( localize(
|
18
|
-
const preferencesClearInputIcon = registerIcon('preferences-clear-input', Codicon.clearAll, ( localize(
|
19
|
-
const
|
20
|
-
const
|
10
|
+
const settingsMoreActionIcon = registerIcon('settings-more-action', Codicon.gear, ( localize(8865, 'Icon for the \'more actions\' action in the Settings UI.')));
|
11
|
+
const keybindingsRecordKeysIcon = registerIcon('keybindings-record-keys', Codicon.recordKeys, ( localize(8866, 'Icon for the \'record keys\' action in the keybinding UI.')));
|
12
|
+
const keybindingsSortIcon = registerIcon('keybindings-sort', Codicon.sortPrecedence, ( localize(8867, 'Icon for the \'sort by precedence\' toggle in the keybinding UI.')));
|
13
|
+
const keybindingsEditIcon = registerIcon('keybindings-edit', Codicon.edit, ( localize(8868, 'Icon for the edit action in the keybinding UI.')));
|
14
|
+
const keybindingsAddIcon = registerIcon('keybindings-add', Codicon.add, ( localize(8869, 'Icon for the add action in the keybinding UI.')));
|
15
|
+
const settingsEditIcon = registerIcon('settings-edit', Codicon.edit, ( localize(8870, 'Icon for the edit action in the Settings UI.')));
|
16
|
+
const settingsRemoveIcon = registerIcon('settings-remove', Codicon.close, ( localize(8871, 'Icon for the remove action in the Settings UI.')));
|
17
|
+
const settingsDiscardIcon = registerIcon('settings-discard', Codicon.discard, ( localize(8872, 'Icon for the discard action in the Settings UI.')));
|
18
|
+
const preferencesClearInputIcon = registerIcon('preferences-clear-input', Codicon.clearAll, ( localize(8873, 'Icon for clear input in the Settings and keybinding UI.')));
|
19
|
+
const preferencesAiResultsIcon = registerIcon('preferences-ai-results', Codicon.sparkle, ( localize(8874, 'Icon for showing AI results in the Settings UI.')));
|
20
|
+
const preferencesFilterIcon = registerIcon('preferences-filter', Codicon.filter, ( localize(8875, 'Icon for the button that suggests filters for the Settings UI.')));
|
21
|
+
const preferencesOpenSettingsIcon = registerIcon('preferences-open-settings', Codicon.goToFile, ( localize(8876, 'Icon for open settings commands.')));
|
21
22
|
|
22
|
-
export { keybindingsAddIcon, keybindingsEditIcon, keybindingsRecordKeysIcon, keybindingsSortIcon, preferencesClearInputIcon, preferencesFilterIcon, preferencesOpenSettingsIcon, settingsDiscardIcon, settingsEditIcon, settingsMoreActionIcon, settingsRemoveIcon, settingsScopeDropDownIcon };
|
23
|
+
export { keybindingsAddIcon, keybindingsEditIcon, keybindingsRecordKeysIcon, keybindingsSortIcon, preferencesAiResultsIcon, preferencesClearInputIcon, preferencesFilterIcon, preferencesOpenSettingsIcon, settingsDiscardIcon, settingsEditIcon, settingsMoreActionIcon, settingsRemoveIcon, settingsScopeDropDownIcon };
|
@@ -7,19 +7,19 @@ import { Event } from "@codingame/monaco-vscode-api/vscode/vs/base/common/event"
|
|
7
7
|
import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
|
8
8
|
import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
|
9
9
|
import { ICodeEditor, IEditorMouseEvent } from "@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser";
|
10
|
+
import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
|
10
11
|
import { ConfigurationTarget } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration";
|
11
12
|
import { IContextKey } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey";
|
12
13
|
import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
|
13
14
|
import { IContextMenuService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
|
14
15
|
import { IContextViewService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service";
|
16
|
+
import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
|
15
17
|
import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
|
16
18
|
import { IKeybindingService } from "@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service";
|
17
19
|
import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
|
18
20
|
import { IWorkspaceFolder } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace";
|
19
21
|
import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service";
|
20
22
|
import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
|
21
|
-
import { ILanguageService } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service";
|
22
|
-
import { IHoverService } from "@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service";
|
23
23
|
export declare class FolderSettingsActionViewItem extends BaseActionViewItem {
|
24
24
|
private readonly contextService;
|
25
25
|
private readonly contextMenuService;
|
@@ -4,6 +4,7 @@ import { $, addDisposableListener, EventType, EventHelper, append, trackFocus, g
|
|
4
4
|
import { StandardKeyboardEvent } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/keyboardEvent';
|
5
5
|
import { ActionBar, ActionsOrientation } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionbar';
|
6
6
|
import { BaseActionViewItem } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/actionbar/actionViewItems';
|
7
|
+
import { getDefaultHoverDelegate } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
|
7
8
|
import { Widget } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/widget';
|
8
9
|
import { Action } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
|
9
10
|
import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
|
@@ -12,15 +13,18 @@ import { KeyCode } from '@codingame/monaco-vscode-api/vscode/vs/base/common/keyC
|
|
12
13
|
import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
|
13
14
|
import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
|
14
15
|
import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
|
16
|
+
import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
|
15
17
|
import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
|
16
18
|
import { MouseTargetType } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
|
19
|
+
import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
|
17
20
|
import { TrackedRangeStickiness } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/model';
|
18
21
|
import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
|
19
|
-
import { ContextScopedHistoryInputBox } from '@codingame/monaco-vscode-api/vscode/vs/platform/history/browser/contextScopedHistoryWidget';
|
20
|
-
import { showHistoryKeybindingHint } from '@codingame/monaco-vscode-api/vscode/vs/platform/history/browser/historyWidgetKeybindingHint';
|
21
22
|
import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
|
22
23
|
import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
|
23
24
|
import { IContextMenuService, IContextViewService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
|
25
|
+
import { ContextScopedHistoryInputBox } from '@codingame/monaco-vscode-api/vscode/vs/platform/history/browser/contextScopedHistoryWidget';
|
26
|
+
import { showHistoryKeybindingHint } from '@codingame/monaco-vscode-api/vscode/vs/platform/history/browser/historyWidgetKeybindingHint';
|
27
|
+
import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
|
24
28
|
import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
|
25
29
|
import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
|
26
30
|
import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
|
@@ -35,14 +39,10 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/mini
|
|
35
39
|
import { badgeBackground, badgeForeground } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/miscColors';
|
36
40
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
|
37
41
|
import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
|
38
|
-
import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
|
39
42
|
import { WorkbenchState, isWorkspaceFolder } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
|
40
43
|
import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
|
41
|
-
import { settingsScopeDropDownIcon, settingsEditIcon } from './preferencesIcons.js';
|
42
44
|
import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
|
43
|
-
import {
|
44
|
-
import { getDefaultHoverDelegate } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/hover/hoverDelegateFactory';
|
45
|
-
import { IHoverService } from '@codingame/monaco-vscode-api/vscode/vs/platform/hover/browser/hover.service';
|
45
|
+
import { settingsScopeDropDownIcon, settingsEditIcon } from './preferencesIcons.js';
|
46
46
|
|
47
47
|
let FolderSettingsActionViewItem = class FolderSettingsActionViewItem extends BaseActionViewItem {
|
48
48
|
constructor(action, contextService, contextMenuService, hoverService) {
|
@@ -206,49 +206,49 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
|
|
206
206
|
resetLabels() {
|
207
207
|
const remoteAuthority = this.environmentService.remoteAuthority;
|
208
208
|
const hostLabel = remoteAuthority && this.labelService.getHostLabel(Schemas.vscodeRemote, remoteAuthority);
|
209
|
-
this.userLocalSettings.label = ( localize(
|
210
|
-
this.userRemoteSettings.label = ( localize(
|
211
|
-
this.workspaceSettings.label = ( localize(
|
212
|
-
this.folderSettingsAction.label = ( localize(
|
209
|
+
this.userLocalSettings.label = ( localize(8892, "User"));
|
210
|
+
this.userRemoteSettings.label = ( localize(8893, "Remote")) + (hostLabel ? ` [${hostLabel}]` : '');
|
211
|
+
this.workspaceSettings.label = ( localize(8894, "Workspace"));
|
212
|
+
this.folderSettingsAction.label = ( localize(8895, "Folder"));
|
213
213
|
}
|
214
214
|
create(parent) {
|
215
215
|
const settingsTabsWidget = append(parent, $('.settings-tabs-widget'));
|
216
216
|
this.settingsSwitcherBar = this._register(( new ActionBar(settingsTabsWidget, {
|
217
217
|
orientation: ActionsOrientation.HORIZONTAL,
|
218
218
|
focusOnlyEnabledItems: true,
|
219
|
-
ariaLabel: ( localize(
|
219
|
+
ariaLabel: ( localize(8896, "Settings Switcher")),
|
220
220
|
ariaRole: 'tablist',
|
221
221
|
actionViewItemProvider: (action, options) => action.id === 'folderSettings' ? this.folderSettings : undefined
|
222
222
|
})));
|
223
|
-
this.userLocalSettings = ( new Action(
|
223
|
+
this.userLocalSettings = this._register(( new Action(
|
224
224
|
'userSettings',
|
225
225
|
'',
|
226
226
|
'.settings-tab',
|
227
227
|
true,
|
228
228
|
() => this.updateTarget(ConfigurationTarget.USER_LOCAL)
|
229
|
-
));
|
230
|
-
this.userLocalSettings.tooltip = ( localize(
|
231
|
-
this.userRemoteSettings = ( new Action(
|
229
|
+
)));
|
230
|
+
this.userLocalSettings.tooltip = ( localize(8892, "User"));
|
231
|
+
this.userRemoteSettings = this._register(( new Action(
|
232
232
|
'userSettingsRemote',
|
233
233
|
'',
|
234
234
|
'.settings-tab',
|
235
235
|
true,
|
236
236
|
() => this.updateTarget(ConfigurationTarget.USER_REMOTE)
|
237
|
-
));
|
237
|
+
)));
|
238
238
|
const remoteAuthority = this.environmentService.remoteAuthority;
|
239
239
|
const hostLabel = remoteAuthority && this.labelService.getHostLabel(Schemas.vscodeRemote, remoteAuthority);
|
240
|
-
this.userRemoteSettings.tooltip = ( localize(
|
241
|
-
this.workspaceSettings = ( new Action(
|
240
|
+
this.userRemoteSettings.tooltip = ( localize(8893, "Remote")) + (hostLabel ? ` [${hostLabel}]` : '');
|
241
|
+
this.workspaceSettings = this._register(( new Action(
|
242
242
|
'workspaceSettings',
|
243
243
|
'',
|
244
244
|
'.settings-tab',
|
245
245
|
false,
|
246
246
|
() => this.updateTarget(ConfigurationTarget.WORKSPACE)
|
247
|
-
));
|
248
|
-
this.folderSettingsAction = ( new Action('folderSettings', '', '.settings-tab', false, async (folder) => {
|
247
|
+
)));
|
248
|
+
this.folderSettingsAction = this._register(( new Action('folderSettings', '', '.settings-tab', false, async (folder) => {
|
249
249
|
this.updateTarget(isWorkspaceFolder(folder) ? folder.uri : ConfigurationTarget.USER_LOCAL);
|
250
|
-
}));
|
251
|
-
this.folderSettings = this.instantiationService.createInstance(FolderSettingsActionViewItem, this.folderSettingsAction);
|
250
|
+
})));
|
251
|
+
this.folderSettings = this._register(this.instantiationService.createInstance(FolderSettingsActionViewItem, this.folderSettingsAction));
|
252
252
|
this.resetLabels();
|
253
253
|
this.update();
|
254
254
|
this.settingsSwitcherBar.push([this.userLocalSettings, this.userRemoteSettings, this.workspaceSettings, this.folderSettingsAction]);
|
@@ -271,14 +271,14 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
|
|
271
271
|
}
|
272
272
|
setResultCount(settingsTarget, count) {
|
273
273
|
if (settingsTarget === ConfigurationTarget.WORKSPACE) {
|
274
|
-
let label = ( localize(
|
274
|
+
let label = ( localize(8894, "Workspace"));
|
275
275
|
if (count) {
|
276
276
|
label += ` (${count})`;
|
277
277
|
}
|
278
278
|
this.workspaceSettings.label = label;
|
279
279
|
}
|
280
280
|
else if (settingsTarget === ConfigurationTarget.USER_LOCAL) {
|
281
|
-
let label = ( localize(
|
281
|
+
let label = ( localize(8892, "User"));
|
282
282
|
if (count) {
|
283
283
|
label += ` (${count})`;
|
284
284
|
}
|
@@ -324,7 +324,7 @@ let SettingsTargetsWidget = class SettingsTargetsWidget extends Widget {
|
|
324
324
|
this.userRemoteSettings.enabled = !!(this.options.enableRemoteSettings && this.environmentService.remoteAuthority);
|
325
325
|
this.workspaceSettings.enabled = this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY;
|
326
326
|
this.folderSettings.action.enabled = this.contextService.getWorkbenchState() === WorkbenchState.WORKSPACE && this.contextService.getWorkspace().folders.length > 0;
|
327
|
-
this.workspaceSettings.tooltip = ( localize(
|
327
|
+
this.workspaceSettings.tooltip = ( localize(8894, "Workspace"));
|
328
328
|
}
|
329
329
|
};
|
330
330
|
SettingsTargetsWidget = ( __decorate([
|