Fix callback return type annotation before constructor (#54034)

src/compiler/checker.ts

@@ -14818,16 +14818,16 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
         if (declaration.kind === SyntaxKind.Constructor) {
             return getDeclaredTypeOfClassOrInterface(getMergedSymbol((declaration.parent as ClassDeclaration).symbol));
         }
+        const typeNode = getEffectiveReturnTypeNode(declaration);
         if (isJSDocSignature(declaration)) {
             const root = getJSDocRoot(declaration);
-            if (root && isConstructorDeclaration(root.parent)) {
+            if (root && isConstructorDeclaration(root.parent) && !typeNode) {
                 return getDeclaredTypeOfClassOrInterface(getMergedSymbol((root.parent.parent as ClassDeclaration).symbol));
             }
         }
         if (isJSDocConstructSignature(declaration)) {
             return getTypeFromTypeNode((declaration.parameters[0] as ParameterDeclaration).type!); // TODO: GH#18217
         }
-        const typeNode = getEffectiveReturnTypeNode(declaration);
         if (typeNode) {
             return getTypeFromTypeNode(typeNode);
         }

tests/baselines/reference/callbackOnConstructor.js

@@ -0,0 +1,40 @@
+//// [callbackOnConstructor.js]
+export class Preferences {
+  assignability = "no"
+  /**
+   * @callback ValueGetter_2
+   * @param {string} name
+   * @returns {boolean|number|string|undefined}
+   */
+  constructor() {}
+}
+
+
+/** @type {ValueGetter_2} */
+var ooscope2 = s => s.length > 0
+
+
+//// [callbackOnConstructor.js]
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Preferences = void 0;
+var Preferences = /** @class */ (function () {
+    /**
+     * @callback ValueGetter_2
+     * @param {string} name
+     * @returns {boolean|number|string|undefined}
+     */
+    function Preferences() {
+        this.assignability = "no";
+    }
+    return Preferences;
+}());
+exports.Preferences = Preferences;
+/** @type {ValueGetter_2} */
+var ooscope2 = function (s) { return s.length > 0; };
+
+
+//// [callbackOnConstructor.d.ts]
+export class Preferences {
+    assignability: string;
+}

tests/baselines/reference/callbackOnConstructor.symbols

@@ -0,0 +1,24 @@
+=== tests/cases/conformance/jsdoc/callbackOnConstructor.js ===
+export class Preferences {
+>Preferences : Symbol(Preferences, Decl(callbackOnConstructor.js, 0, 0))
+
+  assignability = "no"
+>assignability : Symbol(Preferences.assignability, Decl(callbackOnConstructor.js, 0, 26))
+
+  /**
+   * @callback ValueGetter_2
+   * @param {string} name
+   * @returns {boolean|number|string|undefined}
+   */
+  constructor() {}
+}
+
+
+/** @type {ValueGetter_2} */
+var ooscope2 = s => s.length > 0
+>ooscope2 : Symbol(ooscope2, Decl(callbackOnConstructor.js, 12, 3))
+>s : Symbol(s, Decl(callbackOnConstructor.js, 12, 14))
+>s.length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
+>s : Symbol(s, Decl(callbackOnConstructor.js, 12, 14))
+>length : Symbol(String.length, Decl(lib.es5.d.ts, --, --))
+

tests/baselines/reference/callbackOnConstructor.types

@@ -0,0 +1,28 @@
+=== tests/cases/conformance/jsdoc/callbackOnConstructor.js ===
+export class Preferences {
+>Preferences : Preferences
+
+  assignability = "no"
+>assignability : string
+>"no" : "no"
+
+  /**
+   * @callback ValueGetter_2
+   * @param {string} name
+   * @returns {boolean|number|string|undefined}
+   */
+  constructor() {}
+}
+
+
+/** @type {ValueGetter_2} */
+var ooscope2 = s => s.length > 0
+>ooscope2 : (name: string) => string | number | boolean
+>s => s.length > 0 : (s: string) => string | number | boolean
+>s : string
+>s.length > 0 : boolean
+>s.length : number
+>s : string
+>length : number
+>0 : 0
+

tests/cases/conformance/jsdoc/callbackOnConstructor.ts

@@ -0,0 +1,17 @@
+// @filename: callbackOnConstructor.js
+// @checkJs: true
+// @outdir: dist
+// @declaration: true
+export class Preferences {
+  assignability = "no"
+  /**
+   * @callback ValueGetter_2
+   * @param {string} name
+   * @returns {boolean|number|string|undefined}
+   */
+  constructor() {}
+}
+
+
+/** @type {ValueGetter_2} */
+var ooscope2 = s => s.length > 0