From e901d3a1cc285db9740e0e68a1e4225234377015 Mon Sep 17 00:00:00 2001
From: xzfc <5121426+xzfc@users.noreply.github.com>
Date: Thu, 1 Feb 2024 00:46:16 +0000
Subject: [PATCH] Call unraw() on idents (#186)

This changes argh_derive to allow using raw struct field identifiers
(e.g., `r#move`) as long names.

Closes #124
---
 argh/tests/lib.rs      | 14 ++++++++++++++
 argh_derive/src/lib.rs |  4 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/argh/tests/lib.rs b/argh/tests/lib.rs
index 6fed023..8119917 100644
--- a/argh/tests/lib.rs
+++ b/argh/tests/lib.rs
@@ -364,6 +364,20 @@ fn explicit_long_value_for_option() {
     assert_eq!(cmd.x, 5);
 }
 
+#[test]
+fn raw_identifier() {
+    #[derive(FromArgs, Debug)]
+    /// Short description
+    struct Cmd {
+        #[argh(switch)]
+        /// whether to move the file
+        r#move: bool,
+    }
+
+    let cmd = Cmd::from_args(&["cmdname"], &["--move"]).unwrap();
+    assert!(cmd.r#move);
+}
+
 /// Test that descriptions can start with an initialism despite
 /// usually being required to start with a lowercase letter.
 #[derive(FromArgs)]
diff --git a/argh_derive/src/lib.rs b/argh_derive/src/lib.rs
index 4cbfcc3..4663935 100644
--- a/argh_derive/src/lib.rs
+++ b/argh_derive/src/lib.rs
@@ -3,6 +3,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+use syn::ext::IdentExt as _;
+
 /// Implementation of the `FromArgs` and `argh(...)` derive attributes.
 ///
 /// For more thorough documentation, see the `argh` crate itself.
@@ -195,7 +197,7 @@ impl<'a> StructField<'a> {
         let long_name = match kind {
             FieldKind::Switch | FieldKind::Option => {
                 let long_name = attrs.long.as_ref().map(syn::LitStr::value).unwrap_or_else(|| {
-                    let kebab_name = to_kebab_case(&name.to_string());
+                    let kebab_name = to_kebab_case(&name.unraw().to_string());
                     check_long_name(errors, name, &kebab_name);
                     kebab_name
                 });