cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make comment props more consistent (#7246)

Browse Source
This commit is contained in:
Brian Ng 2018-01-26 09:39:52 -06:00 committed by Henry Zhu
parent ca18ea5e79
commit fa5eb4f605
80 changed files with 160 additions and 345 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/babylon/src/parser/comments.js
View File

@ -64,16 +64,14 @@ export default class CommentsParser extends BaseParser {
// later. // later.
this.state.trailingComments.length = 0; this.state.trailingComments.length = 0;
} }
} else { } else if (stack.length > 0) {
if (stack.length > 0) { const lastInStack = last(stack);
const lastInStack = last(stack); if (
if ( lastInStack.trailingComments &&
lastInStack.trailingComments && lastInStack.trailingComments[0].start >= node.end
lastInStack.trailingComments[0].start >= node.end ) {
) { trailingComments = lastInStack.trailingComments;
trailingComments = lastInStack.trailingComments; delete lastInStack.trailingComments;
lastInStack.trailingComments = null;
}
} }
} }
@ -143,7 +141,7 @@ export default class CommentsParser extends BaseParser {
last(lastChild.leadingComments).end <= node.start last(lastChild.leadingComments).end <= node.start
) { ) {
node.leadingComments = lastChild.leadingComments; node.leadingComments = lastChild.leadingComments;
lastChild.leadingComments = null; delete lastChild.leadingComments;
} else { } else {
// A leading comment for an anonymous class had been stolen by its first ClassMethod, // A leading comment for an anonymous class had been stolen by its first ClassMethod,
// so this takes back the leading comment. // so this takes back the leading comment.
@ -196,8 +194,10 @@ export default class CommentsParser extends BaseParser {
// result in an empty array, and if so, the array must be // result in an empty array, and if so, the array must be
// deleted. // deleted.
const leadingComments = this.state.leadingComments.slice(0, i); const leadingComments = this.state.leadingComments.slice(0, i);
node.leadingComments =
leadingComments.length === 0 ? null : leadingComments; if (leadingComments.length) {
node.leadingComments = leadingComments;
}
// Similarly, trailing comments are attached later. The variable // Similarly, trailing comments are attached later. The variable
// must be reset to null if there are no trailing comments. // must be reset to null if there are no trailing comments.

6
packages/babylon/src/parser/node.js
View File

@ -24,9 +24,9 @@ class Node implements NodeBase {
end: number; end: number;
loc: SourceLocation; loc: SourceLocation;
range: [number, number]; range: [number, number];
leadingComments: ?Array<Comment>; leadingComments: Array<Comment>;
trailingComments: ?Array<Comment>; trailingComments: Array<Comment>;
innerComments: ?Array<Comment>; innerComments: Array<Comment>;
extra: { [key: string]: any }; extra: { [key: string]: any };
__clone(): this { __clone(): this {

6
packages/babylon/src/types.js
View File

@ -26,9 +26,9 @@ export interface NodeBase {
end: number; end: number;
loc: SourceLocation; loc: SourceLocation;
range: [number, number]; range: [number, number];
leadingComments?: ?Array<Comment>; leadingComments?: Array<Comment>;
trailingComments?: ?Array<Comment>; trailingComments?: Array<Comment>;
innerComments?: ?Array<Comment>; innerComments?: Array<Comment>;
extra: { [key: string]: any }; extra: { [key: string]: any };
} }

1
packages/babylon/test/expressions/is-expression-babylon/pass/5/output.json
View File

@ -14,7 +14,6 @@
"identifierName": "abc" "identifierName": "abc"
}, },
"name": "abc", "name": "abc",
"leadingComments": null,
"trailingComments": [ "trailingComments": [
{ {
"type": "CommentLine", "type": "CommentLine",

9
packages/babylon/test/fixtures/comments/basic/export-default-anonymous-class/output.json vendored
View File

@ -103,8 +103,7 @@
}, },
"identifierName": "method1" "identifierName": "method1"
}, },
"name": "method1", "name": "method1"
"leadingComments": null
}, },
"computed": false, "computed": false,
"kind": "method", "kind": "method",
@ -148,10 +147,8 @@
} }
] ]
} }
], ]
"leadingComments": null }
},
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

6
packages/babylon/test/fixtures/comments/basic/object-property-trailing-comma/output.json vendored
View File

@ -174,8 +174,7 @@
}, },
"identifierName": "b" "identifierName": "b"
}, },
"name": "b", "name": "b"
"leadingComments": null
}, },
"computed": false, "computed": false,
"shorthand": false, "shorthand": false,
@ -248,8 +247,7 @@
}, },
"identifierName": "c" "identifierName": "c"
}, },
"name": "c", "name": "c"
"leadingComments": null
}, },
"computed": false, "computed": false,
"shorthand": false, "shorthand": false,

6
packages/babylon/test/fixtures/comments/basic/shebang-import/output.json vendored
View File

