aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_ide_api/src/completion/completion_context.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-07-21 14:48:46 +0100
committerbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-07-21 14:48:46 +0100
commit443061e75260e55bbaa741c5c85377b8d5c57e47 (patch)
treec28241dc1639480ba5154040e9f31384eabfed06 /crates/ra_ide_api/src/completion/completion_context.rs
parent1137fc47bbbc8d648db3bc669e41fd059a09dd1d (diff)
parent773ad2edb3b84bf20378a577bc4cd808384de078 (diff)
Merge #1570
1570: switch to upstream rowan's API r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_ide_api/src/completion/completion_context.rs')
-rw-r--r--crates/ra_ide_api/src/completion/completion_context.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_ide_api/src/completion/completion_context.rs b/crates/ra_ide_api/src/completion/completion_context.rs
index 6fee7b5be..dfaa9ce69 100644
--- a/crates/ra_ide_api/src/completion/completion_context.rs
+++ b/crates/ra_ide_api/src/completion/completion_context.rs
@@ -1,6 +1,6 @@
1use hir::source_binder; 1use hir::source_binder;
2use ra_syntax::{ 2use ra_syntax::{
3 algo::{find_covering_element, find_node_at_offset, find_token_at_offset}, 3 algo::{find_covering_element, find_node_at_offset},
4 ast, AstNode, Parse, SourceFile, 4 ast, AstNode, Parse, SourceFile,
5 SyntaxKind::*, 5 SyntaxKind::*,
6 SyntaxNode, SyntaxToken, TextRange, TextUnit, 6 SyntaxNode, SyntaxToken, TextRange, TextUnit,
@@ -49,7 +49,7 @@ impl<'a> CompletionContext<'a> {
49 ) -> Option<CompletionContext<'a>> { 49 ) -> Option<CompletionContext<'a>> {
50 let module = source_binder::module_from_position(db, position); 50 let module = source_binder::module_from_position(db, position);
51 let token = 51 let token =
52 find_token_at_offset(original_parse.tree().syntax(), position.offset).left_biased()?; 52 original_parse.tree().syntax().token_at_offset(position.offset).left_biased()?;
53 let analyzer = 53 let analyzer =
54 hir::SourceAnalyzer::new(db, position.file_id, &token.parent(), Some(position.offset)); 54 hir::SourceAnalyzer::new(db, position.file_id, &token.parent(), Some(position.offset));
55 let mut ctx = CompletionContext { 55 let mut ctx = CompletionContext {