aboutsummaryrefslogtreecommitdiff
path: root/crates/assists/src/handlers
diff options
context:
space:
mode:
Diffstat (limited to 'crates/assists/src/handlers')
-rw-r--r--crates/assists/src/handlers/add_lifetime_to_type.rs10
-rw-r--r--crates/assists/src/handlers/generate_derive.rs4
-rw-r--r--crates/assists/src/handlers/generate_enum_match_method.rs2
-rw-r--r--crates/assists/src/handlers/generate_impl.rs2
-rw-r--r--crates/assists/src/handlers/generate_new.rs2
5 files changed, 10 insertions, 10 deletions
diff --git a/crates/assists/src/handlers/add_lifetime_to_type.rs b/crates/assists/src/handlers/add_lifetime_to_type.rs
index c1603e972..2edf7b204 100644
--- a/crates/assists/src/handlers/add_lifetime_to_type.rs
+++ b/crates/assists/src/handlers/add_lifetime_to_type.rs
@@ -26,7 +26,7 @@ pub(crate) fn add_lifetime_to_type(acc: &mut Assists, ctx: &AssistContext) -> Op
26 return None; 26 return None;
27 } 27 }
28 28
29 let node = ctx.find_node_at_offset::<ast::AdtDef>()?; 29 let node = ctx.find_node_at_offset::<ast::Adt>()?;
30 let has_lifetime = node 30 let has_lifetime = node
31 .generic_param_list() 31 .generic_param_list()
32 .map(|gen_list| gen_list.lifetime_params().count() > 0) 32 .map(|gen_list| gen_list.lifetime_params().count() > 0)
@@ -66,9 +66,9 @@ pub(crate) fn add_lifetime_to_type(acc: &mut Assists, ctx: &AssistContext) -> Op
66 ) 66 )
67} 67}
68 68
69fn fetch_borrowed_types(node: &ast::AdtDef) -> Option<Vec<RefType>> { 69fn fetch_borrowed_types(node: &ast::Adt) -> Option<Vec<RefType>> {
70 let ref_types: Vec<RefType> = match node { 70 let ref_types: Vec<RefType> = match node {
71 ast::AdtDef::Enum(enum_) => { 71 ast::Adt::Enum(enum_) => {
72 let variant_list = enum_.variant_list()?; 72 let variant_list = enum_.variant_list()?;
73 variant_list 73 variant_list
74 .variants() 74 .variants()
@@ -80,11 +80,11 @@ fn fetch_borrowed_types(node: &ast::AdtDef) -> Option<Vec<RefType>> {
80 .flatten() 80 .flatten()
81 .collect() 81 .collect()
82 } 82 }
83 ast::AdtDef::Struct(strukt) => { 83 ast::Adt::Struct(strukt) => {
84 let field_list = strukt.field_list()?; 84 let field_list = strukt.field_list()?;
85 find_ref_types_from_field_list(&field_list)? 85 find_ref_types_from_field_list(&field_list)?
86 } 86 }
87 ast::AdtDef::Union(un) => { 87 ast::Adt::Union(un) => {
88 let record_field_list = un.record_field_list()?; 88 let record_field_list = un.record_field_list()?;
89 record_field_list 89 record_field_list
90 .fields() 90 .fields()
diff --git a/crates/assists/src/handlers/generate_derive.rs b/crates/assists/src/handlers/generate_derive.rs
index f876b7684..adae8ab7e 100644
--- a/crates/assists/src/handlers/generate_derive.rs
+++ b/crates/assists/src/handlers/generate_derive.rs
@@ -26,7 +26,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
26// ``` 26// ```
27pub(crate) fn generate_derive(acc: &mut Assists, ctx: &AssistContext) -> Option<()> { 27pub(crate) fn generate_derive(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
28 let cap = ctx.config.snippet_cap?; 28 let cap = ctx.config.snippet_cap?;
29 let nominal = ctx.find_node_at_offset::<ast::AdtDef>()?; 29 let nominal = ctx.find_node_at_offset::<ast::Adt>()?;
30 let node_start = derive_insertion_offset(&nominal)?; 30 let node_start = derive_insertion_offset(&nominal)?;
31 let target = nominal.syntax().text_range(); 31 let target = nominal.syntax().text_range();
32 acc.add( 32 acc.add(
@@ -58,7 +58,7 @@ pub(crate) fn generate_derive(acc: &mut Assists, ctx: &AssistContext) -> Option<
58} 58}
59 59
60// Insert `derive` after doc comments. 60// Insert `derive` after doc comments.
61fn derive_insertion_offset(nominal: &ast::AdtDef) -> Option<TextSize> { 61fn derive_insertion_offset(nominal: &ast::Adt) -> Option<TextSize> {
62 let non_ws_child = nominal 62 let non_ws_child = nominal
63 .syntax() 63 .syntax()
64 .children_with_tokens() 64 .children_with_tokens()
diff --git a/crates/assists/src/handlers/generate_enum_match_method.rs b/crates/assists/src/handlers/generate_enum_match_method.rs
index 4cf66b5d5..9d6b161c9 100644
--- a/crates/assists/src/handlers/generate_enum_match_method.rs
+++ b/crates/assists/src/handlers/generate_enum_match_method.rs
@@ -49,7 +49,7 @@ pub(crate) fn generate_enum_match_method(acc: &mut Assists, ctx: &AssistContext)
49 // Return early if we've found an existing new fn 49 // Return early if we've found an existing new fn
50 let impl_def = find_struct_impl( 50 let impl_def = find_struct_impl(
51 &ctx, 51 &ctx,
52 &ast::AdtDef::Enum(parent_enum.clone()), 52 &ast::Adt::Enum(parent_enum.clone()),
53 format!("is_{}", fn_name).as_str(), 53 format!("is_{}", fn_name).as_str(),
54 )?; 54 )?;
55 55
diff --git a/crates/assists/src/handlers/generate_impl.rs b/crates/assists/src/handlers/generate_impl.rs
index 827477272..61d1bd25c 100644
--- a/crates/assists/src/handlers/generate_impl.rs
+++ b/crates/assists/src/handlers/generate_impl.rs
@@ -27,7 +27,7 @@ use crate::{AssistContext, AssistId, AssistKind, Assists};
27// } 27// }
28// ``` 28// ```
29pub(crate) fn generate_impl(acc: &mut Assists, ctx: &AssistContext) -> Option<()> { 29pub(crate) fn generate_impl(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
30 let nominal = ctx.find_node_at_offset::<ast::AdtDef>()?; 30 let nominal = ctx.find_node_at_offset::<ast::Adt>()?;
31 let name = nominal.name()?; 31 let name = nominal.name()?;
32 let target = nominal.syntax().text_range(); 32 let target = nominal.syntax().text_range();
33 33
diff --git a/crates/assists/src/handlers/generate_new.rs b/crates/assists/src/handlers/generate_new.rs
index 307f2e228..a9203d33f 100644
--- a/crates/assists/src/handlers/generate_new.rs
+++ b/crates/assists/src/handlers/generate_new.rs
@@ -40,7 +40,7 @@ pub(crate) fn generate_new(acc: &mut Assists, ctx: &AssistContext) -> Option<()>
40 }; 40 };
41 41
42 // Return early if we've found an existing new fn 42 // Return early if we've found an existing new fn
43 let impl_def = find_struct_impl(&ctx, &ast::AdtDef::Struct(strukt.clone()), "new")?; 43 let impl_def = find_struct_impl(&ctx, &ast::Adt::Struct(strukt.clone()), "new")?;
44 44
45 let target = strukt.syntax().text_range(); 45 let target = strukt.syntax().text_range();
46 acc.add(AssistId("generate_new", AssistKind::Generate), "Generate `new`", target, |builder| { 46 acc.add(AssistId("generate_new", AssistKind::Generate), "Generate `new`", target, |builder| {