6/n: include: do not report W0058 if is is already reported by the erlang service

Summary:
In a properly configured buck2 project, W0058 and E1516 will always be reported at the same time.

So do not report W0058 if there is already a E1516.

Reviewed By: TD5

Differential Revision: D86963330

fbshipit-source-id: fe1aaaa71330da059ed697d187542e3cb470e965

Author: alanz

crates/elp/src/resources/test/custom_build_tool/parse_elp_custom_build_tool.jsonl

@@ -1,5 +1,4 @@
 module specified: app_b
 Diagnostics reported in 1 modules:
-  app_b: 2
-      2:13-2:38::[Warning] [W0058] can't find include lib "app_a/include/app_b.hrl"
+  app_b: 1
       2:13-2:38::[Error] [E1516] can't find include lib "app_a/include/app_b.hrl"

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

@@ -1,7 +1,6 @@
 module specified: main_app
 Diagnostics reported in 1 modules:
-  main_app: 6
-      4:13-4:55::[Warning] [W0058] can't find include lib "external_app/include/external_header.hrl"
+  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.

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::[Warning] [W0058] can't find include file "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::[Error] [E1508] undefined macro 'normalDepAssertEqual/2'

crates/ide/src/diagnostics.rs

@@ -2858,15 +2858,19 @@ pub fn attach_related_diagnostics(
 
     // Step 4.
     // Split erlang service normal diagnostics into undefined macro diagnostics (E1507/E1508),
-    // and other diagnostics
+    // unresolved include diagnostics (E1516), and other diagnostics in a single pass
     let mut erlang_service_undefined_macros = Vec::new();
+    let mut erlang_service_unresolved_includes = 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);
             }
+            DiagnosticCode::ErlangService(code) if code == "E1516" => {
+                erlang_service_unresolved_includes.push(d);
+            }
             _ => {
                 erlang_service_other.push(d);
             }
@@ -2882,33 +2886,60 @@ pub fn attach_related_diagnostics(
         .cloned()
         .collect();
 
+    // Collect E1516 from labeled_undefined_errors for filtering
+    let unresolved_includes_from_labeled: Vec<_> = erlang_service_undefined_not_related
+        .clone()
+        .filter(|d| matches!(&d.code, DiagnosticCode::ErlangService(code) if code == "E1516"))
+        .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();
 
+    // Combine all E1516 diagnostics for filtering
+    let all_unresolved_includes: Vec<_> = erlang_service_unresolved_includes
+        .iter()
+        .cloned()
+        .chain(unresolved_includes_from_labeled)
+        .collect();
+
     // Step 5.
     // Filter out W0056 diagnostics if there's a matching E1507/E1508 for the same macro
+    // Filter out W0057 diagnostics if there's a matching E1516 for the same include
     let filtered_native_normal = native.normal.into_iter().filter(|d| {
-        if d.code != DiagnosticCode::HirUnresolvedMacro {
-            return true; // Keep non-W0056 diagnostics
+        if d.code == DiagnosticCode::HirUnresolvedMacro {
+            // 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
+            return !has_matching_erlang_service;
         }
 
-        // 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()
-        });
+        if d.code == DiagnosticCode::HirUnresolvedInclude {
+            // Check if there's a matching E1516 diagnostic
+            let has_matching_erlang_service = all_unresolved_includes.iter().any(|es_diag| {
+                // Check if ranges overlap
+                d.range.intersect(es_diag.range).is_some()
+            });
+
+            // Keep W0057 only if there's no matching E1516
+            return !has_matching_erlang_service;
+        }
 
-        // Keep W0056 only if there's no matching E1507/E1508
-        !has_matching_erlang_service
+        true // Keep all other diagnostics
     });
 
     filtered_native_normal
         .chain(erlang_service_other)
         .chain(erlang_service_undefined_macros)
+        .chain(erlang_service_unresolved_includes)
         .chain(syntax_errors_with_related)
         .chain(erlang_service_undefined_not_related.cloned())
         // TODO:AZ: consider returning an iterator