create function
This commit is contained in:
parent
0ff89deb69
commit
c14a12edd7
1 changed files with 20 additions and 14 deletions
|
@ -1,9 +1,9 @@
|
||||||
use hir::{self, HasCrate, HirDisplay};
|
use hir::{self, HasCrate, HirDisplay};
|
||||||
use stdx::format_to;
|
use stdx::format_to;
|
||||||
use syntax::ast::{self, AstNode, HasName, HasVisibility};
|
use syntax::ast::{self, make, AstNode, HasName, HasVisibility};
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
utils::{find_impl_block_end, find_struct_impl, generate_impl_text},
|
utils::{find_impl_block_end, find_struct_impl, generate_impl_text, render_snippet, Cursor},
|
||||||
AssistContext, AssistId, AssistKind, Assists, GroupLabel,
|
AssistContext, AssistId, AssistKind, Assists, GroupLabel,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -78,17 +78,16 @@ pub(crate) fn generate_delegate(acc: &mut Assists, ctx: &AssistContext) -> Optio
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
format_to!(
|
// make function
|
||||||
buf,
|
let vis = strukt.visibility();
|
||||||
"{}fn {}(&self) {} {{
|
let name = make::name(&method.name(ctx.db()).to_string());
|
||||||
self.{}.{}()
|
let type_params = None;
|
||||||
}}",
|
let params = make::param_list(None, []);
|
||||||
vis,
|
let body = make::block_expr([], None);
|
||||||
method.name(ctx.db()),
|
let ret_type = &method.ret_type(ctx.db()).display(ctx.db()).to_string();
|
||||||
return_type,
|
let ret_type = Some(make::ret_type(make::ty(ret_type)));
|
||||||
field_name,
|
let is_async = false;
|
||||||
method.name(ctx.db())
|
let f = make::fn_(vis, name, type_params, params, body, ret_type, is_async);
|
||||||
);
|
|
||||||
|
|
||||||
let start_offset = impl_def
|
let start_offset = impl_def
|
||||||
.and_then(|impl_def| find_impl_block_end(impl_def, &mut buf))
|
.and_then(|impl_def| find_impl_block_end(impl_def, &mut buf))
|
||||||
|
@ -97,7 +96,14 @@ pub(crate) fn generate_delegate(acc: &mut Assists, ctx: &AssistContext) -> Optio
|
||||||
strukt.syntax().text_range().end()
|
strukt.syntax().text_range().end()
|
||||||
});
|
});
|
||||||
|
|
||||||
builder.insert(start_offset, buf);
|
let cap = ctx.config.snippet_cap.unwrap(); // FIXME.
|
||||||
|
let cursor = Cursor::Before(f.syntax());
|
||||||
|
|
||||||
|
builder.insert_snippet(
|
||||||
|
cap,
|
||||||
|
start_offset,
|
||||||
|
format!("\n\n{}", render_snippet(cap, f.syntax(), cursor)),
|
||||||
|
);
|
||||||
},
|
},
|
||||||
)?;
|
)?;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue