@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 { CancellationToken } from 'monaco-editor/esm/vs/base/common/cancellation
|
|
|
4
4
|
import { FileAccess } from 'monaco-editor/esm/vs/base/common/network.js';
|
|
5
5
|
import Severity from 'monaco-editor/esm/vs/base/common/severity.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 { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
|
|
9
9
|
import { areSameExtensions } from '../../../platform/extensionManagement/common/extensionManagementUtil.js';
|
|
10
10
|
import { INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
|
|
@@ -89,14 +89,15 @@ let MainThreadExtensionService = class MainThreadExtensionService {
|
|
|
89
89
|
if (this._extensionEnablementService.isEnabled(missingInstalledDependency)) {
|
|
90
90
|
this._notificationService.notify({
|
|
91
91
|
severity: Severity.Error,
|
|
92
|
-
message: (
|
|
93
|
-
'reload window',
|
|
94
|
-
"Cannot activate the '{0}' extension because it depends on the '{1}' extension, which is not loaded. Would you like to reload the window to load the extension?",
|
|
95
|
-
extName,
|
|
96
|
-
missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
|
|
97
|
-
)),
|
|
92
|
+
message: localizeWithPath('vs/workbench/api/browser/mainThreadExtensionService', 'reload window', "Cannot activate the '{0}' extension because it depends on the '{1}' extension, which is not loaded. Would you like to reload the window to load the extension?", extName, missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name),
|
|
98
93
|
actions: {
|
|
99
|
-
primary: [( new Action(
|
|
94
|
+
primary: [( new Action(
|
|
95
|
+
'reload',
|
|
96
|
+
localizeWithPath('vs/workbench/api/browser/mainThreadExtensionService', 'reload', "Reload Window"),
|
|
97
|
+
'',
|
|
98
|
+
true,
|
|
99
|
+
() => this._hostService.reload()
|
|
100
|
+
))]
|
|
100
101
|
}
|
|
101
102
|
});
|
|
102
103
|
}
|
|
@@ -105,52 +106,44 @@ let MainThreadExtensionService = class MainThreadExtensionService {
|
|
|
105
106
|
if (enablementState === 4 ) {
|
|
106
107
|
this._notificationService.notify({
|
|
107
108
|
severity: Severity.Error,
|
|
108
|
-
message: (
|
|
109
|
-
'notSupportedInWorkspace',
|
|
110
|
-
"Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in the current workspace",
|
|
111
|
-
extName,
|
|
112
|
-
missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
|
|
113
|
-
)),
|
|
109
|
+
message: localizeWithPath('vs/workbench/api/browser/mainThreadExtensionService', 'notSupportedInWorkspace', "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in the current workspace", extName, missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name),
|
|
114
110
|
});
|
|
115
111
|
}
|
|
116
112
|
else if (enablementState === 0 ) {
|
|
117
113
|
this._notificationService.notify({
|
|
118
114
|
severity: Severity.Error,
|
|
119
|
-
message: (
|
|
120
|
-
'restrictedMode',
|
|
121
|
-
"Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in Restricted Mode",
|
|
122
|
-
extName,
|
|
123
|
-
missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
|
|
124
|
-
)),
|
|
115
|
+
message: localizeWithPath('vs/workbench/api/browser/mainThreadExtensionService', 'restrictedMode', "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in Restricted Mode", extName, missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name),
|
|
125
116
|
actions: {
|
|
126
|
-
primary: [( new Action(
|
|
117
|
+
primary: [( new Action(
|
|
118
|
+
'manageWorkspaceTrust',
|
|
119
|
+
localizeWithPath('vs/workbench/api/browser/mainThreadExtensionService', 'manageWorkspaceTrust', "Manage Workspace Trust"),
|
|
120
|
+
'',
|
|
121
|
+
true,
|
|
122
|
+
() => this._commandService.executeCommand('workbench.trust.manage')
|
|
123
|
+
))]
|
|
127
124
|
}
|
|
128
125
|
});
|
|
129
126
|
}
|
|
130
127
|
else if (this._extensionEnablementService.canChangeEnablement(missingInstalledDependency)) {
|
|
131
128
|
this._notificationService.notify({
|
|
132
129
|
severity: Severity.Error,
|
|
133
|
-
message: (
|
|
134
|
-
'disabledDep',
|
|
135
|
-
"Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled. Would you like to enable the extension and reload the window?",
|
|
136
|
-
extName,
|
|
137
|
-
missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
|
|
138
|
-
)),
|
|
130
|
+
message: localizeWithPath('vs/workbench/api/browser/mainThreadExtensionService', 'disabledDep', "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled. Would you like to enable the extension and reload the window?", extName, missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name),
|
|
139
131
|
actions: {
|
|
140
|
-
primary: [( new Action(
|
|
141
|
-
|
|
132
|
+
primary: [( new Action(
|
|
133
|
+
'enable',
|
|
134
|
+
localizeWithPath('vs/workbench/api/browser/mainThreadExtensionService', 'enable dep', "Enable and Reload"),
|
|
135
|
+
'',
|
|
136
|
+
true,
|
|
137
|
+
() => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === 6 ? 8 : 9 )
|
|
138
|
+
.then(() => this._hostService.reload(), e => this._notificationService.error(e))
|
|
139
|
+
))]
|
|
142
140
|
}
|
|
143
141
|
});
|
|
144
142
|
}
|
|
145
143
|
else {
|
|
146
144
|
this._notificationService.notify({
|
|
147
145
|
severity: Severity.Error,
|
|
148
|
-
message: (
|
|
149
|
-
'disabledDepNoAction',
|
|
150
|
-
"Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled.",
|
|
151
|
-
extName,
|
|
152
|
-
missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
|
|
153
|
-
)),
|
|
146
|
+
message: localizeWithPath('vs/workbench/api/browser/mainThreadExtensionService', 'disabledDepNoAction', "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled.", extName, missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name),
|
|
154
147
|
});
|
|
155
148
|
}
|
|
156
149
|
}
|
|
@@ -166,26 +159,21 @@ let MainThreadExtensionService = class MainThreadExtensionService {
|
|
|
166
159
|
if (dependencyExtension) {
|
|
167
160
|
this._notificationService.notify({
|
|
168
161
|
severity: Severity.Error,
|
|
169
|
-
message: (
|
|
170
|
-
'uninstalledDep',
|
|
171
|
-
"Cannot activate the '{0}' extension because it depends on the '{1}' extension from '{2}', which is not installed. Would you like to install the extension and reload the window?",
|
|
172
|
-
extName,
|
|
173
|
-
dependencyExtension.displayName,
|
|
174
|
-
dependencyExtension.publisherDisplayName
|
|
175
|
-
)),
|
|
162
|
+
message: localizeWithPath('vs/workbench/api/browser/mainThreadExtensionService', 'uninstalledDep', "Cannot activate the '{0}' extension because it depends on the '{1}' extension from '{2}', which is not installed. Would you like to install the extension and reload the window?", extName, dependencyExtension.displayName, dependencyExtension.publisherDisplayName),
|
|
176
163
|
actions: {
|
|
177
|
-
primary: [( new Action(
|
|
178
|
-
|
|
164
|
+
primary: [( new Action(
|
|
165
|
+
'install',
|
|
166
|
+
localizeWithPath('vs/workbench/api/browser/mainThreadExtensionService', 'install missing dep', "Install and Reload"),
|
|
167
|
+
'',
|
|
168
|
+
true,
|
|
169
|
+
() => this._extensionsWorkbenchService.install(dependencyExtension)
|
|
170
|
+
.then(() => this._hostService.reload(), e => this._notificationService.error(e))
|
|
171
|
+
))]
|
|
179
172
|
}
|
|
180
173
|
});
|
|
181
174
|
}
|
|
182
175
|
else {
|
|
183
|
-
this._notificationService.error((
|
|
184
|
-
'unknownDep',
|
|
185
|
-
"Cannot activate the '{0}' extension because it depends on an unknown '{1}' extension.",
|
|
186
|
-
extName,
|
|
187
|
-
missingDependency
|
|
188
|
-
)));
|
|
176
|
+
this._notificationService.error(localizeWithPath('vs/workbench/api/browser/mainThreadExtensionService', 'unknownDep', "Cannot activate the '{0}' extension because it depends on an unknown '{1}' extension.", extName, missingDependency));
|
|
189
177
|
}
|
|
190
178
|
}
|
|
191
179
|
async $setPerformanceMarks(marks) {
|
|
@@ -20,16 +20,16 @@ let MainThreadFileSystem = MainThreadFileSystem_1 = class MainThreadFileSystem {
|
|
|
20
20
|
this._contextService = _contextService;
|
|
21
21
|
this._logService = _logService;
|
|
22
22
|
this._configurationService = _configurationService;
|
|
23
|
-
this._fileProvider = (
|
|
24
|
-
this._disposables = (
|
|
25
|
-
this._watches = (
|
|
26
|
-
this._proxy = (
|
|
27
|
-
const infoProxy = (
|
|
23
|
+
this._fileProvider = ( new DisposableMap());
|
|
24
|
+
this._disposables = ( new DisposableStore());
|
|
25
|
+
this._watches = ( new DisposableMap());
|
|
26
|
+
this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostFileSystem));
|
|
27
|
+
const infoProxy = ( extHostContext.getProxy(ExtHostContext.ExtHostFileSystemInfo));
|
|
28
28
|
for (const entry of _fileService.listCapabilities()) {
|
|
29
|
-
infoProxy.$acceptProviderInfos((
|
|
29
|
+
infoProxy.$acceptProviderInfos(( URI.from({ scheme: entry.scheme, path: '/dummy' })), entry.capabilities);
|
|
30
30
|
}
|
|
31
|
-
this._disposables.add(_fileService.onDidChangeFileSystemProviderRegistrations(e => infoProxy.$acceptProviderInfos((
|
|
32
|
-
this._disposables.add(_fileService.onDidChangeFileSystemProviderCapabilities(e => infoProxy.$acceptProviderInfos((
|
|
31
|
+
this._disposables.add(_fileService.onDidChangeFileSystemProviderRegistrations(e => infoProxy.$acceptProviderInfos(( URI.from({ scheme: e.scheme, path: '/dummy' })), e.provider?.capabilities ?? null)));
|
|
32
|
+
this._disposables.add(_fileService.onDidChangeFileSystemProviderCapabilities(e => infoProxy.$acceptProviderInfos(( URI.from({ scheme: e.scheme, path: '/dummy' })), e.provider.capabilities)));
|
|
33
33
|
}
|
|
34
34
|
dispose() {
|
|
35
35
|
this._disposables.dispose();
|
|
@@ -37,14 +37,14 @@ let MainThreadFileSystem = MainThreadFileSystem_1 = class MainThreadFileSystem {
|
|
|
37
37
|
this._watches.dispose();
|
|
38
38
|
}
|
|
39
39
|
async $registerFileSystemProvider(handle, scheme, capabilities, readonlyMessage) {
|
|
40
|
-
this._fileProvider.set(handle, (
|
|
40
|
+
this._fileProvider.set(handle, ( new RemoteFileSystemProvider(
|
|
41
41
|
this._fileService,
|
|
42
42
|
scheme,
|
|
43
43
|
capabilities,
|
|
44
44
|
readonlyMessage,
|
|
45
45
|
handle,
|
|
46
46
|
this._proxy
|
|
47
|
-
)))
|
|
47
|
+
)));
|
|
48
48
|
}
|
|
49
49
|
$unregisterProvider(handle) {
|
|
50
50
|
this._fileProvider.deleteAndDispose(handle);
|
|
@@ -70,11 +70,11 @@ let MainThreadFileSystem = MainThreadFileSystem_1 = class MainThreadFileSystem {
|
|
|
70
70
|
$readdir(uri) {
|
|
71
71
|
return this._fileService.resolve(URI.revive(uri), { resolveMetadata: false }).then(stat => {
|
|
72
72
|
if (!stat.isDirectory) {
|
|
73
|
-
const err = (
|
|
73
|
+
const err = ( new Error(stat.name));
|
|
74
74
|
err.name = FileSystemProviderErrorCode.FileNotADirectory;
|
|
75
75
|
throw err;
|
|
76
76
|
}
|
|
77
|
-
return !stat.children ? [] : (
|
|
77
|
+
return !stat.children ? [] : ( stat.children.map(child => [child.name, MainThreadFileSystem_1._asFileType(child)]));
|
|
78
78
|
}).catch(MainThreadFileSystem_1._handleError);
|
|
79
79
|
}
|
|
80
80
|
static _asFileType(stat) {
|
|
@@ -152,14 +152,14 @@ let MainThreadFileSystem = MainThreadFileSystem_1 = class MainThreadFileSystem {
|
|
|
152
152
|
}
|
|
153
153
|
}
|
|
154
154
|
catch (error) {
|
|
155
|
-
this._logService.error(`MainThreadFileSystem#$watch(): failed to stat a resource for file watching (extension: ${extensionId}, path: ${(
|
|
155
|
+
this._logService.error(`MainThreadFileSystem#$watch(): failed to stat a resource for file watching (extension: ${extensionId}, path: ${( uri.toString(true))}, recursive: ${opts.recursive}, session: ${session}): ${error}`);
|
|
156
156
|
}
|
|
157
157
|
}
|
|
158
158
|
if (workspaceFolder && opts.recursive) {
|
|
159
|
-
this._logService.trace(`MainThreadFileSystem#$watch(): ignoring request to start watching because path is inside workspace (extension: ${extensionId}, path: ${(
|
|
159
|
+
this._logService.trace(`MainThreadFileSystem#$watch(): ignoring request to start watching because path is inside workspace (extension: ${extensionId}, path: ${( uri.toString(true))}, recursive: ${opts.recursive}, session: ${session})`);
|
|
160
160
|
return;
|
|
161
161
|
}
|
|
162
|
-
this._logService.trace(`MainThreadFileSystem#$watch(): request to start watching (extension: ${extensionId}, path: ${(
|
|
162
|
+
this._logService.trace(`MainThreadFileSystem#$watch(): request to start watching (extension: ${extensionId}, path: ${( uri.toString(true))}, recursive: ${opts.recursive}, session: ${session})`);
|
|
163
163
|
if (opts.recursive) {
|
|
164
164
|
const config = this._configurationService.getValue();
|
|
165
165
|
if (config.files?.watcherExclude) {
|
|
@@ -184,7 +184,7 @@ let MainThreadFileSystem = MainThreadFileSystem_1 = class MainThreadFileSystem {
|
|
|
184
184
|
}
|
|
185
185
|
}
|
|
186
186
|
if (!opts.includes || opts.includes.length === 0) {
|
|
187
|
-
this._logService.trace(`MainThreadFileSystem#$watch(): ignoring request to start watching because path is inside workspace and no excludes are configured (extension: ${extensionId}, path: ${(
|
|
187
|
+
this._logService.trace(`MainThreadFileSystem#$watch(): ignoring request to start watching because path is inside workspace and no excludes are configured (extension: ${extensionId}, path: ${( uri.toString(true))}, recursive: ${opts.recursive}, session: ${session})`);
|
|
188
188
|
return;
|
|
189
189
|
}
|
|
190
190
|
}
|
|
@@ -192,7 +192,7 @@ let MainThreadFileSystem = MainThreadFileSystem_1 = class MainThreadFileSystem {
|
|
|
192
192
|
this._watches.set(session, subscription);
|
|
193
193
|
}
|
|
194
194
|
$unwatch(session) {
|
|
195
|
-
if ((
|
|
195
|
+
if (( this._watches.has(session))) {
|
|
196
196
|
this._logService.trace(`MainThreadFileSystem#$unwatch(): request to stop watching (session: ${session})`);
|
|
197
197
|
this._watches.deleteAndDispose(session);
|
|
198
198
|
}
|
|
@@ -200,17 +200,17 @@ let MainThreadFileSystem = MainThreadFileSystem_1 = class MainThreadFileSystem {
|
|
|
200
200
|
};
|
|
201
201
|
MainThreadFileSystem = MainThreadFileSystem_1 = __decorate([
|
|
202
202
|
extHostNamedCustomer(MainContext.MainThreadFileSystem),
|
|
203
|
-
(
|
|
204
|
-
(
|
|
205
|
-
(
|
|
206
|
-
(
|
|
203
|
+
( __param(1, IWorkbenchFileService)),
|
|
204
|
+
( __param(2, IWorkspaceContextService)),
|
|
205
|
+
( __param(3, ILogService)),
|
|
206
|
+
( __param(4, IConfigurationService))
|
|
207
207
|
], MainThreadFileSystem);
|
|
208
208
|
class RemoteFileSystemProvider {
|
|
209
209
|
constructor(fileService, scheme, capabilities, readOnlyMessage, _handle, _proxy) {
|
|
210
210
|
this.readOnlyMessage = readOnlyMessage;
|
|
211
211
|
this._handle = _handle;
|
|
212
212
|
this._proxy = _proxy;
|
|
213
|
-
this._onDidChange = (
|
|
213
|
+
this._onDidChange = ( new Emitter());
|
|
214
214
|
this.onDidChangeFile = this._onDidChange.event;
|
|
215
215
|
this.onDidChangeCapabilities = Event.None;
|
|
216
216
|
this.capabilities = capabilities;
|
|
@@ -228,7 +228,7 @@ class RemoteFileSystemProvider {
|
|
|
228
228
|
});
|
|
229
229
|
}
|
|
230
230
|
$onFileSystemChange(changes) {
|
|
231
|
-
this._onDidChange.fire((
|
|
231
|
+
this._onDidChange.fire(( changes.map(RemoteFileSystemProvider._createFileChange)));
|
|
232
232
|
}
|
|
233
233
|
static _createFileChange(dto) {
|
|
234
234
|
return { resource: URI.revive(dto.resource), type: dto.type };
|
|
@@ -3,7 +3,7 @@ import { DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
|
3
3
|
import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
|
|
4
4
|
import { extHostCustomer } from '../../services/extensions/common/extHostCustomers.js';
|
|
5
5
|
import { ExtHostContext } from '../common/extHost.protocol.js';
|
|
6
|
-
import {
|
|
6
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
7
7
|
import { IWorkingCopyFileService } from '../../services/workingCopy/common/workingCopyFileService.js';
|
|
8
8
|
import { IBulkEditService } from 'monaco-editor/esm/vs/editor/browser/services/bulkEditService.js';
|
|
9
9
|
import { IProgressService } from 'monaco-editor/esm/vs/platform/progress/common/progress.js';
|
|
@@ -65,70 +65,38 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
|
|
|
65
65
|
let message;
|
|
66
66
|
if (data.extensionNames.length === 1) {
|
|
67
67
|
if (operation === 0 ) {
|
|
68
|
-
message = (
|
|
69
|
-
'ask.1.create',
|
|
70
|
-
"Extension '{0}' wants to make refactoring changes with this file creation",
|
|
71
|
-
data.extensionNames[0]
|
|
72
|
-
));
|
|
68
|
+
message = localizeWithPath('vs/workbench/api/browser/mainThreadFileSystemEventService', 'ask.1.create', "Extension '{0}' wants to make refactoring changes with this file creation", data.extensionNames[0]);
|
|
73
69
|
}
|
|
74
70
|
else if (operation === 3 ) {
|
|
75
|
-
message = (
|
|
76
|
-
'ask.1.copy',
|
|
77
|
-
"Extension '{0}' wants to make refactoring changes with this file copy",
|
|
78
|
-
data.extensionNames[0]
|
|
79
|
-
));
|
|
71
|
+
message = localizeWithPath('vs/workbench/api/browser/mainThreadFileSystemEventService', 'ask.1.copy', "Extension '{0}' wants to make refactoring changes with this file copy", data.extensionNames[0]);
|
|
80
72
|
}
|
|
81
73
|
else if (operation === 2 ) {
|
|
82
|
-
message = (
|
|
83
|
-
'ask.1.move',
|
|
84
|
-
"Extension '{0}' wants to make refactoring changes with this file move",
|
|
85
|
-
data.extensionNames[0]
|
|
86
|
-
));
|
|
74
|
+
message = localizeWithPath('vs/workbench/api/browser/mainThreadFileSystemEventService', 'ask.1.move', "Extension '{0}' wants to make refactoring changes with this file move", data.extensionNames[0]);
|
|
87
75
|
}
|
|
88
76
|
else {
|
|
89
|
-
message = (
|
|
90
|
-
'ask.1.delete',
|
|
91
|
-
"Extension '{0}' wants to make refactoring changes with this file deletion",
|
|
92
|
-
data.extensionNames[0]
|
|
93
|
-
));
|
|
77
|
+
message = localizeWithPath('vs/workbench/api/browser/mainThreadFileSystemEventService', 'ask.1.delete', "Extension '{0}' wants to make refactoring changes with this file deletion", data.extensionNames[0]);
|
|
94
78
|
}
|
|
95
79
|
}
|
|
96
80
|
else {
|
|
97
81
|
if (operation === 0 ) {
|
|
98
|
-
message = (
|
|
99
|
-
{ key: 'ask.N.create', comment: ['{0} is a number, e.g "3 extensions want..."'] },
|
|
100
|
-
"{0} extensions want to make refactoring changes with this file creation",
|
|
101
|
-
data.extensionNames.length
|
|
102
|
-
));
|
|
82
|
+
message = localizeWithPath('vs/workbench/api/browser/mainThreadFileSystemEventService', { key: 'ask.N.create', comment: ['{0} is a number, e.g "3 extensions want..."'] }, "{0} extensions want to make refactoring changes with this file creation", data.extensionNames.length);
|
|
103
83
|
}
|
|
104
84
|
else if (operation === 3 ) {
|
|
105
|
-
message = (
|
|
106
|
-
{ key: 'ask.N.copy', comment: ['{0} is a number, e.g "3 extensions want..."'] },
|
|
107
|
-
"{0} extensions want to make refactoring changes with this file copy",
|
|
108
|
-
data.extensionNames.length
|
|
109
|
-
));
|
|
85
|
+
message = localizeWithPath('vs/workbench/api/browser/mainThreadFileSystemEventService', { key: 'ask.N.copy', comment: ['{0} is a number, e.g "3 extensions want..."'] }, "{0} extensions want to make refactoring changes with this file copy", data.extensionNames.length);
|
|
110
86
|
}
|
|
111
87
|
else if (operation === 2 ) {
|
|
112
|
-
message = (
|
|
113
|
-
{ key: 'ask.N.move', comment: ['{0} is a number, e.g "3 extensions want..."'] },
|
|
114
|
-
"{0} extensions want to make refactoring changes with this file move",
|
|
115
|
-
data.extensionNames.length
|
|
116
|
-
));
|
|
88
|
+
message = localizeWithPath('vs/workbench/api/browser/mainThreadFileSystemEventService', { key: 'ask.N.move', comment: ['{0} is a number, e.g "3 extensions want..."'] }, "{0} extensions want to make refactoring changes with this file move", data.extensionNames.length);
|
|
117
89
|
}
|
|
118
90
|
else {
|
|
119
|
-
message = (
|
|
120
|
-
{ key: 'ask.N.delete', comment: ['{0} is a number, e.g "3 extensions want..."'] },
|
|
121
|
-
"{0} extensions want to make refactoring changes with this file deletion",
|
|
122
|
-
data.extensionNames.length
|
|
123
|
-
));
|
|
91
|
+
message = localizeWithPath('vs/workbench/api/browser/mainThreadFileSystemEventService', { key: 'ask.N.delete', comment: ['{0} is a number, e.g "3 extensions want..."'] }, "{0} extensions want to make refactoring changes with this file deletion", data.extensionNames.length);
|
|
124
92
|
}
|
|
125
93
|
}
|
|
126
94
|
if (needsConfirmation) {
|
|
127
95
|
const { confirmed } = await dialogService.confirm({
|
|
128
96
|
type: Severity.Info,
|
|
129
97
|
message,
|
|
130
|
-
primaryButton: (
|
|
131
|
-
cancelButton: (
|
|
98
|
+
primaryButton: localizeWithPath('vs/workbench/api/browser/mainThreadFileSystemEventService', 'preview', "Show &&Preview"),
|
|
99
|
+
cancelButton: localizeWithPath('vs/workbench/api/browser/mainThreadFileSystemEventService', 'cancel', "Skip Changes")
|
|
132
100
|
});
|
|
133
101
|
showPreview = true;
|
|
134
102
|
if (!confirmed) {
|
|
@@ -147,19 +115,19 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
|
|
|
147
115
|
message,
|
|
148
116
|
buttons: [
|
|
149
117
|
{
|
|
150
|
-
label: (
|
|
118
|
+
label: localizeWithPath('vs/workbench/api/browser/mainThreadFileSystemEventService', { key: 'ok', comment: ['&& denotes a mnemonic'] }, "&&OK"),
|
|
151
119
|
run: () => Choice.OK
|
|
152
120
|
},
|
|
153
121
|
{
|
|
154
|
-
label: (
|
|
122
|
+
label: localizeWithPath('vs/workbench/api/browser/mainThreadFileSystemEventService', { key: 'preview', comment: ['&& denotes a mnemonic'] }, "Show &&Preview"),
|
|
155
123
|
run: () => Choice.Preview
|
|
156
124
|
}
|
|
157
125
|
],
|
|
158
126
|
cancelButton: {
|
|
159
|
-
label: (
|
|
127
|
+
label: localizeWithPath('vs/workbench/api/browser/mainThreadFileSystemEventService', 'cancel', "Skip Changes"),
|
|
160
128
|
run: () => Choice.Cancel
|
|
161
129
|
},
|
|
162
|
-
checkbox: { label: (
|
|
130
|
+
checkbox: { label: localizeWithPath('vs/workbench/api/browser/mainThreadFileSystemEventService', 'again', "Don't ask again") }
|
|
163
131
|
});
|
|
164
132
|
if (result === Choice.Cancel) {
|
|
165
133
|
return;
|
|
@@ -176,15 +144,15 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
|
|
|
176
144
|
_progressLabel(operation) {
|
|
177
145
|
switch (operation) {
|
|
178
146
|
case 0 :
|
|
179
|
-
return (
|
|
147
|
+
return localizeWithPath('vs/workbench/api/browser/mainThreadFileSystemEventService', 'msg-create', "Running 'File Create' participants...");
|
|
180
148
|
case 2 :
|
|
181
|
-
return (
|
|
149
|
+
return localizeWithPath('vs/workbench/api/browser/mainThreadFileSystemEventService', 'msg-rename', "Running 'File Rename' participants...");
|
|
182
150
|
case 3 :
|
|
183
|
-
return (
|
|
151
|
+
return localizeWithPath('vs/workbench/api/browser/mainThreadFileSystemEventService', 'msg-copy', "Running 'File Copy' participants...");
|
|
184
152
|
case 1 :
|
|
185
|
-
return (
|
|
153
|
+
return localizeWithPath('vs/workbench/api/browser/mainThreadFileSystemEventService', 'msg-delete', "Running 'File Delete' participants...");
|
|
186
154
|
case 4 :
|
|
187
|
-
return (
|
|
155
|
+
return localizeWithPath('vs/workbench/api/browser/mainThreadFileSystemEventService', 'msg-write', "Running 'File Write' participants...");
|
|
188
156
|
}
|
|
189
157
|
}
|
|
190
158
|
});
|
|
@@ -212,7 +180,7 @@ registerAction2(class ResetMemento extends Action2 {
|
|
|
212
180
|
super({
|
|
213
181
|
id: 'files.participants.resetChoice',
|
|
214
182
|
title: {
|
|
215
|
-
value: (
|
|
183
|
+
value: localizeWithPath('vs/workbench/api/browser/mainThreadFileSystemEventService', 'label', "Reset choice for 'File operation needs preview'"),
|
|
216
184
|
original: `Reset choice for 'File operation needs preview'`
|
|
217
185
|
},
|
|
218
186
|
f1: true
|
|
@@ -36,12 +36,12 @@ let MainThreadMessageService = class MainThreadMessageService {
|
|
|
36
36
|
let source;
|
|
37
37
|
if (options.source) {
|
|
38
38
|
source = {
|
|
39
|
-
label:
|
|
39
|
+
label: nls.localizeWithPath('vs/workbench/api/browser/mainThreadMessageService', 'extensionSource', "{0} (Extension)", options.source.label),
|
|
40
40
|
id: options.source.identifier.value
|
|
41
41
|
};
|
|
42
42
|
}
|
|
43
43
|
if (!source) {
|
|
44
|
-
source =
|
|
44
|
+
source = nls.localizeWithPath('vs/workbench/api/browser/mainThreadMessageService', 'defaultSource', "Extension");
|
|
45
45
|
}
|
|
46
46
|
const secondaryActions = [];
|
|
47
47
|
const messageHandle = this._notificationService.notify({
|
|
@@ -73,13 +73,13 @@ let MainThreadMessageService = class MainThreadMessageService {
|
|
|
73
73
|
if (!cancelButton) {
|
|
74
74
|
if (buttons.length > 0) {
|
|
75
75
|
cancelButton = {
|
|
76
|
-
label:
|
|
76
|
+
label: nls.localizeWithPath('vs/workbench/api/browser/mainThreadMessageService', 'cancel', "Cancel"),
|
|
77
77
|
run: () => undefined
|
|
78
78
|
};
|
|
79
79
|
}
|
|
80
80
|
else {
|
|
81
81
|
cancelButton = {
|
|
82
|
-
label:
|
|
82
|
+
label: nls.localizeWithPath('vs/workbench/api/browser/mainThreadMessageService', { key: 'ok', comment: ['&& denotes a mnemonic'] }, "&&OK"),
|
|
83
83
|
run: () => undefined
|
|
84
84
|
};
|
|
85
85
|
}
|
|
@@ -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 { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
|
|
4
4
|
import { extHostCustomer } from '../../services/extensions/common/extHostCustomers.js';
|
|
5
5
|
import { ExtHostContext } from '../common/extHost.protocol.js';
|
|
@@ -16,10 +16,9 @@ class ExtHostNotebookDocumentSaveParticipant {
|
|
|
16
16
|
}
|
|
17
17
|
let _warningTimeout;
|
|
18
18
|
const p = ( new Promise((resolve, reject) => {
|
|
19
|
-
_warningTimeout = setTimeout(() => reject(( new Error(
|
|
20
|
-
'timeout.onWillSave',
|
|
21
|
-
|
|
22
|
-
))))), 1750);
|
|
19
|
+
_warningTimeout = setTimeout(() => reject(( new Error(
|
|
20
|
+
localizeWithPath('vs/workbench/api/browser/mainThreadNotebookSaveParticipant', 'timeout.onWillSave', "Aborted onWillSaveNotebookDocument-event after 1750ms")
|
|
21
|
+
))), 1750);
|
|
23
22
|
this._proxy.$participateInSave(workingCopy.resource, env.reason, token).then(_ => {
|
|
24
23
|
clearTimeout(_warningTimeout);
|
|
25
24
|
return undefined;
|
|
@@ -4,7 +4,7 @@ import { ExtHostContext, MainContext } from '../common/extHost.protocol.js';
|
|
|
4
4
|
import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
|
|
5
5
|
import { Action } from 'monaco-editor/esm/vs/base/common/actions.js';
|
|
6
6
|
import { ICommandService } from 'monaco-editor/esm/vs/platform/commands/common/commands.js';
|
|
7
|
-
import {
|
|
7
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
8
8
|
class ManageExtensionAction extends Action {
|
|
9
9
|
constructor(extensionId, label, commandService) {
|
|
10
10
|
super(extensionId, label, undefined, true, () => {
|
|
@@ -29,7 +29,11 @@ let MainThreadProgress = class MainThreadProgress {
|
|
|
29
29
|
const notificationOptions = {
|
|
30
30
|
...options,
|
|
31
31
|
location: 15 ,
|
|
32
|
-
secondaryActions: [( new ManageExtensionAction(
|
|
32
|
+
secondaryActions: [( new ManageExtensionAction(
|
|
33
|
+
extensionId,
|
|
34
|
+
localizeWithPath('vs/workbench/api/browser/mainThreadProgress', 'manageExtension', "Manage Extension"),
|
|
35
|
+
this._commandService
|
|
36
|
+
))]
|
|
33
37
|
};
|
|
34
38
|
options = notificationOptions;
|
|
35
39
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
|
|
2
2
|
import { shouldSynchronizeModel } from 'monaco-editor/esm/vs/editor/common/model.js';
|
|
3
|
-
import {
|
|
3
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
4
4
|
import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
|
|
5
5
|
import { extHostCustomer } from '../../services/extensions/common/extHostCustomers.js';
|
|
6
6
|
import { ITextFileService } from '../../services/textfile/common/textfiles.js';
|
|
@@ -15,7 +15,9 @@ class ExtHostSaveParticipant {
|
|
|
15
15
|
return undefined;
|
|
16
16
|
}
|
|
17
17
|
const p = ( new Promise((resolve, reject) => {
|
|
18
|
-
setTimeout(() => reject(( new Error(
|
|
18
|
+
setTimeout(() => reject(( new Error(
|
|
19
|
+
localizeWithPath('vs/workbench/api/browser/mainThreadSaveParticipant', 'timeout.onWillSave', "Aborted onWillSaveTextDocument-event after 1750ms")
|
|
20
|
+
))), 1750);
|
|
19
21
|
this._proxy.$participateInSave(editorModel.resource, env.reason).then(values => {
|
|
20
22
|
if (!values.every(success => success)) {
|
|
21
23
|
return Promise.reject(( new Error('listener failed')));
|
|
@@ -375,7 +375,7 @@ var TaskDTO;
|
|
|
375
375
|
}
|
|
376
376
|
command.presentation = TaskPresentationOptionsDTO.to(task.presentationOptions);
|
|
377
377
|
const source = TaskSourceDTO.to(task.source, workspace);
|
|
378
|
-
const label =
|
|
378
|
+
const label = nls.localizeWithPath('vs/workbench/api/browser/mainThreadTask', 'task.label', '{0}: {1}', source.label, task.name);
|
|
379
379
|
const definition = TaskDefinitionDTO.to(task.definition, executeOnly);
|
|
380
380
|
const id = (CustomExecutionDTO.is(task.execution) && task._id) ? task._id : `${task.source.extensionId}.${definition._key}`;
|
|
381
381
|
const result = ( new ContributedTask(
|
|
@@ -103,18 +103,8 @@ let MainThreadTunnelService = class MainThreadTunnelService extends Disposable {
|
|
|
103
103
|
return TunnelDtoConverter.fromServiceTunnel(tunnel);
|
|
104
104
|
}
|
|
105
105
|
async elevationPrompt(tunnelOptions, tunnel, source) {
|
|
106
|
-
return this.notificationService.prompt(Severity.Info, (
|
|
107
|
-
|
|
108
|
-
"The extension {0} has forwarded port {1}. You'll need to run as superuser to use port {2} locally.",
|
|
109
|
-
source,
|
|
110
|
-
tunnelOptions.remoteAddress.port,
|
|
111
|
-
tunnelOptions.localAddressPort
|
|
112
|
-
)), [{
|
|
113
|
-
label: ( nls.localize(
|
|
114
|
-
'remote.tunnelsView.elevationButton',
|
|
115
|
-
"Use Port {0} as Sudo...",
|
|
116
|
-
tunnel.tunnelRemotePort
|
|
117
|
-
)),
|
|
106
|
+
return this.notificationService.prompt(Severity.Info, nls.localizeWithPath('vs/workbench/api/browser/mainThreadTunnelService', 'remote.tunnel.openTunnel', "The extension {0} has forwarded port {1}. You'll need to run as superuser to use port {2} locally.", source, tunnelOptions.remoteAddress.port, tunnelOptions.localAddressPort), [{
|
|
107
|
+
label: nls.localizeWithPath('vs/workbench/api/browser/mainThreadTunnelService', 'remote.tunnelsView.elevationButton', "Use Port {0} as Sudo...", tunnel.tunnelRemotePort),
|
|
118
108
|
run: async () => {
|
|
119
109
|
this.elevateionRetry = true;
|
|
120
110
|
await this.remoteExplorerService.close({ host: tunnel.tunnelRemoteHost, port: tunnel.tunnelRemotePort }, TunnelCloseReason.Other);
|
|
@@ -3,7 +3,7 @@ import { Action } from 'monaco-editor/esm/vs/base/common/actions.js';
|
|
|
3
3
|
import { isCancellationError } from 'monaco-editor/esm/vs/base/common/errors.js';
|
|
4
4
|
import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
5
5
|
import { Schemas } from 'monaco-editor/esm/vs/base/common/network.js';
|
|
6
|
-
import {
|
|
6
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
7
7
|
import { Severity, INotificationService } from 'monaco-editor/esm/vs/platform/notification/common/notification.js';
|
|
8
8
|
import { IOpenerService } from 'monaco-editor/esm/vs/platform/opener/common/opener.js';
|
|
9
9
|
import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
|
|
@@ -48,19 +48,25 @@ let MainThreadUriOpeners = class MainThreadUriOpeners extends Disposable {
|
|
|
48
48
|
}
|
|
49
49
|
catch (e) {
|
|
50
50
|
if (!isCancellationError(e)) {
|
|
51
|
-
const openDefaultAction = ( new Action(
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
51
|
+
const openDefaultAction = ( new Action(
|
|
52
|
+
'default',
|
|
53
|
+
localizeWithPath('vs/workbench/api/browser/mainThreadUriOpeners', 'openerFailedUseDefault', "Open using default opener"),
|
|
54
|
+
undefined,
|
|
55
|
+
undefined,
|
|
56
|
+
async () => {
|
|
57
|
+
await this.openerService.open(uri, {
|
|
58
|
+
allowTunneling: false,
|
|
59
|
+
allowContributedOpeners: defaultExternalUriOpenerId,
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
));
|
|
57
63
|
openDefaultAction.tooltip = ( uri.toString());
|
|
58
64
|
this.notificationService.notify({
|
|
59
65
|
severity: Severity.Error,
|
|
60
|
-
message: (
|
|
66
|
+
message: localizeWithPath('vs/workbench/api/browser/mainThreadUriOpeners', {
|
|
61
67
|
key: 'openerFailedMessage',
|
|
62
68
|
comment: ['{0} is the id of the opener. {1} is the url being opened.'],
|
|
63
|
-
}, 'Could not open uri with \'{0}\': {1}', id, ( e.toString()))
|
|
69
|
+
}, 'Could not open uri with \'{0}\': {1}', id, ( e.toString())),
|
|
64
70
|
actions: {
|
|
65
71
|
primary: [
|
|
66
72
|
openDefaultAction
|