microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-27 04:46:25 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge pull request #11891 from Microsoft/jsx_resolution_diagnostic

Browse Source 
Fix bug: Return a resolution diagnostic for a `.jsx` import if `--allowJs` is turned off
This commit is contained in:
Andy
2016-10-27 12:05:59 -07:00
committed by GitHub
parent 6f519d8a27 8448e741c9
commit 231b5ac52d
5 changed files with 60 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/compiler/program.ts
View File

@@ -1579,13 +1579,19 @@ namespace ts {
case Extension.Dts:
// These are always allowed.
return undefined;
case Extension.Tsx:
return needJsx();
case Extension.Jsx:
return options.jsx ? undefined : Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set;
return needJsx() || needAllowJs();
case Extension.Js:
return options.allowJs ? undefined : Diagnostics.Module_0_was_resolved_to_1_but_allowJs_is_not_set;
return needAllowJs();
}
function needJsx() {
return options.jsx ? undefined : Diagnostics.Module_0_was_resolved_to_1_but_jsx_is_not_set;
}
function needAllowJs() {
return options.allowJs ? undefined : Diagnostics.Module_0_was_resolved_to_1_but_allowJs_is_not_set;
}
}
}