@codingame/monaco-vscode-api 1.83.4 → 1.83.6
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/lifecycle.js +3 -1
- package/missing-services.js +32 -28
- package/monaco-editor-treemending.patch +786 -760
- package/monaco.js +1 -0
- package/package.json +1 -1
- package/service-override/extensions.js +5 -5
- package/service-override/files.js +37 -13
- package/service-override/keybindings.js +10 -4
- package/service-override/layout.js +1 -3
- package/services.d.ts +13 -2
- package/services.js +35 -5
- package/vscode/src/vs/base/browser/broadcast.js +52 -0
- package/vscode/src/vs/base/browser/ui/menu/menubar.js +1 -1
- package/vscode/src/vs/base/browser/ui/splitview/paneview.js +6 -1
- package/vscode/src/vs/base/common/date.js +244 -54
- package/vscode/src/vs/base/common/jsonErrorMessages.js +45 -9
- package/vscode/src/vs/editor/common/services/textResourceConfiguration.d.ts +65 -0
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.js +33 -5
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js +165 -32
- package/vscode/src/vs/platform/dialogs/common/dialogs.js +30 -9
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.js +0 -3
- package/vscode/src/vs/platform/extensionManagement/common/extensionNls.js +6 -1
- package/vscode/src/vs/platform/files/browser/indexedDBFileSystemProvider.js +404 -0
- package/vscode/src/vs/platform/files/common/fileService.js +13 -2
- package/vscode/src/vs/platform/files/common/files.js +25 -5
- package/vscode/src/vs/platform/keyboardLayout/common/keyboardConfig.js +15 -3
- package/vscode/src/vs/platform/quickinput/browser/commandsQuickAccess.js +38 -7
- package/vscode/src/vs/platform/quickinput/browser/helpQuickAccess.js +7 -1
- package/vscode/src/vs/platform/request/common/request.js +1 -1
- package/vscode/src/vs/platform/theme/common/tokenClassificationRegistry.js +210 -42
- package/vscode/src/vs/workbench/api/browser/mainThreadAuthentication.js +73 -13
- package/vscode/src/vs/workbench/api/browser/mainThreadComments.js +5 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadCustomEditors.js +11 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.js +5 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadExtensionService.js +70 -35
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystemEventService.js +108 -20
- package/vscode/src/vs/workbench/api/browser/mainThreadMessageService.js +17 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js +5 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadProgress.js +5 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadSaveParticipant.js +5 -3
- package/vscode/src/vs/workbench/api/browser/mainThreadTask.js +7 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js +14 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadUriOpeners.js +12 -14
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviews.js +6 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadWorkspace.js +32 -5
- package/vscode/src/vs/workbench/api/browser/statusBarExtensionPoint.js +0 -60
- package/vscode/src/vs/workbench/api/common/extHostChat.js +11 -2
- package/vscode/src/vs/workbench/api/common/extHostDiagnostics.js +6 -1
- package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js +12 -2
- package/vscode/src/vs/workbench/api/common/extHostLogService.js +9 -1
- package/vscode/src/vs/workbench/api/common/extHostProgress.js +6 -1
- package/vscode/src/vs/workbench/api/common/extHostStatusBar.js +11 -2
- package/vscode/src/vs/workbench/api/common/extHostTelemetry.js +6 -1
- package/vscode/src/vs/workbench/api/common/extHostTerminalService.js +6 -1
- package/vscode/src/vs/workbench/api/common/extHostTunnelService.js +10 -2
- package/vscode/src/vs/workbench/api/common/extHostWorkspace.js +7 -1
- package/vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js +49 -9
- package/vscode/src/vs/workbench/browser/actions/layoutActions.js +397 -274
- package/vscode/src/vs/workbench/browser/actions/quickAccessActions.js +30 -6
- package/vscode/src/vs/workbench/browser/actions/windowActions.js +85 -31
- package/vscode/src/vs/workbench/browser/actions/workspaceActions.js +56 -102
- package/vscode/src/vs/workbench/browser/actions/workspaceCommands.js +5 -1
- package/vscode/src/vs/workbench/browser/editor.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.js +55 -11
- package/vscode/src/vs/workbench/browser/parts/compositeBarActions.js +63 -11
- package/vscode/src/vs/workbench/browser/parts/editor/binaryDiffEditor.js +7 -1
- package/vscode/src/vs/workbench/browser/parts/editor/binaryEditor.js +15 -3
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbs.js +205 -41
- package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution.js +617 -139
- package/vscode/src/vs/workbench/browser/parts/editor/editorActions.js +578 -114
- package/vscode/src/vs/workbench/browser/parts/editor/editorCommands.js +96 -20
- package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js +30 -6
- package/vscode/src/vs/workbench/browser/parts/editor/editorPlaceholder.js +46 -9
- package/vscode/src/vs/workbench/browser/parts/editor/editorQuickAccess.js +30 -5
- package/vscode/src/vs/workbench/browser/parts/editor/editorStatus.js +309 -59
- package/vscode/src/vs/workbench/browser/parts/editor/sideBySideEditor.js +5 -1
- package/vscode/src/vs/workbench/browser/parts/editor/textCodeEditor.js +5 -1
- package/vscode/src/vs/workbench/browser/parts/editor/textDiffEditor.js +16 -3
- package/vscode/src/vs/workbench/browser/parts/editor/textEditor.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCommands.js +35 -7
- package/vscode/src/vs/workbench/browser/parts/panel/panelActions.js +185 -33
- package/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.js +90 -57
- package/vscode/src/vs/workbench/browser/parts/views/viewFilter.js +5 -1
- package/vscode/src/vs/workbench/browser/parts/views/viewPane.js +16 -3
- package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js +26 -6
- package/vscode/src/vs/workbench/browser/parts/views/viewsService.js +35 -6
- package/vscode/src/vs/workbench/browser/quickaccess.js +6 -6
- package/vscode/src/vs/workbench/browser/workbench.contribution.js +918 -185
- package/vscode/src/vs/workbench/common/configuration.js +25 -11
- package/vscode/src/vs/workbench/common/contextkeys.js +244 -228
- package/vscode/src/vs/workbench/common/editor/diffEditorInput.js +7 -1
- package/vscode/src/vs/workbench/common/editor/resourceEditorInput.d.ts +44 -0
- package/vscode/src/vs/workbench/common/editor/sideBySideEditorInput.js +7 -1
- package/vscode/src/vs/workbench/common/editor/textEditorModel.js +6 -1
- package/vscode/src/vs/workbench/common/editor/textResourceEditorInput.d.ts +23 -0
- package/vscode/src/vs/workbench/common/editor.d.ts +26 -1
- package/vscode/src/vs/workbench/common/editor.js +26 -5
- package/vscode/src/vs/workbench/common/theme.js +676 -136
- package/vscode/src/vs/workbench/common/views.js +8 -3
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.js +71 -14
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityContributions.js +21 -2
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleView.js +133 -21
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.js +36 -8
- package/vscode/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.js +96 -17
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatActions.js +0 -2
- package/vscode/src/vs/workbench/contrib/chat/common/chatAgents.js +22 -4
- package/vscode/src/vs/workbench/contrib/chat/common/chatSlashCommands.js +22 -4
- package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js +41 -8
- package/vscode/src/vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint.js +25 -5
- package/vscode/src/vs/workbench/contrib/codeActions/common/documentationExtensionPoint.js +30 -6
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js +34 -6
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/editorFeatures.js +44 -0
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.js +10 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint.js +320 -63
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.js +12 -4
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.js +15 -3
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.js +30 -6
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.js +25 -4
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.js +10 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.js +20 -4
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.js +10 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.js +10 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js +25 -9
- package/vscode/src/vs/workbench/contrib/comments/browser/commentColors.js +30 -6
- package/vscode/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.js +25 -5
- package/vscode/src/vs/workbench/contrib/comments/browser/commentNode.js +16 -3
- package/vscode/src/vs/workbench/contrib/comments/browser/commentReply.js +8 -4
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadBody.js +23 -3
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadHeader.js +15 -9
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadWidget.js +18 -3
- package/vscode/src/vs/workbench/contrib/comments/browser/comments.contribution.js +142 -26
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsController.js +33 -5
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.js +45 -7
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsView.js +63 -10
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsViewActions.js +45 -9
- package/vscode/src/vs/workbench/contrib/comments/browser/reactionsAction.js +16 -8
- package/vscode/src/vs/workbench/contrib/comments/common/commentContextKeys.js +41 -21
- package/vscode/src/vs/workbench/contrib/comments/common/commentModel.js +5 -1
- package/vscode/src/vs/workbench/contrib/customEditor/common/customEditor.js +5 -1
- package/vscode/src/vs/workbench/contrib/debug/browser/debugColors.js +60 -12
- package/vscode/src/vs/workbench/contrib/debug/browser/debugIcons.js +275 -55
- package/vscode/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.js +7 -1
- package/vscode/src/vs/workbench/contrib/debug/common/debug.js +255 -94
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsIcons.js +120 -24
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/configuration.js +22 -4
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.js +21 -4
- package/vscode/src/vs/workbench/contrib/files/browser/explorerViewlet.js +39 -51
- package/vscode/src/vs/workbench/contrib/files/browser/fileActions.js +394 -75
- package/vscode/src/vs/workbench/contrib/files/browser/fileConstants.js +17 -6
- package/vscode/src/vs/workbench/contrib/files/browser/fileImportExport.js +190 -32
- package/vscode/src/vs/workbench/contrib/files/browser/views/emptyView.js +5 -1
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.js +21 -4
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerView.js +26 -5
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.js +81 -14
- package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js +26 -5
- package/vscode/src/vs/workbench/contrib/files/common/files.js +70 -26
- package/vscode/src/vs/workbench/contrib/folding/browser/folding.contribution.js +11 -3
- package/vscode/src/vs/workbench/contrib/format/browser/formatModified.js +5 -1
- package/vscode/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.js +20 -4
- package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.js +75 -111
- package/vscode/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.js +5 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js +6 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js +151 -29
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js +10 -2
- package/vscode/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.js +0 -42
- package/vscode/src/vs/workbench/contrib/output/browser/output.contribution.js +115 -23
- package/vscode/src/vs/workbench/contrib/output/browser/outputView.js +17 -3
- package/vscode/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.js +49 -9
- package/vscode/src/vs/workbench/contrib/quickaccess/browser/quickAccess.contribution.js +66 -13
- package/vscode/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.js +52 -10
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.js +10 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js +110 -26
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.js +21 -3
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsFile.js +15 -3
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsService.js +56 -9
- package/vscode/src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.js +25 -5
- package/vscode/src/vs/workbench/contrib/tasks/common/taskService.js +16 -26
- package/vscode/src/vs/workbench/contrib/tasks/common/tasks.js +7 -8
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.js +20 -4
- package/vscode/src/vs/workbench/contrib/terminal/common/terminal.js +35 -7
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.js +106 -21
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalContextKey.js +81 -21
- package/vscode/src/vs/workbench/contrib/testing/common/testResult.js +6 -1
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.js +6 -2
- package/vscode/src/vs/workbench/services/actions/common/menusExtensionPoint.js +592 -112
- package/vscode/src/vs/workbench/services/assignment/common/assignmentService.js +5 -1
- package/vscode/src/vs/workbench/services/authentication/browser/authenticationService.js +6 -32
- package/vscode/src/vs/workbench/services/configuration/common/jsonEditingService.js +5 -1
- package/vscode/src/vs/workbench/services/decorations/browser/decorationsService.js +5 -1
- package/vscode/src/vs/workbench/services/editor/common/editorResolverService.js +5 -1
- package/vscode/src/vs/workbench/services/extensions/browser/extensionUrlHandler.js +15 -3
- package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js +58 -10
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.js +5 -1
- package/vscode/src/vs/workbench/services/extensions/common/extensionsRegistry.js +392 -80
- package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.js +28 -5
- package/vscode/src/vs/workbench/services/host/browser/browserHostService.js +10 -2
- package/vscode/src/vs/workbench/services/keybinding/browser/keybindingService.js +129 -24
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.js +10 -2
- package/vscode/src/vs/workbench/services/keybinding/common/keybindingEditing.js +20 -10
- package/vscode/src/vs/workbench/services/language/common/languageService.js +122 -22
- package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js +28 -9
- package/vscode/src/vs/workbench/services/search/common/queryBuilder.js +6 -1
- package/vscode/src/vs/workbench/services/textfile/browser/textFileService.js +48 -9
- package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModel.js +5 -1
- package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModelManager.js +7 -1
- package/vscode/src/vs/workbench/services/textfile/common/textFileSaveParticipant.js +6 -1
- package/vscode/src/vs/workbench/services/themes/common/colorExtensionPoint.js +81 -16
- package/vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js +1 -50
- package/vscode/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.js +126 -25
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfile.js +6 -5
- package/vscode/src/vs/workbench/services/userDataSync/common/userDataSync.js +6 -14
- package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopySaveParticipant.js +6 -1
|
@@ -21,18 +21,26 @@ let LargeFileOptimizationsWarner = class LargeFileOptimizationsWarner extends Di
|
|
|
21
21
|
return;
|
|
22
22
|
}
|
|
23
23
|
if (model.isTooLargeForTokenization()) {
|
|
24
|
-
const message = nls.localizeWithPath('vs/workbench/contrib/codeEditor/browser/largeFileOptimizations', {
|
|
24
|
+
const message = ( nls.localizeWithPath('vs/workbench/contrib/codeEditor/browser/largeFileOptimizations', {
|
|
25
25
|
key: 'largeFile',
|
|
26
26
|
comment: [
|
|
27
27
|
'Variable 0 will be a file name.'
|
|
28
28
|
]
|
|
29
|
-
}, "{0}: tokenization, wrapping, folding, codelens, word highlighting and sticky scroll have been turned off for this large file in order to reduce memory usage and avoid freezing or crashing.", path.basename(model.uri.path));
|
|
29
|
+
}, "{0}: tokenization, wrapping, folding, codelens, word highlighting and sticky scroll have been turned off for this large file in order to reduce memory usage and avoid freezing or crashing.", path.basename(model.uri.path)));
|
|
30
30
|
this._notificationService.prompt(Severity.Info, message, [
|
|
31
31
|
{
|
|
32
|
-
label: nls.localizeWithPath(
|
|
32
|
+
label: ( nls.localizeWithPath(
|
|
33
|
+
'vs/workbench/contrib/codeEditor/browser/largeFileOptimizations',
|
|
34
|
+
'removeOptimizations',
|
|
35
|
+
"Forcefully Enable Features"
|
|
36
|
+
)),
|
|
33
37
|
run: () => {
|
|
34
38
|
this._configurationService.updateValue(`editor.largeFileOptimizations`, false).then(() => {
|
|
35
|
-
this._notificationService.info(nls.localizeWithPath(
|
|
39
|
+
this._notificationService.info(( nls.localizeWithPath(
|
|
40
|
+
'vs/workbench/contrib/codeEditor/browser/largeFileOptimizations',
|
|
41
|
+
'reopenFilePrompt',
|
|
42
|
+
"Please reopen file in order for this setting to take effect."
|
|
43
|
+
)));
|
|
36
44
|
}, (err) => {
|
|
37
45
|
this._notificationService.error(err);
|
|
38
46
|
});
|
package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.js
CHANGED
|
@@ -50,7 +50,11 @@ class GotoLineAction extends Action2 {
|
|
|
50
50
|
constructor() {
|
|
51
51
|
super({
|
|
52
52
|
id: GotoLineAction.ID,
|
|
53
|
-
title: { value: localizeWithPath(
|
|
53
|
+
title: { value: ( localizeWithPath(
|
|
54
|
+
'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess',
|
|
55
|
+
'gotoLine',
|
|
56
|
+
"Go to Line/Column..."
|
|
57
|
+
)), original: 'Go to Line/Column...' },
|
|
54
58
|
f1: true,
|
|
55
59
|
keybinding: {
|
|
56
60
|
weight: 200 ,
|
|
@@ -68,7 +72,15 @@ registerAction2(GotoLineAction);
|
|
|
68
72
|
( Registry.as(Extensions.Quickaccess)).registerQuickAccessProvider({
|
|
69
73
|
ctor: GotoLineQuickAccessProvider,
|
|
70
74
|
prefix: AbstractGotoLineQuickAccessProvider.PREFIX,
|
|
71
|
-
placeholder:
|
|
72
|
-
|
|
75
|
+
placeholder: ( localizeWithPath(
|
|
76
|
+
'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess',
|
|
77
|
+
'gotoLineQuickAccessPlaceholder',
|
|
78
|
+
"Type the line number and optional column to go to (e.g. 42:5 for line 42 and column 5)."
|
|
79
|
+
)),
|
|
80
|
+
helpEntries: [{ description: ( localizeWithPath(
|
|
81
|
+
'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess',
|
|
82
|
+
'gotoLineQuickAccess',
|
|
83
|
+
"Go to Line/Column"
|
|
84
|
+
)), commandId: GotoLineAction.ID }]
|
|
73
85
|
});
|
|
74
86
|
export { GotoLineQuickAccessProvider };
|
package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.js
CHANGED
|
@@ -137,7 +137,11 @@ let GotoSymbolQuickAccessProvider = class GotoSymbolQuickAccessProvider extends
|
|
|
137
137
|
return true;
|
|
138
138
|
});
|
|
139
139
|
if (filteredItems.length === 0) {
|
|
140
|
-
const label = localizeWithPath(
|
|
140
|
+
const label = ( localizeWithPath(
|
|
141
|
+
'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess',
|
|
142
|
+
'empty',
|
|
143
|
+
'No matching entries'
|
|
144
|
+
));
|
|
141
145
|
picker.items = [{ label, index: -1, kind: 14 }];
|
|
142
146
|
picker.ariaLabel = label;
|
|
143
147
|
}
|
|
@@ -181,8 +185,16 @@ class GotoSymbolAction extends Action2 {
|
|
|
181
185
|
super({
|
|
182
186
|
id: GotoSymbolAction.ID,
|
|
183
187
|
title: {
|
|
184
|
-
value: localizeWithPath(
|
|
185
|
-
|
|
188
|
+
value: ( localizeWithPath(
|
|
189
|
+
'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess',
|
|
190
|
+
'gotoSymbol',
|
|
191
|
+
"Go to Symbol in Editor..."
|
|
192
|
+
)),
|
|
193
|
+
mnemonicTitle: ( localizeWithPath(
|
|
194
|
+
'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess',
|
|
195
|
+
{ key: 'miGotoSymbolInEditor', comment: ['&& denotes a mnemonic'] },
|
|
196
|
+
"Go to &&Symbol in Editor..."
|
|
197
|
+
)),
|
|
186
198
|
original: 'Go to Symbol in Editor...'
|
|
187
199
|
},
|
|
188
200
|
f1: true,
|
|
@@ -207,16 +219,28 @@ registerAction2(GotoSymbolAction);
|
|
|
207
219
|
ctor: GotoSymbolQuickAccessProvider,
|
|
208
220
|
prefix: AbstractGotoSymbolQuickAccessProvider.PREFIX,
|
|
209
221
|
contextKey: 'inFileSymbolsPicker',
|
|
210
|
-
placeholder: localizeWithPath(
|
|
222
|
+
placeholder: ( localizeWithPath(
|
|
223
|
+
'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess',
|
|
224
|
+
'gotoSymbolQuickAccessPlaceholder',
|
|
225
|
+
"Type the name of a symbol to go to."
|
|
226
|
+
)),
|
|
211
227
|
helpEntries: [
|
|
212
228
|
{
|
|
213
|
-
description: localizeWithPath(
|
|
229
|
+
description: ( localizeWithPath(
|
|
230
|
+
'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess',
|
|
231
|
+
'gotoSymbolQuickAccess',
|
|
232
|
+
"Go to Symbol in Editor"
|
|
233
|
+
)),
|
|
214
234
|
prefix: AbstractGotoSymbolQuickAccessProvider.PREFIX,
|
|
215
235
|
commandId: GotoSymbolAction.ID,
|
|
216
236
|
commandCenterOrder: 40
|
|
217
237
|
},
|
|
218
238
|
{
|
|
219
|
-
description: localizeWithPath(
|
|
239
|
+
description: ( localizeWithPath(
|
|
240
|
+
'vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess',
|
|
241
|
+
'gotoSymbolByCategoryQuickAccess',
|
|
242
|
+
"Go to Symbol in Editor by Category"
|
|
243
|
+
)),
|
|
220
244
|
prefix: AbstractGotoSymbolQuickAccessProvider.PREFIX_BY_CATEGORY
|
|
221
245
|
}
|
|
222
246
|
]
|
|
@@ -180,7 +180,13 @@ let FormatOnSaveParticipant = class FormatOnSaveParticipant {
|
|
|
180
180
|
const overrides = { overrideIdentifier: textEditorModel.getLanguageId(), resource: textEditorModel.uri };
|
|
181
181
|
const nestedProgress = ( new Progress(provider => {
|
|
182
182
|
progress.report({
|
|
183
|
-
message:
|
|
183
|
+
message: ( localizeWithPath(
|
|
184
|
+
'vs/workbench/contrib/codeEditor/browser/saveParticipants',
|
|
185
|
+
{ key: 'formatting2', comment: ['[configure]({1}) is a link. Only translate `configure`. Do not change brackets and parentheses or {1}'] },
|
|
186
|
+
"Running '{0}' Formatter ([configure]({1})).",
|
|
187
|
+
provider.displayName || provider.extensionId && provider.extensionId.value || '???',
|
|
188
|
+
'command:workbench.action.openSettings?%5B%22editor.formatOnSave%22%5D'
|
|
189
|
+
))
|
|
184
190
|
});
|
|
185
191
|
}));
|
|
186
192
|
const enabled = this.configurationService.getValue('editor.formatOnSave', overrides);
|
|
@@ -257,7 +263,11 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
|
|
|
257
263
|
const excludedActions = ( ( Object.keys(setting))
|
|
258
264
|
.filter(x => convertedSetting[x] === 'never' || false)
|
|
259
265
|
.map(x => ( new CodeActionKind(x))));
|
|
260
|
-
progress.report({ message: localizeWithPath(
|
|
266
|
+
progress.report({ message: ( localizeWithPath(
|
|
267
|
+
'vs/workbench/contrib/codeEditor/browser/saveParticipants',
|
|
268
|
+
'codeaction',
|
|
269
|
+
"Quick Fixes"
|
|
270
|
+
)) });
|
|
261
271
|
const filteredSaveList = codeActionsOnSave.filter(x => convertedSetting[x.value] === 'always' || (convertedSetting[x.value] === 'explicit') && env.reason === 1 );
|
|
262
272
|
await this.applyOnSaveActions(textEditorModel, filteredSaveList, excludedActions, progress, token);
|
|
263
273
|
}
|
|
@@ -274,7 +284,13 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
|
|
|
274
284
|
}
|
|
275
285
|
_report() {
|
|
276
286
|
progress.report({
|
|
277
|
-
message:
|
|
287
|
+
message: ( localizeWithPath(
|
|
288
|
+
'vs/workbench/contrib/codeEditor/browser/saveParticipants',
|
|
289
|
+
{ key: 'codeaction.get2', comment: ['[configure]({1}) is a link. Only translate `configure`. Do not change brackets and parentheses or {1}'] },
|
|
290
|
+
"Getting code actions from '{0}' ([configure]({1})).",
|
|
291
|
+
( [...this._names].map(name => `'${name}'`)).join(', '),
|
|
292
|
+
'command:workbench.action.openSettings?%5B%22editor.codeActionsOnSave%22%5D'
|
|
293
|
+
))
|
|
278
294
|
});
|
|
279
295
|
}
|
|
280
296
|
report(provider) {
|
|
@@ -292,7 +308,12 @@ let CodeActionOnSaveParticipant = class CodeActionOnSaveParticipant {
|
|
|
292
308
|
}
|
|
293
309
|
try {
|
|
294
310
|
for (const action of actionsToRun.validActions) {
|
|
295
|
-
progress.report({ message: localizeWithPath(
|
|
311
|
+
progress.report({ message: ( localizeWithPath(
|
|
312
|
+
'vs/workbench/contrib/codeEditor/browser/saveParticipants',
|
|
313
|
+
'codeAction.apply',
|
|
314
|
+
"Applying code action '{0}'.",
|
|
315
|
+
action.action.title
|
|
316
|
+
)) });
|
|
296
317
|
await this.instantiationService.invokeFunction(applyCodeAction, action, ApplyCodeActionReason.OnSave, {}, token);
|
|
297
318
|
if (token.isCancellationRequested) {
|
|
298
319
|
return;
|
|
@@ -9,9 +9,17 @@ class ToggleMinimapAction extends Action2 {
|
|
|
9
9
|
super({
|
|
10
10
|
id: ToggleMinimapAction.ID,
|
|
11
11
|
title: {
|
|
12
|
-
value: localizeWithPath(
|
|
12
|
+
value: ( localizeWithPath(
|
|
13
|
+
'vs/workbench/contrib/codeEditor/browser/toggleMinimap',
|
|
14
|
+
'toggleMinimap',
|
|
15
|
+
"Toggle Minimap"
|
|
16
|
+
)),
|
|
13
17
|
original: 'Toggle Minimap',
|
|
14
|
-
mnemonicTitle: localizeWithPath(
|
|
18
|
+
mnemonicTitle: ( localizeWithPath(
|
|
19
|
+
'vs/workbench/contrib/codeEditor/browser/toggleMinimap',
|
|
20
|
+
{ key: 'miMinimap', comment: ['&& denotes a mnemonic'] },
|
|
21
|
+
"&&Minimap"
|
|
22
|
+
))
|
|
15
23
|
},
|
|
16
24
|
category: Categories.View,
|
|
17
25
|
f1: true,
|
|
@@ -12,7 +12,11 @@ class ToggleMultiCursorModifierAction extends Action2 {
|
|
|
12
12
|
constructor() {
|
|
13
13
|
super({
|
|
14
14
|
id: ToggleMultiCursorModifierAction.ID,
|
|
15
|
-
title: { value: localizeWithPath(
|
|
15
|
+
title: { value: ( localizeWithPath(
|
|
16
|
+
'vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier',
|
|
17
|
+
'toggleLocation',
|
|
18
|
+
"Toggle Multi-Cursor Modifier"
|
|
19
|
+
)), original: 'Toggle Multi-Cursor Modifier' },
|
|
16
20
|
f1: true
|
|
17
21
|
});
|
|
18
22
|
}
|
|
@@ -51,7 +55,11 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSelectionMenu, {
|
|
|
51
55
|
group: '4_config',
|
|
52
56
|
command: {
|
|
53
57
|
id: ToggleMultiCursorModifierAction.ID,
|
|
54
|
-
title: localizeWithPath(
|
|
58
|
+
title: ( localizeWithPath(
|
|
59
|
+
'vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier',
|
|
60
|
+
'miMultiCursorAlt',
|
|
61
|
+
"Switch to Alt+Click for Multi-Cursor"
|
|
62
|
+
))
|
|
55
63
|
},
|
|
56
64
|
when: ( multiCursorModifier.isEqualTo('ctrlCmd')),
|
|
57
65
|
order: 1
|
|
@@ -61,8 +69,16 @@ MenuRegistry.appendMenuItem(MenuId.MenubarSelectionMenu, {
|
|
|
61
69
|
command: {
|
|
62
70
|
id: ToggleMultiCursorModifierAction.ID,
|
|
63
71
|
title: (isMacintosh
|
|
64
|
-
? localizeWithPath(
|
|
65
|
-
|
|
72
|
+
? ( localizeWithPath(
|
|
73
|
+
'vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier',
|
|
74
|
+
'miMultiCursorCmd',
|
|
75
|
+
"Switch to Cmd+Click for Multi-Cursor"
|
|
76
|
+
))
|
|
77
|
+
: ( localizeWithPath(
|
|
78
|
+
'vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier',
|
|
79
|
+
'miMultiCursorCtrl',
|
|
80
|
+
"Switch to Ctrl+Click for Multi-Cursor"
|
|
81
|
+
)))
|
|
66
82
|
},
|
|
67
83
|
when: ( multiCursorModifier.isEqualTo('altKey')),
|
|
68
84
|
order: 1
|
|
@@ -9,8 +9,16 @@ class ToggleRenderControlCharacterAction extends Action2 {
|
|
|
9
9
|
super({
|
|
10
10
|
id: ToggleRenderControlCharacterAction.ID,
|
|
11
11
|
title: {
|
|
12
|
-
value: localizeWithPath(
|
|
13
|
-
|
|
12
|
+
value: ( localizeWithPath(
|
|
13
|
+
'vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter',
|
|
14
|
+
'toggleRenderControlCharacters',
|
|
15
|
+
"Toggle Control Characters"
|
|
16
|
+
)),
|
|
17
|
+
mnemonicTitle: ( localizeWithPath(
|
|
18
|
+
'vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter',
|
|
19
|
+
{ key: 'miToggleRenderControlCharacters', comment: ['&& denotes a mnemonic'] },
|
|
20
|
+
"Render &&Control Characters"
|
|
21
|
+
)),
|
|
14
22
|
original: 'Toggle Control Characters'
|
|
15
23
|
},
|
|
16
24
|
category: Categories.View,
|
|
@@ -9,8 +9,16 @@ class ToggleRenderWhitespaceAction extends Action2 {
|
|
|
9
9
|
super({
|
|
10
10
|
id: ToggleRenderWhitespaceAction.ID,
|
|
11
11
|
title: {
|
|
12
|
-
value: localizeWithPath(
|
|
13
|
-
|
|
12
|
+
value: ( localizeWithPath(
|
|
13
|
+
'vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace',
|
|
14
|
+
'toggleRenderWhitespace',
|
|
15
|
+
"Toggle Render Whitespace"
|
|
16
|
+
)),
|
|
17
|
+
mnemonicTitle: ( localizeWithPath(
|
|
18
|
+
'vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace',
|
|
19
|
+
{ key: 'miToggleRenderWhitespace', comment: ['&& denotes a mnemonic'] },
|
|
20
|
+
"&&Render Whitespace"
|
|
21
|
+
)),
|
|
14
22
|
original: 'Toggle Render Whitespace'
|
|
15
23
|
},
|
|
16
24
|
category: Categories.View,
|
|
@@ -4,7 +4,7 @@ import { Disposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/li
|
|
|
4
4
|
import { registerEditorContribution, registerDiffEditorContribution, registerEditorAction, EditorAction } from 'monaco-editor/esm/vs/editor/browser/editorExtensions.js';
|
|
5
5
|
import { ICodeEditorService } from 'monaco-editor/esm/vs/editor/browser/services/codeEditorService.js';
|
|
6
6
|
import { MenuRegistry, MenuId } from 'monaco-editor/esm/vs/platform/actions/common/actions.js';
|
|
7
|
-
import {
|
|
7
|
+
import { ContextKeyExpr, RawContextKey, IContextKeyService } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
|
|
8
8
|
import { EditorContextKeys } from 'monaco-editor/esm/vs/editor/common/editorContextKeys.js';
|
|
9
9
|
import { Codicon } from 'monaco-editor/esm/vs/base/common/codicons.js';
|
|
10
10
|
import { Registry } from 'monaco-editor/esm/vs/platform/registry/common/platform.js';
|
|
@@ -14,11 +14,11 @@ const transientWordWrapState = 'transientWordWrapState';
|
|
|
14
14
|
const isWordWrapMinifiedKey = 'isWordWrapMinified';
|
|
15
15
|
const isDominatedByLongLinesKey = 'isDominatedByLongLines';
|
|
16
16
|
const CAN_TOGGLE_WORD_WRAP = ( new RawContextKey('canToggleWordWrap', false, true));
|
|
17
|
-
const EDITOR_WORD_WRAP = ( new RawContextKey(
|
|
17
|
+
const EDITOR_WORD_WRAP = ( new RawContextKey('editorWordWrap', false, ( nls.localizeWithPath(
|
|
18
|
+
'vs/workbench/contrib/codeEditor/browser/toggleWordWrap',
|
|
18
19
|
'editorWordWrap',
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
));
|
|
20
|
+
'Whether the editor is currently using word wrapping.'
|
|
21
|
+
))));
|
|
22
22
|
function writeTransientState(model, state, codeEditorService) {
|
|
23
23
|
codeEditorService.setTransientModelProperty(model, transientWordWrapState, state);
|
|
24
24
|
}
|
|
@@ -30,7 +30,11 @@ class ToggleWordWrapAction extends EditorAction {
|
|
|
30
30
|
constructor() {
|
|
31
31
|
super({
|
|
32
32
|
id: TOGGLE_WORD_WRAP_ID,
|
|
33
|
-
label: nls.localizeWithPath(
|
|
33
|
+
label: ( nls.localizeWithPath(
|
|
34
|
+
'vs/workbench/contrib/codeEditor/browser/toggleWordWrap',
|
|
35
|
+
'toggle.wordwrap',
|
|
36
|
+
"View: Toggle Word Wrap"
|
|
37
|
+
)),
|
|
34
38
|
alias: 'View: Toggle Word Wrap',
|
|
35
39
|
precondition: undefined,
|
|
36
40
|
kbOpts: {
|
|
@@ -249,7 +253,11 @@ registerEditorAction(ToggleWordWrapAction);
|
|
|
249
253
|
MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
|
|
250
254
|
command: {
|
|
251
255
|
id: TOGGLE_WORD_WRAP_ID,
|
|
252
|
-
title: nls.localizeWithPath(
|
|
256
|
+
title: ( nls.localizeWithPath(
|
|
257
|
+
'vs/workbench/contrib/codeEditor/browser/toggleWordWrap',
|
|
258
|
+
'unwrapMinified',
|
|
259
|
+
"Disable wrapping for this file"
|
|
260
|
+
)),
|
|
253
261
|
icon: Codicon.wordWrap
|
|
254
262
|
},
|
|
255
263
|
group: 'navigation',
|
|
@@ -259,7 +267,11 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
|
|
|
259
267
|
MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
|
|
260
268
|
command: {
|
|
261
269
|
id: TOGGLE_WORD_WRAP_ID,
|
|
262
|
-
title: nls.localizeWithPath(
|
|
270
|
+
title: ( nls.localizeWithPath(
|
|
271
|
+
'vs/workbench/contrib/codeEditor/browser/toggleWordWrap',
|
|
272
|
+
'wrapMinified',
|
|
273
|
+
"Enable wrapping for this file"
|
|
274
|
+
)),
|
|
263
275
|
icon: Codicon.wordWrap
|
|
264
276
|
},
|
|
265
277
|
group: 'navigation',
|
|
@@ -269,7 +281,11 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
|
|
|
269
281
|
MenuRegistry.appendMenuItem(MenuId.MenubarViewMenu, {
|
|
270
282
|
command: {
|
|
271
283
|
id: TOGGLE_WORD_WRAP_ID,
|
|
272
|
-
title: nls.localizeWithPath(
|
|
284
|
+
title: ( nls.localizeWithPath(
|
|
285
|
+
'vs/workbench/contrib/codeEditor/browser/toggleWordWrap',
|
|
286
|
+
{ key: 'miToggleWordWrap', comment: ['&& denotes a mnemonic'] },
|
|
287
|
+
"&&Word Wrap"
|
|
288
|
+
)),
|
|
273
289
|
toggled: EDITOR_WORD_WRAP,
|
|
274
290
|
precondition: CAN_TOGGLE_WORD_WRAP
|
|
275
291
|
},
|
|
@@ -1,12 +1,36 @@
|
|
|
1
1
|
import * as languages from 'monaco-editor/esm/vs/editor/common/languages.js';
|
|
2
2
|
import * as nls from 'monaco-editor/esm/vs/nls.js';
|
|
3
3
|
import { registerColor, disabledForeground, contrastBorder, listFocusOutline, transparent } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
|
|
4
|
-
const resolvedCommentViewIcon = registerColor('commentsView.resolvedIcon', { dark: disabledForeground, light: disabledForeground, hcDark: contrastBorder, hcLight: contrastBorder }, nls.localizeWithPath(
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
registerColor('
|
|
4
|
+
const resolvedCommentViewIcon = registerColor('commentsView.resolvedIcon', { dark: disabledForeground, light: disabledForeground, hcDark: contrastBorder, hcLight: contrastBorder }, ( nls.localizeWithPath(
|
|
5
|
+
'vs/workbench/contrib/comments/browser/commentColors',
|
|
6
|
+
'resolvedCommentIcon',
|
|
7
|
+
'Icon color for resolved comments.'
|
|
8
|
+
)));
|
|
9
|
+
const unresolvedCommentViewIcon = registerColor('commentsView.unresolvedIcon', { dark: listFocusOutline, light: listFocusOutline, hcDark: contrastBorder, hcLight: contrastBorder }, ( nls.localizeWithPath(
|
|
10
|
+
'vs/workbench/contrib/comments/browser/commentColors',
|
|
11
|
+
'unresolvedCommentIcon',
|
|
12
|
+
'Icon color for unresolved comments.'
|
|
13
|
+
)));
|
|
14
|
+
const resolvedCommentBorder = registerColor('editorCommentsWidget.resolvedBorder', { dark: resolvedCommentViewIcon, light: resolvedCommentViewIcon, hcDark: contrastBorder, hcLight: contrastBorder }, ( nls.localizeWithPath(
|
|
15
|
+
'vs/workbench/contrib/comments/browser/commentColors',
|
|
16
|
+
'resolvedCommentBorder',
|
|
17
|
+
'Color of borders and arrow for resolved comments.'
|
|
18
|
+
)));
|
|
19
|
+
const unresolvedCommentBorder = registerColor('editorCommentsWidget.unresolvedBorder', { dark: unresolvedCommentViewIcon, light: unresolvedCommentViewIcon, hcDark: contrastBorder, hcLight: contrastBorder }, ( nls.localizeWithPath(
|
|
20
|
+
'vs/workbench/contrib/comments/browser/commentColors',
|
|
21
|
+
'unresolvedCommentBorder',
|
|
22
|
+
'Color of borders and arrow for unresolved comments.'
|
|
23
|
+
)));
|
|
24
|
+
registerColor('editorCommentsWidget.rangeBackground', { dark: ( transparent(unresolvedCommentBorder, .1)), light: ( transparent(unresolvedCommentBorder, .1)), hcDark: ( transparent(unresolvedCommentBorder, .1)), hcLight: ( transparent(unresolvedCommentBorder, .1)) }, ( nls.localizeWithPath(
|
|
25
|
+
'vs/workbench/contrib/comments/browser/commentColors',
|
|
26
|
+
'commentThreadRangeBackground',
|
|
27
|
+
'Color of background for comment ranges.'
|
|
28
|
+
)));
|
|
29
|
+
registerColor('editorCommentsWidget.rangeActiveBackground', { dark: ( transparent(unresolvedCommentBorder, .1)), light: ( transparent(unresolvedCommentBorder, .1)), hcDark: ( transparent(unresolvedCommentBorder, .1)), hcLight: ( transparent(unresolvedCommentBorder, .1)) }, ( nls.localizeWithPath(
|
|
30
|
+
'vs/workbench/contrib/comments/browser/commentColors',
|
|
31
|
+
'commentThreadActiveRangeBackground',
|
|
32
|
+
'Color of background for currently selected or hovered comment range.'
|
|
33
|
+
)));
|
|
10
34
|
const commentThreadStateBorderColors = ( new Map([
|
|
11
35
|
[languages.CommentThreadState.Unresolved, unresolvedCommentBorder],
|
|
12
36
|
[languages.CommentThreadState.Resolved, resolvedCommentBorder],
|
|
@@ -5,11 +5,31 @@ import { ModelDecorationOptions } from 'monaco-editor/esm/vs/editor/common/model
|
|
|
5
5
|
import { registerColor, opaque, listInactiveSelectionBackground, editorBackground, darken, editorForeground } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
|
|
6
6
|
import { themeColorFromId } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
|
|
7
7
|
import { CommentThreadState } from 'monaco-editor/esm/vs/editor/common/languages.js';
|
|
8
|
-
const overviewRulerCommentingRangeForeground = registerColor('editorGutter.commentRangeForeground', { dark: opaque(listInactiveSelectionBackground, editorBackground), light: ( darken(opaque(listInactiveSelectionBackground, editorBackground), .05)), hcDark: Color.white, hcLight: Color.black }, nls.localizeWithPath(
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
8
|
+
const overviewRulerCommentingRangeForeground = registerColor('editorGutter.commentRangeForeground', { dark: opaque(listInactiveSelectionBackground, editorBackground), light: ( darken(opaque(listInactiveSelectionBackground, editorBackground), .05)), hcDark: Color.white, hcLight: Color.black }, ( nls.localizeWithPath(
|
|
9
|
+
'vs/workbench/contrib/comments/browser/commentGlyphWidget',
|
|
10
|
+
'editorGutterCommentRangeForeground',
|
|
11
|
+
'Editor gutter decoration color for commenting ranges. This color should be opaque.'
|
|
12
|
+
)));
|
|
13
|
+
const overviewRulerCommentForeground = registerColor('editorOverviewRuler.commentForeground', { dark: overviewRulerCommentingRangeForeground, light: overviewRulerCommentingRangeForeground, hcDark: overviewRulerCommentingRangeForeground, hcLight: overviewRulerCommentingRangeForeground }, ( nls.localizeWithPath(
|
|
14
|
+
'vs/workbench/contrib/comments/browser/commentGlyphWidget',
|
|
15
|
+
'editorOverviewRuler.commentForeground',
|
|
16
|
+
'Editor overview ruler decoration color for resolved comments. This color should be opaque.'
|
|
17
|
+
)));
|
|
18
|
+
const overviewRulerCommentUnresolvedForeground = registerColor('editorOverviewRuler.commentUnresolvedForeground', { dark: overviewRulerCommentForeground, light: overviewRulerCommentForeground, hcDark: overviewRulerCommentForeground, hcLight: overviewRulerCommentForeground }, ( nls.localizeWithPath(
|
|
19
|
+
'vs/workbench/contrib/comments/browser/commentGlyphWidget',
|
|
20
|
+
'editorOverviewRuler.commentUnresolvedForeground',
|
|
21
|
+
'Editor overview ruler decoration color for unresolved comments. This color should be opaque.'
|
|
22
|
+
)));
|
|
23
|
+
const editorGutterCommentGlyphForeground = registerColor('editorGutter.commentGlyphForeground', { dark: editorForeground, light: editorForeground, hcDark: Color.black, hcLight: Color.white }, ( nls.localizeWithPath(
|
|
24
|
+
'vs/workbench/contrib/comments/browser/commentGlyphWidget',
|
|
25
|
+
'editorGutterCommentGlyphForeground',
|
|
26
|
+
'Editor gutter decoration color for commenting glyphs.'
|
|
27
|
+
)));
|
|
28
|
+
registerColor('editorGutter.commentUnresolvedGlyphForeground', { dark: editorGutterCommentGlyphForeground, light: editorGutterCommentGlyphForeground, hcDark: editorGutterCommentGlyphForeground, hcLight: editorGutterCommentGlyphForeground }, ( nls.localizeWithPath(
|
|
29
|
+
'vs/workbench/contrib/comments/browser/commentGlyphWidget',
|
|
30
|
+
'editorGutterCommentUnresolvedGlyphForeground',
|
|
31
|
+
'Editor gutter decoration color for commenting glyphs for unresolved comment threads.'
|
|
32
|
+
)));
|
|
13
33
|
class CommentGlyphWidget {
|
|
14
34
|
static { this.description = 'comment-glyph-widget'; }
|
|
15
35
|
constructor(editor, lineNumber) {
|
|
@@ -300,7 +300,11 @@ let CommentNode = class CommentNode extends Disposable {
|
|
|
300
300
|
createReactionPicker(reactionGroup) {
|
|
301
301
|
const toggleReactionAction = this._register(( new ToggleReactionsAction(() => {
|
|
302
302
|
toggleReactionActionViewItem?.show();
|
|
303
|
-
}, nls.localizeWithPath(
|
|
303
|
+
}, ( nls.localizeWithPath(
|
|
304
|
+
'vs/workbench/contrib/comments/browser/commentNode',
|
|
305
|
+
'commentToggleReaction',
|
|
306
|
+
"Toggle Reaction"
|
|
307
|
+
)))));
|
|
304
308
|
let reactionMenuActions = [];
|
|
305
309
|
if (reactionGroup && reactionGroup.length) {
|
|
306
310
|
reactionMenuActions = ( reactionGroup.map((reaction) => {
|
|
@@ -315,8 +319,17 @@ let CommentNode = class CommentNode extends Disposable {
|
|
|
315
319
|
}
|
|
316
320
|
catch (e) {
|
|
317
321
|
const error = e.message
|
|
318
|
-
? nls.localizeWithPath(
|
|
319
|
-
|
|
322
|
+
? ( nls.localizeWithPath(
|
|
323
|
+
'vs/workbench/contrib/comments/browser/commentNode',
|
|
324
|
+
'commentToggleReactionError',
|
|
325
|
+
"Toggling the comment reaction failed: {0}.",
|
|
326
|
+
e.message
|
|
327
|
+
))
|
|
328
|
+
: ( nls.localizeWithPath(
|
|
329
|
+
'vs/workbench/contrib/comments/browser/commentNode',
|
|
330
|
+
'commentToggleReactionDefaultError',
|
|
331
|
+
"Toggling the comment reaction failed"
|
|
332
|
+
));
|
|
320
333
|
this.notificationService.error(error);
|
|
321
334
|
}
|
|
322
335
|
}
|
|
@@ -151,8 +151,12 @@ let CommentReply = class CommentReply extends Disposable {
|
|
|
151
151
|
const placeholder = valueLength > 0
|
|
152
152
|
? ''
|
|
153
153
|
: hasExistingComments
|
|
154
|
-
? (this._commentOptions?.placeHolder || nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentReply', 'reply', "Reply..."))
|
|
155
|
-
: (this._commentOptions?.placeHolder || nls.localizeWithPath(
|
|
154
|
+
? (this._commentOptions?.placeHolder || ( nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentReply', 'reply', "Reply...")))
|
|
155
|
+
: (this._commentOptions?.placeHolder || ( nls.localizeWithPath(
|
|
156
|
+
'vs/workbench/contrib/comments/browser/commentReply',
|
|
157
|
+
'newComment',
|
|
158
|
+
"Type a new comment"
|
|
159
|
+
)));
|
|
156
160
|
const decorations = [{
|
|
157
161
|
range: {
|
|
158
162
|
startLineNumber: 0,
|
|
@@ -270,8 +274,8 @@ let CommentReply = class CommentReply extends Disposable {
|
|
|
270
274
|
}
|
|
271
275
|
createReplyButton(commentEditor, commentForm) {
|
|
272
276
|
this._reviewThreadReplyButton = dom.append(commentForm, dom.$(`button.review-thread-reply-button.${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`));
|
|
273
|
-
this._reviewThreadReplyButton.title = this._commentOptions?.prompt || nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentReply', 'reply', "Reply...");
|
|
274
|
-
this._reviewThreadReplyButton.textContent = this._commentOptions?.prompt || nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentReply', 'reply', "Reply...");
|
|
277
|
+
this._reviewThreadReplyButton.title = this._commentOptions?.prompt || ( nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentReply', 'reply', "Reply..."));
|
|
278
|
+
this._reviewThreadReplyButton.textContent = this._commentOptions?.prompt || ( nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentReply', 'reply', "Reply..."));
|
|
275
279
|
this._register(dom.addDisposableListener(this._reviewThreadReplyButton, 'click', _ => this.clearAndExpandReplyArea()));
|
|
276
280
|
this._register(dom.addDisposableListener(this._reviewThreadReplyButton, 'focus', _ => this.clearAndExpandReplyArea()));
|
|
277
281
|
commentEditor.onDidBlurEditorWidget(() => {
|
|
@@ -182,14 +182,34 @@ let CommentThreadBody = class CommentThreadBody extends Disposable {
|
|
|
182
182
|
_updateAriaLabel() {
|
|
183
183
|
if (this._commentThread.isDocumentCommentThread()) {
|
|
184
184
|
if (this._commentThread.range) {
|
|
185
|
-
this._commentsElement.ariaLabel = nls.localizeWithPath(
|
|
185
|
+
this._commentsElement.ariaLabel = ( nls.localizeWithPath(
|
|
186
|
+
'vs/workbench/contrib/comments/browser/commentThreadBody',
|
|
187
|
+
'commentThreadAria.withRange',
|
|
188
|
+
"Comment thread with {0} comments on lines {1} through {2}. {3}.",
|
|
189
|
+
this._commentThread.comments?.length,
|
|
190
|
+
this._commentThread.range.startLineNumber,
|
|
191
|
+
this._commentThread.range.endLineNumber,
|
|
192
|
+
this._commentThread.label
|
|
193
|
+
));
|
|
186
194
|
}
|
|
187
195
|
else {
|
|
188
|
-
this._commentsElement.ariaLabel = nls.localizeWithPath(
|
|
196
|
+
this._commentsElement.ariaLabel = ( nls.localizeWithPath(
|
|
197
|
+
'vs/workbench/contrib/comments/browser/commentThreadBody',
|
|
198
|
+
'commentThreadAria.document',
|
|
199
|
+
"Comment thread with {0} comments on the entire document. {1}.",
|
|
200
|
+
this._commentThread.comments?.length,
|
|
201
|
+
this._commentThread.label
|
|
202
|
+
));
|
|
189
203
|
}
|
|
190
204
|
}
|
|
191
205
|
else {
|
|
192
|
-
this._commentsElement.ariaLabel = nls.localizeWithPath(
|
|
206
|
+
this._commentsElement.ariaLabel = ( nls.localizeWithPath(
|
|
207
|
+
'vs/workbench/contrib/comments/browser/commentThreadBody',
|
|
208
|
+
'commentThreadAria',
|
|
209
|
+
"Comment thread with {0} comments. {1}.",
|
|
210
|
+
this._commentThread.comments?.length,
|
|
211
|
+
this._commentThread.label
|
|
212
|
+
));
|
|
193
213
|
}
|
|
194
214
|
}
|
|
195
215
|
_setFocusedComment(value) {
|
|
@@ -9,7 +9,11 @@ import { createActionViewItem } from 'monaco-editor/esm/vs/platform/actions/brow
|
|
|
9
9
|
import { registerIcon } from 'monaco-editor/esm/vs/platform/theme/common/iconRegistry.js';
|
|
10
10
|
import { ThemeIcon } from 'monaco-editor/esm/vs/base/common/themables.js';
|
|
11
11
|
import { StandardMouseEvent } from 'monaco-editor/esm/vs/base/browser/mouseEvent.js';
|
|
12
|
-
const collapseIcon = registerIcon('review-comment-collapse', Codicon.chevronUp, nls.localizeWithPath(
|
|
12
|
+
const collapseIcon = registerIcon('review-comment-collapse', Codicon.chevronUp, ( nls.localizeWithPath(
|
|
13
|
+
'vs/workbench/contrib/comments/browser/commentThreadHeader',
|
|
14
|
+
'collapseIcon',
|
|
15
|
+
'Icon to collapse a review comment.'
|
|
16
|
+
)));
|
|
13
17
|
const COLLAPSE_ACTION_CLASS = 'expand-review-action ' + ThemeIcon.asClassName(collapseIcon);
|
|
14
18
|
class CommentThreadHeader extends Disposable {
|
|
15
19
|
constructor(container, _delegate, _commentMenus, _commentThread, _contextKeyService, instantiationService, _contextMenuService) {
|
|
@@ -33,13 +37,11 @@ class CommentThreadHeader extends Disposable {
|
|
|
33
37
|
actionViewItemProvider: createActionViewItem.bind(undefined, this.instantiationService)
|
|
34
38
|
}));
|
|
35
39
|
this._register(this._actionbarWidget);
|
|
36
|
-
this._collapseAction = ( new Action(
|
|
37
|
-
'
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
() => this._delegate.collapse()
|
|
42
|
-
));
|
|
40
|
+
this._collapseAction = ( new Action('review.expand', ( nls.localizeWithPath(
|
|
41
|
+
'vs/workbench/contrib/comments/browser/commentThreadHeader',
|
|
42
|
+
'label.collapse',
|
|
43
|
+
"Collapse"
|
|
44
|
+
)), COLLAPSE_ACTION_CLASS, true, () => this._delegate.collapse()));
|
|
43
45
|
const menu = this._commentMenus.getCommentThreadTitleActions(this._contextKeyService);
|
|
44
46
|
this.setActionBarActions(menu);
|
|
45
47
|
this._register(menu);
|
|
@@ -66,7 +68,11 @@ class CommentThreadHeader extends Disposable {
|
|
|
66
68
|
label = this._commentThread.label;
|
|
67
69
|
if (label === undefined) {
|
|
68
70
|
if (!(this._commentThread.comments && this._commentThread.comments.length)) {
|
|
69
|
-
label = nls.localizeWithPath(
|
|
71
|
+
label = ( nls.localizeWithPath(
|
|
72
|
+
'vs/workbench/contrib/comments/browser/commentThreadHeader',
|
|
73
|
+
'startThread',
|
|
74
|
+
"Start discussion"
|
|
75
|
+
));
|
|
70
76
|
}
|
|
71
77
|
}
|
|
72
78
|
if (label) {
|