language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 12:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Handle pub tuple fields in tuple structs

Browse source 
The current implementation will throw a parser error for tuple structs
that contain a pub tuple field. For example,
```rust
struct Foo(pub (u32, u32));
```
is valid Rust, but rust-analyzer will throw a parser error.  This is
because the parens after `pub` is treated as a visibility context.
Allowing a tuple type to follow `pub` in the special case when we are
defining fields in a tuple struct can fix the issue.
This commit is contained in:
Adam Bratschi-Kaye 2021-11-03 23:57:46 +01:00
parent 04f03a360a
commit 0d54754ca7
5 changed files with 47 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/parser/src/grammar.rs
View file

@ -75,7 +75,7 @@ pub(crate) mod entry_points {
}
pub(crate) fn visibility(p: &mut Parser) {
let _ = opt_visibility(p);
let _ = opt_visibility(p, false);
}
// Parse a meta item , which excluded [], e.g : #[ MetaItem ]
@ -149,7 +149,7 @@ impl BlockLike {
}
}
fn opt_visibility(p: &mut Parser) -> bool {
fn opt_visibility(p: &mut Parser, in_tuple_field: bool) -> bool {
match p.current() {
T![pub] => {
let m = p.start();
@ -165,9 +165,17 @@ fn opt_visibility(p: &mut Parser) -> bool {
// struct B(pub (super::A));
// struct B(pub (crate::A,));
T![crate] | T![self] | T![super] | T![ident] if p.nth(2) != T![:] => {
p.bump(T!['(']);
paths::use_path(p);
p.expect(T![')']);
// If we are in a tuple struct, then the parens following `pub`
// might be an tuple field, not part of the visibility. So in that
// case we don't want to consume an identifier.
// test pub_tuple_field
// struct MyStruct(pub (u32, u32));
if !(in_tuple_field && matches!(p.nth(1), T![ident])) {
p.bump(T!['(']);
paths::use_path(p);
p.expect(T![')']);
}
}
// test crate_visibility_in
// pub(in super::A) struct S;