@codingame/monaco-vscode-api 1.83.1 → 1.83.3-next.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/extensions.d.ts +3 -3
- package/extensions.js +31 -33
- package/l10n.d.ts +4 -0
- package/l10n.js +10 -0
- package/missing-services.js +4 -2
- package/monaco-editor-treemending.patch +12268 -1070
- package/monaco-treemending.js +8 -2
- package/package.json +8 -1
- package/service-override/extensions.js +2 -2
- package/service-override/layout.js +2 -2
- package/tools/l10n.js +177 -0
- package/tools.js +22 -1
- package/vscode/src/vs/base/browser/ui/menu/menubar.js +1 -1
- package/vscode/src/vs/base/browser/ui/splitview/paneview.js +2 -2
- package/vscode/src/vs/base/common/date.js +55 -55
- package/vscode/src/vs/base/common/jsonErrorMessages.js +10 -10
- package/vscode/src/vs/base/common/tfIdf.js +137 -0
- package/vscode/src/vs/editor/contrib/quickAccess/browser/commandsQuickAccess.js +23 -0
- package/vscode/src/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess.js +115 -0
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.js +112 -0
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js +334 -0
- package/vscode/src/vs/platform/dialogs/common/dialogs.js +10 -14
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.js +3 -0
- package/vscode/src/vs/platform/extensionManagement/common/extensionNls.js +2 -2
- package/vscode/src/vs/platform/files/common/fileService.js +28 -37
- package/vscode/src/vs/platform/files/common/files.js +6 -6
- package/vscode/src/vs/platform/files/common/io.js +2 -2
- package/vscode/src/vs/platform/keyboardLayout/common/keyboardConfig.js +3 -9
- package/vscode/src/vs/platform/quickinput/browser/commandsQuickAccess.js +300 -0
- package/vscode/src/vs/platform/quickinput/browser/helpQuickAccess.js +59 -0
- package/vscode/src/vs/platform/quickinput/browser/pickerQuickAccess.js +212 -0
- package/vscode/src/vs/platform/request/common/request.js +2 -2
- package/vscode/src/vs/platform/theme/common/tokenClassificationRegistry.js +42 -63
- package/vscode/src/vs/platform/workspaces/common/workspaces.js +15 -15
- package/vscode/src/vs/workbench/api/browser/mainThreadAuthentication.js +13 -32
- package/vscode/src/vs/workbench/api/browser/mainThreadComments.js +2 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadCustomEditors.js +50 -52
- package/vscode/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.js +58 -69
- package/vscode/src/vs/workbench/api/browser/mainThreadEditSessionIdentityParticipant.js +4 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadExtensionService.js +38 -50
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystem.js +23 -23
- package/vscode/src/vs/workbench/api/browser/mainThreadFileSystemEventService.js +21 -53
- package/vscode/src/vs/workbench/api/browser/mainThreadMessageService.js +4 -4
- package/vscode/src/vs/workbench/api/browser/mainThreadNotebookSaveParticipant.js +4 -5
- package/vscode/src/vs/workbench/api/browser/mainThreadProgress.js +6 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadSaveParticipant.js +4 -2
- package/vscode/src/vs/workbench/api/browser/mainThreadTask.js +1 -1
- package/vscode/src/vs/workbench/api/browser/mainThreadTunnelService.js +2 -12
- package/vscode/src/vs/workbench/api/browser/mainThreadUriOpeners.js +15 -9
- package/vscode/src/vs/workbench/api/browser/mainThreadWebviews.js +16 -20
- package/vscode/src/vs/workbench/api/browser/mainThreadWorkspace.js +6 -28
- package/vscode/src/vs/workbench/api/browser/statusBarExtensionPoint.js +60 -0
- package/vscode/src/vs/workbench/api/common/extHostChat.js +3 -3
- package/vscode/src/vs/workbench/api/common/extHostCommands.js +59 -65
- package/vscode/src/vs/workbench/api/common/extHostConsoleForwarder.js +8 -8
- package/vscode/src/vs/workbench/api/common/extHostDiagnostics.js +2 -6
- package/vscode/src/vs/workbench/api/common/extHostExtensionService.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js +150 -222
- package/vscode/src/vs/workbench/api/common/extHostLogService.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostNotebook.js +3 -3
- package/vscode/src/vs/workbench/api/common/extHostProgress.js +2 -6
- package/vscode/src/vs/workbench/api/common/extHostSCM.js +54 -58
- package/vscode/src/vs/workbench/api/common/extHostStatusBar.js +3 -7
- package/vscode/src/vs/workbench/api/common/extHostTelemetry.js +2 -6
- package/vscode/src/vs/workbench/api/common/extHostTerminalService.js +2 -6
- package/vscode/src/vs/workbench/api/common/extHostTreeViews.js +55 -57
- package/vscode/src/vs/workbench/api/common/extHostTunnelService.js +28 -28
- package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js +265 -277
- package/vscode/src/vs/workbench/api/common/extHostWorkspace.js +2 -7
- package/vscode/src/vs/workbench/api/common/extensionHostMain.js +17 -19
- package/vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js +9 -34
- package/vscode/src/vs/workbench/api/worker/extHostExtensionService.js +5 -5
- package/vscode/src/vs/workbench/browser/actions/layoutActions.js +898 -68
- package/vscode/src/vs/workbench/browser/actions/quickAccessActions.js +7 -7
- package/vscode/src/vs/workbench/browser/actions/windowActions.js +32 -38
- package/vscode/src/vs/workbench/browser/actions/workspaceActions.js +103 -13
- package/vscode/src/vs/workbench/browser/actions/workspaceCommands.js +2 -2
- package/vscode/src/vs/workbench/browser/editor.js +3 -3
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.js +12 -27
- package/vscode/src/vs/workbench/browser/parts/compositeBarActions.js +12 -12
- package/vscode/src/vs/workbench/browser/parts/editor/binaryDiffEditor.js +2 -7
- package/vscode/src/vs/workbench/browser/parts/editor/binaryEditor.js +4 -7
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbs.js +42 -90
- package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution.js +140 -272
- package/vscode/src/vs/workbench/browser/parts/editor/editorActions.js +115 -148
- package/vscode/src/vs/workbench/browser/parts/editor/editorCommands.js +21 -33
- package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js +7 -19
- package/vscode/src/vs/workbench/browser/parts/editor/editorPlaceholder.js +10 -26
- package/vscode/src/vs/workbench/browser/parts/editor/editorQuickAccess.js +7 -17
- package/vscode/src/vs/workbench/browser/parts/editor/editorStatus.js +60 -81
- package/vscode/src/vs/workbench/browser/parts/editor/sideBySideEditor.js +27 -33
- package/vscode/src/vs/workbench/browser/parts/editor/textCodeEditor.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/editor/textDiffEditor.js +19 -32
- package/vscode/src/vs/workbench/browser/parts/editor/textEditor.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCommands.js +8 -8
- package/vscode/src/vs/workbench/browser/parts/panel/panelActions.js +69 -34
- package/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.js +58 -34
- package/vscode/src/vs/workbench/browser/parts/views/viewFilter.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/views/viewPane.js +3 -9
- package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js +6 -6
- package/vscode/src/vs/workbench/browser/parts/views/viewsService.js +7 -11
- package/vscode/src/vs/workbench/browser/quickaccess.js +7 -3
- package/vscode/src/vs/workbench/browser/workbench.contribution.js +186 -683
- package/vscode/src/vs/workbench/common/configuration.js +12 -15
- package/vscode/src/vs/workbench/common/contextkeys.js +272 -90
- package/vscode/src/vs/workbench/common/editor/diffEditorInput.js +2 -2
- package/vscode/src/vs/workbench/common/editor/sideBySideEditorInput.js +2 -7
- package/vscode/src/vs/workbench/common/editor/textEditorModel.js +2 -6
- package/vscode/src/vs/workbench/common/editor.js +5 -5
- package/vscode/src/vs/workbench/common/theme.js +137 -527
- package/vscode/src/vs/workbench/common/views.js +4 -8
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.js +15 -55
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityContributions.js +3 -8
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleView.js +22 -60
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.js +9 -15
- package/vscode/src/vs/workbench/contrib/bulkEdit/browser/bulkEditService.js +18 -48
- package/vscode/src/vs/workbench/contrib/bulkEdit/browser/bulkFileEdits.js +58 -74
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatActions.js +2 -0
- package/vscode/src/vs/workbench/contrib/chat/common/chatAgents.js +5 -10
- package/vscode/src/vs/workbench/contrib/chat/common/chatSlashCommands.js +5 -13
- package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js +8 -27
- package/vscode/src/vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint.js +5 -17
- package/vscode/src/vs/workbench/contrib/codeActions/common/documentationExtensionPoint.js +6 -15
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js +7 -20
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.js +2 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/languageConfigurationExtensionPoint.js +63 -216
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.js +4 -7
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoLineQuickAccess.js +5 -8
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.js +8 -11
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.js +5 -15
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.js +3 -3
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.js +5 -5
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.js +3 -6
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.js +3 -6
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js +10 -9
- package/vscode/src/vs/workbench/contrib/comments/browser/commentColors.js +6 -15
- package/vscode/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.js +5 -20
- package/vscode/src/vs/workbench/contrib/comments/browser/commentNode.js +3 -10
- package/vscode/src/vs/workbench/contrib/comments/browser/commentReply.js +4 -4
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadBody.js +3 -20
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadHeader.js +9 -3
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadWidget.js +4 -13
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.js +19 -19
- package/vscode/src/vs/workbench/contrib/comments/browser/comments.contribution.js +26 -77
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsController.js +5 -17
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.js +31 -40
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsView.js +10 -29
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsViewActions.js +10 -10
- package/vscode/src/vs/workbench/contrib/comments/browser/reactionsAction.js +8 -8
- package/vscode/src/vs/workbench/contrib/comments/common/commentContextKeys.js +25 -21
- package/vscode/src/vs/workbench/contrib/comments/common/commentModel.js +2 -2
- package/vscode/src/vs/workbench/contrib/customEditor/common/customEditor.js +1 -4
- package/vscode/src/vs/workbench/contrib/debug/browser/debugColors.js +20 -20
- package/vscode/src/vs/workbench/contrib/debug/browser/debugIcons.js +56 -98
- package/vscode/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.js +2 -2
- package/vscode/src/vs/workbench/contrib/debug/common/debug.js +96 -180
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsIcons.js +25 -79
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/configuration.js +4 -15
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.js +4 -8
- package/vscode/src/vs/workbench/contrib/files/browser/explorerViewlet.js +56 -19
- package/vscode/src/vs/workbench/contrib/files/browser/fileActions.js +76 -230
- package/vscode/src/vs/workbench/contrib/files/browser/fileConstants.js +6 -5
- package/vscode/src/vs/workbench/contrib/files/browser/fileImportExport.js +33 -103
- package/vscode/src/vs/workbench/contrib/files/browser/files.contribution.js +228 -99
- package/vscode/src/vs/workbench/contrib/files/browser/views/emptyView.js +1 -1
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.js +5 -9
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerView.js +5 -5
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.js +15 -35
- package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js +5 -8
- package/vscode/src/vs/workbench/contrib/files/common/files.js +27 -48
- package/vscode/src/vs/workbench/contrib/folding/browser/folding.contribution.js +3 -6
- package/vscode/src/vs/workbench/contrib/format/browser/formatModified.js +1 -1
- package/vscode/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.js +5 -8
- package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.js +112 -52
- package/vscode/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.js +1 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js +2 -2
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js +30 -96
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mapping.js +73 -126
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js +3 -3
- package/vscode/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.js +42 -0
- package/vscode/src/vs/workbench/contrib/output/browser/output.contribution.js +23 -29
- package/vscode/src/vs/workbench/contrib/output/browser/outputView.js +3 -3
- package/vscode/src/vs/workbench/contrib/quickaccess/browser/commandsQuickAccess.js +13 -16
- package/vscode/src/vs/workbench/contrib/quickaccess/browser/quickAccess.contribution.js +15 -34
- package/vscode/src/vs/workbench/contrib/quickaccess/browser/viewQuickAccess.js +12 -17
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.js +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js +26 -75
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.js +4 -19
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsFile.js +4 -4
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsService.js +60 -99
- package/vscode/src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.js +5 -14
- package/vscode/src/vs/workbench/contrib/tasks/common/taskService.js +26 -13
- package/vscode/src/vs/workbench/contrib/tasks/common/tasks.js +88 -96
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.js +5 -17
- package/vscode/src/vs/workbench/contrib/terminal/common/terminal.js +7 -28
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.js +21 -78
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalContextKey.js +21 -53
- package/vscode/src/vs/workbench/contrib/testing/common/testResult.js +2 -2
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.js +2 -5
- package/vscode/src/vs/workbench/services/actions/common/menusExtensionPoint.js +113 -348
- package/vscode/src/vs/workbench/services/assignment/common/assignmentService.js +2 -5
- package/vscode/src/vs/workbench/services/authentication/browser/authenticationService.js +31 -1
- package/vscode/src/vs/workbench/services/configuration/common/jsonEditingService.js +1 -4
- package/vscode/src/vs/workbench/services/configurationResolver/common/variableResolver.js +16 -16
- package/vscode/src/vs/workbench/services/decorations/browser/decorationsService.js +2 -2
- package/vscode/src/vs/workbench/services/editor/common/editorResolverService.js +2 -5
- package/vscode/src/vs/workbench/services/extensions/browser/extensionUrlHandler.js +4 -4
- package/vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.js +27 -29
- package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.js +104 -141
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostManager.js +35 -39
- package/vscode/src/vs/workbench/services/extensions/common/extensionRunningLocationTracker.js +25 -25
- package/vscode/src/vs/workbench/services/extensions/common/extensionsRegistry.js +80 -296
- package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.js +6 -21
- package/vscode/src/vs/workbench/services/host/browser/browserHostService.js +3 -6
- package/vscode/src/vs/workbench/services/keybinding/browser/keybindingService.js +24 -81
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.js +2 -2
- package/vscode/src/vs/workbench/services/keybinding/common/keybindingEditing.js +11 -17
- package/vscode/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.js +30 -32
- package/vscode/src/vs/workbench/services/language/common/languageService.js +23 -98
- package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js +83 -95
- package/vscode/src/vs/workbench/services/search/common/queryBuilder.js +1 -5
- package/vscode/src/vs/workbench/services/textfile/browser/textFileService.js +11 -23
- package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModel.js +32 -32
- package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModelManager.js +2 -7
- package/vscode/src/vs/workbench/services/textfile/common/textFileSaveParticipant.js +2 -2
- package/vscode/src/vs/workbench/services/themes/common/colorExtensionPoint.js +16 -53
- package/vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js +50 -1
- package/vscode/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.js +25 -99
- package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorService.js +16 -16
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfile.js +6 -3
- package/vscode/src/vs/workbench/services/userDataSync/common/userDataSync.js +15 -3
- package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopySaveParticipant.js +2 -2
- package/vscode/src/vs/workbench/services/workingCopy/common/workingCopyBackupService.js +32 -42
|
@@ -15,115 +15,64 @@ import { ToggleTabFocusModeAction } from 'monaco-editor/esm/vs/editor/contrib/to
|
|
|
15
15
|
( Registry.as(Extensions.Configuration)).registerConfiguration({
|
|
16
16
|
id: 'comments',
|
|
17
17
|
order: 20,
|
|
18
|
-
title:
|
|
18
|
+
title: nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'commentsConfigurationTitle', "Comments"),
|
|
19
19
|
type: 'object',
|
|
20
20
|
properties: {
|
|
21
21
|
'comments.openPanel': {
|
|
22
22
|
enum: ['neverOpen', 'openOnSessionStart', 'openOnSessionStartWithComments'],
|
|
23
23
|
default: 'openOnSessionStartWithComments',
|
|
24
|
-
description:
|
|
24
|
+
description: nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'openComments', "Controls when the comments panel should open."),
|
|
25
25
|
restricted: false,
|
|
26
|
-
markdownDeprecationMessage: (
|
|
27
|
-
'comments.openPanel.deprecated',
|
|
28
|
-
"This setting is deprecated in favor of `comments.openView`."
|
|
29
|
-
))
|
|
26
|
+
markdownDeprecationMessage: nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'comments.openPanel.deprecated', "This setting is deprecated in favor of `comments.openView`.")
|
|
30
27
|
},
|
|
31
28
|
'comments.openView': {
|
|
32
29
|
enum: ['never', 'file', 'firstFile', 'firstFileUnresolved'],
|
|
33
|
-
enumDescriptions: [
|
|
34
|
-
'comments.openView.file',
|
|
35
|
-
"The comments view will open when a file with comments is active."
|
|
36
|
-
)), ( nls.localize(
|
|
37
|
-
'comments.openView.firstFile',
|
|
38
|
-
"If the comments view has not been opened yet during this session it will open the first time during a session that a file with comments is active."
|
|
39
|
-
)), ( nls.localize(
|
|
40
|
-
'comments.openView.firstFileUnresolved',
|
|
41
|
-
"If the comments view has not been opened yet during this session and the comment is not resolved, it will open the first time during a session that a file with comments is active."
|
|
42
|
-
))],
|
|
30
|
+
enumDescriptions: [nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'comments.openView.never', "The comments view will never be opened."), nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'comments.openView.file', "The comments view will open when a file with comments is active."), nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'comments.openView.firstFile', "If the comments view has not been opened yet during this session it will open the first time during a session that a file with comments is active."), nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'comments.openView.firstFileUnresolved', "If the comments view has not been opened yet during this session and the comment is not resolved, it will open the first time during a session that a file with comments is active.")],
|
|
43
31
|
default: 'firstFile',
|
|
44
|
-
description:
|
|
32
|
+
description: nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'comments.openView', "Controls when the comments view should open."),
|
|
45
33
|
restricted: false
|
|
46
34
|
},
|
|
47
35
|
'comments.useRelativeTime': {
|
|
48
36
|
type: 'boolean',
|
|
49
37
|
default: true,
|
|
50
|
-
description: (
|
|
51
|
-
'useRelativeTime',
|
|
52
|
-
"Determines if relative time will be used in comment timestamps (ex. '1 day ago')."
|
|
53
|
-
))
|
|
38
|
+
description: nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'useRelativeTime', "Determines if relative time will be used in comment timestamps (ex. '1 day ago').")
|
|
54
39
|
},
|
|
55
40
|
'comments.visible': {
|
|
56
41
|
type: 'boolean',
|
|
57
42
|
default: true,
|
|
58
|
-
description: (
|
|
59
|
-
'comments.visible',
|
|
60
|
-
"Controls the visibility of the comments bar and comment threads in editors that have commenting ranges and comments. Comments are still accessible via the Comments view and will cause commenting to be toggled on in the same way running the command \"Comments: Toggle Editor Commenting\" toggles comments."
|
|
61
|
-
))
|
|
43
|
+
description: nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'comments.visible', "Controls the visibility of the comments bar and comment threads in editors that have commenting ranges and comments. Comments are still accessible via the Comments view and will cause commenting to be toggled on in the same way running the command \"Comments: Toggle Editor Commenting\" toggles comments.")
|
|
62
44
|
},
|
|
63
45
|
'comments.maxHeight': {
|
|
64
46
|
type: 'boolean',
|
|
65
47
|
default: true,
|
|
66
|
-
description: (
|
|
67
|
-
'comments.maxHeight',
|
|
68
|
-
"Controls whether the comments widget scrolls or expands."
|
|
69
|
-
))
|
|
48
|
+
description: nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'comments.maxHeight', "Controls whether the comments widget scrolls or expands.")
|
|
70
49
|
},
|
|
71
50
|
'comments.collapseOnResolve': {
|
|
72
51
|
type: 'boolean',
|
|
73
52
|
default: true,
|
|
74
|
-
description: (
|
|
75
|
-
'collapseOnResolve',
|
|
76
|
-
"Controls whether the comment thread should collapse when the thread is resolved."
|
|
77
|
-
))
|
|
53
|
+
description: nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'collapseOnResolve', "Controls whether the comment thread should collapse when the thread is resolved.")
|
|
78
54
|
}
|
|
79
55
|
}
|
|
80
56
|
});
|
|
81
57
|
var CommentAccessibilityHelpNLS;
|
|
82
58
|
( (function(CommentAccessibilityHelpNLS) {
|
|
83
|
-
CommentAccessibilityHelpNLS.intro = (
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
)
|
|
87
|
-
CommentAccessibilityHelpNLS.
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
));
|
|
91
|
-
CommentAccessibilityHelpNLS.
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
));
|
|
95
|
-
CommentAccessibilityHelpNLS.
|
|
96
|
-
CommentAccessibilityHelpNLS.
|
|
97
|
-
CommentAccessibilityHelpNLS.
|
|
98
|
-
CommentAccessibilityHelpNLS.
|
|
99
|
-
|
|
100
|
-
"- Go to Next Commenting Range, which is currently not triggerable via keybinding."
|
|
101
|
-
));
|
|
102
|
-
CommentAccessibilityHelpNLS.previousRange = ( nls.localize('previous', "- Go to Previous Commenting Range ({0})"));
|
|
103
|
-
CommentAccessibilityHelpNLS.previousRangeNoKb = ( nls.localize(
|
|
104
|
-
'previousNoKb',
|
|
105
|
-
"- Go to Previous Commenting Range, which is currently not triggerable via keybinding."
|
|
106
|
-
));
|
|
107
|
-
CommentAccessibilityHelpNLS.nextCommentThreadKb = ( nls.localize('nextCommentThreadKb', "- Go to Next Comment Thread ({0})"));
|
|
108
|
-
CommentAccessibilityHelpNLS.nextCommentThreadNoKb = ( nls.localize(
|
|
109
|
-
'nextCommentThreadNoKb',
|
|
110
|
-
"- Go to Next Comment Thread, which is currently not triggerable via keybinding."
|
|
111
|
-
));
|
|
112
|
-
CommentAccessibilityHelpNLS.previousCommentThreadKb = ( nls.localize('previousCommentThreadKb', "- Go to Previous Comment Thread ({0})"));
|
|
113
|
-
CommentAccessibilityHelpNLS.previousCommentThreadNoKb = ( nls.localize(
|
|
114
|
-
'previousCommentThreadNoKb',
|
|
115
|
-
"- Go to Previous Comment Thread, which is currently not triggerable via keybinding."
|
|
116
|
-
));
|
|
117
|
-
CommentAccessibilityHelpNLS.addComment = ( nls.localize('addComment', "- Add Comment ({0})"));
|
|
118
|
-
CommentAccessibilityHelpNLS.addCommentNoKb = ( nls.localize(
|
|
119
|
-
'addCommentNoKb',
|
|
120
|
-
"- Add Comment on Current Selection, which is currently not triggerable via keybinding."
|
|
121
|
-
));
|
|
122
|
-
CommentAccessibilityHelpNLS.submitComment = ( nls.localize('submitComment', "- Submit Comment ({0})"));
|
|
123
|
-
CommentAccessibilityHelpNLS.submitCommentNoKb = ( nls.localize(
|
|
124
|
-
'submitCommentNoKb',
|
|
125
|
-
"- Submit Comment, accessible via tabbing, as it's currently not triggerable with a keybinding."
|
|
126
|
-
));
|
|
59
|
+
CommentAccessibilityHelpNLS.intro = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'intro', "The editor contains commentable range(s). Some useful commands include:");
|
|
60
|
+
CommentAccessibilityHelpNLS.introWidget = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'introWidget', "This widget contains a text area, for composition of new comments, and actions, that can be tabbed to once tab moves focus mode has been enabled ({0}).");
|
|
61
|
+
CommentAccessibilityHelpNLS.introWidgetNoKb = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'introWidgetNoKb', "This widget contains a text area, for composition of new comments, and actions, that can be tabbed to once tab moves focus mode has been enabled with the command Toggle Tab Key Moves Focus, which is currently not triggerable via keybinding.");
|
|
62
|
+
CommentAccessibilityHelpNLS.commentCommands = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'commentCommands', "Some useful comment commands include:");
|
|
63
|
+
CommentAccessibilityHelpNLS.escape = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'escape', "- Dismiss Comment (Escape)");
|
|
64
|
+
CommentAccessibilityHelpNLS.nextRange = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'next', "- Go to Next Commenting Range ({0})");
|
|
65
|
+
CommentAccessibilityHelpNLS.nextRangeNoKb = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'nextNoKb', "- Go to Next Commenting Range, which is currently not triggerable via keybinding.");
|
|
66
|
+
CommentAccessibilityHelpNLS.previousRange = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'previous', "- Go to Previous Commenting Range ({0})");
|
|
67
|
+
CommentAccessibilityHelpNLS.previousRangeNoKb = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'previousNoKb', "- Go to Previous Commenting Range, which is currently not triggerable via keybinding.");
|
|
68
|
+
CommentAccessibilityHelpNLS.nextCommentThreadKb = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'nextCommentThreadKb', "- Go to Next Comment Thread ({0})");
|
|
69
|
+
CommentAccessibilityHelpNLS.nextCommentThreadNoKb = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'nextCommentThreadNoKb', "- Go to Next Comment Thread, which is currently not triggerable via keybinding.");
|
|
70
|
+
CommentAccessibilityHelpNLS.previousCommentThreadKb = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'previousCommentThreadKb', "- Go to Previous Comment Thread ({0})");
|
|
71
|
+
CommentAccessibilityHelpNLS.previousCommentThreadNoKb = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'previousCommentThreadNoKb', "- Go to Previous Comment Thread, which is currently not triggerable via keybinding.");
|
|
72
|
+
CommentAccessibilityHelpNLS.addComment = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'addComment', "- Add Comment ({0})");
|
|
73
|
+
CommentAccessibilityHelpNLS.addCommentNoKb = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'addCommentNoKb', "- Add Comment on Current Selection, which is currently not triggerable via keybinding.");
|
|
74
|
+
CommentAccessibilityHelpNLS.submitComment = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'submitComment', "- Submit Comment ({0})");
|
|
75
|
+
CommentAccessibilityHelpNLS.submitCommentNoKb = nls.localizeWithPath('vs/workbench/contrib/comments/browser/comments.contribution', 'submitCommentNoKb', "- Submit Comment, accessible via tabbing, as it's currently not triggerable with a keybinding.");
|
|
127
76
|
})(CommentAccessibilityHelpNLS || (CommentAccessibilityHelpNLS = {})));
|
|
128
77
|
class CommentsAccessibilityHelpContribution extends Disposable {
|
|
129
78
|
constructor() {
|
|
@@ -702,12 +702,7 @@ let CommentController = class CommentController {
|
|
|
702
702
|
const commentRangeEnd = range?.getEndPosition().lineNumber;
|
|
703
703
|
if (commentRangeStart && commentRangeEnd) {
|
|
704
704
|
const oneLine = commentRangeStart === commentRangeEnd;
|
|
705
|
-
oneLine ? status(
|
|
706
|
-
'commentRangeStart',
|
|
707
|
-
"Lines {0} to {1}",
|
|
708
|
-
commentRangeStart,
|
|
709
|
-
commentRangeEnd
|
|
710
|
-
)));
|
|
705
|
+
oneLine ? status(nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsController', 'commentRange', "Line {0}", commentRangeStart)) : status(nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsController', 'commentRangeStart', "Lines {0} to {1}", commentRangeStart, commentRangeEnd));
|
|
711
706
|
}
|
|
712
707
|
}
|
|
713
708
|
}
|
|
@@ -823,21 +818,14 @@ let CommentController = class CommentController {
|
|
|
823
818
|
if (verbose) {
|
|
824
819
|
const keybinding = this.keybindingService.lookupKeybinding("editor.action.accessibilityHelp" )?.getAriaLabel();
|
|
825
820
|
if (keybinding) {
|
|
826
|
-
status((
|
|
827
|
-
'hasCommentRangesKb',
|
|
828
|
-
"Editor has commenting ranges, run the command Open Accessibility Help ({0}), for more information.",
|
|
829
|
-
keybinding
|
|
830
|
-
)));
|
|
821
|
+
status(nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsController', 'hasCommentRangesKb', "Editor has commenting ranges, run the command Open Accessibility Help ({0}), for more information.", keybinding));
|
|
831
822
|
}
|
|
832
823
|
else {
|
|
833
|
-
status((
|
|
834
|
-
'hasCommentRangesNoKb',
|
|
835
|
-
"Editor has commenting ranges, run the command Open Accessibility Help, which is currently not triggerable via keybinding, for more information."
|
|
836
|
-
)));
|
|
824
|
+
status(nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsController', 'hasCommentRangesNoKb', "Editor has commenting ranges, run the command Open Accessibility Help, which is currently not triggerable via keybinding, for more information."));
|
|
837
825
|
}
|
|
838
826
|
}
|
|
839
827
|
else {
|
|
840
|
-
status(
|
|
828
|
+
status(nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsController', 'hasCommentRanges', "Editor has commenting ranges."));
|
|
841
829
|
}
|
|
842
830
|
}
|
|
843
831
|
}
|
|
@@ -961,7 +949,7 @@ let CommentController = class CommentController {
|
|
|
961
949
|
}
|
|
962
950
|
else {
|
|
963
951
|
const picks = this.getCommentProvidersQuickPicks(newCommentInfos);
|
|
964
|
-
return this.quickInputService.pick(picks, { placeHolder:
|
|
952
|
+
return this.quickInputService.pick(picks, { placeHolder: nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsController', 'pickCommentService', "Select Comment Provider"), matchOnDescription: true }).then(pick => {
|
|
965
953
|
if (!pick) {
|
|
966
954
|
return;
|
|
967
955
|
}
|
|
@@ -21,7 +21,7 @@ import { openLinkFromMarkdown } from 'monaco-editor/esm/vs/editor/contrib/markdo
|
|
|
21
21
|
const COMMENTS_VIEW_ID = 'workbench.panel.comments';
|
|
22
22
|
const COMMENTS_VIEW_STORAGE_ID = 'Comments';
|
|
23
23
|
const COMMENTS_VIEW_ORIGINAL_TITLE = 'Comments';
|
|
24
|
-
const COMMENTS_VIEW_TITLE =
|
|
24
|
+
const COMMENTS_VIEW_TITLE = nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsTreeViewer', 'comments.view.title', "Comments");
|
|
25
25
|
class CommentsModelVirualDelegate {
|
|
26
26
|
static { this.RESOURCE_ID = 'resource-with-comments'; }
|
|
27
27
|
static { this.COMMENT_ID = 'comment-node'; }
|
|
@@ -71,10 +71,10 @@ let CommentNodeRenderer = class CommentNodeRenderer {
|
|
|
71
71
|
const threadMetadata = {
|
|
72
72
|
icon: dom.append(metadataContainer, dom.$('.icon')),
|
|
73
73
|
userNames: dom.append(metadataContainer, dom.$('.user')),
|
|
74
|
-
timestamp: (
|
|
74
|
+
timestamp: ( new TimestampWidget(
|
|
75
75
|
this.configurationService,
|
|
76
76
|
dom.append(metadataContainer, dom.$('.timestamp-container'))
|
|
77
|
-
))
|
|
77
|
+
)),
|
|
78
78
|
separator: dom.append(metadataContainer, dom.$('.separator')),
|
|
79
79
|
commentPreview: dom.append(metadataContainer, dom.$('.text')),
|
|
80
80
|
range: dom.append(metadataContainer, dom.$('.range'))
|
|
@@ -87,10 +87,10 @@ let CommentNodeRenderer = class CommentNodeRenderer {
|
|
|
87
87
|
count: dom.append(snippetContainer, dom.$('.count')),
|
|
88
88
|
lastReplyDetail: dom.append(snippetContainer, dom.$('.reply-detail')),
|
|
89
89
|
separator: dom.append(snippetContainer, dom.$('.separator')),
|
|
90
|
-
timestamp: (
|
|
90
|
+
timestamp: ( new TimestampWidget(
|
|
91
91
|
this.configurationService,
|
|
92
92
|
dom.append(snippetContainer, dom.$('.timestamp-container'))
|
|
93
|
-
))
|
|
93
|
+
)),
|
|
94
94
|
};
|
|
95
95
|
repliesMetadata.separator.innerText = '\u00b7';
|
|
96
96
|
repliesMetadata.icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.indent));
|
|
@@ -99,14 +99,10 @@ let CommentNodeRenderer = class CommentNodeRenderer {
|
|
|
99
99
|
}
|
|
100
100
|
getCountString(commentCount) {
|
|
101
101
|
if (commentCount > 1) {
|
|
102
|
-
return (
|
|
103
|
-
(nls.localize('commentsCount', "{0} comments", commentCount))
|
|
104
|
-
);
|
|
102
|
+
return nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsTreeViewer', 'commentsCount', "{0} comments", commentCount);
|
|
105
103
|
}
|
|
106
104
|
else {
|
|
107
|
-
return (
|
|
108
|
-
(nls.localize('commentCount', "1 comment"))
|
|
109
|
-
);
|
|
105
|
+
return nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsTreeViewer', 'commentCount', "1 comment");
|
|
110
106
|
}
|
|
111
107
|
}
|
|
112
108
|
getRenderedComment(commentBody, disposables) {
|
|
@@ -121,7 +117,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
|
|
|
121
117
|
for (let i = 0; i < images.length; i++) {
|
|
122
118
|
const image = images[i];
|
|
123
119
|
const textDescription = dom.$('');
|
|
124
|
-
textDescription.textContent = image.alt ?
|
|
120
|
+
textDescription.textContent = image.alt ? nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsTreeViewer', 'imageWithLabel', "Image: {0}", image.alt) : nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsTreeViewer', 'image', "Image");
|
|
125
121
|
image.parentNode.replaceChild(textDescription, image);
|
|
126
122
|
}
|
|
127
123
|
return renderedComment;
|
|
@@ -136,7 +132,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
|
|
|
136
132
|
}
|
|
137
133
|
renderElement(node, index, templateData, height) {
|
|
138
134
|
const commentCount = node.element.replies.length + 1;
|
|
139
|
-
templateData.threadMetadata.icon.classList.remove(...Array.from((
|
|
135
|
+
templateData.threadMetadata.icon.classList.remove(...Array.from(( templateData.threadMetadata.icon.classList.values()))
|
|
140
136
|
.filter(value => value.startsWith('codicon')));
|
|
141
137
|
templateData.threadMetadata.icon.classList.add(...ThemeIcon.asClassNameArray(this.getIcon(node.element.threadState)));
|
|
142
138
|
if (node.element.threadState !== undefined) {
|
|
@@ -145,7 +141,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
|
|
|
145
141
|
templateData.threadMetadata.icon.style.color = `var(${commentViewThreadStateColorVar})`;
|
|
146
142
|
}
|
|
147
143
|
templateData.threadMetadata.userNames.textContent = node.element.comment.userName;
|
|
148
|
-
templateData.threadMetadata.timestamp.setTimestamp(node.element.comment.timestamp ? (
|
|
144
|
+
templateData.threadMetadata.timestamp.setTimestamp(node.element.comment.timestamp ? ( new Date(node.element.comment.timestamp)) : undefined);
|
|
149
145
|
const originalComment = node.element;
|
|
150
146
|
templateData.threadMetadata.commentPreview.innerText = '';
|
|
151
147
|
templateData.threadMetadata.commentPreview.style.height = '22px';
|
|
@@ -153,7 +149,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
|
|
|
153
149
|
templateData.threadMetadata.commentPreview.innerText = originalComment.comment.body;
|
|
154
150
|
}
|
|
155
151
|
else {
|
|
156
|
-
const disposables = (
|
|
152
|
+
const disposables = ( new DisposableStore());
|
|
157
153
|
templateData.disposables.push(disposables);
|
|
158
154
|
const renderedComment = this.getRenderedComment(originalComment.comment.body, disposables);
|
|
159
155
|
templateData.disposables.push(renderedComment);
|
|
@@ -162,15 +158,10 @@ let CommentNodeRenderer = class CommentNodeRenderer {
|
|
|
162
158
|
}
|
|
163
159
|
if (node.element.range) {
|
|
164
160
|
if (node.element.range.startLineNumber === node.element.range.endLineNumber) {
|
|
165
|
-
templateData.threadMetadata.range.textContent =
|
|
161
|
+
templateData.threadMetadata.range.textContent = nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsTreeViewer', 'commentLine', "[Ln {0}]", node.element.range.startLineNumber);
|
|
166
162
|
}
|
|
167
163
|
else {
|
|
168
|
-
templateData.threadMetadata.range.textContent = (
|
|
169
|
-
'commentRange',
|
|
170
|
-
"[Ln {0}-{1}]",
|
|
171
|
-
node.element.range.startLineNumber,
|
|
172
|
-
node.element.range.endLineNumber
|
|
173
|
-
)));
|
|
164
|
+
templateData.threadMetadata.range.textContent = nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsTreeViewer', 'commentRange', "[Ln {0}-{1}]", node.element.range.startLineNumber, node.element.range.endLineNumber);
|
|
174
165
|
}
|
|
175
166
|
}
|
|
176
167
|
if (!node.element.hasReply()) {
|
|
@@ -180,8 +171,8 @@ let CommentNodeRenderer = class CommentNodeRenderer {
|
|
|
180
171
|
templateData.repliesMetadata.container.style.display = '';
|
|
181
172
|
templateData.repliesMetadata.count.textContent = this.getCountString(commentCount);
|
|
182
173
|
const lastComment = node.element.replies[node.element.replies.length - 1].comment;
|
|
183
|
-
templateData.repliesMetadata.lastReplyDetail.textContent =
|
|
184
|
-
templateData.repliesMetadata.timestamp.setTimestamp(lastComment.timestamp ? (
|
|
174
|
+
templateData.repliesMetadata.lastReplyDetail.textContent = nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsTreeViewer', 'lastReplyFrom', "Last reply from {0}", lastComment.userName);
|
|
175
|
+
templateData.repliesMetadata.timestamp.setTimestamp(lastComment.timestamp ? ( new Date(lastComment.timestamp)) : undefined);
|
|
185
176
|
}
|
|
186
177
|
getCommentThreadWidgetStateColor(state, theme) {
|
|
187
178
|
return (state !== undefined) ? getCommentThreadStateIconColor(state, theme) : undefined;
|
|
@@ -190,11 +181,11 @@ let CommentNodeRenderer = class CommentNodeRenderer {
|
|
|
190
181
|
templateData.disposables.forEach(disposeable => disposeable.dispose());
|
|
191
182
|
}
|
|
192
183
|
};
|
|
193
|
-
CommentNodeRenderer = (
|
|
194
|
-
(
|
|
195
|
-
(
|
|
196
|
-
(
|
|
197
|
-
], CommentNodeRenderer))
|
|
184
|
+
CommentNodeRenderer = ( __decorate([
|
|
185
|
+
( __param(0, IOpenerService)),
|
|
186
|
+
( __param(1, IConfigurationService)),
|
|
187
|
+
( __param(2, IThemeService))
|
|
188
|
+
], CommentNodeRenderer));
|
|
198
189
|
class Filter {
|
|
199
190
|
constructor(options) {
|
|
200
191
|
this.options = options;
|
|
@@ -231,10 +222,10 @@ class Filter {
|
|
|
231
222
|
const textMatches =
|
|
232
223
|
FilterOptions._messageFilter(this.options.textFilter.text, typeof comment.comment.body === 'string' ? comment.comment.body : comment.comment.body.value)
|
|
233
224
|
|| FilterOptions._messageFilter(this.options.textFilter.text, comment.comment.userName)
|
|
234
|
-
|| (
|
|
225
|
+
|| ( comment.replies.map(reply => {
|
|
235
226
|
return FilterOptions._messageFilter(this.options.textFilter.text, reply.comment.userName)
|
|
236
227
|
|| FilterOptions._messageFilter(this.options.textFilter.text, typeof reply.comment.body === 'string' ? reply.comment.body : reply.comment.body.value);
|
|
237
|
-
}))
|
|
228
|
+
})).filter(value => !!value).flat();
|
|
238
229
|
if (textMatches.length && !this.options.textFilter.negate) {
|
|
239
230
|
return { visibility: true, data: { type: 1 , textMatches } };
|
|
240
231
|
}
|
|
@@ -249,7 +240,7 @@ class Filter {
|
|
|
249
240
|
}
|
|
250
241
|
let CommentsList = class CommentsList extends WorkbenchObjectTree {
|
|
251
242
|
constructor(labels, container, options, contextKeyService, listService, themeService, instantiationService, configurationService) {
|
|
252
|
-
const delegate = (
|
|
243
|
+
const delegate = ( new CommentsModelVirualDelegate());
|
|
253
244
|
const renderers = [
|
|
254
245
|
instantiationService.createInstance(ResourceWithCommentsRenderer, labels),
|
|
255
246
|
instantiationService.createInstance(CommentNodeRenderer)
|
|
@@ -265,7 +256,7 @@ let CommentsList = class CommentsList extends WorkbenchObjectTree {
|
|
|
265
256
|
return `${element.owner}-${element.id}`;
|
|
266
257
|
}
|
|
267
258
|
if (element instanceof CommentNode) {
|
|
268
|
-
return `${element.owner}-${(
|
|
259
|
+
return `${element.owner}-${( element.resource.toString())}-${element.threadId}-${element.comment.uniqueIdInThread}` + (element.isRoot ? '-root' : '');
|
|
269
260
|
}
|
|
270
261
|
return '';
|
|
271
262
|
}
|
|
@@ -293,11 +284,11 @@ let CommentsList = class CommentsList extends WorkbenchObjectTree {
|
|
|
293
284
|
return filtered;
|
|
294
285
|
}
|
|
295
286
|
};
|
|
296
|
-
CommentsList = (
|
|
297
|
-
(
|
|
298
|
-
(
|
|
299
|
-
(
|
|
300
|
-
(
|
|
301
|
-
(
|
|
302
|
-
], CommentsList))
|
|
287
|
+
CommentsList = ( __decorate([
|
|
288
|
+
( __param(3, IContextKeyService)),
|
|
289
|
+
( __param(4, IListService)),
|
|
290
|
+
( __param(5, IThemeService)),
|
|
291
|
+
( __param(6, IInstantiationService)),
|
|
292
|
+
( __param(7, IConfigurationService))
|
|
293
|
+
], CommentsList));
|
|
303
294
|
export { COMMENTS_VIEW_ID, COMMENTS_VIEW_ORIGINAL_TITLE, COMMENTS_VIEW_STORAGE_ID, COMMENTS_VIEW_TITLE, CommentNodeRenderer, CommentsList, Filter, ResourceWithCommentsRenderer };
|
|
@@ -54,8 +54,8 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
|
|
|
54
54
|
super({
|
|
55
55
|
...options,
|
|
56
56
|
filterOptions: {
|
|
57
|
-
placeholder:
|
|
58
|
-
ariaLabel:
|
|
57
|
+
placeholder: nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsView', 'comments.filter.placeholder', "Filter (e.g. text, author)"),
|
|
58
|
+
ariaLabel: nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsView', 'comments.filter.ariaLabel', "Filter comments"),
|
|
59
59
|
history: viewState['filterHistory'] || [],
|
|
60
60
|
text: viewState['filter'] || '',
|
|
61
61
|
focusContextKey: CommentsViewFilterFocusContextKey.key
|
|
@@ -97,7 +97,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
|
|
|
97
97
|
return;
|
|
98
98
|
}
|
|
99
99
|
this.totalUnresolved = unresolved;
|
|
100
|
-
const message =
|
|
100
|
+
const message = nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsView', 'totalUnresolvedComments', '{0} Unresolved Comments', this.totalUnresolved);
|
|
101
101
|
this.activity.value = this.activityService.showViewActivity(this.id, { badge: ( new NumberBadge(this.totalUnresolved, () => message)) });
|
|
102
102
|
}
|
|
103
103
|
saveState() {
|
|
@@ -148,7 +148,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
|
|
|
148
148
|
this.tree?.filterComments();
|
|
149
149
|
this.cachedFilterStats = undefined;
|
|
150
150
|
const { total, filtered } = this.getFilterStats();
|
|
151
|
-
this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined :
|
|
151
|
+
this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsView', 'showing filtered results', "Showing {0} of {1}", filtered, total));
|
|
152
152
|
this.filterWidget.checkMoreFilters(!this.filters.showResolved || !this.filters.showUnresolved);
|
|
153
153
|
}
|
|
154
154
|
renderBody(container) {
|
|
@@ -262,36 +262,17 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
|
|
|
262
262
|
accessibilityProvider: {
|
|
263
263
|
getAriaLabel(element) {
|
|
264
264
|
if (element instanceof CommentsModel) {
|
|
265
|
-
return
|
|
265
|
+
return nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsView', 'rootCommentsLabel', "Comments for current workspace");
|
|
266
266
|
}
|
|
267
267
|
if (element instanceof ResourceWithCommentThreads) {
|
|
268
|
-
return (
|
|
269
|
-
'resourceWithCommentThreadsLabel',
|
|
270
|
-
"Comments in {0}, full path {1}",
|
|
271
|
-
basename(element.resource),
|
|
272
|
-
element.resource.fsPath
|
|
273
|
-
));
|
|
268
|
+
return nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsView', 'resourceWithCommentThreadsLabel', "Comments in {0}, full path {1}", basename(element.resource), element.resource.fsPath);
|
|
274
269
|
}
|
|
275
270
|
if (element instanceof CommentNode) {
|
|
276
271
|
if (element.range) {
|
|
277
|
-
return (
|
|
278
|
-
'resourceWithCommentLabel',
|
|
279
|
-
"Comment from ${0} at line {1} column {2} in {3}, source: {4}",
|
|
280
|
-
element.comment.userName,
|
|
281
|
-
element.range.startLineNumber,
|
|
282
|
-
element.range.startColumn,
|
|
283
|
-
basename(element.resource),
|
|
284
|
-
(typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value
|
|
285
|
-
));
|
|
272
|
+
return nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsView', 'resourceWithCommentLabel', "Comment from ${0} at line {1} column {2} in {3}, source: {4}", element.comment.userName, element.range.startLineNumber, element.range.startColumn, basename(element.resource), (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value);
|
|
286
273
|
}
|
|
287
274
|
else {
|
|
288
|
-
return (
|
|
289
|
-
'resourceWithCommentLabelFile',
|
|
290
|
-
"Comment from ${0} in {1}, source: {2}",
|
|
291
|
-
element.comment.userName,
|
|
292
|
-
basename(element.resource),
|
|
293
|
-
(typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value
|
|
294
|
-
));
|
|
275
|
+
return nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsView', 'resourceWithCommentLabelFile', "Comment from ${0} in {1}, source: {2}", element.comment.userName, basename(element.resource), (typeof element.comment.body === 'string') ? element.comment.body : element.comment.body.value);
|
|
295
276
|
}
|
|
296
277
|
}
|
|
297
278
|
return '';
|
|
@@ -469,7 +450,7 @@ registerAction2(class Collapse extends ViewAction {
|
|
|
469
450
|
super({
|
|
470
451
|
viewId: COMMENTS_VIEW_ID,
|
|
471
452
|
id: 'comments.collapse',
|
|
472
|
-
title:
|
|
453
|
+
title: nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsView', 'collapseAll', "Collapse All"),
|
|
473
454
|
f1: false,
|
|
474
455
|
icon: Codicon.collapseAll,
|
|
475
456
|
menu: {
|
|
@@ -489,7 +470,7 @@ registerAction2(class Expand extends ViewAction {
|
|
|
489
470
|
super({
|
|
490
471
|
viewId: COMMENTS_VIEW_ID,
|
|
491
472
|
id: 'comments.expand',
|
|
492
|
-
title:
|
|
473
|
+
title: nls.localizeWithPath('vs/workbench/contrib/comments/browser/commentsView', 'expandAll', "Expand All"),
|
|
493
474
|
f1: false,
|
|
494
475
|
icon: Codicon.expandAll,
|
|
495
476
|
menu: {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
|
|
2
|
-
import {
|
|
2
|
+
import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
|
|
3
3
|
import { ContextKeyExpr, RawContextKey } from 'monaco-editor/esm/vs/platform/contextkey/common/contextkey.js';
|
|
4
4
|
import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
|
|
5
5
|
import { CommentsViewFilterFocusContextKey } from './comments.js';
|
|
@@ -44,7 +44,7 @@ registerAction2(class extends ViewAction {
|
|
|
44
44
|
constructor() {
|
|
45
45
|
super({
|
|
46
46
|
id: 'commentsFocusViewFromFilter',
|
|
47
|
-
title: (
|
|
47
|
+
title: localizeWithPath('vs/workbench/contrib/comments/browser/commentsViewActions', 'focusCommentsList', "Focus Comments view"),
|
|
48
48
|
keybinding: {
|
|
49
49
|
when: CommentsViewFilterFocusContextKey,
|
|
50
50
|
weight: 200 ,
|
|
@@ -61,7 +61,7 @@ registerAction2(class extends ViewAction {
|
|
|
61
61
|
constructor() {
|
|
62
62
|
super({
|
|
63
63
|
id: 'commentsClearFilterText',
|
|
64
|
-
title: (
|
|
64
|
+
title: localizeWithPath('vs/workbench/contrib/comments/browser/commentsViewActions', 'commentsClearFilterText', "Clear filter text"),
|
|
65
65
|
keybinding: {
|
|
66
66
|
when: CommentsViewFilterFocusContextKey,
|
|
67
67
|
weight: 200 ,
|
|
@@ -78,7 +78,7 @@ registerAction2(class extends ViewAction {
|
|
|
78
78
|
constructor() {
|
|
79
79
|
super({
|
|
80
80
|
id: 'commentsFocusFilter',
|
|
81
|
-
title: (
|
|
81
|
+
title: localizeWithPath('vs/workbench/contrib/comments/browser/commentsViewActions', 'focusCommentsFilter', "Focus comments filter"),
|
|
82
82
|
keybinding: {
|
|
83
83
|
when: ( FocusedViewContext.isEqualTo(COMMENTS_VIEW_ID)),
|
|
84
84
|
weight: 200 ,
|
|
@@ -95,11 +95,11 @@ registerAction2(class extends ViewAction {
|
|
|
95
95
|
constructor() {
|
|
96
96
|
super({
|
|
97
97
|
id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleUnResolvedComments`,
|
|
98
|
-
title: (
|
|
99
|
-
category: (
|
|
98
|
+
title: localizeWithPath('vs/workbench/contrib/comments/browser/commentsViewActions', 'toggle unresolved', "Toggle Unresolved Comments"),
|
|
99
|
+
category: localizeWithPath('vs/workbench/contrib/comments/browser/commentsViewActions', 'comments', "Comments"),
|
|
100
100
|
toggled: {
|
|
101
101
|
condition: CONTEXT_KEY_SHOW_UNRESOLVED,
|
|
102
|
-
title: (
|
|
102
|
+
title: localizeWithPath('vs/workbench/contrib/comments/browser/commentsViewActions', 'unresolved', "Show Unresolved"),
|
|
103
103
|
},
|
|
104
104
|
menu: {
|
|
105
105
|
id: viewFilterSubmenu,
|
|
@@ -118,11 +118,11 @@ registerAction2(class extends ViewAction {
|
|
|
118
118
|
constructor() {
|
|
119
119
|
super({
|
|
120
120
|
id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleResolvedComments`,
|
|
121
|
-
title: (
|
|
122
|
-
category: (
|
|
121
|
+
title: localizeWithPath('vs/workbench/contrib/comments/browser/commentsViewActions', 'toggle resolved', "Toggle Resolved Comments"),
|
|
122
|
+
category: localizeWithPath('vs/workbench/contrib/comments/browser/commentsViewActions', 'comments', "Comments"),
|
|
123
123
|
toggled: {
|
|
124
124
|
condition: CONTEXT_KEY_SHOW_RESOLVED,
|
|
125
|
-
title: (
|
|
125
|
+
title: localizeWithPath('vs/workbench/contrib/comments/browser/commentsViewActions', 'resolved', "Show Resolved"),
|
|
126
126
|
},
|
|
127
127
|
menu: {
|
|
128
128
|
id: viewFilterSubmenu,
|
|
@@ -6,7 +6,7 @@ import { ActionViewItem } from 'monaco-editor/esm/vs/base/browser/ui/actionbar/a
|
|
|
6
6
|
class ToggleReactionsAction extends Action {
|
|
7
7
|
static { this.ID = 'toolbar.toggle.pickReactions'; }
|
|
8
8
|
constructor(toggleDropdownMenu, title) {
|
|
9
|
-
super(ToggleReactionsAction.ID, title ||
|
|
9
|
+
super(ToggleReactionsAction.ID, title || nls.localizeWithPath('vs/workbench/contrib/comments/browser/reactionsAction', 'pickReactions', "Pick Reactions..."), 'toggle-reactions', true);
|
|
10
10
|
this._menuActions = [];
|
|
11
11
|
this.toggleDropdownMenu = toggleDropdownMenu;
|
|
12
12
|
}
|
|
@@ -50,32 +50,32 @@ class ReactionActionViewItem extends ActionViewItem {
|
|
|
50
50
|
}
|
|
51
51
|
getTooltip() {
|
|
52
52
|
const action = this.action;
|
|
53
|
-
const toggleMessage = action.enabled ?
|
|
53
|
+
const toggleMessage = action.enabled ? nls.localizeWithPath('vs/workbench/contrib/comments/browser/reactionsAction', 'comment.toggleableReaction', "Toggle reaction, ") : '';
|
|
54
54
|
if (action.count === undefined) {
|
|
55
|
-
return
|
|
55
|
+
return nls.localizeWithPath('vs/workbench/contrib/comments/browser/reactionsAction', {
|
|
56
56
|
key: 'comment.reactionLabelNone', comment: [
|
|
57
57
|
'This is a tooltip for an emoji button so that the current user can toggle their reaction to a comment.',
|
|
58
58
|
'The first arg is localized message "Toggle reaction" or empty if the user doesn\'t have permission to toggle the reaction, the second is the name of the reaction.'
|
|
59
59
|
]
|
|
60
|
-
}, "{0}{1} reaction", toggleMessage, action.label)
|
|
60
|
+
}, "{0}{1} reaction", toggleMessage, action.label);
|
|
61
61
|
}
|
|
62
62
|
else if (action.count === 1) {
|
|
63
|
-
return
|
|
63
|
+
return nls.localizeWithPath('vs/workbench/contrib/comments/browser/reactionsAction', {
|
|
64
64
|
key: 'comment.reactionLabelOne', comment: [
|
|
65
65
|
'This is a tooltip for an emoji that is a "reaction" to a comment where the count of the reactions is 1.',
|
|
66
66
|
'The emoji is also a button so that the current user can also toggle their own emoji reaction.',
|
|
67
67
|
'The first arg is localized message "Toggle reaction" or empty if the user doesn\'t have permission to toggle the reaction, the second is the name of the reaction.'
|
|
68
68
|
]
|
|
69
|
-
}, "{0}1 reaction with {1}", toggleMessage, action.label)
|
|
69
|
+
}, "{0}1 reaction with {1}", toggleMessage, action.label);
|
|
70
70
|
}
|
|
71
71
|
else if (action.count > 1) {
|
|
72
|
-
return
|
|
72
|
+
return nls.localizeWithPath('vs/workbench/contrib/comments/browser/reactionsAction', {
|
|
73
73
|
key: 'comment.reactionLabelMany', comment: [
|
|
74
74
|
'This is a tooltip for an emoji that is a "reaction" to a comment where the count of the reactions is greater than 1.',
|
|
75
75
|
'The emoji is also a button so that the current user can also toggle their own emoji reaction.',
|
|
76
76
|
'The first arg is localized message "Toggle reaction" or empty if the user doesn\'t have permission to toggle the reaction, the second is number of users who have reacted with that reaction, and the third is the name of the reaction.'
|
|
77
77
|
]
|
|
78
|
-
}, "{0}{1} reactions with {2}", toggleMessage, action.count, action.label)
|
|
78
|
+
}, "{0}{1} reactions with {2}", toggleMessage, action.count, action.label);
|
|
79
79
|
}
|
|
80
80
|
return undefined;
|
|
81
81
|
}
|