microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-15 11:35:42 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

De-dup typing module completions

Browse Source
This commit is contained in:
Andrew Casey 2018-01-09 16:54:58 -08:00
parent db09a593d3
commit e48312df54
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/services/pathCompletions.ts
View File

@ -312,10 +312,11 @@ namespace ts.Completions.PathCompletions {
function getCompletionEntriesFromTypings(host: LanguageServiceHost, options: CompilerOptions, scriptPath: string, span: TextSpan, result: CompletionEntry[] = []): CompletionEntry[] {
// Check for typings specified in compiler options
let seen = createMap<true>();
if (options.types) {
for (const typesName of options.types) {
const moduleName = getPackageNameFromAtTypesDirectoryWithoutPrefix(typesName);
result.push(createCompletionEntryForModule(moduleName, ScriptElementKind.externalModuleName, span));
pushResult(moduleName);
}
}
else if (host.getDirectories) {
@ -349,11 +350,18 @@ namespace ts.Completions.PathCompletions {
typeDirectory = normalizePath(typeDirectory);
const directoryName = getBaseFileName(typeDirectory);
const moduleName = getPackageNameFromAtTypesDirectoryWithoutPrefix(directoryName);
result.push(createCompletionEntryForModule(moduleName, ScriptElementKind.externalModuleName, span));
pushResult(moduleName);
}
}
}
}
function pushResult(moduleName: string) {
if (!seen.has(moduleName)) {
result.push(createCompletionEntryForModule(moduleName, ScriptElementKind.externalModuleName, span));
seen.set(moduleName, true);
}
}
}
function findPackageJsons(directory: string, host: LanguageServiceHost): string[] {