[integ] update C++ matcher for spdlog (ttiimm#11)

Author: tstack

src/lib.rs

@@ -254,7 +254,7 @@ impl SourceLanguage {
                         (compound_statement
                             (expression_statement
                                 (call_expression
-                                    function: (identifier) @fname
+                                    function: (_) @fname
                                     arguments: (argument_list (string_literal) @arguments)
                                 )
                             )
@@ -458,7 +458,7 @@ pub fn extract_logging(sources: &[CodeSource], tracker: &ProgressTracker) -> Vec
                             }
                         }
                     }
-                    _ => println!("ignoring {}", result.kind),
+                    _ => eprintln!("ignoring {}", result.kind),
                 }
                 // println!("*****");
             }

src/source_ref.rs

@@ -96,7 +96,7 @@ static JAVA_PLACEHOLDER_REGEX: LazyLock<Regex> =
     LazyLock::new(|| Regex::new(r#"\\?\{.*}"#).unwrap());
 
 static CPP_PLACEHOLDER_REGEX: LazyLock<Regex> =
-    LazyLock::new(|| Regex::new(r#"%[-+ #0]*\d*(\.\d+)?[hlLzjt]*[diuoxXfFeEgGaAcspn%]"#).unwrap());
+    LazyLock::new(|| Regex::new(r#"%[-+ #0]*\d*(?:\.\d+)?[hlLzjt]*[diuoxXfFeEgGaAcspn%]|\{(?:([a-zA-Z_][a-zA-Z0-9_.]*)|(\d+))?\s*(?::[^}]*)?}"#).unwrap());
 
 fn placeholder_regex_for(language: SourceLanguage) -> &'static Regex {
     match language {
@@ -212,6 +212,17 @@ mod tests {
         assert_eq!(args[0], FormatArgument::Placeholder);
     }
 
+    #[test]
+    fn test_build_matcher_cpp_spdlog() {
+        let (matcher, _pat, args) =
+            build_matcher("they are {0:d} years old", SourceLanguage::Cpp).unwrap();
+        assert_eq!(
+            Regex::new(r#"^they are (.+) years old$"#).unwrap().as_str(),
+            matcher.as_str()
+        );
+        assert_eq!(args[0], FormatArgument::Positional(0));
+    }
+
     #[test]
     fn test_build_matcher_none() {
         let build_res = build_matcher("%s", SourceLanguage::Cpp);