Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Highlight active line number correctly regardless of word wrap #240029

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −5
Open

Highlight active line number correctly regardless of word wrap #240029

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/vs/editor/browser/viewParts/lineNumbers/lineNumbers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export class LineNumbersOverlay extends DynamicViewOverlay {
private _lineNumbersWidth!: number;
private _lastCursorModelPosition: Position;
private _renderResult: string[] | null;
private _activeLineNumber: number;
private _activeModelLineNumber: number;

constructor(context: ViewContext) {
super();
Expand All @@ -42,7 +42,7 @@ export class LineNumbersOverlay extends DynamicViewOverlay {

this._lastCursorModelPosition = new Position(1, 1);
this._renderResult = null;
this._activeLineNumber = 1;
this._activeModelLineNumber = 1;
this._context.addEventHandler(this);
}

Expand Down Expand Up @@ -75,8 +75,8 @@ export class LineNumbersOverlay extends DynamicViewOverlay {
this._lastCursorModelPosition = this._context.viewModel.coordinatesConverter.convertViewPositionToModelPosition(primaryViewPosition);

let shouldRender = false;
if (this._activeLineNumber !== primaryViewPosition.lineNumber) {
this._activeLineNumber = primaryViewPosition.lineNumber;
if (this._activeModelLineNumber !== this._lastCursorModelPosition.lineNumber) {
this._activeModelLineNumber = this._lastCursorModelPosition.lineNumber;
shouldRender = true;
}
if (this._renderLineNumbers === RenderLineNumbersType.Relative || this._renderLineNumbers === RenderLineNumbersType.Interval) {
Expand Down Expand Up @@ -160,8 +160,10 @@ export class LineNumbersOverlay extends DynamicViewOverlay {

const lineCount = this._context.viewModel.getLineCount();
const output: string[] = [];

for (let lineNumber = visibleStartLineNumber; lineNumber <= visibleEndLineNumber; lineNumber++) {
const lineIndex = lineNumber - visibleStartLineNumber;
const modelLineNumber: number = this._context.viewModel.coordinatesConverter.convertViewPositionToModelPosition(new Position(lineNumber, 1)).lineNumber;

let renderLineNumber = this._getLineRenderLineNumber(lineNumber);
let extraClassNames = '';
Expand Down Expand Up @@ -191,7 +193,7 @@ export class LineNumbersOverlay extends DynamicViewOverlay {
extraClassNames += ' dimmed-line-number';
}
}
if (lineNumber === this._activeLineNumber) {
if (modelLineNumber === this._activeModelLineNumber) {
extraClassNames += ' active-line-number';
}

Expand Down