From 702bdacb03b498f36ed9ccf4f37ca923affb1e9c Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 8 Jan 2019 20:44:31 +0300 Subject: move node at offset to aglo already --- crates/ra_analysis/src/call_info.rs | 2 +- crates/ra_analysis/src/completion/completion_context.rs | 3 +-- crates/ra_analysis/src/goto_defenition.rs | 7 ++++--- crates/ra_analysis/src/hover.rs | 3 +-- crates/ra_analysis/src/imp.rs | 3 ++- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'crates/ra_analysis') diff --git a/crates/ra_analysis/src/call_info.rs b/crates/ra_analysis/src/call_info.rs index 1dac95584..27b760780 100644 --- a/crates/ra_analysis/src/call_info.rs +++ b/crates/ra_analysis/src/call_info.rs @@ -5,8 +5,8 @@ use ra_syntax::{ AstNode, SyntaxNode, TextUnit, TextRange, SyntaxKind::FN_DEF, ast::{self, ArgListOwner, DocCommentsOwner}, + algo::find_node_at_offset, }; -use ra_editor::find_node_at_offset; use crate::{FilePosition, CallInfo, db::RootDatabase}; diff --git a/crates/ra_analysis/src/completion/completion_context.rs b/crates/ra_analysis/src/completion/completion_context.rs index 988c21c58..01786bb69 100644 --- a/crates/ra_analysis/src/completion/completion_context.rs +++ b/crates/ra_analysis/src/completion/completion_context.rs @@ -1,9 +1,8 @@ -use ra_editor::find_node_at_offset; use ra_text_edit::AtomTextEdit; use ra_syntax::{ AstNode, SyntaxNode, SourceFile, TextUnit, TextRange, ast, - algo::{find_leaf_at_offset, find_covering_node}, + algo::{find_leaf_at_offset, find_covering_node, find_node_at_offset}, SyntaxKind::*, }; use hir::source_binder; diff --git a/crates/ra_analysis/src/goto_defenition.rs b/crates/ra_analysis/src/goto_defenition.rs index 0bcf13ebd..fcd8d315e 100644 --- a/crates/ra_analysis/src/goto_defenition.rs +++ b/crates/ra_analysis/src/goto_defenition.rs @@ -1,7 +1,8 @@ use ra_db::{FileId, Cancelable, SyntaxDatabase}; -use ra_syntax::{TextRange, AstNode, ast, SyntaxKind::{NAME, MODULE}}; - -use ra_editor::find_node_at_offset; +use ra_syntax::{ + TextRange, AstNode, ast, SyntaxKind::{NAME, MODULE}, + algo::find_node_at_offset, +}; use crate::{FilePosition, NavigationTarget, db::RootDatabase}; diff --git a/crates/ra_analysis/src/hover.rs b/crates/ra_analysis/src/hover.rs index 5607c3ef3..475524ee1 100644 --- a/crates/ra_analysis/src/hover.rs +++ b/crates/ra_analysis/src/hover.rs @@ -1,9 +1,8 @@ use ra_db::{Cancelable, SyntaxDatabase}; -use ra_editor::find_node_at_offset; use ra_syntax::{ AstNode, SyntaxNode, TreePtr, ast::{self, NameOwner}, - algo::{find_covering_node, find_leaf_at_offset, visit::{visitor, Visitor}}, + algo::{find_covering_node, find_node_at_offset, find_leaf_at_offset, visit::{visitor, Visitor}}, }; use crate::{db::RootDatabase, RangeInfo, FilePosition, FileRange, NavigationTarget}; diff --git a/crates/ra_analysis/src/imp.rs b/crates/ra_analysis/src/imp.rs index b3f75fdbe..2b9963b3c 100644 --- a/crates/ra_analysis/src/imp.rs +++ b/crates/ra_analysis/src/imp.rs @@ -6,10 +6,11 @@ use hir::{ self, Problem, source_binder, }; use ra_db::{FilesDatabase, SourceRoot, SourceRootId, SyntaxDatabase}; -use ra_editor::{self, find_node_at_offset, assists, LocalEdit, Severity}; +use ra_editor::{self, assists, LocalEdit, Severity}; use ra_syntax::{ TextRange, AstNode, SourceFile, ast::{self, NameOwner}, + algo::find_node_at_offset, SyntaxKind::*, }; -- cgit v1.2.3