@codingame/monaco-vscode-api 4.5.2 → 5.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/api.js +1 -1
- package/extensions.d.ts +2 -3
- package/lifecycle.js +6 -0
- package/localExtensionHost.d.ts +4 -1
- package/missing-services.js +41 -25
- package/package.json +8 -8
- package/service-override/tools/editor.js +31 -8
- package/service-override/tools/views.d.ts +1 -1
- package/service-override/tools/views.js +2 -3
- package/service-override/views.d.ts +0 -1
- package/services.d.ts +3 -3
- package/services.js +3 -3
- package/vscode/src/vs/base/browser/markdownRenderer.js +9 -3
- package/vscode/src/vs/base/browser/ui/actionbar/actionViewItems.js +2 -2
- package/vscode/src/vs/base/browser/ui/button/button.js +3 -3
- package/vscode/src/vs/base/browser/ui/codicons/codicon/codicon.css.js +1 -1
- package/vscode/src/vs/base/browser/ui/contextview/contextview.js +1 -1
- package/vscode/src/vs/base/browser/ui/dropdown/dropdown.js +2 -2
- package/vscode/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.js +2 -2
- package/vscode/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.js +2 -2
- package/vscode/src/vs/{platform/hover/browser → base/browser/ui/hover}/hover.d.ts +64 -4
- package/vscode/src/vs/base/browser/ui/hover/hoverDelegate.d.ts +1 -1
- package/vscode/src/vs/base/browser/ui/hover/hoverDelegate2.js +13 -0
- package/vscode/src/vs/base/browser/ui/hover/hoverWidget.css.js +1 -1
- package/vscode/src/vs/base/browser/ui/hover/hoverWidget.js +30 -14
- package/vscode/src/vs/base/browser/ui/iconLabel/iconLabel.js +15 -2
- package/vscode/src/vs/base/browser/ui/iconLabel/simpleIconLabel.js +2 -2
- package/vscode/src/vs/base/browser/ui/icons/iconSelectBox.css.js +4 -0
- package/vscode/src/vs/base/browser/ui/icons/iconSelectBox.js +239 -0
- package/vscode/src/vs/base/browser/ui/inputbox/inputBox.js +2 -2
- package/vscode/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.js +2 -2
- package/vscode/src/vs/base/browser/ui/list/listView.js +5 -3
- package/vscode/src/vs/base/browser/ui/list/listWidget.d.ts +33 -0
- package/vscode/src/vs/base/browser/ui/list/listWidget.js +4 -1
- package/vscode/src/vs/base/browser/ui/menu/menu.js +1 -0
- package/vscode/src/vs/base/browser/ui/menu/menubar.css.js +1 -1
- package/vscode/src/vs/base/browser/ui/progressbar/progressAccessibilitySignal.js +13 -0
- package/vscode/src/vs/base/browser/ui/progressbar/progressbar.js +7 -1
- package/vscode/src/vs/base/browser/ui/selectBox/selectBoxCustom.js +2 -2
- package/vscode/src/vs/base/browser/ui/table/tableWidget.js +2 -2
- package/vscode/src/vs/base/browser/ui/toggle/toggle.js +8 -2
- package/vscode/src/vs/base/browser/ui/toolbar/toolbar.d.ts +1 -1
- package/vscode/src/vs/base/browser/ui/tree/abstractTree.js +11 -4
- package/vscode/src/vs/base/browser/ui/tree/media/tree.css.js +1 -1
- package/vscode/src/vs/base/browser/ui/tree/objectTree.js +6 -4
- package/vscode/src/vs/base/common/arraysFind.js +7 -7
- package/vscode/src/vs/base/common/async.js +8 -3
- package/vscode/src/vs/base/common/cache.js +29 -10
- package/vscode/src/vs/base/common/cancellation.js +6 -1
- package/vscode/src/vs/base/common/codicons.d.ts +3 -0
- package/vscode/src/vs/base/common/codiconsLibrary.js +3 -0
- package/vscode/src/vs/base/common/controlFlow.js +48 -0
- package/vscode/src/vs/base/common/equals.js +44 -0
- package/vscode/src/vs/base/common/event.d.ts +11 -1
- package/vscode/src/vs/base/common/event.js +26 -1
- package/vscode/src/vs/base/common/jsonEdit.js +1 -1
- package/vscode/src/vs/base/common/lifecycle.js +1 -1
- package/vscode/src/vs/base/common/map.js +53 -4
- package/vscode/src/vs/base/common/network.js +2 -0
- package/vscode/src/vs/base/common/objects.js +3 -0
- package/vscode/src/vs/base/common/observableInternal/autorun.js +1 -10
- package/vscode/src/vs/base/common/observableInternal/base.js +22 -10
- package/vscode/src/vs/base/common/observableInternal/derived.js +8 -8
- package/vscode/src/vs/base/common/observableInternal/promise.js +19 -1
- package/vscode/src/vs/base/common/observableInternal/utils.js +30 -52
- package/vscode/src/vs/base/common/product.d.ts +1 -0
- package/vscode/src/vs/base/common/strings.js +1 -1
- package/vscode/src/vs/base/common/types.d.ts +5 -1
- package/vscode/src/vs/editor/browser/config/editorConfiguration.js +3 -2
- package/vscode/src/vs/editor/browser/observableUtilities.js +58 -0
- package/vscode/src/vs/editor/browser/services/hoverService/hoverService.js +121 -2
- package/vscode/src/vs/editor/browser/services/hoverService/updatableHoverWidget.js +80 -0
- package/vscode/src/vs/editor/browser/stableEditorScroll.js +37 -1
- package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.js +10 -3
- package/vscode/src/vs/editor/browser/widget/codeEditor/editor.css.js +1 -1
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorDecorations.js +1 -0
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.js +7 -5
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorSash.js +1 -0
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorOptions.js +1 -0
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorViewModel.js +3 -0
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.js +3 -10
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffProviderFactoryService.js +8 -0
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/gutterFeature.js +6 -6
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.js +1 -0
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.js +2 -2
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/overviewRulerFeature.js +1 -0
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.js +1 -0
- package/vscode/src/vs/editor/browser/widget/diffEditor/utils/editorGutter.js +1 -0
- package/vscode/src/vs/editor/browser/widget/diffEditor/utils.js +1 -0
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.js +3 -2
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel.js +17 -8
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget.js +1 -0
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js +27 -19
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/style.css.js +1 -1
- package/vscode/src/vs/editor/common/core/editorColorRegistry.js +4 -4
- package/vscode/src/vs/editor/common/core/lineRange.d.ts +12 -0
- package/vscode/src/vs/editor/common/core/lineRange.js +28 -0
- package/vscode/src/vs/editor/common/core/textEdit.d.ts +21 -0
- package/vscode/src/vs/editor/common/core/textEdit.js +13 -1
- package/vscode/src/vs/editor/common/core/textLength.d.ts +29 -0
- package/vscode/src/vs/editor/common/core/textLength.js +6 -0
- package/vscode/src/vs/editor/common/cursor/cursorCollection.js +3 -3
- package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.js +11 -1
- package/vscode/src/vs/editor/common/diff/rangeMapping.d.ts +11 -0
- package/vscode/src/vs/editor/common/diff/rangeMapping.js +34 -3
- package/vscode/src/vs/editor/common/languages.d.ts +50 -10
- package/vscode/src/vs/editor/common/languages.js +11 -1
- package/vscode/src/vs/editor/common/services/languageFeatureDebounce.js +1 -1
- package/vscode/src/vs/editor/common/services/languageFeatures.d.ts +2 -2
- package/vscode/src/vs/editor/common/services/languageFeaturesService.js +1 -1
- package/vscode/src/vs/editor/common/standalone/standaloneEnums.js +11 -1
- package/vscode/src/vs/editor/common/viewModel/viewModelImpl.js +3 -0
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionController.js +22 -6
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionModel.js +5 -0
- package/vscode/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.js +1 -0
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorContributions.js +1 -1
- package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerActions.js +20 -3
- package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerWidget.js +1 -1
- package/vscode/src/vs/editor/contrib/contextmenu/browser/contextmenu.js +2 -2
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/defaultProviders.js +4 -4
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js +2 -2
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.js +7 -0
- package/vscode/src/vs/editor/contrib/find/browser/findController.js +11 -6
- package/vscode/src/vs/editor/contrib/find/browser/findWidget.js +10 -10
- package/vscode/src/vs/editor/contrib/hover/browser/contentHoverComputer.js +74 -0
- package/vscode/src/vs/editor/contrib/hover/browser/contentHoverController.js +332 -0
- package/vscode/src/vs/editor/contrib/hover/browser/contentHoverStatusBar.js +34 -0
- package/vscode/src/vs/editor/contrib/hover/browser/contentHoverTypes.js +39 -0
- package/vscode/src/vs/editor/contrib/hover/browser/contentHoverWidget.js +355 -0
- package/vscode/src/vs/editor/contrib/hover/browser/getHover.js +11 -14
- package/vscode/src/vs/editor/contrib/hover/browser/hover.css.js +1 -1
- package/vscode/src/vs/editor/contrib/hover/browser/hoverActionIds.js +13 -0
- package/vscode/src/vs/editor/contrib/hover/browser/hoverActions.js +354 -0
- package/vscode/src/vs/editor/contrib/hover/browser/hoverContribution.js +42 -0
- package/vscode/src/vs/editor/contrib/hover/browser/hoverController.js +320 -0
- package/vscode/src/vs/editor/contrib/hover/browser/marginHoverComputer.js +48 -0
- package/vscode/src/vs/editor/contrib/hover/browser/{marginHover.js → marginHoverWidget.js} +14 -48
- package/vscode/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.js +250 -41
- package/vscode/src/vs/editor/contrib/hover/browser/markerHoverParticipant.js +1 -0
- package/vscode/src/vs/editor/contrib/indentation/browser/indentation.js +44 -20
- package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.js +11 -7
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/commands.js +1 -0
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/ghostTextWidget.js +1 -0
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hoverParticipant.js +2 -3
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys.js +1 -0
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController.js +26 -13
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.js +5 -11
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.js +24 -22
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsSource.js +39 -70
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider.js +3 -3
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/utils.js +1 -0
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/ghostTextWidget.js +1 -0
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/hoverParticipant.js +1 -0
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEditController.js +4 -2
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEditHintsWidget.js +5 -3
- package/vscode/src/vs/editor/contrib/inlineProgress/browser/inlineProgressWidget.css.js +1 -1
- package/vscode/src/vs/editor/contrib/rename/browser/rename.js +18 -6
- package/vscode/src/vs/editor/contrib/rename/browser/renameWidget.css.js +1 -1
- package/vscode/src/vs/editor/contrib/rename/browser/renameWidget.js +165 -40
- package/vscode/src/vs/editor/contrib/sectionHeaders/browser/sectionHeaders.js +5 -0
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetController2.js +3 -3
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.js +15 -8
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.js +13 -6
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollModelProvider.js +0 -2
- package/vscode/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.js +9 -2
- package/vscode/src/vs/editor/standalone/browser/standaloneCodeEditor.js +23 -18
- package/vscode/src/vs/editor/standalone/browser/standaloneServices.js +33 -11
- package/vscode/src/vs/platform/accessibility/common/accessibility.d.ts +1 -9
- package/vscode/src/vs/platform/accessibility/common/accessibility.js +2 -1
- package/vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.d.ts +15 -9
- package/vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.js +133 -132
- package/vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service.d.ts +12 -5
- package/vscode/src/vs/platform/accessibilitySignal/browser/progressAccessibilitySignalScheduler.js +25 -0
- package/vscode/src/vs/platform/actionWidget/browser/actionWidget.js +4 -4
- package/vscode/src/vs/platform/actions/browser/buttonbar.js +10 -7
- package/vscode/src/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem.js +1 -1
- package/vscode/src/vs/platform/actions/browser/toolbar.d.ts +4 -1
- package/vscode/src/vs/platform/actions/browser/toolbar.js +53 -36
- package/vscode/src/vs/platform/actions/common/actions.d.ts +3 -1
- package/vscode/src/vs/platform/actions/common/actions.js +14 -4
- package/vscode/src/vs/platform/actions/common/menuService.js +30 -8
- package/vscode/src/vs/platform/configuration/common/configuration.js +4 -0
- package/vscode/src/vs/platform/configuration/common/configurationModels.js +43 -32
- package/vscode/src/vs/platform/configuration/common/configurations.js +12 -10
- package/vscode/src/vs/platform/contextview/browser/contextView.d.ts +4 -1
- package/vscode/src/vs/platform/contextview/browser/contextView.service.d.ts +2 -3
- package/vscode/src/vs/platform/contextview/browser/contextViewService.js +10 -8
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.d.ts +0 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.js +1 -0
- package/vscode/src/vs/platform/extensionManagement/common/extensionsScannerService.js +1 -0
- package/vscode/src/vs/platform/extensions/common/extensions.d.ts +5 -0
- package/vscode/src/vs/platform/files/common/files.d.ts +14 -1
- package/vscode/src/vs/platform/hover/browser/hover.service.d.ts +2 -31
- package/vscode/src/vs/platform/instantiation/common/instantiation.d.ts +9 -0
- package/vscode/src/vs/platform/instantiation/common/instantiationService.js +42 -8
- package/vscode/src/vs/platform/log/common/log.js +3 -1
- package/vscode/src/vs/platform/markers/common/markerService.js +7 -3
- package/vscode/src/vs/platform/opener/browser/link.js +6 -4
- package/vscode/src/vs/platform/quickinput/browser/quickInput.js +2 -2
- package/vscode/src/vs/platform/quickinput/browser/quickInputTree.js +15 -7
- package/vscode/src/vs/platform/telemetry/common/gdprTypings.d.ts +0 -1
- package/vscode/src/vs/platform/telemetry/common/telemetryUtils.js +1 -0
- package/vscode/src/vs/platform/terminal/common/capabilities/capabilities.d.ts +5 -0
- package/vscode/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.d.ts +30 -0
- package/vscode/src/vs/platform/theme/browser/defaultStyles.js +6 -0
- package/vscode/src/vs/platform/theme/browser/iconsStyleSheet.js +13 -11
- package/vscode/src/vs/platform/userDataProfile/common/userDataProfile.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHost.api.impl.js +28 -28
- package/vscode/src/vs/workbench/api/common/extHost.protocol.js +2 -6
- package/vscode/src/vs/workbench/api/common/extHostBulkEdits.js +2 -1
- package/vscode/src/vs/workbench/api/common/extHostChatAgents2.js +104 -96
- package/vscode/src/vs/workbench/api/common/extHostChatVariables.js +4 -4
- package/vscode/src/vs/workbench/api/common/extHostConfiguration.js +9 -3
- package/vscode/src/vs/workbench/api/common/extHostDebugService.js +3 -3
- package/vscode/src/vs/workbench/api/common/extHostDocumentSaveParticipant.js +2 -1
- package/vscode/src/vs/workbench/api/common/extHostEditorTabs.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostFileSystemEventService.js +19 -1
- package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js +87 -17
- package/vscode/src/vs/workbench/api/common/extHostLanguageModels.js +39 -2
- package/vscode/src/vs/workbench/api/common/extHostNotebookDocumentSaveParticipant.js +2 -1
- package/vscode/src/vs/workbench/api/common/extHostTerminalShellIntegration.js +52 -36
- package/vscode/src/vs/workbench/api/common/extHostTesting.js +10 -28
- package/vscode/src/vs/workbench/api/common/extHostTreeViews.js +6 -1
- package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js +132 -136
- package/vscode/src/vs/workbench/api/common/extHostTypes.js +72 -18
- package/vscode/src/vs/workbench/api/common/extHostWindow.js +3 -5
- package/vscode/src/vs/workbench/browser/actions/layoutActions.js +86 -76
- package/vscode/src/vs/workbench/browser/actions/media/actions.css.js +1 -1
- package/vscode/src/vs/workbench/browser/actions/widgetNavigationCommands.js +30 -6
- package/vscode/src/vs/workbench/browser/labels.js +4 -1
- package/vscode/src/vs/workbench/browser/parts/compositePart.d.ts +3 -1
- package/vscode/src/vs/workbench/browser/parts/editor/diffEditorCommands.js +19 -7
- package/vscode/src/vs/workbench/browser/parts/editor/editorGroupView.js +16 -3
- package/vscode/src/vs/workbench/browser/parts/editor/media/editorquickaccess.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.js +14 -33
- package/vscode/src/vs/workbench/browser/parts/globalCompositeBar.js +33 -13
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsViewer.js +7 -5
- package/vscode/src/vs/workbench/browser/parts/paneCompositePart.d.ts +4 -3
- package/vscode/src/vs/workbench/browser/parts/panel/panelPart.d.ts +2 -1
- package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.d.ts +3 -1
- package/vscode/src/vs/workbench/browser/parts/views/checkbox.js +3 -3
- package/vscode/src/vs/workbench/browser/parts/views/media/views.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/views/treeView.js +182 -63
- package/vscode/src/vs/workbench/browser/parts/views/viewPane.d.ts +14 -3
- package/vscode/src/vs/workbench/browser/parts/views/viewPane.js +61 -34
- package/vscode/src/vs/workbench/browser/workbench.contribution.js +16 -10
- package/vscode/src/vs/workbench/common/theme.js +144 -98
- package/vscode/src/vs/workbench/common/views.d.ts +2 -0
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.js +190 -138
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleView.js +876 -0
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.js +59 -7
- package/vscode/src/vs/workbench/contrib/accessibility/browser/{accessibilityContributions.js → accessibleViewContributions.js} +160 -6
- package/vscode/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.js +3 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatActions.js +66 -150
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.js +75 -12
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.js +21 -22
- package/vscode/src/vs/workbench/contrib/chat/browser/chat.js +6 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatAgentHover.js +101 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditorInput.js +6 -5
- package/vscode/src/vs/workbench/contrib/chat/browser/chatInputPart.js +30 -23
- package/vscode/src/vs/workbench/contrib/chat/browser/chatListRenderer.js +201 -47
- package/vscode/src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.js +42 -5
- package/vscode/src/vs/workbench/contrib/chat/browser/chatWidget.js +13 -28
- package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockPart.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockPart.js +366 -6
- package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.js +35 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/media/chat.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/media/chatAgentHover.css.js +4 -0
- package/vscode/src/vs/workbench/contrib/chat/common/annotations.js +4 -9
- package/vscode/src/vs/workbench/contrib/chat/common/chatAgents.js +95 -5
- package/vscode/src/vs/workbench/contrib/chat/common/chatAgents.service.js +2 -1
- package/vscode/src/vs/workbench/contrib/chat/common/chatColors.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/common/chatContextKeys.js +11 -6
- package/vscode/src/vs/workbench/contrib/chat/common/chatModel.js +94 -79
- package/vscode/src/vs/workbench/contrib/chat/common/chatParserTypes.js +0 -13
- package/vscode/src/vs/workbench/contrib/chat/common/chatParticipantContribTypes.js +2 -0
- package/vscode/src/vs/workbench/contrib/chat/common/chatViewModel.js +7 -9
- package/vscode/src/vs/workbench/contrib/chat/common/languageModelStats.service.js +3 -0
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.js +1 -1
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js +1 -0
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.js +4 -4
- package/vscode/src/vs/workbench/contrib/comments/browser/commentNode.js +30 -26
- package/vscode/src/vs/workbench/contrib/comments/browser/commentReply.js +30 -29
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadBody.js +4 -4
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadWidget.js +5 -4
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.js +3 -3
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsController.js +13 -13
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.js +26 -16
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsView.js +107 -26
- package/vscode/src/vs/workbench/contrib/comments/browser/media/review.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/comments/browser/simpleCommentEditor.js +23 -2
- package/vscode/src/vs/workbench/contrib/comments/browser/timestamp.js +2 -3
- package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.js +39 -11
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointsView.js +53 -33
- package/vscode/src/vs/workbench/contrib/debug/browser/debugCommands.js +967 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugSessionPicker.js +101 -0
- package/vscode/src/vs/workbench/contrib/debug/common/debug.js +4 -1
- package/vscode/src/vs/workbench/contrib/debug/common/loadedScriptsPicker.js +82 -0
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.js +10 -9
- package/vscode/src/vs/workbench/contrib/files/browser/fileActions.js +79 -45
- package/vscode/src/vs/workbench/contrib/files/browser/{fileCommands.save.js → fileCommands._save.js} +4 -4
- package/vscode/src/vs/workbench/contrib/files/browser/{files.configuration.contribution.js → files.contribution._configuration.js} +1 -1
- package/vscode/src/vs/workbench/contrib/files/browser/{files.editorPane.contribution.js → files.contribution._editorPane.js} +18 -18
- package/vscode/src/vs/workbench/contrib/files/browser/views/emptyView.js +5 -3
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerView.js +19 -14
- package/vscode/src/vs/workbench/contrib/files/browser/views/media/openeditors.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js +8 -8
- package/vscode/src/vs/workbench/contrib/files/browser/workspaceWatcher.js +15 -2
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.js +29 -112
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatContentWidget.js +10 -7
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.js +99 -91
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.js +9 -31
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.js +345 -104
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.js +62 -69
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.js +63 -46
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.js +18 -10
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatContentWidget.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/utils.js +1 -31
- package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.js +7 -3
- package/vscode/src/vs/workbench/contrib/interactive/browser/interactiveEditorInput.js +5 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js +1 -0
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js +1 -0
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeMarkers/mergeMarkersController.js +1 -0
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.js +4 -4
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/utils.js +2 -48
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.js +28 -23
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.js +5 -9
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.js +112 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.js +18 -10
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOutputActions.js +7 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.js +4 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/editActions.js +8 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityProvider.js +1 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditor.js +36 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.js +9 -6
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookOptions.js +17 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellActionView.js +6 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.js +5 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellStatusPart.js +5 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars.js +2 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/foldedCellHint.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/notebookCellAnchor.js +2 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.js +22 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.js +34 -6
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.js +15 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/cellEditorOptions.js +6 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineProviderFactory.service.js +3 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.js +17 -14
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.js +2 -1
- package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.js +52 -16
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookCommon.js +3 -1
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookContextKeys.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorModel.js +25 -12
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.js +6 -4
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.js +0 -2
- package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.js +6 -4
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js +24 -2
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsFind.js +38 -8
- package/vscode/src/vs/workbench/contrib/search/browser/searchModel.js +0 -1
- package/vscode/src/vs/workbench/contrib/speech/common/speechService.js +1 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.d.ts +7 -14
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.service.d.ts +24 -6
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.service.js +2 -1
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.d.ts +8 -9
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm-private.d.ts +2 -20
- package/vscode/src/vs/workbench/contrib/terminal/common/terminal.d.ts +3 -1
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.js +2 -2
- package/vscode/src/vs/workbench/contrib/testing/common/testCoverage.js +1 -0
- package/vscode/src/vs/workbench/contrib/testing/common/testItemCollection.js +10 -0
- package/vscode/src/vs/workbench/contrib/testing/common/testResult.js +15 -3
- package/vscode/src/vs/workbench/services/accessibility/common/accessibleViewInformationService.service.d.ts +9 -0
- package/vscode/src/vs/workbench/services/accessibility/common/accessibleViewInformationService.service.js +3 -0
- package/vscode/src/vs/workbench/services/editor/common/customEditorLabelService.js +30 -16
- package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.d.ts +15 -4
- package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.service.d.ts +20 -1
- package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.service.d.ts +0 -1
- package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.d.ts +4 -1
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostManagers.d.ts +4 -1
- package/vscode/src/vs/workbench/services/extensions/common/extensionRunningLocation.d.ts +1 -1
- package/vscode/src/vs/workbench/services/extensions/common/extensions.d.ts +8 -2
- package/vscode/src/vs/workbench/services/extensions/common/extensions.js +2 -1
- package/vscode/src/vs/workbench/services/extensions/common/extensions.service.d.ts +4 -1
- package/vscode/src/vs/workbench/services/extensions/common/extensionsApiProposals.js +3 -3
- package/vscode/src/vs/workbench/services/language/common/languageService.js +23 -18
- package/vscode/src/vs/workbench/services/layout/browser/layoutService.js +6 -4
- package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.js +50 -9
- package/vscode/src/vs/workbench/services/themes/common/workbenchThemeService.js +1 -0
- package/vscode/src/vs/workbench/services/userDataProfile/browser/iconSelectBox.js +97 -0
- package/vscode/src/vs/workbench/services/workingCopy/common/fileWorkingCopy.d.ts +7 -2
- package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.js +2 -2
- package/vscode-dts/vscode.proposed.chatParticipant.d.ts +23 -45
- package/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts +65 -91
- package/vscode-dts/vscode.proposed.chatProvider.d.ts +9 -0
- package/vscode-dts/vscode.proposed.chatTab.d.ts +1 -5
- package/vscode-dts/vscode.proposed.contribAccessibilityHelpContent.d.ts +15 -0
- package/vscode-dts/vscode.proposed.debugFocus.d.ts +4 -4
- package/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts +2 -2
- package/vscode-dts/vscode.proposed.documentPaste.d.ts +144 -43
- package/vscode-dts/vscode.proposed.editorHoverVerbosityLevel.d.ts +76 -0
- package/vscode-dts/vscode.proposed.interactive.d.ts +1 -17
- package/vscode-dts/vscode.proposed.languageModels.d.ts +56 -11
- package/vscode-dts/vscode.proposed.newSymbolNamesProvider.d.ts +12 -1
- package/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts +4 -4
- package/vscode-dts/vscode.proposed.speech.d.ts +2 -1
- package/vscode-dts/vscode.proposed.terminalShellIntegration.d.ts +144 -38
- package/vscode-dts/vscode.proposed.testPreserveFocus.d.ts +28 -0
- package/vscode/src/vs/base/browser/ui/hover/updatableHoverWidget.d.ts +0 -21
- package/vscode/src/vs/base/browser/ui/hover/updatableHoverWidget.js +0 -214
- package/vscode/src/vs/editor/browser/services/hoverService/hoverService.d.ts +0 -32
- package/vscode/src/vs/editor/contrib/hover/browser/contentHover.js +0 -838
- package/vscode/src/vs/editor/contrib/hover/browser/hover.js +0 -621
- package/vscode/src/vs/platform/accessibility/common/accessibility.service.d.ts +0 -19
- package/vscode/src/vs/workbench/api/common/extHostChat.js +0 -54
- package/vscode/src/vs/workbench/api/common/extHostIssueReporter.js +0 -70
- package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignal.contribution.js +0 -237
- package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignalDebuggerContribution.js +0 -49
- package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignalLineFeatureContribution.js +0 -178
- package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/commands.js +0 -141
- package/vscode/src/vs/workbench/contrib/chat/common/chatContributionService.service.js +0 -3
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatFileCreationWidget.js +0 -212
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/OutlineEntry.js +0 -95
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.js +0 -110
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineProvider.js +0 -224
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalConfigHelper.d.ts +0 -48
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalEvents.js +0 -47
- package/vscode-dts/vscode.proposed.dropMetadata.d.ts +0 -65
- package/vscode-dts/vscode.proposed.handleIssueUri.d.ts +0 -57
- package/vscode-dts/vscode.proposed.windowActivity.d.ts +0 -17
- /package/vscode/src/vs/workbench/browser/parts/editor/{editor.autosave.contribution.js → editor.contribution._autosave.js} +0 -0
- /package/vscode/src/vs/workbench/contrib/files/browser/{files.fileEditorFactory.contribution.js → files.contribution._fileEditorFactory.js} +0 -0
|
@@ -3,24 +3,21 @@ import { raceCancellation } from '../../../base/common/async.js';
|
|
|
3
3
|
import { toErrorMessage } from '../../../base/common/errorMessage.js';
|
|
4
4
|
import { Emitter } from '../../../base/common/event.js';
|
|
5
5
|
import { Iterable } from '../../../base/common/iterator.js';
|
|
6
|
-
import { DisposableMap, DisposableStore } from '../../../base/common/lifecycle.js';
|
|
6
|
+
import { Disposable, DisposableMap, DisposableStore } from '../../../base/common/lifecycle.js';
|
|
7
7
|
import { StopWatch } from '../../../base/common/stopwatch.js';
|
|
8
8
|
import { assertType } from '../../../base/common/types.js';
|
|
9
9
|
import { URI } from '../../../base/common/uri.js';
|
|
10
|
-
import { localizeWithPath } from '../../../nls.js';
|
|
11
10
|
import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
|
|
12
11
|
import { MainContext } from './extHost.protocol.js';
|
|
13
|
-
import { ChatAgentRequest, ChatAgentResult, ChatAgentResolvedVariable,
|
|
14
|
-
import { ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind,
|
|
12
|
+
import { ChatAgentRequest, ChatAgentResult, ChatAgentResolvedVariable, ChatFollowup, ChatAgentUserActionEvent, ChatAgentCompletionItem, ChatLocation, ChatResponsePart, MarkdownString, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseFilesPart, ChatResponseAnchorPart, ChatResponseCommandButtonPart, ChatResponseProgressPart, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseDetectedParticipantPart } from './extHostTypeConverters.js';
|
|
13
|
+
import { ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseDetectedParticipantPart as ChatResponseDetectedParticipantPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1, ThemeIcon, ChatResponseFileTreePart, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseProgressPart as ChatResponseProgressPart$1 } from './extHostTypes.js';
|
|
15
14
|
import { InteractiveSessionVoteDirection } from '../../contrib/chat/common/chatService.js';
|
|
16
15
|
import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
|
|
17
|
-
const _moduleId = "vs/workbench/api/common/extHostChatAgents2";
|
|
18
16
|
class ChatAgentResponseStream {
|
|
19
|
-
constructor(_extension, _request, _proxy,
|
|
17
|
+
constructor(_extension, _request, _proxy, _commandsConverter, _sessionDisposables) {
|
|
20
18
|
this._extension = _extension;
|
|
21
19
|
this._request = _request;
|
|
22
20
|
this._proxy = _proxy;
|
|
23
|
-
this._logService = _logService;
|
|
24
21
|
this._commandsConverter = _commandsConverter;
|
|
25
22
|
this._sessionDisposables = _sessionDisposables;
|
|
26
23
|
this._stopWatch = StopWatch.create(false);
|
|
@@ -41,7 +38,7 @@ class ChatAgentResponseStream {
|
|
|
41
38
|
this._stopWatch.reset();
|
|
42
39
|
function throwIfDone(source) {
|
|
43
40
|
if (that._isClosed) {
|
|
44
|
-
const err = (
|
|
41
|
+
const err = ( new Error('Response stream has been closed'));
|
|
45
42
|
Error.captureStackTrace(err, source);
|
|
46
43
|
throw err;
|
|
47
44
|
}
|
|
@@ -55,54 +52,64 @@ class ChatAgentResponseStream {
|
|
|
55
52
|
this._apiObject = {
|
|
56
53
|
markdown(value) {
|
|
57
54
|
throwIfDone(this.markdown);
|
|
58
|
-
const part = new ChatResponseMarkdownPart
|
|
59
|
-
const dto = ChatResponseMarkdownPart.
|
|
55
|
+
const part = new ChatResponseMarkdownPart(value);
|
|
56
|
+
const dto = ChatResponseMarkdownPart$1.from(part);
|
|
57
|
+
_report(dto);
|
|
58
|
+
return this;
|
|
59
|
+
},
|
|
60
|
+
markdownWithVulnerabilities(value, vulnerabilities) {
|
|
61
|
+
throwIfDone(this.markdown);
|
|
62
|
+
if (vulnerabilities) {
|
|
63
|
+
checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
|
|
64
|
+
}
|
|
65
|
+
const part = new ChatResponseMarkdownWithVulnerabilitiesPart(value, vulnerabilities);
|
|
66
|
+
const dto = ChatResponseMarkdownWithVulnerabilitiesPart$1.from(part);
|
|
60
67
|
_report(dto);
|
|
61
68
|
return this;
|
|
62
69
|
},
|
|
63
70
|
filetree(value, baseUri) {
|
|
64
71
|
throwIfDone(this.filetree);
|
|
65
72
|
const part = new ChatResponseFileTreePart(value, baseUri);
|
|
66
|
-
const dto = ChatResponseFilesPart.
|
|
73
|
+
const dto = ChatResponseFilesPart.from(part);
|
|
67
74
|
_report(dto);
|
|
68
75
|
return this;
|
|
69
76
|
},
|
|
70
77
|
anchor(value, title) {
|
|
71
78
|
throwIfDone(this.anchor);
|
|
72
79
|
const part = new ChatResponseAnchorPart$1(value, title);
|
|
73
|
-
const dto = ChatResponseAnchorPart.
|
|
80
|
+
const dto = ChatResponseAnchorPart.from(part);
|
|
74
81
|
_report(dto);
|
|
75
82
|
return this;
|
|
76
83
|
},
|
|
77
84
|
button(value) {
|
|
78
85
|
throwIfDone(this.anchor);
|
|
79
86
|
const part = new ChatResponseCommandButtonPart$1(value);
|
|
80
|
-
const dto = ChatResponseCommandButtonPart.
|
|
87
|
+
const dto = ChatResponseCommandButtonPart.from(part, that._commandsConverter, that._sessionDisposables);
|
|
81
88
|
_report(dto);
|
|
82
89
|
return this;
|
|
83
90
|
},
|
|
84
91
|
progress(value) {
|
|
85
92
|
throwIfDone(this.progress);
|
|
86
93
|
const part = new ChatResponseProgressPart$1(value);
|
|
87
|
-
const dto = ChatResponseProgressPart.
|
|
94
|
+
const dto = ChatResponseProgressPart.from(part);
|
|
88
95
|
_report(dto);
|
|
89
96
|
return this;
|
|
90
97
|
},
|
|
91
|
-
reference(value) {
|
|
98
|
+
reference(value, iconPath) {
|
|
92
99
|
throwIfDone(this.reference);
|
|
93
100
|
if ('variableName' in value && !value.value) {
|
|
94
101
|
const matchingVarData = that._request.variables.variables.find(v => v.name === value.variableName);
|
|
95
102
|
if (matchingVarData) {
|
|
96
103
|
let references;
|
|
97
104
|
if (matchingVarData.references?.length) {
|
|
98
|
-
references = (
|
|
105
|
+
references = ( matchingVarData.references.map(r => ({
|
|
99
106
|
kind: 'reference',
|
|
100
107
|
reference: { variableName: value.variableName, value: r.reference }
|
|
101
|
-
})))
|
|
108
|
+
})));
|
|
102
109
|
}
|
|
103
110
|
else {
|
|
104
|
-
const part = new ChatResponseReferencePart$1(value);
|
|
105
|
-
const dto = ChatResponseReferencePart.
|
|
111
|
+
const part = new ChatResponseReferencePart$1(value, iconPath);
|
|
112
|
+
const dto = ChatResponseReferencePart.from(part);
|
|
106
113
|
references = [dto];
|
|
107
114
|
}
|
|
108
115
|
references.forEach(r => _report(r));
|
|
@@ -110,84 +117,94 @@ class ChatAgentResponseStream {
|
|
|
110
117
|
}
|
|
111
118
|
}
|
|
112
119
|
else {
|
|
113
|
-
const part = new ChatResponseReferencePart$1(value);
|
|
114
|
-
const dto = ChatResponseReferencePart.
|
|
120
|
+
const part = new ChatResponseReferencePart$1(value, iconPath);
|
|
121
|
+
const dto = ChatResponseReferencePart.from(part);
|
|
115
122
|
_report(dto);
|
|
116
123
|
}
|
|
117
124
|
return this;
|
|
118
125
|
},
|
|
126
|
+
textEdit(target, edits) {
|
|
127
|
+
throwIfDone(this.textEdit);
|
|
128
|
+
checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
|
|
129
|
+
const part = new ChatResponseTextEditPart$1(target, edits);
|
|
130
|
+
const dto = ChatResponseTextEditPart.from(part);
|
|
131
|
+
_report(dto);
|
|
132
|
+
return this;
|
|
133
|
+
},
|
|
134
|
+
detectedParticipant(participant, command) {
|
|
135
|
+
throwIfDone(this.detectedParticipant);
|
|
136
|
+
checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
|
|
137
|
+
const part = new ChatResponseDetectedParticipantPart$1(participant, command);
|
|
138
|
+
const dto = ChatResponseDetectedParticipantPart.from(part);
|
|
139
|
+
_report(dto);
|
|
140
|
+
return this;
|
|
141
|
+
},
|
|
119
142
|
push(part) {
|
|
120
143
|
throwIfDone(this.push);
|
|
144
|
+
if (part instanceof ChatResponseTextEditPart$1 || part instanceof ChatResponseMarkdownWithVulnerabilitiesPart || part instanceof ChatResponseDetectedParticipantPart$1) {
|
|
145
|
+
checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
|
|
146
|
+
}
|
|
121
147
|
if (part instanceof ChatResponseReferencePart$1) {
|
|
122
|
-
this.reference(part.value);
|
|
148
|
+
this.reference(part.value, part.iconPath);
|
|
123
149
|
}
|
|
124
150
|
else {
|
|
125
|
-
const dto = ChatResponsePart.
|
|
151
|
+
const dto = ChatResponsePart.from(part, that._commandsConverter, that._sessionDisposables);
|
|
126
152
|
_report(dto);
|
|
127
153
|
}
|
|
128
154
|
return this;
|
|
129
155
|
},
|
|
130
|
-
report(progress) {
|
|
131
|
-
throwIfDone(this.report);
|
|
132
|
-
if ('placeholder' in progress && 'resolvedContent' in progress) {
|
|
133
|
-
return;
|
|
134
|
-
}
|
|
135
|
-
const value = ChatResponseProgress.from(that._extension, progress);
|
|
136
|
-
if (!value) {
|
|
137
|
-
that._logService.error('Unknown progress type: ' + JSON.stringify(progress));
|
|
138
|
-
return;
|
|
139
|
-
}
|
|
140
|
-
_report(value);
|
|
141
|
-
return this;
|
|
142
|
-
}
|
|
143
156
|
};
|
|
144
157
|
}
|
|
145
158
|
return this._apiObject;
|
|
146
159
|
}
|
|
147
160
|
}
|
|
148
|
-
class ExtHostChatAgents2 {
|
|
161
|
+
class ExtHostChatAgents2 extends Disposable {
|
|
149
162
|
static { this._idPool = 0; }
|
|
150
163
|
constructor(mainContext, _logService, commands) {
|
|
164
|
+
super();
|
|
151
165
|
this._logService = _logService;
|
|
152
166
|
this.commands = commands;
|
|
153
|
-
this._agents = (
|
|
154
|
-
this._sessionDisposables = (
|
|
155
|
-
this.
|
|
167
|
+
this._agents = ( new Map());
|
|
168
|
+
this._sessionDisposables = this._register(( new DisposableMap()));
|
|
169
|
+
this._completionDisposables = this._register(( new DisposableStore()));
|
|
170
|
+
this._proxy = ( mainContext.getProxy(MainContext.MainThreadChatAgents2));
|
|
171
|
+
}
|
|
172
|
+
transferActiveChat(newWorkspace) {
|
|
173
|
+
this._proxy.$transferActiveChatSession(newWorkspace);
|
|
156
174
|
}
|
|
157
175
|
createChatAgent(extension, id, handler) {
|
|
158
176
|
const handle = ExtHostChatAgents2._idPool++;
|
|
159
|
-
const agent = (
|
|
177
|
+
const agent = ( new ExtHostChatAgent(extension, id, this._proxy, handle, handler));
|
|
160
178
|
this._agents.set(handle, agent);
|
|
161
179
|
this._proxy.$registerAgent(handle, extension.identifier, id, {}, undefined);
|
|
162
180
|
return agent.apiAgent;
|
|
163
181
|
}
|
|
164
182
|
createDynamicChatAgent(extension, id, name, description, handler) {
|
|
165
183
|
const handle = ExtHostChatAgents2._idPool++;
|
|
166
|
-
const agent = (
|
|
184
|
+
const agent = ( new ExtHostChatAgent(extension, id, this._proxy, handle, handler));
|
|
167
185
|
this._agents.set(handle, agent);
|
|
168
|
-
this._proxy.$registerAgent(handle, extension.identifier, id, {}, { name, description });
|
|
186
|
+
this._proxy.$registerAgent(handle, extension.identifier, id, { isSticky: true }, { name, description });
|
|
169
187
|
return agent.apiAgent;
|
|
170
188
|
}
|
|
171
189
|
async $invokeAgent(handle, request, context, token) {
|
|
172
190
|
const agent = this._agents.get(handle);
|
|
173
191
|
if (!agent) {
|
|
174
|
-
throw (
|
|
192
|
+
throw ( new Error(
|
|
175
193
|
`[CHAT](${handle}) CANNOT invoke agent because the agent is not registered`
|
|
176
|
-
))
|
|
194
|
+
));
|
|
177
195
|
}
|
|
178
196
|
let sessionDisposables = this._sessionDisposables.get(request.sessionId);
|
|
179
197
|
if (!sessionDisposables) {
|
|
180
|
-
sessionDisposables = (
|
|
198
|
+
sessionDisposables = ( new DisposableStore());
|
|
181
199
|
this._sessionDisposables.set(request.sessionId, sessionDisposables);
|
|
182
200
|
}
|
|
183
|
-
const stream = (
|
|
201
|
+
const stream = ( new ChatAgentResponseStream(
|
|
184
202
|
agent.extension,
|
|
185
203
|
request,
|
|
186
204
|
this._proxy,
|
|
187
|
-
this._logService,
|
|
188
205
|
this.commands.converter,
|
|
189
206
|
sessionDisposables
|
|
190
|
-
))
|
|
207
|
+
));
|
|
191
208
|
try {
|
|
192
209
|
const convertedHistory = await this.prepareHistoryTurns(request.agentId, context);
|
|
193
210
|
const task = agent.invoke(ChatAgentRequest.to(request), { history: convertedHistory }, stream.apiObject, token);
|
|
@@ -207,7 +224,7 @@ class ExtHostChatAgents2 {
|
|
|
207
224
|
}
|
|
208
225
|
catch (e) {
|
|
209
226
|
this._logService.error(e, agent.extension);
|
|
210
|
-
return { errorDetails: { message:
|
|
227
|
+
return { errorDetails: { message: toErrorMessage(e), responseIsIncomplete: true } };
|
|
211
228
|
}
|
|
212
229
|
finally {
|
|
213
230
|
stream.close();
|
|
@@ -220,8 +237,8 @@ class ExtHostChatAgents2 {
|
|
|
220
237
|
const result = agentId === h.request.agentId ?
|
|
221
238
|
ehResult :
|
|
222
239
|
{ ...ehResult, metadata: undefined };
|
|
223
|
-
res.push(new ChatRequestTurn(h.request.message, h.request.command, (
|
|
224
|
-
const parts = coalesce((
|
|
240
|
+
res.push(new ChatRequestTurn(h.request.message, h.request.command, ( h.request.variables.variables.map(ChatAgentResolvedVariable.to)), h.request.agentId));
|
|
241
|
+
const parts = coalesce(( h.response.map(r => ChatResponsePart.toContent(r, this.commands.converter))));
|
|
225
242
|
res.push(new ChatResponseTurn(parts, result, h.request.agentId, h.request.command));
|
|
226
243
|
}
|
|
227
244
|
return res;
|
|
@@ -236,20 +253,15 @@ class ExtHostChatAgents2 {
|
|
|
236
253
|
}
|
|
237
254
|
const convertedHistory = await this.prepareHistoryTurns(agent.id, context);
|
|
238
255
|
const ehResult = ChatAgentResult.to(result);
|
|
239
|
-
return (
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
}
|
|
249
|
-
return isValid;
|
|
250
|
-
})
|
|
251
|
-
.map(f => ChatFollowup.from(f, request)))
|
|
252
|
-
);
|
|
256
|
+
return ( (await agent.provideFollowups(ehResult, { history: convertedHistory }, token))
|
|
257
|
+
.filter(f => {
|
|
258
|
+
const isValid = !f.participant || ( Iterable.some(( this._agents.values()), a => a.id === f.participant && ExtensionIdentifier.equals(a.extension.identifier, agent.extension.identifier)));
|
|
259
|
+
if (!isValid) {
|
|
260
|
+
this._logService.warn(`[@${agent.id}] ChatFollowup refers to an unknown participant: ${f.participant}`);
|
|
261
|
+
}
|
|
262
|
+
return isValid;
|
|
263
|
+
})
|
|
264
|
+
.map(f => ChatFollowup.from(f, request)));
|
|
253
265
|
}
|
|
254
266
|
$acceptFeedback(handle, result, vote, reportIssue) {
|
|
255
267
|
const agent = this._agents.get(handle);
|
|
@@ -267,8 +279,8 @@ class ExtHostChatAgents2 {
|
|
|
267
279
|
break;
|
|
268
280
|
}
|
|
269
281
|
agent.acceptFeedback(reportIssue ?
|
|
270
|
-
(
|
|
271
|
-
(
|
|
282
|
+
( Object.freeze({ result: ehResult, kind, reportIssue })) :
|
|
283
|
+
( Object.freeze({ result: ehResult, kind })));
|
|
272
284
|
}
|
|
273
285
|
$acceptAction(handle, result, event) {
|
|
274
286
|
const agent = this._agents.get(handle);
|
|
@@ -280,7 +292,7 @@ class ExtHostChatAgents2 {
|
|
|
280
292
|
}
|
|
281
293
|
const ehAction = ChatAgentUserActionEvent.to(result, event, this.commands.converter);
|
|
282
294
|
if (ehAction) {
|
|
283
|
-
agent.acceptAction((
|
|
295
|
+
agent.acceptAction(( Object.freeze(ehAction)));
|
|
284
296
|
}
|
|
285
297
|
}
|
|
286
298
|
async $invokeCompletionProvider(handle, query, token) {
|
|
@@ -289,26 +301,24 @@ class ExtHostChatAgents2 {
|
|
|
289
301
|
return [];
|
|
290
302
|
}
|
|
291
303
|
const items = await agent.invokeCompletionProvider(query, token);
|
|
292
|
-
return (
|
|
293
|
-
|
|
294
|
-
);
|
|
304
|
+
return ( items.map(
|
|
305
|
+
(i) => ChatAgentCompletionItem.from(i, this.commands.converter, this._completionDisposables)
|
|
306
|
+
));
|
|
295
307
|
}
|
|
296
|
-
async $provideWelcomeMessage(handle, token) {
|
|
308
|
+
async $provideWelcomeMessage(handle, location, token) {
|
|
297
309
|
const agent = this._agents.get(handle);
|
|
298
310
|
if (!agent) {
|
|
299
311
|
return;
|
|
300
312
|
}
|
|
301
|
-
return await agent.provideWelcomeMessage(token);
|
|
313
|
+
return await agent.provideWelcomeMessage(ChatLocation.to(location), token);
|
|
302
314
|
}
|
|
303
|
-
async $provideSampleQuestions(handle, token) {
|
|
315
|
+
async $provideSampleQuestions(handle, location, token) {
|
|
304
316
|
const agent = this._agents.get(handle);
|
|
305
317
|
if (!agent) {
|
|
306
318
|
return;
|
|
307
319
|
}
|
|
308
|
-
return (
|
|
309
|
-
|
|
310
|
-
.map(f => ChatFollowup.from(f, undefined)))
|
|
311
|
-
);
|
|
320
|
+
return ( (await agent.provideSampleQuestions(ChatLocation.to(location), token))
|
|
321
|
+
.map(f => ChatFollowup.from(f, undefined)));
|
|
312
322
|
}
|
|
313
323
|
}
|
|
314
324
|
class ExtHostChatAgent {
|
|
@@ -318,8 +328,8 @@ class ExtHostChatAgent {
|
|
|
318
328
|
this._proxy = _proxy;
|
|
319
329
|
this._handle = _handle;
|
|
320
330
|
this._requestHandler = _requestHandler;
|
|
321
|
-
this._onDidReceiveFeedback = (
|
|
322
|
-
this._onDidPerformAction = (
|
|
331
|
+
this._onDidReceiveFeedback = ( new Emitter());
|
|
332
|
+
this._onDidPerformAction = ( new Emitter());
|
|
323
333
|
}
|
|
324
334
|
acceptFeedback(feedback) {
|
|
325
335
|
this._onDidReceiveFeedback.fire(feedback);
|
|
@@ -345,30 +355,28 @@ class ExtHostChatAgent {
|
|
|
345
355
|
.filter(f => !(f && 'commandId' in f))
|
|
346
356
|
.filter(f => !(f && 'message' in f));
|
|
347
357
|
}
|
|
348
|
-
async provideWelcomeMessage(token) {
|
|
358
|
+
async provideWelcomeMessage(location, token) {
|
|
349
359
|
if (!this._welcomeMessageProvider) {
|
|
350
360
|
return [];
|
|
351
361
|
}
|
|
352
|
-
const content = await this._welcomeMessageProvider.provideWelcomeMessage(token);
|
|
362
|
+
const content = await this._welcomeMessageProvider.provideWelcomeMessage(location, token);
|
|
353
363
|
if (!content) {
|
|
354
364
|
return [];
|
|
355
365
|
}
|
|
356
|
-
return (
|
|
357
|
-
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
}))
|
|
365
|
-
);
|
|
366
|
+
return ( content.map(item => {
|
|
367
|
+
if (typeof item === 'string') {
|
|
368
|
+
return item;
|
|
369
|
+
}
|
|
370
|
+
else {
|
|
371
|
+
return MarkdownString.from(item);
|
|
372
|
+
}
|
|
373
|
+
}));
|
|
366
374
|
}
|
|
367
|
-
async provideSampleQuestions(token) {
|
|
375
|
+
async provideSampleQuestions(location, token) {
|
|
368
376
|
if (!this._welcomeMessageProvider || !this._welcomeMessageProvider.provideSampleQuestions) {
|
|
369
377
|
return [];
|
|
370
378
|
}
|
|
371
|
-
const content = await this._welcomeMessageProvider.provideSampleQuestions(token);
|
|
379
|
+
const content = await this._welcomeMessageProvider.provideSampleQuestions(location, token);
|
|
372
380
|
if (!content) {
|
|
373
381
|
return [];
|
|
374
382
|
}
|
|
@@ -512,7 +520,7 @@ class ExtHostChatAgent {
|
|
|
512
520
|
that._agentVariableProvider = v;
|
|
513
521
|
if (v) {
|
|
514
522
|
if (!v.triggerCharacters.length) {
|
|
515
|
-
throw (
|
|
523
|
+
throw ( new Error('triggerCharacters are required'));
|
|
516
524
|
}
|
|
517
525
|
that._proxy.$registerAgentCompletionsProvider(that._handle, v.triggerCharacters);
|
|
518
526
|
}
|
|
@@ -72,24 +72,24 @@ class ChatVariableResolverResponseStream {
|
|
|
72
72
|
progress(value) {
|
|
73
73
|
throwIfDone(this.progress);
|
|
74
74
|
const part = new ChatResponseProgressPart$1(value);
|
|
75
|
-
const dto = ChatResponseProgressPart.
|
|
75
|
+
const dto = ChatResponseProgressPart.from(part);
|
|
76
76
|
_report(dto);
|
|
77
77
|
return this;
|
|
78
78
|
},
|
|
79
79
|
reference(value) {
|
|
80
80
|
throwIfDone(this.reference);
|
|
81
81
|
const part = new ChatResponseReferencePart$1(value);
|
|
82
|
-
const dto = ChatResponseReferencePart.
|
|
82
|
+
const dto = ChatResponseReferencePart.from(part);
|
|
83
83
|
_report(dto);
|
|
84
84
|
return this;
|
|
85
85
|
},
|
|
86
86
|
push(part) {
|
|
87
87
|
throwIfDone(this.push);
|
|
88
88
|
if (part instanceof ChatResponseReferencePart$1) {
|
|
89
|
-
_report(ChatResponseReferencePart.
|
|
89
|
+
_report(ChatResponseReferencePart.from(part));
|
|
90
90
|
}
|
|
91
91
|
else if (part instanceof ChatResponseProgressPart$1) {
|
|
92
|
-
_report(ChatResponseProgressPart.
|
|
92
|
+
_report(ChatResponseProgressPart.from(part));
|
|
93
93
|
}
|
|
94
94
|
return this;
|
|
95
95
|
}
|
|
@@ -89,7 +89,7 @@ class ExtHostConfigProvider {
|
|
|
89
89
|
this._proxy = proxy;
|
|
90
90
|
this._logService = logService;
|
|
91
91
|
this._extHostWorkspace = extHostWorkspace;
|
|
92
|
-
this._configuration = Configuration$1.parse(data);
|
|
92
|
+
this._configuration = Configuration$1.parse(data, logService);
|
|
93
93
|
this._configurationScopes = this._toMap(data.configurationScopes);
|
|
94
94
|
}
|
|
95
95
|
get onDidChangeConfiguration() {
|
|
@@ -97,7 +97,7 @@ class ExtHostConfigProvider {
|
|
|
97
97
|
}
|
|
98
98
|
$acceptConfigurationChanged(data, change) {
|
|
99
99
|
const previous = { data: this._configuration.toData(), workspace: this._extHostWorkspace.workspace };
|
|
100
|
-
this._configuration = Configuration$1.parse(data);
|
|
100
|
+
this._configuration = Configuration$1.parse(data, this._logService);
|
|
101
101
|
this._configurationScopes = this._toMap(data.configurationScopes);
|
|
102
102
|
this._onDidChangeConfiguration.fire(this._toConfigurationChangeEvent(change, previous));
|
|
103
103
|
}
|
|
@@ -262,7 +262,13 @@ class ExtHostConfigProvider {
|
|
|
262
262
|
}
|
|
263
263
|
}
|
|
264
264
|
_toConfigurationChangeEvent(change, previous) {
|
|
265
|
-
const event = ( new ConfigurationChangeEvent(
|
|
265
|
+
const event = ( new ConfigurationChangeEvent(
|
|
266
|
+
change,
|
|
267
|
+
previous,
|
|
268
|
+
this._configuration,
|
|
269
|
+
this._extHostWorkspace.workspace,
|
|
270
|
+
this._logService
|
|
271
|
+
));
|
|
266
272
|
return ( Object.freeze({
|
|
267
273
|
affectsConfiguration: (section, scope) => event.affectsConfiguration(section, scopeToOverrides(scope))
|
|
268
274
|
}));
|
|
@@ -8,7 +8,7 @@ import { MainContext } from './extHost.protocol.js';
|
|
|
8
8
|
import { IExtHostEditorTabs } from './extHostEditorTabs.js';
|
|
9
9
|
import { IExtHostExtensionService } from './extHostExtensionService.js';
|
|
10
10
|
import { IExtHostRpcService } from './extHostRpcService.js';
|
|
11
|
-
import { SourceBreakpoint, DebugConsoleMode, Disposable, setBreakpointId, FunctionBreakpoint, Location, Position, DebugAdapterExecutable, DebugAdapterServer, DebugAdapterNamedPipeServer, DebugAdapterInlineImplementation, ThemeIcon as ThemeIcon$1, DataBreakpoint,
|
|
11
|
+
import { SourceBreakpoint, DebugConsoleMode, Disposable, setBreakpointId, FunctionBreakpoint, Location, Position, DebugAdapterExecutable, DebugAdapterServer, DebugAdapterNamedPipeServer, DebugAdapterInlineImplementation, ThemeIcon as ThemeIcon$1, DataBreakpoint, DebugThread, DebugStackFrame } from './extHostTypes.js';
|
|
12
12
|
import { IExtHostWorkspace } from './extHostWorkspace.js';
|
|
13
13
|
import { AbstractDebugAdapter } from '../../contrib/debug/common/abstractDebugAdapter.js';
|
|
14
14
|
import { convertToVSCPaths, convertToDAPaths, isDebuggerMainContribution } from '../../contrib/debug/common/debugUtils.js';
|
|
@@ -590,10 +590,10 @@ let ExtHostDebugServiceBase = class ExtHostDebugServiceBase {
|
|
|
590
590
|
if (focusDto) {
|
|
591
591
|
const session = await this.getSession(focusDto.sessionId);
|
|
592
592
|
if (focusDto.kind === 'thread') {
|
|
593
|
-
focus = ( new
|
|
593
|
+
focus = ( new DebugThread(session.api, focusDto.threadId));
|
|
594
594
|
}
|
|
595
595
|
else {
|
|
596
|
-
focus = ( new
|
|
596
|
+
focus = ( new DebugStackFrame(session.api, focusDto.threadId, focusDto.frameId));
|
|
597
597
|
}
|
|
598
598
|
}
|
|
599
599
|
this._activeStackItem = focus;
|
|
@@ -3,6 +3,7 @@ import { illegalState } from '../../../base/common/errors.js';
|
|
|
3
3
|
import { TextEdit } from './extHostTypes.js';
|
|
4
4
|
import { TextDocumentSaveReason, Range, EndOfLine } from './extHostTypeConverters.js';
|
|
5
5
|
import { LinkedList } from '../../../base/common/linkedList.js';
|
|
6
|
+
import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
|
|
6
7
|
class ExtHostDocumentSaveParticipant {
|
|
7
8
|
constructor(_logService, _documents, _mainThreadBulkEdits, _thresholds = { timeout: 1500, errors: 3 }) {
|
|
8
9
|
this._logService = _logService;
|
|
@@ -117,7 +118,7 @@ class ExtHostDocumentSaveParticipant {
|
|
|
117
118
|
return undefined;
|
|
118
119
|
}
|
|
119
120
|
if (version === document.version) {
|
|
120
|
-
return this._mainThreadBulkEdits.$tryApplyWorkspaceEdit(dto);
|
|
121
|
+
return this._mainThreadBulkEdits.$tryApplyWorkspaceEdit(( new SerializableObjectWithBuffers(dto)));
|
|
121
122
|
}
|
|
122
123
|
return Promise.reject(( new Error('concurrent_edits')));
|
|
123
124
|
});
|
|
@@ -82,7 +82,7 @@ class ExtHostEditorTab {
|
|
|
82
82
|
case 9 :
|
|
83
83
|
return ( new InteractiveWindowInput(URI.revive(this._dto.input.uri), URI.revive(this._dto.input.inputBoxUri)));
|
|
84
84
|
case 10 :
|
|
85
|
-
return ( new ChatEditorTabInput(
|
|
85
|
+
return ( new ChatEditorTabInput());
|
|
86
86
|
case 11 :
|
|
87
87
|
return ( new TextMultiDiffTabInput(( this._dto.input.diffEditors.map(diff => ( new TextDiffTabInput(URI.revive(diff.original), URI.revive(diff.modified)))))));
|
|
88
88
|
default:
|
|
@@ -72,12 +72,30 @@ class FileSystemWatcher {
|
|
|
72
72
|
if (typeof globPattern === 'string') {
|
|
73
73
|
return disposable;
|
|
74
74
|
}
|
|
75
|
+
if (options?.ignoreChangeEvents && options?.ignoreCreateEvents && options?.ignoreDeleteEvents) {
|
|
76
|
+
return disposable;
|
|
77
|
+
}
|
|
75
78
|
const proxy = ( mainContext.getProxy(MainContext.MainThreadFileSystemEventService));
|
|
76
79
|
let recursive = false;
|
|
77
80
|
if (globPattern.pattern.includes(GLOBSTAR) || globPattern.pattern.includes(GLOB_SPLIT)) {
|
|
78
81
|
recursive = true;
|
|
79
82
|
}
|
|
80
|
-
|
|
83
|
+
let filter;
|
|
84
|
+
if (correlate) {
|
|
85
|
+
if (options?.ignoreChangeEvents || options?.ignoreCreateEvents || options?.ignoreDeleteEvents) {
|
|
86
|
+
filter = 2 | 4 | 8 ;
|
|
87
|
+
if (options?.ignoreChangeEvents) {
|
|
88
|
+
filter &= ~2 ;
|
|
89
|
+
}
|
|
90
|
+
if (options?.ignoreCreateEvents) {
|
|
91
|
+
filter &= ~4 ;
|
|
92
|
+
}
|
|
93
|
+
if (options?.ignoreDeleteEvents) {
|
|
94
|
+
filter &= ~8 ;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
proxy.$watch(extension.identifier.value, this.session, globPattern.baseUri, { recursive, excludes: options?.excludes ?? [], filter }, Boolean(correlate));
|
|
81
99
|
return Disposable.from({ dispose: () => proxy.$unwatch(this.session) });
|
|
82
100
|
}
|
|
83
101
|
dispose() {
|