@codingame/monaco-vscode-api 3.2.2 → 4.0.0

package/vscode/src/vs/editor/browser/services/editorWorkerService.js

@@ -16,7 +16,7 @@ import { ILanguageFeaturesService } from '../../common/services/languageFeatures
 import { MovedText } from '../../common/diff/linesDiffComputer.js';
 import { LineRangeMapping, DetailedLineRangeMapping, RangeMapping } from '../../common/diff/rangeMapping.js';
 import { LineRange } from '../../common/core/lineRange.js';
-import { $window } from '../../../base/browser/window.js';
+import { mainWindow } from '../../../base/browser/window.js';
 import { WindowIntervalTimer } from '../../../base/browser/dom.js';
 const STOP_SYNC_MODEL_DELTA_TIME_MS = 60 * 1000;
 const STOP_WORKER_DELTA_TIME_MS = 5 * 60 * 1000;
@@ -127,6 +127,9 @@ let EditorWorkerService = class EditorWorkerService extends Disposable {
     computeWordRanges(resource, range) {
         return this._workerManager.withWorker().then(client => client.computeWordRanges(resource, range));
     }
+    findSectionHeaders(uri, options) {
+        return this._workerManager.withWorker().then(client => client.findSectionHeaders(uri, options));
+    }
 };
 EditorWorkerService = ( __decorate([
     ( __param(0, IModelService)),
@@ -200,7 +203,7 @@ class WorkerManager extends Disposable {
         this._editorWorkerClient = null;
         this._lastWorkerUsedTime = (( new Date())).getTime();
         const stopWorkerInterval = this._register(( new WindowIntervalTimer()));
-        stopWorkerInterval.cancelAndSet(() => this._checkStopIdleWorker(), Math.round(STOP_WORKER_DELTA_TIME_MS / 2), $window);
+        stopWorkerInterval.cancelAndSet(() => this._checkStopIdleWorker(), Math.round(STOP_WORKER_DELTA_TIME_MS / 2), mainWindow);
         this._register(this._modelService.onModelRemoved(_ => this._checkStopEmptyWorker()));
     }
     dispose() {
@@ -459,6 +462,11 @@ class EditorWorkerClient extends Disposable {
             return proxy.navigateValueSet(( resource.toString()), range, up, wordDef, wordDefFlags);
         });
     }
+    findSectionHeaders(uri, options) {
+        return this._withSyncedResources([uri]).then(proxy => {
+            return proxy.findSectionHeaders(( uri.toString()), options);
+        });
+    }
     dispose() {
         super.dispose();
         this._disposed = true;

package/vscode/src/vs/editor/browser/services/hoverService/hoverService.d.ts

@@ -0,0 +1,31 @@
+import { IHoverService, IHoverOptions } from '../../../../platform/hover/browser/hover.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { Disposable } from '../../../../base/common/lifecycle.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { IHoverWidget } from '../../../../base/browser/ui/hover/updatableHoverWidget.js';
+
+declare class HoverService extends Disposable implements IHoverService {
+    private readonly _instantiationService;
+    private readonly _keybindingService;
+    private readonly _layoutService;
+    private readonly _accessibilityService;
+    readonly _serviceBrand: undefined;
+    private _contextViewHandler;
+    private _currentHoverOptions;
+    private _currentHover;
+    private _lastHoverOptions;
+    private _lastFocusedElementBeforeOpen;
+    constructor(_instantiationService: IInstantiationService, contextMenuService: IContextMenuService, _keybindingService: IKeybindingService, _layoutService: ILayoutService, _accessibilityService: IAccessibilityService);
+    showHover(options: IHoverOptions, focus?: boolean, skipLastFocusedUpdate?: boolean): IHoverWidget | undefined;
+    hideHover(): void;
+    private doHideHover;
+    private _intersectionChange;
+    showAndFocusLastHover(): void;
+    private _keyDown;
+    private _keyUp;
+}
+
+export { HoverService };

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

@@ -1,26 +1,38 @@
-import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { registerSingleton } from '../../../platform/instantiation/common/extensions.js';
-import { registerThemingParticipant } from '../../../platform/theme/common/themeService.js';
-import { editorHoverBorder } from '../../../platform/theme/common/colorRegistry.js';
-import { IHoverService } from '../../../platform/hover/browser/hover.js';
-import { IContextViewService, IContextMenuService } from '../../../platform/contextview/browser/contextView.js';
-import { IInstantiationService } from '../../../platform/instantiation/common/instantiation.js';
-import { HoverWidget } from '../widget/hoverWidget/hoverWidget.js';
-import { toDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
-import { getActiveElement, isAncestorOfActiveElement, getWindow, addDisposableListener, isAncestor, EventType } from '../../../base/browser/dom.js';
-import { IKeybindingService } from '../../../platform/keybinding/common/keybinding.js';
-import { StandardKeyboardEvent } from '../../../base/browser/keyboardEvent.js';
-import { IAccessibilityService } from '../../../platform/accessibility/common/accessibility.js';
-import { ILayoutService } from '../../../platform/layout/browser/layoutService.js';
-import { mainWindow } from '../../../base/browser/window.js';
-let HoverService = class HoverService {
-    constructor(_instantiationService, _contextViewService, contextMenuService, _keybindingService, _layoutService, _accessibilityService) {
+import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
+import { registerSingleton } from '../../../../platform/instantiation/common/extensions.js';
+import { registerThemingParticipant } from '../../../../platform/theme/common/themeService.js';
+import '../../../../platform/theme/common/colorUtils.js';
+import '../../../../platform/theme/common/colors/baseColors.js';
+import '../../../../platform/theme/common/colors/chartsColors.js';
+import { editorHoverBorder } from '../../../../platform/theme/common/colors/editorColors.js';
+import '../../../../platform/theme/common/colors/inputColors.js';
+import '../../../../platform/theme/common/colors/listColors.js';
+import '../../../../platform/theme/common/colors/menuColors.js';
+import '../../../../platform/theme/common/colors/minimapColors.js';
+import '../../../../platform/theme/common/colors/miscColors.js';
+import '../../../../platform/theme/common/colors/quickpickColors.js';
+import '../../../../platform/theme/common/colors/searchColors.js';
+import { IHoverService } from '../../../../platform/hover/browser/hover.js';
+import { IContextMenuService } from '../../../../platform/contextview/browser/contextView.js';
+import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
+import { HoverWidget } from './hoverWidget.js';
+import { Disposable, toDisposable, DisposableStore } from '../../../../base/common/lifecycle.js';
+import { getActiveElement, isAncestorOfActiveElement, getWindow, addDisposableListener, isAncestor, EventType } from '../../../../base/browser/dom.js';
+import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
+import { StandardKeyboardEvent } from '../../../../base/browser/keyboardEvent.js';
+import { IAccessibilityService } from '../../../../platform/accessibility/common/accessibility.js';
+import { ILayoutService } from '../../../../platform/layout/browser/layoutService.js';
+import { mainWindow } from '../../../../base/browser/window.js';
+import { ContextViewHandler } from '../../../../platform/contextview/browser/contextViewService.js';
+let HoverService = class HoverService extends Disposable {
+    constructor(_instantiationService, contextMenuService, _keybindingService, _layoutService, _accessibilityService) {
+        super();
         this._instantiationService = _instantiationService;
-        this._contextViewService = _contextViewService;
         this._keybindingService = _keybindingService;
         this._layoutService = _layoutService;
         this._accessibilityService = _accessibilityService;
         contextMenuService.onDidShowContextMenu(() => this.hideHover());
+        this._contextViewHandler = this._register(( new ContextViewHandler(this._layoutService)));
     }
     showHover(options, focus, skipLastFocusedUpdate) {
         if (getHoverOptionsIdentity(this._currentHoverOptions) === getHoverOptionsIdentity(options)) {
@@ -60,9 +72,8 @@ let HoverService = class HoverService {
             const targetElement = options.target instanceof HTMLElement ? options.target : options.target.targetElements[0];
             options.container = this._layoutService.getContainer(getWindow(targetElement));
         }
-        const provider = this._contextViewService;
-        provider.showContextView(( new HoverContextViewDelegate(hover, focus)), options.container);
-        hover.onRequestLayout(() => provider.layout());
+        this._contextViewHandler.showContextView(( new HoverContextViewDelegate(hover, focus)), options.container);
+        hover.onRequestLayout(() => this._contextViewHandler.layout());
         if (options.persistence?.sticky) {
             hoverDisposables.add(addDisposableListener(getWindow(options.container).document, EventType.MOUSE_DOWN, e => {
                 if (!isAncestor(e.target, hover.domNode)) {
@@ -106,7 +117,7 @@ let HoverService = class HoverService {
     doHideHover() {
         this._currentHover = undefined;
         this._currentHoverOptions = undefined;
-        this._contextViewService.hideContextView();
+        this._contextViewHandler.hideContextView();
     }
     _intersectionChange(entries, hover) {
         const entry = entries[entries.length - 1];
@@ -147,11 +158,10 @@ let HoverService = class HoverService {
 };
 HoverService = ( __decorate([
     ( __param(0, IInstantiationService)),
-    ( __param(1, IContextViewService)),
-    ( __param(2, IContextMenuService)),
-    ( __param(3, IKeybindingService)),
-    ( __param(4, ILayoutService)),
-    ( __param(5, IAccessibilityService))
+    ( __param(1, IContextMenuService)),
+    ( __param(2, IKeybindingService)),
+    ( __param(3, ILayoutService)),
+    ( __param(4, IAccessibilityService))
 ], HoverService));
 function getHoverOptionsIdentity(options) {
     if (options === undefined) {
@@ -166,6 +176,7 @@ class HoverContextViewDelegate {
     constructor(_hover, _focus = false) {
         this._hover = _hover;
         this._focus = _focus;
+        this.layer = 1;
     }
     render(container) {
         this._hover.render(container);

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 };