Taking into account view data when getting line height

src/vs/editor/browser/editorBrowser.ts

@@ -1078,7 +1078,7 @@ export interface ICodeEditor extends editorCommon.IEditor {
 	/**
 	 * Get the line height for the line number.
 	 */
-	getLineHeightForLineNumber(lineNumber: number): number;
+	getLineHeightForPosition(position: IPosition): number;
 
 	/**
 	 * Set the model ranges that will be hidden in the view.

src/vs/editor/browser/widget/codeEditor/codeEditorWidget.ts

@@ -597,12 +597,15 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 		return CodeEditorWidget._getVerticalOffsetAfterPosition(this._modelData, lineNumber, maxCol, includeViewZones);
 	}
 
-	public getLineHeightForLineNumber(lineNumber: number): number {
+	public getLineHeightForPosition(position: IPosition): number {
 		if (!this._modelData) {
 			return -1;
 		}
-		const viewPosition = this._modelData.viewModel.coordinatesConverter.convertModelPositionToViewPosition(new Position(lineNumber, 1));
-		return this._modelData.viewModel.viewLayout.getLineHeightForLineNumber(viewPosition.lineNumber);
+		const viewModel = this._modelData.viewModel;
+		if (viewModel.coordinatesConverter.modelPositionIsVisible(Position.lift(position))) {
+			return viewModel.viewLayout.getLineHeightForLineNumber(position.lineNumber);
+		}
+		return 0;
 	}
 
 	public setHiddenAreas(ranges: IRange[], source?: unknown, forceUpdate?: boolean): void {
@@ -1609,7 +1612,7 @@ export class CodeEditorWidget extends Disposable implements editorBrowser.ICodeE
 
 		const top = CodeEditorWidget._getVerticalOffsetForPosition(this._modelData, position.lineNumber, position.column) - this.getScrollTop();
 		const left = this._modelData.view.getOffsetForColumn(position.lineNumber, position.column) + layoutInfo.glyphMarginWidth + layoutInfo.lineNumbersWidth + layoutInfo.decorationsWidth - this.getScrollLeft();
-		const height = this.getLineHeightForLineNumber(position.lineNumber);
+		const height = this.getLineHeightForPosition(position);
 		return {
 			top: top,
 			left: left,

src/vs/editor/common/viewLayout/viewLayout.ts

@@ -405,7 +405,7 @@ export class ViewLayout extends Disposable implements IViewLayout {
 	public isInTopPadding(verticalOffset: number): boolean {
 		return this._linesLayout.isInTopPadding(verticalOffset);
 	}
-	isInBottomPadding(verticalOffset: number): boolean {
+	public isInBottomPadding(verticalOffset: number): boolean {
 		return this._linesLayout.isInBottomPadding(verticalOffset);
 	}
 

src/vs/editor/contrib/stickyScroll/browser/stickyScrollProvider.ts

@@ -15,6 +15,7 @@ import { Event, Emitter } from '../../../../base/common/event.js';
 import { ILanguageConfigurationService } from '../../../common/languages/languageConfigurationRegistry.js';
 import { StickyModelProvider, IStickyModelProvider } from './stickyScrollModelProvider.js';
 import { StickyElement, StickyModel, StickyRange } from './stickyScrollElement.js';
+import { Position } from '../../../common/core/position.js';
 
 export class StickyLineCandidate {
 	constructor(
@@ -175,7 +176,7 @@ export class StickyLineCandidateProvider extends Disposable implements IStickyLi
 				const childEndLine = childRange.endLineNumber;
 				if (range.startLineNumber <= childEndLine + 1 && childStartLine - 1 <= range.endLineNumber && childStartLine !== lastLine) {
 					lastLine = childStartLine;
-					const lineHeight = this._editor.getLineHeightForLineNumber(childStartLine);
+					const lineHeight = this._editor.getLineHeightForPosition(new Position(childStartLine, 1));
 					result.push(new StickyLineCandidate(childStartLine, childEndLine - 1, top, lineHeight));
 					this.getCandidateStickyLinesIntersectingFromStickyModel(range, child, result, depth + 1, top + lineHeight, childStartLine);
 				}

src/vs/editor/contrib/stickyScroll/browser/stickyScrollWidget.ts

@@ -263,7 +263,7 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 	private _getHeightOfLines(lineNumbers: number[], lastLineRelativePosition: number): number {
 		let totalHeight = 0;
 		for (let i = 0; i < lineNumbers.length; i++) {
-			totalHeight += this._editor.getLineHeightForLineNumber(lineNumbers[i]);
+			totalHeight += this._editor.getLineHeightForPosition(new Position(lineNumbers[i], 1));
 		}
 		return totalHeight + lastLineRelativePosition;
 	}
@@ -318,7 +318,7 @@ export class StickyScrollWidget extends Disposable implements IOverlayWidget {
 			actualInlineDecorations = [];
 		}
 
-		const lineHeight = this._editor.getLineHeightForLineNumber(line);
+		const lineHeight = this._editor.getLineHeightForPosition(new Position(line, 1));
 		const renderLineInput: RenderLineInput = new RenderLineInput(true, true, lineRenderingData.content,
 			lineRenderingData.continuesWithWrappedLine,
 			lineRenderingData.isBasicASCII, lineRenderingData.containsRTL, 0,

src/vs/monaco.d.ts

@@ -6112,7 +6112,7 @@ declare namespace monaco.editor {
 		/**
 		 * Get the line height for the line number.
 		 */
-		getLineHeightForLineNumber(lineNumber: number): number;
+		getLineHeightForPosition(position: IPosition): number;
 		/**
 		 * Write the screen reader content to be the current selection
 		 */

src/vs/workbench/contrib/codeEditor/browser/emptyTextEditorHint/emptyTextEditorHint.ts

@@ -33,6 +33,7 @@ import { IContextMenuService } from '../../../../../platform/contextview/browser
 import { StandardMouseEvent } from '../../../../../base/browser/mouseEvent.js';
 import { ChatAgentLocation } from '../../../chat/common/constants.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
+import { Position } from '../../../../../editor/common/core/position.js';
 
 export const emptyTextEditorHintSetting = 'workbench.editor.empty.hint';
 export class EmptyTextEditorHintContribution extends Disposable implements IEditorContribution {
@@ -319,7 +320,7 @@ class EmptyTextEditorHintContentWidget extends Disposable implements IContentWid
 			}));
 
 			this.editor.applyFontInfo(this.domNode);
