From 83b2d78bbbe06cf7e00f8de732f8bd4264b82a46 Mon Sep 17 00:00:00 2001 From: Edwin Cheng Date: Wed, 1 Jan 2020 02:19:59 +0800 Subject: Supporting extend selection inside macro calls --- crates/ra_ide/src/extend_selection.rs | 123 ++++++++++++++++++++++++++++++---- 1 file changed, 109 insertions(+), 14 deletions(-) (limited to 'crates') diff --git a/crates/ra_ide/src/extend_selection.rs b/crates/ra_ide/src/extend_selection.rs index 1ec41a117..c6f558021 100644 --- a/crates/ra_ide/src/extend_selection.rs +++ b/crates/ra_ide/src/extend_selection.rs @@ -4,20 +4,27 @@ use ra_db::SourceDatabase; use ra_syntax::{ algo::find_covering_element, ast::{self, AstNode, AstToken}, - Direction, NodeOrToken, + Direction, NodeOrToken, SyntaxElement, SyntaxKind::{self, *}, SyntaxNode, SyntaxToken, TextRange, TextUnit, TokenAtOffset, T, }; use crate::{db::RootDatabase, FileRange}; +use hir::{db::AstDatabase, InFile}; +use itertools::Itertools; // FIXME: restore macro support pub(crate) fn extend_selection(db: &RootDatabase, frange: FileRange) -> TextRange { - let parse = db.parse(frange.file_id); - try_extend_selection(parse.tree().syntax(), frange.range).unwrap_or(frange.range) + let src = db.parse(frange.file_id).tree(); + let root = InFile::new(frange.file_id.into(), src.syntax()); + try_extend_selection(db, root, frange.range).unwrap_or(frange.range) } -fn try_extend_selection(root: &SyntaxNode, range: TextRange) -> Option { +fn try_extend_selection( + db: &RootDatabase, + root: InFile<&SyntaxNode>, + range: TextRange, +) -> Option { let string_kinds = [COMMENT, STRING, RAW_STRING, BYTE_STRING, RAW_BYTE_STRING]; let list_kinds = [ RECORD_FIELD_PAT_LIST, @@ -40,9 +47,9 @@ fn try_extend_selection(root: &SyntaxNode, range: TextRange) -> Option return None, @@ -58,7 +65,7 @@ fn try_extend_selection(root: &SyntaxNode, range: TextRange) -> Option { if token.text_range() != range { return Some(token.text_range()); @@ -72,6 +79,16 @@ fn try_extend_selection(root: &SyntaxNode, range: TextRange) -> Option node, }; + + // if we are in single token_tree, we maybe live in macro or attr + if node.kind() == TOKEN_TREE { + if let Some(macro_call) = node.ancestors().find_map(ast::MacroCall::cast) { + if let Some(range) = extend_tokens_from_range(db, &root, macro_call, range) { + return Some(range); + } + } + } + if node.text_range() != range { return Some(node.text_range()); } @@ -88,6 +105,67 @@ fn try_extend_selection(root: &SyntaxNode, range: TextRange) -> Option, + macro_call: ast::MacroCall, + original_range: TextRange, +) -> Option { + let analyzer = hir::SourceAnalyzer::new(db, root.clone(), None); + let expansion = analyzer.expand(db, root.with_value(¯o_call))?; + + // compute original mapped token range + let range = macro_call + .syntax() + .descendants_with_tokens() + .filter_map(|n| match n { + NodeOrToken::Token(token) if token.text_range().is_subrange(&original_range) => { + expansion + .map_token_down(db, root.with_value(&token)) + .map(|node| node.value.text_range()) + } + _ => None, + }) + .fold1(|x, y| union_range(x, y))?; + + let src = db.parse_or_expand(expansion.file_id())?; + let parent = shallow_node(&find_covering_element(&src, range))?.parent()?; + + // compute parent mapped token range + let range = macro_call + .syntax() + .descendants_with_tokens() + .filter_map(|n| match n { + NodeOrToken::Token(token) => { + expansion.map_token_down(db, root.with_value(&token)).and_then(|node| { + if node.value.text_range().is_subrange(&parent.text_range()) { + Some(token.text_range()) + } else { + None + } + }) + } + _ => None, + }) + .fold1(|x, y| union_range(x, y))?; + + if original_range.is_subrange(&range) && original_range != range { + Some(range) + } else { + None + } +} + +fn union_range(range: TextRange, r: TextRange) -> TextRange { + let start = range.start().min(r.start()); + let end = range.end().max(r.end()); + TextRange::from_to(start, end) +} + +fn shallow_node(node: &SyntaxElement) -> Option { + node.ancestors().take_while(|n| n.text_range() == node.text_range()).last() +} + fn extend_single_word_in_comment_or_string( leaf: &SyntaxToken, offset: TextUnit, @@ -227,18 +305,19 @@ fn adj_comments(comment: &ast::Comment, dir: Direction) -> ast::Comment { #[cfg(test)] mod tests { - use ra_syntax::{AstNode, SourceFile}; - use test_utils::extract_offset; - use super::*; + use crate::mock_analysis::single_file; + use test_utils::extract_offset; fn do_check(before: &str, afters: &[&str]) { let (cursor, before) = extract_offset(before); - let parse = SourceFile::parse(&before); - let mut range = TextRange::offset_len(cursor, 0.into()); + let (analysis, file_id) = single_file(&before); + let range = TextRange::offset_len(cursor, 0.into()); + let mut frange = FileRange { file_id: file_id, range }; + for &after in afters { - range = try_extend_selection(parse.tree().syntax(), range).unwrap(); - let actual = &before[range]; + frange.range = analysis.extend_selection(frange).unwrap(); + let actual = &before[frange.range]; assert_eq!(after, actual); } } @@ -503,4 +582,20 @@ fn main() { let var = ( ], ); } + + #[test] + fn extend_selection_inside_macros() { + do_check( + r#"macro_rules! foo { ($item:item) => {$item} } + foo!{fn hello(na<|>me:usize){}}"#, + &[ + "name", + "name:usize", + "(name:usize)", + "fn hello(name:usize){}", + "{fn hello(name:usize){}}", + "foo!{fn hello(name:usize){}}", + ], + ); + } } -- cgit v1.2.3