language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 04:44:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Improve readability be replacing hard-to-read if-else branches with a match

Browse source
This commit is contained in:
Paul Daniel Faria 2020-06-23 19:35:09 -04:00
parent a8a606cdc4
commit 0d87eee3a9
1 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/ra_ide/src/syntax_highlighting.rs
View file

@ -372,7 +372,8 @@ impl HighlightedRangeStack {
} else { } else {
let maybe_idx = let maybe_idx =
prev.iter().position(|parent| parent.range.contains(child.range.start())); prev.iter().position(|parent| parent.range.contains(child.range.start()));
if let (Some(_), Some(idx)) = (overwrite_parent, maybe_idx) { match (overwrite_parent, maybe_idx) {
(Some(_), Some(idx)) => {
Self::intersect_partial(&mut prev[idx], &child); Self::intersect_partial(&mut prev[idx], &child);
let insert_idx = if prev[idx].range.is_empty() { let insert_idx = if prev[idx].range.is_empty() {
prev.remove(idx); prev.remove(idx);
@ -381,17 +382,20 @@ impl HighlightedRangeStack {
idx + 1 idx + 1
}; };
prev.insert(insert_idx, child); prev.insert(insert_idx, child);
} else if let None = maybe_idx { }
(_, None) => {
let idx = prev let idx = prev
.binary_search_by_key(&child.range.start(), |range| range.range.start()) .binary_search_by_key(&child.range.start(), |range| range.range.start())
.unwrap_or_else(|x| x); .unwrap_or_else(|x| x);
prev.insert(idx, child); prev.insert(idx, child);
} else { }
_ => {
unreachable!("child range should be completely contained in parent range"); unreachable!("child range should be completely contained in parent range");
} }
} }
} }
} }
}
fn add(&mut self, range: HighlightedRange) { fn add(&mut self, range: HighlightedRange) {
self.stack self.stack