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 location for optional params in arrow functions #9998

Merged
merged 5 commits into from May 21, 2019
Merged

Fix location for optional params in arrow functions #9998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a6babc
Fix location with optional params in arrow functions
danez May 19, 2019
a4629b6
add test
danez May 19, 2019
bfed5dc
Ensure rollup replaces NODE_ENV and create sourcemap in dev
danez May 20, 2019
aae82d8
Ensure finishNod*() is never called twice on a node
danez May 20, 2019
fdc01af
Fix check for already finished nodes
danez May 21, 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
5 changes: 5 additions & 0 deletions Gulpfile.js
View file
Open in desktop
Expand Up @@ -15,6 +15,7 @@ const merge = require("merge-stream");
const rollup = require("rollup");
const rollupBabel = require("rollup-plugin-babel");
const rollupNodeResolve = require("rollup-plugin-node-resolve");
const rollupReplace = require("rollup-plugin-replace");
const { registerStandalonePackageTask } = require("./scripts/gulp-tasks");

const sources = ["codemods", "packages"];
Expand Down Expand Up @@ -92,6 +93,9 @@ function buildRollup(packages) {
.rollup({
input,
plugins: [
rollupReplace({
"process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV),
}),
rollupBabel({
envName: "babel-parser",
}),
Expand All @@ -103,6 +107,7 @@ function buildRollup(packages) {
file: path.join(pkg, "lib/index.js"),
format: "cjs",
name: "babel-parser",
sourcemap: process.env.NODE_ENV !== "production",
});
});
})
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Expand Up @@ -124,7 +124,7 @@ prepublish-build:
rm -rf packages/babel-runtime/helpers
rm -rf packages/babel-runtime-corejs2/helpers
rm -rf packages/babel-runtime-corejs2/core-js
BABEL_ENV=production make build-dist
NODE_ENV=production BABEL_ENV=production make build-dist
make clone-license

prepublish:
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Expand Up @@ -62,6 +62,7 @@
"rollup": "^1.6.0",
"rollup-plugin-babel": "^4.0.0",
"rollup-plugin-node-resolve": "^4.0.1",
"rollup-plugin-replace": "^2.2.0",
"test262-stream": "^1.2.0",
"through2": "^2.0.0",
"warnings-to-errors-webpack-plugin": "^2.0.0",
Expand Down
16 changes: 16 additions & 0 deletions packages/babel-parser/src/parser/node.js
View file
Open in desktop
Expand Up @@ -83,6 +83,12 @@ export class NodeUtils extends UtilParser {
pos: number,
loc: Position,
): T {
if (process.env.NODE_ENV !== "production" && node.end > 0) {
throw new Error(
"Do not call finishNode*() twice on the same node." +
" Instead use resetEndLocation() or change type directly.",
);
}
node.type = type;
node.end = pos;
node.loc.end = loc;
Expand All @@ -97,6 +103,16 @@ export class NodeUtils extends UtilParser {
if (this.options.ranges) node.range[0] = start;
}

resetEndLocation(
node: NodeBase,
end?: number = this.state.lastTokEnd,
endLoc?: Position = this.state.lastTokEndLoc,
): void {
node.end = end;
node.loc.end = endLoc;
if (this.options.ranges) node.range[1] = end;
}

/**
* Reset the start location of node to the start location of locationNode
*/
Expand Down
26 changes: 17 additions & 9 deletions packages/babel-parser/src/plugins/flow.js
View file
Open in desktop
Expand Up @@ -222,8 +222,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>

id.typeAnnotation = this.finishNode(typeContainer, "TypeAnnotation");

this.finishNode(id, id.type);

this.resetEndLocation(id);
this.semicolon();

return this.finishNode(node, "DeclareFunction");
Expand Down Expand Up @@ -432,15 +431,19 @@ export default (superClass: Class<Parser>): Class<Parser> =>
): N.FlowDeclareTypeAlias {
this.next();
this.flowParseTypeAlias(node);
return this.finishNode(node, "DeclareTypeAlias");
// Don't do finishNode as we don't want to process comments twice
node.type = "DeclareTypeAlias";
return node;
}

