diff --git a/crates/lsh/definitions/c.lsh b/crates/lsh/definitions/c.lsh
index 40b075e40b9..22483957e31 100644
--- a/crates/lsh/definitions/c.lsh
+++ b/crates/lsh/definitions/c.lsh
@@ -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 {
diff --git a/crates/lsh/definitions/cpp.lsh b/crates/lsh/definitions/cpp.lsh
index 19f139f4964..afb2a2d4bb0 100644
--- a/crates/lsh/definitions/cpp.lsh
+++ b/crates/lsh/definitions/cpp.lsh
@@ -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 {
diff --git a/crates/lsh/definitions/csharp.lsh b/crates/lsh/definitions/csharp.lsh
index 16e1d9b9bc1..afa97a4eb7b 100644
--- a/crates/lsh/definitions/csharp.lsh
+++ b/crates/lsh/definitions/csharp.lsh
@@ -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 {
diff --git a/crates/lsh/definitions/fsharp.lsh b/crates/lsh/definitions/fsharp.lsh
index 6ec32ab4531..bd4537cc574 100644
--- a/crates/lsh/definitions/fsharp.lsh
+++ b/crates/lsh/definitions/fsharp.lsh
@@ -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 {
diff --git a/crates/lsh/definitions/go.lsh b/crates/lsh/definitions/go.lsh
index 8b1d82c5279..ae6abf1b3c4 100644
--- a/crates/lsh/definitions/go.lsh
+++ b/crates/lsh/definitions/go.lsh
@@ -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 {
diff --git a/crates/lsh/definitions/java.lsh b/crates/lsh/definitions/java.lsh
index 8c664ef8ee1..0b996ee978a 100644
--- a/crates/lsh/definitions/java.lsh
+++ b/crates/lsh/definitions/java.lsh
@@ -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 {
diff --git a/crates/lsh/definitions/javascript.lsh b/crates/lsh/definitions/javascript.lsh
index 316c6dd9157..8fbd81bf218 100644
--- a/crates/lsh/definitions/javascript.lsh
+++ b/crates/lsh/definitions/javascript.lsh
@@ -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 {
diff --git a/crates/lsh/definitions/odin.lsh b/crates/lsh/definitions/odin.lsh
index a8e13ea128c..0a915bfdbb5 100644
--- a/crates/lsh/definitions/odin.lsh
+++ b/crates/lsh/definitions/odin.lsh
@@ -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 {
diff --git a/crates/lsh/definitions/python.lsh b/crates/lsh/definitions/python.lsh
index 43ee2e69913..345279bfe53 100644
--- a/crates/lsh/definitions/python.lsh
+++ b/crates/lsh/definitions/python.lsh
@@ -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 {
diff --git a/crates/lsh/definitions/ruby.lsh b/crates/lsh/definitions/ruby.lsh
index 37b95e95c38..6dd4842282b 100644
--- a/crates/lsh/definitions/ruby.lsh
+++ b/crates/lsh/definitions/ruby.lsh
@@ -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+/ {
diff --git a/crates/lsh/definitions/rust.lsh b/crates/lsh/definitions/rust.lsh
index 3419c2e81d8..0f28f5fb9bc 100644
--- a/crates/lsh/definitions/rust.lsh
+++ b/crates/lsh/definitions/rust.lsh
@@ -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 {
diff --git a/crates/lsh/definitions/toml.lsh b/crates/lsh/definitions/toml.lsh
index 4b3f9feb149..f13d0dfb00c 100644
--- a/crates/lsh/definitions/toml.lsh
+++ b/crates/lsh/definitions/toml.lsh
@@ -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 {
diff --git a/crates/lsh/definitions/yaml.lsh b/crates/lsh/definitions/yaml.lsh
index 7a6c0de3e77..512a91d6bd2 100644
--- a/crates/lsh/definitions/yaml.lsh
+++ b/crates/lsh/definitions/yaml.lsh
@@ -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 {
diff --git a/crates/lsh/definitions/zig.lsh b/crates/lsh/definitions/zig.lsh
index acea3329e67..04062e7cc01 100644
--- a/crates/lsh/definitions/zig.lsh
+++ b/crates/lsh/definitions/zig.lsh
@@ -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 {