development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 13:29:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use MutableDisposable for tracking current code actions

Browse source
This commit is contained in:
Matt Bierner 2019-06-11 17:03:44 -07:00
parent 9c14fecc87
commit 1b95baa48b
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/vs/editor/contrib/codeAction/codeActionCommands.ts
View file

@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
import { Disposable, dispose } from 'vs/base/common/lifecycle';
import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
import { escapeRegExpCharacters } from 'vs/base/common/strings';
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
import { EditorAction, EditorCommand, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
@ -46,7 +46,7 @@ export class QuickFixController extends Disposable implements IEditorContributio
private readonly _model: CodeActionModel;
private readonly _codeActionWidget: CodeActionWidget;
private readonly _lightBulbWidget: LightBulbWidget;
private _currentCodeActions: CodeActionSet | undefined;
private readonly _currentCodeActions = this._register(new MutableDisposable<CodeActionSet>());
constructor(
editor: ICodeEditor,
@ -81,16 +81,11 @@ export class QuickFixController extends Disposable implements IEditorContributio
this._register(this._keybindingService.onDidUpdateKeybindings(this._updateLightBulbTitle, this));
}
dipose() {
super.dispose();
dispose(this._currentCodeActions);
}
private _onDidChangeCodeActionsState(newState: CodeActionsState.State): void {
if (newState.type === CodeActionsState.Type.Triggered) {
newState.actions.then(actions => {
dispose(this._currentCodeActions);
this._currentCodeActions = actions;
this._currentCodeActions.value = actions;
if (!actions.actions.length && newState.trigger.context) {
MessageController.get(this._editor).showMessage(newState.trigger.context.notAvailableMessage, newState.trigger.context.position);
@ -123,8 +118,7 @@ export class QuickFixController extends Disposable implements IEditorContributio
}
}
} else {
dispose(this._currentCodeActions);
this._currentCodeActions = undefined;
this._currentCodeActions.clear();
this._lightBulbWidget.hide();
}
}