nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-24 13:43:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #684

Browse Source 
684: fix panic in call info r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2019-01-26 21:35:29 +00:00
commit 99b032b0f6
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crates/ra_ide_api/src/call_info.rs
View File

@ -1,3 +1,4 @@
use test_utils::tested_by;
use ra_db::SourceDatabase; use ra_db::SourceDatabase;
use ra_syntax::{ use ra_syntax::{
AstNode, SyntaxNode, TextUnit, TextRange, AstNode, SyntaxNode, TextUnit, TextRange,
@ -41,7 +42,12 @@ pub(crate) fn call_info(db: &RootDatabase, position: FilePosition) -> Option<Cal
// where offset is in that list (or beyond). // where offset is in that list (or beyond).
// Revisit this after we get documentation comments in. // Revisit this after we get documentation comments in.
if let Some(ref arg_list) = calling_node.arg_list() { if let Some(ref arg_list) = calling_node.arg_list() {
let start = arg_list.syntax().range().start(); let arg_list_range = arg_list.syntax().range();
if !arg_list_range.contains_inclusive(position.offset) {
tested_by!(call_info_bad_offset);
return None;
}
let start = arg_list_range.start();
let range_search = TextRange::from_to(start, position.offset); let range_search = TextRange::from_to(start, position.offset);
let mut commas: usize = arg_list let mut commas: usize = arg_list
@ -172,10 +178,12 @@ fn param_list(node: &ast::FnDef) -> Vec<String> {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use test_utils::covers;
use crate::mock_analysis::single_file_with_position; use crate::mock_analysis::single_file_with_position;
use super::*;
fn call_info(text: &str) -> CallInfo { fn call_info(text: &str) -> CallInfo {
let (analysis, position) = single_file_with_position(text); let (analysis, position) = single_file_with_position(text);
analysis.call_info(position).unwrap().unwrap() analysis.call_info(position).unwrap().unwrap()
@ -417,4 +425,14 @@ By default this method stops actor's `Context`."#
); );
} }
#[test]
fn call_info_bad_offset() {
covers!(call_info_bad_offset);
let (analysis, position) = single_file_with_position(
r#"fn foo(x: u32, y: u32) -> u32 {x + y}
fn bar() { foo <|> (3, ); }"#,
);
let call_info = analysis.call_info(position).unwrap();
assert!(call_info.is_none());
}
} }

1
crates/ra_ide_api/src/marks.rs
View File

@ -2,4 +2,5 @@ test_utils::marks!(
inserts_parens_for_function_calls inserts_parens_for_function_calls
goto_definition_works_for_methods goto_definition_works_for_methods
goto_definition_works_for_fields goto_definition_works_for_fields
call_info_bad_offset
); );