Skip to content

Fix race condition with restoration of problems when closing a file #183271

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
meganrogge merged 2 commits into from
Dec 19, 2023
Merged

Fix race condition with restoration of problems when closing a file #183271

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c01fd5
Fix race condition with restoration of problems when closing a file
russelldavis May 23, 2023
6fa5a68
Merge branch 'main' into fix-problem-restoration-race-condition
meganrogge Nov 15, 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
7 changes: 5 additions & 2 deletions src/vs/workbench/contrib/tasks/common/problemCollectors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ export class WatchingProblemCollector extends AbstractProblemCollector implement
let markerChanged: IDisposable | undefined =
Event.debounce(this.markerService.onMarkerChanged, (last: readonly URI[] | undefined, e: readonly URI[]) => {
return (last ?? []).concat(e);
}, 500)(async (markerEvent) => {
}, 500, false, true)(async (markerEvent) => {
markerChanged?.dispose();
markerChanged = undefined;
if (!markerEvent.includes(modelEvent.uri) || (this.markerService.read({ resource: modelEvent.uri }).length !== 0)) {
Expand All @@ -450,8 +450,11 @@ export class WatchingProblemCollector extends AbstractProblemCollector implement
}
});
setTimeout(async () => {
markerChanged?.dispose();
// Calling dispose below can trigger the debounce event (via flushOnListenerRemove), so we
// have to unset markerChanged first to make sure the handler above doesn't dispose it again.
const _markerChanged = markerChanged;
markerChanged = undefined;
_markerChanged?.dispose();
}, 600);
}));
}
Expand Down