rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

migrate ra_ide_api to the new rowan

Browse Source
This commit is contained in:
Aleksey Kladov
2019-07-19 12:56:47 +03:00
parent 0343c4a815
commit f1abc7bdc6
29 changed files with 342 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ra_ide_api/src/syntax_tree.rs
View File

@@ -18,7 +18,7 @@ pub(crate) fn syntax_tree(
let node = match algo::find_covering_element(parse.tree().syntax(), text_range) {
SyntaxElement::Node(node) => node,
SyntaxElement::Token(token) => {
if let Some(tree) = syntax_tree_for_string(token, text_range) {
if let Some(tree) = syntax_tree_for_string(&token, text_range) {
return tree;
}
token.parent()
@@ -33,7 +33,7 @@ pub(crate) fn syntax_tree(
/// Attempts parsing the selected contents of a string literal
/// as rust syntax and returns its syntax tree
fn syntax_tree_for_string(token: SyntaxToken, text_range: TextRange) -> Option<String> {
fn syntax_tree_for_string(token: &SyntaxToken, text_range: TextRange) -> Option<String> {
// When the range is inside a string
// we'll attempt parsing it as rust syntax
// to provide the syntax tree of the contents of the string
@@ -43,7 +43,7 @@ fn syntax_tree_for_string(token: SyntaxToken, text_range: TextRange) -> Option<S
}
}
fn syntax_tree_for_token(node: SyntaxToken, text_range: TextRange) -> Option<String> {
fn syntax_tree_for_token(node: &SyntaxToken, text_range: TextRange) -> Option<String> {
// Range of the full node
let node_range = node.range();
let text = node.text().to_string();