Skip to content

Commit d876fcc

Browse files
rbucktonrbuckton
committed
Merge branch 'fix15857' of https://github.com/Microsoft/TypeScript into fix15857
2 parents 636cd7c + 6159206 commit d876fcc

21 files changed

Lines changed: 175 additions & 94 deletions

‎.travis.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ branches:
2121
- release-2.3
2222

2323
install:
24-
- npm uninstall typescript
25-
- npm uninstall tslint
24+
- npm uninstall typescript --no-save
25+
- npm uninstall tslint --no-save
2626
- npm install
2727

2828
cache:

‎jenkins.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
# Set up NVM
44
export NVM_DIR="/home/dotnet-bot/.nvm"
5-
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
5+
[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
66

77
nvm install $1
88

9-
npm uninstall typescript
10-
npm uninstall tslint
9+
npm uninstall typescript --no-save
10+
npm uninstall tslint --no-save
1111
npm install
1212
npm update
1313
npm test

‎src/compiler/parser.ts‎

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6510,7 +6510,7 @@ namespace ts {
65106510
case "arg":
65116511
case "argument":
65126512
case "param":
6513-
tag = parseParamTag(atToken, tagName);
6513+
tag = parseParameterOrPropertyTag(atToken, tagName, /*shouldParseParamTag*/ true);
65146514
break;
65156515
case "return":
65166516
case "returns":
@@ -6655,11 +6655,12 @@ namespace ts {
66556655
return { name, isBracketed };
66566656
}
66576657

6658-
function parseParamTag(atToken: AtToken, tagName: Identifier) {
6658+
function parseParameterOrPropertyTag(atToken: AtToken, tagName: Identifier, shouldParseParamTag: boolean): JSDocPropertyTag | JSDocParameterTag {
66596659
let typeExpression = tryParseTypeExpression();
66606660
skipWhitespace();
66616661

66626662
const { name, isBracketed } = parseBracketNameInPropertyAndParamTag();
6663+
skipWhitespace();
66636664

66646665
if (!name) {
66656666
parseErrorAtPosition(scanner.getStartPos(), 0, Diagnostics.Identifier_expected);
@@ -6678,13 +6679,15 @@ namespace ts {
66786679
typeExpression = tryParseTypeExpression();
66796680
}
66806681

6681-
const result = <JSDocParameterTag>createNode(SyntaxKind.JSDocParameterTag, atToken.pos);
6682+
const result = shouldParseParamTag ?
6683+
<JSDocParameterTag>createNode(SyntaxKind.JSDocParameterTag, atToken.pos) :
6684+
<JSDocPropertyTag>createNode(SyntaxKind.JSDocPropertyTag, atToken.pos);
66826685
result.atToken = atToken;
66836686
result.tagName = tagName;
66846687
result.preParameterName = preName;
66856688
result.typeExpression = typeExpression;
66866689
result.postParameterName = postName;
6687-
result.parameterName = postName || preName;
6690+
result.name = postName || preName;
66886691
result.isBracketed = isBracketed;
66896692
return finishNode(result);
66906693
}
@@ -6713,26 +6716,6 @@ namespace ts {
67136716
return finishNode(result);
67146717
}
67156718

6716-
function parsePropertyTag(atToken: AtToken, tagName: Identifier): JSDocPropertyTag {
6717-
const typeExpression = tryParseTypeExpression();
6718-
skipWhitespace();
6719-
const { name, isBracketed } = parseBracketNameInPropertyAndParamTag();
6720-
skipWhitespace();
6721-
6722-
if (!name) {
6723-
parseErrorAtPosition(scanner.getStartPos(), /*length*/ 0, Diagnostics.Identifier_expected);
6724-
return undefined;
6725-
}
6726-
6727-
const result = <JSDocPropertyTag>createNode(SyntaxKind.JSDocPropertyTag, atToken.pos);
6728-
result.atToken = atToken;
6729-
result.tagName = tagName;
6730-
result.name = name;
6731-
result.typeExpression = typeExpression;
6732-
result.isBracketed = isBracketed;
6733-
return finishNode(result);
6734-
}
6735-
67366719
function parseAugmentsTag(atToken: AtToken, tagName: Identifier): JSDocAugmentsTag {
67376720
const typeExpression = tryParseTypeExpression();
67386721

@@ -6869,7 +6852,7 @@ namespace ts {
68696852
return true;
68706853
case "prop":
68716854
case "property":
6872-
const propertyTag = parsePropertyTag(atToken, tagName);
6855+
const propertyTag = parseParameterOrPropertyTag(atToken, tagName, /*shouldParseParamTag*/ false) as JSDocPropertyTag;
68736856
if (propertyTag) {
68746857
if (!parentTag.jsDocPropertyTags) {
68756858
parentTag.jsDocPropertyTags = <NodeArray<JSDocPropertyTag>>[];

‎src/compiler/types.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2145,6 +2145,10 @@ namespace ts {
21452145
parent: JSDoc;
21462146
kind: SyntaxKind.JSDocPropertyTag;
21472147
name: Identifier;
2148+
/** the parameter name, if provided *before* the type (TypeScript-style) */
2149+
preParameterName?: Identifier;
2150+
/** the parameter name, if provided *after* the type (JSDoc-standard) */
2151+
postParameterName?: Identifier;
21482152
typeExpression: JSDocTypeExpression;
21492153
isBracketed: boolean;
21502154
}
@@ -2163,7 +2167,7 @@ namespace ts {
21632167
/** the parameter name, if provided *after* the type (JSDoc-standard) */
21642168
postParameterName?: Identifier;
21652169
/** the parameter name, regardless of the location it was provided */
2166-
parameterName: Identifier;
2170+
name: Identifier;
21672171
isBracketed: boolean;
21682172
}
21692173

‎src/compiler/utilities.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1651,7 +1651,7 @@ namespace ts {
16511651
}
16521652
else if (param.name.kind === SyntaxKind.Identifier) {
16531653
const name = (param.name as Identifier).text;
1654-
return filter(tags, tag => tag.kind === SyntaxKind.JSDocParameterTag && tag.parameterName.text === name);
1654+
return filter(tags, tag => tag.kind === SyntaxKind.JSDocParameterTag && tag.name.text === name);
16551655
}
16561656
else {
16571657
// TODO: it's a destructured parameter, so it should look up an "object type" series of multiple lines
@@ -1662,7 +1662,7 @@ namespace ts {
16621662

16631663
/** Does the opposite of `getJSDocParameterTags`: given a JSDoc parameter, finds the parameter corresponding to it. */
16641664
export function getParameterFromJSDoc(node: JSDocParameterTag): ParameterDeclaration | undefined {
1665-
const name = node.parameterName.text;
1665+
const name = node.name.text;
16661666
const grandParent = node.parent!.parent!;
16671667
Debug.assert(node.parent!.kind === SyntaxKind.JSDocComment);
16681668
if (!isFunctionLike(grandParent)) {

‎tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argSynonymForParamTag.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"0": {
77
"kind": "JSDocParameterTag",
88
"pos": 8,
9-
"end": 27,
9+
"end": 28,
1010
"atToken": {
1111
"kind": "AtToken",
1212
"pos": 8,
@@ -34,7 +34,7 @@
3434
"end": 27,
3535
"text": "name1"
3636
},
37-
"parameterName": {
37+
"name": {
3838
"kind": "Identifier",
3939
"pos": 22,
4040
"end": 27,
@@ -44,6 +44,6 @@
4444
},
4545
"length": 1,
4646
"pos": 8,
47-
"end": 27
47+
"end": 28
4848
}
4949
}

‎tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.argumentSynonymForParamTag.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"0": {
77
"kind": "JSDocParameterTag",
88
"pos": 8,
9-
"end": 32,
9+
"end": 33,
1010
"atToken": {
1111
"kind": "AtToken",
1212
"pos": 8,
@@ -34,7 +34,7 @@
3434
"end": 32,
3535
"text": "name1"
3636
},
37-
"parameterName": {
37+
"name": {
3838
"kind": "Identifier",
3939
"pos": 27,
4040
"end": 32,
@@ -44,6 +44,6 @@
4444
},
4545
"length": 1,
4646
"pos": 8,
47-
"end": 32
47+
"end": 33
4848
}
4949
}

‎tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.oneParamTag.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"0": {
77
"kind": "JSDocParameterTag",
88
"pos": 8,
9-
"end": 29,
9+
"end": 30,
1010
"atToken": {
1111
"kind": "AtToken",
1212
"pos": 8,
@@ -34,7 +34,7 @@
3434
"end": 29,
3535
"text": "name1"
3636
},
37-
"parameterName": {
37+
"name": {
3838
"kind": "Identifier",
3939
"pos": 24,
4040
"end": 29,
@@ -44,6 +44,6 @@
4444
},
4545
"length": 1,
4646
"pos": 8,
47-
"end": 29
47+
"end": 30
4848
}
4949
}

‎tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTag1.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"0": {
77
"kind": "JSDocParameterTag",
88
"pos": 8,
9-
"end": 29,
9+
"end": 30,
1010
"atToken": {
1111
"kind": "AtToken",
1212
"pos": 8,
@@ -34,7 +34,7 @@
3434
"end": 29,
3535
"text": "name1"
3636
},
37-
"parameterName": {
37+
"name": {
3838
"kind": "Identifier",
3939
"pos": 24,
4040
"end": 29,
@@ -44,6 +44,6 @@
4444
},
4545
"length": 1,
4646
"pos": 8,
47-
"end": 29
47+
"end": 30
4848
}
4949
}

‎tests/baselines/reference/JSDocParsing/DocComments.parsesCorrectly.paramTagBracketedName1.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"end": 30,
3535
"text": "name1"
3636
},
37-
"parameterName": {
37+
"name": {
3838
"kind": "Identifier",
3939
"pos": 25,
4040
"end": 30,

0 commit comments

Comments
 (0)