@codingame/monaco-vscode-api 2.0.3 → 2.1.0-update-vscode-1.86.1
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/api.js +15 -12
- package/extensions.d.ts +4 -7
- package/external/@xterm/xterm/typings/xterm.d.ts +22 -0
- package/missing-services.js +62 -6
- package/package.json +8 -8
- package/service-override/tools/editor.js +14 -0
- package/services.d.ts +3 -2
- package/services.js +6 -4
- package/vscode/src/vs/base/browser/browser.js +45 -30
- package/vscode/src/vs/base/browser/canIUse.js +1 -1
- package/vscode/src/vs/base/browser/defaultWorkerFactory.js +12 -5
- package/vscode/src/vs/base/browser/dom.js +104 -14
- package/vscode/src/vs/base/browser/indexedDB.js +3 -3
- package/vscode/src/vs/base/browser/markdownRenderer.js +29 -1
- package/vscode/src/vs/base/browser/mouseEvent.js +17 -3
- package/vscode/src/vs/base/browser/ui/actionbar/actionbar.js +3 -3
- package/vscode/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css.js +4 -0
- package/vscode/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.d.ts +1 -1
- package/vscode/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.js +287 -0
- package/vscode/src/vs/base/browser/ui/button/button.js +9 -0
- package/vscode/src/vs/base/browser/ui/codicons/codicon/codicon.css.js +1 -1
- package/vscode/src/vs/base/browser/ui/dialog/dialog.js +1 -1
- package/vscode/src/vs/base/browser/ui/iconLabel/iconLabelHover.js +16 -5
- package/vscode/src/vs/base/browser/ui/list/listView.js +31 -11
- package/vscode/src/vs/base/browser/ui/list/listWidget.js +35 -21
- package/vscode/src/vs/base/browser/ui/menu/menu.js +10 -1
- package/vscode/src/vs/base/browser/ui/menu/menubar.js +8 -4
- package/vscode/src/vs/base/browser/ui/scrollbar/scrollableElement.js +6 -5
- package/vscode/src/vs/base/browser/ui/tree/abstractTree.js +469 -95
- package/vscode/src/vs/base/browser/ui/tree/asyncDataTree.js +22 -7
- package/vscode/src/vs/base/browser/ui/tree/indexTreeModel.js +0 -5
- package/vscode/src/vs/base/browser/ui/tree/media/tree.css.js +1 -1
- package/vscode/src/vs/base/browser/ui/tree/objectTree.js +70 -4
- package/vscode/src/vs/base/common/assert.js +6 -1
- package/vscode/src/vs/base/common/async.js +31 -6
- package/vscode/src/vs/base/common/codicons.js +5 -0
- package/vscode/src/vs/base/common/event.d.ts +0 -5
- package/vscode/src/vs/base/common/event.js +0 -15
- package/vscode/src/vs/base/common/filters.d.ts +1 -18
- package/vscode/src/vs/base/common/htmlContent.js +12 -6
- package/vscode/src/vs/base/common/iterator.js +8 -0
- package/vscode/src/vs/base/common/labels.js +2 -1
- package/vscode/src/vs/base/common/map.js +20 -1
- package/vscode/src/vs/base/common/observableInternal/base.d.ts +4 -0
- package/vscode/src/vs/base/common/observableInternal/base.js +16 -8
- package/vscode/src/vs/base/common/observableInternal/derived.js +4 -6
- package/vscode/src/vs/base/common/observableInternal/utils.js +60 -5
- package/vscode/src/vs/base/common/platform.js +20 -20
- package/vscode/src/vs/base/common/prefixTree.js +4 -3
- package/vscode/src/vs/base/common/product.d.ts +5 -2
- package/vscode/src/vs/base/common/strings.js +23 -7
- package/vscode/src/vs/base/common/themables.js +4 -1
- package/vscode/src/vs/base/common/uri.js +11 -1
- package/vscode/src/vs/base/common/worker/simpleWorker.js +1 -1
- package/vscode/src/vs/editor/browser/config/migrateOptions.js +5 -0
- package/vscode/src/vs/editor/browser/controller/mouseHandler.js +1 -0
- package/vscode/src/vs/editor/browser/controller/mouseTarget.js +14 -8
- package/vscode/src/vs/editor/browser/controller/pointerHandler.js +18 -11
- package/vscode/src/vs/editor/browser/controller/textAreaHandler.js +1 -1
- package/vscode/src/vs/editor/browser/controller/textAreaInput.js +3 -3
- package/vscode/src/vs/{workbench/services/hover/browser → editor/browser/services}/hoverService.d.ts +7 -6
- package/vscode/src/vs/editor/browser/services/hoverService.js +195 -0
- package/vscode/src/vs/editor/browser/view.js +29 -39
- package/vscode/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.js +41 -19
- package/vscode/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.js +1 -1
- package/vscode/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.js +30 -23
- package/vscode/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.js +23 -8
- package/vscode/src/vs/editor/browser/viewParts/lines/viewLines.js +1 -1
- package/vscode/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.js +8 -1
- package/vscode/src/vs/editor/browser/viewParts/marginDecorations/marginDecorations.js +7 -1
- package/vscode/src/vs/editor/browser/viewParts/minimap/minimap.js +1 -1
- package/vscode/src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.js +30 -3
- package/vscode/src/vs/editor/browser/widget/codeEditorWidget.js +39 -15
- package/vscode/src/vs/editor/browser/widget/diffEditor/{accessibleDiffViewer.css.js → components/accessibleDiffViewer.css.js} +1 -1
- package/vscode/src/vs/editor/browser/widget/diffEditor/{accessibleDiffViewer.js → components/accessibleDiffViewer.js} +43 -43
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorDecorations.js +89 -0
- package/vscode/src/vs/editor/browser/widget/diffEditor/{diffEditorEditors.js → components/diffEditorEditors.js} +14 -14
- package/vscode/src/vs/editor/browser/widget/diffEditor/{diffEditorSash.js → components/diffEditorSash.js} +5 -5
- package/vscode/src/vs/editor/browser/widget/diffEditor/{lineAlignment.js → components/diffEditorViewZones/diffEditorViewZones.js} +38 -28
- package/vscode/src/vs/editor/browser/widget/diffEditor/{inlineDiffDeletedCodeMargin.js → components/diffEditorViewZones/inlineDiffDeletedCodeMargin.js} +14 -14
- package/vscode/src/vs/editor/browser/widget/diffEditor/{renderLines.js → components/diffEditorViewZones/renderLines.js} +7 -7
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditor.contribution.js +29 -38
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorViewModel.js +150 -38
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.js +17 -16
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffProviderFactoryService.js +104 -6
- package/vscode/src/vs/editor/browser/widget/diffEditor/{hideUnchangedRegionsFeature.js → features/hideUnchangedRegionsFeature.js} +51 -78
- package/vscode/src/vs/editor/browser/widget/diffEditor/{movedBlocksLines.js → features/movedBlocksLinesFeature.js} +23 -23
- package/vscode/src/vs/editor/browser/widget/diffEditor/{overviewRulerPart.js → features/overviewRulerFeature.js} +28 -28
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.js +145 -0
- package/vscode/src/vs/editor/browser/widget/diffEditor/{decorations.js → registrations.contribution.js} +18 -2
- package/vscode/src/vs/editor/browser/widget/diffEditor/utils.js +10 -2
- package/vscode/src/vs/editor/browser/widget/hoverWidget/hover.css.js +4 -0
- package/vscode/src/vs/editor/browser/widget/hoverWidget/hoverWidget.js +527 -0
- package/vscode/src/vs/editor/{contrib → browser/widget}/markdownRenderer/browser/markdownRenderer.js +11 -11
- package/vscode/src/vs/editor/{contrib → browser/widget}/markdownRenderer/browser/renderedMarkdown.css.js +1 -1
- package/vscode/src/vs/editor/common/config/editorOptions.d.ts +11 -10
- package/vscode/src/vs/editor/common/config/editorOptions.js +46 -42
- package/vscode/src/vs/editor/common/core/editorColorRegistry.js +3 -3
- package/vscode/src/vs/editor/common/core/offsetRange.d.ts +2 -0
- package/vscode/src/vs/editor/common/core/offsetRange.js +8 -0
- package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm.js +9 -0
- package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/heuristicSequenceOptimizations.js +50 -47
- package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence.js +4 -1
- package/vscode/src/vs/editor/common/diff/rangeMapping.d.ts +2 -1
- package/vscode/src/vs/editor/common/diff/rangeMapping.js +13 -2
- package/vscode/src/vs/editor/common/languages.d.ts +10 -2
- package/vscode/src/vs/editor/common/model/textModel.js +19 -13
- package/vscode/src/vs/editor/common/model/tokenizationTextModelPart.js +1 -1
- package/vscode/src/vs/editor/common/model.d.ts +19 -1
- package/vscode/src/vs/editor/common/model.js +2 -1
- package/vscode/src/vs/editor/common/services/editorSimpleWorker.js +2 -1
- package/vscode/src/vs/editor/common/services/getIconClasses.js +4 -1
- package/vscode/src/vs/editor/common/services/semanticTokensProviderStyling.js +3 -3
- package/vscode/src/vs/editor/common/standalone/standaloneEnums.js +9 -8
- package/vscode/src/vs/editor/common/standaloneStrings.js +18 -18
- package/vscode/src/vs/editor/common/viewEvents.js +2 -0
- package/vscode/src/vs/editor/common/viewModel/glyphLanesModel.js +55 -0
- package/vscode/src/vs/editor/common/viewModel/viewModelImpl.js +4 -1
- package/vscode/src/vs/editor/contrib/clipboard/browser/clipboard.js +5 -1
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeAction.js +1 -0
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionController.js +46 -20
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionMenu.js +1 -1
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionModel.js +38 -11
- package/vscode/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.js +56 -101
- package/vscode/src/vs/editor/contrib/codelens/browser/codelensWidget.js +3 -2
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorContributions.js +2 -2
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorHoverParticipant.js +10 -29
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.js +4 -4
- package/vscode/src/vs/editor/contrib/diffEditorBreadcrumbs/browser/contribution.js +51 -0
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteContribution.js +19 -1
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.js +38 -10
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/defaultProviders.js +29 -1
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/edit.js +10 -3
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.js +3 -17
- package/vscode/src/vs/editor/contrib/find/browser/findController.js +3 -35
- package/vscode/src/vs/editor/contrib/folding/browser/foldingDecorations.js +26 -6
- package/vscode/src/vs/editor/contrib/fontZoom/browser/fontZoom.js +6 -6
- package/vscode/src/vs/editor/contrib/format/browser/format.js +9 -9
- package/vscode/src/vs/editor/contrib/format/browser/formatActions.js +5 -5
- package/vscode/src/vs/editor/contrib/gotoError/browser/media/gotoErrorWidget.css.js +1 -1
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.js +2 -2
- package/vscode/src/vs/editor/contrib/hover/browser/contentHover.js +85 -76
- package/vscode/src/vs/editor/contrib/hover/browser/hover.js +120 -90
- package/vscode/src/vs/editor/contrib/hover/browser/marginHover.js +18 -6
- package/vscode/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.js +1 -1
- package/vscode/src/vs/editor/contrib/hover/browser/markerHoverParticipant.js +2 -2
- package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHints.js +4 -2
- package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.js +56 -38
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hoverParticipant.js +1 -1
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController.js +12 -0
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.js +4 -0
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.js +2 -2
- package/vscode/src/vs/editor/contrib/linkedEditing/browser/linkedEditing.js +50 -53
- package/vscode/src/vs/editor/contrib/message/browser/messageController.js +5 -2
- package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.js +1 -1
- package/vscode/src/vs/editor/contrib/semanticTokens/browser/documentSemanticTokens.js +5 -1
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css.js +1 -1
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.js +4 -4
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.js +8 -5
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.js +58 -46
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestController.js +34 -7
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.js +30 -38
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestModel.js +2 -2
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidget.js +11 -3
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.js +18 -7
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.js +8 -10
- package/vscode/src/vs/editor/contrib/unicodeHighlighter/browser/bannerController.js +1 -1
- package/vscode/src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.js +7 -6
- package/vscode/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.js +3 -0
- package/vscode/src/vs/editor/editor.api.d.ts +82 -11
- package/vscode/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.js +8 -3
- package/vscode/src/vs/editor/standalone/browser/standaloneLayoutService.js +4 -3
- package/vscode/src/vs/editor/standalone/browser/standaloneServices.js +22 -11
- package/vscode/src/vs/editor/standalone/browser/standaloneThemeService.js +1 -1
- package/vscode/src/vs/nls.d.ts +6 -0
- package/vscode/src/vs/platform/accessibility/browser/accessibilityService.js +4 -1
- package/vscode/src/vs/platform/accessibility/common/accessibility.d.ts +2 -16
- package/vscode/src/vs/platform/accessibility/common/accessibility.js +1 -2
- package/vscode/src/vs/platform/action/common/actionCommonCategories.d.ts +7 -20
- package/vscode/src/vs/platform/action/common/actionCommonCategories.js +8 -8
- package/vscode/src/vs/platform/actionWidget/browser/actionList.js +0 -1
- package/vscode/src/vs/platform/actionWidget/browser/actionWidget.css.js +1 -1
- package/vscode/src/vs/platform/actions/browser/buttonbar.js +2 -0
- package/vscode/src/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem.js +5 -0
- package/vscode/src/vs/platform/actions/browser/menuEntryActionViewItem.css.js +1 -1
- package/vscode/src/vs/platform/actions/browser/menuEntryActionViewItem.js +2 -2
- package/vscode/src/vs/platform/actions/common/actions.d.ts +9 -1
- package/vscode/src/vs/platform/actions/common/actions.js +12 -1
- package/vscode/src/vs/platform/audioCues/browser/audioCueService.d.ts +11 -1
- package/vscode/src/vs/platform/audioCues/browser/audioCueService.js +174 -28
- package/vscode/src/vs/platform/clipboard/browser/clipboardService.js +38 -5
- package/vscode/src/vs/platform/configuration/common/configuration.d.ts +0 -1
- package/vscode/src/vs/platform/environment/common/environmentService.js +1 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.d.ts +5 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.js +24 -5
- package/vscode/src/vs/platform/extensions/common/extensions.d.ts +6 -1
- package/vscode/src/vs/{workbench/services → platform}/hover/browser/hover.d.ts +6 -8
- package/vscode/src/vs/platform/hover/browser/hover.js +3 -0
- package/vscode/src/vs/platform/instantiation/common/instantiationService.js +14 -4
- package/vscode/src/vs/platform/keybinding/common/abstractKeybindingService.js +11 -4
- package/vscode/src/vs/platform/keybinding/common/keybinding.d.ts +7 -0
- package/vscode/src/vs/platform/layout/browser/layoutService.d.ts +6 -0
- package/vscode/src/vs/platform/list/browser/listService.js +7 -5
- package/vscode/src/vs/platform/log/common/bufferLog.js +1 -0
- package/vscode/src/vs/platform/log/common/log.d.ts +0 -1
- package/vscode/src/vs/platform/log/common/log.js +1 -2
- package/vscode/src/vs/platform/notification/common/notification.d.ts +36 -19
- package/vscode/src/vs/platform/notification/common/notification.js +9 -3
- package/vscode/src/vs/platform/quickinput/browser/pickerQuickAccess.js +4 -1
- package/vscode/src/vs/platform/quickinput/browser/quickInput.js +50 -48
- package/vscode/src/vs/platform/quickinput/browser/quickInputController.js +3 -5
- package/vscode/src/vs/platform/quickinput/browser/quickInputList.js +49 -66
- package/vscode/src/vs/platform/quickinput/browser/quickInputService.js +11 -3
- package/vscode/src/vs/platform/quickinput/browser/quickInputUtils.js +16 -2
- package/vscode/src/vs/platform/quickinput/common/quickInput.d.ts +230 -26
- package/vscode/src/vs/platform/remote/common/remoteAuthorityResolver.d.ts +1 -0
- package/vscode/src/vs/platform/telemetry/common/telemetryUtils.js +1 -0
- package/vscode/src/vs/platform/theme/browser/defaultStyles.js +5 -3
- package/vscode/src/vs/platform/theme/common/colorRegistry.js +28 -9
- package/vscode/src/vs/platform/tunnel/common/tunnel.d.ts +2 -0
- package/vscode/src/vs/platform/window/common/window.js +14 -8
- package/vscode/src/vs/workbench/api/common/extHost.api.impl.js +97 -78
- package/vscode/src/vs/workbench/api/common/extHost.protocol.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostAuthentication.js +1 -22
- package/vscode/src/vs/workbench/api/common/extHostChat.js +0 -6
- package/vscode/src/vs/workbench/api/common/extHostChatAgents2.js +31 -36
- package/vscode/src/vs/workbench/api/common/extHostChatVariables.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostComments.js +6 -1
- package/vscode/src/vs/workbench/api/common/extHostConsoleForwarder.js +1 -0
- package/vscode/src/vs/workbench/api/common/extHostDebugService.js +130 -6
- package/vscode/src/vs/workbench/api/common/extHostDocumentContentProviders.js +28 -15
- package/vscode/src/vs/workbench/api/common/extHostDocuments.js +4 -5
- package/vscode/src/vs/workbench/api/common/extHostExtensionService.js +5 -1
- package/vscode/src/vs/workbench/api/common/extHostFileSystem.js +1 -2
- package/vscode/src/vs/workbench/api/common/extHostFileSystemConsumer.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostInlineChat.js +35 -33
- package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js +40 -13
- package/vscode/src/vs/workbench/api/common/extHostMessageService.js +10 -1
- package/vscode/src/vs/workbench/api/common/extHostNotebook.js +11 -7
- package/vscode/src/vs/workbench/api/common/extHostNotebookEditors.js +2 -3
- package/vscode/src/vs/workbench/api/common/extHostNotebookKernels.js +29 -4
- package/vscode/src/vs/workbench/api/common/extHostProfileContentHandler.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostProgress.js +1 -7
- package/vscode/src/vs/workbench/api/common/extHostSCM.js +49 -93
- package/vscode/src/vs/workbench/api/common/extHostSpeech.js +21 -0
- package/vscode/src/vs/workbench/api/common/extHostTask.js +18 -22
- package/vscode/src/vs/workbench/api/common/extHostTelemetry.js +1 -0
- package/vscode/src/vs/workbench/api/common/extHostTerminalService.js +3 -3
- package/vscode/src/vs/workbench/api/common/extHostTesting.js +55 -36
- package/vscode/src/vs/workbench/api/common/extHostTextEditor.js +5 -2
- package/vscode/src/vs/workbench/api/common/extHostTextEditors.js +6 -7
- package/vscode/src/vs/workbench/api/common/extHostTreeViews.js +6 -3
- package/vscode/src/vs/workbench/api/common/extHostTunnelService.js +4 -2
- package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js +74 -12
- package/vscode/src/vs/workbench/api/common/extHostTypes.js +27 -8
- package/vscode/src/vs/workbench/api/worker/extHostConsoleForwarder.js +1 -1
- package/vscode/src/vs/workbench/browser/actions/layoutActions.js +172 -103
- package/vscode/src/vs/workbench/browser/actions/windowActions.js +13 -17
- package/vscode/src/vs/workbench/browser/actions/workspaceActions.js +34 -34
- package/vscode/src/vs/workbench/browser/actions/workspaceCommands.js +4 -4
- package/vscode/src/vs/workbench/browser/dnd.js +2 -2
- package/vscode/src/vs/workbench/browser/labels.js +34 -4
- package/vscode/src/vs/workbench/browser/part.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.js +4 -4
- package/vscode/src/vs/workbench/browser/parts/compositeBarActions.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsControl.js +801 -0
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsModel.js +140 -0
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.js +410 -0
- package/vscode/src/vs/workbench/browser/parts/editor/editor.js +1 -2
- package/vscode/src/vs/workbench/browser/parts/editor/editorActions.js +304 -303
- package/vscode/src/vs/workbench/browser/parts/editor/editorAutoSave.js +101 -47
- package/vscode/src/vs/workbench/browser/parts/editor/editorCommands.js +114 -47
- package/vscode/src/vs/workbench/browser/parts/editor/editorGroupView.js +1313 -0
- package/vscode/src/vs/workbench/browser/parts/editor/editorGroupWatermark.js +190 -0
- package/vscode/src/vs/workbench/browser/parts/editor/editorPanes.js +344 -0
- package/vscode/src/vs/workbench/browser/parts/editor/editorQuickAccess.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/editorStatus.js +10 -10
- package/vscode/src/vs/workbench/browser/parts/editor/editorTabsControl.js +27 -42
- package/vscode/src/vs/workbench/browser/parts/editor/editorTitleControl.js +152 -0
- package/vscode/src/vs/workbench/browser/parts/editor/editorsObserver.js +8 -8
- package/vscode/src/vs/workbench/browser/parts/editor/media/breadcrumbscontrol.css.js +4 -0
- package/vscode/src/vs/workbench/browser/parts/editor/media/editorgroupview.css.js +4 -0
- package/vscode/src/vs/workbench/browser/parts/editor/media/editortitlecontrol.css.js +4 -0
- package/vscode/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css.js +4 -0
- package/vscode/src/vs/workbench/browser/parts/editor/media/singleeditortabscontrol.css.js +4 -0
- package/vscode/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.js +1626 -0
- package/vscode/src/vs/workbench/browser/parts/editor/multiRowEditorTabsControl.js +150 -0
- package/vscode/src/vs/workbench/browser/parts/editor/noEditorTabsControl.js +52 -0
- package/vscode/src/vs/workbench/browser/parts/editor/singleEditorTabsControl.js +260 -0
- package/vscode/src/vs/workbench/browser/parts/editor/textEditor.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/textResourceEditor.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/globalCompositeBar.js +39 -36
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCommands.js +68 -28
- package/vscode/src/vs/workbench/browser/parts/panel/media/panelpart.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/panel/panelActions.js +15 -14
- package/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.js +18 -17
- package/vscode/src/vs/workbench/browser/parts/titlebar/windowTitle.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/views/media/views.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/views/treeView.js +7 -10
- package/vscode/src/vs/workbench/browser/parts/views/viewPane.js +2 -1
- package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.d.ts +2 -1
- package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js +18 -17
- package/vscode/src/vs/workbench/browser/quickaccess.js +33 -1
- package/vscode/src/vs/workbench/browser/web.api.d.ts +6 -0
- package/vscode/src/vs/workbench/browser/window.js +92 -9
- package/vscode/src/vs/workbench/browser/workbench.contribution.js +114 -65
- package/vscode/src/vs/workbench/common/component.d.ts +5 -1
- package/vscode/src/vs/workbench/common/component.js +6 -0
- package/vscode/src/vs/workbench/common/configuration.js +11 -1
- package/vscode/src/vs/workbench/common/contextkeys.js +8 -4
- package/vscode/src/vs/workbench/common/editor/editorInput.d.ts +6 -0
- package/vscode/src/vs/workbench/common/editor/editorInput.js +3 -0
- package/vscode/src/vs/workbench/common/editor/filteredEditorGroupModel.js +107 -0
- package/vscode/src/vs/workbench/common/editor/resourceEditorInput.d.ts +6 -3
- package/vscode/src/vs/workbench/common/editor/resourceEditorInput.js +21 -3
- package/vscode/src/vs/workbench/common/editor/textResourceEditorInput.d.ts +2 -1
- package/vscode/src/vs/workbench/common/editor/textResourceEditorInput.js +9 -6
- package/vscode/src/vs/workbench/common/editor.d.ts +16 -4
- package/vscode/src/vs/workbench/common/editor.js +7 -1
- package/vscode/src/vs/workbench/common/memento.js +33 -12
- package/vscode/src/vs/workbench/common/notifications.js +30 -7
- package/vscode/src/vs/workbench/common/theme.js +61 -1
- package/vscode/src/vs/workbench/common/views.d.ts +1 -28
- package/vscode/src/vs/workbench/common/views.js +1 -2
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.js +232 -19
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityContributions.js +9 -9
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleView.js +1 -0
- package/vscode/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.js +19 -31
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.js +8 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatActions.js +57 -38
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.js +4 -4
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditorInput.js +9 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatFollowups.js +7 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatInputPart.js +31 -20
- package/vscode/src/vs/workbench/contrib/chat/browser/chatListRenderer.js +93 -49
- package/vscode/src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.js +30 -6
- package/vscode/src/vs/workbench/contrib/chat/browser/chatSlashCommandContentWidget.js +24 -12
- package/vscode/src/vs/workbench/contrib/chat/browser/chatWidget.js +9 -5
- package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.js +12 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/media/chat.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/common/chatContextKeys.js +2 -1
- package/vscode/src/vs/workbench/contrib/chat/common/chatModel.js +21 -43
- package/vscode/src/vs/workbench/contrib/chat/common/chatService.js +6 -6
- package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js +4 -4
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.js +4 -4
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js +0 -3
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadBody.js +1 -1
- package/vscode/src/vs/workbench/contrib/comments/browser/{comments.contribution.js → commentsAccessibility.js} +36 -128
- package/vscode/src/vs/workbench/contrib/comments/browser/reactionsAction.js +41 -18
- package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.js +202 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.js +27 -4
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointWidget.js +165 -52
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointsView.js +48 -31
- package/vscode/src/vs/workbench/contrib/debug/browser/debugIcons.js +6 -1
- package/vscode/src/vs/workbench/contrib/debug/browser/media/breakpointWidget.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/common/debug.d.ts +40 -10
- package/vscode/src/vs/workbench/contrib/debug/common/debug.js +28 -1
- package/vscode/src/vs/workbench/contrib/debug/common/debugContext.js +14 -0
- package/vscode/src/vs/workbench/contrib/debug/common/debugModel.js +52 -23
- package/vscode/src/vs/workbench/contrib/debug/common/debugSource.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/common/debugVisualizers.js +164 -0
- package/vscode/src/vs/workbench/contrib/debug/common/disassemblyViewInput.js +10 -0
- package/vscode/src/vs/workbench/contrib/debug/common/replModel.js +285 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.js +123 -78
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsInput.js +10 -0
- package/vscode/src/vs/workbench/contrib/files/browser/editors/fileEditorInput.js +3 -19
- package/vscode/src/vs/workbench/contrib/files/browser/explorerViewlet.js +1 -2
- package/vscode/src/vs/workbench/contrib/files/browser/fileActions.js +8 -9
- package/vscode/src/vs/workbench/contrib/files/browser/files.configuration.contribution.js +70 -2
- package/vscode/src/vs/workbench/contrib/files/browser/files.d.ts +5 -2
- package/vscode/src/vs/workbench/contrib/files/browser/views/emptyView.js +2 -2
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerView.js +34 -17
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.js +5 -4
- package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js +48 -14
- package/vscode/src/vs/workbench/contrib/format/browser/formatActionsMultiple.js +16 -8
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChat.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.js +317 -321
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatLivePreviewWidget.js +17 -24
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSavingService.js +3 -0
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.js +306 -130
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionService.js +3 -0
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.js +385 -613
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.js +69 -64
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/utils.js +71 -3
- package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.js +39 -44
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js +5 -3
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.js +1 -1
- 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/media/notebookCellChat.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/media/notebookEditorStickyScroll.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditor.js +38 -7
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.js +36 -8
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookOptions.js +32 -12
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellPart.js +24 -14
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellStatusPart.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbarStickyScroll.js +1 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/chat/cellChatActions.js +264 -12
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/chat/cellChatController.js +60 -27
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.js +12 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellExecutionIcon.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.js +12 -9
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.js +6 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl.js +1 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.js +188 -155
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.js +10 -3
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookCommon.js +16 -33
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorInput.js +9 -7
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorModel.js +6 -2
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookKernelService.js +2 -1
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.js +29 -14
- package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.js +15 -3
- package/vscode/src/vs/workbench/contrib/remote/browser/urlFinder.js +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js +22 -6
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsFind.js +1 -1
- package/vscode/src/vs/workbench/contrib/search/browser/searchModel.js +16 -17
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.js +78 -50
- package/vscode/src/vs/workbench/contrib/speech/common/speechService.js +15 -1
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.d.ts +25 -45
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.js +12 -4
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalIcon.js +2 -1
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.js +33 -36
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/decorationStyles.js +1 -1
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.js +3 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.d.ts +5 -8
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.js +15 -27
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.js +3 -3
- package/vscode/src/vs/workbench/contrib/testing/common/testCoverage.js +38 -22
- package/vscode/src/vs/workbench/contrib/testing/common/testCoverageService.js +5 -2
- package/vscode/src/vs/workbench/contrib/testing/common/testProfileService.js +60 -40
- package/vscode/src/vs/workbench/contrib/testing/common/testResult.js +2 -2
- package/vscode/src/vs/workbench/contrib/testing/common/testResultStorage.js +15 -11
- package/vscode/src/vs/workbench/contrib/testing/common/testService.js +26 -1
- package/vscode/src/vs/workbench/contrib/testing/common/testTypes.js +24 -23
- package/vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStartedService.js +1 -1
- package/vscode/src/vs/workbench/services/authentication/browser/authenticationService.js +124 -26
- package/vscode/src/vs/workbench/services/authentication/common/authentication.d.ts +68 -0
- package/vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js +76 -36
- package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolver.js +1 -0
- package/vscode/src/vs/workbench/services/configurationResolver/common/variableResolver.js +1 -0
- package/vscode/src/vs/workbench/services/editor/browser/editorService.js +15 -3
- package/vscode/src/vs/workbench/services/editor/common/editorGroupFinder.js +10 -1
- package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.d.ts +51 -43
- package/vscode/src/vs/workbench/services/editor/common/editorService.d.ts +13 -8
- package/vscode/src/vs/workbench/services/editor/common/editorService.js +2 -1
- package/vscode/src/vs/workbench/services/extensionManagement/browser/extensionBisect.js +10 -10
- package/vscode/src/vs/workbench/services/extensions/browser/extensionUrlHandler.js +8 -8
- package/vscode/src/vs/workbench/services/extensions/common/extensionsApiProposals.js +7 -7
- package/vscode/src/vs/workbench/services/extensions/common/rpcProtocol.js +1 -0
- package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.d.ts +29 -9
- package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.js +160 -63
- package/vscode/src/vs/workbench/services/host/browser/host.d.ts +8 -0
- package/vscode/src/vs/workbench/services/keybinding/common/keybindingEditing.js +60 -72
- package/vscode/src/vs/workbench/services/layout/browser/layoutService.d.ts +0 -4
- package/vscode/src/vs/workbench/services/notebook/common/notebookDocumentService.js +56 -0
- package/vscode/src/vs/workbench/services/output/common/output.js +2 -2
- package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorInput.js +10 -0
- package/vscode/src/vs/workbench/services/preferences/common/preferencesEditorInput.js +10 -0
- package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.js +2 -1
- package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModel.js +5 -4
- package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorInput.js +21 -8
- package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorService.d.ts +4 -0
- package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorService.js +3 -0
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfile.js +4 -4
- package/vscode/src/vs/workbench/{browser/parts/views → services/views/browser}/viewsService.js +20 -15
- package/vscode/src/vs/workbench/services/views/common/viewsService.d.ts +34 -0
- package/vscode/src/vs/workbench/services/{hover/browser/hover.js → views/common/viewsService.js} +2 -2
- package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.d.ts +6 -1
- package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.js +5 -2
- package/vscode/src/vs/workbench/services/workspaces/common/workspaceTrust.js +1 -0
- package/vscode-dts/vscode.proposed.chatAgents2.d.ts +112 -47
- package/vscode-dts/vscode.proposed.chatAgents2Additions.d.ts +68 -9
- package/vscode-dts/{vscode.proposed.scmInputBoxActionButton.d.ts → vscode.proposed.codeActionRanges.d.ts} +8 -10
- package/vscode-dts/{vscode.proposed.readonlyMessage.d.ts → vscode.proposed.commentReactor.d.ts} +3 -4
- package/vscode-dts/vscode.proposed.contribMultiDiffEditorMenus.d.ts +6 -0
- package/vscode-dts/vscode.proposed.contribSourceControlHistoryItemGroupMenu.d.ts +8 -0
- package/vscode-dts/vscode.proposed.contribSourceControlHistoryItemMenu.d.ts +8 -0
- package/vscode-dts/vscode.proposed.debugVisualization.d.ts +100 -0
- package/vscode-dts/vscode.proposed.defaultChatAgent.d.ts +1 -1
- package/vscode-dts/vscode.proposed.interactive.d.ts +13 -16
- package/vscode-dts/vscode.proposed.notebookVariableProvider.d.ts +4 -1
- package/vscode-dts/vscode.proposed.resolvers.d.ts +4 -0
- package/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts +4 -10
- package/vscode-dts/vscode.proposed.scmMultiDiffEditor.d.ts +34 -0
- package/vscode-dts/vscode.proposed.speech.d.ts +17 -3
- package/vscode-dts/vscode.proposed.testCoverage.d.ts +7 -1
- package/vscode-dts/vscode.proposed.tunnelFactory.d.ts +4 -0
- package/vscode/src/vs/editor/browser/widget/diffEditor/colors.js +0 -17
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorDecorations.js +0 -231
- package/vscode/src/vs/editor/browser/widget/diffEditor/outlineModel.js +0 -299
- package/vscode/src/vs/editor/browser/widget/diffEditor/workerBasedDocumentDiffProvider.js +0 -101
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/suggestAddon.js +0 -390
- package/vscode/src/vs/workbench/services/editor/common/editorGroupColumn.d.ts +0 -10
- package/vscode/src/vs/workbench/services/suggest/browser/media/suggest.css.js +0 -4
- package/vscode/src/vs/workbench/services/suggest/browser/simpleCompletionItem.d.ts +0 -28
- package/vscode/src/vs/workbench/services/suggest/browser/simpleCompletionItem.js +0 -10
- package/vscode/src/vs/workbench/services/suggest/browser/simpleCompletionModel.d.ts +0 -30
- package/vscode/src/vs/workbench/services/suggest/browser/simpleCompletionModel.js +0 -98
- package/vscode/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.d.ts +0 -10
- package/vscode/src/vs/workbench/services/suggest/browser/simpleSuggestWidget.js +0 -428
- package/vscode/src/vs/workbench/services/suggest/browser/simpleSuggestWidgetRenderer.js +0 -83
- package/vscode-dts/vscode.proposed.chatVariables.d.ts +0 -39
- package/vscode-dts/vscode.proposed.interactiveUserActions.d.ts +0 -77
- package/vscode-dts/vscode.proposed.saveEditor.d.ts +0 -35
- package/vscode-dts/vscode.proposed.scmInputBoxValueProvider.d.ts +0 -25
- package/vscode-dts/vscode.proposed.testingActiveProfile.d.ts +0 -21
|
@@ -0,0 +1,202 @@
|
|
|
1
|
+
import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
+
import { append, addDisposableListener, EventType, clearNode, addStandardDisposableListener, $ as $$1 } from '../../../../base/browser/dom.js';
|
|
3
|
+
import { ActionBar } from '../../../../base/browser/ui/actionbar/actionbar.js';
|
|
4
|
+
import { HighlightedLabel } from '../../../../base/browser/ui/highlightedlabel/highlightedLabel.js';
|
|
5
|
+
import { InputBox } from '../../../../base/browser/ui/inputbox/inputBox.js';
|
|
6
|
+
import { Codicon } from '../../../../base/common/codicons.js';
|
|
7
|
+
import { ThemeIcon } from '../../../../base/common/themables.js';
|
|
8
|
+
import { createMatches } from '../../../../base/common/filters.js';
|
|
9
|
+
import { createSingleCallFunction } from '../../../../base/common/functional.js';
|
|
10
|
+
import { toDisposable, DisposableStore, dispose } from '../../../../base/common/lifecycle.js';
|
|
11
|
+
import { localizeWithPath } from '../../../../nls.js';
|
|
12
|
+
import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
|
|
13
|
+
import { defaultInputBoxStyles } from '../../../../platform/theme/browser/defaultStyles.js';
|
|
14
|
+
import { IDebugService } from '../common/debug.js';
|
|
15
|
+
import { Expression, Variable, ExpressionContainer } from '../common/debugModel.js';
|
|
16
|
+
import { ReplEvaluationResult } from '../common/replModel.js';
|
|
17
|
+
const MAX_VALUE_RENDER_LENGTH_IN_VIEWLET = 1024;
|
|
18
|
+
const booleanRegex = /^(true|false)$/i;
|
|
19
|
+
const stringRegex = /^(['"]).*\1$/;
|
|
20
|
+
const $ = $$1;
|
|
21
|
+
function renderViewTree(container) {
|
|
22
|
+
const treeContainer = $('.');
|
|
23
|
+
treeContainer.classList.add('debug-view-content');
|
|
24
|
+
container.appendChild(treeContainer);
|
|
25
|
+
return treeContainer;
|
|
26
|
+
}
|
|
27
|
+
function renderExpressionValue(expressionOrValue, container, options) {
|
|
28
|
+
let value = typeof expressionOrValue === 'string' ? expressionOrValue : expressionOrValue.value;
|
|
29
|
+
container.className = 'value';
|
|
30
|
+
if (value === null || ((expressionOrValue instanceof Expression || expressionOrValue instanceof Variable || expressionOrValue instanceof ReplEvaluationResult) && !expressionOrValue.available)) {
|
|
31
|
+
container.classList.add('unavailable');
|
|
32
|
+
if (value !== Expression.DEFAULT_VALUE) {
|
|
33
|
+
container.classList.add('error');
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
if (typeof expressionOrValue !== 'string' && options.showChanged && expressionOrValue.valueChanged && value !== Expression.DEFAULT_VALUE) {
|
|
38
|
+
container.className = 'value changed';
|
|
39
|
+
expressionOrValue.valueChanged = false;
|
|
40
|
+
}
|
|
41
|
+
if (options.colorize && typeof expressionOrValue !== 'string') {
|
|
42
|
+
if (expressionOrValue.type === 'number' || expressionOrValue.type === 'boolean' || expressionOrValue.type === 'string') {
|
|
43
|
+
container.classList.add(expressionOrValue.type);
|
|
44
|
+
}
|
|
45
|
+
else if (!isNaN(+value)) {
|
|
46
|
+
container.classList.add('number');
|
|
47
|
+
}
|
|
48
|
+
else if (booleanRegex.test(value)) {
|
|
49
|
+
container.classList.add('boolean');
|
|
50
|
+
}
|
|
51
|
+
else if (stringRegex.test(value)) {
|
|
52
|
+
container.classList.add('string');
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
if (options.maxValueLength && value && value.length > options.maxValueLength) {
|
|
57
|
+
value = value.substring(0, options.maxValueLength) + '...';
|
|
58
|
+
}
|
|
59
|
+
if (!value) {
|
|
60
|
+
value = '';
|
|
61
|
+
}
|
|
62
|
+
if (options.linkDetector) {
|
|
63
|
+
container.textContent = '';
|
|
64
|
+
const session = (expressionOrValue instanceof ExpressionContainer) ? expressionOrValue.getSession() : undefined;
|
|
65
|
+
container.appendChild(options.linkDetector.linkify(value, false, session ? session.root : undefined, true));
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
container.textContent = value;
|
|
69
|
+
}
|
|
70
|
+
if (options.showHover) {
|
|
71
|
+
container.title = value || '';
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
function renderVariable(variable, data, showChanged, highlights, linkDetector) {
|
|
75
|
+
if (variable.available) {
|
|
76
|
+
let text = variable.name;
|
|
77
|
+
if (variable.value && typeof variable.name === 'string') {
|
|
78
|
+
text += ':';
|
|
79
|
+
}
|
|
80
|
+
data.label.set(text, highlights, variable.type ? variable.type : variable.name);
|
|
81
|
+
data.name.classList.toggle('virtual', variable.presentationHint?.kind === 'virtual');
|
|
82
|
+
data.name.classList.toggle('internal', variable.presentationHint?.visibility === 'internal');
|
|
83
|
+
}
|
|
84
|
+
else if (variable.value && typeof variable.name === 'string' && variable.name) {
|
|
85
|
+
data.label.set(':');
|
|
86
|
+
}
|
|
87
|
+
data.expression.classList.toggle('lazy', !!variable.presentationHint?.lazy);
|
|
88
|
+
renderExpressionValue(variable, data.value, {
|
|
89
|
+
showChanged,
|
|
90
|
+
maxValueLength: MAX_VALUE_RENDER_LENGTH_IN_VIEWLET,
|
|
91
|
+
showHover: true,
|
|
92
|
+
colorize: true,
|
|
93
|
+
linkDetector
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
let AbstractExpressionsRenderer = class AbstractExpressionsRenderer {
|
|
97
|
+
constructor(debugService, contextViewService) {
|
|
98
|
+
this.debugService = debugService;
|
|
99
|
+
this.contextViewService = contextViewService;
|
|
100
|
+
}
|
|
101
|
+
renderTemplate(container) {
|
|
102
|
+
const expression = append(container, $('.expression'));
|
|
103
|
+
const name = append(expression, $('span.name'));
|
|
104
|
+
const lazyButton = append(expression, $('span.lazy-button'));
|
|
105
|
+
lazyButton.classList.add(...ThemeIcon.asClassNameArray(Codicon.eye));
|
|
106
|
+
lazyButton.title = ( localizeWithPath(
|
|
107
|
+
'vs/workbench/contrib/debug/browser/baseDebugView',
|
|
108
|
+
'debug.lazyButton.tooltip',
|
|
109
|
+
"Click to expand"
|
|
110
|
+
));
|
|
111
|
+
const value = append(expression, $('span.value'));
|
|
112
|
+
const label = ( new HighlightedLabel(name));
|
|
113
|
+
const inputBoxContainer = append(expression, $('.inputBoxContainer'));
|
|
114
|
+
const templateDisposable = ( new DisposableStore());
|
|
115
|
+
let actionBar;
|
|
116
|
+
if (this.renderActionBar) {
|
|
117
|
+
append(expression, $('.span.actionbar-spacer'));
|
|
118
|
+
actionBar = templateDisposable.add(( new ActionBar(expression)));
|
|
119
|
+
}
|
|
120
|
+
const template = { expression, name, value, label, inputBoxContainer, actionBar, elementDisposable: ( new DisposableStore()), templateDisposable, lazyButton, currentElement: undefined };
|
|
121
|
+
templateDisposable.add(addDisposableListener(lazyButton, EventType.CLICK, () => {
|
|
122
|
+
if (template.currentElement) {
|
|
123
|
+
this.debugService.getViewModel().evaluateLazyExpression(template.currentElement);
|
|
124
|
+
}
|
|
125
|
+
}));
|
|
126
|
+
return template;
|
|
127
|
+
}
|
|
128
|
+
renderExpressionElement(element, node, data) {
|
|
129
|
+
data.elementDisposable.clear();
|
|
130
|
+
data.currentElement = element;
|
|
131
|
+
this.renderExpression(node.element, data, createMatches(node.filterData));
|
|
132
|
+
if (data.actionBar) {
|
|
133
|
+
this.renderActionBar(data.actionBar, element, data);
|
|
134
|
+
}
|
|
135
|
+
const selectedExpression = this.debugService.getViewModel().getSelectedExpression();
|
|
136
|
+
if (element === selectedExpression?.expression || (element instanceof Variable && element.errorMessage)) {
|
|
137
|
+
const options = this.getInputBoxOptions(element, !!selectedExpression?.settingWatch);
|
|
138
|
+
if (options) {
|
|
139
|
+
data.elementDisposable.add(this.renderInputBox(data.name, data.value, data.inputBoxContainer, options));
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
renderInputBox(nameElement, valueElement, inputBoxContainer, options) {
|
|
144
|
+
nameElement.style.display = 'none';
|
|
145
|
+
valueElement.style.display = 'none';
|
|
146
|
+
inputBoxContainer.style.display = 'initial';
|
|
147
|
+
clearNode(inputBoxContainer);
|
|
148
|
+
const inputBox = ( new InputBox(
|
|
149
|
+
inputBoxContainer,
|
|
150
|
+
this.contextViewService,
|
|
151
|
+
{ ...options, inputBoxStyles: defaultInputBoxStyles }
|
|
152
|
+
));
|
|
153
|
+
inputBox.value = options.initialValue;
|
|
154
|
+
inputBox.focus();
|
|
155
|
+
inputBox.select();
|
|
156
|
+
const done = createSingleCallFunction((success, finishEditing) => {
|
|
157
|
+
nameElement.style.display = '';
|
|
158
|
+
valueElement.style.display = '';
|
|
159
|
+
inputBoxContainer.style.display = 'none';
|
|
160
|
+
const value = inputBox.value;
|
|
161
|
+
dispose(toDispose);
|
|
162
|
+
if (finishEditing) {
|
|
163
|
+
this.debugService.getViewModel().setSelectedExpression(undefined, false);
|
|
164
|
+
options.onFinish(value, success);
|
|
165
|
+
}
|
|
166
|
+
});
|
|
167
|
+
const toDispose = [
|
|
168
|
+
inputBox,
|
|
169
|
+
addStandardDisposableListener(inputBox.inputElement, EventType.KEY_DOWN, (e) => {
|
|
170
|
+
const isEscape = e.equals(9 );
|
|
171
|
+
const isEnter = e.equals(3 );
|
|
172
|
+
if (isEscape || isEnter) {
|
|
173
|
+
e.preventDefault();
|
|
174
|
+
e.stopPropagation();
|
|
175
|
+
done(isEnter, true);
|
|
176
|
+
}
|
|
177
|
+
}),
|
|
178
|
+
addDisposableListener(inputBox.inputElement, EventType.BLUR, () => {
|
|
179
|
+
done(true, true);
|
|
180
|
+
}),
|
|
181
|
+
addDisposableListener(inputBox.inputElement, EventType.CLICK, e => {
|
|
182
|
+
e.preventDefault();
|
|
183
|
+
e.stopPropagation();
|
|
184
|
+
})
|
|
185
|
+
];
|
|
186
|
+
return toDisposable(() => {
|
|
187
|
+
done(false, false);
|
|
188
|
+
});
|
|
189
|
+
}
|
|
190
|
+
disposeElement(node, index, templateData) {
|
|
191
|
+
templateData.elementDisposable.clear();
|
|
192
|
+
}
|
|
193
|
+
disposeTemplate(templateData) {
|
|
194
|
+
templateData.elementDisposable.dispose();
|
|
195
|
+
templateData.templateDisposable.dispose();
|
|
196
|
+
}
|
|
197
|
+
};
|
|
198
|
+
AbstractExpressionsRenderer = ( __decorate([
|
|
199
|
+
( __param(0, IDebugService)),
|
|
200
|
+
( __param(1, IContextViewService))
|
|
201
|
+
], AbstractExpressionsRenderer));
|
|
202
|
+
export { AbstractExpressionsRenderer, renderExpressionValue, renderVariable, renderViewTree };
|
|
@@ -38,6 +38,11 @@ const breakpointHelperDecoration = {
|
|
|
38
38
|
description: 'breakpoint-helper-decoration',
|
|
39
39
|
glyphMarginClassName: ThemeIcon.asClassName(debugBreakpointHint),
|
|
40
40
|
glyphMargin: { position: GlyphMarginLane.Right },
|
|
41
|
+
glyphMarginHoverMessage: ( new MarkdownString()).appendText(( localizeWithPath(
|
|
42
|
+
'vs/workbench/contrib/debug/browser/breakpointEditorContribution',
|
|
43
|
+
'breakpointHelper',
|
|
44
|
+
"Click to add a breakpoint."
|
|
45
|
+
))),
|
|
41
46
|
stickiness: 1
|
|
42
47
|
};
|
|
43
48
|
function createBreakpointDecorations(accessor, model, breakpoints, state, breakpointsActivated, showBreakpointsInOverviewRuler) {
|
|
@@ -66,7 +71,8 @@ function createBreakpointDecorations(accessor, model, breakpoints, state, breakp
|
|
|
66
71
|
function getBreakpointDecorationOptions(accessor, model, breakpoint, state, breakpointsActivated, showBreakpointsInOverviewRuler, hasOtherBreakpointsOnLine) {
|
|
67
72
|
const debugService = accessor.get(IDebugService);
|
|
68
73
|
const languageService = accessor.get(ILanguageService);
|
|
69
|
-
const
|
|
74
|
+
const labelService = accessor.get(ILabelService);
|
|
75
|
+
const { icon, message, showAdapterUnverifiedMessage } = getBreakpointMessageAndIcon(state, breakpointsActivated, breakpoint, labelService, debugService.getModel());
|
|
70
76
|
let glyphMarginHoverMessage;
|
|
71
77
|
let unverifiedMessage;
|
|
72
78
|
if (showAdapterUnverifiedMessage) {
|
|
@@ -233,7 +239,9 @@ let BreakpointEditorContribution = class BreakpointEditorContribution {
|
|
|
233
239
|
if (isShiftPressed) {
|
|
234
240
|
breakpoints.forEach(bp => this.debugService.enableOrDisableBreakpoints(!enabled, bp));
|
|
235
241
|
}
|
|
236
|
-
else if (!isLinux && ( breakpoints.some(
|
|
242
|
+
else if (!isLinux && ( breakpoints.some(
|
|
243
|
+
bp => !!bp.condition || !!bp.logMessage || !!bp.hitCondition || !!bp.triggeredBy
|
|
244
|
+
))) {
|
|
237
245
|
const logPoint = breakpoints.every(bp => !!bp.logMessage);
|
|
238
246
|
const breakpointType = logPoint ? ( localizeWithPath(
|
|
239
247
|
'vs/workbench/contrib/debug/browser/breakpointEditorContribution',
|
|
@@ -485,6 +493,11 @@ let BreakpointEditorContribution = class BreakpointEditorContribution {
|
|
|
485
493
|
'addLogPoint',
|
|
486
494
|
"Add Logpoint..."
|
|
487
495
|
)), undefined, true, () => Promise.resolve(this.showBreakpointWidget(lineNumber, column, 2 )))));
|
|
496
|
+
actions.push(( new Action('addTriggeredBreakpoint', ( localizeWithPath(
|
|
497
|
+
'vs/workbench/contrib/debug/browser/breakpointEditorContribution',
|
|
498
|
+
'addTriggeredBreakpoint',
|
|
499
|
+
"Add Triggered Breakpoint..."
|
|
500
|
+
)), undefined, true, () => Promise.resolve(this.showBreakpointWidget(lineNumber, column, 3 )))));
|
|
488
501
|
}
|
|
489
502
|
if (this.debugService.state === 2 ) {
|
|
490
503
|
actions.push(( new Separator()));
|
|
@@ -501,7 +514,11 @@ let BreakpointEditorContribution = class BreakpointEditorContribution {
|
|
|
501
514
|
if (decorations) {
|
|
502
515
|
for (const { options } of decorations) {
|
|
503
516
|
const clz = options.glyphMarginClassName;
|
|
504
|
-
if (
|
|
517
|
+
if (!clz) {
|
|
518
|
+
continue;
|
|
519
|
+
}
|
|
520
|
+
const hasSomeActionableCodicon = !(clz.includes('codicon-') || clz.startsWith('coverage-deco-')) || clz.includes('codicon-testing-') || clz.includes('codicon-merge-') || clz.includes('codicon-arrow-') || clz.includes('codicon-loading') || clz.includes('codicon-fold') || clz.includes('codicon-inline-chat');
|
|
521
|
+
if (hasSomeActionableCodicon) {
|
|
505
522
|
return false;
|
|
506
523
|
}
|
|
507
524
|
}
|
|
@@ -536,7 +553,7 @@ let BreakpointEditorContribution = class BreakpointEditorContribution {
|
|
|
536
553
|
});
|
|
537
554
|
this.candidateDecorations = ( candidateDecorationIds.map((decorationId, index) => {
|
|
538
555
|
const candidate = desiredCandidateDecorations[index];
|
|
539
|
-
const icon = candidate.breakpoint ? getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), candidate.breakpoint, this.labelService).icon : breakpoint.disabled;
|
|
556
|
+
const icon = candidate.breakpoint ? getBreakpointMessageAndIcon(this.debugService.state, this.debugService.getModel().areBreakpointsActivated(), candidate.breakpoint, this.labelService, this.debugService.getModel()).icon : breakpoint.disabled;
|
|
540
557
|
const contextMenuActions = () => this.getContextMenuActions(candidate.breakpoint ? [candidate.breakpoint] : [], activeCodeEditor.getModel().uri, candidate.range.startLineNumber, candidate.range.startColumn);
|
|
541
558
|
const inlineWidget = ( new InlineBreakpointWidget(
|
|
542
559
|
activeCodeEditor,
|
|
@@ -792,6 +809,12 @@ registerThemingParticipant((theme, collector) => {
|
|
|
792
809
|
color: ${debugIconBreakpointColor} !important;
|
|
793
810
|
}
|
|
794
811
|
`);
|
|
812
|
+
collector.addRule(`
|
|
813
|
+
.monaco-workbench ${ThemeIcon.asCSSSelector(breakpoint.pending)} {
|
|
814
|
+
color: ${debugIconBreakpointColor} !important;
|
|
815
|
+
font-size: 12px !important;
|
|
816
|
+
}
|
|
817
|
+
`);
|
|
795
818
|
}
|
|
796
819
|
const debugIconBreakpointDisabledColor = theme.getColor(debugIconBreakpointDisabledForeground);
|
|
797
820
|
if (debugIconBreakpointDisabledColor) {
|
|
@@ -1,33 +1,37 @@
|
|
|
1
1
|
import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
-
import '
|
|
3
|
-
import {
|
|
2
|
+
import { append, addDisposableListener, EventType, $ as $$1 } from '../../../../base/browser/dom.js';
|
|
3
|
+
import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
|
|
4
|
+
import { Button } from '../../../../base/browser/ui/button/button.js';
|
|
4
5
|
import { SelectBox } from '../../../../base/browser/ui/selectBox/selectBox.js';
|
|
6
|
+
import { onUnexpectedError } from '../../../../base/common/errors.js';
|
|
5
7
|
import { dispose } from '../../../../base/common/lifecycle.js';
|
|
6
|
-
import { append, $ as $$1 } from '../../../../base/browser/dom.js';
|
|
7
|
-
import { Position } from '../../../../editor/common/core/position.js';
|
|
8
|
-
import { ZoneWidget } from '../../../../editor/contrib/zoneWidget/browser/zoneWidget.js';
|
|
9
|
-
import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
|
|
10
|
-
import { CONTEXT_BREAKPOINT_WIDGET_VISIBLE, CONTEXT_IN_BREAKPOINT_WIDGET, BREAKPOINT_EDITOR_CONTRIBUTION_ID, DEBUG_SCHEME, IDebugService } from '../common/debug.js';
|
|
11
|
-
import { IThemeService } from '../../../../platform/theme/common/themeService.js';
|
|
12
|
-
import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
|
|
13
|
-
import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
|
|
14
|
-
import { EditorCommand, registerEditorCommand } from '../../../../editor/browser/editorExtensions.js';
|
|
15
|
-
import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
|
|
16
|
-
import { IModelService } from '../../../../editor/common/services/model.js';
|
|
17
8
|
import { URI } from '../../../../base/common/uri.js';
|
|
18
|
-
import
|
|
9
|
+
import './media/breakpointWidget.css.js';
|
|
10
|
+
import { EditorCommand, registerEditorCommand } from '../../../../editor/browser/editorExtensions.js';
|
|
19
11
|
import { ICodeEditorService } from '../../../../editor/browser/services/codeEditorService.js';
|
|
20
|
-
import { editorForeground } from '../../../../platform/theme/common/colorRegistry.js';
|
|
21
|
-
import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
|
|
22
12
|
import { CodeEditorWidget } from '../../../../editor/browser/widget/codeEditorWidget.js';
|
|
23
|
-
import {
|
|
13
|
+
import { Position } from '../../../../editor/common/core/position.js';
|
|
24
14
|
import { Range } from '../../../../editor/common/core/range.js';
|
|
25
|
-
import {
|
|
26
|
-
import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
|
|
15
|
+
import { EditorContextKeys } from '../../../../editor/common/editorContextKeys.js';
|
|
27
16
|
import { PLAINTEXT_LANGUAGE_ID } from '../../../../editor/common/languages/modesRegistry.js';
|
|
28
17
|
import { ILanguageFeaturesService } from '../../../../editor/common/services/languageFeatures.js';
|
|
29
|
-
import {
|
|
18
|
+
import { IModelService } from '../../../../editor/common/services/model.js';
|
|
19
|
+
import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
|
|
20
|
+
import { provideSuggestionItems, CompletionOptions } from '../../../../editor/contrib/suggest/browser/suggest.js';
|
|
21
|
+
import { ZoneWidget } from '../../../../editor/contrib/zoneWidget/browser/zoneWidget.js';
|
|
22
|
+
import { localizeWithPath } from '../../../../nls.js';
|
|
23
|
+
import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
|
|
24
|
+
import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.js';
|
|
25
|
+
import { IContextViewService } from '../../../../platform/contextview/browser/contextView.js';
|
|
26
|
+
import { createDecorator, IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
|
|
27
|
+
import { ServiceCollection } from '../../../../platform/instantiation/common/serviceCollection.js';
|
|
30
28
|
import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
|
|
29
|
+
import { ILabelService } from '../../../../platform/label/common/label.js';
|
|
30
|
+
import { defaultSelectBoxStyles, defaultButtonStyles } from '../../../../platform/theme/browser/defaultStyles.js';
|
|
31
|
+
import { editorForeground } from '../../../../platform/theme/common/colorRegistry.js';
|
|
32
|
+
import { IThemeService } from '../../../../platform/theme/common/themeService.js';
|
|
33
|
+
import { getSimpleCodeEditorWidgetOptions, getSimpleEditorOptions } from '../../codeEditor/browser/simpleEditorOptions.js';
|
|
34
|
+
import { CONTEXT_BREAKPOINT_WIDGET_VISIBLE, CONTEXT_IN_BREAKPOINT_WIDGET, BREAKPOINT_EDITOR_CONTRIBUTION_ID, DEBUG_SCHEME, IDebugService } from '../common/debug.js';
|
|
31
35
|
const $ = $$1;
|
|
32
36
|
const IPrivateBreakpointWidgetService = ( (createDecorator('privateBreakpointWidgetService')));
|
|
33
37
|
const DECORATION_KEY = 'breakpointwidgetdecoration';
|
|
@@ -56,7 +60,7 @@ function createDecorations(theme, placeHolder) {
|
|
|
56
60
|
}];
|
|
57
61
|
}
|
|
58
62
|
let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
|
|
59
|
-
constructor(editor, lineNumber, column, context, contextViewService, debugService, themeService, contextKeyService, instantiationService, modelService, codeEditorService, _configurationService, languageFeaturesService, keybindingService) {
|
|
63
|
+
constructor(editor, lineNumber, column, context, contextViewService, debugService, themeService, contextKeyService, instantiationService, modelService, codeEditorService, _configurationService, languageFeaturesService, keybindingService, labelService, textModelService) {
|
|
60
64
|
super(editor, { showFrame: true, showArrow: false, frameWidth: 1, isAccessible: true });
|
|
61
65
|
this.lineNumber = lineNumber;
|
|
62
66
|
this.column = column;
|
|
@@ -70,6 +74,8 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
|
|
|
70
74
|
this._configurationService = _configurationService;
|
|
71
75
|
this.languageFeaturesService = languageFeaturesService;
|
|
72
76
|
this.keybindingService = keybindingService;
|
|
77
|
+
this.labelService = labelService;
|
|
78
|
+
this.textModelService = textModelService;
|
|
73
79
|
this.conditionInput = '';
|
|
74
80
|
this.hitCountInput = '';
|
|
75
81
|
this.logMessageInput = '';
|
|
@@ -87,6 +93,9 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
|
|
|
87
93
|
else if (this.breakpoint && !this.breakpoint.condition && this.breakpoint.hitCondition) {
|
|
88
94
|
this.context = 1 ;
|
|
89
95
|
}
|
|
96
|
+
else if (this.breakpoint && this.breakpoint.triggeredBy) {
|
|
97
|
+
this.context = 3 ;
|
|
98
|
+
}
|
|
90
99
|
else {
|
|
91
100
|
this.context = 0 ;
|
|
92
101
|
}
|
|
@@ -149,16 +158,18 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
|
|
|
149
158
|
}
|
|
150
159
|
}
|
|
151
160
|
rememberInput() {
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
161
|
+
if (this.context !== 3 ) {
|
|
162
|
+
const value = this.input.getModel().getValue();
|
|
163
|
+
switch (this.context) {
|
|
164
|
+
case 2 :
|
|
165
|
+
this.logMessageInput = value;
|
|
166
|
+
break;
|
|
167
|
+
case 1 :
|
|
168
|
+
this.hitCountInput = value;
|
|
169
|
+
break;
|
|
170
|
+
default:
|
|
171
|
+
this.conditionInput = value;
|
|
172
|
+
}
|
|
162
173
|
}
|
|
163
174
|
}
|
|
164
175
|
setInputMode() {
|
|
@@ -177,19 +188,28 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
|
|
|
177
188
|
}
|
|
178
189
|
_fillContainer(container) {
|
|
179
190
|
this.setCssClass('breakpoint-widget');
|
|
180
|
-
const selectBox = ( (new SelectBox([
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
191
|
+
const selectBox = ( (new SelectBox([
|
|
192
|
+
{ text: ( (localizeWithPath(
|
|
193
|
+
'vs/workbench/contrib/debug/browser/breakpointWidget',
|
|
194
|
+
'expression',
|
|
195
|
+
"Expression"
|
|
196
|
+
))) },
|
|
197
|
+
{ text: ( (localizeWithPath(
|
|
198
|
+
'vs/workbench/contrib/debug/browser/breakpointWidget',
|
|
199
|
+
'hitCount',
|
|
200
|
+
"Hit Count"
|
|
201
|
+
))) },
|
|
202
|
+
{ text: ( (localizeWithPath(
|
|
203
|
+
'vs/workbench/contrib/debug/browser/breakpointWidget',
|
|
204
|
+
'logMessage',
|
|
205
|
+
"Log Message"
|
|
206
|
+
))) },
|
|
207
|
+
{ text: ( (localizeWithPath(
|
|
208
|
+
'vs/workbench/contrib/debug/browser/breakpointWidget',
|
|
209
|
+
'triggeredBy',
|
|
210
|
+
"Wait for Breakpoint"
|
|
211
|
+
))) },
|
|
212
|
+
], this.context, this.contextViewService, defaultSelectBoxStyles, { ariaLabel: ( (localizeWithPath(
|
|
193
213
|
'vs/workbench/contrib/debug/browser/breakpointWidget',
|
|
194
214
|
'breakpointType',
|
|
195
215
|
'Breakpoint Type'
|
|
@@ -199,10 +219,7 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
|
|
|
199
219
|
selectBox.onDidSelect(e => {
|
|
200
220
|
this.rememberInput();
|
|
201
221
|
this.context = e.index;
|
|
202
|
-
this.
|
|
203
|
-
const value = this.getInputValue(this.breakpoint);
|
|
204
|
-
this.input.getModel().setValue(value);
|
|
205
|
-
this.input.focus();
|
|
222
|
+
this.updateContextInput();
|
|
206
223
|
});
|
|
207
224
|
this.inputContainer = $('.inputContainer');
|
|
208
225
|
this.createBreakpointInput(append(container, this.inputContainer));
|
|
@@ -211,7 +228,84 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
|
|
|
211
228
|
this.fitHeightToContent();
|
|
212
229
|
}));
|
|
213
230
|
this.input.setPosition({ lineNumber: 1, column: this.input.getModel().getLineMaxColumn(1) });
|
|
214
|
-
|
|
231
|
+
this.createTriggerBreakpointInput(container);
|
|
232
|
+
this.updateContextInput();
|
|
233
|
+
setTimeout(() => this.focusInput(), 150);
|
|
234
|
+
}
|
|
235
|
+
createTriggerBreakpointInput(container) {
|
|
236
|
+
const breakpoints = this.debugService.getModel().getBreakpoints().filter(bp => bp !== this.breakpoint);
|
|
237
|
+
const index = breakpoints.findIndex((bp) => this.breakpoint?.triggeredBy === bp.getId());
|
|
238
|
+
let select = 0;
|
|
239
|
+
if (index > -1) {
|
|
240
|
+
select = index + 1;
|
|
241
|
+
}
|
|
242
|
+
Promise.all(( (breakpoints.map(async (bp) => ({
|
|
243
|
+
text: `${this.labelService.getUriLabel(bp.uri, { relative: true })}: ${bp.lineNumber}`,
|
|
244
|
+
description: await this.textModelService.createModelReference(bp.uri).then(ref => {
|
|
245
|
+
try {
|
|
246
|
+
return ref.object.textEditorModel.getLineContent(bp.lineNumber).trim();
|
|
247
|
+
}
|
|
248
|
+
finally {
|
|
249
|
+
ref.dispose();
|
|
250
|
+
}
|
|
251
|
+
}, () => undefined),
|
|
252
|
+
}))))).then(breakpoints => {
|
|
253
|
+
selectBreakpointBox.setOptions([
|
|
254
|
+
{ text: ( (localizeWithPath(
|
|
255
|
+
'vs/workbench/contrib/debug/browser/breakpointWidget',
|
|
256
|
+
'noTriggerByBreakpoint',
|
|
257
|
+
'None'
|
|
258
|
+
))) },
|
|
259
|
+
...breakpoints
|
|
260
|
+
], select);
|
|
261
|
+
});
|
|
262
|
+
const selectBreakpointBox = this.selectBreakpointBox = ( (new SelectBox([{ text: ( (localizeWithPath(
|
|
263
|
+
'vs/workbench/contrib/debug/browser/breakpointWidget',
|
|
264
|
+
'triggerByLoading',
|
|
265
|
+
'Loading...'
|
|
266
|
+
))), isDisabled: true }], 0, this.contextViewService, defaultSelectBoxStyles, { ariaLabel: ( (localizeWithPath(
|
|
267
|
+
'vs/workbench/contrib/debug/browser/breakpointWidget',
|
|
268
|
+
'selectBreakpoint',
|
|
269
|
+
'Select breakpoint'
|
|
270
|
+
))) })));
|
|
271
|
+
selectBreakpointBox.onDidSelect(e => {
|
|
272
|
+
if (e.index === 0) {
|
|
273
|
+
this.triggeredByBreakpointInput = undefined;
|
|
274
|
+
}
|
|
275
|
+
else {
|
|
276
|
+
this.triggeredByBreakpointInput = breakpoints[e.index - 1];
|
|
277
|
+
}
|
|
278
|
+
});
|
|
279
|
+
this.toDispose.push(selectBreakpointBox);
|
|
280
|
+
this.selectBreakpointContainer = $('.select-breakpoint-container');
|
|
281
|
+
this.toDispose.push(addDisposableListener(this.selectBreakpointContainer, EventType.KEY_DOWN, e => {
|
|
282
|
+
const event = ( (new StandardKeyboardEvent(e)));
|
|
283
|
+
if (event.equals(9 )) {
|
|
284
|
+
this.close(false);
|
|
285
|
+
}
|
|
286
|
+
}));
|
|
287
|
+
const selectionWrapper = $('.select-box-container');
|
|
288
|
+
append(this.selectBreakpointContainer, selectionWrapper);
|
|
289
|
+
selectBreakpointBox.render(selectionWrapper);
|
|
290
|
+
append(container, this.selectBreakpointContainer);
|
|
291
|
+
const closeButton = ( (new Button(this.selectBreakpointContainer, defaultButtonStyles)));
|
|
292
|
+
closeButton.label = ( (localizeWithPath('vs/workbench/contrib/debug/browser/breakpointWidget', 'ok', "Ok")));
|
|
293
|
+
this.toDispose.push(closeButton.onDidClick(() => this.close(true)));
|
|
294
|
+
this.toDispose.push(closeButton);
|
|
295
|
+
}
|
|
296
|
+
updateContextInput() {
|
|
297
|
+
if (this.context === 3 ) {
|
|
298
|
+
this.inputContainer.hidden = true;
|
|
299
|
+
this.selectBreakpointContainer.hidden = false;
|
|
300
|
+
}
|
|
301
|
+
else {
|
|
302
|
+
this.inputContainer.hidden = false;
|
|
303
|
+
this.selectBreakpointContainer.hidden = true;
|
|
304
|
+
this.setInputMode();
|
|
305
|
+
const value = this.getInputValue(this.breakpoint);
|
|
306
|
+
this.input.getModel().setValue(value);
|
|
307
|
+
this.focusInput();
|
|
308
|
+
}
|
|
215
309
|
}
|
|
216
310
|
_doLayout(heightInPixel, widthInPixel) {
|
|
217
311
|
this.heightInPx = heightInPixel;
|
|
@@ -312,6 +406,7 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
|
|
|
312
406
|
let condition = this.breakpoint && this.breakpoint.condition;
|
|
313
407
|
let hitCondition = this.breakpoint && this.breakpoint.hitCondition;
|
|
314
408
|
let logMessage = this.breakpoint && this.breakpoint.logMessage;
|
|
409
|
+
let triggeredBy = this.breakpoint && this.breakpoint.triggeredBy;
|
|
315
410
|
this.rememberInput();
|
|
316
411
|
if (this.conditionInput || this.context === 0 ) {
|
|
317
412
|
condition = this.conditionInput;
|
|
@@ -322,12 +417,19 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
|
|
|
322
417
|
if (this.logMessageInput || this.context === 2 ) {
|
|
323
418
|
logMessage = this.logMessageInput;
|
|
324
419
|
}
|
|
420
|
+
if (this.context === 3 ) {
|
|
421
|
+
condition = undefined;
|
|
422
|
+
hitCondition = undefined;
|
|
423
|
+
logMessage = undefined;
|
|
424
|
+
triggeredBy = this.triggeredByBreakpointInput?.getId();
|
|
425
|
+
}
|
|
325
426
|
if (this.breakpoint) {
|
|
326
427
|
const data = ( (new Map()));
|
|
327
428
|
data.set(this.breakpoint.getId(), {
|
|
328
429
|
condition,
|
|
329
430
|
hitCondition,
|
|
330
|
-
logMessage
|
|
431
|
+
logMessage,
|
|
432
|
+
triggeredBy
|
|
331
433
|
});
|
|
332
434
|
this.debugService.updateBreakpoints(this.breakpoint.originalUri, data, false).then(undefined, onUnexpectedError);
|
|
333
435
|
}
|
|
@@ -340,13 +442,22 @@ let BreakpointWidget = class BreakpointWidget extends ZoneWidget {
|
|
|
340
442
|
enabled: true,
|
|
341
443
|
condition,
|
|
342
444
|
hitCondition,
|
|
343
|
-
logMessage
|
|
445
|
+
logMessage,
|
|
446
|
+
triggeredBy
|
|
344
447
|
}]);
|
|
345
448
|
}
|
|
346
449
|
}
|
|
347
450
|
}
|
|
348
451
|
this.dispose();
|
|
349
452
|
}
|
|
453
|
+
focusInput() {
|
|
454
|
+
if (this.context === 3 ) {
|
|
455
|
+
this.selectBreakpointBox.focus();
|
|
456
|
+
}
|
|
457
|
+
else {
|
|
458
|
+
this.input.focus();
|
|
459
|
+
}
|
|
460
|
+
}
|
|
350
461
|
dispose() {
|
|
351
462
|
super.dispose();
|
|
352
463
|
this.input.dispose();
|
|
@@ -364,7 +475,9 @@ BreakpointWidget = ( (__decorate([
|
|
|
364
475
|
( (__param(10, ICodeEditorService))),
|
|
365
476
|
( (__param(11, IConfigurationService))),
|
|
366
477
|
( (__param(12, ILanguageFeaturesService))),
|
|
367
|
-
( (__param(13, IKeybindingService)))
|
|
478
|
+
( (__param(13, IKeybindingService))),
|
|
479
|
+
( (__param(14, ILabelService))),
|
|
480
|
+
( (__param(15, ITextModelService)))
|
|
368
481
|
], BreakpointWidget)));
|
|
369
482
|
class AcceptBreakpointWidgetInputAction extends EditorCommand {
|
|
370
483
|
static { this.ID = 'breakpointWidget.action.acceptInput'; }
|