Improve Promise and remove --noStrictGenericChecks from DeclarationSyntaxTest

Author: teppeis

src/main/java/com/google/javascript/clutz/DeclarationGenerator.java

@@ -2979,9 +2979,8 @@ private String getSignatureForInstanceTTEFn(
       String templateVarName = templateTypeNames.next();
 
       // TODO(lucassloan): goog.Promise has bad types (caused by an inconsistent number of generic
-      // type
-      // params) that are coerced to any, so explicitly emit any and fix when the callers have been
-      // fixed.
+      // type params) that are coerced to any, so explicitly emit any for the return type and
+      // fix when the callers have been fixed.
       String classTemplatizedType =
           className.equals("ಠ_ಠ.clutz.goog.Promise") ? " any" : className + " < RESULT >";
       // The AngularJS promise type should match the TypeScript type declaration since they describe
@@ -3001,9 +3000,7 @@ private String getSignatureForInstanceTTEFn(
         } else {
           return "then < RESULT > (opt_onFulfilled ? : ( (a : "
               + templateVarName
-              + " ) => "
-              + classTemplatizedType
-              + " | RESULT ) | null , "
+              + " ) => PromiseLike < RESULT > | RESULT ) | null , "
               + "opt_onRejected ? : ( (a : any ) => any ) | null) : "
               + classTemplatizedType
               + " ;";

src/test/java/com/google/javascript/clutz/DeclarationSyntaxTest.java

@@ -49,10 +49,7 @@ public class DeclarationSyntaxTest {
           "--lib",
           "es5,dom,es2015.iterable",
           "--noImplicitAny",
-          "--strictNullChecks",
-          // TODO(lucassloan): Necessary to allow promise like things that extend other promise like
-          // things.  Turn off when turned off in g3
-          "--noStrictGenericChecks");
+          "--strictNullChecks");
 
   @Test
   public void testDeclarationSyntax() throws Exception {

src/test/java/com/google/javascript/clutz/goog_promise_with_platform.d.ts

@@ -2,7 +2,7 @@ declare namespace ಠ_ಠ.clutz.goog {
   class Promise < TYPE , RESOLVER_CONTEXT > implements ಠ_ಠ.clutz.goog.Thenable < TYPE > {
     private noStructuralTyping_goog_Promise : any;
     constructor (resolver : (this : RESOLVER_CONTEXT , a : (a ? : TYPE | PromiseLike < TYPE > | null | { then : any } ) => any , b : (a ? : any ) => any ) => void , opt_context ? : RESOLVER_CONTEXT ) ;
-    then < RESULT > (opt_onFulfilled ? : ( (a : TYPE ) =>  any | RESULT ) | null , opt_onRejected ? : ( (a : any ) => any ) | null) :  any ;
+    then < RESULT > (opt_onFulfilled ? : ( (a : TYPE ) => PromiseLike < RESULT > | RESULT ) | null , opt_onRejected ? : ( (a : any ) => any ) | null) :  any ;
     static all < TYPE > (promises : any [] ) : ಠ_ಠ.clutz.goog.Promise < TYPE [] , any > ;
     static race < TYPE > (promises : any [] ) : ಠ_ಠ.clutz.goog.Promise < TYPE , any > ;
     static resolve < T >(value: ಠ_ಠ.clutz.goog.Promise < T , any > | T): any;
@@ -19,7 +19,7 @@ declare namespace ಠ_ಠ.clutz.goog {
     function isImplementedBy (object : any ) : boolean ;
   }
   interface Thenable < TYPE > extends PromiseLike < TYPE > {
-    then < RESULT > (opt_onFulfilled ? : ( (a : TYPE ) => ಠ_ಠ.clutz.goog.Thenable < RESULT > | RESULT ) | null , opt_onRejected ? : ( (a : any ) => any ) | null) : ಠ_ಠ.clutz.goog.Thenable < RESULT > ;
+    then < RESULT > (opt_onFulfilled ? : ( (a : TYPE ) => PromiseLike < RESULT > | RESULT ) | null , opt_onRejected ? : ( (a : any ) => any ) | null) : ಠ_ಠ.clutz.goog.Thenable < RESULT > ;
   }
 }
 declare module 'goog:goog.Thenable' {

src/test/java/com/google/javascript/clutz/partial/tte_promise_partial.d.ts

@@ -2,7 +2,7 @@ declare namespace ಠ_ಠ.clutz.module$exports$tte$Promise$Partial {
   class PartialDeferred < VALUE = any > extends ಠ_ಠ.clutz.Base < VALUE > {
     private noStructuralTyping_module$exports$tte$Promise$Partial_PartialDeferred : any;
     constructor ( ) ;
-    then < RESULT > (opt_onFulfilled ? : ( (a : VALUE ) => ಠ_ಠ.clutz.module$exports$tte$Promise$Partial.PartialDeferred < RESULT > | RESULT ) | null , opt_onRejected ? : ( (a : any ) => any ) | null) : ಠ_ಠ.clutz.module$exports$tte$Promise$Partial.PartialDeferred < RESULT > ;
+    then < RESULT > (opt_onFulfilled ? : ( (a : VALUE ) => PromiseLike < RESULT > | RESULT ) | null , opt_onRejected ? : ( (a : any ) => any ) | null) : ಠ_ಠ.clutz.module$exports$tte$Promise$Partial.PartialDeferred < RESULT > ;
   }
 }
 declare module 'goog:tte.Promise.Partial' {