user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #20297 from A4-Tacks/fix-ws-gen-trait-from-impl

Browse source 
Fix generate_trait_from_impl whitespace after vis
This commit is contained in:
Chayim Refael Friedman 2025-07-24 09:41:20 +00:00 • committed by GitHub
commit d976ef8ae4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/tools/rust-analyzer/crates/ide-assists/src/handlers/generate_trait_from_impl.rs
View file

@ -3,7 +3,7 @@ use ide_db::assists::AssistId;
use syntax::{
AstNode, SyntaxKind, T,
ast::{
self, HasGenericParams, HasName,
self, HasGenericParams, HasName, HasVisibility,
edit_in_place::{HasVisibilityEdit, Indent},
make,
},
@ -164,6 +164,12 @@ pub(crate) fn generate_trait_from_impl(acc: &mut Assists, ctx: &AssistContext<'_
/// `E0449` Trait items always share the visibility of their trait
fn remove_items_visibility(item: &ast::AssocItem) {
if let Some(has_vis) = ast::AnyHasVisibility::cast(item.syntax().clone()) {
if let Some(vis) = has_vis.visibility()
&& let Some(token) = vis.syntax().next_sibling_or_token()
&& token.kind() == SyntaxKind::WHITESPACE
{
ted::remove(token);
}
has_vis.set_visibility(None);
}
}
@ -333,11 +339,11 @@ impl F$0oo {
struct Foo;
trait NewTrait {
fn a_func() -> Option<()>;
fn a_func() -> Option<()>;
}
impl NewTrait for Foo {
fn a_func() -> Option<()> {
fn a_func() -> Option<()> {
Some(())
}
}"#,