fixed files form Closure #90

Spirals-Team · Mar 7, 2017 · d63ebc7 · d63ebc7
1 parent ff2e203
commit d63ebc7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/projects/Closure/90/com/google/javascript/jscomp/FunctionTypeBuilder.java b/projects/Closure/90/com/google/javascript/jscomp/FunctionTypeBuilder.java
@@ -181,7 +181,7 @@ public boolean apply(JSType type) {
       // create interfaces JSType, ObjectType, FunctionType etc and have
       // separate implementation instead of the class hierarchy, so that
       // union types can also be object types, etc.
-      if (!type.isSubtype(
+      if (!type.restrictByNotNullOrUndefined().isSubtype(
               typeRegistry.getNativeType(OBJECT_TYPE))) {
         reportWarning(THIS_TYPE_NON_OBJECT, type.toString());
         return false;

diff --git a/projects/Closure/90/com/google/javascript/rhino/jstype/FunctionType.java b/projects/Closure/90/com/google/javascript/rhino/jstype/FunctionType.java
@@ -877,6 +877,9 @@ JSType resolveInternal(ErrorReporter t, StaticScope<JSType> scope) {
     // mean "nullable Foo". For certain tags (like @extends) we de-nullify
     // the name for them.
     JSType maybeTypeOfThis = safeResolve(typeOfThis, t, scope);
+    if (maybeTypeOfThis != null) {
+      maybeTypeOfThis = maybeTypeOfThis.restrictByNotNullOrUndefined();
+    }
     if (maybeTypeOfThis instanceof ObjectType) {
       typeOfThis = (ObjectType) maybeTypeOfThis;
     }