|
1 | 1 | use ide_db::{FxIndexSet, source_change::SourceChangeBuilder}; |
2 | 2 | use syntax::{ |
3 | | - NodeOrToken, SyntaxElement, SyntaxNode, SyntaxToken, T, |
| 3 | + NodeOrToken, T, |
4 | 4 | ast::{ |
5 | | - self, AstNode, HasGenericParams, HasName, Lifetime, |
| 5 | + self, AstNode, HasGenericParams, HasName, |
6 | 6 | make::{self, tokens}, |
7 | 7 | syntax_factory::SyntaxFactory, |
8 | 8 | }, |
@@ -191,28 +191,12 @@ fn add_lifetime_to_refs( |
191 | 191 | for r#ref in refs_without_lifetime { |
192 | 192 | let Some(amp_token) = r#ref.amp_token() else { continue }; |
193 | 193 | let lifetime = make.lifetime(lifetime_text); |
194 | | - insert_elements_after( |
195 | | - &NodeOrToken::Token(amp_token), |
196 | | - &lifetime, |
197 | | - vec![lifetime.syntax().clone().into(), tokens::single_space().into()], |
198 | | - ctx, |
199 | | - editor, |
200 | | - builder, |
201 | | - ); |
202 | | - } |
203 | | -} |
204 | | - |
205 | | -fn insert_elements_after( |
206 | | - node_or_token: &NodeOrToken<SyntaxNode, SyntaxToken>, |
207 | | - lifetime: &Lifetime, |
208 | | - elements: Vec<SyntaxElement>, |
209 | | - ctx: &AssistContext<'_>, |
210 | | - editor: &mut SyntaxEditor, |
211 | | - builder: &mut SourceChangeBuilder, |
212 | | -) { |
213 | | - editor.insert_all(Position::after(node_or_token), elements); |
214 | | - if let Some(cap) = ctx.config.snippet_cap { |
215 | | - editor.add_annotation(lifetime.syntax(), builder.make_placeholder_snippet(cap)); |
| 194 | + let node_or_token = &NodeOrToken::Token(amp_token); |
| 195 | + let elements = vec![lifetime.syntax().clone().into(), tokens::single_space().into()]; |
| 196 | + editor.insert_all(Position::after(node_or_token), elements); |
| 197 | + if let Some(cap) = ctx.config.snippet_cap { |
| 198 | + editor.add_annotation(lifetime.syntax(), builder.make_placeholder_snippet(cap)); |
| 199 | + }; |
216 | 200 | } |
217 | 201 | } |
218 | 202 |
|
|
0 commit comments