Transform fields contained into _format into strings

This commit is contained in:
ManyTheFish 2024-01-11 12:43:56 +01:00
parent 81b6128b29
commit 86270e6878
2 changed files with 6 additions and 11 deletions

View File

@ -951,11 +951,6 @@ fn format_value<'a>(
infos: &mut Vec<MatchBounds>, infos: &mut Vec<MatchBounds>,
compute_matches: bool, compute_matches: bool,
) -> Value { ) -> Value {
// early skip recursive function if nothing needs to be changed.
if !format_options.as_ref().map_or(false, FormatOptions::should_format) && !compute_matches {
return value;
}
match value { match value {
Value::String(old_string) => { Value::String(old_string) => {
let mut matcher = builder.build(&old_string); let mut matcher = builder.build(&old_string);
@ -1023,7 +1018,7 @@ fn format_value<'a>(
let value = matcher.format(format_options); let value = matcher.format(format_options);
Value::String(value.into_owned()) Value::String(value.into_owned())
} }
None => Value::Number(number), None => Value::String(s),
} }
} }
value => value, value => value,

View File

@ -94,7 +94,7 @@ async fn set_and_search() {
"id": 1, "id": 1,
"content": "Mac & cheese", "content": "Mac & cheese",
"_formatted": { "_formatted": {
"id": 1, "id": "1",
"content": "Mac <em>&</em> cheese" "content": "Mac <em>&</em> cheese"
} }
}, },
@ -102,7 +102,7 @@ async fn set_and_search() {
"id": 3, "id": 3,
"content": "Mac&sep&&sepcheese", "content": "Mac&sep&&sepcheese",
"_formatted": { "_formatted": {
"id": 3, "id": "3",
"content": "Mac&sep<em>&</em>&sepcheese" "content": "Mac&sep<em>&</em>&sepcheese"
} }
} }
@ -254,7 +254,7 @@ async fn advanced_synergies() {
"id": 1, "id": 1,
"content": "J.R.R. Tolkien", "content": "J.R.R. Tolkien",
"_formatted": { "_formatted": {
"id": 1, "id": "1",
"content": "<em>J.R.R.</em> Tolkien" "content": "<em>J.R.R.</em> Tolkien"
} }
}, },
@ -262,7 +262,7 @@ async fn advanced_synergies() {
"id": 2, "id": 2,
"content": "J. R. R. Tolkien", "content": "J. R. R. Tolkien",
"_formatted": { "_formatted": {
"id": 2, "id": "2",
"content": "<em>J. R. R.</em> Tolkien" "content": "<em>J. R. R.</em> Tolkien"
} }
}, },
@ -270,7 +270,7 @@ async fn advanced_synergies() {
"id": 3, "id": 3,
"content": "jrr Tolkien", "content": "jrr Tolkien",
"_formatted": { "_formatted": {
"id": 3, "id": "3",
"content": "<em>jrr</em> Tolkien" "content": "<em>jrr</em> Tolkien"
} }
} }