@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
|
@@ -1,12 +1,12 @@
|
|
|
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 { ILoggerService } from 'monaco-editor/esm/vs/platform/log/common/log.js';
|
|
4
4
|
import { LogService } from 'monaco-editor/esm/vs/platform/log/common/logService.js';
|
|
5
5
|
import { IExtHostInitDataService } from './extHostInitDataService.js';
|
|
6
6
|
let ExtHostLogService = class ExtHostLogService extends LogService {
|
|
7
7
|
constructor(isWorker, loggerService, initData) {
|
|
8
8
|
const id = initData.remote.isRemote ? 'remoteexthost' : isWorker ? 'workerexthost' : 'exthost';
|
|
9
|
-
const name = initData.remote.isRemote ? (
|
|
9
|
+
const name = initData.remote.isRemote ? localizeWithPath('vs/workbench/api/common/extHostLogService', 'remote', "Extension Host (Remote)") : isWorker ? localizeWithPath('vs/workbench/api/common/extHostLogService', 'worker', "Extension Host (Worker)") : localizeWithPath('vs/workbench/api/common/extHostLogService', 'local', "Extension Host");
|
|
10
10
|
super(loggerService.createLogger(id, { name }));
|
|
11
11
|
}
|
|
12
12
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
2
2
|
import { VSBuffer } from 'monaco-editor/esm/vs/base/common/buffer.js';
|
|
3
3
|
import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
|
|
4
4
|
import { toDisposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
@@ -247,7 +247,7 @@ class ExtHostNotebookController {
|
|
|
247
247
|
throw new Error('Document version mismatch');
|
|
248
248
|
}
|
|
249
249
|
if (!this._extHostFileSystem.value.isWritableFileSystem(uri.scheme)) {
|
|
250
|
-
throw new files.FileOperationError(
|
|
250
|
+
throw new files.FileOperationError(localizeWithPath('vs/workbench/api/common/extHostNotebook', 'err.readonly', "Unable to modify read-only file '{0}'", this._resourceForError(uri)), 6 );
|
|
251
251
|
}
|
|
252
252
|
await this._validateWriteFile(uri, options);
|
|
253
253
|
const data = {
|
|
@@ -283,7 +283,7 @@ class ExtHostNotebookController {
|
|
|
283
283
|
if (typeof options?.mtime === 'number' && typeof options.etag === 'string' && options.etag !== files.ETAG_DISABLED &&
|
|
284
284
|
typeof stat.mtime === 'number' && typeof stat.size === 'number' &&
|
|
285
285
|
options.mtime < stat.mtime && options.etag !== files.etag({ mtime: options.mtime , size: stat.size })) {
|
|
286
|
-
throw new files.FileOperationError(
|
|
286
|
+
throw new files.FileOperationError(localizeWithPath('vs/workbench/api/common/extHostNotebook', 'fileModifiedError', "File Modified Since"), 3 , options);
|
|
287
287
|
}
|
|
288
288
|
return;
|
|
289
289
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { __decorate } from '../../../../../../external/tslib/tslib.es6.js';
|
|
2
2
|
import { ProgressLocation } from './extHostTypeConverters.js';
|
|
3
3
|
import { Progress } from 'monaco-editor/esm/vs/platform/progress/common/progress.js';
|
|
4
|
-
import {
|
|
4
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
5
5
|
import { CancellationToken, CancellationTokenSource } from 'monaco-editor/esm/vs/base/common/cancellation.js';
|
|
6
6
|
import { throttle } from 'monaco-editor/esm/vs/base/common/decorators.js';
|
|
7
7
|
import { onUnexpectedExternalError } from 'monaco-editor/esm/vs/base/common/errors.js';
|
|
@@ -14,11 +14,7 @@ class ExtHostProgress {
|
|
|
14
14
|
async withProgress(extension, options, task) {
|
|
15
15
|
const handle = this._handles++;
|
|
16
16
|
const { title, location, cancellable } = options;
|
|
17
|
-
const source = { label: (
|
|
18
|
-
'extensionSource',
|
|
19
|
-
"{0} (Extension)",
|
|
20
|
-
extension.displayName || extension.name
|
|
21
|
-
)), id: extension.identifier.value };
|
|
17
|
+
const source = { label: localizeWithPath('vs/workbench/api/common/extHostProgress', 'extensionSource', "{0} (Extension)", extension.displayName || extension.name), id: extension.identifier.value };
|
|
22
18
|
this._proxy.$startProgress(handle, { location: ProgressLocation.from(location), title, source, cancellable }, !extension.isUnderDevelopment ? extension.identifier.value : undefined).catch(onUnexpectedExternalError);
|
|
23
19
|
return this._withProgress(handle, task, !!cancellable);
|
|
24
20
|
}
|
|
@@ -256,7 +256,7 @@ class ExtHostSCMInputBox {
|
|
|
256
256
|
this._sourceControlHandle = _sourceControlHandle;
|
|
257
257
|
this._documentUri = _documentUri;
|
|
258
258
|
this._value = '';
|
|
259
|
-
this._onDidChange = (
|
|
259
|
+
this._onDidChange = ( new Emitter());
|
|
260
260
|
this._placeholder = '';
|
|
261
261
|
this._enabled = true;
|
|
262
262
|
this._visible = true;
|
|
@@ -307,13 +307,13 @@ class ExtHostSourceControlResourceGroup {
|
|
|
307
307
|
this._label = _label;
|
|
308
308
|
this._resourceHandlePool = 0;
|
|
309
309
|
this._resourceStates = [];
|
|
310
|
-
this._resourceStatesMap = (
|
|
311
|
-
this._resourceStatesCommandsMap = (
|
|
312
|
-
this._resourceStatesDisposablesMap = (
|
|
313
|
-
this._onDidUpdateResourceStates = (
|
|
310
|
+
this._resourceStatesMap = ( new Map());
|
|
311
|
+
this._resourceStatesCommandsMap = ( new Map());
|
|
312
|
+
this._resourceStatesDisposablesMap = ( new Map());
|
|
313
|
+
this._onDidUpdateResourceStates = ( new Emitter());
|
|
314
314
|
this.onDidUpdateResourceStates = this._onDidUpdateResourceStates.event;
|
|
315
315
|
this._disposed = false;
|
|
316
|
-
this._onDidDispose = (
|
|
316
|
+
this._onDidDispose = ( new Emitter());
|
|
317
317
|
this.onDidDispose = this._onDidDispose.event;
|
|
318
318
|
this._handlesSnapshot = [];
|
|
319
319
|
this._resourceSnapshot = [];
|
|
@@ -333,15 +333,15 @@ class ExtHostSourceControlResourceGroup {
|
|
|
333
333
|
_takeResourceStateSnapshot() {
|
|
334
334
|
const snapshot = [...this._resourceStates].sort(compareResourceStates);
|
|
335
335
|
const diffs = sortedDiff(this._resourceSnapshot, snapshot, compareResourceStates);
|
|
336
|
-
const splices = (
|
|
337
|
-
const toInsert = (
|
|
336
|
+
const splices = ( diffs.map(diff => {
|
|
337
|
+
const toInsert = ( diff.toInsert.map(r => {
|
|
338
338
|
const handle = this._resourceHandlePool++;
|
|
339
339
|
this._resourceStatesMap.set(handle, r);
|
|
340
340
|
const sourceUri = r.resourceUri;
|
|
341
341
|
let command;
|
|
342
342
|
if (r.command) {
|
|
343
343
|
if (r.command.command === 'vscode.open' || r.command.command === 'vscode.diff') {
|
|
344
|
-
const disposables = (
|
|
344
|
+
const disposables = ( new DisposableStore());
|
|
345
345
|
command = this._commands.converter.toInternal(r.command, disposables);
|
|
346
346
|
this._resourceStatesDisposablesMap.set(handle, disposables);
|
|
347
347
|
}
|
|
@@ -359,16 +359,14 @@ class ExtHostSourceControlResourceGroup {
|
|
|
359
359
|
const contextValue = r.contextValue || '';
|
|
360
360
|
const rawResource = [handle, sourceUri, icons, tooltip, strikeThrough, faded, contextValue, command];
|
|
361
361
|
return { rawResource, handle };
|
|
362
|
-
}))
|
|
362
|
+
}));
|
|
363
363
|
return { start: diff.start, deleteCount: diff.deleteCount, toInsert };
|
|
364
|
-
}))
|
|
365
|
-
const rawResourceSplices = (
|
|
366
|
-
.map(
|
|
367
|
-
({ start, deleteCount, toInsert }) => [start, deleteCount, ( (toInsert.map(i => i.rawResource)))]
|
|
368
|
-
)));
|
|
364
|
+
}));
|
|
365
|
+
const rawResourceSplices = ( splices
|
|
366
|
+
.map(({ start, deleteCount, toInsert }) => [start, deleteCount, ( toInsert.map(i => i.rawResource))]));
|
|
369
367
|
const reverseSplices = splices.reverse();
|
|
370
368
|
for (const { start, deleteCount, toInsert } of reverseSplices) {
|
|
371
|
-
const handles = (
|
|
369
|
+
const handles = ( toInsert.map(i => i.handle));
|
|
372
370
|
const handlesToDelete = this._handlesSnapshot.splice(start, deleteCount, ...handles);
|
|
373
371
|
for (const handle of handlesToDelete) {
|
|
374
372
|
this._resourceStatesMap.delete(handle);
|
|
@@ -426,7 +424,7 @@ class ExtHostSourceControl {
|
|
|
426
424
|
set historyProvider(historyProvider) {
|
|
427
425
|
checkProposedApiEnabled(this._extension, 'scmHistoryProvider');
|
|
428
426
|
this._historyProvider = historyProvider;
|
|
429
|
-
this._historyProviderDisposable.value = (
|
|
427
|
+
this._historyProviderDisposable.value = ( new DisposableStore());
|
|
430
428
|
this.#proxy.$updateSourceControl(this.handle, { hasHistoryProvider: !!historyProvider });
|
|
431
429
|
if (historyProvider) {
|
|
432
430
|
this._historyProviderDisposable.value.add(historyProvider.onDidChangeCurrentHistoryItemGroup(() => {
|
|
@@ -438,7 +436,7 @@ class ExtHostSourceControl {
|
|
|
438
436
|
}));
|
|
439
437
|
this._historyProviderDisposable.value.add(historyProvider.onDidChangeActionButton(() => {
|
|
440
438
|
checkProposedApiEnabled(this._extension, 'scmActionButton');
|
|
441
|
-
this._historyProviderActionButtonDisposable.value = (
|
|
439
|
+
this._historyProviderActionButtonDisposable.value = ( new DisposableStore());
|
|
442
440
|
const internal = historyProvider.actionButton !== undefined ?
|
|
443
441
|
{
|
|
444
442
|
command: this._commands.converter.toInternal(historyProvider.actionButton.command, this._historyProviderActionButtonDisposable.value),
|
|
@@ -463,7 +461,7 @@ class ExtHostSourceControl {
|
|
|
463
461
|
return this._acceptInputCommand;
|
|
464
462
|
}
|
|
465
463
|
set acceptInputCommand(acceptInputCommand) {
|
|
466
|
-
this._acceptInputDisposables.value = (
|
|
464
|
+
this._acceptInputDisposables.value = ( new DisposableStore());
|
|
467
465
|
this._acceptInputCommand = acceptInputCommand;
|
|
468
466
|
const internal = this._commands.converter.toInternal(acceptInputCommand, this._acceptInputDisposables.value);
|
|
469
467
|
this.#proxy.$updateSourceControl(this.handle, { acceptInputCommand: internal });
|
|
@@ -474,17 +472,15 @@ class ExtHostSourceControl {
|
|
|
474
472
|
}
|
|
475
473
|
set actionButton(actionButton) {
|
|
476
474
|
checkProposedApiEnabled(this._extension, 'scmActionButton');
|
|
477
|
-
this._actionButtonDisposables.value = (
|
|
475
|
+
this._actionButtonDisposables.value = ( new DisposableStore());
|
|
478
476
|
this._actionButton = actionButton;
|
|
479
477
|
const internal = actionButton !== undefined ?
|
|
480
478
|
{
|
|
481
479
|
command: this._commands.converter.toInternal(actionButton.command, this._actionButtonDisposables.value),
|
|
482
480
|
secondaryCommands: actionButton.secondaryCommands?.map(commandGroup => {
|
|
483
|
-
return (
|
|
484
|
-
|
|
485
|
-
|
|
486
|
-
))
|
|
487
|
-
);
|
|
481
|
+
return ( commandGroup.map(
|
|
482
|
+
command => this._commands.converter.toInternal(command, this._actionButtonDisposables.value)
|
|
483
|
+
));
|
|
488
484
|
}),
|
|
489
485
|
description: actionButton.description,
|
|
490
486
|
enabled: actionButton.enabled
|
|
@@ -498,11 +494,11 @@ class ExtHostSourceControl {
|
|
|
498
494
|
if (this._statusBarCommands && statusBarCommands && commandListEquals(this._statusBarCommands, statusBarCommands)) {
|
|
499
495
|
return;
|
|
500
496
|
}
|
|
501
|
-
this._statusBarDisposables.value = (
|
|
497
|
+
this._statusBarDisposables.value = ( new DisposableStore());
|
|
502
498
|
this._statusBarCommands = statusBarCommands;
|
|
503
|
-
const internal = ( (
|
|
499
|
+
const internal = ( (statusBarCommands || []).map(
|
|
504
500
|
c => this._commands.converter.toInternal(c, this._statusBarDisposables.value)
|
|
505
|
-
))
|
|
501
|
+
));
|
|
506
502
|
this.#proxy.$updateSourceControl(this.handle, { statusBarCommands: internal });
|
|
507
503
|
}
|
|
508
504
|
get selected() {
|
|
@@ -514,40 +510,40 @@ class ExtHostSourceControl {
|
|
|
514
510
|
this._id = _id;
|
|
515
511
|
this._label = _label;
|
|
516
512
|
this._rootUri = _rootUri;
|
|
517
|
-
this._groups = (
|
|
513
|
+
this._groups = ( new Map());
|
|
518
514
|
this._count = undefined;
|
|
519
515
|
this._quickDiffProvider = undefined;
|
|
520
|
-
this._historyProviderDisposable = (
|
|
521
|
-
this._historyProviderActionButtonDisposable = (
|
|
516
|
+
this._historyProviderDisposable = ( new MutableDisposable());
|
|
517
|
+
this._historyProviderActionButtonDisposable = ( new MutableDisposable());
|
|
522
518
|
this._commitTemplate = undefined;
|
|
523
|
-
this._acceptInputDisposables = (
|
|
519
|
+
this._acceptInputDisposables = ( new MutableDisposable());
|
|
524
520
|
this._acceptInputCommand = undefined;
|
|
525
|
-
this._actionButtonDisposables = (
|
|
526
|
-
this._statusBarDisposables = (
|
|
521
|
+
this._actionButtonDisposables = ( new MutableDisposable());
|
|
522
|
+
this._statusBarDisposables = ( new MutableDisposable());
|
|
527
523
|
this._statusBarCommands = undefined;
|
|
528
524
|
this._selected = false;
|
|
529
|
-
this._onDidChangeSelection = (
|
|
525
|
+
this._onDidChangeSelection = ( new Emitter());
|
|
530
526
|
this.onDidChangeSelection = this._onDidChangeSelection.event;
|
|
531
527
|
this.handle = ExtHostSourceControl._handlePool++;
|
|
532
|
-
this.createdResourceGroups = (
|
|
533
|
-
this.updatedResourceGroups = (
|
|
528
|
+
this.createdResourceGroups = ( new Map());
|
|
529
|
+
this.updatedResourceGroups = ( new Set());
|
|
534
530
|
this.#proxy = proxy;
|
|
535
|
-
const inputBoxDocumentUri = (
|
|
531
|
+
const inputBoxDocumentUri = ( URI.from({
|
|
536
532
|
scheme: Schemas.vscodeSourceControl,
|
|
537
533
|
path: `${_id}/scm${this.handle}/input`,
|
|
538
|
-
query: _rootUri ? `rootUri=${encodeURIComponent((
|
|
539
|
-
}))
|
|
540
|
-
this._inputBox = (
|
|
534
|
+
query: _rootUri ? `rootUri=${encodeURIComponent(( _rootUri.toString()))}` : undefined
|
|
535
|
+
}));
|
|
536
|
+
this._inputBox = ( new ExtHostSCMInputBox(
|
|
541
537
|
_extension,
|
|
542
538
|
_extHostDocuments,
|
|
543
539
|
this.#proxy,
|
|
544
540
|
this.handle,
|
|
545
541
|
inputBoxDocumentUri
|
|
546
|
-
))
|
|
542
|
+
));
|
|
547
543
|
this.#proxy.$registerSourceControl(this.handle, _id, _label, _rootUri, inputBoxDocumentUri);
|
|
548
544
|
}
|
|
549
545
|
createResourceGroup(id, label) {
|
|
550
|
-
const group = (
|
|
546
|
+
const group = ( new ExtHostSourceControlResourceGroup(this.#proxy, this._commands, this.handle, id, label));
|
|
551
547
|
const disposable = Event.once(group.onDidDispose)(() => this.createdResourceGroups.delete(group));
|
|
552
548
|
this.createdResourceGroups.set(group, disposable);
|
|
553
549
|
this.eventuallyAddResourceGroups();
|
|
@@ -607,12 +603,12 @@ class ExtHostSourceControl {
|
|
|
607
603
|
this.#proxy.$unregisterSourceControl(this.handle);
|
|
608
604
|
}
|
|
609
605
|
}
|
|
610
|
-
ExtHostSourceControl.__decorator = (
|
|
606
|
+
ExtHostSourceControl.__decorator = ( __decorate([
|
|
611
607
|
debounce(100)
|
|
612
|
-
], ExtHostSourceControl.prototype, "eventuallyAddResourceGroups", null))
|
|
613
|
-
ExtHostSourceControl.__decorator = (
|
|
608
|
+
], ExtHostSourceControl.prototype, "eventuallyAddResourceGroups", null));
|
|
609
|
+
ExtHostSourceControl.__decorator = ( __decorate([
|
|
614
610
|
debounce(100)
|
|
615
|
-
], ExtHostSourceControl.prototype, "eventuallyUpdateResourceStates", null))
|
|
611
|
+
], ExtHostSourceControl.prototype, "eventuallyUpdateResourceStates", null));
|
|
616
612
|
let ExtHostSCM = class ExtHostSCM {
|
|
617
613
|
static { ExtHostSCM_1 = this; }
|
|
618
614
|
static { this._handlePool = 0; }
|
|
@@ -621,11 +617,11 @@ let ExtHostSCM = class ExtHostSCM {
|
|
|
621
617
|
this._commands = _commands;
|
|
622
618
|
this._extHostDocuments = _extHostDocuments;
|
|
623
619
|
this.logService = logService;
|
|
624
|
-
this._sourceControls = (
|
|
625
|
-
this._sourceControlsByExtension = (
|
|
626
|
-
this._onDidChangeActiveProvider = (
|
|
627
|
-
this._proxy = (
|
|
628
|
-
this._telemetry = (
|
|
620
|
+
this._sourceControls = ( new Map());
|
|
621
|
+
this._sourceControlsByExtension = ( new ExtensionIdentifierMap());
|
|
622
|
+
this._onDidChangeActiveProvider = ( new Emitter());
|
|
623
|
+
this._proxy = ( mainContext.getProxy(MainContext.MainThreadSCM));
|
|
624
|
+
this._telemetry = ( mainContext.getProxy(MainContext.MainThreadTelemetry));
|
|
629
625
|
_commands.registerArgumentProcessor({
|
|
630
626
|
processArgument: arg => {
|
|
631
627
|
if (arg && arg.$mid === 3 ) {
|
|
@@ -663,7 +659,7 @@ let ExtHostSCM = class ExtHostSCM {
|
|
|
663
659
|
extensionId: extension.identifier.value,
|
|
664
660
|
});
|
|
665
661
|
const handle = ExtHostSCM_1._handlePool++;
|
|
666
|
-
const sourceControl = (
|
|
662
|
+
const sourceControl = ( new ExtHostSourceControl(
|
|
667
663
|
extension,
|
|
668
664
|
this._extHostDocuments,
|
|
669
665
|
this._proxy,
|
|
@@ -671,7 +667,7 @@ let ExtHostSCM = class ExtHostSCM {
|
|
|
671
667
|
id,
|
|
672
668
|
label,
|
|
673
669
|
rootUri
|
|
674
|
-
))
|
|
670
|
+
));
|
|
675
671
|
this._sourceControls.set(handle, sourceControl);
|
|
676
672
|
const sourceControls = this._sourceControlsByExtension.get(extension.identifier) || [];
|
|
677
673
|
sourceControls.push(sourceControl);
|
|
@@ -686,7 +682,7 @@ let ExtHostSCM = class ExtHostSCM {
|
|
|
686
682
|
}
|
|
687
683
|
$provideOriginalResource(sourceControlHandle, uriComponents, token) {
|
|
688
684
|
const uri = URI.revive(uriComponents);
|
|
689
|
-
this.logService.trace('ExtHostSCM#$provideOriginalResource', sourceControlHandle, (
|
|
685
|
+
this.logService.trace('ExtHostSCM#$provideOriginalResource', sourceControlHandle, ( uri.toString()));
|
|
690
686
|
const sourceControl = this._sourceControls.get(sourceControlHandle);
|
|
691
687
|
if (!sourceControl || !sourceControl.quickDiffProvider || !sourceControl.quickDiffProvider.provideOriginalResource) {
|
|
692
688
|
return Promise.resolve(null);
|
|
@@ -771,7 +767,7 @@ let ExtHostSCM = class ExtHostSCM {
|
|
|
771
767
|
return (await historyProvider?.provideHistoryItemChanges(historyItemId, token)) ?? undefined;
|
|
772
768
|
}
|
|
773
769
|
};
|
|
774
|
-
ExtHostSCM = ExtHostSCM_1 = (
|
|
775
|
-
(
|
|
776
|
-
], ExtHostSCM))
|
|
770
|
+
ExtHostSCM = ExtHostSCM_1 = ( __decorate([
|
|
771
|
+
( __param(3, ILogService))
|
|
772
|
+
], ExtHostSCM));
|
|
777
773
|
export { ExtHostSCM, ExtHostSCMInputBox };
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ThemeColor, asStatusBarItemIdentifier, StatusBarAlignment, Disposable } from './extHostTypes.js';
|
|
2
2
|
import { MainContext } from './extHost.protocol.js';
|
|
3
|
-
import {
|
|
3
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
4
4
|
import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
5
5
|
import { MarkdownString } from './extHostTypeConverters.js';
|
|
6
6
|
import { isNumber } from 'monaco-editor/esm/vs/base/common/types.js';
|
|
@@ -167,11 +167,7 @@ class ExtHostStatusBarEntry {
|
|
|
167
167
|
name = this._name;
|
|
168
168
|
}
|
|
169
169
|
else {
|
|
170
|
-
name = (
|
|
171
|
-
'extensionLabel',
|
|
172
|
-
"{0} (Extension)",
|
|
173
|
-
this._extension.displayName || this._extension.name
|
|
174
|
-
));
|
|
170
|
+
name = localizeWithPath('vs/workbench/api/common/extHostStatusBar', 'extensionLabel', "{0} (Extension)", this._extension.displayName || this._extension.name);
|
|
175
171
|
}
|
|
176
172
|
let color = this._color;
|
|
177
173
|
if (this._backgroundColor) {
|
|
@@ -191,7 +187,7 @@ class StatusBarMessage {
|
|
|
191
187
|
constructor(statusBar) {
|
|
192
188
|
this._messages = [];
|
|
193
189
|
this._item = statusBar.createStatusBarEntry(undefined, 'status.extensionMessage', StatusBarAlignment.Left, Number.MIN_VALUE);
|
|
194
|
-
this._item.name = (
|
|
190
|
+
this._item.name = localizeWithPath('vs/workbench/api/common/extHostStatusBar', 'status.extensionMessage', "Extension Status");
|
|
195
191
|
}
|
|
196
192
|
dispose() {
|
|
197
193
|
this._messages.length = 0;
|
|
@@ -9,7 +9,7 @@ import { extensionTelemetryLogChannelId, cleanRemoteAuthority, cleanData } from
|
|
|
9
9
|
import { mixin } from 'monaco-editor/esm/vs/base/common/objects.js';
|
|
10
10
|
import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
|
|
11
11
|
import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
12
|
-
import {
|
|
12
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
13
13
|
let ExtHostTelemetry = class ExtHostTelemetry extends Disposable {
|
|
14
14
|
constructor(initData, loggerService) {
|
|
15
15
|
super();
|
|
@@ -26,11 +26,7 @@ let ExtHostTelemetry = class ExtHostTelemetry extends Disposable {
|
|
|
26
26
|
this._telemetryLoggers = ( new Map());
|
|
27
27
|
this.extHostTelemetryLogFile = URI.revive(this.initData.environment.extensionTelemetryLogResource);
|
|
28
28
|
this._inLoggingOnlyMode = this.initData.environment.isExtensionTelemetryLoggingOnly;
|
|
29
|
-
this._outputLogger = loggerService.createLogger(this.extHostTelemetryLogFile, { id: extensionTelemetryLogChannelId, name: (
|
|
30
|
-
'extensionTelemetryLog',
|
|
31
|
-
"Extension Telemetry{0}",
|
|
32
|
-
this._inLoggingOnlyMode ? ' (Not Sent)' : ''
|
|
33
|
-
)), hidden: true });
|
|
29
|
+
this._outputLogger = loggerService.createLogger(this.extHostTelemetryLogFile, { id: extensionTelemetryLogChannelId, name: localizeWithPath('vs/workbench/api/common/extHostTelemetry', 'extensionTelemetryLog', "Extension Telemetry{0}", this._inLoggingOnlyMode ? ' (Not Sent)' : ''), hidden: true });
|
|
34
30
|
this._register(loggerService.onDidChangeLogLevel(arg => {
|
|
35
31
|
if (isLogLevel(arg)) {
|
|
36
32
|
this.updateLoggerVisibility();
|
|
@@ -6,7 +6,7 @@ import { URI } from 'monaco-editor/esm/vs/base/common/uri.js';
|
|
|
6
6
|
import { IExtHostRpcService } from './extHostRpcService.js';
|
|
7
7
|
import { Disposable, MutableDisposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
8
8
|
import { Disposable as Disposable$1, EnvironmentVariableMutatorType } from './extHostTypes.js';
|
|
9
|
-
import {
|
|
9
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
10
10
|
import { NotSupportedError } from 'monaco-editor/esm/vs/base/common/errors.js';
|
|
11
11
|
import { serializeEnvironmentVariableCollection, serializeEnvironmentDescriptionMap } from '../../../platform/terminal/common/environmentVariableShared.js';
|
|
12
12
|
import { CancellationTokenSource } from 'monaco-editor/esm/vs/base/common/cancellation.js';
|
|
@@ -449,11 +449,7 @@ let BaseExtHostTerminalService = class BaseExtHostTerminalService extends Dispos
|
|
|
449
449
|
async $startExtensionTerminal(id, initialDimensions) {
|
|
450
450
|
const terminal = this._getTerminalById(id);
|
|
451
451
|
if (!terminal) {
|
|
452
|
-
return { message: (
|
|
453
|
-
'launchFail.idMissingOnExtHost',
|
|
454
|
-
"Could not find the terminal with id {0} on the extension host",
|
|
455
|
-
id
|
|
456
|
-
)) };
|
|
452
|
+
return { message: localizeWithPath('vs/workbench/api/common/extHostTerminalService', 'launchFail.idMissingOnExtHost', "Could not find the terminal with id {0} on the extension host", id) };
|
|
457
453
|
}
|
|
458
454
|
if (!terminal.isOpen) {
|
|
459
455
|
await ( new Promise(r => {
|