From 7f8b6a8c93fd381806e62b90689fe775bd367089 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Wed, 26 Jul 2017 15:19:31 +0200
Subject: [PATCH] fix an issue with snippet choice

---
 .../editor/contrib/snippet/browser/snippetController2.ts  | 3 ++-
 src/vs/editor/contrib/suggest/browser/suggest.ts          | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/vs/editor/contrib/snippet/browser/snippetController2.ts b/src/vs/editor/contrib/snippet/browser/snippetController2.ts
index cefee232af5..ba17541a096 100644
--- a/src/vs/editor/contrib/snippet/browser/snippetController2.ts
+++ b/src/vs/editor/contrib/snippet/browser/snippetController2.ts
@@ -83,11 +83,12 @@ export class SnippetController2 {
 			this._editor.getModel().pushStackElement();
 		}
 
+		this._updateState();
+
 		this._snippetListener = [
 			this._editor.onDidChangeModel(() => this.cancel()),
 			this._editor.onDidChangeCursorSelection(() => this._updateState())
 		];
-		this._updateState();
 	}
 
 	private _updateState(): void {
diff --git a/src/vs/editor/contrib/suggest/browser/suggest.ts b/src/vs/editor/contrib/suggest/browser/suggest.ts
index 66fc97174f0..3831064a10c 100644
--- a/src/vs/editor/contrib/suggest/browser/suggest.ts
+++ b/src/vs/editor/contrib/suggest/browser/suggest.ts
@@ -236,8 +236,10 @@ SuggestRegistry.register('*', _provider);
  * @param suggestions
  */
 export function showSimpleSuggestions(editor: ICommonCodeEditor, suggestions: ISuggestion[]) {
-	_suggestions = suggestions;
-	editor.getContribution<SuggestController>('editor.contrib.suggestController').triggerSuggest([_provider]);
-	_suggestions = undefined;
+	setTimeout(() => {
+		_suggestions = suggestions;
+		editor.getContribution<SuggestController>('editor.contrib.suggestController').triggerSuggest([_provider]);
+		_suggestions = undefined;
+	}, 0);
 }
 
-- 
GitLab