itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #253

Browse Source 
253: Fix diagnostic fixes showing up everywhere r=matklad a=flodiebold

The LSP code action request always returned the fixes for all diagnostics anywhere in the file, because of a shadowed variable.


There's no test yet; I wasn't sure where to add it. I tried adding one in `heavy_tests`, but that's a bit uncomfortable because the code action response contains the (random) file paths. I could make it work, but wanted to ask beforehand what you think.

Co-authored-by: Florian Diebold <flodiebold@gmail.com>
This commit is contained in:
bors[bot] 2018-12-05 22:04:34 +00:00
commit e9060db158
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/ra_lsp_server/src/main_loop/handlers.rs
View File

@ -9,7 +9,7 @@ use languageserver_types::{
WorkspaceEdit, ParameterInformation, SignatureInformation, Hover, HoverContents, WorkspaceEdit, ParameterInformation, SignatureInformation, Hover, HoverContents,
}; };
use ra_analysis::{FileId, FoldKind, Query, RunnableKind, FilePosition}; use ra_analysis::{FileId, FoldKind, Query, RunnableKind, FilePosition};
use ra_syntax::{TextUnit, text_utils::contains_offset_nonstrict}; use ra_syntax::{TextUnit, text_utils::{contains_offset_nonstrict, intersect}};
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use serde_json::to_value; use serde_json::to_value;
@ -618,7 +618,7 @@ pub fn handle_code_action(
.diagnostics(file_id)? .diagnostics(file_id)?
.into_iter() .into_iter()
.filter_map(|d| Some((d.range, d.fix?))) .filter_map(|d| Some((d.range, d.fix?)))
.filter(|(range, _fix)| contains_offset_nonstrict(*range, range.start())) .filter(|(diag_range, _fix)| intersect(*diag_range, range).is_some())
.map(|(_range, fix)| fix); .map(|(_range, fix)| fix);
let mut res = Vec::new(); let mut res = Vec::new();