@codingame/monaco-vscode-api 11.0.2 → 11.1.1
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.d.ts +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/dialog/dialog.js +6 -6
- 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/browser/ui/tree/treeDefaults.js +1 -1
- package/vscode/src/vs/base/common/date.js +61 -61
- package/vscode/src/vs/base/common/errorMessage.js +6 -6
- package/vscode/src/vs/base/common/jsonErrorMessages.js +9 -9
- package/vscode/src/vs/base/common/keybindingLabels.js +20 -20
- package/vscode/src/vs/editor/browser/controller/editContext/textArea/textAreaEditContext.js +1 -1
- 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/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/features/hideUnchangedRegionsFeature.js +7 -7
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.js +4 -4
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.js +2 -2
- package/vscode/src/vs/editor/browser/widget/diffEditor/registrations.contribution.js +5 -5
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/colors.js +3 -3
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js +2 -2
- 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.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/common/viewLayout/viewLineRenderer.js +2 -2
- 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/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/dropIntoEditorController.js +3 -3
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.js +2 -2
- package/vscode/src/vs/editor/contrib/editorState/browser/keybindingCancellation.js +1 -1
- package/vscode/src/vs/editor/contrib/find/browser/findWidget.js +27 -27
- package/vscode/src/vs/editor/contrib/folding/browser/foldingDecorations.js +9 -9
- package/vscode/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.js +14 -14
- 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/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/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/message/browser/messageController.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/quickAccess/browser/gotoLineQuickAccess.js +5 -5
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js +32 -32
- package/vscode/src/vs/editor/contrib/rename/browser/renameWidget.js +6 -6
- 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/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/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/contextkey/browser/contextKeyService.js +1 -1
- package/vscode/src/vs/platform/contextkey/common/contextkeys.js +9 -9
- package/vscode/src/vs/platform/contextkey/common/scanner.js +5 -5
- package/vscode/src/vs/platform/dialogs/common/dialogs.js +9 -9
- package/vscode/src/vs/platform/dnd/browser/dnd.js +1 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.js +2 -2
- package/vscode/src/vs/platform/extensionManagement/common/extensionNls.js +1 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionsScannerService.js +7 -7
- 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/languagePacks/common/languagePacks.js +1 -1
- package/vscode/src/vs/platform/languagePacks/common/localizedStrings.js +3 -3
- package/vscode/src/vs/platform/list/browser/listService.js +27 -27
- package/vscode/src/vs/platform/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/userDataProfile/common/userDataProfile.js +1 -1
- package/vscode/src/vs/platform/userDataSync/common/abstractSynchronizer.js +2 -2
- package/vscode/src/vs/platform/userDataSync/common/userDataSync.js +5 -5
- package/vscode/src/vs/platform/userDataSync/common/userDataSyncMachines.js +1 -1
- package/vscode/src/vs/platform/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 +31 -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/windowActions.js +25 -25
- package/vscode/src/vs/workbench/browser/actions/workspaceActions.js +21 -21
- package/vscode/src/vs/workbench/browser/actions/workspaceCommands.js +4 -4
- package/vscode/src/vs/workbench/browser/editor.js +2 -2
- package/vscode/src/vs/workbench/browser/labels.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.js +11 -11
- package/vscode/src/vs/workbench/browser/parts/compositeBarActions.js +11 -11
- package/vscode/src/vs/workbench/browser/parts/editor/binaryDiffEditor.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/binaryEditor.js +3 -3
- package/vscode/src/vs/workbench/browser/parts/editor/diffEditorCommands.js +6 -6
- package/vscode/src/vs/workbench/browser/parts/editor/editorCommands.js +18 -18
- package/vscode/src/vs/workbench/browser/parts/editor/editorQuickAccess.js +5 -5
- package/vscode/src/vs/workbench/browser/parts/editor/editorStatus.js +61 -61
- package/vscode/src/vs/workbench/browser/parts/editor/editorTabsControl.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/editor/sideBySideEditor.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/textCodeEditor.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/textDiffEditor.js +3 -3
- package/vscode/src/vs/workbench/browser/parts/globalCompositeBar.js +15 -15
- package/vscode/src/vs/workbench/browser/parts/panel/panelActions.js +34 -34
- package/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.js +18 -18
- package/vscode/src/vs/workbench/browser/parts/titlebar/titlebarActions.js +13 -13
- package/vscode/src/vs/workbench/browser/parts/titlebar/windowTitle.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/views/checkbox.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/views/treeView.js +7 -7
- package/vscode/src/vs/workbench/browser/parts/views/viewFilter.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/views/viewPane.js +4 -4
- package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js +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/editor/diffEditorInput.js +1 -1
- package/vscode/src/vs/workbench/common/editor/sideBySideEditorInput.js +1 -1
- package/vscode/src/vs/workbench/common/editor/textEditorModel.js +1 -1
- package/vscode/src/vs/workbench/common/theme.js +156 -156
- package/vscode/src/vs/workbench/common/views.js +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/customEditor/browser/customEditorInput.js +3 -3
- 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/abstractDebugAdapter.js +1 -1
- 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/browser/extensionsIcons.js +24 -24
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.js +5 -5
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsInput.js +2 -2
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsUtils.js +3 -3
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/configuration.js +4 -4
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.js +4 -4
- package/vscode/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.js +1 -1
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditor.js +8 -8
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.js +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/fileCommands._save.js +4 -4
- 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/browser/workspaceWatcher.js +4 -4
- package/vscode/src/vs/workbench/contrib/files/common/dirtyFilesIndicator.js +1 -1
- package/vscode/src/vs/workbench/contrib/files/common/files.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/mergeEditor/browser/mergeEditorInputModel.js +29 -29
- package/vscode/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.js +8 -8
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/icons.contribution.js +1 -1
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.js +2 -2
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.js +6 -6
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditor.js +8 -8
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorInput.js +2 -2
- package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingWidgets.js +3 -3
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesIcons.js +12 -12
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.js +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/remote/browser/remoteExplorer.js +15 -15
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteIcons.js +17 -17
- package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.js +60 -60
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.js +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js +23 -23
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistory.js +13 -13
- package/vscode/src/vs/workbench/contrib/search/browser/anythingQuickAccess.js +15 -11
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsBase.js +1 -1
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsFind.js +10 -10
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsTopBar.js +8 -8
- package/vscode/src/vs/workbench/contrib/search/browser/searchIcons.js +20 -20
- package/vscode/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.js +2 -2
- package/vscode/src/vs/workbench/contrib/snippets/browser/commands/abstractSnippetsActions.js +1 -1
- package/vscode/src/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets.js +2 -2
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.js +3 -3
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsFile.js +3 -3
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsService.js +9 -9
- package/vscode/src/vs/workbench/contrib/speech/common/speechService.js +29 -29
- package/vscode/src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.js +5 -5
- package/vscode/src/vs/workbench/contrib/tasks/common/taskService.js +5 -5
- package/vscode/src/vs/workbench/contrib/tasks/common/tasks.js +3 -3
- package/vscode/src/vs/workbench/contrib/terminal/browser/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/testing/common/testResult.js +2 -2
- 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/webviewPanel/browser/webviewEditor.js +1 -1
- 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/extensions/common/extensionsRegistry.js +82 -82
- 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/remote/common/remoteExplorerService.js +8 -8
- package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js +6 -6
- 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/userDataSync/common/userDataSync.js +11 -11
- 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,476 +0,0 @@
|
|
|
1
|
-
import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
|
|
2
|
-
import { Emitter, Event } from '../../../../base/common/event.js';
|
|
3
|
-
import { CTX_INLINE_CHAT_HAS_STASHED_SESSION } from '@codingame/monaco-vscode-chat-extensions-interactive-notebook-quickaccess-search-terminal-common/vscode/vs/workbench/contrib/inlineChat/common/inlineChat';
|
|
4
|
-
import { Range } from '../../../../editor/common/core/range.js';
|
|
5
|
-
import { ModelDecorationOptions } from '../../../../editor/common/model/textModel.js';
|
|
6
|
-
import { EditOperation } from '../../../../editor/common/core/editOperation.js';
|
|
7
|
-
import { DetailedLineRangeMapping } from '../../../../editor/common/diff/rangeMapping.js';
|
|
8
|
-
import { IInlineChatSessionService } from './inlineChatSessionService.service.js';
|
|
9
|
-
import { IEditorWorkerService } from '../../../../editor/common/services/editorWorker.js';
|
|
10
|
-
import { coalesceInPlace } from '../../../../base/common/arrays.js';
|
|
11
|
-
import { Iterable } from '../../../../base/common/iterator.js';
|
|
12
|
-
import { DisposableStore } from '../../../../base/common/lifecycle.js';
|
|
13
|
-
import { IContextKeyService } from '../../../../platform/contextkey/common/contextkey.service.js';
|
|
14
|
-
import { ILogService } from '../../../../platform/log/common/log.service.js';
|
|
15
|
-
import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
|
|
16
|
-
|
|
17
|
-
var HunkData_1;
|
|
18
|
-
class SessionWholeRange {
|
|
19
|
-
static { this._options = ModelDecorationOptions.register({ description: 'inlineChat/session/wholeRange' }); }
|
|
20
|
-
constructor(_textModel, wholeRange) {
|
|
21
|
-
this._textModel = _textModel;
|
|
22
|
-
this._onDidChange = ( new Emitter());
|
|
23
|
-
this.onDidChange = this._onDidChange.event;
|
|
24
|
-
this._decorationIds = [];
|
|
25
|
-
this._decorationIds = _textModel.deltaDecorations([], [{ range: wholeRange, options: SessionWholeRange._options }]);
|
|
26
|
-
}
|
|
27
|
-
dispose() {
|
|
28
|
-
this._onDidChange.dispose();
|
|
29
|
-
if (!this._textModel.isDisposed()) {
|
|
30
|
-
this._textModel.deltaDecorations(this._decorationIds, []);
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
fixup(changes) {
|
|
34
|
-
const newDeco = [];
|
|
35
|
-
for (const { modified } of changes) {
|
|
36
|
-
const modifiedRange = modified.isEmpty
|
|
37
|
-
? ( new Range(
|
|
38
|
-
modified.startLineNumber,
|
|
39
|
-
1,
|
|
40
|
-
modified.startLineNumber,
|
|
41
|
-
this._textModel.getLineLength(modified.startLineNumber)
|
|
42
|
-
))
|
|
43
|
-
: ( new Range(
|
|
44
|
-
modified.startLineNumber,
|
|
45
|
-
1,
|
|
46
|
-
modified.endLineNumberExclusive - 1,
|
|
47
|
-
this._textModel.getLineLength(modified.endLineNumberExclusive - 1)
|
|
48
|
-
));
|
|
49
|
-
newDeco.push({ range: modifiedRange, options: SessionWholeRange._options });
|
|
50
|
-
}
|
|
51
|
-
const [first, ...rest] = this._decorationIds;
|
|
52
|
-
const newIds = this._textModel.deltaDecorations(rest, newDeco);
|
|
53
|
-
this._decorationIds = [first].concat(newIds);
|
|
54
|
-
this._onDidChange.fire(this);
|
|
55
|
-
}
|
|
56
|
-
get trackedInitialRange() {
|
|
57
|
-
const [first] = this._decorationIds;
|
|
58
|
-
return this._textModel.getDecorationRange(first) ?? ( new Range(1, 1, 1, 1));
|
|
59
|
-
}
|
|
60
|
-
get value() {
|
|
61
|
-
let result;
|
|
62
|
-
for (const id of this._decorationIds) {
|
|
63
|
-
const range = this._textModel.getDecorationRange(id);
|
|
64
|
-
if (range) {
|
|
65
|
-
if (!result) {
|
|
66
|
-
result = range;
|
|
67
|
-
}
|
|
68
|
-
else {
|
|
69
|
-
result = Range.plusRange(result, range);
|
|
70
|
-
}
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
return result;
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
class Session {
|
|
77
|
-
constructor(editMode, headless,
|
|
78
|
-
targetUri,
|
|
79
|
-
textModel0,
|
|
80
|
-
textModelN, agent, wholeRange, hunkData, chatModel, versionsByRequest) {
|
|
81
|
-
this.editMode = editMode;
|
|
82
|
-
this.headless = headless;
|
|
83
|
-
this.targetUri = targetUri;
|
|
84
|
-
this.textModel0 = textModel0;
|
|
85
|
-
this.textModelN = textModelN;
|
|
86
|
-
this.agent = agent;
|
|
87
|
-
this.wholeRange = wholeRange;
|
|
88
|
-
this.hunkData = hunkData;
|
|
89
|
-
this.chatModel = chatModel;
|
|
90
|
-
this._isUnstashed = false;
|
|
91
|
-
this._startTime = ( new Date());
|
|
92
|
-
this._versionByRequest = ( new Map());
|
|
93
|
-
this._teldata = {
|
|
94
|
-
extension: ExtensionIdentifier.toKey(agent.extensionId),
|
|
95
|
-
startTime: this._startTime.toISOString(),
|
|
96
|
-
endTime: this._startTime.toISOString(),
|
|
97
|
-
edits: 0,
|
|
98
|
-
finishedByEdit: false,
|
|
99
|
-
rounds: '',
|
|
100
|
-
undos: '',
|
|
101
|
-
editMode,
|
|
102
|
-
unstashed: 0,
|
|
103
|
-
acceptedHunks: 0,
|
|
104
|
-
discardedHunks: 0,
|
|
105
|
-
responseTypes: ''
|
|
106
|
-
};
|
|
107
|
-
if (versionsByRequest) {
|
|
108
|
-
this._versionByRequest = ( new Map(versionsByRequest));
|
|
109
|
-
}
|
|
110
|
-
}
|
|
111
|
-
get isUnstashed() {
|
|
112
|
-
return this._isUnstashed;
|
|
113
|
-
}
|
|
114
|
-
markUnstashed() {
|
|
115
|
-
this._teldata.unstashed += 1;
|
|
116
|
-
this._isUnstashed = true;
|
|
117
|
-
}
|
|
118
|
-
markModelVersion(request) {
|
|
119
|
-
this._versionByRequest.set(request.id, this.textModelN.getAlternativeVersionId());
|
|
120
|
-
}
|
|
121
|
-
get versionsByRequest() {
|
|
122
|
-
return Array.from(this._versionByRequest);
|
|
123
|
-
}
|
|
124
|
-
async undoChangesUntil(requestId) {
|
|
125
|
-
const targetAltVersion = this._versionByRequest.get(requestId);
|
|
126
|
-
if (targetAltVersion === undefined) {
|
|
127
|
-
return false;
|
|
128
|
-
}
|
|
129
|
-
this.hunkData.ignoreTextModelNChanges = true;
|
|
130
|
-
try {
|
|
131
|
-
while (targetAltVersion < this.textModelN.getAlternativeVersionId() && this.textModelN.canUndo()) {
|
|
132
|
-
await this.textModelN.undo();
|
|
133
|
-
}
|
|
134
|
-
}
|
|
135
|
-
finally {
|
|
136
|
-
this.hunkData.ignoreTextModelNChanges = false;
|
|
137
|
-
}
|
|
138
|
-
return true;
|
|
139
|
-
}
|
|
140
|
-
get hasChangedText() {
|
|
141
|
-
return !this.textModel0.equalsTextBuffer(this.textModelN.getTextBuffer());
|
|
142
|
-
}
|
|
143
|
-
asChangedText(changes) {
|
|
144
|
-
if (changes.length === 0) {
|
|
145
|
-
return undefined;
|
|
146
|
-
}
|
|
147
|
-
let startLine = Number.MAX_VALUE;
|
|
148
|
-
let endLine = Number.MIN_VALUE;
|
|
149
|
-
for (const change of changes) {
|
|
150
|
-
startLine = Math.min(startLine, change.modified.startLineNumber);
|
|
151
|
-
endLine = Math.max(endLine, change.modified.endLineNumberExclusive);
|
|
152
|
-
}
|
|
153
|
-
return this.textModelN.getValueInRange(( new Range(startLine, 1, endLine, Number.MAX_VALUE)));
|
|
154
|
-
}
|
|
155
|
-
recordExternalEditOccurred(didFinish) {
|
|
156
|
-
this._teldata.edits += 1;
|
|
157
|
-
this._teldata.finishedByEdit = didFinish;
|
|
158
|
-
}
|
|
159
|
-
asTelemetryData() {
|
|
160
|
-
for (const item of this.hunkData.getInfo()) {
|
|
161
|
-
switch (item.getState()) {
|
|
162
|
-
case 1 :
|
|
163
|
-
this._teldata.acceptedHunks += 1;
|
|
164
|
-
break;
|
|
165
|
-
case 2 :
|
|
166
|
-
this._teldata.discardedHunks += 1;
|
|
167
|
-
break;
|
|
168
|
-
}
|
|
169
|
-
}
|
|
170
|
-
this._teldata.endTime = ( new Date()).toISOString();
|
|
171
|
-
return this._teldata;
|
|
172
|
-
}
|
|
173
|
-
}
|
|
174
|
-
let StashedSession = class StashedSession {
|
|
175
|
-
constructor(editor, session, _undoCancelEdits, contextKeyService, _sessionService, _logService) {
|
|
176
|
-
this._undoCancelEdits = _undoCancelEdits;
|
|
177
|
-
this._sessionService = _sessionService;
|
|
178
|
-
this._logService = _logService;
|
|
179
|
-
this._ctxHasStashedSession = CTX_INLINE_CHAT_HAS_STASHED_SESSION.bindTo(contextKeyService);
|
|
180
|
-
this._session = session;
|
|
181
|
-
this._ctxHasStashedSession.set(true);
|
|
182
|
-
this._listener = Event.once(Event.any(editor.onDidChangeCursorSelection, editor.onDidChangeModelContent, editor.onDidChangeModel, editor.onDidBlurEditorWidget))(() => {
|
|
183
|
-
this._session = undefined;
|
|
184
|
-
this._sessionService.releaseSession(session);
|
|
185
|
-
this._ctxHasStashedSession.reset();
|
|
186
|
-
});
|
|
187
|
-
}
|
|
188
|
-
dispose() {
|
|
189
|
-
this._listener.dispose();
|
|
190
|
-
this._ctxHasStashedSession.reset();
|
|
191
|
-
if (this._session) {
|
|
192
|
-
this._sessionService.releaseSession(this._session);
|
|
193
|
-
}
|
|
194
|
-
}
|
|
195
|
-
unstash() {
|
|
196
|
-
if (!this._session) {
|
|
197
|
-
return undefined;
|
|
198
|
-
}
|
|
199
|
-
this._listener.dispose();
|
|
200
|
-
const result = this._session;
|
|
201
|
-
result.markUnstashed();
|
|
202
|
-
result.hunkData.ignoreTextModelNChanges = true;
|
|
203
|
-
result.textModelN.pushEditOperations(null, this._undoCancelEdits, () => null);
|
|
204
|
-
result.hunkData.ignoreTextModelNChanges = false;
|
|
205
|
-
this._session = undefined;
|
|
206
|
-
this._logService.debug('[IE] Unstashed session');
|
|
207
|
-
return result;
|
|
208
|
-
}
|
|
209
|
-
};
|
|
210
|
-
StashedSession = ( __decorate([
|
|
211
|
-
( __param(3, IContextKeyService)),
|
|
212
|
-
( __param(4, IInlineChatSessionService)),
|
|
213
|
-
( __param(5, ILogService))
|
|
214
|
-
], StashedSession));
|
|
215
|
-
function lineRangeAsRange(lineRange, model) {
|
|
216
|
-
return lineRange.isEmpty
|
|
217
|
-
? ( new Range(
|
|
218
|
-
lineRange.startLineNumber,
|
|
219
|
-
1,
|
|
220
|
-
lineRange.startLineNumber,
|
|
221
|
-
Number.MAX_SAFE_INTEGER
|
|
222
|
-
))
|
|
223
|
-
: ( new Range(
|
|
224
|
-
lineRange.startLineNumber,
|
|
225
|
-
1,
|
|
226
|
-
lineRange.endLineNumberExclusive - 1,
|
|
227
|
-
Number.MAX_SAFE_INTEGER
|
|
228
|
-
));
|
|
229
|
-
}
|
|
230
|
-
let HunkData = class HunkData {
|
|
231
|
-
static { HunkData_1 = this; }
|
|
232
|
-
static { this._HUNK_TRACKED_RANGE = ModelDecorationOptions.register({
|
|
233
|
-
description: 'inline-chat-hunk-tracked-range',
|
|
234
|
-
stickiness: 0
|
|
235
|
-
}); }
|
|
236
|
-
static { this._HUNK_THRESHOLD = 8; }
|
|
237
|
-
constructor(_editorWorkerService, _textModel0, _textModelN) {
|
|
238
|
-
this._editorWorkerService = _editorWorkerService;
|
|
239
|
-
this._textModel0 = _textModel0;
|
|
240
|
-
this._textModelN = _textModelN;
|
|
241
|
-
this._store = ( new DisposableStore());
|
|
242
|
-
this._data = ( new Map());
|
|
243
|
-
this._ignoreChanges = false;
|
|
244
|
-
this._store.add(_textModelN.onDidChangeContent(e => {
|
|
245
|
-
if (!this._ignoreChanges) {
|
|
246
|
-
this._mirrorChanges(e);
|
|
247
|
-
}
|
|
248
|
-
}));
|
|
249
|
-
}
|
|
250
|
-
dispose() {
|
|
251
|
-
if (!this._textModelN.isDisposed()) {
|
|
252
|
-
this._textModelN.changeDecorations(accessor => {
|
|
253
|
-
for (const { textModelNDecorations } of ( this._data.values())) {
|
|
254
|
-
textModelNDecorations.forEach(accessor.removeDecoration, accessor);
|
|
255
|
-
}
|
|
256
|
-
});
|
|
257
|
-
}
|
|
258
|
-
if (!this._textModel0.isDisposed()) {
|
|
259
|
-
this._textModel0.changeDecorations(accessor => {
|
|
260
|
-
for (const { textModel0Decorations } of ( this._data.values())) {
|
|
261
|
-
textModel0Decorations.forEach(accessor.removeDecoration, accessor);
|
|
262
|
-
}
|
|
263
|
-
});
|
|
264
|
-
}
|
|
265
|
-
this._data.clear();
|
|
266
|
-
this._store.dispose();
|
|
267
|
-
}
|
|
268
|
-
set ignoreTextModelNChanges(value) {
|
|
269
|
-
this._ignoreChanges = value;
|
|
270
|
-
}
|
|
271
|
-
get ignoreTextModelNChanges() {
|
|
272
|
-
return this._ignoreChanges;
|
|
273
|
-
}
|
|
274
|
-
_mirrorChanges(event) {
|
|
275
|
-
const hunkRanges = [];
|
|
276
|
-
const ranges0 = [];
|
|
277
|
-
for (const entry of ( this._data.values())) {
|
|
278
|
-
if (entry.state === 0 ) {
|
|
279
|
-
for (let i = 1; i < entry.textModelNDecorations.length; i++) {
|
|
280
|
-
const rangeN = this._textModelN.getDecorationRange(entry.textModelNDecorations[i]);
|
|
281
|
-
const range0 = this._textModel0.getDecorationRange(entry.textModel0Decorations[i]);
|
|
282
|
-
if (rangeN && range0) {
|
|
283
|
-
hunkRanges.push({
|
|
284
|
-
rangeN, range0,
|
|
285
|
-
markAccepted: () => entry.state = 1
|
|
286
|
-
});
|
|
287
|
-
}
|
|
288
|
-
}
|
|
289
|
-
}
|
|
290
|
-
else if (entry.state === 1 ) {
|
|
291
|
-
for (let i = 1; i < entry.textModel0Decorations.length; i++) {
|
|
292
|
-
const range = this._textModel0.getDecorationRange(entry.textModel0Decorations[i]);
|
|
293
|
-
if (range) {
|
|
294
|
-
ranges0.push(range);
|
|
295
|
-
}
|
|
296
|
-
}
|
|
297
|
-
}
|
|
298
|
-
}
|
|
299
|
-
hunkRanges.sort((a, b) => Range.compareRangesUsingStarts(a.rangeN, b.rangeN));
|
|
300
|
-
ranges0.sort(Range.compareRangesUsingStarts);
|
|
301
|
-
const edits = [];
|
|
302
|
-
for (const change of event.changes) {
|
|
303
|
-
let isOverlapping = false;
|
|
304
|
-
let pendingChangesLen = 0;
|
|
305
|
-
for (const entry of hunkRanges) {
|
|
306
|
-
if (entry.rangeN.getEndPosition().isBefore(Range.getStartPosition(change.range))) {
|
|
307
|
-
pendingChangesLen += this._textModelN.getValueLengthInRange(entry.rangeN);
|
|
308
|
-
pendingChangesLen -= this._textModel0.getValueLengthInRange(entry.range0);
|
|
309
|
-
}
|
|
310
|
-
else if (Range.areIntersectingOrTouching(entry.rangeN, change.range)) {
|
|
311
|
-
entry.markAccepted();
|
|
312
|
-
isOverlapping = true;
|
|
313
|
-
break;
|
|
314
|
-
}
|
|
315
|
-
else {
|
|
316
|
-
break;
|
|
317
|
-
}
|
|
318
|
-
}
|
|
319
|
-
if (isOverlapping) {
|
|
320
|
-
continue;
|
|
321
|
-
}
|
|
322
|
-
const offset0 = change.rangeOffset - pendingChangesLen;
|
|
323
|
-
const start0 = this._textModel0.getPositionAt(offset0);
|
|
324
|
-
let acceptedChangesLen = 0;
|
|
325
|
-
for (const range of ranges0) {
|
|
326
|
-
if (range.getEndPosition().isBefore(start0)) {
|
|
327
|
-
acceptedChangesLen += this._textModel0.getValueLengthInRange(range);
|
|
328
|
-
}
|
|
329
|
-
}
|
|
330
|
-
const start = this._textModel0.getPositionAt(offset0 + acceptedChangesLen);
|
|
331
|
-
const end = this._textModel0.getPositionAt(offset0 + acceptedChangesLen + change.rangeLength);
|
|
332
|
-
edits.push(EditOperation.replace(Range.fromPositions(start, end), change.text));
|
|
333
|
-
}
|
|
334
|
-
this._textModel0.pushEditOperations(null, edits, () => null);
|
|
335
|
-
}
|
|
336
|
-
async recompute(editState, diff) {
|
|
337
|
-
diff ??= await this._editorWorkerService.computeDiff(this._textModel0.uri, this._textModelN.uri, { ignoreTrimWhitespace: false, maxComputationTimeMs: Number.MAX_SAFE_INTEGER, computeMoves: false }, 'advanced');
|
|
338
|
-
let mergedChanges = [];
|
|
339
|
-
if (diff && diff.changes.length > 0) {
|
|
340
|
-
mergedChanges = [diff.changes[0]];
|
|
341
|
-
for (let i = 1; i < diff.changes.length; i++) {
|
|
342
|
-
const lastChange = mergedChanges[mergedChanges.length - 1];
|
|
343
|
-
const thisChange = diff.changes[i];
|
|
344
|
-
if (thisChange.modified.startLineNumber - lastChange.modified.endLineNumberExclusive <= HunkData_1._HUNK_THRESHOLD) {
|
|
345
|
-
mergedChanges[mergedChanges.length - 1] = ( new DetailedLineRangeMapping(
|
|
346
|
-
lastChange.original.join(thisChange.original),
|
|
347
|
-
lastChange.modified.join(thisChange.modified),
|
|
348
|
-
(lastChange.innerChanges ?? []).concat(thisChange.innerChanges ?? [])
|
|
349
|
-
));
|
|
350
|
-
}
|
|
351
|
-
else {
|
|
352
|
-
mergedChanges.push(thisChange);
|
|
353
|
-
}
|
|
354
|
-
}
|
|
355
|
-
}
|
|
356
|
-
const hunks = ( mergedChanges.map(change => ( new RawHunk(change.original, change.modified, change.innerChanges ?? []))));
|
|
357
|
-
editState.applied = hunks.length;
|
|
358
|
-
this._textModelN.changeDecorations(accessorN => {
|
|
359
|
-
this._textModel0.changeDecorations(accessor0 => {
|
|
360
|
-
for (const { textModelNDecorations, textModel0Decorations } of ( this._data.values())) {
|
|
361
|
-
textModelNDecorations.forEach(accessorN.removeDecoration, accessorN);
|
|
362
|
-
textModel0Decorations.forEach(accessor0.removeDecoration, accessor0);
|
|
363
|
-
}
|
|
364
|
-
this._data.clear();
|
|
365
|
-
for (const hunk of hunks) {
|
|
366
|
-
const textModelNDecorations = [];
|
|
367
|
-
const textModel0Decorations = [];
|
|
368
|
-
textModelNDecorations.push(accessorN.addDecoration(lineRangeAsRange(hunk.modified), HunkData_1._HUNK_TRACKED_RANGE));
|
|
369
|
-
textModel0Decorations.push(accessor0.addDecoration(lineRangeAsRange(hunk.original), HunkData_1._HUNK_TRACKED_RANGE));
|
|
370
|
-
for (const change of hunk.changes) {
|
|
371
|
-
textModelNDecorations.push(accessorN.addDecoration(change.modifiedRange, HunkData_1._HUNK_TRACKED_RANGE));
|
|
372
|
-
textModel0Decorations.push(accessor0.addDecoration(change.originalRange, HunkData_1._HUNK_TRACKED_RANGE));
|
|
373
|
-
}
|
|
374
|
-
this._data.set(hunk, {
|
|
375
|
-
editState,
|
|
376
|
-
textModelNDecorations,
|
|
377
|
-
textModel0Decorations,
|
|
378
|
-
state: 0
|
|
379
|
-
});
|
|
380
|
-
}
|
|
381
|
-
});
|
|
382
|
-
});
|
|
383
|
-
}
|
|
384
|
-
get size() {
|
|
385
|
-
return this._data.size;
|
|
386
|
-
}
|
|
387
|
-
get pending() {
|
|
388
|
-
return Iterable.reduce(( this._data.values()), (r, { state }) => r + (state === 0 ? 1 : 0), 0);
|
|
389
|
-
}
|
|
390
|
-
_discardEdits(item) {
|
|
391
|
-
const edits = [];
|
|
392
|
-
const rangesN = item.getRangesN();
|
|
393
|
-
const ranges0 = item.getRanges0();
|
|
394
|
-
for (let i = 1; i < rangesN.length; i++) {
|
|
395
|
-
const modifiedRange = rangesN[i];
|
|
396
|
-
const originalValue = this._textModel0.getValueInRange(ranges0[i]);
|
|
397
|
-
edits.push(EditOperation.replace(modifiedRange, originalValue));
|
|
398
|
-
}
|
|
399
|
-
return edits;
|
|
400
|
-
}
|
|
401
|
-
discardAll() {
|
|
402
|
-
const edits = [];
|
|
403
|
-
for (const item of this.getInfo()) {
|
|
404
|
-
if (item.getState() === 0 ) {
|
|
405
|
-
edits.push(this._discardEdits(item));
|
|
406
|
-
}
|
|
407
|
-
}
|
|
408
|
-
const undoEdits = [];
|
|
409
|
-
this._textModelN.pushEditOperations(null, edits.flat(), (_undoEdits) => {
|
|
410
|
-
undoEdits.push(_undoEdits);
|
|
411
|
-
return null;
|
|
412
|
-
});
|
|
413
|
-
return undoEdits.flat();
|
|
414
|
-
}
|
|
415
|
-
getInfo() {
|
|
416
|
-
const result = [];
|
|
417
|
-
for (const [hunk, data] of this._data.entries()) {
|
|
418
|
-
const item = {
|
|
419
|
-
getState: () => {
|
|
420
|
-
return data.state;
|
|
421
|
-
},
|
|
422
|
-
isInsertion: () => {
|
|
423
|
-
return hunk.original.isEmpty;
|
|
424
|
-
},
|
|
425
|
-
getRangesN: () => {
|
|
426
|
-
const ranges = ( data.textModelNDecorations.map(id => this._textModelN.getDecorationRange(id)));
|
|
427
|
-
coalesceInPlace(ranges);
|
|
428
|
-
return ranges;
|
|
429
|
-
},
|
|
430
|
-
getRanges0: () => {
|
|
431
|
-
const ranges = ( data.textModel0Decorations.map(id => this._textModel0.getDecorationRange(id)));
|
|
432
|
-
coalesceInPlace(ranges);
|
|
433
|
-
return ranges;
|
|
434
|
-
},
|
|
435
|
-
discardChanges: () => {
|
|
436
|
-
if (data.state === 0 ) {
|
|
437
|
-
const edits = this._discardEdits(item);
|
|
438
|
-
this._textModelN.pushEditOperations(null, edits, () => null);
|
|
439
|
-
data.state = 2 ;
|
|
440
|
-
if (data.editState.applied > 0) {
|
|
441
|
-
data.editState.applied -= 1;
|
|
442
|
-
}
|
|
443
|
-
}
|
|
444
|
-
},
|
|
445
|
-
acceptChanges: () => {
|
|
446
|
-
if (data.state === 0 ) {
|
|
447
|
-
const edits = [];
|
|
448
|
-
const rangesN = item.getRangesN();
|
|
449
|
-
const ranges0 = item.getRanges0();
|
|
450
|
-
for (let i = 1; i < ranges0.length; i++) {
|
|
451
|
-
const originalRange = ranges0[i];
|
|
452
|
-
const modifiedValue = this._textModelN.getValueInRange(rangesN[i]);
|
|
453
|
-
edits.push(EditOperation.replace(originalRange, modifiedValue));
|
|
454
|
-
}
|
|
455
|
-
this._textModel0.pushEditOperations(null, edits, () => null);
|
|
456
|
-
data.state = 1 ;
|
|
457
|
-
}
|
|
458
|
-
}
|
|
459
|
-
};
|
|
460
|
-
result.push(item);
|
|
461
|
-
}
|
|
462
|
-
return result;
|
|
463
|
-
}
|
|
464
|
-
};
|
|
465
|
-
HunkData = HunkData_1 = ( __decorate([
|
|
466
|
-
( __param(0, IEditorWorkerService))
|
|
467
|
-
], HunkData));
|
|
468
|
-
class RawHunk {
|
|
469
|
-
constructor(original, modified, changes) {
|
|
470
|
-
this.original = original;
|
|
471
|
-
this.modified = modified;
|
|
472
|
-
this.changes = changes;
|
|
473
|
-
}
|
|
474
|
-
}
|
|
475
|
-
|
|
476
|
-
export { HunkData, Session, SessionWholeRange, StashedSession };
|