GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 14:02:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

typeanswer: 'simplify' by removing normalize_typed (requiring a bool parameter)

Browse source 
I'd prefer to keep this extra method.
This commit is contained in:
Andreas Reis 2024-09-30 01:27:26 +02:00
parent 2106c4306f
commit df2dd3394e
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
rslib/src/typeanswer.rs
View file

@ -50,7 +50,6 @@ trait DiffTrait {
fn get_expected_original(&self) -> Cow<str>; fn get_expected_original(&self) -> Cow<str>;
fn new(expected: &str, typed: &str) -> Self; fn new(expected: &str, typed: &str) -> Self;
fn normalize_typed(typed: &str) -> Vec<char>;
// Entry Point // Entry Point
fn to_html(&self) -> String { fn to_html(&self) -> String {
@ -108,8 +107,17 @@ trait DiffTrait {
} }
// Utility Functions // Utility Functions
fn normalize(string: &str) -> Vec<char> { fn normalize(string: &str, retain_combining: bool) -> Vec<char> {
normalize_to_nfkd(string).chars().collect() let binding = normalize_to_nfkd(string);
let chars = binding.chars();
if retain_combining {
chars.collect()
} else {
chars
.filter(|c| !unicode_normalization::char::is_combining_mark(*c))
.collect()
}
} }
fn slice(chars: &[char], start: usize, end: usize) -> String { fn slice(chars: &[char], start: usize, end: usize) -> String {
@ -166,13 +174,10 @@ impl DiffTrait for Diff {
fn new(expected: &str, typed: &str) -> Self { fn new(expected: &str, typed: &str) -> Self {
Self { Self {
typed: Self::normalize_typed(typed), typed: normalize(typed, true),
expected: normalize(&prepare_expected(expected)), expected: normalize(&prepare_expected(expected), true),
} }
} }
fn normalize_typed(typed: &str) -> Vec<char> {
normalize(typed)
}
fn render_expected_tokens(&self, tokens: &[DiffToken]) -> String { fn render_expected_tokens(&self, tokens: &[DiffToken]) -> String {
render_tokens(tokens) render_tokens(tokens)
@ -202,7 +207,7 @@ impl DiffTrait for DiffNonCombining {
let mut expected_stripped = String::new(); let mut expected_stripped = String::new();
// tokenized into "char+combining" for final rendering // tokenized into "char+combining" for final rendering
let mut expected_split: Vec<String> = Vec::new(); let mut expected_split: Vec<String> = Vec::new();
for c in normalize(&prepare_expected(expected)) { for c in normalize(&prepare_expected(expected), true) {
if unicode_normalization::char::is_combining_mark(c) { if unicode_normalization::char::is_combining_mark(c) {
if let Some(last) = expected_split.last_mut() { if let Some(last) = expected_split.last_mut() {
last.push(c); last.push(c);
@ -215,7 +220,7 @@ impl DiffTrait for DiffNonCombining {
Self { Self {
base: Diff { base: Diff {
typed: Self::normalize_typed(typed), typed: normalize(typed, false),
expected: expected_stripped.chars().collect(), expected: expected_stripped.chars().collect(),
}, },
expected_split, expected_split,
@ -223,13 +228,6 @@ impl DiffTrait for DiffNonCombining {
} }
} }
fn normalize_typed(typed: &str) -> Vec<char> {
normalize_to_nfkd(typed)
.chars()
.filter(|c| !unicode_normalization::char::is_combining_mark(*c))
.collect()
}
// Since the combining characters are still required learning content, use // Since the combining characters are still required learning content, use
// expected_split to show them directly in the "expected" line, rather than // expected_split to show them directly in the "expected" line, rather than
// having to otherwise e.g. include their field twice in the note template. // having to otherwise e.g. include their field twice in the note template.