@ -72,8 +72,7 @@
}, },
"identifierName": "spawn" "identifierName": "spawn"
}, },
"name": "spawn", "name": "spawn"
"leadingComments": null
}, },
"local": { "local": {
"type": "Identifier", "type": "Identifier",
@ -91,8 +90,7 @@
"identifierName": "spawn" "identifierName": "spawn"
}, },
"name": "spawn" "name": "spawn"
}, }
"leadingComments": null
} }
], ],
"source": { "source": {

10
packages/babylon/test/fixtures/comments/basic/shebang-object/output.json vendored
View File

@ -102,8 +102,7 @@
}, },
"identifierName": "spawn" "identifierName": "spawn"
}, },
"name": "spawn", "name": "spawn"
"leadingComments": null
}, },
"computed": false, "computed": false,
"shorthand": true, "shorthand": true,
@ -124,13 +123,11 @@
}, },
"name": "spawn" "name": "spawn"
}, },
"leadingComments": null,
"extra": { "extra": {
"shorthand": true "shorthand": true
} }
} }
], ]
"leadingComments": null
}, },
"init": { "init": {
"type": "Identifier", "type": "Identifier",
@ -148,8 +145,7 @@
"identifierName": "x" "identifierName": "x"
}, },
"name": "x" "name": "x"
}, }
"leadingComments": null
} }
], ],
"kind": "var", "kind": "var",

6
packages/babylon/test/fixtures/comments/basic/surrounding-call-comments/output.json vendored
View File

@ -120,11 +120,9 @@
}, },
"identifierName": "foo" "identifierName": "foo"
}, },
"name": "foo", "name": "foo"
"leadingComments": null
}, },
"arguments": [], "arguments": []
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

3
packages/babylon/test/fixtures/comments/basic/surrounding-throw-comments/output.json vendored
View File

@ -109,8 +109,7 @@
"rawValue": 55, "rawValue": 55,
"raw": "55" "raw": "55"
}, },
"value": 55, "value": 55
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

13
packages/babylon/test/fixtures/comments/basic/surrounding-while-loop-comments/output.json vendored
View File

@ -105,8 +105,7 @@
"column": 41 "column": 41
} }
}, },
"value": true, "value": true
"leadingComments": null
}, },
"body": { "body": {
"type": "BlockStatement", "type": "BlockStatement",
@ -123,9 +122,7 @@
} }
}, },
"body": [], "body": [],
"directives": [], "directives": []
"leadingComments": null,
"trailingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -208,11 +205,9 @@
}, },
"identifierName": "each" "identifierName": "each"
}, },
"name": "each", "name": "each"
"leadingComments": null
}, },
"init": null, "init": null
"leadingComments": null
} }
], ],
"kind": "var", "kind": "var",

6
packages/babylon/test/fixtures/comments/basic/switch-fallthrough-comment-in-function/output.json vendored
View File

@ -160,8 +160,7 @@
"rawValue": 1, "rawValue": 1,
"raw": "1" "raw": "1"
}, },
"value": 1, "value": 1
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -282,8 +281,7 @@
"rawValue": 2, "rawValue": 2,
"raw": "2" "raw": "2"
}, },
"value": 2, "value": 2
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

6
packages/babylon/test/fixtures/comments/basic/switch-fallthrough-comment/output.json vendored
View File

@ -93,8 +93,7 @@
"rawValue": 1, "rawValue": 1,
"raw": "1" "raw": "1"
}, },
"value": 1, "value": 1
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -215,8 +214,7 @@
"rawValue": 2, "rawValue": 2,
"raw": "2" "raw": "2"
}, },
"value": 2, "value": 2
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

6
packages/babylon/test/fixtures/comments/basic/switch-function-call-no-semicolon-no-default/output.json vendored
View File

@ -174,10 +174,8 @@
}, },
"value": "1" "value": "1"
} }
], ]
"trailingComments": null }
},
"trailingComments": null
} }
], ],
"test": { "test": {

9
packages/babylon/test/fixtures/comments/basic/switch-function-call-no-semicolon/output.json vendored
View File

@ -174,10 +174,8 @@
}, },
"value": "1" "value": "1"
} }
], ]
"trailingComments": null }
},
"trailingComments": null
} }
], ],
"test": { "test": {
@ -248,8 +246,7 @@
"column": 10 "column": 10
} }
}, },
"label": null, "label": null
"leadingComments": null
} }
], ],
"test": null, "test": null,

4
packages/babylon/test/fixtures/comments/basic/switch-no-default-comment-in-function/output.json vendored
View File

@ -209,9 +209,7 @@
"column": 18 "column": 18
} }
}, },
"label": null, "label": null
"leadingComments": null,
"trailingComments": null
} }
], ],
"test": { "test": {

3
packages/babylon/test/fixtures/comments/basic/switch-no-default-comment-in-nested-functions/output.json vendored
View File

@ -537,8 +537,7 @@
"computed": true "computed": true
} }
] ]
}, }
"trailingComments": null
} }
], ],
"test": { "test": {

4
packages/babylon/test/fixtures/comments/basic/switch-no-default-comment/output.json vendored
View File

@ -89,9 +89,7 @@
"column": 14 "column": 14
} }
}, },
"label": null, "label": null
"leadingComments": null,
"trailingComments": null
} }
], ],
"test": { "test": {

6
packages/babylon/test/fixtures/core/categorized/filename-specified/output.json vendored
View File

@ -77,8 +77,7 @@
"filename": "path/to/input-file.js", "filename": "path/to/input-file.js",
"identifierName": "node" "identifierName": "node"
}, },
"name": "node", "name": "node"
"leadingComments": null
}, },
"init": { "init": {
"type": "StringLiteral", "type": "StringLiteral",
@ -100,8 +99,7 @@
"raw": "\"shouldHaveFilenameLocProp\"" "raw": "\"shouldHaveFilenameLocProp\""
}, },
"value": "shouldHaveFilenameLocProp" "value": "shouldHaveFilenameLocProp"
}, }
"leadingComments": null
} }
], ],
"kind": "var", "kind": "var",

