microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-09 07:21:18 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

fix parsing of leading union/intersection operator (#31265)

Browse Source 
* fix parsing of leading union/intersection operator

Fixes: #30995

* test declaration emit
This commit is contained in:
Klaus Meinhardt
2019-05-08 23:09:11 +02:00
committed by Ron Buckton
parent a2c1fea20b
commit 0c9db717ad
8 changed files with 102 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/compiler/parser.ts
View File

@@ -3124,15 +3124,16 @@ namespace ts {
}
function parseUnionOrIntersectionType(kind: SyntaxKind.UnionType | SyntaxKind.IntersectionType, parseConstituentType: () => TypeNode, operator: SyntaxKind.BarToken | SyntaxKind.AmpersandToken): TypeNode {
parseOptional(operator);
const start = scanner.getStartPos();
const hasLeadingOperator = parseOptional(operator);
let type = parseConstituentType();
if (token() === operator) {
if (token() === operator || hasLeadingOperator) {
const types = [type];
while (parseOptional(operator)) {
types.push(parseConstituentType());
}
const node = <UnionOrIntersectionTypeNode>createNode(kind, type.pos);
node.types = createNodeArray(types, type.pos);
const node = <UnionOrIntersectionTypeNode>createNode(kind, start);
node.types = createNodeArray(types, start);
type = finishNode(node);
}
return type;

2
src/testRunner/unittests/jsDocParsing.ts
View File

@@ -37,6 +37,8 @@ namespace ts {
parsesCorrectly("callSignatureInRecordType", "{{(): number}}");
parsesCorrectly("methodInRecordType", "{{foo(): number}}");
parsesCorrectly("unionType", "{(number|string)}");
parsesCorrectly("unionTypeWithLeadingOperator", "{( | number | string )}");
parsesCorrectly("unionTypeWithOneElementAndLeadingOperator", "{( | number )}");
parsesCorrectly("topLevelNoParenUnionType", "{number|string}");
parsesCorrectly("functionType1", "{function()}");
parsesCorrectly("functionType2", "{function(string, boolean)}");