fixed files form Closure #117

Spirals-Team · Mar 7, 2017 · 2b2a1b4 · 2b2a1b4
1 parent 3d4ac83
commit 2b2a1b4
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/projects/Closure/117/com/google/javascript/jscomp/TypeValidator.java b/projects/Closure/117/com/google/javascript/jscomp/TypeValidator.java
@@ -722,8 +722,20 @@ private String formatFoundRequired(String description, JSType found,
    *     to an Object type, if possible.
    */
   String getReadableJSTypeName(Node n, boolean dereference) {
+    JSType type = getJSType(n);
+    if (dereference) {
+      ObjectType dereferenced = type.dereference();
+      if (dereferenced != null) {
+        type = dereferenced;
+      }
+    }
 
     // The best type name is the actual type name.
+    if (type.isFunctionPrototypeType() ||
+        (type.toObjectType() != null &&
+         type.toObjectType().getConstructor() != null)) {
+      return type.toString();
+    }
 
     // If we're analyzing a GETPROP, the property may be inherited by the
     // prototype chain. So climb the prototype chain and find out where
@@ -753,18 +765,6 @@ String getReadableJSTypeName(Node n, boolean dereference) {
       }
     }
 
-    JSType type = getJSType(n);
-    if (dereference) {
-      ObjectType dereferenced = type.dereference();
-      if (dereferenced != null) {
-        type = dereferenced;
-      }
-    }
-    if (type.isFunctionPrototypeType() ||
-        (type.toObjectType() != null &&
-         type.toObjectType().getConstructor() != null)) {
-      return type.toString();
-    }
     String qualifiedName = n.getQualifiedName();
     if (qualifiedName != null) {
       return qualifiedName;