- Command line should use spaces between types instead of comma

jramsay · jramsay · commit 199e533059bc · 2016-08-29T19:01:55.000-07:00
- if entry.typings is empty use entry.typings for default typings to install
diff --git a/src/server/typingsCache.ts b/src/server/typingsCache.ts
@@ -82,7 +82,7 @@ namespace ts.server {
             }
 
             const entry = this.perProjectCache[project.getProjectName()];
-            const result: TypingsArray = entry ? entry.typings : <any>emptyArray;
+            const result: TypingsArray = entry && entry.typings.length > 0 ? entry.typings : toTypingsArray(typingOptions.include);
             if (!entry || typingOptionsChanged(typingOptions, entry.typingOptions) || compilerOptionsChanged(project.getCompilerOptions(), entry.compilerOptions)) {
                 // Note: entry is now poisoned since it does not really contain typings for a given combination of compiler options\typings options.
                 // instead it acts as a placeholder to prevent issuing multiple requests
diff --git a/src/server/typingsInstaller/nodeTypingsInstaller.ts b/src/server/typingsInstaller/nodeTypingsInstaller.ts
@@ -114,7 +114,7 @@ namespace ts.server.typingsInstaller {
         protected runInstall(cachePath: string, typingsToInstall: string[], postInstallAction: (installedTypings: string[]) => void): void {
             const id = this.installRunCount;
             this.installRunCount++;
-            const command = `npm install ${typingsToInstall.map(t => "@types/" + t)} --save-dev`;
+            const command = `npm install ${typingsToInstall.map(t => "@types/" + t).join(" ")} --save-dev`;
             if (this.log.isEnabled()) {
                 this.log.writeLine(`Running npm install @types ${id}, command '${command}'. cache path '${cachePath}'`);
             }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ namespace ts.server {`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`const entry = this.perProjectCache[project.getProjectName()];`
`85`		`- const result: TypingsArray = entry ? entry.typings : <any>emptyArray;`
	`85`	`+ const result: TypingsArray = entry && entry.typings.length > 0 ? entry.typings : toTypingsArray(typingOptions.include);`
`86`	`86`	`if (!entry \|\| typingOptionsChanged(typingOptions, entry.typingOptions) \|\| compilerOptionsChanged(project.getCompilerOptions(), entry.compilerOptions)) {`
`87`	`87`	`// Note: entry is now poisoned since it does not really contain typings for a given combination of compiler options\typings options.`
`88`	`88`	`// instead it acts as a placeholder to prevent issuing multiple requests`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ namespace ts.server.typingsInstaller {`
`114`	`114`	`protected runInstall(cachePath: string, typingsToInstall: string[], postInstallAction: (installedTypings: string[]) => void): void {`
`115`	`115`	`const id = this.installRunCount;`
`116`	`116`	`this.installRunCount++;`
`117`		- const command = `npm install ${typingsToInstall.map(t => "@types/" + t)} --save-dev`;
	`117`	+ const command = `npm install ${typingsToInstall.map(t => "@types/" + t).join(" ")} --save-dev`;
`118`	`118`	`if (this.log.isEnabled()) {`
`119`	`119`	this.log.writeLine(`Running npm install @types ${id}, command '${command}'. cache path '${cachePath}'`);
`120`	`120`	`}`