language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 12:29:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Replace visit_fn with crate::completion::function_label

Browse source
This commit is contained in:
Ville Penttinen 2019-02-26 21:30:46 +02:00
parent 6f5fd6c9de
commit 79114c67b1
1 changed files with 2 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

45
crates/ra_ide_api/src/hover.rs
View file

@ -1,6 +1,6 @@
use ra_db::SourceDatabase; use ra_db::SourceDatabase;
use ra_syntax::{ use ra_syntax::{
AstNode, SyntaxNode, TreeArc, ast::{self, NameOwner, VisibilityOwner, TypeParamsOwner}, AstNode, SyntaxNode, TreeArc, ast::{self, NameOwner, VisibilityOwner},
algo::{find_covering_node, find_node_at_offset, find_leaf_at_offset, visit::{visitor, Visitor}}, algo::{find_covering_node, find_node_at_offset, find_leaf_at_offset, visit::{visitor, Visitor}},
}; };
@ -177,47 +177,6 @@ impl NavigationTarget {
// TODO: After type inference is done, add type information to improve the output // TODO: After type inference is done, add type information to improve the output
let node = self.node(db)?; let node = self.node(db)?;
// FIXME: This is copied from `structure.rs` and should probably
// be moved somewhere common
fn collapse_ws(node: &SyntaxNode, output: &mut String) {
let mut can_insert_ws = false;
for line in node.text().chunks().flat_map(|chunk| chunk.lines()) {
let line = line.trim();
if line.is_empty() {
if can_insert_ws {
output.push_str(" ");
can_insert_ws = false;
}
} else {
output.push_str(line);
can_insert_ws = true;
}
}
}
// FIXME: This is also partially copied from `structure.rs`
fn visit_fn(node: &ast::FnDef) -> Option<String> {
let mut detail =
node.visibility().map(|v| format!("{} ", v.syntax().text())).unwrap_or_default();
detail.push_str("fn ");
node.name()?.syntax().text().push_to(&mut detail);
if let Some(type_param_list) = node.type_param_list() {
collapse_ws(type_param_list.syntax(), &mut detail);
}
if let Some(param_list) = node.param_list() {
collapse_ws(param_list.syntax(), &mut detail);
}
if let Some(ret_type) = node.ret_type() {
detail.push_str(" ");
collapse_ws(ret_type.syntax(), &mut detail);
}
Some(detail)
}
fn visit_node<T>(node: &T, label: &str) -> Option<String> fn visit_node<T>(node: &T, label: &str) -> Option<String>
where where
T: NameOwner + VisibilityOwner, T: NameOwner + VisibilityOwner,
@ -230,7 +189,7 @@ impl NavigationTarget {
} }
visitor() visitor()
.visit(visit_fn) .visit(crate::completion::function_label)
.visit(|node: &ast::StructDef| visit_node(node, "struct ")) .visit(|node: &ast::StructDef| visit_node(node, "struct "))
.visit(|node: &ast::EnumDef| visit_node(node, "enum ")) .visit(|node: &ast::EnumDef| visit_node(node, "enum "))
.visit(|node: &ast::TraitDef| visit_node(node, "trait ")) .visit(|node: &ast::TraitDef| visit_node(node, "trait "))