From 14cb96ec0e6be3b99bfe4ea373c058dcbd2a4f79 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 31 Jul 2020 19:54:16 +0200 Subject: Allign RecordPat with RecordExpr --- crates/ra_syntax/src/ast/generated/nodes.rs | 29 ++++++++++------------ crates/ra_syntax/src/ast/node_ext.rs | 2 +- .../test_data/parser/inline/ok/0008_path_part.rast | 2 +- .../inline/ok/0102_record_field_pat_list.rast | 16 ++++++------ .../test_data/parser/inline/ok/0143_box_pat.rast | 6 ++--- .../parser/inline/ok/0145_record_field_pat.rast | 8 +++--- .../parser/ok/0063_trait_fn_patterns.rast | 6 ++--- .../test_data/parser/ok/0064_impl_fn_params.rast | 6 ++--- 8 files changed, 36 insertions(+), 39 deletions(-) (limited to 'crates/ra_syntax') diff --git a/crates/ra_syntax/src/ast/generated/nodes.rs b/crates/ra_syntax/src/ast/generated/nodes.rs index 66821a31c..7708ae806 100644 --- a/crates/ra_syntax/src/ast/generated/nodes.rs +++ b/crates/ra_syntax/src/ast/generated/nodes.rs @@ -1192,7 +1192,7 @@ pub struct RecordPat { } impl RecordPat { pub fn path(&self) -> Option { support::child(&self.syntax) } - pub fn record_field_pat_list(&self) -> Option { + pub fn record_pat_field_list(&self) -> Option { support::child(&self.syntax) } } @@ -1234,24 +1234,21 @@ impl TupleStructPat { pub fn r_paren_token(&self) -> Option { support::token(&self.syntax, T![')']) } } #[derive(Debug, Clone, PartialEq, Eq, Hash)] -pub struct RecordFieldPatList { +pub struct RecordPatFieldList { pub(crate) syntax: SyntaxNode, } -impl RecordFieldPatList { +impl RecordPatFieldList { pub fn l_curly_token(&self) -> Option { support::token(&self.syntax, T!['{']) } - pub fn record_field_pats(&self) -> AstChildren { - support::children(&self.syntax) - } - pub fn bind_pats(&self) -> AstChildren { support::children(&self.syntax) } + pub fn fields(&self) -> AstChildren { support::children(&self.syntax) } pub fn dotdot_token(&self) -> Option { support::token(&self.syntax, T![..]) } pub fn r_curly_token(&self) -> Option { support::token(&self.syntax, T!['}']) } } #[derive(Debug, Clone, PartialEq, Eq, Hash)] -pub struct RecordFieldPat { +pub struct RecordPatField { pub(crate) syntax: SyntaxNode, } -impl ast::AttrsOwner for RecordFieldPat {} -impl RecordFieldPat { +impl ast::AttrsOwner for RecordPatField {} +impl RecordPatField { pub fn name_ref(&self) -> Option { support::child(&self.syntax) } pub fn colon_token(&self) -> Option { support::token(&self.syntax, T![:]) } pub fn pat(&self) -> Option { support::child(&self.syntax) } @@ -2724,8 +2721,8 @@ impl AstNode for TupleStructPat { } fn syntax(&self) -> &SyntaxNode { &self.syntax } } -impl AstNode for RecordFieldPatList { - fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_FIELD_PAT_LIST } +impl AstNode for RecordPatFieldList { + fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_PAT_FIELD_LIST } fn cast(syntax: SyntaxNode) -> Option { if Self::can_cast(syntax.kind()) { Some(Self { syntax }) @@ -2735,8 +2732,8 @@ impl AstNode for RecordFieldPatList { } fn syntax(&self) -> &SyntaxNode { &self.syntax } } -impl AstNode for RecordFieldPat { - fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_FIELD_PAT } +impl AstNode for RecordPatField { + fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_PAT_FIELD } fn cast(syntax: SyntaxNode) -> Option { if Self::can_cast(syntax.kind()) { Some(Self { syntax }) @@ -4059,12 +4056,12 @@ impl std::fmt::Display for TupleStructPat { std::fmt::Display::fmt(self.syntax(), f) } } -impl std::fmt::Display for RecordFieldPatList { +impl std::fmt::Display for RecordPatFieldList { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { std::fmt::Display::fmt(self.syntax(), f) } } -impl std::fmt::Display for RecordFieldPat { +impl std::fmt::Display for RecordPatField { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { std::fmt::Display::fmt(self.syntax(), f) } diff --git a/crates/ra_syntax/src/ast/node_ext.rs b/crates/ra_syntax/src/ast/node_ext.rs index 69726fb93..2cfdac225 100644 --- a/crates/ra_syntax/src/ast/node_ext.rs +++ b/crates/ra_syntax/src/ast/node_ext.rs @@ -227,7 +227,7 @@ impl fmt::Display for NameOrNameRef { } } -impl ast::RecordFieldPat { +impl ast::RecordPatField { /// Deals with field init shorthand pub fn field_name(&self) -> Option { if let Some(name_ref) = self.name_ref() { diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast index 3ce2acfae..d848f3c88 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0008_path_part.rast @@ -58,7 +58,7 @@ SOURCE_FILE@0..103 NAME_REF@62..65 IDENT@62..65 "Bar" WHITESPACE@65..66 " " - RECORD_FIELD_PAT_LIST@66..72 + RECORD_PAT_FIELD_LIST@66..72 L_CURLY@66..67 "{" WHITESPACE@67..68 " " DOT2@68..70 ".." diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast index fe1c290c3..003c517ac 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0102_record_field_pat_list.rast @@ -20,7 +20,7 @@ SOURCE_FILE@0..119 NAME_REF@19..20 IDENT@19..20 "S" WHITESPACE@20..21 " " - RECORD_FIELD_PAT_LIST@21..23 + RECORD_PAT_FIELD_LIST@21..23 L_CURLY@21..22 "{" R_CURLY@22..23 "}" WHITESPACE@23..24 " " @@ -40,16 +40,16 @@ SOURCE_FILE@0..119 NAME_REF@38..39 IDENT@38..39 "S" WHITESPACE@39..40 " " - RECORD_FIELD_PAT_LIST@40..56 + RECORD_PAT_FIELD_LIST@40..56 L_CURLY@40..41 "{" WHITESPACE@41..42 " " - RECORD_FIELD_PAT@42..43 + RECORD_PAT_FIELD@42..43 BIND_PAT@42..43 NAME@42..43 IDENT@42..43 "f" COMMA@43..44 "," WHITESPACE@44..45 " " - RECORD_FIELD_PAT@45..54 + RECORD_PAT_FIELD@45..54 BIND_PAT@45..54 REF_KW@45..48 "ref" WHITESPACE@48..49 " " @@ -76,10 +76,10 @@ SOURCE_FILE@0..119 NAME_REF@71..72 IDENT@71..72 "S" WHITESPACE@72..73 " " - RECORD_FIELD_PAT_LIST@73..84 + RECORD_PAT_FIELD_LIST@73..84 L_CURLY@73..74 "{" WHITESPACE@74..75 " " - RECORD_FIELD_PAT@75..79 + RECORD_PAT_FIELD@75..79 NAME_REF@75..76 IDENT@75..76 "h" COLON@76..77 ":" @@ -107,10 +107,10 @@ SOURCE_FILE@0..119 NAME_REF@99..100 IDENT@99..100 "S" WHITESPACE@100..101 " " - RECORD_FIELD_PAT_LIST@101..110 + RECORD_PAT_FIELD_LIST@101..110 L_CURLY@101..102 "{" WHITESPACE@102..103 " " - RECORD_FIELD_PAT@103..107 + RECORD_PAT_FIELD@103..107 NAME_REF@103..104 IDENT@103..104 "h" COLON@104..105 ":" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast index 09fd9e9b8..caae3e2dc 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0143_box_pat.rast @@ -40,10 +40,10 @@ SOURCE_FILE@0..118 NAME_REF@44..49 IDENT@44..49 "Outer" WHITESPACE@49..50 " " - RECORD_FIELD_PAT_LIST@50..81 + RECORD_PAT_FIELD_LIST@50..81 L_CURLY@50..51 "{" WHITESPACE@51..52 " " - RECORD_FIELD_PAT@52..57 + RECORD_PAT_FIELD@52..57 BOX_PAT@52..57 BOX_KW@52..55 "box" WHITESPACE@55..56 " " @@ -52,7 +52,7 @@ SOURCE_FILE@0..118 IDENT@56..57 "i" COMMA@57..58 "," WHITESPACE@58..59 " " - RECORD_FIELD_PAT@59..79 + RECORD_PAT_FIELD@59..79 NAME_REF@59..60 IDENT@59..60 "j" COLON@60..61 ":" diff --git a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast index b41ef4098..925409bdf 100644 --- a/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast +++ b/crates/ra_syntax/test_data/parser/inline/ok/0145_record_field_pat.rast @@ -20,10 +20,10 @@ SOURCE_FILE@0..63 NAME_REF@19..20 IDENT@19..20 "S" WHITESPACE@20..21 " " - RECORD_FIELD_PAT_LIST@21..29 + RECORD_PAT_FIELD_LIST@21..29 L_CURLY@21..22 "{" WHITESPACE@22..23 " " - RECORD_FIELD_PAT@23..27 + RECORD_PAT_FIELD@23..27 NAME_REF@23..24 INT_NUMBER@23..24 "0" COLON@24..25 ":" @@ -50,10 +50,10 @@ SOURCE_FILE@0..63 NAME_REF@44..45 IDENT@44..45 "S" WHITESPACE@45..46 " " - RECORD_FIELD_PAT_LIST@46..54 + RECORD_PAT_FIELD_LIST@46..54 L_CURLY@46..47 "{" WHITESPACE@47..48 " " - RECORD_FIELD_PAT@48..52 + RECORD_PAT_FIELD@48..52 NAME_REF@48..49 IDENT@48..49 "x" COLON@49..50 ":" diff --git a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast index facce8167..7c5467289 100644 --- a/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast +++ b/crates/ra_syntax/test_data/parser/ok/0063_trait_fn_patterns.rast @@ -64,16 +64,16 @@ SOURCE_FILE@0..170 NAME_REF@57..58 IDENT@57..58 "S" WHITESPACE@58..59 " " - RECORD_FIELD_PAT_LIST@59..67 + RECORD_PAT_FIELD_LIST@59..67 L_CURLY@59..60 "{" WHITESPACE@60..61 " " - RECORD_FIELD_PAT@61..62 + RECORD_PAT_FIELD@61..62 BIND_PAT@61..62 NAME@61..62 IDENT@61..62 "a" COMMA@62..63 "," WHITESPACE@63..64 " " - RECORD_FIELD_PAT@64..65 + RECORD_PAT_FIELD@64..65 BIND_PAT@64..65 NAME@64..65 IDENT@64..65 "b" diff --git a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast index 453757c3c..087053f25 100644 --- a/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast +++ b/crates/ra_syntax/test_data/parser/ok/0064_impl_fn_params.rast @@ -67,16 +67,16 @@ SOURCE_FILE@0..137 NAME_REF@56..57 IDENT@56..57 "S" WHITESPACE@57..58 " " - RECORD_FIELD_PAT_LIST@58..66 + RECORD_PAT_FIELD_LIST@58..66 L_CURLY@58..59 "{" WHITESPACE@59..60 " " - RECORD_FIELD_PAT@60..61 + RECORD_PAT_FIELD@60..61 BIND_PAT@60..61 NAME@60..61 IDENT@60..61 "a" COMMA@61..62 "," WHITESPACE@62..63 " " - RECORD_FIELD_PAT@63..64 + RECORD_PAT_FIELD@63..64 BIND_PAT@63..64 NAME@63..64 IDENT@63..64 "b" -- cgit v1.2.3