monaco-editor-core 0.56.0-dev-20251125 → 0.56.0-dev-20251217
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/esm/nls.keys.json +1 -1
- package/esm/nls.messages.cs.js +2 -2
- package/esm/nls.messages.de.js +2 -2
- package/esm/nls.messages.es.js +2 -2
- package/esm/nls.messages.fr.js +2 -2
- package/esm/nls.messages.it.js +2 -2
- package/esm/nls.messages.ja.js +2 -2
- package/esm/nls.messages.js +1 -1
- package/esm/nls.messages.json +1 -1
- package/esm/nls.messages.ko.js +2 -2
- package/esm/nls.messages.pl.js +2 -2
- package/esm/nls.messages.pt-br.js +2 -2
- package/esm/nls.messages.ru.js +2 -2
- package/esm/nls.messages.tr.js +2 -2
- package/esm/nls.messages.zh-cn.js +2 -2
- package/esm/nls.messages.zh-tw.js +2 -2
- package/esm/nls.metadata.json +30 -4
- package/esm/vs/base/browser/dom.js +1 -4
- package/esm/vs/base/browser/dom.js.map +1 -1
- package/esm/vs/base/browser/markdownRenderer.js +25 -11
- package/esm/vs/base/browser/markdownRenderer.js.map +1 -1
- package/esm/vs/base/browser/ui/button/button.js +15 -8
- package/esm/vs/base/browser/ui/button/button.js.map +1 -1
- package/esm/vs/base/browser/ui/codicons/codicon/codicon-modifiers.css +3 -8
- package/esm/vs/base/browser/ui/codicons/codicon/codicon.ttf +0 -0
- package/esm/vs/base/browser/ui/list/list.css +1 -0
- package/esm/vs/base/browser/ui/toolbar/toolbar.js +3 -0
- package/esm/vs/base/browser/ui/toolbar/toolbar.js.map +1 -1
- package/esm/vs/base/common/codiconsLibrary.js +11 -2
- package/esm/vs/base/common/codiconsLibrary.js.map +1 -1
- package/esm/vs/base/common/defaultAccount.js +6 -0
- package/esm/vs/base/common/defaultAccount.js.map +1 -0
- package/esm/vs/base/common/equals.js +73 -24
- package/esm/vs/base/common/equals.js.map +1 -1
- package/esm/vs/base/common/event.js +14 -4
- package/esm/vs/base/common/event.js.map +1 -1
- package/esm/vs/base/common/iterator.js.map +1 -1
- package/esm/vs/base/common/keybindings.js +0 -8
- package/esm/vs/base/common/keybindings.js.map +1 -1
- package/esm/vs/base/common/lifecycle.js +2 -2
- package/esm/vs/base/common/lifecycle.js.map +1 -1
- package/esm/vs/base/common/marshallingIds.js.map +1 -1
- package/esm/vs/base/common/observableInternal/index.js +1 -1
- package/esm/vs/base/common/observableInternal/index.js.map +1 -1
- package/esm/vs/base/common/observableInternal/observables/observableFromEvent.js +1 -1
- package/esm/vs/base/common/observableInternal/observables/observableFromEvent.js.map +1 -1
- package/esm/vs/base/common/observableInternal/reactions/autorunImpl.js +16 -0
- package/esm/vs/base/common/observableInternal/reactions/autorunImpl.js.map +1 -1
- package/esm/vs/base/common/observableInternal/utils/utils.js +11 -0
- package/esm/vs/base/common/observableInternal/utils/utils.js.map +1 -1
- package/esm/vs/base/common/product.js.map +1 -1
- package/esm/vs/base/common/strings.js +3 -1
- package/esm/vs/base/common/strings.js.map +1 -1
- package/esm/vs/editor/browser/controller/dragScrolling.js +2 -1
- package/esm/vs/editor/browser/controller/dragScrolling.js.map +1 -1
- package/esm/vs/editor/browser/controller/editContext/clipboardUtils.js +73 -2
- package/esm/vs/editor/browser/controller/editContext/clipboardUtils.js.map +1 -1
- package/esm/vs/editor/browser/controller/editContext/native/nativeEditContext.js +7 -51
- package/esm/vs/editor/browser/controller/editContext/native/nativeEditContext.js.map +1 -1
- package/esm/vs/editor/browser/controller/editContext/screenReaderUtils.js.map +1 -1
- package/esm/vs/editor/browser/controller/editContext/textArea/textAreaEditContext.js +7 -20
- package/esm/vs/editor/browser/controller/editContext/textArea/textAreaEditContext.js.map +1 -1
- package/esm/vs/editor/browser/controller/editContext/textArea/textAreaEditContextInput.js +14 -44
- package/esm/vs/editor/browser/controller/editContext/textArea/textAreaEditContextInput.js.map +1 -1
- package/esm/vs/editor/browser/controller/editContext/textArea/textAreaEditContextRegistry.js +19 -0
- package/esm/vs/editor/browser/controller/editContext/textArea/textAreaEditContextRegistry.js.map +1 -0
- package/esm/vs/editor/browser/controller/editContext/textArea/textAreaEditContextState.js +14 -1
- package/esm/vs/editor/browser/controller/editContext/textArea/textAreaEditContextState.js.map +1 -1
- package/esm/vs/editor/browser/controller/mouseHandler.js +5 -2
- package/esm/vs/editor/browser/controller/mouseHandler.js.map +1 -1
- package/esm/vs/editor/browser/editorBrowser.js.map +1 -1
- package/esm/vs/editor/browser/observableCodeEditor.js +32 -15
- package/esm/vs/editor/browser/observableCodeEditor.js.map +1 -1
- package/esm/vs/editor/browser/view.js +11 -2
- package/esm/vs/editor/browser/view.js.map +1 -1
- package/esm/vs/editor/browser/viewParts/contentWidgets/contentWidgets.js +5 -2
- package/esm/vs/editor/browser/viewParts/contentWidgets/contentWidgets.js.map +1 -1
- package/esm/vs/editor/browser/widget/codeEditor/codeEditorWidget.js +10 -0
- package/esm/vs/editor/browser/widget/codeEditor/codeEditorWidget.js.map +1 -1
- package/esm/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js.map +1 -1
- package/esm/vs/editor/browser/widget/multiDiffEditor/style.css +48 -0
- package/esm/vs/editor/common/config/fontInfo.js +1 -1
- package/esm/vs/editor/common/config/fontInfo.js.map +1 -1
- package/esm/vs/editor/common/core/edits/edit.js +19 -0
- package/esm/vs/editor/common/core/edits/edit.js.map +1 -1
- package/esm/vs/editor/common/core/edits/stringEdit.js +13 -0
- package/esm/vs/editor/common/core/edits/stringEdit.js.map +1 -1
- package/esm/vs/editor/common/core/edits/textEdit.js +0 -3
- package/esm/vs/editor/common/core/edits/textEdit.js.map +1 -1
- package/esm/vs/editor/common/core/text/positionToOffsetImpl.js +24 -10
- package/esm/vs/editor/common/core/text/positionToOffsetImpl.js.map +1 -1
- package/esm/vs/editor/common/cursor/cursorMoveCommands.js +4 -4
- package/esm/vs/editor/common/cursor/cursorMoveCommands.js.map +1 -1
- package/esm/vs/editor/common/cursor/cursorWordOperations.js +6 -3
- package/esm/vs/editor/common/cursor/cursorWordOperations.js.map +1 -1
- package/esm/vs/editor/common/languages/defaultDocumentColorsComputer.js +2 -2
- package/esm/vs/editor/common/languages/defaultDocumentColorsComputer.js.map +1 -1
- package/esm/vs/editor/common/languages/nullTokenize.js +1 -1
- package/esm/vs/editor/common/languages/nullTokenize.js.map +1 -1
- package/esm/vs/editor/common/languages/supports/tokenization.js +3 -0
- package/esm/vs/editor/common/languages/supports/tokenization.js.map +1 -1
- package/esm/vs/editor/common/languages.js +2 -1
- package/esm/vs/editor/common/languages.js.map +1 -1
- package/esm/vs/editor/common/model/decorationProvider.js +21 -1
- package/esm/vs/editor/common/model/decorationProvider.js.map +1 -1
- package/esm/vs/editor/common/model/textModel.js +49 -30
- package/esm/vs/editor/common/model/textModel.js.map +1 -1
- package/esm/vs/editor/common/model/tokens/abstractSyntaxTokenBackend.js +6 -3
- package/esm/vs/editor/common/model/tokens/abstractSyntaxTokenBackend.js.map +1 -1
- package/esm/vs/editor/common/model/tokens/annotations.js +177 -0
- package/esm/vs/editor/common/model/tokens/annotations.js.map +1 -0
- package/esm/vs/editor/common/model/tokens/tokenizationFontDecorationsProvider.js +131 -0
- package/esm/vs/editor/common/model/tokens/tokenizationFontDecorationsProvider.js.map +1 -0
- package/esm/vs/editor/common/model/tokens/tokenizationTextModelPart.js +9 -0
- package/esm/vs/editor/common/model/tokens/tokenizationTextModelPart.js.map +1 -1
- package/esm/vs/editor/common/model/tokens/tokenizerSyntaxTokenBackend.js +9 -0
- package/esm/vs/editor/common/model/tokens/tokenizerSyntaxTokenBackend.js.map +1 -1
- package/esm/vs/editor/common/textModelEditSource.js +2 -0
- package/esm/vs/editor/common/textModelEditSource.js.map +1 -1
- package/esm/vs/editor/common/textModelEvents.js.map +1 -1
- package/esm/vs/editor/common/viewLayout/lineDecorations.js.map +1 -1
- package/esm/vs/editor/common/viewLayout/viewLineRenderer.js +1 -1
- package/esm/vs/editor/common/viewLayout/viewLineRenderer.js.map +1 -1
- package/esm/vs/editor/contrib/clipboard/browser/clipboard.js +54 -36
- package/esm/vs/editor/contrib/clipboard/browser/clipboard.js.map +1 -1
- package/esm/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.js +14 -1
- package/esm/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.js.map +1 -1
- package/esm/vs/editor/contrib/floatingMenu/browser/floatingMenu.css +1 -1
- package/esm/vs/editor/contrib/hover/browser/hover.css +1 -1
- package/esm/vs/editor/contrib/hover/browser/markdownHoverParticipant.js +1 -1
- package/esm/vs/editor/contrib/hover/browser/markdownHoverParticipant.js.map +1 -1
- package/esm/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace.js +2 -2
- package/esm/vs/editor/contrib/inlayHints/browser/inlayHintsController.js +1 -0
- package/esm/vs/editor/contrib/inlayHints/browser/inlayHintsController.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/controller/commandIds.js +1 -0
- package/esm/vs/editor/contrib/inlineCompletions/browser/controller/commandIds.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/controller/commands.js +33 -4
- package/esm/vs/editor/contrib/inlineCompletions/browser/controller/commands.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.js +13 -12
- package/esm/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.js +7 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant.js +2 -2
- package/esm/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.js +5 -5
- package/esm/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.js +2 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/model/InlineSuggestAlternativeAction.js +8 -0
- package/esm/vs/editor/contrib/inlineCompletions/browser/model/InlineSuggestAlternativeAction.js.map +1 -0
- package/esm/vs/editor/contrib/inlineCompletions/browser/model/editKind.js +198 -0
- package/esm/vs/editor/contrib/inlineCompletions/browser/model/editKind.js.map +1 -0
- package/esm/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionIsVisible.js +40 -0
- package/esm/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionIsVisible.js.map +1 -0
- package/esm/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.js +128 -70
- package/esm/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.js +59 -11
- package/esm/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.js +152 -95
- package/esm/vs/editor/contrib/inlineCompletions/browser/model/inlineSuggestionItem.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.js +113 -54
- package/esm/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/model/renameSymbolProcessor.js +317 -75
- package/esm/vs/editor/contrib/inlineCompletions/browser/model/renameSymbolProcessor.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/telemetry.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/utils.js +20 -0
- package/esm/vs/editor/contrib/inlineCompletions/browser/utils.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.js +59 -42
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorMenu.js +29 -8
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorMenu.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.js +78 -46
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/components/gutterIndicatorView.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.js +9 -4
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditWithChanges.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.js +11 -4
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsModel.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.js +81 -41
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewInterface.js +48 -0
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewInterface.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewProducer.js +18 -15
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViewProducer.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsCollapsedView.js +3 -4
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsCollapsedView.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsCustomView.js +6 -7
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsCustomView.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsDeletionView.js +4 -5
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsDeletionView.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsInsertionView.js +4 -3
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsInsertionView.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsLineReplacementView.js +8 -8
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsLineReplacementView.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsSideBySideView.js +9 -7
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsSideBySideView.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordReplacementView.js +203 -41
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/inlineEditsWordReplacementView.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/jumpToView.js +189 -0
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/jumpToView.js.map +1 -0
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/longDistanceHint/inlineEditsLongDistanceHint.js +85 -102
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/longDistanceHint/inlineEditsLongDistanceHint.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/longDistanceHint/longDistancePreviewEditor.js +75 -32
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/longDistanceHint/longDistancePreviewEditor.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/longDistanceHint/longDistnaceWidgetPlacement.js +121 -0
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/longDistanceHint/longDistnaceWidgetPlacement.js.map +1 -0
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/originalEditorInlineDiffView.js +2 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/originalEditorInlineDiffView.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/theme.js +22 -20
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/theme.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils/utils.js +15 -5
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils/utils.js.map +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/view.css +39 -6
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineSuggestionsView.js +10 -5
- package/esm/vs/editor/contrib/inlineCompletions/browser/view/inlineSuggestionsView.js.map +1 -1
- package/esm/vs/editor/contrib/insertFinalNewLine/browser/insertFinalNewLine.js +1 -1
- package/esm/vs/editor/contrib/lineSelection/browser/lineSelection.js +1 -1
- package/esm/vs/editor/contrib/linesOperations/browser/linesOperations.js +32 -32
- package/esm/vs/editor/contrib/linesOperations/browser/linesOperations.js.map +1 -1
- package/esm/vs/editor/contrib/linkedEditing/browser/linkedEditing.js +2 -2
- package/esm/vs/editor/contrib/links/browser/links.js +10 -10
- package/esm/vs/editor/contrib/message/browser/messageController.js +1 -1
- package/esm/vs/editor/contrib/multicursor/browser/multicursor.js +22 -22
- package/esm/vs/editor/contrib/parameterHints/browser/parameterHints.js +1 -1
- package/esm/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.js +4 -4
- package/esm/vs/editor/contrib/peekView/browser/peekView.js +18 -18
- package/esm/vs/editor/contrib/placeholderText/browser/placeholderText.contribution.js +1 -1
- package/esm/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.js +11 -11
- package/esm/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js +32 -32
- package/esm/vs/editor/contrib/readOnlyMessage/browser/contribution.js +2 -2
- package/esm/vs/editor/contrib/rename/browser/rename.js +19 -15
- package/esm/vs/editor/contrib/rename/browser/rename.js.map +1 -1
- package/esm/vs/editor/contrib/rename/browser/renameWidget.js +7 -7
- package/esm/vs/editor/contrib/sectionHeaders/browser/sectionHeaders.js +3 -2
- package/esm/vs/editor/contrib/sectionHeaders/browser/sectionHeaders.js.map +1 -1
- package/esm/vs/editor/contrib/smartSelect/browser/smartSelect.js +4 -4
- package/esm/vs/editor/contrib/snippet/browser/snippetController2.js +4 -4
- package/esm/vs/editor/contrib/snippet/browser/snippetParser.js +33 -0
- package/esm/vs/editor/contrib/snippet/browser/snippetParser.js.map +1 -1
- package/esm/vs/editor/contrib/snippet/browser/snippetVariables.js +4 -4
- package/esm/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.js +11 -11
- package/esm/vs/editor/contrib/stickyScroll/browser/stickyScrollController.js +12 -4
- package/esm/vs/editor/contrib/stickyScroll/browser/stickyScrollController.js.map +1 -1
- package/esm/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.js +1 -0
- package/esm/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.js.map +1 -1
- package/esm/vs/editor/contrib/suggest/browser/suggest.js +9 -8
- package/esm/vs/editor/contrib/suggest/browser/suggest.js.map +1 -1
- package/esm/vs/editor/contrib/suggest/browser/suggestController.js +39 -28
- package/esm/vs/editor/contrib/suggest/browser/suggestController.js.map +1 -1
- package/esm/vs/editor/contrib/suggest/browser/suggestInlineCompletions.js +1 -0
- package/esm/vs/editor/contrib/suggest/browser/suggestInlineCompletions.js.map +1 -1
- package/esm/vs/editor/contrib/suggest/browser/suggestWidget.js +22 -18
- package/esm/vs/editor/contrib/suggest/browser/suggestWidget.js.map +1 -1
- package/esm/vs/editor/contrib/suggest/browser/suggestWidgetDetails.js +28 -6
- package/esm/vs/editor/contrib/suggest/browser/suggestWidgetDetails.js.map +1 -1
- package/esm/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.js +2 -2
- package/esm/vs/editor/contrib/suggest/browser/wordContextKey.js +1 -1
- package/esm/vs/editor/contrib/symbolIcons/browser/symbolIcons.js +33 -33
- package/esm/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.js +4 -4
- package/esm/vs/editor/contrib/tokenization/browser/tokenization.js +1 -1
- package/esm/vs/editor/contrib/unicodeHighlighter/browser/bannerController.js +1 -1
- package/esm/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.js +24 -24
- package/esm/vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators.js +5 -5
- package/esm/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.js +9 -9
- package/esm/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.js +3 -3
- package/esm/vs/editor/contrib/wordOperations/browser/wordOperations.js +19 -2
- package/esm/vs/editor/contrib/wordOperations/browser/wordOperations.js.map +1 -1
- package/esm/vs/editor/editor.api.d.ts +34 -3
- package/esm/vs/editor/standalone/browser/standaloneLanguages.js +2 -2
- package/esm/vs/editor/standalone/browser/standaloneLanguages.js.map +1 -1
- package/esm/vs/editor/standalone/browser/standaloneServices.js +11 -1
- package/esm/vs/editor/standalone/browser/standaloneServices.js.map +1 -1
- package/esm/vs/editor/standalone/common/monarch/monarchLexer.js +1 -1
- package/esm/vs/editor/standalone/common/monarch/monarchLexer.js.map +1 -1
- package/esm/vs/platform/accessibilitySignal/browser/accessibilitySignalService.js +62 -62
- package/esm/vs/platform/action/common/actionCommonCategories.js +6 -6
- package/esm/vs/platform/actionWidget/browser/actionList.js +4 -4
- package/esm/vs/platform/actionWidget/browser/actionWidget.css +11 -8
- package/esm/vs/platform/actionWidget/browser/actionWidget.js +7 -7
- package/esm/vs/platform/actions/browser/menuEntryActionViewItem.js +5 -5
- package/esm/vs/platform/actions/browser/toolbar.js +2 -2
- package/esm/vs/platform/actions/common/actions.js +11 -5
- package/esm/vs/platform/actions/common/actions.js.map +1 -1
- package/esm/vs/platform/actions/common/menuService.js +2 -2
- package/esm/vs/platform/configuration/common/configurationRegistry.js +10 -10
- package/esm/vs/platform/contextkey/browser/contextKeyService.js +1 -1
- package/esm/vs/platform/contextkey/common/contextkey.js +9 -9
- package/esm/vs/platform/contextkey/common/contextkeys.js +9 -9
- package/esm/vs/platform/contextkey/common/scanner.js +5 -5
- package/esm/vs/platform/{product/common/productService.js → defaultAccount/common/defaultAccount.js} +2 -2
- package/esm/vs/platform/defaultAccount/common/defaultAccount.js.map +1 -0
- package/esm/vs/platform/history/browser/contextScopedHistoryWidget.js +1 -1
- package/esm/vs/platform/hover/browser/hoverWidget.js +1 -1
- package/esm/vs/platform/hover/browser/updatableHoverWidget.js +1 -1
- package/esm/vs/platform/instantiation/common/instantiation.js.map +1 -1
- package/esm/vs/platform/instantiation/common/instantiationService.js +1 -8
- package/esm/vs/platform/instantiation/common/instantiationService.js.map +1 -1
- package/esm/vs/platform/keybinding/common/abstractKeybindingService.js +4 -4
- package/esm/vs/platform/list/browser/listService.js +27 -27
- package/esm/vs/platform/log/common/log.js +1 -1
- package/esm/vs/platform/log/common/log.js.map +1 -1
- package/esm/vs/platform/markers/common/markerService.js +6 -6
- package/esm/vs/platform/markers/common/markerService.js.map +1 -1
- package/esm/vs/platform/markers/common/markers.js +6 -6
- package/esm/vs/platform/quickinput/browser/commandsQuickAccess.js +8 -8
- package/esm/vs/platform/quickinput/browser/helpQuickAccess.js +1 -1
- package/esm/vs/platform/quickinput/browser/media/quickInput.css +7 -3
- package/esm/vs/platform/quickinput/browser/quickInput.js +19 -11
- package/esm/vs/platform/quickinput/browser/quickInput.js.map +1 -1
- package/esm/vs/platform/quickinput/browser/quickInputActions.js +5 -5
- package/esm/vs/platform/quickinput/browser/quickInputController.js +6 -6
- package/esm/vs/platform/quickinput/browser/quickInputList.js +1 -1
- package/esm/vs/platform/quickinput/browser/quickInputUtils.js +1 -1
- package/esm/vs/platform/quickinput/browser/tree/quickInputTreeAccessibilityProvider.js +1 -1
- package/esm/vs/platform/theme/common/colorUtils.js +2 -2
- package/esm/vs/platform/theme/common/colors/baseColors.js +18 -17
- package/esm/vs/platform/theme/common/colors/baseColors.js.map +1 -1
- package/esm/vs/platform/theme/common/colors/chartsColors.js +8 -8
- package/esm/vs/platform/theme/common/colors/editorColors.js +95 -95
- package/esm/vs/platform/theme/common/colors/inputColors.js +47 -47
- package/esm/vs/platform/theme/common/colors/listColors.js +36 -36
- package/esm/vs/platform/theme/common/colors/menuColors.js +7 -7
- package/esm/vs/platform/theme/common/colors/minimapColors.js +13 -13
- package/esm/vs/platform/theme/common/colors/minimapColors.js.map +1 -1
- package/esm/vs/platform/theme/common/colors/miscColors.js +16 -16
- package/esm/vs/platform/theme/common/colors/quickpickColors.js +9 -9
- package/esm/vs/platform/theme/common/colors/searchColors.js +3 -3
- package/esm/vs/platform/theme/common/iconRegistry.js +6 -6
- package/esm/vs/platform/undoRedo/common/undoRedoService.js +21 -21
- package/esm/vs/platform/undoRedo/common/undoRedoService.js.map +1 -1
- package/esm/vs/platform/window/common/window.js +1 -1
- package/esm/vs/platform/window/common/window.js.map +1 -1
- package/esm/vs/platform/workspace/common/workspace.js +1 -1
- package/monaco.d.ts +34 -3
- package/package.json +2 -2
- package/version.txt +1 -1
- package/esm/vs/editor/contrib/inlineCompletions/browser/model/inlineEdit.js +0 -16
- package/esm/vs/editor/contrib/inlineCompletions/browser/model/inlineEdit.js.map +0 -1
- package/esm/vs/platform/product/common/productService.js.map +0 -1
|
@@ -0,0 +1,189 @@
|
|
|
1
|
+
/*---------------------------------------------------------------------------------------------
|
|
2
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
|
+
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
|
+
*--------------------------------------------------------------------------------------------*/
|
|
5
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
6
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
7
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
8
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
9
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
10
|
+
};
|
|
11
|
+
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
|
+
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
|
+
};
|
|
14
|
+
import { n } from '../../../../../../../base/browser/dom.js';
|
|
15
|
+
import { KeybindingLabel } from '../../../../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';
|
|
16
|
+
import { RunOnceScheduler } from '../../../../../../../base/common/async.js';
|
|
17
|
+
import { Disposable } from '../../../../../../../base/common/lifecycle.js';
|
|
18
|
+
import { autorun, constObservable, DebugLocation, derived, observableFromEvent } from '../../../../../../../base/common/observable.js';
|
|
19
|
+
import { OS } from '../../../../../../../base/common/platform.js';
|
|
20
|
+
import { IContextKeyService } from '../../../../../../../platform/contextkey/common/contextkey.js';
|
|
21
|
+
import { IKeybindingService } from '../../../../../../../platform/keybinding/common/keybinding.js';
|
|
22
|
+
import { defaultKeybindingLabelStyles } from '../../../../../../../platform/theme/browser/defaultStyles.js';
|
|
23
|
+
import { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';
|
|
24
|
+
import { IThemeService } from '../../../../../../../platform/theme/common/themeService.js';
|
|
25
|
+
import { Rect } from '../../../../../../common/core/2d/rect.js';
|
|
26
|
+
import { Range } from '../../../../../../common/core/range.js';
|
|
27
|
+
import { inlineSuggestCommitId } from '../../../controller/commandIds.js';
|
|
28
|
+
import { getEditorBlendedColor, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorPrimaryBorder, inlineEditIndicatorPrimaryForeground } from '../theme.js';
|
|
29
|
+
import { rectToProps } from '../utils/utils.js';
|
|
30
|
+
let JumpToView = class JumpToView extends Disposable {
|
|
31
|
+
constructor(_editor, options, _data, _themeService, _keybindingService, _contextKeyService) {
|
|
32
|
+
super();
|
|
33
|
+
this._editor = _editor;
|
|
34
|
+
this._data = _data;
|
|
35
|
+
this._themeService = _themeService;
|
|
36
|
+
this._keybindingService = _keybindingService;
|
|
37
|
+
this._contextKeyService = _contextKeyService;
|
|
38
|
+
this._styles = derived(this, reader => ({
|
|
39
|
+
background: getEditorBlendedColor(inlineEditIndicatorPrimaryBackground, this._themeService).read(reader).toString(),
|
|
40
|
+
foreground: getEditorBlendedColor(inlineEditIndicatorPrimaryForeground, this._themeService).read(reader).toString(),
|
|
41
|
+
border: getEditorBlendedColor(inlineEditIndicatorPrimaryBorder, this._themeService).read(reader).toString(),
|
|
42
|
+
}));
|
|
43
|
+
this._pos = derived(this, reader => {
|
|
44
|
+
return this._editor.observePosition(derived(reader => this._data.read(reader)?.jumpToPosition || null), reader.store);
|
|
45
|
+
}).flatten();
|
|
46
|
+
this._layout = derived(this, reader => {
|
|
47
|
+
const data = this._data.read(reader);
|
|
48
|
+
if (!data) {
|
|
49
|
+
return undefined;
|
|
50
|
+
}
|
|
51
|
+
const position = data.jumpToPosition;
|
|
52
|
+
const lineHeight = this._editor.observeLineHeightForLine(constObservable(position.lineNumber)).read(reader);
|
|
53
|
+
const scrollLeft = this._editor.scrollLeft.read(reader);
|
|
54
|
+
const point = this._pos.read(reader);
|
|
55
|
+
if (!point) {
|
|
56
|
+
return undefined;
|
|
57
|
+
}
|
|
58
|
+
const layout = this._editor.layoutInfo.read(reader);
|
|
59
|
+
const widgetRect = Rect.fromLeftTopWidthHeight(point.x + layout.contentLeft + 2 - scrollLeft, point.y, 100, lineHeight);
|
|
60
|
+
return {
|
|
61
|
+
widgetRect,
|
|
62
|
+
};
|
|
63
|
+
});
|
|
64
|
+
this._blink = animateFixedValues([
|
|
65
|
+
{ value: true, durationMs: 600 },
|
|
66
|
+
{ value: false, durationMs: 600 },
|
|
67
|
+
]);
|
|
68
|
+
this._widget = n.div({
|
|
69
|
+
class: 'inline-edit-jump-to-widget',
|
|
70
|
+
style: {
|
|
71
|
+
position: 'absolute',
|
|
72
|
+
display: this._layout.map(l => l ? 'flex' : 'none'),
|
|
73
|
+
alignItems: 'center',
|
|
74
|
+
cursor: 'pointer',
|
|
75
|
+
userSelect: 'none',
|
|
76
|
+
...rectToProps(reader => this._layout.read(reader)?.widgetRect),
|
|
77
|
+
}
|
|
78
|
+
}, derived(reader => {
|
|
79
|
+
if (this._data.read(reader) === undefined) {
|
|
80
|
+
return [];
|
|
81
|
+
}
|
|
82
|
+
// Main content container with rounded border
|
|
83
|
+
return n.div({
|
|
84
|
+
style: {
|
|
85
|
+
display: 'flex',
|
|
86
|
+
alignItems: 'center',
|
|
87
|
+
gap: '4px',
|
|
88
|
+
padding: '0 4px',
|
|
89
|
+
height: '100%',
|
|
90
|
+
backgroundColor: this._styles.map(s => s.background),
|
|
91
|
+
['--vscodeIconForeground']: this._styles.map(s => s.foreground),
|
|
92
|
+
border: this._styles.map(s => `1px solid ${s.border}`),
|
|
93
|
+
borderRadius: '3px',
|
|
94
|
+
boxSizing: 'border-box',
|
|
95
|
+
fontSize: '11px',
|
|
96
|
+
color: this._styles.map(s => s.foreground),
|
|
97
|
+
}
|
|
98
|
+
}, [
|
|
99
|
+
this._style === 'cursor' ?
|
|
100
|
+
n.elem('div', {
|
|
101
|
+
style: {
|
|
102
|
+
borderLeft: '2px solid',
|
|
103
|
+
height: 14,
|
|
104
|
+
opacity: this._blink.map(b => b ? '0' : '1'),
|
|
105
|
+
}
|
|
106
|
+
}) :
|
|
107
|
+
[
|
|
108
|
+
derived(() => n.elem('div', {}, keybindingLabel(this._keybinding))),
|
|
109
|
+
n.elem('div', { style: { lineHeight: this._layout.map(l => l?.widgetRect.height), marginTop: '-2px' } }, ['to jump',])
|
|
110
|
+
],
|
|
111
|
+
]);
|
|
112
|
+
}));
|
|
113
|
+
this._style = options.style;
|
|
114
|
+
this._keybinding = this._getKeybinding(inlineSuggestCommitId);
|
|
115
|
+
const widget = this._widget.keepUpdated(this._store);
|
|
116
|
+
this._register(this._editor.createOverlayWidget({
|
|
117
|
+
domNode: widget.element,
|
|
118
|
+
position: constObservable(null),
|
|
119
|
+
allowEditorOverflow: false,
|
|
120
|
+
minContentWidthInPx: constObservable(0),
|
|
121
|
+
}));
|
|
122
|
+
this._register(this._editor.setDecorations(derived(reader => {
|
|
123
|
+
const data = this._data.read(reader);
|
|
124
|
+
if (!data) {
|
|
125
|
+
return [];
|
|
126
|
+
}
|
|
127
|
+
// use injected text at position
|
|
128
|
+
return [{
|
|
129
|
+
range: Range.fromPositions(data.jumpToPosition, data.jumpToPosition),
|
|
130
|
+
options: {
|
|
131
|
+
description: 'inline-edit-jump-to-decoration',
|
|
132
|
+
inlineClassNameAffectsLetterSpacing: true,
|
|
133
|
+
showIfCollapsed: true,
|
|
134
|
+
after: {
|
|
135
|
+
content: this._style === 'label' ? ' ' : ' ',
|
|
136
|
+
}
|
|
137
|
+
},
|
|
138
|
+
}];
|
|
139
|
+
})));
|
|
140
|
+
}
|
|
141
|
+
_getKeybinding(commandId, debugLocation = DebugLocation.ofCaller()) {
|
|
142
|
+
if (!commandId) {
|
|
143
|
+
return constObservable(undefined);
|
|
144
|
+
}
|
|
145
|
+
return observableFromEvent(this, this._contextKeyService.onDidChangeContext, () => this._keybindingService.lookupKeybinding(commandId), debugLocation);
|
|
146
|
+
// TODO: use contextkeyservice to use different renderings
|
|
147
|
+
}
|
|
148
|
+
};
|
|
149
|
+
JumpToView = __decorate([
|
|
150
|
+
__param(3, IThemeService),
|
|
151
|
+
__param(4, IKeybindingService),
|
|
152
|
+
__param(5, IContextKeyService)
|
|
153
|
+
], JumpToView);
|
|
154
|
+
export { JumpToView };
|
|
155
|
+
function animateFixedValues(values, debugLocation = DebugLocation.ofCaller()) {
|
|
156
|
+
let idx = 0;
|
|
157
|
+
return observableFromEvent(undefined, (l) => {
|
|
158
|
+
idx = 0;
|
|
159
|
+
const timer = new RunOnceScheduler(() => {
|
|
160
|
+
idx = (idx + 1) % values.length;
|
|
161
|
+
l(null);
|
|
162
|
+
timer.schedule(values[idx].durationMs);
|
|
163
|
+
}, 0);
|
|
164
|
+
timer.schedule(0);
|
|
165
|
+
return timer;
|
|
166
|
+
}, () => {
|
|
167
|
+
return values[idx].value;
|
|
168
|
+
}, debugLocation);
|
|
169
|
+
}
|
|
170
|
+
function keybindingLabel(keybinding) {
|
|
171
|
+
return derived(_reader => n.div({
|
|
172
|
+
style: {},
|
|
173
|
+
ref: elem => {
|
|
174
|
+
const keybindingLabel = _reader.store.add(new KeybindingLabel(elem, OS, {
|
|
175
|
+
disableTitle: true,
|
|
176
|
+
...defaultKeybindingLabelStyles,
|
|
177
|
+
keybindingLabelShadow: undefined,
|
|
178
|
+
keybindingLabelForeground: asCssVariable(inlineEditIndicatorPrimaryForeground),
|
|
179
|
+
keybindingLabelBackground: 'transparent',
|
|
180
|
+
keybindingLabelBorder: asCssVariable(inlineEditIndicatorPrimaryForeground),
|
|
181
|
+
keybindingLabelBottomBorder: undefined,
|
|
182
|
+
}));
|
|
183
|
+
_reader.store.add(autorun(reader => {
|
|
184
|
+
keybindingLabel.set(keybinding.read(reader));
|
|
185
|
+
}));
|
|
186
|
+
}
|
|
187
|
+
}));
|
|
188
|
+
}
|
|
189
|
+
//# sourceMappingURL=jumpToView.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["file:///mnt/vss/_work/1/s/dependencies/vscode/out-editor-src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/jumpToView.ts","vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsViews/jumpToView.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;;;;;;;;;;AAEhG,OAAO,EAAE,CAAC,EAAE,MAAM,0CAA0C,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,yEAAyE,CAAC;AAC1G,OAAO,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAE7E,OAAO,EAAE,UAAU,EAAE,MAAM,+CAA+C,CAAC;AAC3E,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,OAAO,EAAe,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AACpJ,OAAO,EAAE,EAAE,EAAE,MAAM,8CAA8C,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,+DAA+D,CAAC;AACnG,OAAO,EAAE,kBAAkB,EAAE,MAAM,+DAA+D,CAAC;AACnG,OAAO,EAAE,4BAA4B,EAAE,MAAM,8DAA8D,CAAC;AAC5G,OAAO,EAAE,aAAa,EAAE,MAAM,0DAA0D,CAAC;AACzF,OAAO,EAAE,aAAa,EAAE,MAAM,4DAA4D,CAAC;AAE3F,OAAO,EAAE,IAAI,EAAE,MAAM,0CAA0C,CAAC;AAEhE,OAAO,EAAE,KAAK,EAAE,MAAM,wCAAwC,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,oCAAoC,EAAE,gCAAgC,EAAE,oCAAoC,EAAE,MAAM,aAAa,CAAC;AAClK,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEzC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,UAAU;IAGzC,YACkB,OAA6B,EAC9C,OAAsC,EACrB,KAA4D,EAC9D,aAA6C,EACxC,kBAAuD,EACvD,kBAAuD;QAE3E,KAAK,EAAE,CAAC;QAPS,YAAO,GAAP,OAAO,CAAsB;QAE7B,UAAK,GAAL,KAAK,CAAuD;QAC7C,kBAAa,GAAb,aAAa,CAAe;QACvB,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,uBAAkB,GAAlB,kBAAkB,CAAoB;QAoC3D,YAAO,GAAG,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;YACnD,UAAU,EAAE,qBAAqB,CAAC,oCAAoC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE;YACnH,UAAU,EAAE,qBAAqB,CAAC,oCAAoC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE;YACnH,MAAM,EAAE,qBAAqB,CAAC,gCAAgC,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE;SAC3G,CAAC,CAAC,CAAC;QAEa,SAAI,GAAG,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;YAC9C,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CACpD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,cAAc,IAAI,IAAI,CAC/C,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QAYI,YAAO,GAAG,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE;YACjD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACrC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACX,OAAO,SAAS,CAAC;YAClB,CAAC;YAED,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC;YACrC,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,eAAe,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC5G,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAExD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAErC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACZ,OAAO,SAAS,CAAC;YAClB,CAAC;YAED,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAEpD,MAAM,UAAU,GAAG,IAAI,CAAC,sBAAsB,CAC7C,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,GAAG,CAAC,GAAG,UAAU,EAC7C,KAAK,CAAC,CAAC,EACP,GAAG,EACH,UAAU,CACV,CAAC;YAEF,OAAO;gBACN,UAAU;aACV,CAAC;QACH,CAAC,CAAC,CAAC;QAEc,WAAM,GAAG,kBAAkB,CAAU;YACrD,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE;YAChC,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,EAAE;SACjC,CAAC,CAAC;QAEc,YAAO,GAAG,CAAC,CAAC,GAAG,CAAC;YAChC,KAAK,EAAE,4BAA4B;YACnC,KAAK,EAAE;gBACN,QAAQ,EAAE,UAAU;gBACpB,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;gBAEnD,UAAU,EAAE,QAAQ;gBACpB,MAAM,EAAE,SAAS;gBACjB,UAAU,EAAE,MAAM;gBAClB,GAAG,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC;aAC/D;SACD,EACA,OAAO,CAAC,MAAM,CAAC,EAAE;YAChB,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,SAAS,EAAE,CAAC;gBAC3C,OAAO,EAAE,CAAC;YACX,CAAC;YAED,6CAA6C;YAC7C,OAAO,CAAC,CAAC,GAAG,CAAC;gBACZ,KAAK,EAAE;oBACN,OAAO,EAAE,MAAM;oBACf,UAAU,EAAE,QAAQ;oBACpB,GAAG,EAAE,KAAK;oBACV,OAAO,EAAE,OAAO;oBAChB,MAAM,EAAE,MAAM;oBACd,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;oBACpD,CAAC,wBAAkC,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;oBACzE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,MAAM,EAAE,CAAC;oBACtD,YAAY,EAAE,KAAK;oBACnB,SAAS,EAAE,YAAY;oBACvB,QAAQ,EAAE,MAAM;oBAChB,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;iBAC1C;aACD,EAAE;gBACF,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC;oBACzB,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE;wBACb,KAAK,EAAE;4BACN,UAAU,EAAE,WAAW;4BACvB,MAAM,EAAE,EAAE;4BACV,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;yBAC5C;qBACD,CAAC,CAAC,CAAC;oBAEJ;wBACC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;wBACnE,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EACtG,CAAC,SAAS,EAAE,CACZ;qBACD;aACF,CAAC,CAAC;QAEJ,CAAC,CAAC,CACF,CAAC;QA7ID,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;QAC5B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC;QAE9D,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAErD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC;YAC/C,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,QAAQ,EAAE,eAAe,CAAC,IAAI,CAAC;YAC/B,mBAAmB,EAAE,KAAK;YAC1B,mBAAmB,EAAE,eAAe,CAAC,CAAC,CAAC;SACvC,CAAC,CAAC,CAAC;QAEJ,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAA0B,MAAM,CAAC,EAAE;YACpF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACrC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACX,OAAO,EAAE,CAAC;YACX,CAAC;YACD,gCAAgC;YAChC,OAAO,CAAC;oBACP,KAAK,EAAE,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,cAAc,CAAC;oBACpE,OAAO,EAAE;wBACR,WAAW,EAAE,gCAAgC;wBAC7C,mCAAmC,EAAE,IAAI;wBACzC,eAAe,EAAE,IAAI;wBACrB,KAAK,EAAE;4BACN,OAAO,EAAE,IAAI,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI;yBACtD;qBACD;iBAC+B,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC,CAAC,CAAC;IACN,CAAC;IAcO,cAAc,CAAC,SAA6B,EAAE,aAAa,GAAG,aAAa,CAAC,QAAQ,EAAE;QAC7F,IAAI,CAAC,SAAS,EAAE,CAAC;YAChB,OAAO,eAAe,CAAC,SAAS,CAAC,CAAC;QACnC,CAAC;QACD,OAAO,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,aAAa,CAAC,CAAC;QACvJ,0DAA0D;IAC3D,CAAC;CA4FD,CAAA;AA3JY,UAAU;IAOpB,WAAA,aAAa,CAAA;IACb,WAAA,kBAAkB,CAAA;IAClB,WAAA,kBAAkB,CAAA;GATR,UAAU,CA2JtB;;AAED,SAAS,kBAAkB,CAAI,MAA0C,EAAE,aAAa,GAAG,aAAa,CAAC,QAAQ,EAAE;IAClH,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,OAAO,mBAAmB,CAAC,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE;QAC3C,GAAG,GAAG,CAAC,CAAC;QACR,MAAM,KAAK,GAAG,IAAI,gBAAgB,CAAC,GAAG,EAAE;YACvC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;YAChC,CAAC,CAAC,IAAI,CAAC,CAAC;YACR,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;QACxC,CAAC,EAAE,CAAC,CAAC,CAAC;QACN,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAElB,OAAO,KAAK,CAAC;IACd,CAAC,EAAE,GAAG,EAAE;QACP,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC;IAC1B,CAAC,EAAE,aAAa,CAAC,CAAC;AACnB,CAAC;AAED,SAAS,eAAe,CAAC,UAAuD;IAC/E,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;QAC/B,KAAK,EAAE,EAAE;QACT,GAAG,EAAE,IAAI,CAAC,EAAE;YACX,MAAM,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,eAAe,CAAC,IAAI,EAAE,EAAE,EAAE;gBACvE,YAAY,EAAE,IAAI;gBAClB,GAAG,4BAA4B;gBAC/B,qBAAqB,EAAE,SAAS;gBAChC,yBAAyB,EAAE,aAAa,CAAC,oCAAoC,CAAC;gBAC9E,yBAAyB,EAAE,aAAa;gBACxC,qBAAqB,EAAE,aAAa,CAAC,oCAAoC,CAAC;gBAC1E,2BAA2B,EAAE,SAAS;aACtC,CAAC,CAAC,CAAC;YACJ,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBAClC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAC9C,CAAC,CAAC,CAAC,CAAC;QACL,CAAC;KACD,CAAC,CAAC,CAAC;AACL,CAAC","file":"jumpToView.js","sourceRoot":"file:///mnt/vss/_work/1/s/dependencies/vscode/out-editor-src","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Microsoft Corporation. All rights reserved.\n * Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { n } from '../../../../../../../base/browser/dom.js';\nimport { KeybindingLabel } from '../../../../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';\nimport { RunOnceScheduler } from '../../../../../../../base/common/async.js';\nimport { ResolvedKeybinding } from '../../../../../../../base/common/keybindings.js';\nimport { Disposable } from '../../../../../../../base/common/lifecycle.js';\nimport { autorun, constObservable, DebugLocation, derived, IObservable, observableFromEvent } from '../../../../../../../base/common/observable.js';\nimport { OS } from '../../../../../../../base/common/platform.js';\nimport { IContextKeyService } from '../../../../../../../platform/contextkey/common/contextkey.js';\nimport { IKeybindingService } from '../../../../../../../platform/keybinding/common/keybinding.js';\nimport { defaultKeybindingLabelStyles } from '../../../../../../../platform/theme/browser/defaultStyles.js';\nimport { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';\nimport { IThemeService } from '../../../../../../../platform/theme/common/themeService.js';\nimport { ObservableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';\nimport { Rect } from '../../../../../../common/core/2d/rect.js';\nimport { Position } from '../../../../../../common/core/position.js';\nimport { Range } from '../../../../../../common/core/range.js';\nimport { IModelDeltaDecoration } from '../../../../../../common/model.js';\nimport { inlineSuggestCommitId } from '../../../controller/commandIds.js';\nimport { getEditorBlendedColor, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorPrimaryBorder, inlineEditIndicatorPrimaryForeground } from '../theme.js';\nimport { rectToProps } from '../utils/utils.js';\n\nexport class JumpToView extends Disposable {\n\tprivate readonly _style: 'label' | 'cursor';\n\n\tconstructor(\n\t\tprivate readonly _editor: ObservableCodeEditor,\n\t\toptions: { style: 'label' | 'cursor' },\n\t\tprivate readonly _data: IObservable<{ jumpToPosition: Position } | undefined>,\n\t\t@IThemeService private readonly _themeService: IThemeService,\n\t\t@IKeybindingService private readonly _keybindingService: IKeybindingService,\n\t\t@IContextKeyService private readonly _contextKeyService: IContextKeyService\n\t) {\n\t\tsuper();\n\n\t\tthis._style = options.style;\n\t\tthis._keybinding = this._getKeybinding(inlineSuggestCommitId);\n\n\t\tconst widget = this._widget.keepUpdated(this._store);\n\n\t\tthis._register(this._editor.createOverlayWidget({\n\t\t\tdomNode: widget.element,\n\t\t\tposition: constObservable(null),\n\t\t\tallowEditorOverflow: false,\n\t\t\tminContentWidthInPx: constObservable(0),\n\t\t}));\n\n\t\tthis._register(this._editor.setDecorations(derived<IModelDeltaDecoration[]>(reader => {\n\t\t\tconst data = this._data.read(reader);\n\t\t\tif (!data) {\n\t\t\t\treturn [];\n\t\t\t}\n\t\t\t// use injected text at position\n\t\t\treturn [{\n\t\t\t\trange: Range.fromPositions(data.jumpToPosition, data.jumpToPosition),\n\t\t\t\toptions: {\n\t\t\t\t\tdescription: 'inline-edit-jump-to-decoration',\n\t\t\t\t\tinlineClassNameAffectsLetterSpacing: true,\n\t\t\t\t\tshowIfCollapsed: true,\n\t\t\t\t\tafter: {\n\t\t\t\t\t\tcontent: this._style === 'label' ? ' ' : ' ',\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t} satisfies IModelDeltaDecoration];\n\t\t})));\n\t}\n\n\tprivate readonly _styles = derived(this, reader => ({\n\t\tbackground: getEditorBlendedColor(inlineEditIndicatorPrimaryBackground, this._themeService).read(reader).toString(),\n\t\tforeground: getEditorBlendedColor(inlineEditIndicatorPrimaryForeground, this._themeService).read(reader).toString(),\n\t\tborder: getEditorBlendedColor(inlineEditIndicatorPrimaryBorder, this._themeService).read(reader).toString(),\n\t}));\n\n\tprivate readonly _pos = derived(this, reader => {\n\t\treturn this._editor.observePosition(derived(reader =>\n\t\t\tthis._data.read(reader)?.jumpToPosition || null\n\t\t), reader.store);\n\t}).flatten();\n\n\tprivate _getKeybinding(commandId: string | undefined, debugLocation = DebugLocation.ofCaller()) {\n\t\tif (!commandId) {\n\t\t\treturn constObservable(undefined);\n\t\t}\n\t\treturn observableFromEvent(this, this._contextKeyService.onDidChangeContext, () => this._keybindingService.lookupKeybinding(commandId), debugLocation);\n\t\t// TODO: use contextkeyservice to use different renderings\n\t}\n\n\tprivate readonly _keybinding;\n\n\tprivate readonly _layout = derived(this, reader => {\n\t\tconst data = this._data.read(reader);\n\t\tif (!data) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\tconst position = data.jumpToPosition;\n\t\tconst lineHeight = this._editor.observeLineHeightForLine(constObservable(position.lineNumber)).read(reader);\n\t\tconst scrollLeft = this._editor.scrollLeft.read(reader);\n\n\t\tconst point = this._pos.read(reader);\n\n\t\tif (!point) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\tconst layout = this._editor.layoutInfo.read(reader);\n\n\t\tconst widgetRect = Rect.fromLeftTopWidthHeight(\n\t\t\tpoint.x + layout.contentLeft + 2 - scrollLeft,\n\t\t\tpoint.y,\n\t\t\t100,\n\t\t\tlineHeight\n\t\t);\n\n\t\treturn {\n\t\t\twidgetRect,\n\t\t};\n\t});\n\n\tprivate readonly _blink = animateFixedValues<boolean>([\n\t\t{ value: true, durationMs: 600 },\n\t\t{ value: false, durationMs: 600 },\n\t]);\n\n\tprivate readonly _widget = n.div({\n\t\tclass: 'inline-edit-jump-to-widget',\n\t\tstyle: {\n\t\t\tposition: 'absolute',\n\t\t\tdisplay: this._layout.map(l => l ? 'flex' : 'none'),\n\n\t\t\talignItems: 'center',\n\t\t\tcursor: 'pointer',\n\t\t\tuserSelect: 'none',\n\t\t\t...rectToProps(reader => this._layout.read(reader)?.widgetRect),\n\t\t}\n\t},\n\t\tderived(reader => {\n\t\t\tif (this._data.read(reader) === undefined) {\n\t\t\t\treturn [];\n\t\t\t}\n\n\t\t\t// Main content container with rounded border\n\t\t\treturn n.div({\n\t\t\t\tstyle: {\n\t\t\t\t\tdisplay: 'flex',\n\t\t\t\t\talignItems: 'center',\n\t\t\t\t\tgap: '4px',\n\t\t\t\t\tpadding: '0 4px',\n\t\t\t\t\theight: '100%',\n\t\t\t\t\tbackgroundColor: this._styles.map(s => s.background),\n\t\t\t\t\t['--vscodeIconForeground' as string]: this._styles.map(s => s.foreground),\n\t\t\t\t\tborder: this._styles.map(s => `1px solid ${s.border}`),\n\t\t\t\t\tborderRadius: '3px',\n\t\t\t\t\tboxSizing: 'border-box',\n\t\t\t\t\tfontSize: '11px',\n\t\t\t\t\tcolor: this._styles.map(s => s.foreground),\n\t\t\t\t}\n\t\t\t}, [\n\t\t\t\tthis._style === 'cursor' ?\n\t\t\t\t\tn.elem('div', {\n\t\t\t\t\t\tstyle: {\n\t\t\t\t\t\t\tborderLeft: '2px solid',\n\t\t\t\t\t\t\theight: 14,\n\t\t\t\t\t\t\topacity: this._blink.map(b => b ? '0' : '1'),\n\t\t\t\t\t\t}\n\t\t\t\t\t}) :\n\n\t\t\t\t\t[\n\t\t\t\t\t\tderived(() => n.elem('div', {}, keybindingLabel(this._keybinding))),\n\t\t\t\t\t\tn.elem('div', { style: { lineHeight: this._layout.map(l => l?.widgetRect.height), marginTop: '-2px' } },\n\t\t\t\t\t\t\t['to jump',]\n\t\t\t\t\t\t)\n\t\t\t\t\t],\n\t\t\t]);\n\n\t\t})\n\t);\n}\n\nfunction animateFixedValues<T>(values: { value: T; durationMs: number }[], debugLocation = DebugLocation.ofCaller()): IObservable<T> {\n\tlet idx = 0;\n\treturn observableFromEvent(undefined, (l) => {\n\t\tidx = 0;\n\t\tconst timer = new RunOnceScheduler(() => {\n\t\t\tidx = (idx + 1) % values.length;\n\t\t\tl(null);\n\t\t\ttimer.schedule(values[idx].durationMs);\n\t\t}, 0);\n\t\ttimer.schedule(0);\n\n\t\treturn timer;\n\t}, () => {\n\t\treturn values[idx].value;\n\t}, debugLocation);\n}\n\nfunction keybindingLabel(keybinding: IObservable<ResolvedKeybinding | undefined>) {\n\treturn derived(_reader => n.div({\n\t\tstyle: {},\n\t\tref: elem => {\n\t\t\tconst keybindingLabel = _reader.store.add(new KeybindingLabel(elem, OS, {\n\t\t\t\tdisableTitle: true,\n\t\t\t\t...defaultKeybindingLabelStyles,\n\t\t\t\tkeybindingLabelShadow: undefined,\n\t\t\t\tkeybindingLabelForeground: asCssVariable(inlineEditIndicatorPrimaryForeground),\n\t\t\t\tkeybindingLabelBackground: 'transparent',\n\t\t\t\tkeybindingLabelBorder: asCssVariable(inlineEditIndicatorPrimaryForeground),\n\t\t\t\tkeybindingLabelBottomBorder: undefined,\n\t\t\t}));\n\t\t\t_reader.store.add(autorun(reader => {\n\t\t\t\tkeybindingLabel.set(keybinding.read(reader));\n\t\t\t}));\n\t\t}\n\t}));\n}\n","/*---------------------------------------------------------------------------------------------\n * Copyright (c) Microsoft Corporation. All rights reserved.\n * Licensed under the MIT License. See License.txt in the project root for license information.\n *--------------------------------------------------------------------------------------------*/\n\nimport { n } from '../../../../../../../base/browser/dom.js';\nimport { KeybindingLabel } from '../../../../../../../base/browser/ui/keybindingLabel/keybindingLabel.js';\nimport { RunOnceScheduler } from '../../../../../../../base/common/async.js';\nimport { ResolvedKeybinding } from '../../../../../../../base/common/keybindings.js';\nimport { Disposable } from '../../../../../../../base/common/lifecycle.js';\nimport { autorun, constObservable, DebugLocation, derived, IObservable, observableFromEvent } from '../../../../../../../base/common/observable.js';\nimport { OS } from '../../../../../../../base/common/platform.js';\nimport { IContextKeyService } from '../../../../../../../platform/contextkey/common/contextkey.js';\nimport { IKeybindingService } from '../../../../../../../platform/keybinding/common/keybinding.js';\nimport { defaultKeybindingLabelStyles } from '../../../../../../../platform/theme/browser/defaultStyles.js';\nimport { asCssVariable } from '../../../../../../../platform/theme/common/colorUtils.js';\nimport { IThemeService } from '../../../../../../../platform/theme/common/themeService.js';\nimport { ObservableCodeEditor } from '../../../../../../browser/observableCodeEditor.js';\nimport { Rect } from '../../../../../../common/core/2d/rect.js';\nimport { Position } from '../../../../../../common/core/position.js';\nimport { Range } from '../../../../../../common/core/range.js';\nimport { IModelDeltaDecoration } from '../../../../../../common/model.js';\nimport { inlineSuggestCommitId } from '../../../controller/commandIds.js';\nimport { getEditorBlendedColor, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorPrimaryBorder, inlineEditIndicatorPrimaryForeground } from '../theme.js';\nimport { rectToProps } from '../utils/utils.js';\n\nexport class JumpToView extends Disposable {\n\tprivate readonly _style: 'label' | 'cursor';\n\n\tconstructor(\n\t\tprivate readonly _editor: ObservableCodeEditor,\n\t\toptions: { style: 'label' | 'cursor' },\n\t\tprivate readonly _data: IObservable<{ jumpToPosition: Position } | undefined>,\n\t\t@IThemeService private readonly _themeService: IThemeService,\n\t\t@IKeybindingService private readonly _keybindingService: IKeybindingService,\n\t\t@IContextKeyService private readonly _contextKeyService: IContextKeyService\n\t) {\n\t\tsuper();\n\n\t\tthis._style = options.style;\n\t\tthis._keybinding = this._getKeybinding(inlineSuggestCommitId);\n\n\t\tconst widget = this._widget.keepUpdated(this._store);\n\n\t\tthis._register(this._editor.createOverlayWidget({\n\t\t\tdomNode: widget.element,\n\t\t\tposition: constObservable(null),\n\t\t\tallowEditorOverflow: false,\n\t\t\tminContentWidthInPx: constObservable(0),\n\t\t}));\n\n\t\tthis._register(this._editor.setDecorations(derived<IModelDeltaDecoration[]>(reader => {\n\t\t\tconst data = this._data.read(reader);\n\t\t\tif (!data) {\n\t\t\t\treturn [];\n\t\t\t}\n\t\t\t// use injected text at position\n\t\t\treturn [{\n\t\t\t\trange: Range.fromPositions(data.jumpToPosition, data.jumpToPosition),\n\t\t\t\toptions: {\n\t\t\t\t\tdescription: 'inline-edit-jump-to-decoration',\n\t\t\t\t\tinlineClassNameAffectsLetterSpacing: true,\n\t\t\t\t\tshowIfCollapsed: true,\n\t\t\t\t\tafter: {\n\t\t\t\t\t\tcontent: this._style === 'label' ? ' ' : ' ',\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t} satisfies IModelDeltaDecoration];\n\t\t})));\n\t}\n\n\tprivate readonly _styles = derived(this, reader => ({\n\t\tbackground: getEditorBlendedColor(inlineEditIndicatorPrimaryBackground, this._themeService).read(reader).toString(),\n\t\tforeground: getEditorBlendedColor(inlineEditIndicatorPrimaryForeground, this._themeService).read(reader).toString(),\n\t\tborder: getEditorBlendedColor(inlineEditIndicatorPrimaryBorder, this._themeService).read(reader).toString(),\n\t}));\n\n\tprivate readonly _pos = derived(this, reader => {\n\t\treturn this._editor.observePosition(derived(reader =>\n\t\t\tthis._data.read(reader)?.jumpToPosition || null\n\t\t), reader.store);\n\t}).flatten();\n\n\tprivate _getKeybinding(commandId: string | undefined, debugLocation = DebugLocation.ofCaller()) {\n\t\tif (!commandId) {\n\t\t\treturn constObservable(undefined);\n\t\t}\n\t\treturn observableFromEvent(this, this._contextKeyService.onDidChangeContext, () => this._keybindingService.lookupKeybinding(commandId), debugLocation);\n\t\t// TODO: use contextkeyservice to use different renderings\n\t}\n\n\tprivate readonly _keybinding;\n\n\tprivate readonly _layout = derived(this, reader => {\n\t\tconst data = this._data.read(reader);\n\t\tif (!data) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\tconst position = data.jumpToPosition;\n\t\tconst lineHeight = this._editor.observeLineHeightForLine(constObservable(position.lineNumber)).read(reader);\n\t\tconst scrollLeft = this._editor.scrollLeft.read(reader);\n\n\t\tconst point = this._pos.read(reader);\n\n\t\tif (!point) {\n\t\t\treturn undefined;\n\t\t}\n\n\t\tconst layout = this._editor.layoutInfo.read(reader);\n\n\t\tconst widgetRect = Rect.fromLeftTopWidthHeight(\n\t\t\tpoint.x + layout.contentLeft + 2 - scrollLeft,\n\t\t\tpoint.y,\n\t\t\t100,\n\t\t\tlineHeight\n\t\t);\n\n\t\treturn {\n\t\t\twidgetRect,\n\t\t};\n\t});\n\n\tprivate readonly _blink = animateFixedValues<boolean>([\n\t\t{ value: true, durationMs: 600 },\n\t\t{ value: false, durationMs: 600 },\n\t]);\n\n\tprivate readonly _widget = n.div({\n\t\tclass: 'inline-edit-jump-to-widget',\n\t\tstyle: {\n\t\t\tposition: 'absolute',\n\t\t\tdisplay: this._layout.map(l => l ? 'flex' : 'none'),\n\n\t\t\talignItems: 'center',\n\t\t\tcursor: 'pointer',\n\t\t\tuserSelect: 'none',\n\t\t\t...rectToProps(reader => this._layout.read(reader)?.widgetRect),\n\t\t}\n\t},\n\t\tderived(reader => {\n\t\t\tif (this._data.read(reader) === undefined) {\n\t\t\t\treturn [];\n\t\t\t}\n\n\t\t\t// Main content container with rounded border\n\t\t\treturn n.div({\n\t\t\t\tstyle: {\n\t\t\t\t\tdisplay: 'flex',\n\t\t\t\t\talignItems: 'center',\n\t\t\t\t\tgap: '4px',\n\t\t\t\t\tpadding: '0 4px',\n\t\t\t\t\theight: '100%',\n\t\t\t\t\tbackgroundColor: this._styles.map(s => s.background),\n\t\t\t\t\t['--vscodeIconForeground' as string]: this._styles.map(s => s.foreground),\n\t\t\t\t\tborder: this._styles.map(s => `1px solid ${s.border}`),\n\t\t\t\t\tborderRadius: '3px',\n\t\t\t\t\tboxSizing: 'border-box',\n\t\t\t\t\tfontSize: '11px',\n\t\t\t\t\tcolor: this._styles.map(s => s.foreground),\n\t\t\t\t}\n\t\t\t}, [\n\t\t\t\tthis._style === 'cursor' ?\n\t\t\t\t\tn.elem('div', {\n\t\t\t\t\t\tstyle: {\n\t\t\t\t\t\t\tborderLeft: '2px solid',\n\t\t\t\t\t\t\theight: 14,\n\t\t\t\t\t\t\topacity: this._blink.map(b => b ? '0' : '1'),\n\t\t\t\t\t\t}\n\t\t\t\t\t}) :\n\n\t\t\t\t\t[\n\t\t\t\t\t\tderived(() => n.elem('div', {}, keybindingLabel(this._keybinding))),\n\t\t\t\t\t\tn.elem('div', { style: { lineHeight: this._layout.map(l => l?.widgetRect.height), marginTop: '-2px' } },\n\t\t\t\t\t\t\t['to jump',]\n\t\t\t\t\t\t)\n\t\t\t\t\t],\n\t\t\t]);\n\n\t\t})\n\t);\n}\n\nfunction animateFixedValues<T>(values: { value: T; durationMs: number }[], debugLocation = DebugLocation.ofCaller()): IObservable<T> {\n\tlet idx = 0;\n\treturn observableFromEvent(undefined, (l) => {\n\t\tidx = 0;\n\t\tconst timer = new RunOnceScheduler(() => {\n\t\t\tidx = (idx + 1) % values.length;\n\t\t\tl(null);\n\t\t\ttimer.schedule(values[idx].durationMs);\n\t\t}, 0);\n\t\ttimer.schedule(0);\n\n\t\treturn timer;\n\t}, () => {\n\t\treturn values[idx].value;\n\t}, debugLocation);\n}\n\nfunction keybindingLabel(keybinding: IObservable<ResolvedKeybinding | undefined>) {\n\treturn derived(_reader => n.div({\n\t\tstyle: {},\n\t\tref: elem => {\n\t\t\tconst keybindingLabel = _reader.store.add(new KeybindingLabel(elem, OS, {\n\t\t\t\tdisableTitle: true,\n\t\t\t\t...defaultKeybindingLabelStyles,\n\t\t\t\tkeybindingLabelShadow: undefined,\n\t\t\t\tkeybindingLabelForeground: asCssVariable(inlineEditIndicatorPrimaryForeground),\n\t\t\t\tkeybindingLabelBackground: 'transparent',\n\t\t\t\tkeybindingLabelBorder: asCssVariable(inlineEditIndicatorPrimaryForeground),\n\t\t\t\tkeybindingLabelBottomBorder: undefined,\n\t\t\t}));\n\t\t\t_reader.store.add(autorun(reader => {\n\t\t\t\tkeybindingLabel.set(keybinding.read(reader));\n\t\t\t}));\n\t\t}\n\t}));\n}\n"]}
|
|
@@ -14,7 +14,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
import { n } from '../../../../../../../../base/browser/dom.js';
|
|
15
15
|
import { Event } from '../../../../../../../../base/common/event.js';
|
|
16
16
|
import { Disposable } from '../../../../../../../../base/common/lifecycle.js';
|
|
17
|
-
import { autorun, constObservable, debouncedObservable2, derived, derivedDisposable } from '../../../../../../../../base/common/observable.js';
|
|
17
|
+
import { autorun, constObservable, debouncedObservable2, derived, derivedDisposable, observableFromEvent } from '../../../../../../../../base/common/observable.js';
|
|
18
18
|
import { IInstantiationService } from '../../../../../../../../platform/instantiation/common/instantiation.js';
|
|
19
19
|
import { observableCodeEditor } from '../../../../../../../browser/observableCodeEditor.js';
|
|
20
20
|
import { Rect } from '../../../../../../../common/core/2d/rect.js';
|
|
@@ -30,17 +30,24 @@ import { SymbolKinds } from '../../../../../../../common/languages.js';
|
|
|
30
30
|
import { debugLogRects, debugView } from '../debugVisualization.js';
|
|
31
31
|
import { distributeFlexBoxLayout } from '../../utils/flexBoxLayout.js';
|
|
32
32
|
import { Point } from '../../../../../../../common/core/2d/point.js';
|
|
33
|
-
import { Size2D } from '../../../../../../../common/core/2d/size.js';
|
|
34
|
-
import { getMaxTowerHeightInAvailableArea } from '../../utils/towersLayout.js';
|
|
35
33
|
import { IThemeService } from '../../../../../../../../platform/theme/common/themeService.js';
|
|
36
34
|
import { IKeybindingService } from '../../../../../../../../platform/keybinding/common/keybinding.js';
|
|
37
|
-
import { getEditorBlendedColor, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorSecondaryBackground,
|
|
35
|
+
import { getEditorBlendedColor, inlineEditIndicatorPrimaryBackground, inlineEditIndicatorSecondaryBackground, inlineEditIndicatorSuccessfulBackground, observeColor } from '../../theme.js';
|
|
38
36
|
import { asCssVariable, descriptionForeground, editorBackground, editorWidgetBackground } from '../../../../../../../../platform/theme/common/colorRegistry.js';
|
|
37
|
+
import { editorWidgetBorder } from '../../../../../../../../platform/theme/common/colors/editorColors.js';
|
|
39
38
|
import { LongDistancePreviewEditor } from './longDistancePreviewEditor.js';
|
|
40
39
|
import { jumpToNextInlineEditId } from '../../../../controller/commandIds.js';
|
|
41
|
-
|
|
40
|
+
import { splitIntoContinuousLineRanges, WidgetPlacementContext } from './longDistnaceWidgetPlacement.js';
|
|
41
|
+
const BORDER_RADIUS = 6;
|
|
42
42
|
const MAX_WIDGET_WIDTH = { EMPTY_SPACE: 425, OVERLAY: 375 };
|
|
43
43
|
const MIN_WIDGET_WIDTH = 250;
|
|
44
|
+
const DEFAULT_WIDGET_LAYOUT_CONSTANTS = {
|
|
45
|
+
previewEditorMargin: 2,
|
|
46
|
+
widgetPadding: 2,
|
|
47
|
+
widgetBorder: 1,
|
|
48
|
+
lowerBarHeight: 20,
|
|
49
|
+
minWidgetWidth: MIN_WIDGET_WIDTH,
|
|
50
|
+
};
|
|
44
51
|
let InlineEditsLongDistanceHint = class InlineEditsLongDistanceHint extends Disposable {
|
|
45
52
|
constructor(_editor, _viewState, _previewTextModel, _tabAction, _instantiationService, _themeService, _keybindingService) {
|
|
46
53
|
super();
|
|
@@ -61,23 +68,19 @@ let InlineEditsLongDistanceHint = class InlineEditsLongDistanceHint extends Disp
|
|
|
61
68
|
const viewState = this._viewState.read(reader);
|
|
62
69
|
const p = this._hintTextPosition.read(reader);
|
|
63
70
|
if (!viewState || !p) {
|
|
64
|
-
return
|
|
71
|
+
return [];
|
|
65
72
|
}
|
|
66
73
|
const model = this._editorObs.model.read(reader);
|
|
67
74
|
if (!model) {
|
|
68
|
-
return
|
|
75
|
+
return [];
|
|
69
76
|
}
|
|
70
77
|
const range = LineRange.ofLength(p.lineNumber, 1).addMargin(5, 5).intersect(LineRange.ofLength(1, model.getLineCount()));
|
|
71
78
|
if (!range) {
|
|
72
|
-
return
|
|
79
|
+
return [];
|
|
73
80
|
}
|
|
74
81
|
const sizes = getContentSizeOfLines(this._editorObs, range, reader);
|
|
75
82
|
const top = this._editorObs.observeTopForLineNumber(range.startLineNumber).read(reader);
|
|
76
|
-
return
|
|
77
|
-
lineRange: range,
|
|
78
|
-
top: top,
|
|
79
|
-
sizes: sizes,
|
|
80
|
-
};
|
|
83
|
+
return splitIntoContinuousLineRanges(range, sizes, top, this._editorObs, reader);
|
|
81
84
|
});
|
|
82
85
|
this._isVisibleDelayed = debouncedObservable2(derived(this, reader => this._viewState.read(reader)?.hint.isVisible), (lastValue, newValue) => lastValue === true && newValue === false ? 200 : 0);
|
|
83
86
|
this._previewEditorLayoutInfo = derived(this, (reader) => {
|
|
@@ -85,8 +88,8 @@ let InlineEditsLongDistanceHint = class InlineEditsLongDistanceHint extends Disp
|
|
|
85
88
|
if (!viewState || !this._isVisibleDelayed.read(reader)) {
|
|
86
89
|
return undefined;
|
|
87
90
|
}
|
|
88
|
-
const
|
|
89
|
-
if (
|
|
91
|
+
const continousLineRanges = this._lineSizesAroundHintPosition.read(reader);
|
|
92
|
+
if (continousLineRanges.length === 0) {
|
|
90
93
|
return undefined;
|
|
91
94
|
}
|
|
92
95
|
const editorScrollTop = this._editorObs.scrollTop.read(reader);
|
|
@@ -105,50 +108,36 @@ let InlineEditsLongDistanceHint = class InlineEditsLongDistanceHint extends Disp
|
|
|
105
108
|
if (!c) {
|
|
106
109
|
return undefined;
|
|
107
110
|
}
|
|
108
|
-
const
|
|
109
|
-
const lineNumber = lineSizes.lineRange.startLineNumber + idx;
|
|
110
|
-
let linePaddingLeft = 20;
|
|
111
|
-
if (lineNumber === viewState.hint.lineNumber) {
|
|
112
|
-
linePaddingLeft = 40;
|
|
113
|
-
}
|
|
114
|
-
return new Size2D(Math.max(0, editorTrueContentWidth - s.width - linePaddingLeft), s.height);
|
|
115
|
-
});
|
|
116
|
-
const showRects = false;
|
|
117
|
-
if (showRects) {
|
|
118
|
-
const rects2 = stackSizesDown(new Point(editorTrueContentRight, lineSizes.top - editorScrollTop), availableSpaceSizes, 'right');
|
|
119
|
-
debugView(debugLogRects({ ...rects2 }, this._editor.getDomNode()), reader);
|
|
120
|
-
}
|
|
121
|
-
const availableSpaceHeightPrefixSums = getSums(availableSpaceSizes, s => s.height);
|
|
122
|
-
const availableSpaceSizesTransposed = availableSpaceSizes.map(s => s.transpose());
|
|
123
|
-
const previewEditorMargin = 2;
|
|
124
|
-
const widgetPadding = 2;
|
|
125
|
-
const lowerBarHeight = 20;
|
|
126
|
-
const widgetBorder = 1;
|
|
111
|
+
const layoutConstants = DEFAULT_WIDGET_LAYOUT_CONSTANTS;
|
|
127
112
|
const extraGutterMarginToAvoidScrollBar = 2;
|
|
128
113
|
const previewEditorHeight = previewContentHeight + extraGutterMarginToAvoidScrollBar;
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
return undefined;
|
|
114
|
+
// Try to find widget placement in available empty space
|
|
115
|
+
let possibleWidgetOutline;
|
|
116
|
+
let lastPlacementContext;
|
|
117
|
+
const endOfLinePadding = (lineNumber) => lineNumber === viewState.hint.lineNumber ? 40 : 20;
|
|
118
|
+
for (const continousLineRange of continousLineRanges) {
|
|
119
|
+
const placementContext = new WidgetPlacementContext(continousLineRange, editorTrueContentWidth, endOfLinePadding);
|
|
120
|
+
lastPlacementContext = placementContext;
|
|
121
|
+
const showRects = false;
|
|
122
|
+
if (showRects) {
|
|
123
|
+
const rects2 = stackSizesDown(new Point(editorTrueContentRight, continousLineRange.top - editorScrollTop), placementContext.availableSpaceSizes, 'right');
|
|
124
|
+
debugView(debugLogRects({ ...rects2 }, this._editor.getDomNode()), reader);
|
|
141
125
|
}
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
126
|
+
possibleWidgetOutline = placementContext.tryFindWidgetOutline(viewState.hint.lineNumber, previewEditorHeight, editorTrueContentRight, layoutConstants);
|
|
127
|
+
if (possibleWidgetOutline) {
|
|
128
|
+
break;
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
// Fallback to overlay position if no empty space was found
|
|
145
132
|
let position = 'empty-space';
|
|
146
133
|
if (!possibleWidgetOutline) {
|
|
147
134
|
position = 'overlay';
|
|
148
135
|
const maxAvailableWidth = Math.min(editorLayout.width - editorLayout.contentLeft, MAX_WIDGET_WIDTH.OVERLAY);
|
|
136
|
+
// Create a fallback placement context for computing overlay vertical position
|
|
137
|
+
const fallbackPlacementContext = lastPlacementContext ?? new WidgetPlacementContext(continousLineRanges[0], editorTrueContentWidth, endOfLinePadding);
|
|
149
138
|
possibleWidgetOutline = {
|
|
150
139
|
horizontalWidgetRange: OffsetRange.ofStartAndLength(editorTrueContentRight - maxAvailableWidth, maxAvailableWidth),
|
|
151
|
-
verticalWidgetRange: getWidgetVerticalOutline(viewState.hint.lineNumber + 2).delta(10),
|
|
140
|
+
verticalWidgetRange: fallbackPlacementContext.getWidgetVerticalOutline(viewState.hint.lineNumber + 2, previewEditorHeight, layoutConstants).delta(10),
|
|
152
141
|
};
|
|
153
142
|
}
|
|
154
143
|
if (!possibleWidgetOutline) {
|
|
@@ -159,6 +148,7 @@ let InlineEditsLongDistanceHint = class InlineEditsLongDistanceHint extends Disp
|
|
|
159
148
|
if (showAvailableSpace) {
|
|
160
149
|
debugView(debugLogRects({ rectAvailableSpace }, this._editor.getDomNode()), reader);
|
|
161
150
|
}
|
|
151
|
+
const { previewEditorMargin, widgetPadding, widgetBorder, lowerBarHeight } = layoutConstants;
|
|
162
152
|
const maxWidgetWidth = Math.min(position === 'overlay' ? MAX_WIDGET_WIDTH.OVERLAY : MAX_WIDGET_WIDTH.EMPTY_SPACE, previewEditorContentLayout.maxEditorWidth + previewEditorMargin + widgetPadding);
|
|
163
153
|
const layout = distributeFlexBoxLayout(rectAvailableSpace.width, {
|
|
164
154
|
spaceBefore: { min: 0, max: 10, priority: 1 },
|
|
@@ -254,7 +244,8 @@ let InlineEditsLongDistanceHint = class InlineEditsLongDistanceHint extends Disp
|
|
|
254
244
|
}
|
|
255
245
|
// Outline Element
|
|
256
246
|
const source = this._originalOutlineSource.read(reader);
|
|
257
|
-
const
|
|
247
|
+
const originalTargetLineNumber = this._originalTargetLineNumber.read(reader);
|
|
248
|
+
const outlineItems = source?.getAt(originalTargetLineNumber, reader).slice(0, 1) ?? [];
|
|
258
249
|
const outlineElements = [];
|
|
259
250
|
if (outlineItems.length > 0) {
|
|
260
251
|
for (let i = 0; i < outlineItems.length; i++) {
|
|
@@ -275,11 +266,11 @@ let InlineEditsLongDistanceHint = class InlineEditsLongDistanceHint extends Disp
|
|
|
275
266
|
}
|
|
276
267
|
children.push(n.div({ class: 'outline-elements', style: { overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' } }, outlineElements));
|
|
277
268
|
// Show Edit Direction
|
|
278
|
-
const arrowIcon =
|
|
269
|
+
const arrowIcon = viewState.hint.lineNumber < originalTargetLineNumber ? Codicon.arrowDown : Codicon.arrowUp;
|
|
279
270
|
const keybinding = this._keybindingService.lookupKeybinding(jumpToNextInlineEditId);
|
|
280
271
|
let label = 'Go to suggestion';
|
|
281
272
|
if (keybinding && keybinding.getLabel() === 'Tab') {
|
|
282
|
-
label = 'Tab to
|
|
273
|
+
label = 'Tab to jump';
|
|
283
274
|
}
|
|
284
275
|
children.push(n.div({
|
|
285
276
|
class: 'go-to-label',
|
|
@@ -293,26 +284,52 @@ let InlineEditsLongDistanceHint = class InlineEditsLongDistanceHint extends Disp
|
|
|
293
284
|
})
|
|
294
285
|
]),
|
|
295
286
|
]));
|
|
287
|
+
// Drives breadcrumbs and symbol icon
|
|
288
|
+
this._originalTargetLineNumber = derived(this, (reader) => {
|
|
289
|
+
const viewState = this._viewState.read(reader);
|
|
290
|
+
if (!viewState) {
|
|
291
|
+
return -1;
|
|
292
|
+
}
|
|
293
|
+
if (viewState.edit.action?.kind === 'jumpTo') {
|
|
294
|
+
return viewState.edit.action.position.lineNumber;
|
|
295
|
+
}
|
|
296
|
+
return viewState.diff[0]?.original.startLineNumber ?? -1;
|
|
297
|
+
});
|
|
296
298
|
this._originalOutlineSource = derivedDisposable(this, (reader) => {
|
|
297
299
|
const m = this._editorObs.model.read(reader);
|
|
298
300
|
const factory = HideUnchangedRegionsFeature._breadcrumbsSourceFactory.read(reader);
|
|
299
301
|
return (!m || !factory) ? undefined : factory(m, this._instantiationService);
|
|
300
302
|
});
|
|
301
|
-
this._styles =
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
303
|
+
this._styles = derived(reader => {
|
|
304
|
+
const v = this._tabAction.read(reader);
|
|
305
|
+
// Check theme type by observing a color - this ensures we react to theme changes
|
|
306
|
+
const widgetBorderColor = observeColor(editorWidgetBorder, this._themeService).read(reader);
|
|
307
|
+
const isHighContrast = observableFromEvent(this._themeService.onDidColorThemeChange, () => {
|
|
308
|
+
const theme = this._themeService.getColorTheme();
|
|
309
|
+
return theme.type === 'hcDark' || theme.type === 'hcLight';
|
|
310
|
+
}).read(reader);
|
|
311
|
+
let borderColor;
|
|
312
|
+
if (isHighContrast) {
|
|
313
|
+
// Use editorWidgetBorder in high contrast mode for better visibility
|
|
314
|
+
borderColor = widgetBorderColor;
|
|
315
|
+
}
|
|
316
|
+
else {
|
|
317
|
+
let border;
|
|
318
|
+
switch (v) {
|
|
319
|
+
case InlineEditTabAction.Inactive:
|
|
320
|
+
border = inlineEditIndicatorSecondaryBackground;
|
|
321
|
+
break;
|
|
322
|
+
case InlineEditTabAction.Jump:
|
|
323
|
+
border = inlineEditIndicatorPrimaryBackground;
|
|
324
|
+
break;
|
|
325
|
+
case InlineEditTabAction.Accept:
|
|
326
|
+
border = inlineEditIndicatorSuccessfulBackground;
|
|
327
|
+
break;
|
|
328
|
+
}
|
|
329
|
+
borderColor = getEditorBlendedColor(border, this._themeService).read(reader);
|
|
313
330
|
}
|
|
314
331
|
return {
|
|
315
|
-
border:
|
|
332
|
+
border: borderColor.toString(),
|
|
316
333
|
background: asCssVariable(editorBackground)
|
|
317
334
|
};
|
|
318
335
|
});
|
|
@@ -325,7 +342,8 @@ let InlineEditsLongDistanceHint = class InlineEditsLongDistanceHint extends Disp
|
|
|
325
342
|
return {
|
|
326
343
|
diff: viewState.diff,
|
|
327
344
|
model: viewState.model,
|
|
328
|
-
|
|
345
|
+
inlineSuggestInfo: viewState.inlineSuggestInfo,
|
|
346
|
+
nextCursorPosition: viewState.nextCursorPosition,
|
|
329
347
|
};
|
|
330
348
|
}), this._editor, this._tabAction));
|
|
331
349
|
this._viewWithElement = this._view.keepUpdated(this._store);
|
|
@@ -371,41 +389,6 @@ function stackSizesDown(at, sizes, alignment = 'left') {
|
|
|
371
389
|
}
|
|
372
390
|
return rects;
|
|
373
391
|
}
|
|
374
|
-
function findFirstMinimzeDistance(range, targetLine, predicate) {
|
|
375
|
-
for (let offset = 0;; offset++) {
|
|
376
|
-
const down = targetLine + offset;
|
|
377
|
-
if (down <= range.endLineNumberExclusive) {
|
|
378
|
-
const result = predicate(down);
|
|
379
|
-
if (result !== undefined) {
|
|
380
|
-
return result;
|
|
381
|
-
}
|
|
382
|
-
}
|
|
383
|
-
const up = targetLine - offset;
|
|
384
|
-
if (up >= range.startLineNumber) {
|
|
385
|
-
const result = predicate(up);
|
|
386
|
-
if (result !== undefined) {
|
|
387
|
-
return result;
|
|
388
|
-
}
|
|
389
|
-
}
|
|
390
|
-
if (up < range.startLineNumber && down > range.endLineNumberExclusive) {
|
|
391
|
-
return undefined;
|
|
392
|
-
}
|
|
393
|
-
}
|
|
394
|
-
}
|
|
395
|
-
function getSums(array, fn) {
|
|
396
|
-
const result = [0];
|
|
397
|
-
let sum = 0;
|
|
398
|
-
for (const item of array) {
|
|
399
|
-
sum += fn(item);
|
|
400
|
-
result.push(sum);
|
|
401
|
-
}
|
|
402
|
-
return result;
|
|
403
|
-
}
|
|
404
|
-
function isEditBelowHint(viewState) {
|
|
405
|
-
const hintLineNumber = viewState.hint.lineNumber;
|
|
406
|
-
const editStartLineNumber = viewState.diff[0]?.original.startLineNumber;
|
|
407
|
-
return hintLineNumber < editStartLineNumber;
|
|
408
|
-
}
|
|
409
392
|
/**
|
|
410
393
|
* Changes the scroll position as little as possible just to reveal the given range in the window.
|
|
411
394
|
*/
|