From ded5f34b7fb6d1f8b0dc2a4c6dbc1ce9e85d1c4d Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <git@ortham.net>
Date: Sun, 23 Mar 2025 15:41:53 +0000
Subject: [PATCH] Improve regex compatibility

Neither of the changed regexes were accepted by the regex crate, which thought the fmt regex looked like an invalid repetition count (e.g. "a{5}") and which doesn't support negative lookahead.
---
 src/metadata/message.rs | 2 +-
 src/plugin/mod.rs       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/metadata/message.rs b/src/metadata/message.rs
index 594be6f5..b146107d 100644
--- a/src/metadata/message.rs
+++ b/src/metadata/message.rs
@@ -326,7 +326,7 @@ impl TryFrom<&MarkedYaml> for Message {
 
         if !subs.is_empty() {
             static FMT_REGEX: LazyLock<Regex> = LazyLock::new(|| {
-                Regex::new(r"{(\d+)}").expect("hardcoded fmt placeholder regex should be valid")
+                Regex::new(r"\{(\d+)\}").expect("hardcoded fmt placeholder regex should be valid")
             });
 
             for mc in &mut content {
diff --git a/src/plugin/mod.rs b/src/plugin/mod.rs
index c3378d74..cb476832 100644
--- a/src/plugin/mod.rs
+++ b/src/plugin/mod.rs
@@ -415,9 +415,9 @@ fn extract_version(description: &str) -> Result<Option<String>, Box<fancy_regex:
         // The string below matches the range of version strings supported by
         // Pseudosem v1.0.1, excluding space separators, as they make version
         // extraction from inside sentences very tricky and have not been seen "in
-        // the wild". The second non-capturing group prevents version numbers
+        // the wild". The last non-capturing group prevents version numbers
         // followed by a comma from matching.
-        let pseudosem_regex_str = r"(\d+(?:\.\d+)+(?:[-._:]?[A-Za-z0-9]+)*)(?!,)";
+        let pseudosem_regex_str = r"(\d+(?:\.\d+)+(?:[-._:]?[A-Za-z0-9]+)*)(?:[^,]|$)";
 
         /* There are a few different version formats that can appear in strings
         together, and in order to extract the correct one, they must be searched