flowParseDeclareOpaqueType(
node: N.FlowDeclareOpaqueType,
): N.FlowDeclareOpaqueType {
this.next();
this.flowParseOpaqueType(node, true);
return this.finishNode(node, "DeclareOpaqueType");
// Don't do finishNode as we don't want to process comments twice
node.type = "DeclareOpaqueType";
return node;
}

flowParseDeclareInterface(
Expand Down Expand Up @@ -1520,20 +1523,21 @@ export default (superClass: Class<Parser>): Class<Parser> =>
: this.flowParseRestrictedIdentifier();
if (this.match(tt.colon)) {
ident.typeAnnotation = this.flowParseTypeAnnotation();
this.finishNode(ident, ident.type);
this.resetEndLocation(ident);
}
return ident;
}

typeCastToParameter(node: N.Node): N.Node {
node.expression.typeAnnotation = node.typeAnnotation;

return this.finishNodeAt(
this.resetEndLocation(
node.expression,
node.expression.type,
node.typeAnnotation.end,
node.typeAnnotation.loc.end,
);

return node.expression;
}

flowParseVariance(): ?N.FlowVariance {
Expand Down Expand Up @@ -1848,6 +1852,10 @@ export default (superClass: Class<Parser>): Class<Parser> =>
node = super.parseParenItem(node, startPos, startLoc);
if (this.eat(tt.question)) {
node.optional = true;
// Include questionmark in location of node
// Don't use this.finishNode() as otherwise we might process comments twice and
// include already consumed parens
this.resetEndLocation(node);
}

if (this.match(tt.colon)) {
Expand Down Expand Up @@ -2205,7 +2213,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
if (this.match(tt.colon)) {
param.typeAnnotation = this.flowParseTypeAnnotation();
}
this.finishNode(param, param.type);
this.resetEndLocation(param);
return param;
}

Expand Down Expand Up @@ -2393,7 +2401,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
super.parseVarId(decl, kind);
if (this.match(tt.colon)) {
decl.id.typeAnnotation = this.flowParseTypeAnnotation();
this.finishNode(decl.id, decl.id.type);
this.resetEndLocation(decl.id); // set end position to end of type
}
}

Expand Down
4 changes: 3 additions & 1 deletion packages/babel-parser/src/plugins/placeholders.js
View file
Open in desktop
Expand Up @@ -71,8 +71,10 @@ export default (superClass: Class<Parser>): Class<Parser> =>
node: N.Node,
expectedNode: T,
): /*N.Placeholder<T>*/ MaybePlaceholder<T> {
const isFinished = !!(node.expectedNode && node.type === "Placeholder");
node.expectedNode = expectedNode;
return this.finishNode(node, "Placeholder");

return isFinished ? node : this.finishNode(node, "Placeholder");
}

