@codingame/monaco-vscode-api 9.0.3 → 10.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -0
- package/_virtual/semver.js +3 -2
- package/_virtual/semver2.js +2 -0
- package/api.js +7 -6
- package/debugProtocol.d.ts +10 -1
- package/extensions.d.ts +0 -2
- package/extensions.js +1 -1
- package/external/vscode-semver/semver.js +988 -983
- package/lifecycle.js +4 -7
- package/localExtensionHost.js +11 -7
- package/missing-services.js +126 -42
- package/monaco.js +42 -10
- package/override/vs/workbench/browser/parts/editor/textEditor.weak.js +1 -1
- package/package.json +15 -8
- package/service-override/textmate.d.ts +1 -0
- package/service-override/tools/editor.js +60 -22
- package/service-override/tools/views.js +34 -19
- package/service-override/treesitter.d.ts +5 -0
- package/services.js +4 -5
- package/tools/injection.js +4 -1
- package/tools.js +4 -2
- package/vscode/src/vs/base/browser/browser.js +1 -2
- package/vscode/src/vs/base/browser/canIUse.js +4 -10
- package/vscode/src/vs/base/browser/dom.js +8 -10
- package/vscode/src/vs/base/browser/domObservable.js +3 -2
- package/vscode/src/vs/base/browser/formattedTextRenderer.js +24 -36
- package/vscode/src/vs/base/browser/keyboardEvent.js +24 -24
- package/vscode/src/vs/base/browser/markdownRenderer.js +8 -12
- package/vscode/src/vs/base/browser/performance.js +18 -24
- package/vscode/src/vs/base/browser/ui/actionbar/actionViewItems.js +1 -1
- package/vscode/src/vs/base/browser/ui/actionbar/actionbar.js +14 -20
- package/vscode/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.d.ts +2 -2
- package/vscode/src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.js +2 -3
- package/vscode/src/vs/base/browser/ui/button/button.js +5 -6
- package/vscode/src/vs/base/browser/ui/codicons/codicon/codicon.css.js +1 -1
- package/vscode/src/vs/base/browser/ui/contextview/contextview.js +15 -41
- package/vscode/src/vs/base/browser/ui/dialog/dialog.js +12 -13
- package/vscode/src/vs/base/browser/ui/dropdown/dropdown.js +2 -4
- package/vscode/src/vs/base/browser/ui/dropdown/dropdownActionViewItem.js +3 -4
- package/vscode/src/vs/base/browser/ui/findinput/findInput.js +5 -6
- package/vscode/src/vs/base/browser/ui/findinput/findInputToggles.js +3 -3
- package/vscode/src/vs/base/browser/ui/findinput/replaceInput.js +6 -7
- package/vscode/src/vs/base/browser/ui/hover/hoverWidget.js +8 -12
- package/vscode/src/vs/base/browser/ui/icons/iconSelectBox.js +3 -4
- package/vscode/src/vs/base/browser/ui/inputbox/inputBox.css.js +1 -1
- package/vscode/src/vs/base/browser/ui/inputbox/inputBox.js +15 -23
- package/vscode/src/vs/base/browser/ui/keybindingLabel/keybindingLabel.js +1 -1
- package/vscode/src/vs/base/browser/ui/list/list.js +1 -12
- package/vscode/src/vs/base/browser/ui/list/listView.js +9 -17
- package/vscode/src/vs/base/browser/ui/list/listWidget.js +26 -30
- package/vscode/src/vs/base/browser/ui/menu/menu.js +15 -17
- package/vscode/src/vs/base/browser/ui/menu/menubar.js +13 -13
- package/vscode/src/vs/base/browser/ui/resizable/resizable.js +9 -9
- package/vscode/src/vs/base/browser/ui/sash/sash.js +16 -28
- package/vscode/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.js +4 -5
- package/vscode/src/vs/base/browser/ui/scrollbar/scrollableElement.js +3 -3
- package/vscode/src/vs/base/browser/ui/scrollbar/scrollbarVisibilityController.js +2 -3
- package/vscode/src/vs/base/browser/ui/scrollbar/verticalScrollbar.js +2 -3
- package/vscode/src/vs/base/browser/ui/selectBox/selectBoxCustom.js +21 -23
- package/vscode/src/vs/base/browser/ui/selectBox/selectBoxNative.js +2 -3
- package/vscode/src/vs/base/browser/ui/splitview/paneview.js +23 -25
- package/vscode/src/vs/base/browser/ui/splitview/splitview.js +27 -33
- package/vscode/src/vs/base/browser/ui/table/tableWidget.js +3 -5
- package/vscode/src/vs/base/browser/ui/toggle/toggle.js +1 -2
- package/vscode/src/vs/base/browser/ui/toolbar/toolbar.js +3 -3
- package/vscode/src/vs/base/browser/ui/tree/abstractTree.js +307 -210
- package/vscode/src/vs/base/browser/ui/tree/asyncDataTree.js +395 -22
- package/vscode/src/vs/base/browser/ui/tree/compressedObjectTreeModel.js +25 -32
- package/vscode/src/vs/base/browser/ui/tree/dataTree.js +2 -2
- package/vscode/src/vs/base/browser/ui/tree/indexTreeModel.js +25 -31
- package/vscode/src/vs/base/browser/ui/tree/objectTree.js +9 -5
- package/vscode/src/vs/base/browser/ui/tree/objectTreeModel.js +4 -7
- package/vscode/src/vs/base/browser/ui/tree/tree.js +1 -13
- package/vscode/src/vs/base/browser/ui/tree/treeDefaults.js +1 -1
- package/vscode/src/vs/base/common/actions.js +1 -1
- package/vscode/src/vs/base/common/amd.js +10 -27
- package/vscode/src/vs/base/common/arrays.js +1 -7
- package/vscode/src/vs/base/common/async.js +14 -25
- package/vscode/src/vs/base/common/codicons.d.ts +7 -0
- package/vscode/src/vs/base/common/color.d.ts +28 -0
- package/vscode/src/vs/base/common/color.js +71 -24
- package/vscode/src/vs/base/common/date.js +61 -61
- package/vscode/src/vs/base/common/diff/diff.js +10 -15
- package/vscode/src/vs/base/common/errorMessage.js +6 -6
- package/vscode/src/vs/base/common/errors.js +5 -1
- package/vscode/src/vs/base/common/event.d.ts +2 -2
- package/vscode/src/vs/base/common/event.js +23 -1
- package/vscode/src/vs/base/common/extpath.js +8 -9
- package/vscode/src/vs/base/common/filters.js +31 -39
- package/vscode/src/vs/base/common/fuzzyScorer.js +9 -10
- package/vscode/src/vs/base/common/glob.js +1 -2
- package/vscode/src/vs/base/common/hash.js +10 -15
- package/vscode/src/vs/base/common/hotReloadHelpers.js +9 -17
- package/vscode/src/vs/base/common/htmlContent.js +3 -8
- package/vscode/src/vs/base/common/json.js +149 -323
- package/vscode/src/vs/base/common/jsonErrorMessages.js +9 -10
- package/vscode/src/vs/base/common/jsonFormatter.js +30 -30
- package/vscode/src/vs/base/common/keyCodes.js +249 -591
- package/vscode/src/vs/base/common/keybindingLabels.js +23 -24
- package/vscode/src/vs/base/common/keybindings.js +17 -30
- package/vscode/src/vs/base/common/labels.js +11 -12
- package/vscode/src/vs/base/common/map.js +67 -20
- package/vscode/src/vs/base/common/marshalling.js +4 -5
- package/vscode/src/vs/base/common/naturalLanguage/korean.js +129 -213
- package/vscode/src/vs/base/common/network.js +2 -2
- package/vscode/src/vs/base/common/observableInternal/api.js +3 -1
- package/vscode/src/vs/base/common/observableInternal/autorun.js +46 -35
- package/vscode/src/vs/base/common/observableInternal/base.js +3 -1
- package/vscode/src/vs/base/common/observableInternal/derived.js +55 -40
- package/vscode/src/vs/base/common/observableInternal/promise.js +1 -55
- package/vscode/src/vs/base/common/observableInternal/utils.js +41 -5
- package/vscode/src/vs/base/common/observableInternal/utilsCancellation.js +79 -0
- package/vscode/src/vs/base/common/performance.js +1 -3
- package/vscode/src/vs/base/common/platform.js +10 -23
- package/vscode/src/vs/base/common/processes.js +1 -8
- package/vscode/src/vs/base/common/product.d.ts +2 -0
- package/vscode/src/vs/base/common/resources.js +3 -4
- package/vscode/src/vs/base/common/scrollable.js +1 -7
- package/vscode/src/vs/base/common/strings.js +47 -66
- package/vscode/src/vs/base/common/ternarySearchTree.js +39 -54
- package/vscode/src/vs/base/common/uint.js +5 -14
- package/vscode/src/vs/base/common/uri.js +39 -41
- package/vscode/src/vs/base/common/uriIpc.js +1 -2
- package/vscode/src/vs/base/common/worker/simpleWorker.js +13 -22
- package/vscode/src/vs/base/parts/ipc/common/ipc.js +55 -77
- package/vscode/src/vs/base/parts/ipc/common/ipc.net.js +51 -108
- package/vscode/src/vs/editor/browser/config/charWidthReader.js +4 -10
- package/vscode/src/vs/editor/browser/config/editorConfiguration.js +3 -4
- package/vscode/src/vs/editor/browser/config/fontMeasurements.js +21 -21
- package/vscode/src/vs/editor/browser/controller/editContext/clipboardUtils.js +45 -0
- package/vscode/src/vs/editor/browser/controller/editContext/editContextUtils.js +4 -0
- package/vscode/src/vs/editor/browser/controller/editContext/native/nativeEditContext.css.js +4 -0
- package/vscode/src/vs/editor/browser/controller/editContext/native/nativeEditContext.js +315 -0
- package/vscode/src/vs/editor/browser/controller/editContext/native/nativeEditContextUtils.js +35 -0
- package/vscode/src/vs/editor/browser/controller/editContext/native/screenReaderSupport.js +131 -0
- package/vscode/src/vs/editor/browser/controller/editContext/screenReaderUtils.js +107 -0
- package/vscode/src/vs/editor/browser/controller/{textAreaHandler.css.js → editContext/textArea/textAreaEditContext.css.js} +1 -1
- package/vscode/src/vs/editor/browser/controller/{textAreaHandler.js → editContext/textArea/textAreaEditContext.js} +86 -147
- package/vscode/src/vs/editor/browser/controller/{textAreaInput.js → editContext/textArea/textAreaEditContextInput.js} +23 -43
- package/vscode/src/vs/editor/browser/controller/{textAreaState.js → editContext/textArea/textAreaEditContextState.js} +8 -54
- package/vscode/src/vs/editor/browser/controller/mouseHandler.js +25 -28
- package/vscode/src/vs/editor/browser/controller/mouseTarget.js +51 -69
- package/vscode/src/vs/editor/browser/controller/pointerHandler.js +4 -6
- package/vscode/src/vs/editor/browser/coreCommands.js +203 -220
- package/vscode/src/vs/editor/browser/editorBrowser.js +1 -30
- package/vscode/src/vs/editor/browser/editorExtensions.js +15 -16
- package/vscode/src/vs/editor/browser/gpu/atlas/textureAtlas.js +109 -0
- package/vscode/src/vs/editor/browser/gpu/atlas/textureAtlasPage.js +86 -0
- package/vscode/src/vs/editor/browser/gpu/atlas/textureAtlasShelfAllocator.js +107 -0
- package/vscode/src/vs/editor/browser/gpu/atlas/textureAtlasSlabAllocator.js +258 -0
- package/vscode/src/vs/editor/browser/gpu/bufferDirtyTracker.js +32 -0
- package/vscode/src/vs/editor/browser/gpu/fullFileRenderStrategy.js +160 -0
- package/vscode/src/vs/editor/browser/gpu/fullFileRenderStrategy.wgsl.js +88 -0
- package/vscode/src/vs/editor/browser/gpu/gpuDisposable.js +42 -0
- package/vscode/src/vs/editor/browser/gpu/gpuUtils.js +44 -0
- package/vscode/src/vs/editor/browser/gpu/objectCollectionBuffer.js +117 -0
- package/vscode/src/vs/editor/browser/gpu/raster/glyphRasterizer.js +152 -0
- package/vscode/src/vs/editor/browser/gpu/rectangleRenderer.js +186 -0
- package/vscode/src/vs/editor/browser/gpu/rectangleRenderer.wgsl.js +63 -0
- package/vscode/src/vs/editor/browser/gpu/taskQueue.js +69 -0
- package/vscode/src/vs/editor/browser/gpu/viewGpuContext.js +86 -0
- package/vscode/src/vs/editor/browser/observableCodeEditor.js +7 -39
- package/vscode/src/vs/editor/browser/services/abstractCodeEditorService.js +18 -28
- package/vscode/src/vs/editor/browser/services/editorWorkerService.js +1 -2
- package/vscode/src/vs/editor/browser/services/hoverService/hoverService.js +5 -7
- package/vscode/src/vs/editor/browser/services/hoverService/hoverWidget.js +61 -69
- package/vscode/src/vs/editor/browser/services/hoverService/updatableHoverWidget.js +2 -3
- package/vscode/src/vs/editor/browser/services/markerDecorations.js +2 -2
- package/vscode/src/vs/editor/browser/stableEditorScroll.js +2 -3
- package/vscode/src/vs/editor/browser/view/domLineBreaksComputer.js +21 -27
- package/vscode/src/vs/editor/browser/view/renderingContext.js +4 -3
- package/vscode/src/vs/editor/browser/view/viewController.js +4 -5
- package/vscode/src/vs/editor/browser/view/viewLayer.js +1 -2
- package/vscode/src/vs/editor/browser/view/viewOverlays.js +8 -9
- package/vscode/src/vs/editor/browser/view/viewPart.js +2 -15
- package/vscode/src/vs/editor/browser/view/viewUserInputEvents.js +1 -2
- package/vscode/src/vs/editor/browser/view.js +74 -26
- package/vscode/src/vs/editor/browser/viewParts/blockDecorations/blockDecorations.js +1 -2
- package/vscode/src/vs/editor/browser/viewParts/contentWidgets/contentWidgets.js +17 -20
- package/vscode/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.js +6 -7
- package/vscode/src/vs/editor/browser/viewParts/decorations/decorations.js +2 -3
- package/vscode/src/vs/editor/browser/viewParts/editorScrollbar/editorScrollbar.js +17 -19
- package/vscode/src/vs/editor/browser/viewParts/glyphMargin/glyphMargin.js +10 -16
- package/vscode/src/vs/editor/browser/viewParts/indentGuides/indentGuides.js +6 -7
- package/vscode/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.js +8 -9
- package/vscode/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.js +2 -3
- package/vscode/src/vs/editor/browser/viewParts/margin/margin.js +4 -5
- package/vscode/src/vs/editor/browser/viewParts/minimap/minimap.js +28 -34
- 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 +7 -20
- package/vscode/src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.js +12 -14
- package/vscode/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.js +19 -37
- package/vscode/src/vs/editor/browser/viewParts/overviewRuler/overviewRuler.js +6 -7
- package/vscode/src/vs/editor/browser/viewParts/rulers/rulers.js +4 -5
- package/vscode/src/vs/editor/browser/viewParts/rulersGpu/rulersGpu.js +57 -0
- package/vscode/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.js +3 -4
- package/vscode/src/vs/editor/browser/viewParts/selections/selections.js +26 -33
- package/vscode/src/vs/editor/browser/viewParts/viewCursors/viewCursor.js +9 -9
- package/vscode/src/vs/editor/browser/viewParts/viewCursors/viewCursors.js +24 -23
- package/vscode/src/vs/editor/browser/viewParts/{lines → viewLines}/rangeUtil.js +3 -4
- package/vscode/src/vs/editor/browser/viewParts/{lines → viewLines}/viewLine.js +23 -59
- package/vscode/src/vs/editor/browser/viewParts/viewLines/viewLineOptions.js +40 -0
- package/vscode/src/vs/editor/browser/viewParts/{lines → viewLines}/viewLines.js +33 -36
- package/vscode/src/vs/editor/browser/viewParts/viewLinesGpu/viewLinesGpu.js +299 -0
- package/vscode/src/vs/editor/browser/viewParts/viewZones/viewZones.js +5 -6
- package/vscode/src/vs/editor/browser/viewParts/whitespace/whitespace.js +16 -18
- package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorContributions.js +11 -12
- package/vscode/src/vs/editor/browser/widget/codeEditor/codeEditorWidget.js +105 -113
- package/vscode/src/vs/editor/browser/widget/codeEditor/editor.css.js +1 -1
- package/vscode/src/vs/editor/browser/widget/diffEditor/commands.js +17 -19
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/accessibleDiffViewer.js +40 -40
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorDecorations.js +3 -2
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorEditors.js +3 -3
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorSash.js +7 -6
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/diffEditorViewZones.js +15 -17
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/inlineDiffDeletedCodeMargin.js +13 -16
- package/vscode/src/vs/editor/browser/widget/diffEditor/components/diffEditorViewZones/renderLines.js +10 -10
- package/vscode/src/vs/editor/browser/widget/diffEditor/delegatingEditorImpl.js +18 -19
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditor.contribution.js +5 -5
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorOptions.js +13 -12
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorViewModel.js +14 -18
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffEditorWidget.js +29 -30
- package/vscode/src/vs/editor/browser/widget/diffEditor/diffProviderFactoryService.js +2 -2
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/gutterFeature.js +52 -53
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/hideUnchangedRegionsFeature.js +25 -27
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/movedBlocksLinesFeature.js +7 -6
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/overviewRulerFeature.js +4 -4
- package/vscode/src/vs/editor/browser/widget/diffEditor/features/revertButtonsFeature.js +5 -4
- package/vscode/src/vs/editor/browser/widget/diffEditor/registrations.contribution.js +5 -5
- package/vscode/src/vs/editor/browser/widget/diffEditor/utils/editorGutter.js +4 -3
- package/vscode/src/vs/editor/browser/widget/diffEditor/utils.js +3 -2
- package/vscode/src/vs/editor/browser/widget/markdownRenderer/browser/markdownRenderer.js +5 -3
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/colors.js +3 -3
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/diffEditorItemTemplate.js +8 -7
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorViewModel.js +16 -8
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget.js +9 -10
- package/vscode/src/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidgetImpl.js +26 -15
- package/vscode/src/vs/editor/common/commands/replaceCommand.js +2 -2
- package/vscode/src/vs/editor/common/commands/shiftCommand.js +5 -6
- package/vscode/src/vs/editor/common/commands/trimTrailingWhitespaceCommand.js +1 -2
- package/vscode/src/vs/editor/common/config/editorConfigurationSchema.js +64 -52
- package/vscode/src/vs/editor/common/config/editorOptions.d.ts +15 -0
- package/vscode/src/vs/editor/common/config/editorOptions.js +619 -732
- package/vscode/src/vs/editor/common/config/fontInfo.js +8 -8
- package/vscode/src/vs/editor/common/core/characterClassifier.js +3 -8
- package/vscode/src/vs/editor/common/core/cursorColumns.js +4 -5
- package/vscode/src/vs/editor/common/core/editorColorRegistry.js +72 -72
- package/vscode/src/vs/editor/common/core/eolCounter.js +8 -16
- package/vscode/src/vs/editor/common/core/offsetEdit.js +248 -0
- package/vscode/src/vs/editor/common/core/offsetRange.d.ts +2 -0
- package/vscode/src/vs/editor/common/core/offsetRange.js +8 -0
- package/vscode/src/vs/editor/common/core/selection.js +7 -12
- package/vscode/src/vs/editor/common/core/textEdit.d.ts +22 -1
- package/vscode/src/vs/editor/common/core/textEdit.js +49 -3
- package/vscode/src/vs/editor/common/core/textLength.d.ts +2 -0
- package/vscode/src/vs/editor/common/core/textLength.js +6 -0
- package/vscode/src/vs/editor/common/core/wordCharacterClassifier.js +5 -12
- package/vscode/src/vs/editor/common/cursor/cursor.js +31 -34
- package/vscode/src/vs/editor/common/cursor/cursorAtomicMoveOperations.js +10 -17
- 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 +50 -52
- package/vscode/src/vs/editor/common/cursor/cursorMoveOperations.js +12 -14
- package/vscode/src/vs/editor/common/cursor/cursorTypeEditOperations.js +32 -34
- package/vscode/src/vs/editor/common/cursor/cursorTypeOperations.js +2 -2
- package/vscode/src/vs/editor/common/cursor/cursorWordOperations.js +65 -79
- package/vscode/src/vs/editor/common/cursor/oneCursor.js +6 -7
- package/vscode/src/vs/editor/common/cursorCommon.js +38 -54
- package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/algorithms/diffAlgorithm.js +0 -1
- package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/defaultLinesDiffComputer.js +8 -58
- package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/lineSequence.js +1 -2
- package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/linesSliceCharSequence.js +30 -43
- package/vscode/src/vs/editor/common/diff/defaultLinesDiffComputer/utils.js +1 -2
- package/vscode/src/vs/editor/common/diff/legacyLinesDiffComputer.js +4 -5
- package/vscode/src/vs/editor/common/diff/rangeMapping.d.ts +5 -1
- package/vscode/src/vs/editor/common/diff/rangeMapping.js +80 -1
- package/vscode/src/vs/editor/common/editorCommon.js +1 -16
- package/vscode/src/vs/editor/common/editorContextKeys.js +46 -47
- package/vscode/src/vs/editor/common/encodedTokenAttributes.js +19 -71
- package/vscode/src/vs/editor/common/languages/autoIndent.js +6 -8
- package/vscode/src/vs/editor/common/languages/languageConfiguration.js +7 -9
- package/vscode/src/vs/editor/common/languages/languageConfigurationRegistry.js +2 -2
- package/vscode/src/vs/editor/common/languages/linkComputer.js +69 -94
- package/vscode/src/vs/editor/common/languages/modesRegistry.js +1 -1
- package/vscode/src/vs/editor/common/languages/nullTokenize.js +5 -6
- package/vscode/src/vs/editor/common/languages/supports/indentRules.js +5 -12
- package/vscode/src/vs/editor/common/languages/supports/indentationLineProcessor.js +3 -4
- package/vscode/src/vs/editor/common/languages/supports/onEnter.js +3 -4
- package/vscode/src/vs/editor/common/languages/supports/tokenization.js +24 -25
- package/vscode/src/vs/editor/common/languages/supports.js +1 -6
- package/vscode/src/vs/editor/common/languages/textToHtmlTokenizer.js +12 -14
- package/vscode/src/vs/editor/common/languages.d.ts +23 -3
- package/vscode/src/vs/editor/common/languages.js +119 -205
- package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/ast.js +10 -18
- package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/bracketPairsTree.js +16 -18
- 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 +7 -8
- package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/bracketPairsTree/tokenizer.js +33 -15
- package/vscode/src/vs/editor/common/model/bracketPairsTextModelPart/fixBrackets.js +4 -5
- package/vscode/src/vs/editor/common/model/editStack.js +5 -7
- package/vscode/src/vs/editor/common/model/indentationGuesser.js +6 -7
- package/vscode/src/vs/editor/common/model/intervalTree.js +71 -119
- package/vscode/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeBase.js +16 -17
- package/vscode/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBuffer.js +11 -11
- package/vscode/src/vs/editor/common/model/pieceTreeTextBuffer/pieceTreeTextBufferBuilder.js +3 -5
- package/vscode/src/vs/editor/common/model/pieceTreeTextBuffer/rbTreeBase.js +41 -46
- package/vscode/src/vs/editor/common/model/textModel.js +27 -35
- package/vscode/src/vs/editor/common/model/textModelSearch.js +14 -15
- package/vscode/src/vs/editor/common/model/textModelText.js +3 -0
- package/vscode/src/vs/editor/common/model/textModelTokens.js +18 -16
- package/vscode/src/vs/editor/common/model/tokenizationTextModelPart.js +10 -14
- package/vscode/src/vs/editor/common/model/tokens.js +1 -2
- package/vscode/src/vs/editor/common/model/treeSitterTokens.js +10 -4
- package/vscode/src/vs/editor/common/model/utils.js +2 -3
- package/vscode/src/vs/editor/common/model.d.ts +5 -0
- package/vscode/src/vs/editor/common/model.js +1 -46
- 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/languageFeatureDebounce.js +2 -2
- package/vscode/src/vs/editor/common/services/languageFeaturesService.js +2 -2
- package/vscode/src/vs/editor/common/services/languageService.js +4 -4
- package/vscode/src/vs/editor/common/services/languagesRegistry.js +3 -4
- package/vscode/src/vs/editor/common/services/markerDecorationsService.js +18 -19
- package/vscode/src/vs/editor/common/services/modelService.js +8 -9
- package/vscode/src/vs/editor/common/services/semanticTokensDto.js +3 -8
- package/vscode/src/vs/editor/common/services/semanticTokensProviderStyling.js +15 -27
- package/vscode/src/vs/editor/common/services/semanticTokensStylingService.js +2 -2
- package/vscode/src/vs/editor/common/services/treeSitterParserService.js +2 -1
- package/vscode/src/vs/editor/common/services/treeViewsDndService.js +2 -2
- package/vscode/src/vs/editor/common/services/unicodeTextModelHighlighter.js +18 -31
- package/vscode/src/vs/editor/common/standalone/standaloneEnums.js +116 -114
- package/vscode/src/vs/editor/common/standaloneStrings.js +32 -32
- package/vscode/src/vs/editor/common/textModelEvents.js +6 -14
- package/vscode/src/vs/editor/common/tokenizationRegistry.js +2 -3
- package/vscode/src/vs/editor/common/tokenizationTextModelPart.js +13 -6
- package/vscode/src/vs/editor/common/tokens/contiguousTokensStore.js +7 -7
- package/vscode/src/vs/editor/common/tokens/lineTokens.d.ts +10 -7
- package/vscode/src/vs/editor/common/tokens/lineTokens.js +48 -33
- package/vscode/src/vs/editor/common/tokens/sparseMultilineTokens.js +4 -5
- package/vscode/src/vs/editor/common/tokens/sparseTokensStore.js +6 -7
- package/vscode/src/vs/editor/common/tokens/tokenArray.d.ts +25 -0
- package/vscode/src/vs/editor/common/tokens/tokenArray.js +53 -0
- package/vscode/src/vs/editor/common/viewEventHandler.js +18 -19
- package/vscode/src/vs/editor/common/viewEvents.js +19 -50
- package/vscode/src/vs/editor/common/viewLayout/lineDecorations.js +6 -9
- package/vscode/src/vs/editor/common/viewLayout/linePart.js +3 -12
- package/vscode/src/vs/editor/common/viewLayout/viewLayout.js +23 -25
- package/vscode/src/vs/editor/common/viewLayout/viewLineRenderer.js +74 -99
- package/vscode/src/vs/editor/common/viewModel/minimapTokensColorTracker.js +2 -3
- package/vscode/src/vs/editor/common/viewModel/modelLineProjection.js +23 -7
- package/vscode/src/vs/editor/common/viewModel/monospaceLineBreaksComputer.js +19 -30
- package/vscode/src/vs/editor/common/viewModel/overviewZoneManager.js +1 -5
- package/vscode/src/vs/editor/common/viewModel/viewModelDecorations.js +9 -11
- package/vscode/src/vs/editor/common/viewModel/viewModelImpl.js +41 -45
- package/vscode/src/vs/editor/common/viewModel/viewModelLines.js +8 -15
- package/vscode/src/vs/editor/common/viewModel.js +2 -9
- package/vscode/src/vs/editor/common/viewModelEventDispatcher.js +14 -30
- package/vscode/src/vs/editor/contrib/anchorSelect/browser/anchorSelect.js +16 -18
- package/vscode/src/vs/editor/contrib/bracketMatching/browser/bracketMatching.js +18 -21
- package/vscode/src/vs/editor/contrib/caretOperations/browser/caretOperations.js +2 -2
- package/vscode/src/vs/editor/contrib/caretOperations/browser/transpose.js +3 -5
- package/vscode/src/vs/editor/contrib/clipboard/browser/clipboard.js +47 -44
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeAction.js +3 -4
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionCommands.js +45 -47
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionContributions.js +10 -10
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionController.js +14 -16
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionKeybindingResolver.js +2 -2
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionMenu.js +11 -12
- package/vscode/src/vs/editor/contrib/codeAction/browser/codeActionModel.js +18 -20
- package/vscode/src/vs/editor/contrib/codeAction/browser/lightBulbWidget.js +28 -31
- package/vscode/src/vs/editor/contrib/codeAction/common/types.js +4 -10
- package/vscode/src/vs/editor/contrib/codelens/browser/codeLensCache.js +6 -6
- package/vscode/src/vs/editor/contrib/codelens/browser/codelensController.js +14 -15
- package/vscode/src/vs/editor/contrib/codelens/browser/codelensWidget.js +2 -4
- package/vscode/src/vs/editor/contrib/colorPicker/browser/color.js +2 -23
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorDetector.js +6 -9
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerContribution.js +42 -0
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerParticipantUtils.js +51 -0
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerBody.js +71 -0
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerCloseButton.js +28 -0
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerHeader.js +75 -0
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerInsertButton.js +21 -0
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerSaturationBox.js +101 -0
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerParts/colorPickerStrip.js +92 -0
- package/vscode/src/vs/editor/contrib/colorPicker/browser/defaultDocumentColorProvider.js +1 -3
- package/vscode/src/vs/editor/contrib/colorPicker/browser/{colorContributions.js → hoverColorPicker/hoverColorPickerContribution.js} +9 -17
- package/vscode/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerParticipant.js +131 -0
- package/vscode/src/vs/editor/contrib/colorPicker/browser/hoverColorPicker/hoverColorPickerWidget.js +30 -0
- package/vscode/src/vs/editor/contrib/colorPicker/browser/{standaloneColorPickerActions.js → standaloneColorPicker/standaloneColorPickerActions.js} +17 -23
- package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerController.js +48 -0
- package/vscode/src/vs/editor/contrib/colorPicker/browser/standaloneColorPicker/standaloneColorPickerParticipant.js +115 -0
- package/vscode/src/vs/editor/contrib/colorPicker/browser/{standaloneColorPickerWidget.js → standaloneColorPicker/standaloneColorPickerWidget.js} +22 -69
- package/vscode/src/vs/editor/contrib/comment/browser/blockCommentCommand.js +4 -5
- package/vscode/src/vs/editor/contrib/comment/browser/comment.js +22 -24
- package/vscode/src/vs/editor/contrib/comment/browser/lineCommentCommand.js +12 -20
- package/vscode/src/vs/editor/contrib/contextmenu/browser/contextmenu.js +28 -33
- package/vscode/src/vs/editor/contrib/cursorUndo/browser/cursorUndo.js +6 -8
- package/vscode/src/vs/editor/contrib/diffEditorBreadcrumbs/browser/contribution.js +4 -4
- package/vscode/src/vs/editor/contrib/dnd/browser/dnd.js +12 -17
- package/vscode/src/vs/editor/contrib/documentSymbols/browser/outlineModel.js +2 -2
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteContribution.js +9 -11
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/copyPasteController.js +19 -20
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/defaultProviders.js +8 -8
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorContribution.js +9 -11
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/dropIntoEditorController.js +6 -7
- package/vscode/src/vs/editor/contrib/dropOrPasteInto/browser/postEditWidget.js +4 -6
- package/vscode/src/vs/editor/contrib/editorState/browser/editorState.js +9 -16
- package/vscode/src/vs/editor/contrib/editorState/browser/keybindingCancellation.js +5 -7
- package/vscode/src/vs/editor/contrib/find/browser/findController.js +101 -111
- package/vscode/src/vs/editor/contrib/find/browser/findDecorations.js +8 -8
- package/vscode/src/vs/editor/contrib/find/browser/findModel.js +25 -31
- package/vscode/src/vs/editor/contrib/find/browser/findOptionsWidget.js +1 -2
- package/vscode/src/vs/editor/contrib/find/browser/findState.js +11 -17
- package/vscode/src/vs/editor/contrib/find/browser/findWidget.js +71 -72
- package/vscode/src/vs/editor/contrib/find/browser/replacePattern.js +19 -25
- package/vscode/src/vs/editor/contrib/folding/browser/folding.js +111 -89
- package/vscode/src/vs/editor/contrib/folding/browser/foldingDecorations.js +22 -23
- package/vscode/src/vs/editor/contrib/folding/browser/foldingModel.js +6 -6
- package/vscode/src/vs/editor/contrib/folding/browser/foldingRanges.js +14 -20
- package/vscode/src/vs/editor/contrib/fontZoom/browser/fontZoom.js +3 -3
- package/vscode/src/vs/editor/contrib/format/browser/format.js +12 -23
- package/vscode/src/vs/editor/contrib/format/browser/formatActions.js +19 -21
- package/vscode/src/vs/editor/contrib/gotoError/browser/gotoError.js +22 -25
- package/vscode/src/vs/editor/contrib/gotoError/browser/gotoErrorWidget.js +19 -22
- package/vscode/src/vs/editor/contrib/gotoError/browser/markerNavigationService.js +2 -2
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/goToCommands.js +79 -80
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/link/clickLinkGesture.js +7 -9
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/link/goToDefinitionAtPosition.js +8 -10
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesController.js +31 -34
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesTree.js +3 -3
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/peek/referencesWidget.js +7 -11
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/referencesModel.js +14 -10
- package/vscode/src/vs/editor/contrib/gotoSymbol/browser/symbolNavigation.js +11 -13
- package/vscode/src/vs/editor/contrib/gpu/browser/gpuActions.js +119 -0
- package/vscode/src/vs/editor/contrib/hover/browser/contentHoverComputer.js +8 -21
- package/vscode/src/vs/editor/contrib/hover/browser/{contentHoverController2.js → contentHoverController.js} +9 -12
- package/vscode/src/vs/editor/contrib/hover/browser/contentHoverRendered.js +10 -9
- package/vscode/src/vs/editor/contrib/hover/browser/contentHoverTypes.js +8 -8
- package/vscode/src/vs/editor/contrib/hover/browser/contentHoverWidget.js +11 -15
- package/vscode/src/vs/editor/contrib/hover/browser/contentHoverWidgetWrapper.js +31 -39
- package/vscode/src/vs/editor/contrib/hover/browser/{marginHoverComputer.js → glyphHoverComputer.js} +6 -20
- package/vscode/src/vs/editor/contrib/hover/browser/{marginHoverController.js → glyphHoverController.js} +23 -25
- package/vscode/src/vs/editor/contrib/hover/browser/{marginHoverWidget.js → glyphHoverWidget.js} +30 -33
- package/vscode/src/vs/editor/contrib/hover/browser/hover.css.js +1 -1
- package/vscode/src/vs/editor/contrib/hover/browser/hoverAccessibleViews.js +12 -12
- package/vscode/src/vs/editor/contrib/hover/browser/hoverActionIds.js +2 -2
- package/vscode/src/vs/editor/contrib/hover/browser/hoverActions.js +50 -54
- package/vscode/src/vs/editor/contrib/hover/browser/hoverContribution.js +5 -5
- package/vscode/src/vs/editor/contrib/hover/browser/hoverOperation.js +64 -66
- package/vscode/src/vs/editor/contrib/hover/browser/hoverTypes.js +7 -12
- package/vscode/src/vs/editor/contrib/hover/browser/markdownHoverParticipant.js +21 -19
- package/vscode/src/vs/editor/contrib/hover/browser/markerHoverParticipant.js +11 -13
- package/vscode/src/vs/editor/contrib/hover/browser/resizableContentWidget.js +4 -6
- package/vscode/src/vs/editor/contrib/inPlaceReplace/browser/inPlaceReplace.js +13 -12
- package/vscode/src/vs/editor/contrib/indentation/browser/indentation.js +27 -30
- package/vscode/src/vs/editor/contrib/indentation/common/indentation.js +1 -2
- package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsContribution.js +2 -2
- package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsController.js +101 -42
- package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsHover.js +10 -12
- package/vscode/src/vs/editor/contrib/inlayHints/browser/inlayHintsLocations.js +2 -3
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/controller/commands.js +88 -35
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionContextKeys.js +14 -7
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/controller/inlineCompletionsController.js +96 -54
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/hoverParticipant.js +12 -13
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/hintsWidget/inlineCompletionsHintsWidget.js +15 -17
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletions.contribution.js +10 -6
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/inlineCompletionsAccessibleView.js +3 -4
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/{singleTextEdit.js → computeGhostText.js} +3 -23
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsModel.js +94 -47
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/inlineCompletionsSource.js +63 -21
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEdit.js +12 -0
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/inlineEditsAdapter.js +83 -0
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/provideInlineCompletions.js +6 -3
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/singleTextEditHelpers.js +25 -0
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/model/suggestWidgetAdaptor.js +3 -3
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/utils.js +44 -19
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/{ghostTextView.css.js → ghostText/ghostTextView.css.js} +2 -2
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/ghostText/ghostTextView.js +295 -0
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.css.js +4 -0
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/inlineEditsView.js +357 -0
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/inlineEdits/utils.js +70 -0
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/commands.js +10 -12
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/ghostTextWidget.js +20 -14
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEdit.contribution.js +2 -2
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEditController.js +21 -17
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEditHintsWidget.js +6 -8
- package/vscode/src/vs/editor/contrib/inlineEdit/browser/inlineEditSideBySideWidget.js +6 -6
- package/vscode/src/vs/editor/contrib/inlineProgress/browser/inlineProgress.js +4 -7
- package/vscode/src/vs/editor/contrib/lineSelection/browser/lineSelection.js +4 -7
- package/vscode/src/vs/editor/contrib/linesOperations/browser/copyLinesCommand.js +2 -2
- package/vscode/src/vs/editor/contrib/linesOperations/browser/linesOperations.js +33 -35
- package/vscode/src/vs/editor/contrib/linesOperations/browser/moveLinesCommand.js +2 -4
- package/vscode/src/vs/editor/contrib/linkedEditing/browser/linkedEditing.js +12 -16
- package/vscode/src/vs/editor/contrib/links/browser/links.js +20 -23
- package/vscode/src/vs/editor/contrib/longLinesHelper/browser/longLinesHelper.js +4 -6
- package/vscode/src/vs/editor/contrib/message/browser/messageController.js +10 -15
- package/vscode/src/vs/editor/contrib/multicursor/browser/multicursor.js +73 -75
- package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHints.js +14 -16
- package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHintsModel.js +16 -18
- package/vscode/src/vs/editor/contrib/parameterHints/browser/parameterHintsWidget.js +8 -9
- package/vscode/src/vs/editor/contrib/peekView/browser/peekView.js +24 -25
- package/vscode/src/vs/editor/contrib/placeholderText/browser/placeholderText.contribution.js +3 -3
- package/vscode/src/vs/editor/contrib/placeholderText/browser/placeholderTextContribution.js +7 -7
- package/vscode/src/vs/editor/contrib/quickAccess/browser/editorNavigationQuickAccess.js +2 -4
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoLineQuickAccess.js +8 -10
- package/vscode/src/vs/editor/contrib/quickAccess/browser/gotoSymbolQuickAccess.js +36 -37
- package/vscode/src/vs/editor/contrib/readOnlyMessage/browser/contribution.js +5 -6
- package/vscode/src/vs/editor/contrib/rename/browser/rename.js +31 -33
- package/vscode/src/vs/editor/contrib/rename/browser/renameWidget.js +17 -21
- package/vscode/src/vs/editor/contrib/sectionHeaders/browser/sectionHeaders.js +12 -15
- package/vscode/src/vs/editor/contrib/semanticTokens/browser/viewportSemanticTokens.js +2 -2
- package/vscode/src/vs/editor/contrib/smartSelect/browser/smartSelect.js +15 -18
- package/vscode/src/vs/editor/contrib/smartSelect/browser/wordSelections.js +2 -3
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetController2.js +14 -17
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetParser.js +81 -100
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetSession.js +7 -10
- package/vscode/src/vs/editor/contrib/snippet/browser/snippetVariables.js +4 -4
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollActions.js +16 -18
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollContribution.js +2 -2
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.js +19 -20
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollModelProvider.js +1 -2
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollProvider.js +2 -3
- package/vscode/src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.js +12 -14
- package/vscode/src/vs/editor/contrib/suggest/browser/completionModel.js +10 -18
- package/vscode/src/vs/editor/contrib/suggest/browser/media/suggest.css.js +1 -1
- package/vscode/src/vs/editor/contrib/suggest/browser/suggest.js +24 -32
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestCommitCharacters.js +2 -4
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestController.js +79 -93
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.js +4 -6
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestMemory.js +6 -6
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestModel.js +57 -66
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidget.js +101 -98
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetDetails.js +12 -8
- package/vscode/src/vs/editor/contrib/suggest/browser/suggestWidgetRenderer.js +11 -12
- package/vscode/src/vs/editor/contrib/suggest/browser/wordContextKey.js +2 -3
- package/vscode/src/vs/editor/contrib/suggest/browser/wordDistance.js +2 -4
- package/vscode/src/vs/editor/contrib/symbolIcons/browser/symbolIcons.js +33 -33
- package/vscode/src/vs/editor/contrib/toggleTabFocusMode/browser/toggleTabFocusMode.js +8 -10
- package/vscode/src/vs/editor/contrib/tokenization/browser/tokenization.js +1 -1
- package/vscode/src/vs/editor/contrib/unicodeHighlighter/browser/unicodeHighlighter.js +49 -52
- package/vscode/src/vs/editor/contrib/unusualLineTerminators/browser/unusualLineTerminators.js +11 -12
- package/vscode/src/vs/editor/contrib/wordHighlighter/browser/highlightDecorations.js +19 -19
- package/vscode/src/vs/editor/contrib/wordHighlighter/browser/wordHighlighter.js +87 -62
- package/vscode/src/vs/editor/contrib/wordOperations/browser/wordOperations.js +51 -55
- package/vscode/src/vs/editor/contrib/wordPartOperations/browser/wordPartOperations.js +19 -21
- package/vscode/src/vs/editor/contrib/zoneWidget/browser/zoneWidget.js +9 -12
- package/vscode/src/vs/editor/editor.api.d.ts +3 -0
- package/vscode/src/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.js +4 -6
- package/vscode/src/vs/editor/standalone/browser/quickInput/standaloneQuickInputService.js +3 -4
- package/vscode/src/vs/editor/standalone/browser/standaloneCodeEditorService.js +4 -5
- package/vscode/src/vs/editor/standalone/browser/standaloneLayoutService.js +4 -4
- package/vscode/src/vs/editor/standalone/browser/standaloneServices.js +44 -47
- package/vscode/src/vs/editor/standalone/browser/standaloneThemeService.js +5 -5
- package/vscode/src/vs/editor/standalone/browser/standaloneTreeSitterService.js +4 -0
- package/vscode/src/vs/nls.js +1 -1
- package/vscode/src/vs/platform/accessibility/browser/accessibilityService.js +3 -3
- package/vscode/src/vs/platform/accessibility/browser/accessibleView.js +1 -31
- package/vscode/src/vs/platform/accessibility/common/accessibility.js +1 -7
- package/vscode/src/vs/platform/accessibilitySignal/browser/accessibilitySignalService.js +52 -51
- package/vscode/src/vs/platform/action/common/actionCommonCategories.js +6 -6
- package/vscode/src/vs/platform/actionWidget/browser/actionList.js +12 -17
- package/vscode/src/vs/platform/actionWidget/browser/actionWidget.js +21 -23
- package/vscode/src/vs/platform/actions/browser/actionViewItemService.service.js +3 -0
- package/vscode/src/vs/platform/actions/browser/buttonbar.js +3 -3
- package/vscode/src/vs/platform/actions/browser/dropdownWithPrimaryActionViewItem.js +7 -6
- package/vscode/src/vs/platform/actions/browser/menuEntryActionViewItem.js +9 -11
- package/vscode/src/vs/platform/actions/browser/toolbar.js +34 -17
- package/vscode/src/vs/platform/actions/common/actions.contribution.js +0 -1
- package/vscode/src/vs/platform/actions/common/actions.d.ts +9 -12
- package/vscode/src/vs/platform/actions/common/actions.js +8 -11
- package/vscode/src/vs/platform/actions/common/menuResetAction.js +1 -1
- package/vscode/src/vs/platform/actions/common/menuService.js +6 -7
- package/vscode/src/vs/platform/clipboard/browser/clipboardService.js +20 -0
- package/vscode/src/vs/platform/clipboard/common/clipboardService.service.d.ts +5 -0
- package/vscode/src/vs/platform/configuration/common/configuration.js +8 -8
- package/vscode/src/vs/platform/configuration/common/configurationModels.js +3 -4
- package/vscode/src/vs/platform/configuration/common/configurationRegistry.js +31 -31
- package/vscode/src/vs/platform/contextkey/browser/contextKeyService.js +3 -5
- package/vscode/src/vs/platform/contextkey/common/contextkey.js +89 -109
- package/vscode/src/vs/platform/contextkey/common/contextkeys.js +10 -10
- package/vscode/src/vs/platform/contextkey/common/scanner.js +74 -99
- package/vscode/src/vs/platform/contextview/browser/contextView.service.d.ts +2 -2
- package/vscode/src/vs/platform/contextview/browser/contextViewService.js +6 -6
- package/vscode/src/vs/platform/dialogs/common/dialogs.js +9 -9
- package/vscode/src/vs/platform/dialogs/common/dialogs.service.d.ts +1 -1
- package/vscode/src/vs/platform/dnd/browser/dnd.js +1 -1
- package/vscode/src/vs/platform/editor/common/editor.js +1 -14
- package/vscode/src/vs/platform/extensionManagement/common/extensionEnablementService.js +8 -9
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.js +80 -127
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagement.service.d.ts +1 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionManagementUtil.js +3 -3
- package/vscode/src/vs/platform/extensionManagement/common/extensionNls.js +1 -1
- package/vscode/src/vs/platform/extensionManagement/common/extensionStorage.js +12 -13
- package/vscode/src/vs/platform/extensionManagement/common/extensionsProfileScannerService.js +9 -16
- package/vscode/src/vs/platform/extensionManagement/common/extensionsScannerService.js +35 -35
- package/vscode/src/vs/platform/extensionResourceLoader/common/extensionResourceLoader.js +4 -6
- package/vscode/src/vs/platform/extensions/common/extensionValidator.js +42 -27
- package/vscode/src/vs/platform/extensions/common/extensions.js +1 -22
- package/vscode/src/vs/platform/extensions/common/extensionsApiProposals.js +2 -7
- package/vscode/src/vs/platform/externalServices/common/serviceMachineId.js +2 -3
- package/vscode/src/vs/platform/files/browser/htmlFileSystemProvider.js +6 -6
- package/vscode/src/vs/platform/files/common/files.js +25 -53
- package/vscode/src/vs/platform/files/common/inMemoryFilesystemProvider.js +10 -10
- package/vscode/src/vs/platform/history/browser/contextScopedHistoryWidget.js +8 -9
- package/vscode/src/vs/platform/hover/browser/hover.js +1 -2
- package/vscode/src/vs/platform/instantiation/common/extensions.js +1 -6
- package/vscode/src/vs/platform/instantiation/common/instantiation.d.ts +1 -1
- package/vscode/src/vs/platform/instantiation/common/instantiationService.js +5 -12
- package/vscode/src/vs/platform/keybinding/common/abstractKeybindingService.js +10 -11
- package/vscode/src/vs/platform/keybinding/common/keybindingResolver.js +9 -15
- package/vscode/src/vs/platform/keybinding/common/keybindingsRegistry.js +4 -12
- package/vscode/src/vs/platform/keybinding/common/resolvedKeybindingItem.js +1 -2
- package/vscode/src/vs/platform/keybinding/common/usLayoutResolvedKeybinding.js +63 -64
- package/vscode/src/vs/platform/languagePacks/common/languagePacks.js +1 -1
- package/vscode/src/vs/platform/languagePacks/common/localizedStrings.js +3 -3
- package/vscode/src/vs/platform/list/browser/listService.js +31 -38
- package/vscode/src/vs/platform/log/common/bufferLog.js +4 -3
- package/vscode/src/vs/platform/markers/common/markers.js +4 -9
- package/vscode/src/vs/platform/observable/common/platformObservableUtils.js +4 -2
- package/vscode/src/vs/platform/observable/common/wrapInHotClass.js +25 -0
- package/vscode/src/vs/platform/observable/common/wrapInReloadableClass.js +8 -43
- package/vscode/src/vs/platform/opener/browser/link.js +1 -2
- package/vscode/src/vs/platform/product/common/product.js +1 -1
- package/vscode/src/vs/platform/progress/common/progress.js +1 -10
- package/vscode/src/vs/platform/quickinput/browser/quickInput.js +16 -17
- package/vscode/src/vs/platform/quickinput/browser/quickInputActions.js +32 -33
- package/vscode/src/vs/platform/quickinput/browser/quickInputBox.js +2 -3
- package/vscode/src/vs/platform/quickinput/browser/quickInputController.js +10 -11
- package/vscode/src/vs/platform/quickinput/browser/quickInputTree.js +9 -12
- package/vscode/src/vs/platform/quickinput/browser/quickInputUtils.js +2 -3
- package/vscode/src/vs/platform/quickinput/browser/quickPickPin.js +4 -5
- package/vscode/src/vs/platform/quickinput/common/quickInput.js +1 -7
- package/vscode/src/vs/platform/remote/common/remoteAgentConnection.js +15 -29
- package/vscode/src/vs/platform/remote/common/remoteAuthorityResolver.js +3 -8
- package/vscode/src/vs/platform/request/common/request.js +31 -26
- package/vscode/src/vs/platform/storage/common/storage.js +22 -22
- package/vscode/src/vs/platform/telemetry/common/telemetry.js +1 -15
- package/vscode/src/vs/platform/telemetry/common/telemetryUtils.js +12 -12
- package/vscode/src/vs/platform/terminal/common/capabilities/bufferMarkCapability.js +41 -0
- package/vscode/src/vs/platform/terminal/common/capabilities/commandDetection/promptInputModel.js +345 -0
- package/vscode/src/vs/platform/terminal/common/capabilities/commandDetection/terminalCommand.js +296 -0
- package/vscode/src/vs/platform/terminal/common/capabilities/commandDetectionCapability.js +761 -0
- package/vscode/src/vs/platform/terminal/common/capabilities/cwdDetectionCapability.js +29 -0
- package/vscode/src/vs/platform/terminal/common/capabilities/naiveCwdDetectionCapability.js +22 -0
- package/vscode/src/vs/platform/terminal/common/capabilities/partialCommandDetectionCapability.js +48 -0
- package/vscode/src/vs/platform/terminal/common/capabilities/terminalCapabilityStore.js +94 -0
- package/vscode/src/vs/platform/terminal/common/environmentVariable.js +7 -0
- package/vscode/src/vs/platform/terminal/common/environmentVariableCollection.js +196 -0
- package/vscode/src/vs/platform/terminal/common/terminal.js +1 -155
- package/vscode/src/vs/platform/terminal/common/terminalEnvironment.js +40 -0
- package/vscode/src/vs/platform/terminal/common/terminalProfiles.js +107 -0
- package/vscode/src/vs/platform/terminal/common/terminalRecorder.js +67 -0
- package/vscode/src/vs/platform/terminal/common/xterm/shellIntegrationAddon.js +346 -0
- package/vscode/src/vs/platform/theme/common/colorUtils.js +17 -27
- package/vscode/src/vs/platform/theme/common/colors/baseColors.js +17 -17
- package/vscode/src/vs/platform/theme/common/colors/chartsColors.js +9 -9
- package/vscode/src/vs/platform/theme/common/colors/editorColors.js +93 -93
- package/vscode/src/vs/platform/theme/common/colors/inputColors.js +45 -45
- package/vscode/src/vs/platform/theme/common/colors/listColors.js +36 -36
- package/vscode/src/vs/platform/theme/common/colors/menuColors.js +7 -7
- package/vscode/src/vs/platform/theme/common/colors/minimapColors.js +11 -11
- package/vscode/src/vs/platform/theme/common/colors/miscColors.js +8 -8
- package/vscode/src/vs/platform/theme/common/colors/quickpickColors.js +9 -9
- package/vscode/src/vs/platform/theme/common/colors/searchColors.js +3 -3
- package/vscode/src/vs/platform/theme/common/iconRegistry.js +5 -5
- package/vscode/src/vs/platform/theme/common/tokenClassificationRegistry.js +42 -42
- package/vscode/src/vs/platform/tunnel/common/tunnel.js +1 -3
- package/vscode/src/vs/platform/undoRedo/common/undoRedo.js +1 -6
- package/vscode/src/vs/platform/undoRedo/common/undoRedoService.js +44 -49
- package/vscode/src/vs/platform/update/common/update.js +10 -37
- package/vscode/src/vs/platform/uriIdentity/common/uriIdentityService.js +1 -3
- package/vscode/src/vs/platform/userDataProfile/common/userDataProfile.d.ts +2 -0
- package/vscode/src/vs/platform/userDataProfile/common/userDataProfile.js +146 -145
- package/vscode/src/vs/platform/userDataSync/common/abstractSynchronizer.js +60 -58
- package/vscode/src/vs/platform/userDataSync/common/userDataSync.js +14 -81
- package/vscode/src/vs/platform/userDataSync/common/userDataSyncMachines.js +6 -7
- package/vscode/src/vs/platform/userDataSync/common/userDataSyncStoreService.js +48 -49
- package/vscode/src/vs/platform/window/common/window.js +7 -23
- package/vscode/src/vs/platform/workspace/common/workspace.js +2 -8
- package/vscode/src/vs/workbench/api/browser/statusBarService.js +10 -16
- package/vscode/src/vs/workbench/api/common/extHost.api.impl.js +27 -14
- package/vscode/src/vs/workbench/api/common/extHost.common.services.js +28 -28
- package/vscode/src/vs/workbench/api/common/extHost.protocol.js +3 -65
- package/vscode/src/vs/workbench/api/common/extHostAuthentication.js +9 -4
- package/vscode/src/vs/workbench/api/common/extHostChatAgents2.js +56 -29
- package/vscode/src/vs/workbench/api/common/extHostCodeMapper.js +47 -0
- package/vscode/src/vs/workbench/api/common/extHostComments.js +17 -18
- package/vscode/src/vs/workbench/api/common/extHostConfiguration.js +9 -10
- package/vscode/src/vs/workbench/api/common/extHostCustomEditors.js +6 -11
- package/vscode/src/vs/workbench/api/common/extHostDebugService.js +45 -36
- package/vscode/src/vs/workbench/api/common/extHostDiagnostics.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostEditorTabs.js +19 -19
- package/vscode/src/vs/workbench/api/common/extHostExtensionService.js +4 -4
- package/vscode/src/vs/workbench/api/common/extHostFileSystem.js +15 -17
- package/vscode/src/vs/workbench/api/common/extHostFileSystemConsumer.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostFileSystemEventService.js +67 -30
- package/vscode/src/vs/workbench/api/common/extHostFileSystemInfo.js +1 -2
- package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js +117 -94
- package/vscode/src/vs/workbench/api/common/extHostLanguageModelTools.js +46 -9
- package/vscode/src/vs/workbench/api/common/extHostLanguageModels.js +43 -35
- package/vscode/src/vs/workbench/api/common/extHostLogService.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostNotebook.js +13 -11
- package/vscode/src/vs/workbench/api/common/extHostNotebookEditor.js +11 -6
- package/vscode/src/vs/workbench/api/common/extHostSCM.js +38 -30
- package/vscode/src/vs/workbench/api/common/extHostSearch.js +7 -0
- package/vscode/src/vs/workbench/api/common/extHostStatusBar.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostTask.js +2 -2
- package/vscode/src/vs/workbench/api/common/extHostTelemetry.js +6 -7
- package/vscode/src/vs/workbench/api/common/extHostTerminalService.js +7 -9
- package/vscode/src/vs/workbench/api/common/extHostTestItem.js +7 -7
- package/vscode/src/vs/workbench/api/common/extHostTesting.js +27 -33
- package/vscode/src/vs/workbench/api/common/extHostTimeline.js +1 -2
- package/vscode/src/vs/workbench/api/common/extHostTreeViews.js +1 -1
- package/vscode/src/vs/workbench/api/common/extHostTunnelService.js +5 -5
- package/vscode/src/vs/workbench/api/common/extHostTypeConverters.js +218 -193
- package/vscode/src/vs/workbench/api/common/extHostTypes.js +24 -26
- package/vscode/src/vs/workbench/api/common/extHostWebviewMessaging.js +22 -23
- package/vscode/src/vs/workbench/api/common/extHostWorkspace.js +14 -13
- package/vscode/src/vs/workbench/api/common/extensionHostMain.js +1 -1
- package/vscode/src/vs/workbench/api/common/jsonValidationExtensionPoint.js +14 -14
- 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 +39 -42
- package/vscode/src/vs/workbench/browser/actions/layoutActions.js +220 -215
- package/vscode/src/vs/workbench/browser/actions/textInputActions.js +8 -9
- package/vscode/src/vs/workbench/browser/actions/widgetNavigationCommands.js +7 -8
- package/vscode/src/vs/workbench/browser/actions/windowActions.js +46 -47
- package/vscode/src/vs/workbench/browser/actions/workspaceActions.js +37 -38
- package/vscode/src/vs/workbench/browser/actions/workspaceCommands.js +4 -4
- package/vscode/src/vs/workbench/browser/codeeditor.js +9 -12
- package/vscode/src/vs/workbench/browser/editor.js +2 -2
- package/vscode/src/vs/workbench/browser/labels.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.d.ts +2 -1
- package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarActions.js +19 -22
- package/vscode/src/vs/workbench/browser/parts/compositeBarActions.js +34 -20
- package/vscode/src/vs/workbench/browser/parts/editor/binaryDiffEditor.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/binaryEditor.js +3 -3
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbs.js +69 -70
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsControl.js +44 -45
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsModel.js +2 -4
- package/vscode/src/vs/workbench/browser/parts/editor/breadcrumbsPicker.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/diffEditorCommands.js +17 -18
- package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution._autosave.js +2 -2
- package/vscode/src/vs/workbench/browser/parts/editor/editorActions.js +316 -323
- package/vscode/src/vs/workbench/browser/parts/editor/editorAutoSave.js +27 -30
- package/vscode/src/vs/workbench/browser/parts/editor/editorCommands.js +100 -100
- package/vscode/src/vs/workbench/browser/parts/editor/editorGroupView.js +54 -58
- package/vscode/src/vs/workbench/browser/parts/editor/editorGroupWatermark.js +14 -15
- package/vscode/src/vs/workbench/browser/parts/editor/editorPane.js +3 -4
- package/vscode/src/vs/workbench/browser/parts/editor/editorPanes.js +24 -11
- package/vscode/src/vs/workbench/browser/parts/editor/editorPlaceholder.js +12 -14
- package/vscode/src/vs/workbench/browser/parts/editor/editorQuickAccess.js +11 -12
- package/vscode/src/vs/workbench/browser/parts/editor/editorStatus.js +81 -87
- package/vscode/src/vs/workbench/browser/parts/editor/editorTabsControl.js +21 -13
- package/vscode/src/vs/workbench/browser/parts/editor/editorsObserver.js +17 -19
- package/vscode/src/vs/workbench/browser/parts/editor/media/editorplaceholder.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/media/editortabscontrol.css.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/editor/multiEditorTabsControl.js +23 -26
- package/vscode/src/vs/workbench/browser/parts/editor/noEditorTabsControl.js +9 -2
- package/vscode/src/vs/workbench/browser/parts/editor/sideBySideEditor.js +16 -17
- package/vscode/src/vs/workbench/browser/parts/editor/singleEditorTabsControl.js +4 -4
- package/vscode/src/vs/workbench/browser/parts/editor/textCodeEditor.js +2 -3
- package/vscode/src/vs/workbench/browser/parts/editor/textDiffEditor.js +8 -10
- package/vscode/src/vs/workbench/browser/parts/editor/textEditor.js +11 -13
- package/vscode/src/vs/workbench/browser/parts/editor/textResourceEditor.js +4 -7
- package/vscode/src/vs/workbench/browser/parts/globalCompositeBar.js +25 -30
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsActions.js +17 -17
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsAlerts.js +5 -6
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCenter.js +14 -16
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsCommands.js +43 -44
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsList.js +6 -6
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsStatus.js +19 -21
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsToasts.js +10 -14
- package/vscode/src/vs/workbench/browser/parts/notifications/notificationsViewer.js +9 -10
- package/vscode/src/vs/workbench/browser/parts/paneCompositeBar.d.ts +4 -2
- package/vscode/src/vs/workbench/browser/parts/paneCompositePart.d.ts +1 -1
- package/vscode/src/vs/workbench/browser/parts/panel/panelActions.js +62 -61
- package/vscode/src/vs/workbench/browser/parts/panel/panelPart.d.ts +3 -1
- package/vscode/src/vs/workbench/browser/parts/titlebar/menubarControl.js +57 -61
- package/vscode/src/vs/workbench/browser/parts/titlebar/windowTitle.js +16 -23
- package/vscode/src/vs/workbench/browser/parts/views/checkbox.js +1 -1
- package/vscode/src/vs/workbench/browser/parts/views/treeView.js +8 -9
- package/vscode/src/vs/workbench/browser/parts/views/viewFilter.js +9 -10
- package/vscode/src/vs/workbench/browser/parts/views/viewPane.d.ts +1 -0
- package/vscode/src/vs/workbench/browser/parts/views/viewPane.js +18 -16
- package/vscode/src/vs/workbench/browser/parts/views/viewPaneContainer.js +54 -63
- package/vscode/src/vs/workbench/browser/quickaccess.js +1 -1
- package/vscode/src/vs/workbench/browser/window.js +18 -19
- package/vscode/src/vs/workbench/browser/workbench.contribution.js +257 -249
- package/vscode/src/vs/workbench/common/configuration.js +28 -30
- package/vscode/src/vs/workbench/common/contextkeys.js +70 -70
- package/vscode/src/vs/workbench/common/contributions.js +22 -23
- package/vscode/src/vs/workbench/common/editor/diffEditorInput.js +17 -17
- package/vscode/src/vs/workbench/common/editor/editorGroupModel.js +27 -27
- package/vscode/src/vs/workbench/common/editor/editorInput.js +7 -8
- package/vscode/src/vs/workbench/common/editor/editorOptions.js +4 -5
- package/vscode/src/vs/workbench/common/editor/filteredEditorGroupModel.js +6 -7
- package/vscode/src/vs/workbench/common/editor/resourceEditorInput.js +12 -13
- package/vscode/src/vs/workbench/common/editor/sideBySideEditorInput.js +8 -8
- package/vscode/src/vs/workbench/common/editor/textEditorModel.js +3 -4
- package/vscode/src/vs/workbench/common/editor.js +5 -53
- package/vscode/src/vs/workbench/common/memento.js +9 -10
- package/vscode/src/vs/workbench/common/notifications.js +11 -32
- package/vscode/src/vs/workbench/common/theme.js +156 -156
- package/vscode/src/vs/workbench/common/views.js +8 -8
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibilityConfiguration.js +170 -197
- package/vscode/src/vs/workbench/contrib/accessibility/browser/accessibleViewActions.js +66 -70
- package/vscode/src/vs/workbench/contrib/accessibility/browser/editorAccessibilityHelp.js +8 -11
- package/vscode/src/vs/workbench/contrib/callHierarchy/common/callHierarchy.js +1 -6
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatActions.js +161 -36
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatExecuteActions.js +35 -21
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatQuickInputActions.js +17 -14
- package/vscode/src/vs/workbench/contrib/chat/browser/actions/chatTitleActions.js +51 -33
- package/vscode/src/vs/workbench/contrib/chat/browser/chat.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatAccessibilityProvider.js +11 -17
- package/vscode/src/vs/workbench/contrib/chat/browser/chatAgentHover.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatAttachmentsContentPart.js +78 -28
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCodeCitationContentPart.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatCommandContentPart.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationContentPart.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatConfirmationWidget.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatMarkdownContentPart.js +29 -15
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatProgressContentPart.js +3 -3
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatReferencesContentPart.js +107 -34
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTextEditContentPart.js +2 -5
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatToolInvocationPart.js +68 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatContentParts/chatTreeContentPart.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatDragAndDrop.js +206 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditingService.js +751 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatEditorInput.js +3 -4
- package/vscode/src/vs/workbench/contrib/chat/browser/chatFollowups.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/chatImagePaste.js +73 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatInlineAnchorWidget.js +228 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/chatInputPart.js +469 -103
- package/vscode/src/vs/workbench/contrib/chat/browser/chatListRenderer.js +91 -96
- package/vscode/src/vs/workbench/contrib/chat/browser/chatMarkdownDecorationsRenderer.js +25 -27
- package/vscode/src/vs/workbench/contrib/chat/browser/chatMarkdownRenderer.js +21 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/chatWidget.js +175 -70
- package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockPart.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/chat/browser/codeBlockPart.js +46 -44
- package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatContextAttachments.js +53 -0
- package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatDynamicVariables.js +2 -2
- package/vscode/src/vs/workbench/contrib/chat/browser/contrib/chatInputCompletions.js +532 -0
- 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/chatInlineAnchorWidget.css.js +4 -0
- package/vscode/src/vs/workbench/contrib/chat/common/annotations.js +32 -3
- package/vscode/src/vs/workbench/contrib/chat/common/chatAgents.js +18 -7
- package/vscode/src/vs/workbench/contrib/chat/common/chatCodeMapperService.service.js +3 -0
- package/vscode/src/vs/workbench/contrib/chat/common/chatColors.js +6 -6
- package/vscode/src/vs/workbench/contrib/chat/common/chatContextKeys.js +34 -19
- package/vscode/src/vs/workbench/contrib/chat/common/chatEditingService.service.js +3 -0
- package/vscode/src/vs/workbench/contrib/chat/common/chatModel.js +44 -74
- package/vscode/src/vs/workbench/contrib/chat/common/chatParserTypes.js +8 -4
- package/vscode/src/vs/workbench/contrib/chat/common/chatRequestParser.js +4 -2
- package/vscode/src/vs/workbench/contrib/chat/common/chatViewModel.js +2 -5
- package/vscode/src/vs/workbench/contrib/chat/common/codeBlockModelCollection.js +20 -8
- package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActions.contribution.js +1 -2
- package/vscode/src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.js +17 -17
- package/vscode/src/vs/workbench/contrib/codeActions/common/codeActionsExtensionPoint.js +10 -10
- package/vscode/src/vs/workbench/contrib/codeActions/common/documentationExtensionPoint.js +6 -6
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/dictation/editorDictation.js +14 -18
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorAccessibilityHelp.js +10 -11
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/diffEditorHelper.js +6 -5
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/editorFeatures.js +2 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/editorLineNumberMenu.js +5 -7
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/find/simpleFindWidget.js +17 -14
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.css.js +4 -0
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/inspectEditorTokens/inspectEditorTokens.js +545 -0
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/largeFileOptimizations.js +5 -5
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/menuPreventer.js +4 -5
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/quickaccess/gotoSymbolQuickAccess.js +11 -15
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/saveParticipants.js +16 -19
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/simpleEditorOptions.js +2 -1
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.js +3 -5
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMinimap.js +3 -3
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleMultiCursorModifier.js +5 -6
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderControlCharacter.js +2 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleRenderWhitespace.js +2 -2
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/toggleWordWrap.js +19 -22
- package/vscode/src/vs/workbench/contrib/codeEditor/browser/workbenchReferenceSearch.js +2 -2
- package/vscode/src/vs/workbench/contrib/comments/browser/commentColors.js +7 -7
- package/vscode/src/vs/workbench/contrib/comments/browser/commentFormActions.js +24 -6
- package/vscode/src/vs/workbench/contrib/comments/browser/commentGlyphWidget.js +20 -11
- package/vscode/src/vs/workbench/contrib/comments/browser/commentNode.js +45 -35
- package/vscode/src/vs/workbench/contrib/comments/browser/commentReply.js +14 -10
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadAdditionalActions.js +9 -5
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadBody.js +13 -7
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadHeader.js +4 -5
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadWidget.js +9 -11
- package/vscode/src/vs/workbench/contrib/comments/browser/commentThreadZoneWidget.js +27 -26
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsAccessibility.js +33 -22
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsController.js +54 -29
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsModel.js +1 -1
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsTreeViewer.js +17 -24
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsView.js +39 -28
- package/vscode/src/vs/workbench/contrib/comments/browser/commentsViewActions.js +38 -36
- package/vscode/src/vs/workbench/contrib/comments/browser/reactionsAction.js +7 -7
- package/vscode/src/vs/workbench/contrib/comments/browser/simpleCommentEditor.js +11 -12
- package/vscode/src/vs/workbench/contrib/comments/common/commentContextKeys.js +13 -9
- package/vscode/src/vs/workbench/contrib/contextmenu/browser/contextmenu.contribution.js +1 -2
- package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInput.js +17 -17
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.js +43 -45
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointWidget.js +46 -47
- package/vscode/src/vs/workbench/contrib/debug/browser/breakpointsView.js +185 -147
- package/vscode/src/vs/workbench/contrib/debug/browser/callStackEditorContribution.js +5 -6
- package/vscode/src/vs/workbench/contrib/debug/browser/debugANSIHandling.js +370 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugColors.js +12 -12
- package/vscode/src/vs/workbench/contrib/debug/browser/debugCommands.js +96 -100
- package/vscode/src/vs/workbench/contrib/debug/browser/debugExpressionRenderer.js +160 -0
- package/vscode/src/vs/workbench/contrib/debug/browser/debugIcons.js +57 -57
- package/vscode/src/vs/workbench/contrib/debug/browser/debugSessionPicker.js +3 -3
- package/vscode/src/vs/workbench/contrib/debug/browser/linkDetector.js +21 -17
- package/vscode/src/vs/workbench/contrib/debug/common/abstractDebugAdapter.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/common/debug.d.ts +6 -6
- package/vscode/src/vs/workbench/contrib/debug/common/debug.js +4 -40
- package/vscode/src/vs/workbench/contrib/debug/common/debugModel.js +28 -33
- package/vscode/src/vs/workbench/contrib/debug/common/debugSource.js +2 -3
- package/vscode/src/vs/workbench/contrib/debug/common/disassemblyViewInput.js +2 -2
- package/vscode/src/vs/workbench/contrib/debug/common/loadedScriptsPicker.js +1 -1
- package/vscode/src/vs/workbench/contrib/debug/common/replModel.js +14 -6
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsActions.js +357 -330
- package/vscode/src/vs/workbench/contrib/extensions/browser/extensionsIcons.js +24 -24
- package/vscode/src/vs/workbench/contrib/extensions/common/extensions.js +1 -24
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsFileTemplate.js +5 -5
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsInput.js +3 -4
- package/vscode/src/vs/workbench/contrib/extensions/common/extensionsUtils.js +5 -7
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/configuration.js +4 -4
- package/vscode/src/vs/workbench/contrib/externalUriOpener/common/externalUriOpenerService.js +5 -6
- package/vscode/src/vs/workbench/contrib/files/browser/editors/binaryFileEditor.js +3 -4
- package/vscode/src/vs/workbench/contrib/files/browser/editors/fileEditorInput.js +16 -23
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditor.js +16 -19
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileEditorTracker.js +2 -3
- package/vscode/src/vs/workbench/contrib/files/browser/editors/textFileSaveErrorHandler.js +30 -32
- package/vscode/src/vs/workbench/contrib/files/browser/explorerFileContrib.js +2 -6
- package/vscode/src/vs/workbench/contrib/files/browser/explorerViewlet.js +21 -23
- package/vscode/src/vs/workbench/contrib/files/browser/fileActions.js +93 -96
- package/vscode/src/vs/workbench/contrib/files/browser/fileCommands._save.js +28 -29
- package/vscode/src/vs/workbench/contrib/files/browser/fileConstants.js +6 -6
- package/vscode/src/vs/workbench/contrib/files/browser/fileImportExport.js +44 -46
- package/vscode/src/vs/workbench/contrib/files/browser/files.contribution._configuration.js +77 -77
- package/vscode/src/vs/workbench/contrib/files/browser/files.contribution._editorPane.js +9 -9
- package/vscode/src/vs/workbench/contrib/files/browser/views/emptyView.js +3 -3
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerDecorationsProvider.js +4 -4
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerView.js +132 -25
- package/vscode/src/vs/workbench/contrib/files/browser/views/explorerViewer.js +74 -58
- package/vscode/src/vs/workbench/contrib/files/browser/views/openEditorsView.js +43 -49
- package/vscode/src/vs/workbench/contrib/files/browser/workspaceWatcher.js +4 -4
- package/vscode/src/vs/workbench/contrib/files/common/dirtyFilesIndicator.js +2 -3
- package/vscode/src/vs/workbench/contrib/files/common/explorerFileNestingTrie.js +8 -15
- package/vscode/src/vs/workbench/contrib/files/common/explorerModel.js +3 -5
- package/vscode/src/vs/workbench/contrib/files/common/files.js +16 -39
- package/vscode/src/vs/workbench/contrib/folding/browser/folding.contribution.js +4 -5
- package/vscode/src/vs/workbench/contrib/format/browser/formatActionsMultiple.js +26 -27
- package/vscode/src/vs/workbench/contrib/format/browser/formatActionsNone.js +10 -20
- package/vscode/src/vs/workbench/contrib/format/browser/formatModified.js +3 -3
- package/vscode/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.js +8 -10
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatActions.js +77 -71
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.js +110 -153
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSession.js +18 -25
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatSessionServiceImpl.js +19 -6
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.js +30 -41
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatWidget.js +20 -20
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.js +19 -13
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/media/inlineChat.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/utils.js +1 -2
- package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.js +62 -84
- package/vscode/src/vs/workbench/contrib/interactive/browser/interactiveEditorInput.js +4 -5
- package/vscode/src/vs/workbench/contrib/list/browser/list.contribution.js +2 -2
- package/vscode/src/vs/workbench/contrib/list/browser/listResizeColumnAction.js +2 -2
- package/vscode/src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.js +5 -5
- package/vscode/src/vs/workbench/contrib/markdown/browser/markdownDocumentRenderer.js +3 -2
- package/vscode/src/vs/workbench/contrib/markdown/browser/markedGfmHeadingIdPlugin.js +39 -0
- package/vscode/src/vs/workbench/contrib/markers/common/markers.js +2 -7
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js +8 -6
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js +45 -47
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeMarkers/mergeMarkersController.js +3 -2
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/lineRange.js +2 -3
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mapping.js +3 -3
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js +26 -30
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange.js +8 -13
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.js +13 -24
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/utils.js +5 -5
- package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.js +32 -31
- package/vscode/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.js +8 -8
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/icons.contribution.js +1 -1
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.js +13 -13
- package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.js +17 -7
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.js +12 -12
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindReplaceWidget.js +21 -23
- package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.js +6 -7
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.js +17 -18
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOutputActions.js +8 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext.js +5 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatController.js +4 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/coreActions.js +37 -48
- package/vscode/src/vs/workbench/contrib/notebook/browser/controller/foldingController.js +24 -26
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffCellEditorOptions.js +4 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffComponents.js +347 -127
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffElementOutputs.js +12 -14
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/diffElementViewModel.js +230 -67
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/editorHeightCalculator.js +59 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.js +13 -10
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditorBrowser.js +7 -6
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffList.js +148 -37
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffOverviewRuler.js +2 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffViewModel.js +125 -71
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookMultiDiffEditor.js +13 -6
- package/vscode/src/vs/workbench/contrib/notebook/browser/diff/unchangedEditorRegions.js +36 -0
- package/vscode/src/vs/workbench/contrib/notebook/browser/media/notebook.css.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookAccessibilityProvider.js +32 -13
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookBrowser.js +1 -21
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditor.js +18 -20
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookEditorWidget.js +56 -49
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookIcons.js +28 -28
- package/vscode/src/vs/workbench/contrib/notebook/browser/notebookOptions.js +13 -14
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.js +48 -36
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellContextKeys.js +3 -2
- 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 +3 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellEditorOptions.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellOutput.js +26 -35
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellStatusPart.js +22 -16
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellToolbars.js +2 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCell.js +8 -14
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellExecutionIcon.js +4 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/codeCellRunToolbar.js +10 -11
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/collapsedCellOutput.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/foldedCellHint.js +5 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/markupCell.js +6 -6
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/notebookCellList.js +25 -33
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.js +14 -14
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.js +8 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/webviewPreloads.js +8 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/baseCellViewModel.js +1 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/cellOutputViewModel.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/codeCellViewModel.js +3 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/foldingModel.js +2 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/markupCellViewModel.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewModel/notebookViewModelImpl.js +12 -11
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorStickyScroll.js +2 -3
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookEditorToolbar.js +4 -5
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelQuickPickStrategy.js +39 -49
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookKernelView.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookTopCellToolbar.js +2 -2
- package/vscode/src/vs/workbench/contrib/notebook/browser/viewParts/notebookViewZones.js +1 -1
- package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookCellTextModel.js +32 -21
- package/vscode/src/vs/workbench/contrib/notebook/common/model/notebookMetadataTextModel.js +85 -0
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookCommon.js +21 -35
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookContextKeys.js +2 -1
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorInput.js +17 -19
- package/vscode/src/vs/workbench/contrib/notebook/common/notebookEditorModel.js +4 -7
- package/vscode/src/vs/workbench/contrib/outline/browser/outline.js +2 -8
- package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingWidgets.js +6 -8
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesIcons.js +12 -12
- package/vscode/src/vs/workbench/contrib/preferences/browser/preferencesWidgets.js +32 -36
- package/vscode/src/vs/workbench/contrib/preferences/browser/settingsLayout.js +50 -50
- package/vscode/src/vs/workbench/contrib/preferences/browser/settingsTreeModels.js +24 -31
- package/vscode/src/vs/workbench/contrib/preferences/common/preferences.js +6 -4
- package/vscode/src/vs/workbench/contrib/preferences/common/settingsEditorColorRegistry.js +21 -21
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.js +39 -36
- package/vscode/src/vs/workbench/contrib/remote/browser/remoteIcons.js +17 -17
- package/vscode/src/vs/workbench/contrib/remote/browser/tunnelView.js +77 -79
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtyDiffSwitcher.js +2 -2
- package/vscode/src/vs/workbench/contrib/scm/browser/dirtydiffDecorator.js +45 -49
- package/vscode/src/vs/workbench/contrib/scm/browser/scmHistory.js +250 -0
- package/vscode/src/vs/workbench/contrib/scm/browser/util.js +131 -0
- package/vscode/src/vs/workbench/contrib/scm/common/scm.js +1 -13
- package/vscode/src/vs/workbench/contrib/search/browser/anythingQuickAccess.js +11 -12
- package/vscode/src/vs/workbench/contrib/search/browser/notebookSearch/notebookSearchService.js +2 -2
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsBase.js +1 -1
- package/vscode/src/vs/workbench/contrib/search/browser/searchActionsFind.js +29 -32
- package/vscode/src/vs/workbench/contrib/search/browser/searchModel.js +418 -266
- package/vscode/src/vs/workbench/contrib/search/browser/symbolsQuickAccess.js +11 -11
- package/vscode/src/vs/workbench/contrib/search/common/cellSearchModel.js +2 -3
- package/vscode/src/vs/workbench/contrib/search/common/constants.js +1 -50
- package/vscode/src/vs/workbench/contrib/snippets/browser/commands/abstractSnippetsActions.js +1 -1
- package/vscode/src/vs/workbench/contrib/snippets/browser/commands/fileTemplateSnippets.js +2 -2
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetCompletionProvider.js +8 -9
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsFile.js +5 -11
- package/vscode/src/vs/workbench/contrib/snippets/browser/snippetsService.js +22 -25
- package/vscode/src/vs/workbench/contrib/snippets/browser/tabCompletion.js +11 -11
- package/vscode/src/vs/workbench/contrib/speech/common/speechService.js +31 -37
- package/vscode/src/vs/workbench/contrib/tags/browser/workspaceTagsService.js +0 -1
- package/vscode/src/vs/workbench/contrib/tasks/common/taskDefinitionRegistry.js +5 -5
- package/vscode/src/vs/workbench/contrib/tasks/common/taskService.js +5 -5
- package/vscode/src/vs/workbench/contrib/tasks/common/tasks.js +14 -83
- package/vscode/src/vs/workbench/contrib/terminal/browser/environmentVariableInfo.js +119 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.d.ts +2 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminal.js +1 -27
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalActions.js +1770 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalContextMenu.js +40 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalEditorInput.js +9 -12
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalExtensions.js +25 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalIconPicker.js +72 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalIcons.js +16 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalInstance.js +2218 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalProcessExtHostProxy.js +8 -9
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalProcessManager.js +628 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalQuickAccess.js +143 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalResizeDebouncer.js +61 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalRunRecentQuickPick.js +315 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalStatusList.js +121 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalUri.js +39 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/widgets/widgetManager.js +36 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/decorationAddon.js +498 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/decorationStyles.js +123 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/lineDataEventAddon.js +55 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/markNavigationAddon.js +571 -0
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.d.ts +0 -6
- package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.js +732 -0
- package/vscode/src/vs/workbench/contrib/terminal/common/history.js +378 -0
- package/vscode/src/vs/workbench/contrib/terminal/common/terminal.js +62 -165
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalClipboard.js +80 -0
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalColorRegistry.js +23 -23
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalContextKey.js +141 -89
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalEnvironment.js +282 -0
- package/vscode/src/vs/workbench/contrib/terminal/common/terminalStrings.js +28 -28
- package/vscode/src/vs/workbench/contrib/terminalContrib/accessibility/common/terminal.accessibility.js +2 -10
- package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/media/terminalChatWidget.css.js +4 -0
- package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChat.js +46 -0
- package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatController.js +302 -0
- package/vscode/src/vs/workbench/contrib/terminalContrib/chat/browser/terminalChatWidget.js +203 -0
- package/vscode/src/vs/workbench/contrib/terminalContrib/find/common/terminal.find.js +9 -20
- package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/media/stickyScroll.css.js +4 -0
- package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollColorRegistry.js +22 -0
- package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollContribution.js +97 -0
- package/vscode/src/vs/workbench/contrib/terminalContrib/stickyScroll/browser/terminalStickyScrollOverlay.js +372 -0
- package/vscode/src/vs/workbench/contrib/terminalContrib/suggest/common/terminal.suggest.js +9 -20
- package/vscode/src/vs/workbench/contrib/testing/common/getComputedState.js +3 -4
- package/vscode/src/vs/workbench/contrib/testing/common/testCoverage.d.ts +1 -1
- package/vscode/src/vs/workbench/contrib/testing/common/testCoverage.js +3 -1
- package/vscode/src/vs/workbench/contrib/testing/common/testId.js +18 -29
- package/vscode/src/vs/workbench/contrib/testing/common/testItemCollection.js +41 -51
- package/vscode/src/vs/workbench/contrib/testing/common/testResult.js +24 -35
- package/vscode/src/vs/workbench/contrib/testing/common/testTypes.js +39 -99
- package/vscode/src/vs/workbench/contrib/testing/common/testingStates.js +14 -15
- package/vscode/src/vs/workbench/contrib/timeline/common/timeline.js +2 -1
- package/vscode/src/vs/workbench/contrib/typeHierarchy/common/typeHierarchy.js +1 -6
- package/vscode/src/vs/workbench/contrib/url/browser/trustedDomainService.js +1 -2
- package/vscode/src/vs/workbench/contrib/url/browser/trustedDomains.js +9 -10
- package/vscode/src/vs/workbench/contrib/webview/browser/webview.contribution.js +3 -3
- package/vscode/src/vs/workbench/contrib/webview/browser/webview.js +2 -9
- package/vscode/src/vs/workbench/contrib/webview/common/webview.js +3 -4
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditor.js +3 -4
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput.js +1 -2
- package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewIconManager.js +1 -2
- package/vscode/src/vs/workbench/contrib/workspace/common/workspace.js +2 -2
- package/vscode/src/vs/workbench/services/activity/common/activity.d.ts +10 -1
- package/vscode/src/vs/workbench/services/activity/common/activity.js +29 -6
- package/vscode/src/vs/workbench/services/authentication/browser/authenticationService.js +4 -6
- package/vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js +5 -6
- package/vscode/src/vs/workbench/services/configuration/common/configuration.js +7 -8
- package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverSchema.js +16 -16
- package/vscode/src/vs/workbench/services/configurationResolver/common/configurationResolverUtils.js +1 -1
- package/vscode/src/vs/workbench/services/configurationResolver/common/variableResolver.js +15 -15
- package/vscode/src/vs/workbench/services/driver/browser/driver.js +1 -2
- package/vscode/src/vs/workbench/services/editor/browser/codeEditorService.js +1 -3
- package/vscode/src/vs/workbench/services/editor/browser/editorService.js +26 -29
- package/vscode/src/vs/workbench/services/editor/common/customEditorLabelService.js +0 -1
- 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.js +2 -2
- package/vscode/src/vs/workbench/services/editor/common/editorResolverService.js +2 -7
- package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.d.ts +6 -5
- package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.js +2 -21
- package/vscode/src/vs/workbench/services/extensionManagement/common/extensionManagement.service.d.ts +13 -7
- package/vscode/src/vs/workbench/services/extensionRecommendations/common/workspaceExtensionsConfig.js +6 -7
- package/vscode/src/vs/workbench/services/extensions/common/extensionDescriptionRegistry.js +2 -8
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostKind.js +10 -16
- package/vscode/src/vs/workbench/services/extensions/common/extensionHostProtocol.js +7 -18
- package/vscode/src/vs/workbench/services/extensions/common/extensionManifestPropertiesService.js +0 -1
- package/vscode/src/vs/workbench/services/extensions/common/extensionRunningLocation.js +3 -4
- package/vscode/src/vs/workbench/services/extensions/common/extensions.js +7 -18
- package/vscode/src/vs/workbench/services/extensions/common/extensionsRegistry.js +82 -82
- package/vscode/src/vs/workbench/services/extensions/common/rpcProtocol.js +64 -103
- package/vscode/src/vs/workbench/services/filesConfiguration/common/filesConfigurationService.js +20 -36
- package/vscode/src/vs/workbench/services/language/common/languageService.js +29 -30
- package/vscode/src/vs/workbench/services/layout/browser/layoutService.js +27 -71
- package/vscode/src/vs/workbench/services/lifecycle/common/lifecycle.js +8 -28
- package/vscode/src/vs/workbench/services/lifecycle/common/lifecycleService.js +11 -11
- package/vscode/src/vs/workbench/services/notebook/common/notebookDocumentService.js +12 -2
- package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorInput.js +2 -2
- package/vscode/src/vs/workbench/services/preferences/browser/keybindingsEditorModel.js +7 -7
- package/vscode/src/vs/workbench/services/preferences/common/preferencesEditorInput.js +2 -2
- package/vscode/src/vs/workbench/services/progress/browser/progressIndicator.js +18 -20
- package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.d.ts +6 -1
- package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.js +20 -16
- package/vscode/src/vs/workbench/services/remote/common/remoteExplorerService.service.d.ts +3 -3
- package/vscode/src/vs/workbench/services/remote/common/tunnelModel.d.ts +1 -0
- package/vscode/src/vs/workbench/services/remote/common/tunnelModel.js +34 -22
- package/vscode/src/vs/workbench/services/search/common/fileSearchManager.js +11 -7
- package/vscode/src/vs/workbench/services/search/common/queryBuilder.js +15 -7
- package/vscode/src/vs/workbench/services/search/common/replace.js +11 -12
- package/vscode/src/vs/workbench/services/search/common/search.js +1 -32
- package/vscode/src/vs/workbench/services/search/common/searchExtConversionTypes.js +1 -0
- package/vscode/src/vs/workbench/services/search/common/textSearchManager.js +3 -3
- package/vscode/src/vs/workbench/services/statusbar/browser/statusbar.js +1 -6
- package/vscode/src/vs/workbench/services/storage/browser/storageService.js +13 -13
- package/vscode/src/vs/workbench/services/textMate/common/TMGrammars.js +9 -9
- package/vscode/src/vs/workbench/services/textMate/common/TMHelper.js +107 -0
- package/vscode/src/vs/workbench/services/textfile/common/encoding.js +2 -6
- package/vscode/src/vs/workbench/services/textfile/common/textEditorService.js +0 -1
- package/vscode/src/vs/workbench/services/textfile/common/textFileEditorModel.js +30 -32
- package/vscode/src/vs/workbench/services/textfile/common/textfiles.js +3 -27
- package/vscode/src/vs/workbench/services/themes/common/colorExtensionPoint.js +24 -24
- package/vscode/src/vs/workbench/services/themes/common/colorThemeData.js +933 -0
- package/vscode/src/vs/workbench/services/themes/common/iconExtensionPoint.js +15 -15
- package/vscode/src/vs/workbench/services/themes/common/plistParser.js +400 -0
- package/vscode/src/vs/workbench/services/themes/common/textMateScopeMatcher.js +120 -0
- package/vscode/src/vs/workbench/services/themes/common/themeCompatibility.js +76 -0
- package/vscode/src/vs/workbench/services/treeSitter/browser/treeSitterTokenizationFeature.service.js +3 -0
- 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 +11 -12
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfile.js +3 -3
- package/vscode/src/vs/workbench/services/userDataProfile/common/userDataProfileIcons.js +1 -1
- package/vscode/src/vs/workbench/services/userDataSync/common/userDataSync.js +16 -22
- package/vscode/src/vs/workbench/services/views/browser/viewsService.js +51 -43
- package/vscode/src/vs/workbench/services/views/common/viewsService.service.d.ts +1 -0
- package/vscode/src/vs/workbench/services/workingCopy/common/resourceWorkingCopy.js +2 -3
- package/vscode/src/vs/workbench/services/workingCopy/common/storedFileWorkingCopy.js +46 -59
- package/vscode/src/vs/workbench/services/workingCopy/common/workingCopy.js +1 -7
- package/vscode/src/vs/workbench/services/workspaces/common/workspaceTrust.js +14 -17
- package/vscode-dts/vscode.proposed.aiTextSearchProvider.d.ts +6 -0
- package/vscode-dts/vscode.proposed.aiTextSearchProviderNew.d.ts +5 -0
- package/vscode-dts/vscode.proposed.chatParticipantAdditions.d.ts +30 -3
- package/vscode-dts/vscode.proposed.chatProvider.d.ts +4 -0
- package/vscode-dts/vscode.proposed.contribChatParticipantDetection.d.ts +1 -0
- package/vscode-dts/vscode.proposed.contribSourceControlHistoryItemMenu.d.ts +1 -2
- package/vscode-dts/vscode.proposed.defaultChatParticipant.d.ts +8 -2
- package/vscode-dts/vscode.proposed.inlineCompletionsAdditions.d.ts +1 -1
- package/vscode-dts/vscode.proposed.lmTools.d.ts +47 -9
- package/vscode-dts/vscode.proposed.mappedEditsProvider.d.ts +43 -1
- package/vscode-dts/vscode.proposed.notebookReplDocument.d.ts +17 -4
- package/vscode-dts/vscode.proposed.scmHistoryProvider.d.ts +35 -33
- package/workbench.js +3 -1
- package/vscode/src/vs/base/common/charCode.js +0 -296
- package/vscode/src/vs/base/common/hotReload.js +0 -77
- package/vscode/src/vs/base/common/marshallingIds.js +0 -22
- package/vscode/src/vs/editor/common/cursorEvents.js +0 -11
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorHoverParticipant.js +0 -265
- package/vscode/src/vs/editor/contrib/colorPicker/browser/colorPickerWidget.js +0 -376
- package/vscode/src/vs/editor/contrib/inlineCompletions/browser/view/ghostTextView.js +0 -271
- package/vscode/src/vs/editor/contrib/inlineEdits/browser/commands.js +0 -125
- package/vscode/src/vs/editor/contrib/inlineEdits/browser/consts.js +0 -8
- package/vscode/src/vs/editor/contrib/inlineEdits/browser/inlineEdits.contribution.js +0 -9
- package/vscode/src/vs/editor/contrib/inlineEdits/browser/inlineEditsController.js +0 -82
- package/vscode/src/vs/editor/contrib/inlineEdits/browser/inlineEditsModel.js +0 -240
- package/vscode/src/vs/editor/contrib/inlineEdits/browser/inlineEditsWidget.css.js +0 -4
- package/vscode/src/vs/editor/contrib/inlineEdits/browser/inlineEditsWidget.js +0 -322
- package/vscode/src/vs/platform/label/common/label.js +0 -7
- package/vscode/src/vs/platform/terminal/common/capabilities/capabilities.js +0 -14
- package/vscode/src/vs/platform/workspace/common/workspaceTrust.js +0 -7
- package/vscode/src/vs/workbench/contrib/accessibility/common/accessibilityCommands.js +0 -16
- package/vscode/src/vs/workbench/contrib/chat/common/languageModels.js +0 -164
- package/vscode/src/vs/workbench/contrib/comments/common/commentCommandIds.js +0 -15
- package/vscode/src/vs/workbench/contrib/debug/browser/baseDebugView.js +0 -271
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatContentWidget.js +0 -175
- package/vscode/src/vs/workbench/contrib/inlineChat/browser/media/inlineChatContentWidget.css.js +0 -4
- package/vscode/src/vs/workbench/contrib/notebook/browser/view/cellParts/cellWidgets.js +0 -7
- package/vscode/src/vs/workbench/contrib/terminal/browser/terminalMenus.js +0 -720
- package/vscode/src/vs/workbench/contrib/testing/common/constants.js +0 -106
- package/vscode/src/vs/workbench/services/extensionRecommendations/common/extensionRecommendations.js +0 -11
- package/vscode/src/vs/workbench/services/outline/browser/outline.js +0 -22
- package/vscode/src/vs/workbench/services/workingCopy/common/fileWorkingCopy.js +0 -6
- package/vscode-dts/vscode.proposed.contribSourceControlHistoryItemChangesMenu.d.ts +0 -7
- package/vscode-dts/vscode.proposed.contribSourceControlHistoryItemGroupMenu.d.ts +0 -10
- /package/vscode/src/vs/editor/browser/viewParts/{lines → viewLines}/domReadingContext.js +0 -0
- /package/vscode/src/vs/editor/browser/viewParts/{lines → viewLines}/viewLines.css.js +0 -0
|
@@ -0,0 +1,933 @@
|
|
|
1
|
+
import { basename } from '../../../../base/common/path.js';
|
|
2
|
+
import { parse, getNodeType } from '../../../../base/common/json.js';
|
|
3
|
+
import { Color } from '../../../../base/common/color.js';
|
|
4
|
+
import { THEME_SCOPE_OPEN_PAREN, THEME_SCOPE_CLOSE_PAREN, THEME_SCOPE_WILDCARD, themeScopeRegex, ExtensionData, VS_HC_LIGHT_THEME, VS_HC_THEME, VS_LIGHT_THEME } from './workbenchThemeService.js';
|
|
5
|
+
import { convertSettings } from './themeCompatibility.js';
|
|
6
|
+
import { localize } from '../../../../nls.js';
|
|
7
|
+
import { isObject, isString, isBoolean } from '../../../../base/common/types.js';
|
|
8
|
+
import { extname, joinPath, dirname } from '../../../../base/common/resources.js';
|
|
9
|
+
import { DEFAULT_COLOR_CONFIG_VALUE, Extensions } from '../../../../platform/theme/common/colorUtils.js';
|
|
10
|
+
import '../../../../platform/theme/common/colors/baseColors.js';
|
|
11
|
+
import '../../../../platform/theme/common/colors/chartsColors.js';
|
|
12
|
+
import { editorForeground, editorBackground } from '../../../../platform/theme/common/colors/editorColors.js';
|
|
13
|
+
import '../../../../platform/theme/common/colors/inputColors.js';
|
|
14
|
+
import '../../../../platform/theme/common/colors/listColors.js';
|
|
15
|
+
import '../../../../platform/theme/common/colors/menuColors.js';
|
|
16
|
+
import '../../../../platform/theme/common/colors/minimapColors.js';
|
|
17
|
+
import '../../../../platform/theme/common/colors/miscColors.js';
|
|
18
|
+
import '../../../../platform/theme/common/colors/quickpickColors.js';
|
|
19
|
+
import '../../../../platform/theme/common/colors/searchColors.js';
|
|
20
|
+
import { getThemeTypeSelector } from '../../../../platform/theme/common/themeService.js';
|
|
21
|
+
import { Registry } from '../../../../platform/registry/common/platform.js';
|
|
22
|
+
import { getParseErrorMessage } from '../../../../base/common/jsonErrorMessages.js';
|
|
23
|
+
import { parse as parse$1 } from './plistParser.js';
|
|
24
|
+
import { TokenStyle, parseClassifierString, SemanticTokenRule, getTokenClassificationRegistry } from '../../../../platform/theme/common/tokenClassificationRegistry.js';
|
|
25
|
+
import { createMatchers } from './textMateScopeMatcher.js';
|
|
26
|
+
import { ColorScheme } from '../../../../platform/theme/common/theme.js';
|
|
27
|
+
import { toStandardTokenType } from '../../../../editor/common/languages/supports/tokenization.js';
|
|
28
|
+
import { findMatchingThemeRule } from '../../textMate/common/TMHelper.js';
|
|
29
|
+
const colorRegistry = ( (Registry.as(Extensions.ColorContribution)));
|
|
30
|
+
const tokenClassificationRegistry = getTokenClassificationRegistry();
|
|
31
|
+
const tokenGroupToScopesMap = {
|
|
32
|
+
comments: ['comment', 'punctuation.definition.comment'],
|
|
33
|
+
strings: ['string', 'meta.embedded.assembly'],
|
|
34
|
+
keywords: ['keyword - keyword.operator', 'keyword.control', 'storage', 'storage.type'],
|
|
35
|
+
numbers: ['constant.numeric'],
|
|
36
|
+
types: ['entity.name.type', 'entity.name.class', 'support.type', 'support.class'],
|
|
37
|
+
functions: ['entity.name.function', 'support.function'],
|
|
38
|
+
variables: ['variable', 'entity.name.variable']
|
|
39
|
+
};
|
|
40
|
+
class ColorThemeData {
|
|
41
|
+
static { this.STORAGE_KEY = 'colorThemeData'; }
|
|
42
|
+
constructor(id, label, settingsId) {
|
|
43
|
+
this.themeTokenColors = [];
|
|
44
|
+
this.customTokenColors = [];
|
|
45
|
+
this.colorMap = {};
|
|
46
|
+
this.customColorMap = {};
|
|
47
|
+
this.semanticTokenRules = [];
|
|
48
|
+
this.customSemanticTokenRules = [];
|
|
49
|
+
this.textMateThemingRules = undefined;
|
|
50
|
+
this.tokenColorIndex = undefined;
|
|
51
|
+
this.id = id;
|
|
52
|
+
this.label = label;
|
|
53
|
+
this.settingsId = settingsId;
|
|
54
|
+
this.isLoaded = false;
|
|
55
|
+
}
|
|
56
|
+
get semanticHighlighting() {
|
|
57
|
+
if (this.customSemanticHighlighting !== undefined) {
|
|
58
|
+
return this.customSemanticHighlighting;
|
|
59
|
+
}
|
|
60
|
+
if (this.customSemanticHighlightingDeprecated !== undefined) {
|
|
61
|
+
return this.customSemanticHighlightingDeprecated;
|
|
62
|
+
}
|
|
63
|
+
return !!this.themeSemanticHighlighting;
|
|
64
|
+
}
|
|
65
|
+
get tokenColors() {
|
|
66
|
+
if (!this.textMateThemingRules) {
|
|
67
|
+
const result = [];
|
|
68
|
+
const foreground = this.getColor(editorForeground) || this.getDefault(editorForeground);
|
|
69
|
+
const background = this.getColor(editorBackground) || this.getDefault(editorBackground);
|
|
70
|
+
result.push({
|
|
71
|
+
settings: {
|
|
72
|
+
foreground: normalizeColor(foreground),
|
|
73
|
+
background: normalizeColor(background)
|
|
74
|
+
}
|
|
75
|
+
});
|
|
76
|
+
let hasDefaultTokens = false;
|
|
77
|
+
function addRule(rule) {
|
|
78
|
+
if (rule.scope && rule.settings) {
|
|
79
|
+
if (rule.scope === 'token.info-token') {
|
|
80
|
+
hasDefaultTokens = true;
|
|
81
|
+
}
|
|
82
|
+
result.push({ scope: rule.scope, settings: { foreground: normalizeColor(rule.settings.foreground), background: normalizeColor(rule.settings.background), fontStyle: rule.settings.fontStyle } });
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
this.themeTokenColors.forEach(addRule);
|
|
86
|
+
this.customTokenColors.forEach(addRule);
|
|
87
|
+
if (!hasDefaultTokens) {
|
|
88
|
+
defaultThemeColors[this.type].forEach(addRule);
|
|
89
|
+
}
|
|
90
|
+
this.textMateThemingRules = result;
|
|
91
|
+
}
|
|
92
|
+
return this.textMateThemingRules;
|
|
93
|
+
}
|
|
94
|
+
getColor(colorId, useDefault) {
|
|
95
|
+
const customColor = this.customColorMap[colorId];
|
|
96
|
+
if (customColor instanceof Color) {
|
|
97
|
+
return customColor;
|
|
98
|
+
}
|
|
99
|
+
if (customColor === undefined) {
|
|
100
|
+
const color = this.colorMap[colorId];
|
|
101
|
+
if (color !== undefined) {
|
|
102
|
+
return color;
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
if (useDefault !== false) {
|
|
106
|
+
return this.getDefault(colorId);
|
|
107
|
+
}
|
|
108
|
+
return undefined;
|
|
109
|
+
}
|
|
110
|
+
getTokenStyle(type, modifiers, language, useDefault = true, definitions = {}) {
|
|
111
|
+
const result = {
|
|
112
|
+
foreground: undefined,
|
|
113
|
+
bold: undefined,
|
|
114
|
+
underline: undefined,
|
|
115
|
+
strikethrough: undefined,
|
|
116
|
+
italic: undefined
|
|
117
|
+
};
|
|
118
|
+
const score = {
|
|
119
|
+
foreground: -1,
|
|
120
|
+
bold: -1,
|
|
121
|
+
underline: -1,
|
|
122
|
+
strikethrough: -1,
|
|
123
|
+
italic: -1
|
|
124
|
+
};
|
|
125
|
+
function _processStyle(matchScore, style, definition) {
|
|
126
|
+
if (style.foreground && score.foreground <= matchScore) {
|
|
127
|
+
score.foreground = matchScore;
|
|
128
|
+
result.foreground = style.foreground;
|
|
129
|
+
definitions.foreground = definition;
|
|
130
|
+
}
|
|
131
|
+
for (const p of ['bold', 'underline', 'strikethrough', 'italic']) {
|
|
132
|
+
const property = p;
|
|
133
|
+
const info = style[property];
|
|
134
|
+
if (info !== undefined) {
|
|
135
|
+
if (score[property] <= matchScore) {
|
|
136
|
+
score[property] = matchScore;
|
|
137
|
+
result[property] = info;
|
|
138
|
+
definitions[property] = definition;
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
function _processSemanticTokenRule(rule) {
|
|
144
|
+
const matchScore = rule.selector.match(type, modifiers, language);
|
|
145
|
+
if (matchScore >= 0) {
|
|
146
|
+
_processStyle(matchScore, rule.style, rule);
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
this.semanticTokenRules.forEach(_processSemanticTokenRule);
|
|
150
|
+
this.customSemanticTokenRules.forEach(_processSemanticTokenRule);
|
|
151
|
+
let hasUndefinedStyleProperty = false;
|
|
152
|
+
for (const k in score) {
|
|
153
|
+
const key = k;
|
|
154
|
+
if (score[key] === -1) {
|
|
155
|
+
hasUndefinedStyleProperty = true;
|
|
156
|
+
}
|
|
157
|
+
else {
|
|
158
|
+
score[key] = Number.MAX_VALUE;
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
if (hasUndefinedStyleProperty) {
|
|
162
|
+
for (const rule of tokenClassificationRegistry.getTokenStylingDefaultRules()) {
|
|
163
|
+
const matchScore = rule.selector.match(type, modifiers, language);
|
|
164
|
+
if (matchScore >= 0) {
|
|
165
|
+
let style;
|
|
166
|
+
if (rule.defaults.scopesToProbe) {
|
|
167
|
+
style = this.resolveScopes(rule.defaults.scopesToProbe);
|
|
168
|
+
if (style) {
|
|
169
|
+
_processStyle(matchScore, style, rule.defaults.scopesToProbe);
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
if (!style && useDefault !== false) {
|
|
173
|
+
const tokenStyleValue = rule.defaults[this.type];
|
|
174
|
+
style = this.resolveTokenStyleValue(tokenStyleValue);
|
|
175
|
+
if (style) {
|
|
176
|
+
_processStyle(matchScore, style, tokenStyleValue);
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
return TokenStyle.fromData(result);
|
|
183
|
+
}
|
|
184
|
+
resolveTokenStyleValue(tokenStyleValue) {
|
|
185
|
+
if (tokenStyleValue === undefined) {
|
|
186
|
+
return undefined;
|
|
187
|
+
}
|
|
188
|
+
else if (typeof tokenStyleValue === 'string') {
|
|
189
|
+
const { type, modifiers, language } = parseClassifierString(tokenStyleValue, '');
|
|
190
|
+
return this.getTokenStyle(type, modifiers, language);
|
|
191
|
+
}
|
|
192
|
+
else if (typeof tokenStyleValue === 'object') {
|
|
193
|
+
return tokenStyleValue;
|
|
194
|
+
}
|
|
195
|
+
return undefined;
|
|
196
|
+
}
|
|
197
|
+
getTokenColorIndex() {
|
|
198
|
+
if (!this.tokenColorIndex) {
|
|
199
|
+
const index = ( (new TokenColorIndex()));
|
|
200
|
+
this.tokenColors.forEach(rule => {
|
|
201
|
+
index.add(rule.settings.foreground);
|
|
202
|
+
index.add(rule.settings.background);
|
|
203
|
+
});
|
|
204
|
+
this.semanticTokenRules.forEach(r => index.add(r.style.foreground));
|
|
205
|
+
tokenClassificationRegistry.getTokenStylingDefaultRules().forEach(r => {
|
|
206
|
+
const defaultColor = r.defaults[this.type];
|
|
207
|
+
if (defaultColor && typeof defaultColor === 'object') {
|
|
208
|
+
index.add(defaultColor.foreground);
|
|
209
|
+
}
|
|
210
|
+
});
|
|
211
|
+
this.customSemanticTokenRules.forEach(r => index.add(r.style.foreground));
|
|
212
|
+
this.tokenColorIndex = index;
|
|
213
|
+
}
|
|
214
|
+
return this.tokenColorIndex;
|
|
215
|
+
}
|
|
216
|
+
get tokenColorMap() {
|
|
217
|
+
return this.getTokenColorIndex().asArray();
|
|
218
|
+
}
|
|
219
|
+
getTokenStyleMetadata(typeWithLanguage, modifiers, defaultLanguage, useDefault = true, definitions = {}) {
|
|
220
|
+
const { type, language } = parseClassifierString(typeWithLanguage, defaultLanguage);
|
|
221
|
+
const style = this.getTokenStyle(type, modifiers, language, useDefault, definitions);
|
|
222
|
+
if (!style) {
|
|
223
|
+
return undefined;
|
|
224
|
+
}
|
|
225
|
+
return {
|
|
226
|
+
foreground: this.getTokenColorIndex().get(style.foreground),
|
|
227
|
+
bold: style.bold,
|
|
228
|
+
underline: style.underline,
|
|
229
|
+
strikethrough: style.strikethrough,
|
|
230
|
+
italic: style.italic,
|
|
231
|
+
};
|
|
232
|
+
}
|
|
233
|
+
getTokenStylingRuleScope(rule) {
|
|
234
|
+
if (this.customSemanticTokenRules.indexOf(rule) !== -1) {
|
|
235
|
+
return 'setting';
|
|
236
|
+
}
|
|
237
|
+
if (this.semanticTokenRules.indexOf(rule) !== -1) {
|
|
238
|
+
return 'theme';
|
|
239
|
+
}
|
|
240
|
+
return undefined;
|
|
241
|
+
}
|
|
242
|
+
getDefault(colorId) {
|
|
243
|
+
return colorRegistry.resolveDefaultColor(colorId, this);
|
|
244
|
+
}
|
|
245
|
+
resolveScopes(scopes, definitions) {
|
|
246
|
+
if (!this.themeTokenScopeMatchers) {
|
|
247
|
+
this.themeTokenScopeMatchers = ( (this.themeTokenColors.map(getScopeMatcher)));
|
|
248
|
+
}
|
|
249
|
+
if (!this.customTokenScopeMatchers) {
|
|
250
|
+
this.customTokenScopeMatchers = ( (this.customTokenColors.map(getScopeMatcher)));
|
|
251
|
+
}
|
|
252
|
+
for (const scope of scopes) {
|
|
253
|
+
let foreground = undefined;
|
|
254
|
+
let fontStyle = undefined;
|
|
255
|
+
let foregroundScore = -1;
|
|
256
|
+
let fontStyleScore = -1;
|
|
257
|
+
let fontStyleThemingRule = undefined;
|
|
258
|
+
let foregroundThemingRule = undefined;
|
|
259
|
+
function findTokenStyleForScopeInScopes(scopeMatchers, themingRules) {
|
|
260
|
+
for (let i = 0; i < scopeMatchers.length; i++) {
|
|
261
|
+
const score = scopeMatchers[i](scope);
|
|
262
|
+
if (score >= 0) {
|
|
263
|
+
const themingRule = themingRules[i];
|
|
264
|
+
const settings = themingRules[i].settings;
|
|
265
|
+
if (score >= foregroundScore && settings.foreground) {
|
|
266
|
+
foreground = settings.foreground;
|
|
267
|
+
foregroundScore = score;
|
|
268
|
+
foregroundThemingRule = themingRule;
|
|
269
|
+
}
|
|
270
|
+
if (score >= fontStyleScore && isString(settings.fontStyle)) {
|
|
271
|
+
fontStyle = settings.fontStyle;
|
|
272
|
+
fontStyleScore = score;
|
|
273
|
+
fontStyleThemingRule = themingRule;
|
|
274
|
+
}
|
|
275
|
+
}
|
|
276
|
+
}
|
|
277
|
+
}
|
|
278
|
+
findTokenStyleForScopeInScopes(this.themeTokenScopeMatchers, this.themeTokenColors);
|
|
279
|
+
findTokenStyleForScopeInScopes(this.customTokenScopeMatchers, this.customTokenColors);
|
|
280
|
+
if (foreground !== undefined || fontStyle !== undefined) {
|
|
281
|
+
if (definitions) {
|
|
282
|
+
definitions.foreground = foregroundThemingRule;
|
|
283
|
+
definitions.bold = definitions.italic = definitions.underline = definitions.strikethrough = fontStyleThemingRule;
|
|
284
|
+
definitions.scope = scope;
|
|
285
|
+
}
|
|
286
|
+
return TokenStyle.fromSettings(foreground, fontStyle);
|
|
287
|
+
}
|
|
288
|
+
}
|
|
289
|
+
return undefined;
|
|
290
|
+
}
|
|
291
|
+
defines(colorId) {
|
|
292
|
+
const customColor = this.customColorMap[colorId];
|
|
293
|
+
if (customColor instanceof Color) {
|
|
294
|
+
return true;
|
|
295
|
+
}
|
|
296
|
+
return customColor === undefined && this.colorMap.hasOwnProperty(colorId);
|
|
297
|
+
}
|
|
298
|
+
setCustomizations(settings) {
|
|
299
|
+
this.setCustomColors(settings.colorCustomizations);
|
|
300
|
+
this.setCustomTokenColors(settings.tokenColorCustomizations);
|
|
301
|
+
this.setCustomSemanticTokenColors(settings.semanticTokenColorCustomizations);
|
|
302
|
+
}
|
|
303
|
+
setCustomColors(colors) {
|
|
304
|
+
this.customColorMap = {};
|
|
305
|
+
this.overwriteCustomColors(colors);
|
|
306
|
+
const themeSpecificColors = this.getThemeSpecificColors(colors);
|
|
307
|
+
if (isObject(themeSpecificColors)) {
|
|
308
|
+
this.overwriteCustomColors(themeSpecificColors);
|
|
309
|
+
}
|
|
310
|
+
this.tokenColorIndex = undefined;
|
|
311
|
+
this.textMateThemingRules = undefined;
|
|
312
|
+
this.customTokenScopeMatchers = undefined;
|
|
313
|
+
}
|
|
314
|
+
overwriteCustomColors(colors) {
|
|
315
|
+
for (const id in colors) {
|
|
316
|
+
const colorVal = colors[id];
|
|
317
|
+
if (colorVal === DEFAULT_COLOR_CONFIG_VALUE) {
|
|
318
|
+
this.customColorMap[id] = DEFAULT_COLOR_CONFIG_VALUE;
|
|
319
|
+
}
|
|
320
|
+
else if (typeof colorVal === 'string') {
|
|
321
|
+
this.customColorMap[id] = ( (Color.fromHex(colorVal)));
|
|
322
|
+
}
|
|
323
|
+
}
|
|
324
|
+
}
|
|
325
|
+
setCustomTokenColors(customTokenColors) {
|
|
326
|
+
this.customTokenColors = [];
|
|
327
|
+
this.customSemanticHighlightingDeprecated = undefined;
|
|
328
|
+
this.addCustomTokenColors(customTokenColors);
|
|
329
|
+
const themeSpecificTokenColors = this.getThemeSpecificColors(customTokenColors);
|
|
330
|
+
if (isObject(themeSpecificTokenColors)) {
|
|
331
|
+
this.addCustomTokenColors(themeSpecificTokenColors);
|
|
332
|
+
}
|
|
333
|
+
this.tokenColorIndex = undefined;
|
|
334
|
+
this.textMateThemingRules = undefined;
|
|
335
|
+
this.customTokenScopeMatchers = undefined;
|
|
336
|
+
}
|
|
337
|
+
setCustomSemanticTokenColors(semanticTokenColors) {
|
|
338
|
+
this.customSemanticTokenRules = [];
|
|
339
|
+
this.customSemanticHighlighting = undefined;
|
|
340
|
+
if (semanticTokenColors) {
|
|
341
|
+
this.customSemanticHighlighting = semanticTokenColors.enabled;
|
|
342
|
+
if (semanticTokenColors.rules) {
|
|
343
|
+
this.readSemanticTokenRules(semanticTokenColors.rules);
|
|
344
|
+
}
|
|
345
|
+
const themeSpecificColors = this.getThemeSpecificColors(semanticTokenColors);
|
|
346
|
+
if (isObject(themeSpecificColors)) {
|
|
347
|
+
if (themeSpecificColors.enabled !== undefined) {
|
|
348
|
+
this.customSemanticHighlighting = themeSpecificColors.enabled;
|
|
349
|
+
}
|
|
350
|
+
if (themeSpecificColors.rules) {
|
|
351
|
+
this.readSemanticTokenRules(themeSpecificColors.rules);
|
|
352
|
+
}
|
|
353
|
+
}
|
|
354
|
+
}
|
|
355
|
+
this.tokenColorIndex = undefined;
|
|
356
|
+
this.textMateThemingRules = undefined;
|
|
357
|
+
}
|
|
358
|
+
isThemeScope(key) {
|
|
359
|
+
return key.charAt(0) === THEME_SCOPE_OPEN_PAREN && key.charAt(key.length - 1) === THEME_SCOPE_CLOSE_PAREN;
|
|
360
|
+
}
|
|
361
|
+
isThemeScopeMatch(themeId) {
|
|
362
|
+
const themeIdFirstChar = themeId.charAt(0);
|
|
363
|
+
const themeIdLastChar = themeId.charAt(themeId.length - 1);
|
|
364
|
+
const themeIdPrefix = themeId.slice(0, -1);
|
|
365
|
+
const themeIdInfix = themeId.slice(1, -1);
|
|
366
|
+
const themeIdSuffix = themeId.slice(1);
|
|
367
|
+
return themeId === this.settingsId
|
|
368
|
+
|| (this.settingsId.includes(themeIdInfix) && themeIdFirstChar === THEME_SCOPE_WILDCARD && themeIdLastChar === THEME_SCOPE_WILDCARD)
|
|
369
|
+
|| (this.settingsId.startsWith(themeIdPrefix) && themeIdLastChar === THEME_SCOPE_WILDCARD)
|
|
370
|
+
|| (this.settingsId.endsWith(themeIdSuffix) && themeIdFirstChar === THEME_SCOPE_WILDCARD);
|
|
371
|
+
}
|
|
372
|
+
getThemeSpecificColors(colors) {
|
|
373
|
+
let themeSpecificColors;
|
|
374
|
+
for (const key in colors) {
|
|
375
|
+
const scopedColors = colors[key];
|
|
376
|
+
if (this.isThemeScope(key) && scopedColors instanceof Object && !Array.isArray(scopedColors)) {
|
|
377
|
+
const themeScopeList = key.match(themeScopeRegex) || [];
|
|
378
|
+
for (const themeScope of themeScopeList) {
|
|
379
|
+
const themeId = themeScope.substring(1, themeScope.length - 1);
|
|
380
|
+
if (this.isThemeScopeMatch(themeId)) {
|
|
381
|
+
if (!themeSpecificColors) {
|
|
382
|
+
themeSpecificColors = {};
|
|
383
|
+
}
|
|
384
|
+
const scopedThemeSpecificColors = scopedColors;
|
|
385
|
+
for (const subkey in scopedThemeSpecificColors) {
|
|
386
|
+
const originalColors = themeSpecificColors[subkey];
|
|
387
|
+
const overrideColors = scopedThemeSpecificColors[subkey];
|
|
388
|
+
if (Array.isArray(originalColors) && Array.isArray(overrideColors)) {
|
|
389
|
+
themeSpecificColors[subkey] = originalColors.concat(overrideColors);
|
|
390
|
+
}
|
|
391
|
+
else if (overrideColors) {
|
|
392
|
+
themeSpecificColors[subkey] = overrideColors;
|
|
393
|
+
}
|
|
394
|
+
}
|
|
395
|
+
}
|
|
396
|
+
}
|
|
397
|
+
}
|
|
398
|
+
}
|
|
399
|
+
return themeSpecificColors;
|
|
400
|
+
}
|
|
401
|
+
readSemanticTokenRules(tokenStylingRuleSection) {
|
|
402
|
+
for (const key in tokenStylingRuleSection) {
|
|
403
|
+
if (!this.isThemeScope(key)) {
|
|
404
|
+
try {
|
|
405
|
+
const rule = readSemanticTokenRule(key, tokenStylingRuleSection[key]);
|
|
406
|
+
if (rule) {
|
|
407
|
+
this.customSemanticTokenRules.push(rule);
|
|
408
|
+
}
|
|
409
|
+
}
|
|
410
|
+
catch (e) {
|
|
411
|
+
}
|
|
412
|
+
}
|
|
413
|
+
}
|
|
414
|
+
}
|
|
415
|
+
addCustomTokenColors(customTokenColors) {
|
|
416
|
+
for (const tokenGroup in tokenGroupToScopesMap) {
|
|
417
|
+
const group = tokenGroup;
|
|
418
|
+
const value = customTokenColors[group];
|
|
419
|
+
if (value) {
|
|
420
|
+
const settings = typeof value === 'string' ? { foreground: value } : value;
|
|
421
|
+
const scopes = tokenGroupToScopesMap[group];
|
|
422
|
+
for (const scope of scopes) {
|
|
423
|
+
this.customTokenColors.push({ scope, settings });
|
|
424
|
+
}
|
|
425
|
+
}
|
|
426
|
+
}
|
|
427
|
+
if (Array.isArray(customTokenColors.textMateRules)) {
|
|
428
|
+
for (const rule of customTokenColors.textMateRules) {
|
|
429
|
+
if (rule.scope && rule.settings) {
|
|
430
|
+
this.customTokenColors.push(rule);
|
|
431
|
+
}
|
|
432
|
+
}
|
|
433
|
+
}
|
|
434
|
+
if (customTokenColors.semanticHighlighting !== undefined) {
|
|
435
|
+
this.customSemanticHighlightingDeprecated = customTokenColors.semanticHighlighting;
|
|
436
|
+
}
|
|
437
|
+
}
|
|
438
|
+
ensureLoaded(extensionResourceLoaderService) {
|
|
439
|
+
return !this.isLoaded ? this.load(extensionResourceLoaderService) : Promise.resolve(undefined);
|
|
440
|
+
}
|
|
441
|
+
reload(extensionResourceLoaderService) {
|
|
442
|
+
return this.load(extensionResourceLoaderService);
|
|
443
|
+
}
|
|
444
|
+
load(extensionResourceLoaderService) {
|
|
445
|
+
if (!this.location) {
|
|
446
|
+
return Promise.resolve(undefined);
|
|
447
|
+
}
|
|
448
|
+
this.themeTokenColors = [];
|
|
449
|
+
this.clearCaches();
|
|
450
|
+
const result = {
|
|
451
|
+
colors: {},
|
|
452
|
+
textMateRules: [],
|
|
453
|
+
semanticTokenRules: [],
|
|
454
|
+
semanticHighlighting: false
|
|
455
|
+
};
|
|
456
|
+
return _loadColorTheme(extensionResourceLoaderService, this.location, result).then(_ => {
|
|
457
|
+
this.isLoaded = true;
|
|
458
|
+
this.semanticTokenRules = result.semanticTokenRules;
|
|
459
|
+
this.colorMap = result.colors;
|
|
460
|
+
this.themeTokenColors = result.textMateRules;
|
|
461
|
+
this.themeSemanticHighlighting = result.semanticHighlighting;
|
|
462
|
+
});
|
|
463
|
+
}
|
|
464
|
+
clearCaches() {
|
|
465
|
+
this.tokenColorIndex = undefined;
|
|
466
|
+
this.textMateThemingRules = undefined;
|
|
467
|
+
this.themeTokenScopeMatchers = undefined;
|
|
468
|
+
this.customTokenScopeMatchers = undefined;
|
|
469
|
+
}
|
|
470
|
+
toStorage(storageService) {
|
|
471
|
+
const colorMapData = {};
|
|
472
|
+
for (const key in this.colorMap) {
|
|
473
|
+
colorMapData[key] = Color.Format.CSS.formatHexA(this.colorMap[key], true);
|
|
474
|
+
}
|
|
475
|
+
const value = JSON.stringify({
|
|
476
|
+
id: this.id,
|
|
477
|
+
label: this.label,
|
|
478
|
+
settingsId: this.settingsId,
|
|
479
|
+
themeTokenColors: ( (this.themeTokenColors.map(tc => ({ settings: tc.settings, scope: tc.scope })))),
|
|
480
|
+
semanticTokenRules: ( (this.semanticTokenRules.map(SemanticTokenRule.toJSONObject))),
|
|
481
|
+
extensionData: ExtensionData.toJSONObject(this.extensionData),
|
|
482
|
+
themeSemanticHighlighting: this.themeSemanticHighlighting,
|
|
483
|
+
colorMap: colorMapData,
|
|
484
|
+
watch: this.watch
|
|
485
|
+
});
|
|
486
|
+
storageService.store(ColorThemeData.STORAGE_KEY, value, 0 , 0 );
|
|
487
|
+
}
|
|
488
|
+
get baseTheme() {
|
|
489
|
+
return this.classNames[0];
|
|
490
|
+
}
|
|
491
|
+
get classNames() {
|
|
492
|
+
return this.id.split(' ');
|
|
493
|
+
}
|
|
494
|
+
get type() {
|
|
495
|
+
switch (this.baseTheme) {
|
|
496
|
+
case VS_LIGHT_THEME: return ColorScheme.LIGHT;
|
|
497
|
+
case VS_HC_THEME: return ColorScheme.HIGH_CONTRAST_DARK;
|
|
498
|
+
case VS_HC_LIGHT_THEME: return ColorScheme.HIGH_CONTRAST_LIGHT;
|
|
499
|
+
default: return ColorScheme.DARK;
|
|
500
|
+
}
|
|
501
|
+
}
|
|
502
|
+
static createUnloadedThemeForThemeType(themeType, colorMap) {
|
|
503
|
+
return ColorThemeData.createUnloadedTheme(getThemeTypeSelector(themeType), colorMap);
|
|
504
|
+
}
|
|
505
|
+
static createUnloadedTheme(id, colorMap) {
|
|
506
|
+
const themeData = ( (new ColorThemeData(id, '', '__' + id)));
|
|
507
|
+
themeData.isLoaded = false;
|
|
508
|
+
themeData.themeTokenColors = [];
|
|
509
|
+
themeData.watch = false;
|
|
510
|
+
if (colorMap) {
|
|
511
|
+
for (const id in colorMap) {
|
|
512
|
+
themeData.colorMap[id] = ( (Color.fromHex(colorMap[id])));
|
|
513
|
+
}
|
|
514
|
+
}
|
|
515
|
+
return themeData;
|
|
516
|
+
}
|
|
517
|
+
static createLoadedEmptyTheme(id, settingsId) {
|
|
518
|
+
const themeData = ( (new ColorThemeData(id, '', settingsId)));
|
|
519
|
+
themeData.isLoaded = true;
|
|
520
|
+
themeData.themeTokenColors = [];
|
|
521
|
+
themeData.watch = false;
|
|
522
|
+
return themeData;
|
|
523
|
+
}
|
|
524
|
+
static fromStorageData(storageService) {
|
|
525
|
+
const input = storageService.get(ColorThemeData.STORAGE_KEY, 0 );
|
|
526
|
+
if (!input) {
|
|
527
|
+
return undefined;
|
|
528
|
+
}
|
|
529
|
+
try {
|
|
530
|
+
const data = JSON.parse(input);
|
|
531
|
+
const theme = ( (new ColorThemeData('', '', '')));
|
|
532
|
+
for (const key in data) {
|
|
533
|
+
switch (key) {
|
|
534
|
+
case 'colorMap': {
|
|
535
|
+
const colorMapData = data[key];
|
|
536
|
+
for (const id in colorMapData) {
|
|
537
|
+
theme.colorMap[id] = ( (Color.fromHex(colorMapData[id])));
|
|
538
|
+
}
|
|
539
|
+
break;
|
|
540
|
+
}
|
|
541
|
+
case 'themeTokenColors':
|
|
542
|
+
case 'id':
|
|
543
|
+
case 'label':
|
|
544
|
+
case 'settingsId':
|
|
545
|
+
case 'watch':
|
|
546
|
+
case 'themeSemanticHighlighting':
|
|
547
|
+
theme[key] = data[key];
|
|
548
|
+
break;
|
|
549
|
+
case 'semanticTokenRules': {
|
|
550
|
+
const rulesData = data[key];
|
|
551
|
+
if (Array.isArray(rulesData)) {
|
|
552
|
+
for (const d of rulesData) {
|
|
553
|
+
const rule = SemanticTokenRule.fromJSONObject(tokenClassificationRegistry, d);
|
|
554
|
+
if (rule) {
|
|
555
|
+
theme.semanticTokenRules.push(rule);
|
|
556
|
+
}
|
|
557
|
+
}
|
|
558
|
+
}
|
|
559
|
+
break;
|
|
560
|
+
}
|
|
561
|
+
case 'location':
|
|
562
|
+
break;
|
|
563
|
+
case 'extensionData':
|
|
564
|
+
theme.extensionData = ExtensionData.fromJSONObject(data.extensionData);
|
|
565
|
+
break;
|
|
566
|
+
}
|
|
567
|
+
}
|
|
568
|
+
if (!theme.id || !theme.settingsId) {
|
|
569
|
+
return undefined;
|
|
570
|
+
}
|
|
571
|
+
return theme;
|
|
572
|
+
}
|
|
573
|
+
catch (e) {
|
|
574
|
+
return undefined;
|
|
575
|
+
}
|
|
576
|
+
}
|
|
577
|
+
static fromExtensionTheme(theme, colorThemeLocation, extensionData) {
|
|
578
|
+
const baseTheme = theme['uiTheme'] || 'vs-dark';
|
|
579
|
+
const themeSelector = toCSSSelector(extensionData.extensionId, theme.path);
|
|
580
|
+
const id = `${baseTheme} ${themeSelector}`;
|
|
581
|
+
const label = theme.label || basename(theme.path);
|
|
582
|
+
const settingsId = theme.id || label;
|
|
583
|
+
const themeData = ( (new ColorThemeData(id, label, settingsId)));
|
|
584
|
+
themeData.description = theme.description;
|
|
585
|
+
themeData.watch = theme._watch === true;
|
|
586
|
+
themeData.location = colorThemeLocation;
|
|
587
|
+
themeData.extensionData = extensionData;
|
|
588
|
+
themeData.isLoaded = false;
|
|
589
|
+
return themeData;
|
|
590
|
+
}
|
|
591
|
+
}
|
|
592
|
+
function toCSSSelector(extensionId, path) {
|
|
593
|
+
if (path.startsWith('./')) {
|
|
594
|
+
path = path.substr(2);
|
|
595
|
+
}
|
|
596
|
+
let str = `${extensionId}-${path}`;
|
|
597
|
+
str = str.replace(/[^_a-zA-Z0-9-]/g, '-');
|
|
598
|
+
if (str.charAt(0).match(/[0-9-]/)) {
|
|
599
|
+
str = '_' + str;
|
|
600
|
+
}
|
|
601
|
+
return str;
|
|
602
|
+
}
|
|
603
|
+
async function _loadColorTheme(extensionResourceLoaderService, themeLocation, result) {
|
|
604
|
+
if (extname(themeLocation) === '.json') {
|
|
605
|
+
const content = await extensionResourceLoaderService.readExtensionResource(themeLocation);
|
|
606
|
+
const errors = [];
|
|
607
|
+
const contentValue = parse(content, errors);
|
|
608
|
+
if (errors.length > 0) {
|
|
609
|
+
return Promise.reject(( (new Error(( localize(
|
|
610
|
+
6904,
|
|
611
|
+
"Problems parsing JSON theme file: {0}",
|
|
612
|
+
( (errors.map(e => getParseErrorMessage(e.error)))).join(', ')
|
|
613
|
+
))))));
|
|
614
|
+
}
|
|
615
|
+
else if (getNodeType(contentValue) !== 'object') {
|
|
616
|
+
return Promise.reject(( (new Error(( localize(6905, "Invalid format for JSON theme file: Object expected."))))));
|
|
617
|
+
}
|
|
618
|
+
if (contentValue.include) {
|
|
619
|
+
await _loadColorTheme(extensionResourceLoaderService, joinPath(dirname(themeLocation), contentValue.include), result);
|
|
620
|
+
}
|
|
621
|
+
if (Array.isArray(contentValue.settings)) {
|
|
622
|
+
convertSettings(contentValue.settings, result);
|
|
623
|
+
return null;
|
|
624
|
+
}
|
|
625
|
+
result.semanticHighlighting = result.semanticHighlighting || contentValue.semanticHighlighting;
|
|
626
|
+
const colors = contentValue.colors;
|
|
627
|
+
if (colors) {
|
|
628
|
+
if (typeof colors !== 'object') {
|
|
629
|
+
return Promise.reject(( (new Error(( localize(
|
|
630
|
+
6906,
|
|
631
|
+
"Problem parsing color theme file: {0}. Property 'colors' is not of type 'object'.",
|
|
632
|
+
(themeLocation.toString())
|
|
633
|
+
))))));
|
|
634
|
+
}
|
|
635
|
+
for (const colorId in colors) {
|
|
636
|
+
const colorVal = colors[colorId];
|
|
637
|
+
if (colorVal === DEFAULT_COLOR_CONFIG_VALUE) {
|
|
638
|
+
delete result.colors[colorId];
|
|
639
|
+
}
|
|
640
|
+
else if (typeof colorVal === 'string') {
|
|
641
|
+
result.colors[colorId] = ( (Color.fromHex(colors[colorId])));
|
|
642
|
+
}
|
|
643
|
+
}
|
|
644
|
+
}
|
|
645
|
+
const tokenColors = contentValue.tokenColors;
|
|
646
|
+
if (tokenColors) {
|
|
647
|
+
if (Array.isArray(tokenColors)) {
|
|
648
|
+
result.textMateRules.push(...tokenColors);
|
|
649
|
+
}
|
|
650
|
+
else if (typeof tokenColors === 'string') {
|
|
651
|
+
await _loadSyntaxTokens(extensionResourceLoaderService, joinPath(dirname(themeLocation), tokenColors), result);
|
|
652
|
+
}
|
|
653
|
+
else {
|
|
654
|
+
return Promise.reject(( (new Error(( localize(
|
|
655
|
+
6907,
|
|
656
|
+
"Problem parsing color theme file: {0}. Property 'tokenColors' should be either an array specifying colors or a path to a TextMate theme file",
|
|
657
|
+
(themeLocation.toString())
|
|
658
|
+
))))));
|
|
659
|
+
}
|
|
660
|
+
}
|
|
661
|
+
const semanticTokenColors = contentValue.semanticTokenColors;
|
|
662
|
+
if (semanticTokenColors && typeof semanticTokenColors === 'object') {
|
|
663
|
+
for (const key in semanticTokenColors) {
|
|
664
|
+
try {
|
|
665
|
+
const rule = readSemanticTokenRule(key, semanticTokenColors[key]);
|
|
666
|
+
if (rule) {
|
|
667
|
+
result.semanticTokenRules.push(rule);
|
|
668
|
+
}
|
|
669
|
+
}
|
|
670
|
+
catch (e) {
|
|
671
|
+
return Promise.reject(( (new Error(( localize(
|
|
672
|
+
6908,
|
|
673
|
+
"Problem parsing color theme file: {0}. Property 'semanticTokenColors' contains a invalid selector",
|
|
674
|
+
(themeLocation.toString())
|
|
675
|
+
))))));
|
|
676
|
+
}
|
|
677
|
+
}
|
|
678
|
+
}
|
|
679
|
+
}
|
|
680
|
+
else {
|
|
681
|
+
return _loadSyntaxTokens(extensionResourceLoaderService, themeLocation, result);
|
|
682
|
+
}
|
|
683
|
+
}
|
|
684
|
+
function _loadSyntaxTokens(extensionResourceLoaderService, themeLocation, result) {
|
|
685
|
+
return extensionResourceLoaderService.readExtensionResource(themeLocation).then(content => {
|
|
686
|
+
try {
|
|
687
|
+
const contentValue = parse$1(content);
|
|
688
|
+
const settings = contentValue.settings;
|
|
689
|
+
if (!Array.isArray(settings)) {
|
|
690
|
+
return Promise.reject(( (new Error(( localize(6909, "Problem parsing tmTheme file: {0}. 'settings' is not array."))))));
|
|
691
|
+
}
|
|
692
|
+
convertSettings(settings, result);
|
|
693
|
+
return Promise.resolve(null);
|
|
694
|
+
}
|
|
695
|
+
catch (e) {
|
|
696
|
+
return Promise.reject(( (new Error(( localize(6910, "Problems parsing tmTheme file: {0}", e.message))))));
|
|
697
|
+
}
|
|
698
|
+
}, error => {
|
|
699
|
+
return Promise.reject(( (new Error(( localize(
|
|
700
|
+
6911,
|
|
701
|
+
"Problems loading tmTheme file {0}: {1}",
|
|
702
|
+
(themeLocation.toString()),
|
|
703
|
+
error.message
|
|
704
|
+
))))));
|
|
705
|
+
});
|
|
706
|
+
}
|
|
707
|
+
const defaultThemeColors = {
|
|
708
|
+
'light': [
|
|
709
|
+
{ scope: 'token.info-token', settings: { foreground: '#316bcd' } },
|
|
710
|
+
{ scope: 'token.warn-token', settings: { foreground: '#cd9731' } },
|
|
711
|
+
{ scope: 'token.error-token', settings: { foreground: '#cd3131' } },
|
|
712
|
+
{ scope: 'token.debug-token', settings: { foreground: '#800080' } }
|
|
713
|
+
],
|
|
714
|
+
'dark': [
|
|
715
|
+
{ scope: 'token.info-token', settings: { foreground: '#6796e6' } },
|
|
716
|
+
{ scope: 'token.warn-token', settings: { foreground: '#cd9731' } },
|
|
717
|
+
{ scope: 'token.error-token', settings: { foreground: '#f44747' } },
|
|
718
|
+
{ scope: 'token.debug-token', settings: { foreground: '#b267e6' } }
|
|
719
|
+
],
|
|
720
|
+
'hcLight': [
|
|
721
|
+
{ scope: 'token.info-token', settings: { foreground: '#316bcd' } },
|
|
722
|
+
{ scope: 'token.warn-token', settings: { foreground: '#cd9731' } },
|
|
723
|
+
{ scope: 'token.error-token', settings: { foreground: '#cd3131' } },
|
|
724
|
+
{ scope: 'token.debug-token', settings: { foreground: '#800080' } }
|
|
725
|
+
],
|
|
726
|
+
'hcDark': [
|
|
727
|
+
{ scope: 'token.info-token', settings: { foreground: '#6796e6' } },
|
|
728
|
+
{ scope: 'token.warn-token', settings: { foreground: '#008000' } },
|
|
729
|
+
{ scope: 'token.error-token', settings: { foreground: '#FF0000' } },
|
|
730
|
+
{ scope: 'token.debug-token', settings: { foreground: '#b267e6' } }
|
|
731
|
+
]
|
|
732
|
+
};
|
|
733
|
+
const noMatch = (_scope) => -1;
|
|
734
|
+
function nameMatcher(identifers, scope) {
|
|
735
|
+
function findInIdents(s, lastIndent) {
|
|
736
|
+
for (let i = lastIndent - 1; i >= 0; i--) {
|
|
737
|
+
if (scopesAreMatching(s, identifers[i])) {
|
|
738
|
+
return i;
|
|
739
|
+
}
|
|
740
|
+
}
|
|
741
|
+
return -1;
|
|
742
|
+
}
|
|
743
|
+
if (scope.length < identifers.length) {
|
|
744
|
+
return -1;
|
|
745
|
+
}
|
|
746
|
+
let lastScopeIndex = scope.length - 1;
|
|
747
|
+
let lastIdentifierIndex = findInIdents(scope[lastScopeIndex--], identifers.length);
|
|
748
|
+
if (lastIdentifierIndex >= 0) {
|
|
749
|
+
const score = (lastIdentifierIndex + 1) * 0x10000 + identifers[lastIdentifierIndex].length;
|
|
750
|
+
while (lastScopeIndex >= 0) {
|
|
751
|
+
lastIdentifierIndex = findInIdents(scope[lastScopeIndex--], lastIdentifierIndex);
|
|
752
|
+
if (lastIdentifierIndex === -1) {
|
|
753
|
+
return -1;
|
|
754
|
+
}
|
|
755
|
+
}
|
|
756
|
+
return score;
|
|
757
|
+
}
|
|
758
|
+
return -1;
|
|
759
|
+
}
|
|
760
|
+
function scopesAreMatching(thisScopeName, scopeName) {
|
|
761
|
+
if (!thisScopeName) {
|
|
762
|
+
return false;
|
|
763
|
+
}
|
|
764
|
+
if (thisScopeName === scopeName) {
|
|
765
|
+
return true;
|
|
766
|
+
}
|
|
767
|
+
const len = scopeName.length;
|
|
768
|
+
return thisScopeName.length > len && thisScopeName.substr(0, len) === scopeName && thisScopeName[len] === '.';
|
|
769
|
+
}
|
|
770
|
+
function getScopeMatcher(rule) {
|
|
771
|
+
const ruleScope = rule.scope;
|
|
772
|
+
if (!ruleScope || !rule.settings) {
|
|
773
|
+
return noMatch;
|
|
774
|
+
}
|
|
775
|
+
const matchers = [];
|
|
776
|
+
if (Array.isArray(ruleScope)) {
|
|
777
|
+
for (const rs of ruleScope) {
|
|
778
|
+
createMatchers(rs, nameMatcher, matchers);
|
|
779
|
+
}
|
|
780
|
+
}
|
|
781
|
+
else {
|
|
782
|
+
createMatchers(ruleScope, nameMatcher, matchers);
|
|
783
|
+
}
|
|
784
|
+
if (matchers.length === 0) {
|
|
785
|
+
return noMatch;
|
|
786
|
+
}
|
|
787
|
+
return (scope) => {
|
|
788
|
+
let max = matchers[0].matcher(scope);
|
|
789
|
+
for (let i = 1; i < matchers.length; i++) {
|
|
790
|
+
max = Math.max(max, matchers[i].matcher(scope));
|
|
791
|
+
}
|
|
792
|
+
return max;
|
|
793
|
+
};
|
|
794
|
+
}
|
|
795
|
+
function readSemanticTokenRule(selectorString, settings) {
|
|
796
|
+
const selector = tokenClassificationRegistry.parseTokenSelector(selectorString);
|
|
797
|
+
let style;
|
|
798
|
+
if (typeof settings === 'string') {
|
|
799
|
+
style = TokenStyle.fromSettings(settings, undefined);
|
|
800
|
+
}
|
|
801
|
+
else if (isSemanticTokenColorizationSetting(settings)) {
|
|
802
|
+
style = TokenStyle.fromSettings(settings.foreground, settings.fontStyle, settings.bold, settings.underline, settings.strikethrough, settings.italic);
|
|
803
|
+
}
|
|
804
|
+
if (style) {
|
|
805
|
+
return { selector, style };
|
|
806
|
+
}
|
|
807
|
+
return undefined;
|
|
808
|
+
}
|
|
809
|
+
function isSemanticTokenColorizationSetting(style) {
|
|
810
|
+
return style && (isString(style.foreground) || isString(style.fontStyle) || isBoolean(style.italic)
|
|
811
|
+
|| isBoolean(style.underline) || isBoolean(style.strikethrough) || isBoolean(style.bold));
|
|
812
|
+
}
|
|
813
|
+
function findMetadata(colorThemeData, captureNames, languageId) {
|
|
814
|
+
let metadata = 0;
|
|
815
|
+
metadata |= ((languageId << 0) );
|
|
816
|
+
const themeRule = findMatchingThemeRule(colorThemeData, captureNames);
|
|
817
|
+
let tokenStyle;
|
|
818
|
+
if (!themeRule) {
|
|
819
|
+
tokenStyle = colorThemeData.resolveScopes(( (captureNames.map(name => [name]))).reverse());
|
|
820
|
+
}
|
|
821
|
+
if (captureNames.length > 0) {
|
|
822
|
+
const standardToken = toStandardTokenType(captureNames[captureNames.length - 1]);
|
|
823
|
+
metadata |= ((standardToken << 8) );
|
|
824
|
+
}
|
|
825
|
+
switch (themeRule?.settings.fontStyle) {
|
|
826
|
+
case 'italic':
|
|
827
|
+
metadata |= 1 | 2048 ;
|
|
828
|
+
break;
|
|
829
|
+
case 'bold':
|
|
830
|
+
metadata |= 2 | 4096 ;
|
|
831
|
+
break;
|
|
832
|
+
case 'underline':
|
|
833
|
+
metadata |= 4 | 8192 ;
|
|
834
|
+
break;
|
|
835
|
+
case 'strikethrough':
|
|
836
|
+
metadata |= 8 | 16384 ;
|
|
837
|
+
break;
|
|
838
|
+
default:
|
|
839
|
+
if (typeof tokenStyle?.italic !== 'undefined') {
|
|
840
|
+
const italicbit = (tokenStyle?.italic ? 1 : 0);
|
|
841
|
+
metadata |= italicbit | 2048 ;
|
|
842
|
+
}
|
|
843
|
+
if (typeof tokenStyle?.bold !== 'undefined') {
|
|
844
|
+
const boldBit = (tokenStyle?.bold ? 2 : 0);
|
|
845
|
+
metadata |= boldBit | 4096 ;
|
|
846
|
+
}
|
|
847
|
+
if (typeof tokenStyle?.underline !== 'undefined') {
|
|
848
|
+
const underlineBit = (tokenStyle?.underline ? 4 : 0);
|
|
849
|
+
metadata |= underlineBit | 8192 ;
|
|
850
|
+
}
|
|
851
|
+
if (typeof tokenStyle?.strikethrough !== 'undefined') {
|
|
852
|
+
const strikethroughBit = (tokenStyle?.strikethrough ? 8 : 0);
|
|
853
|
+
metadata |= strikethroughBit | 16384 ;
|
|
854
|
+
}
|
|
855
|
+
}
|
|
856
|
+
const foreground = themeRule ? themeRule.settings.foreground : tokenStyle?.foreground;
|
|
857
|
+
const tokenStyleForeground = foreground ? colorThemeData.getTokenColorIndex().get(foreground) : 1 ;
|
|
858
|
+
metadata |= tokenStyleForeground << 15 ;
|
|
859
|
+
return metadata;
|
|
860
|
+
}
|
|
861
|
+
class TokenColorIndex {
|
|
862
|
+
constructor() {
|
|
863
|
+
this._lastColorId = 0;
|
|
864
|
+
this._id2color = [];
|
|
865
|
+
this._color2id = Object.create(null);
|
|
866
|
+
}
|
|
867
|
+
add(color) {
|
|
868
|
+
color = normalizeColor(color);
|
|
869
|
+
if (color === undefined) {
|
|
870
|
+
return 0;
|
|
871
|
+
}
|
|
872
|
+
let value = this._color2id[color];
|
|
873
|
+
if (value) {
|
|
874
|
+
return value;
|
|
875
|
+
}
|
|
876
|
+
value = ++this._lastColorId;
|
|
877
|
+
this._color2id[color] = value;
|
|
878
|
+
this._id2color[value] = color;
|
|
879
|
+
return value;
|
|
880
|
+
}
|
|
881
|
+
get(color) {
|
|
882
|
+
color = normalizeColor(color);
|
|
883
|
+
if (color === undefined) {
|
|
884
|
+
return 0;
|
|
885
|
+
}
|
|
886
|
+
const value = this._color2id[color];
|
|
887
|
+
if (value) {
|
|
888
|
+
return value;
|
|
889
|
+
}
|
|
890
|
+
console.log(`Color ${color} not in index.`);
|
|
891
|
+
return 0;
|
|
892
|
+
}
|
|
893
|
+
asArray() {
|
|
894
|
+
return this._id2color.slice(0);
|
|
895
|
+
}
|
|
896
|
+
}
|
|
897
|
+
function normalizeColor(color) {
|
|
898
|
+
if (!color) {
|
|
899
|
+
return undefined;
|
|
900
|
+
}
|
|
901
|
+
if (typeof color !== 'string') {
|
|
902
|
+
color = Color.Format.CSS.formatHexA(color, true);
|
|
903
|
+
}
|
|
904
|
+
const len = color.length;
|
|
905
|
+
if (color.charCodeAt(0) !== 35 || (len !== 4 && len !== 5 && len !== 7 && len !== 9)) {
|
|
906
|
+
return undefined;
|
|
907
|
+
}
|
|
908
|
+
const result = [35 ];
|
|
909
|
+
for (let i = 1; i < len; i++) {
|
|
910
|
+
const upper = hexUpper(color.charCodeAt(i));
|
|
911
|
+
if (!upper) {
|
|
912
|
+
return undefined;
|
|
913
|
+
}
|
|
914
|
+
result.push(upper);
|
|
915
|
+
if (len === 4 || len === 5) {
|
|
916
|
+
result.push(upper);
|
|
917
|
+
}
|
|
918
|
+
}
|
|
919
|
+
if (result.length === 9 && result[7] === 70 && result[8] === 70 ) {
|
|
920
|
+
result.length = 7;
|
|
921
|
+
}
|
|
922
|
+
return String.fromCharCode(...result);
|
|
923
|
+
}
|
|
924
|
+
function hexUpper(charCode) {
|
|
925
|
+
if (charCode >= 48 && charCode <= 57 || charCode >= 65 && charCode <= 70 ) {
|
|
926
|
+
return charCode;
|
|
927
|
+
}
|
|
928
|
+
else if (charCode >= 97 && charCode <= 102 ) {
|
|
929
|
+
return charCode - 97 + 65 ;
|
|
930
|
+
}
|
|
931
|
+
return 0;
|
|
932
|
+
}
|
|
933
|
+
export { ColorThemeData, findMetadata };
|