@codingame/monaco-vscode-api 11.1.0 → 11.1.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 +1 -1
- package/package.json +8 -8
- package/vscode/src/vs/base/browser/ui/actionbar/actionViewItems.js +1 -1
- package/vscode/src/vs/base/browser/ui/button/button.js +1 -1
- 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/hover/hoverWidget.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/menu/menubar.js +1 -1
- package/vscode/src/vs/base/browser/ui/splitview/paneview.js +1 -1
- package/vscode/src/vs/base/browser/ui/toolbar/toolbar.js +1 -1
- package/vscode/src/vs/base/browser/ui/tree/abstractTree.js +9 -9
- package/vscode/src/vs/base/common/actions.js +1 -1
- package/vscode/src/vs/base/common/date.js +61 -61
- package/vscode/src/vs/base/common/errorMessage.js +6 -15
- package/vscode/src/vs/base/common/jsonErrorMessages.js +9 -9
- package/vscode/src/vs/editor/browser/controller/editContext/native/screenReaderSupport.js +1 -1
- package/vscode/src/vs/editor/browser/controller/editContext/screenReaderUtils.js +4 -4
- package/vscode/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContext.js +1 -1
- package/vscode/src/vs/editor/browser/coreCommands.js +3 -3
- package/vscode/src/vs/editor/browser/editorExtensions.js +6 -6
- package/vscode/src/vs/editor/browser/gpu/viewGpuContext.js +1 -1
- package/vscode/src/vs/editor/browser/services/hoverService/hoverWidget.js +1 -1
- package/vscode/src/vs/editor/browser/services/hoverService/updatableHoverWidget.js +1 -1
- package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.js +2 -2
- 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/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/common/config/editorConfigurationSchema.js +51 -51
- package/vscode/src/vs/editor/common/config/editorOptions.js +364 -364
- package/vscode/src/vs/editor/common/core/editorColorRegistry.js +71 -71
- package/vscode/src/vs/editor/common/editorContextKeys.js +46 -46
- package/vscode/src/vs/editor/common/languages/modesRegistry.js +1 -1
- package/vscode/src/vs/editor/common/languages.js +27 -27
- package/vscode/src/vs/editor/common/model/editStack.js +1 -1
- package/vscode/src/vs/editor/common/standaloneStrings.js +32 -32
- 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 +3 -3
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionMenu.js +8 -8
- package/vscode/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.js +9 -9
- package/vscode/src/vs/editor/contrib/codelens/browser/codelensController.js +2 -2
- package/vscode/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerParticipant.js +1 -1
- package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerActions.js +7 -7
- 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 +7 -7
- 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/find/browser/findController.js +16 -16
- package/vscode/src/vs/editor/contrib/find/browser/findWidget.js +27 -27
- package/vscode/src/vs/editor/contrib/folding/browser/folding.js +20 -20
- package/vscode/src/vs/editor/contrib/folding/browser/foldingDecorations.js +9 -9
- 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/link/goToDefinitionAtPosition.js +1 -1
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.js +3 -3
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesTree.js +3 -3
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.js +3 -3
- 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/gpu/browser/gpuActions.js +4 -4
- package/vscode/src/vs/editor/contrib/hover/browser/hoverAccessibleViews.js +2 -2
- package/vscode/src/vs/editor/contrib/hover/browser/hoverActionIds.js +2 -2
- package/vscode/src/vs/editor/contrib/hover/browser/hoverActions.js +23 -23
- package/vscode/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.js +9 -9
- package/vscode/src/vs/editor/contrib/hover/browser/markerHoverParticipant.js +5 -5
- 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/controller/commands.js +15 -15
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.js +8 -8
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.js +1 -1
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant.js +2 -2
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.js +5 -5
- 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 -6
- 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 +10 -10
- 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/wordHighlighter.js +3 -3
- package/vscode/src/vs/editor/contrib/wordOperations/browser/wordOperations.js +1 -1
- 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/actionWidget.js +7 -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/menuResetAction.js +1 -1
- package/vscode/src/vs/platform/actions/common/menuService.js +2 -2
- package/vscode/src/vs/platform/configuration/common/configurationRegistry.js +10 -10
- package/vscode/src/vs/platform/contextkey/browser/contextKeyService.js +1 -1
- package/vscode/src/vs/platform/contextkey/common/contextkey.js +11 -11
- package/vscode/src/vs/platform/contextkey/common/contextkeys.js +9 -9
- package/vscode/src/vs/platform/contextkey/common/scanner.js +5 -5
- package/vscode/src/vs/platform/dialogs/common/dialogs.js +9 -9
- package/vscode/src/vs/platform/dnd/browser/dnd.js +1 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.js +2 -2
- package/vscode/src/vs/platform/extensionManagement/common/extensionNls.js +1 -1
- package/vscode/src/vs/platform/extensions/common/extensionValidator.js +20 -28
- package/vscode/src/vs/platform/files/browser/htmlFileSystemProvider.js +2 -2
- package/vscode/src/vs/platform/files/common/files.js +6 -6
- 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/list/browser/listService.js +27 -27
- package/vscode/src/vs/platform/log/common/log.js +6 -6
- package/vscode/src/vs/platform/markers/common/markers.js +3 -3
- 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 +6 -6
- package/vscode/src/vs/platform/quickinput/browser/quickInputTree.js +1 -1
- package/vscode/src/vs/platform/quickinput/browser/quickInputUtils.js +1 -1
- package/vscode/src/vs/platform/request/common/request.js +14 -14
- package/vscode/src/vs/platform/terminal/common/terminalStrings.js +17 -0
- package/vscode/src/vs/platform/theme/common/colorUtils.js +2 -2
- 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 +36 -36
- 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/userDataSync.js +5 -5
- package/vscode/src/vs/platform/workspace/common/workspace.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 +2 -2
- package/vscode/src/vs/workbench/api/common/extHostLanguageModels.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostLogService.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostNotebook.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostStatusBar.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostTelemetry.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostTerminalService.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostTreeViews.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostTunnelService.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostWorkspace.js +1 -1
- package/vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js +12 -12
- package/vscode/src/vs/workbench/browser/actions/developerActions.js +34 -31
- package/vscode/src/vs/workbench/browser/actions/layoutActions.js +129 -129
- package/vscode/src/vs/workbench/browser/actions/textInputActions.js +6 -6
- 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/editor/editorCommands.js +18 -18
- package/vscode/src/vs/workbench/browser/parts/editor/editorTabsControl.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/globalCompositeBar.js +15 -15
- package/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.js +18 -18
- package/vscode/src/vs/workbench/browser/parts/titlebar/titlebarActions.js +13 -13
- package/vscode/src/vs/workbench/browser/parts/titlebar/windowTitle.js +2 -2
- 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 +6 -6
- package/vscode/src/vs/workbench/browser/quickaccess.js +1 -1
- package/vscode/src/vs/workbench/browser/window.js +16 -16
- package/vscode/src/vs/workbench/browser/workbench.contribution.js +217 -217
- package/vscode/src/vs/workbench/common/configuration.js +10 -10
- package/vscode/src/vs/workbench/common/contextkeys.js +70 -70
- package/vscode/src/vs/workbench/common/editor/sideBySideEditorInput.js +1 -1
- package/vscode/src/vs/workbench/common/editor/textEditorModel.js +1 -1
- package/vscode/src/vs/workbench/common/editor.js +4 -4
- package/vscode/src/vs/workbench/common/views.js +4 -4
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.js +131 -131
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.js +12 -12
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatConstants.js +7 -0
- package/vscode/src/vs/workbench/contrib/chat/common/chatContextKeys.js +25 -25
- 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/inspectEditorTokens/inspectEditorTokens.js +2 -2
- 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 +4 -4
- 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/commentsAccessibility.js +12 -12
- package/vscode/src/vs/workbench/contrib/comments/common/commentContextKeys.js +10 -10
- 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/debugIcons.js +57 -57
- package/vscode/src/vs/workbench/contrib/debug/common/debug.js +63 -63
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.js +173 -173
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsInput.js +2 -2
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.js +18 -18
- package/vscode/src/vs/workbench/contrib/files/browser/explorerViewlet.js +14 -14
- package/vscode/src/vs/workbench/contrib/files/browser/fileActions.js +84 -84
- 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 -52
- 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/explorerView.js +8 -8
- package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js +7 -7
- 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/list/browser/listResizeColumnAction.js +2 -2
- package/vscode/src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.js +5 -5
- package/vscode/src/vs/workbench/contrib/logs/common/logsActions.js +12 -12
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js +1 -1
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/icons.contribution.js +1 -1
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.js +2 -2
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.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 +10 -10
- package/vscode/src/vs/workbench/contrib/preferences/browser/settingsLayout.js +50 -50
- package/vscode/src/vs/workbench/contrib/preferences/common/preferences.js +2 -2
- package/vscode/src/vs/workbench/contrib/preferences/common/settingsEditorColorRegistry.js +21 -21
- 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/browser/scmHistory.js +13 -13
- package/vscode/src/vs/workbench/contrib/search/browser/anythingQuickAccess.js +5 -1
- 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/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/terminal/browser/detachedTerminal.js +3 -3
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.js +6 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.js +200 -0
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.js +23 -23
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalContextKey.js +170 -0
- 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/workspace/common/workspace.js +2 -2
- package/vscode/src/vs/workbench/services/activity/common/activity.js +4 -4
- package/vscode/src/vs/workbench/services/authentication/browser/authenticationService.js +3 -3
- package/vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js +5 -5
- 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/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/filesConfiguration/common/filesConfigurationService.js +5 -5
- package/vscode/src/vs/workbench/services/language/common/languageService.js +28 -28
- 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/search/common/queryBuilder.js +1 -1
- package/vscode/src/vs/workbench/services/textMate/common/TMGrammars.js +9 -9
- package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModel.js +3 -3
- package/vscode/src/vs/workbench/services/themes/common/colorExtensionPoint.js +22 -22
- package/vscode/src/vs/workbench/services/themes/common/colorThemeData.js +8 -8
- package/vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js +13 -13
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfile.js +3 -3
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfileIcons.js +1 -1
- package/vscode/src/vs/workbench/services/views/browser/viewsService.js +7 -7
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.js +0 -166
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.js +0 -474
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.js +0 -942
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.js +0 -476
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.js +0 -288
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.js +0 -521
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.js +0 -253
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/utils.js +0 -64
|
@@ -1,521 +0,0 @@
|
|
|
1
|
-
import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
-
import { WindowIntervalTimer } from '../../../../base/browser/dom.js';
|
|
3
|
-
import { coalesceInPlace } from '../../../../base/common/arrays.js';
|
|
4
|
-
import { Emitter, Event } from '../../../../base/common/event.js';
|
|
5
|
-
import { DisposableStore } from '../../../../base/common/lifecycle.js';
|
|
6
|
-
import { themeColorFromId, ThemeIcon } from '../../../../base/common/themables.js';
|
|
7
|
-
import { StableEditorScrollState } from '../../../../editor/browser/stableEditorScroll.js';
|
|
8
|
-
import { RenderOptions, LineSource, renderLines } from '../../../../editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js';
|
|
9
|
-
import { LineRange } from '../../../../editor/common/core/lineRange.js';
|
|
10
|
-
import { Range } from '../../../../editor/common/core/range.js';
|
|
11
|
-
import { OverviewRulerLane } from '../../../../editor/common/model.js';
|
|
12
|
-
import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
|
|
13
|
-
import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
|
|
14
|
-
import { InlineDecoration } from '../../../../editor/common/viewModel.js';
|
|
15
|
-
import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
|
|
16
|
-
import { Progress } from '../../../../platform/progress/common/progress.js';
|
|
17
|
-
import { countWords } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/common/chatWordCounter';
|
|
18
|
-
import { CTX_INLINE_CHAT_DOCUMENT_CHANGED, overviewRulerInlineChatDiffInserted, minimapInlineChatDiffInserted, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, MENU_INLINE_CHAT_ZONE, ACTION_TOGGLE_DIFF } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
|
|
19
|
-
import { assertType } from '../../../../base/common/types.js';
|
|
20
|
-
import { IModelService } from '../../../../editor/common/services/model.js';
|
|
21
|
-
import { asProgressiveEdit, performAsyncTextEdit } from './utils.js';
|
|
22
|
-
import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.service.js';
|
|
23
|
-
import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
|
|
24
|
-
import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
|
|
25
|
-
import { Schemas } from '../../../../base/common/network.js';
|
|
26
|
-
import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
|
|
27
|
-
import { DefaultChatTextEditor } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/chat/browser/codeBlockPart';
|
|
28
|
-
import { isEqual } from '../../../../base/common/resources.js';
|
|
29
|
-
import { Iterable } from '../../../../base/common/iterator.js';
|
|
30
|
-
import { ConflictActionsFactory } from '../../mergeEditor/browser/view/conflictActions.js';
|
|
31
|
-
import { observableValue } from '../../../../base/common/observableInternal/base.js';
|
|
32
|
-
import '../../../../base/common/observableInternal/autorun.js';
|
|
33
|
-
import '../../../../base/common/observableInternal/derived.js';
|
|
34
|
-
import '../../../../base/common/cancellation.js';
|
|
35
|
-
import '../../../../base/common/observableInternal/utils.js';
|
|
36
|
-
import { MenuItemAction } from '../../../../platform/actions/common/actions.js';
|
|
37
|
-
import { IMenuService } from '../../../../platform/actions/common/actions.service.js';
|
|
38
|
-
|
|
39
|
-
var EditModeStrategy_1;
|
|
40
|
-
let EditModeStrategy = class EditModeStrategy {
|
|
41
|
-
static { EditModeStrategy_1 = this; }
|
|
42
|
-
static { this._decoBlock = ModelDecorationOptions.register({
|
|
43
|
-
description: 'inline-chat',
|
|
44
|
-
showIfCollapsed: false,
|
|
45
|
-
isWholeLine: true,
|
|
46
|
-
}); }
|
|
47
|
-
constructor(_session, _editor, _zone, _textFileService, _instaService) {
|
|
48
|
-
this._session = _session;
|
|
49
|
-
this._editor = _editor;
|
|
50
|
-
this._zone = _zone;
|
|
51
|
-
this._textFileService = _textFileService;
|
|
52
|
-
this._instaService = _instaService;
|
|
53
|
-
this._store = ( new DisposableStore());
|
|
54
|
-
this._onDidAccept = this._store.add(( new Emitter()));
|
|
55
|
-
this._onDidDiscard = this._store.add(( new Emitter()));
|
|
56
|
-
this.onDidAccept = this._onDidAccept.event;
|
|
57
|
-
this.onDidDiscard = this._onDidDiscard.event;
|
|
58
|
-
}
|
|
59
|
-
dispose() {
|
|
60
|
-
this._store.dispose();
|
|
61
|
-
}
|
|
62
|
-
performHunkAction(_hunk, action) {
|
|
63
|
-
if (action === 0 ) {
|
|
64
|
-
this._onDidAccept.fire();
|
|
65
|
-
}
|
|
66
|
-
else if (action === 1 ) {
|
|
67
|
-
this._onDidDiscard.fire();
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
async _doApplyChanges(ignoreLocal) {
|
|
71
|
-
const untitledModels = [];
|
|
72
|
-
const editor = this._instaService.createInstance(DefaultChatTextEditor);
|
|
73
|
-
for (const request of this._session.chatModel.getRequests()) {
|
|
74
|
-
if (!request.response?.response) {
|
|
75
|
-
continue;
|
|
76
|
-
}
|
|
77
|
-
for (const item of request.response.response.value) {
|
|
78
|
-
if (item.kind !== 'textEditGroup') {
|
|
79
|
-
continue;
|
|
80
|
-
}
|
|
81
|
-
if (ignoreLocal && isEqual(item.uri, this._session.textModelN.uri)) {
|
|
82
|
-
continue;
|
|
83
|
-
}
|
|
84
|
-
await editor.apply(request.response, item, undefined);
|
|
85
|
-
if (item.uri.scheme === Schemas.untitled) {
|
|
86
|
-
const untitled = this._textFileService.untitled.get(item.uri);
|
|
87
|
-
if (untitled) {
|
|
88
|
-
untitledModels.push(untitled);
|
|
89
|
-
}
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
|
-
for (const untitledModel of untitledModels) {
|
|
94
|
-
if (!untitledModel.isDisposed()) {
|
|
95
|
-
await untitledModel.resolve();
|
|
96
|
-
await untitledModel.save({ reason: 1 });
|
|
97
|
-
}
|
|
98
|
-
}
|
|
99
|
-
}
|
|
100
|
-
cancel() {
|
|
101
|
-
return this._session.hunkData.discardAll();
|
|
102
|
-
}
|
|
103
|
-
getWholeRangeDecoration() {
|
|
104
|
-
const ranges = [this._session.wholeRange.value];
|
|
105
|
-
const newDecorations = ( ranges.map(
|
|
106
|
-
range => range.isEmpty() ? undefined : ({ range, options: EditModeStrategy_1._decoBlock })
|
|
107
|
-
));
|
|
108
|
-
coalesceInPlace(newDecorations);
|
|
109
|
-
return newDecorations;
|
|
110
|
-
}
|
|
111
|
-
};
|
|
112
|
-
EditModeStrategy = EditModeStrategy_1 = ( __decorate([
|
|
113
|
-
( __param(3, ITextFileService)),
|
|
114
|
-
( __param(4, IInstantiationService))
|
|
115
|
-
], EditModeStrategy));
|
|
116
|
-
let PreviewStrategy = class PreviewStrategy extends EditModeStrategy {
|
|
117
|
-
constructor(session, editor, zone, modelService, contextKeyService, textFileService, instaService) {
|
|
118
|
-
super(session, editor, zone, textFileService, instaService);
|
|
119
|
-
this._ctxDocumentChanged = CTX_INLINE_CHAT_DOCUMENT_CHANGED.bindTo(contextKeyService);
|
|
120
|
-
const baseModel = modelService.getModel(session.targetUri);
|
|
121
|
-
Event.debounce(baseModel.onDidChangeContent.bind(baseModel), () => { }, 350)(_ => {
|
|
122
|
-
if (!baseModel.isDisposed() && !session.textModel0.isDisposed()) {
|
|
123
|
-
this._ctxDocumentChanged.set(session.hasChangedText);
|
|
124
|
-
}
|
|
125
|
-
}, undefined, this._store);
|
|
126
|
-
}
|
|
127
|
-
dispose() {
|
|
128
|
-
this._ctxDocumentChanged.reset();
|
|
129
|
-
super.dispose();
|
|
130
|
-
}
|
|
131
|
-
async apply() {
|
|
132
|
-
await super._doApplyChanges(false);
|
|
133
|
-
}
|
|
134
|
-
async makeChanges() {
|
|
135
|
-
}
|
|
136
|
-
async makeProgressiveChanges() {
|
|
137
|
-
}
|
|
138
|
-
async renderChanges() { }
|
|
139
|
-
hasFocus() {
|
|
140
|
-
return this._zone.widget.hasFocus();
|
|
141
|
-
}
|
|
142
|
-
};
|
|
143
|
-
PreviewStrategy = ( __decorate([
|
|
144
|
-
( __param(3, IModelService)),
|
|
145
|
-
( __param(4, IContextKeyService)),
|
|
146
|
-
( __param(5, ITextFileService)),
|
|
147
|
-
( __param(6, IInstantiationService))
|
|
148
|
-
], PreviewStrategy));
|
|
149
|
-
let LiveStrategy = class LiveStrategy extends EditModeStrategy {
|
|
150
|
-
constructor(session, editor, zone, _showOverlayToolbar, contextKeyService, _editorWorkerService, _accessibilityService, _configService, _menuService, _contextService, textFileService, instaService) {
|
|
151
|
-
super(session, editor, zone, textFileService, instaService);
|
|
152
|
-
this._showOverlayToolbar = _showOverlayToolbar;
|
|
153
|
-
this._editorWorkerService = _editorWorkerService;
|
|
154
|
-
this._accessibilityService = _accessibilityService;
|
|
155
|
-
this._configService = _configService;
|
|
156
|
-
this._menuService = _menuService;
|
|
157
|
-
this._contextService = _contextService;
|
|
158
|
-
this._decoInsertedText = ModelDecorationOptions.register({
|
|
159
|
-
description: 'inline-modified-line',
|
|
160
|
-
className: 'inline-chat-inserted-range-linehighlight',
|
|
161
|
-
isWholeLine: true,
|
|
162
|
-
overviewRuler: {
|
|
163
|
-
position: OverviewRulerLane.Full,
|
|
164
|
-
color: themeColorFromId(overviewRulerInlineChatDiffInserted),
|
|
165
|
-
},
|
|
166
|
-
minimap: {
|
|
167
|
-
position: 1 ,
|
|
168
|
-
color: themeColorFromId(minimapInlineChatDiffInserted),
|
|
169
|
-
}
|
|
170
|
-
});
|
|
171
|
-
this._decoInsertedTextRange = ModelDecorationOptions.register({
|
|
172
|
-
description: 'inline-chat-inserted-range-linehighlight',
|
|
173
|
-
className: 'inline-chat-inserted-range',
|
|
174
|
-
stickiness: 1 ,
|
|
175
|
-
});
|
|
176
|
-
this._editCount = 0;
|
|
177
|
-
this._hunkDisplayData = ( new Map());
|
|
178
|
-
this._ctxCurrentChangeHasDiff = CTX_INLINE_CHAT_CHANGE_HAS_DIFF.bindTo(contextKeyService);
|
|
179
|
-
this._ctxCurrentChangeShowsDiff = CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF.bindTo(contextKeyService);
|
|
180
|
-
this._progressiveEditingDecorations = this._editor.createDecorationsCollection();
|
|
181
|
-
this._lensActionsFactory = this._store.add(( new ConflictActionsFactory(this._editor)));
|
|
182
|
-
}
|
|
183
|
-
dispose() {
|
|
184
|
-
this._resetDiff();
|
|
185
|
-
super.dispose();
|
|
186
|
-
}
|
|
187
|
-
_resetDiff() {
|
|
188
|
-
this._ctxCurrentChangeHasDiff.reset();
|
|
189
|
-
this._ctxCurrentChangeShowsDiff.reset();
|
|
190
|
-
this._zone.widget.updateStatus('');
|
|
191
|
-
this._progressiveEditingDecorations.clear();
|
|
192
|
-
for (const data of ( this._hunkDisplayData.values())) {
|
|
193
|
-
data.remove();
|
|
194
|
-
}
|
|
195
|
-
}
|
|
196
|
-
async apply() {
|
|
197
|
-
this._resetDiff();
|
|
198
|
-
if (this._editCount > 0) {
|
|
199
|
-
this._editor.pushUndoStop();
|
|
200
|
-
}
|
|
201
|
-
await super._doApplyChanges(true);
|
|
202
|
-
}
|
|
203
|
-
cancel() {
|
|
204
|
-
this._resetDiff();
|
|
205
|
-
return super.cancel();
|
|
206
|
-
}
|
|
207
|
-
async makeChanges(edits, obs, undoStopBefore) {
|
|
208
|
-
return this._makeChanges(edits, obs, undefined, undefined, undoStopBefore);
|
|
209
|
-
}
|
|
210
|
-
async makeProgressiveChanges(edits, obs, opts, undoStopBefore) {
|
|
211
|
-
const progress = ( new Progress(edits => {
|
|
212
|
-
const newLines = ( new Set());
|
|
213
|
-
for (const edit of edits) {
|
|
214
|
-
LineRange.fromRange(edit.range).forEach(line => newLines.add(line));
|
|
215
|
-
}
|
|
216
|
-
const existingRanges = ( this._progressiveEditingDecorations.getRanges().map(LineRange.fromRange));
|
|
217
|
-
for (const existingRange of existingRanges) {
|
|
218
|
-
existingRange.forEach(line => newLines.delete(line));
|
|
219
|
-
}
|
|
220
|
-
const newDecorations = [];
|
|
221
|
-
for (const line of newLines) {
|
|
222
|
-
newDecorations.push({ range: ( new Range(line, 1, line, Number.MAX_VALUE)), options: this._decoInsertedText });
|
|
223
|
-
}
|
|
224
|
-
this._progressiveEditingDecorations.append(newDecorations);
|
|
225
|
-
}));
|
|
226
|
-
return this._makeChanges(edits, obs, opts, progress, undoStopBefore);
|
|
227
|
-
}
|
|
228
|
-
async _makeChanges(edits, obs, opts, progress, undoStopBefore) {
|
|
229
|
-
if (undoStopBefore) {
|
|
230
|
-
this._editor.pushUndoStop();
|
|
231
|
-
}
|
|
232
|
-
this._editCount++;
|
|
233
|
-
if (opts) {
|
|
234
|
-
const durationInSec = opts.duration / 1000;
|
|
235
|
-
for (const edit of edits) {
|
|
236
|
-
const wordCount = countWords(edit.text ?? '');
|
|
237
|
-
const speed = wordCount / durationInSec;
|
|
238
|
-
const asyncEdit = asProgressiveEdit(( new WindowIntervalTimer(this._zone.domNode)), edit, speed, opts.token);
|
|
239
|
-
await performAsyncTextEdit(this._session.textModelN, asyncEdit, progress, obs);
|
|
240
|
-
}
|
|
241
|
-
}
|
|
242
|
-
else {
|
|
243
|
-
obs.start();
|
|
244
|
-
this._session.textModelN.pushEditOperations(null, edits, (undoEdits) => {
|
|
245
|
-
progress?.report(undoEdits);
|
|
246
|
-
return null;
|
|
247
|
-
});
|
|
248
|
-
obs.stop();
|
|
249
|
-
}
|
|
250
|
-
}
|
|
251
|
-
performHunkAction(hunk, action) {
|
|
252
|
-
const displayData = this._findDisplayData(hunk);
|
|
253
|
-
if (!displayData) {
|
|
254
|
-
if (action === 0 ) {
|
|
255
|
-
this._onDidAccept.fire();
|
|
256
|
-
}
|
|
257
|
-
else if (action === 1 ) {
|
|
258
|
-
this._onDidDiscard.fire();
|
|
259
|
-
}
|
|
260
|
-
return;
|
|
261
|
-
}
|
|
262
|
-
if (action === 0 ) {
|
|
263
|
-
displayData.acceptHunk();
|
|
264
|
-
}
|
|
265
|
-
else if (action === 1 ) {
|
|
266
|
-
displayData.discardHunk();
|
|
267
|
-
}
|
|
268
|
-
else if (action === 2 ) {
|
|
269
|
-
displayData.move(true);
|
|
270
|
-
}
|
|
271
|
-
else if (action === 3 ) {
|
|
272
|
-
displayData.move(false);
|
|
273
|
-
}
|
|
274
|
-
else if (action === 4 ) {
|
|
275
|
-
displayData.toggleDiff?.();
|
|
276
|
-
}
|
|
277
|
-
}
|
|
278
|
-
_findDisplayData(hunkInfo) {
|
|
279
|
-
let result;
|
|
280
|
-
if (hunkInfo) {
|
|
281
|
-
result = this._hunkDisplayData.get(hunkInfo);
|
|
282
|
-
}
|
|
283
|
-
if (!result && this._zone.position) {
|
|
284
|
-
const zoneLine = this._zone.position.lineNumber;
|
|
285
|
-
let distance = Number.MAX_SAFE_INTEGER;
|
|
286
|
-
for (const candidate of ( this._hunkDisplayData.values())) {
|
|
287
|
-
if (candidate.hunk.getState() !== 0 ) {
|
|
288
|
-
continue;
|
|
289
|
-
}
|
|
290
|
-
const hunkRanges = candidate.hunk.getRangesN();
|
|
291
|
-
const myDistance = zoneLine <= hunkRanges[0].startLineNumber
|
|
292
|
-
? hunkRanges[0].startLineNumber - zoneLine
|
|
293
|
-
: zoneLine - hunkRanges[0].endLineNumber;
|
|
294
|
-
if (myDistance < distance) {
|
|
295
|
-
distance = myDistance;
|
|
296
|
-
result = candidate;
|
|
297
|
-
}
|
|
298
|
-
}
|
|
299
|
-
}
|
|
300
|
-
if (!result) {
|
|
301
|
-
result = Iterable.first(Iterable.filter(( this._hunkDisplayData.values()), candidate => candidate.hunk.getState() === 0 ));
|
|
302
|
-
}
|
|
303
|
-
return result;
|
|
304
|
-
}
|
|
305
|
-
async renderChanges() {
|
|
306
|
-
this._progressiveEditingDecorations.clear();
|
|
307
|
-
const renderHunks = () => {
|
|
308
|
-
let widgetData;
|
|
309
|
-
changeDecorationsAndViewZones(this._editor, (decorationsAccessor, viewZoneAccessor) => {
|
|
310
|
-
const keysNow = ( new Set(( this._hunkDisplayData.keys())));
|
|
311
|
-
widgetData = undefined;
|
|
312
|
-
for (const hunkData of this._session.hunkData.getInfo()) {
|
|
313
|
-
keysNow.delete(hunkData);
|
|
314
|
-
const hunkRanges = hunkData.getRangesN();
|
|
315
|
-
let data = this._hunkDisplayData.get(hunkData);
|
|
316
|
-
if (!data) {
|
|
317
|
-
const decorationIds = [];
|
|
318
|
-
for (let i = 0; i < hunkRanges.length; i++) {
|
|
319
|
-
decorationIds.push(decorationsAccessor.addDecoration(hunkRanges[i], i === 0
|
|
320
|
-
? this._decoInsertedText
|
|
321
|
-
: this._decoInsertedTextRange));
|
|
322
|
-
}
|
|
323
|
-
const acceptHunk = () => {
|
|
324
|
-
hunkData.acceptChanges();
|
|
325
|
-
renderHunks();
|
|
326
|
-
};
|
|
327
|
-
const discardHunk = () => {
|
|
328
|
-
hunkData.discardChanges();
|
|
329
|
-
renderHunks();
|
|
330
|
-
};
|
|
331
|
-
const mightContainNonBasicASCII = this._session.textModel0.mightContainNonBasicASCII();
|
|
332
|
-
const mightContainRTL = this._session.textModel0.mightContainRTL();
|
|
333
|
-
const renderOptions = RenderOptions.fromEditor(this._editor);
|
|
334
|
-
const originalRange = hunkData.getRanges0()[0];
|
|
335
|
-
const source = ( new LineSource(
|
|
336
|
-
LineRange.fromRangeInclusive(originalRange).mapToLineArray(l => this._session.textModel0.tokenization.getLineTokens(l)),
|
|
337
|
-
[],
|
|
338
|
-
mightContainNonBasicASCII,
|
|
339
|
-
mightContainRTL
|
|
340
|
-
));
|
|
341
|
-
const domNode = document.createElement('div');
|
|
342
|
-
domNode.className = 'inline-chat-original-zone2';
|
|
343
|
-
const result = renderLines(source, renderOptions, [( new InlineDecoration(( new Range(originalRange.startLineNumber, 1, originalRange.startLineNumber, 1)), '', 0 ))], domNode);
|
|
344
|
-
const viewZoneData = {
|
|
345
|
-
afterLineNumber: -1,
|
|
346
|
-
heightInLines: result.heightInLines,
|
|
347
|
-
domNode,
|
|
348
|
-
ordinal: 50000 + 2
|
|
349
|
-
};
|
|
350
|
-
const toggleDiff = () => {
|
|
351
|
-
const scrollState = StableEditorScrollState.capture(this._editor);
|
|
352
|
-
changeDecorationsAndViewZones(this._editor, (_decorationsAccessor, viewZoneAccessor) => {
|
|
353
|
-
assertType(data);
|
|
354
|
-
if (!data.diffViewZoneId) {
|
|
355
|
-
const [hunkRange] = hunkData.getRangesN();
|
|
356
|
-
viewZoneData.afterLineNumber = hunkRange.startLineNumber - 1;
|
|
357
|
-
data.diffViewZoneId = viewZoneAccessor.addZone(viewZoneData);
|
|
358
|
-
}
|
|
359
|
-
else {
|
|
360
|
-
viewZoneAccessor.removeZone(data.diffViewZoneId);
|
|
361
|
-
data.diffViewZoneId = undefined;
|
|
362
|
-
}
|
|
363
|
-
});
|
|
364
|
-
this._ctxCurrentChangeShowsDiff.set(typeof data?.diffViewZoneId === 'string');
|
|
365
|
-
scrollState.restore(this._editor);
|
|
366
|
-
};
|
|
367
|
-
let lensActions;
|
|
368
|
-
const lensActionsViewZoneIds = [];
|
|
369
|
-
if (this._showOverlayToolbar && hunkData.getState() === 0 ) {
|
|
370
|
-
lensActions = ( new DisposableStore());
|
|
371
|
-
const menu = this._menuService.createMenu(MENU_INLINE_CHAT_ZONE, this._contextService);
|
|
372
|
-
const makeActions = () => {
|
|
373
|
-
const actions = [];
|
|
374
|
-
const tuples = menu.getActions({ arg: hunkData });
|
|
375
|
-
for (const [, group] of tuples) {
|
|
376
|
-
for (const item of group) {
|
|
377
|
-
if (item instanceof MenuItemAction) {
|
|
378
|
-
let text = item.label;
|
|
379
|
-
if (item.id === ACTION_TOGGLE_DIFF) {
|
|
380
|
-
text = item.checked ? 'Hide Changes' : 'Show Changes';
|
|
381
|
-
}
|
|
382
|
-
else if (ThemeIcon.isThemeIcon(item.item.icon)) {
|
|
383
|
-
text = `$(${item.item.icon.id}) ${text}`;
|
|
384
|
-
}
|
|
385
|
-
actions.push({
|
|
386
|
-
text,
|
|
387
|
-
tooltip: item.tooltip,
|
|
388
|
-
action: async () => item.run(),
|
|
389
|
-
});
|
|
390
|
-
}
|
|
391
|
-
}
|
|
392
|
-
}
|
|
393
|
-
return actions;
|
|
394
|
-
};
|
|
395
|
-
const obs = observableValue(this, makeActions());
|
|
396
|
-
lensActions.add(menu.onDidChange(() => obs.set(makeActions(), undefined)));
|
|
397
|
-
lensActions.add(menu);
|
|
398
|
-
lensActions.add(this._lensActionsFactory.createWidget(viewZoneAccessor, hunkRanges[0].startLineNumber - 1, obs, lensActionsViewZoneIds));
|
|
399
|
-
}
|
|
400
|
-
const remove = () => {
|
|
401
|
-
changeDecorationsAndViewZones(this._editor, (decorationsAccessor, viewZoneAccessor) => {
|
|
402
|
-
assertType(data);
|
|
403
|
-
for (const decorationId of data.decorationIds) {
|
|
404
|
-
decorationsAccessor.removeDecoration(decorationId);
|
|
405
|
-
}
|
|
406
|
-
if (data.diffViewZoneId) {
|
|
407
|
-
viewZoneAccessor.removeZone(data.diffViewZoneId);
|
|
408
|
-
}
|
|
409
|
-
data.decorationIds = [];
|
|
410
|
-
data.diffViewZoneId = undefined;
|
|
411
|
-
data.lensActionsViewZoneIds?.forEach(viewZoneAccessor.removeZone);
|
|
412
|
-
data.lensActionsViewZoneIds = undefined;
|
|
413
|
-
});
|
|
414
|
-
lensActions?.dispose();
|
|
415
|
-
};
|
|
416
|
-
const move = (next) => {
|
|
417
|
-
const keys = Array.from(( this._hunkDisplayData.keys()));
|
|
418
|
-
const idx = keys.indexOf(hunkData);
|
|
419
|
-
const nextIdx = (idx + (next ? 1 : -1) + keys.length) % keys.length;
|
|
420
|
-
if (nextIdx !== idx) {
|
|
421
|
-
const nextData = this._hunkDisplayData.get(keys[nextIdx]);
|
|
422
|
-
this._zone.updatePositionAndHeight(nextData?.position);
|
|
423
|
-
renderHunks();
|
|
424
|
-
}
|
|
425
|
-
};
|
|
426
|
-
const zoneLineNumber = this._zone.position?.lineNumber ?? this._editor.getPosition().lineNumber;
|
|
427
|
-
const myDistance = zoneLineNumber <= hunkRanges[0].startLineNumber
|
|
428
|
-
? hunkRanges[0].startLineNumber - zoneLineNumber
|
|
429
|
-
: zoneLineNumber - hunkRanges[0].endLineNumber;
|
|
430
|
-
data = {
|
|
431
|
-
hunk: hunkData,
|
|
432
|
-
decorationIds,
|
|
433
|
-
diffViewZoneId: '',
|
|
434
|
-
diffViewZone: viewZoneData,
|
|
435
|
-
lensActionsViewZoneIds,
|
|
436
|
-
distance: myDistance,
|
|
437
|
-
position: hunkRanges[0].getStartPosition().delta(-1),
|
|
438
|
-
acceptHunk,
|
|
439
|
-
discardHunk,
|
|
440
|
-
toggleDiff: !hunkData.isInsertion() ? toggleDiff : undefined,
|
|
441
|
-
remove,
|
|
442
|
-
move,
|
|
443
|
-
};
|
|
444
|
-
this._hunkDisplayData.set(hunkData, data);
|
|
445
|
-
}
|
|
446
|
-
else if (hunkData.getState() !== 0 ) {
|
|
447
|
-
data.remove();
|
|
448
|
-
}
|
|
449
|
-
else {
|
|
450
|
-
const zoneLineNumber = this._zone.position?.lineNumber ?? this._editor.getPosition().lineNumber;
|
|
451
|
-
const modifiedRangeNow = hunkRanges[0];
|
|
452
|
-
data.position = modifiedRangeNow.getStartPosition().delta(-1);
|
|
453
|
-
data.distance = zoneLineNumber <= modifiedRangeNow.startLineNumber
|
|
454
|
-
? modifiedRangeNow.startLineNumber - zoneLineNumber
|
|
455
|
-
: zoneLineNumber - modifiedRangeNow.endLineNumber;
|
|
456
|
-
}
|
|
457
|
-
if (hunkData.getState() === 0 && (!widgetData || data.distance < widgetData.distance)) {
|
|
458
|
-
widgetData = data;
|
|
459
|
-
}
|
|
460
|
-
}
|
|
461
|
-
for (const key of keysNow) {
|
|
462
|
-
const data = this._hunkDisplayData.get(key);
|
|
463
|
-
if (data) {
|
|
464
|
-
this._hunkDisplayData.delete(key);
|
|
465
|
-
data.remove();
|
|
466
|
-
}
|
|
467
|
-
}
|
|
468
|
-
});
|
|
469
|
-
if (widgetData) {
|
|
470
|
-
this._zone.reveal(widgetData.position);
|
|
471
|
-
const mode = this._configService.getValue("inlineChat.accessibleDiffView" );
|
|
472
|
-
if (mode === 'on' || mode === 'auto' && this._accessibilityService.isScreenReaderOptimized()) {
|
|
473
|
-
this._zone.widget.showAccessibleHunk(this._session, widgetData.hunk);
|
|
474
|
-
}
|
|
475
|
-
this._ctxCurrentChangeHasDiff.set(Boolean(widgetData.toggleDiff));
|
|
476
|
-
}
|
|
477
|
-
else if (this._hunkDisplayData.size > 0) {
|
|
478
|
-
let oneAccepted = false;
|
|
479
|
-
for (const hunkData of this._session.hunkData.getInfo()) {
|
|
480
|
-
if (hunkData.getState() === 1 ) {
|
|
481
|
-
oneAccepted = true;
|
|
482
|
-
break;
|
|
483
|
-
}
|
|
484
|
-
}
|
|
485
|
-
if (oneAccepted) {
|
|
486
|
-
this._onDidAccept.fire();
|
|
487
|
-
}
|
|
488
|
-
else {
|
|
489
|
-
this._onDidDiscard.fire();
|
|
490
|
-
}
|
|
491
|
-
}
|
|
492
|
-
return widgetData;
|
|
493
|
-
};
|
|
494
|
-
return renderHunks()?.position;
|
|
495
|
-
}
|
|
496
|
-
hasFocus() {
|
|
497
|
-
return this._zone.widget.hasFocus();
|
|
498
|
-
}
|
|
499
|
-
getWholeRangeDecoration() {
|
|
500
|
-
return [];
|
|
501
|
-
}
|
|
502
|
-
};
|
|
503
|
-
LiveStrategy = ( __decorate([
|
|
504
|
-
( __param(4, IContextKeyService)),
|
|
505
|
-
( __param(5, IEditorWorkerService)),
|
|
506
|
-
( __param(6, IAccessibilityService)),
|
|
507
|
-
( __param(7, IConfigurationService)),
|
|
508
|
-
( __param(8, IMenuService)),
|
|
509
|
-
( __param(9, IContextKeyService)),
|
|
510
|
-
( __param(10, ITextFileService)),
|
|
511
|
-
( __param(11, IInstantiationService))
|
|
512
|
-
], LiveStrategy));
|
|
513
|
-
function changeDecorationsAndViewZones(editor, callback) {
|
|
514
|
-
editor.changeDecorations(decorationsAccessor => {
|
|
515
|
-
editor.changeViewZones(viewZoneAccessor => {
|
|
516
|
-
callback(decorationsAccessor, viewZoneAccessor);
|
|
517
|
-
});
|
|
518
|
-
});
|
|
519
|
-
}
|
|
520
|
-
|
|
521
|
-
export { EditModeStrategy, LiveStrategy, PreviewStrategy };
|