language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-11-15 18:19:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: add generic TypeBoundList in generated derivable impl

Browse source
This commit is contained in:
rami3l 2022-12-13 12:25:44 +08:00
parent 4596847a88
commit 12b05d2416
3 changed files with 98 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/ide-assists/src/utils.rs
View file

@ -5,6 +5,7 @@ use std::ops;
pub(crate) use gen_trait_fn_body::gen_trait_fn_body;
use hir::{db::HirDatabase, HirDisplay, Semantics};
use ide_db::{famous_defs::FamousDefs, path_transform::PathTransform, RootDatabase, SnippetCap};
use itertools::Itertools;
use stdx::format_to;
use syntax::{
ast::{
@ -452,15 +453,32 @@ fn generate_impl_text_inner(adt: &ast::Adt, trait_text: Option<&str>, code: &str
let lifetime_params =
generic_params.lifetime_params().map(ast::GenericParam::LifetimeParam);
let ty_or_const_params = generic_params.type_or_const_params().filter_map(|param| {
// remove defaults since they can't be specified in impls
match param {
ast::TypeOrConstParam::Type(param) => {
let param = param.clone_for_update();
// remove defaults since they can't be specified in impls
param.remove_default();
let mut bounds = param
.type_bound_list()
.map_or_else(Vec::new, |it| it.bounds().collect_vec());
// `{ty_param}: {trait_text}`
if let Some(trait_) = trait_text {
// Defense against the following cases:
// - The trait is undetermined, e.g. `$0`.
// - The trait is a `From`, e.g. `From<T>`.
if !trait_.starts_with('$')
&& !matches!(trait_.split_once('<'), Some((left, _right)) if left.trim() == "From")
{
bounds.push(make::type_bound(trait_));
}
};
let param =
make::type_param(param.name().unwrap(), make::type_bound_list(bounds));
Some(ast::GenericParam::TypeParam(param))
}
ast::TypeOrConstParam::Const(param) => {
let param = param.clone_for_update();
// remove defaults since they can't be specified in impls
param.remove_default();
Some(ast::GenericParam::ConstParam(param))
}