Revert "Skip folded regions when computing relative line numbers (microsoft#155970)" (microsoft#159236)

This reverts commit 187ec06.

Author: alexdima

src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts

@@ -27,7 +27,6 @@ export class LineNumbersOverlay extends DynamicViewOverlay {
 	private _lineNumbersLeft!: number;
 	private _lineNumbersWidth!: number;
 	private _lastCursorModelPosition: Position;
-	private _lastCursorViewPosition: Position;
 	private _renderResult: string[] | null;
 	private _activeLineNumber: number;
 
@@ -38,7 +37,6 @@ export class LineNumbersOverlay extends DynamicViewOverlay {
 		this._readConfig();
 
 		this._lastCursorModelPosition = new Position(1, 1);
-		this._lastCursorViewPosition = new Position(1, 1);
 		this._renderResult = null;
 		this._activeLineNumber = 1;
 		this._context.addEventHandler(this);
@@ -70,7 +68,6 @@ export class LineNumbersOverlay extends DynamicViewOverlay {
 	}
 	public override onCursorStateChanged(e: viewEvents.ViewCursorStateChangedEvent): boolean {
 		const primaryViewPosition = e.selections[0].getPosition();
-		this._lastCursorViewPosition = primaryViewPosition;
 		this._lastCursorModelPosition = this._context.viewModel.coordinatesConverter.convertViewPositionToModelPosition(primaryViewPosition);
 
 		let shouldRender = false;
@@ -115,6 +112,14 @@ export class LineNumbersOverlay extends DynamicViewOverlay {
 			return this._renderCustomLineNumbers(modelLineNumber);
 		}
 
+		if (this._renderLineNumbers === RenderLineNumbersType.Relative) {
+			const diff = Math.abs(this._lastCursorModelPosition.lineNumber - modelLineNumber);
+			if (diff === 0) {
+				return '<span class="relative-current-line-number">' + modelLineNumber + '</span>';
+			}
+			return String(diff);
+		}
+
 		if (this._renderLineNumbers === RenderLineNumbersType.Interval) {
 			if (this._lastCursorModelPosition.lineNumber === modelLineNumber) {
 				return String(modelLineNumber);
@@ -139,45 +144,6 @@ export class LineNumbersOverlay extends DynamicViewOverlay {
 		const visibleEndLineNumber = ctx.visibleRange.endLineNumber;
 		const common = '<div class="' + LineNumbersOverlay.CLASS_NAME + lineHeightClassName + '" style="left:' + this._lineNumbersLeft + 'px;width:' + this._lineNumbersWidth + 'px;">';
 
-		let relativeLineNumbers: number[] | null = null;
-		if (this._renderLineNumbers === RenderLineNumbersType.Relative) {
-			relativeLineNumbers = new Array(visibleEndLineNumber - visibleStartLineNumber + 1);
-
-			if (this._lastCursorViewPosition.lineNumber >= visibleStartLineNumber && this._lastCursorViewPosition.lineNumber <= visibleEndLineNumber) {
-				relativeLineNumbers[this._lastCursorViewPosition.lineNumber - visibleStartLineNumber] = this._lastCursorModelPosition.lineNumber;
-			}
-
-			// Iterate up to compute relative line numbers
-			{
-				let value = 0;
-				for (let lineNumber = this._lastCursorViewPosition.lineNumber + 1; lineNumber <= visibleEndLineNumber; lineNumber++) {
-					const modelPosition = this._context.viewModel.coordinatesConverter.convertViewPositionToModelPosition(new Position(lineNumber, 1));
-					const isWrappedLine = (modelPosition.column !== 1);
-					if (!isWrappedLine) {
-						value++;
-					}
-					if (lineNumber >= visibleStartLineNumber) {
-						relativeLineNumbers[lineNumber - visibleStartLineNumber] = isWrappedLine ? 0 : value;
-					}
-				}
-			}
-
-			// Iterate down to compute relative line numbers
-			{
-				let value = 0;
-				for (let lineNumber = this._lastCursorViewPosition.lineNumber - 1; lineNumber >= visibleStartLineNumber; lineNumber--) {
-					const modelPosition = this._context.viewModel.coordinatesConverter.convertViewPositionToModelPosition(new Position(lineNumber, 1));
-					const isWrappedLine = (modelPosition.column !== 1);
-					if (!isWrappedLine) {
-						value++;
-					}
-					if (lineNumber <= visibleEndLineNumber) {
-						relativeLineNumbers[lineNumber - visibleStartLineNumber] = isWrappedLine ? 0 : value;
-					}
-				}
-			}
-		}
-
 		const lineCount = this._context.viewModel.getLineCount();
 		const output: string[] = [];
 		for (let lineNumber = visibleStartLineNumber; lineNumber <= visibleEndLineNumber; lineNumber++) {
@@ -191,20 +157,7 @@ export class LineNumbersOverlay extends DynamicViewOverlay {
 				}
 			}
 
-			let renderLineNumber: string;
-			if (relativeLineNumbers) {
-				const relativeLineNumber = relativeLineNumbers[lineIndex];
-				if (this._lastCursorViewPosition.lineNumber === lineNumber) {
-					// current line!
-					renderLineNumber = `<span class="relative-current-line-number">${relativeLineNumber}</span>`;
-				} else if (relativeLineNumber) {
-					renderLineNumber = String(relativeLineNumber);
-				} else {
-					renderLineNumber = '';
-				}
-			} else {
-				renderLineNumber = this._getLineRenderLineNumber(lineNumber);
-			}
+			const renderLineNumber = this._getLineRenderLineNumber(lineNumber);
 
 			if (renderLineNumber) {
 				if (lineNumber === this._activeLineNumber) {