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: allow shebang directive #9922

Merged
merged 3 commits into from May 7, 2019
Merged

fix: allow shebang directive #9922

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5085d10
fix: allow shebang directive
tanhauhau Apr 29, 2019
a60b939
Update packages/babel-parser/src/plugins/flow.js
nicolo-ribaudo Apr 30, 2019
67a35fd
chore: prettier
tanhauhau May 7, 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
2 changes: 1 addition & 1 deletion packages/babel-parser/src/plugins/flow.js
View file
Open in desktop
Expand Up @@ -96,7 +96,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
}

finishToken(type: TokenType, val: any): void {
if (!(type === tt.string || type === tt.semi)) {
if (type !== tt.string && type !== tt.semi && type !== tt.interpreterDirective) {
if (this.flowPragma === undefined) {
this.flowPragma = null;
}
Expand Down
5 changes: 5 additions & 0 deletions packages/babel-parser/test/fixtures/flow/pragma/5/input.js
View file
Open in desktop
@@ -0,0 +1,5 @@
#!/usr/bin/env node
'use strict';
// arbitrary comment
// @flow
foo<x>(y);
304 changes: 304 additions & 0 deletions packages/babel-parser/test/fixtures/flow/pragma/5/output.json
View file
Open in desktop
@@ -0,0 +1,304 @@
{
"type": "File",
"start": 0,
"end": 74,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 5,
"column": 10
}
},
"program": {
"type": "Program",
"start": 0,
"end": 74,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 5,
"column": 10
}
},
"sourceType": "module",
"interpreter": {
"type": "InterpreterDirective",
"start": 0,
"end": 19,
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 19
}
},
"value": "/usr/bin/env node"
},
"body": [
{
"type": "ExpressionStatement",
"start": 64,
"end": 74,
"loc": {
"start": {
"line": 5,
"column": 0
},
"end": {
"line": 5,
"column": 10
}
},
"expression": {
"type": "CallExpression",
"start": 64,
"end": 73,
"loc": {
"start": {
"line": 5,
"column": 0
},
"end": {
"line": 5,
"column": 9
}
},
"callee": {
"type": "Identifier",
"start": 64,
"end": 67,
"loc": {
"start": {
"line": 5,
"column": 0
},
"end": {
"line": 5,
"column": 3
},
"identifierName": "foo"
},
"name": "foo"
},
"typeArguments": {
"type": "TypeParameterInstantiation",
"start": 67,
"end": 70,
"loc": {
"start": {
"line": 5,
"column": 3
},
"end": {
"line": 5,
"column": 6
}
},
"params": [
{
"type": "GenericTypeAnnotation",
"start": 68,
"end": 69,
"loc": {
"start": {
"line": 5,
"column": 4
},
"end": {
"line": 5,
"column": 5
}
},
"typeParameters": null,
"id": {
"type": "Identifier",
"start": 68,
"end": 69,
"loc": {
"start": {
"line": 5,
"column": 4
},
"end": {
"line": 5,
"column": 5
},
"identifierName": "x"
},
"name": "x"
}
}
]
},
"arguments": [
{
"type": "Identifier",
"start": 71,
"end": 72,
"loc": {
"start": {
"line": 5,
"column": 7
},
"end": {
"line": 5,
"column": 8
},
"identifierName": "y"
},
"name": "y"
}
]
},
"leadingComments": [
{
"type": "CommentLine",
"value": " arbitrary comment",
"start": 34,
"end": 54,
"loc": {
"start": {
"line": 3,
"column": 0
},
"end": {
"line": 3,
"column": 20
}
}
},
{
"type": "CommentLine",
"value": " @flow",
"start": 55,
"end": 63,
"loc": {
"start": {
"line": 4,
"column": 0
},
"end": {
"line": 4,
"column": 8
}
}
}
]
}
],
"directives": [
{
"type": "Directive",
"start": 20,
"end": 33,
"loc": {
"start": {
"line": 2,
"column": 0
},
"end": {
"line": 2,
"column": 13
}
},
"value": {
"type": "DirectiveLiteral",
"start": 20,
"end": 32,
"loc": {
"start": {
"line": 2,
"column": 0
},
"end": {
"line": 2,
"column": 12
}
},
"value": "use strict",
"extra": {
"raw": "'use strict'",
"rawValue": "use strict"
}
},
"trailingComments": [
{
"type": "CommentLine",
"value": " arbitrary comment",
"start": 34,
"end": 54,
"loc": {
"start": {
"line": 3,
"column": 0
},
"end": {
"line": 3,
"column": 20
}
}
},
{
"type": "CommentLine",
"value": " @flow",
"start": 55,
"end": 63,
"loc": {
"start": {
"line": 4,
"column": 0
},
"end": {
"line": 4,
"column": 8
}
}
}
]
}
]
},
"comments": [
{
"type": "CommentLine",
"value": " arbitrary comment",
"start": 34,
"end": 54,
"loc": {
"start": {
"line": 3,
"column": 0
},
"end": {
"line": 3,
"column": 20
}
}
},
{
"type": "CommentLine",
"value": " @flow",
"start": 55,
"end": 63,
"loc": {
"start": {
"line": 4,
"column": 0
},
"end": {
"line": 4,
"column": 8
}
}
}
]
}