language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 06:11:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

add try_conv_with_to_vec

Browse source
This commit is contained in:
Aleksey Kladov 2019-07-08 13:39:16 +03:00
parent 5ce2b4819e
commit 227bc0b6d4
2 changed files with 51 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

27
crates/ra_lsp_server/src/main_loop/handlers.rs
View file

@ -21,7 +21,7 @@ use url_serde::Ser;
use crate::{
cargo_target_spec::{runnable_args, CargoTargetSpec},
conv::{to_location, to_location_link, Conv, ConvWith, MapConvWith, TryConvWith},
conv::{to_location, Conv, ConvWith, MapConvWith, TryConvWith, TryConvWithToVec},
req::{self, Decoration},
world::WorldSnapshot,
LspError, Result,
@ -263,7 +263,6 @@ pub fn handle_goto_definition(
params: req::TextDocumentPositionParams,
) -> Result<Option<req::GotoDefinitionResponse>> {
let position = params.try_conv_with(&world)?;
let line_index = world.analysis().file_line_index(position.file_id);
let nav_info = match world.analysis().goto_definition(position)? {
None => return Ok(None),
Some(it) => it,
@ -272,9 +271,8 @@ pub fn handle_goto_definition(
let res = nav_info
.info
.into_iter()
.map(|nav| RangeInfo::new(nav_range, nav))
.map(|nav| to_location_link(&nav, &world, &line_index))
.collect::<Result<Vec<_>>>()?;
.map(|nav| (position.file_id, RangeInfo::new(nav_range, nav)))
.try_conv_with_to_vec(&world)?;
Ok(Some(res.into()))
}
@ -283,7 +281,6 @@ pub fn handle_goto_implementation(
params: req::TextDocumentPositionParams,
) -> Result<Option<req::GotoImplementationResponse>> {
let position = params.try_conv_with(&world)?;
let line_index = world.analysis().file_line_index(position.file_id);
let nav_info = match world.analysis().goto_implementation(position)? {
None => return Ok(None),
Some(it) => it,
@ -292,9 +289,8 @@ pub fn handle_goto_implementation(
let res = nav_info
.info
.into_iter()
.map(|nav| RangeInfo::new(nav_range, nav))
.map(|nav| to_location_link(&nav, &world, &line_index))
.collect::<Result<Vec<_>>>()?;
.map(|nav| (position.file_id, RangeInfo::new(nav_range, nav)))
.try_conv_with_to_vec(&world)?;
Ok(Some(res.into()))
}
@ -303,7 +299,6 @@ pub fn handle_goto_type_definition(
params: req::TextDocumentPositionParams,
) -> Result<Option<req::GotoTypeDefinitionResponse>> {
let position = params.try_conv_with(&world)?;
let line_index = world.analysis().file_line_index(position.file_id);
let nav_info = match world.analysis().goto_type_definition(position)? {
None => return Ok(None),
Some(it) => it,
@ -312,9 +307,8 @@ pub fn handle_goto_type_definition(
let res = nav_info
.info
.into_iter()
.map(|nav| RangeInfo::new(nav_range, nav))
.map(|nav| to_location_link(&nav, &world, &line_index))
.collect::<Result<Vec<_>>>()?;
.map(|nav| (position.file_id, RangeInfo::new(nav_range, nav)))
.try_conv_with_to_vec(&world)?;
Ok(Some(res.into()))
}
@ -323,12 +317,7 @@ pub fn handle_parent_module(
params: req::TextDocumentPositionParams,
) -> Result<Vec<Location>> {
let position = params.try_conv_with(&world)?;
world
.analysis()
.parent_module(position)?
.into_iter()
.map(|nav| nav.try_conv_with(&world))
.collect::<Result<Vec<_>>>()
world.analysis().parent_module(position)?.iter().try_conv_with_to_vec(&world)
}
pub fn handle_runnables(