fix microsoft#59044

jrieken · jrieken · commit a981420ed4e4 · 2018-09-24T15:17:48.000+02:00
diff --git a/src/vs/editor/contrib/suggest/suggestWidget.ts b/src/vs/editor/contrib/suggest/suggestWidget.ts
@@ -564,50 +564,50 @@ export class SuggestWidget implements IContentWidget, IVirtualDelegate<ICompleti
 		}
 
 		const item = e.elements[0];
+		const index = e.indexes[0];
 
 		this.firstFocusInCurrentList = !this.focusedItem;
-		if (item === this.focusedItem) {
-			return;
-		}
+		if (item !== this.focusedItem) {
 
-		if (this.currentSuggestionDetails) {
-			this.currentSuggestionDetails.cancel();
-			this.currentSuggestionDetails = null;
-		}
 
-		const index = e.indexes[0];
+			if (this.currentSuggestionDetails) {
+				this.currentSuggestionDetails.cancel();
+				this.currentSuggestionDetails = null;
+			}
 
-		this.suggestionSupportsAutoAccept.set(!item.suggestion.noAutoAccept);
 
-		this.focusedItem = item;
+			this.suggestionSupportsAutoAccept.set(!item.suggestion.noAutoAccept);
 
-		this.list.reveal(index);
+			this.focusedItem = item;
 
-		this.currentSuggestionDetails = createCancelablePromise(token => item.resolve(token));
+			this.list.reveal(index);
 
-		this.currentSuggestionDetails.then(() => {
-			if (this.list.length < index) {
-				return;
-			}
+			this.currentSuggestionDetails = createCancelablePromise(token => item.resolve(token));
 
-			// item can have extra information, so re-render
-			this.ignoreFocusEvents = true;
-			this.list.splice(index, 1, [item]);
-			this.list.setFocus([index]);
-			this.ignoreFocusEvents = false;
+			this.currentSuggestionDetails.then(() => {
+				if (this.list.length < index) {
+					return;
+				}
 
-			if (this.expandDocsSettingFromStorage()) {
-				this.showDetails();
-			} else {
-				removeClass(this.element, 'docs-side');
-			}
+				// item can have extra information, so re-render
+				this.ignoreFocusEvents = true;
+				this.list.splice(index, 1, [item]);
+				this.list.setFocus([index]);
+				this.ignoreFocusEvents = false;
 
-			this._ariaAlert(this._getSuggestionAriaAlertLabel(item));
-		}).catch(onUnexpectedError).then(() => {
-			if (this.focusedItem === item) {
-				this.currentSuggestionDetails = null;
-			}
-		});
+				if (this.expandDocsSettingFromStorage()) {
+					this.showDetails();
+				} else {
+					removeClass(this.element, 'docs-side');
+				}
+
+				this._ariaAlert(this._getSuggestionAriaAlertLabel(item));
+			}).catch(onUnexpectedError).then(() => {
+				if (this.focusedItem === item) {
+					this.currentSuggestionDetails = null;
+				}
+			});
+		}
 
 		// emit an event
 		this.onDidFocusEmitter.fire({ item, index, model: this.completionModel });
