4/n: include: do not report W0057 if it is already reported by the erlang service

Summary: As title.

Reviewed By: TD5

Differential Revision: D86963332

fbshipit-source-id: ffb3020fbfd6b09a273d4e34cb28f353fa12deab

Author: alanz

crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout

@@ -9,8 +9,7 @@ Diagnostics reported in 5 modules:
       0:8-0:18::[WeakWarning] [W0046] The module is not documented.
   eqwalizer: 1
       1:8-1:17::[WeakWarning] [W0046] The module is not documented.
-  top_includer: 3
-      12:4-12:10::[Warning] [W0057] undefined macro 'THIRD/2'
+  top_includer: 2
       0:8-0:20::[WeakWarning] [W0046] The module is not documented.
       12:4-12:10::[Error] [E1508] undefined macro 'THIRD/2'
   wa_buck2_module_search: 6

crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout

@@ -1,9 +1,8 @@
 module specified: main_app
 Diagnostics reported in 1 modules:
-  main_app: 6
+  main_app: 5
       4:13-4:55::[Error] [E1516] can't find include lib "external_app/include/external_header.hrl"
       11:0-11:42::[Warning] [W0020] Unused file: stdlib/include/assert.hrl
       14:9-14:21::[Hint] [W0037] Unspecific include.
       16:9-16:24::[Error] [L1227] function test_function/0 undefined
-      23:4-23:19::[Warning] [W0057] undefined macro 'EXTERNAL_MACRO'
       23:4-23:19::[Error] [E1507] undefined macro 'EXTERNAL_MACRO'

crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout

@@ -1,8 +1,7 @@
 module specified: main_app
 Diagnostics reported in 1 modules:
-  main_app: 5
+  main_app: 4
       11:0-11:42::[Warning] [W0020] Unused file: stdlib/include/assert.hrl
       14:9-14:21::[Error] [E1516] can't find include file "assert.hrl"
       16:9-16:24::[Error] [L1227] function test_function/0 undefined
-      20:4-20:25::[Warning] [W0057] undefined macro 'normalDepAssertEqual/2'
       20:4-20:25::[Error] [E1508] undefined macro 'normalDepAssertEqual/2'

crates/ide/src/diagnostics.rs

@@ -2817,10 +2817,59 @@ pub fn attach_related_diagnostics(
         .filter(|(k, _)| !undefineds_to_remove.contains(k))
         .flat_map(|(_, v)| v);
 
-    native
-        .normal
-        .into_iter()
-        .chain(erlang_service.normal)
+    // Step 4.
+    // Split erlang service normal diagnostics into undefined macro diagnostics (E1507/E1508),
+    // and other diagnostics
+    let mut erlang_service_undefined_macros = Vec::new();
+    let mut erlang_service_other = Vec::new();
+
+    for d in erlang_service.normal {
+        match &d.code {
+            DiagnosticCode::ErlangService(code) if code == "E1507" || code == "E1508" => {
+                erlang_service_undefined_macros.push(d);
+            }
+            _ => {
+                erlang_service_other.push(d);
+            }
+        }
+    }
+
+    // Collect E1507/E1508 from labeled_undefined_errors for filtering
+    let undefined_macros_from_labeled: Vec<_> = erlang_service_undefined_not_related
+        .clone()
+        .filter(|d| {
+            matches!(&d.code, DiagnosticCode::ErlangService(code) if code == "E1507" || code == "E1508")
+        })
+        .cloned()
+        .collect();
+
+    // Combine all E1507/E1508 diagnostics for filtering (clone to avoid borrow issues)
+    let all_undefined_macros: Vec<_> = erlang_service_undefined_macros
+        .iter()
+        .cloned()
+        .chain(undefined_macros_from_labeled)
+        .collect();
+
+    // Step 5.
+    // Filter out W0056 diagnostics if there's a matching E1507/E1508 for the same macro
+    let filtered_native_normal = native.normal.into_iter().filter(|d| {
+        if d.code != DiagnosticCode::HirUnresolvedMacro {
+            return true; // Keep non-W0056 diagnostics
+        }
+
+        // Check if there's a matching E1507/E1508 diagnostic
+        let has_matching_erlang_service = all_undefined_macros.iter().any(|es_diag| {
+            // Check if ranges overlap
+            d.range.intersect(es_diag.range).is_some()
+        });
+
+        // Keep W0056 only if there's no matching E1507/E1508
+        !has_matching_erlang_service
+    });
+
+    filtered_native_normal
+        .chain(erlang_service_other)
+        .chain(erlang_service_undefined_macros)
         .chain(syntax_errors_with_related)
         .chain(erlang_service_undefined_not_related.cloned())
         // TODO:AZ: consider returning an iterator