support see-also

Author: nikomatsakis

mdbook-goals/src/gh/issues.rs

@@ -122,6 +122,7 @@ pub fn fetch_issue(repository: &Repository, issue: u64) -> anyhow::Result<Existi
     let output = Command::new("gh")
         .arg("-R")
         .arg(&repository.to_string())
+        .arg("issue")
         .arg("view")
         .arg(&format!("{issue}"))
         .arg("--json")

mdbook-goals/src/json.rs

@@ -150,8 +150,13 @@ fn checkboxes(issue: &ExistingGithubIssue) -> anyhow::Result<Progress> {
             let issue_urls = c["issues"].split(&[',', ' ']).filter(|s| !s.is_empty());
 
             for issue_url in issue_urls {
-                let Some(c) = re::SEE_ALSO_ISSUE.captures(issue_url) else {
-                    anyhow::bail!("invalid issue URL `{issue_url}`")
+                let c = match (
+                    re::SEE_ALSO_ISSUE1.captures(issue_url),
+                    re::SEE_ALSO_ISSUE2.captures(issue_url),
+                ) {
+                    (Some(c), _) => c,
+                    (None, Some(c)) => c,
+                    (None, None) => anyhow::bail!("invalid issue URL `{issue_url}`"),
                 };
                 let repository = Repository::new(&c["org"], &c["repo"]);
                 let issue_number = c["issue"].parse::<u64>()?;

mdbook-goals/src/re.rs

@@ -41,9 +41,16 @@ lazy_static! {
 
 lazy_static! {
     pub static ref SEE_ALSO_QUERY: Regex =
-        Regex::new(r"^\| *See also *\| (?P<issues>[^, ]+,|[^, ] )+ *\| *$").unwrap();
+        Regex::new(r"^\| *See also *\|(?P<issues>[^|]+)\| *$").unwrap();
 }
 
 lazy_static! {
-    pub static ref SEE_ALSO_ISSUE: Regex = Regex::new(r"(?P<org>[^#/]*)/(?P<repo>[^#/]*)#(?P<issue>[0-9]+)|https://github.com/(?P<org>[^#/]*)/(?P<repo>[^#/]*)/issues/(?P<issue>[0-9]+)").unwrap();
+    pub static ref SEE_ALSO_ISSUE1: Regex =
+        Regex::new(r"(?P<org>[^#/]*)/(?P<repo>[^#/]*)#(?P<issue>[0-9]+)").unwrap();
+}
+
+lazy_static! {
+    pub static ref SEE_ALSO_ISSUE2: Regex =
+        Regex::new(r"https://github.com/(?P<org>[^#/]*)/(?P<repo>[^#/]*)/issues/(?P<issue>[0-9]+)")
+            .unwrap();
 }