From 7a940314753e96aefb1f00fe61440d06296f3899 Mon Sep 17 00:00:00 2001 From: Ryan Cavanaugh Date: Fri, 6 Nov 2015 14:11:15 -0800 Subject: [PATCH] Rename `isTsx` for clarity --- src/compiler/parser.ts | 4 ++-- src/compiler/utilities.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index b477724475f..f81d4d5f86b 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -554,7 +554,7 @@ namespace ts { scanner.setText(sourceText); scanner.setOnError(scanError); scanner.setScriptTarget(languageVersion); - scanner.setLanguageVariant(isTsx(fileName) ? LanguageVariant.JSX : LanguageVariant.Standard); + scanner.setLanguageVariant(allowsJsxExpressions(fileName) ? LanguageVariant.JSX : LanguageVariant.Standard); } function clearState() { @@ -671,7 +671,7 @@ namespace ts { sourceFile.languageVersion = languageVersion; sourceFile.fileName = normalizePath(fileName); sourceFile.flags = fileExtensionIs(sourceFile.fileName, ".d.ts") ? NodeFlags.DeclarationFile : 0; - sourceFile.languageVariant = isTsx(sourceFile.fileName) ? LanguageVariant.JSX : LanguageVariant.Standard; + sourceFile.languageVariant = allowsJsxExpressions(sourceFile.fileName) ? LanguageVariant.JSX : LanguageVariant.Standard; return sourceFile; } diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts index 5506a1d5e3d..67f16cbfd0f 100644 --- a/src/compiler/utilities.ts +++ b/src/compiler/utilities.ts @@ -2142,7 +2142,7 @@ namespace ts { return fileExtensionIs(fileName, ".js") || fileExtensionIs(fileName, ".jsx"); } - export function isTsx(fileName: string) { + export function allowsJsxExpressions(fileName: string) { return fileExtensionIs(fileName, ".tsx") || fileExtensionIs(fileName, ".jsx"); }