diff --git a/src/vs/editor/contrib/suggest/suggestController.ts b/src/vs/editor/contrib/suggest/suggestController.ts index 5da4aa2c844..d267a41ca4e 100644 --- a/src/vs/editor/contrib/suggest/suggestController.ts +++ b/src/vs/editor/contrib/suggest/suggestController.ts @@ -64,10 +64,10 @@ export class SuggestController implements IEditorContribution { const widget = this._instantiationService.createInstance(SuggestWidget, this._editor); this._toDispose.push(widget); - this._toDispose.push(widget.onDidSelect(item => this._onDidSelectItem(item, false, true), this)); + this._toDispose.push(widget.onDidSelect(item => this._insertSuggestion(item, false, true), this)); // Wire up logic to accept a suggestion on certain characters - const commitCharacterController = new CommitCharacterController(this._editor, widget, item => this._onDidSelectItem(item, false, true)); + const commitCharacterController = new CommitCharacterController(this._editor, widget, item => this._insertSuggestion(item, false, true)); this._toDispose.push( commitCharacterController, this._model.onDidSuggest(e => { @@ -161,7 +161,7 @@ export class SuggestController implements IEditorContribution { } } - protected _onDidSelectItem(event: ISelectedSuggestion | undefined, keepAlternativeSuggestions: boolean, undoStops: boolean): void { + protected _insertSuggestion(event: ISelectedSuggestion | undefined, keepAlternativeSuggestions: boolean, undoStops: boolean): void { if (!event || !event.item) { this._alternatives.getValue().reset(); this._model.cancel(); @@ -233,7 +233,7 @@ export class SuggestController implements IEditorContribution { if (modelVersionNow !== model.getAlternativeVersionId()) { model.undo(); } - this._onDidSelectItem(next, false, false); + this._insertSuggestion(next, false, false); break; } }); @@ -315,7 +315,7 @@ export class SuggestController implements IEditorContribution { return; } this._editor.pushUndoStop(); - this._onDidSelectItem({ index, item, model: completionModel }, true, false); + this._insertSuggestion({ index, item, model: completionModel }, true, false); }, undefined, listener); }); @@ -327,7 +327,7 @@ export class SuggestController implements IEditorContribution { acceptSelectedSuggestion(keepAlternativeSuggestions?: boolean): void { const item = this._widget.getValue().getFocusedItem(); - this._onDidSelectItem(item, !!keepAlternativeSuggestions, true); + this._insertSuggestion(item, !!keepAlternativeSuggestions, true); } acceptNextSuggestion() { diff --git a/src/vs/editor/contrib/suggest/test/suggestModel.test.ts b/src/vs/editor/contrib/suggest/test/suggestModel.test.ts index db6af2b0fbf..8be498a8cc8 100644 --- a/src/vs/editor/contrib/suggest/test/suggestModel.test.ts +++ b/src/vs/editor/contrib/suggest/test/suggestModel.test.ts @@ -671,8 +671,8 @@ suite('SuggestModel - TriggerAndCancelOracle', function () { return withOracle(async (sugget, editor) => { class TestCtrl extends SuggestController { - _onDidSelectItem(item: ISelectedSuggestion) { - super._onDidSelectItem(item, false, true); + _insertSuggestion(item: ISelectedSuggestion) { + super._insertSuggestion(item, false, true); } } const ctrl = editor.registerAndInstantiateContribution(TestCtrl); @@ -687,7 +687,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () { const [first] = event.completionModel.items; assert.equal(first.completion.label, 'bar'); - ctrl._onDidSelectItem({ item: first, index: 0, model: event.completionModel }); + ctrl._insertSuggestion({ item: first, index: 0, model: event.completionModel }); }); assert.equal(