4
packages/babylon/test/fixtures/core/uncategorised/302/output.json vendored
View File

@ -72,9 +72,7 @@
}, },
"identifierName": "x" "identifierName": "x"
}, },
"name": "x", "name": "x"
"leadingComments": null,
"trailingComments": null
}, },
"init": null, "init": null,
"trailingComments": [ "trailingComments": [

4
packages/babylon/test/fixtures/core/uncategorised/305/output.json vendored
View File

@ -88,7 +88,6 @@
} }
}, },
"label": null, "label": null,
"leadingComments": null,
"trailingComments": [ "trailingComments": [
{ {
"type": "CommentLine", "type": "CommentLine",
@ -137,8 +136,7 @@
}, },
"identifierName": "there" "identifierName": "there"
}, },
"name": "there", "name": "there"
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

4
packages/babylon/test/fixtures/core/uncategorised/306/output.json vendored
View File

@ -88,7 +88,6 @@
} }
}, },
"label": null, "label": null,
"leadingComments": null,
"trailingComments": [ "trailingComments": [
{ {
"type": "CommentBlock", "type": "CommentBlock",
@ -137,8 +136,7 @@
}, },
"identifierName": "there" "identifierName": "there"
}, },
"name": "there", "name": "there"
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

4
packages/babylon/test/fixtures/core/uncategorised/308/output.json vendored
View File

@ -88,7 +88,6 @@
} }
}, },
"label": null, "label": null,
"leadingComments": null,
"trailingComments": [ "trailingComments": [
{ {
"type": "CommentLine", "type": "CommentLine",
@ -137,8 +136,7 @@
}, },
"identifierName": "there" "identifierName": "there"
}, },
"name": "there", "name": "there"
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

4
packages/babylon/test/fixtures/core/uncategorised/309/output.json vendored
View File

@ -88,7 +88,6 @@
} }
}, },
"label": null, "label": null,
"leadingComments": null,
"trailingComments": [ "trailingComments": [
{ {
"type": "CommentBlock", "type": "CommentBlock",
@ -137,8 +136,7 @@
}, },
"identifierName": "there" "identifierName": "there"
}, },
"name": "there", "name": "there"
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

4
packages/babylon/test/fixtures/core/uncategorised/311/output.json vendored
View File

@ -90,7 +90,6 @@
} }
}, },
"argument": null, "argument": null,
"leadingComments": null,
"trailingComments": [ "trailingComments": [
{ {
"type": "CommentLine", "type": "CommentLine",
@ -139,8 +138,7 @@
}, },
"identifierName": "x" "identifierName": "x"
}, },
"name": "x", "name": "x"
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

4
packages/babylon/test/fixtures/core/uncategorised/312/output.json vendored
View File

@ -90,7 +90,6 @@
} }
}, },
"argument": null, "argument": null,
"leadingComments": null,
"trailingComments": [ "trailingComments": [
{ {
"type": "CommentBlock", "type": "CommentBlock",
@ -139,8 +138,7 @@
}, },
"identifierName": "x" "identifierName": "x"
}, },
"name": "x", "name": "x"
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

7
packages/babylon/test/fixtures/core/uncategorised/314/output.json vendored
View File

@ -72,9 +72,7 @@
}, },
"identifierName": "error" "identifierName": "error"
}, },
"name": "error", "name": "error"
"leadingComments": null,
"trailingComments": null
}, },
"trailingComments": [ "trailingComments": [
{ {
@ -124,8 +122,7 @@
}, },
"identifierName": "error" "identifierName": "error"
}, },
"name": "error", "name": "error"
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

7
packages/babylon/test/fixtures/core/uncategorised/315/output.json vendored
View File

@ -72,9 +72,7 @@
}, },
"identifierName": "error" "identifierName": "error"
}, },
"name": "error", "name": "error"
"leadingComments": null,
"trailingComments": null
}, },
"trailingComments": [ "trailingComments": [
{ {
@ -124,8 +122,7 @@
}, },
"identifierName": "error" "identifierName": "error"
}, },
"name": "error", "name": "error"
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

1
packages/babylon/test/fixtures/core/uncategorised/342/output.json vendored
View File

@ -72,7 +72,6 @@
"identifierName": "foo" "identifierName": "foo"
}, },
"name": "foo", "name": "foo",
"leadingComments": null,
"trailingComments": [ "trailingComments": [
{ {
"type": "CommentLine", "type": "CommentLine",

3
packages/babylon/test/fixtures/core/uncategorised/46/output.json vendored
View File

@ -60,8 +60,7 @@
"rawValue": 42, "rawValue": 42,
"raw": "42" "raw": "42"
}, },
"value": 42, "value": 42
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

4
packages/babylon/test/fixtures/core/uncategorised/47/output.json vendored
View File

@ -60,9 +60,7 @@
"rawValue": 42, "rawValue": 42,
"raw": "42" "raw": "42"
}, },
"value": 42, "value": 42
"leadingComments": null,
"trailingComments": null
}, },
"trailingComments": [ "trailingComments": [
{ {

4
packages/babylon/test/fixtures/core/uncategorised/48/output.json vendored
View File

@ -60,9 +60,7 @@
"rawValue": 42, "rawValue": 42,
"raw": "42" "raw": "42"
}, },
"value": 42, "value": 42
"leadingComments": null,
"trailingComments": null
}, },
"trailingComments": [ "trailingComments": [
{ {

3
packages/babylon/test/fixtures/core/uncategorised/49/output.json vendored
View File

@ -60,8 +60,7 @@
"rawValue": 42, "rawValue": 42,
"raw": "42" "raw": "42"
}, },
"value": 42, "value": 42
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

3
packages/babylon/test/fixtures/core/uncategorised/50/output.json vendored
View File

@ -60,8 +60,7 @@
"rawValue": 42, "rawValue": 42,
"raw": "42" "raw": "42"
}, },
"value": 42, "value": 42
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

