Merge Nullus157#20

20: Support non-ascii identifiers r=Nemo157 a=Nemo157

Fixes Nullus157#19 

Co-authored-by: Wim Looman <[email protected]>

Author: bors[bot]

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "stylish-core"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 repository = "https://github.com/Nullus157/stylish-rs"
 license = "MIT OR Apache-2.0"
@@ -21,7 +21,7 @@ stack_dst.default-features = false
 stack_dst.version = "0.6.0"
 stylish-macros.default-features = false
 stylish-macros.path = "../macros"
-stylish-macros.version = "=0.1.0"
+stylish-macros.version = "=0.1.1"
 stylish-macros.optional = true
 stylish-style.default-features = false
 stylish-style.path = "../style"

core/Cargo.toml

@@ -2,4 +2,5 @@
 allow = [
   "MIT",
   "Apache-2.0",
+  "Unicode-DFS-2016",
 ]

deny.toml

@@ -1,6 +1,6 @@
 [package]
 name = "stylish-macros"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
 repository = "https://github.com/Nullus157/stylish-rs"
 license = "MIT OR Apache-2.0"
@@ -13,7 +13,7 @@ proc-macro = true
 [dependencies]
 nom.default-features = false
 nom.features = ["std"]
-nom.version = "6.0.1"
+nom.version = "7.1.1"
 proc-macro2.default-features = false
 proc-macro2.version = "1.0.24"
 quote.default-features = false
@@ -25,6 +25,8 @@ stylish-style.default-features = false
 stylish-style.features = ["alloc"]
 stylish-style.version = "=0.1.0"
 stylish-style.path = "../style"
+unicode-ident.default-features = false
+unicode-ident.version = "1.0.3"
 
 [package.metadata.docs.rs]
 all-features = true

macros/Cargo.toml

@@ -3,7 +3,7 @@ use std::str::FromStr;
 use nom::{
     branch::alt,
     bytes::complete::tag,
-    character::complete::{alpha1, alphanumeric1, anychar, digit1, none_of},
+    character::complete::{anychar, char, digit1, none_of, satisfy},
     combinator::{all_consuming, cut, map, map_res, opt, recognize, value},
     multi::{many0, many1, separated_list0},
     sequence::{delimited, pair, preceded, terminated},
@@ -13,8 +13,8 @@ use stylish_style::{Background, Color, Foreground, Intensity, Restyle, Style, St
 
 fn identifier(input: &str) -> IResult<&str, &str> {
     recognize(pair(
-        alt((alpha1, tag("_"))),
-        many0(alt((alphanumeric1, tag("_")))),
+        alt((satisfy(unicode_ident::is_xid_start), char('_'))),
+        many0(satisfy(unicode_ident::is_xid_continue)),
     ))(input)
 }
 

macros/src/format.rs

@@ -1,3 +1,5 @@
+#![allow(uncommon_codepoints)]
+
 #[cfg(not(feature = "_tests"))]
 compile_error!("please test with --all-features");
 
@@ -183,6 +185,14 @@ mod tests {
         );
     }
 
+    #[test]
+    fn non_ascii_idents() {
+        let 𓀄 = 5;
+        assert_eq!(stylish::plain::format!("{𓀄}"), "5");
+        assert_eq!(stylish::plain::format!("{}", 𓀄), "5");
+        assert_eq!(stylish::plain::format!("{𓀄}", 𓀄 = 5), "5");
+    }
+
     #[cfg(stylish_proc_macro_expand)]
     #[test]
     fn extended_builtin_macros() {