maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Support bracket for optional property

Browse source
This commit is contained in:
Yui T 2017-05-25 22:34:48 -07:00
parent 068256b8b0
commit d68038ad28
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/compiler/binder.ts
View file

@ -2179,7 +2179,7 @@ namespace ts {
return bindPropertyWorker(node as JSDocRecordMember); return bindPropertyWorker(node as JSDocRecordMember);
case SyntaxKind.JSDocPropertyTag: case SyntaxKind.JSDocPropertyTag:
return declareSymbolAndAddToSymbolTable(node as JSDocPropertyTag, return declareSymbolAndAddToSymbolTable(node as JSDocPropertyTag,
(node as JSDocPropertyTag).typeExpression && (node as JSDocPropertyTag).typeExpression.type.kind === SyntaxKind.JSDocOptionalType ? (node as JSDocPropertyTag).isBracketed || ((node as JSDocPropertyTag).typeExpression && (node as JSDocPropertyTag).typeExpression.type.kind === SyntaxKind.JSDocOptionalType) ?
SymbolFlags.Property | SymbolFlags.Optional : SymbolFlags.Property, SymbolFlags.Property | SymbolFlags.Optional : SymbolFlags.Property,
SymbolFlags.PropertyExcludes); SymbolFlags.PropertyExcludes);
case SyntaxKind.JSDocFunctionType: case SyntaxKind.JSDocFunctionType:

17
src/compiler/parser.ts
View file

@ -6631,10 +6631,7 @@ namespace ts {
}); });
} }
function parseParamTag(atToken: AtToken, tagName: Identifier) { function parseBracketNameInPropertyAndParamTag() {
let typeExpression = tryParseTypeExpression();
skipWhitespace();
let name: Identifier; let name: Identifier;
let isBracketed: boolean; let isBracketed: boolean;
// Looking for something like '[foo]' or 'foo' // Looking for something like '[foo]' or 'foo'
@ -6653,6 +6650,14 @@ namespace ts {
else if (tokenIsIdentifierOrKeyword(token())) { else if (tokenIsIdentifierOrKeyword(token())) {
name = parseJSDocIdentifierName(); name = parseJSDocIdentifierName();
} }
return { name, isBracketed };
}
function parseParamTag(atToken: AtToken, tagName: Identifier) {
let typeExpression = tryParseTypeExpression();
skipWhitespace();
const { name, isBracketed } = parseBracketNameInPropertyAndParamTag();
if (!name) { if (!name) {
parseErrorAtPosition(scanner.getStartPos(), 0, Diagnostics.Identifier_expected); parseErrorAtPosition(scanner.getStartPos(), 0, Diagnostics.Identifier_expected);
@ -6709,8 +6714,9 @@ namespace ts {
function parsePropertyTag(atToken: AtToken, tagName: Identifier): JSDocPropertyTag { function parsePropertyTag(atToken: AtToken, tagName: Identifier): JSDocPropertyTag {
const typeExpression = tryParseTypeExpression(); const typeExpression = tryParseTypeExpression();
skipWhitespace(); skipWhitespace();
const name = parseJSDocIdentifierName(); const { name, isBracketed } = parseBracketNameInPropertyAndParamTag();
skipWhitespace(); skipWhitespace();
if (!name) { if (!name) {
parseErrorAtPosition(scanner.getStartPos(), /*length*/ 0, Diagnostics.Identifier_expected); parseErrorAtPosition(scanner.getStartPos(), /*length*/ 0, Diagnostics.Identifier_expected);
return undefined; return undefined;
@ -6721,6 +6727,7 @@ namespace ts {
result.tagName = tagName; result.tagName = tagName;
result.name = name; result.name = name;
result.typeExpression = typeExpression; result.typeExpression = typeExpression;
result.isBracketed = isBracketed;
return finishNode(result); return finishNode(result);
} }

1
src/compiler/types.ts
View file

@ -2143,6 +2143,7 @@ namespace ts {
kind: SyntaxKind.JSDocPropertyTag; kind: SyntaxKind.JSDocPropertyTag;
name: Identifier; name: Identifier;
typeExpression: JSDocTypeExpression; typeExpression: JSDocTypeExpression;
isBracketed: boolean;
} }
export interface JSDocTypeLiteral extends JSDocType { export interface JSDocTypeLiteral extends JSDocType {