From bc01b16057f3f7f88859a081922206d8821fa213 Mon Sep 17 00:00:00 2001
From: Wesley Wigham <t-weswig@microsoft.com>
Date: Wed, 9 Dec 2015 16:06:21 -0800
Subject: [PATCH] reorder if

---
 src/compiler/checker.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 35f92de8fbe..0ee73756e57 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -6038,12 +6038,12 @@ namespace ts {
 
         function getWidenedType(type: Type): Type {
             if (type.flags & TypeFlags.RequiresWidening) {
-                if (type.flags & TypeFlags.PredicateType) {
-                    return booleanType;
-                }
                 if (type.flags & (TypeFlags.Undefined | TypeFlags.Null)) {
                     return anyType;
                 }
+                if (type.flags & TypeFlags.PredicateType) {
+                    return booleanType;
+                }
                 if (type.flags & TypeFlags.ObjectLiteral) {
                     return getWidenedTypeOfObjectLiteral(type);
                 }
@@ -14329,15 +14329,16 @@ namespace ts {
         }
 
         function checkTypePredicate(node: TypePredicateNode) {
-            if (node.parameterName.kind === SyntaxKind.Identifier && !isInLegalParameterTypePredicatePosition(node)) {
+            const { parameterName } = node;
+            if (parameterName.kind === SyntaxKind.Identifier && !isInLegalParameterTypePredicatePosition(node)) {
                 error(node, Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods);
             }
-            else if (node.parameterName.kind === SyntaxKind.ThisType) {
+            else if (parameterName.kind === SyntaxKind.ThisType) {
                 if (!isInLegalThisTypePredicatePosition(node)) {
                     error(node, Diagnostics.A_this_based_type_predicate_is_only_allowed_within_a_class_or_interface_s_members_get_accessors_or_return_type_positions_for_functions_and_methods);
                 }
                 else {
-                    getTypeFromThisTypeNode(node.parameterName as ThisTypeNode);
+                    getTypeFromThisTypeNode(parameterName as ThisTypeNode);
                 }
             }
         }