language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-25 09:27:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge Trait and TraitAlias handling

Browse source
This commit is contained in:
Deadbeef 2025-08-04 16:11:51 +08:00
parent a9450ebba3
commit 82f174fbd9
74 changed files with 68 additions and 577 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/parser/src/grammar/items/traits.rs
View file

@ -20,7 +20,7 @@ pub(super) fn trait_(p: &mut Parser<'_>, m: Marker) {
// trait Z<U> = where Self: T<U>;
generic_params::opt_where_clause(p);
p.expect(T![;]);
m.complete(p, TRAIT_ALIAS);
m.complete(p, TRAIT);
return;
}

2
crates/parser/src/syntax_kind/generated.rs
View file

@ -284,7 +284,6 @@ pub enum SyntaxKind {
STRUCT,
TOKEN_TREE,
TRAIT,
TRAIT_ALIAS,
TRY_EXPR,
TUPLE_EXPR,
TUPLE_FIELD,
@ -457,7 +456,6 @@ impl SyntaxKind {
| STRUCT
| TOKEN_TREE
| TRAIT
| TRAIT_ALIAS
| TRY_EXPR
| TUPLE_EXPR
| TUPLE_FIELD

2
crates/parser/test_data/parser/inline/ok/trait_alias.rast
View file

@ -1,5 +1,5 @@
SOURCE_FILE
TRAIT_ALIAS
TRAIT
TRAIT_KW "trait"
WHITESPACE " "
NAME

4
crates/parser/test_data/parser/inline/ok/trait_alias_where_clause.rast
View file

@ -1,5 +1,5 @@
SOURCE_FILE
TRAIT_ALIAS
TRAIT
TRAIT_KW "trait"
WHITESPACE " "
NAME
@ -50,7 +50,7 @@ SOURCE_FILE
IDENT "Copy"
SEMICOLON ";"
WHITESPACE "\n"
TRAIT_ALIAS
TRAIT
TRAIT_KW "trait"
WHITESPACE " "
NAME