mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-09-27 20:42:04 +00:00
Fix panic on raw string assist
Strings that do not contain two quotation marks would cause a slice indexing panic because code was assuming `find_usual_string_range` would return a string with two quotes, but it would incorrectly also return text ranges containing only a single quote.
This commit is contained in:
parent
7dfbe28211
commit
17bd3e59f8
1 changed files with 35 additions and 4 deletions
|
@ -159,10 +159,17 @@ fn count_hashes(s: &str) -> usize {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn find_usual_string_range(s: &str) -> Option<TextRange> {
|
fn find_usual_string_range(s: &str) -> Option<TextRange> {
|
||||||
|
let left_quote = s.find('"')?;
|
||||||
|
let right_quote = s.rfind('"')?;
|
||||||
|
if left_quote == right_quote {
|
||||||
|
// `s` only contains one quote
|
||||||
|
None
|
||||||
|
} else {
|
||||||
Some(TextRange::from_to(
|
Some(TextRange::from_to(
|
||||||
TextUnit::from(s.find('"')? as u32),
|
TextUnit::from(left_quote as u32),
|
||||||
TextUnit::from(s.rfind('"')? as u32),
|
TextUnit::from(right_quote as u32),
|
||||||
))
|
))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
|
@ -271,6 +278,30 @@ string"###;
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn make_raw_string_not_works_on_partial_string() {
|
||||||
|
check_assist_not_applicable(
|
||||||
|
make_raw_string,
|
||||||
|
r#"
|
||||||
|
fn f() {
|
||||||
|
let s = "foo<|>
|
||||||
|
}
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn make_usual_string_not_works_on_partial_string() {
|
||||||
|
check_assist_not_applicable(
|
||||||
|
make_usual_string,
|
||||||
|
r#"
|
||||||
|
fn main() {
|
||||||
|
let s = r#"bar<|>
|
||||||
|
}
|
||||||
|
"#,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn add_hash_target() {
|
fn add_hash_target() {
|
||||||
check_assist_target(
|
check_assist_target(
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue