Fix #525 - safe/consistent .tsx file type checks (#526)

🙌 Thanks @roblourens!
microsoft · Oct 8, 2018 · ac395d8 · ac395d8
1 parent 76d0853
commit ac395d8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/noFunctionExpressionRule.ts b/src/noFunctionExpressionRule.ts
@@ -1,6 +1,7 @@
 import * as ts from 'typescript';
 import * as Lint from 'tslint';
 
+import { AstUtils } from './utils/AstUtils';
 import {ErrorTolerantWalker} from './utils/ErrorTolerantWalker';
 import {ExtendedMetadata} from './utils/ExtendedMetadata';
 
@@ -37,7 +38,8 @@ class NoFunctionExpressionRuleWalker extends ErrorTolerantWalker {
 
     constructor(sourceFile: ts.SourceFile, options: Lint.IOptions) {
         super(sourceFile, options);
-        if (sourceFile.fileName.endsWith('tsx')) {
+
+        if (AstUtils.getLanguageVariant(sourceFile) === ts.LanguageVariant.JSX) {
             this.allowGenericFunctionExpression = true;
         }
     }

diff --git a/src/preferTypeCastRule.ts b/src/preferTypeCastRule.ts
@@ -1,6 +1,7 @@
 import * as ts from 'typescript';
 import * as Lint from 'tslint';
 
+import { AstUtils } from './utils/AstUtils';
 import {ErrorTolerantWalker} from './utils/ErrorTolerantWalker';
 import {ExtendedMetadata} from './utils/ExtendedMetadata';
 
@@ -34,7 +35,7 @@ export class Rule extends Lint.Rules.AbstractRule {
 
 class PreferTypeCastRuleWalker extends ErrorTolerantWalker {
     protected visitSourceFile(node: ts.SourceFile): void {
-        if (/.*\.tsx/.test(node.fileName) === false) {
+        if (AstUtils.getLanguageVariant(node) === ts.LanguageVariant.Standard) {
             super.visitSourceFile(node);
         }
     }

diff --git a/src/utils/AstUtils.ts b/src/utils/AstUtils.ts
@@ -6,7 +6,7 @@ import * as ts from 'typescript';
 export module AstUtils {
 
     export function getLanguageVariant(node: ts.SourceFile): ts.LanguageVariant {
-        if (/.*\.tsx/i.test(node.fileName)) {
+        if (node.fileName.endsWith('.tsx')) {
             return ts.LanguageVariant.JSX;
         } else {
             return ts.LanguageVariant.Standard;