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

Jump to bottom

Fix npe on notebook open. #171866

Merged
merged 1 commit into from
Jan 20, 2023
Merged

Fix npe on notebook open. #171866

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/vs/base/browser/ui/list/listView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1329,7 +1329,7 @@ export class ListView<T> implements IListView<T> {
* Given a stable rendered state, checks every rendered element whether it needs
* to be probed for dynamic height. Adjusts scroll height and top if necessary.
*/
private _rerender(renderTop: number, renderHeight: number, inSmoothScrolling?: boolean): void {
protected _rerender(renderTop: number, renderHeight: number, inSmoothScrolling?: boolean): void {
const previousRenderRange = this.getRenderRange(renderTop, renderHeight);

// Let's remember the second element's position, this helps in scrolling up
Expand Down
14 changes: 10 additions & 4 deletions src/vs/workbench/contrib/notebook/browser/view/notebookCellListView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,21 @@ import { IRange } from 'vs/base/common/range';
import { ListView } from 'vs/base/browser/ui/list/listView';

export class NotebookCellListView<T> extends ListView<T> {
private _inRenderingTransaction: boolean = false;
private _renderingStack = 0;

get inRenderingTransaction(): boolean {
return this._inRenderingTransaction;
return this._renderingStack > 0;
}

protected override render(previousRenderRange: IRange, renderTop: number, renderHeight: number, renderLeft: number | undefined, scrollWidth: number | undefined, updateItemsInDOM?: boolean): void {
this._inRenderingTransaction = true;
this._renderingStack++;
super.render(previousRenderRange, renderTop, renderHeight, renderLeft, scrollWidth, updateItemsInDOM);
this._inRenderingTransaction = false;
this._renderingStack--;
}

protected override _rerender(renderTop: number, renderHeight: number, inSmoothScrolling?: boolean | undefined): void {
this._renderingStack++;
super._rerender(renderTop, renderHeight, inSmoothScrolling);
this._renderingStack--;
}
}