From 93c179531b31786bfd50644b5f0c879afc798f7d Mon Sep 17 00:00:00 2001 From: Ekaterina Babshukova Date: Tue, 15 Oct 2019 19:25:57 +0300 Subject: fix highlighting --- crates/ra_ide_api/src/references/rename.rs | 2 +- crates/ra_ide_api/src/references/search_scope.rs | 2 +- crates/ra_lsp_server/src/main_loop/handlers.rs | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'crates') diff --git a/crates/ra_ide_api/src/references/rename.rs b/crates/ra_ide_api/src/references/rename.rs index c91dada46..0e2e088e0 100644 --- a/crates/ra_ide_api/src/references/rename.rs +++ b/crates/ra_ide_api/src/references/rename.rs @@ -1,7 +1,7 @@ //! FIXME: write short doc here use hir::ModuleSource; -use ra_db::SourceDatabase; +use ra_db::{SourceDatabase, SourceDatabaseExt}; use ra_syntax::{algo::find_node_at_offset, ast, AstNode, SyntaxNode}; use relative_path::{RelativePath, RelativePathBuf}; diff --git a/crates/ra_ide_api/src/references/search_scope.rs b/crates/ra_ide_api/src/references/search_scope.rs index dfea18a19..680988a21 100644 --- a/crates/ra_ide_api/src/references/search_scope.rs +++ b/crates/ra_ide_api/src/references/search_scope.rs @@ -1,7 +1,7 @@ //! FIXME: write short doc here use hir::{DefWithBody, HasSource, ModuleSource}; -use ra_db::{FileId, SourceDatabase}; +use ra_db::{FileId, SourceDatabase, SourceDatabaseExt}; use ra_syntax::{AstNode, TextRange}; use crate::db::RootDatabase; diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs index e08e0dbae..307082865 100644 --- a/crates/ra_lsp_server/src/main_loop/handlers.rs +++ b/crates/ra_lsp_server/src/main_loop/handlers.rs @@ -751,6 +751,7 @@ pub fn handle_document_highlight( Ok(Some( refs.into_iter() + .filter(|r| r.file_id == file_id) .map(|r| DocumentHighlight { range: r.range.conv_with(&line_index), kind: None }) .collect(), )) -- cgit v1.2.3