Skip to content

fix: add whitespace in macro for delegate assists #22330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
A4-Tacks wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix: add whitespace in macro for delegate assists #22330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c95dc8
Move pretty_pat_in_macro to utils
A4-Tacks May 9, 2026
01c1f2e
Insert ws out of node for prettify_macro_expansion
A4-Tacks May 10, 2026
b3d4578
Pretty in macro for generate_delegate_methods
A4-Tacks May 9, 2026
356e906
Pretty in macro for generate_delegate_trait
A4-Tacks May 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions crates/ide-assists/src/handlers/generate_delegate_methods.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use syntax::{

use crate::{
AssistContext, AssistId, AssistKind, Assists, GroupLabel,
utils::{convert_param_list_to_arg_list, find_struct_impl},
utils::{convert_param_list_to_arg_list, find_struct_impl, pretty_node_inside_macro},
};

// Assist: generate_delegate_methods
Expand Down Expand Up @@ -121,6 +121,8 @@ pub(crate) fn generate_delegate_methods(
let source_scope = ctx.sema.scope(v.syntax());
let target_scope = ctx.sema.scope(strukt.syntax());
if let (Some(s), Some(t)) = (source_scope, target_scope) {
let v =
pretty_node_inside_macro(v, &ctx.sema, source.file_id, t.krate());
ast::Fn::cast(
PathTransform::generic_transformation(&t, &s).apply(v.syntax()),
)
Expand Down Expand Up @@ -669,7 +671,7 @@ impl<'a, T> Bar<'a, T> {
//- /bar.rs
macro_rules! test_method {
() => {
pub fn test(self, b: Bar) -> Self {
pub fn test(self, b: &mut Bar) -> Self {
self
}
};
Expand All @@ -696,7 +698,7 @@ struct Foo {
}

impl Foo {
$0pub fn test(self,b:bar::Bar) ->bar::Bar {
$0pub fn test(self,b: &mut bar::Bar) -> bar::Bar {
self.bar.test(b)
}
}
Expand Down
Loading
Loading