Skip to content

fix code action disposable #246290

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
justschen merged 1 commit into from
Apr 11, 2025
Merged

fix code action disposable #246290

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
4 changes: 3 additions & 1 deletion src/vs/editor/contrib/codeAction/browser/codeAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,9 @@ export async function getCodeActions(
...coalesce(actions.map(x => x.documentation)),
...getAdditionalDocumentationForShowingActions(registry, model, trigger, allActions)
];
return new ManagedCodeActionSet(allActions, allDocumentation, disposables);
const managedCodeActionSet = new ManagedCodeActionSet(allActions, allDocumentation, disposables);
disposables.add(managedCodeActionSet);
return managedCodeActionSet;
} catch (err) {
disposables.dispose();
throw err;
Expand Down
4 changes: 3 additions & 1 deletion src/vs/editor/contrib/codeAction/browser/codeActionModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ export class CodeActionModel extends Disposable {
const actions = createCancelablePromise(async token => {
if (this._settingEnabledNearbyQuickfixes() && trigger.trigger.type === CodeActionTriggerType.Invoke && (trigger.trigger.triggerAction === CodeActionTriggerSource.QuickFix || trigger.trigger.filter?.include?.contains(CodeActionKind.QuickFix))) {
const codeActionSet = await getCodeActions(this._registry, model, trigger.selection, trigger.trigger, Progress.None, token);
this.codeActionsDisposable.value = codeActionSet;
const allCodeActions = [...codeActionSet.allActions];
if (token.isCancellationRequested) {
codeActionSet.dispose();
Expand Down Expand Up @@ -326,6 +327,7 @@ export class CodeActionModel extends Disposable {
// Case for manual triggers - specifically Source Actions and Refactors
if (trigger.trigger.type === CodeActionTriggerType.Invoke) {
const codeActions = await getCodeActions(this._registry, model, trigger.selection, trigger.trigger, Progress.None, token);
this.codeActionsDisposable.value = codeActions;
return codeActions;
}

Expand Down Expand Up @@ -365,7 +367,7 @@ export class CodeActionModel extends Disposable {

public trigger(trigger: CodeActionTrigger) {
this._codeActionOracle.value?.trigger(trigger);
this.codeActionsDisposable.clear();
this.codeActionsDisposable.dispose();
}

private setState(newState: CodeActionsState.State, skipNotify?: boolean) {
Expand Down
Loading