From e39c3f9be82355cb39c1d0aa89d6752f14afd5c5 Mon Sep 17 00:00:00 2001
From: Martin Aeschlimann <martinae@microsoft.com>
Date: Thu, 3 Dec 2015 13:31:39 +0100
Subject: [PATCH] [scss] IntelliSense Suggestions After Semicolon #250

---
 src/vs/languages/css/common/services/intelliSense.ts  | 5 ++++-
 src/vs/languages/sass/common/services/intelliSense.ts | 4 ++--
 src/vs/languages/sass/test/common/sass-worker.test.ts | 5 +++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/vs/languages/css/common/services/intelliSense.ts b/src/vs/languages/css/common/services/intelliSense.ts
index ff4804684c1..7da62099097 100644
--- a/src/vs/languages/css/common/services/intelliSense.ts
+++ b/src/vs/languages/css/common/services/intelliSense.ts
@@ -105,7 +105,10 @@ export class CSSIntellisense {
 	}
 
 	public getCompletionsForDeclarationProperty(result:Modes.ISuggestion[]):Modes.ISuggestion[] {
+		return this.getPropertyProposals(result);
+	}
 
+	private getPropertyProposals(result:Modes.ISuggestion[]):Modes.ISuggestion[] {
 		var properties = languageFacts.getProperties();
 
 		for (var key in properties) {
@@ -341,7 +344,7 @@ export class CSSIntellisense {
 		if (ruleSet && ruleSet.isNested()) {
 			var selector = ruleSet.getSelectors().findFirstChildBeforeOffset(this.offset);
 			if (selector && ruleSet.getSelectors().getChildren().indexOf(selector) === 0) {
-				this.getCompletionsForDeclarationProperty(result);
+				this.getPropertyProposals(result);
 			}
 		}
 		return result;
diff --git a/src/vs/languages/sass/common/services/intelliSense.ts b/src/vs/languages/sass/common/services/intelliSense.ts
index f0e4bb82118..77d7929a549 100644
--- a/src/vs/languages/sass/common/services/intelliSense.ts
+++ b/src/vs/languages/sass/common/services/intelliSense.ts
@@ -148,9 +148,9 @@ export class SASSIntellisense extends cssIntellisense.CSSIntellisense {
 		return super.getColorProposals(entry, result);
 	}
 
-	public getCompletionsForDeclarations(declarations: nodes.Declarations, result: Modes.ISuggestion[]): Modes.ISuggestion[]{
+	public getCompletionsForDeclarationProperty(result: Modes.ISuggestion[]): Modes.ISuggestion[]{
 		this.getCompletionsForSelector(null, result);
-		return super.getCompletionsForDeclarations(declarations, result);
+		return super.getCompletionsForDeclarationProperty(result);
 	}
 
 }
diff --git a/src/vs/languages/sass/test/common/sass-worker.test.ts b/src/vs/languages/sass/test/common/sass-worker.test.ts
index 97160296272..59c0a7e3367 100644
--- a/src/vs/languages/sass/test/common/sass-worker.test.ts
+++ b/src/vs/languages/sass/test/common/sass-worker.test.ts
@@ -112,6 +112,11 @@ suite('SASS - Worker', () => {
 			testSuggestionsFor('.foo { .', '{ .').then((completion) => {
 				assert.equal(completion.currentWord, '');
 				assertSuggestion(completion, '.foo');
+			}),
+			// issue #250 
+			testSuggestionsFor('.foo { display: block;', 'block;').then((completion) => {
+				assert.equal(completion.currentWord, '');
+				assert.equal(0, completion.suggestions.length);
 			})
 		]).done(() => testDone(), (errors:any[]) => {
 			testDone(errors.reduce((e1, e2) => e1 || e2));
-- 
GitLab