From 44abbffd6fd734783f640907890987414f5104f9 Mon Sep 17 00:00:00 2001
From: Jonas Dohse <jonas.dohse@sap.com>
Date: Wed, 1 May 2024 15:17:57 +0200
Subject: [PATCH] Fix #13702

---
 src/cargo/ops/cargo_add/mod.rs                | 21 ++++++++++++++++++-
 .../out/primary/Cargo.toml                    |  2 +-
 .../stderr.term.svg                           |  6 +++---
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/cargo/ops/cargo_add/mod.rs b/src/cargo/ops/cargo_add/mod.rs
index a46c61daa892..3637f9bc30c3 100644
--- a/src/cargo/ops/cargo_add/mod.rs
+++ b/src/cargo/ops/cargo_add/mod.rs
@@ -403,7 +403,26 @@ fn resolve_dependency(
     if dependency.source().is_none() {
         // Checking for a workspace dependency happens first since a member could be specified
         // in the workspace dependencies table as a dependency
-        if let Some(_dep) = find_workspace_dep(dependency.toml_key(), ws.root_manifest()).ok() {
+        let mut workspace_dep = find_workspace_dep(dependency.toml_key(), ws.root_manifest()).ok();
+        if workspace_dep.is_none() && dependency.rename.is_none() {
+            for name_permutation in [
+                dependency.name.replace('-', "_"),
+                dependency.name.replace('_', "-"),
+            ] {
+                workspace_dep = find_workspace_dep(&name_permutation, ws.root_manifest()).ok();
+                if let Some(workspace_dep) = &workspace_dep {
+                    if let Some(Source::Registry(_source)) = &workspace_dep.source {
+                        gctx.shell().warn(format!(
+                            "translating `{}` to `{}`",
+                            dependency.name, &name_permutation,
+                        ))?;
+                        dependency.name = name_permutation;
+                        break;
+                    }
+                }
+            }
+        }
+        if let Some(_dep) = workspace_dep {
             dependency = dependency.set_source(WorkspaceSource::new());
         } else if let Some(package) = ws.members().find(|p| p.name().as_str() == dependency.name) {
             // Only special-case workspaces when the user doesn't provide any extra
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/out/primary/Cargo.toml b/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/out/primary/Cargo.toml
index 1ae5f7b63618..22737f576822 100644
--- a/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/out/primary/Cargo.toml
+++ b/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/out/primary/Cargo.toml
@@ -4,4 +4,4 @@ version = "0.0.0"
 edition = "2015"
 
 [dependencies]
-fuzzy_dependency = "1.0.0"
+fuzzy_dependency.workspace = true
diff --git a/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/stderr.term.svg b/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/stderr.term.svg
index e5e452f3b051..b9cd1a406608 100644
--- a/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/stderr.term.svg
+++ b/tests/testsuite/cargo_add/detect_workspace_inherit_fuzzy/stderr.term.svg
@@ -19,11 +19,11 @@
   <rect width="100%" height="100%" y="0" rx="4.5" class="bg" />
 
   <text xml:space="preserve" class="container fg">
-    <tspan x="10px" y="28px"><tspan class="fg-green bold">    Updating</tspan><tspan> `dummy-registry` index</tspan>
+    <tspan x="10px" y="28px"><tspan class="fg-yellow bold">warning</tspan><tspan class="bold">:</tspan><tspan> translating `fuzzy-dependency` to `fuzzy_dependency`</tspan>
 </tspan>
-    <tspan x="10px" y="46px"><tspan class="fg-yellow bold">warning</tspan><tspan class="bold">:</tspan><tspan> translating `fuzzy-dependency` to `fuzzy_dependency`</tspan>
+    <tspan x="10px" y="46px"><tspan class="fg-green bold">    Updating</tspan><tspan> `dummy-registry` index</tspan>
 </tspan>
-    <tspan x="10px" y="64px"><tspan class="fg-green bold">      Adding</tspan><tspan> fuzzy_dependency v1.0.0 to dependencies</tspan>
+    <tspan x="10px" y="64px"><tspan class="fg-green bold">      Adding</tspan><tspan> fuzzy_dependency (workspace) to dependencies</tspan>
 </tspan>
     <tspan x="10px" y="82px"><tspan class="fg-green bold">     Locking</tspan><tspan> 2 packages to latest compatible versions</tspan>
 </tspan>