3
packages/babylon/test/fixtures/core/uncategorised/51/output.json vendored
View File

@ -60,8 +60,7 @@
"rawValue": 42, "rawValue": 42,
"raw": "42" "raw": "42"
}, },
"value": 42, "value": 42
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

3
packages/babylon/test/fixtures/core/uncategorised/52/output.json vendored
View File

@ -60,8 +60,7 @@
"rawValue": 42, "rawValue": 42,
"raw": "42" "raw": "42"
}, },
"value": 42, "value": 42
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

3
packages/babylon/test/fixtures/core/uncategorised/53/output.json vendored
View File

@ -60,8 +60,7 @@
"rawValue": 42, "rawValue": 42,
"raw": "42" "raw": "42"
}, },
"value": 42, "value": 42
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

3
packages/babylon/test/fixtures/core/uncategorised/54/output.json vendored
View File

@ -60,8 +60,7 @@
"rawValue": 42, "rawValue": 42,
"raw": "42" "raw": "42"
}, },
"value": 42, "value": 42
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

4
packages/babylon/test/fixtures/core/uncategorised/55/output.json vendored
View File

@ -60,9 +60,7 @@
"rawValue": 42, "rawValue": 42,
"raw": "42" "raw": "42"
}, },
"value": 42, "value": 42
"leadingComments": null,
"trailingComments": null
}, },
"trailingComments": [ "trailingComments": [
{ {

3
packages/babylon/test/fixtures/core/uncategorised/56/output.json vendored
View File

@ -60,8 +60,7 @@
"rawValue": 42, "rawValue": 42,
"raw": "42" "raw": "42"
}, },
"value": 42, "value": 42
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

1
packages/babylon/test/fixtures/core/uncategorised/57/output.json vendored
View File

@ -29,7 +29,6 @@
"sourceType": "script", "sourceType": "script",
"body": [], "body": [],
"directives": [], "directives": [],
"leadingComments": null,
"innerComments": [ "innerComments": [
{ {
"type": "CommentLine", "type": "CommentLine",

1
packages/babylon/test/fixtures/core/uncategorised/58/output.json vendored
View File

@ -29,7 +29,6 @@
"sourceType": "script", "sourceType": "script",
"body": [], "body": [],
"directives": [], "directives": [],
"leadingComments": null,
"innerComments": [ "innerComments": [
{ {
"type": "CommentLine", "type": "CommentLine",

3
packages/babylon/test/fixtures/core/uncategorised/59/output.json vendored
View File

@ -60,8 +60,7 @@
"rawValue": 42, "rawValue": 42,
"raw": "42" "raw": "42"
}, },
"value": 42, "value": 42
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

1
packages/babylon/test/fixtures/core/uncategorised/60/output.json vendored
View File

@ -29,7 +29,6 @@
"sourceType": "script", "sourceType": "script",
"body": [], "body": [],
"directives": [], "directives": [],
"leadingComments": null,
"innerComments": [ "innerComments": [
{ {
"type": "CommentLine", "type": "CommentLine",

1
packages/babylon/test/fixtures/core/uncategorised/61/output.json vendored
View File

@ -29,7 +29,6 @@
"sourceType": "script", "sourceType": "script",
"body": [], "body": [],
"directives": [], "directives": [],
"leadingComments": null,
"innerComments": [ "innerComments": [
{ {
"type": "CommentLine", "type": "CommentLine",

3
packages/babylon/test/fixtures/core/uncategorised/62/output.json vendored
View File

@ -60,8 +60,7 @@
"rawValue": 42, "rawValue": 42,
"raw": "42" "raw": "42"
}, },
"value": 42, "value": 42
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

3
packages/babylon/test/fixtures/core/uncategorised/63/output.json vendored
View File

@ -60,8 +60,7 @@
"rawValue": 42, "rawValue": 42,
"raw": "42" "raw": "42"
}, },
"value": 42, "value": 42
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

6
packages/babylon/test/fixtures/core/uncategorised/64/output.json vendored
View File

@ -117,11 +117,9 @@
}, },
"identifierName": "doThat" "identifierName": "doThat"
}, },
"name": "doThat", "name": "doThat"
"leadingComments": null
}, },
"arguments": [], "arguments": []
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

6
packages/babylon/test/fixtures/core/uncategorised/65/output.json vendored
View File

@ -118,11 +118,9 @@
}, },
"identifierName": "bingo" "identifierName": "bingo"
}, },
"name": "bingo", "name": "bingo"
"leadingComments": null
}, },
"arguments": [], "arguments": []
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

4
packages/babylon/test/fixtures/es2015/modules/xml-comment-in-script/output.json vendored
View File

