leyoda/pop-launcher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(calc): Improve string slicing of complex equations

Browse source
This commit is contained in:
Michael Aaron Murphy 2021-08-18 22:39:11 +02:00
parent 0e113131d3
commit 74026fd847
1 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

25
plugins/src/calc/mod.rs
View file

@ -123,6 +123,7 @@ async fn qcalc(regex: &mut Regex, expression: &str) -> Option<String> {
}
let normalized = regex.replace_all(line, "");
let mut normalized = normalized.as_ref();
if has_issue(&normalized) {
return None;
@ -131,6 +132,22 @@ async fn qcalc(regex: &mut Regex, expression: &str) -> Option<String> {
output.push(' ');
}
if normalized.starts_with('(') {
let mut level = 1;
for (byte_pos, character) in normalized[1..].char_indices() {
if character == '(' {
level += 1;
} else if character == ')' {
level -= 1;
if level == 0 {
normalized = &normalized[byte_pos + 2..].trim_start();
break;
}
}
}
}
let cut = if let Some(pos) = normalized.find('=') {
pos + 1
} else if let Some(pos) = normalized.find('≈') {
@ -139,7 +156,13 @@ async fn qcalc(regex: &mut Regex, expression: &str) -> Option<String> {
return None;
};
output.push_str(normalized[cut..].trim_start());
normalized = normalized[cut..].trim_start();
if normalized.starts_with('(') && normalized.ends_with(')') {
normalized = &normalized[1..normalized.len() - 1];
}
output.push_str(normalized);
};
}