nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-05 19:58:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: generate getter assist places the cursor at the generated function

Browse Source
This commit is contained in:
Aleksey Kladov 2021-05-23 23:22:38 +03:00
parent af54b1e248
commit 8696c82777
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/ide_assists/src/handlers/generate_getter.rs
View File

@ -23,7 +23,7 @@ use crate::{
// //
// impl Person { // impl Person {
// /// Get a reference to the person's name. // /// Get a reference to the person's name.
// fn name(&self) -> &String { // fn $0name(&self) -> &String {
// &self.name // &self.name
// } // }
// } // }
@ -49,7 +49,7 @@ pub(crate) fn generate_getter(acc: &mut Assists, ctx: &AssistContext) -> Option<
// //
// impl Person { // impl Person {
// /// Get a mutable reference to the person's name. // /// Get a mutable reference to the person's name.
// fn name_mut(&mut self) -> &mut String { // fn $0name_mut(&mut self) -> &mut String {
// &mut self.name // &mut self.name
// } // }
// } // }
@ -119,7 +119,12 @@ pub(crate) fn generate_getter_impl(
strukt.syntax().text_range().end() strukt.syntax().text_range().end()
}); });
builder.insert(start_offset, buf); match ctx.config.snippet_cap {
Some(cap) => {
builder.insert_snippet(cap, start_offset, buf.replacen("fn ", "fn $0", 1))
}
None => builder.insert(start_offset, buf),
}
}, },
) )
} }
@ -146,7 +151,7 @@ struct Context {
impl Context { impl Context {
/// Get a reference to the context's data. /// Get a reference to the context's data.
fn data(&self) -> &Data { fn $0data(&self) -> &Data {
&self.data &self.data
} }
} }
@ -167,7 +172,7 @@ struct Context {
impl Context { impl Context {
/// Get a mutable reference to the context's data. /// Get a mutable reference to the context's data.
fn data_mut(&mut self) -> &mut Data { fn $0data_mut(&mut self) -> &mut Data {
&mut self.data &mut self.data
} }
} }
@ -224,7 +229,7 @@ pub(crate) struct Context {
impl Context { impl Context {
/// Get a reference to the context's data. /// Get a reference to the context's data.
pub(crate) fn data(&self) -> &Data { pub(crate) fn $0data(&self) -> &Data {
&self.data &self.data
} }
} }
@ -262,7 +267,7 @@ impl Context {
} }
/// Get a reference to the context's count. /// Get a reference to the context's count.
fn count(&self) -> &usize { fn $0count(&self) -> &usize {
&self.count &self.count
} }
} }

4
crates/ide_assists/src/tests/generated.rs
View File

@ -786,7 +786,7 @@ struct Person {
impl Person { impl Person {
/// Get a reference to the person's name. /// Get a reference to the person's name.
fn name(&self) -> &String { fn $0name(&self) -> &String {
&self.name &self.name
} }
} }
@ -810,7 +810,7 @@ struct Person {
impl Person { impl Person {
/// Get a mutable reference to the person's name. /// Get a mutable reference to the person's name.
fn name_mut(&mut self) -> &mut String { fn $0name_mut(&mut self) -> &mut String {
&mut self.name &mut self.name
} }
} }