Merge pull request microsoft#10757 from Microsoft/Fix10755

mhegazy · web-flow · commit c16ae3e21559 · 2016-09-07T11:24:10.000-07:00
Fix microsoft#10755: remove uses of `package` as an identifier name
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -4048,8 +4048,8 @@ namespace ts {
 
                 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);
                     }
                 }
@@ -4095,8 +4095,8 @@ namespace ts {
 
                 if (host.readFile && host.fileExists) {
                     for (const packageJson of findPackageJsons(scriptPath)) {
-                        const package = tryReadingPackageJson(packageJson);
-                        if (!package) {
+                        const contents = tryReadingPackageJson(packageJson);
+                        if (!contents) {
                             return;
                         }
 
@@ -4105,7 +4105,7 @@ namespace ts {
 
                         // 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) {

Original file line number	Diff line number	Diff line change
`@@ -4048,8 +4048,8 @@ namespace ts {`
`4048`	`4048`
`4049`	`4049`	`if (host.getDirectories) {`
`4050`	`4050`	`// Also get all @types typings installed in visible node_modules directories`
`4051`		`- for (const package of findPackageJsons(scriptPath)) {`
`4052`		`- const typesDir = combinePaths(getDirectoryPath(package), "node_modules/@types");`
	`4051`	`+ for (const packageJson of findPackageJsons(scriptPath)) {`
	`4052`	`+ const typesDir = combinePaths(getDirectoryPath(packageJson), "node_modules/@types");`
`4053`	`4053`	`getCompletionEntriesFromDirectories(host, options, typesDir, span, result);`
`4054`	`4054`	`}`
`4055`	`4055`	`}`
`@@ -4095,8 +4095,8 @@ namespace ts {`
`4095`	`4095`
`4096`	`4096`	`if (host.readFile && host.fileExists) {`
`4097`	`4097`	`for (const packageJson of findPackageJsons(scriptPath)) {`
`4098`		`- const package = tryReadingPackageJson(packageJson);`
`4099`		`- if (!package) {`
	`4098`	`+ const contents = tryReadingPackageJson(packageJson);`
	`4099`	`+ if (!contents) {`
`4100`	`4100`	`return;`
`4101`	`4101`	`}`
`4102`	`4102`
`@@ -4105,7 +4105,7 @@ namespace ts {`
`4105`	`4105`
`4106`	`4106`	`// Provide completions for all non @types dependencies`
`4107`	`4107`	`for (const key of nodeModulesDependencyKeys) {`
`4108`		`- addPotentialPackageNames(package[key], foundModuleNames);`
	`4108`	`+ addPotentialPackageNames(contents[key], foundModuleNames);`
`4109`	`4109`	`}`
`4110`	`4110`
`4111`	`4111`	`for (const moduleName of foundModuleNames) {`