Skip to content
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

Jump to bottom

fix parsing of leading union/intersection operator #31265

Merged
merged 2 commits into from May 8, 2019
Merged

fix parsing of leading union/intersection operator #31265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32590ab
fix parsing of leading union/intersection operator
ajafff May 5, 2019
6157784
test declaration emit
ajafff May 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/compiler/parser.ts
View file
Open in desktop
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions src/testRunner/unittests/jsDocParsing.ts
View file
Open in desktop
Expand Up @@ -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)}");
Expand Down
37 changes: 37 additions & 0 deletions .../reference/JSDocParsing/TypeExpressions.parsesCorrectly.unionTypeWithLeadingOperator.json
View file
Open in desktop
@@ -0,0 +1,37 @@
{
"kind": "ParenthesizedType",
"pos": 1,
"end": 22,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"type": {
"kind": "UnionType",
"pos": 2,
"end": 20,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"types": {
"0": {
"kind": "NumberKeyword",
"pos": 4,
"end": 11,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0
},
"1": {
"kind": "StringKeyword",
"pos": 13,
"end": 20,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0
},
"length": 2,
"pos": 2,
"end": 20
}
}
}
29 changes: 29 additions & 0 deletions ...DocParsing/TypeExpressions.parsesCorrectly.unionTypeWithOneElementAndLeadingOperator.json
View file
Open in desktop
@@ -0,0 +1,29 @@
{
"kind": "ParenthesizedType",
"pos": 1,
"end": 13,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"type": {
"kind": "UnionType",
"pos": 2,
"end": 11,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0,
"types": {
"0": {
"kind": "NumberKeyword",
"pos": 4,
"end": 11,
"flags": "JSDoc",
"modifierFlagsCache": 0,
"transformFlags": 0
},
"length": 1,
"pos": 2,
"end": 11
}
}
}
12 changes: 11 additions & 1 deletion tests/baselines/reference/unionTypeWithLeadingOperator.js
View file
Open in desktop
Expand Up @@ -5,6 +5,16 @@ type B =
| { type: "DECREMENT" };

type C = [| 0 | 1, | "foo" | "bar"];


export type D =
/*leading0*/
| /*leading1*/ 1 /*trailing1*/
| /*leading2*/ 2 /*trailing2*/;

//// [unionTypeWithLeadingOperator.js]
"use strict";
exports.__esModule = true;


//// [unionTypeWithLeadingOperator.d.ts]
export declare type D = /*leading1*/ 1 | /*leading2*/ 2;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why /*trailing1*/ is removed?

6 changes: 6 additions & 0 deletions tests/baselines/reference/unionTypeWithLeadingOperator.symbols
View file
Open in desktop
Expand Up @@ -14,3 +14,9 @@ type B =
type C = [| 0 | 1, | "foo" | "bar"];
>C : Symbol(C, Decl(unionTypeWithLeadingOperator.ts, 3, 26))

export type D =
>D : Symbol(D, Decl(unionTypeWithLeadingOperator.ts, 5, 36))

/*leading0*/
| /*leading1*/ 1 /*trailing1*/
| /*leading2*/ 2 /*trailing2*/;
6 changes: 6 additions & 0 deletions tests/baselines/reference/unionTypeWithLeadingOperator.types
View file
Open in desktop
Expand Up @@ -14,3 +14,9 @@ type B =
type C = [| 0 | 1, | "foo" | "bar"];
>C : [0 | 1, "foo" | "bar"]

export type D =
>D : D

/*leading0*/
| /*leading1*/ 1 /*trailing1*/
| /*leading2*/ 2 /*trailing2*/;
6 changes: 6 additions & 0 deletions tests/cases/compiler/unionTypeWithLeadingOperator.ts
View file
Open in desktop
@@ -1,6 +1,12 @@
// @declaration: true
type A = | string;
type B =
| { type: "INCREMENT" }
| { type: "DECREMENT" };

type C = [| 0 | 1, | "foo" | "bar"];

export type D =
/*leading0*/
| /*leading1*/ 1 /*trailing1*/
| /*leading2*/ 2 /*trailing2*/;