From 9e213385c9d06db3c8ca20812779e2b8f8ad2c71 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Sat, 30 Mar 2019 13:25:53 +0300 Subject: switch to new rowan --- crates/ra_assists/src/assist_ctx.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/ra_assists/src/assist_ctx.rs') diff --git a/crates/ra_assists/src/assist_ctx.rs b/crates/ra_assists/src/assist_ctx.rs index 4ad21c74b..bb5742bd9 100644 --- a/crates/ra_assists/src/assist_ctx.rs +++ b/crates/ra_assists/src/assist_ctx.rs @@ -2,8 +2,8 @@ use hir::db::HirDatabase; use ra_text_edit::TextEditBuilder; use ra_db::FileRange; use ra_syntax::{ - SourceFile, TextRange, AstNode, TextUnit, SyntaxNode, - algo::{find_leaf_at_offset, find_node_at_offset, find_covering_node, LeafAtOffset}, + SourceFile, TextRange, AstNode, TextUnit, SyntaxNode, SyntaxElement, SyntaxToken, + algo::{find_token_at_offset, find_node_at_offset, find_covering_element, TokenAtOffset}, }; use ra_fmt::{leading_indent, reindent}; @@ -104,15 +104,15 @@ impl<'a, DB: HirDatabase> AssistCtx<'a, DB> { Some(self.assist) } - pub(crate) fn leaf_at_offset(&self) -> LeafAtOffset<&'a SyntaxNode> { - find_leaf_at_offset(self.source_file.syntax(), self.frange.range.start()) + pub(crate) fn token_at_offset(&self) -> TokenAtOffset> { + find_token_at_offset(self.source_file.syntax(), self.frange.range.start()) } pub(crate) fn node_at_offset(&self) -> Option<&'a N> { find_node_at_offset(self.source_file.syntax(), self.frange.range.start()) } - pub(crate) fn covering_node(&self) -> &'a SyntaxNode { - find_covering_node(self.source_file.syntax(), self.frange.range) + pub(crate) fn covering_element(&self) -> SyntaxElement<'a> { + find_covering_element(self.source_file.syntax(), self.frange.range) } } -- cgit v1.2.3