Skip to content

fix(editor): safeguard event unregistrations against undefined values #1125

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

Closed
mrueg wants to merge 1 commit into from
+44 −13
Closed

fix(editor): safeguard event unregistrations against undefined values #1125

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 28 additions & 7 deletions src/editor/lineAuthor/lineAuthorIntegration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,34 @@ export class LineAuthoringFeature {
}

private destroyEventHandlers() {
this.plg.app.workspace.offref(this.gutterContextMenuEvent!);
this.plg.app.workspace.offref(this.refreshOnCssChangeEvent!);
this.plg.app.workspace.offref(this.fileOpenEvent!);
this.plg.app.workspace.offref(this.workspaceLeafChangeEvent!);
this.plg.app.vault.offref(this.fileModificationEvent!);
this.plg.app.workspace.offref(this.headChangeEvent!);
this.plg.app.vault.offref(this.fileRenameEvent!);
if (this.gutterContextMenuEvent) {
this.plg.app.workspace.offref(this.gutterContextMenuEvent);
this.gutterContextMenuEvent = undefined;
}
if (this.refreshOnCssChangeEvent) {
this.plg.app.workspace.offref(this.refreshOnCssChangeEvent);
this.refreshOnCssChangeEvent = undefined;
}
if (this.fileOpenEvent) {
this.plg.app.workspace.offref(this.fileOpenEvent);
this.fileOpenEvent = undefined;
}
if (this.workspaceLeafChangeEvent) {
this.plg.app.workspace.offref(this.workspaceLeafChangeEvent);
this.workspaceLeafChangeEvent = undefined;
}
if (this.fileModificationEvent) {
this.plg.app.vault.offref(this.fileModificationEvent);
this.fileModificationEvent = undefined;
}
if (this.headChangeEvent) {
this.plg.app.workspace.offref(this.headChangeEvent);
this.headChangeEvent = undefined;
}
if (this.fileRenameEvent) {
this.plg.app.vault.offref(this.fileRenameEvent);
this.fileRenameEvent = undefined;
}
}

private handleWorkspaceLeaf = (leaf: WorkspaceLeaf) => {
Expand Down
22 changes: 16 additions & 6 deletions src/editor/signs/signsIntegration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ export class SignsFeature {
private fileRenameEvent?: EventRef;
private intervalRefreshEvent?: number;
private pluginRefreshedEvent?: EventRef;
private gutterContextMenuEvent?: EventRef;
private codeMirrorExtensions: Extension[] = [];
public changeStatusBar?: ChangesStatusBar;

Expand Down Expand Up @@ -143,11 +142,22 @@ export class SignsFeature {
}

private destroyEventHandlers() {
this.plg.app.workspace.offref(this.workspaceLeafChangeEvent!);
this.plg.app.vault.offref(this.fileRenameEvent!);
this.plg.app.workspace.offref(this.pluginRefreshedEvent!);
this.plg.app.workspace.offref(this.gutterContextMenuEvent!);
window.clearInterval(this.intervalRefreshEvent);
if (this.workspaceLeafChangeEvent) {
this.plg.app.workspace.offref(this.workspaceLeafChangeEvent);
this.workspaceLeafChangeEvent = undefined;
}
if (this.fileRenameEvent) {
this.plg.app.vault.offref(this.fileRenameEvent);
this.fileRenameEvent = undefined;
}
if (this.pluginRefreshedEvent) {
this.plg.app.workspace.offref(this.pluginRefreshedEvent);
this.pluginRefreshedEvent = undefined;
}
if (this.intervalRefreshEvent !== undefined) {
window.clearInterval(this.intervalRefreshEvent);
this.intervalRefreshEvent = undefined;
}
}

private handleWorkspaceLeaf = (leaf: WorkspaceLeaf) => {
Expand Down