WIP: Add normalized querykind Fixes #1079

src/cargo/core/resolver/errors.rs

@@ -294,7 +294,7 @@ pub(super) fn activation_error(
             // Maybe the user mistyped the name? Like `dep-thing` when `Dep_Thing`
             // was meant. So we try asking the registry for a `fuzzy` search for suggestions.
             let mut candidates = loop {
-                match registry.query_vec(&new_dep, QueryKind::Fuzzy) {
+                match registry.query_vec(&new_dep, QueryKind::Alternatives) {
                     Poll::Ready(Ok(candidates)) => break candidates,
                     Poll::Ready(Err(e)) => return to_resolve_err(e),
                     Poll::Pending => match registry.block_until_ready() {

src/cargo/core/source/mod.rs

@@ -116,7 +116,10 @@ pub enum QueryKind {
     /// Each source gets to define what `close` means for it.
     /// Path/Git sources may return all dependencies that are at that URI,
     /// whereas an `Index` source may return dependencies that have the same canonicalization.
-    Fuzzy,
+    Alternatives,
+    /// Behavior like `Exact` for path sources and like `Alternatives` for
+    /// registry sources
+    Normalized,
 }
 
 pub enum MaybePackage {

src/cargo/ops/cargo_add/mod.rs

@@ -455,7 +455,7 @@ fn get_latest_dependency(
         }
         MaybeWorkspace::Other(query) => {
             let possibilities = loop {
-                match registry.query_vec(&query, QueryKind::Fuzzy) {
+                match registry.query_vec(&query, QueryKind::Normalized) {
                     std::task::Poll::Ready(res) => {
                         break res?;
                     }
@@ -497,7 +497,7 @@ fn select_package(
         MaybeWorkspace::Other(query) => {
             let possibilities = loop {
                 // Exact to avoid returning all for path/git
-                match registry.query_vec(&query, QueryKind::Exact) {
+                match registry.query_vec(&query, QueryKind::Normalized) {
                     std::task::Poll::Ready(res) => {
                         break res?;
                     }
@@ -611,7 +611,7 @@ fn populate_available_features(
         MaybeWorkspace::Other(query) => query,
     };
     let possibilities = loop {
-        match registry.query_vec(&query, QueryKind::Fuzzy) {
+        match registry.query_vec(&query, QueryKind::Normalized) {
             std::task::Poll::Ready(res) => {
                 break res?;
             }

src/cargo/sources/directory.rs

@@ -58,7 +58,15 @@ impl<'cfg> Source for DirectorySource<'cfg> {
         let packages = self.packages.values().map(|p| &p.0);
         let matches = packages.filter(|pkg| match kind {
             QueryKind::Exact => dep.matches(pkg.summary()),
-            QueryKind::Fuzzy => true,
+            QueryKind::Alternatives => true,
+            QueryKind::Normalized => {
+                let src_id = pkg.package_id().source_id();
+                if src_id.is_path() {
+                    dep.matches(pkg.summary())
+                } else {
+                    true
+                }
+            }
         });
         for summary in matches.map(|pkg| pkg.summary().clone()) {
             f(summary);

src/cargo/sources/path.rs

@@ -507,7 +507,8 @@ impl<'cfg> Source for PathSource<'cfg> {
         for s in self.packages.iter().map(|p| p.summary()) {
             let matched = match kind {
                 QueryKind::Exact => dep.matches(s),
-                QueryKind::Fuzzy => true,
+                QueryKind::Alternatives => true,
+                QueryKind::Normalized => dep.matches(s),
             };
             if matched {
                 f(s.clone())

src/cargo/sources/registry/mod.rs

@@ -739,7 +739,8 @@ impl<'cfg> Source for RegistrySource<'cfg> {
             .query_inner(dep, &mut *self.ops, &self.yanked_whitelist, &mut |s| {
                 let matched = match kind {
                     QueryKind::Exact => dep.matches(&s),
-                    QueryKind::Fuzzy => true,
+                    QueryKind::Alternatives => true,
+                    QueryKind::Normalized => true,
                 };
                 if matched {
                     f(s);

tests/testsuite/cargo_add_with_vendored_pkgs.rs

@@ -0,0 +1,52 @@
+use cargo_test_support::{project, registry::Package};
+
+#[cargo_test]
+fn carg_add_with_vendored_packages() {
+    let p = project()
+        .file("src/lib.rs", "")
+        .file(
+            "Cargo.toml",
+            r#"[package]
+name = "example"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+xml-rs = "0.8.4""#,
+        )
+        .build();
+    Package::new("xml-rs", "0.8.4").publish();
+    Package::new("cbindgen", "0.9.4").publish();
+
+    p.cargo("vendor ./vendor")
+        .with_stdout(
+            r#"
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "./vendor""#,
+        )
+        .run();
+    p.change_file(
+        ".cargo/config",
+        r#"
+    [source.crates-io]
+    replace-with = "vendored-sources"
+
+    [source.vendored-sources]
+    directory = "./vendor""#,
+    );
+    p.cargo("add cbindgen")
+        // current output
+        //.with_stdout(r#"warning: translating `cbindgen` to `xml-rs`
+        //Adding xml-rs v0.8.4 to dependencies."#)
+        // correct output
+        .with_stdout(
+            r#"    Updating crates.io index
+      Adding xml-rs v0.8.4 to dependencies."#,
+        )
+        .run();
+}

tests/testsuite/main.rs

@@ -20,6 +20,7 @@ mod build_script_env;
 mod build_script_extra_link_arg;
 mod cache_messages;
 mod cargo_add;
+mod cargo_add_with_vendored_pkgs;
 mod cargo_alias_config;
 mod cargo_command;
 mod cargo_config;