@codingame/monaco-vscode-api 1.83.2 → 1.83.3
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 +11880 -682
- 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/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 +3 -3
- 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/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 +2 -6
- 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/extHostDiagnostics.js +2 -6
- package/vscode/src/vs/workbench/api/common/extHostExtensionService.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js +3 -11
- 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/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 +2 -2
- package/vscode/src/vs/workbench/api/common/extHostTunnelService.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostWorkspace.js +2 -7
- package/vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js +9 -34
- 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 +2 -2
- package/vscode/src/vs/workbench/browser/parts/editor/textCodeEditor.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/editor/textDiffEditor.js +4 -11
- 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/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/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 +7 -12
- 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 +13 -13
- 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/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 +10 -41
- 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 +8 -6
- 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/common/abstractExtensionService.js +10 -45
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.js +1 -1
- 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/language/common/languageService.js +23 -98
- package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js +9 -11
- 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 +2 -2
- 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/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
|
@@ -202,36 +202,14 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
|
|
|
202
202
|
let detail;
|
|
203
203
|
if (!this.shouldUseDropdown()) {
|
|
204
204
|
detail = this.model.changes.length > 1
|
|
205
|
-
? (
|
|
206
|
-
'
|
|
207
|
-
"{0} - {1} of {2} changes",
|
|
208
|
-
label,
|
|
209
|
-
providerIndex + 1,
|
|
210
|
-
providerChanges.length
|
|
211
|
-
))
|
|
212
|
-
: ( nls.localize(
|
|
213
|
-
'change',
|
|
214
|
-
"{0} - {1} of {2} change",
|
|
215
|
-
label,
|
|
216
|
-
providerIndex + 1,
|
|
217
|
-
providerChanges.length
|
|
218
|
-
));
|
|
205
|
+
? nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'changes', "{0} - {1} of {2} changes", label, providerIndex + 1, providerChanges.length)
|
|
206
|
+
: nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'change', "{0} - {1} of {2} change", label, providerIndex + 1, providerChanges.length);
|
|
219
207
|
this.dropdownContainer.style.display = 'none';
|
|
220
208
|
}
|
|
221
209
|
else {
|
|
222
210
|
detail = this.model.changes.length > 1
|
|
223
|
-
? (
|
|
224
|
-
'
|
|
225
|
-
"{0} of {1} changes",
|
|
226
|
-
providerIndex + 1,
|
|
227
|
-
providerChanges.length
|
|
228
|
-
))
|
|
229
|
-
: ( nls.localize(
|
|
230
|
-
'multiChange',
|
|
231
|
-
"{0} of {1} change",
|
|
232
|
-
providerIndex + 1,
|
|
233
|
-
providerChanges.length
|
|
234
|
-
));
|
|
211
|
+
? nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'multiChanges', "{0} of {1} changes", providerIndex + 1, providerChanges.length)
|
|
212
|
+
: nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'multiChange', "{0} of {1} change", providerIndex + 1, providerChanges.length);
|
|
235
213
|
this.dropdownContainer.style.display = 'inherit';
|
|
236
214
|
}
|
|
237
215
|
this.setTitle(this.title, detail);
|
|
@@ -289,7 +267,13 @@ let DirtyDiffWidget = class DirtyDiffWidget extends PeekViewWidget {
|
|
|
289
267
|
this._actionbarWidget.clear();
|
|
290
268
|
this._actionbarWidget.push(actions.reverse(), { label: false, icon: true });
|
|
291
269
|
this._actionbarWidget.push([next, previous], { label: false, icon: true });
|
|
292
|
-
this._actionbarWidget.push(( new Action(
|
|
270
|
+
this._actionbarWidget.push(( new Action(
|
|
271
|
+
'peekview.close',
|
|
272
|
+
nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'label.close', "Close"),
|
|
273
|
+
ThemeIcon.asClassName(Codicon.close),
|
|
274
|
+
true,
|
|
275
|
+
() => this.dispose()
|
|
276
|
+
)), { label: false, icon: true });
|
|
293
277
|
}
|
|
294
278
|
_fillHead(container) {
|
|
295
279
|
super._fillHead(container, true);
|
|
@@ -393,7 +377,7 @@ class ShowPreviousChangeAction extends EditorAction {
|
|
|
393
377
|
constructor(outerEditor) {
|
|
394
378
|
super({
|
|
395
379
|
id: 'editor.action.dirtydiff.previous',
|
|
396
|
-
label:
|
|
380
|
+
label: nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'show previous change', "Show Previous Change"),
|
|
397
381
|
alias: 'Show Previous Change',
|
|
398
382
|
precondition: ( TextCompareEditorActiveContext.toNegated()),
|
|
399
383
|
kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: 1024 | 512 | 61 , weight: 100 }
|
|
@@ -420,7 +404,7 @@ class ShowNextChangeAction extends EditorAction {
|
|
|
420
404
|
constructor(outerEditor) {
|
|
421
405
|
super({
|
|
422
406
|
id: 'editor.action.dirtydiff.next',
|
|
423
|
-
label:
|
|
407
|
+
label: nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'show next change', "Show Next Change"),
|
|
424
408
|
alias: 'Show Next Change',
|
|
425
409
|
precondition: ( TextCompareEditorActiveContext.toNegated()),
|
|
426
410
|
kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: 512 | 61 , weight: 100 }
|
|
@@ -447,10 +431,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
|
|
|
447
431
|
group: '7_change_nav',
|
|
448
432
|
command: {
|
|
449
433
|
id: 'editor.action.dirtydiff.next',
|
|
450
|
-
title:
|
|
451
|
-
{ key: 'miGotoNextChange', comment: ['&& denotes a mnemonic'] },
|
|
452
|
-
"Next &&Change"
|
|
453
|
-
))
|
|
434
|
+
title: nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', { key: 'miGotoNextChange', comment: ['&& denotes a mnemonic'] }, "Next &&Change")
|
|
454
435
|
},
|
|
455
436
|
order: 1
|
|
456
437
|
});
|
|
@@ -458,10 +439,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarGoMenu, {
|
|
|
458
439
|
group: '7_change_nav',
|
|
459
440
|
command: {
|
|
460
441
|
id: 'editor.action.dirtydiff.previous',
|
|
461
|
-
title:
|
|
462
|
-
{ key: 'miGotoPreviousChange', comment: ['&& denotes a mnemonic'] },
|
|
463
|
-
"Previous &&Change"
|
|
464
|
-
))
|
|
442
|
+
title: nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', { key: 'miGotoPreviousChange', comment: ['&& denotes a mnemonic'] }, "Previous &&Change")
|
|
465
443
|
},
|
|
466
444
|
order: 2
|
|
467
445
|
});
|
|
@@ -469,7 +447,7 @@ class GotoPreviousChangeAction extends EditorAction {
|
|
|
469
447
|
constructor() {
|
|
470
448
|
super({
|
|
471
449
|
id: 'workbench.action.editor.previousChange',
|
|
472
|
-
label:
|
|
450
|
+
label: nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'move to previous change', "Go to Previous Change"),
|
|
473
451
|
alias: 'Go to Previous Change',
|
|
474
452
|
precondition: ( TextCompareEditorActiveContext.toNegated()),
|
|
475
453
|
kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: 1024 | 512 | 63 , weight: 100 }
|
|
@@ -503,7 +481,7 @@ class GotoNextChangeAction extends EditorAction {
|
|
|
503
481
|
constructor() {
|
|
504
482
|
super({
|
|
505
483
|
id: 'workbench.action.editor.nextChange',
|
|
506
|
-
label:
|
|
484
|
+
label: nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'move to next change', "Go to Next Change"),
|
|
507
485
|
alias: 'Go to Next Change',
|
|
508
486
|
precondition: ( TextCompareEditorActiveContext.toNegated()),
|
|
509
487
|
kbOpts: { kbExpr: EditorContextKeys.editorTextFocus, primary: 512 | 63 , weight: 100 }
|
|
@@ -821,67 +799,40 @@ const editorGutterModifiedBackground = registerColor('editorGutter.modifiedBackg
|
|
|
821
799
|
light: '#2090D3',
|
|
822
800
|
hcDark: '#1B81A8',
|
|
823
801
|
hcLight: '#2090D3'
|
|
824
|
-
}, (
|
|
825
|
-
'editorGutterModifiedBackground',
|
|
826
|
-
"Editor gutter background color for lines that are modified."
|
|
827
|
-
)));
|
|
802
|
+
}, nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'editorGutterModifiedBackground', "Editor gutter background color for lines that are modified."));
|
|
828
803
|
const editorGutterAddedBackground = registerColor('editorGutter.addedBackground', {
|
|
829
804
|
dark: '#487E02',
|
|
830
805
|
light: '#48985D',
|
|
831
806
|
hcDark: '#487E02',
|
|
832
807
|
hcLight: '#48985D'
|
|
833
|
-
}, (
|
|
834
|
-
'editorGutterAddedBackground',
|
|
835
|
-
"Editor gutter background color for lines that are added."
|
|
836
|
-
)));
|
|
808
|
+
}, nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'editorGutterAddedBackground', "Editor gutter background color for lines that are added."));
|
|
837
809
|
const editorGutterDeletedBackground = registerColor('editorGutter.deletedBackground', {
|
|
838
810
|
dark: editorErrorForeground,
|
|
839
811
|
light: editorErrorForeground,
|
|
840
812
|
hcDark: editorErrorForeground,
|
|
841
813
|
hcLight: editorErrorForeground
|
|
842
|
-
}, (
|
|
843
|
-
'editorGutterDeletedBackground',
|
|
844
|
-
"Editor gutter background color for lines that are deleted."
|
|
845
|
-
)));
|
|
814
|
+
}, nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'editorGutterDeletedBackground', "Editor gutter background color for lines that are deleted."));
|
|
846
815
|
registerColor('minimapGutter.modifiedBackground', {
|
|
847
816
|
dark: editorGutterModifiedBackground,
|
|
848
817
|
light: editorGutterModifiedBackground,
|
|
849
818
|
hcDark: editorGutterModifiedBackground,
|
|
850
819
|
hcLight: editorGutterModifiedBackground
|
|
851
|
-
}, (
|
|
852
|
-
'minimapGutterModifiedBackground',
|
|
853
|
-
"Minimap gutter background color for lines that are modified."
|
|
854
|
-
)));
|
|
820
|
+
}, nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'minimapGutterModifiedBackground', "Minimap gutter background color for lines that are modified."));
|
|
855
821
|
registerColor('minimapGutter.addedBackground', {
|
|
856
822
|
dark: editorGutterAddedBackground,
|
|
857
823
|
light: editorGutterAddedBackground,
|
|
858
824
|
hcDark: editorGutterAddedBackground,
|
|
859
825
|
hcLight: editorGutterAddedBackground
|
|
860
|
-
}, (
|
|
861
|
-
'minimapGutterAddedBackground',
|
|
862
|
-
"Minimap gutter background color for lines that are added."
|
|
863
|
-
)));
|
|
826
|
+
}, nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'minimapGutterAddedBackground', "Minimap gutter background color for lines that are added."));
|
|
864
827
|
registerColor('minimapGutter.deletedBackground', {
|
|
865
828
|
dark: editorGutterDeletedBackground,
|
|
866
829
|
light: editorGutterDeletedBackground,
|
|
867
830
|
hcDark: editorGutterDeletedBackground,
|
|
868
831
|
hcLight: editorGutterDeletedBackground
|
|
869
|
-
}, (
|
|
870
|
-
|
|
871
|
-
|
|
872
|
-
)));
|
|
873
|
-
registerColor('editorOverviewRuler.modifiedForeground', { dark: ( transparent(editorGutterModifiedBackground, 0.6)), light: ( transparent(editorGutterModifiedBackground, 0.6)), hcDark: ( transparent(editorGutterModifiedBackground, 0.6)), hcLight: ( transparent(editorGutterModifiedBackground, 0.6)) }, ( nls.localize(
|
|
874
|
-
'overviewRulerModifiedForeground',
|
|
875
|
-
'Overview ruler marker color for modified content.'
|
|
876
|
-
)));
|
|
877
|
-
registerColor('editorOverviewRuler.addedForeground', { dark: ( transparent(editorGutterAddedBackground, 0.6)), light: ( transparent(editorGutterAddedBackground, 0.6)), hcDark: ( transparent(editorGutterAddedBackground, 0.6)), hcLight: ( transparent(editorGutterAddedBackground, 0.6)) }, ( nls.localize(
|
|
878
|
-
'overviewRulerAddedForeground',
|
|
879
|
-
'Overview ruler marker color for added content.'
|
|
880
|
-
)));
|
|
881
|
-
registerColor('editorOverviewRuler.deletedForeground', { dark: ( transparent(editorGutterDeletedBackground, 0.6)), light: ( transparent(editorGutterDeletedBackground, 0.6)), hcDark: ( transparent(editorGutterDeletedBackground, 0.6)), hcLight: ( transparent(editorGutterDeletedBackground, 0.6)) }, ( nls.localize(
|
|
882
|
-
'overviewRulerDeletedForeground',
|
|
883
|
-
'Overview ruler marker color for deleted content.'
|
|
884
|
-
)));
|
|
832
|
+
}, nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'minimapGutterDeletedBackground', "Minimap gutter background color for lines that are deleted."));
|
|
833
|
+
registerColor('editorOverviewRuler.modifiedForeground', { dark: ( transparent(editorGutterModifiedBackground, 0.6)), light: ( transparent(editorGutterModifiedBackground, 0.6)), hcDark: ( transparent(editorGutterModifiedBackground, 0.6)), hcLight: ( transparent(editorGutterModifiedBackground, 0.6)) }, nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'overviewRulerModifiedForeground', 'Overview ruler marker color for modified content.'));
|
|
834
|
+
registerColor('editorOverviewRuler.addedForeground', { dark: ( transparent(editorGutterAddedBackground, 0.6)), light: ( transparent(editorGutterAddedBackground, 0.6)), hcDark: ( transparent(editorGutterAddedBackground, 0.6)), hcLight: ( transparent(editorGutterAddedBackground, 0.6)) }, nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'overviewRulerAddedForeground', 'Overview ruler marker color for added content.'));
|
|
835
|
+
registerColor('editorOverviewRuler.deletedForeground', { dark: ( transparent(editorGutterDeletedBackground, 0.6)), light: ( transparent(editorGutterDeletedBackground, 0.6)), hcDark: ( transparent(editorGutterDeletedBackground, 0.6)), hcLight: ( transparent(editorGutterDeletedBackground, 0.6)) }, nls.localizeWithPath('vs/workbench/contrib/scm/browser/dirtydiffDecorator', 'overviewRulerDeletedForeground', 'Overview ruler marker color for deleted content.'));
|
|
885
836
|
async function getOriginalResource(quickDiffService, uri, language, isSynchronized) {
|
|
886
837
|
const quickDiffs = await quickDiffService.getQuickDiffs(uri, language, isSynchronized);
|
|
887
838
|
return quickDiffs.length > 0 ? quickDiffs[0].originalResource : null;
|
|
@@ -4,7 +4,7 @@ import { compare, firstNonWhitespaceIndex, compareSubstring } from 'monaco-edito
|
|
|
4
4
|
import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js';
|
|
5
5
|
import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
|
|
6
6
|
import { SnippetParser } from 'monaco-editor/esm/vs/editor/contrib/snippet/browser/snippetParser.js';
|
|
7
|
-
import {
|
|
7
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
8
8
|
import { ISnippetsService } from './snippets.js';
|
|
9
9
|
import { Snippet } from './snippetsFile.js';
|
|
10
10
|
import { isPatternInWord } from 'monaco-editor/esm/vs/base/common/filters.js';
|
|
@@ -24,12 +24,7 @@ class SnippetCompletion {
|
|
|
24
24
|
constructor(snippet, range) {
|
|
25
25
|
this.snippet = snippet;
|
|
26
26
|
this.label = { label: snippet.prefix, description: snippet.name };
|
|
27
|
-
this.detail = (
|
|
28
|
-
'detail.snippet',
|
|
29
|
-
"{0} ({1})",
|
|
30
|
-
snippet.description || snippet.name,
|
|
31
|
-
snippet.source
|
|
32
|
-
));
|
|
27
|
+
this.detail = localizeWithPath('vs/workbench/contrib/snippets/browser/snippetCompletionProvider', 'detail.snippet', "{0} ({1})", snippet.description || snippet.name, snippet.source);
|
|
33
28
|
this.insertText = snippet.codeSnippet;
|
|
34
29
|
this.extensionId = snippet.extensionId;
|
|
35
30
|
this.range = range;
|
|
@@ -117,20 +112,10 @@ let SnippetCompletionProvider = class SnippetCompletionProvider {
|
|
|
117
112
|
const item = suggestions[i];
|
|
118
113
|
let to = i + 1;
|
|
119
114
|
for (; to < suggestions.length && item.label === suggestions[to].label; to++) {
|
|
120
|
-
suggestions[to].label.label = (
|
|
121
|
-
'snippetSuggest.longLabel',
|
|
122
|
-
"{0}, {1}",
|
|
123
|
-
suggestions[to].label.label,
|
|
124
|
-
suggestions[to].snippet.name
|
|
125
|
-
));
|
|
115
|
+
suggestions[to].label.label = localizeWithPath('vs/workbench/contrib/snippets/browser/snippetCompletionProvider', 'snippetSuggest.longLabel', "{0}, {1}", suggestions[to].label.label, suggestions[to].snippet.name);
|
|
126
116
|
}
|
|
127
117
|
if (to > i + 1) {
|
|
128
|
-
suggestions[i].label.label = (
|
|
129
|
-
'snippetSuggest.longLabel',
|
|
130
|
-
"{0}, {1}",
|
|
131
|
-
suggestions[i].label.label,
|
|
132
|
-
suggestions[i].snippet.name
|
|
133
|
-
));
|
|
118
|
+
suggestions[i].label.label = localizeWithPath('vs/workbench/contrib/snippets/browser/snippetCompletionProvider', 'snippetSuggest.longLabel', "{0}, {1}", suggestions[i].label.label, suggestions[i].snippet.name);
|
|
134
119
|
i = to;
|
|
135
120
|
}
|
|
136
121
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { parse, getNodeType } from 'monaco-editor/esm/vs/base/common/json.js';
|
|
2
|
-
import {
|
|
2
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
3
3
|
import { extname, basename } from 'monaco-editor/esm/vs/base/common/path.js';
|
|
4
4
|
import { SnippetParser, Placeholder, Variable, Text } from 'monaco-editor/esm/vs/editor/contrib/snippet/browser/snippetParser.js';
|
|
5
5
|
import { KnownSnippetVariableNames } from 'monaco-editor/esm/vs/editor/contrib/snippet/browser/snippetVariables.js';
|
|
@@ -200,14 +200,14 @@ class SnippetFile {
|
|
|
200
200
|
source = this._extension.displayName || this._extension.name;
|
|
201
201
|
}
|
|
202
202
|
else if (this.source === 2 ) {
|
|
203
|
-
source = (
|
|
203
|
+
source = localizeWithPath('vs/workbench/contrib/snippets/browser/snippetsFile', 'source.workspaceSnippetGlobal', "Workspace Snippet");
|
|
204
204
|
}
|
|
205
205
|
else {
|
|
206
206
|
if (this.isGlobalSnippets) {
|
|
207
|
-
source = (
|
|
207
|
+
source = localizeWithPath('vs/workbench/contrib/snippets/browser/snippetsFile', 'source.userSnippetGlobal', "Global User Snippet");
|
|
208
208
|
}
|
|
209
209
|
else {
|
|
210
|
-
source = (
|
|
210
|
+
source = localizeWithPath('vs/workbench/contrib/snippets/browser/snippetsFile', 'source.userSnippet', "User Snippet");
|
|
211
211
|
}
|
|
212
212
|
}
|
|
213
213
|
for (const _prefix of Iterable.wrap(prefix)) {
|
|
@@ -4,7 +4,7 @@ import * as resources from 'monaco-editor/esm/vs/base/common/resources.js';
|
|
|
4
4
|
import { isFalsyOrWhitespace } from 'monaco-editor/esm/vs/base/common/strings.js';
|
|
5
5
|
import { ILanguageService } from 'monaco-editor/esm/vs/editor/common/languages/language.js';
|
|
6
6
|
import { setSnippetSuggestSupport } from 'monaco-editor/esm/vs/editor/contrib/suggest/browser/suggest.js';
|
|
7
|
-
import {
|
|
7
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
8
8
|
import { IEnvironmentService } from 'monaco-editor/esm/vs/platform/environment/common/environment.js';
|
|
9
9
|
import { IFileService } from 'monaco-editor/esm/vs/platform/files/common/files.js';
|
|
10
10
|
import { ILifecycleService } from '../../../services/lifecycle/common/lifecycle.js';
|
|
@@ -28,42 +28,21 @@ var snippetExt;
|
|
|
28
28
|
( (function(snippetExt) {
|
|
29
29
|
function toValidSnippet(extension, snippet, languageService) {
|
|
30
30
|
if (isFalsyOrWhitespace(snippet.path)) {
|
|
31
|
-
extension.collector.error((
|
|
32
|
-
'invalid.path.0',
|
|
33
|
-
"Expected string in `contributes.{0}.path`. Provided value: {1}",
|
|
34
|
-
extension.description.name,
|
|
35
|
-
String(snippet.path)
|
|
36
|
-
)));
|
|
31
|
+
extension.collector.error(localizeWithPath('vs/workbench/contrib/snippets/browser/snippetsService', 'invalid.path.0', "Expected string in `contributes.{0}.path`. Provided value: {1}", extension.description.name, String(snippet.path)));
|
|
37
32
|
return null;
|
|
38
33
|
}
|
|
39
34
|
if (isFalsyOrWhitespace(snippet.language) && !snippet.path.endsWith('.code-snippets')) {
|
|
40
|
-
extension.collector.error((
|
|
41
|
-
'invalid.language.0',
|
|
42
|
-
"When omitting the language, the value of `contributes.{0}.path` must be a `.code-snippets`-file. Provided value: {1}",
|
|
43
|
-
extension.description.name,
|
|
44
|
-
String(snippet.path)
|
|
45
|
-
)));
|
|
35
|
+
extension.collector.error(localizeWithPath('vs/workbench/contrib/snippets/browser/snippetsService', 'invalid.language.0', "When omitting the language, the value of `contributes.{0}.path` must be a `.code-snippets`-file. Provided value: {1}", extension.description.name, String(snippet.path)));
|
|
46
36
|
return null;
|
|
47
37
|
}
|
|
48
38
|
if (!isFalsyOrWhitespace(snippet.language) && !languageService.isRegisteredLanguageId(snippet.language)) {
|
|
49
|
-
extension.collector.error((
|
|
50
|
-
'invalid.language',
|
|
51
|
-
"Unknown language in `contributes.{0}.language`. Provided value: {1}",
|
|
52
|
-
extension.description.name,
|
|
53
|
-
String(snippet.language)
|
|
54
|
-
)));
|
|
39
|
+
extension.collector.error(localizeWithPath('vs/workbench/contrib/snippets/browser/snippetsService', 'invalid.language', "Unknown language in `contributes.{0}.language`. Provided value: {1}", extension.description.name, String(snippet.language)));
|
|
55
40
|
return null;
|
|
56
41
|
}
|
|
57
42
|
const extensionLocation = extension.description.extensionLocation;
|
|
58
43
|
const snippetLocation = resources.joinPath(extensionLocation, snippet.path);
|
|
59
44
|
if (!resources.isEqualOrParent(snippetLocation, extensionLocation)) {
|
|
60
|
-
extension.collector.error((
|
|
61
|
-
'invalid.path.1',
|
|
62
|
-
"Expected `contributes.{0}.path` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.",
|
|
63
|
-
extension.description.name,
|
|
64
|
-
snippetLocation.path,
|
|
65
|
-
extensionLocation.path
|
|
66
|
-
)));
|
|
45
|
+
extension.collector.error(localizeWithPath('vs/workbench/contrib/snippets/browser/snippetsService', 'invalid.path.1', "Expected `contributes.{0}.path` ({1}) to be included inside extension's folder ({2}). This might make the extension non-portable.", extension.description.name, snippetLocation.path, extensionLocation.path));
|
|
67
46
|
return null;
|
|
68
47
|
}
|
|
69
48
|
return {
|
|
@@ -73,7 +52,7 @@ var snippetExt;
|
|
|
73
52
|
}
|
|
74
53
|
snippetExt.toValidSnippet = toValidSnippet;
|
|
75
54
|
snippetExt.snippetsContribution = {
|
|
76
|
-
description: (
|
|
55
|
+
description: localizeWithPath('vs/workbench/contrib/snippets/browser/snippetsService', 'vscode.extension.contributes.snippets', 'Contributes snippets.'),
|
|
77
56
|
type: 'array',
|
|
78
57
|
defaultSnippets: [{ body: [{ language: '', path: '' }] }],
|
|
79
58
|
items: {
|
|
@@ -81,17 +60,11 @@ var snippetExt;
|
|
|
81
60
|
defaultSnippets: [{ body: { language: '${1:id}', path: './snippets/${2:id}.json.' } }],
|
|
82
61
|
properties: {
|
|
83
62
|
language: {
|
|
84
|
-
description: (
|
|
85
|
-
'vscode.extension.contributes.snippets-language',
|
|
86
|
-
'Language identifier for which this snippet is contributed to.'
|
|
87
|
-
)),
|
|
63
|
+
description: localizeWithPath('vs/workbench/contrib/snippets/browser/snippetsService', 'vscode.extension.contributes.snippets-language', 'Language identifier for which this snippet is contributed to.'),
|
|
88
64
|
type: 'string'
|
|
89
65
|
},
|
|
90
66
|
path: {
|
|
91
|
-
description: (
|
|
92
|
-
'vscode.extension.contributes.snippets-path',
|
|
93
|
-
'Path of the snippets file. The path is relative to the extension folder and typically starts with \'./snippets/\'.'
|
|
94
|
-
)),
|
|
67
|
+
description: localizeWithPath('vs/workbench/contrib/snippets/browser/snippetsService', 'vscode.extension.contributes.snippets-path', 'Path of the snippets file. The path is relative to the extension folder and typically starts with \'./snippets/\'.'),
|
|
95
68
|
type: 'string'
|
|
96
69
|
}
|
|
97
70
|
}
|
|
@@ -333,14 +306,10 @@ let SnippetsService = class SnippetsService {
|
|
|
333
306
|
if (this._environmentService.isExtensionDevelopment) {
|
|
334
307
|
file.load().then(file => {
|
|
335
308
|
if (( file.data.some(snippet => snippet.isBogous))) {
|
|
336
|
-
extension.collector.warn((
|
|
337
|
-
'badVariableUse',
|
|
338
|
-
"One or more snippets from the extension '{0}' very likely confuse snippet-variables and snippet-placeholders (see https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax for more details)",
|
|
339
|
-
extension.description.name
|
|
340
|
-
)));
|
|
309
|
+
extension.collector.warn(localizeWithPath('vs/workbench/contrib/snippets/browser/snippetsService', 'badVariableUse', "One or more snippets from the extension '{0}' very likely confuse snippet-variables and snippet-placeholders (see https://code.visualstudio.com/docs/editor/userdefinedsnippets#_snippet-syntax for more details)", extension.description.name));
|
|
341
310
|
}
|
|
342
311
|
}, err => {
|
|
343
|
-
extension.collector.warn((
|
|
312
|
+
extension.collector.warn(localizeWithPath('vs/workbench/contrib/snippets/browser/snippetsService', 'badFile', "The snippet file \"{0}\" could not be read.", ( file.location.toString())));
|
|
344
313
|
});
|
|
345
314
|
}
|
|
346
315
|
}
|
|
@@ -10,10 +10,7 @@ const taskDefinitionSchema = {
|
|
|
10
10
|
properties: {
|
|
11
11
|
type: {
|
|
12
12
|
type: 'string',
|
|
13
|
-
description: (
|
|
14
|
-
'TaskDefinition.description',
|
|
15
|
-
'The actual task type. Please note that types starting with a \'$\' are reserved for internal usage.'
|
|
16
|
-
))
|
|
13
|
+
description: nls.localizeWithPath('vs/workbench/contrib/tasks/common/taskDefinitionRegistry', 'TaskDefinition.description', 'The actual task type. Please note that types starting with a \'$\' are reserved for internal usage.')
|
|
17
14
|
},
|
|
18
15
|
required: {
|
|
19
16
|
type: 'array',
|
|
@@ -23,17 +20,14 @@ const taskDefinitionSchema = {
|
|
|
23
20
|
},
|
|
24
21
|
properties: {
|
|
25
22
|
type: 'object',
|
|
26
|
-
description:
|
|
23
|
+
description: nls.localizeWithPath('vs/workbench/contrib/tasks/common/taskDefinitionRegistry', 'TaskDefinition.properties', 'Additional properties of the task type'),
|
|
27
24
|
additionalProperties: {
|
|
28
25
|
$ref: 'http://json-schema.org/draft-07/schema#'
|
|
29
26
|
}
|
|
30
27
|
},
|
|
31
28
|
when: {
|
|
32
29
|
type: 'string',
|
|
33
|
-
markdownDescription: (
|
|
34
|
-
'TaskDefinition.when',
|
|
35
|
-
'Condition which must be true to enable this type of task. Consider using `shellExecutionSupported`, `processExecutionSupported`, and `customExecutionSupported` as appropriate for this task definition. See the [API documentation](https://code.visualstudio.com/api/extension-guides/task-provider#when-clause) for more information.'
|
|
36
|
-
)),
|
|
30
|
+
markdownDescription: nls.localizeWithPath('vs/workbench/contrib/tasks/common/taskDefinitionRegistry', 'TaskDefinition.when', 'Condition which must be true to enable this type of task. Consider using `shellExecutionSupported`, `processExecutionSupported`, and `customExecutionSupported` as appropriate for this task definition. See the [API documentation](https://code.visualstudio.com/api/extension-guides/task-provider#when-clause) for more information.'),
|
|
37
31
|
default: ''
|
|
38
32
|
}
|
|
39
33
|
}
|
|
@@ -46,10 +40,7 @@ var Configuration;
|
|
|
46
40
|
}
|
|
47
41
|
const taskType = types.isString(value.type) ? value.type : undefined;
|
|
48
42
|
if (!taskType || taskType.length === 0) {
|
|
49
|
-
messageCollector.error((
|
|
50
|
-
'TaskTypeConfiguration.noType',
|
|
51
|
-
'The task type configuration is missing the required \'taskType\' property'
|
|
52
|
-
)));
|
|
43
|
+
messageCollector.error(nls.localizeWithPath('vs/workbench/contrib/tasks/common/taskDefinitionRegistry', 'TaskTypeConfiguration.noType', 'The task type configuration is missing the required \'taskType\' property'));
|
|
53
44
|
return undefined;
|
|
54
45
|
}
|
|
55
46
|
const required = [];
|
|
@@ -79,7 +70,7 @@ const taskDefinitionsExtPoint = ( ExtensionsRegistry.registerExtensionPoint({
|
|
|
79
70
|
}
|
|
80
71
|
},
|
|
81
72
|
jsonSchema: {
|
|
82
|
-
description:
|
|
73
|
+
description: nls.localizeWithPath('vs/workbench/contrib/tasks/common/taskDefinitionRegistry', 'TaskDefinitionExtPoint', 'Contributes task kinds'),
|
|
83
74
|
type: 'array',
|
|
84
75
|
items: taskDefinitionSchema
|
|
85
76
|
}
|
|
@@ -1,18 +1,31 @@
|
|
|
1
1
|
import * as nls from 'monaco-editor/esm/vs/nls.js';
|
|
2
2
|
import { createDecorator } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
|
|
3
|
-
import {
|
|
4
|
-
const CustomExecutionSupportedContext = ( new RawContextKey(
|
|
5
|
-
'
|
|
6
|
-
|
|
7
|
-
)
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
3
|
+
import { RawContextKey, ContextKeyExpr } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
|
|
4
|
+
const CustomExecutionSupportedContext = ( new RawContextKey(
|
|
5
|
+
'customExecutionSupported',
|
|
6
|
+
false,
|
|
7
|
+
nls.localizeWithPath('vs/workbench/contrib/tasks/common/taskService', 'tasks.customExecutionSupported', "Whether CustomExecution tasks are supported. Consider using in the when clause of a \'taskDefinition\' contribution.")
|
|
8
|
+
));
|
|
9
|
+
const ShellExecutionSupportedContext = ( new RawContextKey(
|
|
10
|
+
'shellExecutionSupported',
|
|
11
|
+
false,
|
|
12
|
+
nls.localizeWithPath('vs/workbench/contrib/tasks/common/taskService', 'tasks.shellExecutionSupported', "Whether ShellExecution tasks are supported. Consider using in the when clause of a \'taskDefinition\' contribution.")
|
|
13
|
+
));
|
|
14
|
+
( new RawContextKey(
|
|
15
|
+
'taskCommandsRegistered',
|
|
16
|
+
false,
|
|
17
|
+
nls.localizeWithPath('vs/workbench/contrib/tasks/common/taskService', 'tasks.taskCommandsRegistered', "Whether the task commands have been registered yet")
|
|
18
|
+
));
|
|
19
|
+
const ProcessExecutionSupportedContext = ( new RawContextKey(
|
|
20
|
+
'processExecutionSupported',
|
|
21
|
+
false,
|
|
22
|
+
nls.localizeWithPath('vs/workbench/contrib/tasks/common/taskService', 'tasks.processExecutionSupported', "Whether ProcessExecution tasks are supported. Consider using in the when clause of a \'taskDefinition\' contribution.")
|
|
23
|
+
));
|
|
24
|
+
( new RawContextKey(
|
|
25
|
+
'serverlessWebContext',
|
|
26
|
+
false,
|
|
27
|
+
nls.localizeWithPath('vs/workbench/contrib/tasks/common/taskService', 'tasks.serverlessWebContext', "True when in the web with no remote authority.")
|
|
28
|
+
));
|
|
16
29
|
const TaskExecutionSupportedContext = ( ContextKeyExpr.or(( ContextKeyExpr.and(ShellExecutionSupportedContext, ProcessExecutionSupportedContext)), CustomExecutionSupportedContext));
|
|
17
30
|
const ITaskService = ( createDecorator('taskService'));
|
|
18
31
|
export { CustomExecutionSupportedContext, ITaskService, ProcessExecutionSupportedContext, ShellExecutionSupportedContext, TaskExecutionSupportedContext };
|
|
@@ -2,8 +2,15 @@ import * as nls from 'monaco-editor/esm/vs/nls.js';
|
|
|
2
2
|
import * as types from 'monaco-editor/esm/vs/base/common/types.js';
|
|
3
3
|
import * as resources from 'monaco-editor/esm/vs/base/common/resources.js';
|
|
4
4
|
import * as objects from 'monaco-editor/esm/vs/base/common/objects.js';
|
|
5
|
+
import { RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
|
|
5
6
|
import { TaskDefinitionRegistry } from './taskDefinitionRegistry.js';
|
|
6
7
|
const USER_TASKS_GROUP_KEY = 'settings';
|
|
8
|
+
( new RawContextKey(
|
|
9
|
+
'taskRunning',
|
|
10
|
+
false,
|
|
11
|
+
nls.localizeWithPath('vs/workbench/contrib/tasks/common/tasks', 'tasks.taskRunningContext', "Whether a task is currently running.")
|
|
12
|
+
));
|
|
13
|
+
({ value: nls.localizeWithPath('vs/workbench/contrib/tasks/common/tasks', 'tasksCategory', "Tasks"), original: 'Tasks' });
|
|
7
14
|
const CUSTOMIZED_TASK_TYPE = '$customized';
|
|
8
15
|
var CommandOptions;
|
|
9
16
|
( (function(CommandOptions) {
|
|
@@ -485,12 +492,7 @@ var TaskDefinition;
|
|
|
485
492
|
literal[property] = '';
|
|
486
493
|
break;
|
|
487
494
|
default:
|
|
488
|
-
reporter.error((
|
|
489
|
-
'TaskDefinition.missingRequiredProperty',
|
|
490
|
-
'Error: the task identifier \'{0}\' is missing the required property \'{1}\'. The task identifier will be ignored.',
|
|
491
|
-
JSON.stringify(external, undefined, 0),
|
|
492
|
-
property
|
|
493
|
-
)));
|
|
495
|
+
reporter.error(nls.localizeWithPath('vs/workbench/contrib/tasks/common/tasks', 'TaskDefinition.missingRequiredProperty', 'Error: the task identifier \'{0}\' is missing the required property \'{1}\'. The task identifier will be ignored.', JSON.stringify(external, undefined, 0), property));
|
|
494
496
|
return undefined;
|
|
495
497
|
}
|
|
496
498
|
}
|
|
@@ -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 Severity from 'monaco-editor/esm/vs/base/common/severity.js';
|
|
4
4
|
import { toDisposable, dispose } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
5
5
|
import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
|
|
@@ -67,23 +67,11 @@ let TerminalEditorInput = class TerminalEditorInput extends EditorInput {
|
|
|
67
67
|
async confirm(terminals) {
|
|
68
68
|
const { confirmed } = await this._dialogService.confirm({
|
|
69
69
|
type: Severity.Warning,
|
|
70
|
-
message: (
|
|
71
|
-
|
|
72
|
-
"Do you want to terminate running processes?"
|
|
73
|
-
)),
|
|
74
|
-
primaryButton: ( localize(
|
|
75
|
-
{ key: 'confirmDirtyTerminal.button', comment: ['&& denotes a mnemonic'] },
|
|
76
|
-
"&&Terminate"
|
|
77
|
-
)),
|
|
70
|
+
message: localizeWithPath('vs/workbench/contrib/terminal/browser/terminalEditorInput', 'confirmDirtyTerminal.message', "Do you want to terminate running processes?"),
|
|
71
|
+
primaryButton: localizeWithPath('vs/workbench/contrib/terminal/browser/terminalEditorInput', { key: 'confirmDirtyTerminal.button', comment: ['&& denotes a mnemonic'] }, "&&Terminate"),
|
|
78
72
|
detail: terminals.length > 1 ?
|
|
79
|
-
( terminals.map(terminal => terminal.editor.getName())).join('\n') + '\n\n' + (
|
|
80
|
-
|
|
81
|
-
"Closing will terminate the running processes in the terminals."
|
|
82
|
-
)) :
|
|
83
|
-
( localize(
|
|
84
|
-
'confirmDirtyTerminal.detail',
|
|
85
|
-
"Closing will terminate the running processes in this terminal."
|
|
86
|
-
))
|
|
73
|
+
( terminals.map(terminal => terminal.editor.getName())).join('\n') + '\n\n' + localizeWithPath('vs/workbench/contrib/terminal/browser/terminalEditorInput', 'confirmDirtyTerminals.detail', "Closing will terminate the running processes in the terminals.") :
|
|
74
|
+
localizeWithPath('vs/workbench/contrib/terminal/browser/terminalEditorInput', 'confirmDirtyTerminal.detail', "Closing will terminate the running processes in this terminal.")
|
|
87
75
|
});
|
|
88
76
|
return confirmed ? 1 : 2 ;
|
|
89
77
|
}
|
|
@@ -166,18 +166,12 @@ const terminalContributionsDescriptor = {
|
|
|
166
166
|
}
|
|
167
167
|
},
|
|
168
168
|
jsonSchema: {
|
|
169
|
-
description: (
|
|
170
|
-
'vscode.extension.contributes.terminal',
|
|
171
|
-
'Contributes terminal functionality.'
|
|
172
|
-
)),
|
|
169
|
+
description: nls.localizeWithPath('vs/workbench/contrib/terminal/common/terminal', 'vscode.extension.contributes.terminal', 'Contributes terminal functionality.'),
|
|
173
170
|
type: 'object',
|
|
174
171
|
properties: {
|
|
175
172
|
profiles: {
|
|
176
173
|
type: 'array',
|
|
177
|
-
description: (
|
|
178
|
-
'vscode.extension.contributes.terminal.profiles',
|
|
179
|
-
"Defines additional terminal profiles that the user can create."
|
|
180
|
-
)),
|
|
174
|
+
description: nls.localizeWithPath('vs/workbench/contrib/terminal/common/terminal', 'vscode.extension.contributes.terminal.profiles', "Defines additional terminal profiles that the user can create."),
|
|
181
175
|
items: {
|
|
182
176
|
type: 'object',
|
|
183
177
|
required: ['id', 'title'],
|
|
@@ -189,24 +183,15 @@ const terminalContributionsDescriptor = {
|
|
|
189
183
|
}],
|
|
190
184
|
properties: {
|
|
191
185
|
id: {
|
|
192
|
-
description: (
|
|
193
|
-
'vscode.extension.contributes.terminal.profiles.id',
|
|
194
|
-
"The ID of the terminal profile provider."
|
|
195
|
-
)),
|
|
186
|
+
description: nls.localizeWithPath('vs/workbench/contrib/terminal/common/terminal', 'vscode.extension.contributes.terminal.profiles.id', "The ID of the terminal profile provider."),
|
|
196
187
|
type: 'string',
|
|
197
188
|
},
|
|
198
189
|
title: {
|
|
199
|
-
description: (
|
|
200
|
-
'vscode.extension.contributes.terminal.profiles.title',
|
|
201
|
-
"Title for this terminal profile."
|
|
202
|
-
)),
|
|
190
|
+
description: nls.localizeWithPath('vs/workbench/contrib/terminal/common/terminal', 'vscode.extension.contributes.terminal.profiles.title', "Title for this terminal profile."),
|
|
203
191
|
type: 'string',
|
|
204
192
|
},
|
|
205
193
|
icon: {
|
|
206
|
-
description: (
|
|
207
|
-
'vscode.extension.contributes.terminal.types.icon',
|
|
208
|
-
"A codicon, URI, or light and dark URIs to associate with this terminal type."
|
|
209
|
-
)),
|
|
194
|
+
description: nls.localizeWithPath('vs/workbench/contrib/terminal/common/terminal', 'vscode.extension.contributes.terminal.types.icon', "A codicon, URI, or light and dark URIs to associate with this terminal type."),
|
|
210
195
|
anyOf: [{
|
|
211
196
|
type: 'string',
|
|
212
197
|
},
|
|
@@ -214,17 +199,11 @@ const terminalContributionsDescriptor = {
|
|
|
214
199
|
type: 'object',
|
|
215
200
|
properties: {
|
|
216
201
|
light: {
|
|
217
|
-
description: (
|
|
218
|
-
'vscode.extension.contributes.terminal.types.icon.light',
|
|
219
|
-
'Icon path when a light theme is used'
|
|
220
|
-
)),
|
|
202
|
+
description: nls.localizeWithPath('vs/workbench/contrib/terminal/common/terminal', 'vscode.extension.contributes.terminal.types.icon.light', 'Icon path when a light theme is used'),
|
|
221
203
|
type: 'string'
|
|
222
204
|
},
|
|
223
205
|
dark: {
|
|
224
|
-
description: (
|
|
225
|
-
'vscode.extension.contributes.terminal.types.icon.dark',
|
|
226
|
-
'Icon path when a dark theme is used'
|
|
227
|
-
)),
|
|
206
|
+
description: nls.localizeWithPath('vs/workbench/contrib/terminal/common/terminal', 'vscode.extension.contributes.terminal.types.icon.dark', 'Icon path when a dark theme is used'),
|
|
228
207
|
type: 'string'
|
|
229
208
|
}
|
|
230
209
|
}
|