fix(providers): return back local symbols suggestion for Hover & Sign…

…atureHelp
mrmlnc · Dec 1, 2019 · c8049a5 · c8049a5
1 parent 6bdd703
commit c8049a5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/providers/hover.ts b/src/providers/hover.ts
@@ -7,7 +7,7 @@ import { ISymbols, IVariable, IMixin, IFunction } from '../types/symbols';
 import StorageService from '../services/storage';
 
 import { parseDocument } from '../services/parser';
-import { getSymbolsRelatedToDocument } from '../utils/symbols';
+import { getSymbolsCollection } from '../utils/symbols';
 import { getDocumentPath } from '../utils/document';
 import { getLimitedString } from '../utils/string';
 
@@ -145,7 +145,7 @@ export function doHover(document: TextDocument, offset: number, storage: Storage
 
 	storage.set(documentPath, resource.symbols);
 
-	const symbolsList = getSymbolsRelatedToDocument(storage, documentPath);
+	const symbolsList = getSymbolsCollection(storage);
 	const documentImports = resource.symbols.imports.map(x => x.filepath);
 	const symbol = getSymbol(symbolsList, identifier, documentPath);
 

diff --git a/src/providers/signatureHelp.ts b/src/providers/signatureHelp.ts
@@ -7,7 +7,7 @@ import { IVariable } from '../types/symbols';
 import StorageService from '../services/storage';
 
 import { parseDocument } from '../services/parser';
-import { getSymbolsRelatedToDocument } from '../utils/symbols';
+import { getSymbolsCollection } from '../utils/symbols';
 import { getTextBeforePosition } from '../utils/string';
 import { hasInFacts } from '../utils/facts';
 
@@ -171,7 +171,7 @@ export function doSignatureHelp(document: TextDocument, offset: number, storage:
 
 	storage.set(documentPath, resource.symbols);
 
-	getSymbolsRelatedToDocument(storage, documentPath).forEach(symbols => {
+	getSymbolsCollection(storage).forEach(symbols => {
 		symbols[symbolType].forEach(symbol => {
 			if (entry.name === symbol.name && symbol.parameters.length >= entry.parameters) {
 				suggestions.push({

diff --git a/src/test/providers/hover.spec.ts b/src/test/providers/hover.spec.ts
@@ -35,13 +35,16 @@ function getHover(lines: string[]): Hover | null {
 }
 
 describe('Providers/Hover', () => {
-	it('should do not suggest local symbols', () => {
+	it('should suggest local symbols', () => {
 		const actual = getHover([
 			'$one: 1;',
 			'.a { content: $one|; }'
 		]);
 
-		assert.strictEqual(actual.contents, '');
+		assert.deepStrictEqual(actual.contents, {
+			language: 'scss',
+			value: '$one: 1;'
+		});
 	});
 
 	it('should suggest global variables', () => {