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

extend selection expands macros and can totally panic

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-20 21:05:01 +03:00
parent 171f6e6d00
commit 73836cdbbc
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,7 +8,7 @@ use lsp_types::{
WorkspaceEdit
};
use ra_ide_api::{
FileId, FilePosition, FileRange, FoldKind, Query, RangeInfo, RunnableKind, Severity,
FileId, FilePosition, FileRange, FoldKind, Query, RangeInfo, RunnableKind, Severity, Cancelable,
};
use ra_syntax::{AstNode, TextUnit};
use rustc_hash::FxHashMap;
@ -40,9 +40,13 @@ pub fn handle_extend_selection(
.into_iter()
.map_conv_with(&line_index)
.map(|range| FileRange { file_id, range })
.map(|frange| world.analysis().extend_selection(frange))
.map_conv_with(&line_index)
.collect();
.map(|frange| {
world
.analysis()
.extend_selection(frange)
.map(|it| it.conv_with(&line_index))
})
.collect::<Cancelable<Vec<_>>>()?;
Ok(req::ExtendSelectionResult { selections })
}