@ -57,9 +57,7 @@
}, },
"identifierName": "foo" "identifierName": "foo"
}, },
"name": "foo", "name": "foo"
"leadingComments": null,
"trailingComments": null
}, },
"trailingComments": [ "trailingComments": [
{ {

4
packages/babylon/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0002/output.json vendored
View File

@ -72,9 +72,7 @@
}, },
"identifierName": "x" "identifierName": "x"
}, },
"name": "x", "name": "x"
"leadingComments": null,
"trailingComments": null
}, },
"init": null, "init": null,
"trailingComments": [ "trailingComments": [

4
packages/babylon/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0005/output.json vendored
View File

@ -88,7 +88,6 @@
} }
}, },
"label": null, "label": null,
"leadingComments": null,
"trailingComments": [ "trailingComments": [
{ {
"type": "CommentLine", "type": "CommentLine",
@ -137,8 +136,7 @@
}, },
"identifierName": "there" "identifierName": "there"
}, },
"name": "there", "name": "there"
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

4
packages/babylon/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0006/output.json vendored
View File

@ -88,7 +88,6 @@
} }
}, },
"label": null, "label": null,
"leadingComments": null,
"trailingComments": [ "trailingComments": [
{ {
"type": "CommentBlock", "type": "CommentBlock",
@ -137,8 +136,7 @@
}, },
"identifierName": "there" "identifierName": "there"
}, },
"name": "there", "name": "there"
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

4
packages/babylon/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0008/output.json vendored
View File

@ -88,7 +88,6 @@
} }
}, },
"label": null, "label": null,
"leadingComments": null,
"trailingComments": [ "trailingComments": [
{ {
"type": "CommentLine", "type": "CommentLine",
@ -137,8 +136,7 @@
}, },
"identifierName": "there" "identifierName": "there"
}, },
"name": "there", "name": "there"
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

4
packages/babylon/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0009/output.json vendored
View File

@ -88,7 +88,6 @@
} }
}, },
"label": null, "label": null,
"leadingComments": null,
"trailingComments": [ "trailingComments": [
{ {
"type": "CommentBlock", "type": "CommentBlock",
@ -137,8 +136,7 @@
}, },
"identifierName": "there" "identifierName": "there"
}, },
"name": "there", "name": "there"
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

4
packages/babylon/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0011/output.json vendored
View File

@ -90,7 +90,6 @@
} }
}, },
"argument": null, "argument": null,
"leadingComments": null,
"trailingComments": [ "trailingComments": [
{ {
"type": "CommentLine", "type": "CommentLine",
@ -139,8 +138,7 @@
}, },
"identifierName": "x" "identifierName": "x"
}, },
"name": "x", "name": "x"
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

4
packages/babylon/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0012/output.json vendored
View File

@ -90,7 +90,6 @@
} }
}, },
"argument": null, "argument": null,
"leadingComments": null,
"trailingComments": [ "trailingComments": [
{ {
"type": "CommentBlock", "type": "CommentBlock",
@ -139,8 +138,7 @@
}, },
"identifierName": "x" "identifierName": "x"
}, },
"name": "x", "name": "x"
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

7
packages/babylon/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0014/output.json vendored
View File

@ -72,9 +72,7 @@
}, },
"identifierName": "error" "identifierName": "error"
}, },
"name": "error", "name": "error"
"leadingComments": null,
"trailingComments": null
}, },
"trailingComments": [ "trailingComments": [
{ {
@ -124,8 +122,7 @@
}, },
"identifierName": "error" "identifierName": "error"
}, },
"name": "error", "name": "error"
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

7
packages/babylon/test/fixtures/esprima/automatic-semicolon-insertion/migrated_0015/output.json vendored
View File

@ -72,9 +72,7 @@
}, },
"identifierName": "error" "identifierName": "error"
}, },
"name": "error", "name": "error"
"leadingComments": null,
"trailingComments": null
}, },
"trailingComments": [ "trailingComments": [
{ {
@ -124,8 +122,7 @@
}, },
"identifierName": "error" "identifierName": "error"
}, },
"name": "error", "name": "error"
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

1
packages/babylon/test/fixtures/flow/anonymous-function-types/good_02/output.json vendored
View File

