Test for scoped packages

Author: Andy Hanson

src/compiler/moduleNameResolver.ts

@@ -832,7 +832,7 @@ namespace ts {
      */
     function parseNodeModuleFromPath(path: string): { packageDirectory: string, subModuleName: string } | undefined {
         path = normalizePath(path);
-        const idx = path.indexOf(nodeModulesPathPart);
+        const idx = path.lastIndexOf(nodeModulesPathPart);
         if (idx === -1) {
             return undefined;
         }
@@ -843,12 +843,12 @@ namespace ts {
             indexAfterPackageName = moveToNextDirectorySeparatorIfAvailable(path, indexAfterPackageName);
         }
         const packageDirectory = path.slice(0, indexAfterPackageName);
-        const subModuleName = removeExtensionAndIndex(path.slice(indexAfterPackageName));
+        const subModuleName = removeExtensionAndIndex(path.slice(indexAfterPackageName + 1));
         return { packageDirectory, subModuleName };
     }
 
     function moveToNextDirectorySeparatorIfAvailable(path: string, prevSeparatorIndex: number): number {
-        const nextSeparatorIndex = path.indexOf(directorySeparator, prevSeparatorIndex);
+        const nextSeparatorIndex = path.indexOf(directorySeparator, prevSeparatorIndex + 1);
         return nextSeparatorIndex === -1 ? prevSeparatorIndex : nextSeparatorIndex;
     }
 

tests/cases/compiler/duplicatePackage_relativeImportWithinPackage_scoped.ts

@@ -0,0 +1,38 @@
+// @noImplicitReferences: true
+// @traceResolution: true
+
+// @Filename: /node_modules/a/node_modules/@foo/bar/package.json
+{
+    "name": "@foo/bar",
+    "version": "1.2.3"
+}
+
+// @Filename: /node_modules/a/node_modules/@foo/bar/index.d.ts
+export class C {
+    private x: number;
+}
+
+// @Filename: /node_modules/a/index.d.ts
+import { C } from "@foo/bar";
+export const o: C;
+
+// @Filename: /node_modules/@foo/bar/use.d.ts
+import { C } from "./index";
+export function use(o: C): void;
+
+// @Filename: /node_modules/@foo/bar/index.d.ts
+export class C {
+    private x: number;
+}
+
+// @Filename: /node_modules/@foo/bar/package.json
+{
+    "name": "@foo/bar",
+    "version": "1.2.3"
+}
+
+// @Filename: /index.ts
+import { use } from "@foo/bar/use";
+import { o } from "a";
+
+use(o);