adjust typing directory

vladima · vladima · commit 5424df7be542 · 2016-08-14T23:07:25.000-07:00
diff --git a/src/server/server.ts b/src/server/server.ts
@@ -179,11 +179,11 @@ namespace ts.server {
                     basePath = os.homedir();
                     break;
                 case "darwin":
-                    basePath = combinePaths(os.homedir(), "/Library/Application Support/")
+                    basePath = combinePaths(os.homedir(), "Library/Application Support/")
                     break;
             }
             if (basePath) {
-                this.cachePath = combinePaths(normalizeSlashes(basePath), "/Microsoft/TypeScript");
+                this.cachePath = combinePaths(normalizeSlashes(basePath), "Microsoft/TypeScript");
             }
         }
 
diff --git a/src/server/typingsInstaller/typingsInstaller.ts b/src/server/typingsInstaller/typingsInstaller.ts
@@ -60,7 +60,8 @@ namespace ts.server.typingsInstaller {
             this.runTsd(req.cachePath, typingsToInstall, installedTypings => {
                 // TODO: record new missing package names
                 // TODO: watch project directory
-                installedTypings = installedTypings.map(x => getNormalizedAbsolutePath(x, req.cachePath));
+                const typingDirectory = combinePaths(req.cachePath, "typings");
+                installedTypings = installedTypings.map(x => combinePaths(typingDirectory, x));
                 this.sendResponse(this.createResponse(req, currentlyCachedTypings.concat(installedTypings)));
             });
         }

Original file line number	Diff line number	Diff line change
`@@ -179,11 +179,11 @@ namespace ts.server {`
`179`	`179`	`basePath = os.homedir();`
`180`	`180`	`break;`
`181`	`181`	`case "darwin":`
`182`		`- basePath = combinePaths(os.homedir(), "/Library/Application Support/")`
	`182`	`+ basePath = combinePaths(os.homedir(), "Library/Application Support/")`
`183`	`183`	`break;`
`184`	`184`	`}`
`185`	`185`	`if (basePath) {`
`186`		`- this.cachePath = combinePaths(normalizeSlashes(basePath), "/Microsoft/TypeScript");`
	`186`	`+ this.cachePath = combinePaths(normalizeSlashes(basePath), "Microsoft/TypeScript");`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`