@codingame/monaco-vscode-api 3.2.3 → 4.1.0

package/vscode/src/vs/editor/browser/{widget/hoverWidget → services/hoverService}/hoverWidget.js

@@ -10,7 +10,7 @@ import { HoverWidget as HoverWidget$1, getHoverAccessibleViewHint } from '../../
 import { Widget } from '../../../../base/browser/ui/widget.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { openLinkFromMarkdown, MarkdownRenderer } from '../markdownRenderer/browser/markdownRenderer.js';
+import { openLinkFromMarkdown, MarkdownRenderer } from '../../widget/markdownRenderer/browser/markdownRenderer.js';
 import { isMarkdownString } from '../../../../base/common/htmlContent.js';
 import { localizeWithPath } from '../../../../nls.js';
 import { isMacintosh } from '../../../../base/common/platform.js';
@@ -147,7 +147,7 @@ let HoverWidget = class HoverWidget extends Widget {
             const statusBarElement = $('div.hover-row.status-bar');
             const infoElement = $('div.info');
             infoElement.textContent = ( localizeWithPath(
-                'vs/editor/browser/widget/hoverWidget/hoverWidget',
+                'vs/editor/browser/services/hoverService/hoverWidget',
                 'hoverhint',
                 'Hold {0} key to mouse over',
                 isMacintosh ? 'Option' : 'Alt'
@@ -242,10 +242,7 @@ let HoverWidget = class HoverWidget extends Widget {
             };
         };
         const targetBounds = ( this._target.targetElements.map(e => getZoomAccountedBoundingClientRect(e)));
-        const top = Math.min(...( targetBounds.map(e => e.top)));
-        const right = Math.max(...( targetBounds.map(e => e.right)));
-        const bottom = Math.max(...( targetBounds.map(e => e.bottom)));
-        const left = Math.min(...( targetBounds.map(e => e.left)));
+        const { top, right, bottom, left } = targetBounds[0];
         const width = right - left;
         const height = bottom - top;
         const targetRect = {
@@ -354,8 +351,9 @@ let HoverWidget = class HoverWidget extends Widget {
         if (this._target.x !== undefined) {
             return;
         }
+        const hoverPointerOffset = (this._hoverPointer ? 3  : 0);
         if (this._forcePosition) {
-            const padding = (this._hoverPointer ? 3  : 0) + 2 ;
+            const padding = hoverPointerOffset + 2 ;
             if (this._hoverPosition === 1 ) {
                 this._hover.containerDomNode.style.maxWidth = `${this._targetDocumentElement.clientWidth - target.right - padding}px`;
             }
@@ -366,9 +364,9 @@ let HoverWidget = class HoverWidget extends Widget {
         }
         if (this._hoverPosition === 1 ) {
             const roomOnRight = this._targetDocumentElement.clientWidth - target.right;
-            if (roomOnRight < this._hover.containerDomNode.clientWidth) {
+            if (roomOnRight < this._hover.containerDomNode.clientWidth + hoverPointerOffset) {
                 const roomOnLeft = target.left;
-                if (roomOnLeft >= this._hover.containerDomNode.clientWidth) {
+                if (roomOnLeft >= this._hover.containerDomNode.clientWidth + hoverPointerOffset) {
                     this._hoverPosition = 0 ;
                 }
                 else {
@@ -378,16 +376,16 @@ let HoverWidget = class HoverWidget extends Widget {
         }
         else if (this._hoverPosition === 0 ) {
             const roomOnLeft = target.left;
-            if (roomOnLeft < this._hover.containerDomNode.clientWidth) {
+            if (roomOnLeft < this._hover.containerDomNode.clientWidth + hoverPointerOffset) {
                 const roomOnRight = this._targetDocumentElement.clientWidth - target.right;
-                if (roomOnRight >= this._hover.containerDomNode.clientWidth) {
+                if (roomOnRight >= this._hover.containerDomNode.clientWidth + hoverPointerOffset) {
                     this._hoverPosition = 1 ;
                 }
                 else {
                     this._hoverPosition = 2 ;
                 }
             }
-            if (target.left - this._hover.containerDomNode.clientWidth <= this._targetDocumentElement.clientLeft) {
+            if (target.left - this._hover.containerDomNode.clientWidth - hoverPointerOffset <= this._targetDocumentElement.clientLeft) {
                 this._hoverPosition = 1 ;
             }
         }
@@ -396,13 +394,14 @@ let HoverWidget = class HoverWidget extends Widget {
         if (this._target.y !== undefined || this._forcePosition) {
             return;
         }
+        const hoverPointerOffset = (this._hoverPointer ? 3  : 0);
         if (this._hoverPosition === 3 ) {
-            if (target.top - this._hover.containerDomNode.clientHeight < 0) {
+            if (target.top - this._hover.containerDomNode.clientHeight - hoverPointerOffset < 0) {
                 this._hoverPosition = 2 ;
             }
         }
         else if (this._hoverPosition === 2 ) {
-            if (target.bottom + this._hover.containerDomNode.clientHeight > this._targetWindow.innerHeight) {
+            if (target.bottom + this._hover.containerDomNode.clientHeight + hoverPointerOffset > this._targetWindow.innerHeight) {
                 this._hoverPosition = 3 ;
             }
         }

package/vscode/src/vs/editor/browser/view/viewLayer.js

@@ -160,7 +160,7 @@ class VisibleLinesCollection {
         return domNode;
     }
     onConfigurationChanged(e) {
-        if (e.hasChanged(144 )) {
+        if (e.hasChanged(145 )) {
             return true;
         }
         return false;
@@ -291,7 +291,7 @@ class ViewLayerRenderer {
         const lines = ctx.lines;
         for (let i = startIndex; i <= endIndex; i++) {
             const lineNumber = rendLineNumberStart + i;
-            lines[i].layoutLine(lineNumber, deltaTop[lineNumber - deltaLN]);
+            lines[i].layoutLine(lineNumber, deltaTop[lineNumber - deltaLN], this.viewportData.lineHeight);
         }
     }
     _insertLinesBefore(ctx, fromLineNumber, toLineNumber, deltaTop, deltaLN) {
@@ -382,7 +382,7 @@ class ViewLayerRenderer {
                 if (lineDomNode) {
                     continue;
                 }
-                const renderResult = line.renderLine(i + rendLineNumberStart, deltaTop[i], this.viewportData, sb);
+                const renderResult = line.renderLine(i + rendLineNumberStart, deltaTop[i], this.viewportData.lineHeight, this.viewportData, sb);
                 if (!renderResult) {
                     continue;
                 }
@@ -403,7 +403,7 @@ class ViewLayerRenderer {
                 if (wasNew[i]) {
                     continue;
                 }
-                const renderResult = line.renderLine(i + rendLineNumberStart, deltaTop[i], this.viewportData, sb);
+                const renderResult = line.renderLine(i + rendLineNumberStart, deltaTop[i], this.viewportData.lineHeight, this.viewportData, sb);
                 if (!renderResult) {
                     continue;
                 }

package/vscode/src/vs/editor/browser/view/viewOverlays.js

@@ -38,19 +38,13 @@ class ViewOverlays extends ViewPart {
         return this.domNode;
     }
     createVisibleLine() {
-        return ( new ViewOverlayLine(this._context.configuration, this._dynamicOverlays));
+        return ( new ViewOverlayLine(this._dynamicOverlays));
     }
     addDynamicOverlay(overlay) {
         this._dynamicOverlays.push(overlay);
     }
     onConfigurationChanged(e) {
         this._visibleLines.onConfigurationChanged(e);
-        const startLineNumber = this._visibleLines.getStartLineNumber();
-        const endLineNumber = this._visibleLines.getEndLineNumber();
-        for (let lineNumber = startLineNumber; lineNumber <= endLineNumber; lineNumber++) {
-            const line = this._visibleLines.getVisibleLine(lineNumber);
-            line.onConfigurationChanged(e);
-        }
         const options = this._context.configuration.options;
         const fontInfo = options.get(50 );
         applyFontInfo(this.domNode, fontInfo);
@@ -98,9 +92,7 @@ class ViewOverlays extends ViewPart {
     }
 }
 class ViewOverlayLine {
-    constructor(configuration, dynamicOverlays) {
-        this._configuration = configuration;
-        this._lineHeight = this._configuration.options.get(67 );
+    constructor(dynamicOverlays) {
         this._dynamicOverlays = dynamicOverlays;
         this._domNode = null;
         this._renderedContent = null;
@@ -118,10 +110,7 @@ class ViewOverlayLine {
     }
     onTokensChanged() {
     }
-    onConfigurationChanged(e) {
-        this._lineHeight = this._configuration.options.get(67 );
-    }
-    renderLine(lineNumber, deltaTop, viewportData, sb) {
+    renderLine(lineNumber, deltaTop, lineHeight, viewportData, sb) {
         let result = '';
         for (let i = 0, len = this._dynamicOverlays.length; i < len; i++) {
             const dynamicOverlay = this._dynamicOverlays[i];
@@ -131,19 +120,19 @@ class ViewOverlayLine {
             return false;
         }
         this._renderedContent = result;
-        sb.appendString('<div style="position:absolute;top:');
+        sb.appendString('<div style="top:');
         sb.appendString(String(deltaTop));
-        sb.appendString('px;width:100%;height:');
-        sb.appendString(String(this._lineHeight));
+        sb.appendString('px;height:');
+        sb.appendString(String(lineHeight));
         sb.appendString('px;">');
         sb.appendString(result);
         sb.appendString('</div>');
         return true;
     }
-    layoutLine(lineNumber, deltaTop) {
+    layoutLine(lineNumber, deltaTop, lineHeight) {
         if (this._domNode) {
             this._domNode.setTop(deltaTop);
-            this._domNode.setHeight(this._lineHeight);
+            this._domNode.setHeight(lineHeight);
         }
     }
 }
@@ -151,13 +140,13 @@ class ContentViewOverlays extends ViewOverlays {
     constructor(context) {
         super(context);
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         this._contentWidth = layoutInfo.contentWidth;
         this.domNode.setHeight(0);
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         this._contentWidth = layoutInfo.contentWidth;
         return super.onConfigurationChanged(e) || true;
     }
@@ -173,7 +162,7 @@ class MarginViewOverlays extends ViewOverlays {
     constructor(context) {
         super(context);
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         this._contentLeft = layoutInfo.contentLeft;
         this.domNode.setClassName('margin-view-overlays');
         this.domNode.setWidth(1);
@@ -182,7 +171,7 @@ class MarginViewOverlays extends ViewOverlays {
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
         applyFontInfo(this.domNode, options.get(50 ));
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         this._contentLeft = layoutInfo.contentLeft;
         return super.onConfigurationChanged(e) || true;
     }

package/vscode/src/vs/editor/browser/view.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../external/tslib/tslib.es6.js';
-import { getWindow, runAtThisOrScheduleAtNextAnimationFrame } from '../../base/browser/dom.js';
+import { runAtThisOrScheduleAtNextAnimationFrame, getWindow } from '../../base/browser/dom.js';
 import { createFastDomNode } from '../../base/browser/fastDomNode.js';
 import { inputLatency } from '../../base/browser/performance.js';
 import { BugIndicatingError, onUnexpectedError } from '../../base/common/errors.js';
@@ -211,17 +211,17 @@ let View = class View extends ViewEventHandler {
     }
     _applyLayout() {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         this.domNode.setWidth(layoutInfo.width);
         this.domNode.setHeight(layoutInfo.height);
         this._overflowGuardContainer.setWidth(layoutInfo.width);
         this._overflowGuardContainer.setHeight(layoutInfo.height);
-        this._linesContent.setWidth(1000000);
-        this._linesContent.setHeight(1000000);
+        this._linesContent.setWidth(16777216);
+        this._linesContent.setHeight(16777216);
     }
     _getEditorClassName() {
         const focused = this._textAreaHandler.isFocused() ? ' focused' : '';
-        return this._context.configuration.options.get(141 ) + ' ' + getThemeTypeSelector(this._context.theme.type) + focused;
+        return this._context.configuration.options.get(142 ) + ' ' + getThemeTypeSelector(this._context.theme.type) + focused;
     }
     handleEvents(events) {
         super.handleEvents(events);

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

@@ -16,7 +16,7 @@ class BlockDecorations extends ViewPart {
     update() {
         let didChange = false;
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         const newContentWidth = layoutInfo.contentWidth - layoutInfo.verticalScrollbarWidth;
         if (this.contentWidth !== newContentWidth) {
             this.contentWidth = newContentWidth;

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

@@ -124,7 +124,7 @@ class Widget {
         this.allowEditorOverflow = this._actual.allowEditorOverflow || false;
         this.suppressMouseDown = this._actual.suppressMouseDown || false;
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         this._fixedOverflowWidgets = options.get(42 );
         this._contentWidth = layoutInfo.contentWidth;
         this._contentLeft = layoutInfo.contentLeft;
@@ -145,8 +145,8 @@ class Widget {
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
         this._lineHeight = options.get(67 );
-        if (e.hasChanged(144 )) {
-            const layoutInfo = options.get(144 );
+        if (e.hasChanged(145 )) {
+            const layoutInfo = options.get(145 );
             this._contentLeft = layoutInfo.contentLeft;
             this._contentWidth = layoutInfo.contentWidth;
             this._maxWidth = this._getMaxWidth();

package/vscode/src/vs/editor/browser/viewParts/currentLineHighlight/currentLineHighlight.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 .current-line,.monaco-editor .view-overlays .current-line{box-sizing:border-box;display:block;left:0;position:absolute;top:0}.monaco-editor .margin-view-overlays .current-line.current-line-margin.current-line-margin-both{border-right:0}";
+var css = ".monaco-editor .margin-view-overlays .current-line,.monaco-editor .view-overlays .current-line{box-sizing:border-box;display:block;height:100%;left:0;position:absolute;top:0}.monaco-editor\n\t.margin-view-overlays\n\t.current-line.current-line-margin.current-line-margin-both{border-right:0}";
 n(css,{});
 export { css, css as default };

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

@@ -11,8 +11,7 @@ class AbstractLineHighlightOverlay extends DynamicViewOverlay {
         super();
         this._context = context;
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
-        this._lineHeight = options.get(67 );
+        const layoutInfo = options.get(145 );
         this._renderLineHighlight = options.get(96 );
         this._renderLineHighlightOnlyWhenFocus = options.get(97 );
         this._wordWrap = layoutInfo.isViewportWrapping;
@@ -53,8 +52,7 @@ class AbstractLineHighlightOverlay extends DynamicViewOverlay {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
-        this._lineHeight = options.get(67 );
+        const layoutInfo = options.get(145 );
         this._renderLineHighlight = options.get(96 );
         this._renderLineHighlightOnlyWhenFocus = options.get(97 );
         this._wordWrap = layoutInfo.isViewportWrapping;
@@ -151,7 +149,7 @@ class AbstractLineHighlightOverlay extends DynamicViewOverlay {
 class CurrentLineHighlightOverlay extends AbstractLineHighlightOverlay {
     _renderOne(ctx, exact) {
         const className = 'current-line' + (this._shouldRenderInMargin() ? ' current-line-both' : '') + (exact ? ' current-line-exact' : '');
-        return `<div class="${className}" style="width:${Math.max(ctx.scrollWidth, this._contentWidth)}px; height:${this._lineHeight}px;"></div>`;
+        return `<div class="${className}" style="width:${Math.max(ctx.scrollWidth, this._contentWidth)}px;"></div>`;
     }
     _shouldRenderThis() {
         return this._shouldRenderInContent();
@@ -163,7 +161,7 @@ class CurrentLineHighlightOverlay extends AbstractLineHighlightOverlay {
 class CurrentLineMarginHighlightOverlay extends AbstractLineHighlightOverlay {
     _renderOne(ctx, exact) {
         const className = 'current-line' + (this._shouldRenderInMargin() ? ' current-line-margin' : '') + (this._shouldRenderOther() ? ' current-line-margin-both' : '') + (this._shouldRenderInMargin() && exact ? ' current-line-exact-margin' : '');
-        return `<div class="${className}" style="width:${this._contentLeft}px; height:${this._lineHeight}px;"></div>`;
+        return `<div class="${className}" style="width:${this._contentLeft}px"></div>`;
     }
     _shouldRenderThis() {
         return true;

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

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor .lines-content .cdr{position:absolute}";
+var css = ".monaco-editor .lines-content .cdr{height:100%;position:absolute}";
 n(css,{});
 export { css, css as default };

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

@@ -7,7 +7,6 @@ class DecorationsOverlay extends DynamicViewOverlay {
         super();
         this._context = context;
         const options = this._context.configuration.options;
-        this._lineHeight = options.get(67 );
         this._typicalHalfwidthCharacterWidth = options.get(50 ).typicalHalfwidthCharacterWidth;
         this._renderResult = null;
         this._context.addEventHandler(this);
@@ -19,7 +18,6 @@ class DecorationsOverlay extends DynamicViewOverlay {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        this._lineHeight = options.get(67 );
         this._typicalHalfwidthCharacterWidth = options.get(50 ).typicalHalfwidthCharacterWidth;
         return true;
     }
@@ -83,7 +81,6 @@ class DecorationsOverlay extends DynamicViewOverlay {
         this._renderResult = output;
     }
     _renderWholeLineDecorations(ctx, decorations, output) {
-        const lineHeight = String(this._lineHeight);
         const visibleStartLineNumber = ctx.visibleRange.startLineNumber;
         const visibleEndLineNumber = ctx.visibleRange.endLineNumber;
         for (let i = 0, lenI = decorations.length; i < lenI; i++) {
@@ -93,9 +90,7 @@ class DecorationsOverlay extends DynamicViewOverlay {
             }
             const decorationOutput = ('<div class="cdr '
                 + d.options.className
-                + '" style="left:0;width:100%;height:'
-                + lineHeight
-                + 'px;"></div>');
+                + '" style="left:0;width:100%;"></div>');
             const startLineNumber = Math.max(d.range.startLineNumber, visibleStartLineNumber);
             const endLineNumber = Math.min(d.range.endLineNumber, visibleEndLineNumber);
             for (let j = startLineNumber; j <= endLineNumber; j++) {
@@ -105,7 +100,6 @@ class DecorationsOverlay extends DynamicViewOverlay {
         }
     }
     _renderNormalDecorations(ctx, decorations, output) {
-        const lineHeight = String(this._lineHeight);
         const visibleStartLineNumber = ctx.visibleRange.startLineNumber;
         let prevClassName = null;
         let prevShowIfCollapsed = false;
@@ -132,7 +126,7 @@ class DecorationsOverlay extends DynamicViewOverlay {
                 continue;
             }
             if (prevClassName !== null) {
-                this._renderNormalDecoration(ctx, prevRange, prevClassName, prevShouldFillLineOnLineBreak, prevShowIfCollapsed, lineHeight, visibleStartLineNumber, output);
+                this._renderNormalDecoration(ctx, prevRange, prevClassName, prevShouldFillLineOnLineBreak, prevShowIfCollapsed, visibleStartLineNumber, output);
             }
             prevClassName = className;
             prevShowIfCollapsed = showIfCollapsed;
@@ -140,10 +134,10 @@ class DecorationsOverlay extends DynamicViewOverlay {
             prevShouldFillLineOnLineBreak = d.options.shouldFillLineOnLineBreak ?? false;
         }
         if (prevClassName !== null) {
-            this._renderNormalDecoration(ctx, prevRange, prevClassName, prevShouldFillLineOnLineBreak, prevShowIfCollapsed, lineHeight, visibleStartLineNumber, output);
+            this._renderNormalDecoration(ctx, prevRange, prevClassName, prevShouldFillLineOnLineBreak, prevShowIfCollapsed, visibleStartLineNumber, output);
         }
     }
-    _renderNormalDecoration(ctx, range, className, shouldFillLineOnLineBreak, showIfCollapsed, lineHeight, visibleStartLineNumber, output) {
+    _renderNormalDecoration(ctx, range, className, shouldFillLineOnLineBreak, showIfCollapsed, visibleStartLineNumber, output) {
         const linesVisibleRanges = ctx.linesVisibleRangesForRange(range,  className === 'findMatch');
         if (!linesVisibleRanges) {
             return;
@@ -169,11 +163,11 @@ class DecorationsOverlay extends DynamicViewOverlay {
                     + className
                     + '" style="left:'
                     + String(visibleRange.left)
+                    + 'px;width:'
                     + (expandToLeft ?
-                        'px;width:100%;height:' :
-                        ('px;width:' + String(visibleRange.width) + 'px;height:'))
-                    + lineHeight
-                    + 'px;"></div>');
+                        '100%;' :
+                        (String(visibleRange.width) + 'px;'))
+                    + '"></div>');
                 output[lineIndex] += decorationOutput;
             }
         }

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

@@ -69,7 +69,7 @@ class EditorScrollbar extends ViewPart {
     }
     _setLayout() {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         this.scrollbarDomNode.setLeft(layoutInfo.contentLeft);
         const minimap = options.get(73 );
         const side = minimap.side;
@@ -115,7 +115,7 @@ class EditorScrollbar extends ViewPart {
             };
             this.scrollbar.updateOptions(newOpts);
         }
-        if (e.hasChanged(144 )) {
+        if (e.hasChanged(145 )) {
             this._setLayout();
         }
         return true;

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

@@ -82,7 +82,7 @@ class GlyphMarginWidgets extends ViewPart {
         this._widgets = {};
         this._context = context;
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         this.domNode = createFastDomNode(document.createElement('div'));
         this.domNode.setClassName('glyph-margin-widgets');
         this.domNode.setPosition('absolute');
@@ -106,7 +106,7 @@ class GlyphMarginWidgets extends ViewPart {
     }
     onConfigurationChanged(e) {
         const options = this._context.configuration.options;
-        const layoutInfo = options.get(144 );
+        const layoutInfo = options.get(145 );
         this._lineHeight = options.get(67 );
         this._glyphMargin = options.get(57 );
         this._glyphMarginLeft = layoutInfo.glyphMarginLeft;

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

@@ -1,4 +1,4 @@
 import n from '../../../../../../../external/rollup-plugin-styles/dist/runtime/inject-css.js';
-var css = ".monaco-editor .lines-content .core-guide{box-sizing:border-box;position:absolute}";
+var css = ".monaco-editor .lines-content .core-guide{box-sizing:border-box;height:100%;position:absolute}";
 n(css,{});
 export { css, css as default };

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;