Skip to content

Offline, privacy-first grammar checker. Fast, open-source, Rust-powered

fix(core): correct capitalization with contractions with accidental semicolons (#1917)

Elijah Potter1f67b53d8767
diff --git a/harper-core/src/linting/semicolon_apostrophe.rs b/harper-core/src/linting/semicolon_apostrophe.rs
index 2fc6482fe..44e53dcc3 100644
--- a/harper-core/src/linting/semicolon_apostrophe.rs
+++ b/harper-core/src/linting/semicolon_apostrophe.rs
@@ -40,14 +40,15 @@ impl ExprLinter for SemicolonApostrophe {
ending.span.get_content_string(src).to_lowercase()
);
- let lettercase_template_char_slice = base.span.get_content(src);
+ let mut lettercase_template = base.span.get_content(src).to_vec();
+ lettercase_template.extend_from_slice(ending.span.get_content(src));
Some(Lint {
span: whole_span,
lint_kind: LintKind::Typo,
suggestions: vec![Suggestion::replace_with_match_case(
replacement_str.chars().collect(),
- lettercase_template_char_slice,
+ &lettercase_template,
)],
message: format!("Did you mean `{replacement_str}`?"),
priority: 57,
@@ -116,4 +117,9 @@ mod tests {
"Let's see if we've fixed patrakov's bug. Fun wasn't it?",
)
}
+
+ #[test]
+ fn corrects_ive_with_correct_capitalization() {
+ assert_suggestion_result("I;ve", SemicolonApostrophe::default(), "I've");
+ }
}
diff --git a/harper-core/src/linting/suggestion.rs b/harper-core/src/linting/suggestion.rs
index 4f8931e56..c4a683f9d 100644
--- a/harper-core/src/linting/suggestion.rs
+++ b/harper-core/src/linting/suggestion.rs
@@ -40,12 +40,10 @@ impl Suggestion {
.copied()
.chain(template_term),
) {
- if v.is_ascii_uppercase() != t.is_ascii_uppercase() {
- if t.is_uppercase() {
- *v = v.to_ascii_uppercase();
- } else {
- *v = v.to_ascii_lowercase();
- }
+ if t.is_uppercase() {
+ *v = v.to_ascii_uppercase();
+ } else {
+ *v = v.to_ascii_lowercase();
}
}