Skip to content

Use byte range instead of char count for delim run bounds #956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Martin1887 merged 1 commit into from
Sep 10, 2024
Merged

Use byte range instead of char count for delim run bounds #956

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions pulldown-cmark/src/firstpass.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2282,7 +2282,7 @@ fn delim_run_can_open(
ix: usize,
mode: TableParseMode,
) -> bool {
let next_char = if let Some(c) = suffix.chars().nth(run_len) {
let next_char = if let Some(c) = suffix[run_len..].chars().next() {
c
} else {
return false;
Expand All @@ -2294,28 +2294,28 @@ fn delim_run_can_open(
return true;
}
if mode == TableParseMode::Active {
if s[..ix].ends_with('|') && !s[..ix].ends_with(r"\|") {
if s.as_bytes()[..ix].ends_with(b"|") && !s.as_bytes()[..ix].ends_with(br"\|") {
return true;
}
if next_char == '|' {
return false;
}
}
let delim = suffix.chars().next().unwrap();
let delim = suffix.bytes().next().unwrap();
// `*` and `~~` can be intraword, `_` and `~` cannot
if delim == '*' && !is_punctuation(next_char) {
if delim == b'*' && !is_punctuation(next_char) {
return true;
}
if delim == '~' && run_len > 1 {
if delim == b'~' && run_len > 1 {
return true;
}
let prev_char = s[..ix].chars().last().unwrap();
if delim == '~' && prev_char == '~' && !is_punctuation(next_char) {
if delim == b'~' && prev_char == '~' && !is_punctuation(next_char) {
return true;
}

prev_char.is_whitespace()
|| is_punctuation(prev_char) && (delim != '\'' || ![']', ')'].contains(&prev_char))
|| is_punctuation(prev_char) && (delim != b'\'' || ![']', ')'].contains(&prev_char))
}

/// Determines whether the delimiter run starting at given index is
Expand All @@ -2335,25 +2335,25 @@ fn delim_run_can_close(
if prev_char.is_whitespace() {
return false;
}
let next_char = if let Some(c) = suffix.chars().nth(run_len) {
let next_char = if let Some(c) = suffix[run_len..].chars().next() {
c
} else {
return true;
};
if mode == TableParseMode::Active {
if s[..ix].ends_with('|') && !s[..ix].ends_with(r"\|") {
if s.as_bytes()[..ix].ends_with(b"|") && !s.as_bytes()[..ix].ends_with(br"\|") {
return false;
}
if next_char == '|' {
return true;
}
}
let delim = suffix.chars().next().unwrap();
let delim = suffix.bytes().next().unwrap();
// `*` and `~~` can be intraword, `_` and `~` cannot
if (delim == '*' || (delim == '~' && run_len > 1)) && !is_punctuation(prev_char) {
if (delim == b'*' || (delim == b'~' && run_len > 1)) && !is_punctuation(prev_char) {
return true;
}
if delim == '~' && prev_char == '~' {
if delim == b'~' && prev_char == '~' {
return true;
}

Expand Down