Skip to content

Commit 1ff6da0

Browse files
author
Phoebe Szmucer
committed
fix
1 parent 0313da4 commit 1ff6da0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/services/stringCompletions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -650,11 +650,11 @@ function getBaseDirectoriesFromRootDirs(rootDirs: string[], basePath: string, sc
650650
rootDirs = rootDirs.map(rootDirectory => ensureTrailingDirectorySeparator(normalizePath(isRootedDiskPath(rootDirectory) ? rootDirectory : combinePaths(basePath, rootDirectory))));
651651

652652
// Determine the path to the directory containing the script relative to the root directory it is contained within
653-
const relativeDirectory = firstDefined(rootDirs, rootDirectory => containsPath(rootDirectory, scriptDirectory, basePath, ignoreCase) ? scriptDirectory.substr(rootDirectory.length) : undefined)!; // TODO: GH#18217
653+
const relativeDirectory = firstDefined(rootDirs, rootDirectory => containsPath(rootDirectory, scriptDirectory, basePath, ignoreCase) ? scriptDirectory.substr(rootDirectory.length) : undefined);
654654

655655
// Now find a path for each potential directory that is to be merged with the one containing the script
656656
return deduplicate<string>(
657-
[...rootDirs.map(rootDirectory => combinePaths(rootDirectory, relativeDirectory)), scriptDirectory],
657+
[...rootDirs.map(rootDirectory => combinePaths(rootDirectory, relativeDirectory)), scriptDirectory].map(baseDir => removeTrailingDirectorySeparator(baseDir)),
658658
equateStringsCaseSensitive,
659659
compareStringsCaseSensitive,
660660
);

0 commit comments

Comments
 (0)