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

Don’t offer non-relative non-paths path when baseUrl is undefined (#40813)

Browse Source
This commit is contained in:
Andrew Branch 2020-09-28 12:06:39 -07:00 committed by GitHub
parent 343a0a04d7
commit 3e824f18a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/compiler/moduleSpecifiers.ts
View File

@ -174,7 +174,10 @@ namespace ts.moduleSpecifiers {
const bundledPkgReference = bundledPackageName ? combinePaths(bundledPackageName, relativeToBaseUrl) : relativeToBaseUrl;
const importRelativeToBaseUrl = removeExtensionAndIndexPostFix(bundledPkgReference, ending, compilerOptions);
const fromPaths = paths && tryGetModuleNameFromPaths(removeFileExtension(bundledPkgReference), importRelativeToBaseUrl, paths);
const nonRelative = fromPaths === undefined ? importRelativeToBaseUrl : fromPaths;
const nonRelative = fromPaths === undefined && baseUrl !== undefined ? importRelativeToBaseUrl : fromPaths;
if (!nonRelative) {
return relativePath;
}
if (relativePreference === RelativePreference.NonRelative) {
return nonRelative;

2
tests/cases/fourslash/importNameCodeFix_pathsWithoutBaseUrl.ts → tests/cases/fourslash/importNameCodeFix_pathsWithoutBaseUrl1.ts
View File

@ -5,7 +5,7 @@
//// "compilerOptions": {
//// "module": "commonjs",
//// "paths": {
//// "@app/*": ["lib/*"]
//// "@app/*": ["./lib/*"]
//// }
//// }
//// }

21
tests/cases/fourslash/importNameCodeFix_pathsWithoutBaseUrl2.ts Normal file
View File

@ -0,0 +1,21 @@
/// <reference path="fourslash.ts" />
// @Filename: /packages/test-package-1/tsconfig.json
//// {
//// "compilerOptions": {
//// "module": "commonjs",
//// "paths": {
//// "test-package-2/*": ["../test-package-2/src/*"]
//// }
//// }
//// }
// @Filename: /packages/test-package-1/src/common/logging.ts
//// export class Logger {};
// @Filename: /packages/test-package-1/src/something/index.ts
//// Logger/**/
goTo.marker("");
verify.importFixAtPosition([`import { Logger } from "../common/logging";\n\nLogger`]);