Limit cloze nesting level #3264
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
Author
|
This error is printed with deeply nested clozes: I think the issue can still occur with less than 11 levels but not sure whether there's a better solution. |
Member
|
I had an alternative idea: diff --git a/rslib/src/cloze.rs b/rslib/src/cloze.rs
index 32b2c4921..4c78fbad3 100644
--- a/rslib/src/cloze.rs
+++ b/rslib/src/cloze.rs
@@ -161,11 +161,15 @@ fn parse_text_with_clozes(text: &str) -> Vec<TextOrCloze<'_>> {
let mut output = vec![];
for token in tokenize(text) {
match token {
- Token::OpenCloze(ordinal) => open_clozes.push(ExtractedCloze {
- ordinal,
- nodes: Vec::with_capacity(1), // common case
- hint: None,
- }),
+ Token::OpenCloze(ordinal) => {
+ if open_clozes.len() < 3 {
+ open_clozes.push(ExtractedCloze {
+ ordinal,
+ nodes: Vec::with_capacity(1), // common case
+ hint: None,
+ })
+ }
+ }
Token::Text(mut text) => {
if let Some(cloze) = open_clozes.last_mut() {
// extract hint if foundBecause the limiting is done earlier and is at a lower limit, I'm hoping this will address the protobuf error you're getting (presumably we're serialising a deeply-nested list). It also makes it more obvious when the limit has been exceeded (by breaking cloze rendering), instead of only failing to encode entities. WDYT? |
Member
|
Thanks Abdo! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #3189
The source of the issue appears to be encode_attribute(). Commenting out extract_av_tags() doesn't seem to make a difference, so I guess no change is required there.