Skip to content

(fix) prevent crash when ts project is closed #2144

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

Merged
merged 3 commits into from
Aug 29, 2023
Merged

(fix) prevent crash when ts project is closed #2144

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa9d8b5
(fix) prevent crash when ts project is closed
jasonlyu123 Aug 29, 2023
49b549b
format
jasonlyu123 Aug 29, 2023
38bdbf5
Update packages/typescript-plugin/src/project-svelte-files.ts
dummdidumm Aug 29, 2023
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: 13 additions & 4 deletions packages/typescript-plugin/src/project-svelte-files.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ export class ProjectSvelteFilesManager {
return;
}

this.disposeWatchersAndFiles();
this.disposeWatchers();
this.clearProjectFile();
this.parsedCommandLine = parsedCommandLine;
this.setupWatchers();
this.updateProjectSvelteFiles();
Expand Down Expand Up @@ -162,7 +163,8 @@ export class ProjectSvelteFilesManager {
}

private onConfigChanged(config: Configuration) {
this.disposeWatchersAndFiles();
this.disposeWatchers();
this.clearProjectFile();

if (config.enable) {
this.setupWatchers();
Expand All @@ -178,16 +180,23 @@ export class ProjectSvelteFilesManager {
}
}

private disposeWatchersAndFiles() {
private disposeWatchers() {
this.directoryWatchers.forEach((watcher) => watcher.close());
this.directoryWatchers.clear();
}

private clearProjectFile() {
this.projectFileToOriginalCasing.forEach((file) => this.removeFileFromProject(file));
this.projectFileToOriginalCasing.clear();
}

dispose() {
this.disposeWatchersAndFiles();
this.disposeWatchers();

// Don't remove files from the project here
// because TypeScript already does that when the project is closed
// - and because the project is closed, `project.removeFile` will result in an error
this.projectFileToOriginalCasing.clear();

ProjectSvelteFilesManager.instances.delete(this.project.getProjectName());
}
Expand Down