monaco-editor-core 0.58.0-dev-20261107 → 0.58.0-dev-20261109

package/esm/nls.messages.cs.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.58.0-dev-20261107(5359a3330383137dfdf8897ba1d93d943fec4027)
+ * Version: 0.58.0-dev-20261109(5359a3330383137dfdf8897ba1d93d943fec4027)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/nls.messages.de.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.58.0-dev-20261107(5359a3330383137dfdf8897ba1d93d943fec4027)
+ * Version: 0.58.0-dev-20261109(5359a3330383137dfdf8897ba1d93d943fec4027)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/nls.messages.es.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.58.0-dev-20261107(5359a3330383137dfdf8897ba1d93d943fec4027)
+ * Version: 0.58.0-dev-20261109(5359a3330383137dfdf8897ba1d93d943fec4027)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/nls.messages.fr.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.58.0-dev-20261107(5359a3330383137dfdf8897ba1d93d943fec4027)
+ * Version: 0.58.0-dev-20261109(5359a3330383137dfdf8897ba1d93d943fec4027)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/nls.messages.it.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.58.0-dev-20261107(5359a3330383137dfdf8897ba1d93d943fec4027)
+ * Version: 0.58.0-dev-20261109(5359a3330383137dfdf8897ba1d93d943fec4027)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/nls.messages.ja.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.58.0-dev-20261107(5359a3330383137dfdf8897ba1d93d943fec4027)
+ * Version: 0.58.0-dev-20261109(5359a3330383137dfdf8897ba1d93d943fec4027)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/nls.messages.ko.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.58.0-dev-20261107(5359a3330383137dfdf8897ba1d93d943fec4027)
+ * Version: 0.58.0-dev-20261109(5359a3330383137dfdf8897ba1d93d943fec4027)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/nls.messages.pl.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.58.0-dev-20261107(5359a3330383137dfdf8897ba1d93d943fec4027)
+ * Version: 0.58.0-dev-20261109(5359a3330383137dfdf8897ba1d93d943fec4027)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/nls.messages.pt-br.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.58.0-dev-20261107(5359a3330383137dfdf8897ba1d93d943fec4027)
+ * Version: 0.58.0-dev-20261109(5359a3330383137dfdf8897ba1d93d943fec4027)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/nls.messages.ru.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.58.0-dev-20261107(5359a3330383137dfdf8897ba1d93d943fec4027)
+ * Version: 0.58.0-dev-20261109(5359a3330383137dfdf8897ba1d93d943fec4027)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/nls.messages.tr.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.58.0-dev-20261107(5359a3330383137dfdf8897ba1d93d943fec4027)
+ * Version: 0.58.0-dev-20261109(5359a3330383137dfdf8897ba1d93d943fec4027)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/nls.messages.zh-cn.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.58.0-dev-20261107(5359a3330383137dfdf8897ba1d93d943fec4027)
+ * Version: 0.58.0-dev-20261109(5359a3330383137dfdf8897ba1d93d943fec4027)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/nls.messages.zh-tw.js

@@ -1,6 +1,6 @@
 /*!-----------------------------------------------------------
  * Copyright (c) Microsoft Corporation. All rights reserved.
- * Version: 0.58.0-dev-20261107(5359a3330383137dfdf8897ba1d93d943fec4027)
+ * Version: 0.58.0-dev-20261109(5359a3330383137dfdf8897ba1d93d943fec4027)
  * Released under the MIT license
  * https://github.com/microsoft/vscode/blob/main/LICENSE.txt
  *-----------------------------------------------------------*/

package/esm/vs/editor/browser/viewParts/minimap/minimap.css

@@ -8,7 +8,8 @@
 	opacity: 0;
 	transition: opacity 100ms linear;
 }
