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

fix: add tokens when tokens: true is passed to parseExpression (#12939)

Browse Source
This commit is contained in:
Huáng Jùnliàng 2021-03-01 14:09:56 -05:00 committed by GitHub
parent 9844eeee84
commit efdca01409
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/babel-parser/src/parser/expression.js
View File

@ -148,7 +148,7 @@ export default class ExpressionParser extends LValParser {
} }
// Convenience method to parse an Expression only // Convenience method to parse an Expression only
getExpression(): N.Expression { getExpression(): N.Expression & N.ParserOutput {
let paramFlags = PARAM; let paramFlags = PARAM;
if (this.hasPlugin("topLevelAwait") && this.inModule) { if (this.hasPlugin("topLevelAwait") && this.inModule) {
paramFlags |= PARAM_AWAIT; paramFlags |= PARAM_AWAIT;
@ -162,6 +162,9 @@ export default class ExpressionParser extends LValParser {
} }
expr.comments = this.state.comments; expr.comments = this.state.comments;
expr.errors = this.state.errors; expr.errors = this.state.errors;
if (this.options.tokens) {
expr.tokens = this.tokens;
}
return expr; return expr;
} }

10
packages/babel-parser/src/types.js
View File

@ -4,6 +4,7 @@ import type { SourceType } from "./options";
import type { Token } from "./tokenizer"; import type { Token } from "./tokenizer";
import type { SourceLocation } from "./util/location"; import type { SourceLocation } from "./util/location";
import type { PlaceholderTypes } from "./plugins/placeholders"; import type { PlaceholderTypes } from "./plugins/placeholders";
import type { ParsingError } from "./parser/error";
/* /*
* If making any changes to the AST, update: * If making any changes to the AST, update:
@ -129,6 +130,11 @@ export type BigIntLiteral = NodeBase & {
value: number, value: number,
}; };
export type ParserOutput = {
comments: $ReadOnlyArray<Comment>,
errors: Array<ParsingError>,
tokens?: $ReadOnlyArray<Token | Comment>,
};
// Programs // Programs
export type BlockStatementLike = Program | BlockStatement; export type BlockStatementLike = Program | BlockStatement;
@ -136,9 +142,7 @@ export type BlockStatementLike = Program | BlockStatement;
export type File = NodeBase & { export type File = NodeBase & {
type: "File", type: "File",
program: Program, program: Program,
comments: $ReadOnlyArray<Comment>, } & ParserOutput;
tokens: $ReadOnlyArray<Token | Comment>,
};
export type Program = NodeBase & { export type Program = NodeBase & {
type: "Program", type: "Program",