-			const lineHeight = this.editor.getLineHeightForLineNumber(1);
+			const lineHeight = this.editor.getLineHeightForPosition(new Position(1, 1));
 			this.domNode.style.lineHeight = lineHeight + 'px';
 		}
 

src/vs/workbench/contrib/interactive/browser/replInputHintContentWidget.ts

@@ -12,6 +12,7 @@ import { Disposable } from '../../../../base/common/lifecycle.js';
 import { OS } from '../../../../base/common/platform.js';
 import { ContentWidgetPositionPreference, ICodeEditor, IContentWidget, IContentWidgetPosition } from '../../../../editor/browser/editorBrowser.js';
 import { ConfigurationChangedEvent, EditorOption } from '../../../../editor/common/config/editorOptions.js';
+import { Position } from '../../../../editor/common/core/position.js';
 import { localize } from '../../../../nls.js';
 import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IKeybindingService } from '../../../../platform/keybinding/common/keybinding.js';
@@ -77,7 +78,7 @@ export class ReplInputHintContentWidget extends Disposable implements IContentWi
 			}));
 
 			this.editor.applyFontInfo(this.domNode);
-			const lineHeight = this.editor.getLineHeightForLineNumber(1);
+			const lineHeight = this.editor.getLineHeightForPosition(new Position(1, 1));
 			this.domNode.style.lineHeight = lineHeight + 'px';
 		}