Skip to content

Allow an import of "foo.js" to be matched by a file "foo.ts" #8895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
8 commits merged into from
Jun 9, 2016
+262 −30
Merged

Allow an import of "foo.js" to be matched by a file "foo.ts" #8895

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fa16a99
Allow an import of "foo.js" to be matched by a file "foo.ts"
May 31, 2016
a0546a9
Improve loadModuleFromFile code
May 31, 2016
f4d6b67
Respond to PR comments
May 31, 2016
d4b8889
Respond to more PR comments
May 31, 2016
9179f4c
Fix test
Jun 1, 2016
9575b3c
Revert to old tryLoad implementation
Jun 1, 2016
a918730
factor out isJsxOrTsxExtension
Jun 6, 2016
704f987
Move to a conformance test
Jun 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
factor out isJsxOrTsxExtension
  • Loading branch information
Andy Hanson committed Jun 6, 2016
commit a918730df0919357fbe8accd88a873991ef11fa6
4 changes: 4 additions & 0 deletions src/compiler/core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,6 +861,10 @@ namespace ts {
return fileExtensionIs(path, extension) ? path.substring(0, path.length - extension.length) : undefined;
}

export function isJsxOrTsxExtension(ext: string): boolean {
return ext === ".jsx" || ext === ".tsx";
}

export interface ObjectAllocator {
getNodeConstructor(): new (kind: SyntaxKind, pos?: number, end?: number) => Node;
getSourceFileConstructor(): new (kind: SyntaxKind, pos?: number, end?: number) => SourceFile;
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/program.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ namespace ts {
return forEach(extensions, tryLoad);
Copy link
Contributor

@mhegazy mhegazy May 31, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

consider this pattern, split the function into a loadModuleFromFile and loadModuleFromFileWorker. the worker is never called directly except from loaModulefronFile. and loadModuleFromFile becomes:

    function loadModuleFromFile(candidate: string, extensions: string[], failedLookupLocation: string[], onlyRecordFailures: boolean, state: ModuleResolutionState): string {
        return loadModuleFromFileWorker(candidate, extensions, failedLookupLocation, onlyRecordFailures, state) ||
            hasJavaScriptFileExtension(candidate) ? loadModuleFromFileWorker(removeFileExtension(candidate), extensionsm failedLookupLocation, onlyRecordFailures, state) : undefined;
    }

you would want to make it more explicit off course and add some tracing.

Copy link
Author

@ghost ghost May 31, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could it be function worker(candidate) in a closure or would that be bad for perf?

Copy link
Contributor

@mhegazy mhegazy May 31, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i do not know :). @vladima thoughts?


function tryLoad(ext: string): string {
if (state.skipTsx && (ext === ".jsx" || ext === ".tsx")) {
if (state.skipTsx && isJsxOrTsxExtension(ext)) {
return undefined;
}
const fileName = fileExtensionIs(candidate, ext) ? candidate : candidate + ext;
Expand Down