@codingame/monaco-vscode-api 32.0.0 → 32.0.2
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/package.json +8 -8
- package/services.js +3 -3
- package/vscode/src/vs/base/common/paging.js +66 -2
- package/vscode/src/vs/platform/extensionManagement/common/unsupportedExtensionsMigration.d.ts +14 -0
- package/vscode/src/vs/platform/extensionManagement/common/unsupportedExtensionsMigration.js +145 -0
- package/vscode/src/vs/platform/extensionRecommendations/common/extensionRecommendations.d.ts +19 -0
- package/vscode/src/vs/platform/extensionRecommendations/common/extensionRecommendations.js +25 -0
- package/vscode/src/vs/platform/extensionRecommendations/common/extensionRecommendations.service.d.ts +1 -1
- package/vscode/src/vs/platform/product/common/product.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessions.js +12 -12
- package/vscode/src/vs/workbench/contrib/chat/browser/agentSessions/agentSessionsModel.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/aiCustomization/aiCustomizationManagement.js +3 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/attachments/chatScreenshotContext.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chat.js +3 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditing/chatEditingEditorContextKeys.js +7 -7
- package/vscode/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessionDescription.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatSessions/chatSessions.contribution.js +43 -43
- package/vscode/src/vs/workbench/contrib/chat/browser/chatSetup/chatSetup.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/widgetHosts/editor/chatEditorInput.js +9 -9
- package/vscode/src/vs/workbench/contrib/chat/common/actions/chatContextKeys.js +86 -86
- package/vscode/src/vs/workbench/contrib/chat/common/attachments/chatVariableEntries.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/common/chatModes.js +3 -3
- package/vscode/src/vs/workbench/contrib/chat/common/customizationHarnessService.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/common/editing/chatEditingService.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/common/languageModelStats.js +3 -3
- package/vscode/src/vs/workbench/contrib/chat/common/languageModels.js +23 -23
- package/vscode/src/vs/workbench/contrib/chat/common/model/chatModel.js +7 -7
- package/vscode/src/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatToolInvocation.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/computeAutomaticInstructions.js +13 -13
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/hookSchema.js +18 -18
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/hookTypes.js +20 -20
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptFileAttributes.js +79 -79
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/promptTypes.js +10 -10
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/service/promptsServiceImpl.js +3 -3
- package/vscode/src/vs/workbench/contrib/chat/common/promptSyntax/utils/promptFilesLocator.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/common/tools/builtinTools/askQuestionsTool.js +8 -8
- package/vscode/src/vs/workbench/contrib/chat/common/tools/builtinTools/manageTodoListTool.js +10 -10
- package/vscode/src/vs/workbench/contrib/chat/common/tools/builtinTools/reviewPlanTool.js +7 -7
- package/vscode/src/vs/workbench/contrib/chat/common/tools/builtinTools/runSubagentTool.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/common/tools/builtinTools/setArtifactRulesTool.js +3 -3
- package/vscode/src/vs/workbench/contrib/chat/common/tools/builtinTools/setArtifactsTool.js +4 -4
- package/vscode/src/vs/workbench/contrib/chat/common/tools/languageModelToolsContribution.js +22 -22
- package/vscode/src/vs/workbench/contrib/chat/common/tools/languageModelToolsService.js +3 -3
- package/vscode/src/vs/workbench/contrib/chat/common/widget/input/modelPickerWidget.js +1 -1
- package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js +11 -11
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.js +4 -4
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorAccessibilityHelp.js +5 -5
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js +3 -3
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.js +10 -10
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.js +2 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.js +3 -3
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.js +6 -6
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.js +4 -4
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.js +2 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.js +3 -3
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.js +2 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.js +12 -12
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js +5 -5
- package/vscode/src/vs/workbench/contrib/codeEditor/common/languageConfigurationExtensionPoint.js +65 -65
- package/vscode/src/vs/workbench/contrib/comments/browser/commentColors.js +7 -7
- package/vscode/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.js +7 -7
- package/vscode/src/vs/workbench/contrib/comments/browser/commentNode.js +2 -2
- package/vscode/src/vs/workbench/contrib/comments/browser/commentReply.js +3 -3
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadBody.js +3 -3
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadHeader.js +3 -3
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadWidget.js +3 -3
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.js +3 -3
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsAccessibility.js +12 -12
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsController.js +7 -7
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsModel.js +1 -1
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.js +9 -9
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsView.js +14 -14
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsViewActions.js +16 -16
- package/vscode/src/vs/workbench/contrib/comments/browser/reactionsAction.js +7 -7
- package/vscode/src/vs/workbench/contrib/comments/common/commentContextKeys.js +12 -12
- package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorDiffInput.js +2 -2
- package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInput.js +3 -3
- package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.js +29 -29
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointWidget.js +14 -14
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointsView.js +75 -75
- package/vscode/src/vs/workbench/contrib/debug/browser/callStackEditorContribution.js +2 -2
- package/vscode/src/vs/workbench/contrib/debug/browser/debugActionViewItems.js +6 -6
- package/vscode/src/vs/workbench/contrib/debug/browser/debugColors.js +12 -12
- package/vscode/src/vs/workbench/contrib/debug/browser/debugCommands.js +38 -38
- package/vscode/src/vs/workbench/contrib/debug/browser/debugEditorContribution.js +2 -2
- package/vscode/src/vs/workbench/contrib/debug/browser/debugHover.js +3 -3
- package/vscode/src/vs/workbench/contrib/debug/browser/debugIcons.js +57 -57
- package/vscode/src/vs/workbench/contrib/debug/browser/debugSessionPicker.js +3 -3
- package/vscode/src/vs/workbench/contrib/debug/browser/exceptionWidget.js +4 -4
- package/vscode/src/vs/workbench/contrib/debug/browser/linkDetector.js +2 -2
- package/vscode/src/vs/workbench/contrib/debug/browser/repl.js +18 -18
- package/vscode/src/vs/workbench/contrib/debug/browser/replViewer.js +5 -5
- package/vscode/src/vs/workbench/contrib/debug/browser/variablesView.js +9 -9
- package/vscode/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/common/debug.js +65 -65
- package/vscode/src/vs/workbench/contrib/debug/common/debugModel.js +6 -6
- package/vscode/src/vs/workbench/contrib/debug/common/debugSource.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/common/disassemblyViewInput.js +2 -2
- package/vscode/src/vs/workbench/contrib/debug/common/loadedScriptsPicker.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/common/replModel.js +1 -1
- package/vscode/src/vs/workbench/contrib/dropOrPasteInto/browser/commands.js +2 -2
- package/vscode/src/vs/workbench/contrib/dropOrPasteInto/browser/configurationSchema.js +4 -4
- package/vscode/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.d.ts +76 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.js +470 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/configBasedRecommendations.d.ts +25 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/configBasedRecommendations.js +83 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/exeBasedRecommendations.d.ts +20 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/exeBasedRecommendations.js +66 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionEditor.d.ts +83 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionEditor.js +1353 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionEnablementWorkspaceTrustTransitionParticipant.d.ts +11 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionEnablementWorkspaceTrustTransitionParticipant.js +49 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.d.ts +22 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionFeaturesTab.js +728 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService.d.ts +63 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService.js +522 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionRecommendations.d.ts +19 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionRecommendations.js +18 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionRecommendationsService.d.ts +71 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionRecommendationsService.js +263 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensions.contribution.d.ts +5 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensions.contribution.js +2227 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.js +179 -179
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActivationProgress.d.ts +9 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActivationProgress.js +40 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsCompletionItemsProvider.d.ts +9 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsCompletionItemsProvider.js +77 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsDependencyChecker.d.ts +16 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsDependencyChecker.js +93 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsIcons.js +25 -25
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsQuickAccess.d.ts +27 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsQuickAccess.js +100 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsViewer.js +7 -7
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.d.ts +151 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.js +1031 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsViews.d.ts +235 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsViews.js +1600 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWidgets.js +30 -30
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.d.ts +314 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsWorkbenchService.js +3449 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/fileBasedRecommendations.d.ts +44 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/fileBasedRecommendations.js +368 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/keymapRecommendations.d.ts +9 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/keymapRecommendations.js +30 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/languageRecommendations.d.ts +9 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/languageRecommendations.js +30 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/media/extensionEditor.css +910 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/media/extensionManagement.css +12 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/media/extensionsViewlet.css +229 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/media/loading-dark.svg +31 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/media/loading-hc.svg +31 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/media/loading.svg +31 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/media/runtimeExtensionsEditor.css +86 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/remoteRecommendations.d.ts +9 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/remoteRecommendations.js +38 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/unsupportedExtensionsMigrationContribution.d.ts +9 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/unsupportedExtensionsMigrationContribution.js +41 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/webRecommendations.d.ts +11 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/webRecommendations.js +38 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/workspaceRecommendations.d.ts +33 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/workspaceRecommendations.js +179 -0
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionQuery.d.ts +11 -0
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionQuery.js +90 -0
- package/vscode/src/vs/workbench/contrib/extensions/common/extensions.js +1 -1
- package/vscode/src/vs/workbench/contrib/extensions/common/extensions.service.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.js +5 -5
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsInput.d.ts +24 -0
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsInput.js +50 -0
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsUtils.js +3 -3
- package/vscode/src/vs/workbench/contrib/extensions/common/runtimeExtensionsInput.d.ts +15 -0
- package/vscode/src/vs/workbench/contrib/extensions/common/runtimeExtensionsInput.js +47 -0
- package/vscode/src/vs/workbench/contrib/extensions/common/searchExtensionsTool.js +3 -3
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/configuration.js +4 -4
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.js +3 -3
- package/vscode/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.js +1 -1
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditor.js +8 -8
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.js +18 -18
- package/vscode/src/vs/workbench/contrib/files/browser/explorerViewlet.js +14 -14
- package/vscode/src/vs/workbench/contrib/files/browser/fileActions.contribution.js +39 -39
- package/vscode/src/vs/workbench/contrib/files/browser/fileActions.js +84 -84
- package/vscode/src/vs/workbench/contrib/files/browser/fileCommands._save.js +4 -4
- package/vscode/src/vs/workbench/contrib/files/browser/fileCommands.js +2 -2
- package/vscode/src/vs/workbench/contrib/files/browser/fileConstants.js +6 -6
- package/vscode/src/vs/workbench/contrib/files/browser/fileImportExport.js +28 -28
- package/vscode/src/vs/workbench/contrib/files/browser/files.contribution._configuration.js +50 -50
- package/vscode/src/vs/workbench/contrib/files/browser/files.contribution._editorPane.js +2 -2
- package/vscode/src/vs/workbench/contrib/files/browser/views/emptyView.js +1 -1
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.js +4 -4
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerView.js +7 -7
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.js +17 -17
- package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js +7 -7
- package/vscode/src/vs/workbench/contrib/files/browser/workspaceWatcher.js +4 -4
- package/vscode/src/vs/workbench/contrib/files/common/dirtyFilesIndicator.js +1 -1
- package/vscode/src/vs/workbench/contrib/files/common/files.js +16 -16
- package/vscode/src/vs/workbench/contrib/folding/browser/folding.contribution.js +3 -3
- package/vscode/src/vs/workbench/contrib/format/browser/formatActionsMultiple.js +20 -20
- package/vscode/src/vs/workbench/contrib/format/browser/formatActionsNone.js +4 -4
- package/vscode/src/vs/workbench/contrib/format/browser/formatModified.js +1 -1
- package/vscode/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.js +4 -4
- package/vscode/src/vs/workbench/contrib/list/browser/listResizeColumnAction.js +2 -2
- package/vscode/src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.js +5 -5
- package/vscode/src/vs/workbench/contrib/mcp/browser/mcpCommandsAddConfiguration.js +66 -66
- package/vscode/src/vs/workbench/contrib/mcp/browser/mcpServerActions.js +40 -40
- package/vscode/src/vs/workbench/contrib/mcp/common/mcpConfiguration.js +42 -42
- package/vscode/src/vs/workbench/contrib/mcp/common/mcpServer.js +16 -16
- package/vscode/src/vs/workbench/contrib/mcp/common/mcpTypes.js +4 -4
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js +4 -4
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js +23 -23
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js +2 -2
- package/vscode/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.js +8 -8
- package/vscode/src/vs/workbench/contrib/meteredConnection/browser/meteredConnection.contribution.js +8 -8
- package/vscode/src/vs/workbench/contrib/meteredConnection/browser/meteredConnectionStatus.js +4 -4
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/icons.contribution.js +1 -1
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.js +3 -3
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.js +17 -17
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOutputActions.js +6 -6
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/coreActions.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/foldingController.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityProvider.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditor.js +7 -7
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.js +24 -24
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookIcons.js +29 -29
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.js +5 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellOutput.js +7 -7
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellExecutionIcon.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/foldedCellHint.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.js +14 -14
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookViewZones.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorInput.js +2 -2
- package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingWidgets.js +3 -3
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesIcons.js +13 -13
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.js +10 -10
- package/vscode/src/vs/workbench/contrib/preferences/browser/settingsLayout.js +60 -60
- package/vscode/src/vs/workbench/contrib/preferences/common/preferences.js +3 -3
- package/vscode/src/vs/workbench/contrib/preferences/common/settingsEditorColorRegistry.js +21 -21
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.js +15 -15
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteIcons.js +17 -17
- package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.js +59 -59
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistory.js +11 -11
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryChatContext.js +6 -6
- package/vscode/src/vs/workbench/contrib/scm/common/quickDiff.js +14 -14
- package/vscode/src/vs/workbench/contrib/search/browser/anythingQuickAccess.js +9 -9
- package/vscode/src/vs/workbench/contrib/search/browser/patternInputWidget.js +3 -3
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsBase.js +1 -1
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsTopBar.js +9 -9
- package/vscode/src/vs/workbench/contrib/search/browser/searchChatContext.js +5 -5
- package/vscode/src/vs/workbench/contrib/search/browser/searchFindInput.js +1 -1
- package/vscode/src/vs/workbench/contrib/search/browser/searchIcons.js +20 -20
- package/vscode/src/vs/workbench/contrib/search/browser/searchMessage.js +2 -2
- package/vscode/src/vs/workbench/contrib/search/browser/searchResultsView.js +14 -14
- package/vscode/src/vs/workbench/contrib/search/browser/searchView.js +55 -55
- package/vscode/src/vs/workbench/contrib/search/browser/searchWidget.js +11 -11
- package/vscode/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.js +2 -2
- package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditorInput.js +4 -4
- package/vscode/src/vs/workbench/contrib/searchEditor/browser/searchEditorSerialization.js +5 -5
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.js +3 -3
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsFile.js +3 -3
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsService.js +9 -9
- package/vscode/src/vs/workbench/contrib/speech/common/speechService.js +29 -29
- package/vscode/src/vs/workbench/contrib/tasks/common/constants.js +1 -1
- package/vscode/src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.js +6 -6
- package/vscode/src/vs/workbench/contrib/tasks/common/taskService.js +6 -6
- package/vscode/src/vs/workbench/contrib/tasks/common/tasks.js +4 -4
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.js +3 -3
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalIcons.js +13 -13
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalMenus.js +40 -40
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/decorationStyles.js +15 -15
- package/vscode/src/vs/workbench/contrib/terminal/common/terminal.js +10 -10
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.js +23 -23
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalContextKey.js +17 -17
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalStrings.js +26 -26
- package/vscode/src/vs/workbench/contrib/terminalContrib/accessibility/common/terminalAccessibilityConfiguration.js +2 -2
- package/vscode/src/vs/workbench/contrib/terminalContrib/autoReplies/common/terminalAutoRepliesConfiguration.js +2 -2
- package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.js +9 -9
- package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration.js +72 -72
- package/vscode/src/vs/workbench/contrib/terminalContrib/commandGuide/common/terminalCommandGuideConfiguration.js +1 -1
- package/vscode/src/vs/workbench/contrib/terminalContrib/history/common/terminal.history.js +1 -1
- package/vscode/src/vs/workbench/contrib/terminalContrib/inlineHint/common/terminalInitialHintConfiguration.js +2 -2
- package/vscode/src/vs/workbench/contrib/terminalContrib/notification/common/terminalNotificationConfiguration.js +1 -1
- package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/common/terminalStickyScrollConfiguration.js +3 -3
- package/vscode/src/vs/workbench/contrib/terminalContrib/suggest/common/terminalSuggestConfiguration.js +30 -30
- package/vscode/src/vs/workbench/contrib/terminalContrib/typeAhead/common/terminalTypeAheadConfiguration.js +5 -5
- package/vscode/src/vs/workbench/contrib/terminalContrib/zoom/common/terminal.zoom.js +2 -2
- package/vscode/src/vs/workbench/contrib/testing/common/constants.js +11 -11
- package/vscode/src/vs/workbench/contrib/testing/common/testResult.js +2 -2
- package/vscode/src/vs/workbench/contrib/testing/common/testTypes.js +3 -3
- package/vscode/src/vs/workbench/contrib/url/browser/trustedDomains.js +6 -6
- package/vscode/src/vs/workbench/contrib/webview/browser/webview.contribution.js +3 -3
- package/vscode/src/vs/workbench/contrib/webview/browser/webviewFindAccessibilityHelp.js +30 -30
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.js +1 -1
- package/vscode/src/vs/workbench/contrib/welcomeOnboarding/common/onboardingTypes.js +14 -14
- package/vscode/src/vs/workbench/contrib/workspace/common/workspace.js +2 -2
- package/vscode/src/vs/workbench/services/accounts/browser/defaultAccount.d.ts +35 -0
- package/vscode/src/vs/workbench/services/accounts/browser/defaultAccount.js +876 -0
- package/vscode/src/vs/workbench/services/authentication/browser/authenticationService.js +11 -11
- package/vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js +5 -5
- package/vscode/src/vs/workbench/services/chat/common/chatEntitlementService.js +16 -16
- package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverSchema.js +16 -16
- package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverUtils.js +1 -1
- package/vscode/src/vs/workbench/services/configurationResolver/common/variableResolver.js +16 -16
- package/vscode/src/vs/workbench/services/editor/common/editorResolverService.js +2 -2
- package/vscode/src/vs/workbench/services/extensionManagement/common/extensionsIcons.js +3 -3
- package/vscode/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.js +6 -6
- package/vscode/src/vs/workbench/services/extensions/browser/extensionUrlHandler.js +10 -10
- package/vscode/src/vs/workbench/services/extensions/common/extensionsRegistry.js +88 -88
- package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.js +5 -5
- package/vscode/src/vs/workbench/services/language/common/languageService.js +24 -24
- package/vscode/src/vs/workbench/services/log/common/logConstants.js +1 -1
- package/vscode/src/vs/workbench/services/policies/common/accountPolicyService.js +1 -1
- package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorInput.js +2 -2
- package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.js +7 -7
- package/vscode/src/vs/workbench/services/preferences/common/preferencesEditorInput.js +4 -4
- package/vscode/src/vs/workbench/services/preferences/common/preferencesModels.js +2 -2
- package/vscode/src/vs/workbench/services/preferences/common/preferencesValidation.js +30 -30
- package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.js +8 -8
- package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js +6 -6
- package/vscode/src/vs/workbench/services/search/common/queryBuilder.js +1 -1
- package/vscode/src/vs/workbench/services/textMate/common/TMGrammars.js +9 -9
- package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModel.js +3 -3
- package/vscode/src/vs/workbench/services/themes/common/colorExtensionPoint.js +18 -18
- package/vscode/src/vs/workbench/services/themes/common/colorThemeData.js +8 -8
- package/vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js +13 -13
- package/vscode/src/vs/workbench/services/themes/common/tokenClassificationExtensionPoint.js +24 -24
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfile.js +3 -3
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfileIcons.js +1 -1
- package/vscode/src/vs/workbench/services/userDataSync/common/userDataSync.js +13 -13
- package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.js +16 -16
|
@@ -125,17 +125,17 @@ let CommentThreadWidget = class CommentThreadWidget extends Disposable {
|
|
|
125
125
|
return !!this._commentReply?.commentEditor.getValue() || this._body.hasCommentsInEditMode();
|
|
126
126
|
}
|
|
127
127
|
_setAriaLabel() {
|
|
128
|
-
let ariaLabel = ( localize(
|
|
128
|
+
let ariaLabel = ( localize(8366, "Comment"));
|
|
129
129
|
let keybinding;
|
|
130
130
|
const verbose = this.configurationService.getValue(AccessibilityVerbositySettingId.Comments);
|
|
131
131
|
if (verbose) {
|
|
132
132
|
keybinding = this._keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp, this._contextKeyService)?.getLabel() ?? undefined;
|
|
133
133
|
}
|
|
134
134
|
if (keybinding) {
|
|
135
|
-
ariaLabel = ( localize(
|
|
135
|
+
ariaLabel = ( localize(8367, "{0}, use ({1}) for accessibility help", ariaLabel, keybinding));
|
|
136
136
|
} else if (verbose) {
|
|
137
137
|
ariaLabel = ( localize(
|
|
138
|
-
|
|
138
|
+
8368,
|
|
139
139
|
"{0}, run the command Open Accessibility Help which is currently not triggerable via keybinding.",
|
|
140
140
|
ariaLabel
|
|
141
141
|
));
|
|
@@ -298,13 +298,13 @@ let ReviewZoneWidget = class ReviewZoneWidget extends ZoneWidget {
|
|
|
298
298
|
if (confirmSetting === "whenHasUnsubmittedComments" && this._commentThreadWidget.hasUnsubmittedComments) {
|
|
299
299
|
const result = await this.dialogService.confirm({
|
|
300
300
|
message: ( localize(
|
|
301
|
-
|
|
301
|
+
8369,
|
|
302
302
|
"Collapsing this comment thread will discard unsubmitted comments. Are you sure you want to discard these comments?"
|
|
303
303
|
)),
|
|
304
|
-
primaryButton: ( localize(
|
|
304
|
+
primaryButton: ( localize(8370, "Discard")),
|
|
305
305
|
type: Severity$1.Warning,
|
|
306
306
|
checkbox: {
|
|
307
|
-
label: ( localize(
|
|
307
|
+
label: ( localize(8371, "Never ask me again")),
|
|
308
308
|
checked: false
|
|
309
309
|
}
|
|
310
310
|
});
|
|
@@ -13,52 +13,52 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
|
|
|
13
13
|
var CommentAccessibilityHelpNLS;
|
|
14
14
|
(function(CommentAccessibilityHelpNLS) {
|
|
15
15
|
CommentAccessibilityHelpNLS.intro = ( localize(
|
|
16
|
-
|
|
16
|
+
8391,
|
|
17
17
|
"The editor contains commentable range(s). Some useful commands include:"
|
|
18
18
|
));
|
|
19
19
|
CommentAccessibilityHelpNLS.tabFocus = ( localize(
|
|
20
|
-
|
|
20
|
+
8392,
|
|
21
21
|
"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{0}.",
|
|
22
22
|
`<keybinding:${ToggleTabFocusModeAction.ID}>`
|
|
23
23
|
));
|
|
24
|
-
CommentAccessibilityHelpNLS.commentCommands = ( localize(
|
|
25
|
-
CommentAccessibilityHelpNLS.escape = ( localize(
|
|
24
|
+
CommentAccessibilityHelpNLS.commentCommands = ( localize(8393, "Some useful comment commands include:"));
|
|
25
|
+
CommentAccessibilityHelpNLS.escape = ( localize(8394, "- Dismiss Comment{0}.", `<keybinding:${CommentCommandId.Hide}>`));
|
|
26
26
|
CommentAccessibilityHelpNLS.nextRange = ( localize(
|
|
27
|
-
|
|
27
|
+
8395,
|
|
28
28
|
"- Go to Next Commenting Range{0}.",
|
|
29
29
|
`<keybinding:${CommentCommandId.NextRange}>`
|
|
30
30
|
));
|
|
31
31
|
CommentAccessibilityHelpNLS.previousRange = ( localize(
|
|
32
|
-
|
|
32
|
+
8396,
|
|
33
33
|
"- Go to Previous Commenting Range{0}.",
|
|
34
34
|
`<keybinding:${CommentCommandId.PreviousRange}>`
|
|
35
35
|
));
|
|
36
36
|
CommentAccessibilityHelpNLS.nextCommentThread = ( localize(
|
|
37
|
-
|
|
37
|
+
8397,
|
|
38
38
|
"- Go to Next Comment Thread{0}.",
|
|
39
39
|
`<keybinding:${CommentCommandId.NextThread}>`
|
|
40
40
|
));
|
|
41
41
|
CommentAccessibilityHelpNLS.previousCommentThread = ( localize(
|
|
42
|
-
|
|
42
|
+
8398,
|
|
43
43
|
"- Go to Previous Comment Thread{0}.",
|
|
44
44
|
`<keybinding:${CommentCommandId.PreviousThread}>`
|
|
45
45
|
));
|
|
46
46
|
CommentAccessibilityHelpNLS.nextCommentedRange = ( localize(
|
|
47
|
-
|
|
47
|
+
8399,
|
|
48
48
|
"- Go to Next Commented Range{0}.",
|
|
49
49
|
`<keybinding:${CommentCommandId.NextCommentedRange}>`
|
|
50
50
|
));
|
|
51
51
|
CommentAccessibilityHelpNLS.previousCommentedRange = ( localize(
|
|
52
|
-
|
|
52
|
+
8400,
|
|
53
53
|
"- Go to Previous Commented Range{0}.",
|
|
54
54
|
`<keybinding:${CommentCommandId.PreviousCommentedRange}>`
|
|
55
55
|
));
|
|
56
56
|
CommentAccessibilityHelpNLS.addComment = ( localize(
|
|
57
|
-
|
|
57
|
+
8401,
|
|
58
58
|
"- Add Comment on Current Selection{0}.",
|
|
59
59
|
`<keybinding:${CommentCommandId.Add}>`
|
|
60
60
|
));
|
|
61
|
-
CommentAccessibilityHelpNLS.submitComment = ( localize(
|
|
61
|
+
CommentAccessibilityHelpNLS.submitComment = ( localize(8402, "- Submit Comment{0}.", `<keybinding:${CommentCommandId.Submit}>`));
|
|
62
62
|
})(CommentAccessibilityHelpNLS || (CommentAccessibilityHelpNLS = {}));
|
|
63
63
|
class CommentsAccessibilityHelpProvider extends Disposable {
|
|
64
64
|
constructor() {
|
|
@@ -890,7 +890,7 @@ let CommentController = class CommentController extends Disposable {
|
|
|
890
890
|
const commentRangeEnd = range?.getEndPosition().lineNumber;
|
|
891
891
|
if (commentRangeStart && commentRangeEnd) {
|
|
892
892
|
const oneLine = commentRangeStart === commentRangeEnd;
|
|
893
|
-
oneLine ? status(( localize(
|
|
893
|
+
oneLine ? status(( localize(8403, "Line {0}", commentRangeStart))) : status(( localize(8404, "Lines {0} to {1}", commentRangeStart, commentRangeEnd)));
|
|
894
894
|
}
|
|
895
895
|
}
|
|
896
896
|
}
|
|
@@ -1093,18 +1093,18 @@ let CommentController = class CommentController extends Disposable {
|
|
|
1093
1093
|
const keybinding = this.keybindingService.lookupKeybinding(AccessibilityCommandId.OpenAccessibilityHelp)?.getAriaLabel();
|
|
1094
1094
|
if (keybinding) {
|
|
1095
1095
|
status(( localize(
|
|
1096
|
-
|
|
1096
|
+
8405,
|
|
1097
1097
|
"Editor has commenting ranges, run the command Open Accessibility Help ({0}), for more information.",
|
|
1098
1098
|
keybinding
|
|
1099
1099
|
)));
|
|
1100
1100
|
} else {
|
|
1101
1101
|
status(( localize(
|
|
1102
|
-
|
|
1102
|
+
8406,
|
|
1103
1103
|
"Editor has commenting ranges, run the command Open Accessibility Help, which is currently not triggerable via keybinding, for more information."
|
|
1104
1104
|
)));
|
|
1105
1105
|
}
|
|
1106
1106
|
} else {
|
|
1107
|
-
status(( localize(
|
|
1107
|
+
status(( localize(8407, "Editor has commenting ranges.")));
|
|
1108
1108
|
}
|
|
1109
1109
|
}
|
|
1110
1110
|
}
|
|
@@ -1254,9 +1254,9 @@ let CommentController = class CommentController extends Disposable {
|
|
|
1254
1254
|
this._addInProgress = false;
|
|
1255
1255
|
if (!newCommentInfos.length) {
|
|
1256
1256
|
if (range) {
|
|
1257
|
-
this.notificationService.error(( localize(
|
|
1257
|
+
this.notificationService.error(( localize(8408, "The cursor must be within a commenting range to add a comment.")));
|
|
1258
1258
|
} else {
|
|
1259
|
-
this.notificationService.error(( localize(
|
|
1259
|
+
this.notificationService.error(( localize(8409, "File comments are not allowed on this file.")));
|
|
1260
1260
|
}
|
|
1261
1261
|
}
|
|
1262
1262
|
return Promise.resolve();
|
|
@@ -1275,7 +1275,7 @@ let CommentController = class CommentController extends Disposable {
|
|
|
1275
1275
|
} else {
|
|
1276
1276
|
const picks = this.getCommentProvidersQuickPicks(newCommentInfos);
|
|
1277
1277
|
return this.quickInputService.pick(picks, {
|
|
1278
|
-
placeHolder: ( localize(
|
|
1278
|
+
placeHolder: ( localize(8410, "Select Comment Provider")),
|
|
1279
1279
|
matchOnDescription: true
|
|
1280
1280
|
}).then(pick => {
|
|
1281
1281
|
if (!pick) {
|
|
@@ -113,7 +113,7 @@ class CommentsModel extends Disposable {
|
|
|
113
113
|
}
|
|
114
114
|
getMessage() {
|
|
115
115
|
if (!this._resourceCommentThreads.length) {
|
|
116
|
-
return localize(
|
|
116
|
+
return localize(8423, "There are no comments in this workspace yet.");
|
|
117
117
|
} else {
|
|
118
118
|
return "";
|
|
119
119
|
}
|
|
@@ -33,7 +33,7 @@ import { IHoverService } from '../../../../platform/hover/browser/hover.service.
|
|
|
33
33
|
|
|
34
34
|
const COMMENTS_VIEW_ID = "workbench.panel.comments";
|
|
35
35
|
const COMMENTS_VIEW_STORAGE_ID = "Comments";
|
|
36
|
-
const COMMENTS_VIEW_TITLE = ( localize2(
|
|
36
|
+
const COMMENTS_VIEW_TITLE = ( localize2(8424, "Comments"));
|
|
37
37
|
class CommentsModelVirtualDelegate {
|
|
38
38
|
static {
|
|
39
39
|
this.RESOURCE_ID = "resource-with-comments";
|
|
@@ -200,11 +200,11 @@ let CommentNodeRenderer = class CommentNodeRenderer {
|
|
|
200
200
|
}
|
|
201
201
|
getCountString(commentCount) {
|
|
202
202
|
if (commentCount > 2) {
|
|
203
|
-
return localize(
|
|
203
|
+
return localize(8425, "{0} replies", commentCount - 1);
|
|
204
204
|
} else if (commentCount === 2) {
|
|
205
|
-
return localize(
|
|
205
|
+
return localize(8426, "1 reply");
|
|
206
206
|
} else {
|
|
207
|
-
return localize(
|
|
207
|
+
return localize(8427, "1 comment");
|
|
208
208
|
}
|
|
209
209
|
}
|
|
210
210
|
getRenderedComment(commentBody) {
|
|
@@ -213,7 +213,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
|
|
|
213
213
|
for (let i = 0; i < images.length; i++) {
|
|
214
214
|
const image = images[i];
|
|
215
215
|
const textDescription = $("");
|
|
216
|
-
textDescription.textContent = image.alt ? ( localize(
|
|
216
|
+
textDescription.textContent = image.alt ? ( localize(8428, "Image: {0}", image.alt)) : ( localize(8429, "Image"));
|
|
217
217
|
image.replaceWith(textDescription);
|
|
218
218
|
}
|
|
219
219
|
const headings = [
|
|
@@ -247,7 +247,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
|
|
|
247
247
|
const commentCount = node.element.replies.length + 1;
|
|
248
248
|
if (node.element.threadRelevance === CommentThreadApplicability.Outdated) {
|
|
249
249
|
templateData.threadMetadata.relevance.style.display = "";
|
|
250
|
-
templateData.threadMetadata.relevance.innerText = ( localize(
|
|
250
|
+
templateData.threadMetadata.relevance.innerText = ( localize(8430, "Outdated"));
|
|
251
251
|
templateData.threadMetadata.separator.style.display = "none";
|
|
252
252
|
} else {
|
|
253
253
|
templateData.threadMetadata.relevance.innerText = "";
|
|
@@ -286,10 +286,10 @@ let CommentNodeRenderer = class CommentNodeRenderer {
|
|
|
286
286
|
}
|
|
287
287
|
if (node.element.range) {
|
|
288
288
|
if (node.element.range.startLineNumber === node.element.range.endLineNumber) {
|
|
289
|
-
templateData.threadMetadata.range.textContent = ( localize(
|
|
289
|
+
templateData.threadMetadata.range.textContent = ( localize(8431, "[Ln {0}]", node.element.range.startLineNumber));
|
|
290
290
|
} else {
|
|
291
291
|
templateData.threadMetadata.range.textContent = ( localize(
|
|
292
|
-
|
|
292
|
+
8432,
|
|
293
293
|
"[Ln {0}-{1}]",
|
|
294
294
|
node.element.range.startLineNumber,
|
|
295
295
|
node.element.range.endLineNumber
|
|
@@ -313,7 +313,7 @@ let CommentNodeRenderer = class CommentNodeRenderer {
|
|
|
313
313
|
templateData.repliesMetadata.container.style.display = "";
|
|
314
314
|
templateData.repliesMetadata.count.textContent = this.getCountString(commentCount);
|
|
315
315
|
const lastComment = node.element.replies[node.element.replies.length - 1].comment;
|
|
316
|
-
templateData.repliesMetadata.lastReplyDetail.textContent = ( localize(
|
|
316
|
+
templateData.repliesMetadata.lastReplyDetail.textContent = ( localize(8433, "Last reply from {0}", lastComment.userName));
|
|
317
317
|
templateData.repliesMetadata.timestamp.setTimestamp(lastComment.timestamp ? ( new Date(lastComment.timestamp)) : undefined);
|
|
318
318
|
}
|
|
319
319
|
getCommentThreadWidgetStateColor(state, theme) {
|
|
@@ -132,8 +132,8 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
|
|
|
132
132
|
super({
|
|
133
133
|
...options,
|
|
134
134
|
filterOptions: {
|
|
135
|
-
placeholder: ( localize(
|
|
136
|
-
ariaLabel: ( localize(
|
|
135
|
+
placeholder: ( localize(8434, "Filter (e.g. text, author)")),
|
|
136
|
+
ariaLabel: ( localize(8435, "Filter comments")),
|
|
137
137
|
history: viewState.filterHistory || [],
|
|
138
138
|
text: viewState.filter || "",
|
|
139
139
|
focusContextKey: CommentsViewFilterFocusContextKey.key
|
|
@@ -226,7 +226,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
|
|
|
226
226
|
total,
|
|
227
227
|
filtered
|
|
228
228
|
} = this.getFilterStats();
|
|
229
|
-
this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localize(
|
|
229
|
+
this.filterWidget.updateBadge(total === filtered || total === 0 ? undefined : ( localize(8436, "Showing {0} of {1}", filtered, total)));
|
|
230
230
|
this.filterWidget.checkMoreFilters(!this.filters.showResolved || !this.filters.showUnresolved);
|
|
231
231
|
}
|
|
232
232
|
renderBody(container) {
|
|
@@ -311,11 +311,11 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
|
|
|
311
311
|
makeCommentLocationLabel(file, range) {
|
|
312
312
|
const fileLabel = basename(file);
|
|
313
313
|
if (!range) {
|
|
314
|
-
return localize(
|
|
314
|
+
return localize(8437, "in {0}", fileLabel);
|
|
315
315
|
}
|
|
316
316
|
if (range.startLineNumber === range.endLineNumber) {
|
|
317
317
|
return localize(
|
|
318
|
-
|
|
318
|
+
8438,
|
|
319
319
|
"at line {0} column {1} in {2}",
|
|
320
320
|
range.startLineNumber,
|
|
321
321
|
range.startColumn,
|
|
@@ -323,7 +323,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
|
|
|
323
323
|
);
|
|
324
324
|
} else {
|
|
325
325
|
return localize(
|
|
326
|
-
|
|
326
|
+
8439,
|
|
327
327
|
"from line {0} to line {1} in {2}",
|
|
328
328
|
range.startLineNumber,
|
|
329
329
|
range.endLineNumber,
|
|
@@ -347,8 +347,8 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
|
|
|
347
347
|
let accessibleViewHint = "";
|
|
348
348
|
if (forAriaLabel && this.configurationService.getValue(AccessibilityVerbositySettingId.Comments)) {
|
|
349
349
|
const kbLabel = this.keybindingService.lookupKeybinding(AccessibleViewAction.id)?.getAriaLabel();
|
|
350
|
-
accessibleViewHint = kbLabel ? ( localize(
|
|
351
|
-
|
|
350
|
+
accessibleViewHint = kbLabel ? ( localize(8440, "\nInspect this in the accessible view ({0}).", kbLabel)) : ( localize(
|
|
351
|
+
8441,
|
|
352
352
|
"\nInspect this in the accessible view via the command Open Accessible View which is currently not triggerable via keybinding."
|
|
353
353
|
));
|
|
354
354
|
}
|
|
@@ -368,7 +368,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
|
|
|
368
368
|
const labelInfo = this.makeScreenReaderLabelInfo(element, forAriaLabel);
|
|
369
369
|
if (element.threadRelevance === CommentThreadApplicability.Outdated) {
|
|
370
370
|
return ( localize(
|
|
371
|
-
|
|
371
|
+
8442,
|
|
372
372
|
"Outdated from {0}: {1}\n{2}\n{3}\n{4}",
|
|
373
373
|
labelInfo.userName,
|
|
374
374
|
labelInfo.bodyLabel,
|
|
@@ -378,7 +378,7 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
|
|
|
378
378
|
)) + replies + accessibleViewHint;
|
|
379
379
|
} else {
|
|
380
380
|
return ( localize(
|
|
381
|
-
|
|
381
|
+
8443,
|
|
382
382
|
"{0}: {1}\n{2}\n{3}\n{4}",
|
|
383
383
|
labelInfo.userName,
|
|
384
384
|
labelInfo.bodyLabel,
|
|
@@ -393,14 +393,14 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
|
|
|
393
393
|
return "";
|
|
394
394
|
}
|
|
395
395
|
return "\n" + ( node.replies.map(reply => ( localize(
|
|
396
|
-
|
|
396
|
+
8444,
|
|
397
397
|
"{0} {1}",
|
|
398
398
|
reply.comment.userName,
|
|
399
399
|
(typeof reply.comment.body === "string") ? reply.comment.body : reply.comment.body.value
|
|
400
400
|
)))).join("\n");
|
|
401
401
|
}
|
|
402
402
|
getReplyCountAsString(node, forAriaLabel) {
|
|
403
|
-
return node.replies.length && !forAriaLabel ? ( localize(
|
|
403
|
+
return node.replies.length && !forAriaLabel ? ( localize(8445, " {0} replies,", node.replies.length)) : "";
|
|
404
404
|
}
|
|
405
405
|
createTree() {
|
|
406
406
|
this.treeLabels = this._register(this.instantiationService.createInstance(ResourceLabels, this));
|
|
@@ -438,11 +438,11 @@ let CommentsPanel = class CommentsPanel extends FilterViewPane {
|
|
|
438
438
|
accessibilityProvider: {
|
|
439
439
|
getAriaLabel: element => {
|
|
440
440
|
if (element instanceof CommentsModel) {
|
|
441
|
-
return localize(
|
|
441
|
+
return localize(8446, "Comments for current workspace");
|
|
442
442
|
}
|
|
443
443
|
if (element instanceof ResourceWithCommentThreads) {
|
|
444
444
|
return localize(
|
|
445
|
-
|
|
445
|
+
8447,
|
|
446
446
|
"Comments in {0}, full path {1}",
|
|
447
447
|
basename(element.resource),
|
|
448
448
|
element.resource.fsPath
|
|
@@ -72,7 +72,7 @@ registerAction2(class extends ViewAction {
|
|
|
72
72
|
constructor() {
|
|
73
73
|
super({
|
|
74
74
|
id: "commentsFocusViewFromFilter",
|
|
75
|
-
title: ( localize(
|
|
75
|
+
title: ( localize(8448, "Focus Comments view")),
|
|
76
76
|
keybinding: {
|
|
77
77
|
when: CommentsViewFilterFocusContextKey,
|
|
78
78
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
@@ -89,7 +89,7 @@ registerAction2(class extends ViewAction {
|
|
|
89
89
|
constructor() {
|
|
90
90
|
super({
|
|
91
91
|
id: "commentsClearFilterText",
|
|
92
|
-
title: ( localize(
|
|
92
|
+
title: ( localize(8449, "Clear filter text")),
|
|
93
93
|
keybinding: {
|
|
94
94
|
when: CommentsViewFilterFocusContextKey,
|
|
95
95
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
@@ -106,7 +106,7 @@ registerAction2(class extends ViewAction {
|
|
|
106
106
|
constructor() {
|
|
107
107
|
super({
|
|
108
108
|
id: "commentsFocusFilter",
|
|
109
|
-
title: ( localize(
|
|
109
|
+
title: ( localize(8450, "Focus comments filter")),
|
|
110
110
|
keybinding: {
|
|
111
111
|
when: ( FocusedViewContext.isEqualTo(COMMENTS_VIEW_ID)),
|
|
112
112
|
weight: KeybindingWeight.WorkbenchContrib,
|
|
@@ -123,11 +123,11 @@ registerAction2(class extends ViewAction {
|
|
|
123
123
|
constructor() {
|
|
124
124
|
super({
|
|
125
125
|
id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleUnResolvedComments`,
|
|
126
|
-
title: ( localize(
|
|
127
|
-
category: ( localize(
|
|
126
|
+
title: ( localize(8451, "Show Unresolved")),
|
|
127
|
+
category: ( localize(8452, "Comments")),
|
|
128
128
|
toggled: {
|
|
129
129
|
condition: CONTEXT_KEY_SHOW_UNRESOLVED,
|
|
130
|
-
title: ( localize(
|
|
130
|
+
title: ( localize(8453, "Show Unresolved"))
|
|
131
131
|
},
|
|
132
132
|
menu: {
|
|
133
133
|
id: viewFilterSubmenu,
|
|
@@ -146,11 +146,11 @@ registerAction2(class extends ViewAction {
|
|
|
146
146
|
constructor() {
|
|
147
147
|
super({
|
|
148
148
|
id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleResolvedComments`,
|
|
149
|
-
title: ( localize(
|
|
150
|
-
category: ( localize(
|
|
149
|
+
title: ( localize(8454, "Show Resolved")),
|
|
150
|
+
category: ( localize(8452, "Comments")),
|
|
151
151
|
toggled: {
|
|
152
152
|
condition: CONTEXT_KEY_SHOW_RESOLVED,
|
|
153
|
-
title: ( localize(
|
|
153
|
+
title: ( localize(8455, "Show Resolved"))
|
|
154
154
|
},
|
|
155
155
|
menu: {
|
|
156
156
|
id: viewFilterSubmenu,
|
|
@@ -168,7 +168,7 @@ registerAction2(class extends ViewAction {
|
|
|
168
168
|
const commentSortSubmenu = ( new MenuId("submenu.filter.commentSort"));
|
|
169
169
|
MenuRegistry.appendMenuItem(viewFilterSubmenu, {
|
|
170
170
|
submenu: commentSortSubmenu,
|
|
171
|
-
title: ( localize(
|
|
171
|
+
title: ( localize(8456, "Sort By")),
|
|
172
172
|
group: "2_sort",
|
|
173
173
|
icon: Codicon.history,
|
|
174
174
|
when: ( ContextKeyExpr.equals("view", COMMENTS_VIEW_ID))
|
|
@@ -177,13 +177,13 @@ registerAction2(class extends ViewAction {
|
|
|
177
177
|
constructor() {
|
|
178
178
|
super({
|
|
179
179
|
id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleSortByUpdatedAt`,
|
|
180
|
-
title: ( localize(
|
|
181
|
-
category: ( localize(
|
|
180
|
+
title: ( localize(8457, "Updated Time")),
|
|
181
|
+
category: ( localize(8452, "Comments")),
|
|
182
182
|
icon: Codicon.history,
|
|
183
183
|
viewId: COMMENTS_VIEW_ID,
|
|
184
184
|
toggled: {
|
|
185
185
|
condition: ( ContextKeyExpr.equals(CONTEXT_KEY_SORT_BY.key, CommentsSortOrder.UpdatedAtDescending)),
|
|
186
|
-
title: ( localize(
|
|
186
|
+
title: ( localize(8458, "Updated Time"))
|
|
187
187
|
},
|
|
188
188
|
menu: {
|
|
189
189
|
id: commentSortSubmenu,
|
|
@@ -201,13 +201,13 @@ registerAction2(class extends ViewAction {
|
|
|
201
201
|
constructor() {
|
|
202
202
|
super({
|
|
203
203
|
id: `workbench.actions.${COMMENTS_VIEW_ID}.toggleSortByResource`,
|
|
204
|
-
title: ( localize(
|
|
205
|
-
category: ( localize(
|
|
204
|
+
title: ( localize(8459, "Position in File")),
|
|
205
|
+
category: ( localize(8452, "Comments")),
|
|
206
206
|
icon: Codicon.history,
|
|
207
207
|
viewId: COMMENTS_VIEW_ID,
|
|
208
208
|
toggled: {
|
|
209
209
|
condition: ( ContextKeyExpr.equals(CONTEXT_KEY_SORT_BY.key, CommentsSortOrder.ResourceAscending)),
|
|
210
|
-
title: ( localize(
|
|
210
|
+
title: ( localize(8460, "Position in File"))
|
|
211
211
|
},
|
|
212
212
|
menu: {
|
|
213
213
|
id: commentSortSubmenu,
|
|
@@ -11,7 +11,7 @@ class ToggleReactionsAction extends Action {
|
|
|
11
11
|
this.ID = "toolbar.toggle.pickReactions";
|
|
12
12
|
}
|
|
13
13
|
constructor(toggleDropdownMenu, title) {
|
|
14
|
-
super(ToggleReactionsAction.ID, title || ( localize(
|
|
14
|
+
super(ToggleReactionsAction.ID, title || ( localize(8461, "Pick Reactions...")), "toggle-reactions", true);
|
|
15
15
|
this._menuActions = [];
|
|
16
16
|
this.toggleDropdownMenu = toggleDropdownMenu;
|
|
17
17
|
}
|
|
@@ -53,15 +53,15 @@ class ReactionActionViewItem extends ActionViewItem {
|
|
|
53
53
|
}
|
|
54
54
|
getTooltip() {
|
|
55
55
|
const action = this.action;
|
|
56
|
-
const toggleMessage = action.enabled ? ( localize(
|
|
56
|
+
const toggleMessage = action.enabled ? ( localize(8462, "Toggle reaction, ")) : "";
|
|
57
57
|
if (action.count === undefined) {
|
|
58
|
-
return localize(
|
|
58
|
+
return localize(8463, "{0}{1} reaction", toggleMessage, action.label);
|
|
59
59
|
} else if (action.reactors === undefined || action.reactors.length === 0) {
|
|
60
60
|
if (action.count === 1) {
|
|
61
|
-
return localize(
|
|
61
|
+
return localize(8464, "{0}1 reaction with {1}", toggleMessage, action.label);
|
|
62
62
|
} else if (action.count > 1) {
|
|
63
63
|
return localize(
|
|
64
|
-
|
|
64
|
+
8465,
|
|
65
65
|
"{0}{1} reactions with {2}",
|
|
66
66
|
toggleMessage,
|
|
67
67
|
action.count,
|
|
@@ -71,7 +71,7 @@ class ReactionActionViewItem extends ActionViewItem {
|
|
|
71
71
|
} else {
|
|
72
72
|
if (action.reactors.length <= 10 && action.reactors.length === action.count) {
|
|
73
73
|
return localize(
|
|
74
|
-
|
|
74
|
+
8466,
|
|
75
75
|
"{0}{1} reacted with {2}",
|
|
76
76
|
toggleMessage,
|
|
77
77
|
action.reactors.join(", "),
|
|
@@ -80,7 +80,7 @@ class ReactionActionViewItem extends ActionViewItem {
|
|
|
80
80
|
} else if (action.count > 1) {
|
|
81
81
|
const displayedReactors = action.reactors.slice(0, 10);
|
|
82
82
|
return localize(
|
|
83
|
-
|
|
83
|
+
8467,
|
|
84
84
|
"{0}{1} and {2} more reacted with {3}",
|
|
85
85
|
toggleMessage,
|
|
86
86
|
displayedReactors.join(", "),
|
|
@@ -5,54 +5,54 @@ import { RawContextKey } from '../../../../platform/contextkey/common/contextkey
|
|
|
5
5
|
var CommentContextKeys;
|
|
6
6
|
(function(CommentContextKeys) {
|
|
7
7
|
CommentContextKeys.activeCursorHasCommentingRange = ( new RawContextKey("activeCursorHasCommentingRange", false, {
|
|
8
|
-
description: ( localize(
|
|
8
|
+
description: ( localize(8468, "Whether the position at the active cursor has a commenting range")),
|
|
9
9
|
type: "boolean"
|
|
10
10
|
}));
|
|
11
11
|
CommentContextKeys.activeCursorHasComment = ( new RawContextKey("activeCursorHasComment", false, {
|
|
12
|
-
description: ( localize(
|
|
12
|
+
description: ( localize(8469, "Whether the position at the active cursor has a comment")),
|
|
13
13
|
type: "boolean"
|
|
14
14
|
}));
|
|
15
15
|
CommentContextKeys.activeEditorHasCommentingRange = ( new RawContextKey("activeEditorHasCommentingRange", false, {
|
|
16
|
-
description: ( localize(
|
|
16
|
+
description: ( localize(8470, "Whether the active editor has a commenting range")),
|
|
17
17
|
type: "boolean"
|
|
18
18
|
}));
|
|
19
19
|
CommentContextKeys.WorkspaceHasCommenting = ( new RawContextKey("workspaceHasCommenting", false, {
|
|
20
20
|
description: ( localize(
|
|
21
|
-
|
|
21
|
+
8471,
|
|
22
22
|
"Whether the open workspace has either comments or commenting ranges."
|
|
23
23
|
)),
|
|
24
24
|
type: "boolean"
|
|
25
25
|
}));
|
|
26
26
|
CommentContextKeys.commentThreadIsEmpty = ( new RawContextKey("commentThreadIsEmpty", false, {
|
|
27
27
|
type: "boolean",
|
|
28
|
-
description: ( localize(
|
|
28
|
+
description: ( localize(8472, "Set when the comment thread has no comments"))
|
|
29
29
|
}));
|
|
30
30
|
CommentContextKeys.commentIsEmpty = ( new RawContextKey("commentIsEmpty", false, {
|
|
31
31
|
type: "boolean",
|
|
32
|
-
description: ( localize(
|
|
32
|
+
description: ( localize(8473, "Set when the comment has no input"))
|
|
33
33
|
}));
|
|
34
34
|
CommentContextKeys.commentContext = ( new RawContextKey("comment", undefined, {
|
|
35
35
|
type: "string",
|
|
36
|
-
description: ( localize(
|
|
36
|
+
description: ( localize(8474, "The context value of the comment"))
|
|
37
37
|
}));
|
|
38
38
|
CommentContextKeys.commentThreadContext = ( new RawContextKey("commentThread", undefined, {
|
|
39
39
|
type: "string",
|
|
40
|
-
description: ( localize(
|
|
40
|
+
description: ( localize(8475, "The context value of the comment thread"))
|
|
41
41
|
}));
|
|
42
42
|
CommentContextKeys.commentControllerContext = ( new RawContextKey("commentController", undefined, {
|
|
43
43
|
type: "string",
|
|
44
|
-
description: ( localize(
|
|
44
|
+
description: ( localize(8476, "The comment controller id associated with a comment thread"))
|
|
45
45
|
}));
|
|
46
46
|
CommentContextKeys.commentFocused = ( new RawContextKey("commentFocused", false, {
|
|
47
47
|
type: "boolean",
|
|
48
|
-
description: ( localize(
|
|
48
|
+
description: ( localize(8477, "Set when the comment is focused"))
|
|
49
49
|
}));
|
|
50
50
|
CommentContextKeys.commentWidgetVisible = ( new RawContextKey("commentWidgetVisible", false, {
|
|
51
51
|
type: "boolean",
|
|
52
|
-
description: ( localize(
|
|
52
|
+
description: ( localize(8478, "Set when a comment widget is visible in the editor"))
|
|
53
53
|
}));
|
|
54
54
|
CommentContextKeys.commentingEnabled = ( new RawContextKey("commentingEnabled", true, {
|
|
55
|
-
description: ( localize(
|
|
55
|
+
description: ( localize(8479, "Whether commenting functionality is enabled")),
|
|
56
56
|
type: "boolean"
|
|
57
57
|
}));
|
|
58
58
|
})(CommentContextKeys || (CommentContextKeys = {}));
|
|
@@ -104,7 +104,7 @@ let CustomEditorDiffInput = class CustomEditorDiffInput extends LazilyResolvedWe
|
|
|
104
104
|
return this.init.modifiedResource;
|
|
105
105
|
}
|
|
106
106
|
getName() {
|
|
107
|
-
return this.init.label ?? ( localize(
|
|
107
|
+
return this.init.label ?? ( localize(8480, "{0} - {1}", this.original.getName(), this.modified.getName()));
|
|
108
108
|
}
|
|
109
109
|
getDescription(_verbosity) {
|
|
110
110
|
return this.init.description ?? super.getDescription();
|
|
@@ -112,7 +112,7 @@ let CustomEditorDiffInput = class CustomEditorDiffInput extends LazilyResolvedWe
|
|
|
112
112
|
getTitle(verbosity) {
|
|
113
113
|
const description = this.getDescription(verbosity);
|
|
114
114
|
if (description) {
|
|
115
|
-
return localize(
|
|
115
|
+
return localize(8481, "{0} ({1})", this.getName(), description);
|
|
116
116
|
}
|
|
117
117
|
return this.getName();
|
|
118
118
|
}
|
|
@@ -355,11 +355,11 @@ let CustomEditorInput = class CustomEditorInput extends LazilyResolvedWebviewEdi
|
|
|
355
355
|
claim(claimant, targetWindow, scopedContextKeyService) {
|
|
356
356
|
if (this.doCanMove(targetWindow.vscodeWindowId) !== true) {
|
|
357
357
|
throw createEditorOpenError(( localize(
|
|
358
|
-
|
|
358
|
+
8482,
|
|
359
359
|
"Unable to open the editor in this window, it contains modifications that can only be saved in the original window."
|
|
360
360
|
)), [toAction({
|
|
361
361
|
id: "openInOriginalWindow",
|
|
362
|
-
label: ( localize(
|
|
362
|
+
label: ( localize(8483, "Open in Original Window")),
|
|
363
363
|
run: async () => {
|
|
364
364
|
const originalPart = this.editorGroupsService.getPart(this.layoutService.getContainer(getWindow(this.webview.container).window));
|
|
365
365
|
const currentPart = this.editorGroupsService.getPart(this.layoutService.getContainer(targetWindow.window));
|
|
@@ -386,7 +386,7 @@ let CustomEditorInput = class CustomEditorInput extends LazilyResolvedWebviewEdi
|
|
|
386
386
|
const sourceWindowId = getWindow(this.webview.container).vscodeWindowId;
|
|
387
387
|
if (sourceWindowId !== targetWindowId) {
|
|
388
388
|
return localize(
|
|
389
|
-
|
|
389
|
+
8484,
|
|
390
390
|
"Unable to move '{0}': The editor contains changes that can only be saved in its current window.",
|
|
391
391
|
this.getName()
|
|
392
392
|
);
|
|
@@ -94,7 +94,7 @@ let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
|
|
|
94
94
|
const lazyButton = append(expression, $("span.lazy-button"));
|
|
95
95
|
lazyButton.classList.add(...ThemeIcon.asClassNameArray(Codicon.eye));
|
|
96
96
|
templateDisposable.add(
|
|
97
|
-
this.hoverService.setupManagedHover(getDefaultHoverDelegate("mouse"), lazyButton, ( localize(
|
|
97
|
+
this.hoverService.setupManagedHover(getDefaultHoverDelegate("mouse"), lazyButton, ( localize(8506, "Click to expand")))
|
|
98
98
|
);
|
|
99
99
|
const type = append(expression, $("span.type"));
|
|
100
100
|
const value = append(expression, $("span.value"));
|