@codingame/monaco-vscode-api 8.0.4 → 9.0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/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 +22 -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/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/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/extensions/common/extensionValidator.js +19 -19
- 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/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/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 +2 -2
- 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 +5 -5
- 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/extHostTesting.js +22 -9
- package/vscode/src/vs/workbench/api/common/extHostTreeViews.js +1 -1
- 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 +230 -80
- 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/editorGroupView.js +7 -7
- 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/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/extensionsActions.js +166 -166
- 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,630 @@
|
|
|
1
|
+
import { Emitter } from '../../../../../base/common/event.js';
|
|
2
|
+
import { hash } from '../../../../../base/common/hash.js';
|
|
3
|
+
import { toFormattedString } from '../../../../../base/common/jsonFormatter.js';
|
|
4
|
+
import { Disposable } from '../../../../../base/common/lifecycle.js';
|
|
5
|
+
import { DiffEditorWidget } from '../../../../../editor/browser/widget/diffEditor/diffEditorWidget.js';
|
|
6
|
+
import { fixedEditorPadding } from './diffCellEditorOptions.js';
|
|
7
|
+
import { DiffNestedCellViewModel } from './diffNestedCellViewModel.js';
|
|
8
|
+
import { NotebookDiffViewEventType } from './eventDispatcher.js';
|
|
9
|
+
import { DiffSide, DIFF_CELL_MARGIN } from './notebookDiffEditorBrowser.js';
|
|
10
|
+
import { CellLayoutState } from '../notebookBrowser.js';
|
|
11
|
+
var PropertyFoldingState;
|
|
12
|
+
( (function(PropertyFoldingState) {
|
|
13
|
+
PropertyFoldingState[PropertyFoldingState["Expanded"] = 0] = "Expanded";
|
|
14
|
+
PropertyFoldingState[PropertyFoldingState["Collapsed"] = 1] = "Collapsed";
|
|
15
|
+
})(PropertyFoldingState || (PropertyFoldingState = {})));
|
|
16
|
+
const OUTPUT_EDITOR_HEIGHT_MAGIC = 1440;
|
|
17
|
+
class DiffElementViewModelBase extends Disposable {
|
|
18
|
+
constructor(mainDocumentTextModel, editorEventDispatcher, initData) {
|
|
19
|
+
super();
|
|
20
|
+
this.mainDocumentTextModel = mainDocumentTextModel;
|
|
21
|
+
this.editorEventDispatcher = editorEventDispatcher;
|
|
22
|
+
this.initData = initData;
|
|
23
|
+
this._layoutInfoEmitter = this._register(( new Emitter()));
|
|
24
|
+
this.onDidLayoutChange = this._layoutInfoEmitter.event;
|
|
25
|
+
this._register(this.editorEventDispatcher.onDidChangeLayout(e => this._layoutInfoEmitter.fire({ outerWidth: true })));
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
class DiffElementPlaceholderViewModel extends DiffElementViewModelBase {
|
|
29
|
+
constructor(mainDocumentTextModel, editorEventDispatcher, initData) {
|
|
30
|
+
super(mainDocumentTextModel, editorEventDispatcher, initData);
|
|
31
|
+
this.type = 'placeholder';
|
|
32
|
+
this.hiddenCells = [];
|
|
33
|
+
this._unfoldHiddenCells = this._register(( new Emitter()));
|
|
34
|
+
this.onUnfoldHiddenCells = this._unfoldHiddenCells.event;
|
|
35
|
+
}
|
|
36
|
+
get totalHeight() {
|
|
37
|
+
return 24 + (2 * DIFF_CELL_MARGIN);
|
|
38
|
+
}
|
|
39
|
+
getHeight(_) {
|
|
40
|
+
return this.totalHeight;
|
|
41
|
+
}
|
|
42
|
+
layoutChange() {
|
|
43
|
+
}
|
|
44
|
+
showHiddenCells() {
|
|
45
|
+
this._unfoldHiddenCells.fire();
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
class DiffElementCellViewModelBase extends DiffElementViewModelBase {
|
|
49
|
+
hideUnchangedCells() {
|
|
50
|
+
this._hideUnchangedCells.fire();
|
|
51
|
+
}
|
|
52
|
+
set rawOutputHeight(height) {
|
|
53
|
+
this._layout({ rawOutputHeight: Math.min(OUTPUT_EDITOR_HEIGHT_MAGIC, height) });
|
|
54
|
+
}
|
|
55
|
+
get rawOutputHeight() {
|
|
56
|
+
throw ( new Error('Use Cell.layoutInfo.rawOutputHeight'));
|
|
57
|
+
}
|
|
58
|
+
set outputStatusHeight(height) {
|
|
59
|
+
this._layout({ outputStatusHeight: height });
|
|
60
|
+
}
|
|
61
|
+
get outputStatusHeight() {
|
|
62
|
+
throw ( new Error('Use Cell.layoutInfo.outputStatusHeight'));
|
|
63
|
+
}
|
|
64
|
+
set outputMetadataHeight(height) {
|
|
65
|
+
this._layout({ outputMetadataHeight: height });
|
|
66
|
+
}
|
|
67
|
+
get outputMetadataHeight() {
|
|
68
|
+
throw ( new Error('Use Cell.layoutInfo.outputStatusHeight'));
|
|
69
|
+
}
|
|
70
|
+
set editorHeight(height) {
|
|
71
|
+
this._layout({ editorHeight: height });
|
|
72
|
+
}
|
|
73
|
+
get editorHeight() {
|
|
74
|
+
throw ( new Error('Use Cell.layoutInfo.editorHeight'));
|
|
75
|
+
}
|
|
76
|
+
set editorMargin(margin) {
|
|
77
|
+
this._layout({ editorMargin: margin });
|
|
78
|
+
}
|
|
79
|
+
get editorMargin() {
|
|
80
|
+
throw ( new Error('Use Cell.layoutInfo.editorMargin'));
|
|
81
|
+
}
|
|
82
|
+
set metadataStatusHeight(height) {
|
|
83
|
+
this._layout({ metadataStatusHeight: height });
|
|
84
|
+
}
|
|
85
|
+
get metadataStatusHeight() {
|
|
86
|
+
throw ( new Error('Use Cell.layoutInfo.outputStatusHeight'));
|
|
87
|
+
}
|
|
88
|
+
set metadataHeight(height) {
|
|
89
|
+
this._layout({ metadataHeight: height });
|
|
90
|
+
}
|
|
91
|
+
get metadataHeight() {
|
|
92
|
+
throw ( new Error('Use Cell.layoutInfo.metadataHeight'));
|
|
93
|
+
}
|
|
94
|
+
set renderOutput(value) {
|
|
95
|
+
this._renderOutput = value;
|
|
96
|
+
this._layout({ recomputeOutput: true });
|
|
97
|
+
this._stateChangeEmitter.fire({ renderOutput: this._renderOutput });
|
|
98
|
+
}
|
|
99
|
+
get renderOutput() {
|
|
100
|
+
return this._renderOutput;
|
|
101
|
+
}
|
|
102
|
+
get layoutInfo() {
|
|
103
|
+
return this._layoutInfo;
|
|
104
|
+
}
|
|
105
|
+
get totalHeight() {
|
|
106
|
+
return this.layoutInfo.totalHeight;
|
|
107
|
+
}
|
|
108
|
+
constructor(mainDocumentTextModel, original, modified, type, editorEventDispatcher, initData, notebookService) {
|
|
109
|
+
super(mainDocumentTextModel, editorEventDispatcher, initData);
|
|
110
|
+
this.type = type;
|
|
111
|
+
this._stateChangeEmitter = this._register(( new Emitter()));
|
|
112
|
+
this.onDidStateChange = this._stateChangeEmitter.event;
|
|
113
|
+
this._hideUnchangedCells = this._register(( new Emitter()));
|
|
114
|
+
this.onHideUnchangedCells = this._hideUnchangedCells.event;
|
|
115
|
+
this._renderOutput = true;
|
|
116
|
+
this._sourceEditorViewState = null;
|
|
117
|
+
this._outputEditorViewState = null;
|
|
118
|
+
this._metadataEditorViewState = null;
|
|
119
|
+
this.original = original ? this._register(( new DiffNestedCellViewModel(original, notebookService))) : undefined;
|
|
120
|
+
this.modified = modified ? this._register(( new DiffNestedCellViewModel(modified, notebookService))) : undefined;
|
|
121
|
+
const editorHeight = this._estimateEditorHeight(initData.fontInfo);
|
|
122
|
+
const cellStatusHeight = 25;
|
|
123
|
+
this._layoutInfo = {
|
|
124
|
+
width: 0,
|
|
125
|
+
editorHeight: editorHeight,
|
|
126
|
+
editorMargin: 0,
|
|
127
|
+
metadataHeight: 0,
|
|
128
|
+
cellStatusHeight,
|
|
129
|
+
metadataStatusHeight: 25,
|
|
130
|
+
rawOutputHeight: 0,
|
|
131
|
+
outputTotalHeight: 0,
|
|
132
|
+
outputStatusHeight: 25,
|
|
133
|
+
outputMetadataHeight: 0,
|
|
134
|
+
bodyMargin: 32,
|
|
135
|
+
totalHeight: 82 + cellStatusHeight + editorHeight,
|
|
136
|
+
layoutState: CellLayoutState.Uninitialized
|
|
137
|
+
};
|
|
138
|
+
this.cellFoldingState = modified?.getTextBufferHash() !== original?.getTextBufferHash() ? PropertyFoldingState.Expanded : PropertyFoldingState.Collapsed;
|
|
139
|
+
this.metadataFoldingState = PropertyFoldingState.Collapsed;
|
|
140
|
+
this.outputFoldingState = PropertyFoldingState.Collapsed;
|
|
141
|
+
this._register(this.editorEventDispatcher.onDidChangeLayout(e => this._layoutInfoEmitter.fire({ outerWidth: true })));
|
|
142
|
+
}
|
|
143
|
+
layoutChange() {
|
|
144
|
+
this._layout({ recomputeOutput: true });
|
|
145
|
+
}
|
|
146
|
+
_estimateEditorHeight(fontInfo) {
|
|
147
|
+
const lineHeight = fontInfo?.lineHeight ?? 17;
|
|
148
|
+
switch (this.type) {
|
|
149
|
+
case 'unchanged':
|
|
150
|
+
case 'insert':
|
|
151
|
+
{
|
|
152
|
+
const lineCount = this.modified.textModel.textBuffer.getLineCount();
|
|
153
|
+
const editorHeight = lineCount * lineHeight + fixedEditorPadding.top + fixedEditorPadding.bottom;
|
|
154
|
+
return editorHeight;
|
|
155
|
+
}
|
|
156
|
+
case 'delete':
|
|
157
|
+
case 'modified':
|
|
158
|
+
{
|
|
159
|
+
const lineCount = this.original.textModel.textBuffer.getLineCount();
|
|
160
|
+
const editorHeight = lineCount * lineHeight + fixedEditorPadding.top + fixedEditorPadding.bottom;
|
|
161
|
+
return editorHeight;
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
_layout(delta) {
|
|
166
|
+
const width = delta.width !== undefined ? delta.width : this._layoutInfo.width;
|
|
167
|
+
const editorHeight = delta.editorHeight !== undefined ? delta.editorHeight : this._layoutInfo.editorHeight;
|
|
168
|
+
const editorMargin = delta.editorMargin !== undefined ? delta.editorMargin : this._layoutInfo.editorMargin;
|
|
169
|
+
const metadataHeight = delta.metadataHeight !== undefined ? delta.metadataHeight : this._layoutInfo.metadataHeight;
|
|
170
|
+
const cellStatusHeight = delta.cellStatusHeight !== undefined ? delta.cellStatusHeight : this._layoutInfo.cellStatusHeight;
|
|
171
|
+
const metadataStatusHeight = delta.metadataStatusHeight !== undefined ? delta.metadataStatusHeight : this._layoutInfo.metadataStatusHeight;
|
|
172
|
+
const rawOutputHeight = delta.rawOutputHeight !== undefined ? delta.rawOutputHeight : this._layoutInfo.rawOutputHeight;
|
|
173
|
+
const outputStatusHeight = delta.outputStatusHeight !== undefined ? delta.outputStatusHeight : this._layoutInfo.outputStatusHeight;
|
|
174
|
+
const bodyMargin = delta.bodyMargin !== undefined ? delta.bodyMargin : this._layoutInfo.bodyMargin;
|
|
175
|
+
const outputMetadataHeight = delta.outputMetadataHeight !== undefined ? delta.outputMetadataHeight : this._layoutInfo.outputMetadataHeight;
|
|
176
|
+
const outputHeight = (delta.recomputeOutput || delta.rawOutputHeight !== undefined || delta.outputMetadataHeight !== undefined) ? this._getOutputTotalHeight(rawOutputHeight, outputMetadataHeight) : this._layoutInfo.outputTotalHeight;
|
|
177
|
+
const totalHeight = editorHeight
|
|
178
|
+
+ editorMargin
|
|
179
|
+
+ cellStatusHeight
|
|
180
|
+
+ metadataHeight
|
|
181
|
+
+ metadataStatusHeight
|
|
182
|
+
+ outputHeight
|
|
183
|
+
+ outputStatusHeight
|
|
184
|
+
+ bodyMargin;
|
|
185
|
+
const newLayout = {
|
|
186
|
+
width: width,
|
|
187
|
+
editorHeight: editorHeight,
|
|
188
|
+
editorMargin: editorMargin,
|
|
189
|
+
metadataHeight: metadataHeight,
|
|
190
|
+
cellStatusHeight,
|
|
191
|
+
metadataStatusHeight: metadataStatusHeight,
|
|
192
|
+
outputTotalHeight: outputHeight,
|
|
193
|
+
outputStatusHeight: outputStatusHeight,
|
|
194
|
+
bodyMargin: bodyMargin,
|
|
195
|
+
rawOutputHeight: rawOutputHeight,
|
|
196
|
+
outputMetadataHeight: outputMetadataHeight,
|
|
197
|
+
totalHeight: totalHeight,
|
|
198
|
+
layoutState: CellLayoutState.Measured
|
|
199
|
+
};
|
|
200
|
+
let somethingChanged = false;
|
|
201
|
+
const changeEvent = {};
|
|
202
|
+
if (newLayout.width !== this._layoutInfo.width) {
|
|
203
|
+
changeEvent.width = true;
|
|
204
|
+
somethingChanged = true;
|
|
205
|
+
}
|
|
206
|
+
if (newLayout.editorHeight !== this._layoutInfo.editorHeight) {
|
|
207
|
+
changeEvent.editorHeight = true;
|
|
208
|
+
somethingChanged = true;
|
|
209
|
+
}
|
|
210
|
+
if (newLayout.editorMargin !== this._layoutInfo.editorMargin) {
|
|
211
|
+
changeEvent.editorMargin = true;
|
|
212
|
+
somethingChanged = true;
|
|
213
|
+
}
|
|
214
|
+
if (newLayout.metadataHeight !== this._layoutInfo.metadataHeight) {
|
|
215
|
+
changeEvent.metadataHeight = true;
|
|
216
|
+
somethingChanged = true;
|
|
217
|
+
}
|
|
218
|
+
if (newLayout.cellStatusHeight !== this._layoutInfo.cellStatusHeight) {
|
|
219
|
+
changeEvent.cellStatusHeight = true;
|
|
220
|
+
somethingChanged = true;
|
|
221
|
+
}
|
|
222
|
+
if (newLayout.metadataStatusHeight !== this._layoutInfo.metadataStatusHeight) {
|
|
223
|
+
changeEvent.metadataStatusHeight = true;
|
|
224
|
+
somethingChanged = true;
|
|
225
|
+
}
|
|
226
|
+
if (newLayout.outputTotalHeight !== this._layoutInfo.outputTotalHeight) {
|
|
227
|
+
changeEvent.outputTotalHeight = true;
|
|
228
|
+
somethingChanged = true;
|
|
229
|
+
}
|
|
230
|
+
if (newLayout.outputStatusHeight !== this._layoutInfo.outputStatusHeight) {
|
|
231
|
+
changeEvent.outputStatusHeight = true;
|
|
232
|
+
somethingChanged = true;
|
|
233
|
+
}
|
|
234
|
+
if (newLayout.bodyMargin !== this._layoutInfo.bodyMargin) {
|
|
235
|
+
changeEvent.bodyMargin = true;
|
|
236
|
+
somethingChanged = true;
|
|
237
|
+
}
|
|
238
|
+
if (newLayout.outputMetadataHeight !== this._layoutInfo.outputMetadataHeight) {
|
|
239
|
+
changeEvent.outputMetadataHeight = true;
|
|
240
|
+
somethingChanged = true;
|
|
241
|
+
}
|
|
242
|
+
if (newLayout.totalHeight !== this._layoutInfo.totalHeight) {
|
|
243
|
+
changeEvent.totalHeight = true;
|
|
244
|
+
somethingChanged = true;
|
|
245
|
+
}
|
|
246
|
+
if (somethingChanged) {
|
|
247
|
+
this._layoutInfo = newLayout;
|
|
248
|
+
this._fireLayoutChangeEvent(changeEvent);
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
getHeight(lineHeight) {
|
|
252
|
+
if (this._layoutInfo.layoutState === CellLayoutState.Uninitialized) {
|
|
253
|
+
const editorHeight = this.estimateEditorHeight(lineHeight);
|
|
254
|
+
return this._computeTotalHeight(editorHeight);
|
|
255
|
+
}
|
|
256
|
+
else {
|
|
257
|
+
return this._layoutInfo.totalHeight;
|
|
258
|
+
}
|
|
259
|
+
}
|
|
260
|
+
_computeTotalHeight(editorHeight) {
|
|
261
|
+
const totalHeight = editorHeight
|
|
262
|
+
+ this._layoutInfo.editorMargin
|
|
263
|
+
+ this._layoutInfo.metadataHeight
|
|
264
|
+
+ this._layoutInfo.cellStatusHeight
|
|
265
|
+
+ this._layoutInfo.metadataStatusHeight
|
|
266
|
+
+ this._layoutInfo.outputTotalHeight
|
|
267
|
+
+ this._layoutInfo.outputStatusHeight
|
|
268
|
+
+ this._layoutInfo.outputMetadataHeight
|
|
269
|
+
+ this._layoutInfo.bodyMargin;
|
|
270
|
+
return totalHeight;
|
|
271
|
+
}
|
|
272
|
+
estimateEditorHeight(lineHeight = 20) {
|
|
273
|
+
const verticalScrollbarHeight = 0;
|
|
274
|
+
const lineCount = Math.max(this.original?.textModel.textBuffer.getLineCount() ?? 1, this.modified?.textModel.textBuffer.getLineCount() ?? 1);
|
|
275
|
+
return lineCount * lineHeight
|
|
276
|
+
+ 24
|
|
277
|
+
+ 12
|
|
278
|
+
+ verticalScrollbarHeight;
|
|
279
|
+
}
|
|
280
|
+
_getOutputTotalHeight(rawOutputHeight, metadataHeight) {
|
|
281
|
+
if (this.outputFoldingState === PropertyFoldingState.Collapsed) {
|
|
282
|
+
return 0;
|
|
283
|
+
}
|
|
284
|
+
if (this.renderOutput) {
|
|
285
|
+
if (this.isOutputEmpty()) {
|
|
286
|
+
return 24;
|
|
287
|
+
}
|
|
288
|
+
return this.getRichOutputTotalHeight() + metadataHeight;
|
|
289
|
+
}
|
|
290
|
+
else {
|
|
291
|
+
return rawOutputHeight;
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
_fireLayoutChangeEvent(state) {
|
|
295
|
+
this._layoutInfoEmitter.fire(state);
|
|
296
|
+
this.editorEventDispatcher.emit([{ type: NotebookDiffViewEventType.CellLayoutChanged, source: this._layoutInfo }]);
|
|
297
|
+
}
|
|
298
|
+
getComputedCellContainerWidth(layoutInfo, diffEditor, fullWidth) {
|
|
299
|
+
if (fullWidth) {
|
|
300
|
+
return layoutInfo.width - 2 * DIFF_CELL_MARGIN + (diffEditor ? DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH : 0) - 2;
|
|
301
|
+
}
|
|
302
|
+
return (layoutInfo.width - 2 * DIFF_CELL_MARGIN + (diffEditor ? DiffEditorWidget.ENTIRE_DIFF_OVERVIEW_WIDTH : 0)) / 2 - 18 - 2;
|
|
303
|
+
}
|
|
304
|
+
getOutputEditorViewState() {
|
|
305
|
+
return this._outputEditorViewState;
|
|
306
|
+
}
|
|
307
|
+
saveOutputEditorViewState(viewState) {
|
|
308
|
+
this._outputEditorViewState = viewState;
|
|
309
|
+
}
|
|
310
|
+
getMetadataEditorViewState() {
|
|
311
|
+
return this._metadataEditorViewState;
|
|
312
|
+
}
|
|
313
|
+
saveMetadataEditorViewState(viewState) {
|
|
314
|
+
this._metadataEditorViewState = viewState;
|
|
315
|
+
}
|
|
316
|
+
getSourceEditorViewState() {
|
|
317
|
+
return this._sourceEditorViewState;
|
|
318
|
+
}
|
|
319
|
+
saveSpirceEditorViewState(viewState) {
|
|
320
|
+
this._sourceEditorViewState = viewState;
|
|
321
|
+
}
|
|
322
|
+
}
|
|
323
|
+
class SideBySideDiffElementViewModel extends DiffElementCellViewModelBase {
|
|
324
|
+
get originalDocument() {
|
|
325
|
+
return this.otherDocumentTextModel;
|
|
326
|
+
}
|
|
327
|
+
get modifiedDocument() {
|
|
328
|
+
return this.mainDocumentTextModel;
|
|
329
|
+
}
|
|
330
|
+
constructor(mainDocumentTextModel, otherDocumentTextModel, original, modified, type, editorEventDispatcher, initData, notebookService) {
|
|
331
|
+
super(mainDocumentTextModel, original, modified, type, editorEventDispatcher, initData, notebookService);
|
|
332
|
+
this.otherDocumentTextModel = otherDocumentTextModel;
|
|
333
|
+
this.type = type;
|
|
334
|
+
this.cellFoldingState = this.modified.textModel.getValue() !== this.original.textModel.getValue() ? PropertyFoldingState.Expanded : PropertyFoldingState.Collapsed;
|
|
335
|
+
this.metadataFoldingState = PropertyFoldingState.Collapsed;
|
|
336
|
+
this.outputFoldingState = PropertyFoldingState.Collapsed;
|
|
337
|
+
if (this.checkMetadataIfModified()) {
|
|
338
|
+
this.metadataFoldingState = PropertyFoldingState.Expanded;
|
|
339
|
+
}
|
|
340
|
+
if (this.checkIfOutputsModified()) {
|
|
341
|
+
this.outputFoldingState = PropertyFoldingState.Expanded;
|
|
342
|
+
}
|
|
343
|
+
this._register(this.original.onDidChangeOutputLayout(() => {
|
|
344
|
+
this._layout({ recomputeOutput: true });
|
|
345
|
+
}));
|
|
346
|
+
this._register(this.modified.onDidChangeOutputLayout(() => {
|
|
347
|
+
this._layout({ recomputeOutput: true });
|
|
348
|
+
}));
|
|
349
|
+
this._register(this.modified.textModel.onDidChangeContent(() => {
|
|
350
|
+
if (mainDocumentTextModel.transientOptions.cellContentMetadata) {
|
|
351
|
+
const cellMetadataKeys = [...( Object.keys(mainDocumentTextModel.transientOptions.cellContentMetadata))];
|
|
352
|
+
const modifiedMedataRaw = Object.assign({}, this.modified.metadata);
|
|
353
|
+
const originalCellMetadata = this.original.metadata;
|
|
354
|
+
for (const key of cellMetadataKeys) {
|
|
355
|
+
if (key in originalCellMetadata) {
|
|
356
|
+
modifiedMedataRaw[key] = originalCellMetadata[key];
|
|
357
|
+
}
|
|
358
|
+
}
|
|
359
|
+
this.modified.textModel.metadata = modifiedMedataRaw;
|
|
360
|
+
}
|
|
361
|
+
}));
|
|
362
|
+
}
|
|
363
|
+
checkIfInputModified() {
|
|
364
|
+
if (this.original.textModel.getTextBufferHash() === this.modified.textModel.getTextBufferHash()) {
|
|
365
|
+
return false;
|
|
366
|
+
}
|
|
367
|
+
return {
|
|
368
|
+
reason: 'Cell content has changed',
|
|
369
|
+
};
|
|
370
|
+
}
|
|
371
|
+
checkIfOutputsModified() {
|
|
372
|
+
if (this.mainDocumentTextModel.transientOptions.transientOutputs) {
|
|
373
|
+
return false;
|
|
374
|
+
}
|
|
375
|
+
const ret = outputsEqual(this.original?.outputs ?? [], this.modified?.outputs ?? []);
|
|
376
|
+
if (ret === OutputComparison.Unchanged) {
|
|
377
|
+
return false;
|
|
378
|
+
}
|
|
379
|
+
return {
|
|
380
|
+
reason: ret === OutputComparison.Metadata ? 'Output metadata is changed' : undefined,
|
|
381
|
+
kind: ret
|
|
382
|
+
};
|
|
383
|
+
}
|
|
384
|
+
checkMetadataIfModified() {
|
|
385
|
+
const modified = hash(getFormattedMetadataJSON(this.mainDocumentTextModel, this.original?.metadata || {}, this.original?.language)) !== hash(getFormattedMetadataJSON(this.mainDocumentTextModel, this.modified?.metadata ?? {}, this.modified?.language));
|
|
386
|
+
if (modified) {
|
|
387
|
+
return { reason: undefined };
|
|
388
|
+
}
|
|
389
|
+
else {
|
|
390
|
+
return false;
|
|
391
|
+
}
|
|
392
|
+
}
|
|
393
|
+
updateOutputHeight(diffSide, index, height) {
|
|
394
|
+
if (diffSide === DiffSide.Original) {
|
|
395
|
+
this.original.updateOutputHeight(index, height);
|
|
396
|
+
}
|
|
397
|
+
else {
|
|
398
|
+
this.modified.updateOutputHeight(index, height);
|
|
399
|
+
}
|
|
400
|
+
}
|
|
401
|
+
getOutputOffsetInContainer(diffSide, index) {
|
|
402
|
+
if (diffSide === DiffSide.Original) {
|
|
403
|
+
return this.original.getOutputOffset(index);
|
|
404
|
+
}
|
|
405
|
+
else {
|
|
406
|
+
return this.modified.getOutputOffset(index);
|
|
407
|
+
}
|
|
408
|
+
}
|
|
409
|
+
getOutputOffsetInCell(diffSide, index) {
|
|
410
|
+
const offsetInOutputsContainer = this.getOutputOffsetInContainer(diffSide, index);
|
|
411
|
+
return this._layoutInfo.editorHeight
|
|
412
|
+
+ this._layoutInfo.editorMargin
|
|
413
|
+
+ this._layoutInfo.metadataHeight
|
|
414
|
+
+ this._layoutInfo.cellStatusHeight
|
|
415
|
+
+ this._layoutInfo.metadataStatusHeight
|
|
416
|
+
+ this._layoutInfo.outputStatusHeight
|
|
417
|
+
+ this._layoutInfo.bodyMargin / 2
|
|
418
|
+
+ offsetInOutputsContainer;
|
|
419
|
+
}
|
|
420
|
+
isOutputEmpty() {
|
|
421
|
+
if (this.mainDocumentTextModel.transientOptions.transientOutputs) {
|
|
422
|
+
return true;
|
|
423
|
+
}
|
|
424
|
+
if (this.checkIfOutputsModified()) {
|
|
425
|
+
return false;
|
|
426
|
+
}
|
|
427
|
+
return (this.original?.outputs || []).length === 0;
|
|
428
|
+
}
|
|
429
|
+
getRichOutputTotalHeight() {
|
|
430
|
+
return Math.max(this.original.getOutputTotalHeight(), this.modified.getOutputTotalHeight());
|
|
431
|
+
}
|
|
432
|
+
getNestedCellViewModel(diffSide) {
|
|
433
|
+
return diffSide === DiffSide.Original ? this.original : this.modified;
|
|
434
|
+
}
|
|
435
|
+
getCellByUri(cellUri) {
|
|
436
|
+
if (( cellUri.toString()) === ( this.original.uri.toString())) {
|
|
437
|
+
return this.original;
|
|
438
|
+
}
|
|
439
|
+
else {
|
|
440
|
+
return this.modified;
|
|
441
|
+
}
|
|
442
|
+
}
|
|
443
|
+
}
|
|
444
|
+
class SingleSideDiffElementViewModel extends DiffElementCellViewModelBase {
|
|
445
|
+
get cellViewModel() {
|
|
446
|
+
return this.type === 'insert' ? this.modified : this.original;
|
|
447
|
+
}
|
|
448
|
+
get originalDocument() {
|
|
449
|
+
if (this.type === 'insert') {
|
|
450
|
+
return this.otherDocumentTextModel;
|
|
451
|
+
}
|
|
452
|
+
else {
|
|
453
|
+
return this.mainDocumentTextModel;
|
|
454
|
+
}
|
|
455
|
+
}
|
|
456
|
+
get modifiedDocument() {
|
|
457
|
+
if (this.type === 'insert') {
|
|
458
|
+
return this.mainDocumentTextModel;
|
|
459
|
+
}
|
|
460
|
+
else {
|
|
461
|
+
return this.otherDocumentTextModel;
|
|
462
|
+
}
|
|
463
|
+
}
|
|
464
|
+
constructor(mainDocumentTextModel, otherDocumentTextModel, original, modified, type, editorEventDispatcher, initData, notebookService) {
|
|
465
|
+
super(mainDocumentTextModel, original, modified, type, editorEventDispatcher, initData, notebookService);
|
|
466
|
+
this.otherDocumentTextModel = otherDocumentTextModel;
|
|
467
|
+
this.type = type;
|
|
468
|
+
this._register(this.cellViewModel.onDidChangeOutputLayout(() => {
|
|
469
|
+
this._layout({ recomputeOutput: true });
|
|
470
|
+
}));
|
|
471
|
+
}
|
|
472
|
+
checkIfInputModified() {
|
|
473
|
+
return {
|
|
474
|
+
reason: 'Cell content has changed',
|
|
475
|
+
};
|
|
476
|
+
}
|
|
477
|
+
getNestedCellViewModel(diffSide) {
|
|
478
|
+
return this.type === 'insert' ? this.modified : this.original;
|
|
479
|
+
}
|
|
480
|
+
checkIfOutputsModified() {
|
|
481
|
+
return false;
|
|
482
|
+
}
|
|
483
|
+
checkMetadataIfModified() {
|
|
484
|
+
return false;
|
|
485
|
+
}
|
|
486
|
+
updateOutputHeight(diffSide, index, height) {
|
|
487
|
+
this.cellViewModel?.updateOutputHeight(index, height);
|
|
488
|
+
}
|
|
489
|
+
getOutputOffsetInContainer(diffSide, index) {
|
|
490
|
+
return this.cellViewModel.getOutputOffset(index);
|
|
491
|
+
}
|
|
492
|
+
getOutputOffsetInCell(diffSide, index) {
|
|
493
|
+
const offsetInOutputsContainer = this.cellViewModel.getOutputOffset(index);
|
|
494
|
+
return this._layoutInfo.editorHeight
|
|
495
|
+
+ this._layoutInfo.editorMargin
|
|
496
|
+
+ this._layoutInfo.metadataHeight
|
|
497
|
+
+ this._layoutInfo.cellStatusHeight
|
|
498
|
+
+ this._layoutInfo.metadataStatusHeight
|
|
499
|
+
+ this._layoutInfo.outputStatusHeight
|
|
500
|
+
+ this._layoutInfo.bodyMargin / 2
|
|
501
|
+
+ offsetInOutputsContainer;
|
|
502
|
+
}
|
|
503
|
+
isOutputEmpty() {
|
|
504
|
+
if (this.mainDocumentTextModel.transientOptions.transientOutputs) {
|
|
505
|
+
return true;
|
|
506
|
+
}
|
|
507
|
+
return (this.original?.outputs || this.modified?.outputs || []).length === 0;
|
|
508
|
+
}
|
|
509
|
+
getRichOutputTotalHeight() {
|
|
510
|
+
return this.cellViewModel?.getOutputTotalHeight() ?? 0;
|
|
511
|
+
}
|
|
512
|
+
getCellByUri(cellUri) {
|
|
513
|
+
return this.cellViewModel;
|
|
514
|
+
}
|
|
515
|
+
}
|
|
516
|
+
var OutputComparison;
|
|
517
|
+
( (function(OutputComparison) {
|
|
518
|
+
OutputComparison[OutputComparison["Unchanged"] = 0] = "Unchanged";
|
|
519
|
+
OutputComparison[OutputComparison["Metadata"] = 1] = "Metadata";
|
|
520
|
+
OutputComparison[OutputComparison["Other"] = 2] = "Other";
|
|
521
|
+
})(OutputComparison || (OutputComparison = {})));
|
|
522
|
+
function outputEqual(a, b) {
|
|
523
|
+
if (hash(a.metadata) === hash(b.metadata)) {
|
|
524
|
+
return OutputComparison.Other;
|
|
525
|
+
}
|
|
526
|
+
for (let j = 0; j < a.outputs.length; j++) {
|
|
527
|
+
const aOutputItem = a.outputs[j];
|
|
528
|
+
const bOutputItem = b.outputs[j];
|
|
529
|
+
if (aOutputItem.mime !== bOutputItem.mime) {
|
|
530
|
+
return OutputComparison.Other;
|
|
531
|
+
}
|
|
532
|
+
if (aOutputItem.data.buffer.length !== bOutputItem.data.buffer.length) {
|
|
533
|
+
return OutputComparison.Other;
|
|
534
|
+
}
|
|
535
|
+
for (let k = 0; k < aOutputItem.data.buffer.length; k++) {
|
|
536
|
+
if (aOutputItem.data.buffer[k] !== bOutputItem.data.buffer[k]) {
|
|
537
|
+
return OutputComparison.Other;
|
|
538
|
+
}
|
|
539
|
+
}
|
|
540
|
+
}
|
|
541
|
+
return OutputComparison.Metadata;
|
|
542
|
+
}
|
|
543
|
+
function outputsEqual(original, modified) {
|
|
544
|
+
if (original.length !== modified.length) {
|
|
545
|
+
return OutputComparison.Other;
|
|
546
|
+
}
|
|
547
|
+
const len = original.length;
|
|
548
|
+
for (let i = 0; i < len; i++) {
|
|
549
|
+
const a = original[i];
|
|
550
|
+
const b = modified[i];
|
|
551
|
+
if (hash(a.metadata) !== hash(b.metadata)) {
|
|
552
|
+
return OutputComparison.Metadata;
|
|
553
|
+
}
|
|
554
|
+
if (a.outputs.length !== b.outputs.length) {
|
|
555
|
+
return OutputComparison.Other;
|
|
556
|
+
}
|
|
557
|
+
for (let j = 0; j < a.outputs.length; j++) {
|
|
558
|
+
const aOutputItem = a.outputs[j];
|
|
559
|
+
const bOutputItem = b.outputs[j];
|
|
560
|
+
if (aOutputItem.mime !== bOutputItem.mime) {
|
|
561
|
+
return OutputComparison.Other;
|
|
562
|
+
}
|
|
563
|
+
if (aOutputItem.data.buffer.length !== bOutputItem.data.buffer.length) {
|
|
564
|
+
return OutputComparison.Other;
|
|
565
|
+
}
|
|
566
|
+
for (let k = 0; k < aOutputItem.data.buffer.length; k++) {
|
|
567
|
+
if (aOutputItem.data.buffer[k] !== bOutputItem.data.buffer[k]) {
|
|
568
|
+
return OutputComparison.Other;
|
|
569
|
+
}
|
|
570
|
+
}
|
|
571
|
+
}
|
|
572
|
+
}
|
|
573
|
+
return OutputComparison.Unchanged;
|
|
574
|
+
}
|
|
575
|
+
function getFormattedMetadataJSON(documentTextModel, metadata, language) {
|
|
576
|
+
let filteredMetadata = {};
|
|
577
|
+
if (documentTextModel) {
|
|
578
|
+
const transientCellMetadata = documentTextModel.transientOptions.transientCellMetadata;
|
|
579
|
+
const keys = ( new Set([...( Object.keys(metadata))]));
|
|
580
|
+
for (const key of keys) {
|
|
581
|
+
if (!(transientCellMetadata[key])) {
|
|
582
|
+
filteredMetadata[key] = metadata[key];
|
|
583
|
+
}
|
|
584
|
+
}
|
|
585
|
+
}
|
|
586
|
+
else {
|
|
587
|
+
filteredMetadata = metadata;
|
|
588
|
+
}
|
|
589
|
+
const obj = {
|
|
590
|
+
language,
|
|
591
|
+
...filteredMetadata
|
|
592
|
+
};
|
|
593
|
+
if (language) {
|
|
594
|
+
obj.language = language;
|
|
595
|
+
}
|
|
596
|
+
const metadataSource = toFormattedString(obj, {});
|
|
597
|
+
return metadataSource;
|
|
598
|
+
}
|
|
599
|
+
function getStreamOutputData(outputs) {
|
|
600
|
+
if (!outputs.length) {
|
|
601
|
+
return null;
|
|
602
|
+
}
|
|
603
|
+
const first = outputs[0];
|
|
604
|
+
const mime = first.mime;
|
|
605
|
+
const sameStream = !outputs.find(op => op.mime !== mime);
|
|
606
|
+
if (sameStream) {
|
|
607
|
+
return ( outputs.map(opit => ( opit.data.toString()))).join('');
|
|
608
|
+
}
|
|
609
|
+
else {
|
|
610
|
+
return null;
|
|
611
|
+
}
|
|
612
|
+
}
|
|
613
|
+
function getFormattedOutputJSON(outputs) {
|
|
614
|
+
if (outputs.length === 1) {
|
|
615
|
+
const streamOutputData = getStreamOutputData(outputs[0].outputs);
|
|
616
|
+
if (streamOutputData) {
|
|
617
|
+
return streamOutputData;
|
|
618
|
+
}
|
|
619
|
+
}
|
|
620
|
+
return JSON.stringify(( outputs.map(output => {
|
|
621
|
+
return ({
|
|
622
|
+
metadata: output.metadata,
|
|
623
|
+
outputItems: ( output.outputs.map(opit => ({
|
|
624
|
+
mimeType: opit.mime,
|
|
625
|
+
data: ( opit.data.toString())
|
|
626
|
+
})))
|
|
627
|
+
});
|
|
628
|
+
})), undefined, '\t');
|
|
629
|
+
}
|
|
630
|
+
export { DiffElementCellViewModelBase, DiffElementPlaceholderViewModel, DiffElementViewModelBase, OUTPUT_EDITOR_HEIGHT_MAGIC, OutputComparison, PropertyFoldingState, SideBySideDiffElementViewModel, SingleSideDiffElementViewModel, getFormattedMetadataJSON, getFormattedOutputJSON, getStreamOutputData, outputEqual };
|