@codingame/monaco-vscode-api 1.83.1 → 1.83.3-next.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/extensions.d.ts +3 -3
- package/extensions.js +31 -33
- package/l10n.d.ts +4 -0
- package/l10n.js +10 -0
- package/missing-services.js +4 -2
- package/monaco-editor-treemending.patch +12268 -1070
- package/monaco-treemending.js +8 -2
- package/package.json +8 -1
- package/service-override/extensions.js +2 -2
- package/service-override/layout.js +2 -2
- package/tools/l10n.js +177 -0
- package/tools.js +22 -1
- package/vscode/src/vs/base/browser/ui/menu/menubar.js +1 -1
- package/vscode/src/vs/base/browser/ui/splitview/paneview.js +2 -2
- package/vscode/src/vs/base/common/date.js +55 -55
- package/vscode/src/vs/base/common/jsonErrorMessages.js +10 -10
- package/vscode/src/vs/base/common/tfIdf.js +137 -0
- package/vscode/src/vs/editor/contrib/quickAccess/browser/commandsQuickAccess.js +23 -0
- package/vscode/src/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess.js +115 -0
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.js +112 -0
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js +334 -0
- package/vscode/src/vs/platform/dialogs/common/dialogs.js +10 -14
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.js +3 -0
- package/vscode/src/vs/platform/extensionManagement/common/extensionNls.js +2 -2
- package/vscode/src/vs/platform/files/common/fileService.js +28 -37
- package/vscode/src/vs/platform/files/common/files.js +6 -6
- package/vscode/src/vs/platform/files/common/io.js +2 -2
- package/vscode/src/vs/platform/keyboardLayout/common/keyboardConfig.js +3 -9
- package/vscode/src/vs/platform/quickinput/browser/commandsQuickAccess.js +300 -0
- package/vscode/src/vs/platform/quickinput/browser/helpQuickAccess.js +59 -0
- package/vscode/src/vs/platform/quickinput/browser/pickerQuickAccess.js +212 -0
- package/vscode/src/vs/platform/request/common/request.js +2 -2
- package/vscode/src/vs/platform/theme/common/tokenClassificationRegistry.js +42 -63
- package/vscode/src/vs/platform/workspaces/common/workspaces.js +15 -15
- package/vscode/src/vs/workbench/api/browser/mainThreadAuthentication.js +13 -32
- package/vscode/src/vs/workbench/api/browser/mainThreadComments.js +2 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadCustomEditors.js +50 -52
- package/vscode/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.js +58 -69
- package/vscode/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.js +4 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadExtensionService.js +38 -50
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystem.js +23 -23
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystemEventService.js +21 -53
- package/vscode/src/vs/workbench/api/browser/mainThreadMessageService.js +4 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js +4 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadProgress.js +6 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadSaveParticipant.js +4 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadTask.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js +2 -12
- package/vscode/src/vs/workbench/api/browser/mainThreadUriOpeners.js +15 -9
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviews.js +16 -20
- package/vscode/src/vs/workbench/api/browser/mainThreadWorkspace.js +6 -28
- package/vscode/src/vs/workbench/api/browser/statusBarExtensionPoint.js +60 -0
- package/vscode/src/vs/workbench/api/common/extHostChat.js +3 -3
- package/vscode/src/vs/workbench/api/common/extHostCommands.js +59 -65
- package/vscode/src/vs/workbench/api/common/extHostConsoleForwarder.js +8 -8
- package/vscode/src/vs/workbench/api/common/extHostDiagnostics.js +2 -6
- package/vscode/src/vs/workbench/api/common/extHostExtensionService.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js +150 -222
- package/vscode/src/vs/workbench/api/common/extHostLogService.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostNotebook.js +3 -3
- package/vscode/src/vs/workbench/api/common/extHostProgress.js +2 -6
- package/vscode/src/vs/workbench/api/common/extHostSCM.js +54 -58
- package/vscode/src/vs/workbench/api/common/extHostStatusBar.js +3 -7
- package/vscode/src/vs/workbench/api/common/extHostTelemetry.js +2 -6
- package/vscode/src/vs/workbench/api/common/extHostTerminalService.js +2 -6
- package/vscode/src/vs/workbench/api/common/extHostTreeViews.js +55 -57
- package/vscode/src/vs/workbench/api/common/extHostTunnelService.js +28 -28
- package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js +265 -277
- package/vscode/src/vs/workbench/api/common/extHostWorkspace.js +2 -7
- package/vscode/src/vs/workbench/api/common/extensionHostMain.js +17 -19
- package/vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js +9 -34
- package/vscode/src/vs/workbench/api/worker/extHostExtensionService.js +5 -5
- package/vscode/src/vs/workbench/browser/actions/layoutActions.js +898 -68
- package/vscode/src/vs/workbench/browser/actions/quickAccessActions.js +7 -7
- package/vscode/src/vs/workbench/browser/actions/windowActions.js +32 -38
- package/vscode/src/vs/workbench/browser/actions/workspaceActions.js +103 -13
- package/vscode/src/vs/workbench/browser/actions/workspaceCommands.js +2 -2
- package/vscode/src/vs/workbench/browser/editor.js +3 -3
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.js +12 -27
- package/vscode/src/vs/workbench/browser/parts/compositeBarActions.js +12 -12
- package/vscode/src/vs/workbench/browser/parts/editor/binaryDiffEditor.js +2 -7
- package/vscode/src/vs/workbench/browser/parts/editor/binaryEditor.js +4 -7
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbs.js +42 -90
- package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution.js +140 -272
- package/vscode/src/vs/workbench/browser/parts/editor/editorActions.js +115 -148
- package/vscode/src/vs/workbench/browser/parts/editor/editorCommands.js +21 -33
- package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js +7 -19
- package/vscode/src/vs/workbench/browser/parts/editor/editorPlaceholder.js +10 -26
- package/vscode/src/vs/workbench/browser/parts/editor/editorQuickAccess.js +7 -17
- package/vscode/src/vs/workbench/browser/parts/editor/editorStatus.js +60 -81
- package/vscode/src/vs/workbench/browser/parts/editor/sideBySideEditor.js +27 -33
- package/vscode/src/vs/workbench/browser/parts/editor/textCodeEditor.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/editor/textDiffEditor.js +19 -32
- package/vscode/src/vs/workbench/browser/parts/editor/textEditor.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCommands.js +8 -8
- package/vscode/src/vs/workbench/browser/parts/panel/panelActions.js +69 -34
- package/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.js +58 -34
- package/vscode/src/vs/workbench/browser/parts/views/viewFilter.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/views/viewPane.js +3 -9
- package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js +6 -6
- package/vscode/src/vs/workbench/browser/parts/views/viewsService.js +7 -11
- package/vscode/src/vs/workbench/browser/quickaccess.js +7 -3
- package/vscode/src/vs/workbench/browser/workbench.contribution.js +186 -683
- package/vscode/src/vs/workbench/common/configuration.js +12 -15
- package/vscode/src/vs/workbench/common/contextkeys.js +272 -90
- package/vscode/src/vs/workbench/common/editor/diffEditorInput.js +2 -2
- package/vscode/src/vs/workbench/common/editor/sideBySideEditorInput.js +2 -7
- package/vscode/src/vs/workbench/common/editor/textEditorModel.js +2 -6
- package/vscode/src/vs/workbench/common/editor.js +5 -5
- package/vscode/src/vs/workbench/common/theme.js +137 -527
- package/vscode/src/vs/workbench/common/views.js +4 -8
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.js +15 -55
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityContributions.js +3 -8
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleView.js +22 -60
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.js +9 -15
- package/vscode/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.js +18 -48
- package/vscode/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.js +58 -74
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatActions.js +2 -0
- package/vscode/src/vs/workbench/contrib/chat/common/chatAgents.js +5 -10
- package/vscode/src/vs/workbench/contrib/chat/common/chatSlashCommands.js +5 -13
- package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js +8 -27
- package/vscode/src/vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint.js +5 -17
- package/vscode/src/vs/workbench/contrib/codeActions/common/documentationExtensionPoint.js +6 -15
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js +7 -20
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.js +2 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint.js +63 -216
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.js +4 -7
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.js +5 -8
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.js +8 -11
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.js +5 -15
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.js +3 -3
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.js +5 -5
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.js +3 -6
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.js +3 -6
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js +10 -9
- package/vscode/src/vs/workbench/contrib/comments/browser/commentColors.js +6 -15
- package/vscode/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.js +5 -20
- package/vscode/src/vs/workbench/contrib/comments/browser/commentNode.js +3 -10
- package/vscode/src/vs/workbench/contrib/comments/browser/commentReply.js +4 -4
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadBody.js +3 -20
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadHeader.js +9 -3
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadWidget.js +4 -13
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.js +19 -19
- package/vscode/src/vs/workbench/contrib/comments/browser/comments.contribution.js +26 -77
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsController.js +5 -17
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.js +31 -40
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsView.js +10 -29
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsViewActions.js +10 -10
- package/vscode/src/vs/workbench/contrib/comments/browser/reactionsAction.js +8 -8
- package/vscode/src/vs/workbench/contrib/comments/common/commentContextKeys.js +25 -21
- package/vscode/src/vs/workbench/contrib/comments/common/commentModel.js +2 -2
- package/vscode/src/vs/workbench/contrib/customEditor/common/customEditor.js +1 -4
- package/vscode/src/vs/workbench/contrib/debug/browser/debugColors.js +20 -20
- package/vscode/src/vs/workbench/contrib/debug/browser/debugIcons.js +56 -98
- package/vscode/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.js +2 -2
- package/vscode/src/vs/workbench/contrib/debug/common/debug.js +96 -180
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsIcons.js +25 -79
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/configuration.js +4 -15
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.js +4 -8
- package/vscode/src/vs/workbench/contrib/files/browser/explorerViewlet.js +56 -19
- package/vscode/src/vs/workbench/contrib/files/browser/fileActions.js +76 -230
- package/vscode/src/vs/workbench/contrib/files/browser/fileConstants.js +6 -5
- package/vscode/src/vs/workbench/contrib/files/browser/fileImportExport.js +33 -103
- package/vscode/src/vs/workbench/contrib/files/browser/files.contribution.js +228 -99
- package/vscode/src/vs/workbench/contrib/files/browser/views/emptyView.js +1 -1
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.js +5 -9
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerView.js +5 -5
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.js +15 -35
- package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js +5 -8
- package/vscode/src/vs/workbench/contrib/files/common/files.js +27 -48
- package/vscode/src/vs/workbench/contrib/folding/browser/folding.contribution.js +3 -6
- package/vscode/src/vs/workbench/contrib/format/browser/formatModified.js +1 -1
- package/vscode/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.js +5 -8
- package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.js +112 -52
- package/vscode/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.js +1 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js +2 -2
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js +30 -96
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mapping.js +73 -126
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js +3 -3
- package/vscode/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.js +42 -0
- package/vscode/src/vs/workbench/contrib/output/browser/output.contribution.js +23 -29
- package/vscode/src/vs/workbench/contrib/output/browser/outputView.js +3 -3
- package/vscode/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.js +13 -16
- package/vscode/src/vs/workbench/contrib/quickaccess/browser/quickAccess.contribution.js +15 -34
- package/vscode/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.js +12 -17
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.js +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js +26 -75
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.js +4 -19
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsFile.js +4 -4
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsService.js +60 -99
- package/vscode/src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.js +5 -14
- package/vscode/src/vs/workbench/contrib/tasks/common/taskService.js +26 -13
- package/vscode/src/vs/workbench/contrib/tasks/common/tasks.js +88 -96
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.js +5 -17
- package/vscode/src/vs/workbench/contrib/terminal/common/terminal.js +7 -28
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.js +21 -78
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalContextKey.js +21 -53
- package/vscode/src/vs/workbench/contrib/testing/common/testResult.js +2 -2
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.js +2 -5
- package/vscode/src/vs/workbench/services/actions/common/menusExtensionPoint.js +113 -348
- package/vscode/src/vs/workbench/services/assignment/common/assignmentService.js +2 -5
- package/vscode/src/vs/workbench/services/authentication/browser/authenticationService.js +31 -1
- package/vscode/src/vs/workbench/services/configuration/common/jsonEditingService.js +1 -4
- package/vscode/src/vs/workbench/services/configurationResolver/common/variableResolver.js +16 -16
- package/vscode/src/vs/workbench/services/decorations/browser/decorationsService.js +2 -2
- package/vscode/src/vs/workbench/services/editor/common/editorResolverService.js +2 -5
- package/vscode/src/vs/workbench/services/extensions/browser/extensionUrlHandler.js +4 -4
- package/vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.js +27 -29
- package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js +104 -141
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.js +35 -39
- package/vscode/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.js +25 -25
- package/vscode/src/vs/workbench/services/extensions/common/extensionsRegistry.js +80 -296
- package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.js +6 -21
- package/vscode/src/vs/workbench/services/host/browser/browserHostService.js +3 -6
- package/vscode/src/vs/workbench/services/keybinding/browser/keybindingService.js +24 -81
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.js +2 -2
- package/vscode/src/vs/workbench/services/keybinding/common/keybindingEditing.js +11 -17
- package/vscode/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.js +30 -32
- package/vscode/src/vs/workbench/services/language/common/languageService.js +23 -98
- package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js +83 -95
- package/vscode/src/vs/workbench/services/search/common/queryBuilder.js +1 -5
- package/vscode/src/vs/workbench/services/textfile/browser/textFileService.js +11 -23
- package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModel.js +32 -32
- package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModelManager.js +2 -7
- package/vscode/src/vs/workbench/services/textfile/common/textFileSaveParticipant.js +2 -2
- package/vscode/src/vs/workbench/services/themes/common/colorExtensionPoint.js +16 -53
- package/vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js +50 -1
- package/vscode/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.js +25 -99
- package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorService.js +16 -16
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfile.js +6 -3
- package/vscode/src/vs/workbench/services/userDataSync/common/userDataSync.js +15 -3
- package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopySaveParticipant.js +2 -2
- package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyBackupService.js +32 -42
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
3
|
+
import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
|
|
4
|
+
import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
5
|
+
import { IKeybindingService } from 'monaco-editor/esm/vs/platform/keybinding/common/keybinding.js';
|
|
6
|
+
import { Extensions } from 'monaco-editor/esm/vs/platform/quickinput/common/quickAccess.js';
|
|
7
|
+
import { IQuickInputService } from 'monaco-editor/esm/vs/platform/quickinput/common/quickInput.js';
|
|
8
|
+
var HelpQuickAccessProvider_1;
|
|
9
|
+
let HelpQuickAccessProvider = class HelpQuickAccessProvider {
|
|
10
|
+
static { HelpQuickAccessProvider_1 = this; }
|
|
11
|
+
static { this.PREFIX = '?'; }
|
|
12
|
+
constructor(quickInputService, keybindingService) {
|
|
13
|
+
this.quickInputService = quickInputService;
|
|
14
|
+
this.keybindingService = keybindingService;
|
|
15
|
+
this.registry = ( Registry.as(Extensions.Quickaccess));
|
|
16
|
+
}
|
|
17
|
+
provide(picker) {
|
|
18
|
+
const disposables = ( new DisposableStore());
|
|
19
|
+
disposables.add(picker.onDidAccept(() => {
|
|
20
|
+
const [item] = picker.selectedItems;
|
|
21
|
+
if (item) {
|
|
22
|
+
this.quickInputService.quickAccess.show(item.prefix, { preserveValue: true });
|
|
23
|
+
}
|
|
24
|
+
}));
|
|
25
|
+
disposables.add(picker.onDidChangeValue(value => {
|
|
26
|
+
const providerDescriptor = this.registry.getQuickAccessProvider(value.substr(HelpQuickAccessProvider_1.PREFIX.length));
|
|
27
|
+
if (providerDescriptor && providerDescriptor.prefix && providerDescriptor.prefix !== HelpQuickAccessProvider_1.PREFIX) {
|
|
28
|
+
this.quickInputService.quickAccess.show(providerDescriptor.prefix, { preserveValue: true });
|
|
29
|
+
}
|
|
30
|
+
}));
|
|
31
|
+
picker.items = this.getQuickAccessProviders().filter(p => p.prefix !== HelpQuickAccessProvider_1.PREFIX);
|
|
32
|
+
return disposables;
|
|
33
|
+
}
|
|
34
|
+
getQuickAccessProviders() {
|
|
35
|
+
const providers = this.registry
|
|
36
|
+
.getQuickAccessProviders()
|
|
37
|
+
.sort((providerA, providerB) => providerA.prefix.localeCompare(providerB.prefix))
|
|
38
|
+
.flatMap(provider => this.createPicks(provider));
|
|
39
|
+
return providers;
|
|
40
|
+
}
|
|
41
|
+
createPicks(provider) {
|
|
42
|
+
return ( provider.helpEntries.map(helpEntry => {
|
|
43
|
+
const prefix = helpEntry.prefix || provider.prefix;
|
|
44
|
+
const label = prefix || '\u2026' ;
|
|
45
|
+
return {
|
|
46
|
+
prefix,
|
|
47
|
+
label,
|
|
48
|
+
keybinding: helpEntry.commandId ? this.keybindingService.lookupKeybinding(helpEntry.commandId) : undefined,
|
|
49
|
+
ariaLabel: localizeWithPath('vs/platform/quickinput/browser/helpQuickAccess', 'helpPickAriaLabel', "{0}, {1}", label, helpEntry.description),
|
|
50
|
+
description: helpEntry.description
|
|
51
|
+
};
|
|
52
|
+
}));
|
|
53
|
+
}
|
|
54
|
+
};
|
|
55
|
+
HelpQuickAccessProvider = HelpQuickAccessProvider_1 = ( __decorate([
|
|
56
|
+
( __param(0, IQuickInputService)),
|
|
57
|
+
( __param(1, IKeybindingService))
|
|
58
|
+
], HelpQuickAccessProvider));
|
|
59
|
+
export { HelpQuickAccessProvider };
|
|
@@ -0,0 +1,212 @@
|
|
|
1
|
+
import { timeout } from 'monaco-editor/esm/vs/base/common/async.js';
|
|
2
|
+
import { CancellationTokenSource } from 'monaco-editor/esm/vs/base/common/cancellation.js';
|
|
3
|
+
import { Disposable, MutableDisposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
4
|
+
import { isFunction } from 'monaco-editor/esm/vs/base/common/types.js';
|
|
5
|
+
var TriggerAction;
|
|
6
|
+
( (function(TriggerAction) {
|
|
7
|
+
TriggerAction[TriggerAction["NO_ACTION"] = 0] = "NO_ACTION";
|
|
8
|
+
TriggerAction[TriggerAction["CLOSE_PICKER"] = 1] = "CLOSE_PICKER";
|
|
9
|
+
TriggerAction[TriggerAction["REFRESH_PICKER"] = 2] = "REFRESH_PICKER";
|
|
10
|
+
TriggerAction[TriggerAction["REMOVE_ITEM"] = 3] = "REMOVE_ITEM";
|
|
11
|
+
})(TriggerAction || (TriggerAction = {})));
|
|
12
|
+
function isPicksWithActive(obj) {
|
|
13
|
+
const candidate = obj;
|
|
14
|
+
return Array.isArray(candidate.items);
|
|
15
|
+
}
|
|
16
|
+
function isFastAndSlowPicks(obj) {
|
|
17
|
+
const candidate = obj;
|
|
18
|
+
return !!candidate.picks && candidate.additionalPicks instanceof Promise;
|
|
19
|
+
}
|
|
20
|
+
class PickerQuickAccessProvider extends Disposable {
|
|
21
|
+
constructor(prefix, options) {
|
|
22
|
+
super();
|
|
23
|
+
this.prefix = prefix;
|
|
24
|
+
this.options = options;
|
|
25
|
+
}
|
|
26
|
+
provide(picker, token, runOptions) {
|
|
27
|
+
const disposables = ( new DisposableStore());
|
|
28
|
+
picker.canAcceptInBackground = !!this.options?.canAcceptInBackground;
|
|
29
|
+
picker.matchOnLabel = picker.matchOnDescription = picker.matchOnDetail = picker.sortByLabel = false;
|
|
30
|
+
let picksCts = undefined;
|
|
31
|
+
const picksDisposable = disposables.add(( new MutableDisposable()));
|
|
32
|
+
const updatePickerItems = async () => {
|
|
33
|
+
const picksDisposables = picksDisposable.value = ( new DisposableStore());
|
|
34
|
+
picksCts?.dispose(true);
|
|
35
|
+
picker.busy = false;
|
|
36
|
+
picksCts = ( new CancellationTokenSource(token));
|
|
37
|
+
const picksToken = picksCts.token;
|
|
38
|
+
const picksFilter = picker.value.substr(this.prefix.length).trim();
|
|
39
|
+
const providedPicks = this._getPicks(picksFilter, picksDisposables, picksToken, runOptions);
|
|
40
|
+
const applyPicks = (picks, skipEmpty) => {
|
|
41
|
+
let items;
|
|
42
|
+
let activeItem = undefined;
|
|
43
|
+
if (isPicksWithActive(picks)) {
|
|
44
|
+
items = picks.items;
|
|
45
|
+
activeItem = picks.active;
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
items = picks;
|
|
49
|
+
}
|
|
50
|
+
if (items.length === 0) {
|
|
51
|
+
if (skipEmpty) {
|
|
52
|
+
return false;
|
|
53
|
+
}
|
|
54
|
+
if ((picksFilter.length > 0 || picker.hideInput) && this.options?.noResultsPick) {
|
|
55
|
+
if (isFunction(this.options.noResultsPick)) {
|
|
56
|
+
items = [this.options.noResultsPick(picksFilter)];
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
items = [this.options.noResultsPick];
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
picker.items = items;
|
|
64
|
+
if (activeItem) {
|
|
65
|
+
picker.activeItems = [activeItem];
|
|
66
|
+
}
|
|
67
|
+
return true;
|
|
68
|
+
};
|
|
69
|
+
const applyFastAndSlowPicks = async (fastAndSlowPicks) => {
|
|
70
|
+
let fastPicksApplied = false;
|
|
71
|
+
let slowPicksApplied = false;
|
|
72
|
+
await Promise.all([
|
|
73
|
+
(async () => {
|
|
74
|
+
if (typeof fastAndSlowPicks.mergeDelay === 'number') {
|
|
75
|
+
await timeout(fastAndSlowPicks.mergeDelay);
|
|
76
|
+
if (picksToken.isCancellationRequested) {
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
if (!slowPicksApplied) {
|
|
81
|
+
fastPicksApplied = applyPicks(fastAndSlowPicks.picks, true );
|
|
82
|
+
}
|
|
83
|
+
})(),
|
|
84
|
+
(async () => {
|
|
85
|
+
picker.busy = true;
|
|
86
|
+
try {
|
|
87
|
+
const awaitedAdditionalPicks = await fastAndSlowPicks.additionalPicks;
|
|
88
|
+
if (picksToken.isCancellationRequested) {
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
91
|
+
let picks;
|
|
92
|
+
let activePick = undefined;
|
|
93
|
+
if (isPicksWithActive(fastAndSlowPicks.picks)) {
|
|
94
|
+
picks = fastAndSlowPicks.picks.items;
|
|
95
|
+
activePick = fastAndSlowPicks.picks.active;
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
picks = fastAndSlowPicks.picks;
|
|
99
|
+
}
|
|
100
|
+
let additionalPicks;
|
|
101
|
+
let additionalActivePick = undefined;
|
|
102
|
+
if (isPicksWithActive(awaitedAdditionalPicks)) {
|
|
103
|
+
additionalPicks = awaitedAdditionalPicks.items;
|
|
104
|
+
additionalActivePick = awaitedAdditionalPicks.active;
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
additionalPicks = awaitedAdditionalPicks;
|
|
108
|
+
}
|
|
109
|
+
if (additionalPicks.length > 0 || !fastPicksApplied) {
|
|
110
|
+
let fallbackActivePick = undefined;
|
|
111
|
+
if (!activePick && !additionalActivePick) {
|
|
112
|
+
const fallbackActivePickCandidate = picker.activeItems[0];
|
|
113
|
+
if (fallbackActivePickCandidate && picks.indexOf(fallbackActivePickCandidate) !== -1) {
|
|
114
|
+
fallbackActivePick = fallbackActivePickCandidate;
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
applyPicks({
|
|
118
|
+
items: [...picks, ...additionalPicks],
|
|
119
|
+
active: activePick || additionalActivePick || fallbackActivePick
|
|
120
|
+
});
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
finally {
|
|
124
|
+
if (!picksToken.isCancellationRequested) {
|
|
125
|
+
picker.busy = false;
|
|
126
|
+
}
|
|
127
|
+
slowPicksApplied = true;
|
|
128
|
+
}
|
|
129
|
+
})()
|
|
130
|
+
]);
|
|
131
|
+
};
|
|
132
|
+
if (providedPicks === null) ;
|
|
133
|
+
else if (isFastAndSlowPicks(providedPicks)) {
|
|
134
|
+
await applyFastAndSlowPicks(providedPicks);
|
|
135
|
+
}
|
|
136
|
+
else if (!(providedPicks instanceof Promise)) {
|
|
137
|
+
applyPicks(providedPicks);
|
|
138
|
+
}
|
|
139
|
+
else {
|
|
140
|
+
picker.busy = true;
|
|
141
|
+
try {
|
|
142
|
+
const awaitedPicks = await providedPicks;
|
|
143
|
+
if (picksToken.isCancellationRequested) {
|
|
144
|
+
return;
|
|
145
|
+
}
|
|
146
|
+
if (isFastAndSlowPicks(awaitedPicks)) {
|
|
147
|
+
await applyFastAndSlowPicks(awaitedPicks);
|
|
148
|
+
}
|
|
149
|
+
else {
|
|
150
|
+
applyPicks(awaitedPicks);
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
finally {
|
|
154
|
+
if (!picksToken.isCancellationRequested) {
|
|
155
|
+
picker.busy = false;
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
};
|
|
160
|
+
disposables.add(picker.onDidChangeValue(() => updatePickerItems()));
|
|
161
|
+
updatePickerItems();
|
|
162
|
+
disposables.add(picker.onDidAccept(event => {
|
|
163
|
+
const [item] = picker.selectedItems;
|
|
164
|
+
if (typeof item?.accept === 'function') {
|
|
165
|
+
if (!event.inBackground) {
|
|
166
|
+
picker.hide();
|
|
167
|
+
}
|
|
168
|
+
item.accept(picker.keyMods, event);
|
|
169
|
+
}
|
|
170
|
+
}));
|
|
171
|
+
disposables.add(picker.onDidTriggerItemButton(async ({ button, item }) => {
|
|
172
|
+
if (typeof item.trigger === 'function') {
|
|
173
|
+
const buttonIndex = item.buttons?.indexOf(button) ?? -1;
|
|
174
|
+
if (buttonIndex >= 0) {
|
|
175
|
+
const result = item.trigger(buttonIndex, picker.keyMods);
|
|
176
|
+
const action = (typeof result === 'number') ? result : await result;
|
|
177
|
+
if (token.isCancellationRequested) {
|
|
178
|
+
return;
|
|
179
|
+
}
|
|
180
|
+
switch (action) {
|
|
181
|
+
case TriggerAction.NO_ACTION:
|
|
182
|
+
break;
|
|
183
|
+
case TriggerAction.CLOSE_PICKER:
|
|
184
|
+
picker.hide();
|
|
185
|
+
break;
|
|
186
|
+
case TriggerAction.REFRESH_PICKER:
|
|
187
|
+
updatePickerItems();
|
|
188
|
+
break;
|
|
189
|
+
case TriggerAction.REMOVE_ITEM: {
|
|
190
|
+
const index = picker.items.indexOf(item);
|
|
191
|
+
if (index !== -1) {
|
|
192
|
+
const items = picker.items.slice();
|
|
193
|
+
const removed = items.splice(index, 1);
|
|
194
|
+
const activeItems = picker.activeItems.filter(activeItem => activeItem !== removed[0]);
|
|
195
|
+
const keepScrollPositionBefore = picker.keepScrollPosition;
|
|
196
|
+
picker.keepScrollPosition = true;
|
|
197
|
+
picker.items = items;
|
|
198
|
+
if (activeItems) {
|
|
199
|
+
picker.activeItems = activeItems;
|
|
200
|
+
}
|
|
201
|
+
picker.keepScrollPosition = keepScrollPositionBefore;
|
|
202
|
+
}
|
|
203
|
+
break;
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
}));
|
|
209
|
+
return disposables;
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
export { PickerQuickAccessProvider, TriggerAction };
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { getErrorMessage } from 'monaco-editor/esm/vs/base/common/errors.js';
|
|
2
2
|
import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
3
|
-
import {
|
|
3
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
4
4
|
import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
|
|
5
5
|
import { CONTEXT_LOG_LEVEL, LogLevelToString, LogLevel } from 'monaco-editor/esm/vs/platform/log/common/log.js';
|
|
6
6
|
const IRequestService = ( createDecorator('requestService'));
|
|
@@ -29,7 +29,7 @@ class AbstractRequestService extends Disposable {
|
|
|
29
29
|
super();
|
|
30
30
|
this.counter = 0;
|
|
31
31
|
this.logger = loggerService.createLogger('network', {
|
|
32
|
-
name: (
|
|
32
|
+
name: localizeWithPath('vs/platform/request/common/request', 'request', "Network Requests"),
|
|
33
33
|
when: ( CONTEXT_LOG_LEVEL.isEqualTo(LogLevelToString(LogLevel.Trace))).serialize()
|
|
34
34
|
});
|
|
35
35
|
}
|
|
@@ -156,34 +156,25 @@ class TokenClassificationRegistry {
|
|
|
156
156
|
definitions: {
|
|
157
157
|
style: {
|
|
158
158
|
type: 'object',
|
|
159
|
-
description:
|
|
159
|
+
description: nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'schema.token.settings', 'Colors and styles for the token.'),
|
|
160
160
|
properties: {
|
|
161
161
|
foreground: {
|
|
162
162
|
type: 'string',
|
|
163
|
-
description:
|
|
163
|
+
description: nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'schema.token.foreground', 'Foreground color for the token.'),
|
|
164
164
|
format: 'color-hex',
|
|
165
165
|
default: '#ff0000'
|
|
166
166
|
},
|
|
167
167
|
background: {
|
|
168
168
|
type: 'string',
|
|
169
|
-
deprecationMessage: (
|
|
170
|
-
'schema.token.background.warning',
|
|
171
|
-
'Token background colors are currently not supported.'
|
|
172
|
-
))
|
|
169
|
+
deprecationMessage: nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'schema.token.background.warning', 'Token background colors are currently not supported.')
|
|
173
170
|
},
|
|
174
171
|
fontStyle: {
|
|
175
172
|
type: 'string',
|
|
176
|
-
description: (
|
|
177
|
-
'schema.token.fontStyle',
|
|
178
|
-
'Sets the all font styles of the rule: \'italic\', \'bold\', \'underline\' or \'strikethrough\' or a combination. All styles that are not listed are unset. The empty string unsets all styles.'
|
|
179
|
-
)),
|
|
173
|
+
description: nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'schema.token.fontStyle', 'Sets the all font styles of the rule: \'italic\', \'bold\', \'underline\' or \'strikethrough\' or a combination. All styles that are not listed are unset. The empty string unsets all styles.'),
|
|
180
174
|
pattern: fontStylePattern,
|
|
181
|
-
patternErrorMessage: (
|
|
182
|
-
'schema.fontStyle.error',
|
|
183
|
-
'Font style must be \'italic\', \'bold\', \'underline\' or \'strikethrough\' or a combination. The empty string unsets all styles.'
|
|
184
|
-
)),
|
|
175
|
+
patternErrorMessage: nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'schema.fontStyle.error', 'Font style must be \'italic\', \'bold\', \'underline\' or \'strikethrough\' or a combination. The empty string unsets all styles.'),
|
|
185
176
|
defaultSnippets: [
|
|
186
|
-
{ label:
|
|
177
|
+
{ label: nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'schema.token.fontStyle.none', 'None (clear inherited style)'), bodyText: '""' },
|
|
187
178
|
{ body: 'italic' },
|
|
188
179
|
{ body: 'bold' },
|
|
189
180
|
{ body: 'underline' },
|
|
@@ -203,31 +194,19 @@ class TokenClassificationRegistry {
|
|
|
203
194
|
},
|
|
204
195
|
bold: {
|
|
205
196
|
type: 'boolean',
|
|
206
|
-
description: (
|
|
207
|
-
'schema.token.bold',
|
|
208
|
-
'Sets or unsets the font style to bold. Note, the presence of \'fontStyle\' overrides this setting.'
|
|
209
|
-
)),
|
|
197
|
+
description: nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'schema.token.bold', 'Sets or unsets the font style to bold. Note, the presence of \'fontStyle\' overrides this setting.'),
|
|
210
198
|
},
|
|
211
199
|
italic: {
|
|
212
200
|
type: 'boolean',
|
|
213
|
-
description: (
|
|
214
|
-
'schema.token.italic',
|
|
215
|
-
'Sets or unsets the font style to italic. Note, the presence of \'fontStyle\' overrides this setting.'
|
|
216
|
-
)),
|
|
201
|
+
description: nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'schema.token.italic', 'Sets or unsets the font style to italic. Note, the presence of \'fontStyle\' overrides this setting.'),
|
|
217
202
|
},
|
|
218
203
|
underline: {
|
|
219
204
|
type: 'boolean',
|
|
220
|
-
description: (
|
|
221
|
-
'schema.token.underline',
|
|
222
|
-
'Sets or unsets the font style to underline. Note, the presence of \'fontStyle\' overrides this setting.'
|
|
223
|
-
)),
|
|
205
|
+
description: nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'schema.token.underline', 'Sets or unsets the font style to underline. Note, the presence of \'fontStyle\' overrides this setting.'),
|
|
224
206
|
},
|
|
225
207
|
strikethrough: {
|
|
226
208
|
type: 'boolean',
|
|
227
|
-
description: (
|
|
228
|
-
'schema.token.strikethrough',
|
|
229
|
-
'Sets or unsets the font style to strikethrough. Note, the presence of \'fontStyle\' overrides this setting.'
|
|
230
|
-
)),
|
|
209
|
+
description: nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'schema.token.strikethrough', 'Sets or unsets the font style to strikethrough. Note, the presence of \'fontStyle\' overrides this setting.'),
|
|
231
210
|
}
|
|
232
211
|
},
|
|
233
212
|
defaultSnippets: [{ body: { foreground: '${1:#FF0000}', fontStyle: '${2:bold}' } }]
|
|
@@ -390,38 +369,38 @@ function createDefaultTokenClassificationRegistry() {
|
|
|
390
369
|
console.log(e);
|
|
391
370
|
}
|
|
392
371
|
}
|
|
393
|
-
registerTokenType('comment',
|
|
394
|
-
registerTokenType('string',
|
|
395
|
-
registerTokenType('keyword',
|
|
396
|
-
registerTokenType('number',
|
|
397
|
-
registerTokenType('regexp',
|
|
398
|
-
registerTokenType('operator',
|
|
399
|
-
registerTokenType('namespace',
|
|
400
|
-
registerTokenType('type',
|
|
401
|
-
registerTokenType('struct',
|
|
402
|
-
registerTokenType('class',
|
|
403
|
-
registerTokenType('interface',
|
|
404
|
-
registerTokenType('enum',
|
|
405
|
-
registerTokenType('typeParameter',
|
|
406
|
-
registerTokenType('function',
|
|
407
|
-
registerTokenType('member',
|
|
408
|
-
registerTokenType('method',
|
|
409
|
-
registerTokenType('macro',
|
|
410
|
-
registerTokenType('variable',
|
|
411
|
-
registerTokenType('parameter',
|
|
412
|
-
registerTokenType('property',
|
|
413
|
-
registerTokenType('enumMember',
|
|
414
|
-
registerTokenType('event',
|
|
415
|
-
registerTokenType('decorator',
|
|
416
|
-
registerTokenType('label',
|
|
417
|
-
registry.registerTokenModifier('declaration',
|
|
418
|
-
registry.registerTokenModifier('documentation',
|
|
419
|
-
registry.registerTokenModifier('static',
|
|
420
|
-
registry.registerTokenModifier('abstract',
|
|
421
|
-
registry.registerTokenModifier('deprecated',
|
|
422
|
-
registry.registerTokenModifier('modification',
|
|
423
|
-
registry.registerTokenModifier('async',
|
|
424
|
-
registry.registerTokenModifier('readonly',
|
|
372
|
+
registerTokenType('comment', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'comment', "Style for comments."), [['comment']]);
|
|
373
|
+
registerTokenType('string', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'string', "Style for strings."), [['string']]);
|
|
374
|
+
registerTokenType('keyword', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'keyword', "Style for keywords."), [['keyword.control']]);
|
|
375
|
+
registerTokenType('number', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'number', "Style for numbers."), [['constant.numeric']]);
|
|
376
|
+
registerTokenType('regexp', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'regexp', "Style for expressions."), [['constant.regexp']]);
|
|
377
|
+
registerTokenType('operator', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'operator', "Style for operators."), [['keyword.operator']]);
|
|
378
|
+
registerTokenType('namespace', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'namespace', "Style for namespaces."), [['entity.name.namespace']]);
|
|
379
|
+
registerTokenType('type', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'type', "Style for types."), [['entity.name.type'], ['support.type']]);
|
|
380
|
+
registerTokenType('struct', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'struct', "Style for structs."), [['entity.name.type.struct']]);
|
|
381
|
+
registerTokenType('class', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'class', "Style for classes."), [['entity.name.type.class'], ['support.class']]);
|
|
382
|
+
registerTokenType('interface', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'interface', "Style for interfaces."), [['entity.name.type.interface']]);
|
|
383
|
+
registerTokenType('enum', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'enum', "Style for enums."), [['entity.name.type.enum']]);
|
|
384
|
+
registerTokenType('typeParameter', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'typeParameter', "Style for type parameters."), [['entity.name.type.parameter']]);
|
|
385
|
+
registerTokenType('function', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'function', "Style for functions"), [['entity.name.function'], ['support.function']]);
|
|
386
|
+
registerTokenType('member', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'member', "Style for member functions"), [], 'method', 'Deprecated use `method` instead');
|
|
387
|
+
registerTokenType('method', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'method', "Style for method (member functions)"), [['entity.name.function.member'], ['support.function']]);
|
|
388
|
+
registerTokenType('macro', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'macro', "Style for macros."), [['entity.name.function.preprocessor']]);
|
|
389
|
+
registerTokenType('variable', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'variable', "Style for variables."), [['variable.other.readwrite'], ['entity.name.variable']]);
|
|
390
|
+
registerTokenType('parameter', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'parameter', "Style for parameters."), [['variable.parameter']]);
|
|
391
|
+
registerTokenType('property', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'property', "Style for properties."), [['variable.other.property']]);
|
|
392
|
+
registerTokenType('enumMember', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'enumMember', "Style for enum members."), [['variable.other.enummember']]);
|
|
393
|
+
registerTokenType('event', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'event', "Style for events."), [['variable.other.event']]);
|
|
394
|
+
registerTokenType('decorator', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'decorator', "Style for decorators & annotations."), [['entity.name.decorator'], ['entity.name.function']]);
|
|
395
|
+
registerTokenType('label', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'labels', "Style for labels. "), undefined);
|
|
396
|
+
registry.registerTokenModifier('declaration', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'declaration', "Style for all symbol declarations."), undefined);
|
|
397
|
+
registry.registerTokenModifier('documentation', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'documentation', "Style to use for references in documentation."), undefined);
|
|
398
|
+
registry.registerTokenModifier('static', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'static', "Style to use for symbols that are static."), undefined);
|
|
399
|
+
registry.registerTokenModifier('abstract', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'abstract', "Style to use for symbols that are abstract."), undefined);
|
|
400
|
+
registry.registerTokenModifier('deprecated', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'deprecated', "Style to use for symbols that are deprecated."), undefined);
|
|
401
|
+
registry.registerTokenModifier('modification', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'modification', "Style to use for write accesses."), undefined);
|
|
402
|
+
registry.registerTokenModifier('async', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'async', "Style to use for symbols that are async."), undefined);
|
|
403
|
+
registry.registerTokenModifier('readonly', nls.localizeWithPath('vs/platform/theme/common/tokenClassificationRegistry', 'readonly', "Style to use for symbols that are read-only."), undefined);
|
|
425
404
|
registerTokenStyleDefault('variable.readonly', [['variable.other.constant']]);
|
|
426
405
|
registerTokenStyleDefault('property.readonly', [['variable.other.constant.property']]);
|
|
427
406
|
registerTokenStyleDefault('type.defaultLibrary', [['support.type']]);
|
|
@@ -10,7 +10,7 @@ import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
|
|
|
10
10
|
import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
|
|
11
11
|
import { getRemoteAuthority } from 'monaco-editor/esm/vs/platform/remote/common/remoteHosts.js';
|
|
12
12
|
import { WorkspaceFolder } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
|
|
13
|
-
const IWorkspacesService = (
|
|
13
|
+
const IWorkspacesService = ( createDecorator('workspacesService'));
|
|
14
14
|
function isRecentWorkspace(curr) {
|
|
15
15
|
return curr.hasOwnProperty('workspace');
|
|
16
16
|
}
|
|
@@ -33,7 +33,7 @@ function isRawUriWorkspaceFolder(obj) {
|
|
|
33
33
|
}
|
|
34
34
|
function getStoredWorkspaceFolder(folderURI, forceAbsolute, folderName, targetConfigFolderURI, extUri) {
|
|
35
35
|
if (folderURI.scheme !== targetConfigFolderURI.scheme) {
|
|
36
|
-
return { name: folderName, uri: (
|
|
36
|
+
return { name: folderName, uri: ( folderURI.toString(true)) };
|
|
37
37
|
}
|
|
38
38
|
let folderPath = !forceAbsolute ? extUri.relativePath(targetConfigFolderURI, folderURI) : undefined;
|
|
39
39
|
if (folderPath !== undefined) {
|
|
@@ -54,7 +54,7 @@ function getStoredWorkspaceFolder(folderURI, forceAbsolute, folderName, targetCo
|
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
else if (!extUri.isEqualAuthority(folderURI.authority, targetConfigFolderURI.authority)) {
|
|
57
|
-
return { name: folderName, uri: (
|
|
57
|
+
return { name: folderName, uri: ( folderURI.toString(true)) };
|
|
58
58
|
}
|
|
59
59
|
else {
|
|
60
60
|
folderPath = folderURI.path;
|
|
@@ -71,7 +71,7 @@ function massagePathForWindows(folderPath) {
|
|
|
71
71
|
}
|
|
72
72
|
function toWorkspaceFolders(configuredFolders, workspaceConfigFile, extUri) {
|
|
73
73
|
const result = [];
|
|
74
|
-
const seen = (
|
|
74
|
+
const seen = ( new Set());
|
|
75
75
|
const relativeTo = extUri.dirname(workspaceConfigFile);
|
|
76
76
|
for (const configuredFolder of configuredFolders) {
|
|
77
77
|
let uri = undefined;
|
|
@@ -82,7 +82,7 @@ function toWorkspaceFolders(configuredFolders, workspaceConfigFile, extUri) {
|
|
|
82
82
|
}
|
|
83
83
|
else if (isRawUriWorkspaceFolder(configuredFolder)) {
|
|
84
84
|
try {
|
|
85
|
-
uri = (
|
|
85
|
+
uri = ( URI.parse(configuredFolder.uri));
|
|
86
86
|
if (uri.path[0] !== posix.sep) {
|
|
87
87
|
uri = uri.with({ path: posix.sep + uri.path });
|
|
88
88
|
}
|
|
@@ -93,10 +93,10 @@ function toWorkspaceFolders(configuredFolders, workspaceConfigFile, extUri) {
|
|
|
93
93
|
}
|
|
94
94
|
if (uri) {
|
|
95
95
|
const comparisonKey = extUri.getComparisonKey(uri);
|
|
96
|
-
if (!(
|
|
96
|
+
if (!( seen.has(comparisonKey))) {
|
|
97
97
|
seen.add(comparisonKey);
|
|
98
98
|
const name = configuredFolder.name || extUri.basenameOrAuthority(uri);
|
|
99
|
-
result.push((
|
|
99
|
+
result.push(( new WorkspaceFolder({ uri, name, index: result.length }, configuredFolder)));
|
|
100
100
|
}
|
|
101
101
|
}
|
|
102
102
|
}
|
|
@@ -108,7 +108,7 @@ function rewriteWorkspaceFileForNewLocation(rawWorkspaceContents, configPathURI,
|
|
|
108
108
|
const targetConfigFolder = extUri.dirname(targetConfigPathURI);
|
|
109
109
|
const rewrittenFolders = [];
|
|
110
110
|
for (const folder of storedWorkspace.folders) {
|
|
111
|
-
const folderURI = isRawFileWorkspaceFolder(folder) ? extUri.resolvePath(sourceConfigFolder, folder.path) : (
|
|
111
|
+
const folderURI = isRawFileWorkspaceFolder(folder) ? extUri.resolvePath(sourceConfigFolder, folder.path) : ( URI.parse(folder.uri));
|
|
112
112
|
let absolute;
|
|
113
113
|
if (isFromUntitledWorkspace) {
|
|
114
114
|
absolute = false;
|
|
@@ -154,7 +154,7 @@ function restoreRecentlyOpened(data, logService) {
|
|
|
154
154
|
onEntry(entries[i], i);
|
|
155
155
|
}
|
|
156
156
|
catch (e) {
|
|
157
|
-
logService.warn(`Error restoring recent entry ${JSON.stringify(entries[i])}: ${(
|
|
157
|
+
logService.warn(`Error restoring recent entry ${JSON.stringify(entries[i])}: ${( e.toString())}. Skip entry.`);
|
|
158
158
|
}
|
|
159
159
|
}
|
|
160
160
|
};
|
|
@@ -164,13 +164,13 @@ function restoreRecentlyOpened(data, logService) {
|
|
|
164
164
|
const label = entry.label;
|
|
165
165
|
const remoteAuthority = entry.remoteAuthority;
|
|
166
166
|
if (isSerializedRecentWorkspace(entry)) {
|
|
167
|
-
result.workspaces.push({ label, remoteAuthority, workspace: { id: entry.workspace.id, configPath: (
|
|
167
|
+
result.workspaces.push({ label, remoteAuthority, workspace: { id: entry.workspace.id, configPath: ( URI.parse(entry.workspace.configPath)) } });
|
|
168
168
|
}
|
|
169
169
|
else if (isSerializedRecentFolder(entry)) {
|
|
170
|
-
result.workspaces.push({ label, remoteAuthority, folderUri: (
|
|
170
|
+
result.workspaces.push({ label, remoteAuthority, folderUri: ( URI.parse(entry.folderUri)) });
|
|
171
171
|
}
|
|
172
172
|
else if (isSerializedRecentFile(entry)) {
|
|
173
|
-
result.files.push({ label, remoteAuthority, fileUri: (
|
|
173
|
+
result.files.push({ label, remoteAuthority, fileUri: ( URI.parse(entry.fileUri)) });
|
|
174
174
|
}
|
|
175
175
|
});
|
|
176
176
|
}
|
|
@@ -181,14 +181,14 @@ function toStoreData(recents) {
|
|
|
181
181
|
const serialized = { entries: [] };
|
|
182
182
|
for (const recent of recents.workspaces) {
|
|
183
183
|
if (isRecentFolder(recent)) {
|
|
184
|
-
serialized.entries.push({ folderUri: (
|
|
184
|
+
serialized.entries.push({ folderUri: ( recent.folderUri.toString()), label: recent.label, remoteAuthority: recent.remoteAuthority });
|
|
185
185
|
}
|
|
186
186
|
else {
|
|
187
|
-
serialized.entries.push({ workspace: { id: recent.workspace.id, configPath: (
|
|
187
|
+
serialized.entries.push({ workspace: { id: recent.workspace.id, configPath: ( recent.workspace.configPath.toString()) }, label: recent.label, remoteAuthority: recent.remoteAuthority });
|
|
188
188
|
}
|
|
189
189
|
}
|
|
190
190
|
for (const recent of recents.files) {
|
|
191
|
-
serialized.entries.push({ fileUri: (
|
|
191
|
+
serialized.entries.push({ fileUri: ( recent.fileUri.toString()), label: recent.label, remoteAuthority: recent.remoteAuthority });
|
|
192
192
|
}
|
|
193
193
|
return serialized;
|
|
194
194
|
}
|