microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-05 08:11:30 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Fix for crash for auto import completions with a rooted rootDirs entry (#47411)

Browse Source 
* Add failing test case.

* Guard against undefined relative path.
This commit is contained in:
Daniel Rosenwasser 2022-01-12 13:45:06 -08:00 committed by GitHub
parent 14f33d5c4b
commit 461fb65623
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/moduleSpecifiers.ts
View File

@ -854,8 +854,8 @@ namespace ts.moduleSpecifiers {
function getPathRelativeToRootDirs(path: string, rootDirs: readonly string[], getCanonicalFileName: GetCanonicalFileName): string | undefined {
return firstDefined(rootDirs, rootDir => {
const relativePath = getRelativePathIfInDirectory(path, rootDir, getCanonicalFileName)!; // TODO: GH#18217
return isPathRelativeToParent(relativePath) ? undefined : relativePath;
const relativePath = getRelativePathIfInDirectory(path, rootDir, getCanonicalFileName);
return relativePath !== undefined && isPathRelativeToParent(relativePath) ? undefined : relativePath;
});
}

24
tests/cases/fourslash/autoImportsWithRootDirsAndRootedPath01.ts Normal file
View File

@ -0,0 +1,24 @@
/// <reference path="./fourslash.ts" />
// @Filename: /dir/foo.ts
//// export function foo() {}
// @Filename: /dir/bar.ts
//// /*$*/
// @Filename: /dir/tsconfig.json
////{
//// "compilerOptions": {
//// "module": "amd",
//// "moduleResolution": "classic",
//// "rootDirs": ["D:/"]
//// }
////}
goTo.marker("$");
verify.completions({
preferences: {
includeCompletionsForModuleExports: true,
allowIncompleteCompletions: true,
}
});