diff --git a/crates/edit_prediction_context/src/excerpt.rs b/crates/edit_prediction_context/src/excerpt.rs
index 3fde142093efd095129f51a83f836953a76d20cb..d27e75bd129147986d2359585d5e048704d8828f 100644
--- a/crates/edit_prediction_context/src/excerpt.rs
+++ b/crates/edit_prediction_context/src/excerpt.rs
@@ -114,13 +114,13 @@ impl EditPredictionExcerpt {
             options,
         };
 
-        if let Some(excerpt_ranges) = excerpt_selector.select_tree_sitter_nodes() {
-            if excerpt_ranges.size >= options.min_bytes {
-                return Some(excerpt_ranges);
+        if let Some(excerpt) = excerpt_selector.select_tree_sitter_nodes() {
+            if excerpt.size >= options.min_bytes {
+                return Some(excerpt);
             }
             log::debug!(
                 "tree-sitter excerpt was {} bytes, smaller than min of {}, falling back on line-based selection",
-                excerpt_ranges.size,
+                excerpt.size,
                 options.min_bytes
             );
         } else {
diff --git a/crates/edit_prediction_context/src/reference.rs b/crates/edit_prediction_context/src/reference.rs
index 975f15c81f44dad9ee1d3105f6a5863a4685b164..abb7dd75dd569f7a14bea807bdc64441d0e64871 100644
--- a/crates/edit_prediction_context/src/reference.rs
+++ b/crates/edit_prediction_context/src/reference.rs
@@ -1,6 +1,7 @@
 use language::BufferSnapshot;
 use std::collections::HashMap;
 use std::ops::Range;
+use util::RangeExt;
 
 use crate::{
     declaration::Identifier,
@@ -78,8 +79,8 @@ pub fn identifiers_in_range(
             .highlights_config
             .as_ref();
 
-        for capture in mat.captures {
-            if let Some(config) = config {
+        if let Some(config) = config {
+            for capture in mat.captures {
                 if config.identifier_capture_indices.contains(&capture.index) {
                     let node_range = capture.node.byte_range();
 
@@ -88,9 +89,13 @@ pub fn identifiers_in_range(
                         continue;
                     }
 
+                    if !range.contains_inclusive(&node_range) {
+                        continue;
+                    }
+
                     let identifier_text =
-                        // TODO we changed this to saturating_sub for now, but we should fix the actually issue
-                        &range_text[node_range.start.saturating_sub(range.start)..node_range.end.saturating_sub(range.start)];
+                        &range_text[node_range.start - range.start..node_range.end - range.start];
+
                     references.push(Reference {
                         identifier: Identifier {
                             name: identifier_text.into(),
@@ -108,3 +113,61 @@ pub fn identifiers_in_range(
     }
     references
 }
+
+#[cfg(test)]
+mod test {
+    use gpui::{TestAppContext, prelude::*};
+    use indoc::indoc;
+    use language::{BufferSnapshot, Language, LanguageConfig, LanguageMatcher, tree_sitter_rust};
+
+    use crate::reference::{ReferenceRegion, identifiers_in_range};
+
+    #[gpui::test]
+    fn test_identifier_node_truncated(cx: &mut TestAppContext) {
+        let code = indoc! { r#"
+            fn main() {
+                add(1, 2);
+            }
+
+            fn add(a: i32, b: i32) -> i32 {
+                a + b
+            }
+        "# };
+        let buffer = create_buffer(code, cx);
+
+        let range = 0..35;
+        let references = identifiers_in_range(
+            range.clone(),
+            &code[range],
+            ReferenceRegion::Breadcrumb,
+            &buffer,
+        );
+        assert_eq!(references.len(), 2);
+        assert_eq!(references[0].identifier.name.as_ref(), "main");
+        assert_eq!(references[1].identifier.name.as_ref(), "add");
+    }
+
+    fn create_buffer(text: &str, cx: &mut TestAppContext) -> BufferSnapshot {
+        let buffer =
+            cx.new(|cx| language::Buffer::local(text, cx).with_language(rust_lang().into(), cx));
+        buffer.read_with(cx, |buffer, _| buffer.snapshot())
+    }
+
+    fn rust_lang() -> Language {
+        Language::new(
+            LanguageConfig {
+                name: "Rust".into(),
+                matcher: LanguageMatcher {
+                    path_suffixes: vec!["rs".to_string()],
+                    ..Default::default()
+                },
+                ..Default::default()
+            },
+            Some(tree_sitter_rust::LANGUAGE.into()),
+        )
+        .with_highlights_query(include_str!("../../languages/src/rust/highlights.scm"))
+        .unwrap()
+        .with_outline_query(include_str!("../../languages/src/rust/outline.scm"))
+        .unwrap()
+    }
+}