-.monaco-editor .minimap.slider-mouseover:hover .minimap-slider {
+.monaco-editor .minimap.slider-mouseover:hover .minimap-slider,
+.monaco-editor .minimap.slider-mouseover.slider-scrolling .minimap-slider {
 	opacity: 1;
 }
 .monaco-editor .minimap.slider-mouseover .minimap-slider.active {
@@ -49,7 +50,7 @@
 	opacity: 0;
 	transition: opacity 0.5s;
 }
-.minimap.minimap-autohide-scroll{
+.minimap.minimap-autohide-scroll {
 	pointer-events: none;
 }
 .minimap.minimap-autohide-mouseover:hover,
@@ -65,7 +66,3 @@
 	 */
 	z-index: 4;
 }
-
-.monaco-editor .minimap canvas {
-	opacity: 0.9;
-}

package/esm/vs/editor/browser/viewParts/minimap/minimap.js

@@ -19,6 +19,7 @@ import { minimapSelection, minimapBackground, minimapForegroundOpacity, editorFo
 import { Selection } from '../../../common/core/selection.js';
 import { EventType, Gesture } from '../../../../base/browser/touch.js';
 import { MinimapCharRendererFactory } from './minimapCharRendererFactory.js';
+import { RecordedFrame, RowSignatures } from './minimapDirtyRows.js';
 import { createSingleCallFunction } from '../../../../base/common/functional.js';
 import { LRUCache } from '../../../../base/common/map.js';
 import { DEFAULT_FONT_FAMILY } from '../../../../base/browser/fonts.js';
@@ -116,12 +117,13 @@ class MinimapOptions {
             && this.minimapCharWidth === other.minimapCharWidth
             && this.sectionHeaderFontSize === other.sectionHeaderFontSize
             && this.sectionHeaderLetterSpacing === other.sectionHeaderLetterSpacing
+            && this.sectionHeaderFontColor.equals(other.sectionHeaderFontColor)
             && this.defaultBackgroundColor && this.defaultBackgroundColor.equals(other.defaultBackgroundColor)
             && this.backgroundColor && this.backgroundColor.equals(other.backgroundColor)
             && this.foregroundAlpha === other.foregroundAlpha);
     }
 }
