Move the options check before isTypeFlagSet() check

typescript-eslint · Apr 14, 2020 · 9ebb323 · 9ebb323
1 parent f2fab58
commit 9ebb323
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/packages/eslint-plugin/src/rules/restrict-template-expressions.ts b/packages/eslint-plugin/src/rules/restrict-template-expressions.ts
@@ -52,30 +52,30 @@ export default util.createRule<Options, MessageId>({
       }
 
       if (
-        util.isTypeFlagSet(
-          type,
-          ts.TypeFlags.NumberLike | ts.TypeFlags.BigIntLike,
-        ) &&
-        options.allowNumber
+        options.allowNullable &&
+        util.isTypeFlagSet(type, ts.TypeFlags.Null | ts.TypeFlags.Undefined)
       ) {
         return true;
       }
 
       if (
-        util.isTypeFlagSet(type, ts.TypeFlags.BooleanLike) &&
-        options.allowBoolean
+        options.allowNumber &&
+        util.isTypeFlagSet(
+          type,
+          ts.TypeFlags.NumberLike | ts.TypeFlags.BigIntLike,
+        )
       ) {
         return true;
       }
 
       if (
-        util.isTypeFlagSet(type, ts.TypeFlags.Null | ts.TypeFlags.Undefined) &&
-        options.allowNullable
+        options.allowBoolean &&
+        util.isTypeFlagSet(type, ts.TypeFlags.BooleanLike)
       ) {
         return true;
       }
 
-      if (util.isTypeFlagSet(type, ts.TypeFlags.Any) && options.allowAny) {
+      if (options.allowAny && util.isTypeFlagSet(type, ts.TypeFlags.Any)) {
         return true;
       }