duplicate definition error fixup

Author: imalsogreg

baml_language/crates/baml_diagnostics/src/compiler_error/error_format.rs

@@ -89,15 +89,19 @@ where
                 name,
                 kind,
                 first,
+                first_path,
                 second,
+                second_path,
             } => (
                 Report::build(ReportKind::Error, second)
                     .with_message(format!("Duplicate {kind} '{name}'"))
                     .with_label(
-                        Label::new(second).with_message(format!("{kind} '{name}' defined here")),
+                        Label::new(second)
+                            .with_message(format!("{kind} '{name}' defined in {second_path}")),
                     )
                     .with_label(
-                        Label::new(first).with_message(format!("'{name}' previously defined here")),
+                        Label::new(first)
+                            .with_message(format!("'{name}' previously defined in {first_path}")),
                     ),
                 DUPLICATE_NAME,
             ),

baml_language/crates/baml_diagnostics/src/compiler_error/name_error.rs

@@ -12,6 +12,8 @@ pub enum NameError {
         name: String,
         kind: &'static str,
         first: Span,
+        first_path: String,
         second: Span,
+        second_path: String,
     },
 }

baml_language/crates/baml_hir/src/lib.rs

@@ -715,6 +715,7 @@ use rustc_hash::FxHashMap;
 struct ItemInfo {
     kind: &'static str,
     span: Span,
+    path: String,
 }
 
 /// Validate that there are no duplicate names in the project.
@@ -727,48 +728,54 @@ pub fn validate_duplicate_names(db: &dyn Db, root: baml_workspace::Project) -> V
     let mut errors = Vec::new();
 
     for item in items.items(db) {
-        let (name, kind, span) = match item {
+        let (name, kind, span, path) = match item {
             ItemId::Function(loc) => {
                 let file = loc.file(db);
                 let item_tree = file_item_tree(db, file);
                 let func = &item_tree[loc.id(db)];
                 let span = Span::new(file.file_id(db), TextRange::empty(0.into()));
-                (func.name.clone(), "function", span)
+                let path = file.path(db).display().to_string();
+                (func.name.clone(), "function", span, path)
             }
             ItemId::Class(loc) => {
                 let file = loc.file(db);
                 let item_tree = file_item_tree(db, file);
                 let class = &item_tree[loc.id(db)];
                 let span = Span::new(file.file_id(db), TextRange::empty(0.into()));
-                (class.name.clone(), "class", span)
+                let path = file.path(db).display().to_string();
+                (class.name.clone(), "class", span, path)
             }
             ItemId::Enum(loc) => {
                 let file = loc.file(db);
                 let item_tree = file_item_tree(db, file);
                 let enum_def = &item_tree[loc.id(db)];
                 let span = Span::new(file.file_id(db), TextRange::empty(0.into()));
-                (enum_def.name.clone(), "enum", span)
+                let path = file.path(db).display().to_string();
+                (enum_def.name.clone(), "enum", span, path)
             }
             ItemId::TypeAlias(loc) => {
                 let file = loc.file(db);
                 let item_tree = file_item_tree(db, file);
                 let alias = &item_tree[loc.id(db)];
                 let span = Span::new(file.file_id(db), TextRange::empty(0.into()));
-                (alias.name.clone(), "type alias", span)
+                let path = file.path(db).display().to_string();
+                (alias.name.clone(), "type alias", span, path)
             }
             ItemId::Client(loc) => {
                 let file = loc.file(db);
                 let item_tree = file_item_tree(db, file);
                 let client = &item_tree[loc.id(db)];
                 let span = Span::new(file.file_id(db), TextRange::empty(0.into()));
-                (client.name.clone(), "client", span)
+                let path = file.path(db).display().to_string();
+                (client.name.clone(), "client", span, path)
             }
             ItemId::Test(loc) => {
                 let file = loc.file(db);
                 let item_tree = file_item_tree(db, file);
                 let test = &item_tree[loc.id(db)];
                 let span = Span::new(file.file_id(db), TextRange::empty(0.into()));
-                (test.name.clone(), "test", span)
+                let path = file.path(db).display().to_string();
+                (test.name.clone(), "test", span, path)
             }
         };
 
@@ -777,10 +784,12 @@ pub fn validate_duplicate_names(db: &dyn Db, root: baml_workspace::Project) -> V
                 name: name.to_string(),
                 kind,
                 first: existing.span,
+                first_path: existing.path.clone(),
                 second: span,
+                second_path: path,
             });
         } else {
-            seen.insert(name, ItemInfo { kind, span });
+            seen.insert(name, ItemInfo { kind, span, path });
         }
     }