Skip to content

🤖 Cherry-pick PR #33240 into release-3.6 #33244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 4, 2019
Merged

🤖 Cherry-pick PR #33240 into release-3.6 #33244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion src/compiler/binder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1815,7 +1815,23 @@ namespace ts {
if (isTopLevel) {
bindPotentiallyMissingNamespaces(file.symbol, declName.parent, isTopLevel, !!findAncestor(declName, d => isPropertyAccessExpression(d) && d.name.escapedText === "prototype"));
const oldContainer = container;
container = isPropertyAccessExpression(declName.parent.expression) ? declName.parent.expression.name : declName.parent.expression;
switch (getAssignmentDeclarationPropertyAccessKind(declName.parent)) {
case AssignmentDeclarationKind.ExportsProperty:
case AssignmentDeclarationKind.ModuleExports:
container = file;
break;
case AssignmentDeclarationKind.ThisProperty:
container = declName.parent.expression;
break;
case AssignmentDeclarationKind.PrototypeProperty:
container = (declName.parent.expression as PropertyAccessExpression).name;
break;
case AssignmentDeclarationKind.Property:
container = isPropertyAccessExpression(declName.parent.expression) ? declName.parent.expression.name : declName.parent.expression;
break;
case AssignmentDeclarationKind.None:
return Debug.fail("Shouldn't have detected typedef or enum on non-assignment declaration");
}
declareModuleMember(typeAlias, SymbolFlags.TypeAlias, SymbolFlags.TypeAliasExcludes);
container = oldContainer;
}
Expand Down
15 changes: 15 additions & 0 deletions tests/baselines/reference/enumTagOnExports.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
=== tests/cases/conformance/jsdoc/enumTagOnExports.js ===
/** @enum {number} */
exports.a = {};
>exports.a : Symbol(a, Decl(enumTagOnExports.js, 0, 0), Decl(enumTagOnExports.js, 1, 8), Decl(enumTagOnExports.js, 0, 4))
>exports : Symbol(a, Decl(enumTagOnExports.js, 0, 0), Decl(enumTagOnExports.js, 1, 8), Decl(enumTagOnExports.js, 0, 4))
>a : Symbol(a, Decl(enumTagOnExports.js, 0, 0), Decl(enumTagOnExports.js, 1, 8), Decl(enumTagOnExports.js, 0, 4))

/** @enum {string} */
module.exports.b = {};
>module.exports.b : Symbol(b, Decl(enumTagOnExports.js, 1, 15), Decl(enumTagOnExports.js, 4, 15), Decl(enumTagOnExports.js, 3, 4))
>module.exports : Symbol(b, Decl(enumTagOnExports.js, 1, 15), Decl(enumTagOnExports.js, 4, 15), Decl(enumTagOnExports.js, 3, 4))
>module : Symbol(module, Decl(enumTagOnExports.js, 1, 15))
>exports : Symbol("tests/cases/conformance/jsdoc/enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
>b : Symbol(b, Decl(enumTagOnExports.js, 1, 15), Decl(enumTagOnExports.js, 4, 15), Decl(enumTagOnExports.js, 3, 4))

19 changes: 19 additions & 0 deletions tests/baselines/reference/enumTagOnExports.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
=== tests/cases/conformance/jsdoc/enumTagOnExports.js ===
/** @enum {number} */
exports.a = {};
>exports.a = {} : {}
>exports.a : typeof a
>exports : typeof import("tests/cases/conformance/jsdoc/enumTagOnExports")
>a : typeof a
>{} : {}

/** @enum {string} */
module.exports.b = {};
>module.exports.b = {} : {}
>module.exports.b : typeof b
>module.exports : typeof import("tests/cases/conformance/jsdoc/enumTagOnExports")
>module : { "tests/cases/conformance/jsdoc/enumTagOnExports": typeof import("tests/cases/conformance/jsdoc/enumTagOnExports"); }
>exports : typeof import("tests/cases/conformance/jsdoc/enumTagOnExports")
>b : typeof b
>{} : {}

7 changes: 7 additions & 0 deletions tests/baselines/reference/enumTagOnExports2.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
=== tests/cases/conformance/jsdoc/enumTagOnExports.js ===
/** @enum {string} */
module.exports = {};
>module.exports : Symbol("tests/cases/conformance/jsdoc/enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))
>module : Symbol(module, Decl(enumTagOnExports.js, 0, 0))
>exports : Symbol("tests/cases/conformance/jsdoc/enumTagOnExports", Decl(enumTagOnExports.js, 0, 0))

9 changes: 9 additions & 0 deletions tests/baselines/reference/enumTagOnExports2.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
=== tests/cases/conformance/jsdoc/enumTagOnExports.js ===
/** @enum {string} */
module.exports = {};
>module.exports = {} : typeof import("tests/cases/conformance/jsdoc/enumTagOnExports")
>module.exports : typeof import("tests/cases/conformance/jsdoc/enumTagOnExports")
>module : { "tests/cases/conformance/jsdoc/enumTagOnExports": typeof import("tests/cases/conformance/jsdoc/enumTagOnExports"); }
>exports : typeof import("tests/cases/conformance/jsdoc/enumTagOnExports")
>{} : {}

10 changes: 10 additions & 0 deletions tests/cases/conformance/jsdoc/enumTagOnExports.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// @filename: enumTagOnExports.js
// @allowjs: true
// @checkjs: true
// @noemit: true

/** @enum {number} */
exports.a = {};

/** @enum {string} */
module.exports.b = {};
7 changes: 7 additions & 0 deletions tests/cases/conformance/jsdoc/enumTagOnExports2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
// @filename: enumTagOnExports.js
// @allowjs: true
// @checkjs: true
// @noemit: true

/** @enum {string} */
module.exports = {};