@codingame/monaco-vscode-api 5.2.0 → 6.0.0
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/README.md +2 -0
- package/api.js +1 -1
- package/extensions.d.ts +4 -4
- package/localExtensionHost.js +2 -1
- package/missing-services.js +77 -22
- package/package.json +8 -8
- package/service-override/dialogs.d.ts +1 -8
- package/service-override/search.d.ts +1 -8
- package/service-override/tools/editor.js +11 -2
- package/service-override/userDataProfile.d.ts +5 -0
- package/services.js +2 -2
- package/vscode/src/vs/base/browser/canIUse.js +10 -4
- package/vscode/src/vs/base/browser/deviceAccess.js +60 -0
- package/vscode/src/vs/base/browser/dom.js +25 -9
- package/vscode/src/vs/base/browser/formattedTextRenderer.js +36 -24
- package/vscode/src/vs/base/browser/keyboardEvent.js +24 -24
- package/vscode/src/vs/base/browser/markdownRenderer.js +130 -30
- package/vscode/src/vs/base/browser/performance.js +24 -18
- package/vscode/src/vs/base/browser/ui/actionbar/actionbar.js +22 -16
- package/vscode/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.js +3 -2
- package/vscode/src/vs/base/browser/ui/button/button.js +19 -7
- package/vscode/src/vs/base/browser/ui/codicons/codicon/codicon.css.js +1 -1
- package/vscode/src/vs/base/browser/ui/contextview/contextview.js +43 -17
- package/vscode/src/vs/base/browser/ui/dialog/dialog.js +7 -6
- package/vscode/src/vs/base/browser/ui/dropdown/dropdown.js +4 -2
- package/vscode/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.js +3 -2
- package/vscode/src/vs/base/browser/ui/findinput/findInput.js +5 -4
- package/vscode/src/vs/base/browser/ui/findinput/replaceInput.js +5 -4
- package/vscode/src/vs/base/browser/ui/hover/hover.d.ts +5 -0
- package/vscode/src/vs/base/browser/ui/hover/hoverDelegate2.js +1 -0
- package/vscode/src/vs/base/browser/ui/hover/hoverWidget.css.js +1 -1
- package/vscode/src/vs/base/browser/ui/hover/hoverWidget.js +10 -6
- package/vscode/src/vs/base/browser/ui/iconLabel/iconLabel.js +16 -1
- package/vscode/src/vs/base/browser/ui/iconLabel/iconlabel.css.js +1 -1
- package/vscode/src/vs/base/browser/ui/icons/iconSelectBox.js +2 -1
- package/vscode/src/vs/base/browser/ui/inputbox/inputBox.js +17 -9
- package/vscode/src/vs/base/browser/ui/list/list.js +12 -1
- package/vscode/src/vs/base/browser/ui/list/listView.js +19 -11
- package/vscode/src/vs/base/browser/ui/list/listWidget.js +17 -16
- package/vscode/src/vs/base/browser/ui/menu/menu.js +17 -15
- package/vscode/src/vs/base/browser/ui/menu/menubar.js +14 -14
- package/vscode/src/vs/base/browser/ui/resizable/resizable.js +9 -9
- package/vscode/src/vs/base/browser/ui/sash/sash.js +30 -18
- package/vscode/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.js +5 -4
- package/vscode/src/vs/base/browser/ui/scrollbar/scrollableElement.js +3 -3
- package/vscode/src/vs/base/browser/ui/scrollbar/scrollbarVisibilityController.js +3 -2
- package/vscode/src/vs/base/browser/ui/scrollbar/verticalScrollbar.js +3 -2
- package/vscode/src/vs/base/browser/ui/selectBox/selectBox.js +3 -0
- package/vscode/src/vs/base/browser/ui/selectBox/selectBoxCustom.js +25 -20
- package/vscode/src/vs/base/browser/ui/selectBox/selectBoxNative.js +6 -2
- package/vscode/src/vs/base/browser/ui/splitview/paneview.js +26 -24
- package/vscode/src/vs/base/browser/ui/splitview/splitview.js +33 -27
- package/vscode/src/vs/base/browser/ui/table/tableWidget.js +5 -3
- package/vscode/src/vs/base/browser/ui/toggle/toggle.js +4 -2
- package/vscode/src/vs/base/browser/ui/toolbar/toolbar.js +2 -2
- package/vscode/src/vs/base/browser/ui/tree/abstractTree.js +30 -24
- package/vscode/src/vs/base/browser/ui/tree/asyncDataTree.js +7 -7
- package/vscode/src/vs/base/browser/ui/tree/indexTreeModel.js +15 -15
- package/vscode/src/vs/base/browser/ui/tree/tree.js +13 -1
- package/vscode/src/vs/base/common/actions.js +1 -1
- package/vscode/src/vs/base/common/arrays.js +2 -5
- package/vscode/src/vs/base/common/assert.js +7 -2
- package/vscode/src/vs/base/common/async.js +38 -14
- package/vscode/src/vs/base/common/charCode.js +296 -0
- package/vscode/src/vs/base/common/codicons.d.ts +1 -0
- package/vscode/src/vs/base/common/codiconsLibrary.js +1 -0
- package/vscode/src/vs/base/common/color.js +24 -23
- package/vscode/src/vs/base/common/diff/diff.js +15 -10
- package/vscode/src/vs/base/common/event.js +83 -26
- package/vscode/src/vs/base/common/extpath.js +10 -9
- package/vscode/src/vs/base/common/filters.js +40 -32
- package/vscode/src/vs/base/common/fuzzyScorer.js +10 -9
- package/vscode/src/vs/base/common/glob.js +2 -1
- package/vscode/src/vs/base/common/hash.js +15 -10
- package/vscode/src/vs/base/common/htmlContent.js +8 -3
- package/vscode/src/vs/base/common/json.js +323 -149
- package/vscode/src/vs/base/common/jsonErrorMessages.js +10 -9
- package/vscode/src/vs/base/common/jsonFormatter.js +30 -30
- package/vscode/src/vs/base/common/keyCodes.js +591 -249
- package/vscode/src/vs/base/common/keybindingLabels.js +4 -3
- package/vscode/src/vs/base/common/keybindings.js +30 -17
- package/vscode/src/vs/base/common/labels.js +10 -10
- package/vscode/src/vs/base/common/lifecycle.js +5 -0
- package/vscode/src/vs/base/common/map.js +20 -14
- package/vscode/src/vs/base/common/marshalling.js +5 -4
- package/vscode/src/vs/base/common/marshallingIds.js +22 -0
- package/vscode/src/vs/base/common/naturalLanguage/korean.js +213 -129
- package/vscode/src/vs/base/common/network.js +3 -2
- package/vscode/src/vs/base/common/objects.js +8 -1
- package/vscode/src/vs/base/common/observableInternal/autorun.js +19 -13
- package/vscode/src/vs/base/common/observableInternal/base.js +1 -1
- package/vscode/src/vs/base/common/observableInternal/derived.js +35 -19
- package/vscode/src/vs/base/common/observableInternal/utils.js +9 -1
- package/vscode/src/vs/base/common/platform.js +26 -10
- package/vscode/src/vs/base/common/prefixTree.js +3 -0
- package/vscode/src/vs/base/common/processes.js +32 -0
- package/vscode/src/vs/base/common/resources.js +4 -3
- package/vscode/src/vs/base/common/scrollable.js +7 -1
- package/vscode/src/vs/base/common/strings.d.ts +9 -0
- package/vscode/src/vs/base/common/strings.js +94 -47
- package/vscode/src/vs/base/common/ternarySearchTree.js +54 -39
- package/vscode/src/vs/base/common/uint.js +14 -5
- package/vscode/src/vs/base/common/uri.js +41 -39
- package/vscode/src/vs/base/common/uriIpc.js +2 -1
- package/vscode/src/vs/base/common/worker/simpleWorker.js +20 -12
- package/vscode/src/vs/base/parts/ipc/common/ipc.js +77 -55
- package/vscode/src/vs/base/parts/ipc/common/ipc.net.js +108 -51
- package/vscode/src/vs/base/parts/storage/common/storage.js +3 -1
- package/vscode/src/vs/editor/browser/config/charWidthReader.js +10 -4
- package/vscode/src/vs/editor/browser/config/editorConfiguration.js +4 -3
- package/vscode/src/vs/editor/browser/config/fontMeasurements.js +21 -21
- package/vscode/src/vs/editor/browser/controller/mouseHandler.js +28 -25
- package/vscode/src/vs/editor/browser/controller/mouseTarget.js +68 -50
- package/vscode/src/vs/editor/browser/controller/pointerHandler.js +5 -3
- package/vscode/src/vs/editor/browser/controller/textAreaHandler.js +49 -44
- package/vscode/src/vs/editor/browser/controller/textAreaInput.js +8 -6
- package/vscode/src/vs/editor/browser/controller/textAreaState.js +8 -7
- package/vscode/src/vs/editor/browser/coreCommands.js +215 -198
- package/vscode/src/vs/editor/browser/editorBrowser.js +30 -1
- package/vscode/src/vs/editor/browser/editorExtensions.js +19 -10
- package/vscode/src/vs/editor/browser/services/abstractCodeEditorService.js +28 -18
- package/vscode/src/vs/editor/browser/services/editorWorkerService.js +2 -1
- package/vscode/src/vs/editor/browser/services/hoverService/hoverService.js +26 -10
- package/vscode/src/vs/editor/browser/services/hoverService/hoverWidget.js +70 -62
- package/vscode/src/vs/editor/browser/services/hoverService/updatableHoverWidget.js +5 -3
- package/vscode/src/vs/editor/browser/services/markerDecorations.js +2 -2
- package/vscode/src/vs/editor/browser/stableEditorScroll.js +4 -3
- package/vscode/src/vs/editor/browser/view/domLineBreaksComputer.js +27 -21
- package/vscode/src/vs/editor/browser/view/viewController.js +5 -4
- package/vscode/src/vs/editor/browser/view/viewLayer.js +2 -1
- package/vscode/src/vs/editor/browser/view/viewOverlays.js +9 -8
- package/vscode/src/vs/editor/browser/view/viewPart.js +15 -2
- package/vscode/src/vs/editor/browser/view/viewUserInputEvents.js +2 -1
- package/vscode/src/vs/editor/browser/view.js +9 -8
- package/vscode/src/vs/editor/browser/viewParts/blockDecorations/blockDecorations.js +2 -1
- package/vscode/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.js +47 -20
- package/vscode/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.js +7 -6
- package/vscode/src/vs/editor/browser/viewParts/decorations/decorations.js +3 -2
- package/vscode/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.js +19 -17
- package/vscode/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.js +16 -10
- package/vscode/src/vs/editor/browser/viewParts/indentGuides/indentGuides.js +7 -6
- package/vscode/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.js +9 -8
- package/vscode/src/vs/editor/browser/viewParts/lines/rangeUtil.js +4 -3
- package/vscode/src/vs/editor/browser/viewParts/lines/viewLine.js +29 -24
- package/vscode/src/vs/editor/browser/viewParts/lines/viewLines.js +35 -31
- package/vscode/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.js +3 -2
- package/vscode/src/vs/editor/browser/viewParts/margin/margin.js +5 -4
- package/vscode/src/vs/editor/browser/viewParts/minimap/minimap.js +39 -29
- package/vscode/src/vs/editor/browser/viewParts/minimap/minimapCharRenderer.js +9 -9
- package/vscode/src/vs/editor/browser/viewParts/minimap/minimapCharRendererFactory.js +22 -22
- package/vscode/src/vs/editor/browser/viewParts/minimap/minimapCharSheet.js +20 -7
- package/vscode/src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.js +41 -20
- package/vscode/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.js +37 -19
- package/vscode/src/vs/editor/browser/viewParts/overviewRuler/overviewRuler.js +7 -6
- package/vscode/src/vs/editor/browser/viewParts/rulers/rulers.js +5 -4
- package/vscode/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.js +4 -3
- package/vscode/src/vs/editor/browser/viewParts/selections/selections.js +33 -26
- package/vscode/src/vs/editor/browser/viewParts/viewCursors/viewCursor.js +9 -9
- package/vscode/src/vs/editor/browser/viewParts/viewCursors/viewCursors.js +22 -21
- package/vscode/src/vs/editor/browser/viewParts/viewZones/viewZones.js +6 -5
- package/vscode/src/vs/editor/browser/viewParts/whitespace/whitespace.js +18 -16
- package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorContributions.js +12 -11
- package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.js +195 -149
- package/vscode/src/vs/editor/browser/widget/diffEditor/commands.js +7 -5
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer.js +24 -23
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorSash.js +47 -35
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.js +15 -12
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin.js +9 -6
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js +10 -10
- package/vscode/src/vs/editor/browser/widget/diffEditor/delegatingEditorImpl.js +19 -18
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorOptions.js +7 -6
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorViewModel.js +9 -3
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.js +26 -9
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffProviderFactoryService.js +2 -2
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/gutterFeature.js +29 -12
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.js +13 -10
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/overviewRulerFeature.js +2 -1
- package/vscode/src/vs/editor/browser/widget/diffEditor/style.css.js +1 -1
- package/vscode/src/vs/editor/browser/widget/diffEditor/utils.js +4 -7
- package/vscode/src/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer.js +2 -1
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js +49 -39
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/style.css.js +1 -1
- package/vscode/src/vs/editor/common/commands/replaceCommand.js +2 -2
- package/vscode/src/vs/editor/common/commands/shiftCommand.js +6 -5
- package/vscode/src/vs/editor/common/commands/trimTrailingWhitespaceCommand.js +2 -1
- package/vscode/src/vs/editor/common/config/editorConfigurationSchema.js +2 -2
- package/vscode/src/vs/editor/common/config/editorOptions.d.ts +4 -0
- package/vscode/src/vs/editor/common/config/editorOptions.js +719 -559
- package/vscode/src/vs/editor/common/config/fontInfo.js +8 -8
- package/vscode/src/vs/editor/common/core/characterClassifier.js +8 -3
- package/vscode/src/vs/editor/common/core/cursorColumns.js +3 -2
- package/vscode/src/vs/editor/common/core/eolCounter.js +16 -8
- package/vscode/src/vs/editor/common/core/lineRange.d.ts +0 -9
- package/vscode/src/vs/editor/common/core/lineRange.js +0 -28
- package/vscode/src/vs/editor/common/core/selection.js +12 -7
- package/vscode/src/vs/editor/common/core/wordCharacterClassifier.js +12 -5
- package/vscode/src/vs/editor/common/cursor/cursor.js +34 -31
- package/vscode/src/vs/editor/common/cursor/cursorAtomicMoveOperations.js +17 -10
- package/vscode/src/vs/editor/common/cursor/cursorColumnSelection.js +3 -3
- package/vscode/src/vs/editor/common/cursor/cursorDeleteOperations.js +4 -4
- package/vscode/src/vs/editor/common/cursor/cursorMoveCommands.js +52 -50
- package/vscode/src/vs/editor/common/cursor/cursorMoveOperations.js +14 -12
- package/vscode/src/vs/editor/common/cursor/cursorTypeOperations.js +35 -33
- package/vscode/src/vs/editor/common/cursor/cursorWordOperations.js +79 -65
- package/vscode/src/vs/editor/common/cursor/oneCursor.js +7 -6
- package/vscode/src/vs/editor/common/cursorCommon.js +54 -38
- package/vscode/src/vs/editor/common/cursorEvents.js +11 -0
- package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.js +1 -1
- package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/lineSequence.js +2 -1
- package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence.js +43 -30
- package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/utils.js +2 -1
- package/vscode/src/vs/editor/common/diff/legacyLinesDiffComputer.js +5 -4
- package/vscode/src/vs/editor/common/editorCommon.js +16 -1
- package/vscode/src/vs/editor/common/encodedTokenAttributes.js +71 -19
- package/vscode/src/vs/editor/common/languages/autoIndent.js +83 -89
- package/vscode/src/vs/editor/common/languages/enterAction.js +10 -20
- package/vscode/src/vs/editor/common/languages/languageConfiguration.js +9 -7
- package/vscode/src/vs/editor/common/languages/languageConfigurationRegistry.js +3 -10
- package/vscode/src/vs/editor/common/languages/linkComputer.js +94 -69
- package/vscode/src/vs/editor/common/languages/nullTokenize.js +6 -5
- package/vscode/src/vs/editor/common/languages/supports/indentRules.js +12 -5
- package/vscode/src/vs/editor/common/languages/supports/indentationLineProcessor.js +150 -0
- package/vscode/src/vs/editor/common/languages/supports/languageBracketsConfiguration.d.ts +2 -0
- package/vscode/src/vs/editor/common/languages/supports/languageBracketsConfiguration.js +5 -0
- package/vscode/src/vs/editor/common/languages/supports/onEnter.js +4 -3
- package/vscode/src/vs/editor/common/languages/supports/richEditBrackets.js +3 -3
- package/vscode/src/vs/editor/common/languages/supports/tokenization.js +25 -24
- package/vscode/src/vs/editor/common/languages/supports.d.ts +5 -1
- package/vscode/src/vs/editor/common/languages/supports.js +13 -1
- package/vscode/src/vs/editor/common/languages/textToHtmlTokenizer.js +14 -12
- package/vscode/src/vs/editor/common/languages.d.ts +6 -15
- package/vscode/src/vs/editor/common/languages.js +204 -113
- package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/ast.js +18 -10
- package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/bracketPairsTree.js +18 -16
- package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/brackets.js +4 -4
- package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/concat23Trees.js +3 -3
- package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/parser.js +8 -7
- package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer.js +15 -33
- package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/fixBrackets.js +5 -4
- package/vscode/src/vs/editor/common/model/editStack.js +6 -4
- package/vscode/src/vs/editor/common/model/indentationGuesser.js +7 -6
- package/vscode/src/vs/editor/common/model/intervalTree.js +119 -71
- package/vscode/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.js +17 -16
- package/vscode/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.js +11 -11
- package/vscode/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.js +5 -3
- package/vscode/src/vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase.js +46 -41
- package/vscode/src/vs/editor/common/model/textModel.js +35 -26
- package/vscode/src/vs/editor/common/model/textModelSearch.js +15 -14
- package/vscode/src/vs/editor/common/model/textModelTokens.js +8 -3
- package/vscode/src/vs/editor/common/model/tokenizationTextModelPart.js +8 -5
- package/vscode/src/vs/editor/common/model/utils.js +3 -2
- package/vscode/src/vs/editor/common/model.js +46 -1
- package/vscode/src/vs/editor/common/modelLineProjectionData.js +10 -10
- package/vscode/src/vs/editor/common/services/editorBaseApi.js +5 -5
- package/vscode/src/vs/editor/common/services/findSectionHeaders.js +1 -1
- package/vscode/src/vs/editor/common/services/getIconClasses.js +6 -1
- package/vscode/src/vs/editor/common/services/languageFeatureDebounce.js +2 -2
- package/vscode/src/vs/editor/common/services/languageFeaturesService.js +2 -2
- package/vscode/src/vs/editor/common/services/languagesRegistry.js +4 -3
- package/vscode/src/vs/editor/common/services/markerDecorationsService.js +19 -18
- package/vscode/src/vs/editor/common/services/modelService.js +9 -8
- package/vscode/src/vs/editor/common/services/semanticTokensDto.js +8 -3
- package/vscode/src/vs/editor/common/services/semanticTokensProviderStyling.js +27 -16
- package/vscode/src/vs/editor/common/services/semanticTokensStylingService.js +2 -2
- package/vscode/src/vs/editor/common/services/treeViewsDndService.js +2 -2
- package/vscode/src/vs/editor/common/services/unicodeTextModelHighlighter.js +31 -18
- package/vscode/src/vs/editor/common/standaloneStrings.js +18 -39
- package/vscode/src/vs/editor/common/textModelEvents.js +14 -6
- package/vscode/src/vs/editor/common/tokenizationRegistry.js +3 -2
- package/vscode/src/vs/editor/common/tokenizationTextModelPart.js +6 -0
- package/vscode/src/vs/editor/common/tokens/contiguousTokensStore.js +7 -7
- package/vscode/src/vs/editor/common/tokens/lineTokens.d.ts +12 -1
- package/vscode/src/vs/editor/common/tokens/lineTokens.js +64 -8
- package/vscode/src/vs/editor/common/tokens/sparseMultilineTokens.js +5 -4
- package/vscode/src/vs/editor/common/tokens/sparseTokensStore.js +7 -6
- package/vscode/src/vs/editor/common/viewEventHandler.js +19 -18
- package/vscode/src/vs/editor/common/viewEvents.js +50 -19
- package/vscode/src/vs/editor/common/viewLayout/lineDecorations.js +9 -6
- package/vscode/src/vs/editor/common/viewLayout/linePart.js +12 -3
- package/vscode/src/vs/editor/common/viewLayout/viewLayout.js +25 -23
- package/vscode/src/vs/editor/common/viewLayout/viewLineRenderer.js +97 -72
- package/vscode/src/vs/editor/common/viewModel/minimapTokensColorTracker.js +3 -2
- package/vscode/src/vs/editor/common/viewModel/modelLineProjection.js +2 -1
- package/vscode/src/vs/editor/common/viewModel/monospaceLineBreaksComputer.js +30 -19
- package/vscode/src/vs/editor/common/viewModel/overviewZoneManager.js +5 -1
- package/vscode/src/vs/editor/common/viewModel/viewModelDecorations.js +11 -9
- package/vscode/src/vs/editor/common/viewModel/viewModelImpl.js +42 -38
- package/vscode/src/vs/editor/common/viewModel/viewModelLines.js +15 -8
- package/vscode/src/vs/editor/common/viewModel.js +9 -2
- package/vscode/src/vs/editor/common/viewModelEventDispatcher.js +30 -14
- package/vscode/src/vs/editor/contrib/anchorSelect/browser/anchorSelect.js +12 -10
- package/vscode/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.js +15 -12
- package/vscode/src/vs/editor/contrib/caretOperations/browser/transpose.js +4 -2
- package/vscode/src/vs/editor/contrib/clipboard/browser/clipboard.js +19 -16
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeAction.js +3 -2
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionCommands.js +21 -19
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionContributions.js +6 -6
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionController.js +14 -11
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionKeybindingResolver.js +2 -2
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionMenu.js +4 -3
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionModel.js +19 -17
- package/vscode/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.js +21 -12
- package/vscode/src/vs/editor/contrib/codeAction/common/types.js +10 -4
- package/vscode/src/vs/editor/contrib/codelens/browser/codeLensCache.js +6 -6
- package/vscode/src/vs/editor/contrib/codelens/browser/codelensController.js +14 -13
- package/vscode/src/vs/editor/contrib/codelens/browser/codelensWidget.js +4 -2
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorContributions.js +8 -5
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorDetector.js +9 -8
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorHoverParticipant.js +7 -4
- package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerActions.js +6 -4
- package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPickerWidget.js +8 -5
- package/vscode/src/vs/editor/contrib/comment/browser/blockCommentCommand.js +5 -4
- package/vscode/src/vs/editor/contrib/comment/browser/comment.js +18 -16
- package/vscode/src/vs/editor/contrib/comment/browser/lineCommentCommand.js +20 -12
- package/vscode/src/vs/editor/contrib/contextmenu/browser/contextmenu.js +23 -18
- package/vscode/src/vs/editor/contrib/cursorUndo/browser/cursorUndo.js +6 -4
- package/vscode/src/vs/editor/contrib/dnd/browser/dnd.js +17 -12
- package/vscode/src/vs/editor/contrib/documentSymbols/browser/outlineModel.js +2 -2
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteContribution.js +8 -6
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.js +12 -9
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorContribution.js +10 -8
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js +4 -3
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.js +76 -34
- package/vscode/src/vs/editor/contrib/editorState/browser/editorState.js +16 -9
- package/vscode/src/vs/editor/contrib/editorState/browser/keybindingCancellation.js +6 -4
- package/vscode/src/vs/editor/contrib/find/browser/findController.js +95 -85
- package/vscode/src/vs/editor/contrib/find/browser/findDecorations.js +10 -8
- package/vscode/src/vs/editor/contrib/find/browser/findModel.js +31 -25
- package/vscode/src/vs/editor/contrib/find/browser/findOptionsWidget.js +2 -1
- package/vscode/src/vs/editor/contrib/find/browser/findState.js +17 -11
- package/vscode/src/vs/editor/contrib/find/browser/findWidget.js +58 -49
- package/vscode/src/vs/editor/contrib/find/browser/replacePattern.js +25 -19
- package/vscode/src/vs/editor/contrib/folding/browser/folding.js +68 -64
- package/vscode/src/vs/editor/contrib/folding/browser/foldingDecorations.js +14 -13
- package/vscode/src/vs/editor/contrib/folding/browser/foldingModel.js +6 -6
- package/vscode/src/vs/editor/contrib/folding/browser/foldingRanges.js +20 -14
- package/vscode/src/vs/editor/contrib/format/browser/format.js +31 -10
- package/vscode/src/vs/editor/contrib/format/browser/formatActions.js +18 -16
- package/vscode/src/vs/editor/contrib/gotoError/browser/gotoError.js +17 -14
- package/vscode/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.js +8 -5
- package/vscode/src/vs/editor/contrib/gotoError/browser/markerNavigationService.js +2 -2
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.js +39 -38
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToSymbol.js +13 -3
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/link/clickLinkGesture.js +9 -7
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.js +9 -7
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.js +31 -28
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.js +8 -4
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/referencesModel.js +2 -6
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/symbolNavigation.js +10 -8
- package/vscode/src/vs/editor/contrib/hover/browser/contentHoverComputer.js +4 -2
- package/vscode/src/vs/editor/contrib/hover/browser/contentHoverController.js +31 -12
- package/vscode/src/vs/editor/contrib/hover/browser/contentHoverWidget.js +14 -10
- package/vscode/src/vs/editor/contrib/hover/browser/hover.css.js +1 -1
- package/vscode/src/vs/editor/contrib/hover/browser/hoverAccessibleViews.js +247 -0
- package/vscode/src/vs/editor/contrib/hover/browser/hoverActionIds.js +7 -1
- package/vscode/src/vs/editor/contrib/hover/browser/hoverActions.js +38 -34
- package/vscode/src/vs/editor/contrib/hover/browser/hoverContribution.js +7 -2
- package/vscode/src/vs/editor/contrib/hover/browser/hoverController.js +46 -17
- package/vscode/src/vs/editor/contrib/hover/browser/hoverOperation.js +37 -18
- package/vscode/src/vs/editor/contrib/hover/browser/hoverTypes.js +12 -7
- package/vscode/src/vs/editor/contrib/hover/browser/marginHoverWidget.js +9 -7
- package/vscode/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.js +100 -60
- package/vscode/src/vs/editor/contrib/hover/browser/markerHoverParticipant.js +7 -4
- package/vscode/src/vs/editor/contrib/hover/browser/resizableContentWidget.js +6 -4
- package/vscode/src/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace.js +10 -11
- package/vscode/src/vs/editor/contrib/indentation/browser/indentation.js +20 -6
- package/vscode/src/vs/editor/contrib/indentation/common/indentation.js +25 -20
- package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsContribution.js +2 -2
- package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.js +26 -20
- package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.js +4 -2
- package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsLocations.js +3 -2
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/commands.js +9 -7
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/ghostText.js +0 -1
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/ghostTextWidget.js +19 -18
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hoverParticipant.js +9 -7
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.js +5 -2
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.js +55 -0
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsController.js +10 -8
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsHintsWidget.js +26 -14
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsModel.js +8 -5
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsSource.js +2 -1
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/singleTextEdit.js +2 -1
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/suggestWidgetInlineCompletionProvider.js +2 -2
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/commands.js +12 -10
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/ghostTextWidget.js +3 -2
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/hoverParticipant.js +8 -6
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEdit.contribution.js +2 -2
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEditController.js +5 -4
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEditHintsWidget.js +6 -3
- package/vscode/src/vs/editor/contrib/inlineProgress/browser/inlineProgress.js +7 -4
- package/vscode/src/vs/editor/contrib/lineSelection/browser/lineSelection.js +6 -3
- package/vscode/src/vs/editor/contrib/linesOperations/browser/copyLinesCommand.js +2 -2
- package/vscode/src/vs/editor/contrib/linesOperations/browser/linesOperations.js +35 -33
- package/vscode/src/vs/editor/contrib/linesOperations/browser/moveLinesCommand.js +4 -2
- package/vscode/src/vs/editor/contrib/linkedEditing/browser/linkedEditing.js +14 -10
- package/vscode/src/vs/editor/contrib/links/browser/links.js +13 -10
- package/vscode/src/vs/editor/contrib/longLinesHelper/browser/longLinesHelper.js +6 -4
- package/vscode/src/vs/editor/contrib/message/browser/messageController.js +14 -9
- package/vscode/src/vs/editor/contrib/multicursor/browser/multicursor.js +53 -51
- package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHints.js +15 -13
- package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHintsModel.js +18 -16
- package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.js +19 -6
- package/vscode/src/vs/editor/contrib/peekView/browser/peekView.js +8 -7
- package/vscode/src/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess.js +8 -6
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.js +5 -3
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js +38 -34
- package/vscode/src/vs/editor/contrib/readOnlyMessage/browser/contribution.js +4 -3
- package/vscode/src/vs/editor/contrib/rename/browser/rename.js +22 -20
- package/vscode/src/vs/editor/contrib/rename/browser/renameWidget.js +15 -11
- package/vscode/src/vs/editor/contrib/sectionHeaders/browser/sectionHeaders.js +15 -12
- package/vscode/src/vs/editor/contrib/semanticTokens/browser/viewportSemanticTokens.js +2 -2
- package/vscode/src/vs/editor/contrib/smartSelect/browser/smartSelect.js +14 -11
- package/vscode/src/vs/editor/contrib/smartSelect/browser/wordSelections.js +3 -2
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetController2.js +13 -10
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetParser.js +100 -81
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetSession.js +10 -7
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScroll.css.js +1 -1
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.js +7 -5
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollContribution.js +2 -2
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.js +19 -16
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollModelProvider.js +2 -1
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollProvider.js +3 -2
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.js +14 -11
- package/vscode/src/vs/editor/contrib/suggest/browser/completionModel.js +18 -10
- package/vscode/src/vs/editor/contrib/suggest/browser/suggest.js +24 -16
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestCommitCharacters.js +4 -2
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestController.js +83 -69
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.js +6 -4
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestMemory.js +6 -6
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestModel.js +66 -57
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidget.js +71 -59
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.js +6 -5
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.js +10 -9
- package/vscode/src/vs/editor/contrib/suggest/browser/wordContextKey.js +3 -2
- package/vscode/src/vs/editor/contrib/suggest/browser/wordDistance.js +4 -2
- package/vscode/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.js +6 -4
- package/vscode/src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.js +28 -25
- package/vscode/src/vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators.js +7 -6
- package/vscode/src/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.js +10 -10
- package/vscode/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.js +16 -12
- package/vscode/src/vs/editor/contrib/wordOperations/browser/wordOperations.js +54 -50
- package/vscode/src/vs/editor/contrib/wordPartOperations/browser/wordPartOperations.js +21 -19
- package/vscode/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.js +12 -9
- package/vscode/src/vs/editor/editor.api.d.ts +47 -4
- package/vscode/src/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.js +6 -4
- package/vscode/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.js +5 -3
- package/vscode/src/vs/editor/standalone/browser/standaloneCodeEditorService.js +5 -4
- package/vscode/src/vs/editor/standalone/browser/standaloneLayoutService.js +2 -2
- package/vscode/src/vs/editor/standalone/browser/standaloneServices.js +50 -43
- package/vscode/src/vs/editor/standalone/browser/standaloneThemeService.js +5 -5
- package/vscode/src/vs/platform/accessibility/browser/accessibilityService.js +3 -3
- package/vscode/src/vs/platform/accessibility/browser/accessibleView.js +58 -0
- package/vscode/src/vs/{workbench/contrib → platform}/accessibility/browser/accessibleView.service.js +1 -1
- package/vscode/src/vs/platform/accessibility/browser/accessibleViewRegistry.js +35 -0
- package/vscode/src/vs/platform/accessibility/common/accessibility.js +7 -1
- package/vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.d.ts +3 -0
- package/vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.js +61 -51
- package/vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.service.d.ts +1 -0
- package/vscode/src/vs/platform/action/common/action.d.ts +4 -0
- package/vscode/src/vs/platform/actionWidget/browser/actionList.js +13 -8
- package/vscode/src/vs/platform/actionWidget/browser/actionWidget.js +16 -14
- package/vscode/src/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem.js +3 -2
- package/vscode/src/vs/platform/actions/browser/menuEntryActionViewItem.js +6 -4
- package/vscode/src/vs/platform/actions/browser/toolbar.js +10 -4
- package/vscode/src/vs/platform/actions/common/actions.contribution.js +1 -0
- package/vscode/src/vs/platform/actions/common/actions.d.ts +3 -0
- package/vscode/src/vs/platform/actions/common/actions.js +14 -10
- package/vscode/src/vs/platform/actions/common/menuService.js +9 -8
- package/vscode/src/vs/platform/clipboard/browser/clipboardService.js +5 -5
- package/vscode/src/vs/platform/configuration/common/configuration.js +20 -9
- package/vscode/src/vs/platform/configuration/common/configurationModels.js +4 -3
- package/vscode/src/vs/platform/configuration/common/configurationRegistry.js +15 -15
- package/vscode/src/vs/platform/contextkey/browser/contextKeyService.js +4 -2
- package/vscode/src/vs/platform/contextkey/common/contextkey.js +98 -78
- package/vscode/src/vs/platform/contextkey/common/scanner.js +94 -69
- package/vscode/src/vs/platform/contextview/browser/contextMenuHandler.js +2 -2
- package/vscode/src/vs/platform/contextview/browser/contextViewService.js +6 -6
- package/vscode/src/vs/platform/diagnostics/common/diagnostics.js +4 -1
- package/vscode/src/vs/platform/editor/common/editor.js +14 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionEnablementService.js +9 -8
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.d.ts +1 -0
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.js +106 -61
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagementUtil.js +5 -3
- package/vscode/src/vs/platform/extensionManagement/common/extensionStorage.js +13 -12
- package/vscode/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.js +16 -9
- package/vscode/src/vs/platform/extensionManagement/common/extensionsScannerService.js +26 -26
- package/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.js +6 -4
- package/vscode/src/vs/platform/extensions/common/extensions.js +22 -1
- package/vscode/src/vs/platform/externalServices/common/serviceMachineId.js +3 -2
- package/vscode/src/vs/platform/files/browser/htmlFileSystemProvider.js +4 -4
- package/vscode/src/vs/platform/files/common/files.js +53 -25
- package/vscode/src/vs/platform/files/common/inMemoryFilesystemProvider.js +10 -10
- package/vscode/src/vs/platform/files/common/watcher.js +26 -10
- package/vscode/src/vs/platform/history/browser/contextScopedHistoryWidget.js +8 -7
- package/vscode/src/vs/platform/hover/browser/hover.js +5 -4
- package/vscode/src/vs/platform/instantiation/common/extensions.js +6 -1
- package/vscode/src/vs/platform/instantiation/common/instantiation.d.ts +5 -1
- package/vscode/src/vs/platform/instantiation/common/instantiationService.js +16 -7
- package/vscode/src/vs/platform/issue/common/issue.service.js +3 -0
- package/vscode/src/vs/platform/keybinding/common/abstractKeybindingService.js +7 -6
- package/vscode/src/vs/platform/keybinding/common/keybindingResolver.js +15 -9
- package/vscode/src/vs/platform/keybinding/common/keybindingsRegistry.d.ts +3 -0
- package/vscode/src/vs/platform/keybinding/common/keybindingsRegistry.js +12 -4
- package/vscode/src/vs/platform/keybinding/common/resolvedKeybindingItem.js +2 -1
- package/vscode/src/vs/platform/keybinding/common/usLayoutResolvedKeybinding.js +64 -63
- package/vscode/src/vs/platform/label/common/label.js +7 -0
- package/vscode/src/vs/platform/languagePacks/common/localizedStrings.js +11 -0
- package/vscode/src/vs/platform/list/browser/listService.js +3 -2
- package/vscode/src/vs/platform/markers/common/markerService.js +1 -0
- package/vscode/src/vs/platform/markers/common/markers.js +6 -1
- package/vscode/src/vs/platform/observable/common/platformObservableUtils.js +19 -0
- package/vscode/src/vs/platform/opener/browser/link.js +2 -1
- package/vscode/src/vs/platform/product/common/product.js +1 -1
- package/vscode/src/vs/platform/progress/common/progress.js +10 -47
- package/vscode/src/vs/platform/quickinput/browser/pickerQuickAccess.js +7 -0
- package/vscode/src/vs/platform/quickinput/browser/quickAccess.js +9 -8
- package/vscode/src/vs/platform/quickinput/browser/quickInput.js +81 -113
- package/vscode/src/vs/platform/quickinput/browser/quickInputActions.js +145 -0
- package/vscode/src/vs/platform/quickinput/browser/quickInputBox.js +3 -2
- package/vscode/src/vs/platform/quickinput/browser/quickInputController.js +39 -13
- package/vscode/src/vs/platform/quickinput/browser/quickInputService.js +1 -0
- package/vscode/src/vs/platform/quickinput/browser/quickInputTree.js +63 -85
- package/vscode/src/vs/platform/quickinput/browser/quickInputUtils.js +2 -1
- package/vscode/src/vs/platform/quickinput/browser/quickPickPin.js +3 -2
- package/vscode/src/vs/platform/quickinput/common/quickAccess.d.ts +16 -0
- package/vscode/src/vs/platform/quickinput/common/quickInput.d.ts +76 -1
- package/vscode/src/vs/platform/quickinput/common/quickInput.js +19 -1
- package/vscode/src/vs/platform/quickinput/common/quickInput.service.d.ts +5 -1
- package/vscode/src/vs/platform/remote/common/remoteAgentConnection.js +29 -15
- package/vscode/src/vs/platform/remote/common/remoteAuthorityResolver.js +8 -3
- package/vscode/src/vs/platform/request/common/request.js +2 -2
- package/vscode/src/vs/platform/storage/common/storage.js +22 -22
- package/vscode/src/vs/platform/telemetry/common/telemetry.js +15 -1
- package/vscode/src/vs/platform/telemetry/common/telemetry.service.d.ts +1 -0
- package/vscode/src/vs/platform/telemetry/common/telemetryUtils.js +12 -12
- package/vscode/src/vs/platform/terminal/common/capabilities/capabilities.d.ts +1 -0
- package/vscode/src/vs/platform/terminal/common/capabilities/capabilities.js +14 -0
- package/vscode/src/vs/platform/terminal/common/terminal.js +151 -1
- package/vscode/src/vs/platform/theme/common/colorUtils.js +25 -15
- package/vscode/src/vs/platform/theme/common/colors/baseColors.js +1 -1
- package/vscode/src/vs/platform/theme/common/colors/editorColors.js +66 -64
- package/vscode/src/vs/platform/tunnel/common/tunnel.js +3 -1
- package/vscode/src/vs/platform/undoRedo/common/undoRedo.js +6 -1
- package/vscode/src/vs/platform/undoRedo/common/undoRedoService.js +29 -24
- package/vscode/src/vs/platform/update/common/update.js +37 -10
- package/vscode/src/vs/platform/uriIdentity/common/uriIdentityService.js +3 -1
- package/vscode/src/vs/platform/userDataProfile/common/userDataProfile.js +12 -3
- package/vscode/src/vs/platform/userDataProfile/common/userDataProfileStorageService.service.js +3 -0
- package/vscode/src/vs/platform/userDataSync/common/abstractSynchronizer.js +56 -58
- package/vscode/src/vs/platform/userDataSync/common/userDataSync.js +75 -8
- package/vscode/src/vs/platform/userDataSync/common/userDataSyncMachines.js +6 -5
- package/vscode/src/vs/platform/userDataSync/common/userDataSyncStoreService.js +49 -48
- package/vscode/src/vs/platform/window/common/window.js +24 -7
- package/vscode/src/vs/platform/workspace/common/workspace.js +7 -1
- package/vscode/src/vs/platform/workspace/common/workspaceTrust.js +7 -0
- package/vscode/src/vs/workbench/api/browser/statusBarService.js +12 -6
- package/vscode/src/vs/workbench/api/common/extHost.api.impl.js +59 -40
- package/vscode/src/vs/workbench/api/common/extHost.common.services.js +27 -27
- package/vscode/src/vs/workbench/api/common/extHost.protocol.js +68 -3
- package/vscode/src/vs/workbench/api/common/extHostApiCommands.js +19 -0
- package/vscode/src/vs/workbench/api/common/extHostAuthentication.js +6 -6
- package/vscode/src/vs/workbench/api/common/extHostChatAgents2.js +115 -45
- package/vscode/src/vs/workbench/api/common/extHostChatVariables.js +14 -9
- package/vscode/src/vs/workbench/api/common/extHostComments.js +14 -12
- package/vscode/src/vs/workbench/api/common/extHostConfiguration.js +10 -9
- package/vscode/src/vs/workbench/api/common/extHostCustomEditors.js +13 -8
- package/vscode/src/vs/workbench/api/common/extHostDebugService.js +5 -3
- package/vscode/src/vs/workbench/api/common/extHostEditorTabs.js +19 -19
- package/vscode/src/vs/workbench/api/common/extHostEmbedding.js +64 -0
- package/vscode/src/vs/workbench/api/common/extHostExtensionService.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostFileSystem.js +17 -15
- package/vscode/src/vs/workbench/api/common/extHostFileSystemConsumer.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostFileSystemEventService.js +13 -12
- package/vscode/src/vs/workbench/api/common/extHostFileSystemInfo.js +2 -1
- package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js +79 -76
- package/vscode/src/vs/workbench/api/common/extHostLanguageModels.js +121 -87
- package/vscode/src/vs/workbench/api/common/extHostNotebook.js +24 -8
- package/vscode/src/vs/workbench/api/common/extHostNotebookKernels.js +1 -0
- package/vscode/src/vs/workbench/api/common/extHostSCM.js +34 -28
- package/vscode/src/vs/workbench/api/common/extHostSpeech.js +38 -2
- package/vscode/src/vs/workbench/api/common/extHostTask.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostTelemetry.js +7 -5
- package/vscode/src/vs/workbench/api/common/extHostTerminalService.js +8 -6
- package/vscode/src/vs/workbench/api/common/extHostTestItem.js +7 -7
- package/vscode/src/vs/workbench/api/common/extHostTesting.js +140 -45
- package/vscode/src/vs/workbench/api/common/extHostTimeline.js +2 -1
- package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js +259 -278
- package/vscode/src/vs/workbench/api/common/extHostTypes.js +83 -22
- package/vscode/src/vs/workbench/api/common/extHostWebviewMessaging.js +23 -22
- package/vscode/src/vs/workbench/api/common/extHostWorkspace.js +2 -1
- package/vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js +2 -2
- package/vscode/src/vs/workbench/api/worker/extHost.worker.services.js +3 -3
- package/vscode/src/vs/workbench/api/worker/extensionHostWorker.js +4 -4
- package/vscode/src/vs/workbench/browser/actions/developerActions.js +13 -10
- package/vscode/src/vs/workbench/browser/actions/layoutActions.js +95 -100
- package/vscode/src/vs/workbench/browser/actions/textInputActions.js +7 -6
- package/vscode/src/vs/workbench/browser/actions/widgetNavigationCommands.js +8 -7
- package/vscode/src/vs/workbench/browser/actions/windowActions.js +24 -23
- package/vscode/src/vs/workbench/browser/actions/workspaceActions.js +17 -16
- package/vscode/src/vs/workbench/browser/codeeditor.js +12 -9
- package/vscode/src/vs/workbench/browser/labels.js +3 -0
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.js +11 -8
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbs.js +29 -28
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsControl.js +34 -33
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsModel.js +4 -2
- package/vscode/src/vs/workbench/browser/parts/editor/diffEditorCommands.js +37 -33
- package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution._autosave.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/editor/editor.js +2 -0
- package/vscode/src/vs/workbench/browser/parts/editor/editorActions.js +224 -219
- package/vscode/src/vs/workbench/browser/parts/editor/editorAutoSave.js +30 -27
- package/vscode/src/vs/workbench/browser/parts/editor/editorCommands.js +204 -161
- package/vscode/src/vs/workbench/browser/parts/editor/editorGroupView.js +151 -80
- package/vscode/src/vs/workbench/browser/parts/editor/editorGroupWatermark.js +9 -5
- package/vscode/src/vs/workbench/browser/parts/editor/editorPane.js +4 -3
- package/vscode/src/vs/workbench/browser/parts/editor/editorPanes.js +3 -3
- package/vscode/src/vs/workbench/browser/parts/editor/editorPlaceholder.js +5 -3
- package/vscode/src/vs/workbench/browser/parts/editor/editorQuickAccess.js +7 -6
- package/vscode/src/vs/workbench/browser/parts/editor/editorStatus.js +28 -22
- package/vscode/src/vs/workbench/browser/parts/editor/editorTabsControl.js +12 -10
- package/vscode/src/vs/workbench/browser/parts/editor/editorTitleControl.js +3 -0
- package/vscode/src/vs/workbench/browser/parts/editor/editorsObserver.js +19 -17
- package/vscode/src/vs/workbench/browser/parts/editor/media/editortabscontrol.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/media/multieditortabscontrol.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.js +218 -76
- package/vscode/src/vs/workbench/browser/parts/editor/multiRowEditorTabsControl.js +4 -0
- package/vscode/src/vs/workbench/browser/parts/editor/noEditorTabsControl.js +1 -0
- package/vscode/src/vs/workbench/browser/parts/editor/sideBySideEditor.js +16 -15
- package/vscode/src/vs/workbench/browser/parts/editor/singleEditorTabsControl.js +10 -11
- package/vscode/src/vs/workbench/browser/parts/editor/textCodeEditor.js +2 -1
- package/vscode/src/vs/workbench/browser/parts/editor/textDiffEditor.js +7 -5
- package/vscode/src/vs/workbench/browser/parts/editor/textEditor.js +12 -10
- package/vscode/src/vs/workbench/browser/parts/editor/textResourceEditor.js +7 -4
- package/vscode/src/vs/workbench/browser/parts/globalCompositeBar.js +13 -9
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsAlerts.js +3 -2
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCenter.js +10 -8
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCommands.js +33 -33
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsStatus.js +8 -6
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsToasts.js +12 -8
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsViewer.js +12 -6
- package/vscode/src/vs/workbench/browser/parts/paneCompositePart.d.ts +1 -1
- package/vscode/src/vs/workbench/browser/parts/panel/panelActions.js +32 -36
- package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.d.ts +1 -1
- package/vscode/src/vs/workbench/browser/parts/titlebar/media/menubarControl.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.js +22 -16
- package/vscode/src/vs/workbench/browser/parts/titlebar/windowTitle.js +21 -14
- package/vscode/src/vs/workbench/browser/parts/views/treeView.js +8 -12
- package/vscode/src/vs/workbench/browser/parts/views/viewFilter.d.ts +2 -0
- package/vscode/src/vs/workbench/browser/parts/views/viewFilter.js +13 -6
- package/vscode/src/vs/workbench/browser/parts/views/viewPane.js +13 -9
- package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js +57 -46
- package/vscode/src/vs/workbench/browser/window.js +329 -0
- package/vscode/src/vs/workbench/browser/workbench.contribution.js +207 -199
- package/vscode/src/vs/workbench/common/configuration.js +94 -20
- package/vscode/src/vs/workbench/common/contextkeys.js +50 -40
- package/vscode/src/vs/workbench/common/contributions.js +23 -22
- package/vscode/src/vs/workbench/common/editor/diffEditorInput.js +16 -16
- package/vscode/src/vs/workbench/common/editor/editorGroupModel.js +125 -63
- package/vscode/src/vs/workbench/common/editor/editorInput.js +6 -6
- package/vscode/src/vs/workbench/common/editor/editorOptions.js +5 -4
- package/vscode/src/vs/workbench/common/editor/filteredEditorGroupModel.js +9 -6
- package/vscode/src/vs/workbench/common/editor/resourceEditorInput.js +13 -12
- package/vscode/src/vs/workbench/common/editor/sideBySideEditorInput.js +7 -7
- package/vscode/src/vs/workbench/common/editor/textEditorModel.js +3 -2
- package/vscode/src/vs/workbench/common/editor.d.ts +13 -11
- package/vscode/src/vs/workbench/common/editor.js +49 -1
- package/vscode/src/vs/workbench/common/memento.js +10 -9
- package/vscode/src/vs/workbench/common/notifications.js +32 -11
- package/vscode/src/vs/workbench/common/theme.js +167 -137
- package/vscode/src/vs/workbench/common/views.js +5 -6
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.js +477 -378
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.js +87 -49
- package/vscode/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.js +19 -29
- package/vscode/src/vs/workbench/contrib/accessibility/common/accessibilityCommands.js +15 -0
- package/vscode/src/vs/workbench/contrib/callHierarchy/common/callHierarchy.js +6 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatActions.js +74 -48
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.js +10 -8
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.js +5 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/chatAccessibilityProvider.js +3 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatAgentHover.js +50 -43
- package/vscode/src/vs/workbench/contrib/chat/browser/chatConfirmationWidget.js +47 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditorInput.js +2 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatFollowups.js +8 -21
- package/vscode/src/vs/workbench/contrib/chat/browser/chatInputPart.js +101 -47
- package/vscode/src/vs/workbench/contrib/chat/browser/chatListRenderer.js +276 -140
- package/vscode/src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.js +120 -29
- package/vscode/src/vs/workbench/contrib/chat/browser/chatMarkdownRenderer.js +65 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatWidget.js +51 -34
- package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockPart.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockPart.js +55 -34
- package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.js +20 -18
- package/vscode/src/vs/workbench/contrib/chat/browser/media/chat.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/media/chatAgentHover.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/media/chatConfirmationWidget.css.js +4 -0
- package/vscode/src/vs/workbench/contrib/chat/common/annotations.js +7 -7
- package/vscode/src/vs/workbench/contrib/chat/common/chatAgents.js +79 -23
- package/vscode/src/vs/workbench/contrib/chat/common/chatContextKeys.js +2 -1
- package/vscode/src/vs/workbench/contrib/chat/common/chatModel.js +189 -103
- package/vscode/src/vs/workbench/contrib/chat/common/chatParserTypes.js +9 -10
- package/vscode/src/vs/workbench/contrib/chat/common/chatRequestParser.js +21 -5
- package/vscode/src/vs/workbench/contrib/chat/common/chatService.js +6 -6
- package/vscode/src/vs/workbench/contrib/chat/common/chatViewModel.js +19 -12
- package/vscode/src/vs/workbench/contrib/chat/common/chatWordCounter.js +8 -15
- package/vscode/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.js +11 -2
- package/vscode/src/vs/workbench/contrib/chat/common/languageModels.js +170 -0
- package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActions.contribution.js +2 -1
- package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js +2 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.js +20 -12
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorAccessibilityHelp.js +77 -0
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js +9 -89
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/editorFeatures.js +2 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/editorLineNumberMenu.js +7 -5
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.js +4 -7
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.js +2 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/menuPreventer.js +5 -4
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.js +10 -6
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.js +15 -12
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions.js +2 -1
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.js +5 -3
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.js +2 -1
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js +17 -14
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/workbenchReferenceSearch.js +2 -2
- package/vscode/src/vs/workbench/contrib/comments/browser/commentFormActions.js +2 -1
- package/vscode/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.js +2 -1
- package/vscode/src/vs/workbench/contrib/comments/browser/commentNode.js +14 -12
- package/vscode/src/vs/workbench/contrib/comments/browser/commentReply.js +23 -15
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadAdditionalActions.js +2 -1
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadBody.js +3 -2
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadHeader.js +3 -1
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadWidget.js +12 -10
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.js +11 -14
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsAccessibility.js +49 -76
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsController.js +50 -40
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.js +15 -8
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsView.js +4 -2
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsViewActions.js +8 -6
- package/vscode/src/vs/workbench/contrib/comments/browser/simpleCommentEditor.js +9 -8
- package/vscode/src/vs/workbench/contrib/comments/common/commentCommandIds.js +15 -0
- package/vscode/src/vs/workbench/contrib/contextmenu/browser/contextmenu.contribution.js +2 -1
- package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInput.js +14 -14
- package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.js +3 -2
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.js +19 -17
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointWidget.js +33 -32
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointsView.js +25 -20
- package/vscode/src/vs/workbench/contrib/debug/browser/callStackEditorContribution.js +4 -3
- package/vscode/src/vs/workbench/contrib/debug/browser/debugCommands.js +62 -60
- package/vscode/src/vs/workbench/contrib/debug/common/debug.js +40 -4
- package/vscode/src/vs/workbench/contrib/debug/common/debug.service.d.ts +2 -2
- package/vscode/src/vs/workbench/contrib/debug/common/debugModel.d.ts +4 -1
- package/vscode/src/vs/workbench/contrib/debug/common/debugModel.js +15 -16
- package/vscode/src/vs/workbench/contrib/debug/common/debugSource.js +2 -1
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.js +118 -109
- package/vscode/src/vs/workbench/contrib/extensions/browser/media/extensionActions.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/extensions/common/extensions.js +24 -1
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsInput.js +2 -1
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsUtils.js +4 -2
- package/vscode/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.js +3 -2
- package/vscode/src/vs/workbench/contrib/files/browser/editors/fileEditorInput.js +23 -16
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditor.js +12 -9
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditorTracker.js +3 -2
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.js +14 -12
- package/vscode/src/vs/workbench/contrib/files/browser/explorerFileContrib.js +10 -2
- package/vscode/src/vs/workbench/contrib/files/browser/explorerViewlet.js +9 -7
- package/vscode/src/vs/workbench/contrib/files/browser/fileActions.js +12 -9
- package/vscode/src/vs/workbench/contrib/files/browser/fileCommands._save.js +23 -22
- package/vscode/src/vs/workbench/contrib/files/browser/fileImportExport.js +13 -11
- package/vscode/src/vs/workbench/contrib/files/browser/files.contribution._configuration.js +25 -25
- package/vscode/src/vs/workbench/contrib/files/browser/files.contribution._editorPane.js +7 -7
- package/vscode/src/vs/workbench/contrib/files/browser/files.js +8 -1
- package/vscode/src/vs/workbench/contrib/files/browser/media/explorerviewlet.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/files/browser/views/emptyView.js +2 -2
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerView.js +16 -10
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.js +55 -111
- package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js +42 -35
- package/vscode/src/vs/workbench/contrib/files/common/dirtyFilesIndicator.js +2 -1
- package/vscode/src/vs/workbench/contrib/files/common/explorerFileNestingTrie.js +15 -8
- package/vscode/src/vs/workbench/contrib/files/common/explorerModel.js +5 -3
- package/vscode/src/vs/workbench/contrib/files/common/files.js +25 -2
- package/vscode/src/vs/workbench/contrib/folding/browser/folding.contribution.js +2 -1
- package/vscode/src/vs/workbench/contrib/format/browser/formatActionsMultiple.js +8 -6
- package/vscode/src/vs/workbench/contrib/format/browser/formatActionsNone.js +7 -4
- package/vscode/src/vs/workbench/contrib/format/browser/formatModified.js +2 -2
- package/vscode/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.js +6 -4
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.js +82 -137
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatContentWidget.js +11 -8
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.js +292 -328
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.js +69 -67
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.js +79 -417
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.js +50 -61
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.js +32 -124
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.js +41 -20
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/utils.js +5 -1
- package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.js +59 -53
- package/vscode/src/vs/workbench/contrib/interactive/browser/interactiveEditorInput.js +5 -4
- package/vscode/src/vs/workbench/contrib/list/browser/list.contribution.js +2 -2
- package/vscode/src/vs/workbench/contrib/markers/common/markers.js +7 -2
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js +3 -3
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js +15 -13
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/diffComputer.js +1 -1
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/lineRange.js +3 -2
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js +26 -20
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange.js +13 -8
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.js +22 -10
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/utils.js +5 -11
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.js +4 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.js +7 -57
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/findFilters.js +25 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/findModel.js +7 -6
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.js +103 -23
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.js +6 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.js +16 -15
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.js +137 -261
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/coreActions.js +26 -8
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/editActions.js +25 -23
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/foldingController.js +23 -21
- package/vscode/src/vs/workbench/contrib/notebook/browser/media/notebook.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityProvider.js +4 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookBrowser.js +21 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditor.js +16 -11
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.js +36 -18
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookOptions.js +24 -13
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellContextKeys.js +8 -7
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDnd.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellDragRenderer.js +5 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellFocusIndicator.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellOutput.js +17 -10
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellStatusPart.js +14 -9
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars.js +3 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellWidgets.js +7 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.js +11 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar.js +2 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/foldedCellHint.js +15 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.js +7 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.js +36 -25
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/notebookCellListView.js +14 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.js +20 -10
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.js +2 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.js +2 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel.js +7 -10
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/foldingModel.js +3 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl.js +19 -9
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.js +5 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.js +5 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.js +15 -11
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookTopCellToolbar.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.js +4 -3
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookCommon.js +35 -2
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorInput.js +14 -12
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorModel.js +41 -15
- package/vscode/src/vs/workbench/contrib/outline/browser/outline.js +8 -2
- package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingWidgets.js +5 -3
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.js +29 -23
- package/vscode/src/vs/workbench/contrib/preferences/browser/settingsLayout.js +1 -1
- package/vscode/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.js +31 -24
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.js +11 -8
- package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.js +29 -27
- package/vscode/src/vs/workbench/contrib/remote/browser/urlFinder.js +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js +27 -45
- package/vscode/src/vs/workbench/contrib/scm/common/scm.js +13 -1
- package/vscode/src/vs/workbench/contrib/search/browser/anythingQuickAccess.js +785 -0
- package/vscode/src/vs/workbench/contrib/search/browser/media/anythingQuickAccess.css.js +4 -0
- package/vscode/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService.js +2 -2
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsFind.js +23 -22
- package/vscode/src/vs/workbench/contrib/search/browser/searchModel.js +36 -32
- package/vscode/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.js +222 -0
- package/vscode/src/vs/workbench/contrib/search/common/cacheState.js +85 -0
- package/vscode/src/vs/workbench/contrib/search/common/cellSearchModel.js +3 -2
- package/vscode/src/vs/workbench/contrib/search/common/constants.js +49 -1
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.js +6 -5
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsFile.js +8 -2
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsService.js +16 -13
- package/vscode/src/vs/workbench/contrib/snippets/browser/tabCompletion.js +11 -11
- package/vscode/src/vs/workbench/contrib/speech/common/speechService.js +47 -30
- package/vscode/src/vs/workbench/contrib/tags/browser/workspaceTagsService.js +1 -0
- package/vscode/src/vs/workbench/contrib/tasks/common/tasks.js +80 -11
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.d.ts +5 -3
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.js +27 -1
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.js +8 -5
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalMenus.js +721 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.js +9 -8
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.d.ts +0 -9
- package/vscode/src/vs/workbench/contrib/terminal/common/terminal.d.ts +2 -5
- package/vscode/src/vs/workbench/contrib/terminal/common/terminal.js +166 -71
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalContextKey.js +92 -144
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalStrings.js +41 -0
- package/vscode/src/vs/workbench/contrib/terminalContrib/accessibility/common/terminal.accessibility.js +12 -0
- package/vscode/src/vs/workbench/contrib/terminalContrib/find/common/terminal.find.js +22 -0
- package/vscode/src/vs/workbench/contrib/terminalContrib/suggest/common/terminal.suggest.js +18 -0
- package/vscode/src/vs/workbench/contrib/testing/common/constants.js +103 -0
- package/vscode/src/vs/workbench/contrib/testing/common/getComputedState.js +4 -3
- package/vscode/src/vs/workbench/contrib/testing/common/testCoverage.js +79 -22
- package/vscode/src/vs/workbench/contrib/testing/common/testId.js +46 -18
- package/vscode/src/vs/workbench/contrib/testing/common/testItemCollection.js +51 -41
- package/vscode/src/vs/workbench/contrib/testing/common/testResult.js +33 -19
- package/vscode/src/vs/workbench/contrib/testing/common/testTypes.js +108 -38
- package/vscode/src/vs/workbench/contrib/testing/common/testingStates.js +19 -18
- package/vscode/src/vs/workbench/contrib/timeline/common/timeline.js +1 -2
- package/vscode/src/vs/workbench/contrib/typeHierarchy/common/typeHierarchy.js +6 -1
- package/vscode/src/vs/workbench/contrib/url/browser/trustedDomainService.js +77 -0
- package/vscode/src/vs/workbench/contrib/url/browser/trustedDomainService.service.js +3 -0
- package/vscode/src/vs/workbench/contrib/url/browser/trustedDomains.js +119 -0
- package/vscode/src/vs/workbench/contrib/webview/browser/webview.js +9 -2
- package/vscode/src/vs/workbench/contrib/webview/common/webview.js +4 -3
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.js +3 -2
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput.js +2 -1
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewIconManager.js +2 -1
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.js +22 -10
- package/vscode/src/vs/workbench/services/authentication/browser/authenticationService.js +25 -9
- package/vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js +370 -0
- package/vscode/src/vs/workbench/services/configuration/common/configuration.js +8 -7
- package/vscode/src/vs/workbench/services/driver/browser/driver.js +187 -0
- package/vscode/src/vs/workbench/services/editor/browser/codeEditorService.js +3 -1
- package/vscode/src/vs/workbench/services/editor/browser/editorService.js +42 -29
- package/vscode/src/vs/workbench/services/editor/common/customEditorLabelService.js +1 -0
- package/vscode/src/vs/workbench/services/editor/common/editorGroupColumn.js +5 -5
- package/vscode/src/vs/workbench/services/editor/common/editorGroupFinder.js +5 -5
- package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.d.ts +36 -1
- package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.js +2 -2
- package/vscode/src/vs/workbench/services/editor/common/editorGroupsService.service.d.ts +11 -2
- package/vscode/src/vs/workbench/services/editor/common/editorResolverService.js +6 -1
- package/vscode/src/vs/workbench/services/editor/common/editorService.service.d.ts +3 -0
- package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.d.ts +1 -0
- package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.js +20 -1
- package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.service.d.ts +1 -0
- package/vscode/src/vs/workbench/services/extensionRecommendations/common/extensionRecommendations.js +11 -0
- package/vscode/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.js +4 -7
- package/vscode/src/vs/workbench/services/extensions/common/extensionDescriptionRegistry.js +8 -2
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostKind.js +16 -10
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostProtocol.js +18 -7
- package/vscode/src/vs/workbench/services/extensions/common/extensionManifestPropertiesService.js +1 -0
- package/vscode/src/vs/workbench/services/extensions/common/extensionRunningLocation.js +4 -3
- package/vscode/src/vs/workbench/services/extensions/common/extensions.js +17 -6
- package/vscode/src/vs/workbench/services/extensions/common/extensionsApiProposals.js +4 -4
- package/vscode/src/vs/workbench/services/extensions/common/extensionsRegistry.d.ts +2 -1
- package/vscode/src/vs/workbench/services/extensions/common/extensionsRegistry.js +5 -0
- package/vscode/src/vs/workbench/services/extensions/common/rpcProtocol.js +103 -64
- package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.js +31 -15
- package/vscode/src/vs/workbench/services/{views/browser/treeViewsService.service.js → integrity/common/integrity.service.js} +2 -2
- package/vscode/src/vs/workbench/services/language/common/languageService.js +2 -1
- package/vscode/src/vs/workbench/services/layout/browser/layoutService.js +71 -24
- package/vscode/src/vs/workbench/services/lifecycle/common/lifecycle.js +28 -8
- package/vscode/src/vs/workbench/services/lifecycle/common/lifecycleService.js +11 -11
- package/vscode/src/vs/workbench/services/notebook/common/notebookDocumentService.js +1 -0
- package/vscode/src/vs/workbench/services/outline/browser/outline.js +22 -0
- package/vscode/src/vs/workbench/services/preferences/common/preferencesModels.js +10 -9
- package/vscode/src/vs/workbench/services/progress/browser/progressIndicator.js +19 -17
- package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.js +4 -2
- package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js +16 -16
- package/vscode/src/vs/workbench/services/search/common/fileSearchManager.js +3 -2
- package/vscode/src/vs/workbench/services/search/common/queryBuilder.js +9 -9
- package/vscode/src/vs/workbench/services/search/common/replace.js +12 -11
- package/vscode/src/vs/workbench/services/search/common/search.js +32 -1
- package/vscode/src/vs/workbench/services/search/common/textSearchManager.js +6 -6
- package/vscode/src/vs/workbench/services/statusbar/browser/statusbar.js +6 -1
- package/vscode/src/vs/workbench/services/storage/browser/storageService.js +290 -0
- package/vscode/src/vs/workbench/services/textfile/common/encoding.js +6 -2
- package/vscode/src/vs/workbench/services/textfile/common/textEditorService.js +1 -0
- package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModel.js +28 -27
- package/vscode/src/vs/workbench/services/textfile/common/textfiles.js +27 -3
- package/vscode/src/vs/workbench/services/themes/common/colorExtensionPoint.js +2 -2
- package/vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js +2 -2
- package/vscode/src/vs/workbench/services/themes/common/workbenchThemeService.js +43 -1
- package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorInput.js +2 -2
- package/vscode/src/vs/workbench/services/untitled/common/untitledTextEditorModel.js +2 -2
- package/vscode/src/vs/workbench/services/userDataProfile/browser/iconSelectBox.js +12 -11
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfile.js +7 -2
- package/vscode/src/vs/workbench/services/userDataSync/common/userDataSync.js +19 -13
- package/vscode/src/vs/workbench/services/views/browser/viewsService.js +29 -25
- package/vscode/src/vs/workbench/services/workingCopy/common/fileWorkingCopy.js +6 -0
- package/vscode/src/vs/workbench/services/workingCopy/common/resourceWorkingCopy.js +3 -2
- package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.js +52 -32
- package/vscode/src/vs/workbench/services/workingCopy/common/workingCopy.js +7 -1
- package/vscode/src/vs/workbench/services/workspaces/common/workspaceTrust.js +17 -14
- package/vscode-dts/vscode.proposed.attributableCoverage.d.ts +28 -0
- package/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts +90 -97
- package/vscode-dts/vscode.proposed.chatParticipantPrivate.d.ts +76 -0
- package/vscode-dts/vscode.proposed.chatProvider.d.ts +24 -7
- package/vscode-dts/vscode.proposed.chatVariableResolver.d.ts +82 -2
- package/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts +0 -5
- package/vscode-dts/vscode.proposed.editorHoverVerbosityLevel.d.ts +2 -2
- package/vscode-dts/vscode.proposed.embeddings.d.ts +33 -0
- package/vscode-dts/vscode.proposed.interactive.d.ts +2 -110
- package/vscode-dts/vscode.proposed.languageModelSystem.d.ts +17 -0
- package/vscode-dts/vscode.proposed.resolvers.d.ts +2 -1
- package/vscode-dts/vscode.proposed.speech.d.ts +26 -6
- package/vscode-dts/vscode.proposed.testObserver.d.ts +9 -0
- package/vscode/src/vs/workbench/api/common/extHostInlineChat.js +0 -194
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleView.js +0 -876
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleViewContributions.js +0 -407
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatAccessibilityHelp.js +0 -196
- package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.service.js +0 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellCommands/cellCommands.js +0 -595
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellDiagnostics/cellDiagnostics.js +0 -102
- package/vscode-dts/vscode.proposed.chatParticipant.d.ts +0 -458
- package/vscode-dts/vscode.proposed.debugFocus.d.ts +0 -66
- package/vscode-dts/vscode.proposed.languageModels.d.ts +0 -291
- package/vscode-dts/vscode.proposed.testPreserveFocus.d.ts +0 -28
- /package/vscode/src/vs/workbench/{services → contrib}/issue/browser/issueTroubleshoot.service.js +0 -0
- /package/vscode/src/vs/workbench/{services → contrib}/issue/common/issue.service.js +0 -0
|
@@ -1,28 +1,18 @@
|
|
|
1
1
|
import { IndentAction } from './languageConfiguration.js';
|
|
2
|
-
import {
|
|
2
|
+
import { getIndentationAtPosition } from './languageConfigurationRegistry.js';
|
|
3
|
+
import { IndentationContextProcessor } from './supports/indentationLineProcessor.js';
|
|
3
4
|
function getEnterAction(autoIndent, model, range, languageConfigurationService) {
|
|
4
|
-
|
|
5
|
-
const
|
|
5
|
+
model.tokenization.forceTokenization(range.startLineNumber);
|
|
6
|
+
const languageId = model.getLanguageIdAtPosition(range.startLineNumber, range.startColumn);
|
|
7
|
+
const richEditSupport = languageConfigurationService.getLanguageConfiguration(languageId);
|
|
6
8
|
if (!richEditSupport) {
|
|
7
9
|
return null;
|
|
8
10
|
}
|
|
9
|
-
const
|
|
10
|
-
const
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
}
|
|
15
|
-
else {
|
|
16
|
-
const endScopedLineTokens = getScopedLineTokens(model, range.endLineNumber, range.endColumn);
|
|
17
|
-
afterEnterText = endScopedLineTokens.getLineContent().substr(range.endColumn - 1 - scopedLineTokens.firstCharOffset);
|
|
18
|
-
}
|
|
19
|
-
let previousLineText = '';
|
|
20
|
-
if (range.startLineNumber > 1 && scopedLineTokens.firstCharOffset === 0) {
|
|
21
|
-
const oneLineAboveScopedLineTokens = getScopedLineTokens(model, range.startLineNumber - 1);
|
|
22
|
-
if (oneLineAboveScopedLineTokens.languageId === scopedLineTokens.languageId) {
|
|
23
|
-
previousLineText = oneLineAboveScopedLineTokens.getLineContent();
|
|
24
|
-
}
|
|
25
|
-
}
|
|
11
|
+
const indentationContextProcessor = ( new IndentationContextProcessor(model, languageConfigurationService));
|
|
12
|
+
const processedContextTokens = indentationContextProcessor.getProcessedTokenContextAroundRange(range);
|
|
13
|
+
const previousLineText = processedContextTokens.previousLineProcessedTokens.getLineContent();
|
|
14
|
+
const beforeEnterText = processedContextTokens.beforeRangeProcessedTokens.getLineContent();
|
|
15
|
+
const afterEnterText = processedContextTokens.afterRangeProcessedTokens.getLineContent();
|
|
26
16
|
const enterResult = richEditSupport.onEnter(autoIndent, previousLineText, beforeEnterText, afterEnterText);
|
|
27
17
|
if (!enterResult) {
|
|
28
18
|
return null;
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { CharCode } from '../../../base/common/charCode.js';
|
|
2
|
+
import { StandardTokenType } from '../encodedTokenAttributes.js';
|
|
1
3
|
var IndentAction;
|
|
2
4
|
( (function(IndentAction) {
|
|
3
5
|
IndentAction[IndentAction["None"] = 0] = "None";
|
|
@@ -33,13 +35,13 @@ class StandardAutoClosingPairConditional {
|
|
|
33
35
|
}
|
|
34
36
|
isOK(standardToken) {
|
|
35
37
|
switch (standardToken) {
|
|
36
|
-
case
|
|
38
|
+
case StandardTokenType.Other:
|
|
37
39
|
return true;
|
|
38
|
-
case
|
|
40
|
+
case StandardTokenType.Comment:
|
|
39
41
|
return this._inComment;
|
|
40
|
-
case
|
|
42
|
+
case StandardTokenType.String:
|
|
41
43
|
return this._inString;
|
|
42
|
-
case
|
|
44
|
+
case StandardTokenType.RegEx:
|
|
43
45
|
return this._inRegEx;
|
|
44
46
|
}
|
|
45
47
|
}
|
|
@@ -64,13 +66,13 @@ class StandardAutoClosingPairConditional {
|
|
|
64
66
|
if (!this._neutralCharacterSearched) {
|
|
65
67
|
this._neutralCharacterSearched = true;
|
|
66
68
|
if (!this._neutralCharacter) {
|
|
67
|
-
this._neutralCharacter = this._findNeutralCharacterInRange(
|
|
69
|
+
this._neutralCharacter = this._findNeutralCharacterInRange(CharCode.Digit0, CharCode.Digit9);
|
|
68
70
|
}
|
|
69
71
|
if (!this._neutralCharacter) {
|
|
70
|
-
this._neutralCharacter = this._findNeutralCharacterInRange(
|
|
72
|
+
this._neutralCharacter = this._findNeutralCharacterInRange(CharCode.a, CharCode.z);
|
|
71
73
|
}
|
|
72
74
|
if (!this._neutralCharacter) {
|
|
73
|
-
this._neutralCharacter = this._findNeutralCharacterInRange(
|
|
75
|
+
this._neutralCharacter = this._findNeutralCharacterInRange(CharCode.A, CharCode.Z);
|
|
74
76
|
}
|
|
75
77
|
}
|
|
76
78
|
return this._neutralCharacter;
|
|
@@ -4,7 +4,6 @@ import { Disposable, toDisposable } from '../../../base/common/lifecycle.js';
|
|
|
4
4
|
import { getLeadingWhitespace } from '../../../base/common/strings.js';
|
|
5
5
|
import { DEFAULT_WORD_REGEXP, ensureValidWordDefinition } from '../core/wordHelper.js';
|
|
6
6
|
import { AutoClosingPairs } from './languageConfiguration.js';
|
|
7
|
-
import { createScopedLineTokens } from './supports.js';
|
|
8
7
|
import { CharacterPairSupport } from './supports/characterPair.js';
|
|
9
8
|
import { BracketElectricCharacterSupport } from './supports/electricCharacter.js';
|
|
10
9
|
import { IndentRulesSupport } from './supports/indentRules.js';
|
|
@@ -13,7 +12,7 @@ import { RichEditBrackets } from './supports/richEditBrackets.js';
|
|
|
13
12
|
import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
|
|
14
13
|
import { IConfigurationService } from '../../../platform/configuration/common/configuration.service.js';
|
|
15
14
|
import { ILanguageService } from './language.js';
|
|
16
|
-
import { registerSingleton } from '../../../platform/instantiation/common/extensions.js';
|
|
15
|
+
import { registerSingleton, InstantiationType } from '../../../platform/instantiation/common/extensions.js';
|
|
17
16
|
import { PLAINTEXT_LANGUAGE_ID } from './modesRegistry.js';
|
|
18
17
|
import { LanguageBracketsConfiguration } from './supports/languageBracketsConfiguration.js';
|
|
19
18
|
class LanguageConfigurationServiceChangeEvent {
|
|
@@ -122,12 +121,6 @@ function getIndentationAtPosition(model, lineNumber, column) {
|
|
|
122
121
|
}
|
|
123
122
|
return indentation;
|
|
124
123
|
}
|
|
125
|
-
function getScopedLineTokens(model, lineNumber, columnNumber) {
|
|
126
|
-
model.tokenization.forceTokenization(lineNumber);
|
|
127
|
-
const lineTokens = model.tokenization.getLineTokens(lineNumber);
|
|
128
|
-
const column = (typeof columnNumber === 'undefined' ? model.getLineMaxColumn(lineNumber) - 1 : columnNumber - 1);
|
|
129
|
-
return createScopedLineTokens(lineTokens, column);
|
|
130
|
-
}
|
|
131
124
|
class ComposedLanguageConfiguration {
|
|
132
125
|
constructor(languageId) {
|
|
133
126
|
this.languageId = languageId;
|
|
@@ -333,5 +326,5 @@ class ResolvedLanguageConfiguration {
|
|
|
333
326
|
return comments;
|
|
334
327
|
}
|
|
335
328
|
}
|
|
336
|
-
registerSingleton(ILanguageConfigurationService, LanguageConfigurationService,
|
|
337
|
-
export { ILanguageConfigurationService, LanguageConfigurationChangeEvent, LanguageConfigurationRegistry, LanguageConfigurationService, LanguageConfigurationServiceChangeEvent, ResolvedLanguageConfiguration, getIndentationAtPosition
|
|
329
|
+
registerSingleton(ILanguageConfigurationService, LanguageConfigurationService, InstantiationType.Delayed);
|
|
330
|
+
export { ILanguageConfigurationService, LanguageConfigurationChangeEvent, LanguageConfigurationRegistry, LanguageConfigurationService, LanguageConfigurationServiceChangeEvent, ResolvedLanguageConfiguration, getIndentationAtPosition };
|
|
@@ -1,4 +1,23 @@
|
|
|
1
|
+
import { CharCode } from '../../../base/common/charCode.js';
|
|
1
2
|
import { CharacterClassifier } from '../core/characterClassifier.js';
|
|
3
|
+
var State;
|
|
4
|
+
( (function(State) {
|
|
5
|
+
State[State["Invalid"] = 0] = "Invalid";
|
|
6
|
+
State[State["Start"] = 1] = "Start";
|
|
7
|
+
State[State["H"] = 2] = "H";
|
|
8
|
+
State[State["HT"] = 3] = "HT";
|
|
9
|
+
State[State["HTT"] = 4] = "HTT";
|
|
10
|
+
State[State["HTTP"] = 5] = "HTTP";
|
|
11
|
+
State[State["F"] = 6] = "F";
|
|
12
|
+
State[State["FI"] = 7] = "FI";
|
|
13
|
+
State[State["FIL"] = 8] = "FIL";
|
|
14
|
+
State[State["BeforeColon"] = 9] = "BeforeColon";
|
|
15
|
+
State[State["AfterColon"] = 10] = "AfterColon";
|
|
16
|
+
State[State["AlmostThere"] = 11] = "AlmostThere";
|
|
17
|
+
State[State["End"] = 12] = "End";
|
|
18
|
+
State[State["Accept"] = 13] = "Accept";
|
|
19
|
+
State[State["LastKnownState"] = 14] = "LastKnownState";
|
|
20
|
+
})(State || (State = {})));
|
|
2
21
|
class Uint8Matrix {
|
|
3
22
|
constructor(rows, cols, defaultValue) {
|
|
4
23
|
const data = ( new Uint8Array(rows * cols));
|
|
@@ -19,7 +38,7 @@ class Uint8Matrix {
|
|
|
19
38
|
class StateMachine {
|
|
20
39
|
constructor(edges) {
|
|
21
40
|
let maxCharCode = 0;
|
|
22
|
-
let maxState =
|
|
41
|
+
let maxState = State.Invalid;
|
|
23
42
|
for (let i = 0, len = edges.length; i < len; i++) {
|
|
24
43
|
const [from, chCode, to] = edges[i];
|
|
25
44
|
if (chCode > maxCharCode) {
|
|
@@ -34,7 +53,7 @@ class StateMachine {
|
|
|
34
53
|
}
|
|
35
54
|
maxCharCode++;
|
|
36
55
|
maxState++;
|
|
37
|
-
const states = ( new Uint8Matrix(maxState, maxCharCode,
|
|
56
|
+
const states = ( new Uint8Matrix(maxState, maxCharCode, State.Invalid));
|
|
38
57
|
for (let i = 0, len = edges.length; i < len; i++) {
|
|
39
58
|
const [from, chCode, to] = edges[i];
|
|
40
59
|
states.set(from, chCode, to);
|
|
@@ -44,7 +63,7 @@ class StateMachine {
|
|
|
44
63
|
}
|
|
45
64
|
nextState(currentState, chCode) {
|
|
46
65
|
if (chCode < 0 || chCode >= this._maxCharCode) {
|
|
47
|
-
return
|
|
66
|
+
return State.Invalid;
|
|
48
67
|
}
|
|
49
68
|
return this._states.get(currentState, chCode);
|
|
50
69
|
}
|
|
@@ -53,43 +72,49 @@ let _stateMachine = null;
|
|
|
53
72
|
function getStateMachine() {
|
|
54
73
|
if (_stateMachine === null) {
|
|
55
74
|
_stateMachine = ( new StateMachine([
|
|
56
|
-
[
|
|
57
|
-
[
|
|
58
|
-
[
|
|
59
|
-
[
|
|
60
|
-
[
|
|
61
|
-
[
|
|
62
|
-
[
|
|
63
|
-
[
|
|
64
|
-
[
|
|
65
|
-
[
|
|
66
|
-
[
|
|
67
|
-
[
|
|
68
|
-
[
|
|
69
|
-
[
|
|
70
|
-
[
|
|
71
|
-
[
|
|
72
|
-
[
|
|
73
|
-
[
|
|
74
|
-
[
|
|
75
|
-
[
|
|
76
|
-
[
|
|
77
|
-
[
|
|
75
|
+
[State.Start, CharCode.h, State.H],
|
|
76
|
+
[State.Start, CharCode.H, State.H],
|
|
77
|
+
[State.Start, CharCode.f, State.F],
|
|
78
|
+
[State.Start, CharCode.F, State.F],
|
|
79
|
+
[State.H, CharCode.t, State.HT],
|
|
80
|
+
[State.H, CharCode.T, State.HT],
|
|
81
|
+
[State.HT, CharCode.t, State.HTT],
|
|
82
|
+
[State.HT, CharCode.T, State.HTT],
|
|
83
|
+
[State.HTT, CharCode.p, State.HTTP],
|
|
84
|
+
[State.HTT, CharCode.P, State.HTTP],
|
|
85
|
+
[State.HTTP, CharCode.s, State.BeforeColon],
|
|
86
|
+
[State.HTTP, CharCode.S, State.BeforeColon],
|
|
87
|
+
[State.HTTP, CharCode.Colon, State.AfterColon],
|
|
88
|
+
[State.F, CharCode.i, State.FI],
|
|
89
|
+
[State.F, CharCode.I, State.FI],
|
|
90
|
+
[State.FI, CharCode.l, State.FIL],
|
|
91
|
+
[State.FI, CharCode.L, State.FIL],
|
|
92
|
+
[State.FIL, CharCode.e, State.BeforeColon],
|
|
93
|
+
[State.FIL, CharCode.E, State.BeforeColon],
|
|
94
|
+
[State.BeforeColon, CharCode.Colon, State.AfterColon],
|
|
95
|
+
[State.AfterColon, CharCode.Slash, State.AlmostThere],
|
|
96
|
+
[State.AlmostThere, CharCode.Slash, State.End],
|
|
78
97
|
]));
|
|
79
98
|
}
|
|
80
99
|
return _stateMachine;
|
|
81
100
|
}
|
|
101
|
+
var CharacterClass;
|
|
102
|
+
( (function(CharacterClass) {
|
|
103
|
+
CharacterClass[CharacterClass["None"] = 0] = "None";
|
|
104
|
+
CharacterClass[CharacterClass["ForceTermination"] = 1] = "ForceTermination";
|
|
105
|
+
CharacterClass[CharacterClass["CannotEndIn"] = 2] = "CannotEndIn";
|
|
106
|
+
})(CharacterClass || (CharacterClass = {})));
|
|
82
107
|
let _classifier = null;
|
|
83
108
|
function getClassifier() {
|
|
84
109
|
if (_classifier === null) {
|
|
85
|
-
_classifier = ( new CharacterClassifier(
|
|
110
|
+
_classifier = ( new CharacterClassifier(CharacterClass.None));
|
|
86
111
|
const FORCE_TERMINATION_CHARACTERS = ' \t<>\'\"、。。、,.:;‘〈「『〔([{「」}])〕』」〉’`~…';
|
|
87
112
|
for (let i = 0; i < FORCE_TERMINATION_CHARACTERS.length; i++) {
|
|
88
|
-
_classifier.set(FORCE_TERMINATION_CHARACTERS.charCodeAt(i),
|
|
113
|
+
_classifier.set(FORCE_TERMINATION_CHARACTERS.charCodeAt(i), CharacterClass.ForceTermination);
|
|
89
114
|
}
|
|
90
115
|
const CANNOT_END_WITH_CHARACTERS = '.,;:';
|
|
91
116
|
for (let i = 0; i < CANNOT_END_WITH_CHARACTERS.length; i++) {
|
|
92
|
-
_classifier.set(CANNOT_END_WITH_CHARACTERS.charCodeAt(i),
|
|
117
|
+
_classifier.set(CANNOT_END_WITH_CHARACTERS.charCodeAt(i), CharacterClass.CannotEndIn);
|
|
93
118
|
}
|
|
94
119
|
}
|
|
95
120
|
return _classifier;
|
|
@@ -100,7 +125,7 @@ class LinkComputer {
|
|
|
100
125
|
do {
|
|
101
126
|
const chCode = line.charCodeAt(lastIncludedCharIndex);
|
|
102
127
|
const chClass = classifier.get(chCode);
|
|
103
|
-
if (chClass !==
|
|
128
|
+
if (chClass !== CharacterClass.CannotEndIn) {
|
|
104
129
|
break;
|
|
105
130
|
}
|
|
106
131
|
lastIncludedCharIndex--;
|
|
@@ -108,9 +133,9 @@ class LinkComputer {
|
|
|
108
133
|
if (linkBeginIndex > 0) {
|
|
109
134
|
const charCodeBeforeLink = line.charCodeAt(linkBeginIndex - 1);
|
|
110
135
|
const lastCharCodeInLink = line.charCodeAt(lastIncludedCharIndex);
|
|
111
|
-
if ((
|
|
112
|
-
|| (
|
|
113
|
-
|| (
|
|
136
|
+
if ((charCodeBeforeLink === CharCode.OpenParen && lastCharCodeInLink === CharCode.CloseParen)
|
|
137
|
+
|| (charCodeBeforeLink === CharCode.OpenSquareBracket && lastCharCodeInLink === CharCode.CloseSquareBracket)
|
|
138
|
+
|| (charCodeBeforeLink === CharCode.OpenCurlyBrace && lastCharCodeInLink === CharCode.CloseCurlyBrace)) {
|
|
114
139
|
lastIncludedCharIndex--;
|
|
115
140
|
}
|
|
116
141
|
}
|
|
@@ -133,7 +158,7 @@ class LinkComputer {
|
|
|
133
158
|
let j = 0;
|
|
134
159
|
let linkBeginIndex = 0;
|
|
135
160
|
let linkBeginChCode = 0;
|
|
136
|
-
let state =
|
|
161
|
+
let state = State.Start;
|
|
137
162
|
let hasOpenParens = false;
|
|
138
163
|
let hasOpenSquareBracket = false;
|
|
139
164
|
let inSquareBrackets = false;
|
|
@@ -141,86 +166,86 @@ class LinkComputer {
|
|
|
141
166
|
while (j < len) {
|
|
142
167
|
let resetStateMachine = false;
|
|
143
168
|
const chCode = line.charCodeAt(j);
|
|
144
|
-
if (state ===
|
|
169
|
+
if (state === State.Accept) {
|
|
145
170
|
let chClass;
|
|
146
171
|
switch (chCode) {
|
|
147
|
-
case
|
|
172
|
+
case CharCode.OpenParen:
|
|
148
173
|
hasOpenParens = true;
|
|
149
|
-
chClass =
|
|
174
|
+
chClass = CharacterClass.None;
|
|
150
175
|
break;
|
|
151
|
-
case
|
|
152
|
-
chClass = (
|
|
176
|
+
case CharCode.CloseParen:
|
|
177
|
+
chClass = (hasOpenParens ? CharacterClass.None : CharacterClass.ForceTermination);
|
|
153
178
|
break;
|
|
154
|
-
case
|
|
179
|
+
case CharCode.OpenSquareBracket:
|
|
155
180
|
inSquareBrackets = true;
|
|
156
181
|
hasOpenSquareBracket = true;
|
|
157
|
-
chClass =
|
|
182
|
+
chClass = CharacterClass.None;
|
|
158
183
|
break;
|
|
159
|
-
case
|
|
184
|
+
case CharCode.CloseSquareBracket:
|
|
160
185
|
inSquareBrackets = false;
|
|
161
|
-
chClass = (
|
|
186
|
+
chClass = (hasOpenSquareBracket ? CharacterClass.None : CharacterClass.ForceTermination);
|
|
162
187
|
break;
|
|
163
|
-
case
|
|
188
|
+
case CharCode.OpenCurlyBrace:
|
|
164
189
|
hasOpenCurlyBracket = true;
|
|
165
|
-
chClass =
|
|
190
|
+
chClass = CharacterClass.None;
|
|
166
191
|
break;
|
|
167
|
-
case
|
|
168
|
-
chClass = (
|
|
192
|
+
case CharCode.CloseCurlyBrace:
|
|
193
|
+
chClass = (hasOpenCurlyBracket ? CharacterClass.None : CharacterClass.ForceTermination);
|
|
169
194
|
break;
|
|
170
|
-
case
|
|
171
|
-
case
|
|
172
|
-
case
|
|
195
|
+
case CharCode.SingleQuote:
|
|
196
|
+
case CharCode.DoubleQuote:
|
|
197
|
+
case CharCode.BackTick:
|
|
173
198
|
if (linkBeginChCode === chCode) {
|
|
174
|
-
chClass =
|
|
199
|
+
chClass = CharacterClass.ForceTermination;
|
|
175
200
|
}
|
|
176
|
-
else if (linkBeginChCode ===
|
|
177
|
-
chClass =
|
|
201
|
+
else if (linkBeginChCode === CharCode.SingleQuote || linkBeginChCode === CharCode.DoubleQuote || linkBeginChCode === CharCode.BackTick) {
|
|
202
|
+
chClass = CharacterClass.None;
|
|
178
203
|
}
|
|
179
204
|
else {
|
|
180
|
-
chClass =
|
|
205
|
+
chClass = CharacterClass.ForceTermination;
|
|
181
206
|
}
|
|
182
207
|
break;
|
|
183
|
-
case
|
|
184
|
-
chClass = (
|
|
208
|
+
case CharCode.Asterisk:
|
|
209
|
+
chClass = (linkBeginChCode === CharCode.Asterisk) ? CharacterClass.ForceTermination : CharacterClass.None;
|
|
185
210
|
break;
|
|
186
|
-
case
|
|
187
|
-
chClass = (
|
|
211
|
+
case CharCode.Pipe:
|
|
212
|
+
chClass = (linkBeginChCode === CharCode.Pipe) ? CharacterClass.ForceTermination : CharacterClass.None;
|
|
188
213
|
break;
|
|
189
|
-
case
|
|
190
|
-
chClass = (
|
|
214
|
+
case CharCode.Space:
|
|
215
|
+
chClass = (inSquareBrackets ? CharacterClass.None : CharacterClass.ForceTermination);
|
|
191
216
|
break;
|
|
192
217
|
default:
|
|
193
218
|
chClass = classifier.get(chCode);
|
|
194
219
|
}
|
|
195
|
-
if (chClass ===
|
|
220
|
+
if (chClass === CharacterClass.ForceTermination) {
|
|
196
221
|
result.push(LinkComputer._createLink(classifier, line, i, linkBeginIndex, j));
|
|
197
222
|
resetStateMachine = true;
|
|
198
223
|
}
|
|
199
224
|
}
|
|
200
|
-
else if (state ===
|
|
225
|
+
else if (state === State.End) {
|
|
201
226
|
let chClass;
|
|
202
|
-
if (chCode ===
|
|
227
|
+
if (chCode === CharCode.OpenSquareBracket) {
|
|
203
228
|
hasOpenSquareBracket = true;
|
|
204
|
-
chClass =
|
|
229
|
+
chClass = CharacterClass.None;
|
|
205
230
|
}
|
|
206
231
|
else {
|
|
207
232
|
chClass = classifier.get(chCode);
|
|
208
233
|
}
|
|
209
|
-
if (chClass ===
|
|
234
|
+
if (chClass === CharacterClass.ForceTermination) {
|
|
210
235
|
resetStateMachine = true;
|
|
211
236
|
}
|
|
212
237
|
else {
|
|
213
|
-
state =
|
|
238
|
+
state = State.Accept;
|
|
214
239
|
}
|
|
215
240
|
}
|
|
216
241
|
else {
|
|
217
242
|
state = stateMachine.nextState(state, chCode);
|
|
218
|
-
if (state ===
|
|
243
|
+
if (state === State.Invalid) {
|
|
219
244
|
resetStateMachine = true;
|
|
220
245
|
}
|
|
221
246
|
}
|
|
222
247
|
if (resetStateMachine) {
|
|
223
|
-
state =
|
|
248
|
+
state = State.Start;
|
|
224
249
|
hasOpenParens = false;
|
|
225
250
|
hasOpenSquareBracket = false;
|
|
226
251
|
hasOpenCurlyBracket = false;
|
|
@@ -229,7 +254,7 @@ class LinkComputer {
|
|
|
229
254
|
}
|
|
230
255
|
j++;
|
|
231
256
|
}
|
|
232
|
-
if (state ===
|
|
257
|
+
if (state === State.Accept) {
|
|
233
258
|
result.push(LinkComputer._createLink(classifier, line, i, linkBeginIndex, len));
|
|
234
259
|
}
|
|
235
260
|
}
|
|
@@ -242,4 +267,4 @@ function computeLinks(model) {
|
|
|
242
267
|
}
|
|
243
268
|
return LinkComputer.computeLinks(model);
|
|
244
269
|
}
|
|
245
|
-
export { LinkComputer, StateMachine, computeLinks };
|
|
270
|
+
export { LinkComputer, State, StateMachine, computeLinks };
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { TokenizationResult, Token, EncodedTokenizationResult } from '../languages.js';
|
|
2
|
+
import { MetadataConsts, StandardTokenType, FontStyle, ColorId } from '../encodedTokenAttributes.js';
|
|
2
3
|
const NullState = new class {
|
|
3
4
|
clone() {
|
|
4
5
|
return this;
|
|
@@ -13,11 +14,11 @@ function nullTokenize(languageId, state) {
|
|
|
13
14
|
function nullTokenizeEncoded(languageId, state) {
|
|
14
15
|
const tokens = ( new Uint32Array(2));
|
|
15
16
|
tokens[0] = 0;
|
|
16
|
-
tokens[1] = ((
|
|
17
|
-
| (
|
|
18
|
-
| (
|
|
19
|
-
| (
|
|
20
|
-
| (
|
|
17
|
+
tokens[1] = ((languageId << MetadataConsts.LANGUAGEID_OFFSET)
|
|
18
|
+
| (StandardTokenType.Other << MetadataConsts.TOKEN_TYPE_OFFSET)
|
|
19
|
+
| (FontStyle.None << MetadataConsts.FONT_STYLE_OFFSET)
|
|
20
|
+
| (ColorId.DefaultForeground << MetadataConsts.FOREGROUND_OFFSET)
|
|
21
|
+
| (ColorId.DefaultBackground << MetadataConsts.BACKGROUND_OFFSET)) >>> 0;
|
|
21
22
|
return ( new EncodedTokenizationResult(tokens, state === null ? NullState : state));
|
|
22
23
|
}
|
|
23
24
|
export { NullState, nullTokenize, nullTokenizeEncoded };
|
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
var IndentConsts;
|
|
2
|
+
( (function(IndentConsts) {
|
|
3
|
+
IndentConsts[IndentConsts["INCREASE_MASK"] = 1] = "INCREASE_MASK";
|
|
4
|
+
IndentConsts[IndentConsts["DECREASE_MASK"] = 2] = "DECREASE_MASK";
|
|
5
|
+
IndentConsts[IndentConsts["INDENT_NEXTLINE_MASK"] = 4] = "INDENT_NEXTLINE_MASK";
|
|
6
|
+
IndentConsts[IndentConsts["UNINDENT_MASK"] = 8] = "UNINDENT_MASK";
|
|
7
|
+
})(IndentConsts || (IndentConsts = {})));
|
|
1
8
|
function resetGlobalRegex(reg) {
|
|
2
9
|
if (reg.global) {
|
|
3
10
|
reg.lastIndex = 0;
|
|
@@ -37,18 +44,18 @@ class IndentRulesSupport {
|
|
|
37
44
|
getIndentMetadata(text) {
|
|
38
45
|
let ret = 0;
|
|
39
46
|
if (this.shouldIncrease(text)) {
|
|
40
|
-
ret +=
|
|
47
|
+
ret += IndentConsts.INCREASE_MASK;
|
|
41
48
|
}
|
|
42
49
|
if (this.shouldDecrease(text)) {
|
|
43
|
-
ret +=
|
|
50
|
+
ret += IndentConsts.DECREASE_MASK;
|
|
44
51
|
}
|
|
45
52
|
if (this.shouldIndentNextLine(text)) {
|
|
46
|
-
ret +=
|
|
53
|
+
ret += IndentConsts.INDENT_NEXTLINE_MASK;
|
|
47
54
|
}
|
|
48
55
|
if (this.shouldIgnore(text)) {
|
|
49
|
-
ret +=
|
|
56
|
+
ret += IndentConsts.UNINDENT_MASK;
|
|
50
57
|
}
|
|
51
58
|
return ret;
|
|
52
59
|
}
|
|
53
60
|
}
|
|
54
|
-
export { IndentRulesSupport };
|
|
61
|
+
export { IndentConsts, IndentRulesSupport };
|
|
@@ -0,0 +1,150 @@
|
|
|
1
|
+
import { getLeadingWhitespace } from '../../../../base/common/strings.js';
|
|
2
|
+
import { createScopedLineTokens } from '../supports.js';
|
|
3
|
+
import { LineTokens } from '../../tokens/lineTokens.js';
|
|
4
|
+
import { StandardTokenType } from '../../encodedTokenAttributes.js';
|
|
5
|
+
class ProcessedIndentRulesSupport {
|
|
6
|
+
constructor(model, indentRulesSupport, languageConfigurationService) {
|
|
7
|
+
this._indentRulesSupport = indentRulesSupport;
|
|
8
|
+
this._indentationLineProcessor = ( new IndentationLineProcessor(model, languageConfigurationService));
|
|
9
|
+
}
|
|
10
|
+
shouldIncrease(lineNumber, newIndentation) {
|
|
11
|
+
const processedLine = this._indentationLineProcessor.getProcessedLine(lineNumber, newIndentation);
|
|
12
|
+
return this._indentRulesSupport.shouldIncrease(processedLine);
|
|
13
|
+
}
|
|
14
|
+
shouldDecrease(lineNumber, newIndentation) {
|
|
15
|
+
const processedLine = this._indentationLineProcessor.getProcessedLine(lineNumber, newIndentation);
|
|
16
|
+
return this._indentRulesSupport.shouldDecrease(processedLine);
|
|
17
|
+
}
|
|
18
|
+
shouldIgnore(lineNumber, newIndentation) {
|
|
19
|
+
const processedLine = this._indentationLineProcessor.getProcessedLine(lineNumber, newIndentation);
|
|
20
|
+
return this._indentRulesSupport.shouldIgnore(processedLine);
|
|
21
|
+
}
|
|
22
|
+
shouldIndentNextLine(lineNumber, newIndentation) {
|
|
23
|
+
const processedLine = this._indentationLineProcessor.getProcessedLine(lineNumber, newIndentation);
|
|
24
|
+
return this._indentRulesSupport.shouldIndentNextLine(processedLine);
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
class IndentationContextProcessor {
|
|
28
|
+
constructor(model, languageConfigurationService) {
|
|
29
|
+
this.model = model;
|
|
30
|
+
this.indentationLineProcessor = ( new IndentationLineProcessor(model, languageConfigurationService));
|
|
31
|
+
}
|
|
32
|
+
getProcessedTokenContextAroundRange(range) {
|
|
33
|
+
const beforeRangeProcessedTokens = this._getProcessedTokensBeforeRange(range);
|
|
34
|
+
const afterRangeProcessedTokens = this._getProcessedTokensAfterRange(range);
|
|
35
|
+
const previousLineProcessedTokens = this._getProcessedPreviousLineTokens(range);
|
|
36
|
+
return { beforeRangeProcessedTokens, afterRangeProcessedTokens, previousLineProcessedTokens };
|
|
37
|
+
}
|
|
38
|
+
_getProcessedTokensBeforeRange(range) {
|
|
39
|
+
this.model.tokenization.forceTokenization(range.startLineNumber);
|
|
40
|
+
const lineTokens = this.model.tokenization.getLineTokens(range.startLineNumber);
|
|
41
|
+
const scopedLineTokens = createScopedLineTokens(lineTokens, range.startColumn - 1);
|
|
42
|
+
let slicedTokens;
|
|
43
|
+
if (isLanguageDifferentFromLineStart(this.model, range.getStartPosition())) {
|
|
44
|
+
const columnIndexWithinScope = (range.startColumn - 1) - scopedLineTokens.firstCharOffset;
|
|
45
|
+
const firstCharacterOffset = scopedLineTokens.firstCharOffset;
|
|
46
|
+
const lastCharacterOffset = firstCharacterOffset + columnIndexWithinScope;
|
|
47
|
+
slicedTokens = lineTokens.sliceAndInflate(firstCharacterOffset, lastCharacterOffset, 0);
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
const columnWithinLine = range.startColumn - 1;
|
|
51
|
+
slicedTokens = lineTokens.sliceAndInflate(0, columnWithinLine, 0);
|
|
52
|
+
}
|
|
53
|
+
const processedTokens = this.indentationLineProcessor.getProcessedTokens(slicedTokens);
|
|
54
|
+
return processedTokens;
|
|
55
|
+
}
|
|
56
|
+
_getProcessedTokensAfterRange(range) {
|
|
57
|
+
const position = range.isEmpty() ? range.getStartPosition() : range.getEndPosition();
|
|
58
|
+
this.model.tokenization.forceTokenization(position.lineNumber);
|
|
59
|
+
const lineTokens = this.model.tokenization.getLineTokens(position.lineNumber);
|
|
60
|
+
const scopedLineTokens = createScopedLineTokens(lineTokens, position.column - 1);
|
|
61
|
+
const columnIndexWithinScope = position.column - 1 - scopedLineTokens.firstCharOffset;
|
|
62
|
+
const firstCharacterOffset = scopedLineTokens.firstCharOffset + columnIndexWithinScope;
|
|
63
|
+
const lastCharacterOffset = scopedLineTokens.firstCharOffset + scopedLineTokens.getLineLength();
|
|
64
|
+
const slicedTokens = lineTokens.sliceAndInflate(firstCharacterOffset, lastCharacterOffset, 0);
|
|
65
|
+
const processedTokens = this.indentationLineProcessor.getProcessedTokens(slicedTokens);
|
|
66
|
+
return processedTokens;
|
|
67
|
+
}
|
|
68
|
+
_getProcessedPreviousLineTokens(range) {
|
|
69
|
+
const getScopedLineTokensAtEndColumnOfLine = (lineNumber) => {
|
|
70
|
+
this.model.tokenization.forceTokenization(lineNumber);
|
|
71
|
+
const lineTokens = this.model.tokenization.getLineTokens(lineNumber);
|
|
72
|
+
const endColumnOfLine = this.model.getLineMaxColumn(lineNumber) - 1;
|
|
73
|
+
const scopedLineTokensAtEndColumn = createScopedLineTokens(lineTokens, endColumnOfLine);
|
|
74
|
+
return scopedLineTokensAtEndColumn;
|
|
75
|
+
};
|
|
76
|
+
this.model.tokenization.forceTokenization(range.startLineNumber);
|
|
77
|
+
const lineTokens = this.model.tokenization.getLineTokens(range.startLineNumber);
|
|
78
|
+
const scopedLineTokens = createScopedLineTokens(lineTokens, range.startColumn - 1);
|
|
79
|
+
const emptyTokens = LineTokens.createEmpty('', scopedLineTokens.languageIdCodec);
|
|
80
|
+
const previousLineNumber = range.startLineNumber - 1;
|
|
81
|
+
const isFirstLine = previousLineNumber === 0;
|
|
82
|
+
if (isFirstLine) {
|
|
83
|
+
return emptyTokens;
|
|
84
|
+
}
|
|
85
|
+
const canScopeExtendOnPreviousLine = scopedLineTokens.firstCharOffset === 0;
|
|
86
|
+
if (!canScopeExtendOnPreviousLine) {
|
|
87
|
+
return emptyTokens;
|
|
88
|
+
}
|
|
89
|
+
const scopedLineTokensAtEndColumnOfPreviousLine = getScopedLineTokensAtEndColumnOfLine(previousLineNumber);
|
|
90
|
+
const doesLanguageContinueOnPreviousLine = scopedLineTokens.languageId === scopedLineTokensAtEndColumnOfPreviousLine.languageId;
|
|
91
|
+
if (!doesLanguageContinueOnPreviousLine) {
|
|
92
|
+
return emptyTokens;
|
|
93
|
+
}
|
|
94
|
+
const previousSlicedLineTokens = scopedLineTokensAtEndColumnOfPreviousLine.toIViewLineTokens();
|
|
95
|
+
const processedTokens = this.indentationLineProcessor.getProcessedTokens(previousSlicedLineTokens);
|
|
96
|
+
return processedTokens;
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
class IndentationLineProcessor {
|
|
100
|
+
constructor(model, languageConfigurationService) {
|
|
101
|
+
this.model = model;
|
|
102
|
+
this.languageConfigurationService = languageConfigurationService;
|
|
103
|
+
}
|
|
104
|
+
getProcessedLine(lineNumber, newIndentation) {
|
|
105
|
+
const replaceIndentation = (line, newIndentation) => {
|
|
106
|
+
const currentIndentation = getLeadingWhitespace(line);
|
|
107
|
+
const adjustedLine = newIndentation + line.substring(currentIndentation.length);
|
|
108
|
+
return adjustedLine;
|
|
109
|
+
};
|
|
110
|
+
this.model.tokenization.forceTokenization?.(lineNumber);
|
|
111
|
+
const tokens = this.model.tokenization.getLineTokens(lineNumber);
|
|
112
|
+
let processedLine = this.getProcessedTokens(tokens).getLineContent();
|
|
113
|
+
if (newIndentation !== undefined) {
|
|
114
|
+
processedLine = replaceIndentation(processedLine, newIndentation);
|
|
115
|
+
}
|
|
116
|
+
return processedLine;
|
|
117
|
+
}
|
|
118
|
+
getProcessedTokens(tokens) {
|
|
119
|
+
const shouldRemoveBracketsFromTokenType = (tokenType) => {
|
|
120
|
+
return tokenType === StandardTokenType.String
|
|
121
|
+
|| tokenType === StandardTokenType.RegEx
|
|
122
|
+
|| tokenType === StandardTokenType.Comment;
|
|
123
|
+
};
|
|
124
|
+
const languageId = tokens.getLanguageId(0);
|
|
125
|
+
const bracketsConfiguration = this.languageConfigurationService.getLanguageConfiguration(languageId).bracketsNew;
|
|
126
|
+
const bracketsRegExp = bracketsConfiguration.getBracketRegExp({ global: true });
|
|
127
|
+
const textAndMetadata = [];
|
|
128
|
+
tokens.forEach((tokenIndex) => {
|
|
129
|
+
const tokenType = tokens.getStandardTokenType(tokenIndex);
|
|
130
|
+
let text = tokens.getTokenText(tokenIndex);
|
|
131
|
+
if (shouldRemoveBracketsFromTokenType(tokenType)) {
|
|
132
|
+
text = text.replace(bracketsRegExp, '');
|
|
133
|
+
}
|
|
134
|
+
const metadata = tokens.getMetadata(tokenIndex);
|
|
135
|
+
textAndMetadata.push({ text, metadata });
|
|
136
|
+
});
|
|
137
|
+
const processedLineTokens = LineTokens.createFromTextAndMetadata(textAndMetadata, tokens.languageIdCodec);
|
|
138
|
+
return processedLineTokens;
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
function isLanguageDifferentFromLineStart(model, position) {
|
|
142
|
+
model.tokenization.forceTokenization(position.lineNumber);
|
|
143
|
+
const lineTokens = model.tokenization.getLineTokens(position.lineNumber);
|
|
144
|
+
const scopedLineTokens = createScopedLineTokens(lineTokens, position.column - 1);
|
|
145
|
+
const doesScopeStartAtOffsetZero = scopedLineTokens.firstCharOffset === 0;
|
|
146
|
+
const isScopedLanguageEqualToFirstLanguageOnLine = lineTokens.getLanguageId(0) === scopedLineTokens.languageId;
|
|
147
|
+
const languageIsDifferentFromLineStart = !doesScopeStartAtOffsetZero && !isScopedLanguageEqualToFirstLanguageOnLine;
|
|
148
|
+
return languageIsDifferentFromLineStart;
|
|
149
|
+
}
|
|
150
|
+
export { IndentationContextProcessor, ProcessedIndentRulesSupport, isLanguageDifferentFromLineStart };
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { RegExpOptions } from '../../../../base/common/strings.js';
|
|
1
2
|
import { LanguageConfiguration } from '../languageConfiguration.js';
|
|
2
3
|
|
|
3
4
|
/**
|
|
@@ -20,6 +21,7 @@ declare class LanguageBracketsConfiguration {
|
|
|
20
21
|
getOpeningBracketInfo(bracketText: string): OpeningBracketKind | undefined;
|
|
21
22
|
getClosingBracketInfo(bracketText: string): ClosingBracketKind | undefined;
|
|
22
23
|
getBracketInfo(bracketText: string): BracketKind | undefined;
|
|
24
|
+
getBracketRegExp(options?: RegExpOptions): RegExp;
|
|
23
25
|
}
|
|
24
26
|
type BracketKind = OpeningBracketKind | ClosingBracketKind;
|
|
25
27
|
declare class BracketKindBase {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { CachedFunction } from '../../../../base/common/cache.js';
|
|
2
|
+
import { createBracketOrRegExp } from './richEditBrackets.js';
|
|
2
3
|
class LanguageBracketsConfiguration {
|
|
3
4
|
constructor(languageId, config) {
|
|
4
5
|
this.languageId = languageId;
|
|
@@ -53,6 +54,10 @@ class LanguageBracketsConfiguration {
|
|
|
53
54
|
getBracketInfo(bracketText) {
|
|
54
55
|
return this.getOpeningBracketInfo(bracketText) || this.getClosingBracketInfo(bracketText);
|
|
55
56
|
}
|
|
57
|
+
getBracketRegExp(options) {
|
|
58
|
+
const brackets = Array.from([...( this._openingBrackets.keys()), ...( this._closingBrackets.keys())]);
|
|
59
|
+
return createBracketOrRegExp(brackets, options);
|
|
60
|
+
}
|
|
56
61
|
}
|
|
57
62
|
function filterValidBrackets(bracketPairs) {
|
|
58
63
|
return bracketPairs.filter(([open, close]) => open !== '' && close !== '');
|