From 8d74671a0fc84de0b10f3be6c8e82785f50cd105 Mon Sep 17 00:00:00 2001
From: Ulrich Buchgraber <ulrich.b@gmx.at>
Date: Tue, 14 Apr 2020 16:50:47 +0200
Subject: [PATCH] Bring the options order in sync and add missing `allowAny` in
 docs

---
 .../rules/restrict-template-expressions.md    |  2 ++
 .../rules/restrict-template-expressions.ts    | 20 +++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/eslint-plugin/docs/rules/restrict-template-expressions.md b/packages/eslint-plugin/docs/rules/restrict-template-expressions.md
index 4c52e74445f..95064b2a147 100644
--- a/packages/eslint-plugin/docs/rules/restrict-template-expressions.md
+++ b/packages/eslint-plugin/docs/rules/restrict-template-expressions.md
@@ -28,6 +28,8 @@ type Options = {
   allowNumber?: boolean;
   // if true, also allow boolean type in template expressions
   allowBoolean?: boolean;
+  // if true, also allow any in template expressions
+  allowAny?: boolean;
   // if true, also allow null and undefined in template expressions
   allowNullable?: boolean;
 };
diff --git a/packages/eslint-plugin/src/rules/restrict-template-expressions.ts b/packages/eslint-plugin/src/rules/restrict-template-expressions.ts
index b1fbda054ee..90dd363f820 100644
--- a/packages/eslint-plugin/src/rules/restrict-template-expressions.ts
+++ b/packages/eslint-plugin/src/rules/restrict-template-expressions.ts
@@ -7,10 +7,10 @@ import * as util from '../util';
 
 type Options = [
   {
-    allowNullable?: boolean;
     allowNumber?: boolean;
     allowBoolean?: boolean;
     allowAny?: boolean;
+    allowNullable?: boolean;
   },
 ];
 
@@ -33,10 +33,10 @@ export default util.createRule<Options, MessageId>({
       {
         type: 'object',
         properties: {
-          allowAny: { type: 'boolean' },
+          allowNumber: { type: 'boolean' },
           allowBoolean: { type: 'boolean' },
+          allowAny: { type: 'boolean' },
           allowNullable: { type: 'boolean' },
-          allowNumber: { type: 'boolean' },
         },
       },
     ],
@@ -51,13 +51,6 @@ export default util.createRule<Options, MessageId>({
         return true;
       }
 
-      if (
-        options.allowNullable &&
-        util.isTypeFlagSet(type, ts.TypeFlags.Null | ts.TypeFlags.Undefined)
-      ) {
-        return true;
-      }
-
       if (
         options.allowNumber &&
         util.isTypeFlagSet(
@@ -79,6 +72,13 @@ export default util.createRule<Options, MessageId>({
         return true;
       }
 
+      if (
+        options.allowNullable &&
+        util.isTypeFlagSet(type, ts.TypeFlags.Null | ts.TypeFlags.Undefined)
+      ) {
+        return true;
+      }
+
       return false;
     }