Add trailing directory separators

Author: andrewbranch

src/compiler/moduleSpecifiers.ts

@@ -290,7 +290,7 @@ namespace ts.moduleSpecifiers {
 
         const symlinkedDirectories = links.getSymlinkedDirectoriesByRealpath();
         const result = symlinkedDirectories && forEachAncestorDirectory(getDirectoryPath(importedPath), realPathDirectory => {
-            const symlinkDirectories = symlinkedDirectories.get(realPathDirectory);
+            const symlinkDirectories = symlinkedDirectories.get(ensureTrailingDirectorySeparator(realPathDirectory));
             if (!symlinkDirectories) return undefined; // Continue to ancestor directory
 
             // Don't want to a package to globally import from itself (importNameCodeFix_symlink_own_package.ts)

src/compiler/utilities.ts

@@ -6091,9 +6091,9 @@ namespace ts {
     }
 
     export interface SymlinkCache {
-        /** Gets a map from symlink to realpath */
+        /** Gets a map from symlink to realpath. Keys have trailing directory separators. */
         getSymlinkedDirectories(): ReadonlyESMap<Path, SymlinkedDirectory | false> | undefined;
-        /** Gets a map from realpath to symlinks */
+        /** Gets a map from realpath to symlinks. Keys have trailing directory separators. */
         getSymlinkedDirectoriesByRealpath(): MultiMap<Path, Path> | undefined;
         /** Gets a map from symlink to realpath */
         getSymlinkedFiles(): ReadonlyESMap<Path, string> | undefined;
@@ -6115,8 +6115,9 @@ namespace ts {
                 // where both the realpath and the symlink path are inside node_modules/.pnpm. Since
                 // this path is never a candidate for a module specifier, we can ignore it entirely.
                 if (!pathContainsPnpmDirectory(symlinkPath)) {
+                    symlinkPath = ensureTrailingDirectorySeparator(symlinkPath);
                     if (directory !== false && !symlinkedDirectories?.has(symlinkPath)) {
-                        (symlinkedDirectoriesByRealpath ||= createMultiMap()).add(directory.realPath, symlinkPath)
+                        (symlinkedDirectoriesByRealpath ||= createMultiMap()).add(ensureTrailingDirectorySeparator(directory.realPath), symlinkPath);
                     }
                     (symlinkedDirectories || (symlinkedDirectories = new Map())).set(symlinkPath, directory);
                 }
@@ -6133,7 +6134,7 @@ namespace ts {
             const [commonResolved, commonOriginal] = guessDirectorySymlink(resolvedPath, originalPath, cwd, getCanonicalFileName) || emptyArray;
             if (commonResolved && commonOriginal) {
                 cache.setSymlinkedDirectory(
-                    toPath(commonOriginal, cwd, getCanonicalFileName),
+                    ensureTrailingDirectorySeparator(toPath(commonOriginal, cwd, getCanonicalFileName)),
                     { real: commonResolved, realPath: toPath(commonResolved, cwd, getCanonicalFileName) });
             }
         }