From 3ffd5dd2a63e8efe182e79439a879ec1f9420b77 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 8 Jan 2019 11:47:28 +0300 Subject: migrate ra_analysis to new rowan --- crates/ra_analysis/src/extend_selection.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/ra_analysis/src/extend_selection.rs') diff --git a/crates/ra_analysis/src/extend_selection.rs b/crates/ra_analysis/src/extend_selection.rs index f1b77f981..3b130f966 100644 --- a/crates/ra_analysis/src/extend_selection.rs +++ b/crates/ra_analysis/src/extend_selection.rs @@ -1,6 +1,6 @@ use ra_db::SyntaxDatabase; use ra_syntax::{ - SyntaxNodeRef, AstNode, SourceFileNode, + SyntaxNode, AstNode, SourceFile, ast, algo::find_covering_node, }; @@ -19,18 +19,18 @@ pub(crate) fn extend_selection(db: &RootDatabase, frange: FileRange) -> TextRang fn extend_selection_in_macro( _db: &RootDatabase, - source_file: &SourceFileNode, + source_file: &SourceFile, frange: FileRange, ) -> Option { let macro_call = find_macro_call(source_file.syntax(), frange.range)?; let (off, exp) = hir::MacroDef::ast_expand(macro_call)?; let dst_range = exp.map_range_forward(frange.range - off)?; - let dst_range = ra_editor::extend_selection(exp.syntax().borrowed(), dst_range)?; + let dst_range = ra_editor::extend_selection(&exp.syntax(), dst_range)?; let src_range = exp.map_range_back(dst_range)? + off; Some(src_range) } -fn find_macro_call(node: SyntaxNodeRef, range: TextRange) -> Option { +fn find_macro_call(node: &SyntaxNode, range: TextRange) -> Option<&ast::MacroCall> { find_covering_node(node, range) .ancestors() .find_map(ast::MacroCall::cast) -- cgit v1.2.3