microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-15 12:51:30 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge branch 'master' into services_modules_2

Browse Source
This commit is contained in:
Andy Hanson
2016-09-07 11:36:16 -07:00
parent 4d6bd9df72 c16ae3e215
commit 2d64a2300f
4 changed files with 63 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/services/completions.ts
View File

@@ -578,8 +578,8 @@ namespace ts.Completions {
if (host.getDirectories) {
// Also get all @types typings installed in visible node_modules directories
for (const package of findPackageJsons(scriptPath)) {
const typesDir = combinePaths(getDirectoryPath(package), "node_modules/@types");
for (const packageJson of findPackageJsons(scriptPath)) {
const typesDir = combinePaths(getDirectoryPath(packageJson), "node_modules/@types");
getCompletionEntriesFromDirectories(host, options, typesDir, span, result);
}
}
@@ -625,8 +625,8 @@ namespace ts.Completions {
if (host.readFile && host.fileExists) {
for (const packageJson of findPackageJsons(scriptPath)) {
const package = tryReadingPackageJson(packageJson);
if (!package) {
const contents = tryReadingPackageJson(packageJson);
if (!contents) {
return;
}
@@ -635,7 +635,7 @@ namespace ts.Completions {
// Provide completions for all non @types dependencies
for (const key of nodeModulesDependencyKeys) {
addPotentialPackageNames(package[key], foundModuleNames);
addPotentialPackageNames(contents[key], foundModuleNames);
}
for (const moduleName of foundModuleNames) {