@ -29,7 +29,6 @@
"sourceType": "module", "sourceType": "module",
"body": [], "body": [],
"directives": [], "directives": [],
"leadingComments": null,
"innerComments": [ "innerComments": [
{ {
"type": "CommentLine", "type": "CommentLine",

1
packages/babylon/test/fixtures/flow/comment-disabled/01-type-include/output.json vendored
View File

@ -75,7 +75,6 @@
} }
}, },
"body": [], "body": [],
"leadingComments": null,
"innerComments": [ "innerComments": [
{ {
"type": "CommentBlock", "type": "CommentBlock",

1
packages/babylon/test/fixtures/flow/comment-disabled/02-type-include/output.json vendored
View File

@ -29,7 +29,6 @@
"sourceType": "module", "sourceType": "module",
"body": [], "body": [],
"directives": [], "directives": [],
"leadingComments": null,
"innerComments": [ "innerComments": [
{ {
"type": "CommentBlock", "type": "CommentBlock",

1
packages/babylon/test/fixtures/flow/comment-disabled/03-type-flow-include/output.json vendored
View File

@ -29,7 +29,6 @@
"sourceType": "module", "sourceType": "module",
"body": [], "body": [],
"directives": [], "directives": [],
"leadingComments": null,
"innerComments": [ "innerComments": [
{ {
"type": "CommentBlock", "type": "CommentBlock",

1
packages/babylon/test/fixtures/flow/comment-disabled/04-type-flow-include/output.json vendored
View File

@ -75,7 +75,6 @@
} }
}, },
"body": [], "body": [],
"leadingComments": null,
"innerComments": [ "innerComments": [
{ {
"type": "CommentBlock", "type": "CommentBlock",

1
packages/babylon/test/fixtures/flow/comment-disabled/05-type-annotation/output.json vendored
View File

@ -78,7 +78,6 @@
"identifierName": "param" "identifierName": "param"
}, },
"name": "param", "name": "param",
"leadingComments": null,
"trailingComments": [ "trailingComments": [
{ {
"type": "CommentBlock", "type": "CommentBlock",

1
packages/babylon/test/fixtures/flow/comment/04-type-flow-include/output.json vendored
View File

@ -75,7 +75,6 @@
} }
}, },
"body": [], "body": [],
"leadingComments": null,
"innerComments": [ "innerComments": [
{ {
"type": "CommentBlock", "type": "CommentBlock",

3
packages/babylon/test/fixtures/flow/comment/spread/output.json vendored
View File

@ -57,8 +57,7 @@
}, },
"identifierName": "commentsAttachedToIdentifier" "identifierName": "commentsAttachedToIdentifier"
}, },
"name": "commentsAttachedToIdentifier", "name": "commentsAttachedToIdentifier"
"leadingComments": null
}, },
"generator": false, "generator": false,
"async": false, "async": false,

132
packages/babylon/test/fixtures/flow/regression/issue-58/output.json vendored
View File

@ -71,8 +71,7 @@
}, },
"identifierName": "a" "identifierName": "a"
}, },
"name": "a", "name": "a"
"leadingComments": null
}, },
"consequent": { "consequent": {
"type": "Identifier", "type": "Identifier",
@ -148,8 +147,7 @@
}, },
"name": "d" "name": "d"
} }
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -231,8 +229,7 @@
}, },
"identifierName": "a" "identifierName": "a"
}, },
"name": "a", "name": "a"
"leadingComments": null
}, },
"consequent": { "consequent": {
"type": "ArrowFunctionExpression", "type": "ArrowFunctionExpression",
@ -353,8 +350,7 @@
"identifierName": "e" "identifierName": "e"
}, },
"name": "e" "name": "e"
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -436,8 +432,7 @@
}, },
"identifierName": "a" "identifierName": "a"
}, },
"name": "a", "name": "a"
"leadingComments": null
}, },
"consequent": { "consequent": {
"type": "Identifier", "type": "Identifier",
@ -562,8 +557,7 @@
}, },
"name": "e" "name": "e"
} }
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -661,8 +655,7 @@
}, },
"identifierName": "a" "identifierName": "a"
}, },
"name": "a", "name": "a"
"leadingComments": null
}, },
"consequent": { "consequent": {
"type": "AssignmentExpression", "type": "AssignmentExpression",
@ -808,8 +801,7 @@
}, },
"name": "f" "name": "f"
} }
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -907,8 +899,7 @@
}, },
"identifierName": "a" "identifierName": "a"
}, },
"name": "a", "name": "a"
"leadingComments": null
}, },
"consequent": { "consequent": {
"type": "ArrowFunctionExpression", "type": "ArrowFunctionExpression",
@ -1098,8 +1089,7 @@
"identifierName": "g" "identifierName": "g"
}, },
"name": "g" "name": "g"
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -1197,8 +1187,7 @@
}, },
"identifierName": "b" "identifierName": "b"
}, },
"name": "b", "name": "b"
"leadingComments": null
}, },
"consequent": { "consequent": {
"type": "ConditionalExpression", "type": "ConditionalExpression",
@ -1372,8 +1361,7 @@
"identifierName": "h" "identifierName": "h"
}, },
"name": "h" "name": "h"
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -1471,8 +1459,7 @@
}, },
"identifierName": "a" "identifierName": "a"
}, },
"name": "a", "name": "a"
"leadingComments": null
}, },
"consequent": { "consequent": {
"type": "ConditionalExpression", "type": "ConditionalExpression",
@ -1650,8 +1637,7 @@
"identifierName": "h" "identifierName": "h"
}, },
"name": "h" "name": "h"
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -1733,8 +1719,7 @@
}, },
"identifierName": "a" "identifierName": "a"
}, },
"name": "a", "name": "a"
"leadingComments": null
}, },
"consequent": { "consequent": {
"type": "ConditionalExpression", "type": "ConditionalExpression",
@ -1908,8 +1893,7 @@
"identifierName": "g" "identifierName": "g"
}, },
"name": "g" "name": "g"
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -2007,8 +1991,7 @@
}, },
"identifierName": "a" "identifierName": "a"
}, },
"name": "a", "name": "a"
"leadingComments": null
}, },
"consequent": { "consequent": {
"type": "ArrowFunctionExpression", "type": "ArrowFunctionExpression",
@ -2215,8 +2198,7 @@
}, },
"name": "g" "name": "g"
} }
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -2330,8 +2312,7 @@
}, },
"identifierName": "a" "identifierName": "a"
}, },
"name": "a", "name": "a"
"leadingComments": null
}, },
"consequent": { "consequent": {
"type": "ArrowFunctionExpression", "type": "ArrowFunctionExpression",
@ -2538,8 +2519,7 @@
"identifierName": "g" "identifierName": "g"
}, },
"name": "g" "name": "g"
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -2637,8 +2617,7 @@
}, },
"identifierName": "a" "identifierName": "a"
}, },
"name": "a", "name": "a"
"leadingComments": null
}, },
"consequent": { "consequent": {
"type": "Identifier", "type": "Identifier",
@ -2834,8 +2813,7 @@
] ]
} }
} }
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -2917,8 +2895,7 @@
}, },
"identifierName": "a" "identifierName": "a"
}, },
"name": "a", "name": "a"
"leadingComments": null
}, },
"consequent": { "consequent": {
"type": "ArrowFunctionExpression", "type": "ArrowFunctionExpression",
@ -3114,8 +3091,7 @@
}, },
"name": "f" "name": "f"
} }
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -3213,8 +3189,7 @@
}, },
"identifierName": "a" "identifierName": "a"
}, },
"name": "a", "name": "a"
"leadingComments": null
}, },
"consequent": { "consequent": {
"type": "ArrowFunctionExpression", "type": "ArrowFunctionExpression",
@ -3327,8 +3302,7 @@
}, },
"name": "e" "name": "e"
} }
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -3426,8 +3400,7 @@
}, },
"identifierName": "a" "identifierName": "a"
}, },
"name": "a", "name": "a"
"leadingComments": null
}, },
"consequent": { "consequent": {
"type": "ConditionalExpression", "type": "ConditionalExpression",
@ -3589,8 +3562,7 @@
"identifierName": "g" "identifierName": "g"
}, },
"name": "g" "name": "g"
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -3688,8 +3660,7 @@
}, },
"identifierName": "a" "identifierName": "a"
}, },
"name": "a", "name": "a"
"leadingComments": null
}, },
"consequent": { "consequent": {
"type": "ArrowFunctionExpression", "type": "ArrowFunctionExpression",
@ -3888,8 +3859,7 @@
}, },
"name": "g" "name": "g"
} }
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -3987,8 +3957,7 @@
}, },
"identifierName": "a" "identifierName": "a"
}, },
"name": "a", "name": "a"
"leadingComments": null
}, },
"consequent": { "consequent": {
"type": "ConditionalExpression", "type": "ConditionalExpression",
@ -4228,8 +4197,7 @@
}, },
"name": "i" "name": "i"
} }
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -4327,8 +4295,7 @@
}, },
"identifierName": "a" "identifierName": "a"
}, },
"name": "a", "name": "a"
"leadingComments": null
}, },
"consequent": { "consequent": {
"type": "ArrowFunctionExpression", "type": "ArrowFunctionExpression",
@ -4518,8 +4485,7 @@
"identifierName": "f" "identifierName": "f"
}, },
"name": "f" "name": "f"
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -4633,8 +4599,7 @@
}, },
"identifierName": "a" "identifierName": "a"
}, },
"name": "a", "name": "a"
"leadingComments": null
}, },
"consequent": { "consequent": {
"type": "CallExpression", "type": "CallExpression",
@ -4740,8 +4705,7 @@
}, },
"name": "d" "name": "d"
} }
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -4839,8 +4803,7 @@
}, },
"identifierName": "a" "identifierName": "a"
}, },
"name": "a", "name": "a"
"leadingComments": null
}, },
"consequent": { "consequent": {
"type": "ArrowFunctionExpression", "type": "ArrowFunctionExpression",
@ -4960,8 +4923,7 @@
"identifierName": "e" "identifierName": "e"
}, },
"name": "e" "name": "e"
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -5043,8 +5005,7 @@
}, },
"identifierName": "a" "identifierName": "a"
}, },
"name": "a", "name": "a"
"leadingComments": null
}, },
"consequent": { "consequent": {
"type": "CallExpression", "type": "CallExpression",
@ -5187,8 +5148,7 @@
}, },
"name": "e" "name": "e"
} }
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -5270,8 +5230,7 @@
}, },
"identifierName": "a" "identifierName": "a"
}, },
"name": "a", "name": "a"
"leadingComments": null
}, },
"consequent": { "consequent": {
"type": "ArrowFunctionExpression", "type": "ArrowFunctionExpression",
@ -5421,8 +5380,7 @@
}, },
"name": "f" "name": "f"
} }
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -5521,8 +5479,7 @@
}, },
"identifierName": "icecream" "identifierName": "icecream"
}, },
"name": "icecream", "name": "icecream"
"leadingComments": null
}, },
"init": { "init": {
"type": "ConditionalExpression", "type": "ConditionalExpression",
@ -5968,8 +5925,7 @@
] ]
} }
} }
}, }
"leadingComments": null
} }
], ],
"kind": "let", "kind": "let",

