@codingame/monaco-vscode-api 8.0.4 → 9.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 +9 -10
- package/debugProtocol.d.ts +69 -5
- package/extensions.d.ts +5 -3
- package/extensions.js +1 -1
- package/localExtensionHost.js +2 -2
- package/missing-services.js +19 -3
- package/package.json +9 -8
- package/service-override/extensions.d.ts +1 -1
- package/service-override/tools/editor.d.ts +4 -4
- package/service-override/tools/editor.js +7 -3
- package/services.js +2 -2
- package/tools.js +1 -1
- package/vscode/src/vs/base/browser/browser.js +4 -3
- package/vscode/src/vs/base/browser/defaultWorkerFactory.js +83 -13
- package/vscode/src/vs/base/browser/dom.js +6 -12
- package/vscode/src/vs/base/browser/markdownRenderer.js +57 -68
- package/vscode/src/vs/base/browser/ui/actionbar/actionViewItems.js +1 -1
- package/vscode/src/vs/base/browser/ui/actionbar/actionbar.d.ts +1 -1
- package/vscode/src/vs/base/browser/ui/actionbar/actionbar.js +3 -3
- package/vscode/src/vs/base/browser/ui/button/button.js +26 -1
- package/vscode/src/vs/base/browser/ui/dialog/dialog.css.js +1 -1
- package/vscode/src/vs/base/browser/ui/dialog/dialog.js +7 -7
- package/vscode/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.js +1 -1
- package/vscode/src/vs/base/browser/ui/findinput/findInput.js +1 -1
- package/vscode/src/vs/base/browser/ui/findinput/findInputToggles.js +3 -3
- package/vscode/src/vs/base/browser/ui/findinput/replaceInput.js +2 -2
- package/vscode/src/vs/base/browser/ui/hover/hover.d.ts +1 -0
- package/vscode/src/vs/base/browser/ui/hover/hoverDelegate.d.ts +7 -0
- package/vscode/src/vs/base/browser/ui/hover/hoverWidget.js +2 -2
- package/vscode/src/vs/base/browser/ui/iconLabel/iconLabel.js +8 -6
- package/vscode/src/vs/base/browser/ui/icons/iconSelectBox.js +2 -2
- package/vscode/src/vs/base/browser/ui/inputbox/inputBox.js +6 -6
- package/vscode/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.js +1 -1
- package/vscode/src/vs/base/browser/ui/list/listView.js +2 -2
- package/vscode/src/vs/base/browser/ui/menu/menubar.js +1 -1
- package/vscode/src/vs/base/browser/ui/selectBox/selectBoxCustom.js +1 -1
- package/vscode/src/vs/base/browser/ui/splitview/paneview.js +1 -1
- package/vscode/src/vs/base/browser/ui/table/tableWidget.js +8 -0
- package/vscode/src/vs/base/browser/ui/toolbar/toolbar.js +1 -1
- package/vscode/src/vs/base/browser/ui/tree/abstractTree.js +11 -6
- package/vscode/src/vs/base/browser/ui/tree/treeDefaults.js +1 -1
- package/vscode/src/vs/base/common/actions.js +1 -1
- package/vscode/src/vs/base/common/amd.js +119 -0
- package/vscode/src/vs/base/common/async.d.ts +13 -1
- package/vscode/src/vs/base/common/date.js +76 -60
- package/vscode/src/vs/base/common/errorMessage.js +6 -6
- package/vscode/src/vs/base/common/event.d.ts +6 -0
- package/vscode/src/vs/base/common/event.js +5 -0
- package/vscode/src/vs/base/common/jsonErrorMessages.js +9 -9
- package/vscode/src/vs/base/common/keybindingLabels.js +20 -20
- package/vscode/src/vs/base/common/network.js +15 -13
- package/vscode/src/vs/base/common/performance.js +1 -1
- package/vscode/src/vs/base/common/platform.js +3 -1
- package/vscode/src/vs/base/common/product.d.ts +0 -1
- package/vscode/src/vs/base/common/worker/simpleWorker.js +136 -127
- package/vscode/src/vs/editor/browser/controller/mouseHandler.js +18 -66
- package/vscode/src/vs/editor/browser/controller/mouseTarget.js +5 -18
- package/vscode/src/vs/editor/browser/controller/pointerHandler.js +3 -3
- package/vscode/src/vs/editor/browser/controller/textAreaHandler.js +5 -5
- package/vscode/src/vs/editor/browser/coreCommands.js +3 -3
- package/vscode/src/vs/editor/browser/editorExtensions.js +6 -6
- package/vscode/src/vs/editor/browser/services/editorWorkerService.js +115 -221
- package/vscode/src/vs/editor/browser/services/hoverService/hoverWidget.js +2 -2
- package/vscode/src/vs/editor/browser/services/hoverService/updatableHoverWidget.js +5 -2
- package/vscode/src/vs/editor/browser/view/viewLayer.js +20 -20
- package/vscode/src/vs/editor/browser/view/viewOverlays.js +5 -6
- package/vscode/src/vs/editor/browser/view.js +1 -3
- package/vscode/src/vs/editor/browser/viewParts/lines/viewLines.js +10 -14
- package/vscode/src/vs/editor/browser/viewParts/minimap/minimap.js +3 -1
- package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.js +4 -3
- package/vscode/src/vs/editor/browser/widget/diffEditor/commands.js +12 -12
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer.js +14 -14
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.js +1 -1
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.js +3 -1
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin.js +7 -7
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditor.contribution.js +5 -5
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.js +7 -7
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.js +4 -4
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.js +2 -2
- package/vscode/src/vs/editor/browser/widget/diffEditor/registrations.contribution.js +5 -5
- package/vscode/src/vs/editor/browser/widget/diffEditor/utils/editorGutter.js +3 -3
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/colors.js +4 -4
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.js +15 -5
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js +1 -1
- package/vscode/src/vs/editor/common/config/editorConfigurationSchema.js +59 -50
- package/vscode/src/vs/editor/common/config/editorOptions.js +1 -1
- package/vscode/src/vs/editor/common/core/editorColorRegistry.js +71 -71
- package/vscode/src/vs/editor/common/cursor/cursor.js +1 -1
- package/vscode/src/vs/editor/common/cursor/cursorTypeEditOperations.js +1 -1
- package/vscode/src/vs/editor/common/editorContextKeys.js +47 -47
- package/vscode/src/vs/editor/common/languages/modesRegistry.js +1 -1
- package/vscode/src/vs/editor/common/languages.js +29 -28
- package/vscode/src/vs/editor/common/model/editStack.js +1 -1
- package/vscode/src/vs/editor/common/model/textModel.js +8 -39
- package/vscode/src/vs/editor/common/model/tokenizationTextModelPart.js +84 -74
- package/vscode/src/vs/editor/common/model/tokens.js +82 -0
- package/vscode/src/vs/editor/common/model/treeSitterTokens.js +69 -0
- package/vscode/src/vs/editor/common/model.d.ts +2 -0
- package/vscode/src/vs/editor/common/services/editorSimpleWorker.js +39 -241
- package/vscode/src/vs/editor/common/services/editorWorker.d.ts +3 -2
- package/vscode/src/vs/editor/common/services/editorWorkerBootstrap.js +27 -0
- package/vscode/src/vs/editor/common/services/editorWorkerHost.js +10 -0
- package/vscode/src/vs/editor/common/services/getIconClasses.js +1 -1
- package/vscode/src/vs/editor/common/services/languageService.js +10 -37
- package/vscode/src/vs/editor/common/services/modelService.js +6 -17
- package/vscode/src/vs/editor/common/services/textModelSync/textModelSync.impl.js +323 -0
- package/vscode/src/vs/editor/common/services/treeSitterParserService.js +3 -0
- package/vscode/src/vs/editor/common/standaloneStrings.js +57 -28
- package/vscode/src/vs/editor/common/viewLayout/viewLineRenderer.js +2 -2
- package/vscode/src/vs/editor/contrib/anchorSelect/browser/anchorSelect.js +6 -6
- package/vscode/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.js +6 -6
- package/vscode/src/vs/editor/contrib/caretOperations/browser/caretOperations.js +2 -2
- package/vscode/src/vs/editor/contrib/caretOperations/browser/transpose.js +1 -1
- package/vscode/src/vs/editor/contrib/clipboard/browser/clipboard.js +17 -17
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeAction.js +1 -1
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionCommands.js +28 -28
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionContributions.js +3 -3
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionController.js +14 -6
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionMenu.js +8 -8
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionModel.js +14 -1
- package/vscode/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.js +41 -29
- package/vscode/src/vs/editor/contrib/codelens/browser/codelensController.js +2 -2
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorContributions.js +2 -2
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorHoverParticipant.js +1 -1
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.js +2 -2
- package/vscode/src/vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider.js +13 -13
- package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerActions.js +7 -7
- package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerWidget.js +10 -30
- package/vscode/src/vs/editor/contrib/comment/browser/comment.js +6 -6
- package/vscode/src/vs/editor/contrib/contextmenu/browser/contextmenu.js +10 -10
- package/vscode/src/vs/editor/contrib/cursorUndo/browser/cursorUndo.js +2 -2
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteContribution.js +3 -3
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.js +12 -15
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/defaultProviders.js +8 -8
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorContribution.js +1 -1
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js +3 -3
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.js +2 -2
- package/vscode/src/vs/editor/contrib/editorState/browser/keybindingCancellation.js +1 -1
- package/vscode/src/vs/editor/contrib/find/browser/findController.js +26 -25
- package/vscode/src/vs/editor/contrib/find/browser/findWidget.js +27 -27
- package/vscode/src/vs/editor/contrib/folding/browser/folding.d.ts +4 -1
- package/vscode/src/vs/editor/contrib/folding/browser/folding.js +20 -3
- package/vscode/src/vs/editor/contrib/folding/browser/foldingDecorations.js +9 -9
- package/vscode/src/vs/editor/contrib/folding/browser/foldingModel.d.ts +2 -1
- package/vscode/src/vs/editor/contrib/folding/browser/foldingModel.js +5 -13
- package/vscode/src/vs/editor/contrib/folding/browser/foldingRanges.d.ts +3 -1
- package/vscode/src/vs/editor/contrib/folding/browser/foldingRanges.js +2 -2
- package/vscode/src/vs/editor/contrib/fontZoom/browser/fontZoom.js +3 -3
- package/vscode/src/vs/editor/contrib/format/browser/formatActions.js +2 -2
- package/vscode/src/vs/editor/contrib/gotoError/browser/gotoError.js +8 -8
- package/vscode/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.js +14 -14
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.js +39 -39
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToSymbol.js +1 -1
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.js +1 -1
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.js +9 -4
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesTree.js +3 -3
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.js +10 -14
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/referencesModel.js +8 -8
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/symbolNavigation.js +3 -3
- package/vscode/src/vs/editor/contrib/hover/browser/{hoverController.js → contentHoverController2.js} +26 -84
- package/vscode/src/vs/editor/contrib/hover/browser/contentHoverRendered.js +3 -3
- package/vscode/src/vs/editor/contrib/hover/browser/{contentHoverController.js → contentHoverWidgetWrapper.js} +20 -5
- package/vscode/src/vs/editor/contrib/hover/browser/hoverAccessibleViews.js +5 -5
- package/vscode/src/vs/editor/contrib/hover/browser/hoverActionIds.js +2 -2
- package/vscode/src/vs/editor/contrib/hover/browser/hoverActions.js +37 -37
- package/vscode/src/vs/editor/contrib/hover/browser/hoverContribution.js +4 -2
- package/vscode/src/vs/editor/contrib/hover/browser/hoverUtils.js +12 -0
- package/vscode/src/vs/editor/contrib/hover/browser/marginHoverController.js +166 -0
- package/vscode/src/vs/editor/contrib/hover/browser/marginHoverWidget.js +24 -4
- package/vscode/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.js +9 -9
- package/vscode/src/vs/editor/contrib/hover/browser/markerHoverParticipant.js +7 -6
- package/vscode/src/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace.js +2 -2
- package/vscode/src/vs/editor/contrib/indentation/browser/indentation.js +20 -20
- package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.js +8 -8
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{commands.js → controller/commands.js} +26 -26
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{inlineCompletionContextKeys.js → controller/inlineCompletionContextKeys.js} +14 -14
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{inlineCompletionsController.js → controller/inlineCompletionsController.js} +35 -35
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{hoverParticipant.js → hintsWidget/hoverParticipant.js} +23 -23
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{inlineCompletionsHintsWidget.css.js → hintsWidget/inlineCompletionsHintsWidget.css.js} +1 -1
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{inlineCompletionsHintsWidget.js → hintsWidget/inlineCompletionsHintsWidget.js} +38 -38
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.js +3 -3
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.js +2 -2
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{ghostText.js → model/ghostText.js} +5 -5
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{inlineCompletionsModel.js → model/inlineCompletionsModel.js} +27 -27
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{inlineCompletionsSource.js → model/inlineCompletionsSource.js} +16 -16
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{provideInlineCompletions.js → model/provideInlineCompletions.js} +11 -11
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{singleTextEdit.js → model/singleTextEdit.js} +6 -6
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{suggestWidgetInlineCompletionProvider.js → model/suggestWidgetAdaptor.js} +11 -11
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{ghostText.css.js → view/ghostTextView.css.js} +1 -1
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{ghostTextWidget.js → view/ghostTextView.js} +29 -29
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/ghostTextWidget.js +1 -1
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEditController.js +1 -1
- package/vscode/src/vs/editor/contrib/inlineEdits/browser/commands.js +6 -6
- package/vscode/src/vs/editor/contrib/inlineEdits/browser/consts.js +2 -2
- package/vscode/src/vs/editor/contrib/inlineEdits/browser/inlineEditsModel.js +1 -1
- package/vscode/src/vs/editor/contrib/lineSelection/browser/lineSelection.js +1 -1
- package/vscode/src/vs/editor/contrib/linesOperations/browser/linesOperations.js +30 -30
- package/vscode/src/vs/editor/contrib/linkedEditing/browser/linkedEditing.js +2 -2
- package/vscode/src/vs/editor/contrib/links/browser/links.js +10 -10
- package/vscode/src/vs/editor/contrib/message/browser/messageController.js +1 -1
- package/vscode/src/vs/editor/contrib/multicursor/browser/multicursor.js +22 -22
- package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHints.js +1 -1
- package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.js +4 -4
- package/vscode/src/vs/editor/contrib/peekView/browser/peekView.js +17 -17
- package/vscode/src/vs/editor/contrib/placeholderText/browser/placeholderText.contribution.js +1 -1
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.js +5 -5
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js +32 -32
- package/vscode/src/vs/editor/contrib/readOnlyMessage/browser/contribution.js +2 -2
- package/vscode/src/vs/editor/contrib/rename/browser/rename.js +11 -11
- package/vscode/src/vs/editor/contrib/rename/browser/renameWidget.js +6 -8
- package/vscode/src/vs/editor/contrib/smartSelect/browser/smartSelect.js +4 -4
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetController2.js +4 -4
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetVariables.js +4 -4
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.js +11 -11
- package/vscode/src/vs/editor/contrib/suggest/browser/suggest.js +8 -8
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestController.js +28 -13
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestModel.js +6 -3
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidget.js +16 -16
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.js +2 -2
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.js +2 -2
- package/vscode/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.js +33 -33
- package/vscode/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.js +4 -4
- package/vscode/src/vs/editor/contrib/tokenization/browser/tokenization.js +1 -1
- package/vscode/src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.js +24 -24
- package/vscode/src/vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators.js +5 -5
- package/vscode/src/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.js +9 -9
- package/vscode/src/vs/editor/contrib/wordHighlighter/browser/textualHighlightProvider.js +64 -0
- package/vscode/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.js +62 -89
- package/vscode/src/vs/editor/contrib/wordOperations/browser/wordOperations.js +1 -1
- package/vscode/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.js +3 -3
- package/vscode/src/vs/editor/standalone/browser/standaloneCodeEditor.js +0 -1
- package/vscode/src/vs/editor/standalone/browser/standaloneServices.d.ts +1 -1
- package/vscode/src/vs/editor/standalone/browser/standaloneServices.js +24 -3
- package/vscode/src/vs/editor/standalone/browser/standaloneTreeSitterService.js +13 -0
- package/vscode/src/vs/nls.js +4 -3
- package/vscode/src/vs/nls.messages.js +7 -0
- package/vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.js +49 -49
- package/vscode/src/vs/platform/action/common/actionCommonCategories.js +6 -6
- package/vscode/src/vs/platform/actionWidget/browser/actionList.js +4 -4
- package/vscode/src/vs/platform/actionWidget/browser/actionWidget.css.js +1 -1
- package/vscode/src/vs/platform/actionWidget/browser/actionWidget.js +7 -7
- package/vscode/src/vs/platform/actions/browser/buttonbar.js +8 -7
- package/vscode/src/vs/platform/actions/browser/menuEntryActionViewItem.js +5 -5
- package/vscode/src/vs/platform/actions/browser/toolbar.js +2 -2
- package/vscode/src/vs/platform/actions/common/actions.d.ts +2 -0
- package/vscode/src/vs/platform/actions/common/actions.js +2 -0
- package/vscode/src/vs/platform/actions/common/menuResetAction.js +1 -1
- package/vscode/src/vs/platform/actions/common/menuService.js +17 -7
- package/vscode/src/vs/platform/clipboard/browser/clipboardService.js +45 -5
- package/vscode/src/vs/platform/clipboard/common/clipboardService.service.d.ts +6 -0
- package/vscode/src/vs/platform/contextkey/browser/contextKeyService.js +1 -1
- package/vscode/src/vs/platform/contextkey/common/contextkey.js +11 -11
- package/vscode/src/vs/platform/contextkey/common/contextkeys.js +9 -9
- package/vscode/src/vs/platform/contextkey/common/scanner.js +5 -5
- package/vscode/src/vs/platform/dialogs/common/dialogs.js +9 -9
- package/vscode/src/vs/platform/dnd/browser/dnd.js +1 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionEnablementService.js +4 -4
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.js +3 -2
- package/vscode/src/vs/platform/extensionManagement/common/extensionNls.js +1 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionStorage.js +1 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionsScannerService.js +7 -7
- package/vscode/src/vs/platform/extensions/common/extensionValidator.js +19 -27
- package/vscode/src/vs/platform/extensions/common/extensionsApiProposals.js +16 -10
- package/vscode/src/vs/platform/files/browser/htmlFileSystemProvider.js +2 -2
- package/vscode/src/vs/platform/history/browser/contextScopedHistoryWidget.js +1 -1
- package/vscode/src/vs/platform/keybinding/common/abstractKeybindingService.js +4 -4
- package/vscode/src/vs/platform/languagePacks/common/languagePacks.js +1 -1
- package/vscode/src/vs/platform/languagePacks/common/localizedStrings.js +3 -3
- package/vscode/src/vs/platform/list/browser/listService.js +27 -27
- package/vscode/src/vs/platform/markers/common/markerService.js +0 -1
- package/vscode/src/vs/platform/markers/common/markers.js +3 -3
- package/vscode/src/vs/platform/quickinput/browser/quickAccess.js +1 -1
- package/vscode/src/vs/platform/quickinput/browser/quickInput.js +8 -8
- package/vscode/src/vs/platform/quickinput/browser/quickInputActions.js +3 -3
- package/vscode/src/vs/platform/quickinput/browser/quickInputController.js +11 -8
- package/vscode/src/vs/platform/quickinput/browser/quickInputService.js +3 -3
- package/vscode/src/vs/platform/quickinput/browser/quickInputTree.js +43 -35
- package/vscode/src/vs/platform/quickinput/browser/quickInputUtils.js +1 -1
- package/vscode/src/vs/platform/quickinput/browser/quickPickPin.js +10 -7
- package/vscode/src/vs/platform/quickinput/common/quickInput.d.ts +12 -2
- package/vscode/src/vs/platform/quickinput/common/quickInput.service.d.ts +10 -1
- package/vscode/src/vs/platform/request/common/request.js +14 -14
- package/vscode/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.d.ts +19 -4
- package/vscode/src/vs/platform/terminal/common/terminal.d.ts +11 -8
- package/vscode/src/vs/platform/terminal/common/terminal.js +9 -5
- package/vscode/src/vs/platform/theme/common/colorUtils.js +4 -3
- package/vscode/src/vs/platform/theme/common/colors/baseColors.js +17 -17
- package/vscode/src/vs/platform/theme/common/colors/chartsColors.js +8 -8
- package/vscode/src/vs/platform/theme/common/colors/editorColors.js +94 -94
- package/vscode/src/vs/platform/theme/common/colors/inputColors.js +45 -45
- package/vscode/src/vs/platform/theme/common/colors/listColors.js +37 -33
- package/vscode/src/vs/platform/theme/common/colors/menuColors.js +7 -7
- package/vscode/src/vs/platform/theme/common/colors/minimapColors.js +11 -11
- package/vscode/src/vs/platform/theme/common/colors/miscColors.js +8 -8
- package/vscode/src/vs/platform/theme/common/colors/quickpickColors.js +9 -9
- package/vscode/src/vs/platform/theme/common/colors/searchColors.js +3 -3
- package/vscode/src/vs/platform/theme/common/iconRegistry.js +5 -5
- package/vscode/src/vs/platform/theme/common/tokenClassificationRegistry.js +42 -42
- package/vscode/src/vs/platform/undoRedo/common/undoRedoService.js +20 -20
- package/vscode/src/vs/platform/userDataProfile/common/userDataProfile.js +1 -1
- package/vscode/src/vs/platform/userDataSync/common/abstractSynchronizer.js +2 -2
- package/vscode/src/vs/platform/userDataSync/common/userDataSync.js +5 -5
- package/vscode/src/vs/platform/userDataSync/common/userDataSyncMachines.js +1 -1
- package/vscode/src/vs/platform/window/common/window.js +16 -1
- package/vscode/src/vs/platform/workspace/common/workspace.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHost.api.impl.js +20 -73
- package/vscode/src/vs/workbench/api/common/extHostChatAgents2.js +98 -52
- package/vscode/src/vs/workbench/api/common/extHostComments.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostDiagnostics.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostExtensionService.js +4 -4
- package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js +5 -5
- package/vscode/src/vs/workbench/api/common/extHostLanguageModelTools.js +55 -13
- package/vscode/src/vs/workbench/api/common/extHostLanguageModels.js +6 -6
- package/vscode/src/vs/workbench/api/common/extHostLogService.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostNotebook.js +11 -11
- package/vscode/src/vs/workbench/api/common/extHostSearch.js +48 -5
- package/vscode/src/vs/workbench/api/common/extHostStatusBar.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostTask.js +2 -1
- package/vscode/src/vs/workbench/api/common/extHostTelemetry.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostTerminalService.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostTesting.js +22 -9
- package/vscode/src/vs/workbench/api/common/extHostTreeViews.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostTunnelService.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js +147 -48
- package/vscode/src/vs/workbench/api/common/extHostTypes.js +17 -10
- package/vscode/src/vs/workbench/api/common/extHostWorkspace.js +231 -81
- package/vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js +12 -12
- package/vscode/src/vs/workbench/api/worker/extensionHostWorker.esm.js +3 -0
- package/vscode/src/vs/workbench/browser/actions/developerActions.js +31 -31
- package/vscode/src/vs/workbench/browser/actions/layoutActions.js +154 -148
- package/vscode/src/vs/workbench/browser/actions/textInputActions.js +6 -6
- package/vscode/src/vs/workbench/browser/actions/windowActions.js +25 -25
- package/vscode/src/vs/workbench/browser/actions/workspaceActions.js +21 -21
- package/vscode/src/vs/workbench/browser/actions/workspaceCommands.js +4 -4
- package/vscode/src/vs/workbench/browser/editor.js +2 -2
- package/vscode/src/vs/workbench/browser/labels.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.js +11 -11
- package/vscode/src/vs/workbench/browser/parts/compositeBarActions.js +11 -11
- package/vscode/src/vs/workbench/browser/parts/editor/binaryDiffEditor.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/binaryEditor.js +3 -3
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbs.js +41 -41
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsControl.js +11 -11
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/diffEditorCommands.js +6 -6
- package/vscode/src/vs/workbench/browser/parts/editor/editorActions.js +131 -131
- package/vscode/src/vs/workbench/browser/parts/editor/editorAutoSave.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/editor/editorCommands.js +16 -16
- package/vscode/src/vs/workbench/browser/parts/editor/editorGroupWatermark.js +13 -13
- package/vscode/src/vs/workbench/browser/parts/editor/editorPanes.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/editor/editorPlaceholder.js +9 -9
- package/vscode/src/vs/workbench/browser/parts/editor/editorQuickAccess.js +5 -5
- package/vscode/src/vs/workbench/browser/parts/editor/editorStatus.js +74 -72
- package/vscode/src/vs/workbench/browser/parts/editor/editorTabsControl.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/multiRowEditorTabsControl.js +19 -9
- package/vscode/src/vs/workbench/browser/parts/editor/sideBySideEditor.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/textCodeEditor.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/textDiffEditor.js +3 -3
- package/vscode/src/vs/workbench/browser/parts/editor/textEditor.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/globalCompositeBar.js +15 -15
- package/vscode/src/vs/workbench/browser/parts/notifications/media/notificationsCenter.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/notifications/media/notificationsList.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/notifications/media/notificationsToasts.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsActions.js +17 -17
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsAlerts.js +3 -3
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCenter.js +6 -6
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCommands.js +9 -9
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsList.js +6 -6
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsStatus.js +13 -13
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsToasts.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsViewer.js +4 -4
- package/vscode/src/vs/workbench/browser/parts/panel/panelActions.js +34 -34
- package/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.js +18 -18
- package/vscode/src/vs/workbench/browser/parts/titlebar/windowTitle.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/views/checkbox.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/views/treeView.js +7 -7
- package/vscode/src/vs/workbench/browser/parts/views/viewFilter.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/views/viewPane.js +4 -4
- package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js +9 -6
- package/vscode/src/vs/workbench/browser/quickaccess.js +1 -1
- package/vscode/src/vs/workbench/browser/window.js +24 -17
- package/vscode/src/vs/workbench/browser/workbench.contribution.js +217 -217
- package/vscode/src/vs/workbench/common/configuration.js +10 -10
- package/vscode/src/vs/workbench/common/contextkeys.js +70 -70
- package/vscode/src/vs/workbench/common/editor/diffEditorInput.js +1 -1
- package/vscode/src/vs/workbench/common/editor/sideBySideEditorInput.js +1 -1
- package/vscode/src/vs/workbench/common/editor/textEditorModel.js +1 -1
- package/vscode/src/vs/workbench/common/theme.js +156 -156
- package/vscode/src/vs/workbench/common/views.js +5 -5
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.js +178 -137
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.js +13 -13
- package/vscode/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.js +6 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatActions.js +88 -61
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.js +4 -4
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.js +9 -9
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.js +289 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chat.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatAccessibilityProvider.js +11 -11
- package/vscode/src/vs/workbench/contrib/chat/browser/chatAgentHover.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.js +8 -8
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCodeCitationContentPart.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCommandContentPart.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.js +3 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.js +15 -9
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTextEditContentPart.js +31 -74
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTextEditContentPart.service.js +3 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTreeContentPart.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/media/chatConfirmationWidget.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditorInput.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatFollowups.js +5 -12
- package/vscode/src/vs/workbench/contrib/chat/browser/chatInputPart.js +73 -60
- package/vscode/src/vs/workbench/contrib/chat/browser/chatListRenderer.js +139 -50
- package/vscode/src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.js +36 -19
- package/vscode/src/vs/workbench/contrib/chat/browser/chatMarkdownRenderer.js +26 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/chatWidget.js +39 -31
- package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockPart.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockPart.js +50 -37
- package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.js +7 -20
- package/vscode/src/vs/workbench/contrib/chat/browser/media/chat.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/common/chatAgents.js +62 -1
- package/vscode/src/vs/workbench/contrib/chat/common/chatColors.js +6 -6
- package/vscode/src/vs/workbench/contrib/chat/common/chatContextKeys.js +36 -17
- package/vscode/src/vs/workbench/contrib/chat/common/chatModel.js +105 -40
- package/vscode/src/vs/workbench/contrib/chat/common/chatParserTypes.js +35 -2
- package/vscode/src/vs/workbench/contrib/chat/common/chatRequestParser.js +12 -5
- package/vscode/src/vs/workbench/contrib/chat/common/chatService.js +13 -1
- package/vscode/src/vs/workbench/contrib/chat/common/chatViewModel.js +17 -21
- package/vscode/src/vs/workbench/contrib/chat/common/chatWordCounter.js +17 -1
- package/vscode/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.js +3 -0
- package/vscode/src/vs/workbench/contrib/chat/common/languageModels.js +6 -6
- package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js +15 -15
- package/vscode/src/vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint.js +10 -10
- package/vscode/src/vs/workbench/contrib/codeActions/common/documentationExtensionPoint.js +6 -6
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.js +4 -4
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorAccessibilityHelp.js +5 -5
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js +3 -3
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.js +10 -10
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.js +3 -3
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.js +6 -6
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.js +15 -6
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions.js +33 -1
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.js +13 -34
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.js +2 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.js +4 -4
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.js +2 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.js +2 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js +5 -5
- package/vscode/src/vs/workbench/contrib/comments/browser/commentColors.js +7 -7
- package/vscode/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.js +5 -5
- package/vscode/src/vs/workbench/contrib/comments/browser/commentNode.js +3 -3
- package/vscode/src/vs/workbench/contrib/comments/browser/commentReply.js +4 -4
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadBody.js +3 -3
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadHeader.js +18 -4
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadWidget.js +15 -4
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.js +0 -8
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsAccessibility.js +10 -10
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsController.js +7 -6
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsModel.js +13 -6
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.js +17 -13
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsView.js +64 -30
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsViewActions.js +85 -11
- package/vscode/src/vs/workbench/contrib/comments/browser/reactionsAction.js +7 -7
- package/vscode/src/vs/workbench/contrib/comments/browser/simpleCommentEditor.js +6 -4
- package/vscode/src/vs/workbench/contrib/comments/common/commentContextKeys.js +9 -9
- package/vscode/src/vs/workbench/contrib/comments/common/commentModel.js +30 -0
- package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInput.js +3 -3
- package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.js +15 -9
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.js +65 -60
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointWidget.js +21 -16
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointsView.js +75 -74
- package/vscode/src/vs/workbench/contrib/debug/browser/callStackEditorContribution.js +2 -2
- package/vscode/src/vs/workbench/contrib/debug/browser/debugColors.js +12 -12
- package/vscode/src/vs/workbench/contrib/debug/browser/debugCommands.js +45 -41
- package/vscode/src/vs/workbench/contrib/debug/browser/debugIcons.js +57 -57
- package/vscode/src/vs/workbench/contrib/debug/browser/debugSessionPicker.js +4 -4
- package/vscode/src/vs/workbench/contrib/debug/browser/linkDetector.js +260 -0
- package/vscode/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/common/debug.d.ts +9 -1
- package/vscode/src/vs/workbench/contrib/debug/common/debugModel.js +18 -11
- package/vscode/src/vs/workbench/contrib/debug/common/debugSource.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/common/debugUtils.js +3 -0
- package/vscode/src/vs/workbench/contrib/debug/common/disassemblyViewInput.js +2 -2
- package/vscode/src/vs/workbench/contrib/debug/common/loadedScriptsPicker.js +2 -2
- package/vscode/src/vs/workbench/contrib/debug/common/replModel.js +1 -1
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsIcons.js +24 -24
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.js +5 -5
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsInput.js +2 -2
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsUtils.js +3 -3
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/configuration.js +4 -4
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.js +4 -4
- package/vscode/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.js +1 -1
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditor.js +8 -8
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.js +20 -20
- package/vscode/src/vs/workbench/contrib/files/browser/explorerViewlet.js +14 -14
- package/vscode/src/vs/workbench/contrib/files/browser/fileActions.js +85 -85
- package/vscode/src/vs/workbench/contrib/files/browser/fileCommands._save.js +8 -8
- package/vscode/src/vs/workbench/contrib/files/browser/fileConstants.js +6 -6
- package/vscode/src/vs/workbench/contrib/files/browser/fileImportExport.js +33 -33
- package/vscode/src/vs/workbench/contrib/files/browser/files.contribution._configuration.js +52 -87
- package/vscode/src/vs/workbench/contrib/files/browser/files.contribution._editorPane.js +2 -2
- package/vscode/src/vs/workbench/contrib/files/browser/views/emptyView.js +1 -1
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.js +4 -4
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerView.js +7 -7
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.js +18 -14
- package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js +7 -7
- package/vscode/src/vs/workbench/contrib/files/browser/workspaceWatcher.js +4 -4
- package/vscode/src/vs/workbench/contrib/files/common/dirtyFilesIndicator.js +1 -1
- package/vscode/src/vs/workbench/contrib/files/common/files.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/files/common/files.js +14 -14
- package/vscode/src/vs/workbench/contrib/folding/browser/folding.contribution.js +3 -3
- package/vscode/src/vs/workbench/contrib/format/browser/formatActionsMultiple.js +20 -20
- package/vscode/src/vs/workbench/contrib/format/browser/formatActionsNone.js +4 -4
- package/vscode/src/vs/workbench/contrib/format/browser/formatModified.js +1 -1
- package/vscode/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.js +4 -4
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.js +73 -93
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatContentWidget.js +11 -18
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.js +234 -112
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.js +53 -138
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.js +33 -38
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.js +249 -117
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.js +85 -44
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.js +93 -41
- 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/common/inlineChat.js +63 -45
- package/vscode/src/vs/workbench/contrib/list/browser/list.contribution.js +3 -0
- package/vscode/src/vs/workbench/contrib/list/browser/listResizeColumnAction.js +27 -0
- package/vscode/src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.js +54 -0
- package/vscode/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.js +95 -25
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js +1 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js +29 -29
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js +2 -2
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.js +269 -0
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/fixedZoneWidget.js +40 -0
- package/vscode/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.js +8 -8
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/icons.contribution.js +1 -1
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.js +58 -6
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.js +2 -1
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.js +6 -6
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.js +17 -17
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.js +12 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOutputActions.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext.js +5 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.js +2 -2
- 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/diff/diffCellEditorOptions.js +49 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.js +1515 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.js +266 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.js +630 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffNestedCellViewModel.js +113 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/eventDispatcher.js +37 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiff.css.js +4 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.js +729 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.js +28 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.js +445 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.js +184 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel.js +454 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor.js +256 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditorInput.js +45 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/media/notebook.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityProvider.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookBrowser.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditor.js +9 -9
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.js +62 -43
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookIcons.js +29 -29
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellExecution.js +29 -7
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellOutput.js +13 -12
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.js +53 -14
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellExecutionIcon.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/foldedCellHint.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/notebookCellEditorPool.js +114 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.js +0 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/notebookCellListView.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.js +16 -9
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.js +32 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/foldingModel.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.js +14 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookHorizontalTracker.js +47 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.js +35 -30
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.js +4 -0
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookCommon.js +2 -3
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookDiffEditorInput.js +105 -0
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorInput.js +9 -3
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorModel.js +11 -18
- package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingWidgets.js +3 -3
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesIcons.js +12 -12
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.js +18 -17
- package/vscode/src/vs/workbench/contrib/preferences/browser/settingsLayout.js +54 -49
- package/vscode/src/vs/workbench/contrib/preferences/common/settingsEditorColorRegistry.js +21 -21
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.js +15 -15
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteIcons.js +17 -17
- package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.js +60 -60
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.js +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js +23 -23
- package/vscode/src/vs/workbench/contrib/scm/common/scm.js +2 -1
- package/vscode/src/vs/workbench/contrib/search/browser/anythingQuickAccess.js +10 -10
- package/vscode/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService.js +4 -5
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsBase.js +1 -1
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsFind.js +10 -10
- package/vscode/src/vs/workbench/contrib/search/browser/searchModel.js +14 -33
- package/vscode/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.js +2 -2
- package/vscode/src/vs/workbench/contrib/snippets/browser/commands/abstractSnippetsActions.js +1 -1
- package/vscode/src/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets.js +2 -2
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.js +3 -3
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsFile.js +3 -3
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsService.js +9 -9
- package/vscode/src/vs/workbench/contrib/speech/common/speechService.js +29 -29
- package/vscode/src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.js +5 -5
- package/vscode/src/vs/workbench/contrib/tasks/common/taskService.js +5 -5
- package/vscode/src/vs/workbench/contrib/tasks/common/tasks.js +3 -3
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.d.ts +18 -1
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.js +4 -4
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalMenus.js +32 -32
- package/vscode/src/vs/workbench/contrib/terminal/common/terminal.d.ts +3 -0
- package/vscode/src/vs/workbench/contrib/terminal/common/terminal.js +7 -7
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.js +23 -23
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalContextKey.js +16 -16
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalStrings.js +28 -28
- package/vscode/src/vs/workbench/contrib/testing/common/constants.js +11 -11
- package/vscode/src/vs/workbench/contrib/testing/common/testResult.js +8 -4
- package/vscode/src/vs/workbench/contrib/testing/common/testTypes.d.ts +2 -1
- package/vscode/src/vs/workbench/contrib/url/browser/trustedDomains.js +6 -6
- package/vscode/src/vs/workbench/contrib/webview/browser/webview.contribution.js +3 -3
- package/vscode/src/vs/workbench/contrib/webview/browser/webviewWindowDragMonitor.js +21 -2
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.js +1 -1
- package/vscode/src/vs/workbench/contrib/workspace/common/workspace.js +2 -2
- package/vscode/src/vs/workbench/services/authentication/browser/authenticationService.js +3 -3
- package/vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js +7 -7
- package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolver.js +2 -1
- package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverSchema.js +16 -16
- package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverUtils.js +1 -1
- package/vscode/src/vs/workbench/services/configurationResolver/common/variableResolver.js +15 -15
- package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.d.ts +6 -8
- package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.service.d.ts +10 -3
- package/vscode/src/vs/workbench/services/editor/common/editorResolverService.js +1 -1
- package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.js +1 -1
- package/vscode/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.js +6 -6
- package/vscode/src/vs/workbench/services/extensions/common/abstractExtensionService.d.ts +2 -2
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostManagers.d.ts +1 -0
- package/vscode/src/vs/workbench/services/extensions/common/extensions.d.ts +5 -0
- package/vscode/src/vs/workbench/services/extensions/common/extensionsRegistry.js +83 -83
- package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.js +5 -5
- package/vscode/src/vs/workbench/services/language/common/languageService.js +28 -28
- package/vscode/src/vs/workbench/services/lifecycle/common/lifecycleService.js +3 -3
- package/vscode/src/vs/workbench/services/output/common/output.js +1 -2
- package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorInput.js +2 -2
- package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.js +7 -7
- package/vscode/src/vs/workbench/services/preferences/common/preferencesEditorInput.js +2 -2
- package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.js +8 -8
- package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js +5 -5
- package/vscode/src/vs/workbench/services/search/common/fileSearchManager.js +62 -30
- package/vscode/src/vs/workbench/services/search/common/queryBuilder.js +42 -12
- package/vscode/src/vs/workbench/services/search/common/search.js +69 -34
- package/vscode/src/vs/workbench/services/search/common/searchExtConversionTypes.js +144 -0
- package/vscode/src/vs/workbench/services/search/common/searchExtTypes.js +9 -29
- package/vscode/src/vs/workbench/services/search/common/searchHelpers.js +7 -7
- package/vscode/src/vs/workbench/services/search/common/textSearchManager.js +77 -93
- package/vscode/src/vs/workbench/services/textMate/common/TMGrammars.js +9 -9
- package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModel.js +7 -4
- package/vscode/src/vs/workbench/services/themes/common/colorExtensionPoint.js +22 -22
- package/vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js +13 -13
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfile.js +8 -9
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfileIcons.js +1 -1
- package/vscode/src/vs/workbench/services/userDataSync/common/userDataSync.js +11 -11
- package/vscode/src/vs/workbench/services/views/browser/viewsService.js +7 -7
- package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.js +20 -17
- package/vscode-dts/vscode.proposed.aiTextSearchProviderNew.d.ts +1 -85
- package/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts +42 -13
- package/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts +5 -0
- package/vscode-dts/vscode.proposed.chatProvider.d.ts +1 -1
- package/vscode-dts/vscode.proposed.chatVariableResolver.d.ts +0 -17
- package/vscode-dts/vscode.proposed.contribChatParticipantDetection.d.ts +6 -0
- package/vscode-dts/vscode.proposed.contribDebugCreateConfiguration.d.ts +6 -0
- package/vscode-dts/vscode.proposed.contribSourceControlHistoryTitleMenu.d.ts +7 -0
- package/vscode-dts/vscode.proposed.contribViewContainerTitle.d.ts +8 -0
- package/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts +6 -3
- package/vscode-dts/vscode.proposed.extensionsAny.d.ts +1 -0
- package/vscode-dts/vscode.proposed.fileSearchProviderNew.d.ts +7 -6
- package/vscode-dts/vscode.proposed.findFiles2New.d.ts +36 -11
- package/vscode-dts/vscode.proposed.findTextInFilesNew.d.ts +51 -30
- package/vscode-dts/vscode.proposed.interactive.d.ts +0 -2
- package/vscode-dts/vscode.proposed.lmTools.d.ts +119 -20
- package/vscode-dts/vscode.proposed.notebookReplDocument.d.ts +20 -0
- package/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts +1 -0
- package/vscode-dts/vscode.proposed.testObserver.d.ts +6 -0
- package/vscode-dts/vscode.proposed.textSearchCompleteNew.d.ts +1 -9
- package/vscode-dts/vscode.proposed.textSearchProviderNew.d.ts +58 -17
- package/workers/editor.worker.js +1 -1
- package/workers/extensionHost.worker.js +1 -3
- package/external/vscode-marked/lib/marked.esm.js +0 -2199
- package/vscode/src/vs/editor/browser/services/webWorker.js +0 -57
- package/vscode/src/vs/editor/editor.worker.js +0 -21
- package/vscode-dts/vscode.proposed.authGetSessions.d.ts +0 -70
- package/vscode-dts/vscode.proposed.terminalShellIntegration.d.ts +0 -338
- package/vscode-dts/vscode.proposed.testMessageStackTrace.d.ts +0 -38
- /package/vscode/src/vs/editor/contrib/inlineCompletions/browser/{commandIds.js → controller/commandIds.js} +0 -0
|
@@ -0,0 +1,729 @@
|
|
|
1
|
+
import { __decorate, __param } from '../../../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
+
import { localize } from '../../../../../nls.js';
|
|
3
|
+
import { append, $ as $$1, addStandardDisposableGenericMouseDownListener, addStandardDisposableGenericMouseUpListener, scheduleAtNextAnimationFrame } from '../../../../../base/browser/dom.js';
|
|
4
|
+
import { findLastIdx } from '../../../../../base/common/arraysFind.js';
|
|
5
|
+
import { IStorageService } from '../../../../../platform/storage/common/storage.service.js';
|
|
6
|
+
import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.service.js';
|
|
7
|
+
import { registerThemingParticipant } from '../../../../../platform/theme/common/themeService.js';
|
|
8
|
+
import { IThemeService } from '../../../../../platform/theme/common/themeService.service.js';
|
|
9
|
+
import { EditorPaneSelectionChangeReason, EditorPaneSelectionCompareResult } from '../../../../common/editor.js';
|
|
10
|
+
import { getDefaultNotebookCreationOptions } from '../notebookEditorWidget.js';
|
|
11
|
+
import { CancellationTokenSource } from '../../../../../base/common/cancellation.js';
|
|
12
|
+
import { SideBySideDiffElementViewModel } from './diffElementViewModel.js';
|
|
13
|
+
import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
|
|
14
|
+
import { CellDiffSingleSideRenderer, CellDiffSideBySideRenderer, CellDiffPlaceholderRenderer, NotebookTextDiffList, NotebookCellTextDiffListDelegate } from './notebookDiffList.js';
|
|
15
|
+
import { IContextKeyService } from '../../../../../platform/contextkey/common/contextkey.service.js';
|
|
16
|
+
import '../../../../../platform/theme/common/colorUtils.js';
|
|
17
|
+
import { foreground, focusBorder } from '../../../../../platform/theme/common/colors/baseColors.js';
|
|
18
|
+
import '../../../../../platform/theme/common/colors/chartsColors.js';
|
|
19
|
+
import { editorBackground, diffDiagonalFill } from '../../../../../platform/theme/common/colors/editorColors.js';
|
|
20
|
+
import '../../../../../platform/theme/common/colors/inputColors.js';
|
|
21
|
+
import '../../../../../platform/theme/common/colors/listColors.js';
|
|
22
|
+
import '../../../../../platform/theme/common/colors/menuColors.js';
|
|
23
|
+
import '../../../../../platform/theme/common/colors/minimapColors.js';
|
|
24
|
+
import '../../../../../platform/theme/common/colors/miscColors.js';
|
|
25
|
+
import '../../../../../platform/theme/common/colors/quickpickColors.js';
|
|
26
|
+
import '../../../../../platform/theme/common/colors/searchColors.js';
|
|
27
|
+
import { INotebookEditorWorkerService } from '../../common/services/notebookWorkerService.service.js';
|
|
28
|
+
import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.service.js';
|
|
29
|
+
import { BareFontInfo } from '../../../../../editor/common/config/fontInfo.js';
|
|
30
|
+
import { PixelRatio } from '../../../../../base/browser/pixelRatio.js';
|
|
31
|
+
import { DiffSide, DIFF_CELL_MARGIN } from './notebookDiffEditorBrowser.js';
|
|
32
|
+
import { Emitter, Event } from '../../../../../base/common/event.js';
|
|
33
|
+
import { DisposableStore, toDisposable } from '../../../../../base/common/lifecycle.js';
|
|
34
|
+
import { EditorPane } from '../../../../browser/parts/editor/editorPane.js';
|
|
35
|
+
import { NOTEBOOK_DIFF_EDITOR_ID, NotebookSetting, CellUri } from '../../common/notebookCommon.js';
|
|
36
|
+
import { SequencerByKey } from '../../../../../base/common/async.js';
|
|
37
|
+
import { generateUuid } from '../../../../../base/common/uuid.js';
|
|
38
|
+
import { BackLayerWebView } from '../view/renderers/backLayerWebView.js';
|
|
39
|
+
import { NotebookDiffEditorEventDispatcher, NotebookDiffLayoutChangedEvent } from './eventDispatcher.js';
|
|
40
|
+
import { FontMeasurements } from '../../../../../editor/browser/config/fontMeasurements.js';
|
|
41
|
+
import { NotebookOptions } from '../notebookOptions.js';
|
|
42
|
+
import { cellRangesToIndexes, cellIndexesToRanges } from '../../common/notebookRange.js';
|
|
43
|
+
import { NotebookDiffOverviewRuler } from './notebookDiffOverviewRuler.js';
|
|
44
|
+
import { registerZIndex, ZIndex } from '../../../../../platform/layout/browser/zIndexRegistry.js';
|
|
45
|
+
import { NotebookDiffViewModel } from './notebookDiffViewModel.js';
|
|
46
|
+
import { INotebookService } from '../../common/notebookService.service.js';
|
|
47
|
+
var NotebookTextDiffEditor_1;
|
|
48
|
+
const $ = $$1;
|
|
49
|
+
class NotebookDiffEditorSelection {
|
|
50
|
+
constructor(selections) {
|
|
51
|
+
this.selections = selections;
|
|
52
|
+
}
|
|
53
|
+
compare(other) {
|
|
54
|
+
if (!(other instanceof NotebookDiffEditorSelection)) {
|
|
55
|
+
return EditorPaneSelectionCompareResult.DIFFERENT;
|
|
56
|
+
}
|
|
57
|
+
if (this.selections.length !== other.selections.length) {
|
|
58
|
+
return EditorPaneSelectionCompareResult.DIFFERENT;
|
|
59
|
+
}
|
|
60
|
+
for (let i = 0; i < this.selections.length; i++) {
|
|
61
|
+
if (this.selections[i] !== other.selections[i]) {
|
|
62
|
+
return EditorPaneSelectionCompareResult.DIFFERENT;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
return EditorPaneSelectionCompareResult.IDENTICAL;
|
|
66
|
+
}
|
|
67
|
+
restore(options) {
|
|
68
|
+
const notebookOptions = {
|
|
69
|
+
cellSelections: cellIndexesToRanges(this.selections)
|
|
70
|
+
};
|
|
71
|
+
Object.assign(notebookOptions, options);
|
|
72
|
+
return notebookOptions;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
|
|
76
|
+
static { NotebookTextDiffEditor_1 = this; }
|
|
77
|
+
static { this.ENTIRE_DIFF_OVERVIEW_WIDTH = 30; }
|
|
78
|
+
static { this.ID = NOTEBOOK_DIFF_EDITOR_ID; }
|
|
79
|
+
get textModel() {
|
|
80
|
+
return this._model?.modified.notebook;
|
|
81
|
+
}
|
|
82
|
+
get notebookOptions() {
|
|
83
|
+
return this._notebookOptions;
|
|
84
|
+
}
|
|
85
|
+
get isDisposed() {
|
|
86
|
+
return this._isDisposed;
|
|
87
|
+
}
|
|
88
|
+
constructor(group, instantiationService, themeService, contextKeyService, notebookEditorWorkerService, configurationService, telemetryService, storageService, notebookService) {
|
|
89
|
+
super(NotebookTextDiffEditor_1.ID, group, telemetryService, themeService, storageService);
|
|
90
|
+
this.instantiationService = instantiationService;
|
|
91
|
+
this.contextKeyService = contextKeyService;
|
|
92
|
+
this.notebookEditorWorkerService = notebookEditorWorkerService;
|
|
93
|
+
this.configurationService = configurationService;
|
|
94
|
+
this.notebookService = notebookService;
|
|
95
|
+
this.creationOptions = getDefaultNotebookCreationOptions();
|
|
96
|
+
this._dimension = null;
|
|
97
|
+
this._modifiedWebview = null;
|
|
98
|
+
this._originalWebview = null;
|
|
99
|
+
this._webviewTransparentCover = null;
|
|
100
|
+
this._onMouseUp = this._register(( (new Emitter())));
|
|
101
|
+
this.onMouseUp = this._onMouseUp.event;
|
|
102
|
+
this._onDidScroll = this._register(( (new Emitter())));
|
|
103
|
+
this.onDidScroll = this._onDidScroll.event;
|
|
104
|
+
this.onDidChangeScroll = this._onDidScroll.event;
|
|
105
|
+
this._model = null;
|
|
106
|
+
this._modifiedResourceDisposableStore = this._register(( (new DisposableStore())));
|
|
107
|
+
this._insetModifyQueueByOutputId = ( (new SequencerByKey()));
|
|
108
|
+
this._onDidDynamicOutputRendered = this._register(( (new Emitter())));
|
|
109
|
+
this.onDidDynamicOutputRendered = this._onDidDynamicOutputRendered.event;
|
|
110
|
+
this._localStore = this._register(( (new DisposableStore())));
|
|
111
|
+
this._onDidChangeSelection = this._register(( (new Emitter())));
|
|
112
|
+
this.onDidChangeSelection = this._onDidChangeSelection.event;
|
|
113
|
+
this._isDisposed = false;
|
|
114
|
+
this.pendingLayouts = ( (new WeakMap()));
|
|
115
|
+
this._notebookOptions = instantiationService.createInstance(NotebookOptions, this.window, false, undefined);
|
|
116
|
+
this._register(this._notebookOptions);
|
|
117
|
+
this._revealFirst = true;
|
|
118
|
+
}
|
|
119
|
+
get fontInfo() {
|
|
120
|
+
if (!this._fontInfo) {
|
|
121
|
+
this._fontInfo = this.createFontInfo();
|
|
122
|
+
}
|
|
123
|
+
return this._fontInfo;
|
|
124
|
+
}
|
|
125
|
+
createFontInfo() {
|
|
126
|
+
const editorOptions = this.configurationService.getValue('editor');
|
|
127
|
+
return FontMeasurements.readFontInfo(this.window, BareFontInfo.createFromRawSettings(editorOptions, PixelRatio.getInstance(this.window).value));
|
|
128
|
+
}
|
|
129
|
+
isOverviewRulerEnabled() {
|
|
130
|
+
return this.configurationService.getValue(NotebookSetting.diffOverviewRuler) ?? false;
|
|
131
|
+
}
|
|
132
|
+
getSelection() {
|
|
133
|
+
const selections = this._list.getFocus();
|
|
134
|
+
return (
|
|
135
|
+
(new NotebookDiffEditorSelection(selections))
|
|
136
|
+
);
|
|
137
|
+
}
|
|
138
|
+
toggleNotebookCellSelection(cell) {
|
|
139
|
+
}
|
|
140
|
+
updatePerformanceMetadata(cellId, executionId, duration, rendererId) {
|
|
141
|
+
}
|
|
142
|
+
async focusNotebookCell(cell, focus) {
|
|
143
|
+
}
|
|
144
|
+
async focusNextNotebookCell(cell, focus) {
|
|
145
|
+
}
|
|
146
|
+
didFocusOutputInputChange(inputFocused) {
|
|
147
|
+
}
|
|
148
|
+
getScrollTop() {
|
|
149
|
+
return this._list?.scrollTop ?? 0;
|
|
150
|
+
}
|
|
151
|
+
getScrollHeight() {
|
|
152
|
+
return this._list?.scrollHeight ?? 0;
|
|
153
|
+
}
|
|
154
|
+
getScrollPosition() {
|
|
155
|
+
return {
|
|
156
|
+
scrollTop: this.getScrollTop(),
|
|
157
|
+
scrollLeft: this._list?.scrollLeft ?? 0
|
|
158
|
+
};
|
|
159
|
+
}
|
|
160
|
+
setScrollPosition(scrollPosition) {
|
|
161
|
+
if (!this._list) {
|
|
162
|
+
return;
|
|
163
|
+
}
|
|
164
|
+
this._list.scrollTop = scrollPosition.scrollTop;
|
|
165
|
+
if (scrollPosition.scrollLeft !== undefined) {
|
|
166
|
+
this._list.scrollLeft = scrollPosition.scrollLeft;
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
delegateVerticalScrollbarPointerDown(browserEvent) {
|
|
170
|
+
this._list?.delegateVerticalScrollbarPointerDown(browserEvent);
|
|
171
|
+
}
|
|
172
|
+
updateOutputHeight(cellInfo, output, outputHeight, isInit) {
|
|
173
|
+
const diffElement = cellInfo.diffElement;
|
|
174
|
+
const cell = this.getCellByInfo(cellInfo);
|
|
175
|
+
const outputIndex = cell.outputsViewModels.indexOf(output);
|
|
176
|
+
if (diffElement instanceof SideBySideDiffElementViewModel) {
|
|
177
|
+
const info = CellUri.parse(cellInfo.cellUri);
|
|
178
|
+
if (!info) {
|
|
179
|
+
return;
|
|
180
|
+
}
|
|
181
|
+
diffElement.updateOutputHeight(( (info.notebook.toString())) === this._model?.original.resource.toString() ? DiffSide.Original : DiffSide.Modified, outputIndex, outputHeight);
|
|
182
|
+
}
|
|
183
|
+
else {
|
|
184
|
+
diffElement.updateOutputHeight(diffElement.type === 'insert' ? DiffSide.Modified : DiffSide.Original, outputIndex, outputHeight);
|
|
185
|
+
}
|
|
186
|
+
if (isInit) {
|
|
187
|
+
this._onDidDynamicOutputRendered.fire({ cell, output });
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
setMarkupCellEditState(cellId, editState) {
|
|
191
|
+
}
|
|
192
|
+
didStartDragMarkupCell(cellId, event) {
|
|
193
|
+
}
|
|
194
|
+
didDragMarkupCell(cellId, event) {
|
|
195
|
+
}
|
|
196
|
+
didEndDragMarkupCell(cellId) {
|
|
197
|
+
}
|
|
198
|
+
didDropMarkupCell(cellId) {
|
|
199
|
+
}
|
|
200
|
+
didResizeOutput(cellId) {
|
|
201
|
+
}
|
|
202
|
+
createEditor(parent) {
|
|
203
|
+
this._rootElement = append(parent, $$1('.notebook-text-diff-editor'));
|
|
204
|
+
this._overflowContainer = document.createElement('div');
|
|
205
|
+
this._overflowContainer.classList.add('notebook-overflow-widget-container', 'monaco-editor');
|
|
206
|
+
append(parent, this._overflowContainer);
|
|
207
|
+
const renderers = [
|
|
208
|
+
this.instantiationService.createInstance(CellDiffSingleSideRenderer, this),
|
|
209
|
+
this.instantiationService.createInstance(CellDiffSideBySideRenderer, this),
|
|
210
|
+
this.instantiationService.createInstance(CellDiffPlaceholderRenderer, this),
|
|
211
|
+
];
|
|
212
|
+
this._listViewContainer = append(this._rootElement, $$1('.notebook-diff-list-view'));
|
|
213
|
+
this._list = this.instantiationService.createInstance(NotebookTextDiffList, 'NotebookTextDiff', this._listViewContainer, this.instantiationService.createInstance(NotebookCellTextDiffListDelegate, this.window), renderers, this.contextKeyService, {
|
|
214
|
+
setRowLineHeight: false,
|
|
215
|
+
setRowHeight: false,
|
|
216
|
+
supportDynamicHeights: true,
|
|
217
|
+
horizontalScrolling: false,
|
|
218
|
+
keyboardSupport: false,
|
|
219
|
+
mouseSupport: true,
|
|
220
|
+
multipleSelectionSupport: false,
|
|
221
|
+
typeNavigationEnabled: true,
|
|
222
|
+
paddingBottom: 0,
|
|
223
|
+
styleController: (_suffix) => { return this._list; },
|
|
224
|
+
overrideStyles: {
|
|
225
|
+
listBackground: editorBackground,
|
|
226
|
+
listActiveSelectionBackground: editorBackground,
|
|
227
|
+
listActiveSelectionForeground: foreground,
|
|
228
|
+
listFocusAndSelectionBackground: editorBackground,
|
|
229
|
+
listFocusAndSelectionForeground: foreground,
|
|
230
|
+
listFocusBackground: editorBackground,
|
|
231
|
+
listFocusForeground: foreground,
|
|
232
|
+
listHoverForeground: foreground,
|
|
233
|
+
listHoverBackground: editorBackground,
|
|
234
|
+
listHoverOutline: focusBorder,
|
|
235
|
+
listFocusOutline: focusBorder,
|
|
236
|
+
listInactiveSelectionBackground: editorBackground,
|
|
237
|
+
listInactiveSelectionForeground: foreground,
|
|
238
|
+
listInactiveFocusBackground: editorBackground,
|
|
239
|
+
listInactiveFocusOutline: editorBackground,
|
|
240
|
+
},
|
|
241
|
+
accessibilityProvider: {
|
|
242
|
+
getAriaLabel() { return null; },
|
|
243
|
+
getWidgetAriaLabel() {
|
|
244
|
+
return ( localize(8087, "Notebook Text Diff"));
|
|
245
|
+
}
|
|
246
|
+
},
|
|
247
|
+
});
|
|
248
|
+
this._register(this._list);
|
|
249
|
+
this._register(this._list.onMouseUp(e => {
|
|
250
|
+
if (e.element) {
|
|
251
|
+
if (typeof e.index === 'number') {
|
|
252
|
+
this._list.setFocus([e.index]);
|
|
253
|
+
}
|
|
254
|
+
this._onMouseUp.fire({ event: e.browserEvent, target: e.element });
|
|
255
|
+
}
|
|
256
|
+
}));
|
|
257
|
+
this._register(this._list.onDidScroll(() => {
|
|
258
|
+
this._onDidScroll.fire();
|
|
259
|
+
}));
|
|
260
|
+
this._register(this._list.onDidChangeFocus(() => this._onDidChangeSelection.fire({ reason: EditorPaneSelectionChangeReason.USER })));
|
|
261
|
+
this._overviewRulerContainer = document.createElement('div');
|
|
262
|
+
this._overviewRulerContainer.classList.add('notebook-overview-ruler-container');
|
|
263
|
+
this._rootElement.appendChild(this._overviewRulerContainer);
|
|
264
|
+
this._registerOverviewRuler();
|
|
265
|
+
this._webviewTransparentCover = append(this._list.rowsContainer, $('.webview-cover'));
|
|
266
|
+
this._webviewTransparentCover.style.display = 'none';
|
|
267
|
+
this._register(addStandardDisposableGenericMouseDownListener(this._overflowContainer, (e) => {
|
|
268
|
+
if (e.target.classList.contains('slider') && this._webviewTransparentCover) {
|
|
269
|
+
this._webviewTransparentCover.style.display = 'block';
|
|
270
|
+
}
|
|
271
|
+
}));
|
|
272
|
+
this._register(addStandardDisposableGenericMouseUpListener(this._overflowContainer, () => {
|
|
273
|
+
if (this._webviewTransparentCover) {
|
|
274
|
+
this._webviewTransparentCover.style.display = 'none';
|
|
275
|
+
}
|
|
276
|
+
}));
|
|
277
|
+
this._register(this._list.onDidScroll(e => {
|
|
278
|
+
this._webviewTransparentCover.style.top = `${e.scrollTop}px`;
|
|
279
|
+
}));
|
|
280
|
+
}
|
|
281
|
+
_registerOverviewRuler() {
|
|
282
|
+
this._overviewRuler = this._register(this.instantiationService.createInstance(NotebookDiffOverviewRuler, this, NotebookTextDiffEditor_1.ENTIRE_DIFF_OVERVIEW_WIDTH, this._overviewRulerContainer));
|
|
283
|
+
}
|
|
284
|
+
_updateOutputsOffsetsInWebview(scrollTop, scrollHeight, activeWebview, getActiveNestedCell, diffSide) {
|
|
285
|
+
activeWebview.element.style.height = `${scrollHeight}px`;
|
|
286
|
+
if (activeWebview.insetMapping) {
|
|
287
|
+
const updateItems = [];
|
|
288
|
+
const removedItems = [];
|
|
289
|
+
activeWebview.insetMapping.forEach((value, key) => {
|
|
290
|
+
const cell = getActiveNestedCell(value.cellInfo.diffElement);
|
|
291
|
+
if (!cell) {
|
|
292
|
+
return;
|
|
293
|
+
}
|
|
294
|
+
const viewIndex = this._list.indexOf(value.cellInfo.diffElement);
|
|
295
|
+
if (viewIndex === undefined) {
|
|
296
|
+
return;
|
|
297
|
+
}
|
|
298
|
+
if (cell.outputsViewModels.indexOf(key) < 0) {
|
|
299
|
+
removedItems.push(key);
|
|
300
|
+
}
|
|
301
|
+
else {
|
|
302
|
+
const cellTop = this._list.getCellViewScrollTop(value.cellInfo.diffElement);
|
|
303
|
+
const outputIndex = cell.outputsViewModels.indexOf(key);
|
|
304
|
+
const outputOffset = value.cellInfo.diffElement.getOutputOffsetInCell(diffSide, outputIndex);
|
|
305
|
+
updateItems.push({
|
|
306
|
+
cell,
|
|
307
|
+
output: key,
|
|
308
|
+
cellTop: cellTop,
|
|
309
|
+
outputOffset: outputOffset,
|
|
310
|
+
forceDisplay: false
|
|
311
|
+
});
|
|
312
|
+
}
|
|
313
|
+
});
|
|
314
|
+
activeWebview.removeInsets(removedItems);
|
|
315
|
+
if (updateItems.length) {
|
|
316
|
+
activeWebview.updateScrollTops(updateItems, []);
|
|
317
|
+
}
|
|
318
|
+
}
|
|
319
|
+
}
|
|
320
|
+
async setInput(input, options, context, token) {
|
|
321
|
+
await super.setInput(input, options, context, token);
|
|
322
|
+
const model = await input.resolve();
|
|
323
|
+
if (this._model !== model) {
|
|
324
|
+
this._detachModel();
|
|
325
|
+
this._model = model;
|
|
326
|
+
this._attachModel();
|
|
327
|
+
}
|
|
328
|
+
this._model = model;
|
|
329
|
+
if (this._model === null) {
|
|
330
|
+
return;
|
|
331
|
+
}
|
|
332
|
+
this._revealFirst = true;
|
|
333
|
+
this._modifiedResourceDisposableStore.clear();
|
|
334
|
+
this._layoutCancellationTokenSource = ( (new CancellationTokenSource()));
|
|
335
|
+
this._modifiedResourceDisposableStore.add(Event.any(this._model.original.notebook.onDidChangeContent, this._model.modified.notebook.onDidChangeContent)(e => {
|
|
336
|
+
if (this._model !== null) {
|
|
337
|
+
this._layoutCancellationTokenSource?.dispose();
|
|
338
|
+
this._layoutCancellationTokenSource = ( (new CancellationTokenSource()));
|
|
339
|
+
this.updateLayout(this._layoutCancellationTokenSource.token);
|
|
340
|
+
}
|
|
341
|
+
}));
|
|
342
|
+
await this._createOriginalWebview(generateUuid(), this._model.original.viewType, this._model.original.resource);
|
|
343
|
+
if (this._originalWebview) {
|
|
344
|
+
this._modifiedResourceDisposableStore.add(this._originalWebview);
|
|
345
|
+
}
|
|
346
|
+
await this._createModifiedWebview(generateUuid(), this._model.modified.viewType, this._model.modified.resource);
|
|
347
|
+
if (this._modifiedWebview) {
|
|
348
|
+
this._modifiedResourceDisposableStore.add(this._modifiedWebview);
|
|
349
|
+
}
|
|
350
|
+
await this.updateLayout(this._layoutCancellationTokenSource.token, options?.cellSelections ? cellRangesToIndexes(options.cellSelections) : undefined);
|
|
351
|
+
}
|
|
352
|
+
_detachModel() {
|
|
353
|
+
this._localStore.clear();
|
|
354
|
+
this._originalWebview?.dispose();
|
|
355
|
+
this._originalWebview?.element.remove();
|
|
356
|
+
this._originalWebview = null;
|
|
357
|
+
this._modifiedWebview?.dispose();
|
|
358
|
+
this._modifiedWebview?.element.remove();
|
|
359
|
+
this._modifiedWebview = null;
|
|
360
|
+
this.notebookDiffViewModel?.dispose();
|
|
361
|
+
this.notebookDiffViewModel = undefined;
|
|
362
|
+
this._modifiedResourceDisposableStore.clear();
|
|
363
|
+
this._list.clear();
|
|
364
|
+
}
|
|
365
|
+
_attachModel() {
|
|
366
|
+
this._eventDispatcher = ( (new NotebookDiffEditorEventDispatcher()));
|
|
367
|
+
const updateInsets = () => {
|
|
368
|
+
scheduleAtNextAnimationFrame(this.window, () => {
|
|
369
|
+
if (this._isDisposed) {
|
|
370
|
+
return;
|
|
371
|
+
}
|
|
372
|
+
if (this._modifiedWebview) {
|
|
373
|
+
this._updateOutputsOffsetsInWebview(this._list.scrollTop, this._list.scrollHeight, this._modifiedWebview, (diffElement) => {
|
|
374
|
+
return diffElement.modified;
|
|
375
|
+
}, DiffSide.Modified);
|
|
376
|
+
}
|
|
377
|
+
if (this._originalWebview) {
|
|
378
|
+
this._updateOutputsOffsetsInWebview(this._list.scrollTop, this._list.scrollHeight, this._originalWebview, (diffElement) => {
|
|
379
|
+
return diffElement.original;
|
|
380
|
+
}, DiffSide.Original);
|
|
381
|
+
}
|
|
382
|
+
});
|
|
383
|
+
};
|
|
384
|
+
this._localStore.add(this._list.onDidChangeContentHeight(() => {
|
|
385
|
+
updateInsets();
|
|
386
|
+
}));
|
|
387
|
+
this._localStore.add(this._eventDispatcher.onDidChangeCellLayout(() => {
|
|
388
|
+
updateInsets();
|
|
389
|
+
}));
|
|
390
|
+
if (this._model) {
|
|
391
|
+
const vm = this.notebookDiffViewModel = this._register(( (new NotebookDiffViewModel(
|
|
392
|
+
this._model,
|
|
393
|
+
this.notebookEditorWorkerService,
|
|
394
|
+
this.instantiationService,
|
|
395
|
+
this.configurationService,
|
|
396
|
+
this._eventDispatcher,
|
|
397
|
+
this.notebookService,
|
|
398
|
+
this.fontInfo
|
|
399
|
+
))));
|
|
400
|
+
this._localStore.add(this.notebookDiffViewModel.onDidChangeItems(e => {
|
|
401
|
+
this._list.splice(e.start, e.deleteCount, e.elements);
|
|
402
|
+
if (this.isOverviewRulerEnabled()) {
|
|
403
|
+
this._overviewRuler.updateViewModels(vm.items, this._eventDispatcher);
|
|
404
|
+
}
|
|
405
|
+
}));
|
|
406
|
+
}
|
|
407
|
+
}
|
|
408
|
+
async _createModifiedWebview(id, viewType, resource) {
|
|
409
|
+
this._modifiedWebview?.dispose();
|
|
410
|
+
this._modifiedWebview = this.instantiationService.createInstance(BackLayerWebView, this, id, viewType, resource, {
|
|
411
|
+
...this._notebookOptions.computeDiffWebviewOptions(),
|
|
412
|
+
fontFamily: this._generateFontFamily()
|
|
413
|
+
}, undefined);
|
|
414
|
+
this._list.rowsContainer.insertAdjacentElement('afterbegin', this._modifiedWebview.element);
|
|
415
|
+
this._modifiedWebview.createWebview(this.window);
|
|
416
|
+
this._modifiedWebview.element.style.width = `calc(50% - 16px)`;
|
|
417
|
+
this._modifiedWebview.element.style.left = `calc(50%)`;
|
|
418
|
+
}
|
|
419
|
+
_generateFontFamily() {
|
|
420
|
+
return this.fontInfo.fontFamily ?? `"SF Mono", Monaco, Menlo, Consolas, "Ubuntu Mono", "Liberation Mono", "DejaVu Sans Mono", "Courier New", monospace`;
|
|
421
|
+
}
|
|
422
|
+
async _createOriginalWebview(id, viewType, resource) {
|
|
423
|
+
this._originalWebview?.dispose();
|
|
424
|
+
this._originalWebview = this.instantiationService.createInstance(BackLayerWebView, this, id, viewType, resource, {
|
|
425
|
+
...this._notebookOptions.computeDiffWebviewOptions(),
|
|
426
|
+
fontFamily: this._generateFontFamily()
|
|
427
|
+
}, undefined);
|
|
428
|
+
this._list.rowsContainer.insertAdjacentElement('afterbegin', this._originalWebview.element);
|
|
429
|
+
this._originalWebview.createWebview(this.window);
|
|
430
|
+
this._originalWebview.element.style.width = `calc(50% - 16px)`;
|
|
431
|
+
this._originalWebview.element.style.left = `16px`;
|
|
432
|
+
}
|
|
433
|
+
setOptions(options) {
|
|
434
|
+
const selections = options?.cellSelections ? cellRangesToIndexes(options.cellSelections) : undefined;
|
|
435
|
+
if (selections) {
|
|
436
|
+
this._list.setFocus(selections);
|
|
437
|
+
}
|
|
438
|
+
}
|
|
439
|
+
async updateLayout(token, selections) {
|
|
440
|
+
if (!this._model || !this.notebookDiffViewModel) {
|
|
441
|
+
return;
|
|
442
|
+
}
|
|
443
|
+
const diffResult = await this.notebookDiffViewModel.computeDiff(token);
|
|
444
|
+
if (token.isCancellationRequested) {
|
|
445
|
+
return;
|
|
446
|
+
}
|
|
447
|
+
if (diffResult) {
|
|
448
|
+
this._originalWebview?.removeInsets([...this._originalWebview?.insetMapping.keys()]);
|
|
449
|
+
this._modifiedWebview?.removeInsets([...this._modifiedWebview?.insetMapping.keys()]);
|
|
450
|
+
if (this._revealFirst && diffResult.firstChangeIndex !== -1 && diffResult.firstChangeIndex < this._list.length) {
|
|
451
|
+
this._revealFirst = false;
|
|
452
|
+
this._list.setFocus([diffResult.firstChangeIndex]);
|
|
453
|
+
this._list.reveal(diffResult.firstChangeIndex, 0.3);
|
|
454
|
+
}
|
|
455
|
+
}
|
|
456
|
+
if (selections) {
|
|
457
|
+
this._list.setFocus(selections);
|
|
458
|
+
}
|
|
459
|
+
}
|
|
460
|
+
scheduleOutputHeightAck(cellInfo, outputId, height) {
|
|
461
|
+
const diffElement = cellInfo.diffElement;
|
|
462
|
+
let diffSide = DiffSide.Original;
|
|
463
|
+
if (diffElement instanceof SideBySideDiffElementViewModel) {
|
|
464
|
+
const info = CellUri.parse(cellInfo.cellUri);
|
|
465
|
+
if (!info) {
|
|
466
|
+
return;
|
|
467
|
+
}
|
|
468
|
+
diffSide = ( (info.notebook.toString())) === this._model?.original.resource.toString() ? DiffSide.Original : DiffSide.Modified;
|
|
469
|
+
}
|
|
470
|
+
else {
|
|
471
|
+
diffSide = diffElement.type === 'insert' ? DiffSide.Modified : DiffSide.Original;
|
|
472
|
+
}
|
|
473
|
+
const webview = diffSide === DiffSide.Modified ? this._modifiedWebview : this._originalWebview;
|
|
474
|
+
scheduleAtNextAnimationFrame(this.window, () => {
|
|
475
|
+
webview?.ackHeight([{ cellId: cellInfo.cellId, outputId, height }]);
|
|
476
|
+
}, 10);
|
|
477
|
+
}
|
|
478
|
+
layoutNotebookCell(cell, height) {
|
|
479
|
+
const relayout = (cell, height) => {
|
|
480
|
+
this._list.updateElementHeight2(cell, height);
|
|
481
|
+
};
|
|
482
|
+
if (( (this.pendingLayouts.has(cell)))) {
|
|
483
|
+
this.pendingLayouts.get(cell).dispose();
|
|
484
|
+
}
|
|
485
|
+
let r;
|
|
486
|
+
const layoutDisposable = scheduleAtNextAnimationFrame(this.window, () => {
|
|
487
|
+
this.pendingLayouts.delete(cell);
|
|
488
|
+
relayout(cell, height);
|
|
489
|
+
r();
|
|
490
|
+
});
|
|
491
|
+
this.pendingLayouts.set(cell, toDisposable(() => {
|
|
492
|
+
layoutDisposable.dispose();
|
|
493
|
+
r();
|
|
494
|
+
}));
|
|
495
|
+
return (
|
|
496
|
+
(new Promise(resolve => { r = resolve; }))
|
|
497
|
+
);
|
|
498
|
+
}
|
|
499
|
+
setScrollTop(scrollTop) {
|
|
500
|
+
this._list.scrollTop = scrollTop;
|
|
501
|
+
}
|
|
502
|
+
triggerScroll(event) {
|
|
503
|
+
this._list.triggerScrollFromMouseWheelEvent(event);
|
|
504
|
+
}
|
|
505
|
+
previousChange() {
|
|
506
|
+
if (!this.notebookDiffViewModel) {
|
|
507
|
+
return;
|
|
508
|
+
}
|
|
509
|
+
let currFocus = this._list.getFocus()[0];
|
|
510
|
+
if (isNaN(currFocus) || currFocus < 0) {
|
|
511
|
+
currFocus = 0;
|
|
512
|
+
}
|
|
513
|
+
let prevChangeIndex = currFocus - 1;
|
|
514
|
+
const currentViewModels = this.notebookDiffViewModel.items;
|
|
515
|
+
while (prevChangeIndex >= 0) {
|
|
516
|
+
const vm = currentViewModels[prevChangeIndex];
|
|
517
|
+
if (vm.type !== 'unchanged' && vm.type !== 'placeholder') {
|
|
518
|
+
break;
|
|
519
|
+
}
|
|
520
|
+
prevChangeIndex--;
|
|
521
|
+
}
|
|
522
|
+
if (prevChangeIndex >= 0) {
|
|
523
|
+
this._list.setFocus([prevChangeIndex]);
|
|
524
|
+
this._list.reveal(prevChangeIndex);
|
|
525
|
+
}
|
|
526
|
+
else {
|
|
527
|
+
const index = findLastIdx(currentViewModels, vm => vm.type !== 'unchanged' && vm.type !== 'placeholder');
|
|
528
|
+
if (index >= 0) {
|
|
529
|
+
this._list.setFocus([index]);
|
|
530
|
+
this._list.reveal(index);
|
|
531
|
+
}
|
|
532
|
+
}
|
|
533
|
+
}
|
|
534
|
+
nextChange() {
|
|
535
|
+
if (!this.notebookDiffViewModel) {
|
|
536
|
+
return;
|
|
537
|
+
}
|
|
538
|
+
let currFocus = this._list.getFocus()[0];
|
|
539
|
+
if (isNaN(currFocus) || currFocus < 0) {
|
|
540
|
+
currFocus = 0;
|
|
541
|
+
}
|
|
542
|
+
let nextChangeIndex = currFocus + 1;
|
|
543
|
+
const currentViewModels = this.notebookDiffViewModel.items;
|
|
544
|
+
while (nextChangeIndex < currentViewModels.length) {
|
|
545
|
+
const vm = currentViewModels[nextChangeIndex];
|
|
546
|
+
if (vm.type !== 'unchanged' && vm.type !== 'placeholder') {
|
|
547
|
+
break;
|
|
548
|
+
}
|
|
549
|
+
nextChangeIndex++;
|
|
550
|
+
}
|
|
551
|
+
if (nextChangeIndex < currentViewModels.length) {
|
|
552
|
+
this._list.setFocus([nextChangeIndex]);
|
|
553
|
+
this._list.reveal(nextChangeIndex);
|
|
554
|
+
}
|
|
555
|
+
else {
|
|
556
|
+
const index = currentViewModels.findIndex(vm => vm.type !== 'unchanged' && vm.type !== 'placeholder');
|
|
557
|
+
if (index >= 0) {
|
|
558
|
+
this._list.setFocus([index]);
|
|
559
|
+
this._list.reveal(index);
|
|
560
|
+
}
|
|
561
|
+
}
|
|
562
|
+
}
|
|
563
|
+
createOutput(cellDiffViewModel, cellViewModel, output, getOffset, diffSide) {
|
|
564
|
+
this._insetModifyQueueByOutputId.queue(output.source.model.outputId + (diffSide === DiffSide.Modified ? '-right' : 'left'), async () => {
|
|
565
|
+
const activeWebview = diffSide === DiffSide.Modified ? this._modifiedWebview : this._originalWebview;
|
|
566
|
+
if (!activeWebview) {
|
|
567
|
+
return;
|
|
568
|
+
}
|
|
569
|
+
if (!( (activeWebview.insetMapping.has(output.source)))) {
|
|
570
|
+
const cellTop = this._list.getCellViewScrollTop(cellDiffViewModel);
|
|
571
|
+
await activeWebview.createOutput({ diffElement: cellDiffViewModel, cellHandle: cellViewModel.handle, cellId: cellViewModel.id, cellUri: cellViewModel.uri }, output, cellTop, getOffset());
|
|
572
|
+
}
|
|
573
|
+
else {
|
|
574
|
+
const cellTop = this._list.getCellViewScrollTop(cellDiffViewModel);
|
|
575
|
+
const outputIndex = cellViewModel.outputsViewModels.indexOf(output.source);
|
|
576
|
+
const outputOffset = cellDiffViewModel.getOutputOffsetInCell(diffSide, outputIndex);
|
|
577
|
+
activeWebview.updateScrollTops([{
|
|
578
|
+
cell: cellViewModel,
|
|
579
|
+
output: output.source,
|
|
580
|
+
cellTop,
|
|
581
|
+
outputOffset,
|
|
582
|
+
forceDisplay: true
|
|
583
|
+
}], []);
|
|
584
|
+
}
|
|
585
|
+
});
|
|
586
|
+
}
|
|
587
|
+
updateMarkupCellHeight() {
|
|
588
|
+
}
|
|
589
|
+
getCellByInfo(cellInfo) {
|
|
590
|
+
return cellInfo.diffElement.getCellByUri(cellInfo.cellUri);
|
|
591
|
+
}
|
|
592
|
+
getCellById(cellId) {
|
|
593
|
+
throw ( (new Error('Not implemented')));
|
|
594
|
+
}
|
|
595
|
+
removeInset(cellDiffViewModel, cellViewModel, displayOutput, diffSide) {
|
|
596
|
+
this._insetModifyQueueByOutputId.queue(displayOutput.model.outputId + (diffSide === DiffSide.Modified ? '-right' : 'left'), async () => {
|
|
597
|
+
const activeWebview = diffSide === DiffSide.Modified ? this._modifiedWebview : this._originalWebview;
|
|
598
|
+
if (!activeWebview) {
|
|
599
|
+
return;
|
|
600
|
+
}
|
|
601
|
+
if (!( (activeWebview.insetMapping.has(displayOutput)))) {
|
|
602
|
+
return;
|
|
603
|
+
}
|
|
604
|
+
activeWebview.removeInsets([displayOutput]);
|
|
605
|
+
});
|
|
606
|
+
}
|
|
607
|
+
showInset(cellDiffViewModel, cellViewModel, displayOutput, diffSide) {
|
|
608
|
+
this._insetModifyQueueByOutputId.queue(displayOutput.model.outputId + (diffSide === DiffSide.Modified ? '-right' : 'left'), async () => {
|
|
609
|
+
const activeWebview = diffSide === DiffSide.Modified ? this._modifiedWebview : this._originalWebview;
|
|
610
|
+
if (!activeWebview) {
|
|
611
|
+
return;
|
|
612
|
+
}
|
|
613
|
+
if (!( (activeWebview.insetMapping.has(displayOutput)))) {
|
|
614
|
+
return;
|
|
615
|
+
}
|
|
616
|
+
const cellTop = this._list.getCellViewScrollTop(cellDiffViewModel);
|
|
617
|
+
const outputIndex = cellViewModel.outputsViewModels.indexOf(displayOutput);
|
|
618
|
+
const outputOffset = cellDiffViewModel.getOutputOffsetInCell(diffSide, outputIndex);
|
|
619
|
+
activeWebview.updateScrollTops([{
|
|
620
|
+
cell: cellViewModel,
|
|
621
|
+
output: displayOutput,
|
|
622
|
+
cellTop,
|
|
623
|
+
outputOffset,
|
|
624
|
+
forceDisplay: true,
|
|
625
|
+
}], []);
|
|
626
|
+
});
|
|
627
|
+
}
|
|
628
|
+
hideInset(cellDiffViewModel, cellViewModel, output) {
|
|
629
|
+
this._modifiedWebview?.hideInset(output);
|
|
630
|
+
this._originalWebview?.hideInset(output);
|
|
631
|
+
}
|
|
632
|
+
getDomNode() {
|
|
633
|
+
return this._rootElement;
|
|
634
|
+
}
|
|
635
|
+
getOverflowContainerDomNode() {
|
|
636
|
+
return this._overflowContainer;
|
|
637
|
+
}
|
|
638
|
+
getControl() {
|
|
639
|
+
return this;
|
|
640
|
+
}
|
|
641
|
+
clearInput() {
|
|
642
|
+
super.clearInput();
|
|
643
|
+
this._modifiedResourceDisposableStore.clear();
|
|
644
|
+
this._list?.splice(0, this._list?.length || 0);
|
|
645
|
+
this._model = null;
|
|
646
|
+
this.notebookDiffViewModel?.dispose();
|
|
647
|
+
this.notebookDiffViewModel = undefined;
|
|
648
|
+
}
|
|
649
|
+
deltaCellOutputContainerClassNames(diffSide, cellId, added, removed) {
|
|
650
|
+
if (diffSide === DiffSide.Original) {
|
|
651
|
+
this._originalWebview?.deltaCellContainerClassNames(cellId, added, removed);
|
|
652
|
+
}
|
|
653
|
+
else {
|
|
654
|
+
this._modifiedWebview?.deltaCellContainerClassNames(cellId, added, removed);
|
|
655
|
+
}
|
|
656
|
+
}
|
|
657
|
+
getLayoutInfo() {
|
|
658
|
+
if (!this._list) {
|
|
659
|
+
throw ( (new Error('Editor is not initalized successfully')));
|
|
660
|
+
}
|
|
661
|
+
return {
|
|
662
|
+
width: this._dimension.width,
|
|
663
|
+
height: this._dimension.height,
|
|
664
|
+
fontInfo: this.fontInfo,
|
|
665
|
+
scrollHeight: this._list?.getScrollHeight() ?? 0,
|
|
666
|
+
stickyHeight: 0,
|
|
667
|
+
};
|
|
668
|
+
}
|
|
669
|
+
layout(dimension, _position) {
|
|
670
|
+
this._rootElement.classList.toggle('mid-width', dimension.width < 1000 && dimension.width >= 600);
|
|
671
|
+
this._rootElement.classList.toggle('narrow-width', dimension.width < 600);
|
|
672
|
+
const overviewRulerEnabled = this.isOverviewRulerEnabled();
|
|
673
|
+
this._dimension = dimension.with(dimension.width - (overviewRulerEnabled ? NotebookTextDiffEditor_1.ENTIRE_DIFF_OVERVIEW_WIDTH : 0));
|
|
674
|
+
this._listViewContainer.style.height = `${dimension.height}px`;
|
|
675
|
+
this._listViewContainer.style.width = `${this._dimension.width}px`;
|
|
676
|
+
this._list?.layout(this._dimension.height, this._dimension.width);
|
|
677
|
+
if (this._modifiedWebview) {
|
|
678
|
+
this._modifiedWebview.element.style.width = `calc(50% - 16px)`;
|
|
679
|
+
this._modifiedWebview.element.style.left = `calc(50%)`;
|
|
680
|
+
}
|
|
681
|
+
if (this._originalWebview) {
|
|
682
|
+
this._originalWebview.element.style.width = `calc(50% - 16px)`;
|
|
683
|
+
this._originalWebview.element.style.left = `16px`;
|
|
684
|
+
}
|
|
685
|
+
if (this._webviewTransparentCover) {
|
|
686
|
+
this._webviewTransparentCover.style.height = `${this._dimension.height}px`;
|
|
687
|
+
this._webviewTransparentCover.style.width = `${this._dimension.width}px`;
|
|
688
|
+
}
|
|
689
|
+
if (overviewRulerEnabled) {
|
|
690
|
+
this._overviewRuler.layout();
|
|
691
|
+
}
|
|
692
|
+
this._eventDispatcher?.emit([( (new NotebookDiffLayoutChangedEvent({ width: true, fontInfo: true }, this.getLayoutInfo())))]);
|
|
693
|
+
}
|
|
694
|
+
dispose() {
|
|
695
|
+
this._isDisposed = true;
|
|
696
|
+
this._layoutCancellationTokenSource?.dispose();
|
|
697
|
+
this._detachModel();
|
|
698
|
+
super.dispose();
|
|
699
|
+
}
|
|
700
|
+
};
|
|
701
|
+
NotebookTextDiffEditor = NotebookTextDiffEditor_1 = ( (__decorate([
|
|
702
|
+
( (__param(1, IInstantiationService))),
|
|
703
|
+
( (__param(2, IThemeService))),
|
|
704
|
+
( (__param(3, IContextKeyService))),
|
|
705
|
+
( (__param(4, INotebookEditorWorkerService))),
|
|
706
|
+
( (__param(5, IConfigurationService))),
|
|
707
|
+
( (__param(6, ITelemetryService))),
|
|
708
|
+
( (__param(7, IStorageService))),
|
|
709
|
+
( (__param(8, INotebookService)))
|
|
710
|
+
], NotebookTextDiffEditor)));
|
|
711
|
+
registerZIndex(ZIndex.Base, 10, 'notebook-diff-view-viewport-slider');
|
|
712
|
+
registerThemingParticipant((theme, collector) => {
|
|
713
|
+
const diffDiagonalFillColor = theme.getColor(diffDiagonalFill);
|
|
714
|
+
collector.addRule(`
|
|
715
|
+
.notebook-text-diff-editor .diagonal-fill {
|
|
716
|
+
background-image: linear-gradient(
|
|
717
|
+
-45deg,
|
|
718
|
+
${diffDiagonalFillColor} 12.5%,
|
|
719
|
+
#0000 12.5%, #0000 50%,
|
|
720
|
+
${diffDiagonalFillColor} 50%, ${diffDiagonalFillColor} 62.5%,
|
|
721
|
+
#0000 62.5%, #0000 100%
|
|
722
|
+
);
|
|
723
|
+
background-size: 8px 8px;
|
|
724
|
+
}
|
|
725
|
+
`);
|
|
726
|
+
collector.addRule(`.notebook-text-diff-editor .cell-body { margin: ${DIFF_CELL_MARGIN}px; }`);
|
|
727
|
+
collector.addRule(`.notebook-text-diff-editor .cell-placeholder-body { margin: ${DIFF_CELL_MARGIN}px 0; }`);
|
|
728
|
+
});
|
|
729
|
+
export { NotebookTextDiffEditor };
|