diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-30 23:10:48 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-30 23:10:48 +0000 |
| commit | 032d15c392e8de7936c8729e03e6229313f3b054 (patch) | |
| tree | 61cfa26801e456d5fdcd2619238c05bce62a1ac2 /crates/ra_editor/src | |
| parent | 23cad90fe98dcca7f4b6905d9fd3ed52d2896c8c (diff) | |
| parent | fbbee537228538f448a335bb0b2dabec2b3d443e (diff) | |
Merge #171
171: Query-based module scopes r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_editor/src')
| -rw-r--r-- | crates/ra_editor/src/completion.rs | 2 | ||||
| -rw-r--r-- | crates/ra_editor/src/scope/mod_scope.rs | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/crates/ra_editor/src/completion.rs b/crates/ra_editor/src/completion.rs index a0b168bc6..20c8546a4 100644 --- a/crates/ra_editor/src/completion.rs +++ b/crates/ra_editor/src/completion.rs | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | /// FIXME: move completion from ra_editor to ra_analysis | ||
| 2 | |||
| 1 | use rustc_hash::{FxHashMap, FxHashSet}; | 3 | use rustc_hash::{FxHashMap, FxHashSet}; |
| 2 | 4 | ||
| 3 | use ra_syntax::{ | 5 | use ra_syntax::{ |
diff --git a/crates/ra_editor/src/scope/mod_scope.rs b/crates/ra_editor/src/scope/mod_scope.rs index 956ee0e2f..818749a12 100644 --- a/crates/ra_editor/src/scope/mod_scope.rs +++ b/crates/ra_editor/src/scope/mod_scope.rs | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | /// FIXME: this is now moved to ra_analysis::descriptors::module::scope. | ||
| 2 | /// | ||
| 3 | /// Current copy will be deleted as soon as we move the rest of the completion | ||
| 4 | /// to the analyezer. | ||
| 5 | |||
| 6 | |||
| 1 | use ra_syntax::{ | 7 | use ra_syntax::{ |
| 2 | ast::{self, AstChildren}, | 8 | ast::{self, AstChildren}, |
| 3 | AstNode, SmolStr, SyntaxNode, SyntaxNodeRef, | 9 | AstNode, SmolStr, SyntaxNode, SyntaxNodeRef, |