diff --git a/crates/language/src/buffer.rs b/crates/language/src/buffer.rs
index 1220890958cb40ffbec38429e9982a79e14cdba8..3d754dbc951bc22567a47cc4f5cad2d42100fa62 100644
--- a/crates/language/src/buffer.rs
+++ b/crates/language/src/buffer.rs
@@ -2777,10 +2777,13 @@ impl BufferSnapshot {
                         range.start + self.line_len(start.row as u32) as usize - start.column;
                 }
 
-                buffer_ranges.push((range, node_is_name));
+                if !range.is_empty() {
+                    buffer_ranges.push((range, node_is_name));
+                }
             }
 
             if buffer_ranges.is_empty() {
+                matches.advance();
                 continue;
             }