Skip to content

Parse nested prop and param tags the same way #25139

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
Jun 21, 2018
Merged

Parse nested prop and param tags the same way #25139

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: 2 additions & 2 deletions src/compiler/parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6922,9 +6922,9 @@ namespace ts {
case SyntaxKind.AtToken:
if (canParseTag) {
const child = tryParseChildTag(target);
if (child && child.kind === SyntaxKind.JSDocParameterTag &&
if (child && (child.kind === SyntaxKind.JSDocParameterTag || child.kind === SyntaxKind.JSDocPropertyTag) &&
target !== PropertyLikeParse.CallbackParameter &&
(ts.isIdentifier(child.name) || !escapedTextsEqual(name!, child.name.left))) { // TODO: GH#18217
name && (ts.isIdentifier(child.name) || !escapedTextsEqual(name, child.name.left))) {
return false;
}
return child;
Expand Down
32 changes: 31 additions & 1 deletion tests/baselines/reference/typedefTagNested.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,38 @@ const app = {
* @property {string} horrible
* @type {string} idea
*/
var intercessor = 1
>intercessor : Symbol(intercessor, Decl(a.js, 23, 3))

/** @type {Opp} */
var mistake;
>mistake : Symbol(mistake, Decl(a.js, 25, 3))
>mistake : Symbol(mistake, Decl(a.js, 26, 3))

/** @typedef {Object} Upp
* @property {string} name
* @property {Object} not
* @property {string} nested
*/

/** @type {Upp} */
var sala = { name: 'uppsala', not: 0, nested: "ok" };
>sala : Symbol(sala, Decl(a.js, 35, 3))
>name : Symbol(name, Decl(a.js, 35, 12))
>not : Symbol(not, Decl(a.js, 35, 29))
>nested : Symbol(nested, Decl(a.js, 35, 37))

sala.name
>sala.name : Symbol(name, Decl(a.js, 29, 3))
>sala : Symbol(sala, Decl(a.js, 35, 3))
>name : Symbol(name, Decl(a.js, 29, 3))

sala.not
>sala.not : Symbol(not, Decl(a.js, 30, 3))
>sala : Symbol(sala, Decl(a.js, 35, 3))
>not : Symbol(not, Decl(a.js, 30, 3))

sala.nested
>sala.nested : Symbol(nested, Decl(a.js, 31, 3))
>sala : Symbol(sala, Decl(a.js, 35, 3))
>nested : Symbol(nested, Decl(a.js, 31, 3))

37 changes: 36 additions & 1 deletion tests/baselines/reference/typedefTagNested.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,43 @@ const app = {
* @property {string} horrible
* @type {string} idea
*/
var intercessor = 1
>intercessor : number
>1 : 1

/** @type {Opp} */
var mistake;
>mistake : Opp
>mistake : string

/** @typedef {Object} Upp
* @property {string} name
* @property {Object} not
* @property {string} nested
*/

/** @type {Upp} */
var sala = { name: 'uppsala', not: 0, nested: "ok" };
>sala : Upp
>{ name: 'uppsala', not: 0, nested: "ok" } : { name: string; not: number; nested: string; }
>name : string
>'uppsala' : "uppsala"
>not : number
>0 : 0
>nested : string
>"ok" : "ok"

sala.name
>sala.name : string
>sala : Upp
>name : string

sala.not
>sala.not : any
>sala : Upp
>not : any

sala.nested
>sala.nested : string
>sala : Upp
>nested : string

13 changes: 13 additions & 0 deletions tests/cases/conformance/jsdoc/typedefTagNested.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,19 @@ const app = {
* @property {string} horrible
* @type {string} idea
*/
var intercessor = 1

/** @type {Opp} */
var mistake;

/** @typedef {Object} Upp
* @property {string} name
* @property {Object} not
* @property {string} nested
*/

/** @type {Upp} */
var sala = { name: 'uppsala', not: 0, nested: "ok" };
sala.name
sala.not
sala.nested