diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-03 09:59:24 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-03 09:59:24 +0000 |
commit | e92f2ffe270c6a9fca312fb8a53cd0da0dd01fde (patch) | |
tree | 7f72fee435e82c750b321a52c551010d1b7afd09 /crates/ra_lsp_server/src/main_loop | |
parent | f673529a3355cdd00062c873cd4fdd100f60a243 (diff) | |
parent | 8d6185350953391d0dd405cf790a69bb65d88a36 (diff) |
Merge #410
410: Detangle symbols r=matklad a=matklad
Previously, we used `FileSymbol` both to represent bytes which are stored in the index and as an API of `ra_analysis`. Mixing internal storage format and an API is not a really bright idea, so we introduce `NavigationTarget` to handle API part.
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_lsp_server/src/main_loop')
-rw-r--r-- | crates/ra_lsp_server/src/main_loop/handlers.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs index 26b6c7d8a..b5792f3b8 100644 --- a/crates/ra_lsp_server/src/main_loop/handlers.rs +++ b/crates/ra_lsp_server/src/main_loop/handlers.rs | |||
@@ -190,7 +190,7 @@ pub fn handle_workspace_symbol( | |||
190 | let mut res = Vec::new(); | 190 | let mut res = Vec::new(); |
191 | for nav in world.analysis().symbol_search(query)? { | 191 | for nav in world.analysis().symbol_search(query)? { |
192 | let info = SymbolInformation { | 192 | let info = SymbolInformation { |
193 | name: nav.name().into(), | 193 | name: nav.name().to_string(), |
194 | kind: nav.kind().conv(), | 194 | kind: nav.kind().conv(), |
195 | location: nav.try_conv_with(world)?, | 195 | location: nav.try_conv_with(world)?, |
196 | container_name: None, | 196 | container_name: None, |