Update LKG

microsoft · Sep 22, 2017 · 94b4f8b · 94b4f8b
1 parent aa40be6
commit 94b4f8b
Show file tree

Hide file tree

Showing 6 changed files with 450 additions and 240 deletions.
diff --git a/lib/tsc.js b/lib/tsc.js
@@ -2199,6 +2199,8 @@ var ts;
         return sourceFile.checkJsDirective ? sourceFile.checkJsDirective.enabled : compilerOptions.checkJs;
     }
     ts.isCheckJsEnabledForFile = isCheckJsEnabledForFile;
+    function assertTypeIsNever(_) { }
+    ts.assertTypeIsNever = assertTypeIsNever;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -18064,17 +18066,20 @@ var ts;
         return ts.combinePaths(directory, "package.json");
     }
     function loadModuleFromNodeModulesFolder(extensions, moduleName, nodeModulesFolder, nodeModulesFolderExists, failedLookupLocations, state) {
-        var _a = getNameOfTopDirectory(moduleName), top = _a.top, rest = _a.rest;
-        var packageRootPath = ts.combinePaths(nodeModulesFolder, top);
+        var _a = getPackageName(moduleName), packageName = _a.packageName, rest = _a.rest;
+        var packageRootPath = ts.combinePaths(nodeModulesFolder, packageName);
         var _b = getPackageJsonInfo(packageRootPath, rest, failedLookupLocations, !nodeModulesFolderExists, state), packageJsonContent = _b.packageJsonContent, packageId = _b.packageId;
         var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
         var pathAndExtension = loadModuleFromFile(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state) ||
             loadNodeModuleFromDirectoryWorker(extensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state, packageJsonContent);
         return withPackageId(packageId, pathAndExtension);
     }
-    function getNameOfTopDirectory(name) {
-        var idx = name.indexOf(ts.directorySeparator);
-        return idx === -1 ? { top: name, rest: "" } : { top: name.slice(0, idx), rest: name.slice(idx + 1) };
+    function getPackageName(moduleName) {
+        var idx = moduleName.indexOf(ts.directorySeparator);
+        if (moduleName[0] === "@") {
+            idx = moduleName.indexOf(ts.directorySeparator, idx + 1);
+        }
+        return idx === -1 ? { packageName: moduleName, rest: "" } : { packageName: moduleName.slice(0, idx), rest: moduleName.slice(idx + 1) };
     }
     function loadModuleFromNodeModules(extensions, moduleName, directory, failedLookupLocations, state, cache) {
         return loadModuleFromNodeModulesWorker(extensions, moduleName, directory, failedLookupLocations, state, false, cache);