[NTI] Don't silence NTI warnings in CheckConformanceTest, plus replac…

…e isLoose with isSomeUnknownType. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=130452183
google · Aug 17, 2016 · 265a100 · 265a100
1 parent a1467ce
commit 265a100
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 53 deletions.
diff --git a/src/com/google/javascript/jscomp/ConformanceRules.java b/src/com/google/javascript/jscomp/ConformanceRules.java
@@ -485,8 +485,7 @@ private ConformanceResult checkConformance(NodeTraversal t, Node n, Property pro
         Node lhs = n.getFirstChild();
         if (methodClassType != null && lhs.getTypeI() != null) {
           TypeI targetType = lhs.getTypeI().restrictByNotNullOrUndefined();
-          if (targetType.isUnknownType()
+          if (targetType.isSomeUnknownType()
-             || targetType.isLooseType()
              || targetType.isTypeVariable()
              || targetType.isBottom()
              || targetType.isTop()
@@ -1233,7 +1232,7 @@ protected ConformanceResult checkConformance(NodeTraversal t, Node n) {
       }
 
       if (n.isGetProp()
-          && isUnknown(n)
+          && n.getTypeI().isSomeUnknownType()
           && isUsed(n) // skip most assignments, etc
           && !isTypeImmediatelyTightened(n)
           && isCheckablePropertySource(n.getFirstChild()) // not a cascading unknown

diff --git a/src/com/google/javascript/jscomp/newtypes/JSType.java b/src/com/google/javascript/jscomp/newtypes/JSType.java
@@ -1547,8 +1547,11 @@ public boolean isUnknownType() {
   }
 
   @Override
-  public boolean isLooseType() {
+  public boolean isSomeUnknownType() {
-    return isInstanceofObject() && isLoose();
+    FunctionType ft = this.getFunTypeIfSingletonObj();
+    return isUnknown()
+        || (isInstanceofObject() && isLoose())
+        || (ft != null && ft.isTopFunction());
   }
 
   @Override

diff --git a/src/com/google/javascript/rhino/TypeI.java b/src/com/google/javascript/rhino/TypeI.java
@@ -74,7 +74,7 @@ public interface TypeI {
 
   boolean isUnknownType();
 
-  boolean isLooseType();
+  boolean isSomeUnknownType();
 
   boolean isUnionType();
 

diff --git a/src/com/google/javascript/rhino/jstype/JSType.java b/src/com/google/javascript/rhino/jstype/JSType.java
@@ -272,7 +272,7 @@ public boolean isUnknownType() {
   }
 
   @Override
-  public final boolean isLooseType() {
+  public final boolean isSomeUnknownType() {
     // OTI's notion of isUnknownType already accounts for looseness (see override in ObjectType).
     return isUnknownType();
   }