Skip to content

Fix \w not matching UTF-8 continuation bytes #1001

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
Leonard Hecker (lhecker) merged 2 commits into from
Nov 2, 2026
Merged

Fix \w not matching UTF-8 continuation bytes #1001

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3468ac
Fix \w not matching UTF-8 continuation bytes
AkiPoh Nov 1, 2026
627e191
Improve comments
lhecker Nov 2, 2026
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
9 changes: 4 additions & 5 deletions crates/lsh/src/compiler/regex.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@
//!
//! # Gotchas
//!
//! - `\w` includes bytes 0xC2-0xF4 (UTF-8 leading bytes) so that it can consume multibyte characters.
//! - `\w` includes bytes 0xC2-0xF4 (UTF-8 leading bytes) and 0x80-0xBF
//! (UTF-8 continuation bytes), so that it can consume multibyte characters.
//! This isn't Unicode-correct but works for identifiers in most programming languages.
//! - We don't create loops to keep the IR generation and optimization simple.
//! This means that e.g. (a|b)+ is not supported. For now that's fine.
Expand All @@ -50,16 +51,14 @@ use super::charset::Charset;
use super::ir::*;
use crate::runtime::Register;

// 0xC2-0xF4 are UTF-8 leading bytes for multibyte sequences. Including them lets
// `\w+` consume entire multibyte characters, which is important for identifiers
// containing non-ASCII letters (e.g., `naïve`, `café`).
const ASCII_WORD_CHARSET: Charset = {
let mut charset = Charset::no();
charset.set_range(b'0'..=b'9', true);
charset.set_range(b'A'..=b'Z', true);
charset.set_range(b'_'..=b'_', true);
charset.set_range(b'a'..=b'z', true);
charset.set_range(0xC2..=0xF4, true);
charset.set_range(0xC2..=0xF4, true); // UTF8 leading bytes
charset.set_range(0x80..=0xBF, true); // UTF8 continuation bytes
charset
};

Expand Down
Loading