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

Fix more comments

Browse source
This commit is contained in:
Mikhail Rakhmanov 2020-06-03 19:33:57 +02:00
parent 6a0083a519
commit 6cd2e04bd2
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/rust-analyzer/src/main_loop/handlers.rs
View file

@ -25,7 +25,7 @@ use ra_project_model::TargetKind;
use ra_syntax::{AstNode, SyntaxKind, TextRange, TextSize}; use ra_syntax::{AstNode, SyntaxKind, TextRange, TextSize};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_json::to_value; use serde_json::to_value;
use stdx::format_to; use stdx::{format_to, split1};
use crate::{ use crate::{
cargo_target_spec::CargoTargetSpec, cargo_target_spec::CargoTargetSpec,
@ -786,11 +786,10 @@ pub fn handle_resolve_code_action(
let frange = FileRange { file_id, range }; let frange = FileRange { file_id, range };
let assists = snap.analysis().resolved_assists(&snap.config.assist, frange)?; let assists = snap.analysis().resolved_assists(&snap.config.assist, frange)?;
let id_components = params.id.split(":").collect::<Vec<&str>>(); let (id_string, index) = split1(&params.id, ':').unwrap();
let index = id_components.last().unwrap().parse::<usize>().unwrap(); let index = index.parse::<usize>().unwrap();
let id_string = id_components.first().unwrap();
let assist = &assists[index]; let assist = &assists[index];
assert!(assist.assist.id.0 == *id_string); assert!(assist.assist.id.0 == id_string);
Ok(to_proto::resolved_code_action(&snap, assist.clone())?.edit) Ok(to_proto::resolved_code_action(&snap, assist.clone())?.edit)
} }