Skip to content

🤖 Cherry-pick PR #34706 into release-3.7 #34708

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
sandersn merged 1 commit into from
Oct 24, 2019
Merged

🤖 Cherry-pick PR #34706 into release-3.7 #34708

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
4 changes: 3 additions & 1 deletion src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10766,7 +10766,9 @@ namespace ts {
&& isCallExpression(decl.initializer)
&& isRequireCall(decl.initializer, /*requireStringLiteralLikeArgument*/ true)
&& valueType.symbol;
if (isRequireAlias || node.kind === SyntaxKind.ImportType) {
const isImportType = node.kind === SyntaxKind.ImportType;
const isDelayedMergeClass = symbol !== valueType.symbol && getMergedSymbol(symbol) === valueType.symbol;
if (isRequireAlias || isImportType || isDelayedMergeClass) {
typeType = getTypeReferenceType(node, valueType.symbol);
}
}
Expand Down
35 changes: 35 additions & 0 deletions tests/baselines/reference/jsdocTypeReferenceToMergedClass.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
=== tests/cases/conformance/jsdoc/test.js ===
// https://github.com/microsoft/TypeScript/issues/34685

/** @param {Workspace.Project} p */
function demo(p) {
>demo : Symbol(demo, Decl(test.js, 0, 0))
>p : Symbol(p, Decl(test.js, 3, 14))

p.isServiceProject()
>p.isServiceProject : Symbol(isServiceProject, Decl(mod1.js, 3, 31))
>p : Symbol(p, Decl(test.js, 3, 14))
>isServiceProject : Symbol(isServiceProject, Decl(mod1.js, 3, 31))
}
=== tests/cases/conformance/jsdoc/mod1.js ===
// Note: mod1.js needs to appear second to trigger the bug
var Workspace = {}
>Workspace : Symbol(Workspace, Decl(mod1.js, 1, 3), Decl(mod1.js, 1, 18), Decl(mod1.js, 2, 37))

Workspace.Project = function wp() { }
>Workspace.Project : Symbol(Workspace.Project, Decl(mod1.js, 1, 18), Decl(mod1.js, 3, 10))
>Workspace : Symbol(Workspace, Decl(mod1.js, 1, 3), Decl(mod1.js, 1, 18), Decl(mod1.js, 2, 37))
>Project : Symbol(Workspace.Project, Decl(mod1.js, 1, 18), Decl(mod1.js, 3, 10))
>wp : Symbol(wp, Decl(mod1.js, 2, 19))

Workspace.Project.prototype = {
>Workspace.Project.prototype : Symbol(Workspace.Project.prototype, Decl(mod1.js, 2, 37))
>Workspace.Project : Symbol(Workspace.Project, Decl(mod1.js, 1, 18), Decl(mod1.js, 3, 10))
>Workspace : Symbol(Workspace, Decl(mod1.js, 1, 3), Decl(mod1.js, 1, 18), Decl(mod1.js, 2, 37))
>Project : Symbol(Workspace.Project, Decl(mod1.js, 1, 18), Decl(mod1.js, 3, 10))
>prototype : Symbol(Workspace.Project.prototype, Decl(mod1.js, 2, 37))

isServiceProject() {}
>isServiceProject : Symbol(isServiceProject, Decl(mod1.js, 3, 31))
}

41 changes: 41 additions & 0 deletions tests/baselines/reference/jsdocTypeReferenceToMergedClass.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
=== tests/cases/conformance/jsdoc/test.js ===
// https://github.com/microsoft/TypeScript/issues/34685

/** @param {Workspace.Project} p */
function demo(p) {
>demo : (p: wp) => void
>p : wp

p.isServiceProject()
>p.isServiceProject() : void
>p.isServiceProject : () => void
>p : wp
>isServiceProject : () => void
}
=== tests/cases/conformance/jsdoc/mod1.js ===
// Note: mod1.js needs to appear second to trigger the bug
var Workspace = {}
>Workspace : typeof Workspace
>{} : {}

Workspace.Project = function wp() { }
>Workspace.Project = function wp() { } : typeof wp
>Workspace.Project : typeof wp
>Workspace : typeof Workspace
>Project : typeof wp
>function wp() { } : typeof wp
>wp : typeof wp

Workspace.Project.prototype = {
>Workspace.Project.prototype = { isServiceProject() {}} : { isServiceProject(): void; }
>Workspace.Project.prototype : { isServiceProject(): void; }
>Workspace.Project : typeof wp
>Workspace : typeof Workspace
>Project : typeof wp
>prototype : { isServiceProject(): void; }
>{ isServiceProject() {}} : { isServiceProject(): void; }

isServiceProject() {}
>isServiceProject : () => void
}

17 changes: 17 additions & 0 deletions tests/cases/conformance/jsdoc/jsdocTypeReferenceToMergedClass.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// https://github.com/microsoft/TypeScript/issues/34685
// @noEmit: true
// @allowJs: true
// @checkJs: true

// @Filename: test.js
/** @param {Workspace.Project} p */
function demo(p) {
p.isServiceProject()
}
// @Filename: mod1.js
// Note: mod1.js needs to appear second to trigger the bug
var Workspace = {}
Workspace.Project = function wp() { }
Workspace.Project.prototype = {
isServiceProject() {}
}