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 span for patterns with a type annotation #558

Merged
merged 8 commits into from Jan 3, 2020
Merged

Fix span for patterns with a type annotation #558

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5c4583d
Fix span for patterns with a type annotation.
dsherret Jan 3, 2020
57f69f5
Update tests.
dsherret Jan 3, 2020
ff82a46
Fix spans in expr.rs for Pat.
dsherret Jan 3, 2020
5dc0f71
More tests updated.
dsherret Jan 3, 2020
aed0c3d
Update tests
kdy1 Jan 3, 2020
26094fe
Use github actions
kdy1 Jan 3, 2020
752ce26
Rename
kdy1 Jan 3, 2020
1bef58b
Remove test.yml as it should be handled by other PR.
kdy1 Jan 3, 2020
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
4 changes: 2 additions & 2 deletions ecmascript/ast/src/pat.rs
View file
Open in desktop
Expand Up @@ -63,12 +63,12 @@ pub struct AssignPat {
/// EsTree `RestElement`
#[ast_node("RestElement")]
pub struct RestPat {
pub span: Span,
kdy1 marked this conversation as resolved.
Show resolved Hide resolved

#[serde(rename = "rest")]
#[span(lo)]
pub dot3_token: Span,

#[serde(rename = "argument")]
#[span(hi)]
pub arg: Box<Pat>,

#[serde(default, rename = "typeAnnotation")]
Expand Down
34 changes: 28 additions & 6 deletions ecmascript/parser/src/parser/expr.rs
View file
Open in desktop
Expand Up @@ -1120,6 +1120,7 @@ impl<'a, I: Tokens> Parser<'a, I> {
let modifier_start = start;

let has_modifier = self.eat_any_ts_modifier()?;
let pat_start = cur_pos!();

let mut arg = {
if self.input.syntax().typescript()
Expand Down Expand Up @@ -1227,27 +1228,48 @@ impl<'a, I: Tokens> Parser<'a, I> {
}
rest_span = Some(span);
pat = Pat::Rest(RestPat {
span: span!(pat_start),
dot3_token: span,
arg: Box::new(pat),
type_ann: None,
});
}
match pat {
Pat::Ident(Ident {
ref mut type_ann, ..
ref mut type_ann,
ref mut span,
..
})
| Pat::Array(ArrayPat {
ref mut type_ann, ..
ref mut type_ann,
ref mut span,
..
})
| Pat::Assign(AssignPat {
ref mut type_ann, ..
ref mut type_ann,
ref mut span,
..
})
| Pat::Object(ObjectPat {
ref mut type_ann, ..
ref mut type_ann,
ref mut span,
..
})
| Pat::Rest(RestPat {
ref mut type_ann, ..
}) => *type_ann = self.try_parse_ts_type_ann()?,
ref mut type_ann,
ref mut span,
..
}) => {
let new_type_ann = self.try_parse_ts_type_ann()?;
if new_type_ann.is_some() {
*span = Span::new(
pat_start,
self.input.prev_span().hi(),
Default::default(),
);
}
*type_ann = new_type_ann;
}
Pat::Expr(ref expr) => unreachable!("invalid pattern: Expr({:?})", expr),
Pat::Invalid(ref i) => unreachable!("invalid pattern: {:?}", i.span),
}
Expand Down
2 changes: 2 additions & 0 deletions ecmascript/parser/src/parser/expr/tests.rs
View file
Open in desktop
Expand Up @@ -104,6 +104,7 @@ fn object_rest_pat() {
params: vec![Pat::Object(ObjectPat {
span,
props: vec![ObjectPatProp::Rest(RestPat {
span,
dot3_token: span,
arg: box Pat::Ident(Ident::new("a34".into(), span)),
type_ann: None,
Expand Down Expand Up @@ -220,6 +221,7 @@ fn arrow_fn_rest() {
is_async: false,
is_generator: false,
params: vec![Pat::Rest(RestPat {
span,
dot3_token: span,
arg: box Pat::Ident(Ident::new("a".into(), span)),
type_ann: None
Expand Down
1 change: 1 addition & 0 deletions ecmascript/parser/src/parser/object.rs
View file
Open in desktop
Expand Up @@ -390,6 +390,7 @@ impl<'a, I: Tokens> ParseObject<'a, Pat> for Parser<'a, I> {
let arg = Box::new(self.parse_binding_pat_or_ident()?);

return Ok(ObjectPatProp::Rest(RestPat {
span: span!(start),
dot3_token,
arg,
type_ann: None,
Expand Down
60 changes: 41 additions & 19 deletions ecmascript/parser/src/parser/pat.rs
View file
Open in desktop
Expand Up @@ -97,6 +97,7 @@ impl<'a, I: Tokens> Parser<'a, I> {

let pat = self.parse_binding_pat_or_ident()?;
let pat = Pat::Rest(RestPat {
span: span!(start),
dot3_token,
arg: Box::new(pat),
type_ann: None,
Expand Down Expand Up @@ -143,6 +144,7 @@ impl<'a, I: Tokens> Parser<'a, I> {

let has_modifier = self.eat_any_ts_modifier()?;

let pat_start = cur_pos!();
let mut pat = self.parse_binding_element()?;
// let mut opt = false;

Expand All @@ -164,21 +166,36 @@ impl<'a, I: Tokens> Parser<'a, I> {

match pat {
Pat::Array(ArrayPat {
ref mut type_ann, ..
ref mut type_ann,
ref mut span,
..
})
| Pat::Assign(AssignPat {
ref mut type_ann, ..
ref mut type_ann,
ref mut span,
..
})
| Pat::Ident(Ident {
ref mut type_ann, ..
ref mut type_ann,
ref mut span,
..
})
| Pat::Object(ObjectPat {
ref mut type_ann, ..
ref mut type_ann,
ref mut span,
..
})
| Pat::Rest(RestPat {
ref mut type_ann, ..
ref mut type_ann,
ref mut span,
..
}) => {
*type_ann = self.try_parse_ts_type_ann()?;
let new_type_ann = self.try_parse_ts_type_ann()?;
if new_type_ann.is_some() {
*span =
Span::new(pat_start, self.input.prev_span().hi(), Default::default());
}
*type_ann = new_type_ann;
}
Pat::Invalid(..) => {}
_ => unreachable!("invalid syntax: Pat: {:?}", pat),
Expand Down Expand Up @@ -242,6 +259,7 @@ impl<'a, I: Tokens> Parser<'a, I> {
};

let pat = Pat::Rest(RestPat {
span: span!(start),
dot3_token,
arg: Box::new(pat),
type_ann,
Expand Down Expand Up @@ -341,6 +359,7 @@ impl<'a, I: Tokens> Parser<'a, I> {
};

let pat = Pat::Rest(RestPat {
span: span!(start),
dot3_token,
arg: Box::new(pat),
type_ann,
Expand Down Expand Up @@ -489,9 +508,7 @@ impl<'a, I: Tokens> Parser<'a, I> {
match *expr {
Expr::Paren(inner) => syntax_error!(span, SyntaxError::InvalidPat),
Expr::Assign(
assign_expr
@
AssignExpr {
assign_expr @ AssignExpr {
op: AssignOpToken::Assign,
..
},
Expand Down Expand Up @@ -547,6 +564,7 @@ impl<'a, I: Tokens> Parser<'a, I> {

PropOrSpread::Spread(SpreadElement { dot3_token, expr }) => {
Ok(ObjectPatProp::Rest(RestPat {
span,
dot3_token,
// FIXME: is BindingPat correct?
arg: Box::new(
Expand Down Expand Up @@ -591,9 +609,7 @@ impl<'a, I: Tokens> Parser<'a, I> {
for expr in exprs.drain(..idx_of_rest_not_allowed) {
match expr {
Some(
expr
@
ExprOrSpread {
expr @ ExprOrSpread {
spread: Some(..), ..
},
) => syntax_error!(expr.span(), SyntaxError::NonLastRestParam),
Expand All @@ -613,9 +629,11 @@ impl<'a, I: Tokens> Parser<'a, I> {
expr,
}) => {
// TODO: is BindingPat correct?
let expr_span = expr.span();
self.reparse_expr_as_pat(pat_ty.element(), expr)
.map(|pat| {
Pat::Rest(RestPat {
span: expr_span,
dot3_token,
arg: Box::new(pat),
type_ann: None,
Expand Down Expand Up @@ -696,13 +714,17 @@ impl<'a, I: Tokens> Parser<'a, I> {
PatOrExprOrSpread::ExprOrSpread(ExprOrSpread {
spread: Some(dot3_token),
expr,
}) => self.reparse_expr_as_pat(pat_ty, expr).map(|pat| {
Pat::Rest(RestPat {
dot3_token,
arg: Box::new(pat),
type_ann: None,
})
})?,
}) => {
let expr_span = expr.span();
self.reparse_expr_as_pat(pat_ty, expr).map(|pat| {
Pat::Rest(RestPat {
span: expr_span,
dot3_token,
arg: Box::new(pat),
type_ann: None,
})
})?
}
PatOrExprOrSpread::ExprOrSpread(ExprOrSpread { expr, .. }) => {
self.reparse_expr_as_pat(pat_ty, expr)?
}
Expand Down
2 changes: 1 addition & 1 deletion ecmascript/parser/tests/typescript/arrow-function/annotated/input.ts.json
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
"type": "Identifier",
"span": {
"start": 1,
"end": 2,
"end": 10,
"ctxt": 0
},
"value": "x",
Expand Down
2 changes: 1 addition & 1 deletion ecmascript/parser/tests/typescript/arrow-function/async-generic/input.ts.json
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
"type": "Identifier",
"span": {
"start": 10,
"end": 11,
"end": 14,
"ctxt": 0
},
"value": "a",
Expand Down
5 changes: 5 additions & 0 deletions ...script/parser/tests/typescript/arrow-function/async-rest-optional-parameter/input.ts.json
View file
Open in desktop
Expand Up @@ -23,6 +23,11 @@
"params": [
{
"type": "RestElement",
"span": {
"start": 6,
"end": 21,
"ctxt": 0
},
"rest": {
"start": 6,
"end": 9,
Expand Down
5 changes: 5 additions & 0 deletions ecmascript/parser/tests/typescript/arrow-function/async-rest/input.ts.json
View file
Open in desktop
Expand Up @@ -23,6 +23,11 @@
"params": [
{
"type": "RestElement",
"span": {
"start": 7,
"end": 21,
"ctxt": 0
},
"rest": {
"start": 7,
"end": 10,
Expand Down
2 changes: 1 addition & 1 deletion ecmascript/parser/tests/typescript/arrow-function/async/input.ts.json
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
"type": "Identifier",
"span": {
"start": 7,
"end": 8,
"end": 17,
"ctxt": 0
},
"value": "x",
Expand Down
2 changes: 1 addition & 1 deletion ecmascript/parser/tests/typescript/arrow-function/default-parameter-values/input.ts.json
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@
"type": "Identifier",
"span": {
"start": 1,
"end": 2,
"end": 10,
"ctxt": 0
},
"value": "x",
Expand Down
2 changes: 1 addition & 1 deletion ecmascript/parser/tests/typescript/arrow-function/generic-tsx/input.ts.json
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
"type": "Identifier",
"span": {
"start": 66,
"end": 67,
"end": 70,
"ctxt": 0
},
"value": "a",
Expand Down
2 changes: 1 addition & 1 deletion ecmascript/parser/tests/typescript/arrow-function/generic/input.ts.json
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
"type": "Identifier",
"span": {
"start": 4,
"end": 5,
"end": 8,
"ctxt": 0
},
"value": "a",
Expand Down
2 changes: 1 addition & 1 deletion ecmascript/parser/tests/typescript/arrow-function/optional-parameter/input.ts.json
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
"type": "Identifier",
"span": {
"start": 1,
"end": 2,
"end": 11,
"ctxt": 0
},
"value": "x",
Expand Down
2 changes: 1 addition & 1 deletion ecmascript/parser/tests/typescript/arrow-function/predicate-types/input.ts.json
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@
"type": "Identifier",
"span": {
"start": 1,
"end": 2,
"end": 7,
"ctxt": 0
},
"value": "x",
Expand Down
4 changes: 2 additions & 2 deletions ecmascript/parser/tests/typescript/class/constructor-with-modifier-names/input.ts.json
View file
Open in desktop
Expand Up @@ -104,7 +104,7 @@
"type": "Identifier",
"span": {
"start": 60,
"end": 63,
"end": 68,
"ctxt": 0
},
"value": "set",
Expand All @@ -131,7 +131,7 @@
"type": "Identifier",
"span": {
"start": 70,
"end": 78,
"end": 87,
"ctxt": 0
},
"value": "readonly",
Expand Down