@codingame/monaco-vscode-api 3.2.2 → 4.0.0

package/vscode/src/vs/editor/browser/viewParts/indentGuides/indentGuides.js

@@ -13,9 +13,8 @@ class IndentGuidesOverlay extends DynamicViewOverlay {
         this._context = context;
         this._primaryPosition = null;
         const options = this._context.configuration.options;
-        const wrappingInfo = options.get(145 );
+        const wrappingInfo = options.get(146 );
         const fontInfo = options.get(50 );
-        this._lineHeight = options.get(67 );
         this._spaceWidth = fontInfo.spaceWidth;
         this._maxIndentLeft = wrappingInfo.wrappingColumn === -1 ? -1 : (wrappingInfo.wrappingColumn * fontInfo.typicalHalfwidthCharacterWidth);
         this._bracketPairGuideOptions = options.get(16 );
@@ -29,9 +28,8 @@ class IndentGuidesOverlay extends DynamicViewOverlay {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const wrappingInfo = options.get(145 );
+        const wrappingInfo = options.get(146 );
         const fontInfo = options.get(50 );
-        this._lineHeight = options.get(67 );
         this._spaceWidth = fontInfo.spaceWidth;
         this._maxIndentLeft = wrappingInfo.wrappingColumn === -1 ? -1 : (wrappingInfo.wrappingColumn * fontInfo.typicalHalfwidthCharacterWidth);
         this._bracketPairGuideOptions = options.get(16 );
@@ -78,7 +76,6 @@ class IndentGuidesOverlay extends DynamicViewOverlay {
         const visibleStartLineNumber = ctx.visibleRange.startLineNumber;
         const visibleEndLineNumber = ctx.visibleRange.endLineNumber;
         const scrollWidth = ctx.scrollWidth;
-        const lineHeight = this._lineHeight;
         const activeCursorPosition = this._primaryPosition;
         const indents = this.getGuidesByLine(visibleStartLineNumber, Math.min(visibleEndLineNumber + 1, this._context.viewModel.getLineCount()), activeCursorPosition);
         const output = [];
@@ -98,7 +95,7 @@ class IndentGuidesOverlay extends DynamicViewOverlay {
                 const width = guide.horizontalLine
                     ? (ctx.visibleRangeForPosition(( new Position(lineNumber, guide.horizontalLine.endColumn)))?.left ?? (left + this._spaceWidth)) - left
                     : this._spaceWidth;
-                result += `<div class="core-guide ${guide.className} ${className}" style="left:${left}px;height:${lineHeight}px;width:${width}px"></div>`;
+                result += `<div class="core-guide ${guide.className} ${className}" style="left:${left}px;width:${width}px"></div>`;
             }
             output[lineIndex] = result;
         }

package/vscode/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor .margin-view-overlays .line-numbers{box-sizing:border-box;cursor:default;display:inline-block;font-variant-numeric:tabular-nums;height:100%;position:absolute;text-align:right;vertical-align:middle}.monaco-editor .relative-current-line-number{display:inline-block;text-align:left;width:100%}.monaco-editor .margin-view-overlays .line-numbers.lh-odd{margin-top:1px}.monaco-editor .line-numbers{color:var(--vscode-editorLineNumber-foreground)}.monaco-editor .line-numbers.active-line-number{color:var(--vscode-editorLineNumber-activeForeground)}";
+var css = ".monaco-editor .margin-view-overlays .line-numbers{bottom:0;box-sizing:border-box;cursor:default;display:inline-block;font-variant-numeric:tabular-nums;position:absolute;text-align:right;vertical-align:middle}.monaco-editor .relative-current-line-number{display:inline-block;text-align:left;width:100%}.monaco-editor .margin-view-overlays .line-numbers.lh-odd{margin-top:1px}.monaco-editor .line-numbers{color:var(--vscode-editorLineNumber-foreground)}.monaco-editor .line-numbers.active-line-number{color:var(--vscode-editorLineNumber-activeForeground)}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.js

@@ -23,7 +23,7 @@ class LineNumbersOverlay extends DynamicViewOverlay {
         this._renderLineNumbers = lineNumbers.renderType;
         this._renderCustomLineNumbers = lineNumbers.renderFn;
         this._renderFinalNewline = options.get(95 );
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         this._lineNumbersLeft = layoutInfo.lineNumbersLeft;
         this._lineNumbersWidth = layoutInfo.lineNumbersWidth;
     }
@@ -93,6 +93,10 @@ class LineNumbersOverlay extends DynamicViewOverlay {
             if (modelLineNumber % 10 === 0) {
                 return String(modelLineNumber);
             }
+            const finalLineNumber = this._context.viewModel.getLineCount();
+            if (modelLineNumber === finalLineNumber) {
+                return String(modelLineNumber);
+            }
             return '';
         }
         return String(modelLineNumber);

package/vscode/src/vs/editor/browser/viewParts/lines/viewLine.js

@@ -95,7 +95,7 @@ class ViewLine {
         }
         return false;
     }
-    renderLine(lineNumber, deltaTop, viewportData, sb) {
+    renderLine(lineNumber, deltaTop, lineHeight, viewportData, sb) {
         if (this._isMaybeInvalid === false) {
             return false;
         }
@@ -157,7 +157,7 @@ class ViewLine {
         sb.appendString('<div style="top:');
         sb.appendString(String(deltaTop));
         sb.appendString('px;height:');
-        sb.appendString(String(this._options.lineHeight));
+        sb.appendString(String(lineHeight));
         sb.appendString('px;" class="');
         sb.appendString(ViewLine.CLASS_NAME);
         sb.appendString('">');
@@ -177,10 +177,10 @@ class ViewLine {
         this._renderedViewLine = renderedViewLine;
         return true;
     }
-    layoutLine(lineNumber, deltaTop) {
+    layoutLine(lineNumber, deltaTop, lineHeight) {
         if (this._renderedViewLine && this._renderedViewLine.domNode) {
             this._renderedViewLine.domNode.setTop(deltaTop);
-            this._renderedViewLine.domNode.setHeight(this._options.lineHeight);
+            this._renderedViewLine.domNode.setHeight(lineHeight);
         }
     }
     getWidth(context) {

package/vscode/src/vs/editor/browser/viewParts/lines/viewLines.css.js

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".mtkcontrol{background:#960000!important;color:#fff!important}.mtkoverflow{background-color:var(--vscode-button-background,var(--vscode-editor-background));border-color:var(--vscode-contrastBorder);border-radius:2px;border-style:solid;border-width:1px;color:var(--vscode-button-foreground,var(--vscode-editor-foreground));cursor:pointer;padding:4px}.mtkoverflow:hover{background-color:var(--vscode-button-hoverBackground)}.monaco-editor.no-user-select .lines-content,.monaco-editor.no-user-select .view-line,.monaco-editor.no-user-select .view-lines{user-select:none;-webkit-user-select:none}.monaco-editor.mac .lines-content:hover,.monaco-editor.mac .view-line:hover,.monaco-editor.mac .view-lines:hover{user-select:text;-webkit-user-select:text;-ms-user-select:text}.monaco-editor.enable-user-select{user-select:auto;-webkit-user-select:initial}.monaco-editor .view-lines{white-space:nowrap}.monaco-editor .view-line{position:absolute;width:100%}.monaco-editor .mtkw,.monaco-editor .mtkz{color:var(--vscode-editorWhitespace-foreground)!important}.monaco-editor .mtkz{display:inline-block}";
+var css = ".mtkcontrol{background:#960000!important;color:#fff!important}.mtkoverflow{background-color:var(--vscode-button-background,var(--vscode-editor-background));border-color:var(--vscode-contrastBorder);border-radius:2px;border-style:solid;border-width:1px;color:var(--vscode-button-foreground,var(--vscode-editor-foreground));cursor:pointer;padding:4px}.mtkoverflow:hover{background-color:var(--vscode-button-hoverBackground)}.monaco-editor.no-user-select .lines-content,.monaco-editor.no-user-select .view-line,.monaco-editor.no-user-select .view-lines{user-select:none;-webkit-user-select:none}.monaco-editor.mac .lines-content:hover,.monaco-editor.mac .view-line:hover,.monaco-editor.mac .view-lines:hover{user-select:text;-webkit-user-select:text;-ms-user-select:text}.monaco-editor.enable-user-select{user-select:auto;-webkit-user-select:initial}.monaco-editor .view-lines{white-space:nowrap}.monaco-editor .view-line{position:absolute;width:100%}.monaco-editor .lines-content>.view-lines>.view-line>span{bottom:0;position:absolute;top:0}.monaco-editor .mtkw,.monaco-editor .mtkz{color:var(--vscode-editorWhitespace-foreground)!important}.monaco-editor .mtkz{display:inline-block}";
 n(css,{});
 export { css, css as default };

package/vscode/src/vs/editor/browser/viewParts/lines/viewLines.js

@@ -65,7 +65,7 @@ class ViewLines extends ViewPart {
         const conf = this._context.configuration;
         const options = this._context.configuration.options;
         const fontInfo = options.get(50 );
-        const wrappingInfo = options.get(145 );
+        const wrappingInfo = options.get(146 );
         this._lineHeight = options.get(67 );
         this._typicalHalfwidthCharacterWidth = fontInfo.typicalHalfwidthCharacterWidth;
         this._isViewportWrapping = wrappingInfo.isViewportWrapping;
@@ -102,12 +102,12 @@ class ViewLines extends ViewPart {
     }
     onConfigurationChanged(e) {
         this._visibleLines.onConfigurationChanged(e);
-        if (e.hasChanged(145 )) {
+        if (e.hasChanged(146 )) {
             this._maxLineWidth = 0;
         }
         const options = this._context.configuration.options;
         const fontInfo = options.get(50 );
-        const wrappingInfo = options.get(145 );
+        const wrappingInfo = options.get(146 );
         this._lineHeight = options.get(67 );
         this._typicalHalfwidthCharacterWidth = fontInfo.typicalHalfwidthCharacterWidth;
         this._isViewportWrapping = wrappingInfo.isViewportWrapping;
@@ -119,7 +119,7 @@ class ViewLines extends ViewPart {
         this._maxNumberStickyLines = options.get(115 ).maxLineCount;
         applyFontInfo(this.domNode, fontInfo);
         this._onOptionsMaybeChanged();
-        if (e.hasChanged(144 )) {
+        if (e.hasChanged(145 )) {
             this._maxLineWidth = 0;
         }
         return true;
@@ -570,7 +570,7 @@ class ViewLines extends ViewPart {
     }
     _computeScrollLeftToReveal(horizontalRevealRequest) {
         const viewport = this._context.viewLayout.getCurrentViewport();
-        const layoutInfo = this._context.configuration.options.get(144 );
+        const layoutInfo = this._context.configuration.options.get(145 );
         const viewportStartX = viewport.left;
         const viewportEndX = viewportStartX + viewport.width - layoutInfo.verticalScrollbarWidth;
         let boxStartX = 1073741824 ;

package/vscode/src/vs/editor/browser/viewParts/linesDecorations/linesDecorations.js

@@ -5,7 +5,7 @@ class LinesDecorationsOverlay extends DedupOverlay {
         super();
         this._context = context;
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         this._decorationsLeft = layoutInfo.decorationsLeft;
         this._decorationsWidth = layoutInfo.decorationsWidth;
         this._renderResult = null;
@@ -18,7 +18,7 @@ class LinesDecorationsOverlay extends DedupOverlay {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         this._decorationsLeft = layoutInfo.decorationsLeft;
         this._decorationsWidth = layoutInfo.decorationsWidth;
         return true;

package/vscode/src/vs/editor/browser/viewParts/margin/margin.js

@@ -7,7 +7,7 @@ class Margin extends ViewPart {
     constructor(context) {
         super(context);
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         this._canUseLayerHinting = !options.get(32 );
         this._contentLeft = layoutInfo.contentLeft;
         this._glyphMarginLeft = layoutInfo.glyphMarginLeft;
@@ -29,7 +29,7 @@ class Margin extends ViewPart {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         this._canUseLayerHinting = !options.get(32 );
         this._contentLeft = layoutInfo.contentLeft;
         this._glyphMarginLeft = layoutInfo.glyphMarginLeft;

package/vscode/src/vs/editor/browser/viewParts/minimap/minimap.js

@@ -12,19 +12,30 @@ import { Range } from '../../../common/core/range.js';
 import { RGBA8 } from '../../../common/core/rgba.js';
 import { MinimapTokensColorTracker } from '../../../common/viewModel/minimapTokensColorTracker.js';
 import { ViewModelDecoration } from '../../../common/viewModel.js';
-import { minimapSelection, minimapBackground, minimapForegroundOpacity } from '../../../../platform/theme/common/colorRegistry.js';
+import '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorForeground } from '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import { minimapSelection, minimapBackground, minimapForegroundOpacity } from '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
 import { Selection } from '../../../common/core/selection.js';
 import { Gesture, EventType as EventType$1 } from '../../../../base/browser/touch.js';
 import { MinimapCharRendererFactory } from './minimapCharRendererFactory.js';
-import { MinimapPosition } from '../../../common/model.js';
 import { createSingleCallFunction } from '../../../../base/common/functional.js';
+import { LRUCache } from '../../../../base/common/map.js';
+import { DEFAULT_FONT_FAMILY } from '../../../../base/browser/fonts.js';
 const POINTER_DRAG_RESET_DISTANCE = 140;
 const GUTTER_DECORATION_WIDTH = 2;
 class MinimapOptions {
     constructor(configuration, theme, tokensColorTracker) {
         const options = configuration.options;
-        const pixelRatio = options.get(142 );
-        const layoutInfo = options.get(144 );
+        const pixelRatio = options.get(143 );
+        const layoutInfo = options.get(145 );
         const minimapLayout = layoutInfo.minimap;
         const fontInfo = options.get(50 );
         const minimapOpts = options.get(73 );
@@ -51,6 +62,9 @@ class MinimapOptions {
         this.fontScale = minimapLayout.minimapScale;
         this.minimapLineHeight = minimapLayout.minimapLineHeight;
         this.minimapCharWidth = 1  * this.fontScale;
+        this.sectionHeaderFontFamily = DEFAULT_FONT_FAMILY;
+        this.sectionHeaderFontSize = minimapOpts.sectionHeaderFontSize * pixelRatio;
+        this.sectionHeaderFontColor = MinimapOptions._getSectionHeaderColor(theme, tokensColorTracker.getColor(1 ));
         this.charRenderer = createSingleCallFunction(() => MinimapCharRendererFactory.create(this.fontScale, fontInfo.fontFamily));
         this.defaultBackgroundColor = tokensColorTracker.getColor(2 );
         this.backgroundColor = MinimapOptions._getMinimapBackground(theme, this.defaultBackgroundColor);
@@ -75,6 +89,18 @@ class MinimapOptions {
         }
         return 255;
     }
+    static _getSectionHeaderColor(theme, defaultForegroundColor) {
+        const themeColor = theme.getColor(editorForeground);
+        if (themeColor) {
+            return ( new RGBA8(
+                themeColor.rgba.r,
+                themeColor.rgba.g,
+                themeColor.rgba.b,
+                Math.round(255 * themeColor.rgba.a)
+            ));
+        }
+        return defaultForegroundColor;
+    }
     equals(other) {
         return (this.renderMinimap === other.renderMinimap
             && this.size === other.size
@@ -99,6 +125,7 @@ class MinimapOptions {
             && this.fontScale === other.fontScale
             && this.minimapLineHeight === other.minimapLineHeight
             && this.minimapCharWidth === other.minimapCharWidth
+            && this.sectionHeaderFontSize === other.sectionHeaderFontSize
             && this.defaultBackgroundColor && this.defaultBackgroundColor.equals(other.defaultBackgroundColor)
             && this.backgroundColor && this.backgroundColor.equals(other.backgroundColor)
             && this.foregroundAlpha === other.foregroundAlpha);
@@ -455,7 +482,8 @@ class MinimapSamplingState {
         }
         return [( new MinimapSamplingState(ratio, result)), events];
     }
-    constructor(samplingRatio, minimapLines) {
+    constructor(samplingRatio, minimapLines
+    ) {
         this.samplingRatio = samplingRatio;
         this.minimapLines = minimapLines;
     }
@@ -526,6 +554,7 @@ class MinimapSamplingState {
 class Minimap extends ViewPart {
     constructor(context) {
         super(context);
+        this._sectionHeaderCache = ( new LRUCache(10, 1.5));
         this.tokensColorTracker = MinimapTokensColorTracker.getInstance();
         this._selections = [];
         this._minimapSelections = null;
@@ -749,6 +778,37 @@ class Minimap extends ViewPart {
         return this._minimapSelections;
     }
     getMinimapDecorationsInViewport(startLineNumber, endLineNumber) {
+        const decorations = this._getMinimapDecorationsInViewport(startLineNumber, endLineNumber)
+            .filter(decoration => !decoration.options.minimap?.sectionHeaderStyle);
+        if (this._samplingState) {
+            const result = [];
+            for (const decoration of decorations) {
+                if (!decoration.options.minimap) {
+                    continue;
+                }
+                const range = decoration.range;
+                const minimapStartLineNumber = this._samplingState.modelLineToMinimapLine(range.startLineNumber);
+                const minimapEndLineNumber = this._samplingState.modelLineToMinimapLine(range.endLineNumber);
+                result.push(( new ViewModelDecoration(( new Range(
+                    minimapStartLineNumber,
+                    range.startColumn,
+                    minimapEndLineNumber,
+                    range.endColumn
+                )), decoration.options)));
+            }
+            return result;
+        }
+        return decorations;
+    }
+    getSectionHeaderDecorationsInViewport(startLineNumber, endLineNumber) {
+        const minimapLineHeight = this.options.minimapLineHeight;
+        const sectionHeaderFontSize = this.options.sectionHeaderFontSize;
+        const headerHeightInMinimapLines = sectionHeaderFontSize / minimapLineHeight;
+        startLineNumber = Math.floor(Math.max(1, startLineNumber - headerHeightInMinimapLines));
+        return this._getMinimapDecorationsInViewport(startLineNumber, endLineNumber)
+            .filter(decoration => !!decoration.options.minimap?.sectionHeaderStyle);
+    }
+    _getMinimapDecorationsInViewport(startLineNumber, endLineNumber) {
         let visibleRange;
         if (this._samplingState) {
             const modelStartLineNumber = this._samplingState.minimapLines[startLineNumber - 1];
@@ -768,26 +828,20 @@ class Minimap extends ViewPart {
                 this._context.viewModel.getLineMaxColumn(endLineNumber)
             ));
         }
-        const decorations = this._context.viewModel.getMinimapDecorationsInRange(visibleRange);
-        if (this._samplingState) {
-            const result = [];
-            for (const decoration of decorations) {
-                if (!decoration.options.minimap) {
-                    continue;
-                }
-                const range = decoration.range;
-                const minimapStartLineNumber = this._samplingState.modelLineToMinimapLine(range.startLineNumber);
-                const minimapEndLineNumber = this._samplingState.modelLineToMinimapLine(range.endLineNumber);
-                result.push(( new ViewModelDecoration(( new Range(
-                    minimapStartLineNumber,
-                    range.startColumn,
-                    minimapEndLineNumber,
-                    range.endColumn
-                )), decoration.options)));
-            }
-            return result;
+        return this._context.viewModel.getMinimapDecorationsInRange(visibleRange);
+    }
+    getSectionHeaderText(decoration, fitWidth) {
+        const headerText = decoration.options.minimap?.sectionHeaderText;
+        if (!headerText) {
+            return null;
         }
-        return decorations;
+        const cachedText = this._sectionHeaderCache.get(headerText);
+        if (cachedText) {
+            return cachedText;
+        }
+        const fittedText = fitWidth(headerText);
+        this._sectionHeaderCache.set(headerText, fittedText);
+        return fittedText;
     }
     getOptions() {
         return this._context.viewModel.model.getOptions();
@@ -1081,6 +1135,7 @@ class InnerMinimap extends Disposable {
             const lineOffsetMap = ( new ContiguousLineMap(layout.startLineNumber, layout.endLineNumber, null));
             this._renderSelectionsHighlights(canvasContext, selections, lineOffsetMap, layout, minimapLineHeight, tabSize, minimapCharWidth, canvasInnerWidth);
             this._renderDecorationsHighlights(canvasContext, decorations, lineOffsetMap, layout, minimapLineHeight, tabSize, minimapCharWidth, canvasInnerWidth);
+            this._renderSectionHeaders(layout);
         }
     }
     _renderSelectionLineHighlights(canvasContext, selections, highlightedLines, layout, minimapLineHeight) {
@@ -1121,7 +1176,7 @@ class InnerMinimap extends Disposable {
         for (let i = decorations.length - 1; i >= 0; i--) {
             const decoration = decorations[i];
             const minimapOptions = decoration.options.minimap;
-            if (!minimapOptions || minimapOptions.position !== MinimapPosition.Inline) {
+            if (!minimapOptions || minimapOptions.position !== 1 ) {
                 continue;
             }
             const intersection = layout.intersectWithViewport(decoration.range);
@@ -1181,10 +1236,10 @@ class InnerMinimap extends Disposable {
             }
             for (let line = startLineNumber; line <= endLineNumber; line++) {
                 switch (minimapOptions.position) {
-                    case MinimapPosition.Inline:
+                    case 1 :
                         this.renderDecorationOnLine(canvasContext, lineOffsetMap, decoration.range, decorationColor, layout, line, minimapLineHeight, minimapLineHeight, tabSize, characterWidth, canvasInnerWidth);
                         continue;
-                    case MinimapPosition.Gutter: {
+                    case 2 : {
                         const y = layout.getYForLineNumber(line, minimapLineHeight);
                         const x = 2;
                         this.renderDecoration(canvasContext, decorationColor, x, y, GUTTER_DECORATION_WIDTH, minimapLineHeight);
@@ -1245,6 +1300,66 @@ class InnerMinimap extends Disposable {
         canvasContext.fillStyle = decorationColor && ( decorationColor.toString()) || '';
         canvasContext.fillRect(x, y, width, height);
     }
+    _renderSectionHeaders(layout) {
+        const minimapLineHeight = this._model.options.minimapLineHeight;
+        const sectionHeaderFontSize = this._model.options.sectionHeaderFontSize;
+        const backgroundFillHeight = sectionHeaderFontSize * 1.5;
+        const { canvasInnerWidth } = this._model.options;
+        const backgroundColor = this._model.options.backgroundColor;
+        const backgroundFill = `rgb(${backgroundColor.r} ${backgroundColor.g} ${backgroundColor.b} / .7)`;
+        const foregroundColor = this._model.options.sectionHeaderFontColor;
+        const foregroundFill = `rgb(${foregroundColor.r} ${foregroundColor.g} ${foregroundColor.b})`;
+        const separatorStroke = foregroundFill;
+        const canvasContext = this._decorationsCanvas.domNode.getContext('2d');
+        canvasContext.font = sectionHeaderFontSize + 'px ' + this._model.options.sectionHeaderFontFamily;
+        canvasContext.strokeStyle = separatorStroke;
+        canvasContext.lineWidth = 0.2;
+        const decorations = this._model.getSectionHeaderDecorationsInViewport(layout.startLineNumber, layout.endLineNumber);
+        decorations.sort((a, b) => a.range.startLineNumber - b.range.startLineNumber);
+        const fitWidth = InnerMinimap._fitSectionHeader.bind(null, canvasContext, canvasInnerWidth - MINIMAP_GUTTER_WIDTH);
+        for (const decoration of decorations) {
+            const y = layout.getYForLineNumber(decoration.range.startLineNumber, minimapLineHeight) + sectionHeaderFontSize;
+            const backgroundFillY = y - sectionHeaderFontSize;
+            const separatorY = backgroundFillY + 2;
+            const headerText = this._model.getSectionHeaderText(decoration, fitWidth);
+            InnerMinimap._renderSectionLabel(canvasContext, headerText, decoration.options.minimap?.sectionHeaderStyle === 2 , backgroundFill, foregroundFill, canvasInnerWidth, backgroundFillY, backgroundFillHeight, y, separatorY);
+        }
+    }
+    static _fitSectionHeader(target, maxWidth, headerText) {
+        if (!headerText) {
+            return headerText;
+        }
+        const ellipsis = '…';
+        const width = target.measureText(headerText).width;
+        const ellipsisWidth = target.measureText(ellipsis).width;
+        if (width <= maxWidth || width <= ellipsisWidth) {
+            return headerText;
+        }
+        const len = headerText.length;
+        const averageCharWidth = width / headerText.length;
+        const maxCharCount = Math.floor((maxWidth - ellipsisWidth) / averageCharWidth) - 1;
+        let halfCharCount = Math.ceil(maxCharCount / 2);
+        while (halfCharCount > 0 && /\s/.test(headerText[halfCharCount - 1])) {
+            --halfCharCount;
+        }
+        return headerText.substring(0, halfCharCount)
+            + ellipsis + headerText.substring(len - (maxCharCount - halfCharCount));
+    }
+    static _renderSectionLabel(target, headerText, hasSeparatorLine, backgroundFill, foregroundFill, minimapWidth, backgroundFillY, backgroundFillHeight, textY, separatorY) {
+        if (headerText) {
+            target.fillStyle = backgroundFill;
+            target.fillRect(0, backgroundFillY, minimapWidth, backgroundFillHeight);
+            target.fillStyle = foregroundFill;
+            target.fillText(headerText, MINIMAP_GUTTER_WIDTH, textY);
+        }
+        if (hasSeparatorLine) {
+            target.beginPath();
+            target.moveTo(0, separatorY);
+            target.lineTo(minimapWidth, separatorY);
+            target.closePath();
+            target.stroke();
+        }
+    }
     renderLines(layout) {
         const startLineNumber = layout.startLineNumber;
         const endLineNumber = layout.endLineNumber;

package/vscode/src/vs/editor/browser/viewParts/overlayWidgets/overlayWidgets.js

@@ -7,7 +7,7 @@ class ViewOverlayWidgets extends ViewPart {
         super(context);
         this._viewDomNode = viewDomNode;
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         this._widgets = {};
         this._verticalScrollbarWidth = layoutInfo.verticalScrollbarWidth;
         this._minimapWidth = layoutInfo.minimap.minimapWidth;
@@ -31,7 +31,7 @@ class ViewOverlayWidgets extends ViewPart {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         this._verticalScrollbarWidth = layoutInfo.verticalScrollbarWidth;
         this._minimapWidth = layoutInfo.minimap.minimapWidth;
         this._horizontalScrollbarHeight = layoutInfo.horizontalScrollbarHeight;

package/vscode/src/vs/editor/browser/viewParts/overviewRuler/decorationsOverviewRuler.js

@@ -3,21 +3,25 @@ import { Color } from '../../../../base/common/color.js';
 import { ViewPart } from '../../view/viewPart.js';
 import { Position } from '../../../common/core/position.js';
 import { TokenizationRegistry } from '../../../common/languages.js';
-import { editorOverviewRulerBorder, editorCursorForeground, editorOverviewRulerBackground } from '../../../common/core/editorColorRegistry.js';
+import { editorOverviewRulerBorder, editorCursorForeground, editorMultiCursorPrimaryForeground, editorMultiCursorSecondaryForeground, editorOverviewRulerBackground } from '../../../common/core/editorColorRegistry.js';
 import { OverviewRulerDecorationsGroup } from '../../../common/viewModel.js';
 import { equals } from '../../../../base/common/arrays.js';
 class Settings {
     constructor(config, theme) {
         const options = config.options;
         this.lineHeight = options.get(67 );
-        this.pixelRatio = options.get(142 );
+        this.pixelRatio = options.get(143 );
         this.overviewRulerLanes = options.get(83 );
         this.renderBorder = options.get(82 );
         const borderColor = theme.getColor(editorOverviewRulerBorder);
         this.borderColor = borderColor ? ( borderColor.toString()) : null;
         this.hideCursor = options.get(59 );
-        const cursorColor = theme.getColor(editorCursorForeground);
-        this.cursorColor = cursorColor ? ( ( cursorColor.transparent(0.7)).toString()) : null;
+        const cursorColorSingle = theme.getColor(editorCursorForeground);
+        this.cursorColorSingle = cursorColorSingle ? ( ( cursorColorSingle.transparent(0.7)).toString()) : null;
+        const cursorColorPrimary = theme.getColor(editorMultiCursorPrimaryForeground);
+        this.cursorColorPrimary = cursorColorPrimary ? ( ( cursorColorPrimary.transparent(0.7)).toString()) : null;
+        const cursorColorSecondary = theme.getColor(editorMultiCursorSecondaryForeground);
+        this.cursorColorSecondary = cursorColorSecondary ? ( ( cursorColorSecondary.transparent(0.7)).toString()) : null;
         this.themeType = theme.type;
         const minimapOpts = options.get(73 );
         const minimapEnabled = minimapOpts.enabled;
@@ -33,7 +37,7 @@ class Settings {
         else {
             this.backgroundColor = null;
         }
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         const position = layoutInfo.overviewRuler;
         this.top = position.top;
         this.right = position.right;
@@ -142,7 +146,9 @@ class Settings {
             && this.renderBorder === other.renderBorder
             && this.borderColor === other.borderColor
             && this.hideCursor === other.hideCursor
-            && this.cursorColor === other.cursorColor
+            && this.cursorColorSingle === other.cursorColorSingle
+            && this.cursorColorPrimary === other.cursorColorPrimary
+            && this.cursorColorSecondary === other.cursorColorSecondary
             && this.themeType === other.themeType
             && Color.equals(this.backgroundColor, other.backgroundColor)
             && this.top === other.top
@@ -171,7 +177,7 @@ class DecorationsOverviewRuler extends ViewPart {
                 this._updateSettings(true);
             }
         });
-        this._cursorPositions = [( new Position(1, 1))];
+        this._cursorPositions = [{ position: ( new Position(1, 1)), color: this._settings.cursorColorSingle }];
     }
     dispose() {
         super.dispose();
@@ -208,9 +214,13 @@ class DecorationsOverviewRuler extends ViewPart {
     onCursorStateChanged(e) {
         this._cursorPositions = [];
         for (let i = 0, len = e.selections.length; i < len; i++) {
-            this._cursorPositions[i] = e.selections[i].getPosition();
+            let color = this._settings.cursorColorSingle;
+            if (len > 1) {
+                color = i === 0 ? this._settings.cursorColorPrimary : this._settings.cursorColorSecondary;
+            }
+            this._cursorPositions.push({ position: e.selections[i].getPosition(), color });
         }
-        this._cursorPositions.sort(Position.compare);
+        this._cursorPositions.sort((a, b) => Position.compare(a.position, b.position));
         return this._markRenderingIsMaybeNeeded();
     }
     onDecorationsChanged(e) {
@@ -252,7 +262,7 @@ class DecorationsOverviewRuler extends ViewPart {
         if (this._actualShouldRender === 1  && !OverviewRulerDecorationsGroup.equalsArr(this._renderedDecorations, decorations)) {
             this._actualShouldRender = 2 ;
         }
-        if (this._actualShouldRender === 1  && !equals(this._renderedCursorPositions, this._cursorPositions, (a, b) => a.lineNumber === b.lineNumber)) {
+        if (this._actualShouldRender === 1  && !equals(this._renderedCursorPositions, this._cursorPositions, (a, b) => a.position.lineNumber === b.position.lineNumber && a.color === b.color)) {
             this._actualShouldRender = 2 ;
         }
         if (this._actualShouldRender === 1 ) {
@@ -327,16 +337,20 @@ class DecorationsOverviewRuler extends ViewPart {
             }
             canvasCtx.fillRect(x[prevLane], prevY1, w[prevLane], prevY2 - prevY1);
         }
-        if (!this._settings.hideCursor && this._settings.cursorColor) {
+        if (!this._settings.hideCursor) {
             const cursorHeight = (2 * this._settings.pixelRatio) | 0;
             const halfCursorHeight = (cursorHeight / 2) | 0;
             const cursorX = this._settings.x[7 ];
             const cursorW = this._settings.w[7 ];
-            canvasCtx.fillStyle = this._settings.cursorColor;
             let prevY1 = -100;
             let prevY2 = -100;
+            let prevColor = null;
             for (let i = 0, len = this._cursorPositions.length; i < len; i++) {
-                const cursor = this._cursorPositions[i];
+                const color = this._cursorPositions[i].color;
+                if (!color) {
+                    continue;
+                }
+                const cursor = this._cursorPositions[i].position;
                 let yCenter = (viewLayout.getVerticalOffsetForLineNumber(cursor.lineNumber) * heightRatio) | 0;
                 if (yCenter < halfCursorHeight) {
                     yCenter = halfCursorHeight;
@@ -346,8 +360,8 @@ class DecorationsOverviewRuler extends ViewPart {
                 }
                 const y1 = yCenter - halfCursorHeight;
                 const y2 = y1 + cursorHeight;
-                if (y1 > prevY2 + 1) {
-                    if (i !== 0) {
+                if (y1 > prevY2 + 1 || color !== prevColor) {
+                    if (i !== 0 && prevColor) {
                         canvasCtx.fillRect(cursorX, prevY1, cursorW, prevY2 - prevY1);
                     }
                     prevY1 = y1;
@@ -358,8 +372,12 @@ class DecorationsOverviewRuler extends ViewPart {
                         prevY2 = y2;
                     }
                 }
+                prevColor = color;
+                canvasCtx.fillStyle = color;
+            }
+            if (prevColor) {
+                canvasCtx.fillRect(cursorX, prevY1, cursorW, prevY2 - prevY1);
             }
-            canvasCtx.fillRect(cursorX, prevY1, cursorW, prevY2 - prevY1);
         }
         if (this._settings.renderBorder && this._settings.borderColor && this._settings.overviewRulerLanes > 0) {
             canvasCtx.beginPath();

package/vscode/src/vs/editor/browser/viewParts/overviewRuler/overviewRuler.js

@@ -18,7 +18,7 @@ class OverviewRuler extends ViewEventHandler {
         this._zoneManager.setDOMHeight(0);
         this._zoneManager.setOuterHeight(this._context.viewLayout.getScrollHeight());
         this._zoneManager.setLineHeight(options.get(67 ));
-        this._zoneManager.setPixelRatio(options.get(142 ));
+        this._zoneManager.setPixelRatio(options.get(143 ));
         this._context.addEventHandler(this);
     }
     dispose() {
@@ -31,8 +31,8 @@ class OverviewRuler extends ViewEventHandler {
             this._zoneManager.setLineHeight(options.get(67 ));
             this._render();
         }
-        if (e.hasChanged(142 )) {
-            this._zoneManager.setPixelRatio(options.get(142 ));
+        if (e.hasChanged(143 )) {
+            this._zoneManager.setPixelRatio(options.get(143 ));
             this._domNode.setWidth(this._zoneManager.getDOMWidth());
             this._domNode.setHeight(this._zoneManager.getDOMHeight());
             this._domNode.domNode.width = this._zoneManager.getCanvasWidth();

package/vscode/src/vs/editor/browser/viewParts/scrollDecoration/scrollDecoration.js

@@ -31,7 +31,7 @@ class ScrollDecorationViewPart extends ViewPart {
     }
     _updateWidth() {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         if (layoutInfo.minimap.renderMinimap === 0 || (layoutInfo.minimap.minimapWidth > 0 && layoutInfo.minimap.minimapLeft === 0)) {
             this._width = layoutInfo.width;
         }