From 8e328e61342996e6a6999d6c15f01c84720dbdf9 Mon Sep 17 00:00:00 2001 From: Daniel Frederico Lins Leite Date: Thu, 11 Nov 2021 22:53:42 +0000 Subject: [PATCH] rebasing and adapting code to slots --- crates/rome_formatter/src/formatter.rs | 2 +- .../rome_formatter/src/ts/statements/mod.rs | 2 +- crates/rome_rowan/src/api.rs | 3 - crates/rome_rowan/src/green/node.rs | 39 ++-- crates/rome_rowan/src/green/token.rs | 1 + crates/rome_rowan/src/tree_builder.rs | 7 +- .../rslint_parser/src/lossless_tree_sink.rs | 2 +- .../err/async_arrow_expr_await_parameter.rast | 36 ++-- .../inline/err/binary_expressions_err.rast | 67 +------ .../err/binding_identifier_invalid.rast | 70 +------ .../inline/err/block_stmt_in_class.rast | 6 +- .../inline/err/bracket_expr_err.rast | 35 +--- .../test_data/inline/err/class_decl_err.rast | 6 +- .../inline/err/conditional_expr_err.rast | 35 +--- .../inline/err/do_while_stmt_err.rast | 21 +- .../inline/err/export_decl_not_top_level.rast | 22 +-- .../test_data/inline/err/for_stmt_err.rast | 35 +--- .../err/formal_params_no_binding_element.rast | 23 +-- .../inline/err/function_decl_err.rast | 109 +--------- .../test_data/inline/err/if_stmt_err.rast | 124 +++--------- .../inline/err/import_call_no_arg.rast | 35 +--- .../inline/err/import_decl_not_top_level.rast | 30 +-- .../test_data/inline/err/import_no_meta.rast | 25 +-- .../inline/err/invalid_arg_list.rast | 30 +-- .../inline/err/invalid_method_recover.rast | 63 +----- .../inline/err/method_getter_err.rast | 6 +- .../err/object_expr_error_prop_name.rast | 6 +- .../object_expr_non_ident_literal_prop.rast | 6 +- .../paren_or_arrow_expr_invalid_params.rast | 33 +--- .../err/primary_expr_invalid_recovery.rast | 24 +-- .../test_data/inline/err/return_stmt_err.rast | 24 +-- .../test_data/inline/err/semicolons_err.rast | 34 +--- .../test_data/inline/err/switch_stmt_err.rast | 33 +--- .../test_data/inline/err/throw_stmt_err.rast | 24 +-- .../err/unterminated_unicode_codepoint.rast | 6 +- .../test_data/inline/err/var_decl_err.rast | 6 +- .../test_data/inline/err/while_stmt_err.rast | 46 +---- .../test_data/inline/ok/array_expr.rast | 114 +---------- .../inline/ok/arrow_expr_single_param.rast | 74 +------ .../test_data/inline/ok/assign_expr.rast | 92 +-------- .../test_data/inline/ok/async_arrow_expr.rast | 70 +------ .../inline/ok/async_function_expr.rast | 44 +---- .../test_data/inline/ok/async_ident.rast | 6 +- .../test_data/inline/ok/async_method.rast | 44 +---- .../inline/ok/binary_expressions.rast | 168 +--------------- .../test_data/inline/ok/block_stmt.rast | 46 +---- .../test_data/inline/ok/bracket_expr.rast | 93 +-------- .../test_data/inline/ok/break_stmt.rast | 38 +--- .../test_data/inline/ok/class_decl.rast | 6 +- .../inline/ok/class_empty_element.rast | 98 ++------- .../test_data/inline/ok/class_expr.rast | 44 +---- .../test_data/inline/ok/conditional_expr.rast | 39 +--- .../test_data/inline/ok/continue_stmt.rast | 58 +----- .../test_data/inline/ok/debugger_stmt.rast | 16 +- .../test_data/inline/ok/dot_expr.rast | 71 +------ .../test_data/inline/ok/empty_stmt.rast | 14 +- .../test_data/inline/ok/export.rast | 6 +- .../test_data/inline/ok/for_stmt.rast | 80 +------- .../test_data/inline/ok/function_decl.rast | 132 +------------ .../test_data/inline/ok/function_expr.rast | 44 +---- .../test_data/inline/ok/grouping_expr.rast | 6 +- .../inline/ok/identifier_reference.rast | 40 +--- .../test_data/inline/ok/if_stmt.rast | 178 ++++------------- .../test_data/inline/ok/import_call.rast | 6 +- .../test_data/inline/ok/import_decl.rast | 6 +- .../test_data/inline/ok/import_meta.rast | 6 +- .../test_data/inline/ok/literals.rast | 59 +----- .../test_data/inline/ok/method_getter.rast | 25 +-- .../test_data/inline/ok/method_setter.rast | 25 +-- .../test_data/inline/ok/new_exprs.rast | 91 +-------- .../inline/ok/object_binding_prop.rast | 6 +- .../test_data/inline/ok/object_expr.rast | 6 +- .../inline/ok/object_expr_assign_prop.rast | 6 +- .../inline/ok/object_expr_async_method.rast | 44 +---- .../ok/object_expr_generator_method.rast | 25 +-- .../inline/ok/object_expr_getter_setter.rast | 38 +--- .../ok/object_expr_getter_setter_as_prop.rast | 6 +- .../object_expr_getter_setter_computed.rast | 38 +--- .../ok/object_expr_ident_literal_prop.rast | 6 +- .../inline/ok/object_expr_ident_prop.rast | 6 +- .../inline/ok/object_expr_method.rast | 25 +-- .../inline/ok/object_expr_spread_prop.rast | 6 +- .../test_data/inline/ok/object_prop_name.rast | 6 +- .../inline/ok/paren_or_arrow_expr.rast | 146 +------------- .../test_data/inline/ok/post_update_expr.rast | 30 +-- .../test_data/inline/ok/pre_update_expr.rast | 27 +-- .../test_data/inline/ok/return_stmt.rast | 61 +----- .../test_data/inline/ok/semicolons.rast | 44 +---- .../test_data/inline/ok/sequence_expr.rast | 6 +- .../test_data/inline/ok/static_method.rast | 80 +------- .../test_data/inline/ok/subscripts.rast | 34 +--- .../test_data/inline/ok/switch_stmt.rast | 54 +---- .../test_data/inline/ok/template_literal.rast | 6 +- .../test_data/inline/ok/this_expr.rast | 27 +-- .../test_data/inline/ok/throw_stmt.rast | 42 +--- .../test_data/inline/ok/try_stmt.rast | 186 ++++++------------ .../test_data/inline/ok/var_decl.rast | 6 +- .../test_data/inline/ok/while_stmt.rast | 40 +--- .../test_data/inline/ok/with_statement.rast | 78 ++++---- .../test_data/inline/ok/yield_expr.rast | 52 +---- 100 files changed, 456 insertions(+), 3596 deletions(-) diff --git a/crates/rome_formatter/src/formatter.rs b/crates/rome_formatter/src/formatter.rs index cb0fc89913b..77179c1ec80 100644 --- a/crates/rome_formatter/src/formatter.rs +++ b/crates/rome_formatter/src/formatter.rs @@ -138,7 +138,7 @@ impl Formatter { // need to be tracked for every node. self.format_raw(&child_node) } - SyntaxElement::Token(syntax_token) => token(&syntax_token.text_with_trivia()), + SyntaxElement::Token(syntax_token) => token(syntax_token.text_with_trivia()), })) } } diff --git a/crates/rome_formatter/src/ts/statements/mod.rs b/crates/rome_formatter/src/ts/statements/mod.rs index c526406ef27..9e268c7a797 100644 --- a/crates/rome_formatter/src/ts/statements/mod.rs +++ b/crates/rome_formatter/src/ts/statements/mod.rs @@ -1,4 +1,4 @@ -use crate::{concat_elements, hard_line_break, join_elements, FormatElement, Formatter}; +use crate::{hard_line_break, join_elements, FormatElement, Formatter}; use rslint_parser::ast::{AstNodeList, JsAnyStatement}; use rslint_parser::AstNode; diff --git a/crates/rome_rowan/src/api.rs b/crates/rome_rowan/src/api.rs index efd6be16627..b64c0bb978d 100644 --- a/crates/rome_rowan/src/api.rs +++ b/crates/rome_rowan/src/api.rs @@ -143,8 +143,6 @@ impl SyntaxNode { self.raw.text_range() } -<<<<<<< HEAD -======= pub fn text_with_trivia_range(&self) -> TextRange { self.raw.text_with_trivia_range() } @@ -153,7 +151,6 @@ impl SyntaxNode { self.raw.index() } ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) pub fn text(&self) -> SyntaxText { self.raw.text() } diff --git a/crates/rome_rowan/src/green/node.rs b/crates/rome_rowan/src/green/node.rs index 78f28404488..4fb5f8caf70 100644 --- a/crates/rome_rowan/src/green/node.rs +++ b/crates/rome_rowan/src/green/node.rs @@ -161,15 +161,15 @@ impl GreenNodeData { pub fn leading_trailing_total_len(&self) -> (TextSize, TextSize, TextSize) { let leading_len = match self.slice().first() { - Some(GreenChild::Node { node, .. }) => node.leading_trailing_total_len().0, - Some(GreenChild::Token { token, .. }) => token.leading_trailing_total_len().0, - None => 0.into(), + Some(Slot::Node { node, .. }) => node.leading_trailing_total_len().0, + Some(Slot::Token { token, .. }) => token.leading_trailing_total_len().0, + _ => 0.into(), }; let trailing_len = match self.slice().last() { - Some(GreenChild::Node { node, .. }) => node.leading_trailing_total_len().1, - Some(GreenChild::Token { token, .. }) => token.leading_trailing_total_len().1, - None => 0.into(), + Some(Slot::Node { node, .. }) => node.leading_trailing_total_len().1, + Some(Slot::Token { token, .. }) => token.leading_trailing_total_len().1, + _ => 0.into(), }; ( @@ -279,22 +279,12 @@ impl GreenNode { I: IntoIterator>, I::IntoIter: ExactSizeIterator, { -<<<<<<< HEAD - let mut text_len: TextSize = 0.into(); - let slots = slots.into_iter().map(|el| { - let rel_offset = text_len; - text_len += el.text_len(); -======= - // println!("GreenNode: {:?}", kind); let mut text_with_trivia_len: TextSize = 0.into(); - let children = children.into_iter().map(|el| { + let slots = slots.into_iter().map(|el| { let rel_offset = text_with_trivia_len; - text_with_trivia_len += el.text_with_trivia_len(); - // println!("\t\t{:?} text_len:{:?}", el, el.text_len()); ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) match el { Some(el) => { - text_len += el.text_len(); + text_with_trivia_len += el.text_with_trivia_len(); match el { NodeOrToken::Node(node) => Slot::Node { rel_offset, node }, NodeOrToken::Token(token) => Slot::Token { rel_offset, token }, @@ -358,17 +348,12 @@ impl Slot { } #[inline] fn rel_range(&self) -> TextRange { -<<<<<<< HEAD - let text_len = match self.as_ref() { - None => TextSize::from(0), - Some(element) => element.text_len(), + let len = match self { + Slot::Node { node, .. } => node.text_with_trivia_len(), + Slot::Token { token, .. } => token.text_with_trivia_len(), + _ => 0.into(), }; - - TextRange::at(self.rel_offset(), text_len) -======= - let len = self.as_ref().text_with_trivia_len(); TextRange::at(self.rel_offset(), len) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) } } diff --git a/crates/rome_rowan/src/green/token.rs b/crates/rome_rowan/src/green/token.rs index d846811e6a8..1fa0c9afb62 100644 --- a/crates/rome_rowan/src/green/token.rs +++ b/crates/rome_rowan/src/green/token.rs @@ -29,6 +29,7 @@ impl Trivia { } #[derive(Debug, Clone, PartialEq, Eq, Hash)] +#[allow(clippy::box_vec)] pub enum GreenTokenTrivia { None, Whitespace(usize), diff --git a/crates/rome_rowan/src/tree_builder.rs b/crates/rome_rowan/src/tree_builder.rs index bd60cb042d6..93cb59c011c 100644 --- a/crates/rome_rowan/src/tree_builder.rs +++ b/crates/rome_rowan/src/tree_builder.rs @@ -1,7 +1,7 @@ use crate::{ cow_mut::CowMut, green::{GreenElement, GreenTokenTrivia, NodeCache}, - GreenNode, Language, Language, NodeOrToken, NodeOrToken, SyntaxNode, SyntaxNode, + GreenNode, Language, NodeOrToken, SyntaxNode, }; /// A checkpoint for maybe wrapping a node. See `GreenNodeBuilder::checkpoint` for details. @@ -67,18 +67,15 @@ impl TreeBuilder<'_, L> { leading: GreenTokenTrivia, trailing: GreenTokenTrivia, ) { - // println!("TreeBuilder::token_with_trivia {:?}", kind); let (hash, token) = self.cache .token_with_trivia(L::kind_to_raw(kind), text, leading, trailing); - // println!("\ttoken: {:?}", token); - self.children.push((hash, token.into())); + self.children.push((hash, Some(token.into()))); } /// Start new node and make it current. #[inline] pub fn start_node(&mut self, kind: L::Kind) { - // println!("TreeBuilder::start_node {:?}", kind); let len = self.children.len(); self.parents.push((kind, len)); } diff --git a/crates/rslint_parser/src/lossless_tree_sink.rs b/crates/rslint_parser/src/lossless_tree_sink.rs index 3ec5355d1db..6bda236d6c7 100644 --- a/crates/rslint_parser/src/lossless_tree_sink.rs +++ b/crates/rslint_parser/src/lossless_tree_sink.rs @@ -207,8 +207,8 @@ impl<'a> LosslessTreeSink<'a> { }; use GreenTokenTrivia::*; - use Trivia::Whitespace as TWhitespace; use Trivia::Comment as TComments; + use Trivia::Whitespace as TWhitespace; trivia = match (trivia, current_trivia) { (None, TWhitespace(len)) => Whitespace(len), (None, TComments(len)) => Comment(len), diff --git a/crates/rslint_parser/test_data/inline/err/async_arrow_expr_await_parameter.rast b/crates/rslint_parser/test_data/inline/err/async_arrow_expr_await_parameter.rast index 20058e7ed72..fb363fc64d9 100644 --- a/crates/rslint_parser/test_data/inline/err/async_arrow_expr_await_parameter.rast +++ b/crates/rslint_parser/test_data/inline/err/async_arrow_expr_await_parameter.rast @@ -1,28 +1,22 @@ -JS_MODULE@0..26 +JS_MODULE@0..25 LIST@0..25 - VAR_DECL@0..13 - IDENT@0..3 "let" - WHITESPACE@3..4 " " - LIST@4..13 - DECLARATOR@4..13 - SINGLE_PATTERN@4..5 - NAME@4..5 - IDENT@4..5 "a" - WHITESPACE@5..6 " " - EQ@6..7 "=" - WHITESPACE@7..8 " " - NAME_REF@8..13 - IDENT@8..13 "async" - WHITESPACE@13..14 " " + VAR_DECL@0..14 + None IDENT@0..3 "let" Whitespace(1) + LIST@4..14 + DECLARATOR@4..14 + SINGLE_PATTERN@4..6 + NAME@4..6 + None IDENT@4..5 "a" Whitespace(1) + None EQ@6..7 "=" Whitespace(1) + NAME_REF@8..14 + None IDENT@8..13 "async" Whitespace(1) JS_EXPRESSION_STATEMENT@14..25 ARROW_EXPR@14..25 - NAME@14..19 - IDENT@14..19 "await" - WHITESPACE@19..20 " " - FAT_ARROW@20..22 "=>" - WHITESPACE@22..23 " " + NAME@14..20 + None IDENT@14..19 "await" Whitespace(1) + None FAT_ARROW@20..22 "=>" Whitespace(1) JS_BLOCK_STATEMENT@23..25 - L_CURLY@23..24 "{" + None L_CURLY@23..24 "{" None LIST@24..24 None R_CURLY@24..25 "}" None -- diff --git a/crates/rslint_parser/test_data/inline/err/binary_expressions_err.rast b/crates/rslint_parser/test_data/inline/err/binary_expressions_err.rast index 2d1425400f9..a117bcb3147 100644 --- a/crates/rslint_parser/test_data/inline/err/binary_expressions_err.rast +++ b/crates/rslint_parser/test_data/inline/err/binary_expressions_err.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..35 -======= -MODULE@0..34 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..34 LIST@0..34 JS_EXPRESSION_STATEMENT@0..11 CALL_EXPR@0..10 @@ -12,85 +8,28 @@ MODULE@0..34 None L_PAREN@3..4 "(" None LIST@4..9 BIN_EXPR@4..9 -<<<<<<< HEAD - NAME_REF@4..7 - IDENT@4..7 "foo" - WHITESPACE@7..8 " " - PLUS@8..9 "+" - R_PAREN@9..10 ")" - SEMICOLON@10..11 ";" - WHITESPACE@11..12 "\n" - JS_EXPRESSION_STATEMENT@12..22 - BIN_EXPR@12..21 - NAME_REF@12..15 - IDENT@12..15 "foo" - WHITESPACE@15..16 " " - PLUS@16..17 "+" - WHITESPACE@17..18 " " -======= NAME_REF@4..8 None IDENT@4..7 "foo" Whitespace(1) None PLUS@8..9 "+" None None R_PAREN@9..10 ")" None None SEMICOLON@10..11 ";" None - EXPR_STMT@11..22 + JS_EXPRESSION_STATEMENT@11..22 BIN_EXPR@11..21 NAME_REF@11..16 -<<<<<<< HEAD -<<<<<<< HEAD - "\n" IDENT@11..16 "foo" " " - PLUS@16..18 "+" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(1) IDENT@11..16 "foo" Whitespace(1) - None PLUS@16..18 "+" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(1) IDENT@12..15 "foo" Whitespace(1) None PLUS@16..17 "+" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) BIN_EXPR@18..21 None STAR@18..19 "*" Whitespace(1) LITERAL@20..21 -<<<<<<< HEAD -<<<<<<< HEAD - NUMBER@20..21 "2" - SEMICOLON@21..22 ";" - WHITESPACE@22..23 "\n" - JS_EXPRESSION_STATEMENT@23..34 - BIN_EXPR@23..33 - UNARY_EXPR@23..27 - BANG@23..24 "!" - NAME_REF@24..27 - IDENT@24..27 "foo" - WHITESPACE@27..28 " " - STAR@28..29 "*" - WHITESPACE@29..30 " " -======= - NUMBER@20..21 "2" - SEMICOLON@21..22 ";" -======= None NUMBER@20..21 "2" None None SEMICOLON@21..22 ";" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) - EXPR_STMT@22..34 + JS_EXPRESSION_STATEMENT@22..34 BIN_EXPR@22..33 UNARY_EXPR@22..28 Whitespace(1) BANG@23..24 "!" None NAME_REF@24..28 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@24..28 "foo" " " - STAR@28..30 "*" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None IDENT@24..28 "foo" Whitespace(1) - None STAR@28..30 "*" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None IDENT@24..27 "foo" Whitespace(1) None STAR@28..29 "*" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) NAME_REF@30..33 None IDENT@30..33 "bar" None None SEMICOLON@33..34 ";" None diff --git a/crates/rslint_parser/test_data/inline/err/binding_identifier_invalid.rast b/crates/rslint_parser/test_data/inline/err/binding_identifier_invalid.rast index 7e07beeae34..2765d716bdf 100644 --- a/crates/rslint_parser/test_data/inline/err/binding_identifier_invalid.rast +++ b/crates/rslint_parser/test_data/inline/err/binding_identifier_invalid.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..83 -======= -MODULE@0..82 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..82 LIST@0..82 JS_EXPRESSION_STATEMENT@0..30 ARROW_EXPR@0..30 @@ -10,45 +6,13 @@ MODULE@0..82 PARAMETER_LIST@6..9 None L_PAREN@6..7 "(" None LIST@7..7 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@7..8 ")" - WHITESPACE@8..9 " " - FAT_ARROW@9..11 "=>" - WHITESPACE@11..12 " " - JS_BLOCK_STATEMENT@12..30 - L_CURLY@12..13 "{" - WHITESPACE@13..14 " " - LIST@14..28 - VAR_DECL@14..28 - IDENT@14..17 "let" - WHITESPACE@17..18 " " -======= - R_PAREN@7..9 ")" " " - FAT_ARROW@9..12 "=>" " " -======= - None R_PAREN@7..9 ")" Whitespace(1) - None FAT_ARROW@9..12 "=>" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None R_PAREN@7..8 ")" Whitespace(1) None FAT_ARROW@9..11 "=>" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@12..30 + JS_BLOCK_STATEMENT@12..30 None L_CURLY@12..13 "{" Whitespace(1) LIST@14..29 VAR_DECL@14..29 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@14..18 "let" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None IDENT@14..18 "let" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None IDENT@14..17 "let" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) LIST@18..27 DECLARATOR@18..27 SINGLE_PATTERN@18..24 @@ -67,40 +31,12 @@ MODULE@0..82 PARAMETER_LIST@44..47 None L_PAREN@44..45 "(" None LIST@45..45 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@45..46 ")" - WHITESPACE@46..47 " " - JS_BLOCK_STATEMENT@47..68 - L_CURLY@47..48 "{" - WHITESPACE@48..52 "\n " - LIST@52..66 - VAR_DECL@52..66 - IDENT@52..55 "let" - WHITESPACE@55..56 " " -======= - R_PAREN@45..47 ")" " " -======= - None R_PAREN@45..47 ")" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None R_PAREN@45..46 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@47..68 + JS_BLOCK_STATEMENT@47..68 None L_CURLY@47..48 "{" None LIST@48..66 VAR_DECL@48..66 -<<<<<<< HEAD -<<<<<<< HEAD - "\n " IDENT@48..56 "let" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(4) IDENT@48..56 "let" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(4) IDENT@52..55 "let" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) LIST@56..65 DECLARATOR@56..65 SINGLE_PATTERN@56..62 diff --git a/crates/rslint_parser/test_data/inline/err/block_stmt_in_class.rast b/crates/rslint_parser/test_data/inline/err/block_stmt_in_class.rast index 908b393eb6b..b2c1881e70a 100644 --- a/crates/rslint_parser/test_data/inline/err/block_stmt_in_class.rast +++ b/crates/rslint_parser/test_data/inline/err/block_stmt_in_class.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..12 -======= -MODULE@0..11 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..11 LIST@0..11 CLASS_DECL@0..10 None CLASS_KW@0..5 "class" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/err/bracket_expr_err.rast b/crates/rslint_parser/test_data/inline/err/bracket_expr_err.rast index bb5d5494bcb..27945ccbe5d 100644 --- a/crates/rslint_parser/test_data/inline/err/bracket_expr_err.rast +++ b/crates/rslint_parser/test_data/inline/err/bracket_expr_err.rast @@ -1,51 +1,24 @@ -<<<<<<< HEAD -JS_MODULE@0..19 - LIST@0..19 - JS_EXPRESSION_STATEMENT@0..5 - BRACKET_EXPR@0..5 - NAME_REF@0..3 - IDENT@0..3 "foo" - L_BRACK@3..4 "[" - R_BRACK@4..5 "]" - WHITESPACE@5..6 "\n" - JS_EXPRESSION_STATEMENT@6..13 - BRACKET_EXPR@6..13 - NAME_REF@6..9 - IDENT@6..9 "foo" - QUESTIONDOT@9..11 "?." - L_BRACK@11..12 "[" - R_BRACK@12..13 "]" - WHITESPACE@13..14 "\n" - JS_EXPRESSION_STATEMENT@14..19 - BRACKET_EXPR@14..19 - NAME_REF@14..17 - IDENT@14..17 "foo" - L_BRACK@17..18 "[" - WHITESPACE@18..19 "\n" - ERROR@19..19 -======= -MODULE@0..18 +JS_MODULE@0..18 LIST@0..18 - EXPR_STMT@0..5 + JS_EXPRESSION_STATEMENT@0..5 BRACKET_EXPR@0..5 NAME_REF@0..3 None IDENT@0..3 "foo" None None L_BRACK@3..4 "[" None None R_BRACK@4..5 "]" None - EXPR_STMT@5..13 + JS_EXPRESSION_STATEMENT@5..13 BRACKET_EXPR@5..13 NAME_REF@5..9 Whitespace(1) IDENT@6..9 "foo" None None QUESTIONDOT@9..11 "?." None None L_BRACK@11..12 "[" None None R_BRACK@12..13 "]" None - EXPR_STMT@13..18 + JS_EXPRESSION_STATEMENT@13..18 BRACKET_EXPR@13..18 NAME_REF@13..17 Whitespace(1) IDENT@14..17 "foo" None None L_BRACK@17..18 "[" None ERROR@18..18 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -- error[SyntaxError]: Expected an expression, but found none ┌─ bracket_expr_err.js:1:5 diff --git a/crates/rslint_parser/test_data/inline/err/class_decl_err.rast b/crates/rslint_parser/test_data/inline/err/class_decl_err.rast index 866b129453c..b266870d731 100644 --- a/crates/rslint_parser/test_data/inline/err/class_decl_err.rast +++ b/crates/rslint_parser/test_data/inline/err/class_decl_err.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..74 -======= -MODULE@0..73 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..73 LIST@0..73 CLASS_DECL@0..8 None CLASS_KW@0..5 "class" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/err/conditional_expr_err.rast b/crates/rslint_parser/test_data/inline/err/conditional_expr_err.rast index 13ecf509474..a409a5e9ef8 100644 --- a/crates/rslint_parser/test_data/inline/err/conditional_expr_err.rast +++ b/crates/rslint_parser/test_data/inline/err/conditional_expr_err.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..40 -======= -MODULE@0..39 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..39 LIST@0..39 JS_EXPRESSION_STATEMENT@0..13 COND_EXPR@0..13 @@ -12,41 +8,14 @@ MODULE@0..39 NAME_REF@6..10 None IDENT@6..9 "bar" Whitespace(1) NAME_REF@10..13 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@10..13 "baz" - WHITESPACE@13..14 "\n" - JS_EXPRESSION_STATEMENT@14..39 - COND_EXPR@14..39 - NAME_REF@14..17 - IDENT@14..17 "foo" - WHITESPACE@17..18 " " - QUESTION@18..19 "?" - WHITESPACE@19..20 " " - NAME_REF@20..23 - IDENT@20..23 "bar" - WHITESPACE@23..24 " " -======= - IDENT@10..13 "baz" -======= None IDENT@10..13 "baz" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) - EXPR_STMT@13..39 + JS_EXPRESSION_STATEMENT@13..39 COND_EXPR@13..39 NAME_REF@13..18 Whitespace(1) IDENT@14..17 "foo" Whitespace(1) None QUESTION@18..19 "?" Whitespace(1) NAME_REF@20..24 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@20..24 "bar" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None IDENT@20..24 "bar" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None IDENT@20..23 "bar" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) COND_EXPR@24..39 NAME_REF@24..28 None IDENT@24..27 "baz" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/err/do_while_stmt_err.rast b/crates/rslint_parser/test_data/inline/err/do_while_stmt_err.rast index c2b78740b51..fac09ee73c5 100644 --- a/crates/rslint_parser/test_data/inline/err/do_while_stmt_err.rast +++ b/crates/rslint_parser/test_data/inline/err/do_while_stmt_err.rast @@ -1,28 +1,9 @@ -<<<<<<< HEAD -JS_MODULE@0..42 - LIST@0..42 - DO_WHILE_STMT@0..42 - DO_KW@0..2 "do" - WHITESPACE@2..3 " " - WHILE_STMT@3..42 - WHILE_KW@3..8 "while" - WHITESPACE@8..9 " " -======= -MODULE@0..41 +JS_MODULE@0..41 LIST@0..41 DO_WHILE_STMT@0..41 None DO_KW@0..2 "do" Whitespace(1) WHILE_STMT@3..41 -<<<<<<< HEAD -<<<<<<< HEAD - WHILE_KW@3..9 "while" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None WHILE_KW@3..9 "while" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None WHILE_KW@3..8 "while" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) CONDITION@9..15 None L_PAREN@9..10 "(" None LITERAL@10..14 diff --git a/crates/rslint_parser/test_data/inline/err/export_decl_not_top_level.rast b/crates/rslint_parser/test_data/inline/err/export_decl_not_top_level.rast index a5e9c214cba..4ab4b1b3067 100644 --- a/crates/rslint_parser/test_data/inline/err/export_decl_not_top_level.rast +++ b/crates/rslint_parser/test_data/inline/err/export_decl_not_top_level.rast @@ -1,30 +1,10 @@ -<<<<<<< HEAD -JS_MODULE@0..34 +JS_MODULE@0..33 LIST@0..33 JS_BLOCK_STATEMENT@0..33 - L_CURLY@0..1 "{" - WHITESPACE@1..3 "\n " - LIST@3..31 - ERROR@3..31 - EXPORT_KW@3..9 "export" - WHITESPACE@9..10 " " -======= -MODULE@0..33 - LIST@0..33 - BLOCK_STMT@0..33 None L_CURLY@0..1 "{" None LIST@1..31 ERROR@1..31 -<<<<<<< HEAD -<<<<<<< HEAD - "\n " EXPORT_KW@1..10 "export" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(2) EXPORT_KW@1..10 "export" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(2) EXPORT_KW@3..9 "export" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) EXPORT_NAMED@10..31 None L_CURLY@10..11 "{" Whitespace(1) LIST@12..17 diff --git a/crates/rslint_parser/test_data/inline/err/for_stmt_err.rast b/crates/rslint_parser/test_data/inline/err/for_stmt_err.rast index 4e6e5db7101..852fcc06cc6 100644 --- a/crates/rslint_parser/test_data/inline/err/for_stmt_err.rast +++ b/crates/rslint_parser/test_data/inline/err/for_stmt_err.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..40 -======= -MODULE@0..39 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..39 LIST@0..39 FOR_STMT@0..39 None FOR_KW@0..3 "for" Whitespace(1) @@ -33,42 +29,15 @@ MODULE@0..39 None IDENT@25..26 "i" Whitespace(1) None L_ANGLE@27..28 "<" Whitespace(1) LITERAL@29..31 -<<<<<<< HEAD -<<<<<<< HEAD - NUMBER@29..31 "10" - SEMICOLON@31..32 ";" - WHITESPACE@32..33 " " - FOR_STMT_UPDATE@33..36 - PRE_UPDATE_EXPRESSION@33..36 - PLUS2@33..35 "++" - NAME_REF@35..36 - IDENT@35..36 "i" - WHITESPACE@36..37 " " - JS_BLOCK_STATEMENT@37..39 - L_CURLY@37..38 "{" -======= - NUMBER@29..31 "10" - SEMICOLON@31..33 ";" " " -======= None NUMBER@29..31 "10" None -<<<<<<< HEAD - None SEMICOLON@31..33 ";" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None SEMICOLON@31..32 ";" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) FOR_STMT_UPDATE@33..37 PRE_UPDATE_EXPRESSION@33..37 None PLUS2@33..35 "++" None NAME_REF@35..37 None IDENT@35..36 "i" Whitespace(1) - BLOCK_STMT@37..39 -<<<<<<< HEAD - L_CURLY@37..38 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= + JS_BLOCK_STATEMENT@37..39 None L_CURLY@37..38 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@38..38 None R_CURLY@38..39 "}" None -- diff --git a/crates/rslint_parser/test_data/inline/err/formal_params_no_binding_element.rast b/crates/rslint_parser/test_data/inline/err/formal_params_no_binding_element.rast index 0cf4b5b91d1..06370c6c203 100644 --- a/crates/rslint_parser/test_data/inline/err/formal_params_no_binding_element.rast +++ b/crates/rslint_parser/test_data/inline/err/formal_params_no_binding_element.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..22 -======= -MODULE@0..21 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..21 LIST@0..21 FN_DECL@0..21 None FUNCTION_KW@0..8 "function" Whitespace(1) @@ -12,25 +8,10 @@ MODULE@0..21 None L_PAREN@12..13 "(" None LIST@13..17 ERROR@13..17 -<<<<<<< HEAD -<<<<<<< HEAD - TRUE_KW@13..17 "true" - R_PAREN@17..18 ")" - WHITESPACE@18..19 " " - JS_BLOCK_STATEMENT@19..21 - L_CURLY@19..20 "{" -======= - TRUE_KW@13..17 "true" - R_PAREN@17..19 ")" " " - BLOCK_STMT@19..21 - L_CURLY@19..20 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None TRUE_KW@13..17 "true" None None R_PAREN@17..18 ")" Whitespace(1) - BLOCK_STMT@19..21 + JS_BLOCK_STATEMENT@19..21 None L_CURLY@19..20 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@20..20 None R_CURLY@20..21 "}" None -- diff --git a/crates/rslint_parser/test_data/inline/err/function_decl_err.rast b/crates/rslint_parser/test_data/inline/err/function_decl_err.rast index 546df11135e..78243214ca5 100644 --- a/crates/rslint_parser/test_data/inline/err/function_decl_err.rast +++ b/crates/rslint_parser/test_data/inline/err/function_decl_err.rast @@ -1,34 +1,13 @@ -<<<<<<< HEAD -JS_MODULE@0..114 -======= -MODULE@0..113 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..113 LIST@0..113 FN_DECL@0..13 None FUNCTION_KW@0..8 "function" None PARAMETER_LIST@8..11 None L_PAREN@8..9 "(" None LIST@9..9 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@9..10 ")" - WHITESPACE@10..11 " " - JS_BLOCK_STATEMENT@11..13 - L_CURLY@11..12 "{" -======= - R_PAREN@9..11 ")" " " - BLOCK_STMT@11..13 - L_CURLY@11..12 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@9..11 ")" Whitespace(1) -======= None R_PAREN@9..10 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@11..13 + JS_BLOCK_STATEMENT@11..13 None L_CURLY@11..12 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@12..12 None R_CURLY@12..13 "}" None FN_DECL@13..41 @@ -44,25 +23,10 @@ MODULE@0..113 ERROR@35..36 None STAR@35..36 "*" None ERROR@36..37 -<<<<<<< HEAD -<<<<<<< HEAD - L_PAREN@36..37 "(" - R_PAREN@37..38 ")" - WHITESPACE@38..39 " " - JS_BLOCK_STATEMENT@39..41 - L_CURLY@39..40 "{" -======= - L_PAREN@36..37 "(" - R_PAREN@37..39 ")" " " - BLOCK_STMT@39..41 - L_CURLY@39..40 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None L_PAREN@36..37 "(" None None R_PAREN@37..38 ")" Whitespace(1) - BLOCK_STMT@39..41 + JS_BLOCK_STATEMENT@39..41 None L_CURLY@39..40 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@40..40 None R_CURLY@40..41 "}" None FN_DECL@41..61 @@ -71,26 +35,9 @@ MODULE@0..113 PARAMETER_LIST@56..59 None L_PAREN@56..57 "(" None LIST@57..57 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@57..58 ")" - WHITESPACE@58..59 " " - JS_BLOCK_STATEMENT@59..61 - L_CURLY@59..60 "{" -======= - R_PAREN@57..59 ")" " " - BLOCK_STMT@59..61 - L_CURLY@59..60 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@57..59 ")" Whitespace(1) -======= None R_PAREN@57..58 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@59..61 + JS_BLOCK_STATEMENT@59..61 None L_CURLY@59..60 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@60..60 None R_CURLY@60..61 "}" None FN_DECL@61..83 @@ -100,26 +47,9 @@ MODULE@0..113 PARAMETER_LIST@78..81 None L_PAREN@78..79 "(" None LIST@79..79 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@79..80 ")" - WHITESPACE@80..81 " " - JS_BLOCK_STATEMENT@81..83 - L_CURLY@81..82 "{" -======= - R_PAREN@79..81 ")" " " - BLOCK_STMT@81..83 - L_CURLY@81..82 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@79..81 ")" Whitespace(1) -======= None R_PAREN@79..80 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@81..83 + JS_BLOCK_STATEMENT@81..83 None L_CURLY@81..82 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@82..82 None R_CURLY@82..83 "}" None FN_DECL@83..102 @@ -130,38 +60,15 @@ MODULE@0..113 PARAMETER_LIST@97..100 None L_PAREN@97..98 "(" None LIST@98..98 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@98..99 ")" - WHITESPACE@99..100 " " - JS_BLOCK_STATEMENT@100..102 - L_CURLY@100..101 "{" - LIST@101..101 - R_CURLY@101..102 "}" - WHITESPACE@102..103 "\n" - JS_EXPRESSION_STATEMENT@103..108 - NAME_REF@103..108 - IDENT@103..108 "yield" - WHITESPACE@108..109 " " - JS_EXPRESSION_STATEMENT@109..113 -======= - R_PAREN@98..100 ")" " " -======= - None R_PAREN@98..100 ")" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None R_PAREN@98..99 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@100..102 + JS_BLOCK_STATEMENT@100..102 None L_CURLY@100..101 "{" None LIST@101..101 None R_CURLY@101..102 "}" None - EXPR_STMT@102..109 + JS_EXPRESSION_STATEMENT@102..109 NAME_REF@102..109 Whitespace(1) IDENT@103..108 "yield" Whitespace(1) - EXPR_STMT@109..113 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) + JS_EXPRESSION_STATEMENT@109..113 NAME_REF@109..112 None IDENT@109..112 "foo" None None SEMICOLON@112..113 ";" None diff --git a/crates/rslint_parser/test_data/inline/err/if_stmt_err.rast b/crates/rslint_parser/test_data/inline/err/if_stmt_err.rast index 923fc8b7ca8..e29a3c02cb3 100644 --- a/crates/rslint_parser/test_data/inline/err/if_stmt_err.rast +++ b/crates/rslint_parser/test_data/inline/err/if_stmt_err.rast @@ -1,113 +1,47 @@ -<<<<<<< HEAD -JS_MODULE@0..61 +JS_MODULE@0..60 LIST@0..60 JS_IF_STATEMENT@0..17 - IF_KW@0..2 "if" - WHITESPACE@2..3 " " - L_PAREN@3..4 "(" + None IF_KW@0..2 "if" Whitespace(1) + None L_PAREN@3..4 "(" None LITERAL@4..8 - TRUE_KW@4..8 "true" - R_PAREN@8..9 ")" - WHITESPACE@9..10 " " + None TRUE_KW@4..8 "true" None + None R_PAREN@8..9 ")" Whitespace(1) JS_ELSE_CLAUSE@10..17 - ELSE_KW@10..14 "else" - WHITESPACE@14..15 " " + None ELSE_KW@10..14 "else" Whitespace(1) JS_BLOCK_STATEMENT@15..17 - L_CURLY@15..16 "{" + None L_CURLY@15..16 "{" None LIST@16..16 - R_CURLY@16..17 "}" - WHITESPACE@17..18 "\n" - JS_IF_STATEMENT@18..43 - IF_KW@18..20 "if" - WHITESPACE@20..21 " " - L_PAREN@21..22 "(" + None R_CURLY@16..17 "}" None + JS_IF_STATEMENT@17..43 + Whitespace(1) IF_KW@18..20 "if" Whitespace(1) + None L_PAREN@21..22 "(" None LITERAL@22..26 - TRUE_KW@22..26 "true" - R_PAREN@26..27 ")" - WHITESPACE@27..28 " " + None TRUE_KW@22..26 "true" None + None R_PAREN@26..27 ")" Whitespace(1) JS_ELSE_CLAUSE@28..43 - ELSE_KW@28..32 "else" - WHITESPACE@32..33 "\n" - JS_IF_STATEMENT@33..43 - IF_KW@33..35 "if" - WHITESPACE@35..36 " " + None ELSE_KW@28..32 "else" None + JS_IF_STATEMENT@32..43 + Whitespace(1) IF_KW@33..35 "if" Whitespace(1) JS_ELSE_CLAUSE@36..43 - ELSE_KW@36..40 "else" - WHITESPACE@40..41 " " + None ELSE_KW@36..40 "else" Whitespace(1) JS_BLOCK_STATEMENT@41..43 - L_CURLY@41..42 "{" + None L_CURLY@41..42 "{" None LIST@42..42 - R_CURLY@42..43 "}" - WHITESPACE@43..44 "\n" - JS_IF_STATEMENT@44..60 - IF_KW@44..46 "if" - WHITESPACE@46..47 " " - L_PAREN@47..48 "(" - R_PAREN@48..49 ")" - WHITESPACE@49..50 " " - JS_BLOCK_STATEMENT@50..52 - L_CURLY@50..51 "{" - LIST@51..51 - R_CURLY@51..52 "}" - WHITESPACE@52..53 " " - JS_ELSE_CLAUSE@53..60 - ELSE_KW@53..57 "else" - WHITESPACE@57..58 " " - JS_BLOCK_STATEMENT@58..60 - L_CURLY@58..59 "{" - LIST@59..59 - R_CURLY@59..60 "}" - WHITESPACE@60..61 "\n" -======= -MODULE@0..60 - LIST@0..60 - IF_STMT@0..17 - None IF_KW@0..2 "if" Whitespace(1) - CONDITION@3..10 - None L_PAREN@3..4 "(" None - LITERAL@4..8 - None TRUE_KW@4..8 "true" None - None R_PAREN@8..9 ")" Whitespace(1) - None ELSE_KW@10..14 "else" Whitespace(1) - BLOCK_STMT@15..17 - None L_CURLY@15..16 "{" None - LIST@16..16 - None R_CURLY@16..17 "}" None - IF_STMT@17..43 - Whitespace(1) IF_KW@18..20 "if" Whitespace(1) - CONDITION@21..28 - None L_PAREN@21..22 "(" None - LITERAL@22..26 - None TRUE_KW@22..26 "true" None - None R_PAREN@26..27 ")" Whitespace(1) - None ELSE_KW@28..32 "else" None - IF_STMT@32..43 - Whitespace(1) IF_KW@33..35 "if" Whitespace(1) - CONDITION@36..36 - None ELSE_KW@36..40 "else" Whitespace(1) - BLOCK_STMT@41..43 - None L_CURLY@41..42 "{" None - LIST@42..42 - None R_CURLY@42..43 "}" None - IF_STMT@43..60 + None R_CURLY@42..43 "}" None + JS_IF_STATEMENT@43..60 Whitespace(1) IF_KW@44..46 "if" Whitespace(1) - CONDITION@47..50 - None L_PAREN@47..48 "(" None - None R_PAREN@48..49 ")" Whitespace(1) - BLOCK_STMT@50..53 + None L_PAREN@47..48 "(" None + None R_PAREN@48..49 ")" Whitespace(1) + JS_BLOCK_STATEMENT@50..53 None L_CURLY@50..51 "{" None LIST@51..51 None R_CURLY@51..52 "}" Whitespace(1) - None ELSE_KW@53..57 "else" Whitespace(1) - BLOCK_STMT@58..60 - None L_CURLY@58..59 "{" None - LIST@59..59 -<<<<<<< HEAD - R_CURLY@59..60 "}" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_CURLY@59..60 "}" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) + JS_ELSE_CLAUSE@53..60 + None ELSE_KW@53..57 "else" Whitespace(1) + JS_BLOCK_STATEMENT@58..60 + None L_CURLY@58..59 "{" None + LIST@59..59 + None R_CURLY@59..60 "}" None -- error[SyntaxError]: Expected a statement or declaration, but found none ┌─ if_stmt_err.js:1:11 diff --git a/crates/rslint_parser/test_data/inline/err/import_call_no_arg.rast b/crates/rslint_parser/test_data/inline/err/import_call_no_arg.rast index 5c74f5389eb..fd54452568e 100644 --- a/crates/rslint_parser/test_data/inline/err/import_call_no_arg.rast +++ b/crates/rslint_parser/test_data/inline/err/import_call_no_arg.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..25 -======= -MODULE@0..24 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..24 LIST@0..24 VAR_DECL@0..17 None IDENT@0..3 "let" Whitespace(1) @@ -13,41 +9,14 @@ MODULE@0..24 None IDENT@4..5 "a" Whitespace(1) None EQ@6..7 "=" Whitespace(1) IMPORT_CALL@8..16 -<<<<<<< HEAD -<<<<<<< HEAD - IMPORT_KW@8..14 "import" - L_PAREN@14..15 "(" - R_PAREN@15..16 ")" - SEMICOLON@16..17 ";" - WHITESPACE@17..18 "\n" - JS_EXPRESSION_STATEMENT@18..24 - CALL_EXPR@18..23 - NAME_REF@18..21 - IDENT@18..21 "foo" -======= - IMPORT_KW@8..14 "import" - L_PAREN@14..15 "(" - R_PAREN@15..16 ")" - SEMICOLON@16..17 ";" - EXPR_STMT@17..24 - CALL_EXPR@17..23 - NAME_REF@17..21 - "\n" IDENT@17..21 "foo" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None IMPORT_KW@8..14 "import" None None L_PAREN@14..15 "(" None None R_PAREN@15..16 ")" None None SEMICOLON@16..17 ";" None - EXPR_STMT@17..24 + JS_EXPRESSION_STATEMENT@17..24 CALL_EXPR@17..23 NAME_REF@17..21 -<<<<<<< HEAD - Whitespace(1) IDENT@17..21 "foo" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(1) IDENT@18..21 "foo" None ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) ARG_LIST@21..23 None L_PAREN@21..22 "(" None LIST@22..22 diff --git a/crates/rslint_parser/test_data/inline/err/import_decl_not_top_level.rast b/crates/rslint_parser/test_data/inline/err/import_decl_not_top_level.rast index 8fa29f40c1d..fae8a188ff6 100644 --- a/crates/rslint_parser/test_data/inline/err/import_decl_not_top_level.rast +++ b/crates/rslint_parser/test_data/inline/err/import_decl_not_top_level.rast @@ -1,42 +1,14 @@ -<<<<<<< HEAD -JS_MODULE@0..28 +JS_MODULE@0..27 LIST@0..27 JS_BLOCK_STATEMENT@0..27 - L_CURLY@0..1 "{" - WHITESPACE@1..3 "\n " - LIST@3..25 - ERROR@3..25 - IMPORT_KW@3..9 "import" - WHITESPACE@9..10 " " - LIST@10..13 - NAME@10..13 - IDENT@10..13 "foo" - WHITESPACE@13..14 " " - FROM_KW@14..18 "from" - WHITESPACE@18..19 " " -======= -MODULE@0..27 - LIST@0..27 - BLOCK_STMT@0..27 None L_CURLY@0..1 "{" None LIST@1..25 ERROR@1..25 Whitespace(2) IMPORT_KW@3..9 "import" Whitespace(1) LIST@10..14 NAME@10..14 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@10..14 "foo" " " - FROM_KW@14..19 "from" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None IDENT@10..14 "foo" Whitespace(1) - None FROM_KW@14..19 "from" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None IDENT@10..13 "foo" Whitespace(1) None FROM_KW@14..18 "from" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) LITERAL@19..24 None STRING@19..24 "\"bar\"" None None SEMICOLON@24..25 ";" None diff --git a/crates/rslint_parser/test_data/inline/err/import_no_meta.rast b/crates/rslint_parser/test_data/inline/err/import_no_meta.rast index 30cdbf3cddd..532dc6cc2a1 100644 --- a/crates/rslint_parser/test_data/inline/err/import_no_meta.rast +++ b/crates/rslint_parser/test_data/inline/err/import_no_meta.rast @@ -1,36 +1,15 @@ -<<<<<<< HEAD -JS_MODULE@0..24 -======= -MODULE@0..23 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..23 LIST@0..23 JS_EXPRESSION_STATEMENT@0..10 ERROR@0..10 None IMPORT_KW@0..6 "import" None None DOT@6..7 "." None ERROR@7..10 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@7..10 "foo" - WHITESPACE@10..11 "\n" - JS_EXPRESSION_STATEMENT@11..23 - ERROR@11..23 - IMPORT_KW@11..17 "import" - DOT@17..18 "." -======= - IDENT@7..10 "foo" - EXPR_STMT@10..23 - ERROR@10..23 - "\n" IMPORT_KW@10..17 "import" - DOT@17..18 "." ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None IDENT@7..10 "foo" None - EXPR_STMT@10..23 + JS_EXPRESSION_STATEMENT@10..23 ERROR@10..23 Whitespace(1) IMPORT_KW@11..17 "import" None None DOT@17..18 "." None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) ERROR@18..23 None IDENT@18..23 "metaa" None -- diff --git a/crates/rslint_parser/test_data/inline/err/invalid_arg_list.rast b/crates/rslint_parser/test_data/inline/err/invalid_arg_list.rast index 2171fccd07d..96490c1f53c 100644 --- a/crates/rslint_parser/test_data/inline/err/invalid_arg_list.rast +++ b/crates/rslint_parser/test_data/inline/err/invalid_arg_list.rast @@ -1,12 +1,6 @@ -<<<<<<< HEAD -JS_MODULE@0..21 - LIST@0..21 - JS_EXPRESSION_STATEMENT@0..8 -======= -MODULE@0..20 +JS_MODULE@0..20 LIST@0..20 - EXPR_STMT@0..8 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) + JS_EXPRESSION_STATEMENT@0..8 CALL_EXPR@0..7 NAME_REF@0..3 None IDENT@0..3 "foo" None @@ -17,33 +11,15 @@ MODULE@0..20 None IDENT@4..5 "a" None None COMMA@5..6 "," None NAME_REF@6..7 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@6..7 "b" - SEMICOLON@7..8 ";" - WHITESPACE@8..9 "\n" - JS_EXPRESSION_STATEMENT@9..16 - CALL_EXPR@9..16 - NAME_REF@9..12 - IDENT@9..12 "foo" - ARG_LIST@12..16 - L_PAREN@12..13 "(" - LIST@13..16 -======= - IDENT@6..7 "b" - SEMICOLON@7..8 ";" -======= None IDENT@6..7 "b" None None SEMICOLON@7..8 ";" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) - EXPR_STMT@8..17 + JS_EXPRESSION_STATEMENT@8..17 CALL_EXPR@8..17 NAME_REF@8..12 Whitespace(1) IDENT@9..12 "foo" None ARG_LIST@12..17 None L_PAREN@12..13 "(" None LIST@13..17 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) NAME_REF@13..14 None IDENT@13..14 "a" None None COMMA@14..15 "," None diff --git a/crates/rslint_parser/test_data/inline/err/invalid_method_recover.rast b/crates/rslint_parser/test_data/inline/err/invalid_method_recover.rast index 4979cd390d5..10cee69cde2 100644 --- a/crates/rslint_parser/test_data/inline/err/invalid_method_recover.rast +++ b/crates/rslint_parser/test_data/inline/err/invalid_method_recover.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..48 -======= -MODULE@0..47 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..47 LIST@0..47 CLASS_DECL@0..46 None CLASS_KW@0..5 "class" Whitespace(1) @@ -24,45 +20,13 @@ MODULE@0..47 PARAMETER_LIST@20..23 None L_PAREN@20..21 "(" None LIST@21..21 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@21..22 ")" - WHITESPACE@22..23 " " - FAT_ARROW@23..25 "=>" - WHITESPACE@25..26 " " - JS_BLOCK_STATEMENT@26..43 - L_CURLY@26..27 "{" - WHITESPACE@27..32 "\n " - LIST@32..39 - VAR_DECL@32..39 - IDENT@32..35 "let" - WHITESPACE@35..36 " " -======= - R_PAREN@21..23 ")" " " - FAT_ARROW@23..26 "=>" " " -======= - None R_PAREN@21..23 ")" Whitespace(1) - None FAT_ARROW@23..26 "=>" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None R_PAREN@21..22 ")" Whitespace(1) None FAT_ARROW@23..25 "=>" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@26..43 + JS_BLOCK_STATEMENT@26..43 None L_CURLY@26..27 "{" None LIST@27..39 VAR_DECL@27..39 -<<<<<<< HEAD -<<<<<<< HEAD - "\n " IDENT@27..36 "let" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(5) IDENT@27..36 "let" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(5) IDENT@32..35 "let" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) LIST@36..39 DECLARATOR@36..39 SINGLE_PATTERN@36..37 @@ -70,33 +34,12 @@ MODULE@0..47 None IDENT@36..37 "a" None None EQ@37..38 "=" None ERROR@38..39 -<<<<<<< HEAD -<<<<<<< HEAD - SEMICOLON@38..39 ";" - WHITESPACE@39..42 "\n " - R_CURLY@42..43 "}" - SEMICOLON@43..44 ";" - WHITESPACE@44..45 "\n" - R_CURLY@45..46 "}" - JS_EMPTY_STATEMENT@46..47 - SEMICOLON@46..47 ";" - WHITESPACE@47..48 "\n" -======= - SEMICOLON@38..39 ";" - "\n " R_CURLY@39..43 "}" - SEMICOLON@43..44 ";" - "\n" R_CURLY@44..46 "}" - EMPTY_STMT@46..47 - SEMICOLON@46..47 ";" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None SEMICOLON@38..39 ";" None Whitespace(3) R_CURLY@42..43 "}" None None SEMICOLON@43..44 ";" None Whitespace(1) R_CURLY@45..46 "}" None - EMPTY_STMT@46..47 + JS_EMPTY_STATEMENT@46..47 None SEMICOLON@46..47 ";" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -- error[SyntaxError]: class declarations must have a name ┌─ invalid_method_recover.js:1:7 diff --git a/crates/rslint_parser/test_data/inline/err/method_getter_err.rast b/crates/rslint_parser/test_data/inline/err/method_getter_err.rast index 503b2477349..6f13a4751f7 100644 --- a/crates/rslint_parser/test_data/inline/err/method_getter_err.rast +++ b/crates/rslint_parser/test_data/inline/err/method_getter_err.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..22 -======= -MODULE@0..21 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..21 LIST@0..21 CLASS_DECL@0..19 None CLASS_KW@0..5 "class" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/err/object_expr_error_prop_name.rast b/crates/rslint_parser/test_data/inline/err/object_expr_error_prop_name.rast index 6c8011ce0fc..1b003648b1d 100644 --- a/crates/rslint_parser/test_data/inline/err/object_expr_error_prop_name.rast +++ b/crates/rslint_parser/test_data/inline/err/object_expr_error_prop_name.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..40 -======= -MODULE@0..39 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..39 LIST@0..39 VAR_DECL@0..26 None IDENT@0..3 "let" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/err/object_expr_non_ident_literal_prop.rast b/crates/rslint_parser/test_data/inline/err/object_expr_non_ident_literal_prop.rast index 9125a09d838..935437a3949 100644 --- a/crates/rslint_parser/test_data/inline/err/object_expr_non_ident_literal_prop.rast +++ b/crates/rslint_parser/test_data/inline/err/object_expr_non_ident_literal_prop.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..12 -======= -MODULE@0..11 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..11 LIST@0..11 VAR_DECL@0..11 None IDENT@0..3 "let" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/err/paren_or_arrow_expr_invalid_params.rast b/crates/rslint_parser/test_data/inline/err/paren_or_arrow_expr_invalid_params.rast index 7257256c523..01a967ad706 100644 --- a/crates/rslint_parser/test_data/inline/err/paren_or_arrow_expr_invalid_params.rast +++ b/crates/rslint_parser/test_data/inline/err/paren_or_arrow_expr_invalid_params.rast @@ -1,31 +1,7 @@ -<<<<<<< HEAD -JS_MODULE@0..14 -======= -MODULE@0..13 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..13 LIST@0..13 JS_EXPRESSION_STATEMENT@0..6 ARROW_EXPR@0..6 -<<<<<<< HEAD - PARAMETER_LIST@0..4 - L_PAREN@0..1 "(" - LIST@1..4 - ERROR@1..2 - NUMBER@1..2 "5" - WHITESPACE@2..3 " " - ERROR@3..4 - PLUS@3..4 "+" - WHITESPACE@4..5 " " - NUMBER@5..6 "5" - ERROR@6..7 - R_PAREN@6..7 ")" - WHITESPACE@7..8 " " - ERROR@8..10 - FAT_ARROW@8..10 "=>" - WHITESPACE@10..11 " " - JS_BLOCK_STATEMENT@11..13 - L_CURLY@11..12 "{" -======= PARAMETER_LIST@0..5 None L_PAREN@0..1 "(" None LIST@1..5 @@ -38,13 +14,8 @@ MODULE@0..13 None R_PAREN@6..7 ")" Whitespace(1) ERROR@8..11 None FAT_ARROW@8..10 "=>" Whitespace(1) - BLOCK_STMT@11..13 -<<<<<<< HEAD - L_CURLY@11..12 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= + JS_BLOCK_STATEMENT@11..13 None L_CURLY@11..12 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@12..12 None R_CURLY@12..13 "}" None -- diff --git a/crates/rslint_parser/test_data/inline/err/primary_expr_invalid_recovery.rast b/crates/rslint_parser/test_data/inline/err/primary_expr_invalid_recovery.rast index ad7ca2141c9..42e62b8b2ec 100644 --- a/crates/rslint_parser/test_data/inline/err/primary_expr_invalid_recovery.rast +++ b/crates/rslint_parser/test_data/inline/err/primary_expr_invalid_recovery.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..18 -======= -MODULE@0..17 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..17 LIST@0..17 VAR_DECL@0..11 None IDENT@0..3 "let" Whitespace(1) @@ -13,25 +9,9 @@ MODULE@0..17 None IDENT@4..5 "a" Whitespace(1) None EQ@6..7 "=" Whitespace(1) ERROR@8..9 -<<<<<<< HEAD -<<<<<<< HEAD - ERROR_TOKEN@8..9 "\\" - SEMICOLON@9..10 ";" - WHITESPACE@10..11 " " - JS_EXPRESSION_STATEMENT@11..17 -======= - ERROR_TOKEN@8..9 "\\" - SEMICOLON@9..11 ";" " " -======= None ERROR_TOKEN@8..9 "\\" None -<<<<<<< HEAD - None SEMICOLON@9..11 ";" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None SEMICOLON@9..10 ";" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - EXPR_STMT@11..17 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) + JS_EXPRESSION_STATEMENT@11..17 CALL_EXPR@11..16 NAME_REF@11..14 None IDENT@11..14 "foo" None diff --git a/crates/rslint_parser/test_data/inline/err/return_stmt_err.rast b/crates/rslint_parser/test_data/inline/err/return_stmt_err.rast index 323814ecfaf..c11fe07d2c9 100644 --- a/crates/rslint_parser/test_data/inline/err/return_stmt_err.rast +++ b/crates/rslint_parser/test_data/inline/err/return_stmt_err.rast @@ -1,30 +1,10 @@ -<<<<<<< HEAD -JS_MODULE@0..20 +JS_MODULE@0..19 LIST@0..19 JS_RETURN_STATEMENT@0..7 - RETURN_KW@0..6 "return" - SEMICOLON@6..7 ";" - WHITESPACE@7..8 "\n" - JS_RETURN_STATEMENT@8..19 - RETURN_KW@8..14 "return" - WHITESPACE@14..15 " " -======= -MODULE@0..19 - LIST@0..19 - RETURN_STMT@0..7 None RETURN_KW@0..6 "return" None None SEMICOLON@6..7 ";" None - RETURN_STMT@7..19 -<<<<<<< HEAD -<<<<<<< HEAD - "\n" RETURN_KW@7..15 "return" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(1) RETURN_KW@7..15 "return" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= + JS_RETURN_STATEMENT@7..19 Whitespace(1) RETURN_KW@8..14 "return" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) NAME_REF@15..18 None IDENT@15..18 "foo" None None SEMICOLON@18..19 ";" None diff --git a/crates/rslint_parser/test_data/inline/err/semicolons_err.rast b/crates/rslint_parser/test_data/inline/err/semicolons_err.rast index 753265f8d63..c5e42e1ec2b 100644 --- a/crates/rslint_parser/test_data/inline/err/semicolons_err.rast +++ b/crates/rslint_parser/test_data/inline/err/semicolons_err.rast @@ -1,25 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..24 - LIST@0..23 - VAR_DECL@0..13 - IDENT@0..3 "let" - WHITESPACE@3..4 " " - LIST@4..13 - DECLARATOR@4..13 - SINGLE_PATTERN@4..7 - NAME@4..7 - IDENT@4..7 "foo" - WHITESPACE@7..8 " " - EQ@8..9 "=" - WHITESPACE@9..10 " " - NAME_REF@10..13 - IDENT@10..13 "bar" - WHITESPACE@13..14 " " - JS_THROW_STATEMENT@14..23 - THROW_KW@14..19 "throw" - WHITESPACE@19..20 " " -======= -MODULE@0..23 +JS_MODULE@0..23 LIST@0..23 VAR_DECL@0..14 None IDENT@0..3 "let" Whitespace(1) @@ -31,17 +10,8 @@ MODULE@0..23 None EQ@8..9 "=" Whitespace(1) NAME_REF@10..14 None IDENT@10..13 "bar" Whitespace(1) - THROW_STMT@14..23 -<<<<<<< HEAD -<<<<<<< HEAD - THROW_KW@14..20 "throw" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None THROW_KW@14..20 "throw" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= + JS_THROW_STATEMENT@14..23 None THROW_KW@14..19 "throw" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) NAME_REF@20..23 None IDENT@20..23 "foo" None -- diff --git a/crates/rslint_parser/test_data/inline/err/switch_stmt_err.rast b/crates/rslint_parser/test_data/inline/err/switch_stmt_err.rast index 57e657a04ac..846426d082e 100644 --- a/crates/rslint_parser/test_data/inline/err/switch_stmt_err.rast +++ b/crates/rslint_parser/test_data/inline/err/switch_stmt_err.rast @@ -1,40 +1,15 @@ -<<<<<<< HEAD -JS_MODULE@0..24 +JS_MODULE@0..23 LIST@0..23 JS_SWITCH_STATEMENT@0..13 - SWITCH_KW@0..6 "switch" - WHITESPACE@6..7 " " - NAME_REF@7..10 - IDENT@7..10 "foo" - WHITESPACE@10..11 " " - L_CURLY@11..12 "{" - LIST@12..12 - R_CURLY@12..13 "}" - WHITESPACE@13..14 "\n" - JS_SWITCH_STATEMENT@14..23 - SWITCH_KW@14..20 "switch" - WHITESPACE@20..21 " " - L_CURLY@21..22 "{" -======= -MODULE@0..23 - LIST@0..23 - SWITCH_STMT@0..13 None SWITCH_KW@0..6 "switch" Whitespace(1) - CONDITION@7..11 - NAME_REF@7..11 - None IDENT@7..10 "foo" Whitespace(1) + NAME_REF@7..11 + None IDENT@7..10 "foo" Whitespace(1) None L_CURLY@11..12 "{" None LIST@12..12 None R_CURLY@12..13 "}" None - SWITCH_STMT@13..23 + JS_SWITCH_STATEMENT@13..23 Whitespace(1) SWITCH_KW@14..20 "switch" Whitespace(1) - CONDITION@21..21 -<<<<<<< HEAD - L_CURLY@21..22 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None L_CURLY@21..22 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@22..22 None R_CURLY@22..23 "}" None -- diff --git a/crates/rslint_parser/test_data/inline/err/throw_stmt_err.rast b/crates/rslint_parser/test_data/inline/err/throw_stmt_err.rast index f17ebf25960..4a6cf227ae6 100644 --- a/crates/rslint_parser/test_data/inline/err/throw_stmt_err.rast +++ b/crates/rslint_parser/test_data/inline/err/throw_stmt_err.rast @@ -1,30 +1,10 @@ -<<<<<<< HEAD -JS_MODULE@0..28 +JS_MODULE@0..27 LIST@0..27 JS_THROW_STATEMENT@0..5 - THROW_KW@0..5 "throw" - WHITESPACE@5..6 "\n" - JS_EXPRESSION_STATEMENT@6..27 - NEW_EXPR@6..27 - NEW_KW@6..9 "new" - WHITESPACE@9..10 " " -======= -MODULE@0..27 - LIST@0..27 - THROW_STMT@0..5 None THROW_KW@0..5 "throw" None - EXPR_STMT@5..27 + JS_EXPRESSION_STATEMENT@5..27 NEW_EXPR@5..27 -<<<<<<< HEAD -<<<<<<< HEAD - "\n" NEW_KW@5..10 "new" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(1) NEW_KW@5..10 "new" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(1) NEW_KW@6..9 "new" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) NAME_REF@10..15 None IDENT@10..15 "Error" None ARG_LIST@15..27 diff --git a/crates/rslint_parser/test_data/inline/err/unterminated_unicode_codepoint.rast b/crates/rslint_parser/test_data/inline/err/unterminated_unicode_codepoint.rast index 5f13fa1e832..d7071bc0342 100644 --- a/crates/rslint_parser/test_data/inline/err/unterminated_unicode_codepoint.rast +++ b/crates/rslint_parser/test_data/inline/err/unterminated_unicode_codepoint.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..18 -======= -MODULE@0..17 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..17 LIST@0..17 VAR_DECL@0..17 None IDENT@0..3 "let" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/err/var_decl_err.rast b/crates/rslint_parser/test_data/inline/err/var_decl_err.rast index 1e207093c7c..9f9b59d9cd2 100644 --- a/crates/rslint_parser/test_data/inline/err/var_decl_err.rast +++ b/crates/rslint_parser/test_data/inline/err/var_decl_err.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..32 -======= -MODULE@0..31 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..31 LIST@0..31 VAR_DECL@0..8 None VAR_KW@0..3 "var" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/err/while_stmt_err.rast b/crates/rslint_parser/test_data/inline/err/while_stmt_err.rast index 4915fea54ea..82ae28aad47 100644 --- a/crates/rslint_parser/test_data/inline/err/while_stmt_err.rast +++ b/crates/rslint_parser/test_data/inline/err/while_stmt_err.rast @@ -1,53 +1,18 @@ -<<<<<<< HEAD -JS_MODULE@0..52 - LIST@0..51 - WHILE_STMT@0..13 - WHILE_KW@0..5 "while" - WHITESPACE@5..6 " " - CONDITION@6..10 - LITERAL@6..10 - TRUE_KW@6..10 "true" - WHITESPACE@10..11 " " - JS_BLOCK_STATEMENT@11..13 - L_CURLY@11..12 "{" -======= -MODULE@0..51 +JS_MODULE@0..51 LIST@0..51 WHILE_STMT@0..13 None WHILE_KW@0..5 "while" Whitespace(1) CONDITION@6..11 LITERAL@6..11 None TRUE_KW@6..10 "true" Whitespace(1) - BLOCK_STMT@11..13 -<<<<<<< HEAD - L_CURLY@11..12 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= + JS_BLOCK_STATEMENT@11..13 None L_CURLY@11..12 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@12..12 None R_CURLY@12..13 "}" None WHILE_STMT@13..22 Whitespace(1) WHILE_KW@14..19 "while" Whitespace(1) CONDITION@20..20 -<<<<<<< HEAD JS_BLOCK_STATEMENT@20..22 - L_CURLY@20..21 "{" - LIST@21..21 - R_CURLY@21..22 "}" - WHITESPACE@22..23 "\n" - WHILE_STMT@23..37 - WHILE_KW@23..28 "while" - WHITESPACE@28..29 " " - CONDITION@29..34 - L_PAREN@29..30 "(" - LITERAL@30..34 - TRUE_KW@30..34 "true" - WHITESPACE@34..35 " " - JS_BLOCK_STATEMENT@35..37 - L_CURLY@35..36 "{" -======= - BLOCK_STMT@20..22 None L_CURLY@20..21 "{" None LIST@21..21 None R_CURLY@21..22 "}" None @@ -57,13 +22,8 @@ MODULE@0..51 None L_PAREN@29..30 "(" None LITERAL@30..35 None TRUE_KW@30..34 "true" Whitespace(1) - BLOCK_STMT@35..37 -<<<<<<< HEAD - L_CURLY@35..36 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= + JS_BLOCK_STATEMENT@35..37 None L_CURLY@35..36 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@36..36 None R_CURLY@36..37 "}" None WHILE_STMT@37..51 diff --git a/crates/rslint_parser/test_data/inline/ok/array_expr.rast b/crates/rslint_parser/test_data/inline/ok/array_expr.rast index e72dd3a9b31..971f9c2f16a 100644 --- a/crates/rslint_parser/test_data/inline/ok/array_expr.rast +++ b/crates/rslint_parser/test_data/inline/ok/array_expr.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..65 -======= -MODULE@0..64 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..64 LIST@0..64 JS_EXPRESSION_STATEMENT@0..11 ARRAY_EXPR@0..10 @@ -12,34 +8,10 @@ MODULE@0..64 None IDENT@1..4 "foo" None None COMMA@4..5 "," Whitespace(1) NAME_REF@6..9 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@6..9 "bar" - R_BRACK@9..10 "]" - SEMICOLON@10..11 ";" - WHITESPACE@11..12 "\n" - JS_EXPRESSION_STATEMENT@12..18 - ARRAY_EXPR@12..17 - L_BRACK@12..13 "[" - LIST@13..16 - NAME_REF@13..16 - IDENT@13..16 "foo" - R_BRACK@16..17 "]" - SEMICOLON@17..18 ";" - WHITESPACE@18..19 "\n" - JS_EXPRESSION_STATEMENT@19..26 - ARRAY_EXPR@19..25 - L_BRACK@19..20 "[" -======= - IDENT@6..9 "bar" - R_BRACK@9..10 "]" - SEMICOLON@10..11 ";" -======= None IDENT@6..9 "bar" None None R_BRACK@9..10 "]" None None SEMICOLON@10..11 ";" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) - EXPR_STMT@11..18 + JS_EXPRESSION_STATEMENT@11..18 ARRAY_EXPR@11..17 Whitespace(1) L_BRACK@12..13 "[" None LIST@13..16 @@ -47,50 +19,16 @@ MODULE@0..64 None IDENT@13..16 "foo" None None R_BRACK@16..17 "]" None None SEMICOLON@17..18 ";" None - EXPR_STMT@18..26 + JS_EXPRESSION_STATEMENT@18..26 ARRAY_EXPR@18..25 -<<<<<<< HEAD -<<<<<<< HEAD - "\n" L_BRACK@18..20 "[" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(1) L_BRACK@18..20 "[" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(1) L_BRACK@19..20 "[" None ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) LIST@20..24 None COMMA@20..21 "," None NAME_REF@21..24 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@21..24 "foo" - R_BRACK@24..25 "]" - SEMICOLON@25..26 ";" - WHITESPACE@26..27 "\n" - JS_EXPRESSION_STATEMENT@27..34 - ARRAY_EXPR@27..33 - L_BRACK@27..28 "[" - LIST@28..32 - NAME_REF@28..31 - IDENT@28..31 "foo" - COMMA@31..32 "," - R_BRACK@32..33 "]" - SEMICOLON@33..34 ";" - WHITESPACE@34..35 "\n" - JS_EXPRESSION_STATEMENT@35..50 - ARRAY_EXPR@35..49 - L_BRACK@35..36 "[" -======= - IDENT@21..24 "foo" - R_BRACK@24..25 "]" - SEMICOLON@25..26 ";" -======= None IDENT@21..24 "foo" None None R_BRACK@24..25 "]" None None SEMICOLON@25..26 ";" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) - EXPR_STMT@26..34 + JS_EXPRESSION_STATEMENT@26..34 ARRAY_EXPR@26..33 Whitespace(1) L_BRACK@27..28 "[" None LIST@28..32 @@ -99,18 +37,9 @@ MODULE@0..64 None COMMA@31..32 "," None None R_BRACK@32..33 "]" None None SEMICOLON@33..34 ";" None - EXPR_STMT@34..50 + JS_EXPRESSION_STATEMENT@34..50 ARRAY_EXPR@34..49 -<<<<<<< HEAD -<<<<<<< HEAD - "\n" L_BRACK@34..36 "[" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(1) L_BRACK@34..36 "[" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(1) L_BRACK@35..36 "[" None ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) LIST@36..48 None COMMA@36..37 "," None None COMMA@37..38 "," None @@ -118,32 +47,6 @@ MODULE@0..64 None COMMA@39..40 "," None None COMMA@40..41 "," None NAME_REF@41..44 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@41..44 "foo" - COMMA@44..45 "," - COMMA@45..46 "," - COMMA@46..47 "," - COMMA@47..48 "," - R_BRACK@48..49 "]" - SEMICOLON@49..50 ";" - WHITESPACE@50..51 "\n" - JS_EXPRESSION_STATEMENT@51..64 - ARRAY_EXPR@51..63 - L_BRACK@51..52 "[" -======= - IDENT@41..44 "foo" - COMMA@44..45 "," - COMMA@45..46 "," - COMMA@46..47 "," - COMMA@47..48 "," - R_BRACK@48..49 "]" - SEMICOLON@49..50 ";" - EXPR_STMT@50..64 - ARRAY_EXPR@50..63 - "\n" L_BRACK@50..52 "[" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None IDENT@41..44 "foo" None None COMMA@44..45 "," None None COMMA@45..46 "," None @@ -151,14 +54,9 @@ MODULE@0..64 None COMMA@47..48 "," None None R_BRACK@48..49 "]" None None SEMICOLON@49..50 ";" None - EXPR_STMT@50..64 + JS_EXPRESSION_STATEMENT@50..64 ARRAY_EXPR@50..63 -<<<<<<< HEAD - Whitespace(1) L_BRACK@50..52 "[" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(1) L_BRACK@51..52 "[" None ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) LIST@52..62 SPREAD_ELEMENT@52..56 None DOT2@52..55 "..." None diff --git a/crates/rslint_parser/test_data/inline/ok/arrow_expr_single_param.rast b/crates/rslint_parser/test_data/inline/ok/arrow_expr_single_param.rast index e3c9b2182a1..913332c2fa0 100644 --- a/crates/rslint_parser/test_data/inline/ok/arrow_expr_single_param.rast +++ b/crates/rslint_parser/test_data/inline/ok/arrow_expr_single_param.rast @@ -1,96 +1,38 @@ -<<<<<<< HEAD -JS_MODULE@0..44 -======= -MODULE@0..43 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..43 LIST@0..43 JS_EXPRESSION_STATEMENT@0..9 ARROW_EXPR@0..9 -<<<<<<< HEAD - NAME@0..3 - IDENT@0..3 "foo" - WHITESPACE@3..4 " " - FAT_ARROW@4..6 "=>" - WHITESPACE@6..7 " " - JS_BLOCK_STATEMENT@7..9 - L_CURLY@7..8 "{" - LIST@8..8 - R_CURLY@8..9 "}" - WHITESPACE@9..10 "\n" - JS_EXPRESSION_STATEMENT@10..21 - ARROW_EXPR@10..21 - NAME@10..15 - IDENT@10..15 "yield" - WHITESPACE@15..16 " " - FAT_ARROW@16..18 "=>" - WHITESPACE@18..19 " " - JS_BLOCK_STATEMENT@19..21 - L_CURLY@19..20 "{" - LIST@20..20 - R_CURLY@20..21 "}" - WHITESPACE@21..22 "\n" - JS_EXPRESSION_STATEMENT@22..33 - ARROW_EXPR@22..33 - NAME@22..27 - IDENT@22..27 "await" - WHITESPACE@27..28 " " - FAT_ARROW@28..30 "=>" - WHITESPACE@30..31 " " - JS_BLOCK_STATEMENT@31..33 - L_CURLY@31..32 "{" - LIST@32..32 - R_CURLY@32..33 "}" - WHITESPACE@33..34 "\n" - JS_EXPRESSION_STATEMENT@34..43 - ARROW_EXPR@34..43 - NAME@34..37 - IDENT@34..37 "foo" - WHITESPACE@37..38 " " - FAT_ARROW@38..40 "=>" - WHITESPACE@40..41 "\n" - JS_BLOCK_STATEMENT@41..43 - L_CURLY@41..42 "{" -======= NAME@0..4 None IDENT@0..3 "foo" Whitespace(1) None FAT_ARROW@4..6 "=>" Whitespace(1) - BLOCK_STMT@7..9 + JS_BLOCK_STATEMENT@7..9 None L_CURLY@7..8 "{" None LIST@8..8 None R_CURLY@8..9 "}" None - EXPR_STMT@9..21 + JS_EXPRESSION_STATEMENT@9..21 ARROW_EXPR@9..21 NAME@9..16 Whitespace(1) IDENT@10..15 "yield" Whitespace(1) None FAT_ARROW@16..18 "=>" Whitespace(1) - BLOCK_STMT@19..21 + JS_BLOCK_STATEMENT@19..21 None L_CURLY@19..20 "{" None LIST@20..20 None R_CURLY@20..21 "}" None - EXPR_STMT@21..33 + JS_EXPRESSION_STATEMENT@21..33 ARROW_EXPR@21..33 NAME@21..28 Whitespace(1) IDENT@22..27 "await" Whitespace(1) None FAT_ARROW@28..30 "=>" Whitespace(1) - BLOCK_STMT@31..33 + JS_BLOCK_STATEMENT@31..33 None L_CURLY@31..32 "{" None LIST@32..32 None R_CURLY@32..33 "}" None - EXPR_STMT@33..43 + JS_EXPRESSION_STATEMENT@33..43 ARROW_EXPR@33..43 NAME@33..38 Whitespace(1) IDENT@34..37 "foo" Whitespace(1) None FAT_ARROW@38..40 "=>" None - BLOCK_STMT@40..43 -<<<<<<< HEAD -<<<<<<< HEAD - "\n" L_CURLY@40..42 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(1) L_CURLY@40..42 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= + JS_BLOCK_STATEMENT@40..43 Whitespace(1) L_CURLY@41..42 "{" None ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) LIST@42..42 None R_CURLY@42..43 "}" None diff --git a/crates/rslint_parser/test_data/inline/ok/assign_expr.rast b/crates/rslint_parser/test_data/inline/ok/assign_expr.rast index 8b4e75abe10..1079222a57f 100644 --- a/crates/rslint_parser/test_data/inline/ok/assign_expr.rast +++ b/crates/rslint_parser/test_data/inline/ok/assign_expr.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..101 -======= -MODULE@0..100 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..100 LIST@0..100 JS_EXPRESSION_STATEMENT@0..21 ASSIGN_EXPR@0..20 @@ -18,34 +14,9 @@ MODULE@0..100 None IDENT@13..14 "b" Whitespace(1) None QUESTION2EQ@15..18 "??=" Whitespace(1) LITERAL@19..20 -<<<<<<< HEAD -<<<<<<< HEAD - NUMBER@19..20 "3" - SEMICOLON@20..21 ";" - WHITESPACE@21..22 "\n" - JS_EXPRESSION_STATEMENT@22..33 - ASSIGN_EXPR@22..32 - NAME_REF@22..25 - IDENT@22..25 "foo" - WHITESPACE@25..26 " " - MINUSEQ@26..28 "-=" - WHITESPACE@28..29 " " - NAME_REF@29..32 - IDENT@29..32 "bar" - SEMICOLON@32..33 ";" - WHITESPACE@33..34 "\n" - JS_EXPRESSION_STATEMENT@34..51 - ASSIGN_EXPR@34..50 - ARRAY_PATTERN@34..44 - L_BRACK@34..35 "[" -======= - NUMBER@19..20 "3" - SEMICOLON@20..21 ";" -======= None NUMBER@19..20 "3" None None SEMICOLON@20..21 ";" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) - EXPR_STMT@21..33 + JS_EXPRESSION_STATEMENT@21..33 ASSIGN_EXPR@21..32 NAME_REF@21..26 Whitespace(1) IDENT@22..25 "foo" Whitespace(1) @@ -53,19 +24,10 @@ MODULE@0..100 NAME_REF@29..32 None IDENT@29..32 "bar" None None SEMICOLON@32..33 ";" None - EXPR_STMT@33..51 + JS_EXPRESSION_STATEMENT@33..51 ASSIGN_EXPR@33..50 ARRAY_PATTERN@33..45 -<<<<<<< HEAD -<<<<<<< HEAD - "\n" L_BRACK@33..35 "[" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(1) L_BRACK@33..35 "[" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(1) L_BRACK@34..35 "[" None ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) LIST@35..43 SINGLE_PATTERN@35..38 NAME@35..38 @@ -77,32 +39,11 @@ MODULE@0..100 None R_BRACK@43..44 "]" Whitespace(1) None EQ@45..46 "=" Whitespace(1) NAME_REF@47..50 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@47..50 "baz" - SEMICOLON@50..51 ";" - WHITESPACE@51..52 "\n" - JS_EXPRESSION_STATEMENT@52..72 - GROUPING_EXPR@52..71 - L_PAREN@52..53 "(" -======= - IDENT@47..50 "baz" - SEMICOLON@50..51 ";" - EXPR_STMT@51..72 - GROUPING_EXPR@51..71 - "\n" L_PAREN@51..53 "(" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None IDENT@47..50 "baz" None None SEMICOLON@50..51 ";" None - EXPR_STMT@51..72 + JS_EXPRESSION_STATEMENT@51..72 GROUPING_EXPR@51..71 -<<<<<<< HEAD - Whitespace(1) L_PAREN@51..53 "(" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(1) L_PAREN@52..53 "(" None ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) ASSIGN_EXPR@53..70 OBJECT_PATTERN@53..66 None L_CURLY@53..54 "{" Whitespace(1) @@ -119,35 +60,12 @@ MODULE@0..100 OBJECT_EXPR@68..70 None L_CURLY@68..69 "{" None LIST@69..69 -<<<<<<< HEAD -<<<<<<< HEAD - R_CURLY@69..70 "}" - R_PAREN@70..71 ")" - SEMICOLON@71..72 ";" - WHITESPACE@72..73 "\n" - JS_EXPRESSION_STATEMENT@73..100 - GROUPING_EXPR@73..99 - L_PAREN@73..74 "(" -======= - R_CURLY@69..70 "}" - R_PAREN@70..71 ")" - SEMICOLON@71..72 ";" - EXPR_STMT@72..100 - GROUPING_EXPR@72..99 - "\n" L_PAREN@72..74 "(" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None R_CURLY@69..70 "}" None None R_PAREN@70..71 ")" None None SEMICOLON@71..72 ";" None - EXPR_STMT@72..100 + JS_EXPRESSION_STATEMENT@72..100 GROUPING_EXPR@72..99 -<<<<<<< HEAD - Whitespace(1) L_PAREN@72..74 "(" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(1) L_PAREN@73..74 "(" None ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) ASSIGN_EXPR@74..98 OBJECT_PATTERN@74..94 None L_CURLY@74..75 "{" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/ok/async_arrow_expr.rast b/crates/rslint_parser/test_data/inline/ok/async_arrow_expr.rast index c4097ae8a50..01e07bd895c 100644 --- a/crates/rslint_parser/test_data/inline/ok/async_arrow_expr.rast +++ b/crates/rslint_parser/test_data/inline/ok/async_arrow_expr.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..82 -======= -MODULE@0..81 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..81 LIST@0..81 VAR_DECL@0..23 None IDENT@0..3 "let" Whitespace(1) @@ -13,36 +9,12 @@ MODULE@0..81 None IDENT@4..5 "a" Whitespace(1) None EQ@6..7 "=" Whitespace(1) ARROW_EXPR@8..23 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - ASYNC_KW@8..13 "async" - WHITESPACE@13..14 " " - NAME@14..17 - IDENT@14..17 "foo" - WHITESPACE@17..18 " " - FAT_ARROW@18..20 "=>" - WHITESPACE@20..21 " " - JS_BLOCK_STATEMENT@21..23 - L_CURLY@21..22 "{" -======= - ASYNC_KW@8..14 "async" " " -======= - None ASYNC_KW@8..14 "async" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None ASYNC_KW@8..13 "async" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) NAME@14..18 None IDENT@14..17 "foo" Whitespace(1) None FAT_ARROW@18..20 "=>" Whitespace(1) - BLOCK_STMT@21..23 -<<<<<<< HEAD - L_CURLY@21..22 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= + JS_BLOCK_STATEMENT@21..23 None L_CURLY@21..22 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@22..22 None R_CURLY@22..23 "}" None VAR_DECL@23..49 @@ -60,52 +32,18 @@ MODULE@0..81 LIST@39..42 SINGLE_PATTERN@39..42 NAME@39..42 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@39..42 "bar" - R_PAREN@42..43 ")" - WHITESPACE@43..44 " " - FAT_ARROW@44..46 "=>" - WHITESPACE@46..47 " " - JS_BLOCK_STATEMENT@47..49 - L_CURLY@47..48 "{" - LIST@48..48 - R_CURLY@48..49 "}" - WHITESPACE@49..50 "\n" - JS_EXPRESSION_STATEMENT@50..81 - ARROW_EXPR@50..81 - ASYNC_KW@50..55 "async" - WHITESPACE@55..56 " " - PARAMETER_LIST@56..74 - L_PAREN@56..57 "(" -======= - IDENT@39..42 "bar" - R_PAREN@42..44 ")" " " - FAT_ARROW@44..47 "=>" " " -======= None IDENT@39..42 "bar" None -<<<<<<< HEAD - None R_PAREN@42..44 ")" Whitespace(1) - None FAT_ARROW@44..47 "=>" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None R_PAREN@42..43 ")" Whitespace(1) None FAT_ARROW@44..46 "=>" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@47..49 + JS_BLOCK_STATEMENT@47..49 None L_CURLY@47..48 "{" None LIST@48..48 None R_CURLY@48..49 "}" None - EXPR_STMT@49..81 + JS_EXPRESSION_STATEMENT@49..81 ARROW_EXPR@49..81 Whitespace(1) ASYNC_KW@50..55 "async" Whitespace(1) PARAMETER_LIST@56..75 -<<<<<<< HEAD - L_PAREN@56..57 "(" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None L_PAREN@56..57 "(" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@57..73 SINGLE_PATTERN@57..60 NAME@57..60 diff --git a/crates/rslint_parser/test_data/inline/ok/async_function_expr.rast b/crates/rslint_parser/test_data/inline/ok/async_function_expr.rast index 72cddc015ec..0446721eee5 100644 --- a/crates/rslint_parser/test_data/inline/ok/async_function_expr.rast +++ b/crates/rslint_parser/test_data/inline/ok/async_function_expr.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..62 -======= -MODULE@0..61 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..61 LIST@0..61 VAR_DECL@0..28 None IDENT@0..3 "let" Whitespace(1) @@ -18,26 +14,9 @@ MODULE@0..61 PARAMETER_LIST@22..25 None L_PAREN@22..23 "(" None LIST@23..23 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@23..24 ")" - WHITESPACE@24..25 " " - JS_BLOCK_STATEMENT@25..27 - L_CURLY@25..26 "{" -======= - R_PAREN@23..25 ")" " " - BLOCK_STMT@25..27 - L_CURLY@25..26 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@23..25 ")" Whitespace(1) -======= None R_PAREN@23..24 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@25..27 + JS_BLOCK_STATEMENT@25..27 None L_CURLY@25..26 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@26..26 None R_CURLY@26..27 "}" None None SEMICOLON@27..28 ";" None @@ -57,26 +36,9 @@ MODULE@0..61 PARAMETER_LIST@55..58 None L_PAREN@55..56 "(" None LIST@56..56 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@56..57 ")" - WHITESPACE@57..58 " " - JS_BLOCK_STATEMENT@58..60 - L_CURLY@58..59 "{" -======= - R_PAREN@56..58 ")" " " - BLOCK_STMT@58..60 - L_CURLY@58..59 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@56..58 ")" Whitespace(1) -======= None R_PAREN@56..57 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@58..60 + JS_BLOCK_STATEMENT@58..60 None L_CURLY@58..59 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@59..59 None R_CURLY@59..60 "}" None None SEMICOLON@60..61 ";" None diff --git a/crates/rslint_parser/test_data/inline/ok/async_ident.rast b/crates/rslint_parser/test_data/inline/ok/async_ident.rast index c97ee791864..f17fdb20c02 100644 --- a/crates/rslint_parser/test_data/inline/ok/async_ident.rast +++ b/crates/rslint_parser/test_data/inline/ok/async_ident.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..15 -======= -MODULE@0..14 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..14 LIST@0..14 VAR_DECL@0..14 None IDENT@0..3 "let" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/ok/async_method.rast b/crates/rslint_parser/test_data/inline/ok/async_method.rast index a5188075cf0..0614ee6b3e5 100644 --- a/crates/rslint_parser/test_data/inline/ok/async_method.rast +++ b/crates/rslint_parser/test_data/inline/ok/async_method.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..47 -======= -MODULE@0..46 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..46 LIST@0..46 CLASS_DECL@0..46 None CLASS_KW@0..5 "class" Whitespace(1) @@ -18,26 +14,9 @@ MODULE@0..46 PARAMETER_LIST@22..25 None L_PAREN@22..23 "(" None LIST@23..23 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@23..24 ")" - WHITESPACE@24..25 " " - JS_BLOCK_STATEMENT@25..27 - L_CURLY@25..26 "{" -======= - R_PAREN@23..25 ")" " " - BLOCK_STMT@25..27 - L_CURLY@25..26 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@23..25 ")" Whitespace(1) -======= None R_PAREN@23..24 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@25..27 + JS_BLOCK_STATEMENT@25..27 None L_CURLY@25..26 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@26..26 None R_CURLY@26..27 "}" None METHOD@27..44 @@ -48,26 +27,9 @@ MODULE@0..46 PARAMETER_LIST@39..42 None L_PAREN@39..40 "(" None LIST@40..40 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@40..41 ")" - WHITESPACE@41..42 " " - JS_BLOCK_STATEMENT@42..44 - L_CURLY@42..43 "{" -======= - R_PAREN@40..42 ")" " " - BLOCK_STMT@42..44 - L_CURLY@42..43 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@40..42 ")" Whitespace(1) -======= None R_PAREN@40..41 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@42..44 + JS_BLOCK_STATEMENT@42..44 None L_CURLY@42..43 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@43..43 None R_CURLY@43..44 "}" None Whitespace(1) R_CURLY@45..46 "}" None diff --git a/crates/rslint_parser/test_data/inline/ok/binary_expressions.rast b/crates/rslint_parser/test_data/inline/ok/binary_expressions.rast index ef6b75a7d0b..a1025517465 100644 --- a/crates/rslint_parser/test_data/inline/ok/binary_expressions.rast +++ b/crates/rslint_parser/test_data/inline/ok/binary_expressions.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..125 -======= -MODULE@0..124 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..124 LIST@0..124 JS_EXPRESSION_STATEMENT@0..5 BIN_EXPR@0..5 @@ -10,75 +6,23 @@ MODULE@0..124 None NUMBER@0..1 "5" Whitespace(1) None STAR@2..3 "*" Whitespace(1) LITERAL@4..5 -<<<<<<< HEAD -<<<<<<< HEAD - NUMBER@4..5 "5" - WHITESPACE@5..6 "\n" - JS_EXPRESSION_STATEMENT@6..17 - BIN_EXPR@6..17 - LITERAL@6..7 - NUMBER@6..7 "6" - WHITESPACE@7..8 " " - STAR2@8..10 "**" - WHITESPACE@10..11 " " -======= - NUMBER@4..5 "5" - EXPR_STMT@5..17 - BIN_EXPR@5..17 - LITERAL@5..8 - "\n" NUMBER@5..8 "6" " " - STAR2@8..11 "**" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None NUMBER@4..5 "5" None - EXPR_STMT@5..17 + JS_EXPRESSION_STATEMENT@5..17 BIN_EXPR@5..17 LITERAL@5..8 -<<<<<<< HEAD - Whitespace(1) NUMBER@5..8 "6" Whitespace(1) - None STAR2@8..11 "**" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(1) NUMBER@6..7 "6" Whitespace(1) None STAR2@8..10 "**" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) BIN_EXPR@11..17 LITERAL@11..13 None NUMBER@11..12 "6" Whitespace(1) None STAR2@13..15 "**" Whitespace(1) LITERAL@16..17 -<<<<<<< HEAD -<<<<<<< HEAD - NUMBER@16..17 "7" - WHITESPACE@17..18 "\n" - JS_EXPRESSION_STATEMENT@18..39 - BIN_EXPR@18..39 - LITERAL@18..19 - NUMBER@18..19 "1" - WHITESPACE@19..20 " " - PLUS@20..21 "+" - WHITESPACE@21..22 " " -======= - NUMBER@16..17 "7" - EXPR_STMT@17..39 - BIN_EXPR@17..39 - LITERAL@17..20 - "\n" NUMBER@17..20 "1" " " - PLUS@20..22 "+" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None NUMBER@16..17 "7" None - EXPR_STMT@17..39 + JS_EXPRESSION_STATEMENT@17..39 BIN_EXPR@17..39 LITERAL@17..20 -<<<<<<< HEAD - Whitespace(1) NUMBER@17..20 "1" Whitespace(1) - None PLUS@20..22 "+" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(1) NUMBER@18..19 "1" Whitespace(1) None PLUS@20..21 "+" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) BIN_EXPR@22..39 BIN_EXPR@22..36 LITERAL@22..24 @@ -99,119 +43,36 @@ MODULE@0..124 None R_PAREN@34..35 ")" Whitespace(1) None STAR@36..37 "*" Whitespace(1) LITERAL@38..39 -<<<<<<< HEAD -<<<<<<< HEAD - NUMBER@38..39 "3" - WHITESPACE@39..40 "\n" - JS_EXPRESSION_STATEMENT@40..45 - BIN_EXPR@40..45 - LITERAL@40..41 - NUMBER@40..41 "1" - WHITESPACE@41..42 " " - SLASH@42..43 "/" - WHITESPACE@43..44 " " - LITERAL@44..45 - NUMBER@44..45 "2" - WHITESPACE@45..46 "\n" - JS_EXPRESSION_STATEMENT@46..55 - BIN_EXPR@46..55 - LITERAL@46..48 - NUMBER@46..48 "74" - WHITESPACE@48..49 " " - IN_KW@49..51 "in" - WHITESPACE@51..52 " " - NAME_REF@52..55 - IDENT@52..55 "foo" - WHITESPACE@55..56 "\n" - JS_EXPRESSION_STATEMENT@56..76 - BIN_EXPR@56..76 - NAME_REF@56..59 - IDENT@56..59 "foo" - WHITESPACE@59..60 " " - INSTANCEOF_KW@60..70 "instanceof" - WHITESPACE@70..71 " " - NAME_REF@71..76 - IDENT@71..76 "Array" - WHITESPACE@76..77 "\n" - JS_EXPRESSION_STATEMENT@77..87 - BIN_EXPR@77..87 - NAME_REF@77..80 - IDENT@77..80 "foo" - WHITESPACE@80..81 " " - QUESTION2@81..83 "??" - WHITESPACE@83..84 " " - NAME_REF@84..87 - IDENT@84..87 "bar" - WHITESPACE@87..88 "\n" - JS_EXPRESSION_STATEMENT@88..101 - BIN_EXPR@88..101 - BIN_EXPR@88..97 - BIN_EXPR@88..93 - LITERAL@88..89 - NUMBER@88..89 "1" - WHITESPACE@89..90 " " - PLUS@90..91 "+" - WHITESPACE@91..92 " " - LITERAL@92..93 - NUMBER@92..93 "1" - WHITESPACE@93..94 " " - PLUS@94..95 "+" - WHITESPACE@95..96 " " - LITERAL@96..97 - NUMBER@96..97 "1" - WHITESPACE@97..98 " " - PLUS@98..99 "+" - WHITESPACE@99..100 " " - LITERAL@100..101 - NUMBER@100..101 "1" - WHITESPACE@101..102 "\n" - JS_EXPRESSION_STATEMENT@102..124 - BIN_EXPR@102..124 - BIN_EXPR@102..107 - LITERAL@102..103 - NUMBER@102..103 "5" - WHITESPACE@103..104 " " - PLUS@104..105 "+" - WHITESPACE@105..106 " " - LITERAL@106..107 - NUMBER@106..107 "6" - WHITESPACE@107..108 " " - MINUS@108..109 "-" - WHITESPACE@109..110 " " -======= - NUMBER@38..39 "3" -======= None NUMBER@38..39 "3" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) - EXPR_STMT@39..45 + JS_EXPRESSION_STATEMENT@39..45 BIN_EXPR@39..45 LITERAL@39..42 Whitespace(1) NUMBER@40..41 "1" Whitespace(1) None SLASH@42..43 "/" Whitespace(1) LITERAL@44..45 None NUMBER@44..45 "2" None - EXPR_STMT@45..55 + JS_EXPRESSION_STATEMENT@45..55 BIN_EXPR@45..55 LITERAL@45..49 Whitespace(1) NUMBER@46..48 "74" Whitespace(1) None IN_KW@49..51 "in" Whitespace(1) NAME_REF@52..55 None IDENT@52..55 "foo" None - EXPR_STMT@55..76 + JS_EXPRESSION_STATEMENT@55..76 BIN_EXPR@55..76 NAME_REF@55..60 Whitespace(1) IDENT@56..59 "foo" Whitespace(1) None INSTANCEOF_KW@60..70 "instanceof" Whitespace(1) NAME_REF@71..76 None IDENT@71..76 "Array" None - EXPR_STMT@76..87 + JS_EXPRESSION_STATEMENT@76..87 BIN_EXPR@76..87 NAME_REF@76..81 Whitespace(1) IDENT@77..80 "foo" Whitespace(1) None QUESTION2@81..83 "??" Whitespace(1) NAME_REF@84..87 None IDENT@84..87 "bar" None - EXPR_STMT@87..101 + JS_EXPRESSION_STATEMENT@87..101 BIN_EXPR@87..101 BIN_EXPR@87..98 BIN_EXPR@87..94 @@ -226,26 +87,15 @@ MODULE@0..124 None PLUS@98..99 "+" Whitespace(1) LITERAL@100..101 None NUMBER@100..101 "1" None - EXPR_STMT@101..124 + JS_EXPRESSION_STATEMENT@101..124 BIN_EXPR@101..124 BIN_EXPR@101..108 LITERAL@101..104 Whitespace(1) NUMBER@102..103 "5" Whitespace(1) None PLUS@104..105 "+" Whitespace(1) LITERAL@106..108 -<<<<<<< HEAD -<<<<<<< HEAD - NUMBER@106..108 "6" " " - MINUS@108..110 "-" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None NUMBER@106..108 "6" Whitespace(1) - None MINUS@108..110 "-" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None NUMBER@106..107 "6" Whitespace(1) None MINUS@108..109 "-" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) BIN_EXPR@110..124 BIN_EXPR@110..116 LITERAL@110..112 diff --git a/crates/rslint_parser/test_data/inline/ok/block_stmt.rast b/crates/rslint_parser/test_data/inline/ok/block_stmt.rast index 73e2ec723f8..3314a32277b 100644 --- a/crates/rslint_parser/test_data/inline/ok/block_stmt.rast +++ b/crates/rslint_parser/test_data/inline/ok/block_stmt.rast @@ -1,61 +1,29 @@ -<<<<<<< HEAD -JS_MODULE@0..27 +JS_MODULE@0..26 LIST@0..26 JS_BLOCK_STATEMENT@0..2 - L_CURLY@0..1 "{" - LIST@1..1 - R_CURLY@1..2 "}" - WHITESPACE@2..3 "\n" - JS_BLOCK_STATEMENT@3..11 - L_CURLY@3..4 "{" - LIST@4..10 - JS_BLOCK_STATEMENT@4..10 - L_CURLY@4..5 "{" - LIST@5..9 - JS_BLOCK_STATEMENT@5..9 - L_CURLY@5..6 "{" - LIST@6..8 - JS_BLOCK_STATEMENT@6..8 - L_CURLY@6..7 "{" - LIST@7..7 - R_CURLY@7..8 "}" - R_CURLY@8..9 "}" - R_CURLY@9..10 "}" - R_CURLY@10..11 "}" - WHITESPACE@11..12 "\n" - JS_BLOCK_STATEMENT@12..26 - L_CURLY@12..13 "{" - WHITESPACE@13..14 " " - LIST@14..24 - JS_EXPRESSION_STATEMENT@14..24 -======= -MODULE@0..26 - LIST@0..26 - BLOCK_STMT@0..2 None L_CURLY@0..1 "{" None LIST@1..1 None R_CURLY@1..2 "}" None - BLOCK_STMT@2..11 + JS_BLOCK_STATEMENT@2..11 Whitespace(1) L_CURLY@3..4 "{" None LIST@4..10 - BLOCK_STMT@4..10 + JS_BLOCK_STATEMENT@4..10 None L_CURLY@4..5 "{" None LIST@5..9 - BLOCK_STMT@5..9 + JS_BLOCK_STATEMENT@5..9 None L_CURLY@5..6 "{" None LIST@6..8 - BLOCK_STMT@6..8 + JS_BLOCK_STATEMENT@6..8 None L_CURLY@6..7 "{" None LIST@7..7 None R_CURLY@7..8 "}" None None R_CURLY@8..9 "}" None None R_CURLY@9..10 "}" None None R_CURLY@10..11 "}" None - BLOCK_STMT@11..26 + JS_BLOCK_STATEMENT@11..26 Whitespace(1) L_CURLY@12..13 "{" Whitespace(1) LIST@14..25 - EXPR_STMT@14..25 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) + JS_EXPRESSION_STATEMENT@14..25 ASSIGN_EXPR@14..23 NAME_REF@14..18 None IDENT@14..17 "foo" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/ok/bracket_expr.rast b/crates/rslint_parser/test_data/inline/ok/bracket_expr.rast index 6869877bde4..076eb964b90 100644 --- a/crates/rslint_parser/test_data/inline/ok/bracket_expr.rast +++ b/crates/rslint_parser/test_data/inline/ok/bracket_expr.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..56 -======= -MODULE@0..55 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..55 LIST@0..55 JS_EXPRESSION_STATEMENT@0..8 BRACKET_EXPR@0..8 @@ -10,67 +6,21 @@ MODULE@0..55 None IDENT@0..3 "foo" None None L_BRACK@3..4 "[" None NAME_REF@4..7 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@4..7 "bar" - R_BRACK@7..8 "]" - WHITESPACE@8..9 "\n" - JS_EXPRESSION_STATEMENT@9..19 - BRACKET_EXPR@9..19 - NAME_REF@9..12 - IDENT@9..12 "foo" - L_BRACK@12..13 "[" -======= - IDENT@4..7 "bar" - R_BRACK@7..8 "]" - EXPR_STMT@8..19 - BRACKET_EXPR@8..19 - NAME_REF@8..12 - "\n" IDENT@8..12 "foo" - L_BRACK@12..13 "[" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None IDENT@4..7 "bar" None None R_BRACK@7..8 "]" None - EXPR_STMT@8..19 + JS_EXPRESSION_STATEMENT@8..19 BRACKET_EXPR@8..19 NAME_REF@8..12 Whitespace(1) IDENT@9..12 "foo" None None L_BRACK@12..13 "[" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) BIN_EXPR@13..18 LITERAL@13..15 None NUMBER@13..14 "5" Whitespace(1) None PLUS@15..16 "+" Whitespace(1) LITERAL@17..18 -<<<<<<< HEAD -<<<<<<< HEAD - NUMBER@17..18 "5" - R_BRACK@18..19 "]" - WHITESPACE@19..20 "\n" - JS_EXPRESSION_STATEMENT@20..30 - BRACKET_EXPR@20..30 - NAME_REF@20..23 - IDENT@20..23 "foo" - L_BRACK@23..24 "[" - LITERAL@24..29 - STRING@24..29 "\"bar\"" - R_BRACK@29..30 "]" - WHITESPACE@30..31 "\n" - JS_EXPRESSION_STATEMENT@31..44 - BRACKET_EXPR@31..44 - BRACKET_EXPR@31..39 - NAME_REF@31..34 - IDENT@31..34 "foo" - L_BRACK@34..35 "[" -======= - NUMBER@17..18 "5" - R_BRACK@18..19 "]" -======= None NUMBER@17..18 "5" None None R_BRACK@18..19 "]" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) - EXPR_STMT@19..30 + JS_EXPRESSION_STATEMENT@19..30 BRACKET_EXPR@19..30 NAME_REF@19..23 Whitespace(1) IDENT@20..23 "foo" None @@ -78,58 +28,25 @@ MODULE@0..55 LITERAL@24..29 None STRING@24..29 "\"bar\"" None None R_BRACK@29..30 "]" None - EXPR_STMT@30..44 + JS_EXPRESSION_STATEMENT@30..44 BRACKET_EXPR@30..44 BRACKET_EXPR@30..39 NAME_REF@30..34 -<<<<<<< HEAD -<<<<<<< HEAD - "\n" IDENT@30..34 "foo" - L_BRACK@34..35 "[" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(1) IDENT@30..34 "foo" None -======= Whitespace(1) IDENT@31..34 "foo" None ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) None L_BRACK@34..35 "[" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) NAME_REF@35..38 None IDENT@35..38 "bar" None None R_BRACK@38..39 "]" None None L_BRACK@39..40 "[" None NAME_REF@40..43 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@40..43 "baz" - R_BRACK@43..44 "]" - WHITESPACE@44..45 "\n" - JS_EXPRESSION_STATEMENT@45..55 - BRACKET_EXPR@45..55 - NAME_REF@45..48 - IDENT@45..48 "foo" - QUESTIONDOT@48..50 "?." - L_BRACK@50..51 "[" -======= - IDENT@40..43 "baz" - R_BRACK@43..44 "]" - EXPR_STMT@44..55 - BRACKET_EXPR@44..55 - NAME_REF@44..48 - "\n" IDENT@44..48 "foo" - QUESTIONDOT@48..50 "?." - L_BRACK@50..51 "[" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None IDENT@40..43 "baz" None None R_BRACK@43..44 "]" None - EXPR_STMT@44..55 + JS_EXPRESSION_STATEMENT@44..55 BRACKET_EXPR@44..55 NAME_REF@44..48 Whitespace(1) IDENT@45..48 "foo" None None QUESTIONDOT@48..50 "?." None None L_BRACK@50..51 "[" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) NAME_REF@51..54 None IDENT@51..54 "bar" None None R_BRACK@54..55 "]" None diff --git a/crates/rslint_parser/test_data/inline/ok/break_stmt.rast b/crates/rslint_parser/test_data/inline/ok/break_stmt.rast index 2a5262c04fe..90a018c3048 100644 --- a/crates/rslint_parser/test_data/inline/ok/break_stmt.rast +++ b/crates/rslint_parser/test_data/inline/ok/break_stmt.rast @@ -1,43 +1,17 @@ -<<<<<<< HEAD -JS_MODULE@0..46 +JS_MODULE@0..45 LIST@0..45 JS_LABELED_STATEMENT@0..7 - IDENT@0..3 "foo" - COLON@3..4 ":" - WHITESPACE@4..5 " " - JS_BLOCK_STATEMENT@5..7 - L_CURLY@5..6 "{" - LIST@6..6 - R_CURLY@6..7 "}" - WHITESPACE@7..8 "\n" - JS_LABELED_STATEMENT@8..16 - IDENT@8..12 "rust" - COLON@12..13 ":" - WHITESPACE@13..14 " " - JS_BLOCK_STATEMENT@14..16 - L_CURLY@14..15 "{" -======= -MODULE@0..45 - LIST@0..45 - LABELLED_STMT@0..7 - NAME@0..3 - None IDENT@0..3 "foo" None + None IDENT@0..3 "foo" None None COLON@3..4 ":" Whitespace(1) - BLOCK_STMT@5..7 + JS_BLOCK_STATEMENT@5..7 None L_CURLY@5..6 "{" None LIST@6..6 None R_CURLY@6..7 "}" None - LABELLED_STMT@7..16 - NAME@7..12 - Whitespace(1) IDENT@8..12 "rust" None + JS_LABELED_STATEMENT@7..16 + Whitespace(1) IDENT@8..12 "rust" None None COLON@12..13 ":" Whitespace(1) - BLOCK_STMT@14..16 -<<<<<<< HEAD - L_CURLY@14..15 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= + JS_BLOCK_STATEMENT@14..16 None L_CURLY@14..15 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@15..15 None R_CURLY@15..16 "}" None BREAK_STMT@16..23 diff --git a/crates/rslint_parser/test_data/inline/ok/class_decl.rast b/crates/rslint_parser/test_data/inline/ok/class_decl.rast index 103e6412bbc..ad2b46e50c2 100644 --- a/crates/rslint_parser/test_data/inline/ok/class_decl.rast +++ b/crates/rslint_parser/test_data/inline/ok/class_decl.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..67 -======= -MODULE@0..66 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..66 LIST@0..66 CLASS_DECL@0..12 None CLASS_KW@0..5 "class" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/ok/class_empty_element.rast b/crates/rslint_parser/test_data/inline/ok/class_empty_element.rast index d05f4fa0cc9..b417458222d 100644 --- a/crates/rslint_parser/test_data/inline/ok/class_empty_element.rast +++ b/crates/rslint_parser/test_data/inline/ok/class_empty_element.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..41 -======= -MODULE@0..40 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..40 LIST@0..40 CLASS_DECL@0..40 None CLASS_KW@0..5 "class" Whitespace(1) @@ -11,58 +7,26 @@ MODULE@0..40 CLASS_BODY@10..40 None L_CURLY@10..11 "{" Whitespace(1) LIST@12..39 -<<<<<<< HEAD JS_EMPTY_STATEMENT@12..13 - SEMICOLON@12..13 ";" - JS_EMPTY_STATEMENT@13..14 - SEMICOLON@13..14 ";" - JS_EMPTY_STATEMENT@14..15 - SEMICOLON@14..15 ";" - JS_EMPTY_STATEMENT@15..16 - SEMICOLON@15..16 ";" - JS_EMPTY_STATEMENT@16..17 - SEMICOLON@16..17 ";" - JS_EMPTY_STATEMENT@17..18 - SEMICOLON@17..18 ";" - JS_EMPTY_STATEMENT@18..19 - SEMICOLON@18..19 ";" - JS_EMPTY_STATEMENT@19..20 - SEMICOLON@19..20 ";" - JS_EMPTY_STATEMENT@20..21 - SEMICOLON@20..21 ";" - JS_EMPTY_STATEMENT@21..22 - SEMICOLON@21..22 ";" - WHITESPACE@22..23 " " -======= - EMPTY_STMT@12..13 None SEMICOLON@12..13 ";" None - EMPTY_STMT@13..14 + JS_EMPTY_STATEMENT@13..14 None SEMICOLON@13..14 ";" None - EMPTY_STMT@14..15 + JS_EMPTY_STATEMENT@14..15 None SEMICOLON@14..15 ";" None - EMPTY_STMT@15..16 + JS_EMPTY_STATEMENT@15..16 None SEMICOLON@15..16 ";" None - EMPTY_STMT@16..17 + JS_EMPTY_STATEMENT@16..17 None SEMICOLON@16..17 ";" None - EMPTY_STMT@17..18 + JS_EMPTY_STATEMENT@17..18 None SEMICOLON@17..18 ";" None - EMPTY_STMT@18..19 + JS_EMPTY_STATEMENT@18..19 None SEMICOLON@18..19 ";" None - EMPTY_STMT@19..20 + JS_EMPTY_STATEMENT@19..20 None SEMICOLON@19..20 ";" None - EMPTY_STMT@20..21 + JS_EMPTY_STATEMENT@20..21 None SEMICOLON@20..21 ";" None - EMPTY_STMT@21..23 -<<<<<<< HEAD -<<<<<<< HEAD - SEMICOLON@21..23 ";" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None SEMICOLON@21..23 ";" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= + JS_EMPTY_STATEMENT@21..23 None SEMICOLON@21..22 ";" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) GETTER@23..35 None GET_KW@23..26 "get" Whitespace(1) NAME@27..30 @@ -70,49 +34,17 @@ MODULE@0..40 PARAMETER_LIST@30..33 None L_PAREN@30..31 "(" None LIST@31..31 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@31..32 ")" - WHITESPACE@32..33 " " - JS_BLOCK_STATEMENT@33..35 - L_CURLY@33..34 "{" - LIST@34..34 - R_CURLY@34..35 "}" - JS_EMPTY_STATEMENT@35..36 - SEMICOLON@35..36 ";" - JS_EMPTY_STATEMENT@36..37 - SEMICOLON@36..37 ";" - JS_EMPTY_STATEMENT@37..38 - SEMICOLON@37..38 ";" - JS_EMPTY_STATEMENT@38..39 - SEMICOLON@38..39 ";" - R_CURLY@39..40 "}" - WHITESPACE@40..41 "\n" -======= - R_PAREN@31..33 ")" " " -======= - None R_PAREN@31..33 ")" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None R_PAREN@31..32 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@33..35 + JS_BLOCK_STATEMENT@33..35 None L_CURLY@33..34 "{" None LIST@34..34 None R_CURLY@34..35 "}" None - EMPTY_STMT@35..36 + JS_EMPTY_STATEMENT@35..36 None SEMICOLON@35..36 ";" None - EMPTY_STMT@36..37 + JS_EMPTY_STATEMENT@36..37 None SEMICOLON@36..37 ";" None - EMPTY_STMT@37..38 + JS_EMPTY_STATEMENT@37..38 None SEMICOLON@37..38 ";" None - EMPTY_STMT@38..39 -<<<<<<< HEAD - SEMICOLON@38..39 ";" - R_CURLY@39..40 "}" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= + JS_EMPTY_STATEMENT@38..39 None SEMICOLON@38..39 ";" None None R_CURLY@39..40 "}" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) diff --git a/crates/rslint_parser/test_data/inline/ok/class_expr.rast b/crates/rslint_parser/test_data/inline/ok/class_expr.rast index 128fc8b667b..6305eb26909 100644 --- a/crates/rslint_parser/test_data/inline/ok/class_expr.rast +++ b/crates/rslint_parser/test_data/inline/ok/class_expr.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..72 -======= -MODULE@0..71 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..71 LIST@0..71 VAR_DECL@0..17 None IDENT@0..3 "let" Whitespace(1) @@ -40,51 +36,17 @@ MODULE@0..71 PARAMETER_LIST@50..53 None L_PAREN@50..51 "(" None LIST@51..51 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@51..52 ")" - WHITESPACE@52..53 " " - JS_BLOCK_STATEMENT@53..55 - L_CURLY@53..54 "{" - LIST@54..54 - R_CURLY@54..55 "}" - WHITESPACE@55..56 "\n" - R_CURLY@56..57 "}" - WHITESPACE@57..58 "\n" - JS_EXPRESSION_STATEMENT@58..71 - BRACKET_EXPR@58..71 - NAME_REF@58..61 - IDENT@58..61 "foo" - L_BRACK@61..62 "[" -======= - R_PAREN@51..53 ")" " " -======= - None R_PAREN@51..53 ")" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None R_PAREN@51..52 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@53..55 + JS_BLOCK_STATEMENT@53..55 None L_CURLY@53..54 "{" None LIST@54..54 None R_CURLY@54..55 "}" None Whitespace(1) R_CURLY@56..57 "}" None - EXPR_STMT@57..71 + JS_EXPRESSION_STATEMENT@57..71 BRACKET_EXPR@57..71 NAME_REF@57..61 -<<<<<<< HEAD -<<<<<<< HEAD - "\n" IDENT@57..61 "foo" - L_BRACK@61..62 "[" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(1) IDENT@57..61 "foo" None -======= Whitespace(1) IDENT@58..61 "foo" None ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) None L_BRACK@61..62 "[" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) CLASS_EXPR@62..70 None CLASS_KW@62..67 "class" Whitespace(1) CLASS_BODY@68..70 diff --git a/crates/rslint_parser/test_data/inline/ok/conditional_expr.rast b/crates/rslint_parser/test_data/inline/ok/conditional_expr.rast index 8154aa826b6..bf1ca39b845 100644 --- a/crates/rslint_parser/test_data/inline/ok/conditional_expr.rast +++ b/crates/rslint_parser/test_data/inline/ok/conditional_expr.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..44 -======= -MODULE@0..43 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..43 LIST@0..43 JS_EXPRESSION_STATEMENT@0..15 COND_EXPR@0..15 @@ -13,46 +9,15 @@ MODULE@0..43 None IDENT@6..9 "bar" Whitespace(1) None COLON@10..11 ":" Whitespace(1) NAME_REF@12..15 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@12..15 "baz" - WHITESPACE@15..16 "\n" - JS_EXPRESSION_STATEMENT@16..43 - COND_EXPR@16..43 - NAME_REF@16..19 - IDENT@16..19 "foo" - WHITESPACE@19..20 " " - QUESTION@20..21 "?" - WHITESPACE@21..22 " " - NAME_REF@22..25 - IDENT@22..25 "bar" - WHITESPACE@25..26 " " - COLON@26..27 ":" - WHITESPACE@27..28 " " -======= - IDENT@12..15 "baz" -======= None IDENT@12..15 "baz" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) - EXPR_STMT@15..43 + JS_EXPRESSION_STATEMENT@15..43 COND_EXPR@15..43 NAME_REF@15..20 Whitespace(1) IDENT@16..19 "foo" Whitespace(1) None QUESTION@20..21 "?" Whitespace(1) NAME_REF@22..26 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@22..26 "bar" " " - COLON@26..28 ":" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None IDENT@22..26 "bar" Whitespace(1) - None COLON@26..28 ":" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None IDENT@22..25 "bar" Whitespace(1) None COLON@26..27 ":" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) COND_EXPR@28..43 NAME_REF@28..32 None IDENT@28..31 "baz" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/ok/continue_stmt.rast b/crates/rslint_parser/test_data/inline/ok/continue_stmt.rast index 3e2b5537fd9..51fff86c8b6 100644 --- a/crates/rslint_parser/test_data/inline/ok/continue_stmt.rast +++ b/crates/rslint_parser/test_data/inline/ok/continue_stmt.rast @@ -1,26 +1,10 @@ -<<<<<<< HEAD -JS_MODULE@0..64 +JS_MODULE@0..63 LIST@0..63 JS_LABELED_STATEMENT@0..7 - IDENT@0..3 "foo" - COLON@3..4 ":" - WHITESPACE@4..5 " " - JS_BLOCK_STATEMENT@5..7 - L_CURLY@5..6 "{" -======= -MODULE@0..63 - LIST@0..63 - LABELLED_STMT@0..7 - NAME@0..3 - None IDENT@0..3 "foo" None + None IDENT@0..3 "foo" None None COLON@3..4 ":" Whitespace(1) - BLOCK_STMT@5..7 -<<<<<<< HEAD - L_CURLY@5..6 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= + JS_BLOCK_STATEMENT@5..7 None L_CURLY@5..6 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@6..6 None R_CURLY@6..7 "}" None WHILE_STMT@7..63 @@ -28,50 +12,16 @@ MODULE@0..63 CONDITION@14..21 None L_PAREN@14..15 "(" None LITERAL@15..19 -<<<<<<< HEAD -<<<<<<< HEAD - TRUE_KW@15..19 "true" - R_PAREN@19..20 ")" - WHITESPACE@20..21 " " - JS_BLOCK_STATEMENT@21..63 - L_CURLY@21..22 "{" - WHITESPACE@22..25 "\n " - LIST@25..61 - CONTINUE_STMT@25..34 - CONTINUE_KW@25..33 "continue" - SEMICOLON@33..34 ";" - WHITESPACE@34..37 "\n " - CONTINUE_STMT@37..50 - CONTINUE_KW@37..45 "continue" - WHITESPACE@45..46 " " -======= - TRUE_KW@15..19 "true" - R_PAREN@19..21 ")" " " -======= None TRUE_KW@15..19 "true" None -<<<<<<< HEAD - None R_PAREN@19..21 ")" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None R_PAREN@19..20 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@21..63 + JS_BLOCK_STATEMENT@21..63 None L_CURLY@21..22 "{" None LIST@22..61 CONTINUE_STMT@22..34 Whitespace(3) CONTINUE_KW@25..33 "continue" None None SEMICOLON@33..34 ";" None CONTINUE_STMT@34..50 -<<<<<<< HEAD -<<<<<<< HEAD - "\n " CONTINUE_KW@34..46 "continue" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(3) CONTINUE_KW@34..46 "continue" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(3) CONTINUE_KW@37..45 "continue" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) NAME_REF@46..49 None IDENT@46..49 "foo" None None SEMICOLON@49..50 ";" None diff --git a/crates/rslint_parser/test_data/inline/ok/debugger_stmt.rast b/crates/rslint_parser/test_data/inline/ok/debugger_stmt.rast index a2b29bf1522..3425d260eb7 100644 --- a/crates/rslint_parser/test_data/inline/ok/debugger_stmt.rast +++ b/crates/rslint_parser/test_data/inline/ok/debugger_stmt.rast @@ -1,19 +1,5 @@ -<<<<<<< HEAD -JS_MODULE@0..10 +JS_MODULE@0..9 LIST@0..9 JS_DEBUGGER_STATEMENT@0..9 - DEBUGGER_KW@0..8 "debugger" - SEMICOLON@8..9 ";" - WHITESPACE@9..10 "\n" -======= -MODULE@0..9 - LIST@0..9 - DEBUGGER_STMT@0..9 -<<<<<<< HEAD - DEBUGGER_KW@0..8 "debugger" - SEMICOLON@8..9 ";" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None DEBUGGER_KW@0..8 "debugger" None None SEMICOLON@8..9 ";" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) diff --git a/crates/rslint_parser/test_data/inline/ok/dot_expr.rast b/crates/rslint_parser/test_data/inline/ok/dot_expr.rast index 0eb30d7efda..2ae176d053d 100644 --- a/crates/rslint_parser/test_data/inline/ok/dot_expr.rast +++ b/crates/rslint_parser/test_data/inline/ok/dot_expr.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..54 -======= -MODULE@0..53 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..53 LIST@0..53 JS_EXPRESSION_STATEMENT@0..7 DOT_EXPR@0..7 @@ -10,94 +6,39 @@ MODULE@0..53 None IDENT@0..3 "foo" None None DOT@3..4 "." None NAME@4..7 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@4..7 "bar" - WHITESPACE@7..8 "\n" - JS_EXPRESSION_STATEMENT@8..17 - DOT_EXPR@8..17 - NAME_REF@8..11 - IDENT@8..11 "foo" - DOT@11..12 "." - NAME@12..17 - IDENT@12..17 "await" - WHITESPACE@17..18 "\n" - JS_EXPRESSION_STATEMENT@18..27 - DOT_EXPR@18..27 - NAME_REF@18..21 - IDENT@18..21 "foo" - DOT@21..22 "." - NAME@22..27 - IDENT@22..27 "yield" - WHITESPACE@27..28 "\n" - JS_EXPRESSION_STATEMENT@28..35 - DOT_EXPR@28..35 - NAME_REF@28..31 - IDENT@28..31 "foo" - DOT@31..32 "." - NAME@32..35 - IDENT@32..35 "for" - WHITESPACE@35..36 "\n" - JS_EXPRESSION_STATEMENT@36..44 - DOT_EXPR@36..44 - NAME_REF@36..39 - IDENT@36..39 "foo" - QUESTIONDOT@39..41 "?." - NAME@41..44 - IDENT@41..44 "for" - WHITESPACE@44..45 "\n" - JS_EXPRESSION_STATEMENT@45..53 - DOT_EXPR@45..53 - NAME_REF@45..48 - IDENT@45..48 "foo" - QUESTIONDOT@48..50 "?." -======= - IDENT@4..7 "bar" -======= None IDENT@4..7 "bar" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) - EXPR_STMT@7..17 + JS_EXPRESSION_STATEMENT@7..17 DOT_EXPR@7..17 NAME_REF@7..11 Whitespace(1) IDENT@8..11 "foo" None None DOT@11..12 "." None NAME@12..17 None IDENT@12..17 "await" None - EXPR_STMT@17..27 + JS_EXPRESSION_STATEMENT@17..27 DOT_EXPR@17..27 NAME_REF@17..21 Whitespace(1) IDENT@18..21 "foo" None None DOT@21..22 "." None NAME@22..27 None IDENT@22..27 "yield" None - EXPR_STMT@27..35 + JS_EXPRESSION_STATEMENT@27..35 DOT_EXPR@27..35 NAME_REF@27..31 Whitespace(1) IDENT@28..31 "foo" None None DOT@31..32 "." None NAME@32..35 None IDENT@32..35 "for" None - EXPR_STMT@35..44 + JS_EXPRESSION_STATEMENT@35..44 DOT_EXPR@35..44 NAME_REF@35..39 Whitespace(1) IDENT@36..39 "foo" None None QUESTIONDOT@39..41 "?." None NAME@41..44 None IDENT@41..44 "for" None - EXPR_STMT@44..53 + JS_EXPRESSION_STATEMENT@44..53 DOT_EXPR@44..53 NAME_REF@44..48 -<<<<<<< HEAD -<<<<<<< HEAD - "\n" IDENT@44..48 "foo" - QUESTIONDOT@48..50 "?." ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(1) IDENT@44..48 "foo" None -======= Whitespace(1) IDENT@45..48 "foo" None ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) None QUESTIONDOT@48..50 "?." None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) NAME@50..53 None IDENT@50..53 "bar" None diff --git a/crates/rslint_parser/test_data/inline/ok/empty_stmt.rast b/crates/rslint_parser/test_data/inline/ok/empty_stmt.rast index 2a5dcd7ebc0..b666aed4265 100644 --- a/crates/rslint_parser/test_data/inline/ok/empty_stmt.rast +++ b/crates/rslint_parser/test_data/inline/ok/empty_stmt.rast @@ -1,16 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..2 +JS_MODULE@0..1 LIST@0..1 JS_EMPTY_STATEMENT@0..1 - SEMICOLON@0..1 ";" - WHITESPACE@1..2 "\n" -======= -MODULE@0..1 - LIST@0..1 - EMPTY_STMT@0..1 -<<<<<<< HEAD - SEMICOLON@0..1 ";" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None SEMICOLON@0..1 ";" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) diff --git a/crates/rslint_parser/test_data/inline/ok/export.rast b/crates/rslint_parser/test_data/inline/ok/export.rast index f1bbab6db8e..1a739294941 100644 --- a/crates/rslint_parser/test_data/inline/ok/export.rast +++ b/crates/rslint_parser/test_data/inline/ok/export.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..27 -======= -MODULE@0..26 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..26 LIST@0..26 EXPORT_DECL@0..26 None EXPORT_KW@0..6 "export" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/ok/for_stmt.rast b/crates/rslint_parser/test_data/inline/ok/for_stmt.rast index 6af843f5498..28a93d22337 100644 --- a/crates/rslint_parser/test_data/inline/ok/for_stmt.rast +++ b/crates/rslint_parser/test_data/inline/ok/for_stmt.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..95 -======= -MODULE@0..94 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..94 LIST@0..94 FOR_STMT@0..31 None FOR_KW@0..3 "for" Whitespace(1) @@ -30,28 +26,11 @@ MODULE@0..94 FOR_STMT_UPDATE@24..27 POST_UPDATE_EXPRESSION@24..27 NAME_REF@24..25 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@24..25 "i" - PLUS2@25..27 "++" - R_PAREN@27..28 ")" - WHITESPACE@28..29 " " - JS_BLOCK_STATEMENT@29..31 - L_CURLY@29..30 "{" -======= - IDENT@24..25 "i" - PLUS2@25..27 "++" - R_PAREN@27..29 ")" " " - BLOCK_STMT@29..31 - L_CURLY@29..30 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None IDENT@24..25 "i" None None PLUS2@25..27 "++" None None R_PAREN@27..28 ")" Whitespace(1) - BLOCK_STMT@29..31 + JS_BLOCK_STATEMENT@29..31 None L_CURLY@29..30 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@30..30 None R_CURLY@30..31 "}" None FOR_OF_STMT@31..63 @@ -77,25 +56,10 @@ MODULE@0..94 OBJECT_EXPR@57..59 None L_CURLY@57..58 "{" None LIST@58..58 -<<<<<<< HEAD -<<<<<<< HEAD - R_CURLY@58..59 "}" - R_PAREN@59..60 ")" - WHITESPACE@60..61 " " - JS_BLOCK_STATEMENT@61..63 - L_CURLY@61..62 "{" -======= - R_CURLY@58..59 "}" - R_PAREN@59..61 ")" " " - BLOCK_STMT@61..63 - L_CURLY@61..62 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None R_CURLY@58..59 "}" None None R_PAREN@59..60 ")" Whitespace(1) - BLOCK_STMT@61..63 + JS_BLOCK_STATEMENT@61..63 None L_CURLY@61..62 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@62..62 None R_CURLY@62..63 "}" None FOR_IN_STMT@63..82 @@ -108,38 +72,9 @@ MODULE@0..94 OBJECT_EXPR@76..78 None L_CURLY@76..77 "{" None LIST@77..77 -<<<<<<< HEAD -<<<<<<< HEAD - R_CURLY@77..78 "}" - R_PAREN@78..79 ")" - WHITESPACE@79..80 " " - JS_BLOCK_STATEMENT@80..82 - L_CURLY@80..81 "{" - LIST@81..81 - R_CURLY@81..82 "}" - WHITESPACE@82..83 "\n" - FOR_STMT@83..94 - FOR_KW@83..86 "for" - WHITESPACE@86..87 " " - L_PAREN@87..88 "(" - SEMICOLON@88..89 ";" - SEMICOLON@89..90 ";" - R_PAREN@90..91 ")" - WHITESPACE@91..92 " " - JS_BLOCK_STATEMENT@92..94 - L_CURLY@92..93 "{" -======= - R_CURLY@77..78 "}" - R_PAREN@78..80 ")" " " -======= None R_CURLY@77..78 "}" None -<<<<<<< HEAD - None R_PAREN@78..80 ")" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None R_PAREN@78..79 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@80..82 + JS_BLOCK_STATEMENT@80..82 None L_CURLY@80..81 "{" None LIST@81..81 None R_CURLY@81..82 "}" None @@ -149,12 +84,7 @@ MODULE@0..94 None SEMICOLON@88..89 ";" None None SEMICOLON@89..90 ";" None None R_PAREN@90..91 ")" Whitespace(1) - BLOCK_STMT@92..94 -<<<<<<< HEAD - L_CURLY@92..93 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= + JS_BLOCK_STATEMENT@92..94 None L_CURLY@92..93 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@93..93 None R_CURLY@93..94 "}" None diff --git a/crates/rslint_parser/test_data/inline/ok/function_decl.rast b/crates/rslint_parser/test_data/inline/ok/function_decl.rast index 970536e8fa8..6d9f79e2b00 100644 --- a/crates/rslint_parser/test_data/inline/ok/function_decl.rast +++ b/crates/rslint_parser/test_data/inline/ok/function_decl.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..142 -======= -MODULE@0..141 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..141 LIST@0..141 FN_DECL@0..17 None FUNCTION_KW@0..8 "function" Whitespace(1) @@ -11,26 +7,9 @@ MODULE@0..141 PARAMETER_LIST@12..15 None L_PAREN@12..13 "(" None LIST@13..13 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@13..14 ")" - WHITESPACE@14..15 " " - JS_BLOCK_STATEMENT@15..17 - L_CURLY@15..16 "{" -======= - R_PAREN@13..15 ")" " " - BLOCK_STMT@15..17 - L_CURLY@15..16 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@13..15 ")" Whitespace(1) -======= None R_PAREN@13..14 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@15..17 + JS_BLOCK_STATEMENT@15..17 None L_CURLY@15..16 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@16..16 None R_CURLY@16..17 "}" None FN_DECL@17..36 @@ -41,26 +20,9 @@ MODULE@0..141 PARAMETER_LIST@31..34 None L_PAREN@31..32 "(" None LIST@32..32 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@32..33 ")" - WHITESPACE@33..34 " " - JS_BLOCK_STATEMENT@34..36 - L_CURLY@34..35 "{" -======= - R_PAREN@32..34 ")" " " - BLOCK_STMT@34..36 - L_CURLY@34..35 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@32..34 ")" Whitespace(1) -======= None R_PAREN@32..33 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@34..36 + JS_BLOCK_STATEMENT@34..36 None L_CURLY@34..35 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@35..35 None R_CURLY@35..36 "}" None FN_DECL@36..59 @@ -72,25 +34,10 @@ MODULE@0..141 LIST@50..55 SINGLE_PATTERN@50..55 NAME@50..55 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@50..55 "await" - R_PAREN@55..56 ")" - WHITESPACE@56..57 " " - JS_BLOCK_STATEMENT@57..59 - L_CURLY@57..58 "{" -======= - IDENT@50..55 "await" - R_PAREN@55..57 ")" " " - BLOCK_STMT@57..59 - L_CURLY@57..58 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None IDENT@50..55 "await" None None R_PAREN@55..56 ")" Whitespace(1) - BLOCK_STMT@57..59 + JS_BLOCK_STATEMENT@57..59 None L_CURLY@57..58 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@58..58 None R_CURLY@58..59 "}" None FN_DECL@59..84 @@ -102,26 +49,9 @@ MODULE@0..141 PARAMETER_LIST@79..82 None L_PAREN@79..80 "(" None LIST@80..80 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@80..81 ")" - WHITESPACE@81..82 " " - JS_BLOCK_STATEMENT@82..84 - L_CURLY@82..83 "{" -======= - R_PAREN@80..82 ")" " " - BLOCK_STMT@82..84 - L_CURLY@82..83 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@80..82 ")" Whitespace(1) -======= None R_PAREN@80..81 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@82..84 + JS_BLOCK_STATEMENT@82..84 None L_CURLY@82..83 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@83..83 None R_CURLY@83..84 "}" None FN_DECL@84..108 @@ -132,26 +62,9 @@ MODULE@0..141 PARAMETER_LIST@103..106 None L_PAREN@103..104 "(" None LIST@104..104 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@104..105 ")" - WHITESPACE@105..106 " " - JS_BLOCK_STATEMENT@106..108 - L_CURLY@106..107 "{" -======= - R_PAREN@104..106 ")" " " - BLOCK_STMT@106..108 - L_CURLY@106..107 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@104..106 ")" Whitespace(1) -======= None R_PAREN@104..105 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@106..108 + JS_BLOCK_STATEMENT@106..108 None L_CURLY@106..107 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@107..107 None R_CURLY@107..108 "}" None FN_DECL@108..141 @@ -162,42 +75,13 @@ MODULE@0..141 PARAMETER_LIST@122..125 None L_PAREN@122..123 "(" None LIST@123..123 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@123..124 ")" - WHITESPACE@124..125 " " - JS_BLOCK_STATEMENT@125..141 - L_CURLY@125..126 "{" - WHITESPACE@126..129 "\n " - LIST@129..139 - JS_EXPRESSION_STATEMENT@129..139 - YIELD_EXPR@129..138 - YIELD_KW@129..134 "yield" - WHITESPACE@134..135 " " -======= - R_PAREN@123..125 ")" " " -======= - None R_PAREN@123..125 ")" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None R_PAREN@123..124 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@125..141 + JS_BLOCK_STATEMENT@125..141 None L_CURLY@125..126 "{" None LIST@126..139 - EXPR_STMT@126..139 + JS_EXPRESSION_STATEMENT@126..139 YIELD_EXPR@126..138 -<<<<<<< HEAD -<<<<<<< HEAD - "\n " YIELD_KW@126..135 "yield" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(3) YIELD_KW@126..135 "yield" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(3) YIELD_KW@129..134 "yield" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) NAME_REF@135..138 None IDENT@135..138 "foo" None None SEMICOLON@138..139 ";" None diff --git a/crates/rslint_parser/test_data/inline/ok/function_expr.rast b/crates/rslint_parser/test_data/inline/ok/function_expr.rast index e049b931ca2..663ba38118c 100644 --- a/crates/rslint_parser/test_data/inline/ok/function_expr.rast +++ b/crates/rslint_parser/test_data/inline/ok/function_expr.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..48 -======= -MODULE@0..47 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..47 LIST@0..47 VAR_DECL@0..21 None IDENT@0..3 "let" Whitespace(1) @@ -17,26 +13,9 @@ MODULE@0..47 PARAMETER_LIST@16..19 None L_PAREN@16..17 "(" None LIST@17..17 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@17..18 ")" - WHITESPACE@18..19 " " - JS_BLOCK_STATEMENT@19..21 - L_CURLY@19..20 "{" -======= - R_PAREN@17..19 ")" " " - BLOCK_STMT@19..21 - L_CURLY@19..20 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@17..19 ")" Whitespace(1) -======= None R_PAREN@17..18 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@19..21 + JS_BLOCK_STATEMENT@19..21 None L_CURLY@19..20 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@20..20 None R_CURLY@20..21 "}" None VAR_DECL@21..47 @@ -54,25 +33,8 @@ MODULE@0..47 PARAMETER_LIST@42..45 None L_PAREN@42..43 "(" None LIST@43..43 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@43..44 ")" - WHITESPACE@44..45 " " - JS_BLOCK_STATEMENT@45..47 - L_CURLY@45..46 "{" -======= - R_PAREN@43..45 ")" " " - BLOCK_STMT@45..47 - L_CURLY@45..46 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@43..45 ")" Whitespace(1) -======= None R_PAREN@43..44 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@45..47 + JS_BLOCK_STATEMENT@45..47 None L_CURLY@45..46 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@46..46 None R_CURLY@46..47 "}" None diff --git a/crates/rslint_parser/test_data/inline/ok/grouping_expr.rast b/crates/rslint_parser/test_data/inline/ok/grouping_expr.rast index 83e7dec505b..722c6cd2365 100644 --- a/crates/rslint_parser/test_data/inline/ok/grouping_expr.rast +++ b/crates/rslint_parser/test_data/inline/ok/grouping_expr.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..14 -======= -MODULE@0..13 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..13 LIST@0..13 JS_EXPRESSION_STATEMENT@0..13 CALL_EXPR@0..13 diff --git a/crates/rslint_parser/test_data/inline/ok/identifier_reference.rast b/crates/rslint_parser/test_data/inline/ok/identifier_reference.rast index f1e78fd62fe..5770139fb7b 100644 --- a/crates/rslint_parser/test_data/inline/ok/identifier_reference.rast +++ b/crates/rslint_parser/test_data/inline/ok/identifier_reference.rast @@ -1,48 +1,14 @@ -<<<<<<< HEAD -JS_MODULE@0..19 -======= -MODULE@0..18 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..18 LIST@0..18 JS_EXPRESSION_STATEMENT@0..4 NAME_REF@0..3 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@0..3 "foo" - SEMICOLON@3..4 ";" - WHITESPACE@4..5 "\n" - JS_EXPRESSION_STATEMENT@5..11 - NAME_REF@5..10 - IDENT@5..10 "yield" - SEMICOLON@10..11 ";" - WHITESPACE@11..12 "\n" - JS_EXPRESSION_STATEMENT@12..18 - NAME_REF@12..17 - IDENT@12..17 "await" - SEMICOLON@17..18 ";" - WHITESPACE@18..19 "\n" -======= - IDENT@0..3 "foo" - SEMICOLON@3..4 ";" -======= None IDENT@0..3 "foo" None None SEMICOLON@3..4 ";" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) - EXPR_STMT@4..11 + JS_EXPRESSION_STATEMENT@4..11 NAME_REF@4..10 Whitespace(1) IDENT@5..10 "yield" None None SEMICOLON@10..11 ";" None - EXPR_STMT@11..18 + JS_EXPRESSION_STATEMENT@11..18 NAME_REF@11..17 -<<<<<<< HEAD -<<<<<<< HEAD - "\n" IDENT@11..17 "await" - SEMICOLON@17..18 ";" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(1) IDENT@11..17 "await" None -======= Whitespace(1) IDENT@12..17 "await" None ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) None SEMICOLON@17..18 ";" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) diff --git a/crates/rslint_parser/test_data/inline/ok/if_stmt.rast b/crates/rslint_parser/test_data/inline/ok/if_stmt.rast index 8d77e235f54..63eda771a3b 100644 --- a/crates/rslint_parser/test_data/inline/ok/if_stmt.rast +++ b/crates/rslint_parser/test_data/inline/ok/if_stmt.rast @@ -1,159 +1,65 @@ -<<<<<<< HEAD -JS_MODULE@0..88 +JS_MODULE@0..87 LIST@0..87 JS_IF_STATEMENT@0..20 - IF_KW@0..2 "if" - WHITESPACE@2..3 " " - L_PAREN@3..4 "(" + None IF_KW@0..2 "if" Whitespace(1) + None L_PAREN@3..4 "(" None LITERAL@4..8 - TRUE_KW@4..8 "true" - R_PAREN@8..9 ")" - WHITESPACE@9..10 " " - JS_BLOCK_STATEMENT@10..12 - L_CURLY@10..11 "{" + None TRUE_KW@4..8 "true" None + None R_PAREN@8..9 ")" Whitespace(1) + JS_BLOCK_STATEMENT@10..13 + None L_CURLY@10..11 "{" None LIST@11..11 - R_CURLY@11..12 "}" - WHITESPACE@12..13 " " + None R_CURLY@11..12 "}" Whitespace(1) JS_ELSE_CLAUSE@13..20 - ELSE_KW@13..17 "else" - WHITESPACE@17..18 " " + None ELSE_KW@13..17 "else" Whitespace(1) JS_BLOCK_STATEMENT@18..20 - L_CURLY@18..19 "{" + None L_CURLY@18..19 "{" None LIST@19..19 - R_CURLY@19..20 "}" - WHITESPACE@20..21 "\n" - JS_IF_STATEMENT@21..33 - IF_KW@21..23 "if" - WHITESPACE@23..24 " " - L_PAREN@24..25 "(" + None R_CURLY@19..20 "}" None + JS_IF_STATEMENT@20..33 + Whitespace(1) IF_KW@21..23 "if" Whitespace(1) + None L_PAREN@24..25 "(" None LITERAL@25..29 - TRUE_KW@25..29 "true" - R_PAREN@29..30 ")" - WHITESPACE@30..31 " " + None TRUE_KW@25..29 "true" None + None R_PAREN@29..30 ")" Whitespace(1) JS_BLOCK_STATEMENT@31..33 - L_CURLY@31..32 "{" - LIST@32..32 - R_CURLY@32..33 "}" - WHITESPACE@33..34 "\n" - JS_IF_STATEMENT@34..49 - IF_KW@34..36 "if" - WHITESPACE@36..37 " " - L_PAREN@37..38 "(" - LITERAL@38..42 - TRUE_KW@38..42 "true" - R_PAREN@42..43 ")" - WHITESPACE@43..44 " " - JS_EXPRESSION_STATEMENT@44..49 - LITERAL@44..49 - FALSE_KW@44..49 "false" - WHITESPACE@49..50 "\n" - JS_IF_STATEMENT@50..87 - IF_KW@50..52 "if" - WHITESPACE@52..53 " " - L_PAREN@53..54 "(" - NAME_REF@54..57 - IDENT@54..57 "bar" - R_PAREN@57..58 ")" - WHITESPACE@58..59 " " - JS_BLOCK_STATEMENT@59..61 - L_CURLY@59..60 "{" - LIST@60..60 - R_CURLY@60..61 "}" - WHITESPACE@61..62 " " - JS_ELSE_CLAUSE@62..87 - ELSE_KW@62..66 "else" - WHITESPACE@66..67 " " - JS_IF_STATEMENT@67..87 - IF_KW@67..69 "if" - WHITESPACE@69..70 " " - L_PAREN@70..71 "(" - LITERAL@71..75 - TRUE_KW@71..75 "true" - R_PAREN@75..76 ")" - WHITESPACE@76..77 " " - JS_BLOCK_STATEMENT@77..79 - L_CURLY@77..78 "{" - LIST@78..78 - R_CURLY@78..79 "}" - WHITESPACE@79..80 " " - JS_ELSE_CLAUSE@80..87 - ELSE_KW@80..84 "else" - WHITESPACE@84..85 " " - JS_BLOCK_STATEMENT@85..87 - L_CURLY@85..86 "{" - LIST@86..86 - R_CURLY@86..87 "}" - WHITESPACE@87..88 "\n" -======= -MODULE@0..87 - LIST@0..87 - IF_STMT@0..20 - None IF_KW@0..2 "if" Whitespace(1) - CONDITION@3..10 - None L_PAREN@3..4 "(" None - LITERAL@4..8 - None TRUE_KW@4..8 "true" None - None R_PAREN@8..9 ")" Whitespace(1) - BLOCK_STMT@10..13 - None L_CURLY@10..11 "{" None - LIST@11..11 - None R_CURLY@11..12 "}" Whitespace(1) - None ELSE_KW@13..17 "else" Whitespace(1) - BLOCK_STMT@18..20 - None L_CURLY@18..19 "{" None - LIST@19..19 - None R_CURLY@19..20 "}" None - IF_STMT@20..33 - Whitespace(1) IF_KW@21..23 "if" Whitespace(1) - CONDITION@24..31 - None L_PAREN@24..25 "(" None - LITERAL@25..29 - None TRUE_KW@25..29 "true" None - None R_PAREN@29..30 ")" Whitespace(1) - BLOCK_STMT@31..33 None L_CURLY@31..32 "{" None LIST@32..32 None R_CURLY@32..33 "}" None - IF_STMT@33..49 + JS_IF_STATEMENT@33..49 Whitespace(1) IF_KW@34..36 "if" Whitespace(1) - CONDITION@37..44 - None L_PAREN@37..38 "(" None - LITERAL@38..42 - None TRUE_KW@38..42 "true" None - None R_PAREN@42..43 ")" Whitespace(1) - EXPR_STMT@44..49 + None L_PAREN@37..38 "(" None + LITERAL@38..42 + None TRUE_KW@38..42 "true" None + None R_PAREN@42..43 ")" Whitespace(1) + JS_EXPRESSION_STATEMENT@44..49 LITERAL@44..49 None FALSE_KW@44..49 "false" None - IF_STMT@49..87 + JS_IF_STATEMENT@49..87 Whitespace(1) IF_KW@50..52 "if" Whitespace(1) - CONDITION@53..59 - None L_PAREN@53..54 "(" None - NAME_REF@54..57 - None IDENT@54..57 "bar" None - None R_PAREN@57..58 ")" Whitespace(1) - BLOCK_STMT@59..62 + None L_PAREN@53..54 "(" None + NAME_REF@54..57 + None IDENT@54..57 "bar" None + None R_PAREN@57..58 ")" Whitespace(1) + JS_BLOCK_STATEMENT@59..62 None L_CURLY@59..60 "{" None LIST@60..60 None R_CURLY@60..61 "}" Whitespace(1) - None ELSE_KW@62..66 "else" Whitespace(1) - IF_STMT@67..87 - None IF_KW@67..69 "if" Whitespace(1) - CONDITION@70..77 + JS_ELSE_CLAUSE@62..87 + None ELSE_KW@62..66 "else" Whitespace(1) + JS_IF_STATEMENT@67..87 + None IF_KW@67..69 "if" Whitespace(1) None L_PAREN@70..71 "(" None LITERAL@71..75 None TRUE_KW@71..75 "true" None None R_PAREN@75..76 ")" Whitespace(1) - BLOCK_STMT@77..80 - None L_CURLY@77..78 "{" None - LIST@78..78 - None R_CURLY@78..79 "}" Whitespace(1) - None ELSE_KW@80..84 "else" Whitespace(1) - BLOCK_STMT@85..87 - None L_CURLY@85..86 "{" None - LIST@86..86 -<<<<<<< HEAD - R_CURLY@86..87 "}" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_CURLY@86..87 "}" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) + JS_BLOCK_STATEMENT@77..80 + None L_CURLY@77..78 "{" None + LIST@78..78 + None R_CURLY@78..79 "}" Whitespace(1) + JS_ELSE_CLAUSE@80..87 + None ELSE_KW@80..84 "else" Whitespace(1) + JS_BLOCK_STATEMENT@85..87 + None L_CURLY@85..86 "{" None + LIST@86..86 + None R_CURLY@86..87 "}" None diff --git a/crates/rslint_parser/test_data/inline/ok/import_call.rast b/crates/rslint_parser/test_data/inline/ok/import_call.rast index 6cb6b3d7299..9d3f7f6899f 100644 --- a/crates/rslint_parser/test_data/inline/ok/import_call.rast +++ b/crates/rslint_parser/test_data/inline/ok/import_call.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..14 -======= -MODULE@0..13 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..13 LIST@0..13 JS_EXPRESSION_STATEMENT@0..13 IMPORT_CALL@0..13 diff --git a/crates/rslint_parser/test_data/inline/ok/import_decl.rast b/crates/rslint_parser/test_data/inline/ok/import_decl.rast index 2a536568ad3..cdfab6d9c4f 100644 --- a/crates/rslint_parser/test_data/inline/ok/import_decl.rast +++ b/crates/rslint_parser/test_data/inline/ok/import_decl.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..28 -======= -MODULE@0..27 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..27 LIST@0..27 IMPORT_DECL@0..27 None IMPORT_KW@0..6 "import" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/ok/import_meta.rast b/crates/rslint_parser/test_data/inline/ok/import_meta.rast index f50532196dd..9ea3892d02c 100644 --- a/crates/rslint_parser/test_data/inline/ok/import_meta.rast +++ b/crates/rslint_parser/test_data/inline/ok/import_meta.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..12 -======= -MODULE@0..11 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..11 LIST@0..11 JS_EXPRESSION_STATEMENT@0..11 IMPORT_META@0..11 diff --git a/crates/rslint_parser/test_data/inline/ok/literals.rast b/crates/rslint_parser/test_data/inline/ok/literals.rast index c6595afbd08..5fa4dd55d39 100644 --- a/crates/rslint_parser/test_data/inline/ok/literals.rast +++ b/crates/rslint_parser/test_data/inline/ok/literals.rast @@ -1,68 +1,23 @@ -<<<<<<< HEAD -JS_MODULE@0..33 -======= -MODULE@0..32 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..32 LIST@0..32 JS_EXPRESSION_STATEMENT@0..1 LITERAL@0..1 -<<<<<<< HEAD -<<<<<<< HEAD - NUMBER@0..1 "5" - WHITESPACE@1..2 "\n" - JS_EXPRESSION_STATEMENT@2..6 - LITERAL@2..6 - TRUE_KW@2..6 "true" - WHITESPACE@6..7 "\n" - JS_EXPRESSION_STATEMENT@7..12 - LITERAL@7..12 - FALSE_KW@7..12 "false" - WHITESPACE@12..13 "\n" - JS_EXPRESSION_STATEMENT@13..15 - LITERAL@13..15 - NUMBER@13..15 "5n" - WHITESPACE@15..16 "\n" - JS_EXPRESSION_STATEMENT@16..21 - LITERAL@16..21 - STRING@16..21 "\"foo\"" - WHITESPACE@21..22 "\n" - JS_EXPRESSION_STATEMENT@22..27 - LITERAL@22..27 - STRING@22..27 "'bar'" - WHITESPACE@27..28 "\n" - JS_EXPRESSION_STATEMENT@28..32 - LITERAL@28..32 - NULL_KW@28..32 "null" - WHITESPACE@32..33 "\n" -======= - NUMBER@0..1 "5" -======= None NUMBER@0..1 "5" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) - EXPR_STMT@1..6 + JS_EXPRESSION_STATEMENT@1..6 LITERAL@1..6 Whitespace(1) TRUE_KW@2..6 "true" None - EXPR_STMT@6..12 + JS_EXPRESSION_STATEMENT@6..12 LITERAL@6..12 Whitespace(1) FALSE_KW@7..12 "false" None - EXPR_STMT@12..15 + JS_EXPRESSION_STATEMENT@12..15 LITERAL@12..15 Whitespace(1) NUMBER@13..15 "5n" None - EXPR_STMT@15..21 + JS_EXPRESSION_STATEMENT@15..21 LITERAL@15..21 Whitespace(1) STRING@16..21 "\"foo\"" None - EXPR_STMT@21..27 + JS_EXPRESSION_STATEMENT@21..27 LITERAL@21..27 Whitespace(1) STRING@22..27 "'bar'" None - EXPR_STMT@27..32 + JS_EXPRESSION_STATEMENT@27..32 LITERAL@27..32 -<<<<<<< HEAD -<<<<<<< HEAD - "\n" NULL_KW@27..32 "null" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(1) NULL_KW@27..32 "null" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(1) NULL_KW@28..32 "null" None ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) diff --git a/crates/rslint_parser/test_data/inline/ok/method_getter.rast b/crates/rslint_parser/test_data/inline/ok/method_getter.rast index c0b62f8a4de..c56e2bb2fe8 100644 --- a/crates/rslint_parser/test_data/inline/ok/method_getter.rast +++ b/crates/rslint_parser/test_data/inline/ok/method_getter.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..28 -======= -MODULE@0..27 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..27 LIST@0..27 CLASS_DECL@0..27 None CLASS_KW@0..5 "class" Whitespace(1) @@ -18,26 +14,9 @@ MODULE@0..27 PARAMETER_LIST@20..23 None L_PAREN@20..21 "(" None LIST@21..21 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@21..22 ")" - WHITESPACE@22..23 " " - JS_BLOCK_STATEMENT@23..25 - L_CURLY@23..24 "{" -======= - R_PAREN@21..23 ")" " " - BLOCK_STMT@23..25 - L_CURLY@23..24 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@21..23 ")" Whitespace(1) -======= None R_PAREN@21..22 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@23..25 + JS_BLOCK_STATEMENT@23..25 None L_CURLY@23..24 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@24..24 None R_CURLY@24..25 "}" None Whitespace(1) R_CURLY@26..27 "}" None diff --git a/crates/rslint_parser/test_data/inline/ok/method_setter.rast b/crates/rslint_parser/test_data/inline/ok/method_setter.rast index a9dddd0beb4..661801b9a14 100644 --- a/crates/rslint_parser/test_data/inline/ok/method_setter.rast +++ b/crates/rslint_parser/test_data/inline/ok/method_setter.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..28 -======= -MODULE@0..27 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..27 LIST@0..27 CLASS_DECL@0..27 None CLASS_KW@0..5 "class" Whitespace(1) @@ -18,26 +14,9 @@ MODULE@0..27 PARAMETER_LIST@20..23 None L_PAREN@20..21 "(" None LIST@21..21 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@21..22 ")" - WHITESPACE@22..23 " " - JS_BLOCK_STATEMENT@23..25 - L_CURLY@23..24 "{" -======= - R_PAREN@21..23 ")" " " - BLOCK_STMT@23..25 - L_CURLY@23..24 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@21..23 ")" Whitespace(1) -======= None R_PAREN@21..22 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@23..25 + JS_BLOCK_STATEMENT@23..25 None L_CURLY@23..24 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@24..24 None R_CURLY@24..25 "}" None Whitespace(1) R_CURLY@26..27 "}" None diff --git a/crates/rslint_parser/test_data/inline/ok/new_exprs.rast b/crates/rslint_parser/test_data/inline/ok/new_exprs.rast index 7f03a522a9e..880aa49bfbd 100644 --- a/crates/rslint_parser/test_data/inline/ok/new_exprs.rast +++ b/crates/rslint_parser/test_data/inline/ok/new_exprs.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..113 -======= -MODULE@0..112 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..112 LIST@0..112 JS_EXPRESSION_STATEMENT@0..9 NEW_EXPR@0..9 @@ -12,56 +8,21 @@ MODULE@0..112 ARG_LIST@7..9 None L_PAREN@7..8 "(" None LIST@8..8 -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@8..9 ")" - WHITESPACE@9..10 "\n" - JS_EXPRESSION_STATEMENT@10..18 - NEW_EXPR@10..17 - NEW_KW@10..13 "new" - WHITESPACE@13..14 " " - NAME_REF@14..17 - IDENT@14..17 "foo" - SEMICOLON@17..18 ";" - WHITESPACE@18..19 "\n" - JS_EXPRESSION_STATEMENT@19..29 - NEW_TARGET@19..29 - NEW_KW@19..22 "new" - DOT@22..23 "." - IDENT@23..29 "target" - WHITESPACE@29..30 "\n" - JS_EXPRESSION_STATEMENT@30..52 - NEW_EXPR@30..51 - NEW_KW@30..33 "new" - WHITESPACE@33..34 " " -======= - R_PAREN@8..9 ")" -======= None R_PAREN@8..9 ")" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) - EXPR_STMT@9..18 + JS_EXPRESSION_STATEMENT@9..18 NEW_EXPR@9..17 Whitespace(1) NEW_KW@10..13 "new" Whitespace(1) NAME_REF@14..17 None IDENT@14..17 "foo" None None SEMICOLON@17..18 ";" None - EXPR_STMT@18..29 + JS_EXPRESSION_STATEMENT@18..29 NEW_TARGET@18..29 Whitespace(1) NEW_KW@19..22 "new" None None DOT@22..23 "." None None IDENT@23..29 "target" None - EXPR_STMT@29..52 + JS_EXPRESSION_STATEMENT@29..52 NEW_EXPR@29..51 -<<<<<<< HEAD -<<<<<<< HEAD - "\n" NEW_KW@29..34 "new" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(1) NEW_KW@29..34 "new" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(1) NEW_KW@30..33 "new" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) NEW_EXPR@34..51 None NEW_KW@34..37 "new" Whitespace(1) NEW_EXPR@38..51 @@ -73,33 +34,11 @@ MODULE@0..112 ARG_LIST@49..51 None L_PAREN@49..50 "(" None LIST@50..50 -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@50..51 ")" - SEMICOLON@51..52 ";" - WHITESPACE@52..53 "\n" - JS_EXPRESSION_STATEMENT@53..112 - NEW_EXPR@53..112 - NEW_KW@53..56 "new" - WHITESPACE@56..57 " " -======= - R_PAREN@50..51 ")" - SEMICOLON@51..52 ";" - EXPR_STMT@52..112 - NEW_EXPR@52..112 - "\n" NEW_KW@52..57 "new" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None R_PAREN@50..51 ")" None None SEMICOLON@51..52 ";" None - EXPR_STMT@52..112 + JS_EXPRESSION_STATEMENT@52..112 NEW_EXPR@52..112 -<<<<<<< HEAD - Whitespace(1) NEW_KW@52..57 "new" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(1) NEW_KW@53..56 "new" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) NAME_REF@57..60 None IDENT@57..60 "Foo" None ARG_LIST@60..112 @@ -134,29 +73,11 @@ MODULE@0..112 LIST@90..93 SINGLE_PATTERN@90..93 NAME@90..93 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@90..93 "foo" - R_PAREN@93..94 ")" - WHITESPACE@94..95 " " - FAT_ARROW@95..97 "=>" - WHITESPACE@97..98 " " - JS_BLOCK_STATEMENT@98..100 - L_CURLY@98..99 "{" -======= - IDENT@90..93 "foo" - R_PAREN@93..95 ")" " " - FAT_ARROW@95..98 "=>" " " - BLOCK_STMT@98..101 - L_CURLY@98..99 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None IDENT@90..93 "foo" None None R_PAREN@93..94 ")" Whitespace(1) None FAT_ARROW@95..97 "=>" Whitespace(1) - BLOCK_STMT@98..101 + JS_BLOCK_STATEMENT@98..101 None L_CURLY@98..99 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@99..99 None R_CURLY@99..100 "}" Whitespace(1) None STAR@101..102 "*" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/ok/object_binding_prop.rast b/crates/rslint_parser/test_data/inline/ok/object_binding_prop.rast index 2f332a55a1f..a879d2b0afa 100644 --- a/crates/rslint_parser/test_data/inline/ok/object_binding_prop.rast +++ b/crates/rslint_parser/test_data/inline/ok/object_binding_prop.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..59 -======= -MODULE@0..58 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..58 LIST@0..58 VAR_DECL@0..30 None IDENT@0..3 "let" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/ok/object_expr.rast b/crates/rslint_parser/test_data/inline/ok/object_expr.rast index c3603f7f9b2..31362caa466 100644 --- a/crates/rslint_parser/test_data/inline/ok/object_expr.rast +++ b/crates/rslint_parser/test_data/inline/ok/object_expr.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..27 -======= -MODULE@0..26 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..26 LIST@0..26 VAR_DECL@0..11 None IDENT@0..3 "let" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/ok/object_expr_assign_prop.rast b/crates/rslint_parser/test_data/inline/ok/object_expr_assign_prop.rast index 50b355dcd2d..3cc9de6aa4d 100644 --- a/crates/rslint_parser/test_data/inline/ok/object_expr_assign_prop.rast +++ b/crates/rslint_parser/test_data/inline/ok/object_expr_assign_prop.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..31 -======= -MODULE@0..30 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..30 LIST@0..30 VAR_DECL@0..30 None IDENT@0..3 "let" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/ok/object_expr_async_method.rast b/crates/rslint_parser/test_data/inline/ok/object_expr_async_method.rast index 45ff19b4424..a08c3a3be38 100644 --- a/crates/rslint_parser/test_data/inline/ok/object_expr_async_method.rast +++ b/crates/rslint_parser/test_data/inline/ok/object_expr_async_method.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..48 -======= -MODULE@0..47 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..47 LIST@0..47 VAR_DECL@0..47 None IDENT@0..3 "let" Whitespace(1) @@ -22,26 +18,9 @@ MODULE@0..47 PARAMETER_LIST@21..24 None L_PAREN@21..22 "(" None LIST@22..22 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@22..23 ")" - WHITESPACE@23..24 " " - JS_BLOCK_STATEMENT@24..26 - L_CURLY@24..25 "{" -======= - R_PAREN@22..24 ")" " " - BLOCK_STMT@24..26 - L_CURLY@24..25 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@22..24 ")" Whitespace(1) -======= None R_PAREN@22..23 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@24..26 + JS_BLOCK_STATEMENT@24..26 None L_CURLY@24..25 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@25..25 None R_CURLY@25..26 "}" None None COMMA@26..27 "," None @@ -53,26 +32,9 @@ MODULE@0..47 PARAMETER_LIST@40..43 None L_PAREN@40..41 "(" None LIST@41..41 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@41..42 ")" - WHITESPACE@42..43 " " - JS_BLOCK_STATEMENT@43..45 - L_CURLY@43..44 "{" -======= - R_PAREN@41..43 ")" " " - BLOCK_STMT@43..45 - L_CURLY@43..44 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@41..43 ")" Whitespace(1) -======= None R_PAREN@41..42 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@43..45 + JS_BLOCK_STATEMENT@43..45 None L_CURLY@43..44 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@44..44 None R_CURLY@44..45 "}" None Whitespace(1) R_CURLY@46..47 "}" None diff --git a/crates/rslint_parser/test_data/inline/ok/object_expr_generator_method.rast b/crates/rslint_parser/test_data/inline/ok/object_expr_generator_method.rast index 14265a66c06..305f74cfe5d 100644 --- a/crates/rslint_parser/test_data/inline/ok/object_expr_generator_method.rast +++ b/crates/rslint_parser/test_data/inline/ok/object_expr_generator_method.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..22 -======= -MODULE@0..21 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..21 LIST@0..21 VAR_DECL@0..21 None IDENT@0..3 "let" Whitespace(1) @@ -22,26 +18,9 @@ MODULE@0..21 PARAMETER_LIST@14..17 None L_PAREN@14..15 "(" None LIST@15..15 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@15..16 ")" - WHITESPACE@16..17 " " - JS_BLOCK_STATEMENT@17..19 - L_CURLY@17..18 "{" -======= - R_PAREN@15..17 ")" " " - BLOCK_STMT@17..20 - L_CURLY@17..18 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@15..17 ")" Whitespace(1) -======= None R_PAREN@15..16 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@17..20 + JS_BLOCK_STATEMENT@17..20 None L_CURLY@17..18 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@18..18 None R_CURLY@18..19 "}" Whitespace(1) None R_CURLY@20..21 "}" None diff --git a/crates/rslint_parser/test_data/inline/ok/object_expr_getter_setter.rast b/crates/rslint_parser/test_data/inline/ok/object_expr_getter_setter.rast index 0eed35d8c2e..42959b8509c 100644 --- a/crates/rslint_parser/test_data/inline/ok/object_expr_getter_setter.rast +++ b/crates/rslint_parser/test_data/inline/ok/object_expr_getter_setter.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..43 -======= -MODULE@0..42 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..42 LIST@0..42 VAR_DECL@0..42 None IDENT@0..3 "let" Whitespace(1) @@ -22,40 +18,12 @@ MODULE@0..42 PARAMETER_LIST@18..21 None L_PAREN@18..19 "(" None LIST@19..19 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@19..20 ")" - WHITESPACE@20..21 " " - JS_BLOCK_STATEMENT@21..40 - L_CURLY@21..22 "{" - WHITESPACE@22..26 "\n " - LIST@26..37 - JS_RETURN_STATEMENT@26..37 - RETURN_KW@26..32 "return" - WHITESPACE@32..33 " " -======= - R_PAREN@19..21 ")" " " -======= - None R_PAREN@19..21 ")" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None R_PAREN@19..20 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@21..40 + JS_BLOCK_STATEMENT@21..40 None L_CURLY@21..22 "{" None LIST@22..37 - RETURN_STMT@22..37 -<<<<<<< HEAD -<<<<<<< HEAD - "\n " RETURN_KW@22..33 "return" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(4) RETURN_KW@22..33 "return" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= + JS_RETURN_STATEMENT@22..37 Whitespace(4) RETURN_KW@26..32 "return" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) NAME_REF@33..36 None IDENT@33..36 "foo" None None SEMICOLON@36..37 ";" None diff --git a/crates/rslint_parser/test_data/inline/ok/object_expr_getter_setter_as_prop.rast b/crates/rslint_parser/test_data/inline/ok/object_expr_getter_setter_as_prop.rast index 2b93c5e9474..5393611c08b 100644 --- a/crates/rslint_parser/test_data/inline/ok/object_expr_getter_setter_as_prop.rast +++ b/crates/rslint_parser/test_data/inline/ok/object_expr_getter_setter_as_prop.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..26 -======= -MODULE@0..25 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..25 LIST@0..25 VAR_DECL@0..25 None CONST_KW@0..5 "const" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/ok/object_expr_getter_setter_computed.rast b/crates/rslint_parser/test_data/inline/ok/object_expr_getter_setter_computed.rast index c0d6ef4b524..4239a2c7da7 100644 --- a/crates/rslint_parser/test_data/inline/ok/object_expr_getter_setter_computed.rast +++ b/crates/rslint_parser/test_data/inline/ok/object_expr_getter_setter_computed.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..48 -======= -MODULE@0..47 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..47 LIST@0..47 VAR_DECL@0..47 None IDENT@0..3 "let" Whitespace(1) @@ -25,40 +21,12 @@ MODULE@0..47 PARAMETER_LIST@21..24 None L_PAREN@21..22 "(" None LIST@22..22 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@22..23 ")" - WHITESPACE@23..24 " " - JS_BLOCK_STATEMENT@24..45 - L_CURLY@24..25 "{" - WHITESPACE@25..30 "\n " - LIST@30..41 - JS_RETURN_STATEMENT@30..41 - RETURN_KW@30..36 "return" - WHITESPACE@36..37 " " -======= - R_PAREN@22..24 ")" " " -======= - None R_PAREN@22..24 ")" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None R_PAREN@22..23 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@24..45 + JS_BLOCK_STATEMENT@24..45 None L_CURLY@24..25 "{" None LIST@25..41 - RETURN_STMT@25..41 -<<<<<<< HEAD -<<<<<<< HEAD - "\n " RETURN_KW@25..37 "return" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(5) RETURN_KW@25..37 "return" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= + JS_RETURN_STATEMENT@25..41 Whitespace(5) RETURN_KW@30..36 "return" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) NAME_REF@37..40 None IDENT@37..40 "foo" None None SEMICOLON@40..41 ";" None diff --git a/crates/rslint_parser/test_data/inline/ok/object_expr_ident_literal_prop.rast b/crates/rslint_parser/test_data/inline/ok/object_expr_ident_literal_prop.rast index af045476021..616f6225ca8 100644 --- a/crates/rslint_parser/test_data/inline/ok/object_expr_ident_literal_prop.rast +++ b/crates/rslint_parser/test_data/inline/ok/object_expr_ident_literal_prop.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..20 -======= -MODULE@0..19 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..19 LIST@0..19 VAR_DECL@0..19 None IDENT@0..3 "let" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/ok/object_expr_ident_prop.rast b/crates/rslint_parser/test_data/inline/ok/object_expr_ident_prop.rast index c4dcdd01698..d1b8bf5b4d6 100644 --- a/crates/rslint_parser/test_data/inline/ok/object_expr_ident_prop.rast +++ b/crates/rslint_parser/test_data/inline/ok/object_expr_ident_prop.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..14 -======= -MODULE@0..13 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..13 LIST@0..13 VAR_DECL@0..13 None IDENT@0..3 "let" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/ok/object_expr_method.rast b/crates/rslint_parser/test_data/inline/ok/object_expr_method.rast index 9f4ac7c2d93..ceddfde075f 100644 --- a/crates/rslint_parser/test_data/inline/ok/object_expr_method.rast +++ b/crates/rslint_parser/test_data/inline/ok/object_expr_method.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..23 -======= -MODULE@0..22 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..22 LIST@0..22 VAR_DECL@0..22 None IDENT@0..3 "let" Whitespace(1) @@ -21,26 +17,9 @@ MODULE@0..22 PARAMETER_LIST@14..17 None L_PAREN@14..15 "(" None LIST@15..15 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@15..16 ")" - WHITESPACE@16..17 " " - JS_BLOCK_STATEMENT@17..19 - L_CURLY@17..18 "{" -======= - R_PAREN@15..17 ")" " " - BLOCK_STMT@17..19 - L_CURLY@17..18 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@15..17 ")" Whitespace(1) -======= None R_PAREN@15..16 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@17..19 + JS_BLOCK_STATEMENT@17..19 None L_CURLY@17..18 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@18..18 None R_CURLY@18..19 "}" None None COMMA@19..20 "," None diff --git a/crates/rslint_parser/test_data/inline/ok/object_expr_spread_prop.rast b/crates/rslint_parser/test_data/inline/ok/object_expr_spread_prop.rast index a7a7ef96806..309e5af74e3 100644 --- a/crates/rslint_parser/test_data/inline/ok/object_expr_spread_prop.rast +++ b/crates/rslint_parser/test_data/inline/ok/object_expr_spread_prop.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..17 -======= -MODULE@0..16 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..16 LIST@0..16 VAR_DECL@0..16 None IDENT@0..3 "let" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/ok/object_prop_name.rast b/crates/rslint_parser/test_data/inline/ok/object_prop_name.rast index 752798bd694..1e203df269c 100644 --- a/crates/rslint_parser/test_data/inline/ok/object_prop_name.rast +++ b/crates/rslint_parser/test_data/inline/ok/object_prop_name.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..53 -======= -MODULE@0..52 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..52 LIST@0..52 VAR_DECL@0..52 None IDENT@0..3 "let" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/ok/paren_or_arrow_expr.rast b/crates/rslint_parser/test_data/inline/ok/paren_or_arrow_expr.rast index 0cdc8379c79..7471d5b9e2b 100644 --- a/crates/rslint_parser/test_data/inline/ok/paren_or_arrow_expr.rast +++ b/crates/rslint_parser/test_data/inline/ok/paren_or_arrow_expr.rast @@ -1,50 +1,13 @@ -<<<<<<< HEAD -JS_MODULE@0..85 -======= -MODULE@0..84 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..84 LIST@0..84 JS_EXPRESSION_STATEMENT@0..6 GROUPING_EXPR@0..5 None L_PAREN@0..1 "(" None NAME_REF@1..4 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@1..4 "foo" - R_PAREN@4..5 ")" - SEMICOLON@5..6 ";" - WHITESPACE@6..7 "\n" - JS_EXPRESSION_STATEMENT@7..19 - ARROW_EXPR@7..18 - PARAMETER_LIST@7..12 - L_PAREN@7..8 "(" - LIST@8..11 - SINGLE_PATTERN@8..11 - NAME@8..11 - IDENT@8..11 "foo" - R_PAREN@11..12 ")" - WHITESPACE@12..13 " " - FAT_ARROW@13..15 "=>" - WHITESPACE@15..16 " " - JS_BLOCK_STATEMENT@16..18 - L_CURLY@16..17 "{" - LIST@17..17 - R_CURLY@17..18 "}" - SEMICOLON@18..19 ";" - WHITESPACE@19..20 "\n" - JS_EXPRESSION_STATEMENT@20..28 - GROUPING_EXPR@20..27 - L_PAREN@20..21 "(" -======= - IDENT@1..4 "foo" - R_PAREN@4..5 ")" - SEMICOLON@5..6 ";" -======= None IDENT@1..4 "foo" None None R_PAREN@4..5 ")" None None SEMICOLON@5..6 ";" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) - EXPR_STMT@6..19 + JS_EXPRESSION_STATEMENT@6..19 ARROW_EXPR@6..18 PARAMETER_LIST@6..13 Whitespace(1) L_PAREN@7..8 "(" None @@ -54,60 +17,26 @@ MODULE@0..84 None IDENT@8..11 "foo" None None R_PAREN@11..12 ")" Whitespace(1) None FAT_ARROW@13..15 "=>" Whitespace(1) - BLOCK_STMT@16..18 + JS_BLOCK_STATEMENT@16..18 None L_CURLY@16..17 "{" None LIST@17..17 None R_CURLY@17..18 "}" None None SEMICOLON@18..19 ";" None - EXPR_STMT@19..28 + JS_EXPRESSION_STATEMENT@19..28 GROUPING_EXPR@19..27 -<<<<<<< HEAD -<<<<<<< HEAD - "\n" L_PAREN@19..21 "(" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(1) L_PAREN@19..21 "(" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(1) L_PAREN@20..21 "(" None ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) BIN_EXPR@21..26 LITERAL@21..23 None NUMBER@21..22 "5" Whitespace(1) None PLUS@23..24 "+" Whitespace(1) LITERAL@25..26 -<<<<<<< HEAD -<<<<<<< HEAD - NUMBER@25..26 "5" - R_PAREN@26..27 ")" - SEMICOLON@27..28 ";" - WHITESPACE@28..29 "\n" - JS_EXPRESSION_STATEMENT@29..64 - ARROW_EXPR@29..63 - PARAMETER_LIST@29..57 - L_PAREN@29..30 "(" -======= - NUMBER@25..26 "5" - R_PAREN@26..27 ")" - SEMICOLON@27..28 ";" - EXPR_STMT@28..64 - ARROW_EXPR@28..63 - PARAMETER_LIST@28..58 - "\n" L_PAREN@28..30 "(" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None NUMBER@25..26 "5" None None R_PAREN@26..27 ")" None None SEMICOLON@27..28 ";" None - EXPR_STMT@28..64 + JS_EXPRESSION_STATEMENT@28..64 ARROW_EXPR@28..63 PARAMETER_LIST@28..58 -<<<<<<< HEAD - Whitespace(1) L_PAREN@28..30 "(" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(1) L_PAREN@29..30 "(" None ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) LIST@30..56 OBJECT_PATTERN@30..56 None L_CURLY@30..31 "{" None @@ -135,61 +64,20 @@ MODULE@0..84 None DOT2@48..51 "..." None SINGLE_PATTERN@51..54 NAME@51..54 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@51..54 "baz" - R_BRACK@54..55 "]" - R_CURLY@55..56 "}" - R_PAREN@56..57 ")" - WHITESPACE@57..58 " " - FAT_ARROW@58..60 "=>" - WHITESPACE@60..61 " " - JS_BLOCK_STATEMENT@61..63 - L_CURLY@61..62 "{" - LIST@62..62 - R_CURLY@62..63 "}" - SEMICOLON@63..64 ";" - WHITESPACE@64..65 "\n" - JS_EXPRESSION_STATEMENT@65..84 - ARROW_EXPR@65..84 - PARAMETER_LIST@65..78 - L_PAREN@65..66 "(" -======= - IDENT@51..54 "baz" - R_BRACK@54..55 "]" - R_CURLY@55..56 "}" - R_PAREN@56..58 ")" " " - FAT_ARROW@58..61 "=>" " " -======= None IDENT@51..54 "baz" None None R_BRACK@54..55 "]" None None R_CURLY@55..56 "}" None -<<<<<<< HEAD - None R_PAREN@56..58 ")" Whitespace(1) - None FAT_ARROW@58..61 "=>" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None R_PAREN@56..57 ")" Whitespace(1) None FAT_ARROW@58..60 "=>" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@61..63 + JS_BLOCK_STATEMENT@61..63 None L_CURLY@61..62 "{" None LIST@62..62 None R_CURLY@62..63 "}" None None SEMICOLON@63..64 ";" None - EXPR_STMT@64..84 + JS_EXPRESSION_STATEMENT@64..84 ARROW_EXPR@64..84 PARAMETER_LIST@64..79 -<<<<<<< HEAD -<<<<<<< HEAD - "\n" L_PAREN@64..66 "(" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(1) L_PAREN@64..66 "(" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(1) L_PAREN@65..66 "(" None ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) LIST@66..77 SINGLE_PATTERN@66..69 NAME@66..69 @@ -199,28 +87,10 @@ MODULE@0..84 None DOT2@71..74 "..." None SINGLE_PATTERN@74..77 NAME@74..77 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@74..77 "bar" - R_PAREN@77..78 ")" - WHITESPACE@78..79 " " - FAT_ARROW@79..81 "=>" - WHITESPACE@81..82 " " - JS_BLOCK_STATEMENT@82..84 - L_CURLY@82..83 "{" -======= - IDENT@74..77 "bar" - R_PAREN@77..79 ")" " " - FAT_ARROW@79..82 "=>" " " - BLOCK_STMT@82..84 - L_CURLY@82..83 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None IDENT@74..77 "bar" None None R_PAREN@77..78 ")" Whitespace(1) None FAT_ARROW@79..81 "=>" Whitespace(1) - BLOCK_STMT@82..84 + JS_BLOCK_STATEMENT@82..84 None L_CURLY@82..83 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@83..83 None R_CURLY@83..84 "}" None diff --git a/crates/rslint_parser/test_data/inline/ok/post_update_expr.rast b/crates/rslint_parser/test_data/inline/ok/post_update_expr.rast index a090d465c33..d88eb1103cd 100644 --- a/crates/rslint_parser/test_data/inline/ok/post_update_expr.rast +++ b/crates/rslint_parser/test_data/inline/ok/post_update_expr.rast @@ -1,38 +1,12 @@ -<<<<<<< HEAD -JS_MODULE@0..12 -======= -MODULE@0..11 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..11 LIST@0..11 JS_EXPRESSION_STATEMENT@0..5 POST_UPDATE_EXPRESSION@0..5 NAME_REF@0..3 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@0..3 "foo" - PLUS2@3..5 "++" - WHITESPACE@5..6 "\n" - JS_EXPRESSION_STATEMENT@6..11 - POST_UPDATE_EXPRESSION@6..11 - NAME_REF@6..9 - IDENT@6..9 "foo" - MINUS2@9..11 "--" - WHITESPACE@11..12 "\n" -======= - IDENT@0..3 "foo" - PLUS2@3..5 "++" - EXPR_STMT@5..11 - POST_UPDATE_EXPRESSION@5..11 - NAME_REF@5..9 - "\n" IDENT@5..9 "foo" - MINUS2@9..11 "--" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None IDENT@0..3 "foo" None None PLUS2@3..5 "++" None - EXPR_STMT@5..11 + JS_EXPRESSION_STATEMENT@5..11 POST_UPDATE_EXPRESSION@5..11 NAME_REF@5..9 Whitespace(1) IDENT@6..9 "foo" None None MINUS2@9..11 "--" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) diff --git a/crates/rslint_parser/test_data/inline/ok/pre_update_expr.rast b/crates/rslint_parser/test_data/inline/ok/pre_update_expr.rast index 4ab29de56ae..3c5ac07a470 100644 --- a/crates/rslint_parser/test_data/inline/ok/pre_update_expr.rast +++ b/crates/rslint_parser/test_data/inline/ok/pre_update_expr.rast @@ -1,35 +1,12 @@ -<<<<<<< HEAD -JS_MODULE@0..12 -======= -MODULE@0..11 ->>>>>>> 28a4e2282 (rebase) +JS_MODULE@0..11 LIST@0..11 JS_EXPRESSION_STATEMENT@0..5 PRE_UPDATE_EXPRESSION@0..5 None PLUS2@0..2 "++" None NAME_REF@2..5 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@2..5 "foo" - WHITESPACE@5..6 "\n" - JS_EXPRESSION_STATEMENT@6..11 - PRE_UPDATE_EXPRESSION@6..11 - MINUS2@6..8 "--" -======= - IDENT@2..5 "foo" - EXPR_STMT@5..11 - PRE_UPDATE_EXPRESSION@5..11 - "\n" MINUS2@5..8 "--" ->>>>>>> 28a4e2282 (rebase) -======= None IDENT@2..5 "foo" None - EXPR_STMT@5..11 + JS_EXPRESSION_STATEMENT@5..11 PRE_UPDATE_EXPRESSION@5..11 -<<<<<<< HEAD - Whitespace(1) MINUS2@5..8 "--" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(1) MINUS2@6..8 "--" None ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) NAME_REF@8..11 None IDENT@8..11 "foo" None diff --git a/crates/rslint_parser/test_data/inline/ok/return_stmt.rast b/crates/rslint_parser/test_data/inline/ok/return_stmt.rast index 8227dbe592f..7a5c94345d7 100644 --- a/crates/rslint_parser/test_data/inline/ok/return_stmt.rast +++ b/crates/rslint_parser/test_data/inline/ok/return_stmt.rast @@ -1,74 +1,23 @@ -<<<<<<< HEAD -JS_MODULE@0..43 -======= -MODULE@0..42 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..42 LIST@0..42 JS_EXPRESSION_STATEMENT@0..42 ARROW_EXPR@0..42 PARAMETER_LIST@0..3 None L_PAREN@0..1 "(" None LIST@1..1 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@1..2 ")" - WHITESPACE@2..3 " " - FAT_ARROW@3..5 "=>" - WHITESPACE@5..6 " " - JS_BLOCK_STATEMENT@6..42 - L_CURLY@6..7 "{" - WHITESPACE@7..10 "\n " - LIST@10..40 - JS_RETURN_STATEMENT@10..17 - RETURN_KW@10..16 "return" - SEMICOLON@16..17 ";" - WHITESPACE@17..20 "\n " - JS_RETURN_STATEMENT@20..31 - RETURN_KW@20..26 "return" - WHITESPACE@26..27 " " - NAME_REF@27..30 - IDENT@27..30 "foo" - SEMICOLON@30..31 ";" - WHITESPACE@31..34 "\n " - JS_RETURN_STATEMENT@34..40 - RETURN_KW@34..40 "return" - WHITESPACE@40..41 "\n" - R_CURLY@41..42 "}" - WHITESPACE@42..43 "\n" -======= - R_PAREN@1..3 ")" " " - FAT_ARROW@3..6 "=>" " " -======= - None R_PAREN@1..3 ")" Whitespace(1) - None FAT_ARROW@3..6 "=>" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None R_PAREN@1..2 ")" Whitespace(1) None FAT_ARROW@3..5 "=>" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@6..42 + JS_BLOCK_STATEMENT@6..42 None L_CURLY@6..7 "{" None LIST@7..40 - RETURN_STMT@7..17 + JS_RETURN_STATEMENT@7..17 Whitespace(3) RETURN_KW@10..16 "return" None None SEMICOLON@16..17 ";" None - RETURN_STMT@17..31 + JS_RETURN_STATEMENT@17..31 Whitespace(3) RETURN_KW@20..26 "return" Whitespace(1) NAME_REF@27..30 None IDENT@27..30 "foo" None None SEMICOLON@30..31 ";" None - RETURN_STMT@31..40 -<<<<<<< HEAD -<<<<<<< HEAD - "\n " RETURN_KW@31..40 "return" - "\n" R_CURLY@40..42 "}" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(3) RETURN_KW@31..40 "return" None - Whitespace(1) R_CURLY@40..42 "}" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= + JS_RETURN_STATEMENT@31..40 Whitespace(3) RETURN_KW@34..40 "return" None Whitespace(1) R_CURLY@41..42 "}" None ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) diff --git a/crates/rslint_parser/test_data/inline/ok/semicolons.rast b/crates/rslint_parser/test_data/inline/ok/semicolons.rast index 3339eb3671c..2cfe95af1a7 100644 --- a/crates/rslint_parser/test_data/inline/ok/semicolons.rast +++ b/crates/rslint_parser/test_data/inline/ok/semicolons.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..84 -======= -MODULE@0..83 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..83 LIST@0..83 VAR_DECL@0..14 None IDENT@0..3 "let" Whitespace(1) @@ -55,46 +51,12 @@ MODULE@0..83 PARAMETER_LIST@65..68 None L_PAREN@65..66 "(" None LIST@66..66 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@66..67 ")" - WHITESPACE@67..68 " " - JS_BLOCK_STATEMENT@68..83 - L_CURLY@68..69 "{" - WHITESPACE@69..70 " " - LIST@70..81 - JS_RETURN_STATEMENT@70..81 - RETURN_KW@70..76 "return" - WHITESPACE@76..77 " " - LITERAL@77..81 - TRUE_KW@77..81 "true" - WHITESPACE@81..82 " " - R_CURLY@82..83 "}" - WHITESPACE@83..84 "\n" -======= - R_PAREN@66..68 ")" " " -======= - None R_PAREN@66..68 ")" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None R_PAREN@66..67 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@68..83 + JS_BLOCK_STATEMENT@68..83 None L_CURLY@68..69 "{" Whitespace(1) LIST@70..82 - RETURN_STMT@70..82 + JS_RETURN_STATEMENT@70..82 None RETURN_KW@70..76 "return" Whitespace(1) LITERAL@77..82 -<<<<<<< HEAD -<<<<<<< HEAD - TRUE_KW@77..82 "true" " " - R_CURLY@82..83 "}" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None TRUE_KW@77..82 "true" Whitespace(1) -======= None TRUE_KW@77..81 "true" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) None R_CURLY@82..83 "}" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) diff --git a/crates/rslint_parser/test_data/inline/ok/sequence_expr.rast b/crates/rslint_parser/test_data/inline/ok/sequence_expr.rast index 8d964a88359..44087e43bab 100644 --- a/crates/rslint_parser/test_data/inline/ok/sequence_expr.rast +++ b/crates/rslint_parser/test_data/inline/ok/sequence_expr.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..14 -======= -MODULE@0..13 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..13 LIST@0..13 JS_EXPRESSION_STATEMENT@0..13 SEQUENCE_EXPR@0..13 diff --git a/crates/rslint_parser/test_data/inline/ok/static_method.rast b/crates/rslint_parser/test_data/inline/ok/static_method.rast index 78a513b0582..09af41af4f5 100644 --- a/crates/rslint_parser/test_data/inline/ok/static_method.rast +++ b/crates/rslint_parser/test_data/inline/ok/static_method.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..99 -======= -MODULE@0..98 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..98 LIST@0..98 CLASS_DECL@0..98 None CLASS_KW@0..5 "class" Whitespace(1) @@ -20,25 +16,10 @@ MODULE@0..98 LIST@24..27 SINGLE_PATTERN@24..27 NAME@24..27 -<<<<<<< HEAD -<<<<<<< HEAD - IDENT@24..27 "bar" - R_PAREN@27..28 ")" - WHITESPACE@28..29 " " - JS_BLOCK_STATEMENT@29..31 - L_CURLY@29..30 "{" -======= - IDENT@24..27 "bar" - R_PAREN@27..29 ")" " " - BLOCK_STMT@29..31 - L_CURLY@29..30 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None IDENT@24..27 "bar" None None R_PAREN@27..28 ")" Whitespace(1) - BLOCK_STMT@29..31 + JS_BLOCK_STATEMENT@29..31 None L_CURLY@29..30 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@30..30 None R_CURLY@30..31 "}" None METHOD@31..49 @@ -49,26 +30,9 @@ MODULE@0..98 PARAMETER_LIST@44..47 None L_PAREN@44..45 "(" None LIST@45..45 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@45..46 ")" - WHITESPACE@46..47 " " - JS_BLOCK_STATEMENT@47..49 - L_CURLY@47..48 "{" -======= - R_PAREN@45..47 ")" " " - BLOCK_STMT@47..49 - L_CURLY@47..48 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@45..47 ")" Whitespace(1) -======= None R_PAREN@45..46 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@47..49 + JS_BLOCK_STATEMENT@47..49 None L_CURLY@47..48 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@48..48 None R_CURLY@48..49 "}" None METHOD@49..72 @@ -79,26 +43,9 @@ MODULE@0..98 PARAMETER_LIST@67..70 None L_PAREN@67..68 "(" None LIST@68..68 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@68..69 ")" - WHITESPACE@69..70 " " - JS_BLOCK_STATEMENT@70..72 - L_CURLY@70..71 "{" -======= - R_PAREN@68..70 ")" " " - BLOCK_STMT@70..72 - L_CURLY@70..71 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@68..70 ")" Whitespace(1) -======= None R_PAREN@68..69 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@70..72 + JS_BLOCK_STATEMENT@70..72 None L_CURLY@70..71 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@71..71 None R_CURLY@71..72 "}" None METHOD@72..96 @@ -110,26 +57,9 @@ MODULE@0..98 PARAMETER_LIST@91..94 None L_PAREN@91..92 "(" None LIST@92..92 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@92..93 ")" - WHITESPACE@93..94 " " - JS_BLOCK_STATEMENT@94..96 - L_CURLY@94..95 "{" -======= - R_PAREN@92..94 ")" " " - BLOCK_STMT@94..96 - L_CURLY@94..95 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_PAREN@92..94 ")" Whitespace(1) -======= None R_PAREN@92..93 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@94..96 + JS_BLOCK_STATEMENT@94..96 None L_CURLY@94..95 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@95..95 None R_CURLY@95..96 "}" None Whitespace(1) R_CURLY@97..98 "}" None diff --git a/crates/rslint_parser/test_data/inline/ok/subscripts.rast b/crates/rslint_parser/test_data/inline/ok/subscripts.rast index a099c593cb3..06344b58378 100644 --- a/crates/rslint_parser/test_data/inline/ok/subscripts.rast +++ b/crates/rslint_parser/test_data/inline/ok/subscripts.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..33 -======= -MODULE@0..32 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..32 LIST@0..32 JS_EXPRESSION_STATEMENT@0..8 TEMPLATE@0..8 @@ -10,41 +6,15 @@ MODULE@0..32 None IDENT@0..3 "foo" None None BACKTICK@3..4 "`" None LIST@4..7 -<<<<<<< HEAD -<<<<<<< HEAD - TEMPLATE_CHUNK@4..7 "bar" - BACKTICK@7..8 "`" - WHITESPACE@8..9 "\n" - JS_EXPRESSION_STATEMENT@9..32 - BRACKET_EXPR@9..32 - CALL_EXPR@9..27 - CALL_EXPR@9..22 - CALL_EXPR@9..17 - NAME_REF@9..12 - IDENT@9..12 "foo" -======= - TEMPLATE_CHUNK@4..7 "bar" - BACKTICK@7..8 "`" -======= None TEMPLATE_CHUNK@4..7 "bar" None None BACKTICK@7..8 "`" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) - EXPR_STMT@8..32 + JS_EXPRESSION_STATEMENT@8..32 BRACKET_EXPR@8..32 CALL_EXPR@8..27 CALL_EXPR@8..22 CALL_EXPR@8..17 NAME_REF@8..12 -<<<<<<< HEAD -<<<<<<< HEAD - "\n" IDENT@8..12 "foo" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(1) IDENT@8..12 "foo" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(1) IDENT@9..12 "foo" None ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) ARG_LIST@12..17 None L_PAREN@12..13 "(" None LIST@13..16 diff --git a/crates/rslint_parser/test_data/inline/ok/switch_stmt.rast b/crates/rslint_parser/test_data/inline/ok/switch_stmt.rast index f1ae463a84f..9caa2b04d0f 100644 --- a/crates/rslint_parser/test_data/inline/ok/switch_stmt.rast +++ b/crates/rslint_parser/test_data/inline/ok/switch_stmt.rast @@ -1,61 +1,21 @@ -<<<<<<< HEAD -JS_MODULE@0..38 +JS_MODULE@0..37 LIST@0..37 JS_SWITCH_STATEMENT@0..37 - SWITCH_KW@0..6 "switch" - WHITESPACE@6..7 " " - L_PAREN@7..8 "(" - NAME_REF@8..11 - IDENT@8..11 "foo" - R_PAREN@11..12 ")" - WHITESPACE@12..13 " " - L_CURLY@13..14 "{" - WHITESPACE@14..16 "\n " - LIST@16..36 - JS_CASE_CLAUSE@16..27 - CASE_KW@16..20 "case" - WHITESPACE@20..21 " " - NAME_REF@21..24 - IDENT@21..24 "bar" - COLON@24..25 ":" - WHITESPACE@25..27 "\n " - LIST@27..27 - JS_DEFAULT_CLAUSE@27..36 - DEFAULT_KW@27..34 "default" - COLON@34..35 ":" - WHITESPACE@35..36 "\n" - LIST@36..36 - R_CURLY@36..37 "}" - WHITESPACE@37..38 "\n" -======= -MODULE@0..37 - LIST@0..37 - SWITCH_STMT@0..37 None SWITCH_KW@0..6 "switch" Whitespace(1) - CONDITION@7..13 - None L_PAREN@7..8 "(" None - NAME_REF@8..11 - None IDENT@8..11 "foo" None - None R_PAREN@11..12 ")" Whitespace(1) + None L_PAREN@7..8 "(" None + NAME_REF@8..11 + None IDENT@8..11 "foo" None + None R_PAREN@11..12 ")" Whitespace(1) None L_CURLY@13..14 "{" None LIST@14..35 - CASE_CLAUSE@14..25 + JS_CASE_CLAUSE@14..25 Whitespace(2) CASE_KW@16..20 "case" Whitespace(1) NAME_REF@21..24 None IDENT@21..24 "bar" None None COLON@24..25 ":" None LIST@25..25 - DEFAULT_CLAUSE@25..35 + JS_DEFAULT_CLAUSE@25..35 Whitespace(2) DEFAULT_KW@27..34 "default" None None COLON@34..35 ":" None LIST@35..35 -<<<<<<< HEAD -<<<<<<< HEAD - "\n" R_CURLY@35..37 "}" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(1) R_CURLY@35..37 "}" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(1) R_CURLY@36..37 "}" None ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) diff --git a/crates/rslint_parser/test_data/inline/ok/template_literal.rast b/crates/rslint_parser/test_data/inline/ok/template_literal.rast index 93fc63f88fc..7c3f8c77458 100644 --- a/crates/rslint_parser/test_data/inline/ok/template_literal.rast +++ b/crates/rslint_parser/test_data/inline/ok/template_literal.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..67 -======= -MODULE@0..66 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..66 LIST@0..66 VAR_DECL@0..21 None IDENT@0..3 "let" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/ok/this_expr.rast b/crates/rslint_parser/test_data/inline/ok/this_expr.rast index 2acb9c0d99e..73465b4b6b8 100644 --- a/crates/rslint_parser/test_data/inline/ok/this_expr.rast +++ b/crates/rslint_parser/test_data/inline/ok/this_expr.rast @@ -1,35 +1,12 @@ -<<<<<<< HEAD -JS_MODULE@0..14 -======= -MODULE@0..13 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..13 LIST@0..13 JS_EXPRESSION_STATEMENT@0..4 THIS_EXPR@0..4 -<<<<<<< HEAD -<<<<<<< HEAD - THIS_KW@0..4 "this" - WHITESPACE@4..5 "\n" - JS_EXPRESSION_STATEMENT@5..13 - DOT_EXPR@5..13 - THIS_EXPR@5..9 - THIS_KW@5..9 "this" - DOT@9..10 "." -======= - THIS_KW@0..4 "this" - EXPR_STMT@4..13 - DOT_EXPR@4..13 - THIS_EXPR@4..9 - "\n" THIS_KW@4..9 "this" - DOT@9..10 "." ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None THIS_KW@0..4 "this" None - EXPR_STMT@4..13 + JS_EXPRESSION_STATEMENT@4..13 DOT_EXPR@4..13 THIS_EXPR@4..9 Whitespace(1) THIS_KW@5..9 "this" None None DOT@9..10 "." None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) NAME@10..13 None IDENT@10..13 "foo" None diff --git a/crates/rslint_parser/test_data/inline/ok/throw_stmt.rast b/crates/rslint_parser/test_data/inline/ok/throw_stmt.rast index fb23d4317e7..ad9207df05e 100644 --- a/crates/rslint_parser/test_data/inline/ok/throw_stmt.rast +++ b/crates/rslint_parser/test_data/inline/ok/throw_stmt.rast @@ -1,23 +1,7 @@ -<<<<<<< HEAD -JS_MODULE@0..36 +JS_MODULE@0..35 LIST@0..35 JS_THROW_STATEMENT@0..23 - THROW_KW@0..5 "throw" - WHITESPACE@5..6 " " -======= -MODULE@0..35 - LIST@0..35 - THROW_STMT@0..23 -<<<<<<< HEAD -<<<<<<< HEAD - THROW_KW@0..6 "throw" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None THROW_KW@0..6 "throw" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None THROW_KW@0..5 "throw" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) NEW_EXPR@6..22 None NEW_KW@6..9 "new" Whitespace(1) NAME_REF@10..15 @@ -26,32 +10,10 @@ MODULE@0..35 None L_PAREN@15..16 "(" None LIST@16..21 LITERAL@16..21 -<<<<<<< HEAD -<<<<<<< HEAD - STRING@16..21 "\"foo\"" - R_PAREN@21..22 ")" - SEMICOLON@22..23 ";" - WHITESPACE@23..24 "\n" - JS_THROW_STATEMENT@24..35 - THROW_KW@24..29 "throw" - WHITESPACE@29..30 " " -======= - STRING@16..21 "\"foo\"" - R_PAREN@21..22 ")" - SEMICOLON@22..23 ";" - THROW_STMT@23..35 - "\n" THROW_KW@23..30 "throw" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None STRING@16..21 "\"foo\"" None None R_PAREN@21..22 ")" None None SEMICOLON@22..23 ";" None - THROW_STMT@23..35 -<<<<<<< HEAD - Whitespace(1) THROW_KW@23..30 "throw" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= + JS_THROW_STATEMENT@23..35 Whitespace(1) THROW_KW@24..29 "throw" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) LITERAL@30..35 None STRING@30..35 "\"foo\"" None diff --git a/crates/rslint_parser/test_data/inline/ok/try_stmt.rast b/crates/rslint_parser/test_data/inline/ok/try_stmt.rast index b0b9febfbc5..9e2523c7676 100644 --- a/crates/rslint_parser/test_data/inline/ok/try_stmt.rast +++ b/crates/rslint_parser/test_data/inline/ok/try_stmt.rast @@ -1,156 +1,86 @@ -<<<<<<< HEAD -JS_MODULE@0..112 +JS_MODULE@0..111 LIST@0..111 JS_TRY_STATEMENT@0..15 - TRY_KW@0..3 "try" - WHITESPACE@3..4 " " - JS_BLOCK_STATEMENT@4..6 - L_CURLY@4..5 "{" + None TRY_KW@0..3 "try" Whitespace(1) + JS_BLOCK_STATEMENT@4..7 + None L_CURLY@4..5 "{" None LIST@5..5 - R_CURLY@5..6 "}" - WHITESPACE@6..7 " " + None R_CURLY@5..6 "}" Whitespace(1) JS_CATCH_CLAUSE@7..15 - CATCH_KW@7..12 "catch" - WHITESPACE@12..13 " " + None CATCH_KW@7..12 "catch" Whitespace(1) JS_BLOCK_STATEMENT@13..15 - L_CURLY@13..14 "{" + None L_CURLY@13..14 "{" None LIST@14..14 - R_CURLY@14..15 "}" - WHITESPACE@15..16 "\n" - JS_TRY_STATEMENT@16..35 - TRY_KW@16..19 "try" - WHITESPACE@19..20 " " - JS_BLOCK_STATEMENT@20..22 - L_CURLY@20..21 "{" + None R_CURLY@14..15 "}" None + JS_TRY_STATEMENT@15..35 + Whitespace(1) TRY_KW@16..19 "try" Whitespace(1) + JS_BLOCK_STATEMENT@20..23 + None L_CURLY@20..21 "{" None LIST@21..21 - R_CURLY@21..22 "}" - WHITESPACE@22..23 " " + None R_CURLY@21..22 "}" Whitespace(1) JS_CATCH_CLAUSE@23..35 - CATCH_KW@23..28 "catch" - WHITESPACE@28..29 " " - JS_CATCH_DECLARATION@29..32 - L_PAREN@29..30 "(" + None CATCH_KW@23..28 "catch" Whitespace(1) + JS_CATCH_DECLARATION@29..33 + None L_PAREN@29..30 "(" None SINGLE_PATTERN@30..31 NAME@30..31 - IDENT@30..31 "e" - R_PAREN@31..32 ")" - WHITESPACE@32..33 " " + None IDENT@30..31 "e" None + None R_PAREN@31..32 ")" Whitespace(1) JS_BLOCK_STATEMENT@33..35 - L_CURLY@33..34 "{" + None L_CURLY@33..34 "{" None LIST@34..34 - R_CURLY@34..35 "}" - WHITESPACE@35..36 "\n" - JS_TRY_FINALLY_STATEMENT@36..62 - TRY_KW@36..39 "try" - WHITESPACE@39..40 " " - JS_BLOCK_STATEMENT@40..42 - L_CURLY@40..41 "{" + None R_CURLY@34..35 "}" None + JS_TRY_FINALLY_STATEMENT@35..62 + Whitespace(1) TRY_KW@36..39 "try" Whitespace(1) + JS_BLOCK_STATEMENT@40..43 + None L_CURLY@40..41 "{" None LIST@41..41 - R_CURLY@41..42 "}" - WHITESPACE@42..43 " " - JS_CATCH_CLAUSE@43..51 - CATCH_KW@43..48 "catch" - WHITESPACE@48..49 " " - JS_BLOCK_STATEMENT@49..51 - L_CURLY@49..50 "{" + None R_CURLY@41..42 "}" Whitespace(1) + JS_CATCH_CLAUSE@43..52 + None CATCH_KW@43..48 "catch" Whitespace(1) + JS_BLOCK_STATEMENT@49..52 + None L_CURLY@49..50 "{" None LIST@50..50 - R_CURLY@50..51 "}" - WHITESPACE@51..52 " " + None R_CURLY@50..51 "}" Whitespace(1) JS_FINALLY_CLAUSE@52..62 - FINALLY_KW@52..59 "finally" - WHITESPACE@59..60 " " + None FINALLY_KW@52..59 "finally" Whitespace(1) JS_BLOCK_STATEMENT@60..62 - L_CURLY@60..61 "{" + None L_CURLY@60..61 "{" None LIST@61..61 - R_CURLY@61..62 "}" - WHITESPACE@62..63 "\n" - JS_TRY_FINALLY_STATEMENT@63..93 - TRY_KW@63..66 "try" - WHITESPACE@66..67 " " - JS_BLOCK_STATEMENT@67..69 - L_CURLY@67..68 "{" + None R_CURLY@61..62 "}" None + JS_TRY_FINALLY_STATEMENT@62..93 + Whitespace(1) TRY_KW@63..66 "try" Whitespace(1) + JS_BLOCK_STATEMENT@67..70 + None L_CURLY@67..68 "{" None LIST@68..68 - R_CURLY@68..69 "}" - WHITESPACE@69..70 " " - JS_CATCH_CLAUSE@70..82 - CATCH_KW@70..75 "catch" - WHITESPACE@75..76 " " - JS_CATCH_DECLARATION@76..79 - L_PAREN@76..77 "(" + None R_CURLY@68..69 "}" Whitespace(1) + JS_CATCH_CLAUSE@70..83 + None CATCH_KW@70..75 "catch" Whitespace(1) + JS_CATCH_DECLARATION@76..80 + None L_PAREN@76..77 "(" None SINGLE_PATTERN@77..78 NAME@77..78 - IDENT@77..78 "e" - R_PAREN@78..79 ")" - WHITESPACE@79..80 " " - JS_BLOCK_STATEMENT@80..82 - L_CURLY@80..81 "{" + None IDENT@77..78 "e" None + None R_PAREN@78..79 ")" Whitespace(1) + JS_BLOCK_STATEMENT@80..83 + None L_CURLY@80..81 "{" None LIST@81..81 - R_CURLY@81..82 "}" - WHITESPACE@82..83 " " + None R_CURLY@81..82 "}" Whitespace(1) JS_FINALLY_CLAUSE@83..93 - FINALLY_KW@83..90 "finally" - WHITESPACE@90..91 " " + None FINALLY_KW@83..90 "finally" Whitespace(1) JS_BLOCK_STATEMENT@91..93 - L_CURLY@91..92 "{" + None L_CURLY@91..92 "{" None LIST@92..92 - R_CURLY@92..93 "}" - WHITESPACE@93..94 "\n" - JS_TRY_FINALLY_STATEMENT@94..111 - TRY_KW@94..97 "try" - WHITESPACE@97..98 " " - JS_BLOCK_STATEMENT@98..100 - L_CURLY@98..99 "{" + None R_CURLY@92..93 "}" None + JS_TRY_FINALLY_STATEMENT@93..111 + Whitespace(1) TRY_KW@94..97 "try" Whitespace(1) + JS_BLOCK_STATEMENT@98..101 + None L_CURLY@98..99 "{" None LIST@99..99 - R_CURLY@99..100 "}" - WHITESPACE@100..101 " " + None R_CURLY@99..100 "}" Whitespace(1) JS_FINALLY_CLAUSE@101..111 - FINALLY_KW@101..108 "finally" - WHITESPACE@108..109 " " + None FINALLY_KW@101..108 "finally" Whitespace(1) JS_BLOCK_STATEMENT@109..111 - L_CURLY@109..110 "{" + None L_CURLY@109..110 "{" None LIST@110..110 - R_CURLY@110..111 "}" - WHITESPACE@111..112 "\n" -======= -MODULE@0..46 - LIST@0..46 - TRY_STMT@0..19 - None TRY_KW@0..3 "try" Whitespace(1) - BLOCK_STMT@4..7 - None L_CURLY@4..5 "{" None - LIST@5..5 - None R_CURLY@5..6 "}" Whitespace(1) - CATCH_CLAUSE@7..19 - None CATCH_KW@7..12 "catch" Whitespace(1) - None L_PAREN@13..14 "(" None - SINGLE_PATTERN@14..15 - NAME@14..15 - None IDENT@14..15 "e" None - None R_PAREN@15..16 ")" Whitespace(1) - BLOCK_STMT@17..19 - None L_CURLY@17..18 "{" None - LIST@18..18 - None R_CURLY@18..19 "}" None - TRY_STMT@19..46 - Whitespace(1) TRY_KW@20..23 "try" Whitespace(1) - BLOCK_STMT@24..27 - None L_CURLY@24..25 "{" None - LIST@25..25 - None R_CURLY@25..26 "}" Whitespace(1) - CATCH_CLAUSE@27..36 - None CATCH_KW@27..32 "catch" Whitespace(1) - BLOCK_STMT@33..36 - None L_CURLY@33..34 "{" None - LIST@34..34 - None R_CURLY@34..35 "}" Whitespace(1) - FINALIZER@36..46 - None FINALLY_KW@36..43 "finally" Whitespace(1) - BLOCK_STMT@44..46 - None L_CURLY@44..45 "{" None - LIST@45..45 -<<<<<<< HEAD - R_CURLY@45..46 "}" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - None R_CURLY@45..46 "}" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) + None R_CURLY@110..111 "}" None diff --git a/crates/rslint_parser/test_data/inline/ok/var_decl.rast b/crates/rslint_parser/test_data/inline/ok/var_decl.rast index a423971df76..1dd9ad7bae1 100644 --- a/crates/rslint_parser/test_data/inline/ok/var_decl.rast +++ b/crates/rslint_parser/test_data/inline/ok/var_decl.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..92 -======= -MODULE@0..91 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..91 LIST@0..91 VAR_DECL@0..10 None VAR_KW@0..3 "var" Whitespace(1) diff --git a/crates/rslint_parser/test_data/inline/ok/while_stmt.rast b/crates/rslint_parser/test_data/inline/ok/while_stmt.rast index f4351fbb690..4f1b553fb6e 100644 --- a/crates/rslint_parser/test_data/inline/ok/while_stmt.rast +++ b/crates/rslint_parser/test_data/inline/ok/while_stmt.rast @@ -1,33 +1,14 @@ -<<<<<<< HEAD -JS_MODULE@0..29 -======= -MODULE@0..28 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..28 LIST@0..28 WHILE_STMT@0..15 None WHILE_KW@0..5 "while" Whitespace(1) CONDITION@6..13 None L_PAREN@6..7 "(" None LITERAL@7..11 -<<<<<<< HEAD -<<<<<<< HEAD - TRUE_KW@7..11 "true" - R_PAREN@11..12 ")" - WHITESPACE@12..13 " " - JS_BLOCK_STATEMENT@13..15 - L_CURLY@13..14 "{" -======= - TRUE_KW@7..11 "true" - R_PAREN@11..13 ")" " " - BLOCK_STMT@13..15 - L_CURLY@13..14 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None TRUE_KW@7..11 "true" None None R_PAREN@11..12 ")" Whitespace(1) - BLOCK_STMT@13..15 + JS_BLOCK_STATEMENT@13..15 None L_CURLY@13..14 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@14..14 None R_CURLY@14..15 "}" None WHILE_STMT@15..28 @@ -35,24 +16,9 @@ MODULE@0..28 CONDITION@22..26 None L_PAREN@22..23 "(" None LITERAL@23..24 -<<<<<<< HEAD -<<<<<<< HEAD - NUMBER@23..24 "5" - R_PAREN@24..25 ")" - WHITESPACE@25..26 " " - JS_BLOCK_STATEMENT@26..28 - L_CURLY@26..27 "{" -======= - NUMBER@23..24 "5" - R_PAREN@24..26 ")" " " - BLOCK_STMT@26..28 - L_CURLY@26..27 "{" ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= None NUMBER@23..24 "5" None None R_PAREN@24..25 ")" Whitespace(1) - BLOCK_STMT@26..28 + JS_BLOCK_STATEMENT@26..28 None L_CURLY@26..27 "{" None ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) LIST@27..27 None R_CURLY@27..28 "}" None diff --git a/crates/rslint_parser/test_data/inline/ok/with_statement.rast b/crates/rslint_parser/test_data/inline/ok/with_statement.rast index 47b6f9bc37e..587ba865e3a 100644 --- a/crates/rslint_parser/test_data/inline/ok/with_statement.rast +++ b/crates/rslint_parser/test_data/inline/ok/with_statement.rast @@ -1,58 +1,46 @@ -JS_SCRIPT@0..65 - COMMENT@0..9 "// SCRIPT" - WHITESPACE@9..11 "\n\n" - LIST@11..64 - FN_DECL@11..64 - FUNCTION_KW@11..19 "function" - WHITESPACE@19..20 " " +JS_SCRIPT@0..64 + LIST@0..64 + FN_DECL@0..64 + Many([Comment(9), Whitespace(2)]) FUNCTION_KW@11..19 "function" Whitespace(1) NAME@20..21 - IDENT@20..21 "f" - PARAMETER_LIST@21..27 - L_PAREN@21..22 "(" + None IDENT@20..21 "f" None + PARAMETER_LIST@21..28 + None L_PAREN@21..22 "(" None LIST@22..26 SINGLE_PATTERN@22..23 NAME@22..23 - IDENT@22..23 "x" - COMMA@23..24 "," - WHITESPACE@24..25 " " + None IDENT@22..23 "x" None + None COMMA@23..24 "," Whitespace(1) SINGLE_PATTERN@25..26 NAME@25..26 - IDENT@25..26 "o" - R_PAREN@26..27 ")" - WHITESPACE@27..28 " " + None IDENT@25..26 "o" None + None R_PAREN@26..27 ")" Whitespace(1) JS_BLOCK_STATEMENT@28..64 - L_CURLY@28..29 "{" - WHITESPACE@29..31 "\n\t" - LIST@31..62 - JS_WITH_STATEMENT@31..62 - WITH_KW@31..35 "with" - WHITESPACE@35..36 " " - L_PAREN@36..37 "(" + None L_CURLY@28..29 "{" None + LIST@29..62 + JS_WITH_STATEMENT@29..62 + Whitespace(2) WITH_KW@31..35 "with" Whitespace(1) + None L_PAREN@36..37 "(" None NAME_REF@37..38 - IDENT@37..38 "o" - R_PAREN@38..39 ")" - WHITESPACE@39..40 " " + None IDENT@37..38 "o" None + None R_PAREN@38..39 ")" Whitespace(1) JS_BLOCK_STATEMENT@40..62 - L_CURLY@40..41 "{" - WHITESPACE@41..44 "\n\t\t" - LIST@44..59 - JS_EXPRESSION_STATEMENT@44..59 - CALL_EXPR@44..58 - DOT_EXPR@44..55 - NAME_REF@44..51 - IDENT@44..51 "console" - DOT@51..52 "." + None L_CURLY@40..41 "{" None + LIST@41..59 + JS_EXPRESSION_STATEMENT@41..59 + CALL_EXPR@41..58 + DOT_EXPR@41..55 + NAME_REF@41..51 + Whitespace(3) IDENT@44..51 "console" None + None DOT@51..52 "." None NAME@52..55 - IDENT@52..55 "log" + None IDENT@52..55 "log" None ARG_LIST@55..58 - L_PAREN@55..56 "(" + None L_PAREN@55..56 "(" None LIST@56..57 NAME_REF@56..57 - IDENT@56..57 "x" - R_PAREN@57..58 ")" - SEMICOLON@58..59 ";" - WHITESPACE@59..61 "\n\t" - R_CURLY@61..62 "}" - WHITESPACE@62..63 "\n" - R_CURLY@63..64 "}" - WHITESPACE@64..65 "\n" + None IDENT@56..57 "x" None + None R_PAREN@57..58 ")" None + None SEMICOLON@58..59 ";" None + Whitespace(2) R_CURLY@61..62 "}" None + Whitespace(1) R_CURLY@63..64 "}" None diff --git a/crates/rslint_parser/test_data/inline/ok/yield_expr.rast b/crates/rslint_parser/test_data/inline/ok/yield_expr.rast index 7ff23b1cab5..6c2c461bd9a 100644 --- a/crates/rslint_parser/test_data/inline/ok/yield_expr.rast +++ b/crates/rslint_parser/test_data/inline/ok/yield_expr.rast @@ -1,8 +1,4 @@ -<<<<<<< HEAD -JS_MODULE@0..45 -======= -MODULE@0..44 ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) +JS_MODULE@0..44 LIST@0..44 FN_DECL@0..44 None FUNCTION_KW@0..8 "function" Whitespace(1) @@ -12,60 +8,20 @@ MODULE@0..44 PARAMETER_LIST@13..16 None L_PAREN@13..14 "(" None LIST@14..14 -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD - R_PAREN@14..15 ")" - WHITESPACE@15..16 " " - JS_BLOCK_STATEMENT@16..44 - L_CURLY@16..17 "{" - WHITESPACE@17..19 "\n " - LIST@19..42 - JS_EXPRESSION_STATEMENT@19..29 - YIELD_EXPR@19..28 - YIELD_KW@19..24 "yield" - WHITESPACE@24..25 " " - NAME_REF@25..28 - IDENT@25..28 "foo" - SEMICOLON@28..29 ";" - WHITESPACE@29..31 "\n " - JS_EXPRESSION_STATEMENT@31..42 - YIELD_EXPR@31..41 - YIELD_KW@31..36 "yield" - STAR@36..37 "*" - WHITESPACE@37..38 " " -======= - R_PAREN@14..16 ")" " " -======= - None R_PAREN@14..16 ")" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= None R_PAREN@14..15 ")" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) - BLOCK_STMT@16..44 + JS_BLOCK_STATEMENT@16..44 None L_CURLY@16..17 "{" None LIST@17..42 - EXPR_STMT@17..29 + JS_EXPRESSION_STATEMENT@17..29 YIELD_EXPR@17..28 Whitespace(2) YIELD_KW@19..24 "yield" Whitespace(1) NAME_REF@25..28 None IDENT@25..28 "foo" None None SEMICOLON@28..29 ";" None - EXPR_STMT@29..42 + JS_EXPRESSION_STATEMENT@29..42 YIELD_EXPR@29..41 -<<<<<<< HEAD -<<<<<<< HEAD - "\n " YIELD_KW@29..36 "yield" - STAR@36..38 "*" " " ->>>>>>> 56d750195 (trim format_raw when formatter finds an error) -======= - Whitespace(2) YIELD_KW@29..36 "yield" None - None STAR@36..38 "*" Whitespace(1) ->>>>>>> 03257ad46 (greentoken slice contains everything from first leading to last trailing trivia) -======= Whitespace(2) YIELD_KW@31..36 "yield" None None STAR@36..37 "*" Whitespace(1) ->>>>>>> c96756449 (fixing text and text_with_trivia and ranges) NAME_REF@38..41 None IDENT@38..41 "foo" None None SEMICOLON@41..42 ";" None