Fix getExpandoSymbol for already-expando symbols

src/compiler/checker.ts

@@ -2763,7 +2763,7 @@ namespace ts {
          */
         function getExpandoSymbol(symbol: Symbol): Symbol | undefined {
             const decl = symbol.valueDeclaration;
-            if (!decl || !isInJSFile(decl) || symbol.flags & SymbolFlags.TypeAlias) {
+            if (!decl || !isInJSFile(decl) || symbol.flags & SymbolFlags.TypeAlias || getExpandoInitializer(decl, /*isPrototypeAssignment*/ false)) {
                 return undefined;
             }
             const init = isVariableDeclaration(decl) ? getDeclaredExpandoInitializer(decl) : getAssignedExpandoInitializer(decl);

tests/baselines/reference/jsdocTypeReferenceToImportOfClassExpression.symbols

@@ -0,0 +1,49 @@
+=== tests/cases/conformance/jsdoc/MC.js ===
+const MW = require("./MW");
+>MW : Symbol(MW, Decl(MC.js, 0, 5))
+>require : Symbol(require)
+>"./MW" : Symbol("tests/cases/conformance/jsdoc/MW", Decl(MW.js, 0, 0))
+
+/** @typedef {number} Cictema */
+
+module.exports = class MC {
+>module.exports : Symbol("tests/cases/conformance/jsdoc/MC", Decl(MC.js, 0, 0))
+>module : Symbol(export=, Decl(MC.js, 0, 27))
+>exports : Symbol(export=, Decl(MC.js, 0, 27))
+>MC : Symbol(MC, Decl(MC.js, 4, 16))
+
+  watch() {
+>watch : Symbol(MC.watch, Decl(MC.js, 4, 27))
+
+    return new MW(this);
+>MW : Symbol(MW, Decl(MC.js, 0, 5))
+>this : Symbol(MC, Decl(MC.js, 4, 16))
+  }
+};
+
+=== tests/cases/conformance/jsdoc/MW.js ===
+/** @typedef {import("./MC")} MC */
+
+class MW {
+>MW : Symbol(MW, Decl(MW.js, 0, 0))
+
+  /**
+   * @param {MC} compiler the compiler
+   */
+  constructor(compiler) {
+>compiler : Symbol(compiler, Decl(MW.js, 6, 14))
+
+    this.compiler = compiler;
+>this.compiler : Symbol(MW.compiler, Decl(MW.js, 6, 25))
+>this : Symbol(MW, Decl(MW.js, 0, 0))
+>compiler : Symbol(MW.compiler, Decl(MW.js, 6, 25))
+>compiler : Symbol(compiler, Decl(MW.js, 6, 14))
+  }
+}
+
+module.exports = MW;
+>module.exports : Symbol("tests/cases/conformance/jsdoc/MW", Decl(MW.js, 0, 0))
+>module : Symbol(export=, Decl(MW.js, 9, 1))
+>exports : Symbol(export=, Decl(MW.js, 9, 1))
+>MW : Symbol(MW, Decl(MW.js, 0, 0))
+

tests/baselines/reference/jsdocTypeReferenceToImportOfClassExpression.types

@@ -0,0 +1,55 @@
+=== tests/cases/conformance/jsdoc/MC.js ===
+const MW = require("./MW");
+>MW : typeof import("tests/cases/conformance/jsdoc/MW")
+>require("./MW") : typeof import("tests/cases/conformance/jsdoc/MW")
+>require : any
+>"./MW" : "./MW"
+
+/** @typedef {number} Cictema */
+
+module.exports = class MC {
+>module.exports = class MC {  watch() {    return new MW(this);  }} : typeof import("tests/cases/conformance/jsdoc/MC")
+>module.exports : typeof import("tests/cases/conformance/jsdoc/MC")
+>module : { "\"tests/cases/conformance/jsdoc/MC\"": typeof import("tests/cases/conformance/jsdoc/MC"); }
+>exports : typeof import("tests/cases/conformance/jsdoc/MC")
+>class MC {  watch() {    return new MW(this);  }} : typeof import("tests/cases/conformance/jsdoc/MC")
+>MC : typeof import("tests/cases/conformance/jsdoc/MC")
+
+  watch() {
+>watch : () => import("tests/cases/conformance/jsdoc/MW")
+
+    return new MW(this);
+>new MW(this) : import("tests/cases/conformance/jsdoc/MW")
+>MW : typeof import("tests/cases/conformance/jsdoc/MW")
+>this : this
+  }
+};
+
+=== tests/cases/conformance/jsdoc/MW.js ===
+/** @typedef {import("./MC")} MC */
+
+class MW {
+>MW : MW
+
+  /**
+   * @param {MC} compiler the compiler
+   */
+  constructor(compiler) {
+>compiler : import("tests/cases/conformance/jsdoc/MC")
+
+    this.compiler = compiler;
+>this.compiler = compiler : import("tests/cases/conformance/jsdoc/MC")
+>this.compiler : import("tests/cases/conformance/jsdoc/MC")
+>this : this
+>compiler : import("tests/cases/conformance/jsdoc/MC")
+>compiler : import("tests/cases/conformance/jsdoc/MC")
+  }
+}
+
+module.exports = MW;
+>module.exports = MW : typeof MW
+>module.exports : typeof MW
+>module : { "\"tests/cases/conformance/jsdoc/MW\"": typeof MW; }
+>exports : typeof MW
+>MW : typeof MW
+

tests/baselines/reference/jsdocTypeReferenceToImportOfFunctionExpression.symbols

@@ -0,0 +1,51 @@
+=== tests/cases/conformance/jsdoc/MC.js ===
+const MW = require("./MW");
+>MW : Symbol(MW, Decl(MC.js, 0, 5))
+>require : Symbol(require)
+>"./MW" : Symbol("tests/cases/conformance/jsdoc/MW", Decl(MW.js, 0, 0))
+
+/** @typedef {number} Meyerhauser */
+
+/** @class */
+module.exports = function MC() {
+>module.exports : Symbol("tests/cases/conformance/jsdoc/MC", Decl(MC.js, 0, 0))
+>module : Symbol(export=, Decl(MC.js, 0, 27))
+>exports : Symbol(export=, Decl(MC.js, 0, 27))
+>MC : Symbol(MC, Decl(MC.js, 5, 16))
+
+    /** @type {any} */
+    var x = {}
+>x : Symbol(x, Decl(MC.js, 7, 7))
+
+    return new MW(x);
+>MW : Symbol(MW, Decl(MC.js, 0, 5))
+>x : Symbol(x, Decl(MC.js, 7, 7))
+
+};
+
+=== tests/cases/conformance/jsdoc/MW.js ===
+/** @typedef {import("./MC")} MC */
+
+class MW {
+>MW : Symbol(MW, Decl(MW.js, 0, 0))
+
+  /**
+   * @param {MC} compiler the compiler
+   */
+  constructor(compiler) {
+>compiler : Symbol(compiler, Decl(MW.js, 6, 14))
+
+    this.compiler = compiler;
+>this.compiler : Symbol(MW.compiler, Decl(MW.js, 6, 25))
+>this : Symbol(MW, Decl(MW.js, 0, 0))
+>compiler : Symbol(MW.compiler, Decl(MW.js, 6, 25))
+>compiler : Symbol(compiler, Decl(MW.js, 6, 14))
+  }
+}
+
+module.exports = MW;
+>module.exports : Symbol("tests/cases/conformance/jsdoc/MW", Decl(MW.js, 0, 0))
+>module : Symbol(export=, Decl(MW.js, 9, 1))
+>exports : Symbol(export=, Decl(MW.js, 9, 1))
+>MW : Symbol(MW, Decl(MW.js, 0, 0))
+

tests/baselines/reference/jsdocTypeReferenceToImportOfFunctionExpression.types

@@ -0,0 +1,58 @@
+=== tests/cases/conformance/jsdoc/MC.js ===
+const MW = require("./MW");
+>MW : typeof import("tests/cases/conformance/jsdoc/MW")
+>require("./MW") : typeof import("tests/cases/conformance/jsdoc/MW")
+>require : any
+>"./MW" : "./MW"
+
+/** @typedef {number} Meyerhauser */
+
+/** @class */
+module.exports = function MC() {
+>module.exports = function MC() {    /** @type {any} */    var x = {}    return new MW(x);} : typeof MC
+>module.exports : typeof MC
+>module : { "\"tests/cases/conformance/jsdoc/MC\"": typeof MC; }
+>exports : typeof MC
+>function MC() {    /** @type {any} */    var x = {}    return new MW(x);} : typeof MC
+>MC : typeof MC
+
+    /** @type {any} */
+    var x = {}
+>x : any
+>{} : {}
+
+    return new MW(x);
+>new MW(x) : import("tests/cases/conformance/jsdoc/MW")
+>MW : typeof import("tests/cases/conformance/jsdoc/MW")
+>x : any
+
+};
+
+=== tests/cases/conformance/jsdoc/MW.js ===
+/** @typedef {import("./MC")} MC */
+
+class MW {
+>MW : MW
+
+  /**
+   * @param {MC} compiler the compiler
+   */
+  constructor(compiler) {
+>compiler : typeof MC
+
+    this.compiler = compiler;
+>this.compiler = compiler : typeof MC
+>this.compiler : typeof MC
+>this : this
+>compiler : typeof MC
+>compiler : typeof MC
+  }
+}
+
+module.exports = MW;
+>module.exports = MW : typeof MW
+>module.exports : typeof MW
+>module : { "\"tests/cases/conformance/jsdoc/MW\"": typeof MW; }
+>exports : typeof MW
+>MW : typeof MW
+

tests/cases/conformance/jsdoc/jsdocTypeReferenceToImportOfClassExpression.ts

@@ -0,0 +1,28 @@
+// @noEmit: true
+// @allowjs: true
+// @checkjs: true
+
+// @Filename: MW.js
+/** @typedef {import("./MC")} MC */
+
+class MW {
+  /**
+   * @param {MC} compiler the compiler
+   */
+  constructor(compiler) {
+    this.compiler = compiler;
+  }
+}
+
+module.exports = MW;
+
+// @Filename: MC.js
+const MW = require("./MW");
+
+/** @typedef {number} Cictema */
+
+module.exports = class MC {
+  watch() {
+    return new MW(this);
+  }
+};

tests/cases/conformance/jsdoc/jsdocTypeReferenceToImportOfFunctionExpression.ts

@@ -0,0 +1,29 @@
+// @noEmit: true
+// @allowjs: true
+// @checkjs: true
+
+// @Filename: MW.js
+/** @typedef {import("./MC")} MC */
+
+class MW {
+  /**
+   * @param {MC} compiler the compiler
+   */
+  constructor(compiler) {
+    this.compiler = compiler;
+  }
+}
+
+module.exports = MW;
+
+// @Filename: MC.js
+const MW = require("./MW");
+
+/** @typedef {number} Meyerhauser */
+
+/** @class */
+module.exports = function MC() {
+    /** @type {any} */
+    var x = {}
+    return new MW(x);
+};