@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
|
@@ -4,7 +4,7 @@ import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
|
|
|
4
4
|
import { isWeb } from 'monaco-editor/esm/vs/base/common/platform.js';
|
|
5
5
|
import { escape } from 'monaco-editor/esm/vs/base/common/strings.js';
|
|
6
6
|
import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
|
|
7
|
-
import {
|
|
7
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
8
8
|
import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
|
|
9
9
|
import { IProductService } from 'monaco-editor/esm/vs/platform/product/common/productService.js';
|
|
10
10
|
import { ExtHostContext } from '../common/extHost.protocol.js';
|
|
@@ -13,22 +13,22 @@ import { SerializableObjectWithBuffers } from '../../services/extensions/common/
|
|
|
13
13
|
var MainThreadWebviews_1;
|
|
14
14
|
let MainThreadWebviews = class MainThreadWebviews extends Disposable {
|
|
15
15
|
static { MainThreadWebviews_1 = this; }
|
|
16
|
-
static { this.standardSupportedLinkSchemes = (
|
|
16
|
+
static { this.standardSupportedLinkSchemes = ( new Set([
|
|
17
17
|
Schemas.http,
|
|
18
18
|
Schemas.https,
|
|
19
19
|
Schemas.mailto,
|
|
20
20
|
Schemas.vscode,
|
|
21
21
|
'vscode-insider',
|
|
22
|
-
]))
|
|
22
|
+
])); }
|
|
23
23
|
constructor(context, _openerService, _productService) {
|
|
24
24
|
super();
|
|
25
25
|
this._openerService = _openerService;
|
|
26
26
|
this._productService = _productService;
|
|
27
|
-
this._webviews = (
|
|
28
|
-
this._proxy = (
|
|
27
|
+
this._webviews = ( new Map());
|
|
28
|
+
this._proxy = ( context.getProxy(ExtHostContext.ExtHostWebviews));
|
|
29
29
|
}
|
|
30
30
|
addWebview(handle, webview, options) {
|
|
31
|
-
if ((
|
|
31
|
+
if (( this._webviews.has(handle))) {
|
|
32
32
|
throw new Error('Webview already registered');
|
|
33
33
|
}
|
|
34
34
|
this._webviews.set(handle, webview);
|
|
@@ -52,11 +52,11 @@ let MainThreadWebviews = class MainThreadWebviews extends Disposable {
|
|
|
52
52
|
return webview.postMessage(message, arrayBuffers);
|
|
53
53
|
}
|
|
54
54
|
hookupWebviewEventDelegate(handle, webview, options) {
|
|
55
|
-
const disposables = (
|
|
55
|
+
const disposables = ( new DisposableStore());
|
|
56
56
|
disposables.add(webview.onDidClickLink((uri) => this.onDidClickLink(handle, uri)));
|
|
57
57
|
disposables.add(webview.onMessage((message) => {
|
|
58
58
|
const serialized = serializeWebviewMessage(message.message, options);
|
|
59
|
-
this._proxy.$onMessage(handle, serialized.message, (
|
|
59
|
+
this._proxy.$onMessage(handle, serialized.message, ( new SerializableObjectWithBuffers(serialized.buffers)));
|
|
60
60
|
}));
|
|
61
61
|
disposables.add(webview.onMissingCsp((extension) => this._proxy.$onMissingCsp(handle, extension.value)));
|
|
62
62
|
disposables.add(webview.onDidDispose(() => {
|
|
@@ -66,12 +66,12 @@ let MainThreadWebviews = class MainThreadWebviews extends Disposable {
|
|
|
66
66
|
}
|
|
67
67
|
onDidClickLink(handle, link) {
|
|
68
68
|
const webview = this.getWebview(handle);
|
|
69
|
-
if (this.isSupportedLink(webview, (
|
|
69
|
+
if (this.isSupportedLink(webview, ( URI.parse(link)))) {
|
|
70
70
|
this._openerService.open(link, { fromUserGesture: true, allowContributedOpeners: true, allowCommands: Array.isArray(webview.contentOptions.enableCommandUris) || webview.contentOptions.enableCommandUris === true, fromWorkspace: true });
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
isSupportedLink(webview, link) {
|
|
74
|
-
if ((
|
|
74
|
+
if (( MainThreadWebviews_1.standardSupportedLinkSchemes.has(link.scheme))) {
|
|
75
75
|
return true;
|
|
76
76
|
}
|
|
77
77
|
if (!isWeb && this._productService.urlProtocol === link.scheme) {
|
|
@@ -102,18 +102,14 @@ let MainThreadWebviews = class MainThreadWebviews extends Disposable {
|
|
|
102
102
|
<meta http-equiv="Content-type" content="text/html;charset=UTF-8">
|
|
103
103
|
<meta http-equiv="Content-Security-Policy" content="default-src 'none';">
|
|
104
104
|
</head>
|
|
105
|
-
<body>${(
|
|
106
|
-
'errorMessage',
|
|
107
|
-
"An error occurred while loading view: {0}",
|
|
108
|
-
escape(viewType)
|
|
109
|
-
)))}</body>
|
|
105
|
+
<body>${localizeWithPath('vs/workbench/api/browser/mainThreadWebviews', 'errorMessage', "An error occurred while loading view: {0}", escape(viewType))}</body>
|
|
110
106
|
</html>`;
|
|
111
107
|
}
|
|
112
108
|
};
|
|
113
|
-
MainThreadWebviews = MainThreadWebviews_1 = (
|
|
114
|
-
(
|
|
115
|
-
(
|
|
116
|
-
], MainThreadWebviews))
|
|
109
|
+
MainThreadWebviews = MainThreadWebviews_1 = ( __decorate([
|
|
110
|
+
( __param(1, IOpenerService)),
|
|
111
|
+
( __param(2, IProductService))
|
|
112
|
+
], MainThreadWebviews));
|
|
117
113
|
function reviveWebviewExtension(extensionData) {
|
|
118
114
|
return {
|
|
119
115
|
id: extensionData.id,
|
|
@@ -125,7 +121,7 @@ function reviveWebviewContentOptions(webviewOptions) {
|
|
|
125
121
|
allowScripts: webviewOptions.enableScripts,
|
|
126
122
|
allowForms: webviewOptions.enableForms,
|
|
127
123
|
enableCommandUris: webviewOptions.enableCommandUris,
|
|
128
|
-
localResourceRoots: Array.isArray(webviewOptions.localResourceRoots) ? (
|
|
124
|
+
localResourceRoots: Array.isArray(webviewOptions.localResourceRoots) ? ( webviewOptions.localResourceRoots.map(r => URI.revive(r))) : undefined,
|
|
129
125
|
portMapping: webviewOptions.portMapping,
|
|
130
126
|
};
|
|
131
127
|
}
|
|
@@ -3,7 +3,7 @@ import { isCancellationError } from 'monaco-editor/esm/vs/base/common/errors.js'
|
|
|
3
3
|
import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
4
4
|
import { isNative } from 'monaco-editor/esm/vs/base/common/platform.js';
|
|
5
5
|
import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
|
|
6
|
-
import {
|
|
6
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
7
7
|
import { IEnvironmentService } from 'monaco-editor/esm/vs/platform/environment/common/environment.js';
|
|
8
8
|
import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
|
|
9
9
|
import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
|
|
@@ -73,44 +73,22 @@ let MainThreadWorkspace = class MainThreadWorkspace {
|
|
|
73
73
|
const wantsToDelete = removeCount > 0;
|
|
74
74
|
if (wantsToAdd && !wantsToDelete) {
|
|
75
75
|
if (addCount === 1) {
|
|
76
|
-
message = (
|
|
77
|
-
'folderStatusMessageAddSingleFolder',
|
|
78
|
-
"Extension '{0}' added 1 folder to the workspace",
|
|
79
|
-
extensionName
|
|
80
|
-
));
|
|
76
|
+
message = localizeWithPath('vs/workbench/api/browser/mainThreadWorkspace', 'folderStatusMessageAddSingleFolder', "Extension '{0}' added 1 folder to the workspace", extensionName);
|
|
81
77
|
}
|
|
82
78
|
else {
|
|
83
|
-
message = (
|
|
84
|
-
'folderStatusMessageAddMultipleFolders',
|
|
85
|
-
"Extension '{0}' added {1} folders to the workspace",
|
|
86
|
-
extensionName,
|
|
87
|
-
addCount
|
|
88
|
-
));
|
|
79
|
+
message = localizeWithPath('vs/workbench/api/browser/mainThreadWorkspace', 'folderStatusMessageAddMultipleFolders', "Extension '{0}' added {1} folders to the workspace", extensionName, addCount);
|
|
89
80
|
}
|
|
90
81
|
}
|
|
91
82
|
else if (wantsToDelete && !wantsToAdd) {
|
|
92
83
|
if (removeCount === 1) {
|
|
93
|
-
message = (
|
|
94
|
-
'folderStatusMessageRemoveSingleFolder',
|
|
95
|
-
"Extension '{0}' removed 1 folder from the workspace",
|
|
96
|
-
extensionName
|
|
97
|
-
));
|
|
84
|
+
message = localizeWithPath('vs/workbench/api/browser/mainThreadWorkspace', 'folderStatusMessageRemoveSingleFolder', "Extension '{0}' removed 1 folder from the workspace", extensionName);
|
|
98
85
|
}
|
|
99
86
|
else {
|
|
100
|
-
message = (
|
|
101
|
-
'folderStatusMessageRemoveMultipleFolders',
|
|
102
|
-
"Extension '{0}' removed {1} folders from the workspace",
|
|
103
|
-
extensionName,
|
|
104
|
-
removeCount
|
|
105
|
-
));
|
|
87
|
+
message = localizeWithPath('vs/workbench/api/browser/mainThreadWorkspace', 'folderStatusMessageRemoveMultipleFolders', "Extension '{0}' removed {1} folders from the workspace", extensionName, removeCount);
|
|
106
88
|
}
|
|
107
89
|
}
|
|
108
90
|
else {
|
|
109
|
-
message = (
|
|
110
|
-
'folderStatusChangeFolder',
|
|
111
|
-
"Extension '{0}' changed folders of the workspace",
|
|
112
|
-
extensionName
|
|
113
|
-
));
|
|
91
|
+
message = localizeWithPath('vs/workbench/api/browser/mainThreadWorkspace', 'folderStatusChangeFolder', "Extension '{0}' changed folders of the workspace", extensionName);
|
|
114
92
|
}
|
|
115
93
|
return message;
|
|
116
94
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
|
|
2
2
|
import { toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
3
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
3
4
|
import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
|
|
4
5
|
import { IStatusbarService } from '../../services/statusbar/browser/statusbar.js';
|
|
5
6
|
import { getCodiconAriaLabel } from 'monaco-editor/esm/vs/base/common/iconLabels.js';
|
|
@@ -93,4 +94,63 @@ ExtensionStatusBarItemService = ( __decorate([
|
|
|
93
94
|
( __param(0, IStatusbarService))
|
|
94
95
|
], ExtensionStatusBarItemService));
|
|
95
96
|
registerSingleton(IExtensionStatusBarItemService, ExtensionStatusBarItemService, 1 );
|
|
97
|
+
const statusBarItemSchema = {
|
|
98
|
+
type: 'object',
|
|
99
|
+
required: ['id', 'text', 'alignment', 'name'],
|
|
100
|
+
properties: {
|
|
101
|
+
id: {
|
|
102
|
+
type: 'string',
|
|
103
|
+
markdownDescription: localizeWithPath('vs/workbench/api/browser/statusBarExtensionPoint', 'id', 'The identifier of the status bar entry. Must be unique within the extension. The same value must be used when calling the `vscode.window.createStatusBarItem(id, ...)`-API')
|
|
104
|
+
},
|
|
105
|
+
name: {
|
|
106
|
+
type: 'string',
|
|
107
|
+
description: localizeWithPath('vs/workbench/api/browser/statusBarExtensionPoint', 'name', 'The name of the entry, like \'Python Language Indicator\', \'Git Status\' etc. Try to keep the length of the name short, yet descriptive enough that users can understand what the status bar item is about.')
|
|
108
|
+
},
|
|
109
|
+
text: {
|
|
110
|
+
type: 'string',
|
|
111
|
+
description: localizeWithPath('vs/workbench/api/browser/statusBarExtensionPoint', 'text', 'The text to show for the entry. You can embed icons in the text by leveraging the `$(<name>)`-syntax, like \'Hello $(globe)!\'')
|
|
112
|
+
},
|
|
113
|
+
tooltip: {
|
|
114
|
+
type: 'string',
|
|
115
|
+
description: localizeWithPath('vs/workbench/api/browser/statusBarExtensionPoint', 'tooltip', 'The tooltip text for the entry.')
|
|
116
|
+
},
|
|
117
|
+
command: {
|
|
118
|
+
type: 'string',
|
|
119
|
+
description: localizeWithPath('vs/workbench/api/browser/statusBarExtensionPoint', 'command', 'The command to execute when the status bar entry is clicked.')
|
|
120
|
+
},
|
|
121
|
+
alignment: {
|
|
122
|
+
type: 'string',
|
|
123
|
+
enum: ['left', 'right'],
|
|
124
|
+
description: localizeWithPath('vs/workbench/api/browser/statusBarExtensionPoint', 'alignment', 'The alignment of the status bar entry.')
|
|
125
|
+
},
|
|
126
|
+
priority: {
|
|
127
|
+
type: 'number',
|
|
128
|
+
description: localizeWithPath('vs/workbench/api/browser/statusBarExtensionPoint', 'priority', 'The priority of the status bar entry. Higher value means the item should be shown more to the left.')
|
|
129
|
+
},
|
|
130
|
+
accessibilityInformation: {
|
|
131
|
+
type: 'object',
|
|
132
|
+
description: localizeWithPath('vs/workbench/api/browser/statusBarExtensionPoint', 'accessibilityInformation', 'Defines the role and aria label to be used when the status bar entry is focused.'),
|
|
133
|
+
properties: {
|
|
134
|
+
role: {
|
|
135
|
+
type: 'string',
|
|
136
|
+
description: localizeWithPath('vs/workbench/api/browser/statusBarExtensionPoint', 'accessibilityInformation.role', 'The role of the status bar entry which defines how a screen reader interacts with it. More about aria roles can be found here https://w3c.github.io/aria/#widget_roles')
|
|
137
|
+
},
|
|
138
|
+
label: {
|
|
139
|
+
type: 'string',
|
|
140
|
+
description: localizeWithPath('vs/workbench/api/browser/statusBarExtensionPoint', 'accessibilityInformation.label', 'The aria label of the status bar entry. Defaults to the entry\'s text.')
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
};
|
|
146
|
+
({
|
|
147
|
+
description: localizeWithPath('vs/workbench/api/browser/statusBarExtensionPoint', 'vscode.extension.contributes.statusBarItems', "Contributes items to the status bar."),
|
|
148
|
+
oneOf: [
|
|
149
|
+
statusBarItemSchema,
|
|
150
|
+
{
|
|
151
|
+
type: 'array',
|
|
152
|
+
items: statusBarItemSchema
|
|
153
|
+
}
|
|
154
|
+
]
|
|
155
|
+
});
|
|
96
156
|
export { ExtensionStatusBarItemService, IExtensionStatusBarItemService };
|
|
@@ -3,7 +3,7 @@ import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
|
|
|
3
3
|
import { Iterable } from 'monaco-editor/esm/vs/base/common/iterator.js';
|
|
4
4
|
import { toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
5
5
|
import { StopWatch } from 'monaco-editor/esm/vs/base/common/stopwatch.js';
|
|
6
|
-
import {
|
|
6
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
7
7
|
import { MainContext } from './extHost.protocol.js';
|
|
8
8
|
import { ChatReplyFollowup, ChatFollowup, CompletionItemKind, ChatVariable, MarkdownString, Range } from './extHostTypeConverters.js';
|
|
9
9
|
class ChatProviderWrapper {
|
|
@@ -201,11 +201,11 @@ class ExtHostChat {
|
|
|
201
201
|
try {
|
|
202
202
|
result = await entry.provider.provideResponseWithProgress(requestObj, progressObj, token);
|
|
203
203
|
if (!result) {
|
|
204
|
-
result = { errorDetails: { message: (
|
|
204
|
+
result = { errorDetails: { message: localizeWithPath('vs/workbench/api/common/extHostChat', 'emptyResponse', "Provider returned null response") } };
|
|
205
205
|
}
|
|
206
206
|
}
|
|
207
207
|
catch (err) {
|
|
208
|
-
result = { errorDetails: { message: (
|
|
208
|
+
result = { errorDetails: { message: localizeWithPath('vs/workbench/api/common/extHostChat', 'errorResponse', "Error from provider: {0}", err.message), responseIsIncomplete: true } };
|
|
209
209
|
this.logService.error(err);
|
|
210
210
|
}
|
|
211
211
|
try {
|
|
@@ -25,17 +25,17 @@ let ExtHostCommands = class ExtHostCommands {
|
|
|
25
25
|
#telemetry;
|
|
26
26
|
#extHostTelemetry;
|
|
27
27
|
constructor(extHostRpc, logService, extHostTelemetry) {
|
|
28
|
-
this._commands = (
|
|
29
|
-
this._apiCommands = (
|
|
30
|
-
this.#proxy = (
|
|
28
|
+
this._commands = ( new Map());
|
|
29
|
+
this._apiCommands = ( new Map());
|
|
30
|
+
this.#proxy = ( extHostRpc.getProxy(MainContext.MainThreadCommands));
|
|
31
31
|
this._logService = logService;
|
|
32
32
|
this.#extHostTelemetry = extHostTelemetry;
|
|
33
|
-
this.#telemetry = (
|
|
34
|
-
this.converter = (
|
|
33
|
+
this.#telemetry = ( extHostRpc.getProxy(MainContext.MainThreadTelemetry));
|
|
34
|
+
this.converter = ( new CommandsConverter(this, id => {
|
|
35
35
|
const candidate = this._apiCommands.get(id);
|
|
36
36
|
return candidate?.result === ApiCommandResult.Void
|
|
37
37
|
? candidate : undefined;
|
|
38
|
-
}, logService))
|
|
38
|
+
}, logService));
|
|
39
39
|
this._argumentProcessors = [
|
|
40
40
|
{
|
|
41
41
|
processArgument(a) {
|
|
@@ -70,12 +70,12 @@ let ExtHostCommands = class ExtHostCommands {
|
|
|
70
70
|
}
|
|
71
71
|
registerApiCommand(apiCommand) {
|
|
72
72
|
const registration = this.registerCommand(false, apiCommand.id, async (...apiArgs) => {
|
|
73
|
-
const internalArgs = (
|
|
73
|
+
const internalArgs = ( apiCommand.args.map((arg, i) => {
|
|
74
74
|
if (!arg.validate(apiArgs[i])) {
|
|
75
75
|
throw new Error(`Invalid argument '${arg.name}' when running '${apiCommand.id}', received: ${typeof apiArgs[i] === 'object' ? JSON.stringify(apiArgs[i], null, '\t') : apiArgs[i]} `);
|
|
76
76
|
}
|
|
77
77
|
return arg.convert(apiArgs[i]);
|
|
78
|
-
}))
|
|
78
|
+
}));
|
|
79
79
|
const internalResult = await this.executeCommand(apiCommand.internalId, ...internalArgs);
|
|
80
80
|
return apiCommand.result.convert(internalResult, apiArgs, this.converter);
|
|
81
81
|
}, undefined, {
|
|
@@ -94,7 +94,7 @@ let ExtHostCommands = class ExtHostCommands {
|
|
|
94
94
|
if (!id.trim().length) {
|
|
95
95
|
throw new Error('invalid id');
|
|
96
96
|
}
|
|
97
|
-
if ((
|
|
97
|
+
if (( this._commands.has(id))) {
|
|
98
98
|
throw new Error(`command '${id}' already exists`);
|
|
99
99
|
}
|
|
100
100
|
this._commands.set(id, { callback, thisArg, description, extension });
|
|
@@ -114,7 +114,7 @@ let ExtHostCommands = class ExtHostCommands {
|
|
|
114
114
|
return this._doExecuteCommand(id, args, true);
|
|
115
115
|
}
|
|
116
116
|
async _doExecuteCommand(id, args, retry) {
|
|
117
|
-
if ((
|
|
117
|
+
if (( this._commands.has(id))) {
|
|
118
118
|
this.#proxy.$fireCommandActivationEvent(id);
|
|
119
119
|
return this._executeContributedCommand(id, args, false);
|
|
120
120
|
}
|
|
@@ -135,7 +135,7 @@ let ExtHostCommands = class ExtHostCommands {
|
|
|
135
135
|
}
|
|
136
136
|
else if (value instanceof ArrayBuffer) {
|
|
137
137
|
hasBuffers = true;
|
|
138
|
-
return VSBuffer.wrap((
|
|
138
|
+
return VSBuffer.wrap(( new Uint8Array(value)));
|
|
139
139
|
}
|
|
140
140
|
else if (value instanceof Uint8Array) {
|
|
141
141
|
hasBuffers = true;
|
|
@@ -150,7 +150,7 @@ let ExtHostCommands = class ExtHostCommands {
|
|
|
150
150
|
}
|
|
151
151
|
});
|
|
152
152
|
try {
|
|
153
|
-
const result = await this.#proxy.$executeCommand(id, hasBuffers ? (
|
|
153
|
+
const result = await this.#proxy.$executeCommand(id, hasBuffers ? ( new SerializableObjectWithBuffers(toArgs)) : toArgs, retry);
|
|
154
154
|
return revive(result);
|
|
155
155
|
}
|
|
156
156
|
catch (e) {
|
|
@@ -216,7 +216,7 @@ let ExtHostCommands = class ExtHostCommands {
|
|
|
216
216
|
}
|
|
217
217
|
this.#telemetry.$publicLog2('Extension:ActionExecuted', {
|
|
218
218
|
extensionId: command.extension.identifier.value,
|
|
219
|
-
id: (
|
|
219
|
+
id: ( new TelemetryTrustedValue(id)),
|
|
220
220
|
duration: duration,
|
|
221
221
|
});
|
|
222
222
|
}
|
|
@@ -224,12 +224,12 @@ let ExtHostCommands = class ExtHostCommands {
|
|
|
224
224
|
this._logService.trace('ExtHostCommands#$executeContributedCommand', id);
|
|
225
225
|
const cmdHandler = this._commands.get(id);
|
|
226
226
|
if (!cmdHandler) {
|
|
227
|
-
return Promise.reject((
|
|
227
|
+
return Promise.reject(( new Error(`Contributed command '${id}' does not exist.`)));
|
|
228
228
|
}
|
|
229
229
|
else {
|
|
230
|
-
args = (
|
|
230
|
+
args = ( args.map(
|
|
231
231
|
arg => this._argumentProcessors.reduce((r, p) => p.processArgument(r, cmdHandler.extension?.identifier), arg)
|
|
232
|
-
))
|
|
232
|
+
));
|
|
233
233
|
return this._executeContributedCommand(id, args, true);
|
|
234
234
|
}
|
|
235
235
|
}
|
|
@@ -253,19 +253,19 @@ let ExtHostCommands = class ExtHostCommands {
|
|
|
253
253
|
return Promise.resolve(result);
|
|
254
254
|
}
|
|
255
255
|
};
|
|
256
|
-
ExtHostCommands = (
|
|
257
|
-
(
|
|
258
|
-
(
|
|
259
|
-
(
|
|
260
|
-
], ExtHostCommands))
|
|
261
|
-
const IExtHostCommands = (
|
|
256
|
+
ExtHostCommands = ( __decorate([
|
|
257
|
+
( __param(0, IExtHostRpcService)),
|
|
258
|
+
( __param(1, ILogService)),
|
|
259
|
+
( __param(2, IExtHostTelemetry))
|
|
260
|
+
], ExtHostCommands));
|
|
261
|
+
const IExtHostCommands = ( createDecorator('IExtHostCommands'));
|
|
262
262
|
class CommandsConverter {
|
|
263
263
|
constructor(_commands, _lookupApiCommand, _logService) {
|
|
264
264
|
this._commands = _commands;
|
|
265
265
|
this._lookupApiCommand = _lookupApiCommand;
|
|
266
266
|
this._logService = _logService;
|
|
267
|
-
this.delegatingCommandId = `__vsc${(
|
|
268
|
-
this._cache = (
|
|
267
|
+
this.delegatingCommandId = `__vsc${( Date.now().toString(36))} `;
|
|
268
|
+
this._cache = ( new Map());
|
|
269
269
|
this._cachIdPool = 0;
|
|
270
270
|
this._commands.registerCommand(true, this.delegatingCommandId, this._executeConvertedCommand, this);
|
|
271
271
|
}
|
|
@@ -285,7 +285,7 @@ class CommandsConverter {
|
|
|
285
285
|
const apiCommand = this._lookupApiCommand(command.command);
|
|
286
286
|
if (apiCommand) {
|
|
287
287
|
result.id = apiCommand.internalId;
|
|
288
|
-
result.arguments = (
|
|
288
|
+
result.arguments = ( apiCommand.args.map((arg, i) => arg.convert(command.arguments && command.arguments[i])));
|
|
289
289
|
}
|
|
290
290
|
else if (isNonEmptyArray(command.arguments)) {
|
|
291
291
|
const id = `${command.command} /${++this._cachIdPool}`;
|
|
@@ -326,56 +326,54 @@ class CommandsConverter {
|
|
|
326
326
|
}
|
|
327
327
|
}
|
|
328
328
|
class ApiCommandArgument {
|
|
329
|
-
static { this.Uri = (
|
|
330
|
-
static { this.Position = (
|
|
329
|
+
static { this.Uri = ( new ApiCommandArgument('uri', 'Uri of a text document', v => URI.isUri(v), v => v)); }
|
|
330
|
+
static { this.Position = ( new ApiCommandArgument(
|
|
331
331
|
'position',
|
|
332
332
|
'A position in a text document',
|
|
333
333
|
v => Position.isPosition(v),
|
|
334
334
|
Position$1.from
|
|
335
|
-
))
|
|
336
|
-
static { this.Range = (
|
|
335
|
+
)); }
|
|
336
|
+
static { this.Range = ( new ApiCommandArgument(
|
|
337
337
|
'range',
|
|
338
338
|
'A range in a text document',
|
|
339
339
|
v => Range.isRange(v),
|
|
340
340
|
Range$1.from
|
|
341
|
-
))
|
|
342
|
-
static { this.Selection = (
|
|
341
|
+
)); }
|
|
342
|
+
static { this.Selection = ( new ApiCommandArgument(
|
|
343
343
|
'selection',
|
|
344
344
|
'A selection in a text document',
|
|
345
345
|
v => Selection.isSelection(v),
|
|
346
346
|
Selection$1.from
|
|
347
|
-
))
|
|
348
|
-
static { this.Number = (
|
|
349
|
-
static { this.String = (
|
|
347
|
+
)); }
|
|
348
|
+
static { this.Number = ( new ApiCommandArgument('number', '', v => typeof v === 'number', v => v)); }
|
|
349
|
+
static { this.String = ( new ApiCommandArgument('string', '', v => typeof v === 'string', v => v)); }
|
|
350
350
|
static { this.StringArray = ApiCommandArgument.Arr(ApiCommandArgument.String); }
|
|
351
351
|
static Arr(element) {
|
|
352
|
-
return (
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
|
|
358
|
-
))
|
|
359
|
-
);
|
|
352
|
+
return ( new ApiCommandArgument(
|
|
353
|
+
`${element.name}_array`,
|
|
354
|
+
`Array of ${element.name}, ${element.description}`,
|
|
355
|
+
(v) => Array.isArray(v) && v.every(e => element.validate(e)),
|
|
356
|
+
(v) => ( v.map(e => element.convert(e)))
|
|
357
|
+
));
|
|
360
358
|
}
|
|
361
|
-
static { this.CallHierarchyItem = (
|
|
359
|
+
static { this.CallHierarchyItem = ( new ApiCommandArgument(
|
|
362
360
|
'item',
|
|
363
361
|
'A call hierarchy item',
|
|
364
362
|
v => v instanceof CallHierarchyItem,
|
|
365
363
|
CallHierarchyItem$1.from
|
|
366
|
-
))
|
|
367
|
-
static { this.TypeHierarchyItem = (
|
|
364
|
+
)); }
|
|
365
|
+
static { this.TypeHierarchyItem = ( new ApiCommandArgument(
|
|
368
366
|
'item',
|
|
369
367
|
'A type hierarchy item',
|
|
370
368
|
v => v instanceof TypeHierarchyItem,
|
|
371
369
|
TypeHierarchyItem$1.from
|
|
372
|
-
))
|
|
373
|
-
static { this.TestItem = (
|
|
370
|
+
)); }
|
|
371
|
+
static { this.TestItem = ( new ApiCommandArgument(
|
|
374
372
|
'testItem',
|
|
375
373
|
'A VS Code TestItem',
|
|
376
374
|
v => v instanceof TestItemImpl,
|
|
377
375
|
TestItem.from
|
|
378
|
-
))
|
|
376
|
+
)); }
|
|
379
377
|
constructor(name, description, validate, convert) {
|
|
380
378
|
this.name = name;
|
|
381
379
|
this.description = description;
|
|
@@ -383,28 +381,24 @@ class ApiCommandArgument {
|
|
|
383
381
|
this.convert = convert;
|
|
384
382
|
}
|
|
385
383
|
optional() {
|
|
386
|
-
return (
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
))
|
|
393
|
-
);
|
|
384
|
+
return ( new ApiCommandArgument(
|
|
385
|
+
this.name,
|
|
386
|
+
`(optional) ${this.description}`,
|
|
387
|
+
value => value === undefined || value === null || this.validate(value),
|
|
388
|
+
value => value === undefined ? undefined : value === null ? null : this.convert(value)
|
|
389
|
+
));
|
|
394
390
|
}
|
|
395
391
|
with(name, description) {
|
|
396
|
-
return (
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
))
|
|
403
|
-
);
|
|
392
|
+
return ( new ApiCommandArgument(
|
|
393
|
+
name ?? this.name,
|
|
394
|
+
description ?? this.description,
|
|
395
|
+
this.validate,
|
|
396
|
+
this.convert
|
|
397
|
+
));
|
|
404
398
|
}
|
|
405
399
|
}
|
|
406
400
|
class ApiCommandResult {
|
|
407
|
-
static { this.Void = (
|
|
401
|
+
static { this.Void = ( new ApiCommandResult('no result', v => v)); }
|
|
408
402
|
constructor(description, convert) {
|
|
409
403
|
this.description = description;
|
|
410
404
|
this.convert = convert;
|
|
@@ -5,7 +5,7 @@ import { IExtHostInitDataService } from './extHostInitDataService.js';
|
|
|
5
5
|
import { IExtHostRpcService } from './extHostRpcService.js';
|
|
6
6
|
let AbstractExtHostConsoleForwarder = class AbstractExtHostConsoleForwarder {
|
|
7
7
|
constructor(extHostRpc, initData) {
|
|
8
|
-
this._mainThreadConsole = (
|
|
8
|
+
this._mainThreadConsole = ( extHostRpc.getProxy(MainContext.MainThreadConsole));
|
|
9
9
|
this._includeStack = initData.consoleForward.includeStack;
|
|
10
10
|
this._logNative = initData.consoleForward.logNative;
|
|
11
11
|
this._wrapConsoleMethod('info', 'log');
|
|
@@ -34,10 +34,10 @@ let AbstractExtHostConsoleForwarder = class AbstractExtHostConsoleForwarder {
|
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
36
|
};
|
|
37
|
-
AbstractExtHostConsoleForwarder = (
|
|
38
|
-
(
|
|
39
|
-
(
|
|
40
|
-
], AbstractExtHostConsoleForwarder))
|
|
37
|
+
AbstractExtHostConsoleForwarder = ( __decorate([
|
|
38
|
+
( __param(0, IExtHostRpcService)),
|
|
39
|
+
( __param(1, IExtHostInitDataService))
|
|
40
|
+
], AbstractExtHostConsoleForwarder));
|
|
41
41
|
const MAX_LENGTH = 100000;
|
|
42
42
|
function safeStringifyArgumentsToArray(args, includeStack) {
|
|
43
43
|
const argsArray = [];
|
|
@@ -53,14 +53,14 @@ function safeStringifyArgumentsToArray(args, includeStack) {
|
|
|
53
53
|
arg = errorObj.stack;
|
|
54
54
|
}
|
|
55
55
|
else {
|
|
56
|
-
arg = (
|
|
56
|
+
arg = ( errorObj.toString());
|
|
57
57
|
}
|
|
58
58
|
}
|
|
59
59
|
argsArray.push(arg);
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
if (includeStack) {
|
|
63
|
-
const stack = (
|
|
63
|
+
const stack = ( new Error()).stack;
|
|
64
64
|
if (stack) {
|
|
65
65
|
argsArray.push({ __$stack: stack.split('\n').slice(3).join('\n') });
|
|
66
66
|
}
|
|
@@ -73,7 +73,7 @@ function safeStringifyArgumentsToArray(args, includeStack) {
|
|
|
73
73
|
return res;
|
|
74
74
|
}
|
|
75
75
|
catch (error) {
|
|
76
|
-
return `Output omitted for an object that cannot be inspected ('${(
|
|
76
|
+
return `Output omitted for an object that cannot be inspected ('${( error.toString())}')`;
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
79
|
export { AbstractExtHostConsoleForwarder };
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
-
import {
|
|
2
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
3
3
|
import { MarkerSeverity } from 'monaco-editor/esm/vs/platform/markers/common/markers.js';
|
|
4
4
|
import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
|
|
5
5
|
import { MainContext } from './extHost.protocol.js';
|
|
@@ -104,11 +104,7 @@ class DiagnosticCollection {
|
|
|
104
104
|
}
|
|
105
105
|
marker.push({
|
|
106
106
|
severity: MarkerSeverity.Info,
|
|
107
|
-
message: (
|
|
108
|
-
{ key: 'limitHit', comment: ['amount of errors/warning skipped due to limits'] },
|
|
109
|
-
"Not showing {0} further errors and warnings.",
|
|
110
|
-
diagnostics.length - this._maxDiagnosticsPerFile
|
|
111
|
-
)),
|
|
107
|
+
message: localizeWithPath('vs/workbench/api/common/extHostDiagnostics', { key: 'limitHit', comment: ['amount of errors/warning skipped due to limits'] }, "Not showing {0} further errors and warnings.", diagnostics.length - this._maxDiagnosticsPerFile),
|
|
112
108
|
startLineNumber: marker[marker.length - 1].startLineNumber,
|
|
113
109
|
startColumn: marker[marker.length - 1].startColumn,
|
|
114
110
|
endLineNumber: marker[marker.length - 1].endLineNumber,
|
|
@@ -523,11 +523,11 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
|
|
|
523
523
|
async _doHandleExtensionTests() {
|
|
524
524
|
const { extensionDevelopmentLocationURI, extensionTestsLocationURI } = this._initData.environment;
|
|
525
525
|
if (!extensionDevelopmentLocationURI || !extensionTestsLocationURI) {
|
|
526
|
-
throw new Error(nls.
|
|
526
|
+
throw new Error(nls.localizeWithPath('vs/workbench/api/common/extHostExtensionService', 'extensionTestError1', "Cannot load test runner."));
|
|
527
527
|
}
|
|
528
528
|
const testRunner = await this._loadCommonJSModule(null, extensionTestsLocationURI, ( new ExtensionActivationTimesBuilder(false)));
|
|
529
529
|
if (!testRunner || typeof testRunner.run !== 'function') {
|
|
530
|
-
throw new Error(nls.
|
|
530
|
+
throw new Error(nls.localizeWithPath('vs/workbench/api/common/extHostExtensionService', 'extensionTestError', "Path {0} does not point to a valid extension test runner.", extensionTestsLocationURI.toString()));
|
|
531
531
|
}
|
|
532
532
|
return ( new Promise((resolve, reject) => {
|
|
533
533
|
const oldTestRunnerCallback = (error, failures) => {
|