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

Add visibility to hover

Browse source
This commit is contained in:
Jeremy Kolb 2019-01-13 20:08:33 -05:00
parent a901cb4f34
commit 2d7b4cc548
1 changed files with 41 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
use ra_db::{Cancelable, SyntaxDatabase}; use ra_db::{Cancelable, SyntaxDatabase};
use ra_syntax::{ use ra_syntax::{
AstNode, SyntaxNode, TreeArc, AstNode, SyntaxNode, TreeArc,
ast::{self, NameOwner}, 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}},
}; };
@ -140,42 +140,74 @@ impl NavigationTarget {
// TODO: Refactor to be have less repetition // TODO: Refactor to be have less repetition
visitor() visitor()
.visit(|node: &ast::FnDef| { .visit(|node: &ast::FnDef| {
let mut string = "fn ".to_string(); let mut string = node
.visibility()
.map(|v| format!("{} ", v.syntax().text()))
.unwrap_or_default();
string.push_str("fn ");
node.name()?.syntax().text().push_to(&mut string); node.name()?.syntax().text().push_to(&mut string);
Some(string) Some(string)
}) })
.visit(|node: &ast::StructDef| { .visit(|node: &ast::StructDef| {
let mut string = "struct ".to_string(); let mut string = node
.visibility()
.map(|v| format!("{} ", v.syntax().text()))
.unwrap_or_default();
string.push_str("struct ");
node.name()?.syntax().text().push_to(&mut string); node.name()?.syntax().text().push_to(&mut string);
Some(string) Some(string)
}) })
.visit(|node: &ast::EnumDef| { .visit(|node: &ast::EnumDef| {
let mut string = "enum ".to_string(); let mut string = node
.visibility()
.map(|v| format!("{} ", v.syntax().text()))
.unwrap_or_default();
string.push_str("enum ");
node.name()?.syntax().text().push_to(&mut string); node.name()?.syntax().text().push_to(&mut string);
Some(string) Some(string)
}) })
.visit(|node: &ast::TraitDef| { .visit(|node: &ast::TraitDef| {
let mut string = "trait ".to_string(); let mut string = node
.visibility()
.map(|v| format!("{} ", v.syntax().text()))
.unwrap_or_default();
string.push_str("trait ");
node.name()?.syntax().text().push_to(&mut string); node.name()?.syntax().text().push_to(&mut string);
Some(string) Some(string)
}) })
.visit(|node: &ast::Module| { .visit(|node: &ast::Module| {
let mut string = "mod ".to_string(); let mut string = node
.visibility()
.map(|v| format!("{} ", v.syntax().text()))
.unwrap_or_default();
string.push_str("mod ");
node.name()?.syntax().text().push_to(&mut string); node.name()?.syntax().text().push_to(&mut string);
Some(string) Some(string)
}) })
.visit(|node: &ast::TypeDef| { .visit(|node: &ast::TypeDef| {
let mut string = "type ".to_string(); let mut string = node
.visibility()
.map(|v| format!("{} ", v.syntax().text()))
.unwrap_or_default();
string.push_str("type ");
node.name()?.syntax().text().push_to(&mut string); node.name()?.syntax().text().push_to(&mut string);
Some(string) Some(string)
}) })
.visit(|node: &ast::ConstDef| { .visit(|node: &ast::ConstDef| {
let mut string = "const ".to_string(); let mut string = node
.visibility()
.map(|v| format!("{} ", v.syntax().text()))
.unwrap_or_default();
string.push_str("const ");
node.name()?.syntax().text().push_to(&mut string); node.name()?.syntax().text().push_to(&mut string);
Some(string) Some(string)
}) })
.visit(|node: &ast::StaticDef| { .visit(|node: &ast::StaticDef| {
let mut string = "static ".to_string(); let mut string = node
.visibility()
.map(|v| format!("{} ", v.syntax().text()))
.unwrap_or_default();
string.push_str("static ");
node.name()?.syntax().text().push_to(&mut string); node.name()?.syntax().text().push_to(&mut string);
Some(string) Some(string)
}) })