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

Fix two bugs in #214589 fixing #213535. #218357

Merged
merged 4 commits into from
Jun 26, 2024
Merged

Fix two bugs in #214589 fixing #213535. #218357

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e3cd9e
Fix two bugs in #214589.
rehmsen Jun 26, 2024
8d36423
Merge branch 'main' into fix_notebook_comment_lifecycle
rehmsen Jun 26, 2024
ab8621e
Fix blank line.
rehmsen Jun 26, 2024
08554a6
Register the _commentThreadWidget MutableDisposable so that it gets d…
rehmsen Jun 26, 2024
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
4 changes: 1 addition & 3 deletions src/vs/workbench/contrib/notebook/browser/view/cellParts/cellComments.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ export class CellComments extends CellContentPart {
constructor(
private readonly notebookEditor: INotebookEditorDelegate,
private readonly container: HTMLElement,

@IContextKeyService private readonly contextKeyService: IContextKeyService,
@IThemeService private readonly themeService: IThemeService,
@ICommentService private readonly commentService: ICommentService,
Expand Down Expand Up @@ -108,7 +107,7 @@ export class CellComments extends CellContentPart {
if (this._commentThreadWidget.value) {
if (!info) {
this._commentThreadDisposables.clear();
this._commentThreadWidget.dispose();
this._commentThreadWidget.value = undefined;
rehmsen marked this conversation as resolved.
Show resolved Hide resolved
this.currentElement.commentHeight = 0;
return;
}
Expand Down Expand Up @@ -154,7 +153,6 @@ export class CellComments extends CellContentPart {

override didRenderCell(element: ICellViewModel): void {
if (element.cellKind === CellKind.Code) {
this.currentElement = element as CodeCellViewModel;
this.initialize(element);
this._bindListeners();
}
Expand Down