@codingame/monaco-vscode-api 5.2.0 → 6.0.0

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

@@ -4,9 +4,10 @@ import { isNative, isLinux } from '../../../../base/common/platform.js';
 import { RangeUtil } from './rangeUtil.js';
 import { VisibleRanges, FloatHorizontalRange } from '../../view/renderingContext.js';
 import { LineDecoration } from '../../../common/viewLayout/lineDecorations.js';
-import { LineRange, renderViewLine, DomPosition, RenderLineInput } from '../../../common/viewLayout/viewLineRenderer.js';
+import { LineRange, renderViewLine, ForeignElementType, DomPosition, RenderLineInput } from '../../../common/viewLayout/viewLineRenderer.js';
+import { InlineDecorationType } from '../../../common/viewModel.js';
 import { isHighContrast } from '../../../../platform/theme/common/theme.js';
-import { EditorFontLigatures } from '../../../common/config/editorOptions.js';
+import { EditorOption, EditorFontLigatures } from '../../../common/config/editorOptions.js';
 const canUseFastRenderedViewLine = ( (function() {
     if (isNative) {
         return true;
@@ -21,24 +22,24 @@ class ViewLineOptions {
     constructor(config, themeType) {
         this.themeType = themeType;
         const options = config.options;
-        const fontInfo = options.get(50 );
-        const experimentalWhitespaceRendering = options.get(38 );
+        const fontInfo = options.get(EditorOption.fontInfo);
+        const experimentalWhitespaceRendering = options.get(EditorOption.experimentalWhitespaceRendering);
         if (experimentalWhitespaceRendering === 'off') {
-            this.renderWhitespace = options.get(99 );
+            this.renderWhitespace = options.get(EditorOption.renderWhitespace);
         }
         else {
             this.renderWhitespace = 'none';
         }
-        this.renderControlCharacters = options.get(94 );
+        this.renderControlCharacters = options.get(EditorOption.renderControlCharacters);
         this.spaceWidth = fontInfo.spaceWidth;
         this.middotWidth = fontInfo.middotWidth;
         this.wsmiddotWidth = fontInfo.wsmiddotWidth;
         this.useMonospaceOptimizations = (fontInfo.isMonospace
-            && !options.get(33 ));
+            && !options.get(EditorOption.disableMonospaceOptimizations));
         this.canUseHalfwidthRightwardsArrow = fontInfo.canUseHalfwidthRightwardsArrow;
-        this.lineHeight = options.get(67 );
-        this.stopRenderingLineAfter = options.get(117 );
-        this.fontLigatures = options.get(51 );
+        this.lineHeight = options.get(EditorOption.lineHeight);
+        this.stopRenderingLineAfter = options.get(EditorOption.stopRenderingLineAfter);
+        this.fontLigatures = options.get(EditorOption.fontLigatures);
     }
     equals(other) {
         return (this.themeType === other.themeType
@@ -118,7 +119,7 @@ class ViewLine {
                             startColumn,
                             endColumn,
                             'inline-selected-text',
-                            0
+                            InlineDecorationType.Regular
                         )));
                     }
                     if (this._options.renderWhitespace === 'selection') {
@@ -164,7 +165,7 @@ class ViewLine {
         const output = renderViewLine(renderLineInput, sb);
         sb.appendString('</div>');
         let renderedViewLine = null;
-        if (monospaceAssumptionsAreValid && canUseFastRenderedViewLine && lineData.isBasicASCII && options.useMonospaceOptimizations && output.containsForeignElements === 0 ) {
+        if (monospaceAssumptionsAreValid && canUseFastRenderedViewLine && lineData.isBasicASCII && options.useMonospaceOptimizations && output.containsForeignElements === ForeignElementType.None) {
             renderedViewLine = ( new FastRenderedViewLine(
                 this._renderedViewLine ? this._renderedViewLine.domNode : null,
                 renderLineInput,
@@ -244,12 +245,16 @@ class ViewLine {
         return this._renderedViewLine.getColumnOfNodeOffset(spanNode, offset);
     }
 }
+var Constants;
+( (function(Constants) {
+    Constants[Constants["MaxMonospaceDistance"] = 300] = "MaxMonospaceDistance";
+})(Constants || (Constants = {})));
 class FastRenderedViewLine {
     constructor(domNode, renderLineInput, characterMapping) {
         this._cachedWidth = -1;
         this.domNode = domNode;
         this.input = renderLineInput;
-        const keyColumnCount = Math.floor(renderLineInput.lineContent.length / 300 );
+        const keyColumnCount = Math.floor(renderLineInput.lineContent.length / Constants.MaxMonospaceDistance);
         if (keyColumnCount > 0) {
             this._keyColumnPixelOffsetCache = ( new Float32Array(keyColumnCount));
             for (let i = 0; i < keyColumnCount; i++) {
@@ -263,7 +268,7 @@ class FastRenderedViewLine {
         this._charWidth = renderLineInput.spaceWidth;
     }
     getWidth(context) {
-        if (!this.domNode || this.input.lineContent.length < 300 ) {
+        if (!this.domNode || this.input.lineContent.length < Constants.MaxMonospaceDistance) {
             const horizontalOffset = this._characterMapping.getHorizontalOffset(this._characterMapping.length);
             return Math.round(this._charWidth * horizontalOffset);
         }
@@ -274,13 +279,13 @@ class FastRenderedViewLine {
         return this._cachedWidth;
     }
     getWidthIsFast() {
-        return ((this.input.lineContent.length < 300) ) || this._cachedWidth !== -1;
+        return (this.input.lineContent.length < Constants.MaxMonospaceDistance) || this._cachedWidth !== -1;
     }
     monospaceAssumptionsAreValid() {
         if (!this.domNode) {
             return monospaceAssumptionsAreValid;
         }
-        if (this.input.lineContent.length < 300 ) {
+        if (this.input.lineContent.length < Constants.MaxMonospaceDistance) {
             const expectedWidth = this.getWidth(null);
             const actualWidth = this.domNode.domNode.firstChild.offsetWidth;
             if (Math.abs(expectedWidth - actualWidth) >= 2) {
@@ -291,7 +296,7 @@ class FastRenderedViewLine {
         return monospaceAssumptionsAreValid;
     }
     toSlowRenderedLine() {
-        return createRenderedLine(this.domNode, this.input, this._characterMapping, false, 0 );
+        return createRenderedLine(this.domNode, this.input, this._characterMapping, false, ForeignElementType.None);
     }
     getVisibleRangesForRange(lineNumber, startColumn, endColumn, context) {
         const startPosition = this._getColumnPixelOffset(lineNumber, startColumn, context);
@@ -299,12 +304,12 @@ class FastRenderedViewLine {
         return [( new FloatHorizontalRange(startPosition, endPosition - startPosition))];
     }
     _getColumnPixelOffset(lineNumber, column, context) {
-        if (column <= 300 ) {
+        if (column <= Constants.MaxMonospaceDistance) {
             const horizontalOffset = this._characterMapping.getHorizontalOffset(column);
             return this._charWidth * horizontalOffset;
         }
-        const keyColumnOrdinal = Math.floor((column - 1) / 300 ) - 1;
-        const keyColumn = (keyColumnOrdinal + 1) * 300  + 1;
+        const keyColumnOrdinal = Math.floor((column - 1) / Constants.MaxMonospaceDistance) - 1;
+        const keyColumn = (keyColumnOrdinal + 1) * Constants.MaxMonospaceDistance + 1;
         let keyColumnPixelOffset = -1;
         if (this._keyColumnPixelOffsetCache) {
             keyColumnPixelOffset = this._keyColumnPixelOffsetCache[keyColumnOrdinal];
@@ -407,13 +412,13 @@ class RenderedViewLine {
     }
     _readPixelOffset(domNode, lineNumber, column, context) {
         if (this._characterMapping.length === 0) {
-            if (this._containsForeignElements === 0 ) {
+            if (this._containsForeignElements === ForeignElementType.None) {
                 return 0;
             }
-            if (this._containsForeignElements === 2 ) {
+            if (this._containsForeignElements === ForeignElementType.After) {
                 return 0;
             }
-            if (this._containsForeignElements === 1 ) {
+            if (this._containsForeignElements === ForeignElementType.Before) {
                 return this.getWidth(context);
             }
             const readingTarget = this._getReadingTarget(domNode);
@@ -444,7 +449,7 @@ class RenderedViewLine {
             }
             return r[0].left;
         }
-        if (column === this._characterMapping.length && this._isWhitespaceOnly && this._containsForeignElements === 0 ) {
+        if (column === this._characterMapping.length && this._isWhitespaceOnly && this._containsForeignElements === ForeignElementType.None) {
             return this.getWidth(context);
         }
         const domPosition = this._characterMapping.getDomPosition(column);

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

@@ -1,15 +1,19 @@
 import { MOUSE_CURSOR_TEXT_CSS_CLASS_NAME } from '../../../../base/browser/ui/mouseCursor/mouseCursor.js';
 import { RunOnceScheduler } from '../../../../base/common/async.js';
 import { isLinux } from '../../../../base/common/platform.js';
+import { Constants } from '../../../../base/common/uint.js';
 import './viewLines.css.js';
 import { applyFontInfo } from '../../config/domFontInfo.js';
 import { LineVisibleRanges, HorizontalRange, HorizontalPosition } from '../../view/renderingContext.js';
 import { VisibleLinesCollection } from '../../view/viewLayer.js';
-import { ViewPart, PartFingerprints } from '../../view/viewPart.js';
+import { ViewPart, PartFingerprints, PartFingerprint } from '../../view/viewPart.js';
 import { DomReadingContext } from './domReadingContext.js';
 import { ViewLineOptions, ViewLine } from './viewLine.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 import { Position } from '../../../common/core/position.js';
 import { Range } from '../../../common/core/range.js';
+import { ScrollType } from '../../../common/editorCommon.js';
+import { VerticalRevealType } from '../../../common/viewEvents.js';
 class LastRenderedData {
     constructor() {
         this._currentVisibleRange = ( new Range(1, 1, 1, 1));
@@ -64,17 +68,17 @@ class ViewLines extends ViewPart {
         this.domNode = this._visibleLines.domNode;
         const conf = this._context.configuration;
         const options = this._context.configuration.options;
-        const fontInfo = options.get(50 );
-        const wrappingInfo = options.get(146 );
-        this._lineHeight = options.get(67 );
+        const fontInfo = options.get(EditorOption.fontInfo);
+        const wrappingInfo = options.get(EditorOption.wrappingInfo);
+        this._lineHeight = options.get(EditorOption.lineHeight);
         this._typicalHalfwidthCharacterWidth = fontInfo.typicalHalfwidthCharacterWidth;
         this._isViewportWrapping = wrappingInfo.isViewportWrapping;
-        this._revealHorizontalRightPadding = options.get(100 );
-        this._cursorSurroundingLines = options.get(29 );
-        this._cursorSurroundingLinesStyle = options.get(30 );
-        this._canUseLayerHinting = !options.get(32 );
+        this._revealHorizontalRightPadding = options.get(EditorOption.revealHorizontalRightPadding);
+        this._cursorSurroundingLines = options.get(EditorOption.cursorSurroundingLines);
+        this._cursorSurroundingLinesStyle = options.get(EditorOption.cursorSurroundingLinesStyle);
+        this._canUseLayerHinting = !options.get(EditorOption.disableLayerHinting);
         this._viewLineOptions = ( new ViewLineOptions(conf, this._context.theme.type));
-        PartFingerprints.write(this.domNode, 8 );
+        PartFingerprints.write(this.domNode, PartFingerprint.ViewLines);
         this.domNode.setClassName(`view-lines ${MOUSE_CURSOR_TEXT_CSS_CLASS_NAME}`);
         applyFontInfo(this.domNode, fontInfo);
         this._maxLineWidth = 0;
@@ -86,8 +90,8 @@ class ViewLines extends ViewPart {
         }, 2000));
         this._lastRenderedData = ( new LastRenderedData());
         this._horizontalRevealRequest = null;
-        this._stickyScrollEnabled = options.get(115 ).enabled;
-        this._maxNumberStickyLines = options.get(115 ).maxLineCount;
+        this._stickyScrollEnabled = options.get(EditorOption.stickyScroll).enabled;
+        this._maxNumberStickyLines = options.get(EditorOption.stickyScroll).maxLineCount;
     }
     dispose() {
         this._asyncUpdateLineWidths.dispose();
@@ -102,24 +106,24 @@ class ViewLines extends ViewPart {
     }
     onConfigurationChanged(e) {
         this._visibleLines.onConfigurationChanged(e);
-        if (e.hasChanged(146 )) {
+        if (e.hasChanged(EditorOption.wrappingInfo)) {
             this._maxLineWidth = 0;
         }
         const options = this._context.configuration.options;
-        const fontInfo = options.get(50 );
-        const wrappingInfo = options.get(146 );
-        this._lineHeight = options.get(67 );
+        const fontInfo = options.get(EditorOption.fontInfo);
+        const wrappingInfo = options.get(EditorOption.wrappingInfo);
+        this._lineHeight = options.get(EditorOption.lineHeight);
         this._typicalHalfwidthCharacterWidth = fontInfo.typicalHalfwidthCharacterWidth;
         this._isViewportWrapping = wrappingInfo.isViewportWrapping;
-        this._revealHorizontalRightPadding = options.get(100 );
-        this._cursorSurroundingLines = options.get(29 );
-        this._cursorSurroundingLinesStyle = options.get(30 );
-        this._canUseLayerHinting = !options.get(32 );
-        this._stickyScrollEnabled = options.get(115 ).enabled;
-        this._maxNumberStickyLines = options.get(115 ).maxLineCount;
+        this._revealHorizontalRightPadding = options.get(EditorOption.revealHorizontalRightPadding);
+        this._cursorSurroundingLines = options.get(EditorOption.cursorSurroundingLines);
+        this._cursorSurroundingLinesStyle = options.get(EditorOption.cursorSurroundingLinesStyle);
+        this._canUseLayerHinting = !options.get(EditorOption.disableLayerHinting);
+        this._stickyScrollEnabled = options.get(EditorOption.stickyScroll).enabled;
+        this._maxNumberStickyLines = options.get(EditorOption.stickyScroll).maxLineCount;
         applyFontInfo(this.domNode, fontInfo);
         this._onOptionsMaybeChanged();
-        if (e.hasChanged(145 )) {
+        if (e.hasChanged(EditorOption.layoutInfo)) {
             this._maxLineWidth = 0;
         }
         return true;
@@ -210,7 +214,7 @@ class ViewLines extends ViewPart {
             this._horizontalRevealRequest = null;
         }
         const scrollTopDelta = Math.abs(this._context.viewLayout.getCurrentScrollTop() - newScrollPosition.scrollTop);
-        const scrollType = (scrollTopDelta <= this._lineHeight ? 1  : e.scrollType);
+        const scrollType = (scrollTopDelta <= this._lineHeight ? ScrollType.Immediate : e.scrollType);
         this._context.viewModel.viewLayout.setScrollPosition(newScrollPosition, scrollType);
         return true;
     }
@@ -530,7 +534,7 @@ class ViewLines extends ViewPart {
             }
         }
         if (!minimalReveal) {
-            if (verticalType === 0  || verticalType === 4 ) {
+            if (verticalType === VerticalRevealType.Simple || verticalType === VerticalRevealType.Bottom) {
                 paddingBottom += this._lineHeight;
             }
         }
@@ -543,8 +547,8 @@ class ViewLines extends ViewPart {
             }
             newScrollTop = boxStartY;
         }
-        else if (verticalType === 5  || verticalType === 6 ) {
-            if (verticalType === 6  && viewportStartY <= boxStartY && boxEndY <= viewportEndY) {
+        else if (verticalType === VerticalRevealType.NearTop || verticalType === VerticalRevealType.NearTopIfOutsideViewport) {
+            if (verticalType === VerticalRevealType.NearTopIfOutsideViewport && viewportStartY <= boxStartY && boxEndY <= viewportEndY) {
                 newScrollTop = viewportStartY;
             }
             else {
@@ -554,8 +558,8 @@ class ViewLines extends ViewPart {
                 newScrollTop = Math.max(minScrollTop, desiredScrollTop);
             }
         }
-        else if (verticalType === 1  || verticalType === 2 ) {
-            if (verticalType === 2  && viewportStartY <= boxStartY && boxEndY <= viewportEndY) {
+        else if (verticalType === VerticalRevealType.Center || verticalType === VerticalRevealType.CenterIfOutsideViewport) {
+            if (verticalType === VerticalRevealType.CenterIfOutsideViewport && viewportStartY <= boxStartY && boxEndY <= viewportEndY) {
                 newScrollTop = viewportStartY;
             }
             else {
@@ -564,16 +568,16 @@ class ViewLines extends ViewPart {
             }
         }
         else {
-            newScrollTop = this._computeMinimumScrolling(viewportStartY, viewportEndY, boxStartY, boxEndY, verticalType === 3 , verticalType === 4 );
+            newScrollTop = this._computeMinimumScrolling(viewportStartY, viewportEndY, boxStartY, boxEndY, verticalType === VerticalRevealType.Top, verticalType === VerticalRevealType.Bottom);
         }
         return newScrollTop;
     }
     _computeScrollLeftToReveal(horizontalRevealRequest) {
         const viewport = this._context.viewLayout.getCurrentViewport();
-        const layoutInfo = this._context.configuration.options.get(145 );
+        const layoutInfo = this._context.configuration.options.get(EditorOption.layoutInfo);
         const viewportStartX = viewport.left;
         const viewportEndX = viewportStartX + viewport.width - layoutInfo.verticalScrollbarWidth;
-        let boxStartX = 1073741824 ;
+        let boxStartX = Constants.MAX_SAFE_SMALL_INTEGER;
         let boxEndX = 0;
         if (horizontalRevealRequest.type === 'range') {
             const visibleRanges = this._visibleRangesForLineRange(horizontalRevealRequest.lineNumber, horizontalRevealRequest.startColumn, horizontalRevealRequest.endColumn);

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

@@ -1,11 +1,12 @@
 import './linesDecorations.css.js';
 import { DedupOverlay, DecorationToRender } from '../glyphMargin/glyphMargin.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 class LinesDecorationsOverlay extends DedupOverlay {
     constructor(context) {
         super();
         this._context = context;
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(145 );
+        const layoutInfo = options.get(EditorOption.layoutInfo);
         this._decorationsLeft = layoutInfo.decorationsLeft;
         this._decorationsWidth = layoutInfo.decorationsWidth;
         this._renderResult = null;
@@ -18,7 +19,7 @@ class LinesDecorationsOverlay extends DedupOverlay {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(145 );
+        const layoutInfo = options.get(EditorOption.layoutInfo);
         this._decorationsLeft = layoutInfo.decorationsLeft;
         this._decorationsWidth = layoutInfo.decorationsWidth;
         return true;

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

@@ -1,14 +1,15 @@
 import './margin.css.js';
 import { createFastDomNode } from '../../../../base/browser/fastDomNode.js';
 import { ViewPart } from '../../view/viewPart.js';
+import { EditorOption } from '../../../common/config/editorOptions.js';
 class Margin extends ViewPart {
     static { this.CLASS_NAME = 'glyph-margin'; }
     static { this.OUTER_CLASS_NAME = 'margin'; }
     constructor(context) {
         super(context);
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(145 );
-        this._canUseLayerHinting = !options.get(32 );
+        const layoutInfo = options.get(EditorOption.layoutInfo);
+        this._canUseLayerHinting = !options.get(EditorOption.disableLayerHinting);
         this._contentLeft = layoutInfo.contentLeft;
         this._glyphMarginLeft = layoutInfo.glyphMarginLeft;
         this._glyphMarginWidth = layoutInfo.glyphMarginWidth;
@@ -29,8 +30,8 @@ class Margin extends ViewPart {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(145 );
-        this._canUseLayerHinting = !options.get(32 );
+        const layoutInfo = options.get(EditorOption.layoutInfo);
+        this._canUseLayerHinting = !options.get(EditorOption.disableLayerHinting);
         this._contentLeft = layoutInfo.contentLeft;
         this._glyphMarginLeft = layoutInfo.glyphMarginLeft;
         this._glyphMarginWidth = layoutInfo.glyphMarginWidth;

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

@@ -2,15 +2,20 @@ import './minimap.css.js';
 import { addStandardDisposableListener, getDomNodePagePosition, EventType, addDisposableListener } from '../../../../base/browser/dom.js';
 import { createFastDomNode } from '../../../../base/browser/fastDomNode.js';
 import { GlobalPointerMoveMonitor } from '../../../../base/browser/globalPointerMoveMonitor.js';
+import { CharCode } from '../../../../base/common/charCode.js';
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { isWindows } from '../../../../base/common/platform.js';
 import { isFullWidthCharacter } from '../../../../base/common/strings.js';
 import { RenderedLinesCollection } from '../../view/viewLayer.js';
-import { ViewPart, PartFingerprints } from '../../view/viewPart.js';
-import { MINIMAP_GUTTER_WIDTH, EditorLayoutInfoComputer } from '../../../common/config/editorOptions.js';
+import { ViewPart, PartFingerprints, PartFingerprint } from '../../view/viewPart.js';
+import { RenderMinimap, MINIMAP_GUTTER_WIDTH, EditorOption, EditorLayoutInfoComputer } from '../../../common/config/editorOptions.js';
 import { Range } from '../../../common/core/range.js';
 import { RGBA8 } from '../../../common/core/rgba.js';
+import { ScrollType } from '../../../common/editorCommon.js';
+import { ColorId } from '../../../common/encodedTokenAttributes.js';
+import { Constants } from './minimapCharSheet.js';
 import { MinimapTokensColorTracker } from '../../../common/viewModel/minimapTokensColorTracker.js';
+import { VerticalRevealType } from '../../../common/viewEvents.js';
 import { ViewModelDecoration } from '../../../common/viewModel.js';
 import '../../../../platform/theme/common/colorUtils.js';
 import '../../../../platform/theme/common/colors/baseColors.js';
@@ -26,6 +31,7 @@ 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, MinimapSectionHeaderStyle } 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';
@@ -34,22 +40,22 @@ const GUTTER_DECORATION_WIDTH = 2;
 class MinimapOptions {
     constructor(configuration, theme, tokensColorTracker) {
         const options = configuration.options;
-        const pixelRatio = options.get(143 );
-        const layoutInfo = options.get(145 );
+        const pixelRatio = options.get(EditorOption.pixelRatio);
+        const layoutInfo = options.get(EditorOption.layoutInfo);
         const minimapLayout = layoutInfo.minimap;
-        const fontInfo = options.get(50 );
-        const minimapOpts = options.get(73 );
+        const fontInfo = options.get(EditorOption.fontInfo);
+        const minimapOpts = options.get(EditorOption.minimap);
         this.renderMinimap = minimapLayout.renderMinimap;
         this.size = minimapOpts.size;
         this.minimapHeightIsEditorHeight = minimapLayout.minimapHeightIsEditorHeight;
-        this.scrollBeyondLastLine = options.get(105 );
-        this.paddingTop = options.get(84 ).top;
-        this.paddingBottom = options.get(84 ).bottom;
+        this.scrollBeyondLastLine = options.get(EditorOption.scrollBeyondLastLine);
+        this.paddingTop = options.get(EditorOption.padding).top;
+        this.paddingBottom = options.get(EditorOption.padding).bottom;
         this.showSlider = minimapOpts.showSlider;
         this.autohide = minimapOpts.autohide;
         this.pixelRatio = pixelRatio;
         this.typicalHalfwidthCharacterWidth = fontInfo.typicalHalfwidthCharacterWidth;
-        this.lineHeight = options.get(67 );
+        this.lineHeight = options.get(EditorOption.lineHeight);
         this.minimapLeft = minimapLayout.minimapLeft;
         this.minimapWidth = minimapLayout.minimapWidth;
         this.minimapHeight = layoutInfo.height;
@@ -61,12 +67,13 @@ class MinimapOptions {
         this.editorHeight = layoutInfo.height;
         this.fontScale = minimapLayout.minimapScale;
         this.minimapLineHeight = minimapLayout.minimapLineHeight;
-        this.minimapCharWidth = 1  * this.fontScale;
+        this.minimapCharWidth = Constants.BASE_CHAR_WIDTH * this.fontScale;
         this.sectionHeaderFontFamily = DEFAULT_FONT_FAMILY;
         this.sectionHeaderFontSize = minimapOpts.sectionHeaderFontSize * pixelRatio;
-        this.sectionHeaderFontColor = MinimapOptions._getSectionHeaderColor(theme, tokensColorTracker.getColor(1 ));
+        this.sectionHeaderLetterSpacing = minimapOpts.sectionHeaderLetterSpacing;
+        this.sectionHeaderFontColor = MinimapOptions._getSectionHeaderColor(theme, tokensColorTracker.getColor(ColorId.DefaultForeground));
         this.charRenderer = createSingleCallFunction(() => MinimapCharRendererFactory.create(this.fontScale, fontInfo.fontFamily));
-        this.defaultBackgroundColor = tokensColorTracker.getColor(2 );
+        this.defaultBackgroundColor = tokensColorTracker.getColor(ColorId.DefaultBackground);
         this.backgroundColor = MinimapOptions._getMinimapBackground(theme, this.defaultBackgroundColor);
         this.foregroundAlpha = MinimapOptions._getMinimapForegroundOpacity(theme);
     }
@@ -126,6 +133,7 @@ class MinimapOptions {
             && this.minimapLineHeight === other.minimapLineHeight
             && this.minimapCharWidth === other.minimapCharWidth
             && this.sectionHeaderFontSize === other.sectionHeaderFontSize
+            && this.sectionHeaderLetterSpacing === other.sectionHeaderLetterSpacing
             && this.defaultBackgroundColor && this.defaultBackgroundColor.equals(other.defaultBackgroundColor)
             && this.backgroundColor && this.backgroundColor.equals(other.backgroundColor)
             && this.foregroundAlpha === other.foregroundAlpha);
@@ -382,7 +390,7 @@ class MinimapBuffers {
 }
 class MinimapSamplingState {
     static compute(options, viewLineCount, oldSamplingState) {
-        if (options.renderMinimap === 0  || !options.isSampling) {
+        if (options.renderMinimap === RenderMinimap.None || !options.isSampling) {
             return [null, []];
         }
         const { minimapLineCount } = EditorLayoutInfoComputer.computeContainedMinimapLineCount({
@@ -850,12 +858,12 @@ class Minimap extends ViewPart {
         if (this._samplingState) {
             lineNumber = this._samplingState.minimapLines[lineNumber - 1];
         }
-        this._context.viewModel.revealRange('mouse', false, ( new Range(lineNumber, 1, lineNumber, 1)), 1 , 0 );
+        this._context.viewModel.revealRange('mouse', false, ( new Range(lineNumber, 1, lineNumber, 1)), VerticalRevealType.Center, ScrollType.Smooth);
     }
     setScrollTop(scrollTop) {
         this._context.viewModel.viewLayout.setScrollPosition({
             scrollTop: scrollTop
-        }, 1 );
+        }, ScrollType.Immediate);
     }
 }
 class InnerMinimap extends Disposable {
@@ -869,7 +877,7 @@ class InnerMinimap extends Disposable {
         this._buffers = null;
         this._selectionColor = this._theme.getColor(minimapSelection);
         this._domNode = createFastDomNode(document.createElement('div'));
-        PartFingerprints.write(this._domNode, 9 );
+        PartFingerprints.write(this._domNode, PartFingerprint.Minimap);
         this._domNode.setClassName(this._getMinimapDomNodeClassName());
         this._domNode.setPosition('absolute');
         this._domNode.setAttribute('role', 'presentation');
@@ -900,7 +908,7 @@ class InnerMinimap extends Disposable {
         this._pointerDownListener = addStandardDisposableListener(this._domNode.domNode, EventType.POINTER_DOWN, (e) => {
             e.preventDefault();
             const renderMinimap = this._model.options.renderMinimap;
-            if (renderMinimap === 0 ) {
+            if (renderMinimap === RenderMinimap.None) {
                 return;
             }
             if (!this._lastRenderData) {
@@ -1093,7 +1101,7 @@ class InnerMinimap extends Disposable {
     }
     render(renderingCtx) {
         const renderMinimap = this._model.options.renderMinimap;
-        if (renderMinimap === 0 ) {
+        if (renderMinimap === RenderMinimap.None) {
             this._shadow.setClassName('minimap-shadow-hidden');
             this._sliderHorizontal.setWidth(0);
             this._sliderHorizontal.setHeight(0);
@@ -1176,7 +1184,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 !== 1 ) {
+            if (!minimapOptions || minimapOptions.position !== MinimapPosition.Inline) {
                 continue;
             }
             const intersection = layout.intersectWithViewport(decoration.range);
@@ -1236,10 +1244,10 @@ class InnerMinimap extends Disposable {
             }
             for (let line = startLineNumber; line <= endLineNumber; line++) {
                 switch (minimapOptions.position) {
-                    case 1 :
+                    case MinimapPosition.Inline:
                         this.renderDecorationOnLine(canvasContext, lineOffsetMap, decoration.range, decorationColor, layout, line, minimapLineHeight, minimapLineHeight, tabSize, characterWidth, canvasInnerWidth);
                         continue;
-                    case 2 : {
+                    case MinimapPosition.Gutter: {
                         const y = layout.getYForLineNumber(line, minimapLineHeight);
                         const x = 2;
                         this.renderDecoration(canvasContext, decorationColor, x, y, GUTTER_DECORATION_WIDTH, minimapLineHeight);
@@ -1276,7 +1284,7 @@ class InnerMinimap extends Disposable {
             let prevx = MINIMAP_GUTTER_WIDTH;
             for (let i = 1; i < lineData.length + 1; i++) {
                 const charCode = lineData.charCodeAt(i - 1);
-                const dx = charCode === 9
+                const dx = charCode === CharCode.Tab
                     ? tabSize * charWidth
                     : isFullWidthCharacter(charCode)
                         ? 2 * charWidth
@@ -1303,6 +1311,7 @@ class InnerMinimap extends Disposable {
     _renderSectionHeaders(layout) {
         const minimapLineHeight = this._model.options.minimapLineHeight;
         const sectionHeaderFontSize = this._model.options.sectionHeaderFontSize;
+        const sectionHeaderLetterSpacing = this._model.options.sectionHeaderLetterSpacing;
         const backgroundFillHeight = sectionHeaderFontSize * 1.5;
         const { canvasInnerWidth } = this._model.options;
         const backgroundColor = this._model.options.backgroundColor;
@@ -1311,7 +1320,8 @@ class InnerMinimap extends Disposable {
         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.letterSpacing = sectionHeaderLetterSpacing + 'px';
+        canvasContext.font = '500 ' + sectionHeaderFontSize + 'px ' + this._model.options.sectionHeaderFontFamily;
         canvasContext.strokeStyle = separatorStroke;
         canvasContext.lineWidth = 0.2;
         const decorations = this._model.getSectionHeaderDecorationsInViewport(layout.startLineNumber, layout.endLineNumber);
@@ -1322,7 +1332,7 @@ class InnerMinimap extends Disposable {
             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);
+            InnerMinimap._renderSectionLabel(canvasContext, headerText, decoration.options.minimap?.sectionHeaderStyle === MinimapSectionHeaderStyle.Underlined, backgroundFill, foregroundFill, canvasInnerWidth, backgroundFillY, backgroundFillHeight, y, separatorY);
         }
     }
     static _fitSectionHeader(target, maxWidth, headerText) {
@@ -1384,7 +1394,7 @@ class InnerMinimap extends Disposable {
         const charRenderer = this._model.options.charRenderer();
         const fontScale = this._model.options.fontScale;
         const minimapCharWidth = this._model.options.minimapCharWidth;
-        const baseCharHeight = (renderMinimap === 1  ? 2  : 2  + 1);
+        const baseCharHeight = (renderMinimap === RenderMinimap.Text ? Constants.BASE_CHAR_HEIGHT : Constants.BASE_CHAR_HEIGHT + 1);
         const renderMinimapLineHeight = baseCharHeight * fontScale;
         const innerLinePadding = (minimapLineHeight > renderMinimapLineHeight ? Math.floor((minimapLineHeight - renderMinimapLineHeight) / 2) : 0);
         const backgroundA = background.a / 255;
@@ -1498,18 +1508,18 @@ class InnerMinimap extends Disposable {
                     return;
                 }
                 const charCode = content.charCodeAt(charIndex);
-                if (charCode === 9 ) {
+                if (charCode === CharCode.Tab) {
                     const insertSpacesCount = tabSize - (charIndex + tabsCharDelta) % tabSize;
                     tabsCharDelta += insertSpacesCount - 1;
                     dx += insertSpacesCount * charWidth;
                 }
-                else if (charCode === 32 ) {
+                else if (charCode === CharCode.Space) {
                     dx += charWidth;
                 }
                 else {
                     const count = isFullWidthCharacter(charCode) ? 2 : 1;
                     for (let i = 0; i < count; i++) {
-                        if (renderMinimap === 2 ) {
+                        if (renderMinimap === RenderMinimap.Blocks) {
                             minimapCharRenderer.blockRenderChar(target, dx, dy + innerLinePadding, tokenColor, foregroundAlpha, backgroundColor, backgroundAlpha, force1pxHeight);
                         }
                         else {

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

@@ -1,4 +1,4 @@
-import { getCharIndex } from './minimapCharSheet.js';
+import { Constants, getCharIndex } from './minimapCharSheet.js';
 import { toUint8 } from '../../../../base/common/uint.js';
 class MinimapCharRenderer {
     constructor(charData, scale) {
@@ -15,8 +15,8 @@ class MinimapCharRenderer {
         return result;
     }
     renderChar(target, dx, dy, chCode, color, foregroundAlpha, backgroundColor, backgroundAlpha, fontScale, useLighterFont, force1pxHeight) {
-        const charWidth = 1  * this.scale;
-        const charHeight = 2  * this.scale;
+        const charWidth = Constants.BASE_CHAR_WIDTH * this.scale;
+        const charHeight = Constants.BASE_CHAR_HEIGHT * this.scale;
         const renderHeight = (force1pxHeight ? 1 : charHeight);
         if (dx + charWidth > target.width || dy + renderHeight > target.height) {
             console.warn('bad render request outside image data');
@@ -24,7 +24,7 @@ class MinimapCharRenderer {
         }
         const charData = useLighterFont ? this.charDataLight : this.charDataNormal;
         const charIndex = getCharIndex(chCode, fontScale);
-        const destWidth = target.width * 4 ;
+        const destWidth = target.width * Constants.RGBA_CHANNELS_CNT;
         const backgroundR = backgroundColor.r;
         const backgroundG = backgroundColor.g;
         const backgroundB = backgroundColor.b;
@@ -34,7 +34,7 @@ class MinimapCharRenderer {
         const destAlpha = Math.max(foregroundAlpha, backgroundAlpha);
         const dest = target.data;
         let sourceOffset = charIndex * charWidth * charHeight;
-        let row = dy * destWidth + dx * 4 ;
+        let row = dy * destWidth + dx * Constants.RGBA_CHANNELS_CNT;
         for (let y = 0; y < renderHeight; y++) {
             let column = row;
             for (let x = 0; x < charWidth; x++) {
@@ -48,14 +48,14 @@ class MinimapCharRenderer {
         }
     }
     blockRenderChar(target, dx, dy, color, foregroundAlpha, backgroundColor, backgroundAlpha, force1pxHeight) {
-        const charWidth = 1  * this.scale;
-        const charHeight = 2  * this.scale;
+        const charWidth = Constants.BASE_CHAR_WIDTH * this.scale;
+        const charHeight = Constants.BASE_CHAR_HEIGHT * this.scale;
         const renderHeight = (force1pxHeight ? 1 : charHeight);
         if (dx + charWidth > target.width || dy + renderHeight > target.height) {
             console.warn('bad render request outside image data');
             return;
         }
-        const destWidth = target.width * 4 ;
+        const destWidth = target.width * Constants.RGBA_CHANNELS_CNT;
         const c = 0.5 * (foregroundAlpha / 255);
         const backgroundR = backgroundColor.r;
         const backgroundG = backgroundColor.g;
@@ -68,7 +68,7 @@ class MinimapCharRenderer {
         const colorB = backgroundB + deltaB * c;
         const destAlpha = Math.max(foregroundAlpha, backgroundAlpha);
         const dest = target.data;
-        let row = dy * destWidth + dx * 4 ;
+        let row = dy * destWidth + dx * Constants.RGBA_CHANNELS_CNT;
         for (let y = 0; y < renderHeight; y++) {
             let column = row;
             for (let x = 0; x < charWidth; x++) {