language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-25 05:23:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge #7010

Browse source 
7010: Update ungrammar for const block patterns r=matklad a=Veykril

Fixes #6848

Adds const blocks and const block patterns to the AST and parses them.

Blocked on https://github.com/rust-analyzer/ungrammar/pull/17/, will merge that PR there once this one gets the OK so I can remove the local ungrammar dependency path and fix the Cargo.lock.

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2020-12-23 10:37:30 +00:00 • committed by GitHub
commit fd1fcf2c2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 172 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

33
crates/syntax/src/ast/generated/nodes.rs
View file

@ -763,6 +763,7 @@ impl EffectExpr {
pub fn try_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![try]) }
pub fn unsafe_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![unsafe]) }
pub fn async_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![async]) }
pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) }
pub fn block_expr(&self) -> Option<BlockExpr> { support::child(&self.syntax) }
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
@ -1251,6 +1252,14 @@ impl TupleStructPat {
pub fn r_paren_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![')']) }
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct ConstBlockPat {
pub(crate) syntax: SyntaxNode,
}
impl ConstBlockPat {
pub fn const_token(&self) -> Option<SyntaxToken> { support::token(&self.syntax, T![const]) }
pub fn block_expr(&self) -> Option<BlockExpr> { support::child(&self.syntax) }
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct RecordPatFieldList {
pub(crate) syntax: SyntaxNode,
}
@ -1369,6 +1378,7 @@ pub enum Pat {
SlicePat(SlicePat),
TuplePat(TuplePat),
TupleStructPat(TupleStructPat),
ConstBlockPat(ConstBlockPat),
}
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub enum FieldList {
@ -2772,6 +2782,17 @@ impl AstNode for TupleStructPat {
}
fn syntax(&self) -> &SyntaxNode { &self.syntax }
}
impl AstNode for ConstBlockPat {
fn can_cast(kind: SyntaxKind) -> bool { kind == CONST_BLOCK_PAT }
fn cast(syntax: SyntaxNode) -> Option<Self> {
if Self::can_cast(syntax.kind()) {
Some(Self { syntax })
} else {
None
}
}
fn syntax(&self) -> &SyntaxNode { &self.syntax }
}
impl AstNode for RecordPatFieldList {
fn can_cast(kind: SyntaxKind) -> bool { kind == RECORD_PAT_FIELD_LIST }
fn cast(syntax: SyntaxNode) -> Option<Self> {
@ -3242,12 +3263,15 @@ impl From<TuplePat> for Pat {
impl From<TupleStructPat> for Pat {
fn from(node: TupleStructPat) -> Pat { Pat::TupleStructPat(node) }
}
impl From<ConstBlockPat> for Pat {
fn from(node: ConstBlockPat) -> Pat { Pat::ConstBlockPat(node) }
}
impl AstNode for Pat {
fn can_cast(kind: SyntaxKind) -> bool {
match kind {
IDENT_PAT | BOX_PAT | REST_PAT | LITERAL_PAT | MACRO_PAT | OR_PAT | PAREN_PAT
| PATH_PAT | WILDCARD_PAT | RANGE_PAT | RECORD_PAT | REF_PAT | SLICE_PAT
| TUPLE_PAT | TUPLE_STRUCT_PAT => true,
| TUPLE_PAT | TUPLE_STRUCT_PAT | CONST_BLOCK_PAT => true,
_ => false,
}
}
@ -3268,6 +3292,7 @@ impl AstNode for Pat {
SLICE_PAT => Pat::SlicePat(SlicePat { syntax }),
TUPLE_PAT => Pat::TuplePat(TuplePat { syntax }),
TUPLE_STRUCT_PAT => Pat::TupleStructPat(TupleStructPat { syntax }),
CONST_BLOCK_PAT => Pat::ConstBlockPat(ConstBlockPat { syntax }),
_ => return None,
};
Some(res)
@ -3289,6 +3314,7 @@ impl AstNode for Pat {
Pat::SlicePat(it) => &it.syntax,
Pat::TuplePat(it) => &it.syntax,
Pat::TupleStructPat(it) => &it.syntax,
Pat::ConstBlockPat(it) => &it.syntax,
}
}
}
@ -4137,6 +4163,11 @@ impl std::fmt::Display for TupleStructPat {
std::fmt::Display::fmt(self.syntax(), f)
}
}
impl std::fmt::Display for ConstBlockPat {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
std::fmt::Display::fmt(self.syntax(), f)
}
}
impl std::fmt::Display for RecordPatFieldList {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
std::fmt::Display::fmt(self.syntax(), f)

76
crates/syntax/test_data/parser/inline/ok/0156_const_block_pat.rast Normal file
View file

@ -0,0 +1,76 @@
SOURCE_FILE@0..78
FN@0..77
FN_KW@0..2 "fn"
WHITESPACE@2..3 " "
NAME@3..7
IDENT@3..7 "main"
PARAM_LIST@7..9
L_PAREN@7..8 "("
R_PAREN@8..9 ")"
WHITESPACE@9..10 " "
BLOCK_EXPR@10..77
L_CURLY@10..11 "{"
WHITESPACE@11..16 "\n "
LET_STMT@16..38
LET_KW@16..19 "let"
WHITESPACE@19..20 " "
CONST_BLOCK_PAT@20..32
CONST_KW@20..25 "const"
WHITESPACE@25..26 " "
BLOCK_EXPR@26..32
L_CURLY@26..27 "{"
WHITESPACE@27..28 " "
LITERAL@28..30
INT_NUMBER@28..30 "15"
WHITESPACE@30..31 " "
R_CURLY@31..32 "}"
WHITESPACE@32..33 " "
EQ@33..34 "="
WHITESPACE@34..35 " "
TUPLE_EXPR@35..37
L_PAREN@35..36 "("
R_PAREN@36..37 ")"
SEMICOLON@37..38 ";"
WHITESPACE@38..43 "\n "
LET_STMT@43..75
LET_KW@43..46 "let"
WHITESPACE@46..47 " "
CONST_BLOCK_PAT@47..69
CONST_KW@47..52 "const"
WHITESPACE@52..53 " "
BLOCK_EXPR@53..69
L_CURLY@53..54 "{"
WHITESPACE@54..55 " "
EXPR_STMT@55..61
CALL_EXPR@55..60
PATH_EXPR@55..58
PATH@55..58
PATH_SEGMENT@55..58
NAME_REF@55..58
IDENT@55..58 "foo"
ARG_LIST@58..60
L_PAREN@58..59 "("
R_PAREN@59..60 ")"
SEMICOLON@60..61 ";"
WHITESPACE@61..62 " "
CALL_EXPR@62..67
PATH_EXPR@62..65
PATH@62..65
PATH_SEGMENT@62..65
NAME_REF@62..65
IDENT@62..65 "bar"
ARG_LIST@65..67
L_PAREN@65..66 "("
R_PAREN@66..67 ")"
WHITESPACE@67..68 " "
R_CURLY@68..69 "}"
WHITESPACE@69..70 " "
EQ@70..71 "="
WHITESPACE@71..72 " "
TUPLE_EXPR@72..74
L_PAREN@72..73 "("
R_PAREN@73..74 ")"
SEMICOLON@74..75 ";"
WHITESPACE@75..76 "\n"
R_CURLY@76..77 "}"
WHITESPACE@77..78 "\n"

4
crates/syntax/test_data/parser/inline/ok/0156_const_block_pat.rs Normal file
View file

@ -0,0 +1,4 @@
fn main() {
let const { 15 } = ();
let const { foo(); bar() } = ();
}

23
crates/syntax/test_data/parser/inline/ok/0157_const_block.rast Normal file
View file

@ -0,0 +1,23 @@
SOURCE_FILE@0..21
FN@0..20
FN_KW@0..2 "fn"
WHITESPACE@2..3 " "
NAME@3..4
IDENT@3..4 "f"
PARAM_LIST@4..6
L_PAREN@4..5 "("
R_PAREN@5..6 ")"
WHITESPACE@6..7 " "
BLOCK_EXPR@7..20
L_CURLY@7..8 "{"
WHITESPACE@8..9 " "
EFFECT_EXPR@9..18
CONST_KW@9..14 "const"
WHITESPACE@14..15 " "
BLOCK_EXPR@15..18
L_CURLY@15..16 "{"
WHITESPACE@16..17 " "
R_CURLY@17..18 "}"
WHITESPACE@18..19 " "
R_CURLY@19..20 "}"
WHITESPACE@20..21 "\n"

1
crates/syntax/test_data/parser/inline/ok/0157_const_block.rs Normal file
View file

@ -0,0 +1 @@
fn f() { const { } }