duplicatecode 0.3.0__tar.gz → 0.3.2__tar.gz

{duplicatecode-0.3.0 → duplicatecode-0.3.2}/Cargo.lock

@@ -198,7 +198,7 @@ dependencies = [
 
 [[package]]
 name = "duplicatecode"
-version = "0.3.0"
+version = "0.3.2"
 dependencies = [
  "anyhow",
  "clap",
@@ -212,7 +212,7 @@ dependencies = [
 
 [[package]]
 name = "duplicatecode-engine"
-version = "0.3.0"
+version = "0.3.2"
 dependencies = [
  "ignore",
  "serde",

{duplicatecode-0.3.0 → duplicatecode-0.3.2}/Cargo.toml

@@ -3,6 +3,6 @@ resolver = "2"
 members = ["crates/duplicatecode-engine", "crates/duplicatecode-cli"]
 
 [workspace.package]
-version = "0.3.0"
+version = "0.3.2"
 edition = "2021"
 license = "MIT"

{duplicatecode-0.3.0 → duplicatecode-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: duplicatecode
-Version: 0.3.0
+Version: 0.3.2
 Classifier: Programming Language :: Rust
 Classifier: Environment :: Console
 Summary: Static (LLM-free) detection of duplicate/similar code in Python, TypeScript/JavaScript, SQL and C#
@@ -10,7 +10,7 @@ Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 
 # duplicatecode
 
-Static (LLM-free) detection of duplicate / similar code in Python, TypeScript/JavaScript (TSX/JSX), SQL and C#,
+Static by default (LLM-free, no network unless `--embed*` is used) detection of duplicate / similar code in Python, TypeScript/JavaScript (TSX/JSX), SQL and C#,
 aimed at catching an LLM re-implementing something that already exists. Input can be a git diff
 checked against existing source.
 
@@ -66,11 +66,20 @@ duplicatecode find "retry with exponential backoff" src/   # does something like
 
 ## Embeddings (bring your own key)
 
-Two optional signals, both off by default (the detector stays LLM-free unless you ask):
+Two optional signals, both off by default (the detector stays static and offline unless you ask).
+
+> **Privacy warning.** `--embed openai`, `--embed cohere`, and `--embed-code` / `--embeddings` pointed at any
+> hosted endpoint (OpenAI, Cohere, Azure, ...) **upload the source text of your units** to that provider
+> (`--embeddings` sends identifier names only). `find` embeds **every unit under the given paths**, so
+> `find ... --embed openai` uploads all of it. The local presets (`gemma`, `minilm`, `qwen3`, `potion`) are meant for a
+> server on loopback (`gemma`: ollama on `127.0.0.1:11434`, the others `127.0.0.1:8099`; `DUPLICATECODE_EMBED_ENDPOINT` overrides it): pointing that
+> variable at a remote host sends text there too. Do not use hosted embeddings on code you may not share.
 
 - `--embeddings` embeds identifier *names* (cheap) as an extra name-similarity signal.
-- `--embed <preset>` is the short form (`minilm`, `qwen3`, `potion`, `openai`, `cohere`; `qwen3` is about 5x slower than `minilm` on CPU, so use it with a GPU or prefer `minilm`) and implies
-  `--embed-code`. Model ids go into the cache key, so vectors of different models never mix.
+- `--embed` is the short form and implies `--embed-code`. A bare `--embed` uses **`gemma`** (embeddinggemma via a local
+  [ollama](https://ollama.com): `ollama pull embeddinggemma`), the best model in the codebase benchmark (issue #12: re-implementation
+  retrieval R@1 0.94 vs 0.89 for the static detector alone, unchanged when function names are masked). Other presets:
+  `--embed=minilm|qwen3|potion|openai|cohere`; MiniLM is smaller but clearly weaker (0.85) and leans on names. Model ids go into the cache key, so vectors of different models never mix.
 - `--embed-code` embeds the *whole text of every unit* (function, class, file, SQL statement) and blends
   the cosine into the score (`--embed-weight`, default 0.35, others scaled by 1 - weight). It finds
   re-implementations that share no tokens. On function-level LLM re-implementations it lifted Python from
@@ -90,7 +99,8 @@ export OPENAI_BASE_URL=http://localhost:11434/v1 OPENAI_API_KEY=anything OPENAI_
 export AZURE_AI_FOUNDRY_ENDPOINT=https://<res>.services.ai.azure.com
 export AZURE_AI_FOUNDRY_API_KEY=... AZURE_AI_FOUNDRY_EMBEDDING_DEPLOYMENT=text-embedding-3-small
 # Azure OpenAI: AZURE_OPENAI_ENDPOINT / AZURE_OPENAI_API_KEY / AZURE_OPENAI_EMBEDDING_DEPLOYMENT
-# Fully local, no key: start the server once (CPU; it loads whichever model a request names)
+# Fully local, no key, recommended: ollama pull embeddinggemma && duplicatecode scan . --embed   (GPU: ~5 ms per unit)
+# Other local models: start the server once (CPU; it loads whichever model a request names)
 #   uv run --no-project --python 3.12 eval/embed_server.py
 #   duplicatecode scan . --embed minilm          # or: qwen3, potion  (default endpoint 127.0.0.1:8099)
 # Hosted presets: --embed openai (OPENAI_API_KEY), --embed cohere (COHERE_API_KEY)
@@ -215,9 +225,9 @@ Self-scans of three internal repositories (Python + TypeScript), 189 pairs judge
   before trusting them. A structure-heavy `--profile reimpl` exists for renamed re-implementations
   (use with `--min-name 0`) but has no real-repo precision data yet.
 
-### Fresh held-out check (copies profile, threshold 0.6)
+### Fresh held-out check (copies profile, threshold 0.6 = the `copies` default for `scan`)
 
-A third, untouched sample of 57 pairs (nothing was tuned on it): 30% true duplicates, 47% incl. partial
+A third, untouched sample of 57 pairs (nothing was tuned on it; the `reimpl` profile has different defaults, 0.35 for `scan`, and is not covered by this sample): 30% true duplicates, 47% incl. partial
 (OneSales 0/24, MDMApp 11/24, CCMT2 6/9 true). The 50%/76% above was optimistic because it was measured on the
 pairs used to choose the weights. Test code is about half of the noise but also holds real copies
 (25% true either way), so it is kept by default; `--skip-tests` drops it.
@@ -235,7 +245,7 @@ by Haiku and Sonnet without seeing the repo. Fraction where the original is foun
 | 0.5 | 45% | 14% | 30% | 1% |
 | 0.6 | 24% | 5% | 14% | 0% |
 
-So `diff` (checking new code) defaults to threshold 0.4 while `scan` (existing copies) defaults to 0.6. About half of
+So with the `copies` profile `diff` (checking new code) defaults to threshold 0.4 while `scan` (existing copies) defaults to 0.6; the `reimpl` profile has its own lower defaults (see above). About half of
 independent re-implementations are caught; the rest are genuinely different code. The structure-heavy `reimpl`
 profile is not better on this test.
 
@@ -252,7 +262,7 @@ read/grep, two with this CLI. All distinct groups (82) were then judged blind by
 | OneSales, with CLI | 21 | 10 | 48% / 86% | 67% | 9 |
 
 Only 18 of 82 groups were found by both, so the approaches are complementary. The agents' reports are capped at 30
-groups, so the raw tool is a better measure of recall: `scan --threshold 0.6` (defaults) finds 38 of the 40 judged
+groups, so the raw tool is a better measure of recall: `scan --threshold 0.6` (the `copies` defaults) finds 38 of the 40 judged
 true duplicates (25/25 MDMApp, 13/15 OneSales) and 23 of the 25 that the LLM-only agents found independently.
 What it still misses: a differently-written picker function (same purpose, different code) and a formatFileSize
 variant with different constants. Fixed after this test: tiny same-name exact copies (`min_tokens` 20 -> 8, near-exact

{duplicatecode-0.3.0 → duplicatecode-0.3.2}/README.md

@@ -1,6 +1,6 @@
 # duplicatecode
 
-Static (LLM-free) detection of duplicate / similar code in Python, TypeScript/JavaScript (TSX/JSX), SQL and C#,
+Static by default (LLM-free, no network unless `--embed*` is used) detection of duplicate / similar code in Python, TypeScript/JavaScript (TSX/JSX), SQL and C#,
 aimed at catching an LLM re-implementing something that already exists. Input can be a git diff
 checked against existing source.
 
@@ -56,11 +56,20 @@ duplicatecode find "retry with exponential backoff" src/   # does something like
 
 ## Embeddings (bring your own key)
 
-Two optional signals, both off by default (the detector stays LLM-free unless you ask):
+Two optional signals, both off by default (the detector stays static and offline unless you ask).
+
+> **Privacy warning.** `--embed openai`, `--embed cohere`, and `--embed-code` / `--embeddings` pointed at any
+> hosted endpoint (OpenAI, Cohere, Azure, ...) **upload the source text of your units** to that provider
+> (`--embeddings` sends identifier names only). `find` embeds **every unit under the given paths**, so
+> `find ... --embed openai` uploads all of it. The local presets (`gemma`, `minilm`, `qwen3`, `potion`) are meant for a
+> server on loopback (`gemma`: ollama on `127.0.0.1:11434`, the others `127.0.0.1:8099`; `DUPLICATECODE_EMBED_ENDPOINT` overrides it): pointing that
+> variable at a remote host sends text there too. Do not use hosted embeddings on code you may not share.
 
 - `--embeddings` embeds identifier *names* (cheap) as an extra name-similarity signal.
-- `--embed <preset>` is the short form (`minilm`, `qwen3`, `potion`, `openai`, `cohere`; `qwen3` is about 5x slower than `minilm` on CPU, so use it with a GPU or prefer `minilm`) and implies
-  `--embed-code`. Model ids go into the cache key, so vectors of different models never mix.
+- `--embed` is the short form and implies `--embed-code`. A bare `--embed` uses **`gemma`** (embeddinggemma via a local
+  [ollama](https://ollama.com): `ollama pull embeddinggemma`), the best model in the codebase benchmark (issue #12: re-implementation
+  retrieval R@1 0.94 vs 0.89 for the static detector alone, unchanged when function names are masked). Other presets:
+  `--embed=minilm|qwen3|potion|openai|cohere`; MiniLM is smaller but clearly weaker (0.85) and leans on names. Model ids go into the cache key, so vectors of different models never mix.
 - `--embed-code` embeds the *whole text of every unit* (function, class, file, SQL statement) and blends
   the cosine into the score (`--embed-weight`, default 0.35, others scaled by 1 - weight). It finds
   re-implementations that share no tokens. On function-level LLM re-implementations it lifted Python from
@@ -80,7 +89,8 @@ export OPENAI_BASE_URL=http://localhost:11434/v1 OPENAI_API_KEY=anything OPENAI_
 export AZURE_AI_FOUNDRY_ENDPOINT=https://<res>.services.ai.azure.com
 export AZURE_AI_FOUNDRY_API_KEY=... AZURE_AI_FOUNDRY_EMBEDDING_DEPLOYMENT=text-embedding-3-small
 # Azure OpenAI: AZURE_OPENAI_ENDPOINT / AZURE_OPENAI_API_KEY / AZURE_OPENAI_EMBEDDING_DEPLOYMENT
-# Fully local, no key: start the server once (CPU; it loads whichever model a request names)
+# Fully local, no key, recommended: ollama pull embeddinggemma && duplicatecode scan . --embed   (GPU: ~5 ms per unit)
+# Other local models: start the server once (CPU; it loads whichever model a request names)
 #   uv run --no-project --python 3.12 eval/embed_server.py
 #   duplicatecode scan . --embed minilm          # or: qwen3, potion  (default endpoint 127.0.0.1:8099)
 # Hosted presets: --embed openai (OPENAI_API_KEY), --embed cohere (COHERE_API_KEY)
@@ -205,9 +215,9 @@ Self-scans of three internal repositories (Python + TypeScript), 189 pairs judge
   before trusting them. A structure-heavy `--profile reimpl` exists for renamed re-implementations
   (use with `--min-name 0`) but has no real-repo precision data yet.
 
-### Fresh held-out check (copies profile, threshold 0.6)
+### Fresh held-out check (copies profile, threshold 0.6 = the `copies` default for `scan`)
 
-A third, untouched sample of 57 pairs (nothing was tuned on it): 30% true duplicates, 47% incl. partial
+A third, untouched sample of 57 pairs (nothing was tuned on it; the `reimpl` profile has different defaults, 0.35 for `scan`, and is not covered by this sample): 30% true duplicates, 47% incl. partial
 (OneSales 0/24, MDMApp 11/24, CCMT2 6/9 true). The 50%/76% above was optimistic because it was measured on the
 pairs used to choose the weights. Test code is about half of the noise but also holds real copies
 (25% true either way), so it is kept by default; `--skip-tests` drops it.
@@ -225,7 +235,7 @@ by Haiku and Sonnet without seeing the repo. Fraction where the original is foun
 | 0.5 | 45% | 14% | 30% | 1% |
 | 0.6 | 24% | 5% | 14% | 0% |
 
-So `diff` (checking new code) defaults to threshold 0.4 while `scan` (existing copies) defaults to 0.6. About half of
+So with the `copies` profile `diff` (checking new code) defaults to threshold 0.4 while `scan` (existing copies) defaults to 0.6; the `reimpl` profile has its own lower defaults (see above). About half of
 independent re-implementations are caught; the rest are genuinely different code. The structure-heavy `reimpl`
 profile is not better on this test.
 
@@ -242,7 +252,7 @@ read/grep, two with this CLI. All distinct groups (82) were then judged blind by
 | OneSales, with CLI | 21 | 10 | 48% / 86% | 67% | 9 |
 
 Only 18 of 82 groups were found by both, so the approaches are complementary. The agents' reports are capped at 30
-groups, so the raw tool is a better measure of recall: `scan --threshold 0.6` (defaults) finds 38 of the 40 judged
+groups, so the raw tool is a better measure of recall: `scan --threshold 0.6` (the `copies` defaults) finds 38 of the 40 judged
 true duplicates (25/25 MDMApp, 13/15 OneSales) and 23 of the 25 that the LLM-only agents found independently.
 What it still misses: a differently-written picker function (same purpose, different code) and a formatFileSize
 variant with different constants. Fixed after this test: tiny same-name exact copies (`min_tokens` 20 -> 8, near-exact

{duplicatecode-0.3.0 → duplicatecode-0.3.2}/crates/duplicatecode-cli/src/groups.rs

@@ -246,6 +246,8 @@ pub fn make_mutation_groups(
     for (k, p) in files.iter().skip(skip).take(n).enumerate() {
         let text = std::fs::read_to_string(p)?;
         let dir = out.join(format!("c{:03}", skip + k));
+        // a leftover variant of a previous component would be mislabeled as a clone of this one
+        let _ = std::fs::remove_dir_all(&dir);
         std::fs::create_dir_all(&dir)?;
         std::fs::write(dir.join("orig.tsx"), &text)?;
         for m in Mutation::ALL {

{duplicatecode-0.3.0 → duplicatecode-0.3.2}/crates/duplicatecode-cli/src/main.rs

@@ -11,11 +11,14 @@ use duplicatecode_engine::{
 use std::io::Read;
 use std::path::PathBuf;
 
-/// Named embedding setups for `--embed`. Local presets talk to `eval/embed_server.py` (default
-/// http://127.0.0.1:8099/v1, override with DUPLICATECODE_EMBED_ENDPOINT), which loads the named model.
+/// Named embedding setups for `--embed`. `gemma` talks to a local ollama (default
+/// http://127.0.0.1:11434/v1); the other local presets talk to `eval/embed_server.py` (default
+/// http://127.0.0.1:8099/v1). DUPLICATECODE_EMBED_ENDPOINT overrides either, loopback hosts only.
 #[derive(Clone, Copy, clap::ValueEnum)]
 enum Preset {
-    /// all-MiniLM-L6-v2, local: fastest, tied for best quality in the bake-off
+    /// embeddinggemma via local ollama (`ollama pull embeddinggemma`): best in the codebase bake-off, the default of a bare `--embed`
+    Gemma,
+    /// all-MiniLM-L6-v2, local server: small and fast, but below `gemma` on re-implementation retrieval
     Minilm,
     /// Qwen3-Embedding-0.6B, local: 8k-token context, slower
     Qwen3,
@@ -30,19 +33,28 @@ enum Preset {
 impl Preset {
     fn config(self, dims: Option<u32>) -> Result<duplicatecode_engine::embed::EmbedConfig> {
         use duplicatecode_engine::embed::EmbedConfig;
-        let local = |model: &str| {
+        let local = |model: &str, default_endpoint: &str| -> Result<EmbedConfig> {
             let endpoint = std::env::var("DUPLICATECODE_EMBED_ENDPOINT")
-                .unwrap_or_else(|_| "http://127.0.0.1:8099/v1".into());
+                .unwrap_or_else(|_| default_endpoint.into());
             // the local server returns full vectors whatever `dimensions` asks for
-            EmbedConfig::new(endpoint, model.into(), Some("local".into()), None, None)
+            let cfg = EmbedConfig::new(endpoint, model.into(), Some("local".into()), None, None);
+            anyhow::ensure!(
+                cfg.is_loopback(),
+                "the local presets only talk to a server on this machine, but DUPLICATECODE_EMBED_ENDPOINT points at {}; \
+                 unset it, or use --embed openai|cohere (or --embed-code with OPENAI_API_KEY etc.) to send code to a hosted provider on purpose",
+                cfg.host()
+            );
+            Ok(cfg)
         };
+        const SERVER: &str = "http://127.0.0.1:8099/v1";
         let key = |name: &str| {
             std::env::var(name).with_context(|| format!("this preset needs {name} to be set"))
         };
         Ok(match self {
-            Preset::Minilm => local("sentence-transformers/all-MiniLM-L6-v2"),
-            Preset::Qwen3 => local("Qwen/Qwen3-Embedding-0.6B"),
-            Preset::Potion => local("minishlab/potion-base-8M"),
+            Preset::Gemma => local("embeddinggemma", "http://127.0.0.1:11434/v1")?,
+            Preset::Minilm => local("sentence-transformers/all-MiniLM-L6-v2", SERVER)?,
+            Preset::Qwen3 => local("Qwen/Qwen3-Embedding-0.6B", SERVER)?,
+            Preset::Potion => local("minishlab/potion-base-8M", SERVER)?,
             Preset::Openai => EmbedConfig::new(
                 "https://api.openai.com/v1".into(),
                 "text-embedding-3-small".into(),
@@ -70,7 +82,8 @@ struct EmbedArgs {
     #[arg(long)]
     embeddings: bool,
     /// Embed every unit with a named setup (implies --embed-code); see `--help` for the presets.
-    #[arg(long, value_enum)]
+    /// A bare `--embed` means `gemma`; write `--embed=minilm` etc. for the others.
+    #[arg(long, value_enum, num_args = 0..=1, require_equals = true, default_missing_value = "gemma")]
     embed: Option<Preset>,
     /// Embed the full text of every unit (function, class, file, statement) and blend the cosine of
     /// the two vectors into the score. Finds re-implementations that share no tokens.
@@ -94,6 +107,11 @@ struct EmbedArgs {
 }
 
 impl EmbedArgs {
+    /// Any embedding feature is on.
+    fn enabled(&self) -> bool {
+        self.embeddings || self.code_enabled()
+    }
+
     /// Whole-unit embeddings are on for `--embed-code` and for any `--embed <preset>`.
     fn code_enabled(&self) -> bool {
         self.embed_code || self.embed.is_some()
@@ -113,6 +131,27 @@ impl EmbedArgs {
             return Ok(());
         }
         let cfg = self.config()?;
+        // say where the text goes BEFORE anything is sent
+        if cfg.is_loopback() {
+            eprintln!(
+                "embedding {} units via {} (this machine)",
+                units.len(),
+                cfg.host()
+            );
+        } else {
+            eprintln!(
+                "embedding {} units: unit text is sent to {} (model {})",
+                units.len(),
+                cfg.host(),
+                cfg.deployment
+            );
+            if cfg.is_cleartext_remote() {
+                eprintln!(
+                    "warning: {} is plain http, so your API key and source text travel unencrypted",
+                    cfg.endpoint
+                );
+            }
+        }
         let path = self
             .embed_cache
             .clone()
@@ -163,6 +202,30 @@ impl EmbedArgs {
     }
 }
 
+/// Units under the options' size/kind filters can never be reported, so there is no reason to embed
+/// (upload) them.
+fn retain_matchable(
+    units: &mut Vec<duplicatecode_engine::Unit>,
+    min_tokens: usize,
+    skip_tests: bool,
+) {
+    units.retain(|u| u.token_count() >= min_tokens && !u.boilerplate && !(skip_tests && u.is_test));
+}
+
+/// Units of every root; with several roots the file names carry the root so equal names stay apart.
+fn load_roots(paths: &[PathBuf], exclude: &[String]) -> Vec<duplicatecode_engine::Unit> {
+    let mut units = Vec::new();
+    for p in paths {
+        for mut u in load_units_with(p, exclude) {
+            if paths.len() > 1 {
+                u.file = format!("{}/{}", p.display(), u.file);
+            }
+            units.push(u);
+        }
+    }
+    units
+}
+
 #[derive(Clone, Copy, clap::ValueEnum)]
 enum Profile {
     Copies,
@@ -397,7 +460,7 @@ enum Cmd {
     EvalGroups {
         #[arg(long, default_value = "eval/data/codenet")]
         root: PathBuf,
-        /// Print only the final `score=` line.
+        /// Print only the summary lines (`dataset_score`, `dataset_threshold`, `score=`).
         #[arg(long)]
         quiet: bool,
         /// Write every pair's feature vector (TSV) for offline analysis.
@@ -548,6 +611,10 @@ fn main() -> Result<()> {
                 }));
             }
             let mut corpus_units = load_units(&repo);
+            if embed.enabled() {
+                retain_matchable(&mut corpus_units, min_tokens, false);
+                retain_matchable(&mut queries, min_tokens, false);
+            }
             embed.apply(&mut corpus_units)?;
             embed.apply(&mut queries)?;
             let corpus = Corpus::new(corpus_units);
@@ -616,6 +683,9 @@ fn main() -> Result<()> {
                     units.push(u);
                 }
             }
+            if embed.enabled() {
+                units.retain(|u| !u.boilerplate && !(skip_tests && u.is_test));
+            }
             embed.apply(&mut units)?;
             let o = review::ReviewOptions {
                 threshold,
@@ -711,10 +781,7 @@ fn main() -> Result<()> {
             cross_file,
             json,
         } => {
-            let mut units = Vec::new();
-            for p in &paths {
-                units.extend(load_units_with(p, &exclude));
-            }
+            let mut units = load_roots(&paths, &exclude);
             units.retain(|u| !u.boilerplate && !(skip_tests && u.is_test));
             let mut found = duplicatecode_engine::fragments::find_fragments(
                 &units,
@@ -760,10 +827,7 @@ fn main() -> Result<()> {
             json,
         } => {
             embed.embed_code = true; // searching by description needs unit embeddings
-            let mut units = Vec::new();
-            for p in &paths {
-                units.extend(load_units_with(p, &exclude));
-            }
+            let mut units = load_roots(&paths, &exclude);
             units.retain(|u| u.token_count() >= min_tokens && !u.boilerplate);
             embed.apply(&mut units)?;
             let cfg = embed.config()?;
@@ -814,14 +878,9 @@ fn main() -> Result<()> {
         } => {
             let threshold =
                 threshold.unwrap_or(profile.default_threshold(Command::Scan, embed.code_enabled()));
-            let mut units = Vec::new();
-            for p in &paths {
-                for mut u in load_units_with(p, &exclude) {
-                    if paths.len() > 1 {
-                        u.file = format!("{}/{}", p.display(), u.file);
-                    }
-                    units.push(u);
-                }
+            let mut units = load_roots(&paths, &exclude);
+            if embed.enabled() {
+                retain_matchable(&mut units, min_tokens, skip_tests);
             }
             embed.apply(&mut units)?;
             let corpus = Corpus::new(units.clone());
@@ -851,14 +910,23 @@ fn main() -> Result<()> {
                 .collect();
             pairs.sort_by(|a, b| b.scores.combined.total_cmp(&a.scores.combined));
             let groups = group_pairs(&pairs);
-            let by_place: std::collections::HashMap<String, &duplicatecode_engine::Unit> = units
+            // keyed by the full place: units that start on the same line (minified code, one-line
+            // classes) must not be mixed up
+            let place = |r: &duplicatecode_engine::index::UnitRef| {
+                (r.file.clone(), r.start_line, r.end_line, r.name.clone())
+            };
+            let by_place: std::collections::HashMap<_, &duplicatecode_engine::Unit> = units
                 .iter()
-                .map(|u| (format!("{}:{}", u.file, u.start_line), u))
+                .map(|u| {
+                    (
+                        (u.file.clone(), u.start_line, u.end_line, u.name.clone()),
+                        u,
+                    )
+                })
                 .collect();
             let explanation = |m: &duplicatecode_engine::Match| {
-                let a = by_place.get(&format!("{}:{}", m.query.file, m.query.start_line))?;
-                let b =
-                    by_place.get(&format!("{}:{}", m.candidate.file, m.candidate.start_line))?;
+                let a = by_place.get(&place(&m.query))?;
+                let b = by_place.get(&place(&m.candidate))?;
                 Some(duplicatecode_engine::explain::explain(a, b))
             };
             if pairs_out {