10
packages/babylon/test/fixtures/flow/type-generics/async-arrow-like/output.json vendored
View File

@ -316,8 +316,7 @@
}, },
"identifierName": "async" "identifierName": "async"
}, },
"name": "async", "name": "async"
"leadingComments": null
}, },
"operator": "<", "operator": "<",
"right": { "right": {
@ -369,8 +368,7 @@
}, },
"name": "U" "name": "U"
} }
}, }
"leadingComments": null
}, },
"operator": ">", "operator": ">",
"right": { "right": {
@ -456,8 +454,7 @@
"parenthesized": true, "parenthesized": true,
"parenStart": 149 "parenStart": 149
} }
}, }
"leadingComments": null
}, },
"typeAnnotation": { "typeAnnotation": {
"type": "TypeAnnotation", "type": "TypeAnnotation",
@ -576,7 +573,6 @@
"typeParameters": null "typeParameters": null
} }
}, },
"leadingComments": null,
"extra": { "extra": {
"parenthesized": true, "parenthesized": true,
"parenStart": 135 "parenStart": 135

1
packages/babylon/test/fixtures/jsx/basic/10/output.json vendored
View File

@ -149,7 +149,6 @@
"column": 27 "column": 27
} }
}, },
"leadingComments": null,
"innerComments": [ "innerComments": [
{ {
"type": "CommentBlock", "type": "CommentBlock",

1
packages/babylon/test/fixtures/jsx/basic/fragment-5/output.json vendored
View File

@ -70,7 +70,6 @@
"column": 1 "column": 1
} }
}, },
"leadingComments": null,
"innerComments": [ "innerComments": [
{ {
"type": "CommentLine", "type": "CommentLine",

6
packages/babylon/test/fixtures/typescript/arrow-function/generic-tsx/output.json vendored
View File

@ -218,11 +218,9 @@
"column": 2 "column": 2
} }
}, },
"name": "T", "name": "T"
"leadingComments": null
} }
], ]
"leadingComments": null
} }
}, },
"leadingComments": [ "leadingComments": [

15
packages/babylon/test/fixtures/typescript/cast/as/output.json vendored
View File

@ -263,8 +263,7 @@
}, },
"identifierName": "x" "identifierName": "x"
}, },
"name": "x", "name": "x"
"leadingComments": null
}, },
"operator": "===", "operator": "===",
"right": { "right": {
@ -316,8 +315,7 @@
} }
} }
} }
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {
@ -413,8 +411,7 @@
}, },
"identifierName": "x" "identifierName": "x"
}, },
"name": "x", "name": "x"
"leadingComments": null
}, },
"typeAnnotation": { "typeAnnotation": {
"type": "TSAnyKeyword", "type": "TSAnyKeyword",
@ -430,8 +427,7 @@
"column": 8 "column": 8
} }
} }
}, }
"leadingComments": null
}, },
"typeAnnotation": { "typeAnnotation": {
"type": "TSTypeReference", "type": "TSTypeReference",
@ -464,8 +460,7 @@
}, },
"name": "T" "name": "T"
} }
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