-class MinimapLayout {
+export class MinimapLayout {
     constructor(
     /**
      * The given editor scrollTop (input).
@@ -188,7 +190,7 @@ class MinimapLayout {
     getYForLineNumber(lineNumber, minimapLineHeight) {
         return +(lineNumber - this.startLineNumber + this.topPaddingLineCount) * minimapLineHeight;
     }
-    static create(options, viewportStartLineNumber, viewportEndLineNumber, viewportStartLineNumberVerticalOffset, viewportHeight, viewportContainsWhitespaceGaps, lineCount, realLineCount, scrollTop, scrollHeight, previousLayout) {
+    static create(options, viewportStartLineNumber, viewportEndLineNumber, viewportStartLineNumberVerticalOffset, viewportStartLineNumberLineHeight, viewportHeight, viewportContainsWhitespaceGaps, lineCount, realLineCount, scrollTop, scrollHeight, previousLayout) {
         const pixelRatio = options.pixelRatio;
         const minimapLineHeight = options.minimapLineHeight;
         const minimapLinesFitting = Math.floor(options.canvasInnerHeight / minimapLineHeight);
@@ -291,7 +293,12 @@ class MinimapLayout {
                 }
             }
             const endLineNumber = Math.min(lineCount, startLineNumber - topPaddingLineCount + minimapLinesFitting - 1);
-            const partialLine = (scrollTop - viewportStartLineNumberVerticalOffset) / lineHeight;
+            // When the viewport starts inside a view zone, the top padding or a taller line, the first
+            // visible line does not start at `scrollTop`; clamp so the slider never moves backwards.
+            // A custom line height can round to 0px, and such a line has no partial progress
+            const partialLine = viewportStartLineNumberLineHeight > 0
+                ? Math.min(Math.max(0, scrollTop - viewportStartLineNumberVerticalOffset), viewportStartLineNumberLineHeight) / viewportStartLineNumberLineHeight
+                : 0;
             let sliderTopAligned;
             if (scrollTop >= options.paddingTop) {
                 sliderTopAligned = (viewportStartLineNumber - startLineNumber + topPaddingLineCount + partialLine) * minimapLineHeight / pixelRatio;
@@ -744,6 +751,7 @@ export class Minimap extends ViewPart {
             viewportStartLineNumber: viewportStartLineNumber,
             viewportEndLineNumber: viewportEndLineNumber,
             viewportStartLineNumberVerticalOffset: ctx.getVerticalOffsetForLineNumber(viewportStartLineNumber),
+            viewportStartLineNumberLineHeight: ctx.getLineHeightForLineNumber(viewportStartLineNumber),
             scrollTop: ctx.scrollTop,
             scrollLeft: ctx.scrollLeft,
             viewportWidth: ctx.viewportWidth,
@@ -892,6 +900,11 @@ export class Minimap extends ViewPart {
 class InnerMinimap extends Disposable {
     constructor(theme, model) {
         super();
+        /**
+         * What each row of `_decorationsCanvas` shows, so that the next frame only redraws
+         * the rows that change. Drawing on all of a visible canvas makes the browser repaint all of it.
+         */
+        this._lastDecorationsRows = null;
         this._renderDecorations = false;
         this._gestureInProgress = false;
         this._isMouseOverMinimap = false;
@@ -930,6 +943,7 @@ class InnerMinimap extends Disposable {
         this._slider.appendChild(this._sliderHorizontal);
         this._applyLayout();
         this._hideDelayedScheduler = this._register(new RunOnceScheduler(() => this._hideImmediatelyIfMouseIsOutside(), 500));
+        this._hideSliderAfterScrollScheduler = this._register(new RunOnceScheduler(() => this._domNode.toggleClassName('slider-scrolling', false), 500));
         this._register(dom.addStandardDisposableListener(this._domNode.domNode, dom.EventType.MOUSE_OVER, () => {
             this._isMouseOverMinimap = true;
         }));
@@ -1086,6 +1100,7 @@ class InnerMinimap extends Disposable {
         this._decorationsCanvas.setHeight(this._model.options.canvasOuterHeight);
         this._decorationsCanvas.domNode.width = this._model.options.canvasInnerWidth;
         this._decorationsCanvas.domNode.height = this._model.options.canvasInnerHeight;
+        this._lastDecorationsRows = null;
         this._slider.setWidth(this._model.options.minimapWidth);
     }
     _getBuffer() {
@@ -1134,6 +1149,10 @@ class InnerMinimap extends Disposable {
             this._domNode.toggleClassName('active', true);
             this._hideSoon();
         }
+        if (this._model.options.showSlider === 'mouseover' && e.scrollTopChanged) {
+            this._domNode.toggleClassName('slider-scrolling', true);
+            this._hideSliderAfterScrollScheduler.schedule();
+        }
         this._renderDecorations = true;
         return true;
     }
@@ -1172,7 +1191,7 @@ class InnerMinimap extends Disposable {
         else {
             this._shadow.setClassName('minimap-shadow-visible');
         }
-        const layout = MinimapLayout.create(this._model.options, renderingCtx.viewportStartLineNumber, renderingCtx.viewportEndLineNumber, renderingCtx.viewportStartLineNumberVerticalOffset, renderingCtx.viewportHeight, renderingCtx.viewportContainsWhitespaceGaps, this._model.getLineCount(), this._model.getRealLineCount(), renderingCtx.scrollTop, renderingCtx.scrollHeight, this._lastRenderData ? this._lastRenderData.renderedLayout : null);
+        const layout = MinimapLayout.create(this._model.options, renderingCtx.viewportStartLineNumber, renderingCtx.viewportEndLineNumber, renderingCtx.viewportStartLineNumberVerticalOffset, renderingCtx.viewportStartLineNumberLineHeight, renderingCtx.viewportHeight, renderingCtx.viewportContainsWhitespaceGaps, this._model.getLineCount(), this._model.getRealLineCount(), renderingCtx.scrollTop, renderingCtx.scrollHeight, this._lastRenderData ? this._lastRenderData.renderedLayout : null);
         this._slider.setDisplay(layout.sliderNeeded ? 'block' : 'none');
         this._slider.setTop(layout.sliderTop);
         this._slider.setHeight(layout.sliderHeight);
@@ -1195,26 +1214,41 @@ class InnerMinimap extends Disposable {
             const minimapLineHeight = this._model.options.minimapLineHeight;
             const minimapCharWidth = this._model.options.minimapCharWidth;
             const tabSize = this._model.getOptions().tabSize;
+            if (canvasInnerWidth === 0 || canvasInnerHeight === 0) {
+                return;
+            }
             const canvasContext = this._decorationsCanvas.domNode.getContext('2d');
-            canvasContext.clearRect(0, 0, canvasInnerWidth, canvasInnerHeight);
+            const frame = new RecordedFrame(canvasInnerHeight);
             // We first need to render line highlights and then render decorations on top of those.
             // But we need to pick a single color for each line, and use that as a line highlight.
             // This needs to be the color of the decoration with the highest `zIndex`, but priority
             // is given to the selection.
             const highlightedLines = new ContiguousLineMap(layout.startLineNumber, layout.endLineNumber, false);
-            this._renderSelectionLineHighlights(canvasContext, selections, highlightedLines, layout, minimapLineHeight);
-            this._renderDecorationsLineHighlights(canvasContext, decorations, highlightedLines, layout, minimapLineHeight);
+            this._renderSelectionLineHighlights(frame, selections, highlightedLines, layout, minimapLineHeight, canvasInnerWidth);
+            this._renderDecorationsLineHighlights(frame, decorations, highlightedLines, layout, minimapLineHeight, canvasInnerWidth);
             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) {
+            this._renderSelectionsHighlights(frame, selections, lineOffsetMap, layout, minimapLineHeight, tabSize, minimapCharWidth, canvasInnerWidth);
+            this._renderDecorationsHighlights(frame, decorations, lineOffsetMap, layout, minimapLineHeight, tabSize, minimapCharWidth, canvasInnerWidth);
+            this._renderSectionHeaders(frame, canvasContext, layout);
+            // Only redraw the rows that look different from the last frame
+            const dirty = RowSignatures.diff(this._lastDecorationsRows, frame.rows);
+            this._lastDecorationsRows = frame.rows;
+            if (dirty) {
+                canvasContext.save();
+                canvasContext.beginPath();
+                canvasContext.rect(0, dirty.start, canvasInnerWidth, dirty.end - dirty.start);
+                canvasContext.clip();
+                canvasContext.clearRect(0, dirty.start, canvasInnerWidth, dirty.end - dirty.start);
+                frame.replay(canvasContext, dirty);
+                canvasContext.restore();
+            }
+        }
+    }
+    _renderSelectionLineHighlights(frame, selections, highlightedLines, layout, minimapLineHeight, canvasInnerWidth) {
         if (!this._selectionColor || this._selectionColor.isTransparent()) {
             return;
         }
-        canvasContext.fillStyle = this._selectionColor.transparent(0.5).toString();
+        const fillStyle = this._selectionColor.transparent(0.5).toString();
         let y1 = 0;
         let y2 = 0;
         for (const selection of selections) {
@@ -1236,7 +1270,7 @@ class InnerMinimap extends Disposable {
             else {
                 if (y2 > y1) {
                     // flush
-                    canvasContext.fillRect(MINIMAP_GUTTER_WIDTH, y1, canvasContext.canvas.width, y2 - y1);
+                    frame.fillRect(fillStyle, MINIMAP_GUTTER_WIDTH, y1, canvasInnerWidth, y2 - y1);
                 }
                 y1 = yy1;
                 y2 = yy2;
@@ -1244,10 +1278,10 @@ class InnerMinimap extends Disposable {
         }
         if (y2 > y1) {
             // flush
-            canvasContext.fillRect(MINIMAP_GUTTER_WIDTH, y1, canvasContext.canvas.width, y2 - y1);
+            frame.fillRect(fillStyle, MINIMAP_GUTTER_WIDTH, y1, canvasInnerWidth, y2 - y1);
         }
     }
-    _renderDecorationsLineHighlights(canvasContext, decorations, highlightedLines, layout, minimapLineHeight) {
+    _renderDecorationsLineHighlights(frame, decorations, highlightedLines, layout, minimapLineHeight, canvasInnerWidth) {
         const highlightColors = new Map();
         // Loop backwards to hit first decorations with higher `zIndex`
         for (let i = decorations.length - 1; i >= 0; i--) {
@@ -1271,18 +1305,17 @@ class InnerMinimap extends Disposable {
                 highlightColor = decorationColor.transparent(0.5).toString();
                 highlightColors.set(decorationColor.toString(), highlightColor);
             }
-            canvasContext.fillStyle = highlightColor;
             for (let line = startLineNumber; line <= endLineNumber; line++) {
                 if (highlightedLines.has(line)) {
                     continue;
                 }
                 highlightedLines.set(line, true);
                 const y = layout.getYForLineNumber(line, minimapLineHeight);
-                canvasContext.fillRect(MINIMAP_GUTTER_WIDTH, y, canvasContext.canvas.width, minimapLineHeight);
+                frame.fillRect(highlightColor, MINIMAP_GUTTER_WIDTH, y, canvasInnerWidth, minimapLineHeight);
             }
         }
     }
-    _renderSelectionsHighlights(canvasContext, selections, lineOffsetMap, layout, lineHeight, tabSize, characterWidth, canvasInnerWidth) {
+    _renderSelectionsHighlights(frame, selections, lineOffsetMap, layout, lineHeight, tabSize, characterWidth, canvasInnerWidth) {
         if (!this._selectionColor || this._selectionColor.isTransparent()) {
             return;
         }
@@ -1294,11 +1327,11 @@ class InnerMinimap extends Disposable {
             }
             const [startLineNumber, endLineNumber] = intersection;
             for (let line = startLineNumber; line <= endLineNumber; line++) {
-                this.renderDecorationOnLine(canvasContext, lineOffsetMap, selection, this._selectionColor, layout, line, lineHeight, lineHeight, tabSize, characterWidth, canvasInnerWidth);
+                this.renderDecorationOnLine(frame, lineOffsetMap, selection, this._selectionColor, layout, line, lineHeight, lineHeight, tabSize, characterWidth, canvasInnerWidth);
             }
         }
     }
-    _renderDecorationsHighlights(canvasContext, decorations, lineOffsetMap, layout, minimapLineHeight, tabSize, characterWidth, canvasInnerWidth) {
+    _renderDecorationsHighlights(frame, decorations, lineOffsetMap, layout, minimapLineHeight, tabSize, characterWidth, canvasInnerWidth) {
         // Loop forwards to hit first decorations with lower `zIndex`
         for (const decoration of decorations) {
             const minimapOptions = decoration.options.minimap;
@@ -1318,19 +1351,19 @@ class InnerMinimap extends Disposable {
             for (let line = startLineNumber; line <= endLineNumber; line++) {
                 switch (minimapOptions.position) {
                     case 1 /* MinimapPosition.Inline */:
-                        this.renderDecorationOnLine(canvasContext, lineOffsetMap, decoration.range, decorationColor, layout, line, minimapLineHeight, minimapLineHeight, tabSize, characterWidth, canvasInnerWidth);
+                        this.renderDecorationOnLine(frame, lineOffsetMap, decoration.range, decorationColor, layout, line, minimapLineHeight, minimapLineHeight, tabSize, characterWidth, canvasInnerWidth);
                         continue;
                     case 2 /* MinimapPosition.Gutter */: {
                         const y = layout.getYForLineNumber(line, minimapLineHeight);
                         const x = 2;
-                        this.renderDecoration(canvasContext, decorationColor, x, y, GUTTER_DECORATION_WIDTH, minimapLineHeight);
+                        this.renderDecoration(frame, decorationColor, x, y, GUTTER_DECORATION_WIDTH, minimapLineHeight);
                         continue;
                     }
                 }
             }
         }
     }
-    renderDecorationOnLine(canvasContext, lineOffsetMap, decorationRange, decorationColor, layout, lineNumber, height, minimapLineHeight, tabSize, charWidth, canvasInnerWidth) {
+    renderDecorationOnLine(frame, lineOffsetMap, decorationRange, decorationColor, layout, lineNumber, height, minimapLineHeight, tabSize, charWidth, canvasInnerWidth) {
         const y = layout.getYForLineNumber(lineNumber, minimapLineHeight);
         // Skip rendering the line if it's vertically outside our viewport
         if (y + height < 0 || y > this._model.options.canvasInnerHeight) {
@@ -1341,7 +1374,7 @@ class InnerMinimap extends Disposable {
         const endColumn = (endLineNumber === lineNumber ? decorationRange.endColumn : this._model.getLineMaxColumn(lineNumber));
         const x1 = this.getXOffsetForPosition(lineOffsetMap, lineNumber, startColumn, tabSize, charWidth, canvasInnerWidth);
         const x2 = this.getXOffsetForPosition(lineOffsetMap, lineNumber, endColumn, tabSize, charWidth, canvasInnerWidth);
-        this.renderDecoration(canvasContext, decorationColor, x1, y, x2 - x1, height);
+        this.renderDecoration(frame, decorationColor, x1, y, x2 - x1, height);
     }
     getXOffsetForPosition(lineOffsetMap, lineNumber, column, tabSize, charWidth, canvasInnerWidth) {
         if (column === 1) {
@@ -1383,11 +1416,12 @@ class InnerMinimap extends Disposable {
         // goes over the canvas width
         return canvasInnerWidth;
     }
-    renderDecoration(canvasContext, decorationColor, x, y, width, height) {
-        canvasContext.fillStyle = decorationColor && decorationColor.toString() || '';
-        canvasContext.fillRect(x, y, width, height);
+    renderDecoration(frame, decorationColor, x, y, width, height) {
+        if (decorationColor) {
+            frame.fillRect(decorationColor.toString(), x, y, width, height);
+        }
     }
-    _renderSectionHeaders(layout) {
+    _renderSectionHeaders(frame, canvasContext, layout) {
         const minimapLineHeight = this._model.options.minimapLineHeight;
         const sectionHeaderFontSize = this._model.options.sectionHeaderFontSize;
         const sectionHeaderLetterSpacing = this._model.options.sectionHeaderLetterSpacing;
@@ -1401,13 +1435,19 @@ class InnerMinimap extends Disposable {
         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.letterSpacing = sectionHeaderLetterSpacing + 'px';
-        canvasContext.font = '500 ' + sectionHeaderFontSize + 'px ' + this._model.options.sectionHeaderFontFamily;
-        canvasContext.strokeStyle = separatorStroke;
-        canvasContext.lineWidth = 0.4;
+        const letterSpacing = sectionHeaderLetterSpacing + 'px';
+        const font = '500 ' + sectionHeaderFontSize + 'px ' + this._model.options.sectionHeaderFontFamily;
+        const style = `${letterSpacing}:${font}:${backgroundFill}:${foregroundFill}:${horizontalScale}:${labelAreaWidth}`;
+        const setStyle = (target) => {
+            target.letterSpacing = letterSpacing;
+            target.font = font;
+            target.strokeStyle = separatorStroke;
+            target.lineWidth = 0.4;
+            target.scale(horizontalScale, 1);
+        };
+        // Measure the labels with the style they are drawn with
         canvasContext.save();
-        canvasContext.scale(horizontalScale, 1);
+        setStyle(canvasContext);
         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, labelAreaWidth - MINIMAP_GUTTER_WIDTH);
@@ -1423,7 +1463,19 @@ class InnerMinimap extends Disposable {
             if (headerText) {
                 nextLabelY = backgroundFillY + backgroundFillHeight;
             }
-            InnerMinimap._renderSectionLabel(canvasContext, headerText, decoration.options.minimap?.sectionHeaderStyle === 2 /* MinimapSectionHeaderStyle.Underlined */, backgroundFill, foregroundFill, labelAreaWidth, backgroundFillY, backgroundFillHeight, y, separatorY);
+            const hasSeparatorLine = decoration.options.minimap?.sectionHeaderStyle === 2 /* MinimapSectionHeaderStyle.Underlined */;
+            if (!headerText && !hasSeparatorLine) {
+                continue;
+            }
+            // Glyphs can reach out of the label background, so give the label some room
+            const top = backgroundFillY - sectionHeaderFontSize;
+            const bottom = backgroundFillY + backgroundFillHeight + sectionHeaderFontSize;
+            frame.add(top, bottom - top, `label:${style}:${hasSeparatorLine}:${headerText}`, false, target => {
+                target.save();
+                setStyle(target);
+                InnerMinimap._renderSectionLabel(target, headerText, hasSeparatorLine, backgroundFill, foregroundFill, labelAreaWidth, backgroundFillY, backgroundFillHeight, y, separatorY);
+                target.restore();
+            });
         }
         canvasContext.restore();
     }