From 6f47dea0418628a62ef6e4d782890dd2d4dd3fb6 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Tue, 21 May 2019 15:05:50 +0200 Subject: [PATCH] :lipstick: suggest widget is always defined, no checks needed --- .../contrib/suggest/suggestController.ts | 44 +++++-------------- 1 file changed, 12 insertions(+), 32 deletions(-) diff --git a/src/vs/editor/contrib/suggest/suggestController.ts b/src/vs/editor/contrib/suggest/suggestController.ts index 5163ebaafa9..5da4aa2c844 100644 --- a/src/vs/editor/contrib/suggest/suggestController.ts +++ b/src/vs/editor/contrib/suggest/suggestController.ts @@ -326,10 +326,8 @@ export class SuggestController implements IEditorContribution { } acceptSelectedSuggestion(keepAlternativeSuggestions?: boolean): void { - if (this._widget) { - const item = this._widget.getValue().getFocusedItem(); - this._onDidSelectItem(item, !!keepAlternativeSuggestions, true); - } + const item = this._widget.getValue().getFocusedItem(); + this._onDidSelectItem(item, !!keepAlternativeSuggestions, true); } acceptNextSuggestion() { @@ -341,58 +339,40 @@ export class SuggestController implements IEditorContribution { } cancelSuggestWidget(): void { - if (this._widget) { - this._model.cancel(); - this._widget.getValue().hideWidget(); - } + this._model.cancel(); + this._widget.getValue().hideWidget(); } selectNextSuggestion(): void { - if (this._widget) { - this._widget.getValue().selectNext(); - } + this._widget.getValue().selectNext(); } selectNextPageSuggestion(): void { - if (this._widget) { - this._widget.getValue().selectNextPage(); - } + this._widget.getValue().selectNextPage(); } selectLastSuggestion(): void { - if (this._widget) { - this._widget.getValue().selectLast(); - } + this._widget.getValue().selectLast(); } selectPrevSuggestion(): void { - if (this._widget) { - this._widget.getValue().selectPrevious(); - } + this._widget.getValue().selectPrevious(); } selectPrevPageSuggestion(): void { - if (this._widget) { - this._widget.getValue().selectPreviousPage(); - } + this._widget.getValue().selectPreviousPage(); } selectFirstSuggestion(): void { - if (this._widget) { - this._widget.getValue().selectFirst(); - } + this._widget.getValue().selectFirst(); } toggleSuggestionDetails(): void { - if (this._widget) { - this._widget.getValue().toggleDetails(); - } + this._widget.getValue().toggleDetails(); } toggleSuggestionFocus(): void { - if (this._widget) { - this._widget.getValue().toggleDetailsFocus(); - } + this._widget.getValue().toggleDetailsFocus(); } }