language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-03 07:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

save comments as ra_syntax::ast::Comment

Browse source
This commit is contained in:
adamrk 2020-02-25 23:35:16 +01:00
parent 4f1d90e73b
commit 94603d9848
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/ra_ide/src/ssr.rs
View file

@ -3,7 +3,8 @@
use crate::source_change::SourceFileEdit; use crate::source_change::SourceFileEdit;
use ra_ide_db::RootDatabase; use ra_ide_db::RootDatabase;
use ra_syntax::ast::make::expr_from_text; use ra_syntax::ast::make::expr_from_text;
use ra_syntax::{AstNode, SyntaxElement, SyntaxKind, SyntaxNode, SyntaxToken}; use ra_syntax::ast::{AstToken, Comment};
use ra_syntax::{AstNode, SyntaxElement, SyntaxNode};
use ra_text_edit::{TextEdit, TextEditBuilder}; use ra_text_edit::{TextEdit, TextEditBuilder};
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use std::collections::HashMap; use std::collections::HashMap;
@ -70,7 +71,7 @@ type Binding = HashMap<Var, SyntaxNode>;
struct Match { struct Match {
place: SyntaxNode, place: SyntaxNode,
binding: Binding, binding: Binding,
ignored_comments: Vec<SyntaxToken>, ignored_comments: Vec<Comment>,
} }
#[derive(Debug)] #[derive(Debug)]
@ -199,12 +200,7 @@ fn find(pattern: &SsrPattern, code: &SyntaxNode) -> SsrMatches {
let mut code_children = let mut code_children =
code.children_with_tokens().filter(|element| !element.kind().is_trivia()); code.children_with_tokens().filter(|element| !element.kind().is_trivia());
let new_ignored_comments = code.children_with_tokens().filter_map(|element| { let new_ignored_comments = code.children_with_tokens().filter_map(|element| {
if let SyntaxElement::Token(token) = element { element.as_token().and_then(|token| Comment::cast(token.clone()))
if token.kind() == SyntaxKind::COMMENT {
return Some(token.clone());
}
}
None
}); });
match_.ignored_comments.extend(new_ignored_comments); match_.ignored_comments.extend(new_ignored_comments);
let match_from_children = pattern_children let match_from_children = pattern_children
@ -254,7 +250,7 @@ fn replace(matches: &SsrMatches, template: &SsrTemplate) -> TextEdit {
fn render_replace( fn render_replace(
binding: &Binding, binding: &Binding,
ignored_comments: &Vec<SyntaxToken>, ignored_comments: &Vec<Comment>,
template: &SsrTemplate, template: &SsrTemplate,
) -> String { ) -> String {
let mut builder = TextEditBuilder::default(); let mut builder = TextEditBuilder::default();
@ -264,7 +260,7 @@ fn render_replace(
} }
} }
for comment in ignored_comments { for comment in ignored_comments {
builder.insert(template.template.text_range().end(), comment.to_string()) builder.insert(template.template.text_range().end(), comment.syntax().to_string())
} }
builder.finish().apply(&template.template.text().to_string()) builder.finish().apply(&template.template.text().to_string())
} }