/* ============================================================ *
Expand Down
19 changes: 13 additions & 6 deletions packages/babel-parser/src/plugins/typescript/index.js
View file
Open in desktop
Expand Up @@ -422,7 +422,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
this.expect(tt.bracketL);
const id = this.parseIdentifier();
id.typeAnnotation = this.tsParseTypeAnnotation();
this.finishNode(id, "Identifier"); // set end position to end of type
this.resetEndLocation(id); // set end position to end of type

this.expect(tt.bracketR);
node.parameters = [id];
Expand Down Expand Up @@ -1958,6 +1958,10 @@ export default (superClass: Class<Parser>): Class<Parser> =>
node = super.parseParenItem(node, startPos, startLoc);
if (this.eat(tt.question)) {
node.optional = true;
// Include questionmark in location of node
// Don't use this.finishNode() as otherwise we might process comments twice and
// include already consumed parens
this.resetEndLocation(node);
}

if (this.match(tt.colon)) {
Expand All @@ -1971,7 +1975,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
return this.finishNode(typeCastNode, "TSTypeCastExpression");
}

return this.finishNode(node, node.type);
return node;
}

parseExportDeclaration(node: N.ExportNamedDeclaration): ?N.Declaration {
Expand Down Expand Up @@ -2092,7 +2096,7 @@ export default (superClass: Class<Parser>): Class<Parser> =>
const type = this.tsTryParseTypeAnnotation();
if (type) {
decl.id.typeAnnotation = type;
this.finishNode(decl.id, decl.id.type); // set end position to end of type
this.resetEndLocation(decl.id); // set end position to end of type
}
}

Expand Down Expand Up @@ -2234,7 +2238,9 @@ export default (superClass: Class<Parser>): Class<Parser> =>
}
const type = this.tsTryParseTypeAnnotation();
if (type) param.typeAnnotation = type;
return this.finishNode(param, param.type);
this.resetEndLocation(param);

return param;
}

toAssignable(
Expand Down Expand Up @@ -2396,12 +2402,13 @@ export default (superClass: Class<Parser>): Class<Parser> =>
typeCastToParameter(node: N.TsTypeCastExpression): N.Node {
node.expression.typeAnnotation = node.typeAnnotation;

return this.finishNodeAt(
this.resetEndLocation(
node.expression,
node.expression.type,
node.typeAnnotation.end,
node.typeAnnotation.loc.end,
);

return node.expression;
}

toReferencedList(
Expand Down
4 changes: 2 additions & 2 deletions packages/babel-parser/test/fixtures/flow/optional-type/1/output.json
View file
Open in desktop
Expand Up @@ -96,15 +96,15 @@
{
"type": "Identifier",
"start": 11,
"end": 12,
"end": 13,
"loc": {
"start": {
"line": 1,
"column": 11
},
"end": {
"line": 1,
"column": 12
"column": 13
},
"identifierName": "x"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/babel-parser/test/fixtures/flow/optional-type/3/output.json
View file
Open in desktop
Expand Up @@ -96,15 +96,15 @@
{
"type": "Identifier",
"start": 11,
"end": 12,
"end": 13,
"loc": {
"start": {
"line": 1,
"column": 11
},
"end": {
"line": 1,
"column": 12
"column": 13
},
"identifierName": "x"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/babel-parser/test/fixtures/flow/optional-type/4/output.json
View file
Open in desktop
Expand Up @@ -96,15 +96,15 @@
{
"type": "RestElement",
"start": 11,
"end": 15,
"end": 16,
"loc": {
"start": {
"line": 1,
"column": 11
},
"end": {
"line": 1,
"column": 15
"column": 16
}
},
"argument": {
Expand Down
8 changes: 4 additions & 4 deletions packages/babel-parser/test/fixtures/typescript/cast/as-const/output.json
View file
Open in desktop
Expand Up @@ -3951,15 +3951,15 @@
"expression": {
"type": "UnaryExpression",
"start": 858,
"end": 862,
"end": 861,
"loc": {
"start": {
"line": 29,
"column": 11
},
"end": {
"line": 29,
"column": 15
"column": 14
}
},
"operator": "-",
Expand Down Expand Up @@ -4104,15 +4104,15 @@
{
"type": "NumericLiteral",
"start": 886,
"end": 889,
"end": 888,
"loc": {
"start": {
"line": 30,
"column": 12
},
"end": {
"line": 30,
"column": 15
"column": 14
}
},
"extra": {
Expand Down
6 changes: 6 additions & 0 deletions packages/babel-parser/test/fixtures/typescript/regression/comments-disappearing/input.ts
View file
Open in desktop
@@ -0,0 +1,6 @@
let fun = () => {
// one
// two
// three
return (1);
}