Skip to content

python.lsh: Avoid capturing underscores as numeric literals #981

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 3 commits into from
Oct 12, 2026
Merged

python.lsh: Avoid capturing underscores as numeric literals #981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
699f3ee
python.lsh: Avoid capturing underscores as numeric literals
jagourq Oct 7, 2026
7af7db5
Charsets are free real estate
lhecker Oct 7, 2026
a58a9bc
Fix all the others too
lhecker Oct 9, 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
2 changes: 1 addition & 1 deletion crates/lsh/definitions/c.lsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pub fn c() {
yield constant.language;
} else if /(?:bool|char|double|float|int|long|short|signed|unsigned|void|_BitInt|_Bool|_Complex)\>/ {
yield storage.type;
} else if /(?i:-?(?:0x[\da-f']+|0b[01']+|[\d']+\.?[\d']*|\.[\d']+)(?:[ep][+-]?[\d']+)?[flu]*)/ {
} else if /(?i:-?(?:0x[\da-f']+|0b[01']+|[\d']+\.?[\d']*|\.[\d']+)(?:[ep][+-]?[\d']+)?[flu]*)\>/ {
if /\w+/ {
// Invalid numeric literal
} else {
Expand Down
2 changes: 1 addition & 1 deletion crates/lsh/definitions/cpp.lsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pub fn cpp() {
yield constant.language;
} else if /(?:auto|bool|char8_t|char16_t|char32_t|char|double|float|int|long|short|signed|unsigned|void|wchar_t)\>/ {
yield storage.type;
} else if /(?i:-?(?:0x[\da-f']+|0b[01']+|[\d']+\.?[\d']*|\.[\d']+)(?:[ep][+-]?[\d']+)?[fluz]*)/ {
} else if /(?i:-?(?:0x[\da-f']+|0b[01']+|[\d']+\.?[\d']*|\.[\d']+)(?:[ep][+-]?[\d']+)?[fluz]*)\>/ {
if /\w+/ {
// Invalid numeric literal
} else {
Expand Down
2 changes: 1 addition & 1 deletion crates/lsh/definitions/csharp.lsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ pub fn csharp() {
yield constant.language;
} else if /(?:bool|byte|char|decimal|double|float|int|long|nint|nuint|object|sbyte|short|string|uint|ulong|ushort|void)\>/ {
yield storage.type;
} else if /(?i:-?(?:0x[\da-f_]+|0b[01_]+|[\d_]+\.?[\d_]*|\.[\d_]+)(?:e[+-]?[\d_]+)?[dflmu]{0,2})/ {
} else if /(?i:-?(?:0x[\da-f_]+|0b[01_]+|\d+[\d_]*\.?[\d_]*|\.\d+[\d_]*)(?:e[+-]?[\d_]+)?[dflmu]{0,2})\>/ {
if /\w+/ {
// Invalid numeric literal
} else {
Expand Down
2 changes: 1 addition & 1 deletion crates/lsh/definitions/fsharp.lsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ pub fn fsharp() {
yield constant.language;
} else if /(?:bigint|bool|byte|char|decimal|double|exn|float32|float|int8|int16|int32|int64|int|nativeint|obj|sbyte|single|string|uint8|uint16|uint32|uint64|unativeint|uint|unit|void)\>/ {
yield storage.type;
} else if /(?i:-?(?:0x[\da-f_]+|0b[01_]+|0o[0-7_]+|[\d_]+\.?[\d_]*|\.[\d_]+)(?:e[+-]?[\d_]+)?[filmnsuy]{0,2})/ {
} else if /(?i:-?(?:0x[\da-f_]+|0b[01_]+|0o[0-7_]+|\d+[\d_]*\.?[\d_]*|\.\d+[\d_]*)(?:e[+-]?[\d_]+)?[filmnsuy]{0,2})\>/ {
if /\w+/ {
// Invalid numeric literal
} else {
Expand Down
2 changes: 1 addition & 1 deletion crates/lsh/definitions/go.lsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pub fn go() {
yield constant.language;
} else if /(?:any|bool|byte|comparable|complex128|complex64|error|float32|float64|int8|int16|int32|int64|int|rune|string|uint8|uint16|uint32|uint64|uintptr|uint)\>/ {
yield storage.type;
} else if /(?i:-?(?:0x[\da-f_]+|0b[01_]+|0o[0-7_]+|\d[\d_]*\.?[\d_]*|\.[\d_]+)(?:[ep][+-]?[\d_]+)?i?)/ {
} else if /(?i:-?(?:0x[\da-f_]+|0b[01_]+|0o[0-7_]+|\d[\d_]*\.?[\d_]*|\.\d+[\d_]*)(?:[ep][+-]?[\d_]+)?i?)\>/ {
if /\w+/ {
// Invalid numeric literal
} else {
Expand Down
2 changes: 1 addition & 1 deletion crates/lsh/definitions/java.lsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pub fn java() {
yield constant.language;
} else if /(?:boolean|byte|char|double|float|int|long|short|void)\>/ {
yield storage.type;
} else if /(?i:-?(?:0x[\da-f_]+|0b[01_]+|[\d_]+\.?[\d_]*|\.[\d_]+)(?:e[+-]?[\d_]+)?[dfl]?)/ {
} else if /(?i:-?(?:0x[\da-f_]+|0b[01_]+|\d+[\d_]*\.?[\d_]*|\.\d+[\d_]*)(?:e[+-]?[\d_]+)?[dfl]?)\>/ {
if /\w+/ {
// Invalid numeric literal
} else {
Expand Down
2 changes: 1 addition & 1 deletion crates/lsh/definitions/javascript.lsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ pub fn javascript() {
yield keyword.other;
} else if /(?:true|false|null|undefined|NaN|Infinity)\>/ {
yield constant.language;
} else if /(?i:-?(?:0x[\da-fA-F_]+|0b[01_]+|0o[0-7_]+|[\d_]+\.?[\d_]*|\.[\d_]+)(?:e[+-]?[\d_]+)?)n?/ {
} else if /(?i:-?(?:0x[\da-fA-F_]+|0b[01_]+|0o[0-7_]+|\d+[\d_]*\.?[\d_]*|\.\d+[\d_]*)(?:e[+-]?[\d_]+)?)n?\>/ {
if /\w+/ {
// Invalid numeric literal
} else {
Expand Down
2 changes: 1 addition & 1 deletion crates/lsh/definitions/odin.lsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pub fn odin() {
yield constant.language;
} else if /(?:any|bool|complex(?:32|64|128)|cstring|int|quaternion(?:64|128|256)|rawptr|rune|string|typeid|uintptr|uint|(?:[iu](?:8|16|32|64|128)|f(?:16|32|64)|b(?:8|16|32|64))(?:be|le)?)\>/ {
yield storage.type;
} else if /-?(?:0[xh][\da-fA-F_]+|0b[01_]+|0o[0-7_]+|\d[\d_]*\.[\d_]+|\d[\d_]*|\.\d[\d_]*)(?:[eE][+-]?[\d_]+)?[ijk]?/ {
} else if /-?(?i:0[xh][\da-fA-F_]+|0b[01_]+|0o[0-7_]+|\d[\d_]*\.\d+[\d_]*|\d[\d_]*|\.\d[\d_]*)(?i:e[+-]?[\d_]+)?[ijk]?\>/ {
if /\w+/ {
// Invalid numeric literal
} else {
Expand Down
2 changes: 1 addition & 1 deletion crates/lsh/definitions/python.lsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ pub fn python() {
yield keyword.other;
} else if /(?:True|False|None)\>/ {
yield constant.language;
} else if /(?i:-?(?:0x[\da-fA-F_]+|0b[01_]+|0o[0-7_]+|[\d_]+\.?[\d_]*|\.[\d_]+)(?:e[+-]?[\d_]+)?j?)/ {
} else if /(?i:-?(?:0x[\da-fA-F_]+|0b[01_]+|0o[0-7_]+|\d+[\d_]*\.?[\d_]*|\.\d+[\d_]*)(?i:e[+-]?[\d_]+)?j?)\>/ {
if /\w+/ {
// Invalid numeric literal
} else {
Expand Down
2 changes: 1 addition & 1 deletion crates/lsh/definitions/ruby.lsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ pub fn ruby() {
yield keyword.other;
} else if /(?:true|false|nil)\>/ {
yield constant.language;
} else if /(?i:-?(?:0x[\da-f_]+|0b[01_]+|0o[0-7_]+|[\d_]+(?:\.[\d_]+)?(?:e[+-]?[\d_]+)?)r?i?)/ {
} else if /(?i:-?(?:0x[\da-f_]+|0b[01_]+|0o[0-7_]+|\d+[\d_]*(?:\.\d+[\d_]*)?(?:e[+-]?[\d_]+)?)r?i?)\>/ {
// Floats need digits on both sides of the dot, so that `1..2` and
// `1.upto(2)` don't swallow the dot.
if /\w+/ {
Expand Down
2 changes: 1 addition & 1 deletion crates/lsh/definitions/rust.lsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ pub fn rust() {
yield keyword.other;
} else if /(?:false|true)\>/ {
yield constant.language;
} else if /(?i:-?(?:0x[\da-fA-F_]+|0b[01_]+|0o[0-7_]+|[\d_]+\.?[\d_]*)(?:e[+-]?[\d_]+)?)(?:[iu](?:8|16|32|64|128|size)|f32|f64)?/ {
} else if /(?i:-?(?:0x[\da-fA-F_]+|0b[01_]+|0o[0-7_]+|\d+[\d_]*\.?[\d_]*)(?i:e[+-]?[\d_]+)?)(?:[iu](?:8|16|32|64|128|size)|f32|f64)?\>/ {
if /\w+/ {
// Invalid numeric literal
} else {
Expand Down
6 changes: 3 additions & 3 deletions crates/lsh/definitions/toml.lsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ pub fn toml() {
yield constant.language;
} else if /\+?-?(?:inf|nan)\>/ {
yield constant.language;
} else if /(?i:\d{4}-\d{2}-\d{2}(?:[Tt ]\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:z|[+-]\d{2}:\d{2})?)?)/ {
} else if /(?i:\d{4}-\d{2}-\d{2}(?:[Tt ]\d{2}:\d{2}:\d{2}(?:\.\d+)?(?:z|[+-]\d{2}:\d{2})?)?)\>/ {
// Offset date-time, local date-time and local date.
yield constant.numeric;
} else if /\d{2}:\d{2}:\d{2}(?:\.\d+)?/ {
} else if /\d{2}:\d{2}:\d{2}(?:\.\d+)?\>/ {
// Local time.
yield constant.numeric;
} else if /(?i:\+?-?(?:0x[\da-fA-F_]+|0b[01_]+|0o[0-7_]+|[\d_]+\.?[\d_]*|\.[\d_]+)(?:e[+-]?[\d_]+)?)/ {
} else if /(?i:\+?-?(?:0x[\da-fA-F_]+|0b[01_]+|0o[0-7_]+|\d+[\d_]*\.?[\d_]*|\.\d+[\d_]*)(?:e[+-]?[\d_]+)?)\>/ {
if /\w+/ {
// Not a number after all.
} else {
Expand Down
2 changes: 1 addition & 1 deletion crates/lsh/definitions/yaml.lsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ pub fn yaml() {
} else {
yield constant.language;
}
} else if /[+-]?(?i:\.inf|\.nan|(?:0x[\da-f_]+|0o[0-7_]+|0b[01_]+|\d+\.?\d*|\.\d+)(?:e[+-]?\d+)?)/ {
} else if /[+-]?(?i:\.inf|\.nan|(?:0x[\da-f_]+|0o[0-7_]+|0b[01_]+|\d+\.?\d*|\.\d+)(?i:e[+-]?\d+)?)\>/ {
if /\s*[^\s#]+[^#]*/ {
yield string;
} else {
Expand Down
2 changes: 1 addition & 1 deletion crates/lsh/definitions/zig.lsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pub fn zig() {
yield storage.type;
} else if /c_(?:char|short|ushort|int|uint|longdouble|longlong|long|ulonglong|ulong)\>/ {
yield storage.type;
} else if /-?(?i:0x[\da-f_]+(?:\.[\da-f_]+)?(?:p[+-]?[\d_]+)?|0b[01_]+|0o[0-7_]+|\d[\d_]*(?:\.[\d_]+)?(?:e[+-]?[\d_]+)?)/ {
} else if /-?(?i:0x[\da-f_]+(?:\.[\da-f_]+)?(?:p[+-]?\d+[\d_]*)?|0b[01_]+|0o[0-7_]+|\d[\d_]*(?:\.\d+[\d_]*)?(?i:e[+-]?[\d_]+)?)\>/ {
if /\w+/ {
// Invalid numeric literal
} else {
Expand Down
Loading