Skip to content

Fix memory leak with installing cursor change position listener for r… #2

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

Open
irengrig wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix memory leak with installing cursor change position listener for r… #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fb43c7
Fix memory leak with installing cursor change position listener for r…
irengrig Sep 22, 2025
ac4a787
Update stickyScrollController.ts
irengrig Sep 22, 2025
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
17 changes: 12 additions & 5 deletions src/vs/editor/contrib/stickyScroll/browser/stickyScrollController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/

import { Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
import { IDisposable, Disposable, DisposableStore, toDisposable } from '../../../../base/common/lifecycle.js';
import { IActiveCodeEditor, ICodeEditor, MouseTargetType } from '../../../browser/editorBrowser.js';
import { IEditorContribution, ScrollType } from '../../../common/editorCommon.js';
import { ILanguageFeaturesService } from '../../../common/services/languageFeatures.js';
Expand Down Expand Up @@ -75,6 +75,7 @@ export class StickyScrollController extends Disposable implements IEditorContrib
private _showEndForLine: number | undefined;
private _minRebuildFromLine: number | undefined;
private _mouseTarget: EventTarget | null = null;
private _cursorPositionListener: IDisposable | undefined;

private readonly _onDidChangeStickyScrollHeight = this._register(new Emitter<{ height: number }>());
public readonly onDidChangeStickyScrollHeight = this._onDidChangeStickyScrollHeight.event;
Expand Down Expand Up @@ -475,10 +476,16 @@ export class StickyScrollController extends Disposable implements IEditorContrib

const lineNumberOption = this._editor.getOption(EditorOption.lineNumbers);
if (lineNumberOption.renderType === RenderLineNumbersType.Relative) {
this._sessionStore.add(this._editor.onDidChangeCursorPosition(() => {
this._showEndForLine = undefined;
this._renderStickyScroll(0);
}));
if (!this._cursorPositionListener) {
this._cursorPositionListener = this._editor.onDidChangeCursorPosition(() => {
this._showEndForLine = undefined;
this._renderStickyScroll(0);
});
this._sessionStore.add(this._cursorPositionListener);
}
} else if (this._cursorPositionListener) {
this._sessionStore.delete(this._cursorPositionListener);
this._cursorPositionListener = undefined;
}
}

Expand Down
Loading