@codingame/monaco-vscode-api 4.5.1 → 4.5.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/extensions.js +10 -2
- package/package.json +8 -8
- package/services.js +1 -0
- package/vscode/src/vs/base/browser/defaultWorkerFactory.js +4 -2
- package/vscode/src/vs/base/browser/dom.js +3 -3
- package/vscode/src/vs/base/browser/iframe.js +3 -1
- package/vscode/src/vs/base/browser/indexedDB.js +2 -2
- package/vscode/src/vs/base/browser/ui/actionbar/actionViewItems.js +4 -9
- package/vscode/src/vs/base/browser/ui/button/button.js +16 -19
- package/vscode/src/vs/base/browser/ui/dialog/dialog.js +168 -165
- package/vscode/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.js +5 -8
- package/vscode/src/vs/base/browser/ui/findinput/findInput.js +19 -18
- package/vscode/src/vs/base/browser/ui/findinput/findInputToggles.js +4 -15
- package/vscode/src/vs/base/browser/ui/findinput/replaceInput.js +13 -16
- package/vscode/src/vs/base/browser/ui/hover/hoverWidget.js +10 -12
- package/vscode/src/vs/base/browser/ui/hover/updatableHoverWidget.js +13 -14
- package/vscode/src/vs/base/browser/ui/inputbox/inputBox.js +19 -39
- package/vscode/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.js +3 -2
- package/vscode/src/vs/base/browser/ui/list/listView.js +6 -6
- package/vscode/src/vs/base/browser/ui/list/listWidget.js +7 -7
- package/vscode/src/vs/base/browser/ui/list/rowCache.js +2 -2
- package/vscode/src/vs/base/browser/ui/menu/menubar.js +24 -23
- package/vscode/src/vs/base/browser/ui/scrollbar/scrollableElement.js +1 -1
- package/vscode/src/vs/base/browser/ui/selectBox/selectBoxCustom.js +12 -15
- package/vscode/src/vs/base/browser/ui/splitview/paneview.js +25 -25
- package/vscode/src/vs/base/browser/ui/splitview/splitview.js +10 -10
- package/vscode/src/vs/base/browser/ui/table/tableWidget.js +1 -1
- package/vscode/src/vs/base/browser/ui/toolbar/toolbar.js +11 -10
- package/vscode/src/vs/base/browser/ui/tree/abstractTree.js +177 -152
- package/vscode/src/vs/base/browser/ui/tree/asyncDataTree.js +7 -7
- package/vscode/src/vs/base/browser/ui/tree/compressedObjectTreeModel.js +2 -2
- package/vscode/src/vs/base/browser/ui/tree/dataTree.js +2 -2
- package/vscode/src/vs/base/browser/ui/tree/indexTreeModel.js +6 -6
- package/vscode/src/vs/base/browser/ui/tree/objectTree.js +1 -1
- package/vscode/src/vs/base/browser/ui/tree/objectTreeModel.js +4 -4
- package/vscode/src/vs/base/browser/ui/tree/treeDefaults.js +2 -1
- package/vscode/src/vs/base/common/actions.js +6 -5
- package/vscode/src/vs/base/common/arrays.js +2 -2
- package/vscode/src/vs/base/common/arraysFind.js +3 -1
- package/vscode/src/vs/base/common/assert.js +2 -2
- package/vscode/src/vs/base/common/async.js +3 -3
- package/vscode/src/vs/base/common/buffer.js +2 -2
- package/vscode/src/vs/base/common/codiconsUtil.js +1 -1
- package/vscode/src/vs/base/common/color.js +2 -2
- package/vscode/src/vs/base/common/date.js +70 -284
- package/vscode/src/vs/base/common/decorators.js +2 -2
- package/vscode/src/vs/base/common/diff/diff.js +1 -1
- package/vscode/src/vs/base/common/errorMessage.js +12 -22
- package/vscode/src/vs/base/common/errors.js +2 -2
- package/vscode/src/vs/base/common/event.js +2 -2
- package/vscode/src/vs/base/common/extpath.js +1 -1
- package/vscode/src/vs/base/common/filters.js +1 -1
- package/vscode/src/vs/base/common/history.js +1 -1
- package/vscode/src/vs/base/common/jsonEdit.js +6 -4
- package/vscode/src/vs/base/common/jsonErrorMessages.js +10 -45
- package/vscode/src/vs/base/common/keyCodes.js +3 -1
- package/vscode/src/vs/base/common/keybindingLabels.js +29 -108
- package/vscode/src/vs/base/common/labels.js +2 -2
- package/vscode/src/vs/base/common/lifecycle.js +5 -5
- package/vscode/src/vs/base/common/map.js +11 -11
- package/vscode/src/vs/base/common/objects.js +1 -1
- package/vscode/src/vs/base/common/path.js +2 -2
- package/vscode/src/vs/base/common/platform.js +7 -26
- package/vscode/src/vs/base/common/stream.js +1 -1
- package/vscode/src/vs/base/common/strings.js +2 -2
- package/vscode/src/vs/base/common/ternarySearchTree.js +3 -3
- package/vscode/src/vs/base/common/types.js +7 -5
- package/vscode/src/vs/base/common/uri.js +11 -5
- package/vscode/src/vs/base/common/worker/simpleWorker.js +7 -7
- package/vscode/src/vs/base/parts/ipc/common/ipc.net.js +1 -1
- package/vscode/src/vs/editor/browser/config/editorConfiguration.js +1 -1
- package/vscode/src/vs/editor/browser/controller/textAreaHandler.js +47 -42
- package/vscode/src/vs/editor/browser/coreCommands.js +104 -115
- package/vscode/src/vs/editor/browser/editorExtensions.js +24 -35
- package/vscode/src/vs/editor/browser/services/abstractCodeEditorService.js +2 -2
- package/vscode/src/vs/editor/browser/services/bulkEditService.js +1 -1
- package/vscode/src/vs/editor/browser/services/editorWorkerService.js +1 -1
- package/vscode/src/vs/editor/browser/services/hoverService/hoverWidget.js +18 -22
- package/vscode/src/vs/editor/browser/services/openerService.js +1 -1
- package/vscode/src/vs/editor/browser/view/viewLayer.js +1 -1
- package/vscode/src/vs/editor/browser/view.js +6 -6
- package/vscode/src/vs/editor/browser/viewParts/lines/viewLine.js +1 -1
- package/vscode/src/vs/editor/browser/viewParts/lines/viewLines.js +2 -2
- package/vscode/src/vs/editor/browser/viewParts/minimap/minimapCharRendererFactory.js +1 -1
- package/vscode/src/vs/editor/browser/viewParts/viewZones/viewZones.js +1 -1
- package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorContributions.js +1 -1
- package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.js +129 -128
- package/vscode/src/vs/editor/browser/widget/diffEditor/commands.js +25 -68
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer.js +66 -99
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.js +10 -9
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin.js +15 -34
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditor.contribution.js +25 -41
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffProviderFactoryService.js +1 -1
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.js +27 -51
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.js +40 -31
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.js +13 -20
- package/vscode/src/vs/editor/browser/widget/diffEditor/registrations.contribution.js +8 -19
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/colors.js +4 -15
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js +1 -1
- package/vscode/src/vs/editor/common/config/editorConfigurationSchema.js +83 -154
- package/vscode/src/vs/editor/common/config/editorOptions.js +863 -1427
- package/vscode/src/vs/editor/common/core/editorColorRegistry.js +110 -253
- package/vscode/src/vs/editor/common/core/lineRange.js +4 -2
- package/vscode/src/vs/editor/common/core/offsetRange.js +3 -3
- package/vscode/src/vs/editor/common/core/textEdit.js +1 -1
- package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm.js +1 -1
- package/vscode/src/vs/editor/common/diff/legacyLinesDiffComputer.js +1 -1
- package/vscode/src/vs/editor/common/editorContextKeys.js +80 -239
- package/vscode/src/vs/editor/common/languages/modesRegistry.js +5 -8
- package/vscode/src/vs/editor/common/languages/supports/tokenization.js +2 -2
- package/vscode/src/vs/editor/common/languages.js +68 -71
- package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/ast.js +12 -12
- package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/concat23Trees.js +2 -2
- package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/nodeReader.js +1 -1
- package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/parser.js +2 -2
- package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer.js +1 -1
- package/vscode/src/vs/editor/common/model/editStack.js +47 -36
- package/vscode/src/vs/editor/common/model/guidesTextModelPart.js +3 -3
- package/vscode/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.js +2 -2
- package/vscode/src/vs/editor/common/model/textModel.js +9 -9
- package/vscode/src/vs/editor/common/model/textModelPart.js +1 -1
- package/vscode/src/vs/editor/common/model/textModelTokens.js +2 -2
- package/vscode/src/vs/editor/common/model/tokenizationTextModelPart.js +1 -1
- package/vscode/src/vs/editor/common/services/editorSimpleWorker.js +2 -2
- package/vscode/src/vs/editor/common/services/modelService.js +1 -1
- package/vscode/src/vs/editor/common/standaloneStrings.js +56 -115
- package/vscode/src/vs/editor/common/textModelGuides.js +1 -1
- package/vscode/src/vs/editor/common/tokens/contiguousMultilineTokens.js +2 -2
- package/vscode/src/vs/editor/common/tokens/sparseMultilineTokens.js +1 -1
- package/vscode/src/vs/editor/common/viewLayout/viewLineRenderer.js +79 -67
- package/vscode/src/vs/editor/common/viewModel/modelLineProjection.js +12 -12
- package/vscode/src/vs/editor/contrib/anchorSelect/browser/anchorSelect.js +12 -31
- package/vscode/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.js +25 -40
- package/vscode/src/vs/editor/contrib/caretOperations/browser/caretOperations.js +4 -11
- package/vscode/src/vs/editor/contrib/caretOperations/browser/transpose.js +3 -6
- package/vscode/src/vs/editor/contrib/clipboard/browser/clipboard.js +28 -76
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeAction.js +36 -25
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionCommands.js +54 -143
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionContributions.js +8 -7
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionController.js +30 -37
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionMenu.js +25 -54
- package/vscode/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.js +15 -28
- package/vscode/src/vs/editor/contrib/codelens/browser/codeLensCache.js +1 -1
- package/vscode/src/vs/editor/contrib/codelens/browser/codelensController.js +30 -37
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.js +24 -31
- package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerActions.js +7 -24
- package/vscode/src/vs/editor/contrib/comment/browser/comment.js +11 -34
- package/vscode/src/vs/editor/contrib/contextmenu/browser/contextmenu.js +37 -70
- package/vscode/src/vs/editor/contrib/cursorUndo/browser/cursorUndo.js +15 -14
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteContribution.js +6 -13
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.js +33 -50
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/defaultProviders.js +37 -68
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorContribution.js +4 -3
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js +20 -27
- package/vscode/src/vs/editor/contrib/editorState/browser/keybindingCancellation.js +8 -7
- package/vscode/src/vs/editor/contrib/find/browser/findController.js +83 -120
- package/vscode/src/vs/editor/contrib/find/browser/findWidget.js +59 -143
- package/vscode/src/vs/editor/contrib/folding/browser/folding.js +51 -117
- package/vscode/src/vs/editor/contrib/folding/browser/foldingDecorations.js +13 -32
- package/vscode/src/vs/editor/contrib/folding/browser/foldingRanges.js +2 -2
- package/vscode/src/vs/editor/contrib/fontZoom/browser/fontZoom.js +4 -15
- package/vscode/src/vs/editor/contrib/format/browser/formatActions.js +28 -35
- package/vscode/src/vs/editor/contrib/gotoError/browser/gotoError.js +21 -52
- package/vscode/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.js +38 -77
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.js +109 -246
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.js +21 -23
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.js +40 -30
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesTree.js +23 -34
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.js +31 -42
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/referencesModel.js +33 -39
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/symbolNavigation.js +24 -23
- package/vscode/src/vs/editor/contrib/hover/browser/hover.js +31 -95
- package/vscode/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.js +41 -32
- package/vscode/src/vs/editor/contrib/hover/browser/markerHoverParticipant.js +18 -37
- package/vscode/src/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace.js +11 -18
- package/vscode/src/vs/editor/contrib/indentation/browser/indentation.js +29 -76
- package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHints.js +1 -1
- package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.js +80 -99
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/commands.js +30 -63
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hoverParticipant.js +45 -42
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionContextKeys.js +11 -18
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController.js +28 -23
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.js +39 -60
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.js +2 -2
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/singleTextEdit.js +1 -1
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/utils.js +3 -1
- package/vscode/src/vs/editor/contrib/lineSelection/browser/lineSelection.js +2 -5
- package/vscode/src/vs/editor/contrib/linesOperations/browser/linesOperations.js +135 -234
- package/vscode/src/vs/editor/contrib/linkedEditing/browser/linkedEditing.js +26 -33
- package/vscode/src/vs/editor/contrib/links/browser/links.js +32 -64
- package/vscode/src/vs/editor/contrib/message/browser/messageController.js +13 -16
- package/vscode/src/vs/editor/contrib/multicursor/browser/multicursor.js +122 -195
- package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHints.js +17 -20
- package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.js +16 -32
- package/vscode/src/vs/editor/contrib/peekView/browser/peekView.js +43 -86
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.js +10 -24
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js +46 -170
- package/vscode/src/vs/editor/contrib/readOnlyMessage/browser/contribution.js +3 -10
- package/vscode/src/vs/editor/contrib/rename/browser/rename.js +54 -76
- package/vscode/src/vs/editor/contrib/rename/browser/renameWidget.js +37 -45
- package/vscode/src/vs/editor/contrib/smartSelect/browser/smartSelect.js +73 -86
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetController2.js +23 -38
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetSession.js +1 -1
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetVariables.js +13 -80
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.js +20 -56
- package/vscode/src/vs/editor/contrib/suggest/browser/suggest.js +55 -72
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestController.js +161 -147
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidget.js +43 -95
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.js +21 -28
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.js +16 -23
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetStatus.js +11 -10
- package/vscode/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.js +67 -66
- package/vscode/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.js +6 -13
- package/vscode/src/vs/editor/contrib/tokenization/browser/tokenization.js +3 -6
- package/vscode/src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.js +72 -136
- package/vscode/src/vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators.js +11 -26
- package/vscode/src/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.js +19 -22
- package/vscode/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.js +66 -59
- package/vscode/src/vs/editor/contrib/wordOperations/browser/wordOperations.js +72 -51
- package/vscode/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.js +1 -1
- package/vscode/src/vs/editor/standalone/browser/standaloneCodeEditor.js +3 -1
- package/vscode/src/vs/editor/standalone/browser/standaloneServices.js +7 -7
- package/vscode/src/vs/editor/standalone/browser/standaloneThemeService.js +2 -2
- package/vscode/src/vs/nls.js +1 -4
- package/vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.js +88 -255
- package/vscode/src/vs/platform/action/common/actionCommonCategories.js +9 -16
- package/vscode/src/vs/platform/actionWidget/browser/actionList.js +21 -41
- package/vscode/src/vs/platform/actionWidget/browser/actionWidget.js +18 -45
- package/vscode/src/vs/platform/actions/browser/buttonbar.js +19 -24
- package/vscode/src/vs/platform/actions/browser/menuEntryActionViewItem.js +40 -51
- package/vscode/src/vs/platform/actions/browser/toolbar.js +24 -23
- package/vscode/src/vs/platform/actions/common/actions.contribution.js +5 -0
- package/vscode/src/vs/platform/actions/common/actions.js +4 -2
- package/vscode/src/vs/platform/actions/common/menuResetAction.js +21 -0
- package/vscode/src/vs/platform/actions/common/menuService.js +49 -51
- package/vscode/src/vs/platform/commands/common/commands.js +2 -2
- package/vscode/src/vs/platform/configuration/common/configurationModels.js +1 -1
- package/vscode/src/vs/platform/configuration/common/configurationRegistry.js +38 -61
- package/vscode/src/vs/platform/contextkey/browser/contextKeyService.js +68 -51
- package/vscode/src/vs/platform/contextkey/common/contextkey.js +168 -130
- package/vscode/src/vs/platform/contextkey/common/contextkeys.js +14 -45
- package/vscode/src/vs/platform/contextkey/common/scanner.js +12 -26
- package/vscode/src/vs/platform/dialogs/common/dialogs.js +18 -33
- package/vscode/src/vs/platform/dnd/browser/dnd.js +24 -19
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.js +8 -15
- package/vscode/src/vs/platform/extensionManagement/common/extensionNls.js +2 -6
- package/vscode/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.js +335 -0
- package/vscode/src/vs/platform/extensionManagement/common/extensionsScannerService.js +915 -0
- package/vscode/src/vs/platform/extensions/common/extensionValidator.js +36 -43
- package/vscode/src/vs/platform/files/browser/htmlFileSystemProvider.js +23 -16
- package/vscode/src/vs/platform/files/common/files.js +41 -58
- package/vscode/src/vs/platform/history/browser/contextScopedHistoryWidget.js +28 -21
- package/vscode/src/vs/platform/hover/browser/hover.js +2 -2
- package/vscode/src/vs/platform/instantiation/common/instantiation.js +1 -1
- package/vscode/src/vs/platform/instantiation/common/instantiationService.js +7 -7
- package/vscode/src/vs/platform/keybinding/common/abstractKeybindingService.js +21 -20
- package/vscode/src/vs/platform/languagePacks/common/languagePacks.js +75 -6
- package/vscode/src/vs/platform/layout/browser/zIndexRegistry.js +4 -2
- package/vscode/src/vs/platform/list/browser/listService.js +159 -189
- package/vscode/src/vs/platform/log/common/log.js +20 -19
- package/vscode/src/vs/platform/markers/common/markerService.js +1 -1
- package/vscode/src/vs/platform/markers/common/markers.js +15 -14
- package/vscode/src/vs/platform/product/common/product.js +1 -1
- package/vscode/src/vs/platform/quickinput/browser/quickInput.js +34 -47
- package/vscode/src/vs/platform/quickinput/browser/quickInputController.js +183 -193
- package/vscode/src/vs/platform/quickinput/browser/quickInputTree.js +107 -98
- package/vscode/src/vs/platform/quickinput/browser/quickInputUtils.js +9 -8
- package/vscode/src/vs/platform/quickinput/browser/quickPickPin.js +5 -12
- package/vscode/src/vs/platform/request/common/request.js +31 -40
- package/vscode/src/vs/platform/terminal/common/terminal.js +3 -1
- package/vscode/src/vs/platform/theme/common/colors/baseColors.js +28 -59
- package/vscode/src/vs/platform/theme/common/colors/chartsColors.js +9 -40
- package/vscode/src/vs/platform/theme/common/colors/editorColors.js +151 -350
- package/vscode/src/vs/platform/theme/common/colors/inputColors.js +51 -170
- package/vscode/src/vs/platform/theme/common/colors/listColors.js +63 -90
- package/vscode/src/vs/platform/theme/common/colors/menuColors.js +8 -35
- package/vscode/src/vs/platform/theme/common/colors/minimapColors.js +14 -53
- package/vscode/src/vs/platform/theme/common/colors/miscColors.js +13 -32
- package/vscode/src/vs/platform/theme/common/colors/quickpickColors.js +14 -37
- package/vscode/src/vs/platform/theme/common/colors/searchColors.js +6 -13
- package/vscode/src/vs/platform/theme/common/iconRegistry.js +9 -24
- package/vscode/src/vs/platform/theme/common/tokenClassificationRegistry.js +64 -207
- package/vscode/src/vs/platform/undoRedo/common/undoRedoService.js +111 -114
- package/vscode/src/vs/platform/userDataProfile/common/userDataProfile.js +51 -54
- package/vscode/src/vs/platform/userDataSync/common/abstractSynchronizer.js +20 -5
- package/vscode/src/vs/platform/userDataSync/common/userDataSync.js +25 -32
- package/vscode/src/vs/platform/userDataSync/common/userDataSyncMachines.js +7 -1
- package/vscode/src/vs/platform/userDataSync/common/userDataSyncStoreService.js +173 -35
- package/vscode/src/vs/platform/workspace/common/workspace.js +8 -9
- package/vscode/src/vs/platform/workspaces/common/workspaces.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHost.api.impl.js +3 -3
- package/vscode/src/vs/workbench/api/common/extHostAiRelatedInformation.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostApiCommands.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostAuthentication.js +4 -4
- package/vscode/src/vs/workbench/api/common/extHostChatAgents2.js +55 -46
- package/vscode/src/vs/workbench/api/common/extHostCodeInsets.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostCommands.js +9 -5
- package/vscode/src/vs/workbench/api/common/extHostConfiguration.js +10 -4
- package/vscode/src/vs/workbench/api/common/extHostCustomEditors.js +17 -15
- package/vscode/src/vs/workbench/api/common/extHostDebugService.js +40 -24
- package/vscode/src/vs/workbench/api/common/extHostDiagnostics.js +37 -34
- package/vscode/src/vs/workbench/api/common/extHostDocumentContentProviders.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostDocumentData.js +6 -4
- package/vscode/src/vs/workbench/api/common/extHostDocuments.js +5 -5
- package/vscode/src/vs/workbench/api/common/extHostDocumentsAndEditors.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostEditorTabs.js +12 -8
- package/vscode/src/vs/workbench/api/common/extHostEmbeddingVector.js +3 -3
- package/vscode/src/vs/workbench/api/common/extHostExtensionActivator.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostExtensionService.js +22 -7
- package/vscode/src/vs/workbench/api/common/extHostFileSystem.js +16 -16
- package/vscode/src/vs/workbench/api/common/extHostFileSystemConsumer.js +4 -4
- package/vscode/src/vs/workbench/api/common/extHostInlineChat.js +4 -2
- package/vscode/src/vs/workbench/api/common/extHostIssueReporter.js +9 -9
- package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js +272 -200
- package/vscode/src/vs/workbench/api/common/extHostLanguageModels.js +49 -42
- package/vscode/src/vs/workbench/api/common/extHostLanguages.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostLogService.js +6 -13
- package/vscode/src/vs/workbench/api/common/extHostManagedSockets.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostNotebook.js +20 -14
- package/vscode/src/vs/workbench/api/common/extHostNotebookDocument.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostNotebookDocumentSaveParticipant.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostNotebookKernels.js +20 -18
- package/vscode/src/vs/workbench/api/common/extHostNotebookRenderers.js +3 -1
- package/vscode/src/vs/workbench/api/common/extHostOutput.js +4 -4
- package/vscode/src/vs/workbench/api/common/extHostProfileContentHandler.js +3 -3
- package/vscode/src/vs/workbench/api/common/extHostSCM.js +4 -2
- package/vscode/src/vs/workbench/api/common/extHostSearch.js +8 -6
- package/vscode/src/vs/workbench/api/common/extHostStatusBar.js +41 -38
- package/vscode/src/vs/workbench/api/common/extHostTask.js +15 -11
- package/vscode/src/vs/workbench/api/common/extHostTelemetry.js +22 -21
- package/vscode/src/vs/workbench/api/common/extHostTerminalService.js +109 -94
- package/vscode/src/vs/workbench/api/common/extHostTestItem.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostTesting.js +9 -7
- package/vscode/src/vs/workbench/api/common/extHostTestingPrivateApi.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostTextEditor.js +6 -6
- package/vscode/src/vs/workbench/api/common/extHostTextEditors.js +4 -4
- package/vscode/src/vs/workbench/api/common/extHostTimeline.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostTreeViews.js +17 -10
- package/vscode/src/vs/workbench/api/common/extHostTunnelService.js +31 -36
- package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js +11 -11
- package/vscode/src/vs/workbench/api/common/extHostTypes.js +31 -27
- package/vscode/src/vs/workbench/api/common/extHostUriOpener.js +6 -4
- package/vscode/src/vs/workbench/api/common/extHostUrls.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostWebview.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostWebviewMessaging.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostWebviewPanels.js +3 -3
- package/vscode/src/vs/workbench/api/common/extHostWebviewView.js +4 -4
- package/vscode/src/vs/workbench/api/common/extHostWorkspace.js +51 -48
- package/vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js +29 -44
- package/vscode/src/vs/workbench/api/worker/extHostExtensionService.js +3 -3
- package/vscode/src/vs/workbench/api/worker/extensionHostWorker.js +2 -2
- package/vscode/src/vs/workbench/browser/actions/developerActions.js +93 -157
- package/vscode/src/vs/workbench/browser/actions/layoutActions.js +270 -614
- package/vscode/src/vs/workbench/browser/actions/textInputActions.js +31 -30
- package/vscode/src/vs/workbench/browser/actions/windowActions.js +49 -123
- package/vscode/src/vs/workbench/browser/actions/workspaceActions.js +63 -119
- package/vscode/src/vs/workbench/browser/actions/workspaceCommands.js +11 -26
- package/vscode/src/vs/workbench/browser/editor.js +62 -55
- package/vscode/src/vs/workbench/browser/labels.js +40 -51
- package/vscode/src/vs/workbench/browser/part.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.js +23 -56
- package/vscode/src/vs/workbench/browser/parts/compositeBarActions.js +72 -115
- package/vscode/src/vs/workbench/browser/parts/editor/binaryDiffEditor.js +12 -17
- package/vscode/src/vs/workbench/browser/parts/editor/binaryEditor.js +11 -18
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbs.js +51 -198
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsControl.js +60 -101
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.js +51 -48
- package/vscode/src/vs/workbench/browser/parts/editor/diffEditorCommands.js +10 -33
- package/vscode/src/vs/workbench/browser/parts/editor/editorActions.js +176 -684
- package/vscode/src/vs/workbench/browser/parts/editor/editorCommands.js +51 -104
- package/vscode/src/vs/workbench/browser/parts/editor/editorGroupView.js +61 -91
- package/vscode/src/vs/workbench/browser/parts/editor/editorGroupWatermark.js +26 -77
- package/vscode/src/vs/workbench/browser/parts/editor/editorPanes.js +19 -27
- package/vscode/src/vs/workbench/browser/parts/editor/editorPlaceholder.js +41 -60
- package/vscode/src/vs/workbench/browser/parts/editor/editorQuickAccess.js +86 -94
- package/vscode/src/vs/workbench/browser/parts/editor/editorStatus.js +124 -353
- package/vscode/src/vs/workbench/browser/parts/editor/editorTabsControl.js +21 -30
- package/vscode/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.js +45 -48
- package/vscode/src/vs/workbench/browser/parts/editor/sideBySideEditor.js +34 -31
- package/vscode/src/vs/workbench/browser/parts/editor/textCodeEditor.js +2 -5
- package/vscode/src/vs/workbench/browser/parts/editor/textDiffEditor.js +27 -24
- package/vscode/src/vs/workbench/browser/parts/editor/textEditor.js +21 -18
- package/vscode/src/vs/workbench/browser/parts/editor/textResourceEditor.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/globalCompositeBar.js +117 -135
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsActions.js +42 -109
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsAlerts.js +11 -10
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCenter.js +25 -52
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCommands.js +24 -59
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsList.js +22 -30
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsStatus.js +21 -61
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsToasts.js +23 -25
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsViewer.js +32 -50
- package/vscode/src/vs/workbench/browser/parts/panel/panelActions.js +58 -196
- package/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.js +73 -124
- package/vscode/src/vs/workbench/browser/parts/titlebar/windowTitle.js +19 -30
- package/vscode/src/vs/workbench/browser/parts/views/checkbox.js +6 -5
- package/vscode/src/vs/workbench/browser/parts/views/treeView.js +152 -141
- package/vscode/src/vs/workbench/browser/parts/views/viewFilter.js +13 -16
- package/vscode/src/vs/workbench/browser/parts/views/viewPane.js +62 -72
- package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js +68 -85
- package/vscode/src/vs/workbench/browser/quickaccess.js +12 -12
- package/vscode/src/vs/workbench/browser/workbench.contribution.js +381 -589
- package/vscode/src/vs/workbench/common/configuration.js +33 -52
- package/vscode/src/vs/workbench/common/contextkeys.js +117 -348
- package/vscode/src/vs/workbench/common/contributions.js +9 -3
- package/vscode/src/vs/workbench/common/editor/diffEditorInput.js +14 -15
- package/vscode/src/vs/workbench/common/editor/sideBySideEditorInput.js +18 -15
- package/vscode/src/vs/workbench/common/editor/textEditorModel.js +14 -11
- package/vscode/src/vs/workbench/common/editor/textResourceEditorInput.js +1 -1
- package/vscode/src/vs/workbench/common/editor.js +31 -36
- package/vscode/src/vs/workbench/common/theme.js +359 -406
- package/vscode/src/vs/workbench/common/views.js +36 -35
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.js +221 -488
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityContributions.js +4 -22
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.js +37 -52
- package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/accessibilitySignal.contribution.js +56 -127
- package/vscode/src/vs/workbench/contrib/accessibilitySignals/browser/commands.js +18 -41
- package/vscode/src/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.js +55 -54
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatActions.js +27 -71
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.js +13 -18
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.js +13 -45
- package/vscode/src/vs/workbench/contrib/chat/browser/chat.js +2 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatAccessibilityProvider.js +21 -37
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditorInput.js +17 -22
- package/vscode/src/vs/workbench/contrib/chat/browser/chatFollowups.js +8 -12
- package/vscode/src/vs/workbench/contrib/chat/browser/chatInputPart.js +40 -52
- package/vscode/src/vs/workbench/contrib/chat/browser/chatListRenderer.js +83 -138
- package/vscode/src/vs/workbench/contrib/chat/browser/chatWidget.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockPart.js +31 -52
- package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.js +20 -19
- package/vscode/src/vs/workbench/contrib/chat/common/chatAgents.js +6 -6
- package/vscode/src/vs/workbench/contrib/chat/common/chatColors.js +7 -30
- package/vscode/src/vs/workbench/contrib/chat/common/chatContextKeys.js +29 -64
- package/vscode/src/vs/workbench/contrib/chat/common/chatModel.js +14 -8
- package/vscode/src/vs/workbench/contrib/chat/common/chatParserTypes.js +1 -1
- package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js +33 -40
- package/vscode/src/vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint.js +24 -61
- package/vscode/src/vs/workbench/contrib/codeActions/common/documentationExtensionPoint.js +11 -34
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.js +22 -38
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js +23 -34
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.js +23 -67
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.js +14 -17
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.js +25 -45
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.js +47 -55
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.js +4 -11
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.js +13 -28
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.js +4 -11
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.js +4 -11
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js +29 -41
- package/vscode/src/vs/workbench/contrib/comments/browser/commentColors.js +14 -37
- package/vscode/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.js +11 -14
- package/vscode/src/vs/workbench/contrib/comments/browser/commentNode.js +82 -88
- package/vscode/src/vs/workbench/contrib/comments/browser/commentReply.js +19 -22
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadBody.js +17 -16
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadHeader.js +9 -20
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadWidget.js +15 -18
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsAccessibility.js +33 -64
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsController.js +108 -124
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsModel.js +16 -19
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.js +43 -79
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsView.js +46 -61
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsViewActions.js +16 -51
- package/vscode/src/vs/workbench/contrib/comments/browser/reactionsAction.js +30 -44
- package/vscode/src/vs/workbench/contrib/comments/common/commentContextKeys.js +24 -51
- package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInput.js +22 -17
- package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.js +18 -21
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.js +84 -242
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointWidget.js +33 -74
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointsView.js +220 -412
- package/vscode/src/vs/workbench/contrib/debug/browser/callStackEditorContribution.js +14 -13
- package/vscode/src/vs/workbench/contrib/debug/browser/debugColors.js +20 -67
- package/vscode/src/vs/workbench/contrib/debug/browser/debugIcons.js +62 -273
- package/vscode/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.js +12 -17
- package/vscode/src/vs/workbench/contrib/debug/common/debug.js +227 -290
- package/vscode/src/vs/workbench/contrib/debug/common/debugModel.js +147 -141
- package/vscode/src/vs/workbench/contrib/debug/common/debugSource.js +13 -14
- package/vscode/src/vs/workbench/contrib/debug/common/disassemblyViewInput.js +4 -11
- package/vscode/src/vs/workbench/contrib/debug/common/replModel.js +25 -22
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.js +617 -1086
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsIcons.js +42 -69
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.js +10 -13
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsInput.js +9 -15
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsUtils.js +32 -29
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/configuration.js +9 -12
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.js +26 -35
- package/vscode/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.js +8 -11
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditor.js +38 -49
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.js +60 -107
- package/vscode/src/vs/workbench/contrib/files/browser/explorerViewlet.js +71 -100
- package/vscode/src/vs/workbench/contrib/files/browser/fileActions.js +161 -373
- package/vscode/src/vs/workbench/contrib/files/browser/fileCommands.save.js +10 -13
- package/vscode/src/vs/workbench/contrib/files/browser/fileConstants.js +11 -22
- package/vscode/src/vs/workbench/contrib/files/browser/fileImportExport.js +151 -244
- package/vscode/src/vs/workbench/contrib/files/browser/files.configuration.contribution.js +105 -156
- package/vscode/src/vs/workbench/contrib/files/browser/files.editorPane.contribution.js +10 -17
- package/vscode/src/vs/workbench/contrib/files/browser/views/emptyView.js +18 -21
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.js +14 -25
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerView.js +52 -72
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.js +122 -155
- package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js +55 -78
- package/vscode/src/vs/workbench/contrib/files/browser/workspaceWatcher.js +22 -25
- package/vscode/src/vs/workbench/contrib/files/common/dirtyFilesIndicator.js +8 -16
- package/vscode/src/vs/workbench/contrib/files/common/files.js +61 -84
- package/vscode/src/vs/workbench/contrib/folding/browser/folding.contribution.js +11 -14
- package/vscode/src/vs/workbench/contrib/format/browser/formatActionsMultiple.js +58 -106
- package/vscode/src/vs/workbench/contrib/format/browser/formatActionsNone.js +9 -22
- package/vscode/src/vs/workbench/contrib/format/browser/formatModified.js +6 -9
- package/vscode/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.js +15 -26
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.js +122 -171
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.js +53 -78
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatFileCreationWidget.js +19 -30
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.js +7 -7
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.js +46 -67
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.js +56 -65
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.js +7 -10
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/utils.js +3 -1
- package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.js +78 -165
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js +14 -18
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js +74 -145
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/diffComputer.js +1 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/lineRange.js +1 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mapping.js +1 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js +64 -53
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange.js +2 -2
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.js +3 -3
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/utils.js +1 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.js +19 -50
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/icons.contribution.js +2 -5
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.js +58 -55
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffSourceResolverService.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.js +97 -157
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.js +40 -60
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.js +57 -120
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.js +19 -35
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.js +36 -43
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOutputActions.js +2 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext.js +11 -18
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.js +50 -63
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/coreActions.js +12 -27
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/editActions.js +90 -152
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/foldingController.js +8 -19
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/notebookIndentationActions.js +18 -45
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityProvider.js +6 -14
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditor.js +58 -49
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.js +155 -210
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookIcons.js +28 -135
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.js +17 -26
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellOutput.js +63 -82
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.js +16 -20
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellExecutionIcon.js +8 -23
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar.js +11 -14
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput.js +8 -16
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/foldedCellHint.js +12 -20
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.js +20 -24
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.js +5 -5
- 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 +89 -100
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.js +66 -73
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookOutlineEntryFactory.js +10 -13
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.js +48 -101
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.js +15 -19
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookViewZones.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorInput.js +21 -23
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorModel.js +6 -6
- package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingWidgets.js +32 -44
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesIcons.js +16 -51
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.js +52 -91
- package/vscode/src/vs/workbench/contrib/preferences/browser/settingsLayout.js +52 -231
- package/vscode/src/vs/workbench/contrib/preferences/common/settingsEditorColorRegistry.js +34 -105
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.js +128 -156
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteIcons.js +19 -82
- package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.js +250 -445
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.js +9 -16
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js +123 -180
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsBase.js +2 -5
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsFind.js +21 -62
- package/vscode/src/vs/workbench/contrib/search/browser/searchModel.js +2 -2
- package/vscode/src/vs/workbench/contrib/search/common/cellSearchModel.js +1 -1
- package/vscode/src/vs/workbench/contrib/snippets/browser/commands/abstractSnippetsActions.js +2 -5
- package/vscode/src/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets.js +3 -10
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.js +18 -17
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsFile.js +18 -24
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsService.js +71 -70
- package/vscode/src/vs/workbench/contrib/speech/common/speechService.js +35 -146
- package/vscode/src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.js +18 -23
- package/vscode/src/vs/workbench/contrib/tasks/common/taskService.js +19 -23
- package/vscode/src/vs/workbench/contrib/tasks/common/tasks.js +134 -123
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.js +19 -26
- package/vscode/src/vs/workbench/contrib/terminal/common/terminal.js +10 -29
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.js +42 -78
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalContextKey.js +106 -138
- package/vscode/src/vs/workbench/contrib/testing/common/testId.js +1 -1
- package/vscode/src/vs/workbench/contrib/testing/common/testItemCollection.js +5 -5
- package/vscode/src/vs/workbench/contrib/testing/common/testResult.js +36 -31
- package/vscode/src/vs/workbench/contrib/webview/browser/webview.contribution.js +4 -11
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.js +20 -23
- package/vscode/src/vs/workbench/contrib/workspace/common/workspace.js +6 -9
- package/vscode/src/vs/workbench/services/authentication/browser/authenticationService.js +18 -8
- package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverSchema.js +23 -62
- package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverUtils.js +3 -2
- package/vscode/src/vs/workbench/services/configurationResolver/common/variableResolver.js +99 -18
- package/vscode/src/vs/workbench/services/editor/common/editorResolverService.js +9 -8
- package/vscode/src/vs/workbench/services/extensionManagement/common/extensionFeatures.js +1 -1
- package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.js +3 -6
- package/vscode/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.js +40 -57
- package/vscode/src/vs/workbench/services/extensions/common/extensionDescriptionRegistry.js +1 -1
- package/vscode/src/vs/workbench/services/extensions/common/extensions.js +6 -2
- package/vscode/src/vs/workbench/services/extensions/common/extensionsRegistry.js +176 -223
- package/vscode/src/vs/workbench/services/extensions/common/rpcProtocol.js +5 -3
- package/vscode/src/vs/workbench/services/extensions/worker/polyfillNestedWorker.js +1 -1
- package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.js +35 -38
- package/vscode/src/vs/workbench/services/language/common/languageService.js +55 -119
- package/vscode/src/vs/workbench/services/lifecycle/common/lifecycleService.js +1 -1
- package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorInput.js +6 -13
- package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.js +33 -60
- package/vscode/src/vs/workbench/services/preferences/common/preferencesEditorInput.js +8 -15
- package/vscode/src/vs/workbench/services/preferences/common/preferencesModels.js +79 -72
- package/vscode/src/vs/workbench/services/preferences/common/preferencesValidation.js +54 -141
- package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.js +30 -42
- package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js +92 -101
- package/vscode/src/vs/workbench/services/search/common/queryBuilder.js +50 -45
- package/vscode/src/vs/workbench/services/textMate/common/TMGrammars.js +15 -30
- package/vscode/src/vs/workbench/services/textfile/common/encoding.js +4 -1
- package/vscode/src/vs/workbench/services/textfile/common/textEditorService.js +3 -1
- package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModel.js +32 -35
- package/vscode/src/vs/workbench/services/themes/common/colorExtensionPoint.js +48 -83
- package/vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js +26 -45
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfile.js +14 -23
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfileIcons.js +2 -5
- package/vscode/src/vs/workbench/services/userDataSync/common/userDataSync.js +22 -62
- package/vscode/src/vs/workbench/services/views/browser/viewsService.js +49 -78
- package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.js +48 -87
- package/tools/l10n.js +0 -177
|
@@ -17,6 +17,7 @@ import { FindModel } from './findModel.js';
|
|
|
17
17
|
import { SimpleFindReplaceWidget } from './notebookFindReplaceWidget.js';
|
|
18
18
|
import { CellEditState } from '../../notebookBrowser.js';
|
|
19
19
|
import { KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED } from '../../../common/notebookContextKeys.js';
|
|
20
|
+
const _moduleId = "vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget";
|
|
20
21
|
const FIND_HIDE_TRANSITION = 'find-hide-transition';
|
|
21
22
|
const FIND_SHOW_TRANSITION = 'find-show-transition';
|
|
22
23
|
let MAX_MATCHES_COUNT_WIDTH = 69;
|
|
@@ -27,9 +28,9 @@ let NotebookFindContrib = class NotebookFindContrib extends Disposable {
|
|
|
27
28
|
super();
|
|
28
29
|
this.notebookEditor = notebookEditor;
|
|
29
30
|
this.instantiationService = instantiationService;
|
|
30
|
-
this.widget = ( new Lazy(
|
|
31
|
+
this.widget = ( (new Lazy(
|
|
31
32
|
() => this._register(this.instantiationService.createInstance(NotebookFindWidget, this.notebookEditor))
|
|
32
|
-
));
|
|
33
|
+
)));
|
|
33
34
|
}
|
|
34
35
|
show(initialInput, options) {
|
|
35
36
|
return this.widget.value.show(initialInput, options);
|
|
@@ -41,15 +42,15 @@ let NotebookFindContrib = class NotebookFindContrib extends Disposable {
|
|
|
41
42
|
return this.widget.value.replace(searchString);
|
|
42
43
|
}
|
|
43
44
|
};
|
|
44
|
-
NotebookFindContrib = ( __decorate([
|
|
45
|
-
( __param(1, IInstantiationService))
|
|
46
|
-
], NotebookFindContrib));
|
|
45
|
+
NotebookFindContrib = ( (__decorate([
|
|
46
|
+
( (__param(1, IInstantiationService)))
|
|
47
|
+
], NotebookFindContrib)));
|
|
47
48
|
let NotebookFindWidget = class NotebookFindWidget extends SimpleFindReplaceWidget {
|
|
48
49
|
constructor(_notebookEditor, contextViewService, contextKeyService, configurationService, contextMenuService, menuService, instantiationService) {
|
|
49
|
-
super(contextViewService, contextKeyService, configurationService, contextMenuService, instantiationService, ( new FindReplaceState()), _notebookEditor);
|
|
50
|
+
super(contextViewService, contextKeyService, configurationService, contextMenuService, instantiationService, ( (new FindReplaceState())), _notebookEditor);
|
|
50
51
|
this._showTimeout = null;
|
|
51
52
|
this._hideTimeout = null;
|
|
52
|
-
this._findModel = ( new FindModel(this._notebookEditor, this._state, this._configurationService));
|
|
53
|
+
this._findModel = ( (new FindModel(this._notebookEditor, this._state, this._configurationService)));
|
|
53
54
|
append(this._notebookEditor.getDomNode(), this.getDomNode());
|
|
54
55
|
this._findWidgetFocused = KEYBINDING_CONTEXT_NOTEBOOK_FIND_WIDGET_FOCUSED.bindTo(contextKeyService);
|
|
55
56
|
this._register(this._findInput.onKeyDown((e) => this._onFindInputKeyDown(e)));
|
|
@@ -275,27 +276,10 @@ let NotebookFindWidget = class NotebookFindWidget extends SimpleFindReplaceWidge
|
|
|
275
276
|
_getAriaLabel(label, currentMatch, searchString) {
|
|
276
277
|
if (label === NLS_NO_RESULTS) {
|
|
277
278
|
return searchString === ''
|
|
278
|
-
? ( localizeWithPath(
|
|
279
|
-
'
|
|
280
|
-
'ariaSearchNoResultEmpty',
|
|
281
|
-
"{0} found",
|
|
282
|
-
label
|
|
283
|
-
))
|
|
284
|
-
: ( localizeWithPath(
|
|
285
|
-
'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget',
|
|
286
|
-
'ariaSearchNoResult',
|
|
287
|
-
"{0} found for '{1}'",
|
|
288
|
-
label,
|
|
289
|
-
searchString
|
|
290
|
-
));
|
|
279
|
+
? ( localizeWithPath(_moduleId, 0, "{0} found", label))
|
|
280
|
+
: ( localizeWithPath(_moduleId, 1, "{0} found for '{1}'", label, searchString));
|
|
291
281
|
}
|
|
292
|
-
return ( localizeWithPath(
|
|
293
|
-
'vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget',
|
|
294
|
-
'ariaSearchNoResultWithLineNumNoCurrentMatch',
|
|
295
|
-
"{0} found for '{1}'",
|
|
296
|
-
label,
|
|
297
|
-
searchString
|
|
298
|
-
));
|
|
282
|
+
return ( localizeWithPath(_moduleId, 2, "{0} found for '{1}'", label, searchString));
|
|
299
283
|
}
|
|
300
284
|
dispose() {
|
|
301
285
|
this._notebookEditor?.removeClassName(FIND_SHOW_TRANSITION);
|
|
@@ -304,12 +288,12 @@ let NotebookFindWidget = class NotebookFindWidget extends SimpleFindReplaceWidge
|
|
|
304
288
|
super.dispose();
|
|
305
289
|
}
|
|
306
290
|
};
|
|
307
|
-
NotebookFindWidget = ( __decorate([
|
|
308
|
-
( __param(1, IContextViewService)),
|
|
309
|
-
( __param(2, IContextKeyService)),
|
|
310
|
-
( __param(3, IConfigurationService)),
|
|
311
|
-
( __param(4, IContextMenuService)),
|
|
312
|
-
( __param(5, IMenuService)),
|
|
313
|
-
( __param(6, IInstantiationService))
|
|
314
|
-
], NotebookFindWidget));
|
|
291
|
+
NotebookFindWidget = ( (__decorate([
|
|
292
|
+
( (__param(1, IContextViewService))),
|
|
293
|
+
( (__param(2, IContextKeyService))),
|
|
294
|
+
( (__param(3, IConfigurationService))),
|
|
295
|
+
( (__param(4, IContextMenuService))),
|
|
296
|
+
( (__param(5, IMenuService))),
|
|
297
|
+
( (__param(6, IInstantiationService)))
|
|
298
|
+
], NotebookFindWidget)));
|
|
315
299
|
export { NotebookFindContrib };
|
|
@@ -8,6 +8,7 @@ import { cloneNotebookCellTextModel } from '../../common/model/notebookCellTextM
|
|
|
8
8
|
import { SelectionStateType, CellKind } from '../../common/notebookCommon.js';
|
|
9
9
|
import { cellRangesToIndexes, cellRangeContains } from '../../common/notebookRange.js';
|
|
10
10
|
import { localizeWithPath } from '../../../../../nls.js';
|
|
11
|
+
const _moduleId = "vs/workbench/contrib/notebook/browser/controller/cellOperations";
|
|
11
12
|
async function changeCellToKind(kind, context, language, mime) {
|
|
12
13
|
const { notebookEditor } = context;
|
|
13
14
|
if (!notebookEditor.hasModel()) {
|
|
@@ -102,9 +103,9 @@ function runDeleteAction(editor, cell) {
|
|
|
102
103
|
const containingSelection = selections.find(selection => selection.start <= targetCellIndex && targetCellIndex < selection.end);
|
|
103
104
|
const computeUndoRedo = !editor.isReadOnly || textModel.viewType === 'interactive';
|
|
104
105
|
if (containingSelection) {
|
|
105
|
-
const edits = ( selections.reverse().map(selection => ({
|
|
106
|
+
const edits = ( (selections.reverse().map(selection => ({
|
|
106
107
|
editType: 1 , index: selection.start, count: selection.end - selection.start, cells: []
|
|
107
|
-
})));
|
|
108
|
+
}))));
|
|
108
109
|
const nextCellAfterContainingSelection = containingSelection.end >= editor.getLength() ? undefined : editor.cellAt(containingSelection.end);
|
|
109
110
|
textModel.applyEdits(edits, true, { kind: SelectionStateType.Index, focus: editor.getFocus(), selections: editor.getSelections() }, () => {
|
|
110
111
|
if (nextCellAfterContainingSelection) {
|
|
@@ -247,7 +248,7 @@ async function copyCellRange(context, direction) {
|
|
|
247
248
|
editType: 1 ,
|
|
248
249
|
index: range.end,
|
|
249
250
|
count: 0,
|
|
250
|
-
cells: ( cellRangesToIndexes([range]).map(index => cloneNotebookCellTextModel(editor.cellAt(index).model)))
|
|
251
|
+
cells: ( (cellRangesToIndexes([range]).map(index => cloneNotebookCellTextModel(editor.cellAt(index).model))))
|
|
251
252
|
}
|
|
252
253
|
], true, {
|
|
253
254
|
kind: SelectionStateType.Index,
|
|
@@ -258,7 +259,7 @@ async function copyCellRange(context, direction) {
|
|
|
258
259
|
else {
|
|
259
260
|
const focus = editor.getFocus();
|
|
260
261
|
const selections = editor.getSelections();
|
|
261
|
-
const newCells = ( cellRangesToIndexes([range]).map(index => cloneNotebookCellTextModel(editor.cellAt(index).model)));
|
|
262
|
+
const newCells = ( (cellRangesToIndexes([range]).map(index => cloneNotebookCellTextModel(editor.cellAt(index).model))));
|
|
262
263
|
const countDelta = newCells.length;
|
|
263
264
|
const newFocus = context.ui ? focus : { start: focus.start + countDelta, end: focus.end + countDelta };
|
|
264
265
|
const newSelections = context.ui ? selections : [{ start: range.start + countDelta, end: range.end + countDelta }];
|
|
@@ -267,7 +268,7 @@ async function copyCellRange(context, direction) {
|
|
|
267
268
|
editType: 1 ,
|
|
268
269
|
index: range.end,
|
|
269
270
|
count: 0,
|
|
270
|
-
cells: ( cellRangesToIndexes([range]).map(index => cloneNotebookCellTextModel(editor.cellAt(index).model)))
|
|
271
|
+
cells: ( (cellRangesToIndexes([range]).map(index => cloneNotebookCellTextModel(editor.cellAt(index).model))))
|
|
271
272
|
}
|
|
272
273
|
], true, {
|
|
273
274
|
kind: SelectionStateType.Index,
|
|
@@ -294,17 +295,13 @@ async function joinSelectedCells(bulkEditService, notificationService, context)
|
|
|
294
295
|
const cellKind = cells[0].cellKind;
|
|
295
296
|
const isSameKind = cells.every(cell => cell.cellKind === cellKind);
|
|
296
297
|
if (!isSameKind) {
|
|
297
|
-
const message = ( localizeWithPath(
|
|
298
|
-
'vs/workbench/contrib/notebook/browser/controller/cellOperations',
|
|
299
|
-
'notebookActions.joinSelectedCells',
|
|
300
|
-
"Cannot join cells of different kinds"
|
|
301
|
-
));
|
|
298
|
+
const message = ( localizeWithPath(_moduleId, 0, "Cannot join cells of different kinds"));
|
|
302
299
|
return notificationService.warn(message);
|
|
303
300
|
}
|
|
304
301
|
const firstCell = cells[0];
|
|
305
|
-
const insertContent = ( cells.map(cell => cell.getText())).join(firstCell.textBuffer.getEOL());
|
|
302
|
+
const insertContent = ( (cells.map(cell => cell.getText()))).join(firstCell.textBuffer.getEOL());
|
|
306
303
|
const firstSelection = editor.getSelections()[0];
|
|
307
|
-
edits.push(( new ResourceNotebookCellEdit(editor.textModel.uri, {
|
|
304
|
+
edits.push(( (new ResourceNotebookCellEdit(editor.textModel.uri, {
|
|
308
305
|
editType: 1 ,
|
|
309
306
|
index: firstSelection.start,
|
|
310
307
|
count: firstSelection.end - firstSelection.start,
|
|
@@ -316,21 +313,17 @@ async function joinSelectedCells(bulkEditService, notificationService, context)
|
|
|
316
313
|
outputs: firstCell.model.outputs,
|
|
317
314
|
metadata: firstCell.metadata,
|
|
318
315
|
}]
|
|
319
|
-
})));
|
|
316
|
+
}))));
|
|
320
317
|
for (const selection of editor.getSelections().slice(1)) {
|
|
321
|
-
edits.push(( new ResourceNotebookCellEdit(editor.textModel.uri, {
|
|
318
|
+
edits.push(( (new ResourceNotebookCellEdit(editor.textModel.uri, {
|
|
322
319
|
editType: 1 ,
|
|
323
320
|
index: selection.start,
|
|
324
321
|
count: selection.end - selection.start,
|
|
325
322
|
cells: []
|
|
326
|
-
})));
|
|
323
|
+
}))));
|
|
327
324
|
}
|
|
328
325
|
if (edits.length) {
|
|
329
|
-
await bulkEditService.apply(edits, { quotableLabel: ( localizeWithPath(
|
|
330
|
-
'vs/workbench/contrib/notebook/browser/controller/cellOperations',
|
|
331
|
-
'notebookActions.joinSelectedCells.label',
|
|
332
|
-
"Join Notebook Cells"
|
|
333
|
-
)) });
|
|
326
|
+
await bulkEditService.apply(edits, { quotableLabel: ( localizeWithPath(_moduleId, 1, "Join Notebook Cells")) });
|
|
334
327
|
}
|
|
335
328
|
}
|
|
336
329
|
async function joinNotebookCells(editor, range, direction, constraint) {
|
|
@@ -359,23 +352,23 @@ async function joinNotebookCells(editor, range, direction, constraint) {
|
|
|
359
352
|
if (constraint && above.cellKind !== constraint) {
|
|
360
353
|
return null;
|
|
361
354
|
}
|
|
362
|
-
const insertContent = ( cells.map(cell => (cell.textBuffer.getEOL() ?? '') + cell.getText())).join('');
|
|
355
|
+
const insertContent = ( (cells.map(cell => (cell.textBuffer.getEOL() ?? '') + cell.getText()))).join('');
|
|
363
356
|
const aboveCellLineCount = above.textBuffer.getLineCount();
|
|
364
357
|
const aboveCellLastLineEndColumn = above.textBuffer.getLineLength(aboveCellLineCount);
|
|
365
358
|
return {
|
|
366
359
|
edits: [
|
|
367
|
-
( new ResourceTextEdit(above.uri, { range: ( new Range(
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
( new ResourceNotebookCellEdit(textModel.uri, {
|
|
360
|
+
( (new ResourceTextEdit(above.uri, { range: ( (new Range(
|
|
361
|
+
aboveCellLineCount,
|
|
362
|
+
aboveCellLastLineEndColumn + 1,
|
|
363
|
+
aboveCellLineCount,
|
|
364
|
+
aboveCellLastLineEndColumn + 1
|
|
365
|
+
))), text: insertContent }))),
|
|
366
|
+
( (new ResourceNotebookCellEdit(textModel.uri, {
|
|
374
367
|
editType: 1 ,
|
|
375
368
|
index: range.start,
|
|
376
369
|
count: range.end - range.start,
|
|
377
370
|
cells: []
|
|
378
|
-
}))
|
|
371
|
+
})))
|
|
379
372
|
],
|
|
380
373
|
cell: above,
|
|
381
374
|
endFocus: { start: range.start - 1, end: range.start },
|
|
@@ -389,23 +382,23 @@ async function joinNotebookCells(editor, range, direction, constraint) {
|
|
|
389
382
|
}
|
|
390
383
|
const cell = cells[0];
|
|
391
384
|
const restCells = [...cells.slice(1), below];
|
|
392
|
-
const insertContent = ( restCells.map(cl => (cl.textBuffer.getEOL() ?? '') + cl.getText())).join('');
|
|
385
|
+
const insertContent = ( (restCells.map(cl => (cl.textBuffer.getEOL() ?? '') + cl.getText()))).join('');
|
|
393
386
|
const cellLineCount = cell.textBuffer.getLineCount();
|
|
394
387
|
const cellLastLineEndColumn = cell.textBuffer.getLineLength(cellLineCount);
|
|
395
388
|
return {
|
|
396
389
|
edits: [
|
|
397
|
-
( new ResourceTextEdit(cell.uri, { range: ( new Range(
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
( new ResourceNotebookCellEdit(textModel.uri, {
|
|
390
|
+
( (new ResourceTextEdit(cell.uri, { range: ( (new Range(
|
|
391
|
+
cellLineCount,
|
|
392
|
+
cellLastLineEndColumn + 1,
|
|
393
|
+
cellLineCount,
|
|
394
|
+
cellLastLineEndColumn + 1
|
|
395
|
+
))), text: insertContent }))),
|
|
396
|
+
( (new ResourceNotebookCellEdit(textModel.uri, {
|
|
404
397
|
editType: 1 ,
|
|
405
398
|
index: range.start + 1,
|
|
406
399
|
count: range.end - range.start,
|
|
407
400
|
cells: []
|
|
408
|
-
}))
|
|
401
|
+
})))
|
|
409
402
|
],
|
|
410
403
|
cell,
|
|
411
404
|
endFocus: { start: range.start, end: range.start + 1 },
|
|
@@ -474,7 +467,7 @@ async function joinCellsWithSurrounds(bulkEditService, context, direction) {
|
|
|
474
467
|
cells.forEach(cell => {
|
|
475
468
|
cell.updateEditState(CellEditState.Editing, 'joinCellsWithSurrounds');
|
|
476
469
|
});
|
|
477
|
-
viewModel.updateSelectionsState({ kind: SelectionStateType.Handle, primary: cell.handle, selections: ( cells.map(cell => cell.handle)) });
|
|
470
|
+
viewModel.updateSelectionsState({ kind: SelectionStateType.Handle, primary: cell.handle, selections: ( (cells.map(cell => cell.handle))) });
|
|
478
471
|
editor.revealCellRangeInView(editor.getFocus());
|
|
479
472
|
const newFocusedCell = editor.cellAt(editor.getFocus().start);
|
|
480
473
|
if (focusMode === CellFocusMode.Editor && newFocusedCell) {
|
|
@@ -495,15 +488,15 @@ function _splitPointsToBoundaries(splitPoints, textBuffer) {
|
|
|
495
488
|
});
|
|
496
489
|
for (let sp of splitPoints) {
|
|
497
490
|
if (getLineLen(sp.lineNumber) + 1 === sp.column && sp.column !== 1 && sp.lineNumber < lineCnt) {
|
|
498
|
-
sp = ( new Position(sp.lineNumber + 1, 1));
|
|
491
|
+
sp = ( (new Position(sp.lineNumber + 1, 1)));
|
|
499
492
|
}
|
|
500
493
|
_pushIfAbsent(boundaries, sp);
|
|
501
494
|
}
|
|
502
495
|
if (boundaries.length === 0) {
|
|
503
496
|
return null;
|
|
504
497
|
}
|
|
505
|
-
const modelStart = ( new Position(1, 1));
|
|
506
|
-
const modelEnd = ( new Position(lineCnt, getLineLen(lineCnt) + 1));
|
|
498
|
+
const modelStart = ( (new Position(1, 1)));
|
|
499
|
+
const modelEnd = ( (new Position(lineCnt, getLineLen(lineCnt) + 1)));
|
|
507
500
|
return [modelStart, ...boundaries, modelEnd];
|
|
508
501
|
}
|
|
509
502
|
function _pushIfAbsent(positions, p) {
|
|
@@ -521,7 +514,7 @@ function computeCellLinesContents(cell, splitPoints) {
|
|
|
521
514
|
for (let i = 1; i < rangeBoundaries.length; i++) {
|
|
522
515
|
const start = rangeBoundaries[i - 1];
|
|
523
516
|
const end = rangeBoundaries[i];
|
|
524
|
-
newLineModels.push(cell.textBuffer.getValueInRange(( new Range(start.lineNumber, start.column, end.lineNumber, end.column)), 0 ));
|
|
517
|
+
newLineModels.push(cell.textBuffer.getValueInRange(( (new Range(start.lineNumber, start.column, end.lineNumber, end.column))), 0 ));
|
|
525
518
|
}
|
|
526
519
|
return newLineModels;
|
|
527
520
|
}
|
|
@@ -9,16 +9,13 @@ import { copyCellOutput } from '../contrib/clipboard/cellOutputClipboard.js';
|
|
|
9
9
|
import { IEditorService } from '../../../../services/editor/common/editorService.service.js';
|
|
10
10
|
import { getNotebookEditorFromEditorPane } from '../notebookBrowser.js';
|
|
11
11
|
import { CellKind } from '../../common/notebookCommon.js';
|
|
12
|
+
const _moduleId = "vs/workbench/contrib/notebook/browser/controller/cellOutputActions";
|
|
12
13
|
const COPY_OUTPUT_COMMAND_ID = 'notebook.cellOutput.copy';
|
|
13
14
|
registerAction2(class CopyCellOutputAction extends Action2 {
|
|
14
15
|
constructor() {
|
|
15
16
|
super({
|
|
16
17
|
id: COPY_OUTPUT_COMMAND_ID,
|
|
17
|
-
title: ( localizeWithPath(
|
|
18
|
-
'vs/workbench/contrib/notebook/browser/controller/cellOutputActions',
|
|
19
|
-
'notebookActions.copyOutput',
|
|
20
|
-
"Copy Cell Output"
|
|
21
|
-
)),
|
|
18
|
+
title: ( localizeWithPath(_moduleId, 0, "Copy Cell Output")),
|
|
22
19
|
menu: {
|
|
23
20
|
id: MenuId.NotebookOutputToolbar,
|
|
24
21
|
when: NOTEBOOK_CELL_HAS_OUTPUTS
|
package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext.js
CHANGED
|
@@ -1,26 +1,19 @@
|
|
|
1
1
|
import { localizeWithPath } from '../../../../../../nls.js';
|
|
2
2
|
import { MenuId } from '../../../../../../platform/actions/common/actions.js';
|
|
3
3
|
import { RawContextKey } from '../../../../../../platform/contextkey/common/contextkey.js';
|
|
4
|
-
const
|
|
5
|
-
'
|
|
6
|
-
'
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
'vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext',
|
|
11
|
-
'notebookChatHasActiveRequest',
|
|
12
|
-
"Whether the cell chat editor has an active request"
|
|
13
|
-
))));
|
|
14
|
-
const CTX_NOTEBOOK_CHAT_USER_DID_EDIT = ( new RawContextKey('notebookChatUserDidEdit', false, ( localizeWithPath(
|
|
15
|
-
'vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext',
|
|
16
|
-
'notebookChatUserDidEdit',
|
|
4
|
+
const _moduleId = "vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext";
|
|
5
|
+
const CTX_NOTEBOOK_CELL_CHAT_FOCUSED = ( (new RawContextKey('notebookCellChatFocused', false, ( localizeWithPath(_moduleId, 0, "Whether the cell chat editor is focused")))));
|
|
6
|
+
const CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST = ( (new RawContextKey('notebookChatHasActiveRequest', false, ( localizeWithPath(_moduleId, 1, "Whether the cell chat editor has an active request")))));
|
|
7
|
+
const CTX_NOTEBOOK_CHAT_USER_DID_EDIT = ( (new RawContextKey('notebookChatUserDidEdit', false, ( localizeWithPath(
|
|
8
|
+
_moduleId,
|
|
9
|
+
2,
|
|
17
10
|
"Whether the user did changes ontop of the notebook cell chat"
|
|
18
|
-
))));
|
|
19
|
-
const CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION = ( new RawContextKey('notebookChatOuterFocusPosition', '', ( localizeWithPath(
|
|
20
|
-
|
|
21
|
-
|
|
11
|
+
)))));
|
|
12
|
+
const CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION = ( (new RawContextKey('notebookChatOuterFocusPosition', '', ( localizeWithPath(
|
|
13
|
+
_moduleId,
|
|
14
|
+
3,
|
|
22
15
|
"Whether the focus of the notebook editor is above or below the cell chat"
|
|
23
|
-
))));
|
|
16
|
+
)))));
|
|
24
17
|
const MENU_CELL_CHAT_INPUT = MenuId.for('cellChatInput');
|
|
25
18
|
const MENU_CELL_CHAT_WIDGET = MenuId.for('cellChatWidget');
|
|
26
19
|
const MENU_CELL_CHAT_WIDGET_STATUS = MenuId.for('cellChatWidget.status');
|
package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.js
CHANGED
|
@@ -40,6 +40,7 @@ import { CellKind } from '../../../common/notebookCommon.js';
|
|
|
40
40
|
import { NotebookExecutionType } from '../../../common/notebookExecutionStateService.js';
|
|
41
41
|
import { INotebookExecutionStateService } from '../../../common/notebookExecutionStateService.service.js';
|
|
42
42
|
var NotebookChatController_1;
|
|
43
|
+
const _moduleId = "vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController";
|
|
43
44
|
class NotebookChatWidget extends Disposable {
|
|
44
45
|
set afterModelPosition(afterModelPosition) {
|
|
45
46
|
this.notebookViewZone.afterModelPosition = afterModelPosition;
|
|
@@ -156,7 +157,7 @@ class NotebookChatWidget extends Disposable {
|
|
|
156
157
|
const leftMargin = this._notebookEditor.notebookOptions.getCellEditorContainerLeftMargin();
|
|
157
158
|
const maxWidth = 640;
|
|
158
159
|
const width = Math.min(maxWidth, this._notebookEditor.getLayoutInfo().width - leftMargin - rightMargin);
|
|
159
|
-
inlineChatWidget.layout(( new Dimension(width, this.heightInPx)));
|
|
160
|
+
inlineChatWidget.layout(( (new Dimension(width, this.heightInPx))));
|
|
160
161
|
inlineChatWidget.domNode.style.width = `${width}px`;
|
|
161
162
|
widgetContainer.style.left = `${leftMargin}px`;
|
|
162
163
|
}
|
|
@@ -170,13 +171,13 @@ class NotebookChatWidget extends Disposable {
|
|
|
170
171
|
}
|
|
171
172
|
class NotebookCellTextModelLikeId {
|
|
172
173
|
static str(k) {
|
|
173
|
-
return `${k.viewType}/${( k.uri.toString())}`;
|
|
174
|
+
return `${k.viewType}/${( (k.uri.toString()))}`;
|
|
174
175
|
}
|
|
175
176
|
static obj(s) {
|
|
176
177
|
const idx = s.indexOf('/');
|
|
177
178
|
return {
|
|
178
179
|
viewType: s.substring(0, idx),
|
|
179
|
-
uri: ( URI.parse(s.substring(idx + 1)))
|
|
180
|
+
uri: ( (URI.parse(s.substring(idx + 1))))
|
|
180
181
|
};
|
|
181
182
|
}
|
|
182
183
|
}
|
|
@@ -204,11 +205,11 @@ let NotebookChatController = class NotebookChatController extends Disposable {
|
|
|
204
205
|
this._storageService = _storageService;
|
|
205
206
|
this._historyOffset = -1;
|
|
206
207
|
this._historyCandidate = '';
|
|
207
|
-
this._promptCache = ( new LRUCache(1000, 0.7));
|
|
208
|
-
this._onDidChangePromptCache = this._register(( new Emitter()));
|
|
208
|
+
this._promptCache = ( (new LRUCache(1000, 0.7)));
|
|
209
|
+
this._onDidChangePromptCache = this._register(( (new Emitter())));
|
|
209
210
|
this.onDidChangePromptCache = this._onDidChangePromptCache.event;
|
|
210
|
-
this._userEditingDisposables = this._register(( new DisposableStore()));
|
|
211
|
-
this._widgetDisposableStore = this._register(( new DisposableStore()));
|
|
211
|
+
this._userEditingDisposables = this._register(( (new DisposableStore())));
|
|
212
|
+
this._widgetDisposableStore = this._register(( (new DisposableStore())));
|
|
212
213
|
this._ctxHasActiveRequest = CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST.bindTo(this._contextKeyService);
|
|
213
214
|
this._ctxCellWidgetFocused = CTX_NOTEBOOK_CELL_CHAT_FOCUSED.bindTo(this._contextKeyService);
|
|
214
215
|
this._ctxLastResponseType = CTX_INLINE_CHAT_LAST_RESPONSE_TYPE.bindTo(this._contextKeyService);
|
|
@@ -314,16 +315,8 @@ let NotebookChatController = class NotebookChatController extends Disposable {
|
|
|
314
315
|
statusMenuId: MENU_CELL_CHAT_WIDGET_STATUS,
|
|
315
316
|
feedbackMenuId: MENU_CELL_CHAT_WIDGET_FEEDBACK
|
|
316
317
|
}));
|
|
317
|
-
inlineChatWidget.placeholder = ( localizeWithPath(
|
|
318
|
-
|
|
319
|
-
'default.placeholder',
|
|
320
|
-
"Ask a question"
|
|
321
|
-
));
|
|
322
|
-
inlineChatWidget.updateInfo(( localizeWithPath(
|
|
323
|
-
'vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController',
|
|
324
|
-
'welcome.1',
|
|
325
|
-
"AI-generated code may be incorrect"
|
|
326
|
-
)));
|
|
318
|
+
inlineChatWidget.placeholder = ( localizeWithPath(_moduleId, 0, "Ask a question"));
|
|
319
|
+
inlineChatWidget.updateInfo(( localizeWithPath(_moduleId, 1, "AI-generated code may be incorrect")));
|
|
327
320
|
widgetContainer.appendChild(inlineChatWidget.domNode);
|
|
328
321
|
this._widgetDisposableStore.add(inlineChatWidget.onDidChangeInput(() => {
|
|
329
322
|
this._warmupRequestCts?.dispose(true);
|
|
@@ -337,7 +330,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
|
|
|
337
330
|
};
|
|
338
331
|
const id = accessor.addZone(notebookViewZone);
|
|
339
332
|
this._scrollWidgetIntoView(index);
|
|
340
|
-
this._widget = ( new NotebookChatWidget(
|
|
333
|
+
this._widget = ( (new NotebookChatWidget(
|
|
341
334
|
this._notebookEditor,
|
|
342
335
|
id,
|
|
343
336
|
notebookViewZone,
|
|
@@ -346,7 +339,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
|
|
|
346
339
|
inlineChatWidget,
|
|
347
340
|
fakeParentEditor,
|
|
348
341
|
this._languageService
|
|
349
|
-
));
|
|
342
|
+
)));
|
|
350
343
|
if (initEditingCell) {
|
|
351
344
|
this._widget.restoreEditingCell(initEditingCell);
|
|
352
345
|
this._updateUserEditingState();
|
|
@@ -358,19 +351,11 @@ let NotebookChatController = class NotebookChatController extends Disposable {
|
|
|
358
351
|
this._sessionCtor = createCancelablePromise(async (token) => {
|
|
359
352
|
if (fakeParentEditor.hasModel()) {
|
|
360
353
|
await this._startSession(fakeParentEditor, token);
|
|
361
|
-
this._warmupRequestCts = ( new CancellationTokenSource());
|
|
354
|
+
this._warmupRequestCts = ( (new CancellationTokenSource()));
|
|
362
355
|
this._startInitialFolowups(fakeParentEditor, this._warmupRequestCts.token);
|
|
363
356
|
if (this._widget) {
|
|
364
|
-
this._widget.inlineChatWidget.placeholder = this._activeSession?.session.placeholder ?? ( localizeWithPath(
|
|
365
|
-
|
|
366
|
-
'default.placeholder',
|
|
367
|
-
"Ask a question"
|
|
368
|
-
));
|
|
369
|
-
this._widget.inlineChatWidget.updateInfo(this._activeSession?.session.message ?? ( localizeWithPath(
|
|
370
|
-
'vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController',
|
|
371
|
-
'welcome.1',
|
|
372
|
-
"AI-generated code may be incorrect"
|
|
373
|
-
)));
|
|
357
|
+
this._widget.inlineChatWidget.placeholder = this._activeSession?.session.placeholder ?? ( localizeWithPath(_moduleId, 0, "Ask a question"));
|
|
358
|
+
this._widget.inlineChatWidget.updateInfo(this._activeSession?.session.message ?? ( localizeWithPath(_moduleId, 1, "AI-generated code may be incorrect")));
|
|
374
359
|
this._widget.inlineChatWidget.updateSlashCommands(this._activeSession?.session.slashCommands ?? []);
|
|
375
360
|
this._focusWidget();
|
|
376
361
|
}
|
|
@@ -416,7 +401,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
|
|
|
416
401
|
assertType(this._activeSession);
|
|
417
402
|
this._warmupRequestCts?.dispose(true);
|
|
418
403
|
this._warmupRequestCts = undefined;
|
|
419
|
-
this._activeSession.addInput(( new SessionPrompt(this._widget.inlineChatWidget.value, 0, true)));
|
|
404
|
+
this._activeSession.addInput(( (new SessionPrompt(this._widget.inlineChatWidget.value, 0, true))));
|
|
420
405
|
assertType(this._activeSession.lastInput);
|
|
421
406
|
const value = this._activeSession.lastInput.value;
|
|
422
407
|
this._historyUpdate(value);
|
|
@@ -456,14 +441,14 @@ let NotebookChatController = class NotebookChatController extends Disposable {
|
|
|
456
441
|
withIntentDetection: true,
|
|
457
442
|
};
|
|
458
443
|
this._activeRequestCts?.cancel();
|
|
459
|
-
this._activeRequestCts = ( new CancellationTokenSource());
|
|
444
|
+
this._activeRequestCts = ( (new CancellationTokenSource()));
|
|
460
445
|
const progressEdits = [];
|
|
461
|
-
const progressiveEditsQueue = ( new Queue());
|
|
446
|
+
const progressiveEditsQueue = ( (new Queue()));
|
|
462
447
|
const progressiveEditsClock = StopWatch.create();
|
|
463
|
-
const progressiveEditsAvgDuration = ( new MovingAverage());
|
|
464
|
-
const progressiveEditsCts = ( new CancellationTokenSource(this._activeRequestCts.token));
|
|
448
|
+
const progressiveEditsAvgDuration = ( (new MovingAverage()));
|
|
449
|
+
const progressiveEditsCts = ( (new CancellationTokenSource(this._activeRequestCts.token)));
|
|
465
450
|
let progressiveChatResponse;
|
|
466
|
-
const progress = ( new AsyncProgress(async (data) => {
|
|
451
|
+
const progress = ( (new AsyncProgress(async (data) => {
|
|
467
452
|
if (this._activeRequestCts?.token.isCancellationRequested) {
|
|
468
453
|
return;
|
|
469
454
|
}
|
|
@@ -473,7 +458,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
|
|
|
473
458
|
}
|
|
474
459
|
if (data.edits?.length) {
|
|
475
460
|
if (!request.live) {
|
|
476
|
-
throw new Error('Progress in NOT supported in non-live mode');
|
|
461
|
+
throw ( (new Error('Progress in NOT supported in non-live mode')));
|
|
477
462
|
}
|
|
478
463
|
progressEdits.push(data.edits);
|
|
479
464
|
progressiveEditsAvgDuration.update(progressiveEditsClock.elapsed());
|
|
@@ -487,10 +472,10 @@ let NotebookChatController = class NotebookChatController extends Disposable {
|
|
|
487
472
|
if (data.markdownFragment) {
|
|
488
473
|
if (!progressiveChatResponse) {
|
|
489
474
|
const message = {
|
|
490
|
-
message: ( new MarkdownString(
|
|
475
|
+
message: ( (new MarkdownString(
|
|
491
476
|
data.markdownFragment,
|
|
492
477
|
{ supportThemeIcons: true, supportHtml: true, isTrusted: false }
|
|
493
|
-
)),
|
|
478
|
+
))),
|
|
494
479
|
providerId: this._activeSession.provider.label,
|
|
495
480
|
requestId: request.requestId,
|
|
496
481
|
};
|
|
@@ -500,7 +485,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
|
|
|
500
485
|
progressiveChatResponse.appendContent(data.markdownFragment);
|
|
501
486
|
}
|
|
502
487
|
}
|
|
503
|
-
}));
|
|
488
|
+
})));
|
|
504
489
|
const task = this._activeSession.provider.provideResponse(this._activeSession.session, request, progress, this._activeRequestCts.token);
|
|
505
490
|
let response;
|
|
506
491
|
try {
|
|
@@ -515,16 +500,16 @@ let NotebookChatController = class NotebookChatController extends Disposable {
|
|
|
515
500
|
}
|
|
516
501
|
await progress.drain();
|
|
517
502
|
if (!reply) {
|
|
518
|
-
response = ( new EmptyResponse());
|
|
503
|
+
response = ( (new EmptyResponse()));
|
|
519
504
|
}
|
|
520
505
|
else {
|
|
521
|
-
const markdownContents = ( new MarkdownString('', { supportThemeIcons: true, supportHtml: true, isTrusted: false }));
|
|
506
|
+
const markdownContents = ( (new MarkdownString('', { supportThemeIcons: true, supportHtml: true, isTrusted: false })));
|
|
522
507
|
const replyResponse = response = this._instantiationService.createInstance(ReplyResponse, reply, markdownContents, this._activeSession.textModelN.uri, this._activeSession.textModelN.getAlternativeVersionId(), progressEdits, request.requestId);
|
|
523
508
|
for (let i = progressEdits.length; i < replyResponse.allLocalEdits.length; i++) {
|
|
524
509
|
await this._makeChanges(replyResponse.allLocalEdits[i], undefined);
|
|
525
510
|
}
|
|
526
511
|
if (this._activeSession?.provider.provideFollowups) {
|
|
527
|
-
const followupCts = ( new CancellationTokenSource());
|
|
512
|
+
const followupCts = ( (new CancellationTokenSource()));
|
|
528
513
|
const followups = await this._activeSession.provider.provideFollowups(this._activeSession.session, replyResponse.raw, followupCts.token);
|
|
529
514
|
if (followups && this._widget) {
|
|
530
515
|
const widget = this._widget;
|
|
@@ -557,7 +542,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
|
|
|
557
542
|
}
|
|
558
543
|
}
|
|
559
544
|
catch (e) {
|
|
560
|
-
response = ( new ErrorResponse(e));
|
|
545
|
+
response = ( (new ErrorResponse(e)));
|
|
561
546
|
}
|
|
562
547
|
finally {
|
|
563
548
|
this._ctxHasActiveRequest.set(false);
|
|
@@ -569,7 +554,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
|
|
|
569
554
|
this._widget?.inlineChatWidget.updateProgress(false);
|
|
570
555
|
this._widget?.inlineChatWidget.updateInfo('');
|
|
571
556
|
this._widget?.inlineChatWidget.updateToolbar(true);
|
|
572
|
-
this._activeSession?.addExchange(( new SessionExchange(this._activeSession.lastInput, response)));
|
|
557
|
+
this._activeSession?.addExchange(( (new SessionExchange(this._activeSession.lastInput, response))));
|
|
573
558
|
this._ctxLastResponseType.set(response instanceof ReplyResponse ? response.raw.type : undefined);
|
|
574
559
|
}
|
|
575
560
|
async _startSession(editor, token) {
|
|
@@ -581,7 +566,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
|
|
|
581
566
|
return;
|
|
582
567
|
}
|
|
583
568
|
this._activeSession = session;
|
|
584
|
-
this._strategy = ( new EditStrategy(session));
|
|
569
|
+
this._strategy = ( (new EditStrategy(session)));
|
|
585
570
|
}
|
|
586
571
|
async _startInitialFolowups(editor, token) {
|
|
587
572
|
if (!this._activeSession || !this._activeSession.provider.provideFollowups) {
|
|
@@ -597,7 +582,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
|
|
|
597
582
|
previewDocument: editor.getModel().uri,
|
|
598
583
|
withIntentDetection: true
|
|
599
584
|
};
|
|
600
|
-
const progress = ( new AsyncProgress(async (data) => { }));
|
|
585
|
+
const progress = ( (new AsyncProgress(async (data) => { })));
|
|
601
586
|
const task = this._activeSession.provider.provideResponse(this._activeSession.session, request, progress, token);
|
|
602
587
|
const reply = await raceCancellationError(Promise.resolve(task), token);
|
|
603
588
|
if (token.isCancellationRequested) {
|
|
@@ -606,7 +591,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
|
|
|
606
591
|
if (!reply) {
|
|
607
592
|
return;
|
|
608
593
|
}
|
|
609
|
-
const markdownContents = ( new MarkdownString('', { supportThemeIcons: true, supportHtml: true, isTrusted: false }));
|
|
594
|
+
const markdownContents = ( (new MarkdownString('', { supportThemeIcons: true, supportHtml: true, isTrusted: false })));
|
|
610
595
|
const response = this._instantiationService.createInstance(ReplyResponse, reply, markdownContents, this._activeSession.textModelN.uri, this._activeSession.textModelN.getAlternativeVersionId(), [], request.requestId);
|
|
611
596
|
const followups = await this._activeSession.provider.provideFollowups(this._activeSession.session, response.raw, token);
|
|
612
597
|
if (followups && this._widget) {
|
|
@@ -637,7 +622,7 @@ let NotebookChatController = class NotebookChatController extends Disposable {
|
|
|
637
622
|
return;
|
|
638
623
|
}
|
|
639
624
|
const actualEdits = !opts && moreMinimalEdits ? moreMinimalEdits : edits;
|
|
640
|
-
const editOperations = ( actualEdits.map(TextEdit.asEditOperation));
|
|
625
|
+
const editOperations = ( (actualEdits.map(TextEdit.asEditOperation)));
|
|
641
626
|
this._inlineChatSavingService.markChanged(this._activeSession);
|
|
642
627
|
try {
|
|
643
628
|
this._activeSession.wholeRange.trackEdits(editOperations);
|
|
@@ -802,7 +787,9 @@ let NotebookChatController = class NotebookChatController extends Disposable {
|
|
|
802
787
|
return false;
|
|
803
788
|
}
|
|
804
789
|
const cellId = NotebookCellTextModelLikeId.str({ uri: cell.uri, viewType: this._notebookEditor.textModel.viewType });
|
|
805
|
-
return (
|
|
790
|
+
return (
|
|
791
|
+
(this._promptCache.has(cellId))
|
|
792
|
+
);
|
|
806
793
|
}
|
|
807
794
|
getPromptFromCache(cell) {
|
|
808
795
|
if (!this._notebookEditor.hasModel()) {
|
|
@@ -816,18 +803,18 @@ let NotebookChatController = class NotebookChatController extends Disposable {
|
|
|
816
803
|
super.dispose();
|
|
817
804
|
}
|
|
818
805
|
};
|
|
819
|
-
NotebookChatController = NotebookChatController_1 = ( __decorate([
|
|
820
|
-
( __param(1, IInstantiationService)),
|
|
821
|
-
( __param(2, IInlineChatSessionService)),
|
|
822
|
-
( __param(3, IContextKeyService)),
|
|
823
|
-
( __param(4, ICommandService)),
|
|
824
|
-
( __param(5, IEditorWorkerService)),
|
|
825
|
-
( __param(6, IInlineChatSavingService)),
|
|
826
|
-
( __param(7, IModelService)),
|
|
827
|
-
( __param(8, ILanguageService)),
|
|
828
|
-
( __param(9, INotebookExecutionStateService)),
|
|
829
|
-
( __param(10, IStorageService))
|
|
830
|
-
], NotebookChatController));
|
|
806
|
+
NotebookChatController = NotebookChatController_1 = ( (__decorate([
|
|
807
|
+
( (__param(1, IInstantiationService))),
|
|
808
|
+
( (__param(2, IInlineChatSessionService))),
|
|
809
|
+
( (__param(3, IContextKeyService))),
|
|
810
|
+
( (__param(4, ICommandService))),
|
|
811
|
+
( (__param(5, IEditorWorkerService))),
|
|
812
|
+
( (__param(6, IInlineChatSavingService))),
|
|
813
|
+
( (__param(7, IModelService))),
|
|
814
|
+
( (__param(8, ILanguageService))),
|
|
815
|
+
( (__param(9, INotebookExecutionStateService))),
|
|
816
|
+
( (__param(10, IStorageService)))
|
|
817
|
+
], NotebookChatController)));
|
|
831
818
|
class EditStrategy {
|
|
832
819
|
constructor(_session) {
|
|
833
820
|
this._session = _session;
|
|
@@ -841,7 +828,7 @@ class EditStrategy {
|
|
|
841
828
|
for (const edit of edits) {
|
|
842
829
|
const wordCount = countWords(edit.text ?? '');
|
|
843
830
|
const speed = wordCount / durationInSec;
|
|
844
|
-
await performAsyncTextEdit(editor.getModel(), asProgressiveEdit(( new WindowIntervalTimer()), edit, speed, opts.token));
|
|
831
|
+
await performAsyncTextEdit(editor.getModel(), asProgressiveEdit(( (new WindowIntervalTimer())), edit, speed, opts.token));
|
|
845
832
|
}
|
|
846
833
|
}
|
|
847
834
|
async makeChanges(editor, edits) {
|