Revert "Add explicit @this {*} annotation to some more async fns. (#1064

)" (#1068) This reverts commit 40a006a. The change does not work as-is in google3. Reverting to unblock furhter work on tsickle (for TS3.6 etc).
angular · Sep 10, 2019 · 05fa9da · 05fa9da
1 parent 40a006a
commit 05fa9da
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 58 deletions.
diff --git a/src/jsdoc_transformer.ts b/src/jsdoc_transformer.ts
@@ -595,24 +595,12 @@ export function jsdocTransformer(
           }
         }
 
-        // All async functions when down-leveled access `this` to pass it to
-        // tslib.__awaiter. Closure requires a @this tag for that in some
-        // situations.
-        const fnDeclNeedsExplicitThis =
-            // Instance methods already have an implicit this. So we only care
-            // for function declarations/expressions and arrow fns.
-            fnDecl.kind === ts.SyntaxKind.FunctionDeclaration ||
-            fnDecl.kind === ts.SyntaxKind.FunctionExpression ||
-            fnDecl.kind === ts.SyntaxKind.ArrowFunction ||
-            // static methods also need explicit this
-            // TODO(rado): The correct emit for static methods would be
-            // {typeof C} where C is the enclosing class.
-            (fnDecl.kind === ts.SyntaxKind.MethodDeclaration &&
-             transformerUtil.hasModifierFlag(fnDecl, ts.ModifierFlags.Static));
-
-        if (transformerUtil.hasModifierFlag(fnDecl, ts.ModifierFlags.Async) &&
-            (tsOptions.target !== undefined && tsOptions.target <= ts.ScriptTarget.ES2015) &&
-            fnDeclNeedsExplicitThis &&
+        // top-level async functions when down-leveled access `this` to pass it to
+        // tslib.__awaiter. Closure requires a @this tag for that.
+        if ((tsOptions.target !== undefined && tsOptions.target <= ts.ScriptTarget.ES2015) &&
+            transformerUtil.hasModifierFlag(fnDecl, ts.ModifierFlags.Async) &&
+            // Methods/getters/setters/ctors already have an implicit this.
+            fnDecl.kind === ts.SyntaxKind.FunctionDeclaration &&
             // There might be an explicit `this: T` type.
             !tags.some(t => t.tagName === 'this')) {
           tags.push({tagName: 'this', type: '*'});

diff --git a/test_files/async_functions/async_functions.js b/test_files/async_functions/async_functions.js
@@ -53,7 +53,6 @@ function asyncTopLevelFunctionWithThisType(param) {
 const asyncTopLevelArrowFunction = (/**
  * @param {string} param
  * @return {!Promise<string>}
- * @this {*}
  */
 (param) => tslib_1.__awaiter(this, void 0, void 0, function* () {
     /** @type {!Promise<string>} */
@@ -91,7 +90,6 @@ class Container {
         const asyncArrowFunctionInMethod = (/**
          * @param {string} param
          * @return {!Promise<string>}
-         * @this {*}
          */
         (param) => tslib_1.__awaiter(this, void 0, void 0, function* () {
             /** @type {!Promise<string>} */
@@ -129,36 +127,8 @@ class Container {
             });
         }
     }
-    /**
-     * @return {!Promise<string>}
-     * @this {*}
-     */
-    static asyncStaticMethod() {
-        return tslib_1.__awaiter(this, void 0, void 0, /** @this {!Container} */ function* () {
-            /** @type {string} */
-            const s = yield asyncTopLevelFunction('x');
-            return s + this.staticField;
-        });
-    }
 }
-Container.staticField = 's';
 if (false) {
-    /** @type {string} */
-    Container.staticField;
     /** @type {string} */
     Container.prototype.field;
 }
-/** @type {function(): !Promise<void>} */
-const asyncFnExpression = (/**
- * @return {!Promise<void>}
- * @this {*}
- */
-function f() {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () { });
-});
-/** @type {function(): !Promise<void>} */
-const asyncArrowFn = (/**
- * @return {!Promise<void>}
- * @this {*}
- */
-() => tslib_1.__awaiter(this, void 0, void 0, function* () { }));
diff --git a/test_files/async_functions/async_functions.ts b/test_files/async_functions/async_functions.ts
@@ -48,14 +48,4 @@ class Container {
       return s + this.field;
     }
   }
-
-  static staticField = 's';
-
-  static async asyncStaticMethod() {
-    const s = await asyncTopLevelFunction('x');
-    return s + this.staticField;
-  }
 }
-
-const asyncFnExpression = async function f() {};
-const asyncArrowFn = async () => {};