diff --git a/src/providers/completion.ts b/src/providers/completion.ts index 8807dce9..91e6f412 100644 --- a/src/providers/completion.ts +++ b/src/providers/completion.ts @@ -8,7 +8,7 @@ import StorageService from '../services/storage'; import { parseDocument } from '../services/parser'; import { getSymbolsRelatedToDocument } from '../utils/symbols'; -import { getCurrentDocumentImportPaths, getDocumentPath } from '../utils/document'; +import { getDocumentPath } from '../utils/document'; import { getCurrentWord, getLimitedString, getTextBeforePosition } from '../utils/string'; import { getVariableColor } from '../utils/color'; @@ -242,7 +242,7 @@ export function doCompletion( storage.set(documentPath, resource.symbols); const symbolsList = getSymbolsRelatedToDocument(storage, documentPath); - const documentImports = getCurrentDocumentImportPaths(symbolsList, documentPath); + const documentImports = resource.symbols.imports.map(x => x.filepath); const context = createCompletionContext(document, offset, settings); // Drop suggestions inside `//` and `/* */` comments diff --git a/src/providers/hover.ts b/src/providers/hover.ts index 8ad1fb57..b99c3eb6 100644 --- a/src/providers/hover.ts +++ b/src/providers/hover.ts @@ -8,7 +8,7 @@ import StorageService from '../services/storage'; import { parseDocument } from '../services/parser'; import { getSymbolsRelatedToDocument } from '../utils/symbols'; -import { getCurrentDocumentImportPaths, getDocumentPath } from '../utils/document'; +import { getDocumentPath } from '../utils/document'; import { getLimitedString } from '../utils/string'; /** @@ -146,7 +146,7 @@ export function doHover(document: TextDocument, offset: number, storage: Storage storage.set(documentPath, resource.symbols); const symbolsList = getSymbolsRelatedToDocument(storage, documentPath); - const documentImports = getCurrentDocumentImportPaths(symbolsList, documentPath); + const documentImports = resource.symbols.imports.map(x => x.filepath); const symbol = getSymbol(symbolsList, identifier, documentPath); // Content for Hover popup diff --git a/src/test/utils/document.spec.ts b/src/test/utils/document.spec.ts index 516cb89e..7f68a16c 100644 --- a/src/test/utils/document.spec.ts +++ b/src/test/utils/document.spec.ts @@ -2,50 +2,9 @@ import * as assert from 'assert'; -import { ISymbols } from '../../types/symbols'; -import { getCurrentDocumentImportPaths, getDocumentPath } from '../../utils/document'; +import { getDocumentPath } from '../../utils/document'; describe('Utils/Document', () => { - it('getCurrentDocumentImports', () => { - const symbolsList: ISymbols[] = [ - { - document: 'a.scss', - mixins: [], - functions: [], - variables: [], - imports: [ - { - filepath: 'b.scss', - css: false, - dynamic: false - } - ] - }, - { - document: 'b.scss', - mixins: [], - functions: [], - variables: [], - imports: [ - { - filepath: 'a.scss', - css: false, - dynamic: false - }, - { - filepath: 'c.scss', - css: false, - dynamic: false - } - ] - } - ]; - - const imports = getCurrentDocumentImportPaths(symbolsList, 'b.scss'); - - assert.equal(imports.length, 2); - }); - it('getDocumentPath', () => { assert.equal(getDocumentPath('test/file.scss', 'test/includes/a.scss'), 'includes/a.scss'); assert.equal(getDocumentPath('test/includes/a.scss', 'test/file.scss'), '../file.scss'); diff --git a/src/utils/document.ts b/src/utils/document.ts index c9ea122b..cf4c6881 100644 --- a/src/utils/document.ts +++ b/src/utils/document.ts @@ -2,21 +2,6 @@ import * as path from 'path'; -import { ISymbols } from '../types/symbols'; - -/** - * Returns imports for document. - */ -export function getCurrentDocumentImportPaths(symbolsList: ISymbols[], currentPath: string): string[] { - for (let i = 0; i < symbolsList.length; i++) { - if (symbolsList[i].document === currentPath) { - return symbolsList[i].imports.map(x => x.filepath); - } - } - - return []; -} - /** * Returns the path to the document, relative to the current document. */