From cbc7c306e07c92a3bad97d38b4a1a6ade84fcde8 Mon Sep 17 00:00:00 2001
From: Johannes Rieken <johannes.rieken@gmail.com>
Date: Tue, 18 Sep 2018 10:28:12 +0200
Subject: [PATCH] skip snippets when cycling through other suggestions

---
 .../contrib/suggest/suggestController.ts      | 63 ++++++++++++-------
 1 file changed, 42 insertions(+), 21 deletions(-)

diff --git a/src/vs/editor/contrib/suggest/suggestController.ts b/src/vs/editor/contrib/suggest/suggestController.ts
index f7795625987..cebd2723cb2 100644
--- a/src/vs/editor/contrib/suggest/suggestController.ts
+++ b/src/vs/editor/contrib/suggest/suggestController.ts
@@ -96,28 +96,48 @@ class SuggestAlternatives {
 	}
 
 	reset(): void {
-		this._ckOtherSuggestions.set(false);
+		this._ckOtherSuggestions.reset();
 		dispose(this._listener);
 		this._model = undefined;
 		this._ignore = false;
 	}
 
-	set(event: ISelectedSuggestion): void {
-		// todo@joh filter snippets and so
-		if (event.model.items.length > 1) {
-			this._model = event.model;
-			this._index = event.index;
-			this._listener = this._editor.onDidChangeCursorPosition(() => this._onCursorMove());
-			this._ckOtherSuggestions.set(true);
-		} else {
+	set({ model, index }: ISelectedSuggestion): void {
+		// no suggestions -> nothing to do
+		if (model.items.length === 0) {
 			this.reset();
+			return;
 		}
-	}
 
-	private _onCursorMove(): void {
-		if (!this._ignore) {
+		// no alternative suggestions -> nothing to do
+		let nextIndex = SuggestAlternatives._moveIndex(true, model, index);
+		if (nextIndex === index) {
 			this.reset();
+			return;
 		}
+
+		this._model = model;
+		this._index = index;
+		this._listener = this._editor.onDidChangeCursorPosition(() => {
+			if (!this._ignore) {
+				this.reset();
+			}
+		});
+		this._ckOtherSuggestions.set(true);
+	}
+
+	private static _moveIndex(fwd: boolean, model: CompletionModel, index: number): number {
+		let newIndex = index;
+		while (true) {
+			newIndex = (newIndex + model.items.length + (fwd ? +1 : -1)) % model.items.length;
+			if (newIndex === index) {
+				break;
+			}
+			if (!model.items[newIndex].suggestion.insertTextIsSnippet) {
+				break;
+			}
+		}
+		return newIndex;
 	}
 
 	next(): void {
@@ -129,17 +149,18 @@ class SuggestAlternatives {
 	}
 
 	private _move(fwd: boolean): void {
-		if (this._model) {
-			try {
-				this._ignore = true;
-				this._index = (this._index + this._model.items.length + (fwd ? 1 : -1)) % this._model.items.length;
-				this._accept({ index: this._index, item: this._model.items[this._index], model: this._model });
-			} finally {
-				this._ignore = false;
-			}
+		if (!this._model) {
+			// nothing to reason about
+			return;
+		}
+		try {
+			this._ignore = true;
+			this._index = SuggestAlternatives._moveIndex(fwd, this._model, this._index);
+			this._accept({ index: this._index, item: this._model.items[this._index], model: this._model });
+		} finally {
+			this._ignore = false;
 		}
 	}
-
 }
 
 export class SuggestController implements IEditorContribution {
-- 
GitLab