3
packages/babylon/test/fixtures/typescript/class/abstract-false-positive/output.json vendored
View File

@ -57,8 +57,7 @@
}, },
"identifierName": "abstract" "identifierName": "abstract"
}, },
"name": "abstract", "name": "abstract"
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

16
packages/babylon/test/fixtures/typescript/class/abstract/output.json vendored
View File

@ -192,11 +192,8 @@
"column": 26 "column": 26
} }
}, },
"body": [], "body": []
"leadingComments": null, }
"trailingComments": null
},
"trailingComments": null
}, },
"trailingComments": [ "trailingComments": [
{ {
@ -261,10 +258,8 @@
"column": 33 "column": 33
} }
}, },
"body": [], "body": []
"leadingComments": null
}, },
"leadingComments": null,
"abstract": true "abstract": true
}, },
"leadingComments": [ "leadingComments": [
@ -346,11 +341,8 @@
"column": 35 "column": 35
} }
}, },
"body": [], "body": []
"leadingComments": null,
"trailingComments": null
}, },
"trailingComments": null,
"abstract": true "abstract": true
}, },
"trailingComments": [ "trailingComments": [

6
packages/babylon/test/fixtures/typescript/class/parameter-properties/output.json vendored
View File

@ -385,8 +385,7 @@
}, },
"identifierName": "x" "identifierName": "x"
}, },
"name": "x", "name": "x"
"leadingComments": null
}, },
"right": { "right": {
"type": "NumericLiteral", "type": "NumericLiteral",
@ -407,8 +406,7 @@
"raw": "0" "raw": "0"
}, },
"value": 0 "value": 0
}, }
"leadingComments": null
}, },
"leadingComments": [ "leadingComments": [
{ {

7
packages/babylon/test/fixtures/typescript/interface/export/output.json vendored
View File

@ -89,11 +89,8 @@
"column": 21 "column": 21
} }
}, },
"body": [], "body": []
"leadingComments": null, }
"trailingComments": null
},
"trailingComments": null
}, },
"trailingComments": [ "trailingComments": [
{ {

3
packages/babylon/test/fixtures/typescript/tsx/brace-is-block/output.json vendored
View File

@ -57,8 +57,7 @@
}, },
"identifierName": "C" "identifierName": "C"
}, },
"name": "C", "name": "C"
"leadingComments": null
}, },
"superClass": { "superClass": {
"type": "Identifier", "type": "Identifier",

3
packages/babylon/test/fixtures/typescript/type-alias/export/output.json vendored
View File

@ -89,8 +89,7 @@
"column": 22 "column": 22
} }
} }
}, }
"trailingComments": null
}, },
"trailingComments": [ "trailingComments": [
{ {

6
scripts/generators/flow.js
View File

@ -36,9 +36,9 @@ declare class ${NODE_PREFIX}SourceLocation {
} }
declare class ${NODE_PREFIX} { declare class ${NODE_PREFIX} {
leadingComments: ?Array<${NODE_PREFIX}Comment>; leadingComments?: Array<${NODE_PREFIX}Comment>;
innerComments: ?Array<${NODE_PREFIX}Comment>; innerComments?: Array<${NODE_PREFIX}Comment>;
trailingComments: ?Array<${NODE_PREFIX}Comment>; trailingComments?: Array<${NODE_PREFIX}Comment>;
start: ?number; start: ?number;
end: ?number; end: ?number;
loc: ?${NODE_PREFIX}SourceLocation; loc: ?${NODE_PREFIX}SourceLocation;