Update LKG

microsoft · Feb 1, 2017 · 3b54f29 · 3b54f29
1 parent 870e44f
commit 3b54f29
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lib/typingsInstaller.js b/lib/typingsInstaller.js
@@ -7044,8 +7044,7 @@ var ts;
                         this.log.writeLine("Installing typings " + JSON.stringify(typingsToInstall));
                     }
                     var filteredTypings = this.filterTypings(typingsToInstall);
-                    var scopedTypings = filteredTypings.map(function (x) { return "@types/" + x; });
-                    if (scopedTypings.length === 0) {
+                    if (filteredTypings.length === 0) {
                         if (this.log.isEnabled()) {
                             this.log.writeLine("All typings are known to be missing or invalid - no need to go any further");
                         }
@@ -7060,6 +7059,7 @@ var ts;
                         typingsInstallerVersion: ts.version,
                         projectName: req.projectName
                     });
+                    var scopedTypings = filteredTypings.map(typingsName);
                     this.installTypingsAsync(requestId, scopedTypings, cachePath, function (ok) {
                         try {
                             if (!ok) {
@@ -7170,6 +7170,11 @@ var ts;
                 return TypingsInstaller;
             }());
             typingsInstaller.TypingsInstaller = TypingsInstaller;
+            function typingsName(packageName) {
+                return "@types/" + packageName + "@ts" + versionMajorMinor;
+            }
+            typingsInstaller.typingsName = typingsName;
+            var versionMajorMinor = ts.version.split(".").slice(0, 2).join(".");
         })(typingsInstaller = server.typingsInstaller || (server.typingsInstaller = {}));
     })(server = ts.server || (ts.server = {}));
 })(ts || (ts = {}));