Skip to content
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

Simplify getOutputExtension #23889

Closed
wants to merge 2 commits into from
Closed

Simplify getOutputExtension #23889

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06dab5e
Simplify getOutputExtension
May 4, 2018
6281ffd
Use isSourceFileJavaScript
May 4, 2018
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
16 changes: 4 additions & 12 deletions src/compiler/emitter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,10 @@ namespace ts {
// For TypeScript, the only time to emit with a '.jsx' extension, is on JSX input, and JsxEmit.Preserve
/* @internal */
export function getOutputExtension(sourceFile: SourceFile, options: CompilerOptions): Extension {
if (options.jsx === JsxEmit.Preserve) {
if (isSourceFileJavaScript(sourceFile)) {
if (fileExtensionIs(sourceFile.fileName, Extension.Jsx)) {
return Extension.Jsx;
}
}
else if (sourceFile.languageVariant === LanguageVariant.JSX) {
// TypeScript source file preserving JSX syntax
return Extension.Jsx;
}
}
return Extension.Js;
const jsx = options.jsx === JsxEmit.Preserve && (isSourceFileJavaScript(sourceFile)
? fileExtensionIs(sourceFile.fileName, Extension.Jsx)
: sourceFile.languageVariant === LanguageVariant.JSX);
return jsx ? Extension.Jsx : Extension.Js;
}

/*@internal*/
Expand Down