From dd24fd96a0c87a3d0db1fafc396a357075971ba4 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 8 Jul 2025 05:09:44 -0700
Subject: [PATCH 001/394] BE: make buck::Target.app_name an AppName

Summary: As title.  This makes it clearer when we work with a combination of `AppName`s and `TargetFullName`s.

Reviewed By: robertoaloi

Differential Revision: D77927019

fbshipit-source-id: affb557cda7ffc4be65f9d8cabb65150e05f5032
---
 crates/project_model/src/buck.rs | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 90c1f4f74f..1b4e6db5e2 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -300,11 +300,11 @@ pub struct BuckTarget {
 }
 
 impl BuckTarget {
-    fn name(&self) -> String {
+    fn name(&self) -> AppName {
         if let Some(name) = self.app_name.clone() {
-            name
+            AppName(name)
         } else {
-            self.name.clone()
+            AppName(self.name.clone())
         }
     }
 }
@@ -313,7 +313,7 @@ impl BuckTarget {
 pub struct Target {
     // full-name, like cell//path/to/target/...
     pub name: TargetFullName,
-    pub app_name: String,
+    pub app_name: AppName,
     pub dir: AbsPathBuf,
     pub src_files: Vec<AbsPathBuf>,
     pub include_files: Vec<AbsPathBuf>,
@@ -772,14 +772,18 @@ fn targets_to_project_data_bxl(
     for target in targets.values() {
         target.include_files.iter().for_each(|inc: &AbsPathBuf| {
             let include_path = include_path_from_file(inc);
-            update_mapping_from_path(&target.app_name, include_path, &mut include_mapping);
+            update_mapping_from_path(&target.app_name.0, include_path, &mut include_mapping);
         });
 
         if target.private_header {
             target.src_files.iter().for_each(|path: &AbsPathBuf| {
                 if Some("hrl") == path.extension() {
                     let include_path = include_path_from_file(path);
-                    update_mapping_from_path(&target.app_name, include_path, &mut include_mapping);
+                    update_mapping_from_path(
+                        &target.app_name.0,
+                        include_path,
+                        &mut include_mapping,
+                    );
                 }
             });
         }
@@ -836,7 +840,7 @@ fn targets_to_project_data_bxl(
             ),
         };
         let project_app_data = ProjectAppData {
-            name: AppName(target.app_name.clone()),
+            name: target.app_name.clone(),
             dir: target.dir.clone(),
             ebin: None,
             extra_src_dirs: extra_src_dirs.into_iter().collect(),

From 8f75584a2fcc3eaaa78630293fe5f4e8ff77a564 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Thu, 10 Jul 2025 02:15:03 -0700
Subject: [PATCH 002/394] Fix W0037 unspecific include for buck generated files

Summary:
Our current `elp.bxl` script returns a full path instead of a directory for the `includes` field for generated files.

This breaks the reverse lookup for W0037, so the unspecific_include diagnostic is not reported.

Add a check on the ELP side for this, and remove the file name if present.

Reviewed By: TD5, robertoaloi

Differential Revision: D77792503

fbshipit-source-id: 90d31106caca8828a07e82d82a4a4b93fd4114c4
---
 crates/project_model/src/buck.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 1b4e6db5e2..975f836700 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -464,7 +464,10 @@ fn make_buck_target(
             }
             let mut include_files = vec![];
             for include in &target.includes {
-                let inc = buck_path_to_abs_path(root, include).unwrap();
+                let mut inc = buck_path_to_abs_path(root, include).unwrap();
+                if inc.extension().is_some() {
+                    inc.pop();
+                }
                 include_files.push(inc);
             }
 

From d0cffb13998c3bc77c0c8337eca5eb74b6befc36 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Thu, 10 Jul 2025 05:37:15 -0700
Subject: [PATCH 003/394] Add failing test to show undefined macro duplicate
 actions

Summary:
Because ELP does not (yet) properly process conditional macros, a macro defined with conditional alternatives will show up multiple times.

Add a test to demonstrate this case, which will be fixed in the next diff.

Reviewed By: michalmuskala

Differential Revision: D78087402

fbshipit-source-id: e450a3d8f1cbd08b3040a5b70f114bafd8227800
---
 crates/ide/src/diagnostics/undefined_macro.rs | 36 +++++++++++++++++++
 crates/ide/src/tests.rs                       | 32 +++++++++++------
 2 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/crates/ide/src/diagnostics/undefined_macro.rs b/crates/ide/src/diagnostics/undefined_macro.rs
index 3136618da5..83519ac040 100644
--- a/crates/ide/src/diagnostics/undefined_macro.rs
+++ b/crates/ide/src/diagnostics/undefined_macro.rs
@@ -252,4 +252,40 @@ mod tests {
             "#]],
         );
     }
+
+    #[test]
+    #[should_panic(
+        expected = "Expecting one \"Add required include for 'assertEqual/2' (app_a)\", but multiple found in [(ErlangService(\"E1508\"), \"Add required include for 'assertEqual/2' (app_b)\"), (ErlangService(\"E1508\"), \"Add required include for 'assertEqual/2' (app_a)\"), (ErlangService(\"E1508\"), \"Add required include for 'assertEqual/2' (app_a)\")]"
+    )]
+    fn undefined_macro_fix_duplicate_definitions() {
+        check_specific_fix(
+            "Add required include for 'assertEqual/2' (app_a)",
+            r#"
+            //- erlang_service
+            //- /main/src/main.erl app:main
+            -module(main).
+
+            foo(X) -> ?assert~Equal(X,2).
+            %%        ^^^^^^^^^^^^ 💡 error: undefined macro 'assertEqual/2'
+
+            //- /app_a/include/inc.hrl app:app_a include_path:/app_a/include
+
+            -ifdef(NOASSERT).
+            -define(assertEqual(A,B), ok).
+            -else.
+            -define(assertEqual(A,B), A =:= B).
+            -endif.
+
+            //- /app_b/include/inc.hrl app:app_b include_path:/app_b/include
+            -define(assertEqual(A,B), A =:= B).
+           "#,
+            expect![[r#"
+                -module(main).
+                -include_lib("app_a/include/inc.hrl").
+
+                foo(X) -> ?assertEqual(X,2).
+
+            "#]],
+        );
+    }
 }
diff --git a/crates/ide/src/tests.rs b/crates/ide/src/tests.rs
index 467e70d8f9..386b7fa302 100644
--- a/crates/ide/src/tests.rs
+++ b/crates/ide/src/tests.rs
@@ -307,17 +307,29 @@ pub(crate) fn check_specific_fix_with_config_and_adhoc(
     let actual = convert_diagnostics_to_annotations(diagnostics.clone());
     assert_eq!(expected, actual);
 
-    let fix: &Assist = if let Some(label) = assist_label {
-        if let Some(fix) = diagnostics
+    let fix: Assist = if let Some(label) = assist_label {
+        let fixes: Vec<_> = diagnostics
             .iter()
-            .filter_map(|d| {
-                d.fixes
-                    .as_ref()
-                    .and_then(|fixes| fixes.iter().find(|f| f.label == label))
-            })
-            .next()
-        {
-            fix
+            .flat_map(|d| d.fixes.clone().unwrap_or_default())
+            .filter(|f| f.label == label)
+            .collect();
+        if fixes.len() == 1 {
+            fixes.into_iter().next().unwrap()
+        } else if fixes.len() > 1 {
+            panic!(
+                "Expecting one \"{}\", but multiple found in {:?}",
+                label,
+                diagnostics
+                    .iter()
+                    .flat_map(|d| match d.fixes.as_ref() {
+                        None => vec![],
+                        Some(fixes) => fixes
+                            .iter()
+                            .map(|f| (d.code.clone(), f.label.clone()))
+                            .collect_vec(),
+                    })
+                    .collect_vec()
+            );
         } else {
             panic!(
                 "Expecting \"{}\", but not found in {:?}",

From 6040dcbfe56624cf943ea7caf3af6c35620a016d Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Thu, 10 Jul 2025 05:37:15 -0700
Subject: [PATCH 004/394] fix duplicate undefined macro duplicate actions

Summary:
As title.

Since we currently can have multiple macro definitions, we put candidates in a set to filter them out.

Reviewed By: michalmuskala

Differential Revision: D78087578

fbshipit-source-id: 084db136f7842185cd840c1d13a00cb75d2e8e00
---
 crates/ide/src/diagnostics/undefined_macro.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/crates/ide/src/diagnostics/undefined_macro.rs b/crates/ide/src/diagnostics/undefined_macro.rs
index 83519ac040..b4be2ac306 100644
--- a/crates/ide/src/diagnostics/undefined_macro.rs
+++ b/crates/ide/src/diagnostics/undefined_macro.rs
@@ -16,6 +16,7 @@ use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::path_for_file;
 use elp_ide_db::source_change::SourceChange;
 use elp_text_edit::TextEdit;
+use fxhash::FxHashSet;
 use hir::Semantic;
 use lazy_static::lazy_static;
 use regex::Regex;
@@ -36,7 +37,7 @@ pub(crate) fn add_assist(
         Some(macro_arity) => format!("{macro_name}/{macro_arity}"),
         None => macro_name.clone(),
     };
-    let includes: Vec<_> = index
+    let includes: FxHashSet<_> = index
         .complete(&macro_name)
         .iter()
         .flat_map(|(_chars, defines)| {
@@ -254,9 +255,6 @@ mod tests {
     }
 
     #[test]
-    #[should_panic(
-        expected = "Expecting one \"Add required include for 'assertEqual/2' (app_a)\", but multiple found in [(ErlangService(\"E1508\"), \"Add required include for 'assertEqual/2' (app_b)\"), (ErlangService(\"E1508\"), \"Add required include for 'assertEqual/2' (app_a)\"), (ErlangService(\"E1508\"), \"Add required include for 'assertEqual/2' (app_a)\")]"
-    )]
     fn undefined_macro_fix_duplicate_definitions() {
         check_specific_fix(
             "Add required include for 'assertEqual/2' (app_a)",

From e78a8d99b37034a67d1deea80fca76a06460a7e0 Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Fri, 11 Jul 2025 01:35:47 -0700
Subject: [PATCH 005/394] Migrate to Salsa 0.19

Summary:
Migrate ELP to Salsa 0.19, featuring a completely new API. Overall, the migration follows closely the one of [rust-analyzer](https://github.com/rust-lang/rust-analyzer/commit/74620e64ec24861a821ebb9e519461042905668f#diff-5828430af308cfce455219d40dac23f272baf89378ada6febee5d6a186ffe0fb)

Major changes:
- Bump `rust-analyzer` to 2025-03-17
- Use `ra_ap_query-group-macro` to emulate the old `query_group` macro.
- `SourceDatabase` is split into two, `RootQueryDb` containing queries inside a `query_group` and `SourceDatabase` which deals with salsa inputs only.
- All parameterized inputs (`FileText`, `SourceRoot`, ...) are extracted as structs, and a read/write API is provided according to Salsa 0.19 principles. This API was previously automatically derived by Salsa.
- Cycle handling functions signatures are modified.
- Create structs for all interned values, also following Salsa 0.19 guidelines.

Reviewed By: alanz

Differential Revision: D75066592

fbshipit-source-id: 233e626ca3c3c9004241e2064d2bcf7e2d0106ed
---
 Cargo.lock                                    | 215 +++++------
 Cargo.toml                                    |  16 +-
 crates/base_db/Cargo.toml                     |   2 +
 crates/base_db/src/change.rs                  |   4 +-
 crates/base_db/src/fixture.rs                 |   6 +-
 crates/base_db/src/include.rs                 |  20 +-
 crates/base_db/src/input.rs                   |   4 +-
 crates/base_db/src/lib.rs                     | 351 ++++++++++++++----
 crates/elp/src/bin/glean.rs                   |  24 +-
 crates/elp/src/bin/shell.rs                   |   1 -
 crates/elp/src/build/load.rs                  |   1 -
 crates/elp/src/server.rs                      |   2 +-
 crates/eqwalizer/Cargo.toml                   |   1 +
 crates/eqwalizer/src/analyses/mod.rs          |   2 +-
 crates/eqwalizer/src/db.rs                    |   6 +-
 crates/eqwalizer/src/lib.rs                   |   6 +-
 crates/hir/Cargo.toml                         |   1 +
 crates/hir/src/body.rs                        |   6 +-
 crates/hir/src/body/scope.rs                  |   2 +-
 crates/hir/src/db.rs                          |  11 +-
 crates/hir/src/def_map.rs                     |   9 +-
 crates/hir/src/edoc.rs                        |   6 +-
 crates/hir/src/include.rs                     |   3 +-
 crates/hir/src/intern.rs                      |  47 +--
 crates/hir/src/lib.rs                         |   4 +-
 crates/hir/src/macro_exp.rs                   |  11 +-
 crates/hir/src/module_data.rs                 |  50 +--
 crates/hir/src/sema.rs                        |   5 +-
 crates/hir/src/test_db.rs                     |  94 ++++-
 crates/ide/src/codemod_helpers.rs             |   2 +-
 crates/ide/src/diagnostics.rs                 |   2 +-
 .../eqwalizer_assists/expected_type.rs        |   2 +-
 crates/ide/src/diagnostics/module_mismatch.rs |   4 +-
 crates/ide/src/fixture.rs                     |   2 +-
 crates/ide/src/lib.rs                         |  12 +-
 crates/ide/src/rename.rs                      |   2 +-
 crates/ide/src/tests.rs                       |  20 +-
 crates/ide_assists/src/assist_context.rs      |   2 +-
 crates/ide_assists/src/tests.rs               |  26 +-
 crates/ide_completion/src/ctx.rs              |   2 +-
 crates/ide_completion/src/helpers.rs          |   6 +-
 crates/ide_completion/src/macros.rs           |   4 +-
 crates/ide_db/Cargo.toml                      |   1 +
 crates/ide_db/src/common_test.rs              |   8 +-
 crates/ide_db/src/docs.rs                     |  19 +-
 crates/ide_db/src/eqwalizer.rs                |  26 +-
 crates/ide_db/src/erl_ast.rs                  |  24 +-
 crates/ide_db/src/lib.rs                      | 156 +++++---
 crates/ide_db/src/search.rs                   |   5 +-
 crates/ide_ssr/src/lib.rs                     |  10 +-
 crates/ide_ssr/src/tests.rs                   |  10 +-
 51 files changed, 794 insertions(+), 461 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a03c78f3cc..d19a4aeafc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -115,6 +115,12 @@ version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 
+[[package]]
+name = "boxcar"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66bb12751a83493ef4b8da1120451a262554e216a247f14b48cb5e8fe7ed8bdf"
+
 [[package]]
 name = "bpaf"
 version = "0.7.9"
@@ -301,6 +307,15 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.21"
@@ -348,6 +363,20 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04d2cd9c18b9f454ed67da600630b021a8a80bf33f8c95896ab33aaf1c26b728"
 
+[[package]]
+name = "dashmap"
+version = "6.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+ "hashbrown 0.14.5",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
 [[package]]
 name = "deranged"
 version = "0.4.0"
@@ -456,7 +485,7 @@ dependencies = [
  "fxhash",
  "hir",
  "include_dir",
- "indexmap 2.9.0",
+ "indexmap",
  "indicatif",
  "itertools 0.10.5",
  "jod-thread",
@@ -464,7 +493,7 @@ dependencies = [
  "log",
  "lsp-server",
  "lsp-types",
- "parking_lot 0.12.4",
+ "parking_lot",
  "paths",
  "profile",
  "range-set",
@@ -494,6 +523,7 @@ name = "elp_base_db"
 version = "1.1.0"
 dependencies = [
  "anyhow",
+ "dashmap",
  "dissimilar",
  "eetf",
  "either",
@@ -505,6 +535,7 @@ dependencies = [
  "log",
  "paths",
  "profile",
+ "ra_ap_query-group-macro",
  "regex",
  "salsa",
  "serde_json",
@@ -525,7 +556,8 @@ dependencies = [
  "fxhash",
  "itertools 0.10.5",
  "log",
- "parking_lot 0.12.4",
+ "parking_lot",
+ "ra_ap_query-group-macro",
  "salsa",
  "serde",
  "serde_json",
@@ -552,7 +584,7 @@ dependencies = [
  "jod-thread",
  "lazy_static",
  "log",
- "parking_lot 0.12.4",
+ "parking_lot",
  "regex",
  "stdx",
  "tempfile",
@@ -582,7 +614,7 @@ dependencies = [
  "itertools 0.10.5",
  "lazy_static",
  "log",
- "parking_lot 0.12.4",
+ "parking_lot",
  "profile",
  "rayon",
  "regex",
@@ -649,14 +681,15 @@ dependencies = [
  "expect-test",
  "fxhash",
  "hir",
- "indexmap 2.9.0",
+ "indexmap",
  "lazy_static",
  "log",
  "memchr",
  "once_cell",
- "parking_lot 0.12.4",
+ "parking_lot",
  "paths",
  "profile",
+ "ra_ap_query-group-macro",
  "regex",
  "rustc-hash 1.1.0",
  "serde",
@@ -693,7 +726,7 @@ dependencies = [
  "humantime",
  "lazy_static",
  "log",
- "parking_lot 0.12.4",
+ "parking_lot",
  "regex",
  "serde",
  "serde_json",
@@ -713,11 +746,11 @@ dependencies = [
  "fxhash",
  "glob",
  "include_dir",
- "indexmap 2.9.0",
+ "indexmap",
  "itertools 0.10.5",
  "lazy_static",
  "log",
- "parking_lot 0.12.4",
+ "parking_lot",
  "paths",
  "regex",
  "semver",
@@ -740,7 +773,7 @@ dependencies = [
  "elp_text_edit",
  "expect-test",
  "fxhash",
- "indexmap 2.9.0",
+ "indexmap",
  "itertools 0.10.5",
  "lazy_static",
  "log",
@@ -975,12 +1008,6 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
 
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
@@ -997,16 +1024,18 @@ version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
 dependencies = [
+ "allocator-api2",
+ "equivalent",
  "foldhash",
 ]
 
 [[package]]
-name = "heck"
-version = "0.3.3"
+name = "hashlink"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
+checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
 dependencies = [
- "unicode-segmentation",
+ "hashbrown 0.15.3",
 ]
 
 [[package]]
@@ -1015,6 +1044,12 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
 [[package]]
 name = "hermit-abi"
 version = "0.5.1"
@@ -1037,6 +1072,7 @@ dependencies = [
  "lazy_static",
  "log",
  "profile",
+ "ra_ap_query-group-macro",
  "regex",
  "stdx",
  "tracing",
@@ -1202,16 +1238,6 @@ dependencies = [
  "quote",
 ]
 
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
-]
-
 [[package]]
 name = "indexmap"
 version = "2.9.0"
@@ -1220,6 +1246,7 @@ checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.3",
+ "serde",
 ]
 
 [[package]]
@@ -1256,15 +1283,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
@@ -1370,7 +1388,7 @@ dependencies = [
 [[package]]
 name = "la-arena"
 version = "0.3.1"
-source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-04#02862f5d52c30b476a5dca909a17aa4386d1fdc5"
+source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-17#b0632f749e6abf0f82f71755d7eaca4884c1a808"
 
 [[package]]
 name = "lazy_static"
@@ -1416,7 +1434,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
  "bitflags 2.9.1",
  "libc",
- "redox_syscall 0.5.12",
+ "redox_syscall",
 ]
 
 [[package]]
@@ -1684,12 +1702,6 @@ version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
 
-[[package]]
-name = "oorandom"
-version = "11.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
-
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@@ -1705,17 +1717,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.6",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.12.4"
@@ -1723,21 +1724,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.11",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
-dependencies = [
- "cfg-if",
- "instant",
- "libc",
- "redox_syscall 0.2.16",
- "smallvec",
- "winapi",
+ "parking_lot_core",
 ]
 
 [[package]]
@@ -1748,7 +1735,7 @@ checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.12",
+ "redox_syscall",
  "smallvec",
  "windows-targets 0.52.6",
 ]
@@ -1762,7 +1749,7 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 [[package]]
 name = "paths"
 version = "0.0.0"
-source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-04#02862f5d52c30b476a5dca909a17aa4386d1fdc5"
+source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-17#b0632f749e6abf0f82f71755d7eaca4884c1a808"
 dependencies = [
  "camino",
 ]
@@ -1799,7 +1786,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.9.0",
+ "indexmap",
 ]
 
 [[package]]
@@ -1874,7 +1861,7 @@ dependencies = [
 [[package]]
 name = "profile"
 version = "0.0.0"
-source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-04#02862f5d52c30b476a5dca909a17aa4386d1fdc5"
+source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-17#b0632f749e6abf0f82f71755d7eaca4884c1a808"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1898,6 +1885,19 @@ version = "5.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
 
+[[package]]
+name = "ra_ap_query-group-macro"
+version = "0.0.270"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f1a38f07b442e47a234cbe2e8fd1b8a41ff0cc5123cb1cf994c5ce20edb5bd6"
+dependencies = [
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "salsa",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "radix_trie"
 version = "0.2.1"
@@ -1938,15 +1938,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
-dependencies = [
- "bitflags 1.3.2",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.5.12"
@@ -2089,31 +2080,43 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "salsa"
-version = "0.17.0-pre.2"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b223dccb46c32753144d0b51290da7230bb4aedcd8379d6b4c9a474c18bf17a"
+checksum = "dd55c6549513b2a42884dae31e3d4f4ac8a6cc51062e68e24d162133889f327c"
 dependencies = [
- "crossbeam-utils",
- "indexmap 1.9.3",
- "lock_api",
- "log",
- "oorandom",
- "parking_lot 0.11.2",
- "rustc-hash 1.1.0",
+ "boxcar",
+ "crossbeam-queue",
+ "dashmap",
+ "hashbrown 0.15.3",
+ "hashlink",
+ "indexmap",
+ "parking_lot",
+ "portable-atomic",
+ "rayon",
+ "rustc-hash 2.1.1",
+ "salsa-macro-rules",
  "salsa-macros",
  "smallvec",
+ "tracing",
 ]
 
 [[package]]
-name = "salsa-macros"
-version = "0.17.0-pre.2"
+name = "salsa-macro-rules"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac6c2e352df550bf019da7b16164ed2f7fa107c39653d1311d1bba42d1582ff7"
+checksum = "2619b4b451beab0a7e4364ff1e6f31950e7e418888fd9bf2f28889671563166a"
+
+[[package]]
+name = "salsa-macros"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4be57a99b3896e8d26850428a6874fb86849e2db874e1db3528e5cee4337d277"
 dependencies = [
- "heck 0.3.3",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.101",
+ "synstructure",
 ]
 
 [[package]]
@@ -2245,7 +2248,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 [[package]]
 name = "stdx"
 version = "0.0.0"
-source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-04#02862f5d52c30b476a5dca909a17aa4386d1fdc5"
+source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-17#b0632f749e6abf0f82f71755d7eaca4884c1a808"
 dependencies = [
  "crossbeam-channel",
  "itertools 0.12.1",
@@ -2607,7 +2610,7 @@ dependencies = [
  "ahash",
  "byteorder",
  "lazy_static",
- "parking_lot 0.12.4",
+ "parking_lot",
  "serde",
 ]
 
@@ -2632,11 +2635,11 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 [[package]]
 name = "vfs"
 version = "0.0.0"
-source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-04#02862f5d52c30b476a5dca909a17aa4386d1fdc5"
+source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-17#b0632f749e6abf0f82f71755d7eaca4884c1a808"
 dependencies = [
  "crossbeam-channel",
  "fst",
- "indexmap 2.9.0",
+ "indexmap",
  "nohash-hasher",
  "paths",
  "rustc-hash 2.1.1",
@@ -2647,7 +2650,7 @@ dependencies = [
 [[package]]
 name = "vfs-notify"
 version = "0.0.0"
-source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-04#02862f5d52c30b476a5dca909a17aa4386d1fdc5"
+source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-17#b0632f749e6abf0f82f71755d7eaca4884c1a808"
 dependencies = [
  "crossbeam-channel",
  "notify",
diff --git a/Cargo.toml b/Cargo.toml
index 7ec49a5f83..533310e950 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,6 +47,7 @@ codespan-reporting = "0.11.1"
 cov-mark = "2.0.0"
 criterion = "0.3.6"
 crossbeam-channel = "0.5.15"
+dashmap = "6.1.0"
 dirs = "5.0"
 dissimilar = "1.0.9"
 triple_accel = "0.4.0"
@@ -69,7 +70,7 @@ jemalloc-ctl = { version = "0.5.0", package = "tikv-jemalloc-ctl" }
 jemallocator = { version = "0.5.4", package = "tikv-jemallocator" }
 jod-thread = "0.1.2"
 krates = "0.12.6"
-la-arena = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-04" }
+la-arena = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-17" }
 lazy_static = "1.5.0"
 log = "0.4.22"
 lsp-server = "0.7.6"
@@ -80,10 +81,11 @@ num-derive = "0.4.2"
 num-traits = "0.2.19"
 once_cell = "1.19.0"
 parking_lot = "0.12.3"
-paths = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-04" }
+paths = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-17" }
 proc-macro2 = "1.0.86"
-profile = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-04" }
+profile = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-17" }
 quote = "1.0.36"
+ra_ap_query-group-macro = "0.0.270"
 range-set = "0.0.10"
 rayon = "1.10.0"
 regex = "1.10.6"
@@ -91,7 +93,7 @@ rowan = "0.15.15"
 rust-ini = "0.18"
 rustc-hash = "1.1.0"
 rustyline = "11.0.0"
-salsa = "0.17.0-pre.2"
+salsa = "0.19.0"
 semver = "1.0.23"
 serde = { version = "1.0.206", features = ["derive", "rc"] }
 serde_json = "1.0.124"
@@ -99,7 +101,7 @@ serde_path_to_error = "0.1.16"
 serde_with = "1.14.0"
 smallvec = { version = "1.13.2", features = ["const_new", "union", "const_generics"] }
 smol_str = "0.1.24"
-stdx = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-04" }
+stdx = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-17" }
 strsim = { version = "0.10.0" }
 strum = "0.25.0"
 strum_macros = "0.25.3"
@@ -116,7 +118,7 @@ tree-sitter = "0.23.2"
 tree-sitter-erlang = "0.14.0" # @oss-only
 url = "2.5.4"
 ustr = { version = "1.1.0", features = ["serde"] }
-vfs = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-04" }
-vfs-notify = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-04" }
+vfs = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-17" }
+vfs-notify = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-17" }
 walkdir = "2.5.0"
 xshell = "0.2.6"
diff --git a/crates/base_db/Cargo.toml b/crates/base_db/Cargo.toml
index a8c0c0e834..07f3cbb81a 100644
--- a/crates/base_db/Cargo.toml
+++ b/crates/base_db/Cargo.toml
@@ -14,6 +14,7 @@ elp_project_model.workspace = true
 elp_syntax.workspace = true
 
 anyhow.workspace = true
+dashmap.workspace = true
 dissimilar.workspace = true
 eetf.workspace = true
 either.workspace = true
@@ -22,6 +23,7 @@ lazy_static.workspace = true
 log.workspace = true
 paths.workspace = true
 profile.workspace = true
+ra_ap_query-group-macro.workspace = true
 regex.workspace = true
 salsa.workspace = true
 serde_json.workspace = true
diff --git a/crates/base_db/src/change.rs b/crates/base_db/src/change.rs
index 48758f9e17..6bb412a60d 100644
--- a/crates/base_db/src/change.rs
+++ b/crates/base_db/src/change.rs
@@ -17,7 +17,7 @@ use std::sync::Arc;
 use vfs::AbsPathBuf;
 use vfs::FileId;
 
-use crate::SourceDatabaseExt;
+use crate::RootQueryDb;
 use crate::SourceRoot;
 use crate::SourceRootId;
 use crate::input::AppStructure;
@@ -65,7 +65,7 @@ impl Change {
 
     pub fn apply(
         self,
-        db: &mut dyn SourceDatabaseExt,
+        db: &mut dyn RootQueryDb,
         resolve_file_id: &impl Fn(&AbsPathBuf) -> Option<FileId>,
     ) -> Vec<FileId> {
         let _p = tracing::info_span!("RootDatabase::apply_change").entered();
diff --git a/crates/base_db/src/fixture.rs b/crates/base_db/src/fixture.rs
index 7464f4f793..9e56edef89 100644
--- a/crates/base_db/src/fixture.rs
+++ b/crates/base_db/src/fixture.rs
@@ -47,12 +47,12 @@ use crate::FilePosition;
 use crate::FileRange;
 use crate::ProjectApps;
 use crate::ProjectId;
-use crate::SourceDatabaseExt;
+use crate::SourceDatabase;
 use crate::SourceRoot;
 use crate::change::Change;
 use crate::input::IncludeOtp;
 
-pub trait WithFixture: Default + SourceDatabaseExt + 'static {
+pub trait WithFixture: Default + SourceDatabase + 'static {
     #[track_caller]
     fn with_single_file(fixture: &str) -> (Self, FileId) {
         let (db, fixture) = Self::with_fixture(fixture);
@@ -91,7 +91,7 @@ pub trait WithFixture: Default + SourceDatabaseExt + 'static {
     }
 }
 
-impl<DB: SourceDatabaseExt + Default + 'static> WithFixture for DB {}
+impl<DB: SourceDatabase + Default + 'static> WithFixture for DB {}
 
 #[derive(Clone, Debug)]
 pub struct ChangeFixture {
diff --git a/crates/base_db/src/include.rs b/crates/base_db/src/include.rs
index adad605cbf..c561a6abb7 100644
--- a/crates/base_db/src/include.rs
+++ b/crates/base_db/src/include.rs
@@ -16,21 +16,21 @@ use vfs::VfsPath;
 
 use crate::AppData;
 use crate::ProjectId;
-use crate::SourceDatabase;
+use crate::RootQueryDb;
 use crate::SourceRoot;
 
 pub struct IncludeCtx<'a> {
-    db: &'a dyn SourceDatabase,
+    db: &'a dyn RootQueryDb,
     source_root: Arc<SourceRoot>,
     pub file_id: FileId,
 }
 
 impl<'a> IncludeCtx<'a> {
-    pub fn new(db: &'a dyn SourceDatabase, file_id: FileId) -> Self {
+    pub fn new(db: &'a dyn RootQueryDb, file_id: FileId) -> Self {
         // Context for T171541590
         let _ = stdx::panic_context::enter(format!("\nIncludeCtx::new: {:?}", file_id));
-        let source_root_id = db.file_source_root(file_id);
-        let source_root = db.source_root(source_root_id);
+        let source_root_id = db.file_source_root(file_id).source_root_id(db);
+        let source_root = db.source_root(source_root_id).source_root(db);
         Self {
             db,
             file_id,
@@ -58,7 +58,7 @@ impl<'a> IncludeCtx<'a> {
 
     /// Called via salsa for inserting in the graph
     pub(crate) fn resolve_local_query(
-        db: &dyn SourceDatabase,
+        db: &dyn RootQueryDb,
         file_id: FileId,
         path: SmolStr,
     ) -> Option<FileId> {
@@ -77,12 +77,12 @@ impl<'a> IncludeCtx<'a> {
 
     /// Called via salsa for inserting in the graph
     pub(crate) fn resolve_remote_query(
-        db: &dyn SourceDatabase,
+        db: &dyn RootQueryDb,
         file_id: FileId,
         path: SmolStr,
     ) -> Option<FileId> {
         let project_id = db.file_project_id(file_id)?;
-        let project_data = db.project_data(project_id);
+        let project_data = db.project_data(project_id).project_data(db);
         let include = if let Some(include_mapping) = &project_data.include_mapping {
             include_mapping
                 .get(&path)
@@ -104,7 +104,7 @@ impl<'a> IncludeCtx<'a> {
 }
 
 fn find_generated_include_lib(
-    db: &dyn SourceDatabase,
+    db: &dyn RootQueryDb,
     project_id: ProjectId,
     include_path: &str,
     target_app_data: &AppData,
@@ -132,7 +132,7 @@ fn find_generated_include_lib(
 }
 
 pub fn generated_file_include_lib(
-    db: &dyn SourceDatabase,
+    db: &dyn RootQueryDb,
     file_id: FileId,
     included_file_id: FileId,
     include_path: VfsPath,
diff --git a/crates/base_db/src/input.rs b/crates/base_db/src/input.rs
index f86dae5f61..ef672ff5af 100644
--- a/crates/base_db/src/input.rs
+++ b/crates/base_db/src/input.rs
@@ -29,7 +29,7 @@ use vfs::VfsPath;
 use vfs::file_set::FileSet;
 
 use crate::AppDataIndex;
-use crate::SourceDatabaseExt;
+use crate::RootQueryDb;
 
 /// Files are grouped into source roots. A source root is a directory on the
 /// file systems which is watched for changes. Typically it corresponds to an OTP
@@ -204,7 +204,7 @@ impl AppStructure {
     /// Set the salsa inputs according to this AppStructure
     pub fn apply(
         self,
-        db: &mut dyn SourceDatabaseExt,
+        db: &mut dyn RootQueryDb,
         resolve_file_id: &impl Fn(&AbsPathBuf) -> Option<FileId>,
     ) -> FxHashMap<AbsPathBuf, AppDataId> {
         let mut app_index = AppDataIndex::default();
diff --git a/crates/base_db/src/lib.rs b/crates/base_db/src/lib.rs
index 3ec2f75408..7999ce6674 100644
--- a/crates/base_db/src/lib.rs
+++ b/crates/base_db/src/lib.rs
@@ -9,8 +9,11 @@
  */
 
 use std::borrow::Cow;
+use std::hash::BuildHasherDefault;
 use std::sync::Arc;
 
+use dashmap::DashMap;
+use dashmap::Entry;
 use elp_project_model::AppName;
 use elp_project_model::buck::IncludeMapping;
 use elp_syntax::AstNode;
@@ -20,6 +23,7 @@ use elp_syntax::TextRange;
 use elp_syntax::TextSize;
 use elp_syntax::ast::SourceFile;
 use fxhash::FxHashMap;
+use fxhash::FxHasher;
 use lazy_static::lazy_static;
 
 mod change;
@@ -61,6 +65,7 @@ pub use paths::RelPath;
 pub use paths::RelPathBuf;
 use regex::Regex;
 pub use salsa;
+use salsa::Setter;
 pub use vfs::AnchoredPath;
 pub use vfs::AnchoredPathBuf;
 pub use vfs::ChangeKind;
@@ -143,35 +148,213 @@ impl FileKind {
     }
 }
 
-pub trait FileLoader {
-    /// Text of the file.
-    fn file_text(&self, file_id: FileId) -> Arc<str>;
+#[derive(Debug, Default, Clone)]
+pub struct Files {
+    files: Arc<DashMap<FileId, FileText, BuildHasherDefault<FxHasher>>>,
+    source_roots: Arc<DashMap<SourceRootId, SourceRootInput, BuildHasherDefault<FxHasher>>>,
+    file_source_roots: Arc<DashMap<FileId, FileSourceRootInput, BuildHasherDefault<FxHasher>>>,
+    app_datas: Arc<DashMap<AppDataId, AppDataInput, BuildHasherDefault<FxHasher>>>,
+    source_app_datas: Arc<DashMap<SourceRootId, SourceAppDataInput, BuildHasherDefault<FxHasher>>>,
+    project_datas: Arc<DashMap<ProjectId, ProjectDataInput, BuildHasherDefault<FxHasher>>>,
+}
+
+impl Files {
+    pub fn file_text(&self, file_id: FileId) -> FileText {
+        *self
+            .files
+            .get(&file_id)
+            .expect("Unable to fetch file; this is a bug")
+    }
+
+    pub fn set_file_text(&self, db: &mut dyn SourceDatabase, file_id: FileId, text: Arc<str>) {
+        let files = Arc::clone(&self.files);
+        match files.entry(file_id) {
+            Entry::Occupied(mut occupied) => {
+                occupied.get_mut().set_text(db).to(text);
+            }
+            Entry::Vacant(vacant) => {
+                let text = FileText::builder(text).new(db);
+                vacant.insert(text);
+            }
+        };
+    }
+
+    pub fn source_root(&self, source_root_id: SourceRootId) -> SourceRootInput {
+        let source_root = self
+            .source_roots
+            .get(&source_root_id)
+            .expect("Unable to fetch source root id; this is a bug");
+
+        *source_root
+    }
+
+    pub fn set_source_root(
+        &self,
+        db: &mut dyn SourceDatabase,
+        source_root_id: SourceRootId,
+        source_root: Arc<SourceRoot>,
+    ) {
+        let source_roots = Arc::clone(&self.source_roots);
+        match source_roots.entry(source_root_id) {
+            Entry::Occupied(mut occupied) => {
+                occupied.get_mut().set_source_root(db).to(source_root);
+            }
+            Entry::Vacant(vacant) => {
+                let source_root = SourceRootInput::builder(source_root).new(db);
+                vacant.insert(source_root);
+            }
+        };
+    }
+
+    pub fn file_source_root(&self, id: FileId) -> FileSourceRootInput {
+        let file_source_root = self
+            .file_source_roots
+            .get(&id)
+            .expect("Unable to fetch FileSourceRootInput; this is a bug");
+        *file_source_root
+    }
+
+    pub fn set_file_source_root(
+        &self,
+        db: &mut dyn SourceDatabase,
+        id: FileId,
+        source_root_id: SourceRootId,
+    ) {
+        let file_source_roots = Arc::clone(&self.file_source_roots);
+        match file_source_roots.entry(id) {
+            Entry::Occupied(mut occupied) => {
+                occupied.get_mut().set_source_root_id(db).to(source_root_id);
+            }
+            Entry::Vacant(vacant) => {
+                let file_source_root = FileSourceRootInput::builder(source_root_id).new(db);
+                vacant.insert(file_source_root);
+            }
+        };
+    }
+
+    pub fn app_data(&self, app_data_id: AppDataId) -> AppDataInput {
+        let app_data = self
+            .app_datas
+            .get(&app_data_id)
+            .expect("Unable to fetch app data id; this is a bug");
+
+        *app_data
+    }
+
+    pub fn set_app_data(
+        &self,
+        db: &mut dyn SourceDatabase,
+        app_data_id: AppDataId,
+        app_data: Option<Arc<AppData>>,
+    ) {
+        let app_datas = Arc::clone(&self.app_datas);
+        match app_datas.entry(app_data_id) {
+            Entry::Occupied(mut occupied) => {
+                occupied.get_mut().set_app_data(db).to(app_data);
+            }
+            Entry::Vacant(vacant) => {
+                let app_data = AppDataInput::builder(app_data).new(db);
+                vacant.insert(app_data);
+            }
+        };
+    }
+
+    pub fn source_app_data(&self, source_root_id: SourceRootId) -> SourceAppDataInput {
+        let source_app_data = self
+            .source_app_datas
+            .get(&source_root_id)
+            .expect("Unable to fetch source app data; this is a bug");
+
+        *source_app_data
+    }
+
+    pub fn set_source_app_data(
+        &self,
+        db: &mut dyn SourceDatabase,
+        source_root_id: SourceRootId,
+        app_data_id: AppDataId,
+    ) {
+        let source_app_datas = Arc::clone(&self.source_app_datas);
+        match source_app_datas.entry(source_root_id) {
+            Entry::Occupied(mut occupied) => {
+                occupied.get_mut().set_app_data_id(db).to(app_data_id);
+            }
+            Entry::Vacant(vacant) => {
+                let source_app_data = SourceAppDataInput::builder(app_data_id).new(db);
+                vacant.insert(source_app_data);
+            }
+        };
+    }
+
+    pub fn project_data(&self, project_id: ProjectId) -> ProjectDataInput {
+        let project_data = self
+            .project_datas
+            .get(&project_id)
+            .expect("Unable to fetch project data; this is a bug");
+
+        *project_data
+    }
+
+    pub fn set_project_data(
+        &self,
+        db: &mut dyn SourceDatabase,
+        project_id: ProjectId,
+        project_data: Arc<ProjectData>,
+    ) {
+        let project_datas = Arc::clone(&self.project_datas);
+        match project_datas.entry(project_id) {
+            Entry::Occupied(mut occupied) => {
+                occupied.get_mut().set_project_data(db).to(project_data);
+            }
+            Entry::Vacant(vacant) => {
+                let project_data = ProjectDataInput::builder(project_data).new(db);
+                vacant.insert(project_data);
+            }
+        };
+    }
+}
+
+#[salsa::input]
+pub struct FileText {
+    pub text: Arc<str>,
+}
+
+#[salsa::input]
+pub struct FileSourceRootInput {
+    pub source_root_id: SourceRootId,
+}
+
+#[salsa::input]
+pub struct SourceRootInput {
+    pub source_root: Arc<SourceRoot>,
+}
+
+#[salsa::input]
+pub struct AppDataInput {
+    pub app_data: Option<Arc<AppData>>,
+}
+
+#[salsa::input]
+pub struct SourceAppDataInput {
+    pub app_data_id: AppDataId,
+}
+
+#[salsa::input]
+pub struct ProjectDataInput {
+    pub project_data: Arc<ProjectData>,
 }
 
 /// Database which stores all significant input facts: source code and project
 /// model. Everything else in ELP is derived from these queries.
-#[salsa::query_group(SourceDatabaseStorage)]
-pub trait SourceDatabase: FileLoader + salsa::Database {
-    /// Path to a file, relative to the root of its source root.
-    /// Source root of the file.
-    #[salsa::input]
-    fn file_source_root(&self, file_id: FileId) -> SourceRootId;
-
+#[ra_ap_query_group_macro::query_group]
+pub trait RootQueryDb: SourceDatabase + salsa::Database {
     #[salsa::input]
     fn catch_all_source_root(&self) -> SourceRootId;
 
-    /// Contents of the source root.
-    #[salsa::input]
-    fn source_root(&self, id: SourceRootId) -> Arc<SourceRoot>;
-
     /// The data for a given application. We can access this either
     /// from the `FileId` or by `SourceRootId`, so introduce an
     /// intermediate `AppDataId` to map from the two sources.
     fn app_data(&self, id: SourceRootId) -> Option<Arc<AppData>>;
-    #[salsa::input]
-    fn app_data_by_id(&self, id: AppDataId) -> Option<Arc<AppData>>;
-    #[salsa::input]
-    fn app_data_id(&self, id: SourceRootId) -> AppDataId;
 
     fn app_data_id_by_file(&self, id: FileId) -> Option<AppDataId>;
 
@@ -179,9 +362,6 @@ pub trait SourceDatabase: FileLoader + salsa::Database {
 
     fn mapped_include_file(&self, project_id: ProjectId, path: SmolStr) -> Option<FileId>;
 
-    #[salsa::input]
-    fn project_data(&self, id: ProjectId) -> Arc<ProjectData>;
-
     fn file_app_data(&self, file_id: FileId) -> Option<Arc<AppData>>;
 
     /// Returns a map from module name to FileId of the containing file.
@@ -227,13 +407,43 @@ pub trait SourceDatabase: FileLoader + salsa::Database {
     fn resolve_remote(&self, file_id: FileId, path: SmolStr) -> Option<FileId>;
 }
 
-fn app_data(db: &dyn SourceDatabase, id: SourceRootId) -> Option<Arc<AppData>> {
-    db.app_data_by_id(db.app_data_id(id))
+#[salsa::db]
+pub trait SourceDatabase: salsa::Database {
+    fn file_text(&self, file_id: FileId) -> FileText;
+
+    fn set_file_text(&mut self, file_id: FileId, text: Arc<str>);
+
+    /// Contents of the source root.
+    fn source_root(&self, id: SourceRootId) -> SourceRootInput;
+
+    fn set_source_root(&mut self, source_root_id: SourceRootId, source_root: Arc<SourceRoot>);
+
+    /// Source root of the file.
+    fn file_source_root(&self, id: FileId) -> FileSourceRootInput;
+
+    fn set_file_source_root(&mut self, id: FileId, source_root_id: SourceRootId);
+
+    fn app_data_by_id(&self, id: AppDataId) -> AppDataInput;
+
+    fn set_app_data_by_id(&mut self, id: AppDataId, app_data: Option<Arc<AppData>>);
+
+    fn app_data_id(&self, id: SourceRootId) -> SourceAppDataInput;
+
+    fn set_app_data_id(&mut self, id: SourceRootId, app_data_id: AppDataId);
+
+    fn project_data(&self, id: ProjectId) -> ProjectDataInput;
+
+    fn set_project_data(&mut self, id: ProjectId, project_data: Arc<ProjectData>);
 }
 
-fn file_app_data(db: &dyn SourceDatabase, file_id: FileId) -> Option<Arc<AppData>> {
+fn app_data(db: &dyn RootQueryDb, id: SourceRootId) -> Option<Arc<AppData>> {
+    db.app_data_by_id(db.app_data_id(id).app_data_id(db))
+        .app_data(db)
+}
+
+fn file_app_data(db: &dyn RootQueryDb, file_id: FileId) -> Option<Arc<AppData>> {
     let lookup = if let Some(id) = db.app_data_id_by_file(file_id) {
-        db.app_data_by_id(id)
+        db.app_data_by_id(id).app_data(db)
     } else {
         None
     };
@@ -242,16 +452,16 @@ fn file_app_data(db: &dyn SourceDatabase, file_id: FileId) -> Option<Arc<AppData
         // mode, and OTP files
         .or_else(|| {
             let source_root_id = db.file_source_root(file_id);
-            db.app_data(source_root_id)
+            db.app_data(source_root_id.source_root_id(db))
         })
 }
 
-fn module_index(db: &dyn SourceDatabase, project_id: ProjectId) -> Arc<ModuleIndex> {
+fn module_index(db: &dyn RootQueryDb, project_id: ProjectId) -> Arc<ModuleIndex> {
     let mut builder = ModuleIndex::builder();
 
-    let project_data = db.project_data(project_id);
+    let project_data = db.project_data(project_id).project_data(db);
     for &source_root_id in &project_data.source_roots {
-        let source_root = db.source_root(source_root_id);
+        let source_root = db.source_root(source_root_id).source_root(db);
         for file_id in source_root.iter() {
             if db.file_kind(file_id).is_module() {
                 if let Some(app_data) = db.file_app_data(file_id) {
@@ -304,9 +514,9 @@ impl IncludeFileIndex {
     }
 }
 
-fn include_file_index(db: &dyn SourceDatabase, project_id: ProjectId) -> Arc<IncludeFileIndex> {
+fn include_file_index(db: &dyn RootQueryDb, project_id: ProjectId) -> Arc<IncludeFileIndex> {
     let mut include_file_index = IncludeFileIndex::default();
-    let project_data = db.project_data(project_id);
+    let project_data = db.project_data(project_id).project_data(db);
     build_include_file_index(db, &project_data, &mut include_file_index);
     project_data
         .otp_project_id
@@ -315,7 +525,7 @@ fn include_file_index(db: &dyn SourceDatabase, project_id: ProjectId) -> Arc<Inc
             if *otp_project_id != project_id {
                 build_include_file_index(
                     db,
-                    &db.project_data(*otp_project_id),
+                    &db.project_data(*otp_project_id).project_data(db),
                     &mut include_file_index,
                 );
             }
@@ -327,12 +537,12 @@ fn include_file_index(db: &dyn SourceDatabase, project_id: ProjectId) -> Arc<Inc
 }
 
 fn build_include_file_index(
-    db: &dyn SourceDatabase,
+    db: &dyn RootQueryDb,
     project_data: &Arc<ProjectData>,
     include_file_index: &mut IncludeFileIndex,
 ) {
     for &source_root_id in &project_data.source_roots {
-        let source_root = db.source_root(source_root_id);
+        let source_root = db.source_root(source_root_id).source_root(db);
         for file_id in source_root.iter() {
             if let Some(path) = source_root.path_for_file(&file_id) {
                 if let Some((_name, Some("hrl"))) = path.name_and_extension() {
@@ -345,17 +555,13 @@ fn build_include_file_index(
     }
 }
 
-fn include_file_id(
-    db: &dyn SourceDatabase,
-    project_id: ProjectId,
-    path: VfsPath,
-) -> Option<FileId> {
+fn include_file_id(db: &dyn RootQueryDb, project_id: ProjectId, path: VfsPath) -> Option<FileId> {
     let include_file_index = db.include_file_index(project_id);
     include_file_index.path_to_file_id.get(&path).copied()
 }
 
 fn mapped_include_file(
-    db: &dyn SourceDatabase,
+    db: &dyn RootQueryDb,
     project_id: ProjectId,
     path: SmolStr,
 ) -> Option<FileId> {
@@ -372,12 +578,12 @@ pub struct AppDataIndex {
     pub map: FxHashMap<FileId, AppDataId>,
 }
 
-fn app_data_id_by_file(db: &dyn SourceDatabase, file_id: FileId) -> Option<AppDataId> {
+fn app_data_id_by_file(db: &dyn RootQueryDb, file_id: FileId) -> Option<AppDataId> {
     let app_data_index = db.app_index();
     app_data_index.map.get(&file_id).copied()
 }
 
-pub fn set_app_data_id_by_file(db: &mut dyn SourceDatabase, id: FileId, app_data_id: AppDataId) {
+pub fn set_app_data_id_by_file(db: &mut dyn RootQueryDb, id: FileId, app_data_id: AppDataId) {
     let mut app_data_index: Arc<AppDataIndex> = db.app_index();
     Arc::make_mut(&mut app_data_index)
         .map
@@ -385,18 +591,18 @@ pub fn set_app_data_id_by_file(db: &mut dyn SourceDatabase, id: FileId, app_data
     db.set_app_index(app_data_index);
 }
 
-fn parse(db: &dyn SourceDatabase, file_id: FileId) -> Parse<SourceFile> {
-    let text = db.file_text(file_id);
+fn parse(db: &dyn RootQueryDb, file_id: FileId) -> Parse<SourceFile> {
+    let text = db.file_text(file_id).text(db);
     SourceFile::parse_text(&text)
 }
 
-pub fn path_for_file(db: &dyn SourceDatabase, file_id: FileId) -> Option<VfsPath> {
-    let source_root_id = db.file_source_root(file_id);
-    let source_root = db.source_root(source_root_id);
+pub fn path_for_file(db: &dyn RootQueryDb, file_id: FileId) -> Option<VfsPath> {
+    let source_root_id = db.file_source_root(file_id).source_root_id(db);
+    let source_root = db.source_root(source_root_id).source_root(db);
     source_root.path_for_file(&file_id).cloned()
 }
 
-fn is_generated(db: &dyn SourceDatabase, file_id: FileId) -> bool {
+fn is_generated(db: &dyn RootQueryDb, file_id: FileId) -> bool {
     lazy_static! {
         // We operate a byte level via a regex (as opposed to use .contains)
         // to avoid issues with UTF8 character boundaries.
@@ -404,27 +610,27 @@ fn is_generated(db: &dyn SourceDatabase, file_id: FileId) -> bool {
         // The format macro is used to avoid marking the whole file as generated
         static ref RE: regex::bytes::Regex = regex::bytes::Regex::new(&format!("{}generated", "@")).unwrap();
     }
-    let contents = db.file_text(file_id);
+    let contents = db.file_text(file_id).text(db);
     RE.is_match(&contents.as_bytes()[0..(2001.min(contents.len()))])
 }
 
-fn is_erlang_config_file(db: &dyn SourceDatabase, file_id: FileId) -> bool {
+fn is_erlang_config_file(db: &dyn RootQueryDb, file_id: FileId) -> bool {
     let parse = db.parse(file_id);
     parse.tree().is_erlang_config_file()
 }
 
-fn is_otp(db: &dyn SourceDatabase, file_id: FileId) -> Option<bool> {
+fn is_otp(db: &dyn RootQueryDb, file_id: FileId) -> Option<bool> {
     let app_data = db.file_app_data(file_id)?;
     let project_id = app_data.project_id;
-    Some(db.project_data(project_id).otp_project_id == Some(project_id))
+    Some(db.project_data(project_id).project_data(db).otp_project_id == Some(project_id))
 }
 
-fn is_test_suite_or_test_helper(db: &dyn SourceDatabase, file_id: FileId) -> Option<bool> {
+fn is_test_suite_or_test_helper(db: &dyn RootQueryDb, file_id: FileId) -> Option<bool> {
     // Context for T171541590
     let _ = stdx::panic_context::enter(format!("\nis_test_suite_or_test_helper: {:?}", file_id));
     let app_data = db.file_app_data(file_id)?;
-    let root_id = db.file_source_root(file_id);
-    let root = db.source_root(root_id);
+    let root_id = db.file_source_root(file_id).source_root_id(db);
+    let root = db.source_root(root_id).source_root(db);
     let path = root.path_for_file(&file_id)?;
     if app_data.is_extra_src_file(path) {
         Some(true)
@@ -433,28 +639,28 @@ fn is_test_suite_or_test_helper(db: &dyn SourceDatabase, file_id: FileId) -> Opt
     }
 }
 
-fn file_app_type(db: &dyn SourceDatabase, file_id: FileId) -> Option<AppType> {
+fn file_app_type(db: &dyn RootQueryDb, file_id: FileId) -> Option<AppType> {
     // Context for T171541590
     let _ = stdx::panic_context::enter(format!("\nfile_app_type: {:?}", file_id));
     let app_data = db.file_app_data(file_id)?;
     Some(app_data.app_type)
 }
 
-fn file_app_name(db: &dyn SourceDatabase, file_id: FileId) -> Option<AppName> {
+fn file_app_name(db: &dyn RootQueryDb, file_id: FileId) -> Option<AppName> {
     // Context for T171541590
     let _ = stdx::panic_context::enter(format!("\nfile_app_name: {:?}", file_id));
     let app_data = db.file_app_data(file_id)?;
     Some(app_data.name.clone())
 }
 
-fn file_project_id(db: &dyn SourceDatabase, file_id: FileId) -> Option<ProjectId> {
+fn file_project_id(db: &dyn RootQueryDb, file_id: FileId) -> Option<ProjectId> {
     // Context for T171541590
     let _ = stdx::panic_context::enter(format!("\nfile_project_id: {:?}", file_id));
     let app_data = db.file_app_data(file_id)?;
     Some(app_data.project_id)
 }
 
-pub fn module_name(db: &dyn SourceDatabase, file_id: FileId) -> Option<ModuleName> {
+pub fn module_name(db: &dyn RootQueryDb, file_id: FileId) -> Option<ModuleName> {
     // Context for T171541590
     let _ = stdx::panic_context::enter(format!("\nmodule_name: {:?}", file_id));
     let app_data = db.file_app_data(file_id)?;
@@ -473,11 +679,11 @@ static ref IGNORED_SOURCES: Vec<Regex> = {
    };
 }
 
-fn file_kind(db: &dyn SourceDatabase, file_id: FileId) -> FileKind {
+fn file_kind(db: &dyn RootQueryDb, file_id: FileId) -> FileKind {
     // Context for T171541590
     let _ = stdx::panic_context::enter(format!("\nfile_kind: {:?}", file_id));
-    let source_root_id = db.file_source_root(file_id);
-    let source_root = db.source_root(source_root_id);
+    let source_root_id = db.file_source_root(file_id).source_root_id(db);
+    let source_root = db.source_root(source_root_id).source_root(db);
     let ignored_path = source_root
         .path_for_file(&file_id)
         .and_then(|path| path.as_path())
@@ -512,7 +718,7 @@ fn file_kind(db: &dyn SourceDatabase, file_id: FileId) -> FileKind {
 }
 
 /// When we get a range from the client, limit it to what is in the source file
-fn clamp_range(db: &dyn SourceDatabase, file_id: FileId, range: TextRange) -> TextRange {
+fn clamp_range(db: &dyn RootQueryDb, file_id: FileId, range: TextRange) -> TextRange {
     let source_file = db.parse(file_id).tree();
     let file_range = source_file.syntax().text_range();
     let start = file_range.start();
@@ -523,7 +729,7 @@ fn clamp_range(db: &dyn SourceDatabase, file_id: FileId, range: TextRange) -> Te
     )
 }
 
-fn clamp_offset(db: &dyn SourceDatabase, file_id: FileId, offset: TextSize) -> TextSize {
+fn clamp_offset(db: &dyn RootQueryDb, file_id: FileId, offset: TextSize) -> TextSize {
     let source_file = db.parse(file_id).tree();
     let file_range = source_file.syntax().text_range();
     let start = file_range.start();
@@ -531,23 +737,6 @@ fn clamp_offset(db: &dyn SourceDatabase, file_id: FileId, offset: TextSize) -> T
     offset.clamp(start, end)
 }
 
-/// We don't want to give HIR knowledge of source roots, hence we extract these
-/// methods into a separate DB.
-#[salsa::query_group(SourceDatabaseExtStorage)]
-pub trait SourceDatabaseExt: SourceDatabase {
-    #[salsa::input]
-    fn file_text(&self, file_id: FileId) -> Arc<str>;
-}
-
-/// Silly workaround for cyclic deps between the traits
-pub struct FileLoaderDelegate<T>(pub T);
-
-impl<T: SourceDatabaseExt> FileLoader for FileLoaderDelegate<&'_ T> {
-    fn file_text(&self, file_id: FileId) -> Arc<str> {
-        SourceDatabaseExt::file_text(self.0, file_id)
-    }
-}
-
 /// If the `input` string represents an atom, and needs quoting, quote
 /// it.
 pub fn to_quoted_string(input: &str) -> Cow<str> {
diff --git a/crates/elp/src/bin/glean.rs b/crates/elp/src/bin/glean.rs
index 3eb58e0836..d7e3006bc8 100644
--- a/crates/elp/src/bin/glean.rs
+++ b/crates/elp/src/bin/glean.rs
@@ -28,8 +28,8 @@ use elp_ide::elp_ide_db::elp_base_db::FileId;
 use elp_ide::elp_ide_db::elp_base_db::IncludeOtp;
 use elp_ide::elp_ide_db::elp_base_db::ModuleName;
 use elp_ide::elp_ide_db::elp_base_db::ProjectId;
+use elp_ide::elp_ide_db::elp_base_db::RootQueryDb;
 use elp_ide::elp_ide_db::elp_base_db::SourceDatabase;
-use elp_ide::elp_ide_db::elp_base_db::SourceDatabaseExt;
 use elp_ide::elp_ide_db::elp_base_db::VfsPath;
 use elp_ide::elp_ide_db::elp_base_db::module_name;
 use elp_ide::elp_ide_db::elp_base_db::path_for_file;
@@ -793,8 +793,8 @@ impl GleanIndexer {
                 let file_id = index
                     .file_for_module(&ModuleName::new(module))
                     .expect("No module found");
-                let source_root_id = db.file_source_root(file_id);
-                let source_root = db.source_root(source_root_id);
+                let source_root_id = db.file_source_root(file_id).source_root_id(db);
+                let source_root = db.source_root(source_root_id).source_root(db);
                 let path = source_root.path_for_file(&file_id).unwrap();
                 match Self::index_file(
                     db,
@@ -859,12 +859,12 @@ impl GleanIndexer {
     }
 
     fn project_files(db: &RootDatabase, project_id: ProjectId) -> Vec<(FileId, VfsPath)> {
-        let project_data = db.project_data(project_id);
+        let project_data = db.project_data(project_id).project_data(db);
         let mut files = vec![];
         for &source_root_id in &project_data.source_roots {
             if let Some(app_data) = db.app_data(source_root_id) {
                 if app_data.app_type == AppType::App {
-                    let source_root = db.source_root(source_root_id);
+                    let source_root = db.source_root(source_root_id).source_root(db);
                     for file_id in source_root.iter() {
                         if let Some(path) = source_root.path_for_file(&file_id) {
                             files.push((file_id, path.clone()));
@@ -926,7 +926,7 @@ impl GleanIndexer {
                     let def = def_map.get_macros().get(&MacroName::new(name, x.key.arity));
                     if let Some(def) = def {
                         let range = def.source(db).syntax().text_range();
-                        let text = &db.file_text(id)[range];
+                        let text = &db.file_text(id).text(db)[range];
                         let text = format!("```erlang\n{}\n```", text);
                         let doc = match (&x.key.expansion, &x.key.ods_url) {
                             (None, None) => text,
@@ -990,7 +990,7 @@ impl GleanIndexer {
         project_id: ProjectId,
         prefix: Option<&String>,
     ) -> Option<FileFact> {
-        let project_data = db.project_data(project_id);
+        let project_data = db.project_data(project_id).project_data(db);
         let root = project_data.root_dir.as_path();
         let file_path = path.as_path()?;
         let file_path = file_path.strip_prefix(root)?;
@@ -1013,7 +1013,7 @@ impl GleanIndexer {
             line += 1;
             prev_offset = curr_offset;
         }
-        let content = db.file_text(file_id);
+        let content = db.file_text(file_id).text(db);
         if !content.ends_with('\n') {
             ends_with_new_line = false;
             let len = if content.len() as u32 >= prev_offset {
@@ -1112,7 +1112,7 @@ impl GleanIndexer {
 
         for (ty, def) in def_map.get_types() {
             let range = def.source(db).syntax().text_range();
-            let text = &db.file_text(file_id)[range];
+            let text = &db.file_text(file_id).text(db)[range];
             let text = format!("```erlang\n{}\n```", text);
             let span: Location = range.into();
 
@@ -1139,7 +1139,7 @@ impl GleanIndexer {
 
         for (rec, def) in def_map.get_records() {
             let range = def.source(db).syntax().text_range();
-            let text = &db.file_text(file_id)[range];
+            let text = &db.file_text(file_id).text(db)[range];
             let text = format!("```erlang\n{}\n```", text);
             let span: Location = range.into();
 
@@ -2571,8 +2571,8 @@ mod tests {
         let db = host.raw_database();
         for file_id in &fixture.files {
             let file_id = *file_id;
-            let source_root_id = db.file_source_root(file_id);
-            let source_root = db.source_root(source_root_id);
+            let source_root_id = db.file_source_root(file_id).source_root_id(db);
+            let source_root = db.source_root(source_root_id).source_root(db);
             let path = source_root.path_for_file(&file_id).unwrap();
             let (name, ext) = path.name_and_extension().unwrap();
             let name = format!("{}.{}", name, ext.unwrap());
diff --git a/crates/elp/src/bin/shell.rs b/crates/elp/src/bin/shell.rs
index b00ce58fc1..98ef380570 100644
--- a/crates/elp/src/bin/shell.rs
+++ b/crates/elp/src/bin/shell.rs
@@ -25,7 +25,6 @@ use elp_eqwalizer::Mode;
 use elp_ide::elp_ide_db::elp_base_db::AbsPathBuf;
 use elp_ide::elp_ide_db::elp_base_db::IncludeOtp;
 use elp_ide::elp_ide_db::elp_base_db::SourceDatabase;
-use elp_ide::elp_ide_db::elp_base_db::SourceDatabaseExt;
 use elp_ide::elp_ide_db::elp_base_db::SourceRoot;
 use elp_ide::elp_ide_db::elp_base_db::SourceRootId;
 use elp_ide::elp_ide_db::elp_base_db::VfsPath;
diff --git a/crates/elp/src/build/load.rs b/crates/elp/src/build/load.rs
index 115f6f56c6..3126a6f09f 100644
--- a/crates/elp/src/build/load.rs
+++ b/crates/elp/src/build/load.rs
@@ -26,7 +26,6 @@ use elp_ide::elp_ide_db::elp_base_db::IncludeOtp;
 use elp_ide::elp_ide_db::elp_base_db::ProjectApps;
 use elp_ide::elp_ide_db::elp_base_db::ProjectId;
 use elp_ide::elp_ide_db::elp_base_db::SourceDatabase;
-use elp_ide::elp_ide_db::elp_base_db::SourceDatabaseExt;
 use elp_ide::elp_ide_db::elp_base_db::SourceRoot;
 use elp_ide::elp_ide_db::elp_base_db::SourceRootId;
 use elp_ide::elp_ide_db::elp_base_db::Vfs;
diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index a240e3159f..988529b585 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -46,8 +46,8 @@ use elp_ide::elp_ide_db::elp_base_db::FileSetConfig;
 use elp_ide::elp_ide_db::elp_base_db::IncludeOtp;
 use elp_ide::elp_ide_db::elp_base_db::ProjectApps;
 use elp_ide::elp_ide_db::elp_base_db::ProjectId;
+use elp_ide::elp_ide_db::elp_base_db::RootQueryDb;
 use elp_ide::elp_ide_db::elp_base_db::SourceDatabase;
-use elp_ide::elp_ide_db::elp_base_db::SourceDatabaseExt;
 use elp_ide::elp_ide_db::elp_base_db::SourceRoot;
 use elp_ide::elp_ide_db::elp_base_db::SourceRootId;
 use elp_ide::elp_ide_db::elp_base_db::Vfs;
diff --git a/crates/eqwalizer/Cargo.toml b/crates/eqwalizer/Cargo.toml
index 031c43242f..e1bd709181 100644
--- a/crates/eqwalizer/Cargo.toml
+++ b/crates/eqwalizer/Cargo.toml
@@ -17,6 +17,7 @@ fxhash.workspace = true
 itertools.workspace = true
 log.workspace = true
 parking_lot.workspace = true
+ra_ap_query-group-macro.workspace = true
 salsa.workspace = true
 serde_json.workspace = true
 serde.workspace = true
diff --git a/crates/eqwalizer/src/analyses/mod.rs b/crates/eqwalizer/src/analyses/mod.rs
index b5ad028630..548d503d96 100644
--- a/crates/eqwalizer/src/analyses/mod.rs
+++ b/crates/eqwalizer/src/analyses/mod.rs
@@ -19,7 +19,7 @@ use crate::db::EqwalizerDiagnosticsDatabase;
 mod escape_hatches;
 mod overloaded_specs;
 
-#[salsa::query_group(EqwalizerAnalysesDatabaseStorage)]
+#[ra_ap_query_group_macro::query_group(EqwalizerAnalysesDatabaseStorage)]
 pub trait EqwalizerAnalysesDatabase: EqwalizerDiagnosticsDatabase {
     fn compute_eqwalizer_stats(
         &self,
diff --git a/crates/eqwalizer/src/db.rs b/crates/eqwalizer/src/db.rs
index b94659b5e0..316b697221 100644
--- a/crates/eqwalizer/src/db.rs
+++ b/crates/eqwalizer/src/db.rs
@@ -19,7 +19,7 @@ use elp_base_db::AppType;
 use elp_base_db::FileId;
 use elp_base_db::ModuleName;
 use elp_base_db::ProjectId;
-use elp_base_db::SourceDatabase;
+use elp_base_db::RootQueryDb;
 use elp_types_db::StringId;
 use elp_types_db::eqwalizer::AST;
 use elp_types_db::eqwalizer::Id;
@@ -76,8 +76,8 @@ pub trait ELPDbApi {
     fn module_ipc_handle(&self, module: ModuleName) -> Option<Arc<Mutex<IpcHandle>>>;
 }
 
-#[salsa::query_group(EqwalizerDiagnosticsDatabaseStorage)]
-pub trait EqwalizerDiagnosticsDatabase: EqwalizerErlASTStorage + SourceDatabase + ELPDbApi {
+#[ra_ap_query_group_macro::query_group]
+pub trait EqwalizerDiagnosticsDatabase: EqwalizerErlASTStorage + RootQueryDb + ELPDbApi {
     #[salsa::input]
     fn eqwalizer_config(&self) -> Arc<EqwalizerConfig>;
 
diff --git a/crates/eqwalizer/src/lib.rs b/crates/eqwalizer/src/lib.rs
index 6e92e108e0..155878e822 100644
--- a/crates/eqwalizer/src/lib.rs
+++ b/crates/eqwalizer/src/lib.rs
@@ -267,14 +267,14 @@ fn do_typecheck(
     project_id: ProjectId,
 ) -> Result<EqwalizerDiagnostics, anyhow::Error> {
     // Never cache the results of this function
-    db.salsa_runtime().report_untracked_read();
+    db.report_untracked_read();
     let handle = Arc::new(Mutex::new(
         IpcHandle::from_command(&mut cmd)
             .with_context(|| format!("starting eqWAlizer process: {:?}", cmd))?,
     ));
     let mut diagnostics = EqwalizerDiagnostics::default();
     loop {
-        db.unwind_if_cancelled();
+        db.unwind_if_revision_cancelled();
         let msg = handle.lock().receive()?;
         match msg {
             MsgFromEqWAlizer::EnteringModule { module } => {
@@ -318,7 +318,7 @@ fn get_module_diagnostics(
     let mut handle = handle_mutex.lock();
     handle.send(&MsgToEqWAlizer::ELPEnteringModule)?;
     loop {
-        db.unwind_if_cancelled();
+        db.unwind_if_revision_cancelled();
         match handle.receive()? {
             MsgFromEqWAlizer::GetAstBytes { module, format } => {
                 log::debug!(
diff --git a/crates/hir/Cargo.toml b/crates/hir/Cargo.toml
index 934619ca47..84d2445bea 100644
--- a/crates/hir/Cargo.toml
+++ b/crates/hir/Cargo.toml
@@ -20,6 +20,7 @@ la-arena.workspace = true
 lazy_static.workspace = true
 log.workspace = true
 profile.workspace = true
+ra_ap_query-group-macro.workspace = true
 regex.workspace = true
 stdx.workspace = true
 tracing.workspace = true
diff --git a/crates/hir/src/body.rs b/crates/hir/src/body.rs
index 0a3e160708..6545326604 100644
--- a/crates/hir/src/body.rs
+++ b/crates/hir/src/body.rs
@@ -13,7 +13,7 @@ use std::sync::Arc;
 
 use elp_base_db::FileId;
 use elp_base_db::FileRange;
-use elp_base_db::SourceDatabase;
+use elp_base_db::RootQueryDb;
 use elp_syntax::AstNode;
 use elp_syntax::AstPtr;
 use elp_syntax::SourceFile;
@@ -1112,7 +1112,7 @@ impl<T: AstNode> InFileAstPtr<T> {
             None
         }
     }
-    pub fn to_ast(&self, db: &dyn SourceDatabase) -> T {
+    pub fn to_ast(&self, db: &dyn RootQueryDb) -> T {
         let parse = db.parse(self.file_id());
         self.0.value.to_node(parse.tree().syntax())
     }
@@ -1211,7 +1211,7 @@ impl BodySourceMap {
 
 #[cfg(test)]
 mod local_tests {
-    use elp_base_db::SourceDatabase;
+    use elp_base_db::RootQueryDb;
     use elp_base_db::fixture::WithFixture;
     use elp_syntax::AstNode;
     use elp_syntax::algo::find_node_at_offset;
diff --git a/crates/hir/src/body/scope.rs b/crates/hir/src/body/scope.rs
index dd1da23e94..4584b58759 100644
--- a/crates/hir/src/body/scope.rs
+++ b/crates/hir/src/body/scope.rs
@@ -759,7 +759,7 @@ fn add_exported_scopes(
 #[cfg(test)]
 mod tests {
     use elp_base_db::FileId;
-    use elp_base_db::SourceDatabase;
+    use elp_base_db::RootQueryDb;
     use elp_base_db::assert_eq_text;
     use elp_base_db::extract_offset;
     use elp_base_db::fixture::WithFixture;
diff --git a/crates/hir/src/db.rs b/crates/hir/src/db.rs
index 783b30ae7c..207695d99a 100644
--- a/crates/hir/src/db.rs
+++ b/crates/hir/src/db.rs
@@ -11,7 +11,7 @@
 use std::sync::Arc;
 
 use elp_base_db::FileId;
-use elp_base_db::SourceDatabase;
+use elp_base_db::RootQueryDb;
 use elp_base_db::Upcast;
 use elp_base_db::salsa;
 use elp_syntax::ast;
@@ -50,17 +50,12 @@ use crate::edoc;
 use crate::edoc::EdocHeader;
 use crate::include;
 pub use crate::intern::InternDatabase;
-pub use crate::intern::InternDatabaseStorage;
 use crate::macro_exp;
 use crate::macro_exp::MacroResolution;
 
-#[salsa::query_group(DefDatabaseStorage)]
+#[ra_ap_query_group_macro::query_group]
 pub trait DefDatabase:
-    InternDatabase
-    + Upcast<dyn InternDatabase>
-    + SourceDatabase
-    + Upcast<dyn SourceDatabase>
-    + TypedSemantic
+    InternDatabase + Upcast<dyn InternDatabase> + RootQueryDb + Upcast<dyn RootQueryDb> + TypedSemantic
 {
     #[salsa::invoke(FormList::file_form_list_query)]
     fn file_form_list(&self, file_id: FileId) -> Arc<FormList>;
diff --git a/crates/hir/src/def_map.rs b/crates/hir/src/def_map.rs
index 6cb840f7f2..ea04a60a4f 100644
--- a/crates/hir/src/def_map.rs
+++ b/crates/hir/src/def_map.rs
@@ -22,6 +22,7 @@ use std::sync::Arc;
 
 use elp_base_db::FileId;
 use elp_base_db::module_name;
+use elp_base_db::salsa::Cycle;
 use elp_syntax::AstNode;
 use elp_syntax::ast;
 use elp_syntax::match_ast;
@@ -45,6 +46,7 @@ use crate::PPDirective;
 use crate::RecordDef;
 use crate::TypeAliasDef;
 use crate::db::DefDatabase;
+use crate::db::DefDatabaseData;
 use crate::form_list::DeprecatedAttribute;
 use crate::form_list::DeprecatedDesc;
 use crate::form_list::DeprecatedFa;
@@ -376,10 +378,11 @@ impl DefMap {
     // Return just the local def map in such cases, not resolving nested includes at all
     pub(crate) fn recover_cycle(
         db: &dyn DefDatabase,
-        _cycle: &[String],
-        file_id: &FileId,
+        _cycle: &Cycle,
+        _data: DefDatabaseData,
+        file_id: FileId,
     ) -> Arc<DefMap> {
-        db.def_map_local(*file_id)
+        db.def_map_local(file_id)
     }
 
     pub fn get_by_function_id(&self, function_id: &InFile<FunctionDefId>) -> Option<&FunctionDef> {
diff --git a/crates/hir/src/edoc.rs b/crates/hir/src/edoc.rs
index cd44d2f36b..50d3491d3d 100644
--- a/crates/hir/src/edoc.rs
+++ b/crates/hir/src/edoc.rs
@@ -35,7 +35,7 @@ use std::sync::Arc;
 use std::sync::LazyLock;
 
 use elp_base_db::FileId;
-use elp_base_db::SourceDatabase;
+use elp_base_db::RootQueryDb;
 use elp_syntax::AstNode;
 use elp_syntax::AstPtr;
 use elp_syntax::Direction;
@@ -120,12 +120,12 @@ impl EdocHeader {
         ))
     }
 
-    pub fn prev_divider(&self, db: &dyn SourceDatabase) -> Option<SyntaxNode> {
+    pub fn prev_divider(&self, db: &dyn RootQueryDb) -> Option<SyntaxNode> {
         let first_comment = self.comments().next()?;
         divider(first_comment.to_ast(db).syntax(), Direction::Prev)
     }
 
-    pub fn next_divider(&self, db: &dyn SourceDatabase) -> Option<SyntaxNode> {
+    pub fn next_divider(&self, db: &dyn RootQueryDb) -> Option<SyntaxNode> {
         let last_comment = self.comments().last()?;
         divider(last_comment.to_ast(db).syntax(), Direction::Next)
     }
diff --git a/crates/hir/src/include.rs b/crates/hir/src/include.rs
index 673f12e1af..c4a07c8396 100644
--- a/crates/hir/src/include.rs
+++ b/crates/hir/src/include.rs
@@ -58,7 +58,8 @@ mod tests {
                     .resolve_include(InFile::new(file_id, idx))
                     .unwrap_or_else(|| panic!("unresolved include: {:?}", include));
                 let resolved_path = db
-                    .source_root(db.file_source_root(resolved))
+                    .source_root(db.file_source_root(resolved).source_root_id(&db))
+                    .source_root(&db)
                     .path_for_file(&resolved)
                     .unwrap()
                     .clone();
diff --git a/crates/hir/src/intern.rs b/crates/hir/src/intern.rs
index e116c1a30f..ad1e3edf52 100644
--- a/crates/hir/src/intern.rs
+++ b/crates/hir/src/intern.rs
@@ -11,11 +11,12 @@
 use std::sync::Arc;
 
 use elp_base_db::salsa;
+use elp_base_db::salsa::plumbing::AsId;
 
 use crate::Name;
 
-#[salsa::query_group(InternDatabaseStorage)]
-pub trait InternDatabase {
+#[ra_ap_query_group_macro::query_group]
+pub trait InternDatabase: salsa::Database {
     #[salsa::interned]
     fn atom(&self, name: Name) -> Atom;
 
@@ -26,43 +27,19 @@ pub trait InternDatabase {
     fn ssr(&self, source: Arc<str>) -> SsrSource;
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct Atom(salsa::InternId);
-
-impl salsa::InternKey for Atom {
-    fn from_intern_id(v: salsa::InternId) -> Self {
-        Atom(v)
-    }
-
-    fn as_intern_id(&self) -> salsa::InternId {
-        self.0
-    }
+#[salsa::interned(no_lifetime)]
+pub struct Atom {
+    pub name: Name,
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct Var(salsa::InternId);
-
-impl salsa::InternKey for Var {
-    fn from_intern_id(v: salsa::InternId) -> Self {
-        Var(v)
-    }
-
-    fn as_intern_id(&self) -> salsa::InternId {
-        self.0
-    }
+#[salsa::interned(no_lifetime)]
+pub struct Var {
+    pub name: Name,
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct SsrSource(salsa::InternId);
-
-impl salsa::InternKey for SsrSource {
-    fn from_intern_id(v: salsa::InternId) -> Self {
-        SsrSource(v)
-    }
-
-    fn as_intern_id(&self) -> salsa::InternId {
-        self.0
-    }
+#[salsa::interned(no_lifetime)]
+pub struct SsrSource {
+    pub source: Arc<str>,
 }
 
 impl Atom {
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 7c54e55b54..48b9e8802e 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -9,7 +9,7 @@
  */
 
 use elp_base_db::FileId;
-use elp_base_db::SourceDatabase;
+use elp_base_db::RootQueryDb;
 use elp_syntax::ast;
 
 mod body;
@@ -195,7 +195,7 @@ impl<T> InFile<T> {
         self.with_value(&self.value)
     }
 
-    pub fn file_syntax(&self, db: &dyn SourceDatabase) -> ast::SourceFile {
+    pub fn file_syntax(&self, db: &dyn RootQueryDb) -> ast::SourceFile {
         db.parse(self.file_id).tree()
     }
 }
diff --git a/crates/hir/src/macro_exp.rs b/crates/hir/src/macro_exp.rs
index 849797509d..d52eab5be7 100644
--- a/crates/hir/src/macro_exp.rs
+++ b/crates/hir/src/macro_exp.rs
@@ -9,6 +9,7 @@
  */
 
 use elp_base_db::FileId;
+use elp_base_db::salsa::Cycle;
 use elp_syntax::ast;
 
 use crate::Define;
@@ -20,6 +21,7 @@ use crate::Name;
 use crate::PPDirective;
 use crate::body::SSR_SOURCE_FILE_ID;
 use crate::db::DefDatabase;
+use crate::db::DefDatabaseData;
 use crate::form_list::FormListData;
 use crate::known;
 use crate::name::AsName;
@@ -170,9 +172,10 @@ pub(crate) fn local_resolve_query(
 // This handles the case of headers accidentally forming cycles during macro resolution.
 pub(crate) fn recover_cycle(
     _db: &dyn DefDatabase,
-    _cycle: &[String],
-    _file_id: &FileId,
-    _name: &MacroName,
+    _cycle: &Cycle,
+    _data: DefDatabaseData,
+    _file_id: FileId,
+    _name: MacroName,
 ) -> MacroResolution {
     MacroResolution::Unresolved
 }
@@ -301,7 +304,7 @@ pub fn macro_name(macro_call: &ast::MacroCallExpr) -> Option<MacroName> {
 #[cfg(test)]
 mod tests {
     use elp_base_db::FileRange;
-    use elp_base_db::SourceDatabase;
+    use elp_base_db::RootQueryDb;
     use elp_base_db::fixture::ChangeFixture;
     use elp_base_db::fixture::WithFixture;
     use elp_syntax::AstNode;
diff --git a/crates/hir/src/module_data.rs b/crates/hir/src/module_data.rs
index 32820a1d5c..4d008f445d 100644
--- a/crates/hir/src/module_data.rs
+++ b/crates/hir/src/module_data.rs
@@ -13,7 +13,7 @@ use std::sync::Arc;
 use elp_base_db::FileId;
 use elp_base_db::FileKind;
 use elp_base_db::ModuleName;
-use elp_base_db::SourceDatabase;
+use elp_base_db::RootQueryDb;
 use elp_syntax::AstNode;
 use elp_syntax::AstPtr;
 use elp_syntax::SmolStr;
@@ -65,18 +65,20 @@ pub struct File {
 }
 
 impl File {
-    pub fn source(&self, db: &dyn SourceDatabase) -> ast::SourceFile {
+    pub fn source(&self, db: &dyn RootQueryDb) -> ast::SourceFile {
         db.parse(self.file_id).tree()
     }
 
-    pub fn kind(&self, db: &dyn SourceDatabase) -> FileKind {
+    pub fn kind(&self, db: &dyn RootQueryDb) -> FileKind {
         db.file_kind(self.file_id)
     }
 
-    pub fn name(&self, db: &dyn SourceDatabase) -> SmolStr {
+    pub fn name(&self, db: &dyn RootQueryDb) -> SmolStr {
         // Context for T171541590
         let _ = stdx::panic_context::enter(format!("\nFile::name: {:?}", self.file_id));
-        let source_root = db.source_root(db.file_source_root(self.file_id));
+        let source_root = db
+            .source_root(db.file_source_root(self.file_id).source_root_id(db))
+            .source_root(db);
         if let Some((name, Some(ext))) = source_root
             .path_for_file(&self.file_id)
             .and_then(|path| path.name_and_extension())
@@ -125,7 +127,7 @@ pub struct FunctionClauseDef {
 }
 
 impl FunctionClauseDef {
-    pub fn source(&self, db: &dyn SourceDatabase) -> ast::FunDecl {
+    pub fn source(&self, db: &dyn RootQueryDb) -> ast::FunDecl {
         let source_file = self.file.source(db);
         self.function_clause.form_id.get(&source_file)
     }
@@ -172,7 +174,7 @@ pub struct FunctionDef {
 }
 
 impl FunctionDef {
-    pub fn source(&self, db: &dyn SourceDatabase) -> Vec<ast::FunDecl> {
+    pub fn source(&self, db: &dyn RootQueryDb) -> Vec<ast::FunDecl> {
         let source_file = self.file.source(db);
         self.function_clauses
             .iter()
@@ -180,11 +182,11 @@ impl FunctionDef {
             .collect()
     }
 
-    pub fn first_clause_name(&self, db: &dyn SourceDatabase) -> Option<ast::Name> {
+    pub fn first_clause_name(&self, db: &dyn RootQueryDb) -> Option<ast::Name> {
         self.source(db).first()?.name()
     }
 
-    pub fn range(&self, db: &dyn SourceDatabase) -> Option<TextRange> {
+    pub fn range(&self, db: &dyn RootQueryDb) -> Option<TextRange> {
         let sources = self.source(db);
         let start = sources.first()?;
         let end = sources.last()?;
@@ -222,7 +224,7 @@ impl FunctionDef {
         )
     }
 
-    pub fn spec_range(&self, db: &dyn SourceDatabase) -> Option<TextRange> {
+    pub fn spec_range(&self, db: &dyn RootQueryDb) -> Option<TextRange> {
         self.spec.as_ref().map(|spec| spec.range(db))
     }
 
@@ -266,7 +268,7 @@ impl FunctionDef {
         Some(res)
     }
 
-    pub fn arg_names(&self, db: &dyn SourceDatabase) -> Option<Vec<String>> {
+    pub fn arg_names(&self, db: &dyn RootQueryDb) -> Option<Vec<String>> {
         match &self.spec {
             Some(spec_def) => match spec_def.arg_names(db) {
                 Some(arg_names_from_spec) => {
@@ -383,17 +385,17 @@ pub struct SpecDef {
 }
 
 impl SpecDef {
-    pub fn source(&self, db: &dyn SourceDatabase) -> ast::Spec {
+    pub fn source(&self, db: &dyn RootQueryDb) -> ast::Spec {
         let source_file = self.file.source(db);
         self.spec.form_id.get(&source_file)
     }
 
-    pub fn range(&self, db: &dyn SourceDatabase) -> TextRange {
+    pub fn range(&self, db: &dyn RootQueryDb) -> TextRange {
         let source = self.source(db);
         source.syntax().text_range()
     }
 
-    pub fn arg_names(&self, db: &dyn SourceDatabase) -> Option<Vec<SpecArgName>> {
+    pub fn arg_names(&self, db: &dyn RootQueryDb) -> Option<Vec<SpecArgName>> {
         let spec = self.source(db);
         let first_sig = spec.sigs().next()?;
         Some(
@@ -449,12 +451,12 @@ pub struct RecordDef {
 }
 
 impl RecordDef {
-    pub fn source(&self, db: &dyn SourceDatabase) -> ast::RecordDecl {
+    pub fn source(&self, db: &dyn RootQueryDb) -> ast::RecordDecl {
         let source_file = self.file.source(db);
         self.record.form_id.get(&source_file)
     }
 
-    pub fn range(&self, db: &dyn SourceDatabase) -> TextRange {
+    pub fn range(&self, db: &dyn RootQueryDb) -> TextRange {
         let source = self.source(db);
         source.syntax().text_range()
     }
@@ -514,7 +516,7 @@ pub struct RecordFieldDef {
 }
 
 impl RecordFieldDef {
-    pub fn source(&self, db: &dyn SourceDatabase) -> ast::RecordField {
+    pub fn source(&self, db: &dyn RootQueryDb) -> ast::RecordField {
         let record = self.record.source(db);
         record.fields().nth(self.field.idx as usize).unwrap()
     }
@@ -534,7 +536,7 @@ pub enum TypeAliasSource {
 }
 
 impl TypeAliasDef {
-    pub fn source(&self, db: &dyn SourceDatabase) -> TypeAliasSource {
+    pub fn source(&self, db: &dyn RootQueryDb) -> TypeAliasSource {
         let source_file = self.file.source(db);
         match self.type_alias {
             TypeAlias::Opaque { form_id, .. } => TypeAliasSource::Opaque(form_id.get(&source_file)),
@@ -555,14 +557,14 @@ impl TypeAliasDef {
         }
     }
 
-    pub fn range(&self, db: &dyn SourceDatabase) -> Option<TextRange> {
+    pub fn range(&self, db: &dyn RootQueryDb) -> Option<TextRange> {
         let source = self.source(db);
         Some(source.syntax().text_range())
     }
 
     /// This information is used for completion.
     /// We deliberately return nothing for an opaque type
-    pub fn map_expr_for_completion(&self, db: &dyn SourceDatabase) -> Option<MapExpr> {
+    pub fn map_expr_for_completion(&self, db: &dyn RootQueryDb) -> Option<MapExpr> {
         let source = self.source(db);
         match source {
             TypeAliasSource::Regular(alias) => match alias.ty()? {
@@ -604,7 +606,7 @@ pub struct CallbackDef {
 }
 
 impl CallbackDef {
-    pub fn source(&self, db: &dyn SourceDatabase) -> ast::Callback {
+    pub fn source(&self, db: &dyn RootQueryDb) -> ast::Callback {
         let source_file = self.file.source(db);
         self.callback.form_id.get(&source_file)
     }
@@ -617,7 +619,7 @@ pub struct DefineDef {
 }
 
 impl DefineDef {
-    pub fn source(&self, db: &dyn SourceDatabase) -> ast::PpDefine {
+    pub fn source(&self, db: &dyn RootQueryDb) -> ast::PpDefine {
         let source_file = self.file.source(db);
         self.define.form_id.get(&source_file)
     }
@@ -633,7 +635,7 @@ pub struct VarDef {
 }
 
 impl VarDef {
-    pub fn source(&self, db: &dyn SourceDatabase) -> ast::Var {
+    pub fn source(&self, db: &dyn RootQueryDb) -> ast::Var {
         let source_file = self.file.source(db);
         self.var.to_node(source_file.syntax())
     }
@@ -649,7 +651,7 @@ fn is_in_otp(file_id: FileId, db: &dyn DefDatabase) -> bool {
     match db.file_app_data(file_id) {
         Some(app_data) => {
             let project_id = app_data.project_id;
-            db.project_data(project_id).otp_project_id == Some(project_id)
+            db.project_data(project_id).project_data(db).otp_project_id == Some(project_id)
         }
         None => false,
     }
diff --git a/crates/hir/src/sema.rs b/crates/hir/src/sema.rs
index b433946852..86f5a68839 100644
--- a/crates/hir/src/sema.rs
+++ b/crates/hir/src/sema.rs
@@ -97,7 +97,6 @@ use crate::fold::MacroStrategy;
 use crate::fold::ParenStrategy;
 use crate::fold::Strategy;
 pub use crate::intern::InternDatabase;
-pub use crate::intern::InternDatabaseStorage;
 use crate::resolver::Resolution;
 use crate::resolver::Resolver;
 
@@ -561,7 +560,7 @@ impl Semantic<'_> {
     }
 
     pub fn vardef_source(&self, def: &VarDef) -> ast::Var {
-        def.source(self.db.upcast())
+        def.source(self.db)
     }
 
     pub fn range_for_any(&self, body: &Body, expr_id: &AnyExprId) -> Option<FileRange> {
@@ -1648,7 +1647,7 @@ impl<T> Index<TermId> for InFunctionClauseBody<'_, T> {
 #[cfg(test)]
 mod tests {
     use elp_base_db::ProjectId;
-    use elp_base_db::SourceDatabase;
+    use elp_base_db::RootQueryDb;
     use elp_base_db::fixture::WithFixture;
     use elp_syntax::AstNode;
     use elp_syntax::algo::find_node_at_offset;
diff --git a/crates/hir/src/test_db.rs b/crates/hir/src/test_db.rs
index d71bdaa9ef..c13f46006c 100644
--- a/crates/hir/src/test_db.rs
+++ b/crates/hir/src/test_db.rs
@@ -14,11 +14,23 @@ use std::fmt;
 use std::panic;
 use std::sync::Arc;
 
+use elp_base_db::AppData;
+use elp_base_db::AppDataId;
+use elp_base_db::AppDataInput;
 use elp_base_db::FileId;
-use elp_base_db::FileLoader;
-use elp_base_db::FileLoaderDelegate;
 use elp_base_db::FileRange;
+use elp_base_db::FileSourceRootInput;
+use elp_base_db::FileText;
+use elp_base_db::Files;
+use elp_base_db::ProjectData;
+use elp_base_db::ProjectDataInput;
+use elp_base_db::ProjectId;
+use elp_base_db::RootQueryDb;
+use elp_base_db::SourceAppDataInput;
 use elp_base_db::SourceDatabase;
+use elp_base_db::SourceRoot;
+use elp_base_db::SourceRootId;
+use elp_base_db::SourceRootInput;
 use elp_base_db::Upcast;
 use elp_base_db::salsa;
 use elp_types_db::TypedSemantic;
@@ -26,19 +38,15 @@ use elp_types_db::eqwalizer;
 
 use crate::db::InternDatabase;
 
-#[salsa::database(
-    elp_base_db::SourceDatabaseExtStorage,
-    elp_base_db::SourceDatabaseStorage,
-    crate::db::DefDatabaseStorage,
-    crate::db::InternDatabaseStorage
-)]
-#[derive(Default)]
+#[salsa::db]
+#[derive(Default, Clone)]
 pub(crate) struct TestDB {
     storage: salsa::Storage<TestDB>,
+    files: Arc<Files>,
 }
 
-impl Upcast<dyn SourceDatabase> for TestDB {
-    fn upcast(&self) -> &(dyn SourceDatabase + 'static) {
+impl Upcast<dyn RootQueryDb> for TestDB {
+    fn upcast(&self) -> &(dyn RootQueryDb + 'static) {
         self
     }
 }
@@ -49,7 +57,10 @@ impl Upcast<dyn InternDatabase> for TestDB {
     }
 }
 
-impl salsa::Database for TestDB {}
+#[salsa::db]
+impl salsa::Database for TestDB {
+    fn salsa_event(&self, _event: &dyn Fn() -> salsa::Event) {}
+}
 
 impl fmt::Debug for TestDB {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -57,14 +68,65 @@ impl fmt::Debug for TestDB {
     }
 }
 
-impl panic::RefUnwindSafe for TestDB {}
+#[salsa::db]
+impl SourceDatabase for TestDB {
+    fn file_text(&self, file_id: FileId) -> FileText {
+        self.files.file_text(file_id)
+    }
 
-impl FileLoader for TestDB {
-    fn file_text(&self, file_id: FileId) -> Arc<str> {
-        FileLoaderDelegate(self).file_text(file_id)
+    fn set_file_text(&mut self, file_id: FileId, text: Arc<str>) {
+        let files = self.files.clone();
+        files.set_file_text(self, file_id, text);
+    }
+
+    fn source_root(&self, source_root_id: SourceRootId) -> SourceRootInput {
+        self.files.source_root(source_root_id)
+    }
+
+    fn set_source_root(&mut self, source_root_id: SourceRootId, source_root: Arc<SourceRoot>) {
+        let files = self.files.clone();
+        files.set_source_root(self, source_root_id, source_root);
+    }
+
+    fn file_source_root(&self, id: FileId) -> FileSourceRootInput {
+        self.files.file_source_root(id)
+    }
+
+    fn set_file_source_root(&mut self, id: FileId, source_root_id: SourceRootId) {
+        let files = self.files.clone();
+        files.set_file_source_root(self, id, source_root_id);
+    }
+
+    fn app_data_by_id(&self, id: AppDataId) -> AppDataInput {
+        self.files.app_data(id)
+    }
+
+    fn set_app_data_by_id(&mut self, id: AppDataId, app_data: Option<Arc<AppData>>) {
+        let files = self.files.clone();
+        files.set_app_data(self, id, app_data)
+    }
+
+    fn app_data_id(&self, source_root_id: SourceRootId) -> SourceAppDataInput {
+        self.files.source_app_data(source_root_id)
+    }
+
+    fn set_app_data_id(&mut self, id: SourceRootId, app_data_id: AppDataId) {
+        let files = self.files.clone();
+        files.set_source_app_data(self, id, app_data_id)
+    }
+
+    fn project_data(&self, project_id: ProjectId) -> ProjectDataInput {
+        self.files.project_data(project_id)
+    }
+
+    fn set_project_data(&mut self, id: ProjectId, project_data: Arc<ProjectData>) {
+        let files = self.files.clone();
+        files.set_project_data(self, id, project_data)
     }
 }
 
+impl panic::RefUnwindSafe for TestDB {}
+
 impl TypedSemantic for TestDB {
     fn eqwalizer_diagnostics(
         &self,
diff --git a/crates/ide/src/codemod_helpers.rs b/crates/ide/src/codemod_helpers.rs
index e531b6264c..bd5c4fd16d 100644
--- a/crates/ide/src/codemod_helpers.rs
+++ b/crates/ide/src/codemod_helpers.rs
@@ -602,7 +602,7 @@ pub(crate) fn find_call_in_function<CallCtx, MakeCtx, Res>(
 mod tests {
     use elp_ide_db::RootDatabase;
     use elp_ide_db::elp_base_db::FileId;
-    use elp_ide_db::elp_base_db::SourceDatabase;
+    use elp_ide_db::elp_base_db::RootQueryDb;
     use elp_ide_db::elp_base_db::fixture::WithFixture;
     use elp_project_model::otp::otp_supported_by_eqwalizer;
     use elp_syntax::algo::find_node_at_offset;
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index a9832e8843..56a5a83932 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -37,6 +37,7 @@ use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::FileKind;
 use elp_ide_db::elp_base_db::FileRange;
 use elp_ide_db::elp_base_db::ProjectId;
+use elp_ide_db::elp_base_db::RootQueryDb;
 use elp_ide_db::erlang_service::DiagnosticLocation;
 use elp_ide_db::erlang_service::ParseError;
 use elp_ide_db::metadata::Kind;
@@ -73,7 +74,6 @@ use serde::Deserialize;
 use serde::Serialize;
 
 use crate::RootDatabase;
-use crate::SourceDatabase;
 use crate::common_test;
 
 mod application_env;
diff --git a/crates/ide/src/diagnostics/eqwalizer_assists/expected_type.rs b/crates/ide/src/diagnostics/eqwalizer_assists/expected_type.rs
index 31096f0112..ad7c5f4513 100644
--- a/crates/ide/src/diagnostics/eqwalizer_assists/expected_type.rs
+++ b/crates/ide/src/diagnostics/eqwalizer_assists/expected_type.rs
@@ -68,7 +68,7 @@ pub fn expected_type(
                 if let [atom @ Type::AtomLitType(AtomLitType { .. }), other] = &arg_tys[..] {
                     if other == other2 {
                         // Add wrapping tuple to return
-                        let file_text = sema.db.file_text(file_id);
+                        let file_text = sema.db.file_text(file_id).text(sema.db);
                         let current = &file_text[d.range.start().into()..d.range.end().into()];
                         let replacement = format!("{{{atom}, {current}}}");
                         let edit = TextEdit::replace(d.range, replacement.clone());
diff --git a/crates/ide/src/diagnostics/module_mismatch.rs b/crates/ide/src/diagnostics/module_mismatch.rs
index 3e0bb0231b..32a138507c 100644
--- a/crates/ide/src/diagnostics/module_mismatch.rs
+++ b/crates/ide/src/diagnostics/module_mismatch.rs
@@ -34,8 +34,8 @@ pub(crate) fn module_mismatch(
     let module_name = ast::ModuleAttribute::cast(node.clone())?.name()?;
     // Context for T171541590
     let _ = stdx::panic_context::enter(format!("\nmodule_mismatch: {:?}", file_id));
-    let root_id = sema.db.file_source_root(file_id);
-    let root = sema.db.source_root(root_id);
+    let root_id = sema.db.file_source_root(file_id).source_root_id(sema.db);
+    let root = sema.db.source_root(root_id).source_root(sema.db);
     let path = root.path_for_file(&file_id).unwrap();
     let filename = path.name_and_extension().unwrap_or_default().0;
     let loc = module_name.syntax().text_range();
diff --git a/crates/ide/src/fixture.rs b/crates/ide/src/fixture.rs
index 0f17fccf34..00e4ea859f 100644
--- a/crates/ide/src/fixture.rs
+++ b/crates/ide/src/fixture.rs
@@ -13,7 +13,7 @@
 use elp_ide_db::RootDatabase;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::FileRange;
-use elp_ide_db::elp_base_db::SourceDatabase;
+use elp_ide_db::elp_base_db::RootQueryDb;
 use elp_ide_db::elp_base_db::fixture::ChangeFixture;
 use elp_ide_db::elp_base_db::fixture::WithFixture;
 use elp_project_model::test_fixture::DiagnosticsEnabled;
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index 63d2cbc9a2..9cee1a06b4 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -48,10 +48,9 @@ use elp_ide_db::elp_base_db::ModuleIndex;
 use elp_ide_db::elp_base_db::ModuleName;
 use elp_ide_db::elp_base_db::ProjectData;
 use elp_ide_db::elp_base_db::ProjectId;
+use elp_ide_db::elp_base_db::RootQueryDb;
 use elp_ide_db::elp_base_db::SourceDatabase;
-use elp_ide_db::elp_base_db::SourceDatabaseExt;
 use elp_ide_db::elp_base_db::salsa;
-use elp_ide_db::elp_base_db::salsa::ParallelDatabase;
 use elp_ide_db::eqwalizer::type_references;
 use elp_ide_db::erlang_service::ParseResult;
 use elp_ide_db::rename::RenameError;
@@ -207,7 +206,7 @@ impl AnalysisHost {
 /// `Analysis` are canceled (most method return `Err(Canceled)`).
 #[derive(Debug)]
 pub struct Analysis {
-    db: salsa::Snapshot<RootDatabase>,
+    db: RootDatabase,
 }
 
 // As a general design guideline, `Analysis` API are intended to be independent
@@ -384,7 +383,10 @@ impl Analysis {
         self.with_db(|db| {
             // Context for T171541590
             let _ = stdx::panic_context::enter(format!("\nproject_data: {:?}", file_id));
-            Some(db.project_data(db.file_app_data(file_id)?.project_id))
+            Some(
+                db.project_data(db.file_app_data(file_id)?.project_id)
+                    .project_data(db),
+            )
         })
     }
 
@@ -429,7 +431,7 @@ impl Analysis {
 
     /// Returns the contents of a file
     pub fn file_text(&self, file_id: FileId) -> Cancellable<Arc<str>> {
-        self.with_db(|db| db.file_text(file_id))
+        self.with_db(|db| db.file_text(file_id).text(db))
     }
 
     /// Returns the app_type for a file
diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index b6c78ea2b3..820828120a 100644
--- a/crates/ide/src/rename.rs
+++ b/crates/ide/src/rename.rs
@@ -1153,7 +1153,7 @@ mod tests {
                     for indel in edit.1.into_iter() {
                         text_edit_builder.replace(indel.delete, indel.insert);
                     }
-                    let mut result = sema.db.file_text(file_id).to_string();
+                    let mut result = sema.db.file_text(file_id).text(sema.db).to_string();
                     let edit = text_edit_builder.finish();
                     edit.apply(&mut result);
                     let expected = analysis_after.file_text(file_id).unwrap().to_string();
diff --git a/crates/ide/src/tests.rs b/crates/ide/src/tests.rs
index 386b7fa302..11db81329b 100644
--- a/crates/ide/src/tests.rs
+++ b/crates/ide/src/tests.rs
@@ -16,7 +16,7 @@ use elp_ide_db::RootDatabase;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::FilePosition;
 use elp_ide_db::elp_base_db::FileRange;
-use elp_ide_db::elp_base_db::SourceDatabaseExt;
+use elp_ide_db::elp_base_db::SourceDatabase;
 use elp_ide_db::elp_base_db::assert_eq_text;
 use elp_ide_db::elp_base_db::fixture::WithFixture;
 use elp_ide_db::elp_base_db::remove_annotations;
@@ -109,7 +109,11 @@ pub(crate) fn check_filtered_ct_fix_with_config(
     let actual = {
         let source_change = fix.source_change.as_ref().unwrap();
         let file_id = *source_change.source_file_edits.keys().next().unwrap();
-        let mut actual = analysis.db.file_text(file_id).to_string();
+        let mut actual = analysis
+            .db
+            .file_text(file_id)
+            .text(&analysis.db)
+            .to_string();
 
         for edit in source_change.source_file_edits.values() {
             edit.apply(&mut actual);
@@ -226,7 +230,11 @@ pub(crate) fn check_nth_fix(
     let actual = {
         let source_change = fix.source_change.as_ref().unwrap();
         let file_id = *source_change.source_file_edits.keys().next().unwrap();
-        let mut actual = analysis.db.file_text(file_id).to_string();
+        let mut actual = analysis
+            .db
+            .file_text(file_id)
+            .text(&analysis.db)
+            .to_string();
 
         for edit in source_change.source_file_edits.values() {
             edit.apply(&mut actual);
@@ -353,7 +361,11 @@ pub(crate) fn check_specific_fix_with_config_and_adhoc(
     let actual = {
         let source_change = fix.source_change.as_ref().unwrap();
         let file_id = *source_change.source_file_edits.keys().next().unwrap();
-        let mut actual = analysis.db.file_text(file_id).to_string();
+        let mut actual = analysis
+            .db
+            .file_text(file_id)
+            .text(&analysis.db)
+            .to_string();
 
         for edit in source_change.source_file_edits.values() {
             edit.apply(&mut actual);
diff --git a/crates/ide_assists/src/assist_context.rs b/crates/ide_assists/src/assist_context.rs
index 1b4bcc5888..5739294f26 100644
--- a/crates/ide_assists/src/assist_context.rs
+++ b/crates/ide_assists/src/assist_context.rs
@@ -17,7 +17,7 @@ use elp_ide_db::assists::AssistUserInput;
 use elp_ide_db::assists::GroupLabel;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::FileRange;
-use elp_ide_db::elp_base_db::SourceDatabase;
+use elp_ide_db::elp_base_db::RootQueryDb;
 use elp_ide_db::source_change::SourceChangeBuilder;
 use elp_syntax::Direction;
 use elp_syntax::SourceFile;
diff --git a/crates/ide_assists/src/tests.rs b/crates/ide_assists/src/tests.rs
index 42bb15ac23..91aa9018ea 100644
--- a/crates/ide_assists/src/tests.rs
+++ b/crates/ide_assists/src/tests.rs
@@ -19,8 +19,8 @@ use elp_ide_db::assists::AssistId;
 use elp_ide_db::assists::AssistKind;
 use elp_ide_db::assists::AssistUserInput;
 use elp_ide_db::assists::AssistUserInputType;
+use elp_ide_db::elp_base_db::RootQueryDb;
 use elp_ide_db::elp_base_db::SourceDatabase;
-use elp_ide_db::elp_base_db::SourceDatabaseExt;
 use elp_ide_db::elp_base_db::fixture::WithFixture;
 use elp_ide_db::elp_base_db::remove_annotations;
 use elp_ide_db::helpers::SnippetCap;
@@ -176,7 +176,7 @@ fn check(
     // Check that the fixture is syntactically valid
     if check_parse_error {
         // Check that we have a syntactically valid starting point
-        let text = sema.file_text(frange.file_id);
+        let text = sema.file_text(frange.file_id).text(sema);
         let parse = sema.parse(frange.file_id);
         let errors = parse.errors();
         if !errors.is_empty() {
@@ -246,11 +246,11 @@ fn check(
 
             let mut buf = String::new();
             for (file_id, edit) in source_change.source_file_edits {
-                let mut text = db.file_text(file_id).as_ref().to_owned();
+                let mut text = db.file_text(file_id).text(&db).as_ref().to_owned();
                 edit.apply(&mut text);
                 if !skip_header {
-                    let sr = db.file_source_root(file_id);
-                    let sr = db.source_root(sr);
+                    let sr = db.file_source_root(file_id).source_root_id(&db);
+                    let sr = db.source_root(sr).source_root(&db);
                     let path = sr.path_for_file(&file_id).unwrap();
                     format_to!(buf, "//- {}\n", path)
                 }
@@ -263,8 +263,8 @@ fn check(
                     initial_contents,
                 } = file_system_edit
                 {
-                    let sr = db.file_source_root(dst.anchor);
-                    let sr = db.source_root(sr);
+                    let sr = db.file_source_root(dst.anchor).source_root_id(&db);
+                    let sr = db.source_root(sr).source_root(&db);
                     let mut base = sr.path_for_file(&dst.anchor).unwrap().clone();
                     base.pop();
                     let created_file_path = format!("{}{}", base, &dst.path[1..]);
@@ -754,7 +754,7 @@ fn add_compile_option_1() {
     let mut builder = SourceChangeBuilder::new(file_id);
     helpers::add_compile_option(&sema, file_id, "blah", None, &mut builder);
     let source_change = builder.finish();
-    let mut changed = db.file_text(file_id).to_string();
+    let mut changed = db.file_text(file_id).text(&db).to_string();
     for edit in source_change.source_file_edits.values() {
         edit.apply(&mut changed);
     }
@@ -790,7 +790,7 @@ fn add_to_suite_basic() {
         &mut builder,
     );
     let source_change = builder.finish();
-    let mut changed = db.file_text(file_id).to_string();
+    let mut changed = db.file_text(file_id).text(&db).to_string();
     for edit in source_change.source_file_edits.values() {
         edit.apply(&mut changed);
     }
@@ -825,7 +825,7 @@ fn add_to_suite_existing_no_match() {
     let mut builder = SourceChangeBuilder::new(file_id);
     helpers::add_suite_0_option(&sema, file_id, "require", "foo", None, &mut builder);
     let source_change = builder.finish();
-    let mut changed = db.file_text(file_id).to_string();
+    let mut changed = db.file_text(file_id).text(&db).to_string();
     for edit in source_change.source_file_edits.values() {
         edit.apply(&mut changed);
     }
@@ -870,7 +870,7 @@ fn add_to_suite_existing_with_match() {
         &mut builder,
     );
     let source_change = builder.finish();
-    let mut changed = db.file_text(file_id).to_string();
+    let mut changed = db.file_text(file_id).text(&db).to_string();
     for edit in source_change.source_file_edits.values() {
         edit.apply(&mut changed);
     }
@@ -916,7 +916,7 @@ fn add_to_suite_existing_with_comment() {
         &mut builder,
     );
     let source_change = builder.finish();
-    let mut changed = db.file_text(file_id).to_string();
+    let mut changed = db.file_text(file_id).text(&db).to_string();
     for edit in source_change.source_file_edits.values() {
         edit.apply(&mut changed);
     }
@@ -963,7 +963,7 @@ fn add_to_suite_grouped_export() {
         &mut builder,
     );
     let source_change = builder.finish();
-    let mut changed = db.file_text(file_id).to_string();
+    let mut changed = db.file_text(file_id).text(&db).to_string();
     for edit in source_change.source_file_edits.values() {
         edit.apply(&mut changed);
     }
diff --git a/crates/ide_completion/src/ctx.rs b/crates/ide_completion/src/ctx.rs
index 20fbfb46fb..75265ac361 100644
--- a/crates/ide_completion/src/ctx.rs
+++ b/crates/ide_completion/src/ctx.rs
@@ -260,7 +260,7 @@ impl CtxKind {
 /// Tests of internals, delete when autocomplete is full-featured T126163525
 #[cfg(test)]
 mod ctx_tests {
-    use elp_base_db::SourceDatabase;
+    use elp_base_db::RootQueryDb;
     use elp_ide_db::RootDatabase;
     use elp_ide_db::elp_base_db::FilePosition;
     use elp_ide_db::elp_base_db::fixture::WithFixture;
diff --git a/crates/ide_completion/src/helpers.rs b/crates/ide_completion/src/helpers.rs
index ed6b5f0cbf..7f02f03206 100644
--- a/crates/ide_completion/src/helpers.rs
+++ b/crates/ide_completion/src/helpers.rs
@@ -10,7 +10,7 @@
 
 use elp_base_db::FileId;
 use elp_base_db::FilePosition;
-use elp_base_db::SourceDatabase;
+use elp_base_db::RootQueryDb;
 use elp_syntax::AstNode;
 use elp_syntax::SmolStr;
 use elp_syntax::SourceFile;
@@ -134,7 +134,7 @@ pub(crate) fn should_include_args(next_token: &Option<SyntaxToken>) -> bool {
     }
 }
 
-fn function_arg_names(db: &dyn SourceDatabase, def: &FunctionDef) -> Option<String> {
+fn function_arg_names(db: &dyn RootQueryDb, def: &FunctionDef) -> Option<String> {
     let param_names = def.arg_names(db);
     let res = param_names?
         .iter()
@@ -149,7 +149,7 @@ fn function_arg_names(db: &dyn SourceDatabase, def: &FunctionDef) -> Option<Stri
 }
 
 pub(crate) fn function_contents(
-    db: &dyn SourceDatabase,
+    db: &dyn RootQueryDb,
     def: &FunctionDef,
     function_name: &str,
     include_args: bool,
diff --git a/crates/ide_completion/src/macros.rs b/crates/ide_completion/src/macros.rs
index a03f798ff0..8a9b801609 100644
--- a/crates/ide_completion/src/macros.rs
+++ b/crates/ide_completion/src/macros.rs
@@ -10,7 +10,7 @@
 
 use elp_base_db::FileId;
 use elp_base_db::IncludeCtx;
-use elp_base_db::SourceDatabase;
+use elp_base_db::RootQueryDb;
 use elp_base_db::VfsPath;
 use elp_base_db::path_for_file;
 use elp_syntax::AstNode;
@@ -197,7 +197,7 @@ const BUILT_IN: [Name; 8] = [
 // TODO: should this be done in the resolve step? Or, cached in the table
 // First make it work.
 pub fn get_include_file(
-    db: &dyn SourceDatabase,
+    db: &dyn RootQueryDb,
     file_id: FileId,
     included_file_id: FileId,
     include_path: VfsPath,
diff --git a/crates/ide_db/Cargo.toml b/crates/ide_db/Cargo.toml
index babeee31b9..b3159b897b 100644
--- a/crates/ide_db/Cargo.toml
+++ b/crates/ide_db/Cargo.toml
@@ -29,6 +29,7 @@ parking_lot.workspace = true
 paths.workspace = true
 profile.workspace = true
 regex.workspace = true
+ra_ap_query-group-macro.workspace = true
 rustc-hash.workspace = true
 serde.workspace = true
 stdx.workspace = true
diff --git a/crates/ide_db/src/common_test.rs b/crates/ide_db/src/common_test.rs
index c630714fe9..892749f2c8 100644
--- a/crates/ide_db/src/common_test.rs
+++ b/crates/ide_db/src/common_test.rs
@@ -12,7 +12,7 @@ use std::sync::Arc;
 
 use elp_base_db::FileId;
 use elp_base_db::ProjectId;
-use elp_base_db::SourceDatabase;
+use elp_base_db::RootQueryDb;
 use elp_base_db::salsa;
 use elp_base_db::salsa::Database;
 use elp_erlang_service::CTInfoRequest;
@@ -42,8 +42,8 @@ pub enum CommonTestInfo {
     NoProjectInfoError,
 }
 
-#[salsa::query_group(CommonTestDatabaseStorage)]
-pub trait CommonTestDatabase: DefDatabase + SourceDatabase + CommonTestLoader {
+#[ra_ap_query_group_macro::query_group(CommonTestDatabaseStorage)]
+pub trait CommonTestDatabase: DefDatabase + RootQueryDb + CommonTestLoader {
     #[salsa::invoke(ct_info)]
     fn ct_info(&self, file_id: FileId) -> Arc<CommonTestInfo>;
 }
@@ -78,7 +78,7 @@ impl CommonTestLoader for crate::RootDatabase {
             should_request_groups,
             file_abstract_forms: module_ast.ast.clone(),
         };
-        match erlang_service.ct_info(module, request, || self.unwind_if_cancelled()) {
+        match erlang_service.ct_info(module, request, || self.unwind_if_revision_cancelled()) {
             Ok(result) => match result.all() {
                 Ok(all) => match result.groups() {
                     Ok(groups) => CommonTestInfo::Result { all, groups },
diff --git a/crates/ide_db/src/docs.rs b/crates/ide_db/src/docs.rs
index dfe07a2916..397bbe6afd 100644
--- a/crates/ide_db/src/docs.rs
+++ b/crates/ide_db/src/docs.rs
@@ -15,8 +15,8 @@ use std::sync::Arc;
 use std::vec;
 
 use elp_base_db::FileId;
+use elp_base_db::RootQueryDb;
 use elp_base_db::SourceDatabase;
-use elp_base_db::SourceDatabaseExt;
 use elp_base_db::Upcast;
 use elp_base_db::salsa;
 use elp_erlang_service::DocDiagnostic;
@@ -183,8 +183,8 @@ pub struct FileDoc {
 }
 
 // TODO Add an input so we know when to invalidate?
-#[salsa::query_group(DocDatabaseStorage)]
-pub trait DocDatabase: DefDatabase + SourceDatabase + DocLoader + Upcast<dyn DefDatabase> {
+#[ra_ap_query_group_macro::query_group]
+pub trait DocDatabase: DefDatabase + RootQueryDb + DocLoader + Upcast<dyn DefDatabase> {
     #[salsa::invoke(get_file_docs)]
     fn file_doc(&self, file_id: FileId) -> Arc<FileDoc>;
 
@@ -237,7 +237,7 @@ fn is_file_in_otp(db: &dyn DocDatabase, file_id: FileId) -> Option<bool> {
     let _ = stdx::panic_context::enter(format!("\nis_file_in_otp: {:?}", file_id));
     if let Some(app_data) = db.file_app_data(file_id) {
         let project_id = app_data.project_id;
-        Some(db.project_data(project_id).otp_project_id == Some(project_id))
+        Some(db.project_data(project_id).project_data(db).otp_project_id == Some(project_id))
     } else {
         log::error!(
             "Unknown application - could not load app_data to determine whether file is on OTP"
@@ -335,12 +335,12 @@ fn get_file_function_specs(def_db: &dyn DefDatabase, file_id: FileId) -> FxHashM
 
 impl DocLoader for crate::RootDatabase {
     fn load_doc_descriptions(&self, file_id: FileId, doc_origin: DocOrigin) -> FileDoc {
-        _ = SourceDatabaseExt::file_text(self, file_id); // Take dependency on the contents of the file we're getting docs for
+        _ = SourceDatabase::file_text(self, file_id); // Take dependency on the contents of the file we're getting docs for
         // Context for T171541590
         let _ = stdx::panic_context::enter(format!("\nload_doc_descriptions: {:?}", file_id));
-        let root_id = self.file_source_root(file_id);
-        let root = self.source_root(root_id);
-        let src_db: &dyn SourceDatabase = self.upcast();
+        let root_id = self.file_source_root(file_id).source_root_id(self);
+        let root = self.source_root(root_id).source_root(self);
+        let src_db: &dyn RootQueryDb = self.upcast();
         let app_data = if let Some(app_data) = src_db.file_app_data(file_id) {
             app_data
         } else {
@@ -373,7 +373,8 @@ impl DocLoader for crate::RootDatabase {
                 ast: None,
             },
         };
-        let raw_doc = erlang_service.request_doc(doc_request, || src_db.unwind_if_cancelled());
+        let raw_doc =
+            erlang_service.request_doc(doc_request, || src_db.unwind_if_revision_cancelled());
         match raw_doc {
             Ok(d) => FileDoc {
                 module_doc: Some(Doc {
diff --git a/crates/ide_db/src/eqwalizer.rs b/crates/ide_db/src/eqwalizer.rs
index 808e570ab3..3e13f50ba9 100644
--- a/crates/ide_db/src/eqwalizer.rs
+++ b/crates/ide_db/src/eqwalizer.rs
@@ -15,6 +15,7 @@ use elp_base_db::FileRange;
 use elp_base_db::FileSource;
 use elp_base_db::ModuleName;
 use elp_base_db::ProjectId;
+use elp_base_db::RootQueryDb;
 use elp_base_db::SourceDatabase;
 use elp_base_db::VfsPath;
 use elp_base_db::salsa;
@@ -52,8 +53,9 @@ impl EqwalizerLoader for crate::RootDatabase {
                 None => {
                     // Context for T171541590
                     let _ = stdx::panic_context::enter(format!("\ntypecheck: {:?}", module));
-                    let source_root_id = self.file_source_root(module);
-                    let source_root = self.source_root(source_root_id);
+                    let source_root_id =
+                        SourceDatabase::file_source_root(self, module).source_root_id(self);
+                    let source_root = self.source_root(source_root_id).source_root(self);
                     let path = source_root.path_for_file(&module);
                     log::error!("Can't find module for path: {:?}", path);
                     continue;
@@ -64,11 +66,11 @@ impl EqwalizerLoader for crate::RootDatabase {
     }
 }
 
-#[salsa::query_group(EqwalizerDatabaseStorage)]
+#[ra_ap_query_group_macro::query_group]
 pub trait EqwalizerDatabase:
     EqwalizerDiagnosticsDatabase
     + EqwalizerAnalysesDatabase
-    + SourceDatabase
+    + RootQueryDb
     + EqwalizerLoader
     + ErlAstDatabase
 {
@@ -175,7 +177,7 @@ fn is_eqwalizer_enabled(db: &dyn EqwalizerDatabase, file_id: FileId, include_tes
         return false;
     };
     let project_id = app_data.project_id;
-    let project = db.project_data(project_id);
+    let project = db.project_data(project_id).project_data(db);
     let eqwalizer_config = &project.eqwalizer_config;
     let module_index = db.module_index(project_id);
     let is_src = module_index.file_source_for_file(file_id) == Some(FileSource::Src);
@@ -240,17 +242,21 @@ fn find_path_in_project(
     project_id: ProjectId,
     path: &VfsPath,
 ) -> Option<FileId> {
-    let project = db.project_data(project_id);
+    let project = db.project_data(project_id).project_data(db);
     let source_roots = &project.source_roots;
     let mut otp_source_roots = Vec::new();
     if let Some(otp_project_id) = project.otp_project_id {
-        let otp_project = db.project_data(otp_project_id);
+        let otp_project = db.project_data(otp_project_id).project_data(db);
         otp_source_roots = otp_project.source_roots.clone();
     }
     source_roots
         .iter()
         .chain(&otp_source_roots)
-        .find_map(|&source_root_id| db.source_root(source_root_id).file_for_path(path))
+        .find_map(|&source_root_id| {
+            db.source_root(source_root_id)
+                .source_root(db)
+                .file_for_path(path)
+        })
 }
 
 fn decl_location(
@@ -263,8 +269,8 @@ fn decl_location(
     let module_file_id = module_index.file_for_module(&module)?;
     // Context for T171541590
     let _ = stdx::panic_context::enter(format!("\ndecl_location: {:?}", module_file_id));
-    let source_root_id = db.file_source_root(module_file_id);
-    let source_root = db.source_root(source_root_id);
+    let source_root_id = db.file_source_root(module_file_id).source_root_id(db);
+    let source_root = db.source_root(source_root_id).source_root(db);
     let decl_file_path = &source_root.path_for_file(&module_file_id)?;
     let file_id = find_path_in_project(db, project_id, decl_file_path)?;
     let range: elp_syntax::TextRange = {
diff --git a/crates/ide_db/src/erl_ast.rs b/crates/ide_db/src/erl_ast.rs
index ddcf597854..bdeb6fd516 100644
--- a/crates/ide_db/src/erl_ast.rs
+++ b/crates/ide_db/src/erl_ast.rs
@@ -13,9 +13,9 @@ use std::sync::Arc;
 
 use elp_base_db::AbsPath;
 use elp_base_db::FileId;
-use elp_base_db::FileLoader;
 use elp_base_db::IncludeCtx;
 use elp_base_db::ProjectId;
+use elp_base_db::RootQueryDb;
 use elp_base_db::SourceDatabase;
 use elp_base_db::path_for_file;
 use elp_base_db::salsa;
@@ -61,7 +61,7 @@ impl AstLoader for crate::RootDatabase {
             CompileOption::ElpMetadata(elp_metadata),
         ];
         let path: PathBuf = path.to_path_buf().into();
-        let file_text = self.file_text(file_id);
+        let file_text = SourceDatabase::file_text(self, file_id).text(self);
         let req = ParseRequest {
             options,
             file_id,
@@ -73,14 +73,14 @@ impl AstLoader for crate::RootDatabase {
 
         erlang_service.request_parse(
             req,
-            || self.unwind_if_cancelled(),
+            || self.unwind_if_revision_cancelled(),
             &move |file_id, include_type, path| resolve_include(self, file_id, include_type, path),
         )
     }
 }
 
 fn resolve_include(
-    db: &dyn SourceDatabase,
+    db: &dyn RootQueryDb,
     file_id: FileId,
     include_type: IncludeType,
     path: &str,
@@ -91,11 +91,15 @@ fn resolve_include(
         IncludeType::Doc => IncludeCtx::new(db, file_id).resolve_include_doc(path)?,
     };
     let path = path_for_file(db, include_file_id).map(|vfs_path| vfs_path.to_string())?;
-    Some((path, include_file_id, db.file_text(include_file_id)))
+    Some((
+        path,
+        include_file_id,
+        db.file_text(include_file_id).text(db),
+    ))
 }
 
-#[salsa::query_group(ErlAstDatabaseStorage)]
-pub trait ErlAstDatabase: SourceDatabase + AstLoader + LineIndexDatabase {
+#[ra_ap_query_group_macro::query_group(ErlAstDatabaseStorage)]
+pub trait ErlAstDatabase: RootQueryDb + AstLoader + LineIndexDatabase {
     fn module_ast(&self, file_id: FileId) -> Arc<ParseResult>;
     fn elp_metadata(&self, file_id: FileId) -> Metadata;
 }
@@ -103,8 +107,8 @@ pub trait ErlAstDatabase: SourceDatabase + AstLoader + LineIndexDatabase {
 fn module_ast(db: &dyn ErlAstDatabase, file_id: FileId) -> Arc<ParseResult> {
     // Context for T171541590
     let _ = stdx::panic_context::enter(format!("\nmodule_ast: {:?}", file_id));
-    let root_id = db.file_source_root(file_id);
-    let root = db.source_root(root_id);
+    let root_id = db.file_source_root(file_id).source_root_id(db);
+    let root = db.source_root(root_id).source_root(db);
     let path = root.path_for_file(&file_id).unwrap().as_path().unwrap();
     let metadata = db.elp_metadata(file_id);
     let app_data = if let Some(app_data) = db.file_app_data(file_id) {
@@ -129,7 +133,7 @@ fn module_ast(db: &dyn ErlAstDatabase, file_id: FileId) -> Arc<ParseResult> {
 
 fn elp_metadata(db: &dyn ErlAstDatabase, file_id: FileId) -> Metadata {
     let line_index = db.file_line_index(file_id);
-    let file_text = db.file_text(file_id);
+    let file_text = db.file_text(file_id).text(db);
     let source = db.parse(file_id);
     metadata::collect_metadata(&line_index, &file_text, &source)
 }
diff --git a/crates/ide_db/src/lib.rs b/crates/ide_db/src/lib.rs
index 7320907e34..a84795b6f5 100644
--- a/crates/ide_db/src/lib.rs
+++ b/crates/ide_db/src/lib.rs
@@ -15,13 +15,24 @@ use std::path::PathBuf;
 use std::sync::Arc;
 
 use elp_base_db::AbsPathBuf;
+use elp_base_db::AppData;
+use elp_base_db::AppDataId;
+use elp_base_db::AppDataInput;
 use elp_base_db::FileId;
-use elp_base_db::FileLoader;
-use elp_base_db::FileLoaderDelegate;
 use elp_base_db::FilePosition;
 use elp_base_db::FileRange;
+use elp_base_db::FileSourceRootInput;
+use elp_base_db::FileText;
+use elp_base_db::Files;
+use elp_base_db::ProjectData;
+use elp_base_db::ProjectDataInput;
 use elp_base_db::ProjectId;
+use elp_base_db::RootQueryDb;
+use elp_base_db::SourceAppDataInput;
 use elp_base_db::SourceDatabase;
+use elp_base_db::SourceRoot;
+use elp_base_db::SourceRootId;
+use elp_base_db::SourceRootInput;
 use elp_base_db::Upcast;
 use elp_base_db::limit_logged_string;
 use elp_base_db::salsa;
@@ -100,22 +111,11 @@ pub trait EqwalizerProgressReporter: Send + Sync + RefUnwindSafe {
     fn done_module(&mut self, module: &str);
 }
 
-#[salsa::database(
-    LineIndexDatabaseStorage,
-    docs::DocDatabaseStorage,
-    elp_base_db::SourceDatabaseExtStorage,
-    elp_base_db::SourceDatabaseStorage,
-    eqwalizer::EqwalizerDatabaseStorage,
-    common_test::CommonTestDatabaseStorage,
-    elp_eqwalizer::db::EqwalizerDiagnosticsDatabaseStorage,
-    elp_eqwalizer::analyses::EqwalizerAnalysesDatabaseStorage,
-    erl_ast::ErlAstDatabaseStorage,
-    hir::db::InternDatabaseStorage,
-    hir::db::DefDatabaseStorage
-)]
+#[salsa::db]
 #[allow(clippy::type_complexity)]
 pub struct RootDatabase {
     storage: salsa::Storage<Self>,
+    files: Arc<Files>,
     erlang_services: Arc<AssertUnwindSafe<RwLock<FxHashMap<ProjectId, Connection>>>>,
     eqwalizer: Eqwalizer,
     eqwalizer_progress_reporter: EqwalizerProgressReporterBox,
@@ -125,6 +125,7 @@ impl Default for RootDatabase {
     fn default() -> Self {
         let mut db = RootDatabase {
             storage: salsa::Storage::default(),
+            files: Arc::default(),
             erlang_services: Arc::default(),
             eqwalizer: Eqwalizer::default(),
             eqwalizer_progress_reporter: EqwalizerProgressReporterBox::default(),
@@ -135,8 +136,23 @@ impl Default for RootDatabase {
     }
 }
 
-impl Upcast<dyn SourceDatabase> for RootDatabase {
-    fn upcast(&self) -> &(dyn SourceDatabase + 'static) {
+impl RefUnwindSafe for RootDatabase {}
+
+impl Clone for RootDatabase {
+    fn clone(&self) -> Self {
+        Self {
+            storage: self.storage.clone(),
+            files: self.files.clone(),
+            erlang_services: self.erlang_services.clone(),
+            eqwalizer: self.eqwalizer.clone(),
+            eqwalizer_progress_reporter: self.eqwalizer_progress_reporter.clone(),
+            ipc_handles: self.ipc_handles.clone(),
+        }
+    }
+}
+
+impl Upcast<dyn RootQueryDb> for RootDatabase {
+    fn upcast(&self) -> &(dyn RootQueryDb + 'static) {
         self
     }
 }
@@ -153,37 +169,89 @@ impl Upcast<dyn DefDatabase> for RootDatabase {
     }
 }
 
-impl FileLoader for RootDatabase {
-    fn file_text(&self, file_id: FileId) -> Arc<str> {
-        FileLoaderDelegate(self).file_text(file_id)
-    }
-}
-
 impl fmt::Debug for RootDatabase {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("RootDatabase").finish_non_exhaustive()
     }
 }
 
-impl salsa::Database for RootDatabase {}
+#[salsa::db]
+impl salsa::Database for RootDatabase {
+    fn salsa_event(&self, _event: &dyn Fn() -> salsa::Event) {}
+}
 
-impl salsa::ParallelDatabase for RootDatabase {
-    fn snapshot(&self) -> salsa::Snapshot<RootDatabase> {
-        salsa::Snapshot::new(RootDatabase {
-            storage: self.storage.snapshot(),
-            erlang_services: self.erlang_services.clone(),
-            eqwalizer: self.eqwalizer.clone(),
-            eqwalizer_progress_reporter: self.eqwalizer_progress_reporter.clone(),
-            ipc_handles: self.ipc_handles.clone(),
-        })
+#[salsa::db]
+impl SourceDatabase for RootDatabase {
+    fn file_text(&self, file_id: FileId) -> FileText {
+        self.files.file_text(file_id)
+    }
+
+    fn set_file_text(&mut self, file_id: FileId, text: Arc<str>) {
+        let files = self.files.clone();
+        files.set_file_text(self, file_id, text);
+    }
+
+    fn source_root(&self, source_root_id: SourceRootId) -> SourceRootInput {
+        self.files.source_root(source_root_id)
+    }
+
+    fn set_source_root(&mut self, source_root_id: SourceRootId, source_root: Arc<SourceRoot>) {
+        let files = self.files.clone();
+        files.set_source_root(self, source_root_id, source_root);
+    }
+
+    fn file_source_root(&self, id: FileId) -> FileSourceRootInput {
+        self.files.file_source_root(id)
+    }
+
+    fn set_file_source_root(&mut self, id: FileId, source_root_id: SourceRootId) {
+        let files = self.files.clone();
+        files.set_file_source_root(self, id, source_root_id);
+    }
+
+    fn app_data_by_id(&self, id: AppDataId) -> AppDataInput {
+        self.files.app_data(id)
+    }
+
+    fn set_app_data_by_id(&mut self, id: AppDataId, app_data: Option<Arc<AppData>>) {
+        let files = self.files.clone();
+        files.set_app_data(self, id, app_data)
+    }
+
+    fn app_data_id(&self, source_root_id: SourceRootId) -> SourceAppDataInput {
+        self.files.source_app_data(source_root_id)
+    }
+
+    fn set_app_data_id(&mut self, id: SourceRootId, app_data_id: AppDataId) {
+        let files = self.files.clone();
+        files.set_source_app_data(self, id, app_data_id)
+    }
+
+    fn project_data(&self, project_id: ProjectId) -> ProjectDataInput {
+        self.files.project_data(project_id)
+    }
+
+    fn set_project_data(&mut self, id: ProjectId, project_data: Arc<ProjectData>) {
+        let files = self.files.clone();
+        files.set_project_data(self, id, project_data)
     }
 }
 
 impl RootDatabase {
+    pub fn snapshot(&self) -> Self {
+        Self {
+            storage: self.storage.clone(),
+            files: self.files.clone(),
+            erlang_services: self.erlang_services.clone(),
+            eqwalizer: self.eqwalizer.clone(),
+            eqwalizer_progress_reporter: self.eqwalizer_progress_reporter.clone(),
+            ipc_handles: self.ipc_handles.clone(),
+        }
+    }
+
     pub fn request_cancellation(&mut self) {
         let _p = tracing::info_span!("RootDatabase::request_cancellation").entered();
-        self.salsa_runtime_mut()
-            .synthetic_write(salsa::Durability::LOW);
+        self.synthetic_write(salsa::Durability::LOW);
     }
 
     pub fn clear_erlang_services(&mut self) {
@@ -200,7 +268,7 @@ impl RootDatabase {
             .entry(project_id)
             .or_insert_with(|| {
                 let conn = Connection::start().expect("failed to establish connection");
-                let project_data = self.project_data(project_id);
+                let project_data = self.project_data(project_id).project_data(self);
                 let path: Vec<PathBuf> = project_data
                     .deps_ebins
                     .iter()
@@ -217,7 +285,7 @@ impl RootDatabase {
 
     pub fn update_erlang_service_paths(&self) {
         for (&project_id, connection) in self.erlang_services.read().iter() {
-            let project_data = self.project_data(project_id);
+            let project_data = self.project_data(project_id).project_data(self);
             let paths = project_data
                 .deps_ebins
                 .iter()
@@ -247,7 +315,7 @@ impl RootDatabase {
         // Context for T171541590
         let _ = stdx::panic_context::enter(format!("\nresolved_includes: {:?}", file_id));
         let project_id = self.file_app_data(file_id)?.project_id;
-        let root_abs = &self.project_data(project_id).root_dir;
+        let root_abs = &self.project_data(project_id).project_data(self).root_dir;
         let form_list = self.file_form_list(file_id);
         let line_index = self.file_line_index(file_id);
         let includes: Vec<_> = form_list
@@ -279,13 +347,13 @@ impl RootDatabase {
     }
 }
 
-#[salsa::query_group(LineIndexDatabaseStorage)]
-pub trait LineIndexDatabase: SourceDatabase {
+#[ra_ap_query_group_macro::query_group(LineIndexDatabaseStorage)]
+pub trait LineIndexDatabase: RootQueryDb {
     fn file_line_index(&self, file_id: FileId) -> Arc<LineIndex>;
 }
 
 fn file_line_index(db: &dyn LineIndexDatabase, file_id: FileId) -> Arc<LineIndex> {
-    let text = db.file_text(file_id);
+    let text = db.file_text(file_id).text(db);
     Arc::new(LineIndex::new(&text))
 }
 
@@ -315,8 +383,8 @@ impl Includes {
     ) -> Option<Utf8PathBuf> {
         // Context for T171541590
         let _ = stdx::panic_context::enter(format!("\napp_file_path: {:?}", file_id));
-        let root_id = db.file_source_root(file_id);
-        let root = db.source_root(root_id);
+        let root_id = db.file_source_root(file_id).source_root_id(db);
+        let root = db.source_root(root_id).source_root(db);
         let path = root.path_for_file(&file_id)?;
         let app_data = db.file_app_data(file_id)?;
 
@@ -417,7 +485,7 @@ impl TypedSemantic for RootDatabase {
 
 #[cfg(test)]
 mod tests {
-    use elp_base_db::SourceDatabase;
+    use elp_base_db::RootQueryDb;
     use elp_base_db::fixture::WithFixture;
     use elp_text_edit::TextRange;
 
diff --git a/crates/ide_db/src/search.rs b/crates/ide_db/src/search.rs
index cdac400688..7d792fbf06 100644
--- a/crates/ide_db/src/search.rs
+++ b/crates/ide_db/src/search.rs
@@ -117,9 +117,10 @@ impl SearchScope {
     pub fn project(db: &dyn DefDatabase, project_id: ProjectId) -> SearchScope {
         let mut entries = FxHashMap::default();
 
-        for &source_root_id in &db.project_data(project_id).source_roots {
+        for &source_root_id in &db.project_data(project_id).project_data(db).source_roots {
             entries.extend(
                 db.source_root(source_root_id)
+                    .source_root(db)
                     .iter()
                     .map(|file_id| (file_id, None)),
             )
@@ -283,7 +284,7 @@ impl<'a> FindUsages<'a> {
             scope: &'a SearchScope,
         ) -> impl Iterator<Item = (Arc<str>, FileId, TextRange)> + 'a {
             scope.entries.iter().map(move |(&file_id, &search_range)| {
-                let text = sema.db.file_text(file_id);
+                let text = sema.db.file_text(file_id).text(sema.db);
                 let search_range =
                     search_range.unwrap_or_else(|| TextRange::up_to(TextSize::of(&*text)));
 
diff --git a/crates/ide_ssr/src/lib.rs b/crates/ide_ssr/src/lib.rs
index 3a04cd9037..af5307fa0b 100644
--- a/crates/ide_ssr/src/lib.rs
+++ b/crates/ide_ssr/src/lib.rs
@@ -61,7 +61,7 @@ use std::sync::Arc;
 use elp_ide_db::RootDatabase;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::FileRange;
-use elp_ide_db::elp_base_db::SourceDatabaseExt;
+use elp_ide_db::elp_base_db::SourceDatabase;
 use elp_syntax::AstNode;
 use elp_syntax::SyntaxNode;
 use elp_syntax::TextRange;
@@ -428,7 +428,7 @@ impl<'a> MatchFinder<'a> {
     pub fn debug_where_text_equal(&self, file_id: FileId, snippet: &str) -> Vec<MatchDebugInfo> {
         let file = self.sema.parse(file_id);
         let mut res = Vec::new();
-        let file_text = self.sema.db.file_text(file_id);
+        let file_text = self.sema.db.file_text(file_id).text(self.sema.db);
         let mut remaining_text = &*file_text;
         let mut base = 0;
         let len = snippet.len() as u32;
@@ -530,7 +530,7 @@ impl SsrMatches {
 
 impl Match {
     pub fn matched_text(&self, db: &RootDatabase) -> String {
-        let file_text = db.file_text(self.range.file_id);
+        let file_text = SourceDatabase::file_text(db, self.range.file_id).text(db);
         file_text[self.range.range.start().into()..self.range.range.end().into()].to_string()
     }
 
@@ -755,7 +755,7 @@ mod test {
                         },
                         placeholders_by_var: {
                             Var(
-                                0,
+                                Id(3c00),
                             ): {
                                 AnyExprId(
                                     Expr(
@@ -841,7 +841,7 @@ mod test {
                         },
                         placeholders_by_var: {
                             Var(
-                                0,
+                                Id(3c00),
                             ): {
                                 AnyExprId(
                                     Expr(
diff --git a/crates/ide_ssr/src/tests.rs b/crates/ide_ssr/src/tests.rs
index 108680853e..5b42e30ca1 100644
--- a/crates/ide_ssr/src/tests.rs
+++ b/crates/ide_ssr/src/tests.rs
@@ -1570,7 +1570,7 @@ fn ssr_predicates_on_match_expr_pat() {
     expect![[r#"
         Some(
             Var(
-                3,
+                Id(3803),
             ),
         )
     "#]]
@@ -1584,7 +1584,7 @@ fn ssr_predicates_on_match_expr_pat() {
     expect![[r#"
         Some(
             Atom(
-                1,
+                Id(6801),
             ),
         )
     "#]]
@@ -1596,7 +1596,7 @@ fn ssr_predicates_on_match_expr_pat() {
     expect![[r#"
         Some(
             Var(
-                3,
+                Id(3803),
             ),
         )
     "#]]
@@ -1609,7 +1609,7 @@ fn ssr_predicates_on_match_expr_pat() {
     expect![[r#"
         Some(
             Var(
-                3,
+                Id(3803),
             ),
         )
     "#]]
@@ -1623,7 +1623,7 @@ fn ssr_predicates_on_match_expr_pat() {
     expect![[r#"
         Some(
             Atom(
-                2,
+                Id(6802),
             ),
         )
     "#]]

From babe31bb6f81572879cc8eb39655ce7ef829534e Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 14 Jul 2025 03:12:31 -0700
Subject: [PATCH 006/394] Keep original buck TargetFullName in AppData

Summary:
We use `AppData` as our general representation of an Erlang application in ELP, originally in the rebar3 sense.

The ELP design standardises on this information, whatever the origin of the project data in an ELP Project.

For a buck2 project, we use the last part of a buck2 target as the `AppData::name`.

So the buck target `cell/path/to/app:app_name` would give rise to "app_name".

In some circumstances involving test fixtures we cannot guarantee that the derived "app_name" is unique.

This diff adds the original full buck target name to `AppData`, so this can be used as needed.  It is used in a later diff, still unpublished.

Reviewed By: TD5

Differential Revision: D78160505

fbshipit-source-id: 3b14d50709328b53079d648c5eb2ae6a86311d6d
---
 crates/base_db/src/fixture.rs                 | 4 ++++
 crates/base_db/src/input.rs                   | 4 ++++
 crates/project_model/src/buck.rs              | 1 +
 crates/project_model/src/eqwalizer_support.rs | 1 +
 crates/project_model/src/json.rs              | 1 +
 crates/project_model/src/lib.rs               | 5 +++++
 crates/project_model/src/no_manifest.rs       | 1 +
 crates/project_model/src/rebar.rs             | 1 +
 crates/project_model/src/test_fixture.rs      | 1 +
 9 files changed, 19 insertions(+)

diff --git a/crates/base_db/src/fixture.rs b/crates/base_db/src/fixture.rs
index 9e56edef89..1c77eda18e 100644
--- a/crates/base_db/src/fixture.rs
+++ b/crates/base_db/src/fixture.rs
@@ -493,6 +493,7 @@ bar() -> ?FOO.
                                     name: AppName(
                                         "test-fixture",
                                     ),
+                                    buck_target_name: None,
                                     dir: AbsPathBuf(
                                         "/",
                                     ),
@@ -531,6 +532,7 @@ bar() -> ?FOO.
                                     name: AppName(
                                         "comp",
                                     ),
+                                    buck_target_name: None,
                                     dir: AbsPathBuf(
                                         "/opt/lib/comp-1.3",
                                     ),
@@ -580,6 +582,7 @@ bar() -> ?FOO.
                                     name: AppName(
                                         "foo-app",
                                     ),
+                                    buck_target_name: None,
                                     dir: AbsPathBuf(
                                         "/",
                                     ),
@@ -753,6 +756,7 @@ foo() -> ?BAR.
                                     name: AppName(
                                         "test-fixture",
                                     ),
+                                    buck_target_name: None,
                                     dir: AbsPathBuf(
                                         "/extra",
                                     ),
diff --git a/crates/base_db/src/input.rs b/crates/base_db/src/input.rs
index ef672ff5af..75223bc3bd 100644
--- a/crates/base_db/src/input.rs
+++ b/crates/base_db/src/input.rs
@@ -20,6 +20,7 @@ use elp_project_model::EqwalizerConfig;
 use elp_project_model::Project;
 use elp_project_model::ProjectAppData;
 use elp_project_model::buck::IncludeMapping;
+use elp_project_model::buck::TargetFullName;
 use fxhash::FxHashMap;
 use paths::RelPath;
 use paths::Utf8Path;
@@ -124,6 +125,8 @@ pub struct ProjectData {
 pub struct AppData {
     pub project_id: ProjectId,
     pub name: AppName,
+    /// Target name if this application originates from a buck target
+    pub buck_target_name: Option<TargetFullName>,
     pub dir: AbsPathBuf,
     /// Include directories belonging to this app only. Used for
     /// include_lib resolution
@@ -365,6 +368,7 @@ impl<'a> ProjectApps<'a> {
                 let input_data = AppData {
                     project_id,
                     name: app.name.clone(),
+                    buck_target_name: app.buck_target_name.clone(),
                     dir: app.dir.clone(),
                     include_dirs: app.include_dirs.clone(),
                     include_path: app.include_path.clone(),
diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 975f836700..35a40ce85e 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -844,6 +844,7 @@ fn targets_to_project_data_bxl(
         };
         let project_app_data = ProjectAppData {
             name: target.app_name.clone(),
+            buck_target_name: Some(target.name.clone()),
             dir: target.dir.clone(),
             ebin: None,
             extra_src_dirs: extra_src_dirs.into_iter().collect(),
diff --git a/crates/project_model/src/eqwalizer_support.rs b/crates/project_model/src/eqwalizer_support.rs
index c9e34b3430..9a341a38ec 100644
--- a/crates/project_model/src/eqwalizer_support.rs
+++ b/crates/project_model/src/eqwalizer_support.rs
@@ -36,6 +36,7 @@ pub(crate) fn eqwalizer_suppport_data(otp_root: &AbsPath) -> ProjectAppData {
 
     ProjectAppData {
         name: AppName("eqwalizer_support".to_string()),
+        buck_target_name: None,
         dir: eqwalizer_support.clone(),
         include_dirs: vec![],
         abs_src_dirs: vec![eqwalizer_support.join("src")],
diff --git a/crates/project_model/src/json.rs b/crates/project_model/src/json.rs
index 41d2acfc0e..2861f2a621 100644
--- a/crates/project_model/src/json.rs
+++ b/crates/project_model/src/json.rs
@@ -92,6 +92,7 @@ impl JsonProjectAppData {
         };
         Ok(ProjectAppData {
             name: AppName(self.name.clone()),
+            buck_target_name: None,
             dir,
             ebin,
             extra_src_dirs: self.extra_src_dirs.clone(),
diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs
index 746ae7b67e..cc8dc10c5a 100644
--- a/crates/project_model/src/lib.rs
+++ b/crates/project_model/src/lib.rs
@@ -30,6 +30,7 @@ use anyhow::bail;
 use buck::BuckConfig;
 use buck::BuckQueryConfig;
 use buck::IncludeMapping;
+use buck::TargetFullName;
 use elp_log::timeit;
 use fxhash::FxHashMap;
 use fxhash::FxHashSet;
@@ -832,6 +833,8 @@ pub enum AppType {
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct ProjectAppData {
     pub name: AppName,
+    /// Target name if this application originates from a buck target
+    pub buck_target_name: Option<TargetFullName>,
     pub dir: AbsPathBuf,
     pub ebin: Option<AbsPathBuf>,
     pub extra_src_dirs: Vec<String>,
@@ -862,6 +865,7 @@ impl ProjectAppData {
     ) -> ProjectAppData {
         ProjectAppData {
             name,
+            buck_target_name: None,
             ebin: None,
             extra_src_dirs,
             include_dirs,
@@ -886,6 +890,7 @@ impl ProjectAppData {
         let abs_src_dir = dir.join("src");
         Self {
             name: AppName(name.to_string()),
+            buck_target_name: None,
             ebin: Some(dir.join("ebin")),
             extra_src_dirs: vec![],
             // This makes sure files in ./include are loaded into VFS
diff --git a/crates/project_model/src/no_manifest.rs b/crates/project_model/src/no_manifest.rs
index 23b00ae1c0..402d27d9c5 100644
--- a/crates/project_model/src/no_manifest.rs
+++ b/crates/project_model/src/no_manifest.rs
@@ -58,6 +58,7 @@ impl NoManifestConfig {
     pub fn to_project_app_data(&self, otp_root: &AbsPath) -> Vec<ProjectAppData> {
         let mut data = ProjectAppData {
             name: self.name.clone(),
+            buck_target_name: None,
             dir: self.root_path.clone(),
             include_dirs: self.include_dirs.clone(),
             abs_src_dirs: self.abs_src_dirs.clone(),
diff --git a/crates/project_model/src/rebar.rs b/crates/project_model/src/rebar.rs
index 138e7e2469..14468e5fa8 100644
--- a/crates/project_model/src/rebar.rs
+++ b/crates/project_model/src/rebar.rs
@@ -187,6 +187,7 @@ impl RebarProject {
                 .collect::<Result<_>>()?;
             Ok(ProjectAppData {
                 name: AppName(into_string(map_pop(&mut term, "name")?)?),
+                buck_target_name: None,
                 dir,
                 ebin: map_pop(&mut term, "ebin")
                     .ok()
diff --git a/crates/project_model/src/test_fixture.rs b/crates/project_model/src/test_fixture.rs
index 5b2b8e9e29..b1dbd93d6c 100644
--- a/crates/project_model/src/test_fixture.rs
+++ b/crates/project_model/src/test_fixture.rs
@@ -953,6 +953,7 @@ bar() -> ok.
                 name: AppName(
                     "test-fixture",
                 ),
+                buck_target_name: None,
                 dir: AbsPathBuf(
                     "/",
                 ),

From 8d73b1dc45c99aba08e449d9b6fdfbb0e8c34a25 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 14 Jul 2025 09:36:14 -0700
Subject: [PATCH 007/394] Properly clear diagnostics when a file is closed

Summary:
When we process a `DidCloseTextDocument` we sent a `PublishDocuments` notification with empty diagnostics to the server, to clear its diagnostic store.

But if at the time of closing the file we are calculating diagnostics for it, these will be sent when the diagnostic calculation ends.

This diff ensures we clear all current diagnostics (except eqwalizer project ones, if enabled) when we close the file, and does not send diagnostics for unopened files.

Reviewed By: TD5

Differential Revision: D78275536

fbshipit-source-id: f4d380e0022102dcb74151f027df4d5b0cdd58c5
---
 crates/elp/src/server.rs                 | 43 ++++++++++++++----------
 crates/ide/src/diagnostics_collection.rs | 14 ++++++++
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index 988529b585..972824d529 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -566,16 +566,23 @@ impl Server {
                         break;
                     }
                 };
+                let (in_mem, version) = match convert::vfs_path(&url) {
+                    Ok(path) => match self.mem_docs.read().get(&path).cloned() {
+                        Some(d) => (true, Some(d.version)),
+                        None => (false, None),
+                    },
+                    Err(_) => (false, None),
+                };
+                if !in_mem {
+                    // Clear all but eqwalizer project diagnostics
+                    Arc::make_mut(&mut self.diagnostics).clear(*file_id);
+                }
                 let diagnostics = self
                     .diagnostics
                     .diagnostics_for(*file_id)
                     .iter()
                     .map(|d| ide_to_lsp_diagnostic(&line_index, &url, d))
                     .collect();
-                let version = convert::vfs_path(&url)
-                    .map(|path| self.mem_docs.read().get(&path).cloned())
-                    .unwrap_or_default()
-                    .map(|doc_info| doc_info.version);
 
                 self.send_notification::<notification::PublishDiagnostics>(
                     lsp_types::PublishDiagnosticsParams {
@@ -762,20 +769,22 @@ impl Server {
                         this.vfs_loader.handle.invalidate(path.to_path_buf());
                     }
 
-                    // If project-wide diagnostics are enabled, ensure we don't lose the eqwalizer ones.
-                    if this.config.eqwalizer().all {
-                        let vfs = this.vfs.read();
-                        if let Some((file_id, _)) = vfs.file_id(&path) {
+                    let vfs = this.vfs.read();
+                    if let Some((file_id, _)) = vfs.file_id(&path) {
+                        // If project-wide diagnostics are enabled, ensure we don't lose the eqwalizer ones.
+                        if this.config.eqwalizer().all {
                             Arc::make_mut(&mut this.diagnostics)
                                 .move_eqwalizer_diagnostics_to_project_diagnostics(file_id);
-                            if let Ok(line_index) = analysis.line_index(file_id) {
-                                diagnostics = this
-                                    .diagnostics
-                                    .project_diagnostics_for(file_id)
-                                    .iter()
-                                    .map(|d| ide_to_lsp_diagnostic(&line_index, &url, d))
-                                    .collect()
-                            }
+                        }
+                        Arc::make_mut(&mut this.diagnostics)
+                            .clear(file_id);
+                        if let Ok(line_index) = analysis.line_index(file_id) {
+                            diagnostics = this
+                                .diagnostics
+                                .diagnostics_for(file_id)
+                                .iter()
+                                .map(|d| ide_to_lsp_diagnostic(&line_index, &url, d))
+                                .collect()
                         }
                     }
                 }
@@ -952,7 +961,7 @@ impl Server {
             }
             if !opened {
                 // This call will add the file to the changed_files, picked
-                // up in `process_changes`.
+                // up in `process_changes`, if it has changed.
                 vfs.set_file_contents(path, contents);
             }
         }
diff --git a/crates/ide/src/diagnostics_collection.rs b/crates/ide/src/diagnostics_collection.rs
index 26b6098b2f..d944e223da 100644
--- a/crates/ide/src/diagnostics_collection.rs
+++ b/crates/ide/src/diagnostics_collection.rs
@@ -85,6 +85,20 @@ impl DiagnosticCollection {
         }
     }
 
+    /// Reset all diagnostics for a given file, by explicitly setting
+    /// them to an empty list.  The LSP server (ELP) is responsible
+    /// for the diagnostic database for a file, so we need to
+    /// explicitly clear them when the file closes.  This function
+    /// does not clear `eqwalizer_project` ones, as these are intended
+    /// to be valid regardless of whether the file is open or not.
+    pub fn clear(&mut self, file_id: FileId) {
+        self.set_native(file_id, LabeledDiagnostics::default());
+        self.set_eqwalizer(file_id, vec![]);
+        self.set_edoc(file_id, vec![]);
+        self.set_ct(file_id, vec![]);
+        self.set_erlang_service(file_id, LabeledDiagnostics::default());
+    }
+
     pub fn diagnostics_for(&self, file_id: FileId) -> Vec<Diagnostic> {
         let empty_diags = LabeledDiagnostics::default();
         let native = self.native.get(&file_id).unwrap_or(&empty_diags);

From 748ecf93ecb3ba37aaa90fba8b5ffc57f318135b Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 15 Jul 2025 09:59:27 -0700
Subject: [PATCH 008/394] BE: Fix new clippy warnings from rust 1.88.0

Summary:
We have moved to `cargo 1.88.0 (873a06493 2025-05-10)` internally.  This has enabled a check for `uninlined_format_args`.

Update the local clippy.toml to match this, and run

```
cargo clippy --workspace --tests --fix
```

to generate this diff

This may be related to https://github.com/rust-lang/rust-clippy/issues/14694

Reviewed By: TD5

Differential Revision: D78345648

fbshipit-source-id: a218be720e34b06ed08c52b5f7db936940bc2c37
---
 crates/base_db/src/fixture.rs                 |  4 +-
 crates/base_db/src/include.rs                 |  2 +-
 crates/base_db/src/lib.rs                     | 16 ++---
 crates/base_db/src/test_utils.rs              |  4 +-
 crates/elp/build.rs                           | 22 +++----
 crates/elp/src/bin/config_stanza.rs           |  2 +-
 crates/elp/src/bin/elp_parse_cli.rs           | 17 +++--
 crates/elp/src/bin/eqwalizer_cli.rs           | 25 ++++----
 crates/elp/src/bin/erlang_service_cli.rs      |  2 +-
 crates/elp/src/bin/glean.rs                   | 30 ++++-----
 crates/elp/src/bin/lint_cli.rs                | 13 ++--
 crates/elp/src/bin/main.rs                    | 59 +++++++-----------
 crates/elp/src/bin/reporting.rs               | 16 ++---
 crates/elp/src/bin/shell.rs                   | 24 +++----
 crates/elp/src/build/load.rs                  |  2 +-
 crates/elp/src/config.rs                      | 18 +++---
 crates/elp/src/convert.rs                     |  2 +-
 crates/elp/src/handlers.rs                    |  6 +-
 crates/elp/src/reload.rs                      |  2 +-
 crates/elp/src/server.rs                      | 48 ++++++--------
 crates/elp/src/server/dispatch.rs             |  2 +-
 crates/elp/src/server/progress.rs             |  4 +-
 crates/elp/src/server/setup.rs                |  6 +-
 crates/elp/src/server/telemetry_manager.rs    |  6 +-
 crates/elp/src/snapshot.rs                    | 17 +++--
 crates/elp/tests/slow-tests/support.rs        | 20 +++---
 crates/elp_log/src/file.rs                    |  4 +-
 crates/eqwalizer/build.rs                     | 12 +---
 crates/eqwalizer/src/ast/mod.rs               | 18 +++---
 crates/eqwalizer/src/ast/preprocess.rs        |  2 +-
 crates/eqwalizer/src/ast/trans_valid.rs       |  2 +-
 crates/eqwalizer/src/db.rs                    |  3 +-
 crates/eqwalizer/src/ipc.rs                   |  4 +-
 crates/eqwalizer/src/lib.rs                   | 35 ++++-------
 crates/erlang_service/build.rs                |  9 +--
 crates/erlang_service/src/common_test.rs      |  2 +-
 crates/erlang_service/src/lib.rs              | 46 +++++---------
 crates/hir/src/body.rs                        |  2 +-
 crates/hir/src/body/pretty.rs                 | 62 +++++++++----------
 crates/hir/src/body/tree_print.rs             | 56 ++++++++---------
 crates/hir/src/edoc.rs                        |  4 +-
 crates/hir/src/fold.rs                        |  8 +--
 crates/hir/src/form_list/pretty.rs            | 14 ++---
 crates/hir/src/include.rs                     |  6 +-
 crates/hir/src/lib.rs                         |  7 +--
 crates/hir/src/macro_exp.rs                   |  7 +--
 crates/hir/src/module_data.rs                 |  8 +--
 crates/hir/src/name.rs                        |  6 +-
 crates/hir/src/sema.rs                        |  4 +-
 crates/hir/src/sema/to_def.rs                 |  2 +-
 crates/ide/src/codemod_helpers.rs             |  4 +-
 crates/ide/src/diagnostics.rs                 |  8 +--
 .../ide/src/diagnostics/boolean_precedence.rs |  2 +-
 crates/ide/src/diagnostics/edoc.rs            |  9 +--
 .../expression_can_be_simplified.rs           |  2 +-
 crates/ide/src/diagnostics/head_mismatch.rs   |  4 +-
 .../diagnostics/map_insertion_to_syntax.rs    |  4 +-
 .../ide/src/diagnostics/missing_separator.rs  |  4 +-
 .../src/diagnostics/misspelled_attribute.rs   |  8 +--
 crates/ide/src/diagnostics/module_mismatch.rs |  2 +-
 .../nonstandard_integer_formatting.rs         |  2 +-
 .../ide/src/diagnostics/record_tuple_match.rs |  2 +-
 crates/ide/src/diagnostics/replace_call.rs    |  2 +-
 .../ide/src/diagnostics/undefined_function.rs |  4 +-
 .../ide/src/diagnostics/unspecific_include.rs |  4 +-
 .../src/diagnostics/unused_function_args.rs   |  4 +-
 crates/ide/src/diagnostics/unused_include.rs  |  4 +-
 crates/ide/src/doc_links/otp_links.rs         |  5 +-
 crates/ide/src/document_symbols.rs            |  2 +-
 crates/ide/src/fixture.rs                     |  2 +-
 crates/ide/src/handlers/goto_definition.rs    |  2 +-
 crates/ide/src/handlers/references.rs         |  5 +-
 crates/ide/src/lib.rs                         |  6 +-
 crates/ide/src/rename.rs                      |  6 +-
 crates/ide/src/runnables.rs                   |  6 +-
 crates/ide/src/tests.rs                       |  3 +-
 crates/ide_assists/src/handlers/add_doc.rs    | 16 ++---
 crates/ide_assists/src/handlers/add_format.rs |  2 +-
 crates/ide_assists/src/handlers/add_spec.rs   |  6 +-
 .../src/handlers/extract_function.rs          |  2 +-
 .../src/handlers/extract_variable.rs          |  2 +-
 .../src/handlers/implement_behaviour.rs       |  3 +-
 .../src/handlers/inline_function.rs           |  5 +-
 crates/ide_assists/src/helpers.rs             |  2 +-
 crates/ide_assists/src/tests.rs               |  6 +-
 crates/ide_completion/src/helpers.rs          |  4 +-
 crates/ide_completion/src/macros.rs           |  2 +-
 crates/ide_completion/src/tests.rs            |  2 +-
 crates/ide_db/src/apply_change.rs             |  2 +-
 crates/ide_db/src/assists.rs                  |  2 +-
 crates/ide_db/src/common_test.rs              |  2 +-
 crates/ide_db/src/diagnostic_code.rs          |  5 +-
 crates/ide_db/src/docs.rs                     |  8 +--
 crates/ide_db/src/eqwalizer.rs                |  8 +--
 crates/ide_db/src/erl_ast.rs                  |  2 +-
 crates/ide_db/src/lib.rs                      |  4 +-
 crates/ide_db/src/rename.rs                   |  6 +-
 crates/ide_db/src/search.rs                   |  2 +-
 crates/ide_ssr/src/lib.rs                     |  5 +-
 crates/project_model/src/buck.rs              |  9 ++-
 crates/project_model/src/json.rs              |  4 +-
 crates/project_model/src/lib.rs               | 17 +++--
 crates/project_model/src/otp.rs               |  4 +-
 crates/project_model/src/test_fixture.rs      | 28 ++++-----
 crates/syntax/src/algo.rs                     |  5 +-
 crates/syntax/src/ast/edit.rs                 |  2 +-
 crates/syntax/src/ast/node_ext.rs             | 14 ++---
 crates/syntax/src/ast/traits.rs               |  4 +-
 crates/syntax/src/lib.rs                      | 10 +--
 crates/syntax/src/ptr.rs                      |  2 +-
 crates/syntax/src/syntax_error.rs             |  2 +-
 crates/types_db/src/eqwalizer/mod.rs          |  2 +-
 crates/types_db/src/eqwalizer/types.rs        |  6 +-
 xtask/src/codegen.rs                          |  7 +--
 xtask/src/main.rs                             |  2 +-
 115 files changed, 451 insertions(+), 563 deletions(-)

diff --git a/crates/base_db/src/fixture.rs b/crates/base_db/src/fixture.rs
index 1c77eda18e..22e6c85c97 100644
--- a/crates/base_db/src/fixture.rs
+++ b/crates/base_db/src/fixture.rs
@@ -142,7 +142,7 @@ impl Builder {
     fn absolute_path(&self, path: String) -> String {
         if let Some(project_dir) = &self.project_dir {
             let project_dir_str = project_dir.path().as_os_str().to_str().unwrap();
-            format!("{}/{}", project_dir_str, path)
+            format!("{project_dir_str}/{path}")
         } else {
             path
         }
@@ -272,7 +272,7 @@ impl ChangeFixture {
                 write!(tmp_file, "{}", &text).unwrap();
             }
 
-            let json_config_file = format!("{}/build_info.json", project_dir_str);
+            let json_config_file = format!("{project_dir_str}/build_info.json");
 
             let mut writer = File::create(&json_config_file).unwrap();
 
diff --git a/crates/base_db/src/include.rs b/crates/base_db/src/include.rs
index c561a6abb7..458db14773 100644
--- a/crates/base_db/src/include.rs
+++ b/crates/base_db/src/include.rs
@@ -28,7 +28,7 @@ pub struct IncludeCtx<'a> {
 impl<'a> IncludeCtx<'a> {
     pub fn new(db: &'a dyn RootQueryDb, file_id: FileId) -> Self {
         // Context for T171541590
-        let _ = stdx::panic_context::enter(format!("\nIncludeCtx::new: {:?}", file_id));
+        let _ = stdx::panic_context::enter(format!("\nIncludeCtx::new: {file_id:?}"));
         let source_root_id = db.file_source_root(file_id).source_root_id(db);
         let source_root = db.source_root(source_root_id).source_root(db);
         Self {
diff --git a/crates/base_db/src/lib.rs b/crates/base_db/src/lib.rs
index 7999ce6674..5f32cc358b 100644
--- a/crates/base_db/src/lib.rs
+++ b/crates/base_db/src/lib.rs
@@ -549,7 +549,7 @@ fn build_include_file_index(
                     include_file_index.add(path, file_id);
                 }
             } else {
-                log::warn!("No file path for {:?}", file_id);
+                log::warn!("No file path for {file_id:?}");
             }
         }
     }
@@ -627,7 +627,7 @@ fn is_otp(db: &dyn RootQueryDb, file_id: FileId) -> Option<bool> {
 
 fn is_test_suite_or_test_helper(db: &dyn RootQueryDb, file_id: FileId) -> Option<bool> {
     // Context for T171541590
-    let _ = stdx::panic_context::enter(format!("\nis_test_suite_or_test_helper: {:?}", file_id));
+    let _ = stdx::panic_context::enter(format!("\nis_test_suite_or_test_helper: {file_id:?}"));
     let app_data = db.file_app_data(file_id)?;
     let root_id = db.file_source_root(file_id).source_root_id(db);
     let root = db.source_root(root_id).source_root(db);
@@ -641,28 +641,28 @@ fn is_test_suite_or_test_helper(db: &dyn RootQueryDb, file_id: FileId) -> Option
 
 fn file_app_type(db: &dyn RootQueryDb, file_id: FileId) -> Option<AppType> {
     // Context for T171541590
-    let _ = stdx::panic_context::enter(format!("\nfile_app_type: {:?}", file_id));
+    let _ = stdx::panic_context::enter(format!("\nfile_app_type: {file_id:?}"));
     let app_data = db.file_app_data(file_id)?;
     Some(app_data.app_type)
 }
 
 fn file_app_name(db: &dyn RootQueryDb, file_id: FileId) -> Option<AppName> {
     // Context for T171541590
-    let _ = stdx::panic_context::enter(format!("\nfile_app_name: {:?}", file_id));
+    let _ = stdx::panic_context::enter(format!("\nfile_app_name: {file_id:?}"));
     let app_data = db.file_app_data(file_id)?;
     Some(app_data.name.clone())
 }
 
 fn file_project_id(db: &dyn RootQueryDb, file_id: FileId) -> Option<ProjectId> {
     // Context for T171541590
-    let _ = stdx::panic_context::enter(format!("\nfile_project_id: {:?}", file_id));
+    let _ = stdx::panic_context::enter(format!("\nfile_project_id: {file_id:?}"));
     let app_data = db.file_app_data(file_id)?;
     Some(app_data.project_id)
 }
 
 pub fn module_name(db: &dyn RootQueryDb, file_id: FileId) -> Option<ModuleName> {
     // Context for T171541590
-    let _ = stdx::panic_context::enter(format!("\nmodule_name: {:?}", file_id));
+    let _ = stdx::panic_context::enter(format!("\nmodule_name: {file_id:?}"));
     let app_data = db.file_app_data(file_id)?;
     let module_index = db.module_index(app_data.project_id);
     module_index.module_for_file(file_id).cloned()
@@ -681,7 +681,7 @@ static ref IGNORED_SOURCES: Vec<Regex> = {
 
 fn file_kind(db: &dyn RootQueryDb, file_id: FileId) -> FileKind {
     // Context for T171541590
-    let _ = stdx::panic_context::enter(format!("\nfile_kind: {:?}", file_id));
+    let _ = stdx::panic_context::enter(format!("\nfile_kind: {file_id:?}"));
     let source_root_id = db.file_source_root(file_id).source_root_id(db);
     let source_root = db.source_root(source_root_id).source_root(db);
     let ignored_path = source_root
@@ -693,7 +693,7 @@ fn file_kind(db: &dyn RootQueryDb, file_id: FileId) -> FileKind {
         })
         .unwrap_or(false);
     // Context for T171541590
-    let _ = stdx::panic_context::enter(format!("\nfile_kind: {:?}", file_id));
+    let _ = stdx::panic_context::enter(format!("\nfile_kind: {file_id:?}"));
     if ignored_path {
         // not part of the known project model, and on list of ignored
         // sources, do not process
diff --git a/crates/base_db/src/test_utils.rs b/crates/base_db/src/test_utils.rs
index fd7250d105..fa478eb385 100644
--- a/crates/base_db/src/test_utils.rs
+++ b/crates/base_db/src/test_utils.rs
@@ -46,8 +46,8 @@ pub fn format_diff(chunks: Vec<dissimilar::Chunk>) -> String {
     for chunk in chunks {
         let formatted = match chunk {
             dissimilar::Chunk::Equal(text) => text.into(),
-            dissimilar::Chunk::Delete(text) => format!("\x1b[41m{}\x1b[0m", text),
-            dissimilar::Chunk::Insert(text) => format!("\x1b[42m{}\x1b[0m", text),
+            dissimilar::Chunk::Delete(text) => format!("\x1b[41m{text}\x1b[0m"),
+            dissimilar::Chunk::Insert(text) => format!("\x1b[42m{text}\x1b[0m"),
         };
         buf.push_str(&formatted);
     }
diff --git a/crates/elp/build.rs b/crates/elp/build.rs
index d55fabfa0b..be24e95092 100644
--- a/crates/elp/build.rs
+++ b/crates/elp/build.rs
@@ -33,7 +33,7 @@ fn main() {
                 OffsetDateTime::from_unix_timestamp(timestamp).expect("parsing SOURCE_DATE_EPOCH")
             }
             Err(std::env::VarError::NotPresent) => OffsetDateTime::now_utc(),
-            Err(e) => panic!("Error getting SOURCE_DATE_EPOCH: {}", e),
+            Err(e) => panic!("Error getting SOURCE_DATE_EPOCH: {e}"),
         };
         date.format(&date_format).expect("formatting date")
     } else {
@@ -43,20 +43,14 @@ fn main() {
     let cargo_manifest_dir = env::var(CARGO_MANIFEST_DIR)
         .expect("CARGO_MANIFEST_DIR should be set automatically by cargo");
     let eqwalizer_support_dir = match eqwalizer_dir {
-        Ok(eqwalizer_support_dir) => format!("{}/../eqwalizer_support", eqwalizer_support_dir),
-        Err(_) => format!(
-            "{}/../../../eqwalizer/eqwalizer_support",
-            cargo_manifest_dir
-        ),
+        Ok(eqwalizer_support_dir) => format!("{eqwalizer_support_dir}/../eqwalizer_support"),
+        Err(_) => format!("{cargo_manifest_dir}/../../../eqwalizer/eqwalizer_support"),
     };
 
     println!("cargo:rerun-if-changed=build.rs");
-    println!("cargo:rerun-if-env-changed={}", SOURCE_DATE_EPOCH);
-    println!("cargo:rerun-if-env-changed={}", CI);
-    println!("cargo:rustc-env=BUILD_ID={}", build_id);
-    println!(
-        "cargo:rustc-env={}={}",
-        EQWALIZER_SUPPORT_DIR, eqwalizer_support_dir
-    );
-    println!("cargo:rerun-if-env-changed={}", EQWALIZER_DIR);
+    println!("cargo:rerun-if-env-changed={SOURCE_DATE_EPOCH}");
+    println!("cargo:rerun-if-env-changed={CI}");
+    println!("cargo:rustc-env=BUILD_ID={build_id}");
+    println!("cargo:rustc-env={EQWALIZER_SUPPORT_DIR}={eqwalizer_support_dir}");
+    println!("cargo:rerun-if-env-changed={EQWALIZER_DIR}");
 }
diff --git a/crates/elp/src/bin/config_stanza.rs b/crates/elp/src/bin/config_stanza.rs
index 97e76f1b4f..a0f0650c6b 100644
--- a/crates/elp/src/bin/config_stanza.rs
+++ b/crates/elp/src/bin/config_stanza.rs
@@ -16,5 +16,5 @@ use crate::args::ConfigStanza;
 
 pub fn config_stanza(_args: &ConfigStanza, cli: &mut dyn Cli) -> Result<()> {
     let schema = format!("{:#}", Config::json_schema());
-    Ok(writeln!(cli, "{}", schema)?)
+    Ok(writeln!(cli, "{schema}")?)
 }
diff --git a/crates/elp/src/bin/elp_parse_cli.rs b/crates/elp/src/bin/elp_parse_cli.rs
index e8d36aa247..6d29ba38e5 100644
--- a/crates/elp/src/bin/elp_parse_cli.rs
+++ b/crates/elp/src/bin/elp_parse_cli.rs
@@ -87,7 +87,7 @@ pub fn parse_all(
     let (file_id, name) = match &args.module {
         Some(module) => {
             if args.is_format_normal() {
-                writeln!(cli, "module specified: {}", module)?;
+                writeln!(cli, "module specified: {module}")?;
             }
             let file_id = analysis.module_file_id(loaded.project_id, module)?;
             (file_id, analysis.module_name(file_id.unwrap())?)
@@ -96,7 +96,7 @@ pub fn parse_all(
         None => match &args.file {
             Some(file_name) => {
                 if args.is_format_normal() {
-                    writeln!(cli, "file specified: {}", file_name)?;
+                    writeln!(cli, "file specified: {file_name}")?;
                 }
                 let path_buf = Utf8PathBuf::from_path_buf(fs::canonicalize(file_name).unwrap())
                     .expect("UTF8 conversion failed");
@@ -127,7 +127,7 @@ pub fn parse_all(
             do_parse_one(&analysis, &loaded.vfs, &cfg, &args.to, file_id, &name)?
                 .map_or(vec![], |x| vec![x])
         }
-        (Some(file_id), _, _) => panic!("Could not get name from file_id for {:?}", file_id),
+        (Some(file_id), _, _) => panic!("Could not get name from file_id for {file_id:?}"),
     };
 
     if args.dump_include_resolutions {
@@ -208,8 +208,7 @@ fn print_diagnostic_json(
         cli,
         "{}",
         serde_json::to_string(&converted_diagnostic).unwrap_or_else(|err| panic!(
-            "print_diagnostics_json failed for '{:?}': {}",
-            converted_diagnostic, err
+            "print_diagnostics_json failed for '{converted_diagnostic:?}': {err}"
         ))
     )?;
     Ok(())
@@ -247,7 +246,7 @@ fn print_diagnostic(
 fn maybe_code_as_string(mc: Option<NumberOrString>) -> String {
     match mc {
         Some(ns) => match ns {
-            NumberOrString::Number(n) => format!("{}", n),
+            NumberOrString::Number(n) => format!("{n}"),
             NumberOrString::String(s) => s,
         },
         None => "".to_string(),
@@ -336,16 +335,16 @@ fn do_parse_one(
         .unwrap_or(LabeledDiagnostics::default());
 
     if let Some(to) = to {
-        let to_path = to.join(format!("{}.diag", name));
+        let to_path = to.join(format!("{name}.diag"));
         let mut output = File::create(to_path)?;
 
         for diagnostic in native.iter() {
             let diagnostic = convert::ide_to_lsp_diagnostic(&line_index, &url, diagnostic);
-            writeln!(output, "{:?}", diagnostic)?;
+            writeln!(output, "{diagnostic:?}")?;
         }
         for diagnostic in erlang_service.iter() {
             let diagnostic = convert::ide_to_lsp_diagnostic(&line_index, &url, diagnostic);
-            writeln!(output, "{:?}", diagnostic)?;
+            writeln!(output, "{diagnostic:?}")?;
         }
     }
     if !(native.is_empty() && erlang_service.is_empty()) {
diff --git a/crates/elp/src/bin/eqwalizer_cli.rs b/crates/elp/src/bin/eqwalizer_cli.rs
index 23b078c1de..e9159372be 100644
--- a/crates/elp/src/bin/eqwalizer_cli.rs
+++ b/crates/elp/src/bin/eqwalizer_cli.rs
@@ -100,11 +100,10 @@ pub fn do_eqwalize_module(
     for module in &args.modules {
         let suggest_name = Path::new(module).file_stem().and_then(|name| name.to_str());
         let context_str = match suggest_name {
-            Some(name) if name != module => format!(
-                "Module {} not found. Did you mean elp eqwalize {}?",
-                module, name
-            ),
-            _ => format!("Module {} not found", module),
+            Some(name) if name != module => {
+                format!("Module {module} not found. Did you mean elp eqwalize {name}?")
+            }
+            _ => format!("Module {module} not found"),
         };
         let file_id = analysis
             .module_file_id(loaded.project_id, module)?
@@ -169,7 +168,7 @@ pub fn do_eqwalize_all(
     let module_index = analysis.module_index(loaded.project_id)?;
     let include_generated = args.include_generated;
     if include_generated {
-        write!(cli, "{}", DEPRECATED_INCLUDE_GENERATED)?;
+        write!(cli, "{DEPRECATED_INCLUDE_GENERATED}")?;
     }
     let pb = cli.progress(module_index.len_own() as u64, "Gathering modules");
     let file_ids: Vec<FileId> = module_index
@@ -250,7 +249,7 @@ pub fn do_eqwalize_app(
     let module_index = analysis.module_index(loaded.project_id)?;
     let include_generated = args.include_generated;
     if include_generated {
-        write!(cli, "{}", DEPRECATED_INCLUDE_GENERATED)?;
+        write!(cli, "{DEPRECATED_INCLUDE_GENERATED}")?;
     }
     let file_ids: Vec<FileId> = module_index
         .iter_own()
@@ -307,7 +306,7 @@ pub fn eqwalize_target(
     let analysis = &loaded.analysis();
     let include_generated = args.include_generated;
     if include_generated {
-        write!(cli, "{}", DEPRECATED_INCLUDE_GENERATED)?;
+        write!(cli, "{DEPRECATED_INCLUDE_GENERATED}")?;
     }
     let mut file_ids: Vec<FileId> = Default::default();
     let mut at_least_one_found = false;
@@ -382,7 +381,7 @@ pub fn eqwalize_stats(
     let module_index = analysis.module_index(loaded.project_id)?;
     let include_generated = args.include_generated;
     if include_generated {
-        write!(cli, "{}", DEPRECATED_INCLUDE_GENERATED)?;
+        write!(cli, "{DEPRECATED_INCLUDE_GENERATED}")?;
     }
     let project_id = loaded.project_id;
     let pb = cli.progress(module_index.len_own() as u64, "Computing stats");
@@ -446,8 +445,7 @@ fn print_diagnostic_json(
         cli,
         "{}",
         serde_json::to_string(&converted_diagnostic).unwrap_or_else(|err| panic!(
-            "print_diagnostics_json failed for '{:?}': {}",
-            converted_diagnostic, err
+            "print_diagnostics_json failed for '{converted_diagnostic:?}': {err}"
         ))
     )?;
     Ok(())
@@ -504,7 +502,7 @@ fn eqwalize(
                 let file_id = analysis
                     .module_index(loaded.project_id)?
                     .file_for_module(module.as_str())
-                    .with_context(|| format!("module {} not found", module))?;
+                    .with_context(|| format!("module {module} not found"))?;
                 reporter.write_eqwalizer_diagnostics(file_id, &diagnostics)?;
                 if !diagnostics.is_empty() {
                     has_errors = true;
@@ -559,8 +557,7 @@ fn eqwalize(
                 // The cached parse errors must be non-empty otherwise we wouldn't have `NoAst`
                 assert!(
                     !parse_diagnostics.is_empty(),
-                    "Expecting erlang service diagnostics, but none found, for '{}'",
-                    module
+                    "Expecting erlang service diagnostics, but none found, for '{module}'"
                 );
                 let parse_diagnostics: Vec<_> = parse_diagnostics
                     .into_iter()
diff --git a/crates/elp/src/bin/erlang_service_cli.rs b/crates/elp/src/bin/erlang_service_cli.rs
index 06e596018b..0c1946b329 100644
--- a/crates/elp/src/bin/erlang_service_cli.rs
+++ b/crates/elp/src/bin/erlang_service_cli.rs
@@ -129,7 +129,7 @@ pub fn do_parse_one(
     let result = db.module_ast(file_id)?;
     if result.is_ok() {
         if let Some((name, to)) = to {
-            let to_path = to.join(format!("{}.etf", name));
+            let to_path = to.join(format!("{name}.etf"));
             fs::write(to_path, &*result.ast)?;
         }
         Ok(vec![])
diff --git a/crates/elp/src/bin/glean.rs b/crates/elp/src/bin/glean.rs
index d7e3006bc8..a99cde49bb 100644
--- a/crates/elp/src/bin/glean.rs
+++ b/crates/elp/src/bin/glean.rs
@@ -812,7 +812,7 @@ impl GleanIndexer {
                         );
                         result
                     }
-                    None => panic!("Can't find module {}", module),
+                    None => panic!("Can't find module {module}"),
                 }
             } else {
                 let iter = files
@@ -838,7 +838,7 @@ impl GleanIndexer {
                     .collect::<Vec<_>>()
                     .into_iter()
                     .enumerate()
-                    .map(|(id, facts)| (format!("{}.json", id), facts))
+                    .map(|(id, facts)| (format!("{id}.json"), facts))
                     .collect()
                 } else {
                     let mut result = FxHashMap::default();
@@ -927,12 +927,12 @@ impl GleanIndexer {
                     if let Some(def) = def {
                         let range = def.source(db).syntax().text_range();
                         let text = &db.file_text(id).text(db)[range];
-                        let text = format!("```erlang\n{}\n```", text);
+                        let text = format!("```erlang\n{text}\n```");
                         let doc = match (&x.key.expansion, &x.key.ods_url) {
                             (None, None) => text,
-                            (None, Some(o)) => format!("[ODS]({})\n{}", o, text),
-                            (Some(e), None) => format!("{}\n---\n\n{}", text, e),
-                            (Some(e), Some(o)) => format!("[ODS]({})\n{}\n---\n\n{}", o, text, e),
+                            (None, Some(o)) => format!("[ODS]({o})\n{text}"),
+                            (Some(e), None) => format!("{text}\n---\n\n{e}"),
+                            (Some(e), Some(o)) => format!("[ODS]({o})\n{text}\n---\n\n{e}"),
                         };
                         let decl = Declaration::MacroDeclaration(
                             MacroDecl {
@@ -1113,7 +1113,7 @@ impl GleanIndexer {
         for (ty, def) in def_map.get_types() {
             let range = def.source(db).syntax().text_range();
             let text = &db.file_text(file_id).text(db)[range];
-            let text = format!("```erlang\n{}\n```", text);
+            let text = format!("```erlang\n{text}\n```");
             let span: Location = range.into();
 
             let decl = Declaration::TypeDeclaration(
@@ -1140,7 +1140,7 @@ impl GleanIndexer {
         for (rec, def) in def_map.get_records() {
             let range = def.source(db).syntax().text_range();
             let text = &db.file_text(file_id).text(db)[range];
-            let text = format!("```erlang\n{}\n```", text);
+            let text = format!("```erlang\n{text}\n```");
             let span: Location = range.into();
 
             let decl = Declaration::RecordDeclaration(
@@ -1165,7 +1165,7 @@ impl GleanIndexer {
         if let Some((name, Some("hrl"))) = path.name_and_extension() {
             declarations.push(Declaration::HeaderDeclaration(
                 HeaderDecl {
-                    name: format!("{}.hrl", name),
+                    name: format!("{name}.hrl"),
                     span: Location {
                         start: 0,
                         length: 1,
@@ -1416,7 +1416,7 @@ impl GleanIndexer {
                     let range: TextRange = range.clone().into();
                     let range: Location = range.into();
                     if let Some(name) = vars.get(&range) {
-                        let text = format!("```erlang\n{} :: {}\n```", name, ty);
+                        let text = format!("```erlang\n{name} :: {ty}\n```");
                         let decl = VarDecl {
                             name: name.to_string(),
                             doc: text,
@@ -1463,7 +1463,7 @@ impl GleanIndexer {
                                 if let Some((name, Some("hrl"))) = path.name_and_extension() {
                                     let target = HeaderTarget {
                                         file_id: file.into(),
-                                        name: format!("{}.hrl", name),
+                                        name: format!("{name}.hrl"),
                                     };
                                     let xref = XRef {
                                         source: range,
@@ -1638,7 +1638,7 @@ impl GleanIndexer {
         if let ast::Expr::ExprMax(ExprMax::MacroCallExpr(macro_call)) = node {
             let (_, expansion) = sema.expand(InFile::new(source_file.file_id, &macro_call))?;
             let expansion = expansion.trim();
-            let expansion = format!("```erlang\n{}\n```", expansion);
+            let expansion = format!("```erlang\n{expansion}\n```");
             return Some(expansion);
         }
         None
@@ -1766,7 +1766,7 @@ impl GleanIndexer {
 fn path_to_module_name(path: &VfsPath) -> Option<String> {
     match path.name_and_extension() {
         Some((name, Some("erl"))) => Some(name.to_string()),
-        Some((name, Some("hrl"))) => Some(format!("{}.hrl", name)),
+        Some((name, Some("hrl"))) => Some(format!("{name}.hrl")),
         _ => None,
     }
 }
@@ -2642,7 +2642,7 @@ mod tests {
                 if label.is_empty() {
                     continue;
                 }
-                let label = format!("{}/{}", file_name, label);
+                let label = format!("{file_name}/{label}");
                 let tuple = (range, label);
                 let idx = annotations
                     .iter()
@@ -2791,7 +2791,7 @@ mod tests {
                         .strip_suffix("\n```")
                         .unwrap()
                         .to_string();
-                    f.write_str(format!("var/{}", ttype).as_str())
+                    f.write_str(format!("var/{ttype}").as_str())
                 }
                 Declaration::HeaderDeclaration(decl) => {
                     f.write_str(format!("header/{}", decl.key.name).as_str())
diff --git a/crates/elp/src/bin/lint_cli.rs b/crates/elp/src/bin/lint_cli.rs
index f32de37074..c08d6e065e 100644
--- a/crates/elp/src/bin/lint_cli.rs
+++ b/crates/elp/src/bin/lint_cli.rs
@@ -229,7 +229,7 @@ pub fn do_codemod(
             Some(module) => match analysis.module_file_id(loaded.project_id, module)? {
                 Some(file_id) => {
                     if args.is_format_normal() {
-                        writeln!(cli, "module specified: {}", module)?;
+                        writeln!(cli, "module specified: {module}")?;
                     }
                     (Some(file_id), analysis.module_name(file_id)?)
                 }
@@ -238,7 +238,7 @@ pub fn do_codemod(
             None => match &args.file {
                 Some(file_name) => {
                     if args.is_format_normal() {
-                        writeln!(cli, "file specified: {}", file_name)?;
+                        writeln!(cli, "file specified: {file_name}")?;
                     }
                     let path_buf = Utf8PathBuf::from_path_buf(fs::canonicalize(file_name).unwrap())
                         .expect("UTF8 conversion failed");
@@ -272,7 +272,7 @@ pub fn do_codemod(
                     .map_or(vec![], |x| vec![x])
             }
             (Some(file_id), _) => {
-                panic!("Could not get name from file_id for {:?}", file_id)
+                panic!("Could not get name from file_id for {file_id:?}")
             }
         };
 
@@ -365,7 +365,7 @@ pub fn do_codemod(
             match lints.apply_relevant_fixes(args.is_format_normal(), cli) {
                 Ok(_) => {}
                 Err(err) => {
-                    writeln!(cli, "Apply fix failed: {:#}", err).ok();
+                    writeln!(cli, "Apply fix failed: {err:#}").ok();
                 }
             };
         }
@@ -424,8 +424,7 @@ fn print_diagnostic_json(
         cli,
         "{}",
         serde_json::to_string(&converted_diagnostic).unwrap_or_else(|err| panic!(
-            "print_diagnostics_json failed for '{:?}': {}",
-            converted_diagnostic, err
+            "print_diagnostics_json failed for '{converted_diagnostic:?}': {err}"
         ))
     )?;
     Ok(())
@@ -864,7 +863,7 @@ impl<'a> Lints<'a> {
             let mut output = File::create(to_path).ok()?;
             write!(output, "{file_text}").ok()?;
         } else if let Some(to) = &self.args.to {
-            let to_path = to.join(format!("{}.erl", name));
+            let to_path = to.join(format!("{name}.erl"));
             let mut output = File::create(to_path).ok()?;
             write!(output, "{file_text}").ok()?;
         } else {
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 3a5c4daff0..e1eb2a3acc 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -72,7 +72,7 @@ fn main() {
 
 fn handle_res(result: Result<()>, stderr: &mut dyn Write) -> i32 {
     if let Err(err) = result {
-        writeln!(stderr, "{:#}", err).unwrap();
+        writeln!(stderr, "{err:#}").unwrap();
         101
     } else {
         0
@@ -81,7 +81,7 @@ fn handle_res(result: Result<()>, stderr: &mut dyn Write) -> i32 {
 
 fn setup_static(args: &Args) {
     if let Err(err) = eqwalizer_support::setup_eqwalizer_support(&EQWALIZER_SUPPORT_DIR) {
-        log::warn!("Failed to setup eqwalizer_support: {}", err);
+        log::warn!("Failed to setup eqwalizer_support: {err}");
     }
     if let Some(erl) = &args.erl {
         let path = fs::canonicalize(erl).expect("erl path should be valid");
@@ -123,13 +123,13 @@ fn try_main(cli: &mut dyn Cli, args: Args) -> Result<()> {
         args::Command::Lint(args) => lint_cli::run_lint_command(&args, cli, &query_config)?,
         args::Command::GenerateCompletions(args) => {
             let instructions = args::gen_completions(&args.shell);
-            writeln!(cli, "#Please run this:\n{}", instructions)?
+            writeln!(cli, "#Please run this:\n{instructions}")?
         }
         args::Command::Version(_) => writeln!(cli, "elp {}", elp::version())?,
         args::Command::Shell(args) => shell::run_shell(&args, cli, &query_config)?,
         args::Command::Help() => {
             let help = batteries::get_usage(args::args());
-            writeln!(cli, "{}", help)?
+            writeln!(cli, "{help}")?
         }
         args::Command::Explain(args) => explain_cli::explain(&args, cli)?,
         args::Command::Glean(args) => glean::index(&args, cli, &query_config)?,
@@ -169,7 +169,7 @@ fn setup_thread_pool() {
         .stack_size(THREAD_STACK_SIZE)
         .build_global()
     {
-        log::warn!("Failed to setup thread pool: {}", err);
+        log::warn!("Failed to setup thread pool: {err}");
     }
 }
 
@@ -282,7 +282,7 @@ mod tests {
 
     fn parse_all_complete(project: &str) -> Result<i32> {
         // Just check the command returns.
-        let project_path = format!("../../test_projects/{}", project);
+        let project_path = format!("../../test_projects/{project}");
         let tmp = Builder::new().prefix("elp_parse_all_").tempdir().unwrap();
         let (_stdout, _stderr, code) = elp(args_vec![
             "parse-all",
@@ -348,20 +348,20 @@ mod tests {
                 Mode::Cli,
                 &BUCK_QUERY_CONFIG,
             )
-            .with_context(|| format!("Failed to load project at {}", str_path))
+            .with_context(|| format!("Failed to load project at {str_path}"))
             .unwrap();
             loaded
                 .analysis_host
                 .raw_database_mut()
                 .set_eqwalizer_config(Arc::new(config));
             build::compile_deps(&loaded, &cli)
-                .with_context(|| format!("Failed to compile deps for project {}", project))
+                .with_context(|| format!("Failed to compile deps for project {project}"))
                 .unwrap();
 
             let analysis = loaded.analysis();
             let module_index = analysis
                 .module_index(loaded.project_id)
-                .with_context(|| format!("No module index for project {}", project))
+                .with_context(|| format!("No module index for project {project}"))
                 .unwrap();
             let file_ids: Vec<FileId> = module_index
                 .iter_own()
@@ -432,13 +432,10 @@ mod tests {
                     }
                 }
                 EqwalizerDiagnostics::NoAst { module } => {
-                    panic!(
-                        "Could not run tests because module {} was not found",
-                        module
-                    )
+                    panic!("Could not run tests because module {module} was not found")
                 }
                 EqwalizerDiagnostics::Error(error) => {
-                    panic!("Could not run tests: {}", error)
+                    panic!("Could not run tests: {error}")
                 }
             }
         }
@@ -839,8 +836,7 @@ mod tests {
         );
         assert!(
             stderr.is_empty(),
-            "expected stderr to be empty, got:\n{}",
-            stderr
+            "expected stderr to be empty, got:\n{stderr}"
         );
         assert!(tmp_file.clone().exists());
         let content = fs::read_to_string(tmp_file).unwrap();
@@ -893,8 +889,7 @@ mod tests {
             );
             assert!(
                 stderr.is_empty(),
-                "expected stderr to be empty, got:\n{}",
-                stderr
+                "expected stderr to be empty, got:\n{stderr}"
             );
             assert!(tmp_file.clone().exists());
             let content = fs::read_to_string(tmp_file).unwrap();
@@ -1042,8 +1037,7 @@ mod tests {
             );
             assert!(
                 stderr.is_empty(),
-                "expected stderr to be empty, got:\n{}",
-                stderr
+                "expected stderr to be empty, got:\n{stderr}"
             );
             assert!(tmp_file.clone().exists());
             let content = fs::read_to_string(tmp_file).unwrap();
@@ -2179,15 +2173,13 @@ mod tests {
             let (stdout, stderr, code) = elp(args);
             assert_eq!(
                 code, expected_code,
-                "failed with unexpected exit code: got {} not {}\nstdout:\n{}\nstderr:\n{}",
-                code, expected_code, stdout, stderr
+                "failed with unexpected exit code: got {code} not {expected_code}\nstdout:\n{stdout}\nstderr:\n{stderr}"
             );
             assert_normalised_file(expected, &stdout, path, false);
             if expected_code == 0 {
                 assert!(
                     stderr.is_empty(),
-                    "expected stderr to be empty, got:\n{}",
-                    stderr
+                    "expected stderr to be empty, got:\n{stderr}"
                 )
             }
         }
@@ -2203,16 +2195,14 @@ mod tests {
         let (stdout, stderr, code) = elp(args);
         assert_eq!(
             code, expected_code,
-            "failed with unexpected exit code: got {} not {}\nstdout:\n{}\nstderr:\n{}",
-            code, expected_code, stdout, stderr
+            "failed with unexpected exit code: got {code} not {expected_code}\nstdout:\n{stdout}\nstderr:\n{stderr}"
         );
         let path = PathBuf::from("");
         assert_normalised_file(expected, &stdout, path, false);
         if expected_code == 0 {
             assert!(
                 stderr.is_empty(),
-                "expected stderr to be empty, got:\n{}",
-                stderr
+                "expected stderr to be empty, got:\n{stderr}"
             )
         }
     }
@@ -2232,8 +2222,7 @@ mod tests {
             let (stdout, stderr, code) = elp(args);
             assert_eq!(
                 code, 101,
-                "Expected exit code 101, got: {}\nstdout:\n{}\nstderr:\n{}",
-                code, stdout, stderr
+                "Expected exit code 101, got: {code}\nstdout:\n{stdout}\nstderr:\n{stderr}"
             );
             assert_normalised_file(expected, &stdout, path, false);
         }
@@ -2255,8 +2244,7 @@ mod tests {
             let (stdout, stderr, code) = elp(args);
             assert_eq!(
                 code, 101,
-                "Expected exit code 101, got: {}\nstdout:\n{}\nstderr:\n{}",
-                code, stdout, stderr
+                "Expected exit code 101, got: {code}\nstdout:\n{stdout}\nstderr:\n{stderr}"
             );
             assert_normalised_file(expected, &stderr, path, normalise_urls);
         }
@@ -2319,8 +2307,7 @@ mod tests {
             let (stdout, stderr, code) = elp(args);
             assert_eq!(
                 code, expected_code,
-                "Expected exit code {expected_code}, got: {}\nstdout:\n{}\nstderr:\n{}",
-                code, stdout, stderr
+                "Expected exit code {expected_code}, got: {code}\nstdout:\n{stdout}\nstderr:\n{stderr}"
             );
             if let Some(expected_stderr) = expected_stderr {
                 expected_stderr.assert_eq(&stderr);
@@ -2377,7 +2364,7 @@ mod tests {
         let project_path: PathBuf = path_str.clone().into();
         args.push("--project".into());
         if let Some(json_file) = json {
-            let full_file = format!("{}/{}", path_str, json_file);
+            let full_file = format!("{path_str}/{json_file}");
             args.push(full_file.into());
         } else {
             args.push(path_str.into());
@@ -2391,7 +2378,7 @@ mod tests {
     }
 
     fn project_path(project: &str) -> String {
-        format!("../../test_projects/{}", project)
+        format!("../../test_projects/{project}")
     }
 
     struct BackupFiles {
diff --git a/crates/elp/src/bin/reporting.rs b/crates/elp/src/bin/reporting.rs
index 7b447d2bfd..64fe8168c2 100644
--- a/crates/elp/src/bin/reporting.rs
+++ b/crates/elp/src/bin/reporting.rs
@@ -117,7 +117,7 @@ impl Reporter for PrettyReporter<'_> {
             let range: Range<usize> =
                 diagnostic.range.start().into()..diagnostic.range.end().into();
             let expr = match &diagnostic.expression {
-                Some(s) => format!("{}.\n", s),
+                Some(s) => format!("{s}.\n"),
                 None => "".to_string(),
             };
 
@@ -127,7 +127,7 @@ impl Reporter for PrettyReporter<'_> {
             let mut labels = vec![msg_label];
             if let Some(s) = &diagnostic.explanation {
                 let explanation_label =
-                    Label::secondary(reporting_id, range).with_message(format!("\n\n{}", s));
+                    Label::secondary(reporting_id, range).with_message(format!("\n\n{s}"));
                 labels.push(explanation_label);
             };
             let d: ReportingDiagnostic<usize> = ReportingDiagnostic::error()
@@ -188,7 +188,7 @@ impl Reporter for PrettyReporter<'_> {
         let duration = self.start.elapsed().as_secs();
         self.cli.set_color(&YELLOW_COLOR_SPEC)?;
         if count == total {
-            write!(self.cli, "eqWAlized {} module(s) in {}s", count, duration)?;
+            write!(self.cli, "eqWAlized {count} module(s) in {duration}s")?;
         } else {
             write!(
                 self.cli,
@@ -242,7 +242,7 @@ impl Reporter for JsonReporter<'_> {
                 eqwalizer_enabled,
             );
             let diagnostic = serde_json::to_string(&diagnostic)?;
-            writeln!(self.cli, "{}", diagnostic)?;
+            writeln!(self.cli, "{diagnostic}")?;
         }
         Ok(())
     }
@@ -260,7 +260,7 @@ impl Reporter for JsonReporter<'_> {
                 None,
             );
             let diagnostic = serde_json::to_string(&diagnostic)?;
-            writeln!(self.cli, "{}", diagnostic)?;
+            writeln!(self.cli, "{diagnostic}")?;
         }
         Ok(())
     }
@@ -283,7 +283,7 @@ impl Reporter for JsonReporter<'_> {
             None,
         );
         let diagnostic = serde_json::to_string(&diagnostic)?;
-        writeln!(self.cli, "{}", diagnostic)?;
+        writeln!(self.cli, "{diagnostic}")?;
         Ok(())
     }
 
@@ -357,12 +357,12 @@ pub(crate) fn dump_stats(cli: &mut dyn Cli, list_modules: bool) {
     if list_modules {
         writeln!(cli, "--------------start of modules----------").ok();
         stats.iter().sorted().for_each(|stat| {
-            writeln!(cli, "{}", stat).ok();
+            writeln!(cli, "{stat}").ok();
         });
     }
     writeln!(cli, "{} modules processed", stats.len()).ok();
     let mem_usage = MemoryUsage::now();
-    writeln!(cli, "{}", mem_usage).ok();
+    writeln!(cli, "{mem_usage}").ok();
 }
 
 lazy_static! {
diff --git a/crates/elp/src/bin/shell.rs b/crates/elp/src/bin/shell.rs
index 98ef380570..3285b57fa1 100644
--- a/crates/elp/src/bin/shell.rs
+++ b/crates/elp/src/bin/shell.rs
@@ -102,14 +102,14 @@ enum ShellError {
 impl fmt::Display for ShellError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            ShellError::UnexpectedCommand(cmd) => write!(f, "Unexpected command {}", cmd),
+            ShellError::UnexpectedCommand(cmd) => write!(f, "Unexpected command {cmd}"),
             ShellError::UnexpectedOption(cmd, arg) => {
-                write!(f, "Unexpected option {} for command {}", arg, cmd)
+                write!(f, "Unexpected option {arg} for command {cmd}")
             }
             ShellError::UnexpectedArg(cmd, arg) => {
-                write!(f, "Unexpected arg {} for command {}", arg, cmd)
+                write!(f, "Unexpected arg {arg} for command {cmd}")
             }
-            ShellError::MissingArg(cmd) => write!(f, "Missing arg for command {}", cmd),
+            ShellError::MissingArg(cmd) => write!(f, "Missing arg for command {cmd}"),
         }
     }
 }
@@ -321,7 +321,7 @@ fn update_changes(
             vfs.set_file_contents(vfs_path, None);
         } else {
             let contents =
-                fs::read(&path).unwrap_or_else(|_| panic!("Cannot read created file {:?}", path));
+                fs::read(&path).unwrap_or_else(|_| panic!("Cannot read created file {path:?}"));
             vfs.set_file_contents(vfs_path, Some(contents));
         }
     });
@@ -345,7 +345,7 @@ pub fn run_shell(shell: &Shell, cli: &mut dyn Cli, query_config: &BuckQueryConfi
     )?;
     let mut rl = rustyline::DefaultEditor::new()?;
     let mut last_read = watchman.get_clock()?;
-    write!(cli, "{}", WELCOME)?;
+    write!(cli, "{WELCOME}")?;
     loop {
         let readline = rl.readline("> ");
         match readline {
@@ -367,21 +367,21 @@ pub fn run_shell(shell: &Shell, cli: &mut dyn Cli, query_config: &BuckQueryConfi
                 last_read = update_changes(&mut loaded, &watchman, &last_read)?;
                 match ShellCommand::parse(shell, line) {
                     Ok(None) => (),
-                    Ok(Some(ShellCommand::Help)) => write!(cli, "{}", HELP)?,
+                    Ok(Some(ShellCommand::Help)) => write!(cli, "{HELP}")?,
                     Ok(Some(ShellCommand::Quit)) => break,
                     Ok(Some(ShellCommand::ShellEqwalize(eqwalize))) => {
                         eqwalizer_cli::do_eqwalize_module(&eqwalize, &mut loaded, cli)
-                            .or_else(|e| writeln!(cli, "Error: {}", e))?;
+                            .or_else(|e| writeln!(cli, "Error: {e}"))?;
                     }
                     Ok(Some(ShellCommand::ShellEqwalizeApp(eqwalize_app))) => {
                         eqwalizer_cli::do_eqwalize_app(&eqwalize_app, &mut loaded, cli)
-                            .or_else(|e| writeln!(cli, "Error: {}", e))?;
+                            .or_else(|e| writeln!(cli, "Error: {e}"))?;
                     }
                     Ok(Some(ShellCommand::ShellEqwalizeAll(eqwalize_all))) => {
                         eqwalizer_cli::do_eqwalize_all(&eqwalize_all, &mut loaded, cli)
-                            .or_else(|e| writeln!(cli, "Error: {}", e))?;
+                            .or_else(|e| writeln!(cli, "Error: {e}"))?;
                     }
-                    Err(err) => write!(cli, "{}\n{}", err, HELP)?,
+                    Err(err) => write!(cli, "{err}\n{HELP}")?,
                 }
             }
             Err(ReadlineError::Interrupted) => {
@@ -392,7 +392,7 @@ pub fn run_shell(shell: &Shell, cli: &mut dyn Cli, query_config: &BuckQueryConfi
                 break;
             }
             Err(err) => {
-                writeln!(cli, "Error: {:?}", err)?;
+                writeln!(cli, "Error: {err:?}")?;
                 break;
             }
         }
diff --git a/crates/elp/src/build/load.rs b/crates/elp/src/build/load.rs
index 3126a6f09f..a75349dce8 100644
--- a/crates/elp/src/build/load.rs
+++ b/crates/elp/src/build/load.rs
@@ -77,7 +77,7 @@ pub fn load_project_at(
         bail!("no projects")
     };
 
-    log::info!("Discovered project: {:?}", manifest);
+    log::info!("Discovered project: {manifest:?}");
     let pb = cli.spinner("Loading build info");
     let project = Project::load(
         &manifest,
diff --git a/crates/elp/src/config.rs b/crates/elp/src/config.rs
index 598bea9bd1..a631721a94 100644
--- a/crates/elp/src/config.rs
+++ b/crates/elp/src/config.rs
@@ -164,7 +164,7 @@ impl Config {
     }
 
     pub fn update(&mut self, json: serde_json::Value) {
-        log::info!("updating config from JSON: {:#}", json);
+        log::info!("updating config from JSON: {json:#}");
         if json.is_null() || json.as_object().is_some_and(|it| it.is_empty()) {
             return;
         }
@@ -173,13 +173,13 @@ impl Config {
     }
 
     pub fn update_gks(&mut self, json: serde_json::Value) {
-        log::info!("updating gks from JSON: {:#}", json);
+        log::info!("updating gks from JSON: {json:#}");
         if json.is_null() || json.as_object().is_some_and(|it| it.is_empty()) {
             return;
         }
         match from_json::<GKs>("GKs", json) {
             Ok(val) => self.gks = val,
-            Err(err) => log::warn!("could not update GKs from JSON: {:#}", err),
+            Err(err) => log::warn!("could not update GKs from JSON: {err:#}"),
         }
     }
 
@@ -465,7 +465,7 @@ fn schema(
         fn key(f: &str) -> &str {
             f.split_once('_').map_or(f, |x| x.0)
         }
-        assert!(key(f1) <= key(f2), "wrong field order: {:?} {:?}", f1, f2);
+        assert!(key(f1) <= key(f2), "wrong field order: {f1:?} {f2:?}");
     }
 
     let map = fields
@@ -490,9 +490,7 @@ fn field_props(
     let doc = doc.trim_end_matches('\n');
     assert!(
         doc.ends_with('.') && doc.starts_with(char::is_uppercase),
-        "bad docs for {}: {:?}",
-        field,
-        doc
+        "bad docs for {field}: {doc:?}"
     );
 
     let mut map = serde_json::Map::default();
@@ -541,7 +539,7 @@ fn field_props(
             "type": ["null", "array"],
             "items": { "type": "string" },
         },
-        _ => panic!("{}: {}", ty, default),
+        _ => panic!("{ty}: {default}"),
     }
 
     map.into()
@@ -551,14 +549,14 @@ fn doc_comment_to_string(doc: &[&str]) -> String {
     doc.iter()
         .map(|it| it.strip_prefix(' ').unwrap_or(it))
         .fold(String::new(), |mut output, it| {
-            let _ = writeln!(output, "{}", it);
+            let _ = writeln!(output, "{it}");
             output
         })
 }
 
 pub fn config_schema_json() -> String {
     let s = Config::json_schema();
-    let schema = format!("{:#}", s);
+    let schema = format!("{s:#}");
     let mut schema = schema
         .trim_start_matches('{')
         .trim_end_matches('}')
diff --git a/crates/elp/src/convert.rs b/crates/elp/src/convert.rs
index a70aeadfb0..1f42e6f454 100644
--- a/crates/elp/src/convert.rs
+++ b/crates/elp/src/convert.rs
@@ -138,7 +138,7 @@ pub fn eqwalizer_to_arc_diagnostic(
     };
     // formatting: https://fburl.com/max_wiki_link_to_phabricator_rich_text
     let explanation = match &d.explanation {
-        Some(s) => format!("```\n{}\n```", s),
+        Some(s) => format!("```\n{s}\n```"),
         None => "".to_string(),
     };
     let link = format!("> [docs on `{}`]({})", d.code, d.uri);
diff --git a/crates/elp/src/handlers.rs b/crates/elp/src/handlers.rs
index a429066ce4..707d392069 100644
--- a/crates/elp/src/handlers.rs
+++ b/crates/elp/src/handlers.rs
@@ -214,7 +214,7 @@ fn parse_action_id(action_id: &str) -> Result<(usize, SingleResolve), String> {
             let assist_kind: AssistKind = assist_kind_string.parse()?;
             let index: usize = match index_string.parse() {
                 Ok(index) => index,
-                Err(e) => return Err(format!("Incorrect index string: {}", e)),
+                Err(e) => return Err(format!("Incorrect index string: {e}")),
             };
             Ok((
                 index,
@@ -549,7 +549,7 @@ pub(crate) fn handle_hover(snap: Snapshot, params: HoverParams) -> Result<Option
         if let Some(type_info) = snap.analysis.type_at_position(query_range)? {
             let (ty, range) = &*type_info;
             let text = &snap.analysis.file_text(range.file_id)?[range.range];
-            let type_doc = Doc::new(format!("```erlang\n{} :: {}\n```\n", text, ty));
+            let type_doc = Doc::new(format!("```erlang\n{text} :: {ty}\n```\n"));
             docs.push((type_doc, Some(range.to_owned())));
             let refs = snap.analysis.type_references(range.file_id, ty)?;
             if !refs.is_empty() {
@@ -569,7 +569,7 @@ pub(crate) fn handle_hover(snap: Snapshot, params: HoverParams) -> Result<Option
                             .ok()
                     })
                     .join(" | ");
-                let goto_docs = Doc::new(format!("Go to: {}", goto_list));
+                let goto_docs = Doc::new(format!("Go to: {goto_list}"));
                 docs.push((goto_docs, None));
             }
         }
diff --git a/crates/elp/src/reload.rs b/crates/elp/src/reload.rs
index 8518eb0d36..aa87c27404 100644
--- a/crates/elp/src/reload.rs
+++ b/crates/elp/src/reload.rs
@@ -56,7 +56,7 @@ impl ProjectFolders {
             })
             .filter_map(|(project_id, root)| {
                 if Some(*project_id) != project_apps.otp_project_id {
-                    Some(format!("{}/**/*.{{e,h}}rl", root))
+                    Some(format!("{root}/**/*.{{e,h}}rl"))
                 } else {
                     None
                 }
diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index 972824d529..b20a7f8c30 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -435,7 +435,7 @@ impl Server {
     }
 
     fn handle_event(&mut self, event: Event) -> Result<()> {
-        log::info!("handle_event {:?}", event);
+        log::info!("handle_event {event:?}");
 
         match event {
             Event::Lsp(msg) => match msg {
@@ -550,7 +550,7 @@ impl Server {
         }
 
         if let Some(diagnostic_changes) = Arc::make_mut(&mut self.diagnostics).take_changes() {
-            log::info!("changed diagnostics: {:?}", diagnostic_changes);
+            log::info!("changed diagnostics: {diagnostic_changes:?}");
 
             let snapshot = self.snapshot();
             for file_id in &diagnostic_changes {
@@ -561,7 +561,7 @@ impl Server {
                         // We have had a cancellation (How?). Restore
                         // the list of files to be published, and try
                         // again next time around the loop
-                        log::warn!("Snapshot cancelled while publishing diagnostics: {}", err);
+                        log::warn!("Snapshot cancelled while publishing diagnostics: {err}");
                         Arc::make_mut(&mut self.diagnostics).return_changes(diagnostic_changes);
                         break;
                     }
@@ -706,7 +706,7 @@ impl Server {
                         .is_err();
                     if already_exists {
                         tracing::error!("duplicate DidOpenTextDocument: {}", path);
-                        log::error!("duplicate DidOpenTextDocument: {}", path);
+                        log::error!("duplicate DidOpenTextDocument: {path}");
                     }
 
                     let mut vfs = this.vfs.write();
@@ -762,7 +762,7 @@ impl Server {
                 if let Ok(path) = convert::vfs_path(&url) {
                     if this.mem_docs.write().remove(&path).is_err() {
                         tracing::error!("orphan DidCloseTextDocument: {}", path);
-                        log::error!("unexpected DidCloseTextDocument: {}", path);
+                        log::error!("unexpected DidCloseTextDocument: {path}");
                     }
 
                     if let Some(path) = path.as_path() {
@@ -1404,12 +1404,12 @@ impl Server {
                 }],
             },
             |this, resp| {
-                log::debug!("config update response: '{:?}", resp);
+                log::debug!("config update response: '{resp:?}");
                 let lsp_server::Response { error, result, .. } = resp;
 
                 match (error, result) {
                     (Some(err), _) => {
-                        log::error!("failed to fetch the server settings: {:?}", err)
+                        log::error!("failed to fetch the server settings: {err:?}")
                     }
                     (None, Some(mut configs)) => {
                         if let Some(json) = configs.get_mut(0) {
@@ -1445,7 +1445,7 @@ impl Server {
         if let Some((path, _)) = loader.project_roots.iter().find(|(_k, v)| v.is_some()) {
             let path_buf: PathBuf = path.clone().into();
             if let Ok(lint_config) = read_lint_config_file(&path_buf, &None) {
-                log::warn!("update_configuration: read lint file: {:?}", lint_config);
+                log::warn!("update_configuration: read lint file: {lint_config:?}");
                 self.lint_config = Arc::new(lint_config);
 
                 // Diagnostic config may have changed, regen
@@ -1557,7 +1557,7 @@ impl Server {
                     // We have set the panic context to include the
                     // message, no need to repeat here.
                     // This way we do not have to clone it on the send
-                    panic!("Could not send message, got: {}", err);
+                    panic!("Could not send message, got: {err}");
                 }
             }
         }
@@ -1620,11 +1620,7 @@ impl Server {
         let manifest = match main {
             Ok(main) => main,
             Err(err) => {
-                log::error!(
-                    "Failed to discover manifest for path: {:?}, error: {:?}",
-                    path,
-                    err
-                );
+                log::error!("Failed to discover manifest for path: {path:?}, error: {err:?}");
                 fallback_used = true;
                 errors.push((err.to_string(), None));
                 fallback.clone()
@@ -1639,11 +1635,7 @@ impl Server {
             &|message| spinner.report(message.to_string()),
         );
         if let Err(err) = &project {
-            log::error!(
-                "Failed to load project for manifest {:?}, error: {:?}",
-                manifest,
-                err
-            );
+            log::error!("Failed to load project for manifest {manifest:?}, error: {err:?}");
             match err.downcast_ref::<BuckQueryError>() {
                 Some(e) => {
                     errors.push((
@@ -1663,9 +1655,7 @@ impl Server {
                     });
                 if let Err(err) = &project {
                     log::error!(
-                        "Failed to load project for fallback manifest {:?}, error: {:?}",
-                        manifest,
-                        err
+                        "Failed to load project for fallback manifest {manifest:?}, error: {err:?}"
                     );
                     errors.push((err.to_string(), None));
                 }
@@ -1721,7 +1711,7 @@ impl Server {
                 };
 
                 log::info!("did fetch project");
-                log::debug!("fetched projects {:?}", project);
+                log::debug!("fetched projects {project:?}");
                 if let Ok(project) = project {
                     sender
                         .send(Task::FetchProject(spinner, vec![project]))
@@ -1779,7 +1769,7 @@ impl Server {
                 },
                 |_, rsp| {
                     if rsp.error.is_some() {
-                        log::warn!("Dynamic registration failed, got {:?}", rsp);
+                        log::warn!("Dynamic registration failed, got {rsp:?}");
                     }
                     Ok(())
                 },
@@ -1865,7 +1855,7 @@ impl Server {
             Some(project) => project.name(),
             None => "undefined".to_string(),
         };
-        let message = format!("Eqwalize All ({})", project_name);
+        let message = format!("Eqwalize All ({project_name})");
         let bar = self.progress.begin_bar(message, None);
 
         self.eqwalizer_pool.handle.spawn_with_sender(move |sender| {
@@ -1975,11 +1965,9 @@ impl Server {
     fn on_telemetry(&mut self, message: TelemetryMessage) {
         match serde_json::to_value(message.clone()) {
             Ok(params) => self.send_notification::<lsp_types::notification::TelemetryEvent>(params),
-            Err(err) => log::warn!(
-                "Error serializing telemetry. message: {:?} error: {}",
-                message,
-                err
-            ),
+            Err(err) => {
+                log::warn!("Error serializing telemetry. message: {message:?} error: {err}")
+            }
         }
     }
 
diff --git a/crates/elp/src/server/dispatch.rs b/crates/elp/src/server/dispatch.rs
index 12b0425216..033249062a 100644
--- a/crates/elp/src/server/dispatch.rs
+++ b/crates/elp/src/server/dispatch.rs
@@ -249,7 +249,7 @@ impl<'a, S, R> NotificationDispatcher<'a, S, R> {
 
     pub fn finish(self) {
         if let Some(notif) = self.notif {
-            log::error!("unhandled notification: {:?}", notif);
+            log::error!("unhandled notification: {notif:?}");
         }
     }
 }
diff --git a/crates/elp/src/server/progress.rs b/crates/elp/src/server/progress.rs
index 1491ceb75e..3fe2e96d3b 100644
--- a/crates/elp/src/server/progress.rs
+++ b/crates/elp/src/server/progress.rs
@@ -202,7 +202,7 @@ impl ProgressBar {
     pub fn report(&self, done: usize, total: usize) {
         let percent_f = done as f64 / total.max(1) as f64;
         let percent = (percent_f * 100.0) as u32;
-        let message = format!("{}%", percent);
+        let message = format!("{percent}%");
         let msg = WorkDoneProgress::Report(WorkDoneProgressReport {
             cancellable: None,
             message: Some(message),
@@ -245,6 +245,6 @@ fn send_progress(sender: &Sender<ProgressTask>, token: NumberOrString, msg: Work
         value: ProgressParamsValue::WorkDone(msg),
     };
     if let Err(SendError(err)) = sender.send(ProgressTask::Notify(params)) {
-        log::error!("Failed to send progress message: {:?}", err);
+        log::error!("Failed to send progress message: {err:?}");
     }
 }
diff --git a/crates/elp/src/server/setup.rs b/crates/elp/src/server/setup.rs
index 397b6d06f0..6dade5c677 100644
--- a/crates/elp/src/server/setup.rs
+++ b/crates/elp/src/server/setup.rs
@@ -78,10 +78,10 @@ impl ServerSetup {
 
         self.connection
             .initialize_finish(id, serde_json::to_value(result.clone()).unwrap())
-            .with_context(|| format!("during initialization finish: {:?}", result))?;
+            .with_context(|| format!("during initialization finish: {result:?}"))?;
 
         let otp_details =
-            Otp::system_version().unwrap_or_else(|err| format!("Could not find OTP: {}", err));
+            Otp::system_version().unwrap_or_else(|err| format!("Could not find OTP: {err}"));
         let message = format!(
             "ELP version: {}, OTP version: {}",
             crate::version(),
@@ -152,7 +152,7 @@ pub fn setup_server(config: Config, connection: Connection, logger: Logger) -> R
     let cache_pool = set_up_single_thread_pool();
     let eqwalizer_pool = set_up_eqwalizer_pool();
     let project_pool = set_up_single_thread_pool();
-    log::debug!("initial state: {:#?}", config);
+    log::debug!("initial state: {config:#?}");
 
     Ok(Server::new(
         connection,
diff --git a/crates/elp/src/server/telemetry_manager.rs b/crates/elp/src/server/telemetry_manager.rs
index 0f8661abec..e8a54309a4 100644
--- a/crates/elp/src/server/telemetry_manager.rs
+++ b/crates/elp/src/server/telemetry_manager.rs
@@ -60,11 +60,7 @@ impl TelemetryManager {
                     telemetry::send("periodic_memory_stats".to_string(), mem_usage_value);
                 }
                 Err(err) => {
-                    log::warn!(
-                        "on_periodic: unable to serialize {:?}, err: {}",
-                        mem_usage,
-                        err
-                    );
+                    log::warn!("on_periodic: unable to serialize {mem_usage:?}, err: {err}");
                 }
             };
         }
diff --git a/crates/elp/src/snapshot.rs b/crates/elp/src/snapshot.rs
index cccaffe2f8..d1fba2859a 100644
--- a/crates/elp/src/snapshot.rs
+++ b/crates/elp/src/snapshot.rs
@@ -61,29 +61,28 @@ impl fmt::Display for TelemetryData {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
             TelemetryData::NativeDiagnostics { file_url } => {
-                write!(f, "Native Diagnostics file_url: {}", file_url)
+                write!(f, "Native Diagnostics file_url: {file_url}")
             }
             TelemetryData::EqwalizerDiagnostics { file_url } => {
-                write!(f, "Eqwalizer Diagnostics file_url: {}", file_url)
+                write!(f, "Eqwalizer Diagnostics file_url: {file_url}")
             }
             TelemetryData::EqwalizerProjectDiagnostics { project_name } => {
                 write!(
                     f,
-                    "Eqwalizer Project Diagnostics project_name: {}",
-                    project_name
+                    "Eqwalizer Project Diagnostics project_name: {project_name}"
                 )
             }
             TelemetryData::ParseServerDiagnostics { file_url } => {
-                write!(f, "Parse Server Diagnostics file_url: {}", file_url)
+                write!(f, "Parse Server Diagnostics file_url: {file_url}")
             }
             TelemetryData::EdocDiagnostics { file_url } => {
-                write!(f, "EDoc Diagnostics file_url: {}", file_url)
+                write!(f, "EDoc Diagnostics file_url: {file_url}")
             }
             TelemetryData::MetaDiagnostics { file_url } => {
-                write!(f, "Meta Diagnostics file_url: {}", file_url)
+                write!(f, "Meta Diagnostics file_url: {file_url}")
             }
             TelemetryData::CommonTestDiagnostics { file_url } => {
-                write!(f, "CT Diagnostics file_url: {}", file_url)
+                write!(f, "CT Diagnostics file_url: {file_url}")
             }
             TelemetryData::Initialize => {
                 write!(f, "Initialize")
@@ -142,7 +141,7 @@ impl Snapshot {
         let vfs = self.vfs.read();
         let (res, _) = vfs
             .file_id(&path)
-            .context(format!("file not found: {}", path))?;
+            .context(format!("file not found: {path}"))?;
         Ok(res)
     }
 
diff --git a/crates/elp/tests/slow-tests/support.rs b/crates/elp/tests/slow-tests/support.rs
index af1e1137da..bf482a7816 100644
--- a/crates/elp/tests/slow-tests/support.rs
+++ b/crates/elp/tests/slow-tests/support.rs
@@ -271,7 +271,7 @@ impl TestServer {
         self.client.sender.send(r.clone().into()).unwrap();
         while let Some(msg) = self
             .recv()
-            .unwrap_or_else(|Timeout| panic!("timeout waiting for response to request: {:?}", r))
+            .unwrap_or_else(|Timeout| panic!("timeout waiting for response to request: {r:?}"))
         {
             match msg {
                 Message::Request(req) => {
@@ -293,18 +293,18 @@ impl TestServer {
                         if err.code == ErrorCode::ContentModified as i32 {
                             // "elp still loading".
                             // wait for notification before sending first request.
-                            log::error!("response: {:#?}", err);
+                            log::error!("response: {err:#?}");
                             std::thread::sleep(std::time::Duration::from_millis(100));
                             continue;
                         } else {
-                            panic!("error response: {:#?}", err);
+                            panic!("error response: {err:#?}");
                         }
                     }
                     return res.result.unwrap();
                 }
             }
         }
-        panic!("no response for {:?}", r);
+        panic!("no response for {r:?}");
     }
 
     pub(crate) fn wait_until_workspace_is_loaded(&self) {
@@ -320,7 +320,7 @@ impl TestServer {
                 // Filter our other requests such as "client/registerCapability"
                 Message::Request(_req) => {}
                 Message::Response(res) => {
-                    panic!("No request sent, didn't expect response: {:#?}", res);
+                    panic!("No request sent, didn't expect response: {res:#?}");
                 }
                 Message::Notification(notif) => match notif.method.as_str() {
                     "elp/status" => {
@@ -330,13 +330,13 @@ impl TestServer {
                         }
                     }
                     "textDocument/publishDiagnostics" | "$/progress" => {
-                        log::info!("======{:#?}", notif);
+                        log::info!("======{notif:#?}");
                     }
                     "telemetry/event" => {
-                        log::info!("------{:#?}", notif);
+                        log::info!("------{notif:#?}");
                     }
                     _ => {
-                        panic!("{:#?}", notif);
+                        panic!("{notif:#?}");
                     }
                 },
             }
@@ -354,7 +354,7 @@ impl TestServer {
                 // Filter our other requests such as "client/registerCapability"
                 Message::Request(_req) => {}
                 Message::Response(res) => {
-                    panic!("No request sent, didn't expect response: {:#?}", res);
+                    panic!("No request sent, didn't expect response: {res:#?}");
                 }
                 Message::Notification(notif) => {
                     match notif.method.as_str() {
@@ -368,7 +368,7 @@ impl TestServer {
                                 match diagnostics {
                                     Value::Array(_) => return notif.params,
                                     _ => {
-                                        panic!("Unexpected diagnostic format: {:#?}", diagnostics)
+                                        panic!("Unexpected diagnostic format: {diagnostics:#?}")
                                     }
                                 }
                             }
diff --git a/crates/elp_log/src/file.rs b/crates/elp_log/src/file.rs
index 96dc21aae4..1c4b450fa4 100644
--- a/crates/elp_log/src/file.rs
+++ b/crates/elp_log/src/file.rs
@@ -84,11 +84,11 @@ impl ReconfigureLog for FileLogger {
         );
         let should_flush = match &self.file {
             Some(w) => {
-                let _ = writeln!(w.lock(), "{}", formatted);
+                let _ = writeln!(w.lock(), "{formatted}");
                 self.no_buffering
             }
             None => {
-                eprintln!("{}", formatted);
+                eprintln!("{formatted}");
                 true // flush stderr unconditionally
             }
         };
diff --git a/crates/eqwalizer/build.rs b/crates/eqwalizer/build.rs
index c101542925..f7e9a0acaa 100644
--- a/crates/eqwalizer/build.rs
+++ b/crates/eqwalizer/build.rs
@@ -45,10 +45,7 @@ fn main() {
                 String::from_utf8(output.stdout).expect("valid utf8 output from sbt assembly");
             let stderr =
                 String::from_utf8(output.stderr).expect("valid utf8 output from sbt assembly");
-            panic!(
-                "sbt assembly failed with stdout:\n{}\n\nstderr:\n{}",
-                stdout, stderr
-            );
+            panic!("sbt assembly failed with stdout:\n{stdout}\n\nstderr:\n{stderr}");
         }
 
         let jar = fs::canonicalize(eqwalizer_out_dir.join("eqwalizer.jar")).unwrap();
@@ -74,10 +71,7 @@ fn main() {
                 String::from_utf8(output.stdout).expect("valid utf8 output from native-image");
             let stderr =
                 String::from_utf8(output.stderr).expect("valid utf8 output from native-image");
-            panic!(
-                "native-image failed with stdout:\n{}\n\nstderr:\n{}",
-                stdout, stderr
-            );
+            panic!("native-image failed with stdout:\n{stdout}\n\nstderr:\n{stderr}");
         }
 
         fs::copy(image_path, dest_path).expect("Copying fresh eqwalizer failed");
@@ -86,7 +80,7 @@ fn main() {
         rerun_if_changed(source_directory.join("src"));
     }
 
-    println!("cargo:rustc-env=ELP_EQWALIZER_EXT={}", extension);
+    println!("cargo:rustc-env=ELP_EQWALIZER_EXT={extension}");
     println!("cargo:rerun-if-env-changed=ELP_EQWALIZER_PATH");
 }
 
diff --git a/crates/eqwalizer/src/ast/mod.rs b/crates/eqwalizer/src/ast/mod.rs
index 0eb8a59e1f..513ff924f1 100644
--- a/crates/eqwalizer/src/ast/mod.rs
+++ b/crates/eqwalizer/src/ast/mod.rs
@@ -70,11 +70,11 @@ impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let message: String = match self {
             Error::DecodeError(msg) => {
-                format!("EETF decoding failed with {}", msg)
+                format!("EETF decoding failed with {msg}")
             }
-            err => format!("{:?}", err),
+            err => format!("{err:?}"),
         };
-        write!(f, "eqWAlizer error:\n{}", message)
+        write!(f, "eqWAlizer error:\n{message}")
     }
 }
 
@@ -123,13 +123,13 @@ impl fmt::Display for ConversionError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let message: String = match self {
             ConversionError::UnknownBuiltin(name, arity) => {
-                format!("unknown builtin {}/{}", name, arity)
+                format!("unknown builtin {name}/{arity}")
             }
             // All other cases are variants without parameters,
             // printing their name is enough info to debug
-            err => format!("{:?}", err),
+            err => format!("{err:?}"),
         };
-        write!(f, "eqWAlizer AST conversion failed with {}", message)
+        write!(f, "eqWAlizer AST conversion failed with {message}")
     }
 }
 
@@ -148,11 +148,11 @@ impl fmt::Display for TypeConversionError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let message: String = match self {
             TypeConversionError::UnknownBuiltin(name, arity) => {
-                format!("unknown builtin {}/{}", name, arity)
+                format!("unknown builtin {name}/{arity}")
             }
-            err => format!("{:?}", err),
+            err => format!("{err:?}"),
         };
-        write!(f, "eqWAlizer stub expansion failed with {}", message)
+        write!(f, "eqWAlizer stub expansion failed with {message}")
     }
 }
 
diff --git a/crates/eqwalizer/src/ast/preprocess.rs b/crates/eqwalizer/src/ast/preprocess.rs
index 4570574e1b..a36892b27f 100644
--- a/crates/eqwalizer/src/ast/preprocess.rs
+++ b/crates/eqwalizer/src/ast/preprocess.rs
@@ -135,7 +135,7 @@ impl Preprocessor {
     fn fresh_var(&mut self) -> StringId {
         let var = self.var;
         self.var += 1;
-        format!("$pp{}", var).into()
+        format!("$pp{var}").into()
     }
 
     fn eta_expand_unary_predicate(&mut self, location: &Pos, name: StringId) -> Lambda {
diff --git a/crates/eqwalizer/src/ast/trans_valid.rs b/crates/eqwalizer/src/ast/trans_valid.rs
index 376176919c..023d199453 100644
--- a/crates/eqwalizer/src/ast/trans_valid.rs
+++ b/crates/eqwalizer/src/ast/trans_valid.rs
@@ -323,7 +323,7 @@ impl TransitiveChecker<'_> {
             .to_string()
             .into(),
             Ref::RidRef(rid) => rid.to_string().into(),
-            Ref::RecRef(_, name) => format!("#{}{{}}", name).into(),
+            Ref::RecRef(_, name) => format!("#{name}{{}}").into(),
         }
     }
 
diff --git a/crates/eqwalizer/src/db.rs b/crates/eqwalizer/src/db.rs
index 316b697221..b85dcaf1a1 100644
--- a/crates/eqwalizer/src/db.rs
+++ b/crates/eqwalizer/src/db.rs
@@ -220,8 +220,7 @@ fn module_diagnostics(
         Ok(diag) => (Arc::new(diag), timestamp),
         Err(err) => (
             Arc::new(EqwalizerDiagnostics::Error(format!(
-                "eqWAlizing module {}:\n{}",
-                module, err
+                "eqWAlizing module {module}:\n{err}"
             ))),
             timestamp,
         ),
diff --git a/crates/eqwalizer/src/ipc.rs b/crates/eqwalizer/src/ipc.rs
index 60b1fddc24..46cc0ac677 100644
--- a/crates/eqwalizer/src/ipc.rs
+++ b/crates/eqwalizer/src/ipc.rs
@@ -188,10 +188,10 @@ impl IpcHandle {
 
     pub fn send(&mut self, msg: &MsgToEqWAlizer) -> Result<()> {
         let msg = serde_json::to_string(msg).expect("failed to serialize msg to eqwalizer");
-        writeln!(self.writer, "{}", msg).with_context(|| format!("writing message: {:?}", msg))?;
+        writeln!(self.writer, "{msg}").with_context(|| format!("writing message: {msg:?}"))?;
         self.writer
             .flush()
-            .with_context(|| format!("flushing message: {:?}", msg))?;
+            .with_context(|| format!("flushing message: {msg:?}"))?;
         Ok(())
     }
 
diff --git a/crates/eqwalizer/src/lib.rs b/crates/eqwalizer/src/lib.rs
index 155878e822..7a79e35e1e 100644
--- a/crates/eqwalizer/src/lib.rs
+++ b/crates/eqwalizer/src/lib.rs
@@ -214,7 +214,7 @@ impl EqwalizerExe {
                 vec!["-Xss20M".into(), "-jar".into(), path.into()],
             ),
             "" => (path, vec![]),
-            _ => panic!("Unknown eqwalizer executable {:?}", path),
+            _ => panic!("Unknown eqwalizer executable {path:?}"),
         };
 
         Self {
@@ -256,7 +256,7 @@ impl Eqwalizer {
 
         match do_typecheck(cmd, db, project_id) {
             Ok(diags) => diags,
-            Err(err) => EqwalizerDiagnostics::Error(format!("{:?}", err)),
+            Err(err) => EqwalizerDiagnostics::Error(format!("{err:?}")),
         }
     }
 }
@@ -270,7 +270,7 @@ fn do_typecheck(
     db.report_untracked_read();
     let handle = Arc::new(Mutex::new(
         IpcHandle::from_command(&mut cmd)
-            .with_context(|| format!("starting eqWAlizer process: {:?}", cmd))?,
+            .with_context(|| format!("starting eqWAlizer process: {cmd:?}"))?,
     ));
     let mut diagnostics = EqwalizerDiagnostics::default();
     loop {
@@ -297,7 +297,7 @@ fn do_typecheck(
             msg => {
                 log::warn!(
                     "received unexpected message from eqwalizer, ignoring: {}",
-                    limit_logged_string(&format!("{:?}", msg))
+                    limit_logged_string(&format!("{msg:?}"))
                 )
             }
         }
@@ -312,8 +312,7 @@ fn get_module_diagnostics(
     let handle_mutex = db
         .module_ipc_handle(ModuleName::new(&module))
         .ok_or(anyhow::Error::msg(format!(
-            "no eqWAlizer handle for module {}",
-            module
+            "no eqWAlizer handle for module {module}"
         )))?;
     let mut handle = handle_mutex.lock();
     handle.send(&MsgToEqWAlizer::ELPEnteringModule)?;
@@ -322,9 +321,7 @@ fn get_module_diagnostics(
         match handle.receive()? {
             MsgFromEqWAlizer::GetAstBytes { module, format } => {
                 log::debug!(
-                    "received from eqwalizer: GetAstBytes for module {} (format = {:?})",
-                    module,
-                    format
+                    "received from eqwalizer: GetAstBytes for module {module} (format = {format:?})"
                 );
                 let module_name = ModuleName::new(&module);
                 let ast = {
@@ -339,25 +336,20 @@ fn get_module_diagnostics(
                 };
                 match ast {
                     Ok(ast_bytes) => {
-                        log::debug!(
-                            "sending to eqwalizer: GetAstBytesReply for module {}",
-                            module
-                        );
+                        log::debug!("sending to eqwalizer: GetAstBytesReply for module {module}");
                         let len = ast_bytes.len().try_into()?;
                         let reply = &MsgToEqWAlizer::GetAstBytesReply { len };
                         handle.send(reply)?;
                         handle.receive_newline()?;
                         handle.send_bytes(&ast_bytes).with_context(|| {
                             format!(
-                                "sending to eqwalizer: bytes for module {} (format = {:?})",
-                                module, format
+                                "sending to eqwalizer: bytes for module {module} (format = {format:?})"
                             )
                         })?;
                     }
                     Err(Error::ModuleNotFound(_)) => {
                         log::debug!(
-                            "module not found, sending to eqwalizer: empty GetAstBytesReply for module {}",
-                            module
+                            "module not found, sending to eqwalizer: empty GetAstBytesReply for module {module}"
                         );
                         let len = 0;
                         let reply = &MsgToEqWAlizer::GetAstBytesReply { len };
@@ -366,8 +358,7 @@ fn get_module_diagnostics(
                     }
                     Err(Error::ParseError) => {
                         log::debug!(
-                            "parse error, sending to eqwalizer: CannotCompleteRequest for module {}",
-                            module
+                            "parse error, sending to eqwalizer: CannotCompleteRequest for module {module}"
                         );
                         let reply = &MsgToEqWAlizer::CannotCompleteRequest;
                         handle.send(reply)?;
@@ -375,9 +366,7 @@ fn get_module_diagnostics(
                     }
                     Err(err) => {
                         log::debug!(
-                            "error {} sending to eqwalizer: CannotCompleteRequest for module {}",
-                            err,
-                            module
+                            "error {err} sending to eqwalizer: CannotCompleteRequest for module {module}"
                         );
                         let reply = &MsgToEqWAlizer::CannotCompleteRequest;
                         handle.send(reply)?;
@@ -483,7 +472,7 @@ fn get_module_diagnostics(
             msg => {
                 log::warn!(
                     "received unexpected message from eqwalizer, ignoring: {}",
-                    limit_logged_string(&format!("{:?}", msg))
+                    limit_logged_string(&format!("{msg:?}"))
                 )
             }
         }
diff --git a/crates/erlang_service/build.rs b/crates/erlang_service/build.rs
index a9e8219534..c94331e07e 100644
--- a/crates/erlang_service/build.rs
+++ b/crates/erlang_service/build.rs
@@ -37,17 +37,14 @@ fn main() {
                 String::from_utf8(output.stdout).expect("valid utf8 output from rebar3 escriptize");
             let stderr =
                 String::from_utf8(output.stderr).expect("valid utf8 output from rebar3 escriptize");
-            panic!(
-                "rebar3 escriptize failed with stdout:\n{}\n\nstderr:\n{}",
-                stdout, stderr
-            );
+            panic!("rebar3 escriptize failed with stdout:\n{stdout}\n\nstderr:\n{stderr}");
         }
 
         let source = dest_dir.join(profile).join("bin").join("erlang_service");
         fs::copy(source, dest_dir.join("erlang_service")).unwrap();
 
-        println!("cargo:rerun-if-changed={}/rebar.config", source_directory);
-        println!("cargo:rerun-if-changed={}/src", source_directory);
+        println!("cargo:rerun-if-changed={source_directory}/rebar.config");
+        println!("cargo:rerun-if-changed={source_directory}/src");
     }
 
     println!("cargo:rerun-if-env-changed=ELP_PARSE_SERVER_ESCRIPT_PATH");
diff --git a/crates/erlang_service/src/common_test.rs b/crates/erlang_service/src/common_test.rs
index 5cc89ecbaf..d04f3fbf6b 100644
--- a/crates/erlang_service/src/common_test.rs
+++ b/crates/erlang_service/src/common_test.rs
@@ -39,7 +39,7 @@ pub enum ConversionError {
 
 impl fmt::Display for ConversionError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "Common Test conversion failed with {:?}", self)
+        write!(f, "Common Test conversion failed with {self:?}")
     }
 }
 
diff --git a/crates/erlang_service/src/lib.rs b/crates/erlang_service/src/lib.rs
index a35ad077ec..705304ab4f 100644
--- a/crates/erlang_service/src/lib.rs
+++ b/crates/erlang_service/src/lib.rs
@@ -347,10 +347,7 @@ impl Connection {
 
     fn request_reply(&self, tag: Tag, request: Vec<u8>, unwind: impl Fn()) -> Response {
         self.request_reply_handle(tag, request, unwind, |callback| {
-            panic!(
-                "Got unexpected callback processing {:?}: {:?}",
-                tag, callback
-            );
+            panic!("Got unexpected callback processing {tag:?}: {callback:?}");
         })
     }
 
@@ -381,7 +378,7 @@ impl Connection {
                             self.sender.send(request).unwrap();
                         }
                         Err(err) => {
-                            log::warn!("handle_callback gave err: {}, for {}", err, id);
+                            log::warn!("handle_callback gave err: {err}, for {id}");
                             // We must always reply, else the erlang side hangs
                             self.sender
                                 .send((
@@ -424,7 +421,7 @@ impl Connection {
                     b"AST" => ast = data,
                     b"WAR" => warnings = data,
                     b"ERR" => errors = data,
-                    _ => log::error!("unrecognised segment {:?}", tag),
+                    _ => log::error!("unrecognised segment {tag:?}"),
                 };
                 Ok(())
             })
@@ -439,7 +436,7 @@ impl Connection {
                 ParseResult::error(ParseError {
                     path,
                     location: None,
-                    msg: format!("Could not parse, error: {}", error),
+                    msg: format!("Could not parse, error: {error}"),
                     code: "L0002".to_string(),
                 })
             })
@@ -552,7 +549,7 @@ impl Connection {
                             log::error!("Could not capture in EDOC_DIAGNOSTICS: {text}");
                         }
                     }
-                    _ => log::error!("Unrecognised segment: {:?}", segment),
+                    _ => log::error!("Unrecognised segment: {segment:?}"),
                 };
                 Ok(())
             })
@@ -563,15 +560,8 @@ impl Connection {
                 diagnostics,
             })
             .map_err(|error| {
-                log::error!(
-                    "Erlang service crashed for: {:?}, error: {:?}",
-                    request,
-                    error
-                );
-                format!(
-                    "Erlang service crash when trying to load docs: {:?}",
-                    request
-                )
+                log::error!("Erlang service crashed for: {request:?}, error: {error:?}");
+                format!("Erlang service crash when trying to load docs: {request:?}")
             })
     }
 
@@ -593,7 +583,7 @@ impl Connection {
                 match segment {
                     b"ALL" => all = data,
                     b"GRP" => groups = data,
-                    _ => log::error!("Unrecognised segment: {:?}", segment),
+                    _ => log::error!("Unrecognised segment: {segment:?}"),
                 };
                 Ok(())
             })
@@ -604,8 +594,8 @@ impl Connection {
                 })
             })
             .map_err(|error| {
-                log::warn!("Failed to fetch CT Info for {:?}: {:?}", module, error);
-                format!("Failed to fetch CT Info for {:?}", module)
+                log::warn!("Failed to fetch CT Info for {module:?}: {error:?}");
+                format!("Failed to fetch CT Info for {module:?}")
             })
     }
 
@@ -633,7 +623,7 @@ fn stdio_transport(proc: &mut Child) -> (Sender<Request>, JoinHandle, JoinHandle
         let inflight = inflight.clone();
         move || match writer_run(writer_receiver, instream, inflight) {
             Result::Ok(()) => {}
-            Err(err) => log::error!("writer failed with {}", err),
+            Err(err) => log::error!("writer failed with {err}"),
         }
     });
 
@@ -644,11 +634,7 @@ fn stdio_transport(proc: &mut Child) -> (Sender<Request>, JoinHandle, JoinHandle
                 let mut buf = vec![0; 512];
                 let _ = outstream.read(&mut buf);
                 let remaining = String::from_utf8_lossy(&buf);
-                log::error!(
-                    "reader failed with {:?}\nremaining data:\n\n{}",
-                    err,
-                    remaining
-                );
+                log::error!("reader failed with {err:?}\nremaining data:\n\n{remaining}");
             }
         }
     });
@@ -679,7 +665,7 @@ fn reader_run(
             inflight.lock().remove(&id)
         };
         if let Err(err) = sender.expect("unexpected callback id").send(response) {
-            log::info!("Got response {}, but request was canceled: {}", id, err);
+            log::info!("Got response {id}, but request was canceled: {err}");
         };
     }
 }
@@ -786,11 +772,7 @@ fn safe_textrange(start: TextSize, end: TextSize) -> TextRange {
     if start <= end {
         TextRange::new(start, end)
     } else {
-        log::warn!(
-            "Bad diagnostic range from erlang_service: ({:?},{:?})",
-            start,
-            end
-        );
+        log::warn!("Bad diagnostic range from erlang_service: ({start:?},{end:?})");
         TextRange::new(end, start)
     }
 }
diff --git a/crates/hir/src/body.rs b/crates/hir/src/body.rs
index 6545326604..c5b1900ef3 100644
--- a/crates/hir/src/body.rs
+++ b/crates/hir/src/body.rs
@@ -1299,7 +1299,7 @@ mod local_tests {
             if valid {
                 debug_assert_eq!(val, ast_found);
             } else {
-                panic!("expected invalid path, found {:?}", ast_found);
+                panic!("expected invalid path, found {ast_found:?}");
             }
         } else if valid {
             panic!("expected valid path, nothing found");
diff --git a/crates/hir/src/body/pretty.rs b/crates/hir/src/body/pretty.rs
index 3b41877837..fae31c3b0a 100644
--- a/crates/hir/src/body/pretty.rs
+++ b/crates/hir/src/body/pretty.rs
@@ -58,7 +58,7 @@ pub fn print_function_clause(
 
     let mut sep = "";
     for (_idx, clause) in body.clauses.iter() {
-        write!(out, "{}", sep).unwrap();
+        write!(out, "{sep}").unwrap();
         sep = ";";
         let mut printer = Printer::new(db, &clause.body);
         printer
@@ -106,7 +106,7 @@ pub fn print_spec(db: &dyn InternDatabase, body: &SpecBody, form: SpecOrCallback
 
     let mut sep = "";
     for sig in &body.sigs {
-        write!(printer, "{}", sep).unwrap();
+        write!(printer, "{sep}").unwrap();
         sep = ";\n";
         printer.print_sig(sig).unwrap();
     }
@@ -129,7 +129,7 @@ pub fn print_record(
 
     let mut sep = "\n";
     for field in &body.fields {
-        write!(printer, "{}", sep).unwrap();
+        write!(printer, "{sep}").unwrap();
         sep = ",\n";
         printer.print_field(field, form_list).unwrap();
     }
@@ -221,10 +221,10 @@ impl<'a> Printer<'a> {
     }
 
     fn print_clause(&mut self, clause: &Clause, name: &str) -> fmt::Result {
-        write!(self, "{}(", name)?;
+        write!(self, "{name}(")?;
         let mut sep = "";
         for pat in clause.pats.iter().map(|pat_id| &self.body[*pat_id]) {
-            write!(self, "{}", sep)?;
+            write!(self, "{sep}")?;
             sep = ", ";
             self.print_pat(pat)?;
         }
@@ -273,14 +273,14 @@ impl<'a> Printer<'a> {
                 self.print_pat(&self.body[*rhs])
             }
             Pat::UnaryOp { pat, op } => {
-                write!(self, "({} ", op)?;
+                write!(self, "({op} ")?;
                 self.print_pat(&self.body[*pat])?;
                 write!(self, ")")
             }
             Pat::BinaryOp { lhs, rhs, op } => {
                 write!(self, "(")?;
                 self.print_pat(&self.body[*lhs])?;
-                write!(self, " {} ", op)?;
+                write!(self, " {op} ")?;
                 self.print_pat(&self.body[*rhs])?;
                 write!(self, ")")
             }
@@ -328,11 +328,11 @@ impl<'a> Printer<'a> {
             }
             let mut sep = "";
             for guard_clause in guards {
-                write!(self, "{}", sep)?;
+                write!(self, "{sep}")?;
                 sep = ";\n";
                 let mut sep = "";
                 for expr in guard_clause {
-                    write!(self, "{}", sep)?;
+                    write!(self, "{sep}")?;
                     sep = ",\n";
                     self.print_expr(&self.body[*expr])?;
                 }
@@ -352,11 +352,11 @@ impl<'a> Printer<'a> {
         if !guards.is_empty() {
             let mut sep = "";
             for guard_clause in guards {
-                write!(self, "{}", sep)?;
+                write!(self, "{sep}")?;
                 sep = ";\n";
                 let mut sep = "";
                 for expr in guard_clause {
-                    write!(self, "{}", sep)?;
+                    write!(self, "{sep}")?;
                     sep = ",\n";
                     self.print_expr(&self.body[*expr])?;
                 }
@@ -384,7 +384,7 @@ impl<'a> Printer<'a> {
         self.indent_level += 1;
         let mut sep = "";
         for expr_id in exprs {
-            writeln!(self, "{}", sep)?;
+            writeln!(self, "{sep}")?;
             sep = ",";
             self.print_expr(&self.body[*expr_id])?;
         }
@@ -411,14 +411,14 @@ impl<'a> Printer<'a> {
                 self.print_expr(&self.body[*rhs])
             }
             Expr::UnaryOp { expr, op } => {
-                write!(self, "({} ", op)?;
+                write!(self, "({op} ")?;
                 self.print_expr(&self.body[*expr])?;
                 write!(self, ")")
             }
             Expr::BinaryOp { lhs, rhs, op } => {
                 write!(self, "(")?;
                 self.print_expr(&self.body[*lhs])?;
-                write!(self, " {} ", op)?;
+                write!(self, " {op} ")?;
                 self.print_expr(&self.body[*rhs])?;
                 write!(self, ")")
             }
@@ -433,7 +433,7 @@ impl<'a> Printer<'a> {
                 self.print_expr(&self.body[*expr])?;
                 self.print_seq(fields, None, "#{", "}", ",", |this, (key, op, value)| {
                     this.print_expr(&this.body[*key])?;
-                    write!(this, " {} ", op)?;
+                    write!(this, " {op} ")?;
                     this.print_expr(&this.body[*value])
                 })
             }
@@ -575,7 +575,7 @@ impl<'a> Printer<'a> {
                     ComprehensionBuilder::Binary(_) => ("<<", ">>"),
                     ComprehensionBuilder::Map(_, _) => ("#{", "}"),
                 };
-                writeln!(self, "{}", start)?;
+                writeln!(self, "{start}")?;
                 self.indent_level += 1;
                 match builder {
                     ComprehensionBuilder::List(expr) => self.print_expr(&self.body[*expr])?,
@@ -707,7 +707,7 @@ impl<'a> Printer<'a> {
             TypeExpr::Map { fields } => {
                 self.print_seq(fields, None, "#{", "}", ",", |this, (key, op, value)| {
                     this.print_type(&this.body[*key])?;
-                    write!(this, " {} ", op)?;
+                    write!(this, " {op} ")?;
                     this.print_type(&this.body[*value])
                 })
             }
@@ -735,7 +735,7 @@ impl<'a> Printer<'a> {
                 write!(self, ")")
             }
             TypeExpr::UnaryOp { type_expr, op } => {
-                write!(self, "({} ", op)?;
+                write!(self, "({op} ")?;
                 self.print_type(&self.body[*type_expr])?;
                 write!(self, ")")
             }
@@ -748,7 +748,7 @@ impl<'a> Printer<'a> {
             TypeExpr::BinaryOp { lhs, rhs, op } => {
                 write!(self, "(")?;
                 self.print_type(&self.body[*lhs])?;
-                write!(self, " {} ", op)?;
+                write!(self, " {op} ")?;
                 self.print_type(&self.body[*rhs])?;
                 write!(self, ")")
             }
@@ -799,12 +799,12 @@ impl<'a> Printer<'a> {
             }
             Term::Binary(bin) => {
                 if let Ok(str) = str::from_utf8(bin) {
-                    write!(self, "<<{:?}/utf8>>", str)
+                    write!(self, "<<{str:?}/utf8>>")
                 } else {
                     write!(self, "<<")?;
                     let mut sep = "";
                     for byte in bin {
-                        write!(self, "{}{}", sep, byte)?;
+                        write!(self, "{sep}{byte}")?;
                         sep = ", ";
                     }
                     write!(self, ">>")
@@ -849,11 +849,11 @@ impl<'a> Printer<'a> {
 
     fn print_literal(&mut self, lit: &Literal) -> fmt::Result {
         match lit {
-            Literal::String(StringVariant::Normal(string)) => write!(self, "{:?}", string),
+            Literal::String(StringVariant::Normal(string)) => write!(self, "{string:?}"),
             Literal::String(StringVariant::Verbatim(string)) => {
-                write!(self, "{}", string)
+                write!(self, "{string}")
             }
-            Literal::Char(char) => write!(self, "${}", char),
+            Literal::Char(char) => write!(self, "${char}"),
             Literal::Atom(atom) => write!(self, "'{}'", self.db.lookup_atom(*atom)),
             Literal::Integer(int) => write!(self, "{}", int.value), // TODO: other bases
             Literal::Float(float) => write!(self, "{}", f64::from_bits(*float)),
@@ -870,13 +870,13 @@ impl<'a> Printer<'a> {
         print: impl Fn(&mut Self, &T) -> fmt::Result,
     ) -> fmt::Result {
         if exprs.is_empty() && tail.is_none() {
-            write!(self, "{}{}", start, end)
+            write!(self, "{start}{end}")
         } else {
-            write!(self, "{}", start)?;
+            write!(self, "{start}")?;
             self.indent_level += 1;
             let mut sep = "";
             for expr in exprs {
-                writeln!(self, "{}", sep)?;
+                writeln!(self, "{sep}")?;
                 sep = base_sep;
                 print(self, expr)?;
             }
@@ -885,7 +885,7 @@ impl<'a> Printer<'a> {
                 print(self, tail)?;
             }
             self.indent_level -= 1;
-            write!(self, "\n{}", end)
+            write!(self, "\n{end}")
         }
     }
 
@@ -895,10 +895,10 @@ impl<'a> Printer<'a> {
         exprs: &[T],
         print: impl Fn(&mut Self, &T) -> fmt::Result,
     ) -> fmt::Result {
-        write!(self, "{}(", name)?;
+        write!(self, "{name}(")?;
         let mut sep = "";
         for expr in exprs {
-            write!(self, "{}", sep)?;
+            write!(self, "{sep}")?;
             sep = ", ";
             print(self, expr)?;
         }
@@ -923,7 +923,7 @@ impl<'a> Printer<'a> {
                 sep = "-";
             }
             if let Some(unit) = seg.unit {
-                write!(self, "{}unit:{}", sep, unit)?;
+                write!(self, "{sep}unit:{unit}")?;
             }
         }
         Ok(())
diff --git a/crates/hir/src/body/tree_print.rs b/crates/hir/src/body/tree_print.rs
index c9619033de..92d88b1bbf 100644
--- a/crates/hir/src/body/tree_print.rs
+++ b/crates/hir/src/body/tree_print.rs
@@ -128,12 +128,12 @@ pub(crate) fn print_function(
 
     if let Some((_, clause)) = body.clauses.iter().next() {
         if let Some(na) = clause.name.clone() {
-            write!(out, "function: {}", na).ok();
+            write!(out, "function: {na}").ok();
         }
     };
     let mut sep = "";
     for (_idx, clause) in body.clauses.iter() {
-        write!(out, "{}", sep).unwrap();
+        write!(out, "{sep}").unwrap();
         sep = ";";
         let fold_body = fold_body(strategy, &clause.body);
         let mut printer = Printer::new_with_strategy(db, &fold_body, strategy);
@@ -234,7 +234,7 @@ pub(crate) fn print_spec(
 
     let mut sep = "";
     body.sigs.iter().for_each(|sig| {
-        write!(printer, "{}", sep).unwrap();
+        write!(printer, "{sep}").unwrap();
         sep = ";\n";
 
         if sig.args.is_empty() {
@@ -244,7 +244,7 @@ pub(crate) fn print_spec(
             printer.indent_level += 1;
             let mut args_sep = "";
             for arg in &sig.args {
-                write!(printer, "{}", args_sep).unwrap();
+                write!(printer, "{args_sep}").unwrap();
                 args_sep = ",\n";
                 printer.print_type(arg);
             }
@@ -437,7 +437,7 @@ impl<'a> Printer<'a> {
                 self.print_herald("Expr::UnaryOp", &mut |this| {
                     this.print_expr(expr);
                     writeln!(this).ok();
-                    writeln!(this, "{:?},", op).ok();
+                    writeln!(this, "{op:?},").ok();
                 });
             }
             Expr::BinaryOp { lhs, rhs, op } => {
@@ -445,7 +445,7 @@ impl<'a> Printer<'a> {
                     this.print_labelled("lhs", true, &mut |this| this.print_expr(lhs));
                     this.print_labelled("rhs", true, &mut |this| this.print_expr(rhs));
                     this.print_labelled("op", true, &mut |this| {
-                        write!(this, "{:?},", op).ok();
+                        write!(this, "{op:?},").ok();
                     });
                 });
             }
@@ -513,7 +513,7 @@ impl<'a> Printer<'a> {
                             this.print_expr(name);
                             this.indent();
                             writeln!(this).ok();
-                            writeln!(this, "{:?}", op).ok();
+                            writeln!(this, "{op:?}").ok();
                             this.print_expr(value);
                             writeln!(this, ",").ok();
                             this.dedent();
@@ -535,7 +535,7 @@ impl<'a> Printer<'a> {
                 self.print_herald("Expr::MacroCall", &mut |this| {
                     this.print_labelled("args", false, &mut |this| this.print_exprs(args));
                     this.print_labelled("macro_def", false, &mut |this| {
-                        writeln!(this, "{:?}", macro_def).ok();
+                        writeln!(this, "{macro_def:?}").ok();
                     });
                     if this.expand_macros {
                         this.print_labelled("expansion", true, &mut |this| {
@@ -797,7 +797,7 @@ impl<'a> Printer<'a> {
                 self.print_herald("Pat::UnaryOp", &mut |this| {
                     this.print_pat(pat);
                     writeln!(this).ok();
-                    writeln!(this, "{:?},", op).ok();
+                    writeln!(this, "{op:?},").ok();
                 });
             }
             Pat::BinaryOp { lhs, rhs, op } => {
@@ -805,7 +805,7 @@ impl<'a> Printer<'a> {
                     this.print_labelled("lhs", true, &mut |this| this.print_pat(lhs));
                     this.print_labelled("rhs", true, &mut |this| this.print_pat(rhs));
                     this.print_labelled("op", true, &mut |this| {
-                        write!(this, "{:?},", op).ok();
+                        write!(this, "{op:?},").ok();
                     });
                 });
             }
@@ -852,7 +852,7 @@ impl<'a> Printer<'a> {
                 self.print_herald("Pat::MacroCall", &mut |this| {
                     this.print_labelled("args", false, &mut |this| this.print_exprs(args));
                     this.print_labelled("macro_def", false, &mut |this| {
-                        writeln!(this, "{:?}", macro_def).ok();
+                        writeln!(this, "{macro_def:?}").ok();
                     });
                     if this.expand_macros {
                         this.print_labelled("expansion", true, &mut |this| {
@@ -883,12 +883,12 @@ impl<'a> Printer<'a> {
             Term::Binary(bin) => {
                 self.print_herald("Term::Binary", &mut |this| {
                     if let Ok(str) = str::from_utf8(bin) {
-                        writeln!(this, "<<{:?}/utf8>>", str).ok();
+                        writeln!(this, "<<{str:?}/utf8>>").ok();
                     } else {
                         write!(this, "<<").ok();
                         let mut sep = "";
                         for byte in bin {
-                            write!(this, "{}{}", sep, byte).ok();
+                            write!(this, "{sep}{byte}").ok();
                             sep = ", ";
                         }
                         writeln!(this, ">>").ok();
@@ -959,7 +959,7 @@ impl<'a> Printer<'a> {
                 self.print_herald("Term::MacroCall", &mut |this| {
                     this.print_labelled("args", false, &mut |this| this.print_exprs(args));
                     this.print_labelled("macro_def", false, &mut |this| {
-                        writeln!(this, "{:?}", macro_def).ok();
+                        writeln!(this, "{macro_def:?}").ok();
                     });
                     if this.expand_macros {
                         this.print_labelled("expansion", true, &mut |this| {
@@ -986,7 +986,7 @@ impl<'a> Printer<'a> {
                     this.print_labelled("lhs", true, &mut |this| this.print_type(lhs));
                     this.print_labelled("rhs", true, &mut |this| this.print_type(rhs));
                     this.print_labelled("op", true, &mut |this| {
-                        write!(this, "{:?},", op).ok();
+                        write!(this, "{op:?},").ok();
                     });
                 });
             }
@@ -1062,7 +1062,7 @@ impl<'a> Printer<'a> {
                         this.print_type(name);
                         this.indent();
                         writeln!(this).ok();
-                        writeln!(this, "{:?}", op).ok();
+                        writeln!(this, "{op:?}").ok();
                         this.print_type(value);
                         writeln!(this, ",").ok();
                         this.dedent();
@@ -1116,7 +1116,7 @@ impl<'a> Printer<'a> {
                 self.print_herald("TypeExpr::UnaryOp", &mut |this| {
                     this.print_type(type_expr);
                     writeln!(this).ok();
-                    writeln!(this, "{:?},", op).ok();
+                    writeln!(this, "{op:?},").ok();
                 });
             }
             TypeExpr::Var(var) => {
@@ -1131,7 +1131,7 @@ impl<'a> Printer<'a> {
                 self.print_herald("TypeExpr::MacroCall", &mut |this| {
                     this.print_labelled("args", false, &mut |this| this.print_exprs(args));
                     this.print_labelled("macro_def", false, &mut |this| {
-                        writeln!(this, "{:?}", macro_def).ok();
+                        writeln!(this, "{macro_def:?}").ok();
                     });
                     if this.expand_macros {
                         this.print_labelled("expansion", true, &mut |this| {
@@ -1146,8 +1146,8 @@ impl<'a> Printer<'a> {
 
     fn print_literal(&mut self, lit: &Literal) {
         match lit {
-            Literal::String(string) => write!(self, "String({:?})", string),
-            Literal::Char(char) => write!(self, "Char(${})", char),
+            Literal::String(string) => write!(self, "String({string:?})"),
+            Literal::Char(char) => write!(self, "Char(${char})"),
             Literal::Atom(atom) => write!(self, "Atom('{}')", self.db.lookup_atom(*atom)),
             Literal::Integer(int) => write!(self, "Integer({})", int.value), // TODO: other base
             Literal::Float(float) => write!(self, "Float({})", f64::from_bits(*float)),
@@ -1255,7 +1255,7 @@ impl<'a> Printer<'a> {
         final_newline: bool,
         print: &mut dyn FnMut(&mut Self),
     ) {
-        writeln!(self, "{}", label).ok();
+        writeln!(self, "{label}").ok();
         self.indent();
         print(self);
         if final_newline {
@@ -1290,7 +1290,7 @@ impl<'a> Printer<'a> {
             writeln!(this, "unit").ok();
             this.indent();
             if let Some(unit) = seg.unit {
-                writeln!(this, "{}", unit).ok();
+                writeln!(this, "{unit}").ok();
             };
             this.dedent();
         });
@@ -1333,10 +1333,10 @@ impl<'a> Printer<'a> {
     }
 
     fn print_args<T>(&mut self, name: &str, exprs: &[T], print: impl Fn(&mut Self, &T)) {
-        write!(self, "{}(", name).ok();
+        write!(self, "{name}(").ok();
         let mut sep = "";
         for expr in exprs {
-            write!(self, "{}", sep).ok();
+            write!(self, "{sep}").ok();
             sep = ", ";
             print(self, expr);
         }
@@ -1377,7 +1377,7 @@ impl<'a> Printer<'a> {
     }
 
     fn print_record_field(&mut self, field: &RecordFieldId) {
-        write!(self, "{:?}", field).ok();
+        write!(self, "{field:?}").ok();
     }
 }
 
@@ -1389,7 +1389,7 @@ fn print_comprehension_expr(this: &mut Printer<'_>, expr: &ComprehensionExpr) {
                 writeln!(this).ok();
                 this.print_expr(expr);
                 writeln!(this).ok();
-                writeln!(format!("strict: {}", strict)).ok();
+                writeln!(format!("strict: {strict}")).ok();
             });
         }
         ComprehensionExpr::ListGenerator { pat, expr, strict } => {
@@ -1398,7 +1398,7 @@ fn print_comprehension_expr(this: &mut Printer<'_>, expr: &ComprehensionExpr) {
                 writeln!(this).ok();
                 this.print_expr(expr);
                 writeln!(this).ok();
-                writeln!(format!("strict: {}", strict)).ok();
+                writeln!(format!("strict: {strict}")).ok();
             });
         }
         ComprehensionExpr::Expr(expr) => {
@@ -1420,7 +1420,7 @@ fn print_comprehension_expr(this: &mut Printer<'_>, expr: &ComprehensionExpr) {
                 writeln!(this, " <-").ok();
                 this.print_expr(expr);
                 writeln!(this).ok();
-                writeln!(format!("strict: {}", strict)).ok();
+                writeln!(format!("strict: {strict}")).ok();
             });
         }
         ComprehensionExpr::Zip(exprs) => {
diff --git a/crates/hir/src/edoc.rs b/crates/hir/src/edoc.rs
index 50d3491d3d..26959ef02a 100644
--- a/crates/hir/src/edoc.rs
+++ b/crates/hir/src/edoc.rs
@@ -355,7 +355,7 @@ fn reference_to_exdoc(text: &str) -> String {
     if text.contains('/') {
         text.to_string()
     } else {
-        format!("m:{}", text)
+        format!("m:{text}")
     }
 }
 
@@ -944,7 +944,7 @@ mod tests {
                     ..
                 },
             )| {
-                buf.push_str(&format!("{:?}\n", kind));
+                buf.push_str(&format!("{kind:?}\n"));
                 if let Some(doc) = doc {
                     if !doc.lines.is_empty() {
                         buf.push_str("  doc\n");
diff --git a/crates/hir/src/fold.rs b/crates/hir/src/fold.rs
index 2939525000..8b1f6281a0 100644
--- a/crates/hir/src/fold.rs
+++ b/crates/hir/src/fold.rs
@@ -2329,7 +2329,7 @@ bar() ->
                     macro_name: _,
                 }) => {
                     if let Some(def) = macro_def {
-                        acc.push(format!("Expr:{:?}", def));
+                        acc.push(format!("Expr:{def:?}"));
                         acc
                     } else {
                         acc
@@ -2342,7 +2342,7 @@ bar() ->
                     macro_name: _,
                 }) => {
                     if let Some(def) = macro_def {
-                        acc.push(format!("Pat:{:?}", def));
+                        acc.push(format!("Pat:{def:?}"));
                         acc
                     } else {
                         acc
@@ -2355,7 +2355,7 @@ bar() ->
                     macro_name: _,
                 }) => {
                     if let Some(def) = macro_def {
-                        acc.push(format!("TypeExpr:{:?}", def));
+                        acc.push(format!("TypeExpr:{def:?}"));
                         acc
                     } else {
                         acc
@@ -2368,7 +2368,7 @@ bar() ->
                     macro_name: _,
                 }) => {
                     if let Some(def) = macro_def {
-                        acc.push(format!("Term:{:?}", def));
+                        acc.push(format!("Term:{def:?}"));
                         acc
                     } else {
                         acc
diff --git a/crates/hir/src/form_list/pretty.rs b/crates/hir/src/form_list/pretty.rs
index 84a0321465..32d6b78bb1 100644
--- a/crates/hir/src/form_list/pretty.rs
+++ b/crates/hir/src/form_list/pretty.rs
@@ -434,7 +434,7 @@ impl Printer<'_> {
 impl fmt::Display for DeprecatedDesc {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
         match self {
-            DeprecatedDesc::Str(s) => write!(f, "\"{}\"", s),
+            DeprecatedDesc::Str(s) => write!(f, "\"{s}\""),
             DeprecatedDesc::Atom(s) => fmt::Display::fmt(s, f),
         }
     }
@@ -447,10 +447,10 @@ impl fmt::Display for DeprecatedFa {
             name = &"'_'";
         }
         match (&self.arity, &self.desc) {
-            (Some(arity), Some(desc)) => write!(f, "{{{}, {}, {}}}", name, arity, desc),
-            (Some(arity), None) => write!(f, "{{{}, {}}}", name, arity),
-            (None, Some(desc)) => write!(f, "{{{}, '_', {}}}", name, desc),
-            (None, None) => write!(f, "{{{}, '_'}}", name),
+            (Some(arity), Some(desc)) => write!(f, "{{{name}, {arity}, {desc}}}"),
+            (Some(arity), None) => write!(f, "{{{name}, {arity}}}"),
+            (None, Some(desc)) => write!(f, "{{{name}, '_', {desc}}}"),
+            (None, None) => write!(f, "{{{name}, '_'}}"),
         }
     }
 }
@@ -464,7 +464,7 @@ impl fmt::Display for DeprecatedFas<'_> {
             if i > 0 {
                 write!(f, ",")?;
             }
-            write!(f, "{}", fa)?;
+            write!(f, "{fa}")?;
         }
         write!(f, "]")
     }
@@ -476,7 +476,7 @@ impl fmt::Display for BlankArgs {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut join = "";
         for _ in 0..self.0 {
-            write!(f, "{}_", join)?;
+            write!(f, "{join}_")?;
             join = ", "
         }
         Ok(())
diff --git a/crates/hir/src/include.rs b/crates/hir/src/include.rs
index c4a07c8396..70430742ea 100644
--- a/crates/hir/src/include.rs
+++ b/crates/hir/src/include.rs
@@ -56,7 +56,7 @@ mod tests {
             .map(|(idx, include)| {
                 let resolved = db
                     .resolve_include(InFile::new(file_id, idx))
-                    .unwrap_or_else(|| panic!("unresolved include: {:?}", include));
+                    .unwrap_or_else(|| panic!("unresolved include: {include:?}"));
                 let resolved_path = db
                     .source_root(db.file_source_root(resolved).source_root_id(&db))
                     .source_root(&db)
@@ -67,10 +67,10 @@ mod tests {
             })
             .map(|(include, resolved)| match include {
                 IncludeAttribute::Include { path, .. } => {
-                    format!("-include({:?}). % => {}", path, resolved)
+                    format!("-include({path:?}). % => {resolved}")
                 }
                 IncludeAttribute::IncludeLib { path, .. } => {
-                    format!("-include_lib({:?}). % => {}", path, resolved)
+                    format!("-include_lib({path:?}). % => {resolved}")
                 }
             })
             .collect::<Vec<_>>()
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 48b9e8802e..d64ac7b795 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -242,11 +242,8 @@ impl HirIdx {
                     let body = sema.db.function_clause_body(InFile::new(file_id, fun_idx));
                     body.body.tree_print_any_expr(sema.db.upcast(), self.idx)
                 }
-                _ => format!(
-                    "HirIdx::tree_print not implemented for FormIdx '{:?}'",
-                    form_id
-                )
-                .to_string(),
+                _ => format!("HirIdx::tree_print not implemented for FormIdx '{form_id:?}'")
+                    .to_string(),
             },
             BodyOrigin::Define {
                 file_id: _,
diff --git a/crates/hir/src/macro_exp.rs b/crates/hir/src/macro_exp.rs
index d52eab5be7..4d85daae71 100644
--- a/crates/hir/src/macro_exp.rs
+++ b/crates/hir/src/macro_exp.rs
@@ -351,10 +351,9 @@ mod tests {
         let (expected_range, _) = annos[0];
 
         let resolved = match resolved.expect("failed to resolve macro") {
-            ResolvedMacro::BuiltIn(built_in) => panic!(
-                "expected to resolve to a custom macro, got {:?} instead",
-                built_in
-            ),
+            ResolvedMacro::BuiltIn(built_in) => {
+                panic!("expected to resolve to a custom macro, got {built_in:?} instead")
+            }
             ResolvedMacro::User(def) => def,
         };
         let def = DefineDef {
diff --git a/crates/hir/src/module_data.rs b/crates/hir/src/module_data.rs
index 4d008f445d..4c77861f7a 100644
--- a/crates/hir/src/module_data.rs
+++ b/crates/hir/src/module_data.rs
@@ -83,7 +83,7 @@ impl File {
             .path_for_file(&self.file_id)
             .and_then(|path| path.name_and_extension())
         {
-            SmolStr::new(format!("{}.{}", name, ext))
+            SmolStr::new(format!("{name}.{ext}"))
         } else {
             SmolStr::new_inline("unknown")
         }
@@ -435,12 +435,12 @@ fn arg_name(arg_idx: usize, expr: ast::Expr) -> SpecArgName {
         ann.var()
             .and_then(|var| var.var())
             .map(|var| SpecArgName::Name(var.text().to_string()))
-            .unwrap_or_else(|| SpecArgName::Generated(format!("Arg{}", arg_idx)))
+            .unwrap_or_else(|| SpecArgName::Generated(format!("Arg{arg_idx}")))
 
     // -spec f(bar()) -> ok.
     //   f(Arg1) -> ok.
     } else {
-        SpecArgName::Generated(format!("Arg{}", arg_idx))
+        SpecArgName::Generated(format!("Arg{arg_idx}"))
     }
 }
 
@@ -647,7 +647,7 @@ impl VarDef {
 
 fn is_in_otp(file_id: FileId, db: &dyn DefDatabase) -> bool {
     // Context for T171541590
-    let _ = stdx::panic_context::enter(format!("\nis_in_otp:2: {:?}", file_id));
+    let _ = stdx::panic_context::enter(format!("\nis_in_otp:2: {file_id:?}"));
     match db.file_app_data(file_id) {
         Some(app_data) => {
             let project_id = app_data.project_id;
diff --git a/crates/hir/src/name.rs b/crates/hir/src/name.rs
index 7dd74bac36..1dedc7e24d 100644
--- a/crates/hir/src/name.rs
+++ b/crates/hir/src/name.rs
@@ -136,7 +136,7 @@ impl NameArity {
     }
 
     pub fn as_label(&self) -> String {
-        format!("{}", self)
+        format!("{self}")
     }
 }
 
@@ -174,8 +174,8 @@ impl MacroName {
 
     pub fn extended_display_name(&self) -> String {
         match self.arity() {
-            Some(_arity) => format!("{}", self),
-            None => format!("{}/NOARGS", self),
+            Some(_arity) => format!("{self}"),
+            None => format!("{self}/NOARGS"),
         }
     }
 }
diff --git a/crates/hir/src/sema.rs b/crates/hir/src/sema.rs
index 86f5a68839..1b48827d46 100644
--- a/crates/hir/src/sema.rs
+++ b/crates/hir/src/sema.rs
@@ -242,7 +242,7 @@ impl Semantic<'_> {
 
     pub fn resolve_module_names(&self, from_file: FileId) -> Option<ModuleIter> {
         // Context for T171541590
-        let _ = stdx::panic_context::enter(format!("\nresolve_module_names: {:?}", from_file));
+        let _ = stdx::panic_context::enter(format!("\nresolve_module_names: {from_file:?}"));
         let project_id = self.db.file_app_data(from_file)?.project_id;
         let module_index = self.db.module_index(project_id);
         Some(ModuleIter(module_index))
@@ -295,7 +295,7 @@ impl Semantic<'_> {
 
     pub fn resolve_module_name(&self, file_id: FileId, name: &str) -> Option<Module> {
         // Context for T171541590
-        let _ = stdx::panic_context::enter(format!("\nresolve_module_names {:?}", file_id));
+        let _ = stdx::panic_context::enter(format!("\nresolve_module_names {file_id:?}"));
         let project_id = self.db.file_app_data(file_id)?.project_id;
         let module_index = self.db.module_index(project_id);
         let module_file_id = module_index.file_for_module(name)?;
diff --git a/crates/hir/src/sema/to_def.rs b/crates/hir/src/sema/to_def.rs
index 74a4baaaee..83ff57e88a 100644
--- a/crates/hir/src/sema/to_def.rs
+++ b/crates/hir/src/sema/to_def.rs
@@ -539,7 +539,7 @@ impl ToDef for ast::Var {
 
 pub fn resolve_module_name(sema: &Semantic<'_>, file_id: FileId, name: &str) -> Option<Module> {
     // Context for T171541590
-    let _ = stdx::panic_context::enter(format!("\nresolve_module_name: {:?}", file_id));
+    let _ = stdx::panic_context::enter(format!("\nresolve_module_name: {file_id:?}"));
     let project_id = sema.db.file_app_data(file_id)?.project_id;
     let module_index = sema.db.module_index(project_id);
     let module_file_id = module_index.file_for_module(name)?;
diff --git a/crates/ide/src/codemod_helpers.rs b/crates/ide/src/codemod_helpers.rs
index bd5c4fd16d..c6ae3905d6 100644
--- a/crates/ide/src/codemod_helpers.rs
+++ b/crates/ide/src/codemod_helpers.rs
@@ -221,7 +221,7 @@ impl<'a, T> FunctionMatcher<'a, T> {
                 labels_full_typed.insert(Some(mfa.label().into()), (types, *c, t));
             }
             FunctionMatch::MF { module, name } => {
-                let label = format!("{}:{}", module, name);
+                let label = format!("{module}:{name}");
                 labels_mf.insert(Some(label.into()), (*c, t));
             }
             FunctionMatch::M { module } => {
@@ -1002,7 +1002,7 @@ mod tests {
                     .map(|in_clause| sema.pat_type(&in_clause.body(), &in_clause.value).unwrap())
             });
         if let Some(type_info) = type_info {
-            let type_str = format!("{}", type_info);
+            let type_str = format!("{type_info}");
             if type_str != expected[0].1 {
                 panic!("Expected '{}', got '{}'", expected[0].1, type_str);
             }
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 56a5a83932..454798eb3a 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -765,7 +765,7 @@ pub fn eqwalizer_to_diagnostic(
         Severity::Information
     };
     let explanation = match &d.explanation {
-        Some(s) => format!("\n\n{}", s),
+        Some(s) => format!("\n\n{s}"),
         None => "".to_string(),
     };
     let message = format!(
@@ -848,7 +848,7 @@ pub fn native_diagnostics(
                 }
                 elp_syntax::SyntaxError::Missing(m, _) => (
                     DiagnosticCode::Missing("missing".to_string()),
-                    format!("Missing '{}'", m),
+                    format!("Missing '{m}'"),
                 ),
             };
             Diagnostic::error(code, widen_range(err.range()), message)
@@ -1159,7 +1159,7 @@ pub(crate) fn make_missing_diagnostic(
     item: &'static str,
     code: String,
 ) -> Diagnostic {
-    let message = format!("Missing '{}'", item);
+    let message = format!("Missing '{item}'");
     Diagnostic::new(DiagnosticCode::Missing(code), message, range).with_severity(Severity::Warning)
 }
 
@@ -1168,7 +1168,7 @@ pub(crate) fn make_unexpected_diagnostic(
     item: &'static str,
     code: String,
 ) -> Diagnostic {
-    let message = format!("Unexpected '{}'", item);
+    let message = format!("Unexpected '{item}'");
     Diagnostic::new(DiagnosticCode::Unexpected(code), message, range)
         .with_severity(Severity::Warning)
 }
diff --git a/crates/ide/src/diagnostics/boolean_precedence.rs b/crates/ide/src/diagnostics/boolean_precedence.rs
index c7b2520c77..cdddb76e44 100644
--- a/crates/ide/src/diagnostics/boolean_precedence.rs
+++ b/crates/ide/src/diagnostics/boolean_precedence.rs
@@ -177,7 +177,7 @@ fn add_parens_fix(
     where_str: &str,
     diag: &mut Diagnostic,
 ) {
-    let assist_message = format!("Add parens to {}", where_str);
+    let assist_message = format!("Add parens to {where_str}");
     let edit = add_parens_edit(&expr_range);
     diag.add_fix(fix(
         "replace_boolean_operator_add_parens",
diff --git a/crates/ide/src/diagnostics/edoc.rs b/crates/ide/src/diagnostics/edoc.rs
index bb038dde59..ac09034315 100644
--- a/crates/ide/src/diagnostics/edoc.rs
+++ b/crates/ide/src/diagnostics/edoc.rs
@@ -1,10 +1,11 @@
 /*
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under both the MIT license found in the
- * LICENSE-MIT file in the root directory of this source tree and the Apache
+ * This source code is dual-licensed under either the MIT license found in the
+ * LICENSE-MIT file in the root directory of this source tree or the Apache
  * License, Version 2.0 found in the LICENSE-APACHE file in the root directory
- * of this source tree.
+ * of this source tree. You may select, at your option, one of the
+ * above-listed licenses.
  */
 
 // Diagnostic: edoc
@@ -128,7 +129,7 @@ fn old_edoc_syntax_diagnostic(
         if !author_exists(&author_description, &existing_authors) {
             builder.insert(
                 authors_insert_offset,
-                format!("-author(\"{}\").\n", author_description),
+                format!("-author(\"{author_description}\").\n"),
             );
         }
     }
diff --git a/crates/ide/src/diagnostics/expression_can_be_simplified.rs b/crates/ide/src/diagnostics/expression_can_be_simplified.rs
index fd5e7a8c92..f941ff1738 100644
--- a/crates/ide/src/diagnostics/expression_can_be_simplified.rs
+++ b/crates/ide/src/diagnostics/expression_can_be_simplified.rs
@@ -151,7 +151,7 @@ fn simplify_binary_op(
         // -
         (lhs, BinaryOp::ArithOp(ArithOp::Sub), _rhs) if is_integer(0, lhs) => {
             let rhs_str = to_string(&rhs_id, sema, clause_id, def_fb)?;
-            Some(format!("-{}", rhs_str))
+            Some(format!("-{rhs_str}"))
         }
         (_lhs, BinaryOp::ArithOp(ArithOp::Sub), rhs) if is_integer(0, rhs) => {
             to_string(&lhs_id, sema, clause_id, def_fb)
diff --git a/crates/ide/src/diagnostics/head_mismatch.rs b/crates/ide/src/diagnostics/head_mismatch.rs
index 1776ec1c0d..259ed2853c 100644
--- a/crates/ide/src/diagnostics/head_mismatch.rs
+++ b/crates/ide/src/diagnostics/head_mismatch.rs
@@ -266,7 +266,7 @@ impl Validate<String> for Name {
 
         Diagnostic::new(
             super::DiagnosticCode::HeadMismatch,
-            format!("head mismatch '{}' vs '{}'", attr, hattr),
+            format!("head mismatch '{attr}' vs '{hattr}'"),
             attr_loc,
         )
         .with_related(Some(vec![RelatedInformation {
@@ -301,7 +301,7 @@ impl Validate<usize> for Arity {
     ) -> Diagnostic {
         Diagnostic::new(
             DiagnosticCode::HeadMismatch,
-            format!("head arity mismatch {} vs {}", attr, hattr),
+            format!("head arity mismatch {attr} vs {hattr}"),
             attr_loc,
         )
         .with_related(Some(vec![RelatedInformation {
diff --git a/crates/ide/src/diagnostics/map_insertion_to_syntax.rs b/crates/ide/src/diagnostics/map_insertion_to_syntax.rs
index d6627d8085..75ec6c27cf 100644
--- a/crates/ide/src/diagnostics/map_insertion_to_syntax.rs
+++ b/crates/ide/src/diagnostics/map_insertion_to_syntax.rs
@@ -93,7 +93,7 @@ fn map_put_to_syntax_ssr(diags: &mut Vec<Diagnostic>, sema: &Semantic, file_id:
             parens: ParenStrategy::InvisibleParens,
         },
         file_id,
-        format!("ssr: maps:put({},{},{}).", KEY_VAR, VALUE_VAR, MAP_VAR).as_str(),
+        format!("ssr: maps:put({KEY_VAR},{VALUE_VAR},{MAP_VAR}).").as_str(),
     );
     matches.matches.iter().for_each(|m| {
         if let Some(map_match) = m.get_placeholder_match(sema, MAP_VAR) {
@@ -116,7 +116,7 @@ fn map_update_to_syntax_ssr(diags: &mut Vec<Diagnostic>, sema: &Semantic, file_i
             parens: ParenStrategy::InvisibleParens,
         },
         file_id,
-        format!("ssr: maps:update({},{},{}).", KEY_VAR, VALUE_VAR, MAP_VAR).as_str(),
+        format!("ssr: maps:update({KEY_VAR},{VALUE_VAR},{MAP_VAR}).").as_str(),
     );
     matches.matches.iter().for_each(|m| {
         if let Some(map_match) = m.get_placeholder_match(sema, MAP_VAR) {
diff --git a/crates/ide/src/diagnostics/missing_separator.rs b/crates/ide/src/diagnostics/missing_separator.rs
index 16a91cb294..5d421a2a30 100644
--- a/crates/ide/src/diagnostics/missing_separator.rs
+++ b/crates/ide/src/diagnostics/missing_separator.rs
@@ -130,7 +130,7 @@ mod tests {
 
         let parsed = ast::SourceFile::parse_text(text);
         let d = form_missing_separator_diagnostics(&parsed);
-        assert_eq!(format!("{:?}", d), "[]")
+        assert_eq!(format!("{d:?}"), "[]")
     }
 
     #[test]
@@ -139,7 +139,7 @@ mod tests {
 
         let parsed = ast::SourceFile::parse_text(text);
         let d = form_missing_separator_diagnostics(&parsed);
-        assert_eq!(format!("{:?}", d), "[]")
+        assert_eq!(format!("{d:?}"), "[]")
     }
 
     #[test]
diff --git a/crates/ide/src/diagnostics/misspelled_attribute.rs b/crates/ide/src/diagnostics/misspelled_attribute.rs
index d3b49e7d1f..dafd2c1e1c 100644
--- a/crates/ide/src/diagnostics/misspelled_attribute.rs
+++ b/crates/ide/src/diagnostics/misspelled_attribute.rs
@@ -136,7 +136,7 @@ fn make_diagnostic(
     }]))
     .with_fixes(Some(vec![fix(
         "fix_misspelled_attribute",
-        format!("Change misspelled attribute to '{}'", suggested_rename).as_str(),
+        format!("Change misspelled attribute to '{suggested_rename}'").as_str(),
         SourceChange::from_text_edit(file_id, edit),
         attr_name_range,
     )]))
@@ -190,8 +190,7 @@ mod tests {
             .unwrap();
         assert!(
             diags.is_empty(),
-            "didn't expect diagnostic errors in files: {:?}",
-            diags
+            "didn't expect diagnostic errors in files: {diags:?}"
         );
     }
 
@@ -211,8 +210,7 @@ mod tests {
             .unwrap();
         assert!(
             diags.is_empty(),
-            "didn't expect diagnostic errors in files: {:?}",
-            diags
+            "didn't expect diagnostic errors in files: {diags:?}"
         );
     }
 }
diff --git a/crates/ide/src/diagnostics/module_mismatch.rs b/crates/ide/src/diagnostics/module_mismatch.rs
index 32a138507c..9db5574c34 100644
--- a/crates/ide/src/diagnostics/module_mismatch.rs
+++ b/crates/ide/src/diagnostics/module_mismatch.rs
@@ -33,7 +33,7 @@ pub(crate) fn module_mismatch(
 ) -> Option<()> {
     let module_name = ast::ModuleAttribute::cast(node.clone())?.name()?;
     // Context for T171541590
-    let _ = stdx::panic_context::enter(format!("\nmodule_mismatch: {:?}", file_id));
+    let _ = stdx::panic_context::enter(format!("\nmodule_mismatch: {file_id:?}"));
     let root_id = sema.db.file_source_root(file_id).source_root_id(sema.db);
     let root = sema.db.source_root(root_id).source_root(sema.db);
     let path = root.path_for_file(&file_id).unwrap();
diff --git a/crates/ide/src/diagnostics/nonstandard_integer_formatting.rs b/crates/ide/src/diagnostics/nonstandard_integer_formatting.rs
index e402a906c9..8069b9bc0c 100644
--- a/crates/ide/src/diagnostics/nonstandard_integer_formatting.rs
+++ b/crates/ide/src/diagnostics/nonstandard_integer_formatting.rs
@@ -149,7 +149,7 @@ fn make_diagnostic(
     let mut builder = SourceChangeBuilder::new(file_id);
     builder.replace(integer_src_range, formatted_integer);
     let fix_msg: &str = if formatted_integer.len() < 16 {
-        &format!("Reformat integer to {}", formatted_integer)
+        &format!("Reformat integer to {formatted_integer}")
     } else {
         "Reformat integer"
     };
diff --git a/crates/ide/src/diagnostics/record_tuple_match.rs b/crates/ide/src/diagnostics/record_tuple_match.rs
index 1f122ac4c3..32cb4d5713 100644
--- a/crates/ide/src/diagnostics/record_tuple_match.rs
+++ b/crates/ide/src/diagnostics/record_tuple_match.rs
@@ -90,7 +90,7 @@ fn report(
 }
 
 fn make_diagnostic(range: TextRange, record_name: &Name) -> Diagnostic {
-    let message = format!("matching record '{}' as a tuple.", record_name);
+    let message = format!("matching record '{record_name}' as a tuple.");
     Diagnostic::new(DiagnosticCode::RecordTupleMatch, message, range)
         .with_severity(Severity::Warning)
 }
diff --git a/crates/ide/src/diagnostics/replace_call.rs b/crates/ide/src/diagnostics/replace_call.rs
index 74797aa232..76b8b5e07b 100644
--- a/crates/ide/src/diagnostics/replace_call.rs
+++ b/crates/ide/src/diagnostics/replace_call.rs
@@ -169,7 +169,7 @@ impl Replacement {
             Replacement::UseOk => "with ok".to_string(),
             Replacement::UseCallArg { n } => format!("with argument {n}"),
             Replacement::Invocation { replacement } => format!("with '{replacement}'"),
-            Replacement::ArgsPermutation { perm } => format!("with arguments permuted {:?}", perm),
+            Replacement::ArgsPermutation { perm } => format!("with arguments permuted {perm:?}"),
         }
     }
 }
diff --git a/crates/ide/src/diagnostics/undefined_function.rs b/crates/ide/src/diagnostics/undefined_function.rs
index f59f2d4b68..a32bb9765c 100644
--- a/crates/ide/src/diagnostics/undefined_function.rs
+++ b/crates/ide/src/diagnostics/undefined_function.rs
@@ -192,7 +192,7 @@ fn make_diagnostic(
             });
             let mut diagnostic = Diagnostic::new(
                 DiagnosticCode::UnexportedFunction,
-                format!("Function '{}' is not exported.", function_name),
+                format!("Function '{function_name}' is not exported."),
                 range,
             )
             .with_severity(Severity::Warning)
@@ -210,7 +210,7 @@ fn make_diagnostic(
         Some(
             Diagnostic::new(
                 DiagnosticCode::UndefinedFunction,
-                format!("Function '{}' is undefined.", function_name),
+                format!("Function '{function_name}' is undefined."),
                 range,
             )
             .with_severity(Severity::Warning)
diff --git a/crates/ide/src/diagnostics/unspecific_include.rs b/crates/ide/src/diagnostics/unspecific_include.rs
index ec3e754d64..b6306c399f 100644
--- a/crates/ide/src/diagnostics/unspecific_include.rs
+++ b/crates/ide/src/diagnostics/unspecific_include.rs
@@ -136,9 +136,9 @@ fn replace_include_path(
 ) -> Assist {
     let mut builder = TextEdit::builder();
     if let Some(attr_range) = make_include_lib {
-        builder.replace(attr_range, format!("-include_lib(\"{}\").", filename));
+        builder.replace(attr_range, format!("-include_lib(\"{filename}\")."));
     } else {
-        builder.replace(range, format!("\"{}\"", filename));
+        builder.replace(range, format!("\"{filename}\""));
     }
     let edit = builder.finish();
     fix(
diff --git a/crates/ide/src/diagnostics/unused_function_args.rs b/crates/ide/src/diagnostics/unused_function_args.rs
index ddf27568f2..11a485ded8 100644
--- a/crates/ide/src/diagnostics/unused_function_args.rs
+++ b/crates/ide/src/diagnostics/unused_function_args.rs
@@ -165,9 +165,9 @@ fn pick_new_unused_var_names(
     let result = unused_var_names
         .iter()
         .map(|(k, v)| {
-            let mut new_var_name = format!("_{}", v);
+            let mut new_var_name = format!("_{v}");
             while other_ignored_var_names.contains(&new_var_name) {
-                new_var_name = format!("_{}", new_var_name);
+                new_var_name = format!("_{new_var_name}");
             }
             (*k, new_var_name)
         })
diff --git a/crates/ide/src/diagnostics/unused_include.rs b/crates/ide/src/diagnostics/unused_include.rs
index cff520070b..08f23af1d5 100644
--- a/crates/ide/src/diagnostics/unused_include.rs
+++ b/crates/ide/src/diagnostics/unused_include.rs
@@ -74,7 +74,7 @@ pub(crate) fn unused_includes(
 
                 let diagnostic = Diagnostic::new(
                     DiagnosticCode::UnusedInclude,
-                    format!("Unused file: {}", path),
+                    format!("Unused file: {path}"),
                     attribute_range,
                 )
                 .with_severity(Severity::Warning)
@@ -85,7 +85,7 @@ pub(crate) fn unused_includes(
                     attribute_range,
                 )]));
 
-                log::debug!("Found unused include {:?}", path);
+                log::debug!("Found unused include {path:?}");
 
                 diagnostics.push(diagnostic);
             }
diff --git a/crates/ide/src/doc_links/otp_links.rs b/crates/ide/src/doc_links/otp_links.rs
index e209cc4ca4..f77030e028 100644
--- a/crates/ide/src/doc_links/otp_links.rs
+++ b/crates/ide/src/doc_links/otp_links.rs
@@ -20,7 +20,7 @@ pub(crate) fn links(res: &mut Vec<DocLink>, sema: &Semantic, def: &SymbolDefinit
         SymbolDefinition::Module(module) => {
             if module.is_in_otp(sema.db) {
                 let name = module.name(sema.db);
-                let uri = format!("{}/doc/man/{}.html", OTP_BASE_URL, name);
+                let uri = format!("{OTP_BASE_URL}/doc/man/{name}.html");
                 let link = DocLink {
                     title: name.to_string(),
                     uri,
@@ -36,8 +36,7 @@ pub(crate) fn links(res: &mut Vec<DocLink>, sema: &Semantic, def: &SymbolDefinit
                     let function_arity = function_def.name.arity();
                     let title = format!("{module_name}:{function_name}/{function_arity}");
                     let uri = format!(
-                        "{}/doc/man/{}.html#{}/{}",
-                        OTP_BASE_URL, module_name, function_name, function_arity
+                        "{OTP_BASE_URL}/doc/man/{module_name}.html#{function_name}/{function_arity}"
                     );
                     let link = DocLink { title, uri };
                     res.push(link);
diff --git a/crates/ide/src/document_symbols.rs b/crates/ide/src/document_symbols.rs
index 2b2aa8f07c..7baf10640a 100644
--- a/crates/ide/src/document_symbols.rs
+++ b/crates/ide/src/document_symbols.rs
@@ -40,7 +40,7 @@ impl fmt::Display for DocumentSymbol {
         let mut s = format!("{:?} | {}", self.kind, self.name);
         match &self.detail {
             None => (),
-            Some(detail) => s.push_str(format!(" | {}", detail).as_str()),
+            Some(detail) => s.push_str(format!(" | {detail}").as_str()),
         };
         if self.deprecated {
             s.push_str(" | deprecated")
diff --git a/crates/ide/src/fixture.rs b/crates/ide/src/fixture.rs
index 00e4ea859f..ecebc29c7d 100644
--- a/crates/ide/src/fixture.rs
+++ b/crates/ide/src/fixture.rs
@@ -70,7 +70,7 @@ pub fn check_no_parse_errors(analysis: &Analysis, file_id: FileId) -> Option<()>
     let parse = analysis.db.parse(file_id);
     let errors = parse.errors();
     if !errors.is_empty() {
-        assert_eq!(format!("{:?}\nin\n{text}", errors), "");
+        assert_eq!(format!("{errors:?}\nin\n{text}"), "");
     };
     Some(())
 }
diff --git a/crates/ide/src/handlers/goto_definition.rs b/crates/ide/src/handlers/goto_definition.rs
index ef017daada..f0a6c8fa99 100644
--- a/crates/ide/src/handlers/goto_definition.rs
+++ b/crates/ide/src/handlers/goto_definition.rs
@@ -74,7 +74,7 @@ mod tests {
 
         match analysis.goto_definition(position).unwrap() {
             Some(navs) if !navs.info.is_empty() => {
-                panic!("didn't expect this to resolve anywhere: {:?}", navs)
+                panic!("didn't expect this to resolve anywhere: {navs:?}")
             }
             Some(_) => {
                 panic!("got some with empty navs!");
diff --git a/crates/ide/src/handlers/references.rs b/crates/ide/src/handlers/references.rs
index 900c73ea00..6f5804f9a1 100644
--- a/crates/ide/src/handlers/references.rs
+++ b/crates/ide/src/handlers/references.rs
@@ -106,10 +106,7 @@ mod tests {
                     .position(|(range, _)| range == &res.declaration.file_range())
                 {
                     Some(idx) => annos.remove(idx).1,
-                    None => panic!(
-                        "definition not found for:\n{:#?}\nsearching:\n{:#?}",
-                        res, annos
-                    ),
+                    None => panic!("definition not found for:\n{res:#?}\nsearching:\n{annos:#?}"),
                 };
                 let key = def_name
                     .strip_prefix("def")
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index 9cee1a06b4..fbbbbb7738 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -375,14 +375,14 @@ impl Analysis {
 
     pub fn project_id(&self, file_id: FileId) -> Cancellable<Option<ProjectId>> {
         // Context for T171541590
-        let _ = stdx::panic_context::enter(format!("\nproject_id: {:?}", file_id));
+        let _ = stdx::panic_context::enter(format!("\nproject_id: {file_id:?}"));
         self.with_db(|db| Some(db.file_app_data(file_id)?.project_id))
     }
 
     pub fn project_data(&self, file_id: FileId) -> Cancellable<Option<Arc<ProjectData>>> {
         self.with_db(|db| {
             // Context for T171541590
-            let _ = stdx::panic_context::enter(format!("\nproject_data: {:?}", file_id));
+            let _ = stdx::panic_context::enter(format!("\nproject_data: {file_id:?}"));
             Some(
                 db.project_data(db.file_app_data(file_id)?.project_id)
                     .project_data(db),
@@ -394,7 +394,7 @@ impl Analysis {
     pub fn module_name(&self, file_id: FileId) -> Cancellable<Option<ModuleName>> {
         self.with_db(|db| {
             // Context for T171541590
-            let _ = stdx::panic_context::enter(format!("\nmodule_name: {:?}", file_id));
+            let _ = stdx::panic_context::enter(format!("\nmodule_name: {file_id:?}"));
             let app_data = db.file_app_data(file_id)?;
             db.module_index(app_data.project_id)
                 .module_for_file(file_id)
diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index 820828120a..d7166ba37c 100644
--- a/crates/ide/src/rename.rs
+++ b/crates/ide/src/rename.rs
@@ -195,7 +195,7 @@ mod tests {
         let (analysis, position, _) = fixture::position(fixture_before);
         let rename_result = analysis
             .rename(position, new_name)
-            .unwrap_or_else(|err| panic!("Rename to '{}' was cancelled: {}", new_name, err));
+            .unwrap_or_else(|err| panic!("Rename to '{new_name}' was cancelled: {err}"));
         match rename_result {
             Ok(source_change) => {
                 for edit in source_change.source_file_edits {
@@ -219,7 +219,7 @@ mod tests {
                         .collect::<String>();
                     assert_eq!(error_message.trim(), err.to_string());
                 } else {
-                    panic!("Rename to '{}' failed unexpectedly: {}", new_name, err)
+                    panic!("Rename to '{new_name}' failed unexpectedly: {err}")
                 }
             }
         };
@@ -1161,7 +1161,7 @@ mod tests {
                 }
             }
             None => {
-                panic!("Rename to '{}' failed", new_name)
+                panic!("Rename to '{new_name}' failed")
             }
         };
     }
diff --git a/crates/ide/src/runnables.rs b/crates/ide/src/runnables.rs
index 8454844157..aeeb947481 100644
--- a/crates/ide/src/runnables.rs
+++ b/crates/ide/src/runnables.rs
@@ -150,7 +150,7 @@ impl Runnable {
             RunnableKind::Test { group, .. } => match group {
                 common_test::GroupName::NoGroup => "▶\u{fe0e} Run in REPL".to_string(),
                 common_test::GroupName::Name(name) => {
-                    format!("▶\u{fe0e} Run in REPL (in {})", name)
+                    format!("▶\u{fe0e} Run in REPL (in {name})")
                 }
             },
             RunnableKind::Suite { .. } => "▶\u{fe0e} Open REPL".to_string(),
@@ -161,7 +161,7 @@ impl Runnable {
             RunnableKind::Test { group, .. } => match group {
                 common_test::GroupName::NoGroup => "▶\u{fe0e} Run Test".to_string(),
                 common_test::GroupName::Name(name) => {
-                    format!("▶\u{fe0e} Run Test (in {})", name)
+                    format!("▶\u{fe0e} Run Test (in {name})")
                 }
             },
             RunnableKind::Suite { .. } => "▶\u{fe0e} Run All Tests".to_string(),
@@ -172,7 +172,7 @@ impl Runnable {
             RunnableKind::Test { group, .. } => match group {
                 common_test::GroupName::NoGroup => "▶\u{fe0e} Debug".to_string(),
                 common_test::GroupName::Name(name) => {
-                    format!("▶\u{fe0e} Debug (in {})", name)
+                    format!("▶\u{fe0e} Debug (in {name})")
                 }
             },
             RunnableKind::Suite { .. } => "▶\u{fe0e} Debug".to_string(),
diff --git a/crates/ide/src/tests.rs b/crates/ide/src/tests.rs
index 11db81329b..77d84f0013 100644
--- a/crates/ide/src/tests.rs
+++ b/crates/ide/src/tests.rs
@@ -550,8 +550,7 @@ pub fn check_no_parse_errors_with_config(
         .unwrap();
     assert!(
         diags.is_empty(),
-        "didn't expect parse errors in files: {:?}",
-        diags
+        "didn't expect parse errors in files: {diags:?}"
     );
 }
 
diff --git a/crates/ide_assists/src/handlers/add_doc.rs b/crates/ide_assists/src/handlers/add_doc.rs
index 7fae343265..b1f51a7b90 100644
--- a/crates/ide_assists/src/handlers/add_doc.rs
+++ b/crates/ide_assists/src/handlers/add_doc.rs
@@ -76,24 +76,20 @@ pub(crate) fn add_doc(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
             let mut idx = 1;
             let header = match ctx.config.snippet_cap {
                 Some(_cap) => {
-                    format!("-doc \"\"\"\n${{{}:{}}}\n\"\"\".", idx, DEFAULT_TEXT)
+                    format!("-doc \"\"\"\n${{{idx}:{DEFAULT_TEXT}}}\n\"\"\".")
                 }
                 None => {
-                    format!("-doc \"\"\"\n{}\n\"\"\".", DEFAULT_TEXT)
+                    format!("-doc \"\"\"\n{DEFAULT_TEXT}\n\"\"\".")
                 }
             };
             let params = arg_names.fold(String::new(), |mut output, arg_name| {
                 idx += 1;
                 match ctx.config.snippet_cap {
                     Some(_cap) => {
-                        let _ = write!(
-                            output,
-                            "\"{}\" => \"${{{}:{}}}\", ",
-                            arg_name, idx, ARG_TEXT
-                        );
+                        let _ = write!(output, "\"{arg_name}\" => \"${{{idx}:{ARG_TEXT}}}\", ");
                     }
                     None => {
-                        let _ = write!(output, "\"{}\" => \"{}\", ", arg_name, ARG_TEXT);
+                        let _ = write!(output, "\"{arg_name}\" => \"{ARG_TEXT}\", ");
                     }
                 }
                 output
@@ -106,7 +102,7 @@ pub(crate) fn add_doc(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
             } else {
                 "".to_string()
             };
-            let text = format!("{}\n{}", header, params);
+            let text = format!("{header}\n{params}");
             builder.edit_file(ctx.frange.file_id);
             match ctx.config.snippet_cap {
                 Some(cap) => {
@@ -131,7 +127,7 @@ pub fn arg_name(arg_idx: usize, expr: ast::Expr) -> String {
     if let ast::Expr::ExprMax(ast::ExprMax::Var(var)) = expr {
         var.text().to_string()
     } else {
-        format!("Arg{}", arg_idx)
+        format!("Arg{arg_idx}")
     }
 }
 
diff --git a/crates/ide_assists/src/handlers/add_format.rs b/crates/ide_assists/src/handlers/add_format.rs
index ee449daabe..42bd24f98d 100644
--- a/crates/ide_assists/src/handlers/add_format.rs
+++ b/crates/ide_assists/src/handlers/add_format.rs
@@ -61,7 +61,7 @@ pub(crate) fn add_format(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
         target,
         None,
         |builder| {
-            let text = format!("{}{}\n", PRAGMA_PREFIX, PRAGMA);
+            let text = format!("{PRAGMA_PREFIX}{PRAGMA}\n");
             builder.edit_file(ctx.frange.file_id);
             builder.insert(insert, text)
         },
diff --git a/crates/ide_assists/src/handlers/add_spec.rs b/crates/ide_assists/src/handlers/add_spec.rs
index 16ec4b0e82..0f607bbf03 100644
--- a/crates/ide_assists/src/handlers/add_spec.rs
+++ b/crates/ide_assists/src/handlers/add_spec.rs
@@ -80,7 +80,7 @@ pub(crate) fn add_spec(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
                     let mut snippet_idx = 0;
                     let types_snippets = type_names.fold(String::new(), |mut output, arg_name| {
                         snippet_idx += 1;
-                        let _ = write!(output, "${{{}:{}}}, ", snippet_idx, arg_name);
+                        let _ = write!(output, "${{{snippet_idx}:{arg_name}}}, ");
                         output
                     });
                     snippet_idx += 1;
@@ -95,7 +95,7 @@ pub(crate) fn add_spec(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
                 }
                 None => {
                     let types_text = type_names.fold(String::new(), |mut output, arg_name| {
-                        let _ = write!(output, "{}, ", arg_name);
+                        let _ = write!(output, "{arg_name}, ");
                         output
                     });
                     let text = format!(
@@ -115,7 +115,7 @@ pub fn type_name(arg_idx: usize, expr: ast::Expr) -> String {
     if let ast::Expr::ExprMax(ast::ExprMax::Var(var)) = expr {
         format!("{} :: type{}()", var.text(), arg_idx)
     } else {
-        format!("type{}()", arg_idx)
+        format!("type{arg_idx}()")
     }
 }
 
diff --git a/crates/ide_assists/src/handlers/extract_function.rs b/crates/ide_assists/src/handlers/extract_function.rs
index 10c43c440e..4c3c773cac 100644
--- a/crates/ide_assists/src/handlers/extract_function.rs
+++ b/crates/ide_assists/src/handlers/extract_function.rs
@@ -129,7 +129,7 @@ fn make_function_name(ctx: &AssistContext<'_>) -> String {
     let names_in_scope: FxHashSet<_> = def_map
         .get_functions()
         .map(|(na, _)| na)
-        .chain(def_map.get_imports().iter().map(|(na, _)| na))
+        .chain(def_map.get_imports().keys())
         .map(|n| n.name().as_str().to_string())
         .collect();
     let default_name = "fun_name";
diff --git a/crates/ide_assists/src/handlers/extract_variable.rs b/crates/ide_assists/src/handlers/extract_variable.rs
index a4124b4c1b..fa17eb1da7 100644
--- a/crates/ide_assists/src/handlers/extract_variable.rs
+++ b/crates/ide_assists/src/handlers/extract_variable.rs
@@ -109,7 +109,7 @@ pub(crate) fn extract_variable(acc: &mut Assists, ctx: &AssistContext) -> Option
             let offset = anchor.syntax().text_range().start();
             match ctx.config.snippet_cap {
                 Some(cap) => {
-                    let snip = buf.replace(&var_name.to_string(), &format!("$0{}", var_name));
+                    let snip = buf.replace(&var_name.to_string(), &format!("$0{var_name}"));
                     edit.insert_snippet(cap, offset, snip)
                 }
                 None => edit.insert(offset, buf),
diff --git a/crates/ide_assists/src/handlers/implement_behaviour.rs b/crates/ide_assists/src/handlers/implement_behaviour.rs
index 613fd66058..384ac8a65b 100644
--- a/crates/ide_assists/src/handlers/implement_behaviour.rs
+++ b/crates/ide_assists/src/handlers/implement_behaviour.rs
@@ -242,8 +242,7 @@ fn make_implementation(
                 let addition = (
                     callback.name.clone(),
                     Some(format!(
-                        "\n{}({}) ->\n    erlang:error(not_implemented).",
-                        function_name, function_args
+                        "\n{function_name}({function_args}) ->\n    erlang:error(not_implemented)."
                     )),
                 );
                 Some(addition)
diff --git a/crates/ide_assists/src/handlers/inline_function.rs b/crates/ide_assists/src/handlers/inline_function.rs
index 68c3d92c5c..9fb231eb86 100644
--- a/crates/ide_assists/src/handlers/inline_function.rs
+++ b/crates/ide_assists/src/handlers/inline_function.rs
@@ -591,10 +591,7 @@ fn params_text(args: &ast::ExprArgs) -> Option<String> {
     if args.args().count() == 1 {
         Some(args_str)
     } else {
-        Some(format!(
-            "{{{}}}", // open and closing braces, around params
-            args_str
-        ))
+        Some(format!("{{{args_str}}}"))
     }
 }
 
diff --git a/crates/ide_assists/src/helpers.rs b/crates/ide_assists/src/helpers.rs
index 2a121798c3..6170b112b3 100644
--- a/crates/ide_assists/src/helpers.rs
+++ b/crates/ide_assists/src/helpers.rs
@@ -311,7 +311,7 @@ pub(crate) fn change_indent(delta_indent: i8, str: String) -> String {
                     s.trim_start().to_string()
                 } else if delta_indent >= 0 {
                     if !s.is_empty() {
-                        format!("{}{}", indent_str, s)
+                        format!("{indent_str}{s}")
                     } else {
                         s.to_owned()
                     }
diff --git a/crates/ide_assists/src/tests.rs b/crates/ide_assists/src/tests.rs
index 91aa9018ea..6ea0a30f5f 100644
--- a/crates/ide_assists/src/tests.rs
+++ b/crates/ide_assists/src/tests.rs
@@ -180,7 +180,7 @@ fn check(
         let parse = sema.parse(frange.file_id);
         let errors = parse.errors();
         if !errors.is_empty() {
-            assert_eq!(format!("{:?}\nin\n{text}", errors), "");
+            assert_eq!(format!("{errors:?}\nin\n{text}"), "");
         }
     }
 
@@ -279,7 +279,7 @@ fn check(
                 let parse = SourceFile::parse_text(&text);
                 let errors = parse.errors();
                 if !errors.is_empty() {
-                    assert_eq!(format!("{:?}\nin\n{text}", errors), "");
+                    assert_eq!(format!("{errors:?}\nin\n{text}"), "");
                 }
             }
 
@@ -294,7 +294,7 @@ fn check(
                         .iter()
                         .map(|resolved| resolved.label.clone())
                         .collect::<Vec<_>>();
-                    panic!("Expecting \"{}\", but not found in {:?}", label, all);
+                    panic!("Expecting \"{label}\", but not found in {all:?}");
                 }
                 None => panic!("code action is not applicable"),
             };
diff --git a/crates/ide_completion/src/helpers.rs b/crates/ide_completion/src/helpers.rs
index 7f02f03206..3d64901aaf 100644
--- a/crates/ide_completion/src/helpers.rs
+++ b/crates/ide_completion/src/helpers.rs
@@ -53,10 +53,10 @@ pub(crate) fn atom_value(parsed: &InFile<SourceFile>, offset: TextSize) -> Optio
 
 pub(crate) fn format_call(name: &str, arity: u32) -> Contents {
     let args = (1..(arity + 1))
-        .map(|n| format!("${{{}:Arg{}}}", n, n))
+        .map(|n| format!("${{{n}:Arg{n}}}"))
         .collect::<Vec<_>>()
         .join(", ");
-    Contents::Snippet(format!("{}({})", name, args))
+    Contents::Snippet(format!("{name}({args})"))
 }
 
 pub(crate) fn name_slash_arity_completion(
diff --git a/crates/ide_completion/src/macros.rs b/crates/ide_completion/src/macros.rs
index 8a9b801609..8c192e70a7 100644
--- a/crates/ide_completion/src/macros.rs
+++ b/crates/ide_completion/src/macros.rs
@@ -142,7 +142,7 @@ fn macro_name_to_completion(
         (None, None)
     };
     let label = if let Some(app_name) = app_name {
-        format!("{} ({})", macro_name, app_name)
+        format!("{macro_name} ({app_name})")
     } else {
         macro_name.to_string()
     };
diff --git a/crates/ide_completion/src/tests.rs b/crates/ide_completion/src/tests.rs
index c40c446331..d75e276460 100644
--- a/crates/ide_completion/src/tests.rs
+++ b/crates/ide_completion/src/tests.rs
@@ -16,7 +16,7 @@ use crate::Completion;
 pub(crate) fn render_completions(completions: Vec<Completion>) -> String {
     completions
         .iter()
-        .map(|completion| format!("{}", completion))
+        .map(|completion| format!("{completion}"))
         .collect::<Vec<_>>()
         .join("\n")
 }
diff --git a/crates/ide_db/src/apply_change.rs b/crates/ide_db/src/apply_change.rs
index faaed191dc..24d0b03597 100644
--- a/crates/ide_db/src/apply_change.rs
+++ b/crates/ide_db/src/apply_change.rs
@@ -24,7 +24,7 @@ impl RootDatabase {
     ) {
         let _p = tracing::info_span!("RootDatabase::apply_change").entered();
         self.request_cancellation();
-        log::info!("apply_change {:?}", change);
+        log::info!("apply_change {change:?}");
         change.apply(self, resolve_file_id);
     }
 }
diff --git a/crates/ide_db/src/assists.rs b/crates/ide_db/src/assists.rs
index 50e9ad5453..8bafff9046 100644
--- a/crates/ide_db/src/assists.rs
+++ b/crates/ide_db/src/assists.rs
@@ -111,7 +111,7 @@ impl FromStr for AssistKind {
             "RefactorExtract" => Ok(AssistKind::RefactorExtract),
             "RefactorInline" => Ok(AssistKind::RefactorInline),
             "RefactorRewrite" => Ok(AssistKind::RefactorRewrite),
-            unknown => Err(format!("Unknown AssistKind: '{}'", unknown)),
+            unknown => Err(format!("Unknown AssistKind: '{unknown}'")),
         }
     }
 }
diff --git a/crates/ide_db/src/common_test.rs b/crates/ide_db/src/common_test.rs
index 892749f2c8..3601e4ead4 100644
--- a/crates/ide_db/src/common_test.rs
+++ b/crates/ide_db/src/common_test.rs
@@ -50,7 +50,7 @@ pub trait CommonTestDatabase: DefDatabase + RootQueryDb + CommonTestLoader {
 
 fn ct_info(db: &dyn CommonTestDatabase, file_id: FileId) -> Arc<CommonTestInfo> {
     // Context for T171541590
-    let _ = stdx::panic_context::enter(format!("\nct_info: {:?}", file_id));
+    let _ = stdx::panic_context::enter(format!("\nct_info: {file_id:?}"));
     let def_map = db.def_map(file_id);
     if let Some(project_id) = db.file_project_id(file_id) {
         return Arc::new(db.check(project_id, file_id, &def_map));
diff --git a/crates/ide_db/src/diagnostic_code.rs b/crates/ide_db/src/diagnostic_code.rs
index a3848123ce..48dfc4ea92 100644
--- a/crates/ide_db/src/diagnostic_code.rs
+++ b/crates/ide_db/src/diagnostic_code.rs
@@ -370,10 +370,7 @@ impl DiagnosticCode {
     pub fn as_uri(&self) -> Option<String> {
         let namespace = self.as_namespace()?;
         let code = self.as_code();
-        Some(format!(
-            "{}/erlang-error-index/{namespace}/{code}",
-            BASE_URL
-        ))
+        Some(format!("{BASE_URL}/erlang-error-index/{namespace}/{code}"))
     }
 
     /// Check if the diagnostic label is for an AdHoc one.
diff --git a/crates/ide_db/src/docs.rs b/crates/ide_db/src/docs.rs
index 397bbe6afd..7049764289 100644
--- a/crates/ide_db/src/docs.rs
+++ b/crates/ide_db/src/docs.rs
@@ -234,7 +234,7 @@ impl Documentation<'_> {
 // None -> Unknown (e.g. because OTP is not being tracked)
 fn is_file_in_otp(db: &dyn DocDatabase, file_id: FileId) -> Option<bool> {
     // Context for T171541590
-    let _ = stdx::panic_context::enter(format!("\nis_file_in_otp: {:?}", file_id));
+    let _ = stdx::panic_context::enter(format!("\nis_file_in_otp: {file_id:?}"));
     if let Some(app_data) = db.file_app_data(file_id) {
         let project_id = app_data.project_id;
         Some(db.project_data(project_id).project_data(db).otp_project_id == Some(project_id))
@@ -305,9 +305,9 @@ fn merge_type_definitions_and_descriptions(
         .map(|(na, def)| {
             let type_def = def.source(db.upcast()).syntax().to_string();
             let markdown = if let Some(doc) = type_docs.get(na).map(|d| d.markdown_text()) {
-                format!("```erlang\n{}\n```\n\n-----\n\n{}", type_def, doc)
+                format!("```erlang\n{type_def}\n```\n\n-----\n\n{doc}")
             } else {
-                format!("```erlang\n{}\n```", type_def)
+                format!("```erlang\n{type_def}\n```")
             };
             (na.clone(), Doc::new(markdown))
         })
@@ -337,7 +337,7 @@ impl DocLoader for crate::RootDatabase {
     fn load_doc_descriptions(&self, file_id: FileId, doc_origin: DocOrigin) -> FileDoc {
         _ = SourceDatabase::file_text(self, file_id); // Take dependency on the contents of the file we're getting docs for
         // Context for T171541590
-        let _ = stdx::panic_context::enter(format!("\nload_doc_descriptions: {:?}", file_id));
+        let _ = stdx::panic_context::enter(format!("\nload_doc_descriptions: {file_id:?}"));
         let root_id = self.file_source_root(file_id).source_root_id(self);
         let root = self.source_root(root_id).source_root(self);
         let src_db: &dyn RootQueryDb = self.upcast();
diff --git a/crates/ide_db/src/eqwalizer.rs b/crates/ide_db/src/eqwalizer.rs
index 3e13f50ba9..ee71208aef 100644
--- a/crates/ide_db/src/eqwalizer.rs
+++ b/crates/ide_db/src/eqwalizer.rs
@@ -52,12 +52,12 @@ impl EqwalizerLoader for crate::RootDatabase {
                 Some(f) => module_names.push(f.as_str()),
                 None => {
                     // Context for T171541590
-                    let _ = stdx::panic_context::enter(format!("\ntypecheck: {:?}", module));
+                    let _ = stdx::panic_context::enter(format!("\ntypecheck: {module:?}"));
                     let source_root_id =
                         SourceDatabase::file_source_root(self, module).source_root_id(self);
                     let source_root = self.source_root(source_root_id).source_root(self);
                     let path = source_root.path_for_file(&module);
-                    log::error!("Can't find module for path: {:?}", path);
+                    log::error!("Can't find module for path: {path:?}");
                     continue;
                 }
             };
@@ -170,7 +170,7 @@ fn is_eqwalizer_enabled(db: &dyn EqwalizerDatabase, file_id: FileId, include_tes
     }
 
     // Context for T171541590
-    let _ = stdx::panic_context::enter(format!("\nis_eqwalizer_enabled: {:?}", file_id));
+    let _ = stdx::panic_context::enter(format!("\nis_eqwalizer_enabled: {file_id:?}"));
     let app_data = if let Some(app_data) = db.file_app_data(file_id) {
         app_data
     } else {
@@ -268,7 +268,7 @@ fn decl_location(
     let module_index = db.module_index(project_id);
     let module_file_id = module_index.file_for_module(&module)?;
     // Context for T171541590
-    let _ = stdx::panic_context::enter(format!("\ndecl_location: {:?}", module_file_id));
+    let _ = stdx::panic_context::enter(format!("\ndecl_location: {module_file_id:?}"));
     let source_root_id = db.file_source_root(module_file_id).source_root_id(db);
     let source_root = db.source_root(source_root_id).source_root(db);
     let decl_file_path = &source_root.path_for_file(&module_file_id)?;
diff --git a/crates/ide_db/src/erl_ast.rs b/crates/ide_db/src/erl_ast.rs
index bdeb6fd516..69fe763ba5 100644
--- a/crates/ide_db/src/erl_ast.rs
+++ b/crates/ide_db/src/erl_ast.rs
@@ -106,7 +106,7 @@ pub trait ErlAstDatabase: RootQueryDb + AstLoader + LineIndexDatabase {
 
 fn module_ast(db: &dyn ErlAstDatabase, file_id: FileId) -> Arc<ParseResult> {
     // Context for T171541590
-    let _ = stdx::panic_context::enter(format!("\nmodule_ast: {:?}", file_id));
+    let _ = stdx::panic_context::enter(format!("\nmodule_ast: {file_id:?}"));
     let root_id = db.file_source_root(file_id).source_root_id(db);
     let root = db.source_root(root_id).source_root(db);
     let path = root.path_for_file(&file_id).unwrap().as_path().unwrap();
diff --git a/crates/ide_db/src/lib.rs b/crates/ide_db/src/lib.rs
index a84795b6f5..c06cca5dad 100644
--- a/crates/ide_db/src/lib.rs
+++ b/crates/ide_db/src/lib.rs
@@ -313,7 +313,7 @@ impl RootDatabase {
     pub fn resolved_includes(&self, file_id: FileId) -> Option<Includes> {
         let source_file = self.parse(file_id).tree();
         // Context for T171541590
-        let _ = stdx::panic_context::enter(format!("\nresolved_includes: {:?}", file_id));
+        let _ = stdx::panic_context::enter(format!("\nresolved_includes: {file_id:?}"));
         let project_id = self.file_app_data(file_id)?.project_id;
         let root_abs = &self.project_data(project_id).project_data(self).root_dir;
         let form_list = self.file_form_list(file_id);
@@ -382,7 +382,7 @@ impl Includes {
         root_abs: &AbsPathBuf,
     ) -> Option<Utf8PathBuf> {
         // Context for T171541590
-        let _ = stdx::panic_context::enter(format!("\napp_file_path: {:?}", file_id));
+        let _ = stdx::panic_context::enter(format!("\napp_file_path: {file_id:?}"));
         let root_id = db.file_source_root(file_id).source_root_id(db);
         let root = db.source_root(root_id).source_root(db);
         let path = root.path_for_file(&file_id)?;
diff --git a/crates/ide_db/src/rename.rs b/crates/ide_db/src/rename.rs
index fb561a3a73..8bba7219d0 100644
--- a/crates/ide_db/src/rename.rs
+++ b/crates/ide_db/src/rename.rs
@@ -57,7 +57,7 @@ pub use _rename_error as rename_error;
 
 // Delegate checking name validity to the parser
 pub fn is_valid_var_name(new_name: &String) -> bool {
-    let parse = ast::SourceFile::parse_text(format!("foo() -> {} = 1.", new_name).as_str());
+    let parse = ast::SourceFile::parse_text(format!("foo() -> {new_name} = 1.").as_str());
     parse.tree().syntax().descendants().any(|node| {
         if let Some(var) = ast::Var::cast(node) {
             var.syntax().text().to_string() == *new_name
@@ -69,7 +69,7 @@ pub fn is_valid_var_name(new_name: &String) -> bool {
 
 // Delegate checking name validity to the parser
 pub fn is_valid_function_name(new_name: &String) -> bool {
-    let parse = ast::SourceFile::parse_text(format!("{}() -> ok.", new_name).as_str());
+    let parse = ast::SourceFile::parse_text(format!("{new_name}() -> ok.").as_str());
     match parse.tree().forms().next() {
         Some(ast::Form::FunDecl(fun)) => match fun.name() {
             Some(ast::Name::Atom(atom)) => atom.syntax().text().to_string() == *new_name,
@@ -291,7 +291,7 @@ pub fn source_edit_from_references(
     let mut edited_ranges = Vec::new();
     for name in references {
         let new_name = if parens_needed_in_context(name) {
-            format!("({})", new_name)
+            format!("({new_name})")
         } else {
             new_name.clone()
         };
diff --git a/crates/ide_db/src/search.rs b/crates/ide_db/src/search.rs
index 7d792fbf06..cdf5aa6a2c 100644
--- a/crates/ide_db/src/search.rs
+++ b/crates/ide_db/src/search.rs
@@ -179,7 +179,7 @@ impl SymbolDefinition {
             // but our dependencies are not precise enough - especially for types
             let file_id = self.file().file_id;
             // Context for T171541590
-            let _ = stdx::panic_context::enter(format!("\nsearch_scope: {:?}", file_id));
+            let _ = stdx::panic_context::enter(format!("\nsearch_scope: {file_id:?}"));
             let project_id = match sema.db.file_app_data(file_id) {
                 Some(app_data) => app_data.project_id,
                 None => return SearchScope::single_file(file_id, None),
diff --git a/crates/ide_ssr/src/lib.rs b/crates/ide_ssr/src/lib.rs
index af5307fa0b..122be5512f 100644
--- a/crates/ide_ssr/src/lib.rs
+++ b/crates/ide_ssr/src/lib.rs
@@ -562,10 +562,7 @@ impl Match {
         } else {
             // We panic here because this should be used when doing
             // development only, give feedback to the dev.
-            panic!(
-                "expecting a single match for '{}', got multiple",
-                placeholder_name
-            );
+            panic!("expecting a single match for '{placeholder_name}', got multiple");
         }
     }
 
diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 35a40ce85e..77a41556b9 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -263,8 +263,7 @@ impl TryFrom<&str> for BuckTargetOrigin {
             "dep" => Ok(BuckTargetOrigin::Dep),
             "prelude" => Ok(BuckTargetOrigin::Prelude),
             _ => Err(format!(
-                "bad origin value '{}', expected 'app', 'dep', or 'prelude'.",
-                value
+                "bad origin value '{value}', expected 'app', 'dep', or 'prelude'."
             )),
         }
     }
@@ -518,7 +517,7 @@ fn find_root(buck_config: &BuckConfig) -> Result<AbsPathBuf> {
     let output = match buck_config.buck_command().arg("root").output() {
         Ok(out) => out,
         Err(err) => {
-            log::error!("Err executing buck2 root: {:?}", err);
+            log::error!("Err executing buck2 root: {err:?}");
             bail!(ProjectModelError::MissingBuck(err))
         }
     };
@@ -892,7 +891,7 @@ fn update_mapping_from_path(app_name: &str, path: AbsPathBuf, mapping: &mut Incl
                 if let Some(basename) = path.file_name() {
                     let local_include = SmolStr::new(basename);
                     let remote_include =
-                        SmolStr::new(format!("{}/include/{}", app_name, local_include));
+                        SmolStr::new(format!("{app_name}/include/{local_include}"));
                     let path = AbsPathBuf::assert(path);
                     // TODO: remove clone()
                     mapping.insert(local_include, path.clone());
@@ -1155,7 +1154,7 @@ mod tests {
                 .output()
                 .unwrap();
             if !output.status.success() {
-                panic!("{:#?}", output);
+                panic!("{output:#?}");
             }
             let string = String::from_utf8(output.stdout).unwrap();
             let prelude_cell = get_prelude_cell(&buck_config).expect("could not get prelude");
diff --git a/crates/project_model/src/json.rs b/crates/project_model/src/json.rs
index 2861f2a621..3adf353e13 100644
--- a/crates/project_model/src/json.rs
+++ b/crates/project_model/src/json.rs
@@ -141,7 +141,7 @@ fn convert_macro(mac: &eetf::Term) -> (String, String) {
             [Term::Atom(key), Term::Atom(value)] => (key.name.clone(), value.name.to_string()),
             _ => panic!("Invalid macro in ${tuple}"),
         },
-        term => panic!("Term not supported for macro definition: {}", term),
+        term => panic!("Term not supported for macro definition: {term}"),
     }
 }
 
@@ -201,7 +201,7 @@ pub(crate) fn gen_app_data(
             let app: ProjectAppData = match app.to_project_app_data(path, is_dep) {
                 Ok(data) => data,
                 Err(err) => {
-                    log::error!("Error parsing app: {:?}. Err: {}", app, err);
+                    log::error!("Error parsing app: {app:?}. Err: {err}");
                     continue;
                 }
             };
diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs
index cc8dc10c5a..df66b54b4d 100644
--- a/crates/project_model/src/lib.rs
+++ b/crates/project_model/src/lib.rs
@@ -105,7 +105,7 @@ impl fmt::Display for CommandProxy<'_> {
             .get_args()
             .map(|a| a.to_string_lossy())
             .join(" ");
-        write!(f, "{} {}", program, args)
+        write!(f, "{program} {args}")
     }
 }
 
@@ -588,7 +588,7 @@ impl ElpConfig {
                                     }
                                 }
                                 Err(e) => {
-                                    log::warn!("Glob Error: {:?}", e)
+                                    log::warn!("Glob Error: {e:?}")
                                 }
                             }
                         }
@@ -995,8 +995,7 @@ impl Project {
                     RebarProject::from_rebar_build_info(&loaded, rebar_setting.clone())
                         .with_context(|| {
                             format!(
-                                "Failed to decode rebar build info for config file {:?}",
-                                manifest
+                                "Failed to decode rebar build info for config file {manifest:?}"
                             )
                         })?;
                 (
@@ -1077,7 +1076,7 @@ impl Project {
 }
 
 pub fn utf8_stdout(cmd: &mut Command) -> Result<String> {
-    let output = cmd.output().with_context(|| format!("{:?} failed", cmd))?;
+    let output = cmd.output().with_context(|| format!("{cmd:?} failed"))?;
     let stdout = String::from_utf8(output.stdout)?;
     if !output.status.success() {
         match String::from_utf8(output.stderr) {
@@ -1113,7 +1112,7 @@ mod tests {
 
     fn debug_normalise_temp_dir(dir: TempDir, actual: &impl fmt::Debug) -> String {
         let dir_str = dir.path().as_os_str().to_string_lossy().to_string();
-        let actual_debug = format!("{:#?}\n", actual);
+        let actual_debug = format!("{actual:#?}\n");
         actual_debug.replace(dir_str.as_str(), "TMPDIR")
     }
 
@@ -1444,7 +1443,7 @@ mod tests {
                 .downcast_ref::<ProjectModelError>()
             {
                 Some(ProjectModelError::NotInBuckProject) => (),
-                Some(err) => panic!("Wrong err {:?}", err),
+                Some(err) => panic!("Wrong err {err:?}"),
                 None => panic!("Wrong error"),
             };
         }
@@ -1619,7 +1618,7 @@ mod tests {
             "#]]
             .assert_debug_eq(&res);
         } else {
-            panic!("Expected syntax error, got {:?}", manifest)
+            panic!("Expected syntax error, got {manifest:?}")
         }
     }
 
@@ -1653,7 +1652,7 @@ mod tests {
             "#]]
             .assert_debug_eq(&res);
         } else {
-            panic!("Expected syntax error, got {:?}", manifest)
+            panic!("Expected syntax error, got {manifest:?}")
         }
     }
 
diff --git a/crates/project_model/src/otp.rs b/crates/project_model/src/otp.rs
index ee3159b6da..3d561177d8 100644
--- a/crates/project_model/src/otp.rs
+++ b/crates/project_model/src/otp.rs
@@ -106,7 +106,7 @@ impl Otp {
             );
         }
         let path = String::from_utf8(output.stdout)?;
-        let result: Utf8PathBuf = format!("{}/lib", path).into();
+        let result: Utf8PathBuf = format!("{path}/lib").into();
         let result = fs::canonicalize(result)?;
         Ok(Utf8PathBuf::from_path_buf(result).expect("Could not create Utf8PathBuf"))
     }
@@ -168,7 +168,7 @@ impl Otp {
     }
 
     fn discover_otp_apps(path: &Utf8Path) -> Vec<ProjectAppData> {
-        log::info!("Loading OTP apps from {:?}", path);
+        log::info!("Loading OTP apps from {path:?}");
         if let Ok(entries) = fs::read_dir(path) {
             entries
                 .into_iter()
diff --git a/crates/project_model/src/test_fixture.rs b/crates/project_model/src/test_fixture.rs
index b1dbd93d6c..496144bb2b 100644
--- a/crates/project_model/src/test_fixture.rs
+++ b/crates/project_model/src/test_fixture.rs
@@ -257,11 +257,9 @@ impl FixtureWithProjectMeta {
             if line.contains("//-") {
                 assert!(
                     line.starts_with("//-"),
-                    "Metadata line {} has invalid indentation. \
+                    "Metadata line {ix} has invalid indentation. \
                      All metadata lines need to have the same indentation.\n\
-                     The offending line: {:?}",
-                    ix,
-                    line
+                     The offending line: {line:?}"
                 );
             }
 
@@ -274,7 +272,7 @@ impl FixtureWithProjectMeta {
                     && !line.contains("::")
                     && line.chars().all(|it| !it.is_uppercase())
                 {
-                    panic!("looks like invalid metadata line: {:?}", line)
+                    panic!("looks like invalid metadata line: {line:?}")
                 }
 
                 if let Some(entry) = res.last_mut() {
@@ -333,8 +331,7 @@ impl FixtureWithProjectMeta {
         let path = components[0].to_string();
         assert!(
             path.starts_with('/'),
-            "fixture path does not start with `/`: {:?}",
-            path
+            "fixture path does not start with `/`: {path:?}"
         );
 
         let mut app_name = None;
@@ -346,7 +343,7 @@ impl FixtureWithProjectMeta {
         for component in components[1..].iter() {
             let (key, value) = component
                 .split_once(':')
-                .unwrap_or_else(|| panic!("invalid meta line: {:?}", meta));
+                .unwrap_or_else(|| panic!("invalid meta line: {meta:?}"));
             match key {
                 "app" => app_name = Some(AppName(value.to_string())),
                 "include_path" => include_dirs
@@ -369,7 +366,7 @@ impl FixtureWithProjectMeta {
                 "tag" => {
                     tag = Some(value.to_string());
                 }
-                _ => panic!("bad component: {:?}", component),
+                _ => panic!("bad component: {component:?}"),
             }
         }
 
@@ -448,7 +445,7 @@ pub fn extract_tags(mut text: &str, tag: &str) -> (Vec<(TextRange, Option<String
             }
         }
     }
-    assert!(stack.is_empty(), "unmatched <{}>", tag);
+    assert!(stack.is_empty(), "unmatched <{tag}>");
     ranges.sort_by_key(|r| (r.0.start(), r.0.end()));
     (ranges, res)
 }
@@ -503,10 +500,9 @@ pub fn extract_annotations(text: &str) -> (Vec<(TextRange, String)>, String) {
             }
         } else if line.contains(TOP_OF_FILE_MARKER) {
             panic!(
-                "Annotation line {} is invalid here. \
-                     The top of file marker '{}' can only appear first in the file on the left margin.\n\
-                     The offending line: {:?}",
-                idx, TOP_OF_FILE_MARKER, line
+                "Annotation line {idx} is invalid here. \
+                     The top of file marker '{TOP_OF_FILE_MARKER}' can only appear first in the file on the left margin.\n\
+                     The offending line: {line:?}"
             );
         }
         let mut this_line_annotations = Vec::new();
@@ -714,7 +710,7 @@ pub fn extract_offset(text: &str) -> (TextSize, String) {
 /// Infallible version of `try_extract_offset()`.
 pub fn extract_marker_offset(marker: &str, text: &str) -> (TextSize, String) {
     match try_extract_marker(marker, text) {
-        None => panic!("text should contain marker '{}'", marker),
+        None => panic!("text should contain marker '{marker}'"),
         Some(result) => result,
     }
 }
@@ -1046,7 +1042,7 @@ bar() -> ?FOO.
         let (annotations, _text_without_annotations) = extract_annotations(&text);
         let res = annotations
             .into_iter()
-            .map(|(range, ann)| (format!("{:?}", range), &text[range], ann))
+            .map(|(range, ann)| (format!("{range:?}"), &text[range], ann))
             .collect::<Vec<_>>();
 
         assert_eq!(
diff --git a/crates/syntax/src/algo.rs b/crates/syntax/src/algo.rs
index daaea533b2..af72d7de98 100644
--- a/crates/syntax/src/algo.rs
+++ b/crates/syntax/src/algo.rs
@@ -739,7 +739,7 @@ main() ->
 
         let fmt_syntax = |syn: &SyntaxElement| match syn.kind() {
             SyntaxKind::WHITESPACE => format!("{:?}", syn.to_string()),
-            _ => format!("{}", syn),
+            _ => format!("{syn}"),
         };
 
         let insertions =
@@ -775,8 +775,7 @@ main() ->
         });
 
         let actual = format!(
-            "insertions:\n\n{}\n\nreplacements:\n\n{}\n\ndeletions:\n\n{}\n",
-            insertions, replacements, deletions
+            "insertions:\n\n{insertions}\n\nreplacements:\n\n{replacements}\n\ndeletions:\n\n{deletions}\n"
         );
         expected_diff.assert_eq(&actual);
 
diff --git a/crates/syntax/src/ast/edit.rs b/crates/syntax/src/ast/edit.rs
index b73f38cc4a..a5cbc5b884 100644
--- a/crates/syntax/src/ast/edit.rs
+++ b/crates/syntax/src/ast/edit.rs
@@ -133,7 +133,7 @@ impl IndentLevel {
         });
         for token in tokens {
             if token.kind() == WHITESPACE && token.text().contains('\n') {
-                let new_ws = make_whitespace(&token.text().replace(&format!("\n{}", self), "\n"));
+                let new_ws = make_whitespace(&token.text().replace(&format!("\n{self}"), "\n"));
                 ted::replace(token, &new_ws);
             }
         }
diff --git a/crates/syntax/src/ast/node_ext.rs b/crates/syntax/src/ast/node_ext.rs
index 4b650b35a1..f6e9626442 100644
--- a/crates/syntax/src/ast/node_ext.rs
+++ b/crates/syntax/src/ast/node_ext.rs
@@ -815,7 +815,7 @@ mod tests {
     use crate::ast;
 
     fn parse_expr(arg: &str) -> ast::Expr {
-        let text = format!("f() -> {}.", arg);
+        let text = format!("f() -> {arg}.");
         let parse = ast::SourceFile::parse_text(&text);
 
         if !parse.errors().is_empty() {
@@ -824,12 +824,12 @@ mod tests {
 
         let fun = match parse.tree().forms().next().expect("no form parsed") {
             ast::Form::FunDecl(fun) => fun,
-            got => panic!("expected fun, got: {:?}", got),
+            got => panic!("expected fun, got: {got:?}"),
         };
 
         let clause = match fun.clauses().next().expect("no clauses parsed") {
             ast::FunctionOrMacroClause::FunctionClause(clause) => clause,
-            got => panic!("expected clause, got: {:?}", got),
+            got => panic!("expected clause, got: {got:?}"),
         };
 
         clause
@@ -845,7 +845,7 @@ mod tests {
         fn check(parse: &str, expected_op_text: &str, expected_op: UnaryOp) {
             let (op, token) = match parse_expr(parse) {
                 ast::Expr::UnaryOpExpr(unary_op) => unary_op.op().expect("no operator found"),
-                got => panic!("expected unary op, got: {:?}", got),
+                got => panic!("expected unary op, got: {got:?}"),
             };
 
             assert_eq!(token.text(), expected_op_text);
@@ -864,7 +864,7 @@ mod tests {
         fn check(parse: &str, expected_op_text: &str, expected_op: BinaryOp) {
             let (op, token) = match parse_expr(parse) {
                 ast::Expr::BinaryOpExpr(binary_op) => binary_op.op().expect("no operator found"),
-                got => panic!("expected binary op, got: {:?}", got),
+                got => panic!("expected binary op, got: {got:?}"),
             };
 
             assert_eq!(token.text(), expected_op_text);
@@ -979,10 +979,10 @@ mod tests {
     #[test]
     fn test_unary_map_expr() {
         fn check(parse: &str, expected_op_text: &str, expected_op: MapOp) {
-            let parse = format!("#{{{}}}", parse);
+            let parse = format!("#{{{parse}}}");
             let map_expr = match parse_expr(&parse) {
                 ast::Expr::MapExpr(map_expr) => map_expr,
-                got => panic!("expected map expr, got: {:?}", got),
+                got => panic!("expected map expr, got: {got:?}"),
             };
 
             let field = map_expr.fields().next().expect("no map fields parsed");
diff --git a/crates/syntax/src/ast/traits.rs b/crates/syntax/src/ast/traits.rs
index 34af46a59d..440ed82865 100644
--- a/crates/syntax/src/ast/traits.rs
+++ b/crates/syntax/src/ast/traits.rs
@@ -29,7 +29,7 @@ impl HasLabel for ast::FunDecl {
     fn label(&self) -> Option<Label> {
         let name = self.name()?.text()?;
         let arity = self.arity_value()?;
-        Some(Label::new_raw(format!("{}/{}", name, arity)))
+        Some(Label::new_raw(format!("{name}/{arity}")))
     }
 }
 impl HasLabel for ast::RecordDecl {}
@@ -42,7 +42,7 @@ impl HasLabel for ast::PpDefine {
     fn label(&self) -> Option<Label> {
         let name = self.name()?.text()?;
         if let Some(arity) = self.arity_value() {
-            Some(Label::new_raw(format!("{}/{}", name, arity)))
+            Some(Label::new_raw(format!("{name}/{arity}")))
         } else {
             Some(Label::new_raw(name))
         }
diff --git a/crates/syntax/src/lib.rs b/crates/syntax/src/lib.rs
index a61c66dbc8..e1c14f14a1 100644
--- a/crates/syntax/src/lib.rs
+++ b/crates/syntax/src/lib.rs
@@ -622,7 +622,7 @@ mod tests {
             match item {
                 ast::Form::ModuleAttribute(f) => module_attr = Some(f),
                 ast::Form::FunDecl(f) => func = Some(f),
-                x => panic!("{:?}", x),
+                x => panic!("{x:?}"),
                 // _ => unreachable!(),
             }
         }
@@ -639,7 +639,7 @@ mod tests {
                   ANON_DOT@12..13 "."
                 ,
             }"#]]
-        .assert_eq(format!("{:#?}", module).as_str());
+        .assert_eq(format!("{module:#?}").as_str());
 
         match module.name().unwrap() {
             ast::Name::Atom(name) => assert_eq!(name.raw_text(), "foo"),
@@ -675,7 +675,7 @@ mod tests {
                   ANON_DOT@31..32 "."
                 ,
             }"#]]
-        .assert_eq(format!("{:#?}", fun).as_str());
+        .assert_eq(format!("{fun:#?}").as_str());
         let fun_clauses = fun.clauses();
         assert_eq!(fun.clauses().count(), 1);
 
@@ -715,7 +715,7 @@ mod tests {
         for item in fun_clauses {
             match item {
                 ast::FunctionOrMacroClause::FunctionClause(f) => clause = Some(f),
-                x => panic!("{:?}", x),
+                x => panic!("{x:?}"),
                 // _ => unreachable!(),
             }
         }
@@ -788,7 +788,7 @@ mod tests {
                     INTEGER@30..31 "1"
                 ,
             }"#]]
-        .assert_eq(format!("{:#?}", bin_expr).as_str());
+        .assert_eq(format!("{bin_expr:#?}").as_str());
 
         // Besides the "typed" AST API, there's an untyped CST one as well.
         // To switch from AST to CST, call `.syntax()` method:
diff --git a/crates/syntax/src/ptr.rs b/crates/syntax/src/ptr.rs
index 793932d933..cac8b0f458 100644
--- a/crates/syntax/src/ptr.rs
+++ b/crates/syntax/src/ptr.rs
@@ -63,7 +63,7 @@ impl SyntaxNodePtr {
                 .and_then(|it| it.into_node())
         })
         .find(|it| it.text_range() == self.range && it.kind() == self.kind)
-        .unwrap_or_else(|| panic!("can't resolve local ptr to SyntaxNode: {:?}", self))
+        .unwrap_or_else(|| panic!("can't resolve local ptr to SyntaxNode: {self:?}"))
     }
 
     pub fn cast<N: AstNode>(self) -> Option<AstPtr<N>> {
diff --git a/crates/syntax/src/syntax_error.rs b/crates/syntax/src/syntax_error.rs
index dbdc08ac59..1775878704 100644
--- a/crates/syntax/src/syntax_error.rs
+++ b/crates/syntax/src/syntax_error.rs
@@ -44,7 +44,7 @@ impl fmt::Display for SyntaxError {
                 write!(f, "Syntax Error")
             }
             SyntaxError::Missing(m, _) => {
-                write!(f, "Missing '{}'", m)
+                write!(f, "Missing '{m}'")
             }
         }
     }
diff --git a/crates/types_db/src/eqwalizer/mod.rs b/crates/types_db/src/eqwalizer/mod.rs
index dc7d05e3e9..682dfd79b5 100644
--- a/crates/types_db/src/eqwalizer/mod.rs
+++ b/crates/types_db/src/eqwalizer/mod.rs
@@ -62,7 +62,7 @@ pub enum StructuredDiagnostic {
 impl EqwalizerDiagnostic {
     pub fn expr_string(&self) -> String {
         match &self.expression {
-            Some(s) => format!("`{}`.\n", s),
+            Some(s) => format!("`{s}`.\n"),
             None => "".to_string(),
         }
     }
diff --git a/crates/types_db/src/eqwalizer/types.rs b/crates/types_db/src/eqwalizer/types.rs
index 1ec7de1dba..870b30f0fd 100644
--- a/crates/types_db/src/eqwalizer/types.rs
+++ b/crates/types_db/src/eqwalizer/types.rs
@@ -336,7 +336,7 @@ impl fmt::Display for Type {
                 "#{{{}}}",
                 ty.props
                     .iter()
-                    .map(|(k, p)| format!("{} {}", k, p))
+                    .map(|(k, p)| format!("{k} {p}"))
                     .collect::<Vec<_>>()
                     .join(", ")
             ),
@@ -345,7 +345,7 @@ impl fmt::Display for Type {
                 "#{{{}, {} => {}}}",
                 ty.props
                     .iter()
-                    .map(|(k, p)| format!("{} {}", k, p))
+                    .map(|(k, p)| format!("{k} {p}"))
                     .collect::<Vec<_>>()
                     .join(", "),
                 ty.k_type,
@@ -472,6 +472,8 @@ impl std::str::FromStr for Key {
                     _ => (),
                 }
                 if in_parens == 0 && c == ',' {
+                    // TODO: fix this T231065083
+                    #[allow(clippy::char_indices_as_byte_indices)]
                     res.push(s[start..i].trim());
                     start = i + 1;
                 }
diff --git a/xtask/src/codegen.rs b/xtask/src/codegen.rs
index f73e914ac3..c64c199dac 100644
--- a/xtask/src/codegen.rs
+++ b/xtask/src/codegen.rs
@@ -604,7 +604,7 @@ fn read_node_types() -> Result<Vec<NodeType>> {
             let id = SymbolId(language.id_for_node_kind(&node.nodetype, node.named));
             println!("processing {:?}", node.nodetype);
             if node.nodetype == "==>>" {
-                println!("processing {:?}", node);
+                println!("processing {node:?}");
             }
             if id.0 == 65535 {
                 None
@@ -616,8 +616,7 @@ fn read_node_types() -> Result<Vec<NodeType>> {
                         ..
                     } => {
                         panic!(
-                            "raw children without fields assigned are not supported, in {}",
-                            nodetype
+                            "raw children without fields assigned are not supported, in {nodetype}"
                         );
                     }
                     RawNodeType {
@@ -859,7 +858,7 @@ fn build_fields(fields: &BTreeMap<String, RawField>) -> Vec<Field> {
                 // we have some types overlapping with _expr, ignore them
                 [_, ty] if ty.nodetype == "_expr" => ty,
                 [] => panic!("field with no types"),
-                _ => panic!("fields with multiple types are not supported '{}'", k),
+                _ => panic!("fields with multiple types are not supported '{k}'"),
             };
             (k, v, ty)
         })
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index e756ae8e44..cdf2418540 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -133,7 +133,7 @@ pub fn reformat(text: &str) -> Result<String> {
     let stdout = cmd!(sh, "rustfmt --config-path {rustfmt_toml} ")
         .stdin(text)
         .read()?;
-    Ok(format!("//! {}\n\n{}\n", PREAMBLE, stdout))
+    Ok(format!("//! {PREAMBLE}\n\n{stdout}\n"))
 }
 
 fn ensure_rustfmt(sh: &Shell) -> Result<()> {

From 401145b43cb5f58b0127bdbd816693112394052f Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 16 Jul 2025 02:41:27 -0700
Subject: [PATCH 009/394] BE: improve check for path being in mem_docs

Summary: As title

Reviewed By: TheGeorge

Differential Revision: D78333441

fbshipit-source-id: 22cae1907a9520bd8fcf9e02e4817c5c22ab1f57
---
 crates/elp/src/server.rs | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index b20a7f8c30..8a2017631b 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -566,15 +566,13 @@ impl Server {
                         break;
                     }
                 };
-                let (in_mem, version) = match convert::vfs_path(&url) {
-                    Ok(path) => match self.mem_docs.read().get(&path).cloned() {
-                        Some(d) => (true, Some(d.version)),
-                        None => (false, None),
-                    },
-                    Err(_) => (false, None),
-                };
-                if !in_mem {
-                    // Clear all but eqwalizer project diagnostics
+                let version = convert::vfs_path(&url)
+                    .ok()
+                    .and_then(|path| self.mem_docs.read().get(&path).cloned())
+                    .map(|d| d.version);
+                if version.is_none() {
+                    // File is not in mem_docs, clear all but
+                    // eqwalizer project diagnostics
                     Arc::make_mut(&mut self.diagnostics).clear(*file_id);
                 }
                 let diagnostics = self

From 8a2e70ffccb0a2e103a4c8859f9b11d71027ecf7 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 16 Jul 2025 05:47:25 -0700
Subject: [PATCH 010/394] remove --buck-generated CLI arg, it is no longer used

Summary: As title

Reviewed By: TheGeorge

Differential Revision: D78403971

fbshipit-source-id: 4f7df06440465bbc2c5f0227c8506f6864e96fe7
---
 crates/elp/src/bin/args.rs                | 4 ----
 crates/elp/src/resources/test/help.stdout | 3 +--
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index f4a2d282a0..8ec40533bf 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -407,10 +407,6 @@ pub struct Args {
     pub escript: Option<PathBuf>,
     pub no_log_buffering: bool,
 
-    /// When using buck, invoke a build step for generated files.
-    #[allow(dead_code)] // Until T208401551 done
-    pub buck_generated: bool,
-
     /// When using buck, do not invoke a build step for generated files.
     pub no_buck_generated: bool,
 
diff --git a/crates/elp/src/resources/test/help.stdout b/crates/elp/src/resources/test/help.stdout
index 5fcf649866..67fa0d9498 100644
--- a/crates/elp/src/resources/test/help.stdout
+++ b/crates/elp/src/resources/test/help.stdout
@@ -1,11 +1,10 @@
-Usage: [--log-file LOG_FILE] [--erl ERL] [--escript ESCRIPT] [--no-log-buffering] [--buck-generated] [--no-buck-generated] [COMMAND ...]
+Usage: [--log-file LOG_FILE] [--erl ERL] [--escript ESCRIPT] [--no-log-buffering] [--no-buck-generated] [COMMAND ...]
 
 Available options:
         --log-file <LOG_FILE>
         --erl <ERL>
         --escript <ESCRIPT>
         --no-log-buffering
-        --buck-generated       When using buck, invoke a build step for generated files.
         --no-buck-generated    When using buck, do not invoke a build step for generated files.
     -h, --help                 Prints help information
 

From e306e28e01b09cbc0744999a999f654fbac61af2 Mon Sep 17 00:00:00 2001
From: Greg Cowan <cowang@meta.com>
Date: Fri, 18 Jul 2025 05:42:04 -0700
Subject: [PATCH 011/394] Handle long application in elp lint CLI

Summary:
TSIA
Followed https://www.internalfb.com/wiki/WhatsApp/Eng/Infra/Development/Environment_%28IDE%29/VSCode/How_the_Erlang_extension_works/Contributing_to_ELP/

Reviewed By: alanz

Differential Revision: D78359675

fbshipit-source-id: 8e13a7dc63eb1d4a76a0897e4b446af223d1f63c
---
 crates/elp/src/bin/args.rs |  2 +-
 crates/elp/src/bin/main.rs | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index 8ec40533bf..8e7af5ff4f 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -237,7 +237,7 @@ pub struct Lint {
     #[bpaf(argument("MODULE"))]
     pub module: Option<String>,
     /// Parse a single application from the project, not the entire project.
-    #[bpaf(argument("APP"))]
+    #[bpaf(long("app"), long("application"), argument("APP"))]
     pub app: Option<String>,
     /// Parse a single file from the project, not the entire project. This can be an include file or escript, etc.
     #[bpaf(argument("FILE"))]
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index e1eb2a3acc..2415c9f5e5 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -1201,6 +1201,24 @@ mod tests {
         );
     }
 
+    #[test_case(false ; "rebar")]
+    #[test_case(true  ; "buck")]
+    fn lint_application(buck: bool) {
+        simple_snapshot_expect_error(
+            args_vec![
+                "lint",
+                "--application",
+                "app_a",
+                "--diagnostic-filter",
+                "P1700",
+            ],
+            "linter",
+            expect_file!("../resources/test/linter/parse_elp_lint_app.stdout"),
+            buck,
+            None,
+        );
+    }
+
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
     fn lint_report_suppressed(buck: bool) {

From d93e9b69f160cb8cda304d97cc627f03ccba3e96 Mon Sep 17 00:00:00 2001
From: David Ansari <david.ansari@broadcom.com>
Date: Fri, 18 Jul 2025 05:47:55 -0700
Subject: [PATCH 012/394] Document ELP in Neovim example config (#109)

Summary:
Add an example config for ELP in Neovim without using `mason.nvim` as discussed in https://github.com/WhatsApp/erlang-language-platform/issues/87#issuecomment-2967196399

Pull Request resolved: https://github.com/WhatsApp/erlang-language-platform/pull/109

Reviewed By: alanz, TheGeorge

Differential Revision: D77920015

Pulled By: robertoaloi

fbshipit-source-id: dc408c179910bb74b2111b34c056754993ccae56
---
 website/docs/get-started/editors/neovim.md | 71 +++++++++++++++++++++-
 1 file changed, 70 insertions(+), 1 deletion(-)

diff --git a/website/docs/get-started/editors/neovim.md b/website/docs/get-started/editors/neovim.md
index 726694c16f..10bdecd836 100644
--- a/website/docs/get-started/editors/neovim.md
+++ b/website/docs/get-started/editors/neovim.md
@@ -8,6 +8,10 @@ sidebar_position: 5
 
 The ELP project can be used as a [language server](https://microsoft.github.io/language-server-protocol/overviews/lsp/overview/) in Neovim.
 
+## Installation
+
+### `mason.nvim`
+
 The easiest way to install the ELP server is to use [mason.nvim](https://github.com/williamboman/mason.nvim), a package manager
 focused on language servers, linters and similar tools. If you use Neovim for programming, you likely already have `mason.nvim` installed. It is also included in all the most popular "batteries included" configurations/distributions of Neovim such [kickstart.nvim](https://github.com/nvim-lua/kickstart.nvim), [LazyVim](https://github.com/LazyVim/LazyVim), [NVChad](https://nvchad.com/) and others.
 
@@ -19,10 +23,75 @@ from within Neovim.
 
 Alternatively you can run `:Mason` and browse the list of available packages, then press `i` when `elp` is highlighted.
 
-## Updating ELP
+#### Updating ELP
 
 You can update all packages managed by `mason.nvim` by running `:Mason` and pressing `U`.
 
+### Manual installation
+
+Alternatively, if you don't have `mason.nvim` installed, you can [install the ELP binary](../install.md#from-binary) and configure key mappings manually.
+
+#### Example config
+
+Here is an example user config to be placed in your `init.vim` file (`~/.config/nvim/init.vim` on Unix systems):
+```Vimscript
+nnoremap <SPACE> <Nop>
+let mapleader=" "
+
+call plug#begin()
+Plug 'neovim/nvim-lspconfig'
+call plug#end()
+
+lua <<EOF
+local opts = { noremap=true, silent=true }
+vim.api.nvim_set_keymap('n', '<leader>e', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
+
+local on_attach = function(client, bufnr)
+  vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
+  vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
+  if client.server_capabilities.inlayHintProvider then
+    vim.api.nvim_buf_set_keymap(bufnr, 'n', '<leader>ih',
+      '<cmd>lua vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())<CR>',
+      { noremap=true, silent=true, desc = '[T]oggle Inlay [H]ints' })
+  end
+end
+
+require('lspconfig').elp.setup {
+  on_attach = on_attach,
+  settings = {
+    elp = {
+      diagnostics = {
+        disabled = {
+          "W0030",
+          "W0031",
+          "W0032"
+        }
+      }
+    }
+  }
+}
+EOF
+```
+
+In this example config, the Leader key is mapped to `<space>`.
+
+[vim-plug](https://github.com/junegunn/vim-plug), a minimalist Vim plugin manager is used to install [nvim-lspconfig](https://github.com/neovim/nvim-lspconfig).
+
+The Lua code then defines the following key mappings in "normal" Vim mode:
+* `<space>e` displays diagnostics, for example the red text in above screenshot
+* `gd` goes to the definition
+* `K` shows function specs
+* `<space>rn` renames a variable
+* `gr` shows references
+* `<space>ca` suggests code actions for warnings displayed ELP
+* `<space>ih` toggles displaying inlay hints (for example function argument hints)
+
+Finally, you can disable some [warnings](../../erlang-error-index/w/about.md) globally for all your Erlang projects.
+
 ## Troubleshooting
 
 `:LspInfo` shows the current status of the LSP client.

From 14facfe54dd2a38d0db46de4734ab1ac1cdfde00 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 18 Jul 2025 05:50:19 -0700
Subject: [PATCH 013/394] fix dependabot alert for `on-headers`

Summary: As title

Reviewed By: TheGeorge

Differential Revision: D78550118

fbshipit-source-id: 59b8ea42df653fd71793949bd8b79745d87aff88
---
 website/package.json | 3 ++-
 website/yarn.lock    | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/website/package.json b/website/package.json
index c1cc4cd30f..d14528fe23 100644
--- a/website/package.json
+++ b/website/package.json
@@ -59,6 +59,7 @@
     "estree-util-value-to-estree": ">=3.3.3",
     "http-proxy-middleware": ">=2.0.9",
     "brace-expansion": ">=1.1.12",
-    "webpack-dev-server": ">=5.2.1"
+    "webpack-dev-server": ">=5.2.1",
+    "on-headers": ">=1.1.0"
   }
 }
diff --git a/website/yarn.lock b/website/yarn.lock
index 92774354a2..d4634fde1d 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -8209,10 +8209,10 @@ on-finished@2.4.1, on-finished@^2.4.1:
   dependencies:
     ee-first "1.1.1"
 
-on-headers@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
-  integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
+on-headers@>=1.1.0, on-headers@~1.0.2:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.1.0.tgz#59da4f91c45f5f989c6e4bcedc5a3b0aed70ff65"
+  integrity sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==
 
 once@^1.3.0:
   version "1.4.0"

From 5ab3f58c741917d790bdb9e491bdc5b4ef291015 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 18 Jul 2025 07:21:05 -0700
Subject: [PATCH 014/394] Tweak elp_development.md

Summary:
- Add some metadata indicating the files it applies to
- Fix the formatting

Reviewed By: TD5

Differential Revision: D78276191

fbshipit-source-id: f8c47162dea2dd97574fb34de9ba436496aef9fb
---
 .llms/rules/elp_development.md | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/.llms/rules/elp_development.md b/.llms/rules/elp_development.md
index c2e52eec1a..b92c227c6c 100644
--- a/.llms/rules/elp_development.md
+++ b/.llms/rules/elp_development.md
@@ -1,11 +1,18 @@
+---
+llms-gk: 'devmate_elp_development_md'
+apply_to: '*.rs,*.md'
+---
+
 # ELP Development Rules for LLMs
 
 ## Project Overview
+
 ELP (Erlang Language Platform) is a language server and development tools suite for Erlang, built in Rust. This project provides IDE features, diagnostics, and code analysis for Erlang codebases.
 
 ## Diagnostic Code Management
 
 ### Adding New Diagnostic Codes
+
 When adding new diagnostic codes to `DiagnosticCode` enum:
 
 1. **Naming Convention**: Use descriptive PascalCase names that clearly indicate the issue
@@ -41,6 +48,7 @@ When adding new diagnostic codes to `DiagnosticCode` enum:
    - The `as_uri()` method automatically generates URLs pointing to these docs
 
 ### Creating DiagnosticDescriptor
+
 Every diagnostic must have a corresponding `DiagnosticDescriptor` that defines when and how the diagnostic runs:
 
 1. **Static Descriptor Declaration**: Create a public static descriptor in your diagnostic module
@@ -69,6 +77,7 @@ Every diagnostic must have a corresponding `DiagnosticDescriptor` that defines w
    - Use SSR patterns when appropriate for complex matching
 
 ### Meta-Only vs OSS Code
+
 - Use `@fb-only` and `@oss-only` comments to mark platform-specific code
 - Meta-only diagnostics should use `MetaOnlyDiagnosticCode` wrapper
 - Ensure OSS builds work by providing fallbacks for Meta-only features
@@ -76,21 +85,25 @@ Every diagnostic must have a corresponding `DiagnosticDescriptor` that defines w
 ## Rust Code Style
 
 ### Error Handling
+
 - Use `Result<T, E>` for fallible operations
 - Prefer `?` operator over explicit match for error propagation
 - Use descriptive error messages with context
 
 ### Pattern Matching
+
 - Use exhaustive matches for enums to catch new variants at compile time
 - Add explicit comments when intentionally using catch-all patterns
 - Prefer early returns to reduce nesting
 
 ### String Handling
+
 - Use `&str` for borrowed strings, `String` for owned
 - Use `format!()` for complex string formatting
 - Use `to_string()` for simple conversions
 
 ### Collections
+
 - Use `FxHashMap` instead of `std::HashMap` for better performance
 - Use `lazy_static!` for expensive static computations
 - Prefer iterators over manual loops where possible
@@ -98,28 +111,32 @@ Every diagnostic must have a corresponding `DiagnosticDescriptor` that defines w
 ## Testing Guidelines
 
 ### Test Structure
+
 - Use `expect_test` for snapshot testing of complex outputs
 - Group related tests in the same module
 - Use descriptive test names that explain the scenario
 
 ### Test Data
+
 - Create minimal test cases that focus on specific functionality
 - Use realistic Erlang code examples in tests
 - Test both positive and negative cases
 
 ### Existing tests
-- Do not change existing tests without asking
 
+- Do not change existing tests without asking
 
 ## Documentation
 
 ### Code Comments
+
 - Document complex algorithms and business logic
 - Explain WHY, not just WHAT the code does
 - Use `///` for public API documentation
 - Use `//` for internal implementation notes
 
 ### Error Messages
+
 - Make error messages actionable and user-friendly
 - Include context about what was expected vs. what was found
 - Provide suggestions for fixing the issue when possible
@@ -127,11 +144,13 @@ Every diagnostic must have a corresponding `DiagnosticDescriptor` that defines w
 ## Performance Considerations
 
 ### Memory Usage
+
 - Use `Box<T>` for large enum variants to keep enum size small
 - Consider using `Cow<str>` for strings that might be borrowed or owned
 - Use `Arc<T>` for shared immutable data
 
 ### Computation
+
 - Cache expensive computations using `lazy_static!` or `once_cell`
 - Use appropriate data structures (HashMap for lookups, Vec for sequences)
 - Profile code paths that handle large Erlang codebases
@@ -139,11 +158,13 @@ Every diagnostic must have a corresponding `DiagnosticDescriptor` that defines w
 ## Integration Guidelines
 
 ### Erlang Service Integration
+
 - Handle Erlang service errors gracefully
 - Use appropriate namespaces for different error sources
 - Maintain backward compatibility with existing error codes
 
 ### IDE Integration
+
 - Provide rich diagnostic information (ranges, severity, fixes)
 - Support quick fixes and code actions where appropriate
 - Ensure diagnostics are fast enough for real-time feedback
@@ -151,16 +172,19 @@ Every diagnostic must have a corresponding `DiagnosticDescriptor` that defines w
 ## Maintenance
 
 ### Backward Compatibility
+
 - Don't change existing diagnostic codes or their meanings
 - Deprecate old codes before removing them
 - Maintain serialization compatibility for configuration files
 
 ### Code Organization
+
 - Keep related functionality together in modules
 - Use clear module boundaries and public APIs
 - Minimize dependencies between modules
 
 ### Version Management
+
 - Follow semantic versioning for public APIs
 - Document breaking changes in release notes
 - Provide migration guides for major changes
@@ -168,16 +192,19 @@ Every diagnostic must have a corresponding `DiagnosticDescriptor` that defines w
 ## Common Patterns
 
 ### Regex Usage
+
 - Use `lazy_static!` for compiled regexes
 - Prefer specific patterns over overly broad ones
 - Test regex patterns thoroughly with edge cases
 
 ### Configuration
+
 - Support both code-based and label-based diagnostic references
 - Use serde for serialization/deserialization
 - Provide sensible defaults for all configuration options
 
 ### Error Recovery
+
 - Continue processing after encountering errors when possible
 - Collect multiple errors rather than failing on the first one
 - Provide partial results when full analysis isn't possible
@@ -190,5 +217,6 @@ Every diagnostic must have a corresponding `DiagnosticDescriptor` that defines w
 - Use `arc lint --apply-patches` for formatting.
 
 ### Process
+
 - Always run tests before finishing.
 - Always run `./meta/cargo.sh clippy --tests` before submitting a diff

From ddbb00c34bc7f97b9dcc4aadf1e28840e4f7db27 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 18 Jul 2025 08:15:38 -0700
Subject: [PATCH 015/394] Fix tests on master

Summary:
Some new modules were added to the buck2 directory, they affect expected results for one of the ELP tests.

Fix them

Reviewed By: mapoulin

Differential Revision: D78558795

fbshipit-source-id: 3e3b0b9b7c8c70699e91735fa0baa349ebf6c01a
---
 .../buck_tests_2/resolves_generated_includes.stdout   | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
index f55e2925c6..7c9890aa86 100644
--- a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
+++ b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
@@ -1,5 +1,5 @@
 Reporting all diagnostics codes
-Diagnostics reported in 2 modules:
+Diagnostics reported in 4 modules:
   app_a: 3
       0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
       5:9-5:31::[WeakWarning] [W0037] Unspecific include.
@@ -7,3 +7,12 @@ Diagnostics reported in 2 modules:
   auto_gen_a: 2
       0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
       0:8-0:18::[WeakWarning] [W0046] The module is not documented.
+  eqwalizer: 1
+      1:8-1:17::[WeakWarning] [W0046] The module is not documented.
+  wa_buck2_module_search: 6
+      19:0-19:18::[WeakWarning] [W0040] The function is non-trivial, exported, but not documented.
+      2:8-2:30::[WeakWarning] [W0046] The module is not documented.
+      49:18-49:31::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
+      51:18-51:28::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
+      51:38-51:51::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
+      55:30-55:40::[WeakWarning] [W0051] Binary string can be written using sigil syntax.

From 9927c3bb20fe7ea193703bbdc8a5fa1f2a30001a Mon Sep 17 00:00:00 2001
From: Jonathan Arns <jonathan.arns@ericsson.com>
Date: Mon, 21 Jul 2025 01:15:08 -0700
Subject: [PATCH 016/394] .elp.toml: add eqwalizer option ignore modules (#108)

Summary:
As the title says and as proposed in https://github.com/WhatsApp/erlang-language-platform/issues/67, this adds a config option that allows ignoring specific modules for `eqwalize-all`.

I think it would be nice to also allow some form of patterns (regex or shell-style globs) in addition to plain module names, e.g.
```
[eqwalizer]
ignore_modules = ["some_module", "some_app_*_pb"]
```
Q: Would patterns also be acceptable or does that violate some project rules or conventions?

Closes https://github.com/WhatsApp/erlang-language-platform/issues/67

Pull Request resolved: https://github.com/WhatsApp/erlang-language-platform/pull/108

Reviewed By: TheGeorge

Differential Revision: D77657335

Pulled By: alanz

fbshipit-source-id: 74b8e37e998d436485137c978758793bfe805334
---
 crates/elp/src/bin/main.rs                    | 30 +++++++++++++++++++
 .../eqwalize_all_bail_on_error_success.pretty |  1 +
 .../eqwalize_bail_on_error_failure.pretty     |  9 ++++++
 crates/ide_db/src/eqwalizer.rs                | 10 ++++++-
 crates/project_model/src/lib.rs               | 26 ++++++++++++++++
 .../eqwalizer_ignore_modules/.elp.toml        |  6 ++++
 .../apps/app_a/include/app_a.hrl              |  1 +
 .../apps/app_a/src/another_module_a.erl       |  4 +++
 .../apps/app_a/src/app_a.erl                  |  4 +++
 .../apps/app_b/src/app_b.erl                  |  5 ++++
 .../get-started/configure-project/elp-toml.md | 13 ++++----
 11 files changed, 102 insertions(+), 7 deletions(-)
 create mode 100644 crates/elp/src/resources/test/eqwalizer_ignore_modules/eqwalize_all_bail_on_error_success.pretty
 create mode 100644 crates/elp/src/resources/test/eqwalizer_ignore_modules/eqwalize_bail_on_error_failure.pretty
 create mode 100644 test_projects/eqwalizer_ignore_modules/.elp.toml
 create mode 100644 test_projects/eqwalizer_ignore_modules/apps/app_a/include/app_a.hrl
 create mode 100644 test_projects/eqwalizer_ignore_modules/apps/app_a/src/another_module_a.erl
 create mode 100644 test_projects/eqwalizer_ignore_modules/apps/app_a/src/app_a.erl
 create mode 100644 test_projects/eqwalizer_ignore_modules/apps/app_b/src/app_b.erl

diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 2415c9f5e5..e3614f9bba 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -1964,6 +1964,36 @@ mod tests {
         }
     }
 
+    #[test]
+    fn eqwalize_specific_module_overrides_ignore_modules() {
+        if otp_supported_by_eqwalizer() {
+            simple_snapshot_expect_error(
+                args_vec!["eqwalize", "--bail-on-error", "app_b"],
+                "eqwalizer_ignore_modules",
+                expect_file!(
+                    "../resources/test/eqwalizer_ignore_modules/eqwalize_bail_on_error_failure.pretty"
+                ),
+                true,
+                None,
+            );
+        }
+    }
+
+    #[test]
+    fn eqwalize_all_ignore_modules_success() {
+        if otp_supported_by_eqwalizer() {
+            simple_snapshot(
+                args_vec!["eqwalize-all", "--bail-on-error"],
+                "eqwalizer_ignore_modules",
+                expect_file!(
+                    "../resources/test/eqwalizer_ignore_modules/eqwalize_all_bail_on_error_success.pretty"
+                ),
+                true,
+                None,
+            );
+        }
+    }
+
     // -----------------------------------------------------------------
 
     #[test]
diff --git a/crates/elp/src/resources/test/eqwalizer_ignore_modules/eqwalize_all_bail_on_error_success.pretty b/crates/elp/src/resources/test/eqwalizer_ignore_modules/eqwalize_all_bail_on_error_success.pretty
new file mode 100644
index 0000000000..89dc33db74
--- /dev/null
+++ b/crates/elp/src/resources/test/eqwalizer_ignore_modules/eqwalize_all_bail_on_error_success.pretty
@@ -0,0 +1 @@
+NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_ignore_modules/eqwalize_bail_on_error_failure.pretty b/crates/elp/src/resources/test/eqwalizer_ignore_modules/eqwalize_bail_on_error_failure.pretty
new file mode 100644
index 0000000000..cf53ad2a46
--- /dev/null
+++ b/crates/elp/src/resources/test/eqwalizer_ignore_modules/eqwalize_bail_on_error_failure.pretty
@@ -0,0 +1,9 @@
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+  ┌─ apps/app_b/src/app_b.erl:5:15
+  │
+5 │ test_fun() -> type_error.
+  │               ^^^^^^^^^^ 'type_error'.
+Expression has type:   'type_error'
+Context expected type: 'ok'
+
+1 ERROR
diff --git a/crates/ide_db/src/eqwalizer.rs b/crates/ide_db/src/eqwalizer.rs
index ee71208aef..01e0be3e28 100644
--- a/crates/ide_db/src/eqwalizer.rs
+++ b/crates/ide_db/src/eqwalizer.rs
@@ -185,7 +185,15 @@ fn is_eqwalizer_enabled(db: &dyn EqwalizerDatabase, file_id: FileId, include_tes
     let global_opt_in = eqwalizer_config.enable_all;
     let opt_in =
         (global_opt_in && (is_src || is_test_opted_in)) || db.has_eqwalizer_module_marker(file_id);
-    let ignored = db.has_eqwalizer_ignore_marker(file_id);
+    let ignored_in_config = if let Some(module_name) = module_index.module_for_file(file_id) {
+        eqwalizer_config
+            .ignore_modules_compiled_patterns
+            .iter()
+            .any(|pattern| pattern.matches(module_name.as_str()))
+    } else {
+        false
+    };
+    let ignored = ignored_in_config || db.has_eqwalizer_ignore_marker(file_id);
     opt_in && !ignored
 }
 
diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs
index df66b54b4d..d8f47836aa 100644
--- a/crates/project_model/src/lib.rs
+++ b/crates/project_model/src/lib.rs
@@ -34,6 +34,7 @@ use buck::TargetFullName;
 use elp_log::timeit;
 use fxhash::FxHashMap;
 use fxhash::FxHashSet;
+use glob::Pattern;
 use glob::glob;
 use itertools::Either;
 use itertools::Itertools;
@@ -402,6 +403,11 @@ pub struct EqwalizerConfig {
     pub enable_all: bool,
     #[serde(default = "eqwalizer_max_tasks_default")]
     pub max_tasks: usize,
+    #[serde(default = "eqwalizer_ignore_modules_default")]
+    pub ignore_modules: Vec<String>,
+    #[serde(skip_deserializing)]
+    #[serde(skip_serializing)]
+    pub ignore_modules_compiled_patterns: Vec<Pattern>,
 }
 
 fn eqwalizer_enable_all_default() -> bool {
@@ -412,15 +418,31 @@ fn eqwalizer_max_tasks_default() -> usize {
     4
 }
 
+fn eqwalizer_ignore_modules_default() -> Vec<String> {
+    vec![]
+}
+
 impl Default for EqwalizerConfig {
     fn default() -> Self {
         Self {
             enable_all: eqwalizer_enable_all_default(),
             max_tasks: eqwalizer_max_tasks_default(),
+            ignore_modules: eqwalizer_ignore_modules_default(),
+            ignore_modules_compiled_patterns: vec![],
         }
     }
 }
 
+impl EqwalizerConfig {
+    pub fn compile_patterns(&mut self) {
+        self.ignore_modules_compiled_patterns = self
+            .ignore_modules
+            .iter()
+            .map(|s| Pattern::new(s).unwrap())
+            .collect();
+    }
+}
+
 #[derive(Debug, Default, Clone, PartialEq, Eq, Deserialize, Serialize)]
 pub struct BuildInfoConfig {
     pub file: Option<PathBuf>,
@@ -507,6 +529,7 @@ impl ElpConfig {
             Ok(mut config) => {
                 BuckConfig::make_config(&path, &mut config)?;
                 config.config_path = Some(path);
+                config.eqwalizer.compile_patterns();
 
                 Ok(config)
             }
@@ -1775,6 +1798,8 @@ mod tests {
             eqwalizer: EqwalizerConfig {
                 enable_all: true,
                 max_tasks: 34,
+                ignore_modules: vec!["some_module".to_string()],
+                ignore_modules_compiled_patterns: vec![Pattern::new("some_module").unwrap()],
             },
             rebar: ElpRebarConfig {
                 profile: "my_profile".to_string(),
@@ -1797,6 +1822,7 @@ mod tests {
             [eqwalizer]
             enable_all = true
             max_tasks = 34
+            ignore_modules = ["some_module"]
 
             [rebar]
             profile = "my_profile"
diff --git a/test_projects/eqwalizer_ignore_modules/.elp.toml b/test_projects/eqwalizer_ignore_modules/.elp.toml
new file mode 100644
index 0000000000..a86511e704
--- /dev/null
+++ b/test_projects/eqwalizer_ignore_modules/.elp.toml
@@ -0,0 +1,6 @@
+[build_info]
+apps = "apps/*"
+deps = "deps/*"
+
+[eqwalizer]
+ignore_modules = ["*_a", "app_b"]
diff --git a/test_projects/eqwalizer_ignore_modules/apps/app_a/include/app_a.hrl b/test_projects/eqwalizer_ignore_modules/apps/app_a/include/app_a.hrl
new file mode 100644
index 0000000000..831e29e939
--- /dev/null
+++ b/test_projects/eqwalizer_ignore_modules/apps/app_a/include/app_a.hrl
@@ -0,0 +1 @@
+-compile(debug_info).
diff --git a/test_projects/eqwalizer_ignore_modules/apps/app_a/src/another_module_a.erl b/test_projects/eqwalizer_ignore_modules/apps/app_a/src/another_module_a.erl
new file mode 100644
index 0000000000..1af81c0cba
--- /dev/null
+++ b/test_projects/eqwalizer_ignore_modules/apps/app_a/src/another_module_a.erl
@@ -0,0 +1,4 @@
+-module(another_module_a).
+
+-spec test_fun() -> ok.
+test_fun() -> type_error.
diff --git a/test_projects/eqwalizer_ignore_modules/apps/app_a/src/app_a.erl b/test_projects/eqwalizer_ignore_modules/apps/app_a/src/app_a.erl
new file mode 100644
index 0000000000..b8c18ff18e
--- /dev/null
+++ b/test_projects/eqwalizer_ignore_modules/apps/app_a/src/app_a.erl
@@ -0,0 +1,4 @@
+-module(app_a).
+
+-spec test_fun() -> ok.
+test_fun() -> type_error.
diff --git a/test_projects/eqwalizer_ignore_modules/apps/app_b/src/app_b.erl b/test_projects/eqwalizer_ignore_modules/apps/app_b/src/app_b.erl
new file mode 100644
index 0000000000..7f23e5f368
--- /dev/null
+++ b/test_projects/eqwalizer_ignore_modules/apps/app_b/src/app_b.erl
@@ -0,0 +1,5 @@
+-module(app_b).
+-include_lib("app_a/include/app_a.hrl").
+
+-spec test_fun() -> ok.
+test_fun() -> type_error.
diff --git a/website/docs/get-started/configure-project/elp-toml.md b/website/docs/get-started/configure-project/elp-toml.md
index 3bbf6dcdfa..557027a138 100644
--- a/website/docs/get-started/configure-project/elp-toml.md
+++ b/website/docs/get-started/configure-project/elp-toml.md
@@ -25,6 +25,7 @@ file = "my_hand_crafted_build_info.json"
 [eqwalizer]
 enable_all = true
 max_tasks = 32
+ignore_modules = ["very_big_generated_module"]
 
 [buck]
 enabled = false
@@ -87,8 +88,7 @@ type checker. The integration can be configured via this section.
 
 :::info
 
-By default eqWAlizer is enabled on all non-test modules. It is also disabled for
-modules containing the `@generated` keyword within their first 2000 characters.
+By default eqWAlizer is enabled on all non-test modules, including generated modules.
 This can be overriden per module via the following attributes:
 
 - `-eqwalizer(ignore).` Opt-out module unconditionally
@@ -96,10 +96,11 @@ This can be overriden per module via the following attributes:
 
 :::
 
-| Key         | Type    | Description                                                                                                                                          |
-| ----------- | ------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- |
-| enabled_all | Boolean | Disable eqwalizer for all modules by default, but still honours the module-specific overrides listed above                                           |
-| max_tasks   | Integer | Max number of parallel eqWAlizer tasks, defaults to 4 (eqWAlizer instances are memory intensive). This only applies to using eqWAlizer from the CLI. |
+| Key            | Type           | Description                                                                                                                                          |
+| -------------- | -------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- |
+| enabled_all    | Boolean        | Enable eqwalizer for all modules by default, but still honours the module-specific overrides listed above and the ignore_modules list.               |
+| max_tasks      | Integer        | Max number of parallel eqWAlizer tasks, defaults to 4 (eqWAlizer instances are memory intensive). This only applies to using eqWAlizer from the CLI. |
+| ignore_modules | List of String | Disable eqwalizer for individual modules from the config.                                                                                            |
 
 ### \[buck\] {#buck}
 

From 69cfea0b3d58151bd28f640d200e752672c3f7dc Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 21 Jul 2025 02:59:01 -0700
Subject: [PATCH 017/394] Track original file when resolving includes

Summary:
When `erlc` resolves an `-include_lib(..)` directive it does so with the search path of the original file.

Up to now ELP has been taking a lenient approach to include file resolution, and has not precisely resolved according to the explicit dependencies of a given application. The application is determined from the originating `FileId`.

This diff keeps track of the originating `FileId`, so it can be used for more precise tracking in a later diff

Reviewed By: TD5

Differential Revision: D78165061

fbshipit-source-id: 225c1af47abea00616fc2763a26c6c89ae2db55f
---
 crates/base_db/src/include.rs       | 27 ++++++++++++++++++---------
 crates/hir/src/include.rs           |  6 +++---
 crates/ide_completion/src/macros.rs |  2 +-
 crates/ide_db/src/erl_ast.rs        | 22 +++++++++++++++-------
 4 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/crates/base_db/src/include.rs b/crates/base_db/src/include.rs
index 458db14773..4fb1ae70f8 100644
--- a/crates/base_db/src/include.rs
+++ b/crates/base_db/src/include.rs
@@ -22,30 +22,38 @@ use crate::SourceRoot;
 pub struct IncludeCtx<'a> {
     db: &'a dyn RootQueryDb,
     source_root: Arc<SourceRoot>,
-    pub file_id: FileId,
+    pub orig_file_id: Option<FileId>,
+    pub current_file_id: FileId,
 }
 
 impl<'a> IncludeCtx<'a> {
-    pub fn new(db: &'a dyn RootQueryDb, file_id: FileId) -> Self {
+    pub fn new(
+        db: &'a dyn RootQueryDb,
+        orig_file_id: Option<FileId>,
+        current_file_id: FileId,
+    ) -> Self {
         // Context for T171541590
-        let _ = stdx::panic_context::enter(format!("\nIncludeCtx::new: {file_id:?}"));
-        let source_root_id = db.file_source_root(file_id).source_root_id(db);
+        let _ = stdx::panic_context::enter(format!(
+            "\nIncludeCtx::new: {orig_file_id:?} {current_file_id:?}"
+        ));
+        let source_root_id = db.file_source_root(current_file_id).source_root_id(db);
         let source_root = db.source_root(source_root_id).source_root(db);
         Self {
             db,
-            file_id,
+            orig_file_id,
+            current_file_id,
             source_root,
         }
     }
 
     pub fn resolve_include(&self, path: &str) -> Option<FileId> {
         self.resolve_relative(path)
-            .or_else(|| self.db.resolve_local(self.file_id, path.into()))
+            .or_else(|| self.db.resolve_local(self.current_file_id, path.into()))
     }
 
     pub fn resolve_include_lib(&self, path: &str) -> Option<FileId> {
         self.resolve_include(path)
-            .or_else(|| self.db.resolve_remote(self.file_id, path.into()))
+            .or_else(|| self.db.resolve_remote(self.current_file_id, path.into()))
     }
 
     pub fn resolve_include_doc(&self, path: &str) -> Option<FileId> {
@@ -53,7 +61,7 @@ impl<'a> IncludeCtx<'a> {
     }
 
     fn resolve_relative(&self, path: &str) -> Option<FileId> {
-        self.source_root.relative_path(self.file_id, path)
+        self.source_root.relative_path(self.current_file_id, path)
     }
 
     /// Called via salsa for inserting in the graph
@@ -155,7 +163,8 @@ pub fn generated_file_include_lib(
         .iter()
         .find_map(|dir| include_path.as_path()?.strip_prefix(dir))?;
     let candidate = format!("{}/include/{}", inc_app_data.name, candidate_path.as_str());
-    let resolved_file_id = IncludeCtx::new(db, file_id).resolve_include_lib(&candidate)?;
+    let resolved_file_id =
+        IncludeCtx::new(db, Some(file_id), file_id).resolve_include_lib(&candidate)?;
     if resolved_file_id == included_file_id {
         // We have an equivalent include
         Some(candidate)
diff --git a/crates/hir/src/include.rs b/crates/hir/src/include.rs
index 70430742ea..3c8fb294c1 100644
--- a/crates/hir/src/include.rs
+++ b/crates/hir/src/include.rs
@@ -20,8 +20,8 @@ pub(crate) fn resolve(
     db: &dyn DefDatabase,
     include_id: InFile<IncludeAttributeId>,
 ) -> Option<FileId> {
-    let ctx = &IncludeCtx::new(db.upcast(), include_id.file_id);
-    let form_list = db.file_form_list(ctx.file_id);
+    let ctx = &IncludeCtx::new(db.upcast(), None, include_id.file_id);
+    let form_list = db.file_form_list(ctx.current_file_id);
     let (path, file_id) = match &form_list[include_id.value] {
         IncludeAttribute::Include { path, .. } => (path, ctx.resolve_include(path)),
         IncludeAttribute::IncludeLib { path, .. } => (path, ctx.resolve_include_lib(path)),
@@ -30,7 +30,7 @@ pub(crate) fn resolve(
         let module_str = if let Some(module_attribute) = form_list.module_attribute() {
             module_attribute.name.as_str().to_string()
         } else {
-            format!("{:?}", ctx.file_id)
+            format!("{:?}", ctx.current_file_id)
         };
         log::warn!("Unable to resolve \"{path}\" in '{module_str}'");
     }
diff --git a/crates/ide_completion/src/macros.rs b/crates/ide_completion/src/macros.rs
index 8c192e70a7..715fe77505 100644
--- a/crates/ide_completion/src/macros.rs
+++ b/crates/ide_completion/src/macros.rs
@@ -220,7 +220,7 @@ pub fn get_include_file(
 
     let candidate = format!("{}/{}", inc_app_data.name, candidate_path.as_str());
     // Check that it is valid
-    let resolved_file_id = IncludeCtx::new(db, file_id).resolve_include_lib(&candidate)?;
+    let resolved_file_id = IncludeCtx::new(db, None, file_id).resolve_include_lib(&candidate)?;
     if resolved_file_id == included_file_id {
         // We have an equivalent include
         Some(IncludeFile {
diff --git a/crates/ide_db/src/erl_ast.rs b/crates/ide_db/src/erl_ast.rs
index 69fe763ba5..0d6e1a2648 100644
--- a/crates/ide_db/src/erl_ast.rs
+++ b/crates/ide_db/src/erl_ast.rs
@@ -74,22 +74,30 @@ impl AstLoader for crate::RootDatabase {
         erlang_service.request_parse(
             req,
             || self.unwind_if_revision_cancelled(),
-            &move |file_id, include_type, path| resolve_include(self, file_id, include_type, path),
+            &move |current_file_id, include_type, path| {
+                resolve_include(self, file_id, current_file_id, include_type, path)
+            },
         )
     }
 }
 
 fn resolve_include(
     db: &dyn RootQueryDb,
-    file_id: FileId,
+    orig_file_id: FileId,
+    current_file_id: FileId,
     include_type: IncludeType,
     path: &str,
 ) -> Option<(String, FileId, Arc<str>)> {
-    let include_file_id = match include_type {
-        IncludeType::Normal => IncludeCtx::new(db, file_id).resolve_include(path)?,
-        IncludeType::Lib => IncludeCtx::new(db, file_id).resolve_include_lib(path)?,
-        IncludeType::Doc => IncludeCtx::new(db, file_id).resolve_include_doc(path)?,
-    };
+    let include_file_id =
+        match include_type {
+            IncludeType::Normal => {
+                IncludeCtx::new(db, Some(orig_file_id), current_file_id).resolve_include(path)?
+            }
+            IncludeType::Lib => IncludeCtx::new(db, Some(orig_file_id), current_file_id)
+                .resolve_include_lib(path)?,
+            IncludeType::Doc => IncludeCtx::new(db, Some(orig_file_id), current_file_id)
+                .resolve_include_doc(path)?,
+        };
     let path = path_for_file(db, include_file_id).map(|vfs_path| vfs_path.to_string())?;
     Some((
         path,

From 4d0fad71fde4d4fe51bfaf60c42f8c241397b034 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 21 Jul 2025 02:59:01 -0700
Subject: [PATCH 018/394] BE: move update_mapping_from_path to IncludeMapping

Summary:
As title. It is now a struct, this is the natural home.
And it will simplify adding OTP paths in a later diff.

Reviewed By: TheGeorge

Differential Revision: D78486867

fbshipit-source-id: ce012c07ae13ab0276a00f0dcd69d589c73d811c
---
 crates/project_model/src/buck.rs | 46 +++++++++++++++-----------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 77a41556b9..636f4d59a3 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -162,6 +162,25 @@ pub struct IncludeMapping {
 }
 
 impl IncludeMapping {
+    fn update_mapping_from_path(&mut self, app_name: &str, path: AbsPathBuf) {
+        if let Ok(paths) = Utf8PathBuf::from(path).read_dir_utf8() {
+            for path in paths.flatten() {
+                let path = path.into_path();
+                if let Some("hrl") = path.extension() {
+                    if let Some(basename) = path.file_name() {
+                        let local_include = SmolStr::new(basename);
+                        let remote_include =
+                            SmolStr::new(format!("{app_name}/include/{local_include}"));
+                        let path = AbsPathBuf::assert(path);
+                        // TODO: remove clone()
+                        self.insert(local_include, path.clone());
+                        self.insert(remote_include, path);
+                    }
+                }
+            }
+        }
+    }
+
     pub fn get(&self, path: &SmolStr) -> Option<&AbsPathBuf> {
         self.includes.get(path)
     }
@@ -774,18 +793,14 @@ fn targets_to_project_data_bxl(
     for target in targets.values() {
         target.include_files.iter().for_each(|inc: &AbsPathBuf| {
             let include_path = include_path_from_file(inc);
-            update_mapping_from_path(&target.app_name.0, include_path, &mut include_mapping);
+            include_mapping.update_mapping_from_path(&target.app_name.0, include_path);
         });
 
         if target.private_header {
             target.src_files.iter().for_each(|path: &AbsPathBuf| {
                 if Some("hrl") == path.extension() {
                     let include_path = include_path_from_file(path);
-                    update_mapping_from_path(
-                        &target.app_name.0,
-                        include_path,
-                        &mut include_mapping,
-                    );
+                    include_mapping.update_mapping_from_path(&target.app_name.0, include_path);
                 }
             });
         }
@@ -883,25 +898,6 @@ fn include_path_from_file(path: &AbsPath) -> AbsPathBuf {
     }
 }
 
-fn update_mapping_from_path(app_name: &str, path: AbsPathBuf, mapping: &mut IncludeMapping) {
-    if let Ok(paths) = Utf8PathBuf::from(path).read_dir_utf8() {
-        for path in paths.flatten() {
-            let path = path.into_path();
-            if let Some("hrl") = path.extension() {
-                if let Some(basename) = path.file_name() {
-                    let local_include = SmolStr::new(basename);
-                    let remote_include =
-                        SmolStr::new(format!("{app_name}/include/{local_include}"));
-                    let path = AbsPathBuf::assert(path);
-                    // TODO: remove clone()
-                    mapping.insert(local_include, path.clone());
-                    mapping.insert(remote_include, path);
-                }
-            }
-        }
-    }
-}
-
 /// This is used in tests
 pub fn get_prelude_cell(buck_config: &BuckConfig) -> Result<String> {
     let output = buck_config

From f8fa36611357fbff909b52e3f77604593a460fa4 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 21 Jul 2025 02:59:01 -0700
Subject: [PATCH 019/394] BE: inline buck::load_from_config_bxl

Summary: It is only used in one place. This prepares for changes to the calculation in the next diff.

Reviewed By: TheGeorge

Differential Revision: D78486961

fbshipit-source-id: c01cb401a3eb6bb36c8b55e75b02ce04a8309928
---
 crates/project_model/src/buck.rs | 46 ++++++++++----------------------
 1 file changed, 14 insertions(+), 32 deletions(-)

diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 636f4d59a3..397f76124a 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -205,9 +205,20 @@ impl BuckProject {
         anyhow::Error,
     > {
         let _timer = timeit_with_telemetry!("BuckProject::load_from_config");
-        let (otp_root, project_app_data, project, include_mapping) =
-            load_from_config_bxl(buck_conf, query_config, report_progress)?;
-        Ok((project, project_app_data, otp_root, include_mapping))
+        let target_info = load_buck_targets_bxl(buck_conf, query_config, report_progress)?;
+        report_progress("Making project app data");
+        let (project_app_data, include_mapping) = targets_to_project_data_bxl(&target_info.targets);
+        let project = BuckProject {
+            target_info,
+            buck_conf: buck_conf.clone(),
+        };
+        let otp_root = Otp::find_otp()?;
+        Ok((
+            project,
+            project_app_data,
+            otp_root,
+            Arc::new(include_mapping),
+        ))
     }
 
     pub fn target(&self, file_path: &AbsPathBuf) -> Option<String> {
@@ -215,35 +226,6 @@ impl BuckProject {
     }
 }
 
-fn load_from_config_bxl(
-    buck_conf: &BuckConfig,
-    build: &BuckQueryConfig,
-    report_progress: &impl Fn(&str),
-) -> Result<
-    (
-        Utf8PathBuf,
-        Vec<ProjectAppData>,
-        BuckProject,
-        Arc<IncludeMapping>,
-    ),
-    anyhow::Error,
-> {
-    let target_info = load_buck_targets_bxl(buck_conf, build, report_progress)?;
-    report_progress("Making project app data");
-    let otp_root = Otp::find_otp()?;
-    let (project_app_data, include_mapping) = targets_to_project_data_bxl(&target_info.targets);
-    let project = BuckProject {
-        target_info,
-        buck_conf: buck_conf.clone(),
-    };
-    Ok((
-        otp_root,
-        project_app_data,
-        project,
-        Arc::new(include_mapping),
-    ))
-}
-
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(try_from = "String", into = "String")]
 #[derive(Default)]

From 9fd2bc40aa9b8b76da0ddcf887404dad96473bee Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 21 Jul 2025 03:23:34 -0700
Subject: [PATCH 020/394] Bump extension version to 0.38

Summary: As title, preparing for release

Reviewed By: Balajiganapathi

Differential Revision: D78654847

fbshipit-source-id: 0b1f3c93dc5bafc4bfd724a726e149a1411f0b9f
---
 editors/code/package-lock.json | 4 ++--
 editors/code/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 9c6e577627..298ab19203 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "erlang-language-platform",
-  "version": "0.37.0",
+  "version": "0.38.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "erlang-language-platform",
-      "version": "0.37.0",
+      "version": "0.38.0",
       "hasInstallScript": true,
       "license": "Apache2",
       "devDependencies": {
diff --git a/editors/code/package.json b/editors/code/package.json
index 7ef6ea3a01..7dd026d352 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -3,7 +3,7 @@
   "description": "Erlang language server",
   "author": "Meta Platforms, Inc",
   "license": "Apache2",
-  "version": "0.37.0",
+  "version": "0.38.0",
   "icon": "images/elp-logo-color.png",
   "homepage": "https://whatsapp.github.io/erlang-language-platform/",
   "repository": {

From f8f557a10576324781a2bec76e94c9d3b5b554c4 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 21 Jul 2025 04:20:42 -0700
Subject: [PATCH 021/394] BE: fix tests on master

Summary: As title.

Reviewed By: TD5

Differential Revision: D78657388

fbshipit-source-id: e6d535c895ce71eec404a88324bcb72d7cc918e8
---
 crates/base_db/src/fixture.rs   |  8 ++++++++
 crates/project_model/src/lib.rs | 14 ++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/crates/base_db/src/fixture.rs b/crates/base_db/src/fixture.rs
index 22e6c85c97..f935cd0485 100644
--- a/crates/base_db/src/fixture.rs
+++ b/crates/base_db/src/fixture.rs
@@ -667,6 +667,8 @@ bar() -> ?FOO.
                             eqwalizer_config: EqwalizerConfig {
                                 enable_all: true,
                                 max_tasks: 4,
+                                ignore_modules: [],
+                                ignore_modules_compiled_patterns: [],
                             },
                             include_mapping: Some(
                                 IncludeMapping {
@@ -705,6 +707,8 @@ bar() -> ?FOO.
                             eqwalizer_config: EqwalizerConfig {
                                 enable_all: true,
                                 max_tasks: 4,
+                                ignore_modules: [],
+                                ignore_modules_compiled_patterns: [],
                             },
                             include_mapping: Some(
                                 IncludeMapping {
@@ -838,6 +842,8 @@ foo() -> ?BAR.
                             eqwalizer_config: EqwalizerConfig {
                                 enable_all: true,
                                 max_tasks: 4,
+                                ignore_modules: [],
+                                ignore_modules_compiled_patterns: [],
                             },
                             include_mapping: Some(
                                 IncludeMapping {
@@ -866,6 +872,8 @@ foo() -> ?BAR.
                             eqwalizer_config: EqwalizerConfig {
                                 enable_all: true,
                                 max_tasks: 4,
+                                ignore_modules: [],
+                                ignore_modules_compiled_patterns: [],
                             },
                             include_mapping: Some(
                                 IncludeMapping {
diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs
index d8f47836aa..938746d0d1 100644
--- a/crates/project_model/src/lib.rs
+++ b/crates/project_model/src/lib.rs
@@ -1175,6 +1175,8 @@ mod tests {
                         eqwalizer: EqwalizerConfig {
                             enable_all: true,
                             max_tasks: 4,
+                            ignore_modules: [],
+                            ignore_modules_compiled_patterns: [],
                         },
                         rebar: ElpRebarConfig {
                             profile: "test",
@@ -1238,6 +1240,8 @@ mod tests {
                         eqwalizer: EqwalizerConfig {
                             enable_all: true,
                             max_tasks: 4,
+                            ignore_modules: [],
+                            ignore_modules_compiled_patterns: [],
                         },
                         rebar: ElpRebarConfig {
                             profile: "test",
@@ -1346,6 +1350,8 @@ mod tests {
                         eqwalizer: EqwalizerConfig {
                             enable_all: true,
                             max_tasks: 4,
+                            ignore_modules: [],
+                            ignore_modules_compiled_patterns: [],
                         },
                         rebar: ElpRebarConfig {
                             profile: "test",
@@ -1499,6 +1505,8 @@ mod tests {
                         eqwalizer: EqwalizerConfig {
                             enable_all: true,
                             max_tasks: 4,
+                            ignore_modules: [],
+                            ignore_modules_compiled_patterns: [],
                         },
                         rebar: ElpRebarConfig {
                             profile: "test",
@@ -1566,6 +1574,8 @@ mod tests {
                             eqwalizer: EqwalizerConfig {
                                 enable_all: true,
                                 max_tasks: 4,
+                                ignore_modules: [],
+                                ignore_modules_compiled_patterns: [],
                             },
                             rebar: ElpRebarConfig {
                                 profile: "test",
@@ -1757,6 +1767,8 @@ mod tests {
                     eqwalizer: EqwalizerConfig {
                         enable_all: true,
                         max_tasks: 4,
+                        ignore_modules: [],
+                        ignore_modules_compiled_patterns: [],
                     },
                     rebar: ElpRebarConfig {
                         profile: "other",
@@ -1893,6 +1905,8 @@ mod tests {
                 eqwalizer: EqwalizerConfig {
                     enable_all: true,
                     max_tasks: 34,
+                    ignore_modules: [],
+                    ignore_modules_compiled_patterns: [],
                 },
                 rebar: ElpRebarConfig {
                     profile: "my_profile",

From c46e6934af3109c0fa42f342be373c849cf6fd1a Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 21 Jul 2025 04:58:39 -0700
Subject: [PATCH 022/394] Use buck dependencies when resolving include_lib

Summary:
It is time to explicitly check that the application referred to in an `include_lib` directive is part of the (transitive) dependencies of the originating file application (== buck target).

This processing is currently only applied to buck projects, so the `basedb::include` processing is updated to distinguish between the case where there is a mapping, and where there is not. Prior to this it tried the include mapping and fell back to more lax processing. This is no longer valid, as we may explicitly decide that an `include_lib` should **not** be resolved, in which case there should be no fallback processing.

We also need to clearly distinguish between a local lookup and an `include_lib` lookup in the `IncludeMapping`.  We do so by encoding the key into the hashmap of include strings to paths with an `L:` or 'R:` for the two cases.

An alternative would be to store a tuple of `(IncludeMappingScope, <lookup_path>)`.

Reviewed By: TheGeorge

Differential Revision: D77937818

fbshipit-source-id: bb3827b0ead94103025f784c4ff713991418f944
---
 crates/base_db/src/fixture.rs                 | 28 +-----
 crates/base_db/src/include.rs                 | 98 ++++++++++++++++---
 crates/base_db/src/input.rs                   |  2 +-
 crates/base_db/src/lib.rs                     | 18 +++-
 crates/elp/src/bin/main.rs                    | 26 +++++
 .../include_lib_non_dependency_fails.stdout   |  6 ++
 .../include_lib_non_dependency_rebar.stdout   |  2 +
 crates/project_model/src/buck.rs              | 96 +++++++++++++++++-
 crates/project_model/src/lib.rs               | 29 ++----
 .../include_lib_dependency_test/.elp.toml     |  5 +
 .../external_app/include/external_header.hrl  |  4 +
 .../external_app/src/external_app.app.src     | 10 ++
 .../external_app/src/external_app.erl         |  6 ++
 .../extra_app/include/extra_header.hrl        |  3 +
 .../extra_app/src/extra_app.app.src           | 10 ++
 .../extra_app/src/extra_app.erl               |  6 ++
 .../main_app/src/main_app.app.src             | 10 ++
 .../main_app/src/main_app.erl                 | 17 ++++
 .../include_lib_dependency_test/rebar.config  |  9 ++
 19 files changed, 315 insertions(+), 70 deletions(-)
 create mode 100644 crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout
 create mode 100644 crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout
 create mode 100644 test_projects/include_lib_dependency_test/.elp.toml
 create mode 100644 test_projects/include_lib_dependency_test/external_app/include/external_header.hrl
 create mode 100644 test_projects/include_lib_dependency_test/external_app/src/external_app.app.src
 create mode 100644 test_projects/include_lib_dependency_test/external_app/src/external_app.erl
 create mode 100644 test_projects/include_lib_dependency_test/extra_app/include/extra_header.hrl
 create mode 100644 test_projects/include_lib_dependency_test/extra_app/src/extra_app.app.src
 create mode 100644 test_projects/include_lib_dependency_test/extra_app/src/extra_app.erl
 create mode 100644 test_projects/include_lib_dependency_test/main_app/src/main_app.app.src
 create mode 100644 test_projects/include_lib_dependency_test/main_app/src/main_app.erl
 create mode 100644 test_projects/include_lib_dependency_test/rebar.config

diff --git a/crates/base_db/src/fixture.rs b/crates/base_db/src/fixture.rs
index f935cd0485..d48a221534 100644
--- a/crates/base_db/src/fixture.rs
+++ b/crates/base_db/src/fixture.rs
@@ -670,12 +670,7 @@ bar() -> ?FOO.
                                 ignore_modules: [],
                                 ignore_modules_compiled_patterns: [],
                             },
-                            include_mapping: Some(
-                                IncludeMapping {
-                                    includes: {},
-                                    deps: {},
-                                },
-                            ),
+                            include_mapping: None,
                         },
                         ProjectId(
                             1,
@@ -710,12 +705,7 @@ bar() -> ?FOO.
                                 ignore_modules: [],
                                 ignore_modules_compiled_patterns: [],
                             },
-                            include_mapping: Some(
-                                IncludeMapping {
-                                    includes: {},
-                                    deps: {},
-                                },
-                            ),
+                            include_mapping: None,
                         },
                     },
                     catch_all_source_root: SourceRootId(
@@ -845,12 +835,7 @@ foo() -> ?BAR.
                                 ignore_modules: [],
                                 ignore_modules_compiled_patterns: [],
                             },
-                            include_mapping: Some(
-                                IncludeMapping {
-                                    includes: {},
-                                    deps: {},
-                                },
-                            ),
+                            include_mapping: None,
                         },
                         ProjectId(
                             1,
@@ -875,12 +860,7 @@ foo() -> ?BAR.
                                 ignore_modules: [],
                                 ignore_modules_compiled_patterns: [],
                             },
-                            include_mapping: Some(
-                                IncludeMapping {
-                                    includes: {},
-                                    deps: {},
-                                },
-                            ),
+                            include_mapping: None,
                         },
                     },
                     catch_all_source_root: SourceRootId(
diff --git a/crates/base_db/src/include.rs b/crates/base_db/src/include.rs
index 4fb1ae70f8..efc3588943 100644
--- a/crates/base_db/src/include.rs
+++ b/crates/base_db/src/include.rs
@@ -10,6 +10,8 @@
 
 use std::sync::Arc;
 
+use elp_project_model::AppName;
+use elp_project_model::buck::IncludeMappingScope;
 use elp_syntax::SmolStr;
 use vfs::FileId;
 use vfs::VfsPath;
@@ -22,7 +24,12 @@ use crate::SourceRoot;
 pub struct IncludeCtx<'a> {
     db: &'a dyn RootQueryDb,
     source_root: Arc<SourceRoot>,
+    /// The starting .erl file when resolving includes
     pub orig_file_id: Option<FileId>,
+    /// The current `FileId`. This starts out the same as
+    /// `orig_file_id`, but will change if a nested include file is
+    /// processed.  The dependency graph for includes is calculated
+    /// based on the `orig_file_id`, if set.
     pub current_file_id: FileId,
 }
 
@@ -52,8 +59,10 @@ impl<'a> IncludeCtx<'a> {
     }
 
     pub fn resolve_include_lib(&self, path: &str) -> Option<FileId> {
-        self.resolve_include(path)
-            .or_else(|| self.db.resolve_remote(self.current_file_id, path.into()))
+        self.resolve_include(path).or_else(|| {
+            self.db
+                .resolve_remote(self.orig_file_id, self.current_file_id, path.into())
+        })
     }
 
     pub fn resolve_include_doc(&self, path: &str) -> Option<FileId> {
@@ -71,7 +80,9 @@ impl<'a> IncludeCtx<'a> {
         path: SmolStr,
     ) -> Option<FileId> {
         let project_id = db.file_project_id(file_id)?;
-        if let Some(file_id) = db.mapped_include_file(project_id, path.clone()) {
+        if let Some(file_id) =
+            db.mapped_include_file(project_id, IncludeMappingScope::Local, path.clone())
+        {
             Some(file_id)
         } else {
             let path: &str = &path;
@@ -84,30 +95,87 @@ impl<'a> IncludeCtx<'a> {
     }
 
     /// Called via salsa for inserting in the graph
+    /// When processing a .erl file, it can include other files, and so on recursively.
+    /// In this case, the starting file is the `orig_file_id`, and the current file is
+    /// the one being processed.
     pub(crate) fn resolve_remote_query(
         db: &dyn RootQueryDb,
-        file_id: FileId,
+        orig_file_id: Option<FileId>,
+        current_file_id: FileId,
         path: SmolStr,
     ) -> Option<FileId> {
-        let project_id = db.file_project_id(file_id)?;
+        let project_id = db.file_project_id(current_file_id)?;
         let project_data = db.project_data(project_id).project_data(db);
-        let include = if let Some(include_mapping) = &project_data.include_mapping {
-            include_mapping
-                .get(&path)
+        // `app_data` represents the app that is doing the including.
+        // If `orig_file_id` is set, we are possibly processing a
+        // nested include file.  In this case we must do our checking
+        // based on its app data.
+        let app_data = orig_file_id
+            .map(|file_id| db.file_app_data(file_id))
+            .unwrap_or_else(|| db.file_app_data(current_file_id))?;
+        let (app_name, include_path) = path.split_once('/')?;
+        let source_root_id = project_data.app_roots.get(app_name)?;
+        let target_app_data = db.app_data(source_root_id)?;
+        if let Some(include_mapping) = &project_data.include_mapping {
+            if let Some(p) = include_mapping
+                .get(IncludeMappingScope::Remote, &path)
                 .map(|path| db.include_file_id(project_id, VfsPath::from(path.clone())))
+            {
+                if p.is_some() {
+                    // We have an entry in the include mapping, and it maps to a FileId
+                    if let Some(target_full_name) = &app_data.buck_target_name {
+                        // We have an entry for the lookup, only return it
+                        // if it is in the dependencies
+                        if include_mapping.is_dep(target_full_name, &AppName(app_name.to_string()))
+                        {
+                            p
+                        } else {
+                            // We have a lookup value, but it is not a
+                            // dependency, do not do fallback processing
+                            None
+                        }
+                    } else {
+                        // This should not be possible. We only have
+                        // an include mapping for a buck project, and
+                        // so the `buck_target_name` should be
+                        // populated.
+                        log::warn!(
+                            "include mapping without buck_target_name: app:{:?}, path:{}",
+                            &app_data.name,
+                            &path
+                        );
+                        None
+                    }
+                } else {
+                    // We do have an entry in the include mapping, but
+                    // it does not resolve to a valid FileId.
+                    // This should also not happen.
+                    log::warn!(
+                        "include mapping does not resolve to FileId: app:{:?}, path:{}, p:{:?}",
+                        &app_data.name,
+                        &path,
+                        &p
+                    );
+                    None
+                }
+            } else {
+                // We did not find an entry in the include mapping.
+
+                // TODO: remove when OTP and local includes resolved later in the stack
+                let path = target_app_data.dir.join(include_path);
+                db.include_file_id(project_id, VfsPath::from(path.clone()))
+            }
         } else {
-            None
-        };
-        include.unwrap_or_else(|| {
-            let (app_name, include_path) = path.split_once('/')?;
-            let source_root_id = project_data.app_roots.get(app_name)?;
-            let target_app_data = db.app_data(source_root_id)?;
+            // There is no include mapping.
+            // This is the path followed when it is not a buck2
+            // project, as those are currently the only ones that
+            // populate the include_mapping.
             let path = target_app_data.dir.join(include_path);
             db.include_file_id(project_id, VfsPath::from(path.clone()))
                 .or_else(|| {
                     find_generated_include_lib(db, project_id, include_path, &target_app_data)
                 })
-        })
+        }
     }
 }
 
diff --git a/crates/base_db/src/input.rs b/crates/base_db/src/input.rs
index 75223bc3bd..8b679c0c6b 100644
--- a/crates/base_db/src/input.rs
+++ b/crates/base_db/src/input.rs
@@ -396,7 +396,7 @@ impl<'a> ProjectApps<'a> {
                 otp_project_id: self.otp_project_id,
                 app_roots,
                 eqwalizer_config: project.eqwalizer_config.clone(),
-                include_mapping: Some(project.include_mapping.clone()),
+                include_mapping: project.include_mapping.clone(),
             };
             app_structure.add_project_data(project_id, project_data);
         }
diff --git a/crates/base_db/src/lib.rs b/crates/base_db/src/lib.rs
index 5f32cc358b..4dd3a1c865 100644
--- a/crates/base_db/src/lib.rs
+++ b/crates/base_db/src/lib.rs
@@ -16,6 +16,7 @@ use dashmap::DashMap;
 use dashmap::Entry;
 use elp_project_model::AppName;
 use elp_project_model::buck::IncludeMapping;
+use elp_project_model::buck::IncludeMappingScope;
 use elp_syntax::AstNode;
 use elp_syntax::Parse;
 use elp_syntax::SmolStr;
@@ -360,7 +361,12 @@ pub trait RootQueryDb: SourceDatabase + salsa::Database {
 
     fn include_file_id(&self, project_id: ProjectId, path: VfsPath) -> Option<FileId>;
 
-    fn mapped_include_file(&self, project_id: ProjectId, path: SmolStr) -> Option<FileId>;
+    fn mapped_include_file(
+        &self,
+        project_id: ProjectId,
+        scope: IncludeMappingScope,
+        path: SmolStr,
+    ) -> Option<FileId>;
 
     fn file_app_data(&self, file_id: FileId) -> Option<Arc<AppData>>;
 
@@ -404,7 +410,12 @@ pub trait RootQueryDb: SourceDatabase + salsa::Database {
     fn resolve_local(&self, file_id: FileId, path: SmolStr) -> Option<FileId>;
 
     #[salsa::invoke(IncludeCtx::resolve_remote_query)]
-    fn resolve_remote(&self, file_id: FileId, path: SmolStr) -> Option<FileId>;
+    fn resolve_remote(
+        &self,
+        orig_file_id: Option<FileId>,
+        current_file_id: FileId,
+        path: SmolStr,
+    ) -> Option<FileId>;
 }
 
 #[salsa::db]
@@ -563,10 +574,11 @@ fn include_file_id(db: &dyn RootQueryDb, project_id: ProjectId, path: VfsPath) -
 fn mapped_include_file(
     db: &dyn RootQueryDb,
     project_id: ProjectId,
+    scope: IncludeMappingScope,
     path: SmolStr,
 ) -> Option<FileId> {
     let include_file_index = db.include_file_index(project_id);
-    let file_path = include_file_index.include_mapping.get(&path)?;
+    let file_path = include_file_index.include_mapping.get(scope, &path)?;
     include_file_index
         .path_to_file_id
         .get(&VfsPath::from(file_path.clone()))
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index e3614f9bba..0ec9526c44 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -2192,6 +2192,32 @@ mod tests {
         }
     }
 
+    #[test_case(false ; "rebar")]
+    #[test_case(true  ; "buck")]
+    fn include_lib_non_dependency_fails(buck: bool) {
+        if buck {
+            simple_snapshot_expect_error(
+                args_vec!["parse-elp", "--module", "main_app"],
+                "include_lib_dependency_test",
+                expect_file!(
+                    "../resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout"
+                ),
+                buck,
+                None,
+            );
+        } else {
+            simple_snapshot(
+                args_vec!["parse-elp", "--module", "main_app"],
+                "include_lib_dependency_test",
+                expect_file!(
+                    "../resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout"
+                ),
+                buck,
+                None,
+            );
+        };
+    }
+
     #[track_caller]
     fn simple_snapshot(
         args: Vec<OsString>,
diff --git a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout
new file mode 100644
index 0000000000..1778f5269a
--- /dev/null
+++ b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout
@@ -0,0 +1,6 @@
+module specified: main_app
+Diagnostics reported in 1 modules:
+  main_app: 3
+      4:13-4:55::[Error] [E1516] can't find include lib "external_app/include/external_header.hrl"
+      10:9-10:24::[Error] [L1227] function test_function/0 undefined
+      16:4-16:19::[Error] [E1507] undefined macro 'EXTERNAL_MACRO'
diff --git a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout
new file mode 100644
index 0000000000..0e70190970
--- /dev/null
+++ b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout
@@ -0,0 +1,2 @@
+module specified: main_app
+No errors reported
diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 397f76124a..750f098ad2 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -159,8 +159,24 @@ pub struct BuckProject {
 pub struct IncludeMapping {
     includes: FxHashMap<SmolStr, AbsPathBuf>,
     deps: FxHashMap<TargetFullName, FxHashSet<TargetFullName>>,
+    /// A buck target can have an alternative app name in case the
+    /// last part of its `TargetFullName` is ambiguous.  Keep a
+    /// mapping from these to the corresponding `TargetFullName`.
+    app_names: FxHashMap<AppName, TargetFullName>,
 }
 
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+pub enum IncludeMappingScope {
+    Local,
+    Remote,
+}
+
+/// We add a prefix to the local and remote lookup strings in the
+/// `IncludeMapping`, so we can do dependency checking on the remote
+/// one via `include_lib`
+const LOCAL_LOOKUP_INCLUDE_PREFIX: &str = "L";
+const REMOTE_LOOKUP_INCLUDE_PREFIX: &str = "R";
+
 impl IncludeMapping {
     fn update_mapping_from_path(&mut self, app_name: &str, path: AbsPathBuf) {
         if let Ok(paths) = Utf8PathBuf::from(path).read_dir_utf8() {
@@ -168,9 +184,13 @@ impl IncludeMapping {
                 let path = path.into_path();
                 if let Some("hrl") = path.extension() {
                     if let Some(basename) = path.file_name() {
-                        let local_include = SmolStr::new(basename);
-                        let remote_include =
-                            SmolStr::new(format!("{app_name}/include/{local_include}"));
+                        let local_include =
+                            SmolStr::new(format!("{LOCAL_LOOKUP_INCLUDE_PREFIX}:{basename}"));
+                        let trimmed_app_name =
+                            app_name.strip_suffix("_includes_only").unwrap_or(app_name);
+                        let remote_include = SmolStr::new(format!(
+                            "{REMOTE_LOOKUP_INCLUDE_PREFIX}:{trimmed_app_name}/include/{basename}"
+                        ));
                         let path = AbsPathBuf::assert(path);
                         // TODO: remove clone()
                         self.insert(local_include, path.clone());
@@ -181,13 +201,59 @@ impl IncludeMapping {
         }
     }
 
-    pub fn get(&self, path: &SmolStr) -> Option<&AbsPathBuf> {
-        self.includes.get(path)
+    pub fn get(&self, scope: IncludeMappingScope, path: &SmolStr) -> Option<&AbsPathBuf> {
+        let lookup_path = match scope {
+            IncludeMappingScope::Local => {
+                SmolStr::new(format!("{LOCAL_LOOKUP_INCLUDE_PREFIX}:{path}"))
+            }
+            IncludeMappingScope::Remote => {
+                SmolStr::new(format!("{REMOTE_LOOKUP_INCLUDE_PREFIX}:{path}"))
+            }
+        };
+        self.includes.get(&lookup_path)
     }
 
     pub fn insert(&mut self, path: SmolStr, abs_path: AbsPathBuf) -> Option<AbsPathBuf> {
         self.includes.insert(path, abs_path)
     }
+
+    /// For each buck TargetFullName we have a set of immediate dependencies.
+    /// Check for the `source` one if the target is in the graph rooted at it.
+    pub fn is_dep(&self, source: &TargetFullName, target_app: &AppName) -> bool {
+        if let Some(target) = self.app_names.get(target_app) {
+            let mut visited = FxHashSet::default();
+            self.dfs(source, target, &mut visited)
+        } else {
+            false
+        }
+    }
+
+    fn dfs(
+        &self,
+        current: &TargetFullName,
+        target: &TargetFullName,
+        visited: &mut FxHashSet<TargetFullName>,
+    ) -> bool {
+        if current == target {
+            return true;
+        }
+
+        if visited.contains(current) {
+            return false;
+        }
+
+        visited.insert(current.clone());
+
+        if let Some(deps) = self.deps.get(current) {
+            for dep in deps {
+                if self.dfs(dep, target, visited) {
+                    return true;
+                }
+            }
+        }
+
+        false
+    }
 }
 
 impl BuckProject {
@@ -270,6 +336,7 @@ impl TryFrom<&str> for BuckTargetOrigin {
     }
 }
 
+/// The interface type used in reading the output of running `elp.bxl`
 #[derive(Deserialize, Debug)]
 pub struct BuckTarget {
     name: String,
@@ -295,6 +362,13 @@ pub struct BuckTarget {
     /// path.
     #[serde(default)]
     included_apps: Vec<TargetFullName>,
+    /// extra_includes are a similar but slightly different
+    /// hack. buck2 creates a shadow target with only the include path
+    /// in it, as a proxy for the real target when building the graph.
+    /// These do not have dependencies, so make it possible for buck2
+    /// to build the graph.
+    #[serde(default)]
+    extra_includes: Vec<TargetFullName>,
     #[serde(default)]
     origin: BuckTargetOrigin,
 }
@@ -320,6 +394,7 @@ pub struct Target {
     pub deps: Vec<TargetFullName>,
     pub apps: Vec<TargetFullName>,
     pub included_apps: Vec<TargetFullName>,
+    pub extra_includes: Vec<TargetFullName>,
     pub ebin: Option<AbsPathBuf>,
     pub target_type: TargetType,
     /// true if there are .hrl files in the src dir
@@ -489,6 +564,7 @@ fn make_buck_target(
         deps: target.deps.clone(),
         apps: target.apps.clone(),
         included_apps: target.included_apps.clone(),
+        extra_includes: target.extra_includes.clone(),
         ebin,
         target_type,
         private_header,
@@ -797,9 +873,13 @@ fn targets_to_project_data_bxl(
                 .deps
                 .iter()
                 .chain(target.apps.iter().chain(target.included_apps.iter()))
+                .chain(target.apps.iter().chain(target.extra_includes.iter()))
                 .cloned(),
         );
         include_mapping.deps.insert(target_name.clone(), all_deps);
+        include_mapping
+            .app_names
+            .insert(target.app_name.clone(), target_name.clone());
     }
 
     for target in targets.values() {
@@ -947,6 +1027,7 @@ mod tests {
             deps: vec![],
             apps: vec![],
             included_apps: vec![],
+            extra_includes: vec![],
             origin: BuckTargetOrigin::App,
         };
 
@@ -974,6 +1055,7 @@ mod tests {
             deps: vec![],
             apps: vec![],
             included_apps: vec![],
+            extra_includes: vec![],
             origin: BuckTargetOrigin::App,
         };
 
@@ -1001,6 +1083,7 @@ mod tests {
             deps: vec![],
             apps: vec![],
             included_apps: vec![],
+            extra_includes: vec![],
             origin: BuckTargetOrigin::App,
         };
 
@@ -1032,6 +1115,7 @@ mod tests {
             deps: vec![],
             apps: vec![],
             included_apps: vec![],
+            extra_includes: vec![],
             origin: BuckTargetOrigin::App,
         };
 
@@ -1060,6 +1144,7 @@ mod tests {
             deps: vec![],
             apps: vec![],
             included_apps: vec![],
+            extra_includes: vec![],
             origin: BuckTargetOrigin::App,
         };
 
@@ -1088,6 +1173,7 @@ mod tests {
             deps: vec![],
             apps: vec![],
             included_apps: vec![],
+            extra_includes: vec![],
             origin: BuckTargetOrigin::App,
         };
 
diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs
index 938746d0d1..1399d2b061 100644
--- a/crates/project_model/src/lib.rs
+++ b/crates/project_model/src/lib.rs
@@ -680,7 +680,7 @@ pub struct Project {
     pub project_build_data: ProjectBuildData,
     pub project_apps: Vec<ProjectAppData>,
     pub eqwalizer_config: EqwalizerConfig,
-    pub include_mapping: Arc<IncludeMapping>,
+    pub include_mapping: Option<Arc<IncludeMapping>>,
 }
 
 #[derive(Clone, Debug)]
@@ -715,7 +715,7 @@ impl Project {
             project_build_data: ProjectBuildData::Otp,
             project_apps,
             eqwalizer_config: EqwalizerConfig::default(),
-            include_mapping: Arc::new(IncludeMapping::default()),
+            include_mapping: None,
         }
     }
 
@@ -725,7 +725,7 @@ impl Project {
             project_build_data: ProjectBuildData::Rebar(Default::default()),
             project_apps: Vec::default(),
             eqwalizer_config: EqwalizerConfig::default(),
-            include_mapping: Arc::new(IncludeMapping::default()),
+            include_mapping: None,
         }
     }
 
@@ -1021,12 +1021,7 @@ impl Project {
                                 "Failed to decode rebar build info for config file {manifest:?}"
                             )
                         })?;
-                (
-                    ProjectBuildData::Rebar(rebar_project),
-                    apps,
-                    otp_root,
-                    Arc::new(IncludeMapping::default()),
-                )
+                (ProjectBuildData::Rebar(rebar_project), apps, otp_root, None)
             }
             ProjectManifest::TomlBuck(buck) => {
                 // We only select this manifest if buck is actually enabled
@@ -1036,7 +1031,7 @@ impl Project {
                     ProjectBuildData::Buck(project),
                     apps,
                     otp_root,
-                    include_mapping,
+                    Some(include_mapping),
                 )
             }
             ProjectManifest::Json(config) => {
@@ -1045,12 +1040,7 @@ impl Project {
                 let (mut apps, deps) = json::gen_app_data(config, AbsPath::assert(&otp_root));
                 let project = StaticProject { config_path };
                 apps.extend(deps);
-                (
-                    ProjectBuildData::Static(project),
-                    apps,
-                    otp_root,
-                    Arc::new(IncludeMapping::default()),
-                )
+                (ProjectBuildData::Static(project), apps, otp_root, None)
             }
             ProjectManifest::NoManifest(config) => {
                 let otp_root = Otp::find_otp()?;
@@ -1061,12 +1051,7 @@ impl Project {
                     eqwalizer_support::eqwalizer_suppport_data(abs_otp_root);
                 let project = StaticProject { config_path };
                 apps.push(eqwalizer_support_app);
-                (
-                    ProjectBuildData::Static(project),
-                    apps,
-                    otp_root,
-                    Arc::new(IncludeMapping::default()),
-                )
+                (ProjectBuildData::Static(project), apps, otp_root, None)
             }
         };
 
diff --git a/test_projects/include_lib_dependency_test/.elp.toml b/test_projects/include_lib_dependency_test/.elp.toml
new file mode 100644
index 0000000000..65e106a9e2
--- /dev/null
+++ b/test_projects/include_lib_dependency_test/.elp.toml
@@ -0,0 +1,5 @@
+[buck]
+enabled = true
+build_deps = false
+included_targets = [ "fbcode//whatsapp/elp/test_projects/include_lib_dependency_test/..." ]
+source_root = "whatsapp/elp/test_projects/include_lib_dependency_test"
diff --git a/test_projects/include_lib_dependency_test/external_app/include/external_header.hrl b/test_projects/include_lib_dependency_test/external_app/include/external_header.hrl
new file mode 100644
index 0000000000..4ca4bb9642
--- /dev/null
+++ b/test_projects/include_lib_dependency_test/external_app/include/external_header.hrl
@@ -0,0 +1,4 @@
+%% Header file that should not be accessible to main_app
+%% since external_app is not a dependency of main_app
+
+-define(EXTERNAL_MACRO, "This should not be accessible").
diff --git a/test_projects/include_lib_dependency_test/external_app/src/external_app.app.src b/test_projects/include_lib_dependency_test/external_app/src/external_app.app.src
new file mode 100644
index 0000000000..e394d5c70e
--- /dev/null
+++ b/test_projects/include_lib_dependency_test/external_app/src/external_app.app.src
@@ -0,0 +1,10 @@
+{application, external_app,
+ [{description, "External application that main_app should not be able to include_lib from"},
+  {vsn, "1.0.0"},
+  {registered, []},
+  {applications, [kernel, stdlib]},
+  {env, []},
+  {modules, []},
+  {licenses, ["Apache-2.0"]},
+  {links, []}
+ ]}.
diff --git a/test_projects/include_lib_dependency_test/external_app/src/external_app.erl b/test_projects/include_lib_dependency_test/external_app/src/external_app.erl
new file mode 100644
index 0000000000..0f87f0d773
--- /dev/null
+++ b/test_projects/include_lib_dependency_test/external_app/src/external_app.erl
@@ -0,0 +1,6 @@
+-module(external_app).
+
+-export([external_function/0]).
+
+external_function() ->
+    ok.
diff --git a/test_projects/include_lib_dependency_test/extra_app/include/extra_header.hrl b/test_projects/include_lib_dependency_test/extra_app/include/extra_header.hrl
new file mode 100644
index 0000000000..1bd91163d4
--- /dev/null
+++ b/test_projects/include_lib_dependency_test/extra_app/include/extra_header.hrl
@@ -0,0 +1,3 @@
+%% Header file is only accessible via the `extra_includes` attribute
+
+-define(EXTRA_MACRO,ok).
diff --git a/test_projects/include_lib_dependency_test/extra_app/src/extra_app.app.src b/test_projects/include_lib_dependency_test/extra_app/src/extra_app.app.src
new file mode 100644
index 0000000000..d1bb84604d
--- /dev/null
+++ b/test_projects/include_lib_dependency_test/extra_app/src/extra_app.app.src
@@ -0,0 +1,10 @@
+{application, extra_app,
+ [{description, "Extra application that main_app include_lib's from via `extra_includes`"},
+  {vsn, "1.0.0"},
+  {registered, []},
+  {applications, [kernel, stdlib]},
+  {env, []},
+  {modules, []},
+  {licenses, ["Apache-2.0"]},
+  {links, []}
+ ]}.
diff --git a/test_projects/include_lib_dependency_test/extra_app/src/extra_app.erl b/test_projects/include_lib_dependency_test/extra_app/src/extra_app.erl
new file mode 100644
index 0000000000..1d45fff192
--- /dev/null
+++ b/test_projects/include_lib_dependency_test/extra_app/src/extra_app.erl
@@ -0,0 +1,6 @@
+-module(extra_app).
+
+-export([extra_function/0]).
+
+extra_function() ->
+    ok.
diff --git a/test_projects/include_lib_dependency_test/main_app/src/main_app.app.src b/test_projects/include_lib_dependency_test/main_app/src/main_app.app.src
new file mode 100644
index 0000000000..3b4408778c
--- /dev/null
+++ b/test_projects/include_lib_dependency_test/main_app/src/main_app.app.src
@@ -0,0 +1,10 @@
+{application, main_app,
+ [{description, "Main application that tries to include_lib from non-dependency"},
+  {vsn, "1.0.0"},
+  {registered, []},
+  {applications, [kernel, stdlib]},
+  {env, []},
+  {modules, []},
+  {licenses, ["Apache-2.0"]},
+  {links, []}
+ ]}.
diff --git a/test_projects/include_lib_dependency_test/main_app/src/main_app.erl b/test_projects/include_lib_dependency_test/main_app/src/main_app.erl
new file mode 100644
index 0000000000..c4df4aa53a
--- /dev/null
+++ b/test_projects/include_lib_dependency_test/main_app/src/main_app.erl
@@ -0,0 +1,17 @@
+-module(main_app).
+
+%% This include_lib should fail because external_app is not a
+%% dependency of main_app
+-include_lib("external_app/include/external_header.hrl").
+
+%% This include_lib should succeed, because extra_app is in
+%% `extra_includes` for main_app
+-include_lib("extra_app/include/extra_header.hrl").
+
+-export([test_function/0]).
+
+test_function() ->
+    ?EXTRA_MACRO,
+    %% Try to use something from the header that should not be
+    %% available
+    ?EXTERNAL_MACRO.
diff --git a/test_projects/include_lib_dependency_test/rebar.config b/test_projects/include_lib_dependency_test/rebar.config
new file mode 100644
index 0000000000..ff62beab8b
--- /dev/null
+++ b/test_projects/include_lib_dependency_test/rebar.config
@@ -0,0 +1,9 @@
+{checkouts_dir, ["."]}.
+{project_app_dirs, [
+    "main_app",
+    "external_app",
+    "extra_app"
+]}.
+
+{erl_opts, [debug_info]}.
+{deps, []}.

From d1475ea85698e1f8232beb3d7fbee97ac6efdb17 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 21 Jul 2025 04:58:39 -0700
Subject: [PATCH 023/394] resolve OTP includes

Summary:
The `buck::IncludeMapping` keeps a map from the include(_lib) directive to the appropriate file path for all buck targets in the project.

This does not, however include the ones from OTP.

This diff remedies that.

Reviewed By: TheGeorge

Differential Revision: D78487455

fbshipit-source-id: 4d69541133fc3b0afd6b1afa07db80c13f61c5eb
---
 crates/base_db/src/include.rs                 |  5 +---
 .../include_lib_non_dependency_fails.stdout   |  7 +++---
 .../include_lib_non_dependency_rebar.stdout   |  4 +++-
 crates/project_model/src/buck.rs              | 23 ++++++++++++++++++-
 .../main_app/src/main_app.erl                 |  3 +++
 5 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/crates/base_db/src/include.rs b/crates/base_db/src/include.rs
index efc3588943..f76bd8a485 100644
--- a/crates/base_db/src/include.rs
+++ b/crates/base_db/src/include.rs
@@ -160,10 +160,7 @@ impl<'a> IncludeCtx<'a> {
                 }
             } else {
                 // We did not find an entry in the include mapping.
-
-                // TODO: remove when OTP and local includes resolved later in the stack
-                let path = target_app_data.dir.join(include_path);
-                db.include_file_id(project_id, VfsPath::from(path.clone()))
+                None
             }
         } else {
             // There is no include mapping.
diff --git a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout
index 1778f5269a..c99af6889c 100644
--- a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout
+++ b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout
@@ -1,6 +1,7 @@
 module specified: main_app
 Diagnostics reported in 1 modules:
-  main_app: 3
+  main_app: 4
       4:13-4:55::[Error] [E1516] can't find include lib "external_app/include/external_header.hrl"
-      10:9-10:24::[Error] [L1227] function test_function/0 undefined
-      16:4-16:19::[Error] [E1507] undefined macro 'EXTERNAL_MACRO'
+      11:0-11:42::[Warning] [W0020] Unused file: stdlib/include/assert.hrl
+      13:9-13:24::[Error] [L1227] function test_function/0 undefined
+      19:4-19:19::[Error] [E1507] undefined macro 'EXTERNAL_MACRO'
diff --git a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout
index 0e70190970..50ee89ce88 100644
--- a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout
+++ b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout
@@ -1,2 +1,4 @@
 module specified: main_app
-No errors reported
+Diagnostics reported in 1 modules:
+  main_app: 1
+      11:0-11:42::[Warning] [W0020] Unused file: stdlib/include/assert.hrl
diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 750f098ad2..3446880fd3 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -163,6 +163,9 @@ pub struct IncludeMapping {
     /// last part of its `TargetFullName` is ambiguous.  Keep a
     /// mapping from these to the corresponding `TargetFullName`.
     app_names: FxHashMap<AppName, TargetFullName>,
+    /// The OTP apps are always available as dependencies, keep track
+    /// of what they are
+    otp_apps: FxHashSet<AppName>,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
@@ -178,6 +181,15 @@ const LOCAL_LOOKUP_INCLUDE_PREFIX: &str = "L";
 const REMOTE_LOOKUP_INCLUDE_PREFIX: &str = "R";
 
 impl IncludeMapping {
+    pub fn add_otp(&mut self, otp_apps: &[ProjectAppData]) {
+        for app in otp_apps {
+            self.otp_apps.insert(app.name.clone());
+            for inc in &app.include_dirs {
+                self.update_mapping_from_path(&app.name.0, inc.clone());
+            }
+        }
+    }
+
     fn update_mapping_from_path(&mut self, app_name: &str, path: AbsPathBuf) {
         if let Ok(paths) = Utf8PathBuf::from(path).read_dir_utf8() {
             for path in paths.flatten() {
@@ -219,7 +231,11 @@ impl IncludeMapping {
 
     /// For each buck TargetFullName we have a set of immediate dependencies.
     /// Check for the `source` one if the target is in the graph rooted at it.
+    /// If the target is an OTP app then it is always a dependency.
     pub fn is_dep(&self, source: &TargetFullName, target_app: &AppName) -> bool {
+        if self.otp_apps.contains(target_app) {
+            return true;
+        }
         if let Some(target) = self.app_names.get(target_app) {
             let mut visited = FxHashSet::default();
             self.dfs(source, target, &mut visited)
@@ -273,12 +289,16 @@ impl BuckProject {
         let _timer = timeit_with_telemetry!("BuckProject::load_from_config");
         let target_info = load_buck_targets_bxl(buck_conf, query_config, report_progress)?;
         report_progress("Making project app data");
-        let (project_app_data, include_mapping) = targets_to_project_data_bxl(&target_info.targets);
+        let (project_app_data, mut include_mapping) =
+            targets_to_project_data_bxl(&target_info.targets);
         let project = BuckProject {
             target_info,
             buck_conf: buck_conf.clone(),
         };
         let otp_root = Otp::find_otp()?;
+        // TODO: we now get these twice. Perhaps they should be cached?
+        let (_otp, otp_project_apps) = Otp::discover(otp_root.clone());
+        include_mapping.add_otp(&otp_project_apps);
         Ok((
             project,
             project_app_data,
@@ -850,6 +870,7 @@ fn targets_to_project_data_bxl(
 
     for target in targets.values() {
         target.include_files.iter().for_each(|inc: &AbsPathBuf| {
+            // TODO: make a FXHashSet of include paths, and use that to update the mapping
             let include_path = include_path_from_file(inc);
             include_mapping.update_mapping_from_path(&target.app_name.0, include_path);
         });
diff --git a/test_projects/include_lib_dependency_test/main_app/src/main_app.erl b/test_projects/include_lib_dependency_test/main_app/src/main_app.erl
index c4df4aa53a..3b8893a8d2 100644
--- a/test_projects/include_lib_dependency_test/main_app/src/main_app.erl
+++ b/test_projects/include_lib_dependency_test/main_app/src/main_app.erl
@@ -8,6 +8,9 @@
 %% `extra_includes` for main_app
 -include_lib("extra_app/include/extra_header.hrl").
 
+%% Check that OTP libs are allowed
+-include_lib("stdlib/include/assert.hrl").
+
 -export([test_function/0]).
 
 test_function() ->

From c33cffe102319d88a4e2a98c3b139599baa445f5 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 21 Jul 2025 04:58:39 -0700
Subject: [PATCH 024/394] local include via deps

Summary:
The Erlang local include processing is intended to search in the include path of the initial application, then the include paths of all dependencies.

This is also how it works in buck2.

This diff aligns ELP with this by

- Include the app name in the local include key for the include mapping
- If the initial lookup fails, walk the tree of dependencies looking for a result

Reviewed By: TD5

Differential Revision: D78488506

fbshipit-source-id: 5ec98a0ecde04883db480b9adecae19ea0e784c6
---
 crates/base_db/src/include.rs                 | 45 ++++++++++---
 crates/elp/src/bin/main.rs                    |  2 +-
 .../include_lib_non_dependency_fails.stdout   |  7 ++-
 .../include_lib_non_dependency_rebar.stdout   |  5 +-
 crates/project_model/src/buck.rs              | 63 +++++++++++++++++--
 .../main_app/src/main_app.app.src             |  2 +-
 .../main_app/src/main_app.erl                 |  4 ++
 .../normal_dep/include/assert.hrl             |  4 ++
 .../normal_dep/src/normal_dep.app.src         | 11 ++++
 .../normal_dep/src/normal_dep.erl             |  6 ++
 10 files changed, 128 insertions(+), 21 deletions(-)
 create mode 100644 test_projects/include_lib_dependency_test/normal_dep/include/assert.hrl
 create mode 100644 test_projects/include_lib_dependency_test/normal_dep/src/normal_dep.app.src
 create mode 100644 test_projects/include_lib_dependency_test/normal_dep/src/normal_dep.erl

diff --git a/crates/base_db/src/include.rs b/crates/base_db/src/include.rs
index f76bd8a485..d68f41a2a5 100644
--- a/crates/base_db/src/include.rs
+++ b/crates/base_db/src/include.rs
@@ -54,6 +54,14 @@ impl<'a> IncludeCtx<'a> {
     }
 
     pub fn resolve_include(&self, path: &str) -> Option<FileId> {
+        // Note, from https://www.erlang.org/doc/apps/erts/erlc_cmd#generally-useful-flags
+        // When encountering an `-include` or `-include_lib` directive,
+        // the compiler searches for header files in the following directories:
+        //
+        //   - ".", the current working directory of the file server
+        //   - The base name of the compiled file
+        //   - The directories specified using option -I; the directory
+        //     specified last is searched first
         self.resolve_relative(path)
             .or_else(|| self.db.resolve_local(self.current_file_id, path.into()))
     }
@@ -73,24 +81,41 @@ impl<'a> IncludeCtx<'a> {
         self.source_root.relative_path(self.current_file_id, path)
     }
 
-    /// Called via salsa for inserting in the graph
+    /// Called via salsa for inserting in the graph.  We are looking
+    /// for a base filename in the includes of the current app (from
+    /// the `file_id`) or any of its dependencies
     pub(crate) fn resolve_local_query(
         db: &dyn RootQueryDb,
         file_id: FileId,
         path: SmolStr,
     ) -> Option<FileId> {
         let project_id = db.file_project_id(file_id)?;
-        if let Some(file_id) =
-            db.mapped_include_file(project_id, IncludeMappingScope::Local, path.clone())
-        {
+        let app_data = db.file_app_data(file_id)?;
+        if let Some(file_id) = db.mapped_include_file(
+            project_id,
+            IncludeMappingScope::Local(app_data.name.clone()),
+            path.clone(),
+        ) {
             Some(file_id)
         } else {
-            let path: &str = &path;
-            let app_data = db.file_app_data(file_id)?;
-            app_data.include_path.iter().find_map(|include| {
-                let name = include.join(path);
-                db.include_file_id(app_data.project_id, VfsPath::from(name.clone()))
-            })
+            // Not in the current app, look in the dependencies
+            let include_file_index = db.include_file_index(project_id);
+            if let Some(file_path) = include_file_index
+                .include_mapping
+                .find_local(&app_data.name, &path)
+            {
+                include_file_index
+                    .path_to_file_id
+                    .get(&VfsPath::from(file_path.clone()))
+                    .copied()
+            } else {
+                // Fallback for non-buck2 projects
+                let path: &str = &path;
+                app_data.include_path.iter().find_map(|include| {
+                    let name = include.join(path);
+                    db.include_file_id(app_data.project_id, VfsPath::from(name.clone()))
+                })
+            }
         }
     }
 
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 0ec9526c44..b37f57c034 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -2206,7 +2206,7 @@ mod tests {
                 None,
             );
         } else {
-            simple_snapshot(
+            simple_snapshot_expect_error(
                 args_vec!["parse-elp", "--module", "main_app"],
                 "include_lib_dependency_test",
                 expect_file!(
diff --git a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout
index c99af6889c..c0fe03edea 100644
--- a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout
+++ b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout
@@ -1,7 +1,8 @@
 module specified: main_app
 Diagnostics reported in 1 modules:
-  main_app: 4
+  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
-      13:9-13:24::[Error] [L1227] function test_function/0 undefined
-      19:4-19:19::[Error] [E1507] undefined macro 'EXTERNAL_MACRO'
+      14:9-14:21::[Hint] [W0037] Unspecific include.
+      16:9-16:24::[Error] [L1227] function test_function/0 undefined
+      23:4-23:19::[Error] [E1507] undefined macro 'EXTERNAL_MACRO'
diff --git a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout
index 50ee89ce88..513197d889 100644
--- a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout
+++ b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout
@@ -1,4 +1,7 @@
 module specified: main_app
 Diagnostics reported in 1 modules:
-  main_app: 1
+  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::[Error] [E1508] undefined macro 'normalDepAssertEqual/2'
diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 3446880fd3..56b3e69516 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -163,6 +163,7 @@ pub struct IncludeMapping {
     /// last part of its `TargetFullName` is ambiguous.  Keep a
     /// mapping from these to the corresponding `TargetFullName`.
     app_names: FxHashMap<AppName, TargetFullName>,
+    app_names_rev: FxHashMap<TargetFullName, AppName>,
     /// The OTP apps are always available as dependencies, keep track
     /// of what they are
     otp_apps: FxHashSet<AppName>,
@@ -170,7 +171,7 @@ pub struct IncludeMapping {
 
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub enum IncludeMappingScope {
-    Local,
+    Local(AppName),
     Remote,
 }
 
@@ -196,8 +197,17 @@ impl IncludeMapping {
                 let path = path.into_path();
                 if let Some("hrl") = path.extension() {
                     if let Some(basename) = path.file_name() {
-                        let local_include =
-                            SmolStr::new(format!("{LOCAL_LOOKUP_INCLUDE_PREFIX}:{basename}"));
+                        // We encode the local include string as follows
+                        // - First an indicator to flag that it is local
+                        // - Next the app name that it is local to
+                        // - Then the base file name.
+                        // We always do the local lookup in the
+                        // context of a specific app, this ensures the
+                        // app matches, and allows different apps to
+                        // use the same include file base name.
+                        let local_include = SmolStr::new(format!(
+                            "{LOCAL_LOOKUP_INCLUDE_PREFIX}:{app_name}:{basename}"
+                        ));
                         let trimmed_app_name =
                             app_name.strip_suffix("_includes_only").unwrap_or(app_name);
                         let remote_include = SmolStr::new(format!(
@@ -215,8 +225,8 @@ impl IncludeMapping {
 
     pub fn get(&self, scope: IncludeMappingScope, path: &SmolStr) -> Option<&AbsPathBuf> {
         let lookup_path = match scope {
-            IncludeMappingScope::Local => {
-                SmolStr::new(format!("{LOCAL_LOOKUP_INCLUDE_PREFIX}:{path}"))
+            IncludeMappingScope::Local(app_name) => {
+                SmolStr::new(format!("{LOCAL_LOOKUP_INCLUDE_PREFIX}:{app_name}:{path}"))
             }
             IncludeMappingScope::Remote => {
                 SmolStr::new(format!("{REMOTE_LOOKUP_INCLUDE_PREFIX}:{path}"))
@@ -229,6 +239,46 @@ impl IncludeMapping {
         self.includes.insert(path, abs_path)
     }
 
+    /// Local lookup of `path` in the dependencies of `app_name`
+    pub fn find_local(&self, app_name: &AppName, path: &SmolStr) -> Option<AbsPathBuf> {
+        self.get(IncludeMappingScope::Local(app_name.clone()), path);
+        if let Some(current) = self.app_names.get(app_name) {
+            let mut visited = FxHashSet::default();
+            self.dfs_local(current, path, &mut visited)
+        } else {
+            None
+        }
+    }
+
+    fn dfs_local(
+        &self,
+        current: &TargetFullName,
+        path: &SmolStr,
+        visited: &mut FxHashSet<TargetFullName>,
+    ) -> Option<AbsPathBuf> {
+        if let Some(app_name) = self.app_names_rev.get(current) {
+            if let Some(abs_path) = self.get(IncludeMappingScope::Local(app_name.clone()), path) {
+                return Some(abs_path.clone());
+            }
+        }
+
+        if visited.contains(current) {
+            return None;
+        }
+
+        visited.insert(current.clone());
+
+        if let Some(deps) = self.deps.get(current) {
+            for dep in deps {
+                if let Some(abs_path) = self.dfs_local(dep, path, visited) {
+                    return Some(abs_path);
+                }
+            }
+        }
+
+        None
+    }
+
     /// For each buck TargetFullName we have a set of immediate dependencies.
     /// Check for the `source` one if the target is in the graph rooted at it.
     /// If the target is an OTP app then it is always a dependency.
@@ -901,6 +951,9 @@ fn targets_to_project_data_bxl(
         include_mapping
             .app_names
             .insert(target.app_name.clone(), target_name.clone());
+        include_mapping
+            .app_names_rev
+            .insert(target_name.clone(), target.app_name.clone());
     }
 
     for target in targets.values() {
diff --git a/test_projects/include_lib_dependency_test/main_app/src/main_app.app.src b/test_projects/include_lib_dependency_test/main_app/src/main_app.app.src
index 3b4408778c..d674d45b17 100644
--- a/test_projects/include_lib_dependency_test/main_app/src/main_app.app.src
+++ b/test_projects/include_lib_dependency_test/main_app/src/main_app.app.src
@@ -2,7 +2,7 @@
  [{description, "Main application that tries to include_lib from non-dependency"},
   {vsn, "1.0.0"},
   {registered, []},
-  {applications, [kernel, stdlib]},
+  {applications, [normal_dep]},
   {env, []},
   {modules, []},
   {licenses, ["Apache-2.0"]},
diff --git a/test_projects/include_lib_dependency_test/main_app/src/main_app.erl b/test_projects/include_lib_dependency_test/main_app/src/main_app.erl
index 3b8893a8d2..6f3eef5273 100644
--- a/test_projects/include_lib_dependency_test/main_app/src/main_app.erl
+++ b/test_projects/include_lib_dependency_test/main_app/src/main_app.erl
@@ -11,10 +11,14 @@
 %% Check that OTP libs are allowed
 -include_lib("stdlib/include/assert.hrl").
 
+%% Check that local includes resolve the dependent app version
+-include("assert.hrl").
+
 -export([test_function/0]).
 
 test_function() ->
     ?EXTRA_MACRO,
+    ?normalDepAssertEqual(3,4),
     %% Try to use something from the header that should not be
     %% available
     ?EXTERNAL_MACRO.
diff --git a/test_projects/include_lib_dependency_test/normal_dep/include/assert.hrl b/test_projects/include_lib_dependency_test/normal_dep/include/assert.hrl
new file mode 100644
index 0000000000..092605a520
--- /dev/null
+++ b/test_projects/include_lib_dependency_test/normal_dep/include/assert.hrl
@@ -0,0 +1,4 @@
+%% This file exists to check that local includes take the includes
+%% from the deps first.
+
+-define(normalDepAssertEqual(A,B), A =:= B).
diff --git a/test_projects/include_lib_dependency_test/normal_dep/src/normal_dep.app.src b/test_projects/include_lib_dependency_test/normal_dep/src/normal_dep.app.src
new file mode 100644
index 0000000000..2be6794b01
--- /dev/null
+++ b/test_projects/include_lib_dependency_test/normal_dep/src/normal_dep.app.src
@@ -0,0 +1,11 @@
+
+{application, normal_dep,
+ [{description, "Normal dependency for main_app"},
+  {vsn, "1.0.0"},
+  {registered, []},
+  {applications, [kernel, stdlib]},
+  {env, []},
+  {modules, []},
+  {licenses, ["Apache-2.0"]},
+  {links, []}
+ ]}.
diff --git a/test_projects/include_lib_dependency_test/normal_dep/src/normal_dep.erl b/test_projects/include_lib_dependency_test/normal_dep/src/normal_dep.erl
new file mode 100644
index 0000000000..30dedabfd5
--- /dev/null
+++ b/test_projects/include_lib_dependency_test/normal_dep/src/normal_dep.erl
@@ -0,0 +1,6 @@
+-module(normal_dep).
+
+-export([normal_function/0]).
+
+normal_function() ->
+    ok.

From 94c793c8526408c2fa417db0723dd0f8126e710a Mon Sep 17 00:00:00 2001
From: Rahul Jain <jainrahul6620@meta.com>
Date: Mon, 21 Jul 2025 06:09:18 -0700
Subject: [PATCH 025/394] Add body index implementation on references

Reviewed By: alanz

Differential Revision: D78551538

fbshipit-source-id: c5e294bede1b13eccb7ed2979232b74fcd70cd33
---
 crates/hir/src/body.rs | 144 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)

diff --git a/crates/hir/src/body.rs b/crates/hir/src/body.rs
index c5b1900ef3..74c8ad0221 100644
--- a/crates/hir/src/body.rs
+++ b/crates/hir/src/body.rs
@@ -949,6 +949,14 @@ impl Index<ClauseId> for FunctionBody {
     }
 }
 
+impl Index<&ClauseId> for FunctionBody {
+    type Output = Arc<FunctionClauseBody>;
+
+    fn index(&self, index: &ClauseId) -> &Self::Output {
+        self.index(*index)
+    }
+}
+
 impl Index<ExprId> for FoldBody<'_> {
     type Output = Expr;
 
@@ -967,6 +975,14 @@ impl Index<ExprId> for FoldBody<'_> {
     }
 }
 
+impl Index<&ExprId> for FoldBody<'_> {
+    type Output = Expr;
+
+    fn index(&self, index: &ExprId) -> &Self::Output {
+        self.index(*index)
+    }
+}
+
 impl Index<ExprId> for Body {
     type Output = Expr;
 
@@ -980,6 +996,14 @@ impl Index<ExprId> for Body {
     }
 }
 
+impl Index<&ExprId> for Body {
+    type Output = Expr;
+
+    fn index(&self, index: &ExprId) -> &Self::Output {
+        self.index(*index)
+    }
+}
+
 impl Index<PatId> for FoldBody<'_> {
     type Output = Pat;
 
@@ -999,6 +1023,14 @@ impl Index<PatId> for FoldBody<'_> {
     }
 }
 
+impl Index<&PatId> for FoldBody<'_> {
+    type Output = Pat;
+
+    fn index(&self, index: &PatId) -> &Self::Output {
+        self.index(*index)
+    }
+}
+
 impl Index<PatId> for Body {
     type Output = Pat;
 
@@ -1012,6 +1044,14 @@ impl Index<PatId> for Body {
     }
 }
 
+impl Index<&PatId> for Body {
+    type Output = Pat;
+
+    fn index(&self, index: &PatId) -> &Self::Output {
+        self.index(*index)
+    }
+}
+
 impl Index<TypeExprId> for FoldBody<'_> {
     type Output = TypeExpr;
 
@@ -1027,6 +1067,14 @@ impl Index<TypeExprId> for FoldBody<'_> {
     }
 }
 
+impl Index<&TypeExprId> for FoldBody<'_> {
+    type Output = TypeExpr;
+
+    fn index(&self, index: &TypeExprId) -> &Self::Output {
+        self.index(*index)
+    }
+}
+
 impl Index<TypeExprId> for Body {
     type Output = TypeExpr;
 
@@ -1039,6 +1087,14 @@ impl Index<TypeExprId> for Body {
     }
 }
 
+impl Index<&TypeExprId> for Body {
+    type Output = TypeExpr;
+
+    fn index(&self, index: &TypeExprId) -> &Self::Output {
+        self.index(*index)
+    }
+}
+
 impl Index<TermId> for FoldBody<'_> {
     type Output = Term;
 
@@ -1054,6 +1110,14 @@ impl Index<TermId> for FoldBody<'_> {
     }
 }
 
+impl Index<&TermId> for FoldBody<'_> {
+    type Output = Term;
+
+    fn index(&self, index: &TermId) -> &Self::Output {
+        self.index(*index)
+    }
+}
+
 impl Index<TermId> for Body {
     type Output = Term;
 
@@ -1066,6 +1130,14 @@ impl Index<TermId> for Body {
     }
 }
 
+impl Index<&TermId> for Body {
+    type Output = Term;
+
+    fn index(&self, index: &TermId) -> &Self::Output {
+        self.index(*index)
+    }
+}
+
 pub type ExprSource = InFileAstPtr<ast::Expr>;
 
 pub type MacroSource = InFileAstPtr<ast::MacroCallExpr>;
@@ -1211,15 +1283,23 @@ impl BodySourceMap {
 
 #[cfg(test)]
 mod local_tests {
+    use elp_base_db::FileId;
     use elp_base_db::RootQueryDb;
     use elp_base_db::fixture::WithFixture;
     use elp_syntax::AstNode;
     use elp_syntax::algo::find_node_at_offset;
     use elp_syntax::ast;
+    use expect_test::expect;
 
     use crate::AnyExprId;
+    use crate::Body;
+    use crate::BodyOrigin;
+    use crate::Expr;
     use crate::InFile;
+    use crate::Pat;
     use crate::Semantic;
+    use crate::Term;
+    use crate::TypeExpr;
     use crate::test_db::TestDB;
 
     fn check_is_macro_expr(fixture: &str) {
@@ -1333,4 +1413,68 @@ mod local_tests {
             "#,
         )
     }
+
+    #[test]
+    fn verify_body_index_impl_for_references() {
+        let mut body = Body::new(BodyOrigin::Invalid(FileId::from_raw(0)));
+
+        let expr_id = body.exprs.alloc(Expr::Missing);
+        let pat_id = body.pats.alloc(Pat::Missing);
+        let type_expr_id = body.type_exprs.alloc(TypeExpr::Missing);
+        let term_id = body.terms.alloc(Term::Missing);
+
+        // Test for Expr arena
+        let expr = &body[expr_id];
+        let expr_using_idref = &body[&expr_id];
+
+        let expr_tests = vec![expr, expr_using_idref];
+
+        for test_val in expr_tests {
+            expect![[r#"
+                Missing
+            "#]]
+            .assert_debug_eq(test_val);
+        }
+
+        // Test for Pat arena
+        let pat = &body[pat_id];
+        let pat_using_idref = &body[&pat_id];
+
+        let pat_tests = vec![pat, pat_using_idref];
+
+        for test_val in pat_tests {
+            expect![[r#"
+                Missing
+            "#]]
+            .assert_debug_eq(test_val);
+        }
+
+        // Test for TypeExpr arena
+        let type_expr = &body[type_expr_id];
+        let type_expr_using_idref = &body[&type_expr_id];
+
+        let type_expr_tests = vec![type_expr, type_expr_using_idref];
+
+        for test_val in type_expr_tests {
+            expect![[r#"
+                Missing
+            "#]]
+            .assert_debug_eq(test_val);
+        }
+
+        // Test for Term arena
+        let term = &body[term_id];
+        let term_using_idref = &body[&term_id];
+
+        let term_tests = vec![term, term_using_idref];
+
+        for test_val in term_tests {
+            expect![[r#"
+                Missing
+            "#]]
+            .assert_debug_eq(test_val);
+        }
+
+        return ();
+    }
 }

From 8eebcbf7931276ff4101da16d0600d05dbe5277f Mon Sep 17 00:00:00 2001
From: Rahul Jain <jainrahul6620@meta.com>
Date: Mon, 21 Jul 2025 06:09:18 -0700
Subject: [PATCH 026/394] Add tests for Indexing on FoldBody

Summary:
We have added Index impl for FoldBody with and without using references.
This diff adds unit tests for both the implementations.

Reviewed By: alanz

Differential Revision: D78659116

fbshipit-source-id: 404144735399c82a8a2d265298ff35ac9bd0a672
---
 crates/hir/src/body.rs | 41 ++++++++++++++++++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/crates/hir/src/body.rs b/crates/hir/src/body.rs
index 74c8ad0221..dd21d3ee93 100644
--- a/crates/hir/src/body.rs
+++ b/crates/hir/src/body.rs
@@ -1300,6 +1300,7 @@ mod local_tests {
     use crate::Semantic;
     use crate::Term;
     use crate::TypeExpr;
+    use crate::fold::default_fold_body;
     use crate::test_db::TestDB;
 
     fn check_is_macro_expr(fixture: &str) {
@@ -1415,7 +1416,7 @@ mod local_tests {
     }
 
     #[test]
-    fn verify_body_index_impl_for_references() {
+    fn verify_index_impl_for_references() {
         let mut body = Body::new(BodyOrigin::Invalid(FileId::from_raw(0)));
 
         let expr_id = body.exprs.alloc(Expr::Missing);
@@ -1423,11 +1424,20 @@ mod local_tests {
         let type_expr_id = body.type_exprs.alloc(TypeExpr::Missing);
         let term_id = body.terms.alloc(Term::Missing);
 
+        let fold_body = &default_fold_body(&body);
+
         // Test for Expr arena
         let expr = &body[expr_id];
         let expr_using_idref = &body[&expr_id];
+        let fold_body_expr = &fold_body[expr_id];
+        let fold_body_expr_using_idref = &fold_body[&expr_id];
 
-        let expr_tests = vec![expr, expr_using_idref];
+        let expr_tests = vec![
+            expr,
+            expr_using_idref,
+            fold_body_expr,
+            fold_body_expr_using_idref,
+        ];
 
         for test_val in expr_tests {
             expect![[r#"
@@ -1439,8 +1449,15 @@ mod local_tests {
         // Test for Pat arena
         let pat = &body[pat_id];
         let pat_using_idref = &body[&pat_id];
+        let fold_body_pat = &fold_body[pat_id];
+        let fold_body_pat_using_idref = &fold_body[&pat_id];
 
-        let pat_tests = vec![pat, pat_using_idref];
+        let pat_tests = vec![
+            pat,
+            pat_using_idref,
+            fold_body_pat,
+            fold_body_pat_using_idref,
+        ];
 
         for test_val in pat_tests {
             expect![[r#"
@@ -1452,8 +1469,15 @@ mod local_tests {
         // Test for TypeExpr arena
         let type_expr = &body[type_expr_id];
         let type_expr_using_idref = &body[&type_expr_id];
+        let fold_body_type_expr = &fold_body[type_expr_id];
+        let fold_body_type_expr_using_idref = &fold_body[&type_expr_id];
 
-        let type_expr_tests = vec![type_expr, type_expr_using_idref];
+        let type_expr_tests = vec![
+            type_expr,
+            type_expr_using_idref,
+            fold_body_type_expr,
+            fold_body_type_expr_using_idref,
+        ];
 
         for test_val in type_expr_tests {
             expect![[r#"
@@ -1465,8 +1489,15 @@ mod local_tests {
         // Test for Term arena
         let term = &body[term_id];
         let term_using_idref = &body[&term_id];
+        let fold_body_term = &fold_body[term_id];
+        let fold_body_term_using_idref = &fold_body[&term_id];
 
-        let term_tests = vec![term, term_using_idref];
+        let term_tests = vec![
+            term,
+            term_using_idref,
+            fold_body_term,
+            fold_body_term_using_idref,
+        ];
 
         for test_val in term_tests {
             expect![[r#"

From 726ece42748351d4c85891d3a86412360f67f84d Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 21 Jul 2025 07:33:12 -0700
Subject: [PATCH 027/394] Provide error message if watchman not installed for
 `elp shell`

Summary: Explicitly check if watchman is available when starting up, and bail if not.

Reviewed By: michalmuskala

Differential Revision: D78662213

fbshipit-source-id: 0d648e0f5f6d84c8f275c067f4c25a0790e61956
---
 crates/elp/src/bin/shell.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crates/elp/src/bin/shell.rs b/crates/elp/src/bin/shell.rs
index 3285b57fa1..9530fa36a1 100644
--- a/crates/elp/src/bin/shell.rs
+++ b/crates/elp/src/bin/shell.rs
@@ -83,7 +83,7 @@ impl Watchman {
     }
 
     fn get_changes(&self, from: &WatchmanClock, patterns: Vec<&str>) -> Result<WatchmanChanges> {
-        let mut cmd = Command::new("watchman");
+        let mut cmd = Self::cmd();
         cmd.arg("since");
         cmd.arg(self.watch.as_os_str());
         cmd.arg(&from.clock);
@@ -330,6 +330,11 @@ fn update_changes(
 }
 
 pub fn run_shell(shell: &Shell, cli: &mut dyn Cli, query_config: &BuckQueryConfig) -> Result<()> {
+    let mut cmd = Command::new("watchman");
+    let _ = cmd.arg("--version").output().map_err(|_| {
+            anyhow::Error::msg("`watchman` command not found. install it from https://facebook.github.io/watchman/ to use `elp shell`.")
+        })?;
+
     let watchman = Watchman::new(&shell.project)
         .map_err(|_err| anyhow::Error::msg(
             "Could not find project. Are you in an Erlang project directory, or is one specified using --project?"

From 5fe199720ce7d6aee18c1f1ae044b170ca67f0bb Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 22 Jul 2025 03:25:01 -0700
Subject: [PATCH 028/394] BE: fix clippy warnings

Summary: As title

Reviewed By: TD5

Differential Revision: D78731905

fbshipit-source-id: 23a69471d82d61a218471d838c17cb4cf18831c3
---
 crates/hir/src/body.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/crates/hir/src/body.rs b/crates/hir/src/body.rs
index dd21d3ee93..b36f796599 100644
--- a/crates/hir/src/body.rs
+++ b/crates/hir/src/body.rs
@@ -1505,7 +1505,5 @@ mod local_tests {
             "#]]
             .assert_debug_eq(test_val);
         }
-
-        return ();
     }
 }

From 2472efbec9c4e52057b78d163368aa765c7bda25 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 23 Jul 2025 02:13:47 -0700
Subject: [PATCH 029/394] Add instructions for elp shell, and need for watchman

Summary:
`elp shell` relies on watchman to monitor for changes.

Document this fact in the web site

Reviewed By: Balajiganapathi

Differential Revision: D78660276

fbshipit-source-id: 03e8b5fdc8b5cbb8fca0b8b008a8003d221b7c2b
---
 website/docs/get-started/cli.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/website/docs/get-started/cli.md b/website/docs/get-started/cli.md
index 361b9a5b51..cdafdfd1d9 100644
--- a/website/docs/get-started/cli.md
+++ b/website/docs/get-started/cli.md
@@ -84,3 +84,18 @@ Run the _eqWAlizer_ typechecker against all _src_ modules in a project.
 ```
 $ elp eqwalize-all
 ```
+
+## `elp shell`
+
+Run the _eqWAlizer_ typechecker in a REPL. This means the startup processing is done
+once, so it's faster to run the typechecker on changed modules.
+
+:::warning
+
+`elp shell` relies on [watchman](https://facebook.github.io/watchman/). If you don't have it installed, it will not work.
+
+:::
+
+```
+$ elp shell
+```

From e49ff321bdca6982fd136ccd486f6d75c862e80c Mon Sep 17 00:00:00 2001
From: ZeeWanderer <mxx888777@gmail.com>
Date: Wed, 23 Jul 2025 08:40:59 -0700
Subject: [PATCH 030/394] windows initial support (#111)

Summary:
This makes it compile on Windows and work from the command line, but still can't get it to work properly with Windows VS Code extension.

```shell
[2025-07-17T18:47:44.619Z] [ERROR elp_ide_db::docs] Unknown application - could not load app_data to determine whether file is on OTP
[2025-07-17T18:47:44.619Z] [ERROR elp_ide_db::docs] No corresponding appdata found for file, so no docs can be loaded
[Error - 9:47:44 PM] [elp_ide_db::docs] Unknown application - could not load app_data to determine whether file is on OTP
[Error - 9:47:44 PM] [elp_ide_db::docs] No corresponding appdata found for file, so no docs can be loaded
[2025-07-17T19:06:47.466Z] [ERROR elp_ide_db::docs] Unknown application - could not load app_data to determine whether file is on OTP
[2025-07-17T19:06:47.466Z] [ERROR elp_ide_db::docs] No corresponding appdata found for file, so no docs can be loaded
[Error - 10:06:47 PM] [elp_ide_db::docs] Unknown application - could not load app_data to determine whether file is on OTP
[Error - 10:06:47 PM] [elp_ide_db::docs] No corresponding appdata found for file, so no docs can be loaded
```

~~and when running `elp shell`~~ Turns out `watchman` was not installed. Haven't seen it in setup docs.
```shell
Could not find project. Are you in an Erlang project directory, or is one specified using --project?
```

[build_info.json](https://github.com/user-attachments/files/21303371/build_info.json) and [project_imfo.json](https://github.com/user-attachments/files/21303726/project_imfo.json) for the newly generated rebar3 project

https://github.com/WhatsApp/erlang-language-platform/issues/26

Pull Request resolved: https://github.com/WhatsApp/erlang-language-platform/pull/111

Reviewed By: TheGeorge

Differential Revision: D78658932

Pulled By: alanz

fbshipit-source-id: 0477ad649a6dc4542d5494360d9c8c0a8374a0ba
---
 crates/eqwalizer/src/ipc.rs       | 44 +++++++++++++++++++++++++++++++
 crates/eqwalizer/src/lib.rs       | 12 ++++++++-
 crates/erlang_service/build.rs    | 27 ++++++++++++++++++-
 crates/erlang_service/src/lib.rs  |  9 +++++++
 crates/project_model/src/lib.rs   |  2 +-
 crates/project_model/src/rebar.rs | 34 +++++++++++++++++++++++-
 6 files changed, 124 insertions(+), 4 deletions(-)

diff --git a/crates/eqwalizer/src/ipc.rs b/crates/eqwalizer/src/ipc.rs
index 46cc0ac677..30b1dae582 100644
--- a/crates/eqwalizer/src/ipc.rs
+++ b/crates/eqwalizer/src/ipc.rs
@@ -35,9 +35,53 @@ use fxhash::FxHashMap;
 use serde::Deserialize;
 use serde::Serialize;
 use stdx::JodChild;
+#[cfg(unix)]
 use timeout_readwrite::TimeoutReader;
+#[cfg(unix)]
 use timeout_readwrite::TimeoutWriter;
 
+#[cfg(windows)]
+mod win_timeout {
+    use std::io::Read;
+    use std::io::Result;
+    use std::io::Write;
+    use std::time::Duration;
+
+    pub struct TimeoutReader<R>(R, Duration);
+    pub struct TimeoutWriter<W>(W, Duration);
+
+    impl<R> TimeoutReader<R> {
+        pub fn new(inner: R, timeout: Duration) -> Self {
+            TimeoutReader(inner, timeout)
+        }
+    }
+    impl<W> TimeoutWriter<W> {
+        pub fn new(inner: W, timeout: Duration) -> Self {
+            TimeoutWriter(inner, timeout)
+        }
+    }
+
+    impl<R: Read> Read for TimeoutReader<R> {
+        fn read(&mut self, buf: &mut [u8]) -> Result<usize> {
+            self.0.read(buf)
+        }
+    }
+
+    impl<W: Write> Write for TimeoutWriter<W> {
+        fn write(&mut self, buf: &[u8]) -> Result<usize> {
+            self.0.write(buf)
+        }
+        fn flush(&mut self) -> Result<()> {
+            self.0.flush()
+        }
+    }
+}
+
+#[cfg(windows)]
+use win_timeout::TimeoutReader;
+#[cfg(windows)]
+use win_timeout::TimeoutWriter;
+
 use crate::ast::Pos;
 
 #[derive(Deserialize, Debug)]
diff --git a/crates/eqwalizer/src/lib.rs b/crates/eqwalizer/src/lib.rs
index 7a79e35e1e..947fc84c6c 100644
--- a/crates/eqwalizer/src/lib.rs
+++ b/crates/eqwalizer/src/lib.rs
@@ -12,6 +12,7 @@ use std::env;
 use std::ffi::OsString;
 use std::fs;
 use std::io::Write;
+#[cfg(unix)]
 use std::os::unix::prelude::PermissionsExt;
 use std::path::PathBuf;
 use std::process::Command;
@@ -202,7 +203,16 @@ impl EqwalizerExe {
             let mut perm = fs::metadata(&temp_file)
                 .expect("can't create eqwalizer temp executable")
                 .permissions();
-            perm.set_mode(0o755);
+
+            #[cfg(windows)]
+            {
+                perm.set_readonly(false);
+            }
+            #[cfg(unix)]
+            {
+                perm.set_mode(0o755);
+            }
+
             fs::set_permissions(&temp_file, perm).expect("can't create eqwalizer temp executable");
 
             (temp_file.to_path_buf(), extension, Some(temp_file))
diff --git a/crates/erlang_service/build.rs b/crates/erlang_service/build.rs
index c94331e07e..30b1285330 100644
--- a/crates/erlang_service/build.rs
+++ b/crates/erlang_service/build.rs
@@ -24,7 +24,32 @@ fn main() {
             .expect("Copying precompiled erlang service escript failed");
     } else {
         let profile = env::var("PROFILE").unwrap();
-        let output = Command::new("rebar3")
+
+        let mut cmd = if cfg!(target_os = "windows") {
+            let rebar3_name = "rebar3";
+            let rebar3_path = env::var("PATH")
+                .ok()
+                .and_then(|paths| {
+                    env::split_paths(&paths).find_map(|dir| {
+                        let candidate = dir.join(rebar3_name);
+                        if candidate.exists() {
+                            Some(candidate)
+                        } else {
+                            None
+                        }
+                    })
+                })
+                .expect("rebar3 not found in PATH - install and add to PATH");
+
+            let mut cmd = Command::new("escript");
+
+            cmd.arg(rebar3_path);
+            cmd
+        } else {
+            Command::new("rebar3")
+        };
+
+        let output = cmd
             .arg("escriptize")
             .env("REBAR_PROFILE", &profile)
             .env("REBAR_BASE_DIR", &dest_dir)
diff --git a/crates/erlang_service/src/lib.rs b/crates/erlang_service/src/lib.rs
index 705304ab4f..16020d78f6 100644
--- a/crates/erlang_service/src/lib.rs
+++ b/crates/erlang_service/src/lib.rs
@@ -860,6 +860,15 @@ fn path_into_list(path: PathBuf) -> eetf::ByteList {
     }
 }
 
+#[cfg(windows)]
+fn path_into_list(path: PathBuf) -> eetf::ByteList {
+    use std::os::windows::ffi::OsStrExt;
+    eetf::ByteList {
+        bytes: String::from_utf16_lossy(&path.as_os_str().encode_wide().collect::<Vec<u16>>())
+            .into_bytes(),
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use std::fs;
diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs
index 1399d2b061..27ebc959b6 100644
--- a/crates/project_model/src/lib.rs
+++ b/crates/project_model/src/lib.rs
@@ -1003,7 +1003,7 @@ impl Project {
                     rebar_setting.config_file
                 );
                 let rebar_version = {
-                    let mut cmd = Command::new("rebar3");
+                    let mut cmd = RebarConfig::rebar3_command_base();
                     cmd.arg("version");
                     utf8_stdout(&mut cmd)?
                 };
diff --git a/crates/project_model/src/rebar.rs b/crates/project_model/src/rebar.rs
index 14468e5fa8..b55cbc1552 100644
--- a/crates/project_model/src/rebar.rs
+++ b/crates/project_model/src/rebar.rs
@@ -8,6 +8,7 @@
  * above-listed licenses.
  */
 
+use std::env;
 use std::fs;
 use std::path::Path;
 use std::path::PathBuf;
@@ -66,12 +67,43 @@ impl RebarConfig {
         Ok(config)
     }
 
+    pub fn rebar3_command_base() -> Command {
+        if cfg!(target_os = "windows") {
+            lazy_static! {
+                static ref REBAR3_PATH: PathBuf = {
+                    let rebar3_name = "rebar3";
+                    env::var("PATH")
+                        .ok()
+                        .and_then(|paths| {
+                            env::split_paths(&paths).find_map(|dir| {
+                                let candidate = dir.join(rebar3_name);
+                                if candidate.exists() {
+                                    Some(candidate)
+                                } else {
+                                    None
+                                }
+                            })
+                        })
+                        .expect("rebar3 not found in PATH - install and add to PATH")
+                };
+            }
+
+            let mut cmd = Command::new("escript");
+            cmd.arg(&*REBAR3_PATH);
+            cmd
+        } else {
+            Command::new("rebar3")
+        }
+    }
+
     pub fn rebar3_command(&self) -> CommandProxy<'_> {
         lazy_static! {
             static ref REBAR_GLOBAL_LOCK: Mutex<()> = Mutex::new(());
         }
         let guard = REBAR_GLOBAL_LOCK.lock();
-        let mut cmd = Command::new("rebar3");
+
+        let mut cmd = Self::rebar3_command_base();
+
         cmd.arg("as");
         cmd.arg(&self.profile.0);
         if let Some(parent) = self.config_file.parent() {

From f1bb7738ae682d96c9f37a031c953a73e76c55de Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Fri, 1 Aug 2025 07:35:06 -0700
Subject: [PATCH 031/394] Revert D75066592

Summary: Revert Salsa 0.19 migration in an attempt to diagnose S546488

Reviewed By: robertoaloi

Differential Revision: D79442869

fbshipit-source-id: 4bc73d2cfc14a9fc5832b08cd3014681dd7721e1
---
 Cargo.lock                                    | 213 ++++++-----
 Cargo.toml                                    |  16 +-
 crates/base_db/Cargo.toml                     |   2 -
 crates/base_db/src/change.rs                  |   4 +-
 crates/base_db/src/fixture.rs                 |   6 +-
 crates/base_db/src/include.rs                 |  20 +-
 crates/base_db/src/input.rs                   |   4 +-
 crates/base_db/src/lib.rs                     | 351 ++++--------------
 crates/elp/src/bin/glean.rs                   |  24 +-
 crates/elp/src/bin/shell.rs                   |   1 +
 crates/elp/src/build/load.rs                  |   1 +
 crates/elp/src/server.rs                      |   2 +-
 crates/eqwalizer/Cargo.toml                   |   1 -
 crates/eqwalizer/src/analyses/mod.rs          |   2 +-
 crates/eqwalizer/src/db.rs                    |   6 +-
 crates/eqwalizer/src/lib.rs                   |   6 +-
 crates/hir/Cargo.toml                         |   1 -
 crates/hir/src/body.rs                        |   6 +-
 crates/hir/src/body/scope.rs                  |   2 +-
 crates/hir/src/db.rs                          |  11 +-
 crates/hir/src/def_map.rs                     |   9 +-
 crates/hir/src/edoc.rs                        |   6 +-
 crates/hir/src/include.rs                     |   3 +-
 crates/hir/src/intern.rs                      |  47 ++-
 crates/hir/src/lib.rs                         |   4 +-
 crates/hir/src/macro_exp.rs                   |  11 +-
 crates/hir/src/module_data.rs                 |  50 ++-
 crates/hir/src/sema.rs                        |   5 +-
 crates/hir/src/test_db.rs                     |  94 +----
 crates/ide/src/codemod_helpers.rs             |   2 +-
 crates/ide/src/diagnostics.rs                 |   2 +-
 .../eqwalizer_assists/expected_type.rs        |   2 +-
 crates/ide/src/diagnostics/module_mismatch.rs |   4 +-
 crates/ide/src/fixture.rs                     |   2 +-
 crates/ide/src/lib.rs                         |  12 +-
 crates/ide/src/rename.rs                      |   2 +-
 crates/ide/src/tests.rs                       |  20 +-
 crates/ide_assists/src/assist_context.rs      |   2 +-
 crates/ide_assists/src/tests.rs               |  26 +-
 crates/ide_completion/src/ctx.rs              |   2 +-
 crates/ide_completion/src/helpers.rs          |   6 +-
 crates/ide_completion/src/macros.rs           |   4 +-
 crates/ide_db/Cargo.toml                      |   1 -
 crates/ide_db/src/common_test.rs              |   8 +-
 crates/ide_db/src/docs.rs                     |  19 +-
 crates/ide_db/src/eqwalizer.rs                |  26 +-
 crates/ide_db/src/erl_ast.rs                  |  24 +-
 crates/ide_db/src/lib.rs                      | 152 +++-----
 crates/ide_db/src/search.rs                   |   5 +-
 crates/ide_ssr/src/lib.rs                     |  10 +-
 crates/ide_ssr/src/tests.rs                   |  10 +-
 51 files changed, 458 insertions(+), 791 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d19a4aeafc..a03c78f3cc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -115,12 +115,6 @@ version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 
-[[package]]
-name = "boxcar"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66bb12751a83493ef4b8da1120451a262554e216a247f14b48cb5e8fe7ed8bdf"
-
 [[package]]
 name = "bpaf"
 version = "0.7.9"
@@ -307,15 +301,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
-dependencies = [
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.21"
@@ -363,20 +348,6 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04d2cd9c18b9f454ed67da600630b021a8a80bf33f8c95896ab33aaf1c26b728"
 
-[[package]]
-name = "dashmap"
-version = "6.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core",
-]
-
 [[package]]
 name = "deranged"
 version = "0.4.0"
@@ -485,7 +456,7 @@ dependencies = [
  "fxhash",
  "hir",
  "include_dir",
- "indexmap",
+ "indexmap 2.9.0",
  "indicatif",
  "itertools 0.10.5",
  "jod-thread",
@@ -493,7 +464,7 @@ dependencies = [
  "log",
  "lsp-server",
  "lsp-types",
- "parking_lot",
+ "parking_lot 0.12.4",
  "paths",
  "profile",
  "range-set",
@@ -523,7 +494,6 @@ name = "elp_base_db"
 version = "1.1.0"
 dependencies = [
  "anyhow",
- "dashmap",
  "dissimilar",
  "eetf",
  "either",
@@ -535,7 +505,6 @@ dependencies = [
  "log",
  "paths",
  "profile",
- "ra_ap_query-group-macro",
  "regex",
  "salsa",
  "serde_json",
@@ -556,8 +525,7 @@ dependencies = [
  "fxhash",
  "itertools 0.10.5",
  "log",
- "parking_lot",
- "ra_ap_query-group-macro",
+ "parking_lot 0.12.4",
  "salsa",
  "serde",
  "serde_json",
@@ -584,7 +552,7 @@ dependencies = [
  "jod-thread",
  "lazy_static",
  "log",
- "parking_lot",
+ "parking_lot 0.12.4",
  "regex",
  "stdx",
  "tempfile",
@@ -614,7 +582,7 @@ dependencies = [
  "itertools 0.10.5",
  "lazy_static",
  "log",
- "parking_lot",
+ "parking_lot 0.12.4",
  "profile",
  "rayon",
  "regex",
@@ -681,15 +649,14 @@ dependencies = [
  "expect-test",
  "fxhash",
  "hir",
- "indexmap",
+ "indexmap 2.9.0",
  "lazy_static",
  "log",
  "memchr",
  "once_cell",
- "parking_lot",
+ "parking_lot 0.12.4",
  "paths",
  "profile",
- "ra_ap_query-group-macro",
  "regex",
  "rustc-hash 1.1.0",
  "serde",
@@ -726,7 +693,7 @@ dependencies = [
  "humantime",
  "lazy_static",
  "log",
- "parking_lot",
+ "parking_lot 0.12.4",
  "regex",
  "serde",
  "serde_json",
@@ -746,11 +713,11 @@ dependencies = [
  "fxhash",
  "glob",
  "include_dir",
- "indexmap",
+ "indexmap 2.9.0",
  "itertools 0.10.5",
  "lazy_static",
  "log",
- "parking_lot",
+ "parking_lot 0.12.4",
  "paths",
  "regex",
  "semver",
@@ -773,7 +740,7 @@ dependencies = [
  "elp_text_edit",
  "expect-test",
  "fxhash",
- "indexmap",
+ "indexmap 2.9.0",
  "itertools 0.10.5",
  "lazy_static",
  "log",
@@ -1008,6 +975,12 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
 
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
 [[package]]
 name = "hashbrown"
 version = "0.14.5"
@@ -1024,18 +997,16 @@ version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
 dependencies = [
- "allocator-api2",
- "equivalent",
  "foldhash",
 ]
 
 [[package]]
-name = "hashlink"
-version = "0.10.0"
+name = "heck"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
 dependencies = [
- "hashbrown 0.15.3",
+ "unicode-segmentation",
 ]
 
 [[package]]
@@ -1044,12 +1015,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
 [[package]]
 name = "hermit-abi"
 version = "0.5.1"
@@ -1072,7 +1037,6 @@ dependencies = [
  "lazy_static",
  "log",
  "profile",
- "ra_ap_query-group-macro",
  "regex",
  "stdx",
  "tracing",
@@ -1238,6 +1202,16 @@ dependencies = [
  "quote",
 ]
 
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+]
+
 [[package]]
 name = "indexmap"
 version = "2.9.0"
@@ -1246,7 +1220,6 @@ checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.3",
- "serde",
 ]
 
 [[package]]
@@ -1283,6 +1256,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
@@ -1388,7 +1370,7 @@ dependencies = [
 [[package]]
 name = "la-arena"
 version = "0.3.1"
-source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-17#b0632f749e6abf0f82f71755d7eaca4884c1a808"
+source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-04#02862f5d52c30b476a5dca909a17aa4386d1fdc5"
 
 [[package]]
 name = "lazy_static"
@@ -1434,7 +1416,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
  "bitflags 2.9.1",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.5.12",
 ]
 
 [[package]]
@@ -1702,6 +1684,12 @@ version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
 
+[[package]]
+name = "oorandom"
+version = "11.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
+
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@@ -1717,6 +1705,17 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
 [[package]]
 name = "parking_lot"
 version = "0.12.4"
@@ -1724,7 +1723,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
 dependencies = [
  "lock_api",
- "parking_lot_core",
+ "parking_lot_core 0.9.11",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
 ]
 
 [[package]]
@@ -1735,7 +1748,7 @@ checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.5.12",
  "smallvec",
  "windows-targets 0.52.6",
 ]
@@ -1749,7 +1762,7 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 [[package]]
 name = "paths"
 version = "0.0.0"
-source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-17#b0632f749e6abf0f82f71755d7eaca4884c1a808"
+source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-04#02862f5d52c30b476a5dca909a17aa4386d1fdc5"
 dependencies = [
  "camino",
 ]
@@ -1786,7 +1799,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap",
+ "indexmap 2.9.0",
 ]
 
 [[package]]
@@ -1861,7 +1874,7 @@ dependencies = [
 [[package]]
 name = "profile"
 version = "0.0.0"
-source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-17#b0632f749e6abf0f82f71755d7eaca4884c1a808"
+source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-04#02862f5d52c30b476a5dca909a17aa4386d1fdc5"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1885,19 +1898,6 @@ version = "5.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
 
-[[package]]
-name = "ra_ap_query-group-macro"
-version = "0.0.270"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f1a38f07b442e47a234cbe2e8fd1b8a41ff0cc5123cb1cf994c5ce20edb5bd6"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "salsa",
- "syn 2.0.101",
-]
-
 [[package]]
 name = "radix_trie"
 version = "0.2.1"
@@ -1938,6 +1938,15 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.5.12"
@@ -2080,43 +2089,31 @@ checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "salsa"
-version = "0.19.0"
+version = "0.17.0-pre.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd55c6549513b2a42884dae31e3d4f4ac8a6cc51062e68e24d162133889f327c"
+checksum = "9b223dccb46c32753144d0b51290da7230bb4aedcd8379d6b4c9a474c18bf17a"
 dependencies = [
- "boxcar",
- "crossbeam-queue",
- "dashmap",
- "hashbrown 0.15.3",
- "hashlink",
- "indexmap",
- "parking_lot",
- "portable-atomic",
- "rayon",
- "rustc-hash 2.1.1",
- "salsa-macro-rules",
+ "crossbeam-utils",
+ "indexmap 1.9.3",
+ "lock_api",
+ "log",
+ "oorandom",
+ "parking_lot 0.11.2",
+ "rustc-hash 1.1.0",
  "salsa-macros",
  "smallvec",
- "tracing",
 ]
 
-[[package]]
-name = "salsa-macro-rules"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2619b4b451beab0a7e4364ff1e6f31950e7e418888fd9bf2f28889671563166a"
-
 [[package]]
 name = "salsa-macros"
-version = "0.19.0"
+version = "0.17.0-pre.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be57a99b3896e8d26850428a6874fb86849e2db874e1db3528e5cee4337d277"
+checksum = "ac6c2e352df550bf019da7b16164ed2f7fa107c39653d1311d1bba42d1582ff7"
 dependencies = [
- "heck 0.5.0",
+ "heck 0.3.3",
  "proc-macro2",
  "quote",
- "syn 2.0.101",
- "synstructure",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2248,7 +2245,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 [[package]]
 name = "stdx"
 version = "0.0.0"
-source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-17#b0632f749e6abf0f82f71755d7eaca4884c1a808"
+source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-04#02862f5d52c30b476a5dca909a17aa4386d1fdc5"
 dependencies = [
  "crossbeam-channel",
  "itertools 0.12.1",
@@ -2610,7 +2607,7 @@ dependencies = [
  "ahash",
  "byteorder",
  "lazy_static",
- "parking_lot",
+ "parking_lot 0.12.4",
  "serde",
 ]
 
@@ -2635,11 +2632,11 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 [[package]]
 name = "vfs"
 version = "0.0.0"
-source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-17#b0632f749e6abf0f82f71755d7eaca4884c1a808"
+source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-04#02862f5d52c30b476a5dca909a17aa4386d1fdc5"
 dependencies = [
  "crossbeam-channel",
  "fst",
- "indexmap",
+ "indexmap 2.9.0",
  "nohash-hasher",
  "paths",
  "rustc-hash 2.1.1",
@@ -2650,7 +2647,7 @@ dependencies = [
 [[package]]
 name = "vfs-notify"
 version = "0.0.0"
-source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-17#b0632f749e6abf0f82f71755d7eaca4884c1a808"
+source = "git+https://github.com/rust-lang/rust-analyzer?rev=2025-03-04#02862f5d52c30b476a5dca909a17aa4386d1fdc5"
 dependencies = [
  "crossbeam-channel",
  "notify",
diff --git a/Cargo.toml b/Cargo.toml
index 533310e950..7ec49a5f83 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,7 +47,6 @@ codespan-reporting = "0.11.1"
 cov-mark = "2.0.0"
 criterion = "0.3.6"
 crossbeam-channel = "0.5.15"
-dashmap = "6.1.0"
 dirs = "5.0"
 dissimilar = "1.0.9"
 triple_accel = "0.4.0"
@@ -70,7 +69,7 @@ jemalloc-ctl = { version = "0.5.0", package = "tikv-jemalloc-ctl" }
 jemallocator = { version = "0.5.4", package = "tikv-jemallocator" }
 jod-thread = "0.1.2"
 krates = "0.12.6"
-la-arena = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-17" }
+la-arena = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-04" }
 lazy_static = "1.5.0"
 log = "0.4.22"
 lsp-server = "0.7.6"
@@ -81,11 +80,10 @@ num-derive = "0.4.2"
 num-traits = "0.2.19"
 once_cell = "1.19.0"
 parking_lot = "0.12.3"
-paths = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-17" }
+paths = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-04" }
 proc-macro2 = "1.0.86"
-profile = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-17" }
+profile = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-04" }
 quote = "1.0.36"
-ra_ap_query-group-macro = "0.0.270"
 range-set = "0.0.10"
 rayon = "1.10.0"
 regex = "1.10.6"
@@ -93,7 +91,7 @@ rowan = "0.15.15"
 rust-ini = "0.18"
 rustc-hash = "1.1.0"
 rustyline = "11.0.0"
-salsa = "0.19.0"
+salsa = "0.17.0-pre.2"
 semver = "1.0.23"
 serde = { version = "1.0.206", features = ["derive", "rc"] }
 serde_json = "1.0.124"
@@ -101,7 +99,7 @@ serde_path_to_error = "0.1.16"
 serde_with = "1.14.0"
 smallvec = { version = "1.13.2", features = ["const_new", "union", "const_generics"] }
 smol_str = "0.1.24"
-stdx = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-17" }
+stdx = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-04" }
 strsim = { version = "0.10.0" }
 strum = "0.25.0"
 strum_macros = "0.25.3"
@@ -118,7 +116,7 @@ tree-sitter = "0.23.2"
 tree-sitter-erlang = "0.14.0" # @oss-only
 url = "2.5.4"
 ustr = { version = "1.1.0", features = ["serde"] }
-vfs = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-17" }
-vfs-notify = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-17" }
+vfs = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-04" }
+vfs-notify = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-04" }
 walkdir = "2.5.0"
 xshell = "0.2.6"
diff --git a/crates/base_db/Cargo.toml b/crates/base_db/Cargo.toml
index 07f3cbb81a..a8c0c0e834 100644
--- a/crates/base_db/Cargo.toml
+++ b/crates/base_db/Cargo.toml
@@ -14,7 +14,6 @@ elp_project_model.workspace = true
 elp_syntax.workspace = true
 
 anyhow.workspace = true
-dashmap.workspace = true
 dissimilar.workspace = true
 eetf.workspace = true
 either.workspace = true
@@ -23,7 +22,6 @@ lazy_static.workspace = true
 log.workspace = true
 paths.workspace = true
 profile.workspace = true
-ra_ap_query-group-macro.workspace = true
 regex.workspace = true
 salsa.workspace = true
 serde_json.workspace = true
diff --git a/crates/base_db/src/change.rs b/crates/base_db/src/change.rs
index 6bb412a60d..48758f9e17 100644
--- a/crates/base_db/src/change.rs
+++ b/crates/base_db/src/change.rs
@@ -17,7 +17,7 @@ use std::sync::Arc;
 use vfs::AbsPathBuf;
 use vfs::FileId;
 
-use crate::RootQueryDb;
+use crate::SourceDatabaseExt;
 use crate::SourceRoot;
 use crate::SourceRootId;
 use crate::input::AppStructure;
@@ -65,7 +65,7 @@ impl Change {
 
     pub fn apply(
         self,
-        db: &mut dyn RootQueryDb,
+        db: &mut dyn SourceDatabaseExt,
         resolve_file_id: &impl Fn(&AbsPathBuf) -> Option<FileId>,
     ) -> Vec<FileId> {
         let _p = tracing::info_span!("RootDatabase::apply_change").entered();
diff --git a/crates/base_db/src/fixture.rs b/crates/base_db/src/fixture.rs
index d48a221534..e6db02c361 100644
--- a/crates/base_db/src/fixture.rs
+++ b/crates/base_db/src/fixture.rs
@@ -47,12 +47,12 @@ use crate::FilePosition;
 use crate::FileRange;
 use crate::ProjectApps;
 use crate::ProjectId;
-use crate::SourceDatabase;
+use crate::SourceDatabaseExt;
 use crate::SourceRoot;
 use crate::change::Change;
 use crate::input::IncludeOtp;
 
-pub trait WithFixture: Default + SourceDatabase + 'static {
+pub trait WithFixture: Default + SourceDatabaseExt + 'static {
     #[track_caller]
     fn with_single_file(fixture: &str) -> (Self, FileId) {
         let (db, fixture) = Self::with_fixture(fixture);
@@ -91,7 +91,7 @@ pub trait WithFixture: Default + SourceDatabase + 'static {
     }
 }
 
-impl<DB: SourceDatabase + Default + 'static> WithFixture for DB {}
+impl<DB: SourceDatabaseExt + Default + 'static> WithFixture for DB {}
 
 #[derive(Clone, Debug)]
 pub struct ChangeFixture {
diff --git a/crates/base_db/src/include.rs b/crates/base_db/src/include.rs
index d68f41a2a5..685989edb4 100644
--- a/crates/base_db/src/include.rs
+++ b/crates/base_db/src/include.rs
@@ -18,11 +18,11 @@ use vfs::VfsPath;
 
 use crate::AppData;
 use crate::ProjectId;
-use crate::RootQueryDb;
+use crate::SourceDatabase;
 use crate::SourceRoot;
 
 pub struct IncludeCtx<'a> {
-    db: &'a dyn RootQueryDb,
+    db: &'a dyn SourceDatabase,
     source_root: Arc<SourceRoot>,
     /// The starting .erl file when resolving includes
     pub orig_file_id: Option<FileId>,
@@ -35,7 +35,7 @@ pub struct IncludeCtx<'a> {
 
 impl<'a> IncludeCtx<'a> {
     pub fn new(
-        db: &'a dyn RootQueryDb,
+        db: &'a dyn SourceDatabase,
         orig_file_id: Option<FileId>,
         current_file_id: FileId,
     ) -> Self {
@@ -43,8 +43,8 @@ impl<'a> IncludeCtx<'a> {
         let _ = stdx::panic_context::enter(format!(
             "\nIncludeCtx::new: {orig_file_id:?} {current_file_id:?}"
         ));
-        let source_root_id = db.file_source_root(current_file_id).source_root_id(db);
-        let source_root = db.source_root(source_root_id).source_root(db);
+        let source_root_id = db.file_source_root(current_file_id);
+        let source_root = db.source_root(source_root_id);
         Self {
             db,
             orig_file_id,
@@ -85,7 +85,7 @@ impl<'a> IncludeCtx<'a> {
     /// for a base filename in the includes of the current app (from
     /// the `file_id`) or any of its dependencies
     pub(crate) fn resolve_local_query(
-        db: &dyn RootQueryDb,
+        db: &dyn SourceDatabase,
         file_id: FileId,
         path: SmolStr,
     ) -> Option<FileId> {
@@ -124,13 +124,13 @@ impl<'a> IncludeCtx<'a> {
     /// In this case, the starting file is the `orig_file_id`, and the current file is
     /// the one being processed.
     pub(crate) fn resolve_remote_query(
-        db: &dyn RootQueryDb,
+        db: &dyn SourceDatabase,
         orig_file_id: Option<FileId>,
         current_file_id: FileId,
         path: SmolStr,
     ) -> Option<FileId> {
         let project_id = db.file_project_id(current_file_id)?;
-        let project_data = db.project_data(project_id).project_data(db);
+        let project_data = db.project_data(project_id);
         // `app_data` represents the app that is doing the including.
         // If `orig_file_id` is set, we are possibly processing a
         // nested include file.  In this case we must do our checking
@@ -202,7 +202,7 @@ impl<'a> IncludeCtx<'a> {
 }
 
 fn find_generated_include_lib(
-    db: &dyn RootQueryDb,
+    db: &dyn SourceDatabase,
     project_id: ProjectId,
     include_path: &str,
     target_app_data: &AppData,
@@ -230,7 +230,7 @@ fn find_generated_include_lib(
 }
 
 pub fn generated_file_include_lib(
-    db: &dyn RootQueryDb,
+    db: &dyn SourceDatabase,
     file_id: FileId,
     included_file_id: FileId,
     include_path: VfsPath,
diff --git a/crates/base_db/src/input.rs b/crates/base_db/src/input.rs
index 8b679c0c6b..29da6ed0c5 100644
--- a/crates/base_db/src/input.rs
+++ b/crates/base_db/src/input.rs
@@ -30,7 +30,7 @@ use vfs::VfsPath;
 use vfs::file_set::FileSet;
 
 use crate::AppDataIndex;
-use crate::RootQueryDb;
+use crate::SourceDatabaseExt;
 
 /// Files are grouped into source roots. A source root is a directory on the
 /// file systems which is watched for changes. Typically it corresponds to an OTP
@@ -207,7 +207,7 @@ impl AppStructure {
     /// Set the salsa inputs according to this AppStructure
     pub fn apply(
         self,
-        db: &mut dyn RootQueryDb,
+        db: &mut dyn SourceDatabaseExt,
         resolve_file_id: &impl Fn(&AbsPathBuf) -> Option<FileId>,
     ) -> FxHashMap<AbsPathBuf, AppDataId> {
         let mut app_index = AppDataIndex::default();
diff --git a/crates/base_db/src/lib.rs b/crates/base_db/src/lib.rs
index 4dd3a1c865..04b258f2cd 100644
--- a/crates/base_db/src/lib.rs
+++ b/crates/base_db/src/lib.rs
@@ -9,11 +9,8 @@
  */
 
 use std::borrow::Cow;
-use std::hash::BuildHasherDefault;
 use std::sync::Arc;
 
-use dashmap::DashMap;
-use dashmap::Entry;
 use elp_project_model::AppName;
 use elp_project_model::buck::IncludeMapping;
 use elp_project_model::buck::IncludeMappingScope;
@@ -24,7 +21,6 @@ use elp_syntax::TextRange;
 use elp_syntax::TextSize;
 use elp_syntax::ast::SourceFile;
 use fxhash::FxHashMap;
-use fxhash::FxHasher;
 use lazy_static::lazy_static;
 
 mod change;
@@ -66,7 +62,6 @@ pub use paths::RelPath;
 pub use paths::RelPathBuf;
 use regex::Regex;
 pub use salsa;
-use salsa::Setter;
 pub use vfs::AnchoredPath;
 pub use vfs::AnchoredPathBuf;
 pub use vfs::ChangeKind;
@@ -149,213 +144,35 @@ impl FileKind {
     }
 }
 
-#[derive(Debug, Default, Clone)]
-pub struct Files {
-    files: Arc<DashMap<FileId, FileText, BuildHasherDefault<FxHasher>>>,
-    source_roots: Arc<DashMap<SourceRootId, SourceRootInput, BuildHasherDefault<FxHasher>>>,
-    file_source_roots: Arc<DashMap<FileId, FileSourceRootInput, BuildHasherDefault<FxHasher>>>,
-    app_datas: Arc<DashMap<AppDataId, AppDataInput, BuildHasherDefault<FxHasher>>>,
-    source_app_datas: Arc<DashMap<SourceRootId, SourceAppDataInput, BuildHasherDefault<FxHasher>>>,
-    project_datas: Arc<DashMap<ProjectId, ProjectDataInput, BuildHasherDefault<FxHasher>>>,
-}
-
-impl Files {
-    pub fn file_text(&self, file_id: FileId) -> FileText {
-        *self
-            .files
-            .get(&file_id)
-            .expect("Unable to fetch file; this is a bug")
-    }
-
-    pub fn set_file_text(&self, db: &mut dyn SourceDatabase, file_id: FileId, text: Arc<str>) {
-        let files = Arc::clone(&self.files);
-        match files.entry(file_id) {
-            Entry::Occupied(mut occupied) => {
-                occupied.get_mut().set_text(db).to(text);
-            }
-            Entry::Vacant(vacant) => {
-                let text = FileText::builder(text).new(db);
-                vacant.insert(text);
-            }
-        };
-    }
-
-    pub fn source_root(&self, source_root_id: SourceRootId) -> SourceRootInput {
-        let source_root = self
-            .source_roots
-            .get(&source_root_id)
-            .expect("Unable to fetch source root id; this is a bug");
-
-        *source_root
-    }
-
-    pub fn set_source_root(
-        &self,
-        db: &mut dyn SourceDatabase,
-        source_root_id: SourceRootId,
-        source_root: Arc<SourceRoot>,
-    ) {
-        let source_roots = Arc::clone(&self.source_roots);
-        match source_roots.entry(source_root_id) {
-            Entry::Occupied(mut occupied) => {
-                occupied.get_mut().set_source_root(db).to(source_root);
-            }
-            Entry::Vacant(vacant) => {
-                let source_root = SourceRootInput::builder(source_root).new(db);
-                vacant.insert(source_root);
-            }
-        };
-    }
-
-    pub fn file_source_root(&self, id: FileId) -> FileSourceRootInput {
-        let file_source_root = self
-            .file_source_roots
-            .get(&id)
-            .expect("Unable to fetch FileSourceRootInput; this is a bug");
-        *file_source_root
-    }
-
-    pub fn set_file_source_root(
-        &self,
-        db: &mut dyn SourceDatabase,
-        id: FileId,
-        source_root_id: SourceRootId,
-    ) {
-        let file_source_roots = Arc::clone(&self.file_source_roots);
-        match file_source_roots.entry(id) {
-            Entry::Occupied(mut occupied) => {
-                occupied.get_mut().set_source_root_id(db).to(source_root_id);
-            }
-            Entry::Vacant(vacant) => {
-                let file_source_root = FileSourceRootInput::builder(source_root_id).new(db);
-                vacant.insert(file_source_root);
-            }
-        };
-    }
-
-    pub fn app_data(&self, app_data_id: AppDataId) -> AppDataInput {
-        let app_data = self
-            .app_datas
-            .get(&app_data_id)
-            .expect("Unable to fetch app data id; this is a bug");
-
-        *app_data
-    }
-
-    pub fn set_app_data(
-        &self,
-        db: &mut dyn SourceDatabase,
-        app_data_id: AppDataId,
-        app_data: Option<Arc<AppData>>,
-    ) {
-        let app_datas = Arc::clone(&self.app_datas);
-        match app_datas.entry(app_data_id) {
-            Entry::Occupied(mut occupied) => {
-                occupied.get_mut().set_app_data(db).to(app_data);
-            }
-            Entry::Vacant(vacant) => {
-                let app_data = AppDataInput::builder(app_data).new(db);
-                vacant.insert(app_data);
-            }
-        };
-    }
-
-    pub fn source_app_data(&self, source_root_id: SourceRootId) -> SourceAppDataInput {
-        let source_app_data = self
-            .source_app_datas
-            .get(&source_root_id)
-            .expect("Unable to fetch source app data; this is a bug");
-
-        *source_app_data
-    }
-
-    pub fn set_source_app_data(
-        &self,
-        db: &mut dyn SourceDatabase,
-        source_root_id: SourceRootId,
-        app_data_id: AppDataId,
-    ) {
-        let source_app_datas = Arc::clone(&self.source_app_datas);
-        match source_app_datas.entry(source_root_id) {
-            Entry::Occupied(mut occupied) => {
-                occupied.get_mut().set_app_data_id(db).to(app_data_id);
-            }
-            Entry::Vacant(vacant) => {
-                let source_app_data = SourceAppDataInput::builder(app_data_id).new(db);
-                vacant.insert(source_app_data);
-            }
-        };
-    }
-
-    pub fn project_data(&self, project_id: ProjectId) -> ProjectDataInput {
-        let project_data = self
-            .project_datas
-            .get(&project_id)
-            .expect("Unable to fetch project data; this is a bug");
-
-        *project_data
-    }
-
-    pub fn set_project_data(
-        &self,
-        db: &mut dyn SourceDatabase,
-        project_id: ProjectId,
-        project_data: Arc<ProjectData>,
-    ) {
-        let project_datas = Arc::clone(&self.project_datas);
-        match project_datas.entry(project_id) {
-            Entry::Occupied(mut occupied) => {
-                occupied.get_mut().set_project_data(db).to(project_data);
-            }
-            Entry::Vacant(vacant) => {
-                let project_data = ProjectDataInput::builder(project_data).new(db);
-                vacant.insert(project_data);
-            }
-        };
-    }
-}
-
-#[salsa::input]
-pub struct FileText {
-    pub text: Arc<str>,
-}
-
-#[salsa::input]
-pub struct FileSourceRootInput {
-    pub source_root_id: SourceRootId,
-}
-
-#[salsa::input]
-pub struct SourceRootInput {
-    pub source_root: Arc<SourceRoot>,
-}
-
-#[salsa::input]
-pub struct AppDataInput {
-    pub app_data: Option<Arc<AppData>>,
-}
-
-#[salsa::input]
-pub struct SourceAppDataInput {
-    pub app_data_id: AppDataId,
-}
-
-#[salsa::input]
-pub struct ProjectDataInput {
-    pub project_data: Arc<ProjectData>,
+pub trait FileLoader {
+    /// Text of the file.
+    fn file_text(&self, file_id: FileId) -> Arc<str>;
 }
 
 /// Database which stores all significant input facts: source code and project
 /// model. Everything else in ELP is derived from these queries.
-#[ra_ap_query_group_macro::query_group]
-pub trait RootQueryDb: SourceDatabase + salsa::Database {
+#[salsa::query_group(SourceDatabaseStorage)]
+pub trait SourceDatabase: FileLoader + salsa::Database {
+    /// Path to a file, relative to the root of its source root.
+    /// Source root of the file.
+    #[salsa::input]
+    fn file_source_root(&self, file_id: FileId) -> SourceRootId;
+
     #[salsa::input]
     fn catch_all_source_root(&self) -> SourceRootId;
 
+    /// Contents of the source root.
+    #[salsa::input]
+    fn source_root(&self, id: SourceRootId) -> Arc<SourceRoot>;
+
     /// The data for a given application. We can access this either
     /// from the `FileId` or by `SourceRootId`, so introduce an
     /// intermediate `AppDataId` to map from the two sources.
     fn app_data(&self, id: SourceRootId) -> Option<Arc<AppData>>;
+    #[salsa::input]
+    fn app_data_by_id(&self, id: AppDataId) -> Option<Arc<AppData>>;
+    #[salsa::input]
+    fn app_data_id(&self, id: SourceRootId) -> AppDataId;
 
     fn app_data_id_by_file(&self, id: FileId) -> Option<AppDataId>;
 
@@ -368,6 +185,9 @@ pub trait RootQueryDb: SourceDatabase + salsa::Database {
         path: SmolStr,
     ) -> Option<FileId>;
 
+    #[salsa::input]
+    fn project_data(&self, id: ProjectId) -> Arc<ProjectData>;
+
     fn file_app_data(&self, file_id: FileId) -> Option<Arc<AppData>>;
 
     /// Returns a map from module name to FileId of the containing file.
@@ -418,43 +238,13 @@ pub trait RootQueryDb: SourceDatabase + salsa::Database {
     ) -> Option<FileId>;
 }
 
-#[salsa::db]
-pub trait SourceDatabase: salsa::Database {
-    fn file_text(&self, file_id: FileId) -> FileText;
-
-    fn set_file_text(&mut self, file_id: FileId, text: Arc<str>);
-
-    /// Contents of the source root.
-    fn source_root(&self, id: SourceRootId) -> SourceRootInput;
-
-    fn set_source_root(&mut self, source_root_id: SourceRootId, source_root: Arc<SourceRoot>);
-
-    /// Source root of the file.
-    fn file_source_root(&self, id: FileId) -> FileSourceRootInput;
-
-    fn set_file_source_root(&mut self, id: FileId, source_root_id: SourceRootId);
-
-    fn app_data_by_id(&self, id: AppDataId) -> AppDataInput;
-
-    fn set_app_data_by_id(&mut self, id: AppDataId, app_data: Option<Arc<AppData>>);
-
-    fn app_data_id(&self, id: SourceRootId) -> SourceAppDataInput;
-
-    fn set_app_data_id(&mut self, id: SourceRootId, app_data_id: AppDataId);
-
-    fn project_data(&self, id: ProjectId) -> ProjectDataInput;
-
-    fn set_project_data(&mut self, id: ProjectId, project_data: Arc<ProjectData>);
+fn app_data(db: &dyn SourceDatabase, id: SourceRootId) -> Option<Arc<AppData>> {
+    db.app_data_by_id(db.app_data_id(id))
 }
 
-fn app_data(db: &dyn RootQueryDb, id: SourceRootId) -> Option<Arc<AppData>> {
-    db.app_data_by_id(db.app_data_id(id).app_data_id(db))
-        .app_data(db)
-}
-
-fn file_app_data(db: &dyn RootQueryDb, file_id: FileId) -> Option<Arc<AppData>> {
+fn file_app_data(db: &dyn SourceDatabase, file_id: FileId) -> Option<Arc<AppData>> {
     let lookup = if let Some(id) = db.app_data_id_by_file(file_id) {
-        db.app_data_by_id(id).app_data(db)
+        db.app_data_by_id(id)
     } else {
         None
     };
@@ -463,16 +253,16 @@ fn file_app_data(db: &dyn RootQueryDb, file_id: FileId) -> Option<Arc<AppData>>
         // mode, and OTP files
         .or_else(|| {
             let source_root_id = db.file_source_root(file_id);
-            db.app_data(source_root_id.source_root_id(db))
+            db.app_data(source_root_id)
         })
 }
 
-fn module_index(db: &dyn RootQueryDb, project_id: ProjectId) -> Arc<ModuleIndex> {
+fn module_index(db: &dyn SourceDatabase, project_id: ProjectId) -> Arc<ModuleIndex> {
     let mut builder = ModuleIndex::builder();
 
-    let project_data = db.project_data(project_id).project_data(db);
+    let project_data = db.project_data(project_id);
     for &source_root_id in &project_data.source_roots {
-        let source_root = db.source_root(source_root_id).source_root(db);
+        let source_root = db.source_root(source_root_id);
         for file_id in source_root.iter() {
             if db.file_kind(file_id).is_module() {
                 if let Some(app_data) = db.file_app_data(file_id) {
@@ -525,9 +315,9 @@ impl IncludeFileIndex {
     }
 }
 
-fn include_file_index(db: &dyn RootQueryDb, project_id: ProjectId) -> Arc<IncludeFileIndex> {
+fn include_file_index(db: &dyn SourceDatabase, project_id: ProjectId) -> Arc<IncludeFileIndex> {
     let mut include_file_index = IncludeFileIndex::default();
-    let project_data = db.project_data(project_id).project_data(db);
+    let project_data = db.project_data(project_id);
     build_include_file_index(db, &project_data, &mut include_file_index);
     project_data
         .otp_project_id
@@ -536,7 +326,7 @@ fn include_file_index(db: &dyn RootQueryDb, project_id: ProjectId) -> Arc<Includ
             if *otp_project_id != project_id {
                 build_include_file_index(
                     db,
-                    &db.project_data(*otp_project_id).project_data(db),
+                    &db.project_data(*otp_project_id),
                     &mut include_file_index,
                 );
             }
@@ -548,12 +338,12 @@ fn include_file_index(db: &dyn RootQueryDb, project_id: ProjectId) -> Arc<Includ
 }
 
 fn build_include_file_index(
-    db: &dyn RootQueryDb,
+    db: &dyn SourceDatabase,
     project_data: &Arc<ProjectData>,
     include_file_index: &mut IncludeFileIndex,
 ) {
     for &source_root_id in &project_data.source_roots {
-        let source_root = db.source_root(source_root_id).source_root(db);
+        let source_root = db.source_root(source_root_id);
         for file_id in source_root.iter() {
             if let Some(path) = source_root.path_for_file(&file_id) {
                 if let Some((_name, Some("hrl"))) = path.name_and_extension() {
@@ -566,13 +356,17 @@ fn build_include_file_index(
     }
 }
 
-fn include_file_id(db: &dyn RootQueryDb, project_id: ProjectId, path: VfsPath) -> Option<FileId> {
+fn include_file_id(
+    db: &dyn SourceDatabase,
+    project_id: ProjectId,
+    path: VfsPath,
+) -> Option<FileId> {
     let include_file_index = db.include_file_index(project_id);
     include_file_index.path_to_file_id.get(&path).copied()
 }
 
 fn mapped_include_file(
-    db: &dyn RootQueryDb,
+    db: &dyn SourceDatabase,
     project_id: ProjectId,
     scope: IncludeMappingScope,
     path: SmolStr,
@@ -590,12 +384,12 @@ pub struct AppDataIndex {
     pub map: FxHashMap<FileId, AppDataId>,
 }
 
-fn app_data_id_by_file(db: &dyn RootQueryDb, file_id: FileId) -> Option<AppDataId> {
+fn app_data_id_by_file(db: &dyn SourceDatabase, file_id: FileId) -> Option<AppDataId> {
     let app_data_index = db.app_index();
     app_data_index.map.get(&file_id).copied()
 }
 
-pub fn set_app_data_id_by_file(db: &mut dyn RootQueryDb, id: FileId, app_data_id: AppDataId) {
+pub fn set_app_data_id_by_file(db: &mut dyn SourceDatabase, id: FileId, app_data_id: AppDataId) {
     let mut app_data_index: Arc<AppDataIndex> = db.app_index();
     Arc::make_mut(&mut app_data_index)
         .map
@@ -603,18 +397,18 @@ pub fn set_app_data_id_by_file(db: &mut dyn RootQueryDb, id: FileId, app_data_id
     db.set_app_index(app_data_index);
 }
 
-fn parse(db: &dyn RootQueryDb, file_id: FileId) -> Parse<SourceFile> {
-    let text = db.file_text(file_id).text(db);
+fn parse(db: &dyn SourceDatabase, file_id: FileId) -> Parse<SourceFile> {
+    let text = db.file_text(file_id);
     SourceFile::parse_text(&text)
 }
 
-pub fn path_for_file(db: &dyn RootQueryDb, file_id: FileId) -> Option<VfsPath> {
-    let source_root_id = db.file_source_root(file_id).source_root_id(db);
-    let source_root = db.source_root(source_root_id).source_root(db);
+pub fn path_for_file(db: &dyn SourceDatabase, file_id: FileId) -> Option<VfsPath> {
+    let source_root_id = db.file_source_root(file_id);
+    let source_root = db.source_root(source_root_id);
     source_root.path_for_file(&file_id).cloned()
 }
 
-fn is_generated(db: &dyn RootQueryDb, file_id: FileId) -> bool {
+fn is_generated(db: &dyn SourceDatabase, file_id: FileId) -> bool {
     lazy_static! {
         // We operate a byte level via a regex (as opposed to use .contains)
         // to avoid issues with UTF8 character boundaries.
@@ -622,27 +416,27 @@ fn is_generated(db: &dyn RootQueryDb, file_id: FileId) -> bool {
         // The format macro is used to avoid marking the whole file as generated
         static ref RE: regex::bytes::Regex = regex::bytes::Regex::new(&format!("{}generated", "@")).unwrap();
     }
-    let contents = db.file_text(file_id).text(db);
+    let contents = db.file_text(file_id);
     RE.is_match(&contents.as_bytes()[0..(2001.min(contents.len()))])
 }
 
-fn is_erlang_config_file(db: &dyn RootQueryDb, file_id: FileId) -> bool {
+fn is_erlang_config_file(db: &dyn SourceDatabase, file_id: FileId) -> bool {
     let parse = db.parse(file_id);
     parse.tree().is_erlang_config_file()
 }
 
-fn is_otp(db: &dyn RootQueryDb, file_id: FileId) -> Option<bool> {
+fn is_otp(db: &dyn SourceDatabase, file_id: FileId) -> Option<bool> {
     let app_data = db.file_app_data(file_id)?;
     let project_id = app_data.project_id;
-    Some(db.project_data(project_id).project_data(db).otp_project_id == Some(project_id))
+    Some(db.project_data(project_id).otp_project_id == Some(project_id))
 }
 
-fn is_test_suite_or_test_helper(db: &dyn RootQueryDb, file_id: FileId) -> Option<bool> {
+fn is_test_suite_or_test_helper(db: &dyn SourceDatabase, file_id: FileId) -> Option<bool> {
     // Context for T171541590
     let _ = stdx::panic_context::enter(format!("\nis_test_suite_or_test_helper: {file_id:?}"));
     let app_data = db.file_app_data(file_id)?;
-    let root_id = db.file_source_root(file_id).source_root_id(db);
-    let root = db.source_root(root_id).source_root(db);
+    let root_id = db.file_source_root(file_id);
+    let root = db.source_root(root_id);
     let path = root.path_for_file(&file_id)?;
     if app_data.is_extra_src_file(path) {
         Some(true)
@@ -651,28 +445,28 @@ fn is_test_suite_or_test_helper(db: &dyn RootQueryDb, file_id: FileId) -> Option
     }
 }
 
-fn file_app_type(db: &dyn RootQueryDb, file_id: FileId) -> Option<AppType> {
+fn file_app_type(db: &dyn SourceDatabase, file_id: FileId) -> Option<AppType> {
     // Context for T171541590
     let _ = stdx::panic_context::enter(format!("\nfile_app_type: {file_id:?}"));
     let app_data = db.file_app_data(file_id)?;
     Some(app_data.app_type)
 }
 
-fn file_app_name(db: &dyn RootQueryDb, file_id: FileId) -> Option<AppName> {
+fn file_app_name(db: &dyn SourceDatabase, file_id: FileId) -> Option<AppName> {
     // Context for T171541590
     let _ = stdx::panic_context::enter(format!("\nfile_app_name: {file_id:?}"));
     let app_data = db.file_app_data(file_id)?;
     Some(app_data.name.clone())
 }
 
-fn file_project_id(db: &dyn RootQueryDb, file_id: FileId) -> Option<ProjectId> {
+fn file_project_id(db: &dyn SourceDatabase, file_id: FileId) -> Option<ProjectId> {
     // Context for T171541590
     let _ = stdx::panic_context::enter(format!("\nfile_project_id: {file_id:?}"));
     let app_data = db.file_app_data(file_id)?;
     Some(app_data.project_id)
 }
 
-pub fn module_name(db: &dyn RootQueryDb, file_id: FileId) -> Option<ModuleName> {
+pub fn module_name(db: &dyn SourceDatabase, file_id: FileId) -> Option<ModuleName> {
     // Context for T171541590
     let _ = stdx::panic_context::enter(format!("\nmodule_name: {file_id:?}"));
     let app_data = db.file_app_data(file_id)?;
@@ -691,11 +485,11 @@ static ref IGNORED_SOURCES: Vec<Regex> = {
    };
 }
 
-fn file_kind(db: &dyn RootQueryDb, file_id: FileId) -> FileKind {
+fn file_kind(db: &dyn SourceDatabase, file_id: FileId) -> FileKind {
     // Context for T171541590
     let _ = stdx::panic_context::enter(format!("\nfile_kind: {file_id:?}"));
-    let source_root_id = db.file_source_root(file_id).source_root_id(db);
-    let source_root = db.source_root(source_root_id).source_root(db);
+    let source_root_id = db.file_source_root(file_id);
+    let source_root = db.source_root(source_root_id);
     let ignored_path = source_root
         .path_for_file(&file_id)
         .and_then(|path| path.as_path())
@@ -730,7 +524,7 @@ fn file_kind(db: &dyn RootQueryDb, file_id: FileId) -> FileKind {
 }
 
 /// When we get a range from the client, limit it to what is in the source file
-fn clamp_range(db: &dyn RootQueryDb, file_id: FileId, range: TextRange) -> TextRange {
+fn clamp_range(db: &dyn SourceDatabase, file_id: FileId, range: TextRange) -> TextRange {
     let source_file = db.parse(file_id).tree();
     let file_range = source_file.syntax().text_range();
     let start = file_range.start();
@@ -741,7 +535,7 @@ fn clamp_range(db: &dyn RootQueryDb, file_id: FileId, range: TextRange) -> TextR
     )
 }
 
-fn clamp_offset(db: &dyn RootQueryDb, file_id: FileId, offset: TextSize) -> TextSize {
+fn clamp_offset(db: &dyn SourceDatabase, file_id: FileId, offset: TextSize) -> TextSize {
     let source_file = db.parse(file_id).tree();
     let file_range = source_file.syntax().text_range();
     let start = file_range.start();
@@ -749,6 +543,23 @@ fn clamp_offset(db: &dyn RootQueryDb, file_id: FileId, offset: TextSize) -> Text
     offset.clamp(start, end)
 }
 
+/// We don't want to give HIR knowledge of source roots, hence we extract these
+/// methods into a separate DB.
+#[salsa::query_group(SourceDatabaseExtStorage)]
+pub trait SourceDatabaseExt: SourceDatabase {
+    #[salsa::input]
+    fn file_text(&self, file_id: FileId) -> Arc<str>;
+}
+
+/// Silly workaround for cyclic deps between the traits
+pub struct FileLoaderDelegate<T>(pub T);
+
+impl<T: SourceDatabaseExt> FileLoader for FileLoaderDelegate<&'_ T> {
+    fn file_text(&self, file_id: FileId) -> Arc<str> {
+        SourceDatabaseExt::file_text(self.0, file_id)
+    }
+}
+
 /// If the `input` string represents an atom, and needs quoting, quote
 /// it.
 pub fn to_quoted_string(input: &str) -> Cow<str> {
diff --git a/crates/elp/src/bin/glean.rs b/crates/elp/src/bin/glean.rs
index a99cde49bb..9597e35eff 100644
--- a/crates/elp/src/bin/glean.rs
+++ b/crates/elp/src/bin/glean.rs
@@ -28,8 +28,8 @@ use elp_ide::elp_ide_db::elp_base_db::FileId;
 use elp_ide::elp_ide_db::elp_base_db::IncludeOtp;
 use elp_ide::elp_ide_db::elp_base_db::ModuleName;
 use elp_ide::elp_ide_db::elp_base_db::ProjectId;
-use elp_ide::elp_ide_db::elp_base_db::RootQueryDb;
 use elp_ide::elp_ide_db::elp_base_db::SourceDatabase;
+use elp_ide::elp_ide_db::elp_base_db::SourceDatabaseExt;
 use elp_ide::elp_ide_db::elp_base_db::VfsPath;
 use elp_ide::elp_ide_db::elp_base_db::module_name;
 use elp_ide::elp_ide_db::elp_base_db::path_for_file;
@@ -793,8 +793,8 @@ impl GleanIndexer {
                 let file_id = index
                     .file_for_module(&ModuleName::new(module))
                     .expect("No module found");
-                let source_root_id = db.file_source_root(file_id).source_root_id(db);
-                let source_root = db.source_root(source_root_id).source_root(db);
+                let source_root_id = db.file_source_root(file_id);
+                let source_root = db.source_root(source_root_id);
                 let path = source_root.path_for_file(&file_id).unwrap();
                 match Self::index_file(
                     db,
@@ -859,12 +859,12 @@ impl GleanIndexer {
     }
 
     fn project_files(db: &RootDatabase, project_id: ProjectId) -> Vec<(FileId, VfsPath)> {
-        let project_data = db.project_data(project_id).project_data(db);
+        let project_data = db.project_data(project_id);
         let mut files = vec![];
         for &source_root_id in &project_data.source_roots {
             if let Some(app_data) = db.app_data(source_root_id) {
                 if app_data.app_type == AppType::App {
-                    let source_root = db.source_root(source_root_id).source_root(db);
+                    let source_root = db.source_root(source_root_id);
                     for file_id in source_root.iter() {
                         if let Some(path) = source_root.path_for_file(&file_id) {
                             files.push((file_id, path.clone()));
@@ -926,7 +926,7 @@ impl GleanIndexer {
                     let def = def_map.get_macros().get(&MacroName::new(name, x.key.arity));
                     if let Some(def) = def {
                         let range = def.source(db).syntax().text_range();
-                        let text = &db.file_text(id).text(db)[range];
+                        let text = &db.file_text(id)[range];
                         let text = format!("```erlang\n{text}\n```");
                         let doc = match (&x.key.expansion, &x.key.ods_url) {
                             (None, None) => text,
@@ -990,7 +990,7 @@ impl GleanIndexer {
         project_id: ProjectId,
         prefix: Option<&String>,
     ) -> Option<FileFact> {
-        let project_data = db.project_data(project_id).project_data(db);
+        let project_data = db.project_data(project_id);
         let root = project_data.root_dir.as_path();
         let file_path = path.as_path()?;
         let file_path = file_path.strip_prefix(root)?;
@@ -1013,7 +1013,7 @@ impl GleanIndexer {
             line += 1;
             prev_offset = curr_offset;
         }
-        let content = db.file_text(file_id).text(db);
+        let content = db.file_text(file_id);
         if !content.ends_with('\n') {
             ends_with_new_line = false;
             let len = if content.len() as u32 >= prev_offset {
@@ -1112,7 +1112,7 @@ impl GleanIndexer {
 
         for (ty, def) in def_map.get_types() {
             let range = def.source(db).syntax().text_range();
-            let text = &db.file_text(file_id).text(db)[range];
+            let text = &db.file_text(file_id)[range];
             let text = format!("```erlang\n{text}\n```");
             let span: Location = range.into();
 
@@ -1139,7 +1139,7 @@ impl GleanIndexer {
 
         for (rec, def) in def_map.get_records() {
             let range = def.source(db).syntax().text_range();
-            let text = &db.file_text(file_id).text(db)[range];
+            let text = &db.file_text(file_id)[range];
             let text = format!("```erlang\n{text}\n```");
             let span: Location = range.into();
 
@@ -2571,8 +2571,8 @@ mod tests {
         let db = host.raw_database();
         for file_id in &fixture.files {
             let file_id = *file_id;
-            let source_root_id = db.file_source_root(file_id).source_root_id(db);
-            let source_root = db.source_root(source_root_id).source_root(db);
+            let source_root_id = db.file_source_root(file_id);
+            let source_root = db.source_root(source_root_id);
             let path = source_root.path_for_file(&file_id).unwrap();
             let (name, ext) = path.name_and_extension().unwrap();
             let name = format!("{}.{}", name, ext.unwrap());
diff --git a/crates/elp/src/bin/shell.rs b/crates/elp/src/bin/shell.rs
index 9530fa36a1..490c852893 100644
--- a/crates/elp/src/bin/shell.rs
+++ b/crates/elp/src/bin/shell.rs
@@ -25,6 +25,7 @@ use elp_eqwalizer::Mode;
 use elp_ide::elp_ide_db::elp_base_db::AbsPathBuf;
 use elp_ide::elp_ide_db::elp_base_db::IncludeOtp;
 use elp_ide::elp_ide_db::elp_base_db::SourceDatabase;
+use elp_ide::elp_ide_db::elp_base_db::SourceDatabaseExt;
 use elp_ide::elp_ide_db::elp_base_db::SourceRoot;
 use elp_ide::elp_ide_db::elp_base_db::SourceRootId;
 use elp_ide::elp_ide_db::elp_base_db::VfsPath;
diff --git a/crates/elp/src/build/load.rs b/crates/elp/src/build/load.rs
index a75349dce8..25a20889c2 100644
--- a/crates/elp/src/build/load.rs
+++ b/crates/elp/src/build/load.rs
@@ -26,6 +26,7 @@ use elp_ide::elp_ide_db::elp_base_db::IncludeOtp;
 use elp_ide::elp_ide_db::elp_base_db::ProjectApps;
 use elp_ide::elp_ide_db::elp_base_db::ProjectId;
 use elp_ide::elp_ide_db::elp_base_db::SourceDatabase;
+use elp_ide::elp_ide_db::elp_base_db::SourceDatabaseExt;
 use elp_ide::elp_ide_db::elp_base_db::SourceRoot;
 use elp_ide::elp_ide_db::elp_base_db::SourceRootId;
 use elp_ide::elp_ide_db::elp_base_db::Vfs;
diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index 8a2017631b..83d85af49a 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -46,8 +46,8 @@ use elp_ide::elp_ide_db::elp_base_db::FileSetConfig;
 use elp_ide::elp_ide_db::elp_base_db::IncludeOtp;
 use elp_ide::elp_ide_db::elp_base_db::ProjectApps;
 use elp_ide::elp_ide_db::elp_base_db::ProjectId;
-use elp_ide::elp_ide_db::elp_base_db::RootQueryDb;
 use elp_ide::elp_ide_db::elp_base_db::SourceDatabase;
+use elp_ide::elp_ide_db::elp_base_db::SourceDatabaseExt;
 use elp_ide::elp_ide_db::elp_base_db::SourceRoot;
 use elp_ide::elp_ide_db::elp_base_db::SourceRootId;
 use elp_ide::elp_ide_db::elp_base_db::Vfs;
diff --git a/crates/eqwalizer/Cargo.toml b/crates/eqwalizer/Cargo.toml
index e1bd709181..031c43242f 100644
--- a/crates/eqwalizer/Cargo.toml
+++ b/crates/eqwalizer/Cargo.toml
@@ -17,7 +17,6 @@ fxhash.workspace = true
 itertools.workspace = true
 log.workspace = true
 parking_lot.workspace = true
-ra_ap_query-group-macro.workspace = true
 salsa.workspace = true
 serde_json.workspace = true
 serde.workspace = true
diff --git a/crates/eqwalizer/src/analyses/mod.rs b/crates/eqwalizer/src/analyses/mod.rs
index 548d503d96..b5ad028630 100644
--- a/crates/eqwalizer/src/analyses/mod.rs
+++ b/crates/eqwalizer/src/analyses/mod.rs
@@ -19,7 +19,7 @@ use crate::db::EqwalizerDiagnosticsDatabase;
 mod escape_hatches;
 mod overloaded_specs;
 
-#[ra_ap_query_group_macro::query_group(EqwalizerAnalysesDatabaseStorage)]
+#[salsa::query_group(EqwalizerAnalysesDatabaseStorage)]
 pub trait EqwalizerAnalysesDatabase: EqwalizerDiagnosticsDatabase {
     fn compute_eqwalizer_stats(
         &self,
diff --git a/crates/eqwalizer/src/db.rs b/crates/eqwalizer/src/db.rs
index b85dcaf1a1..d7194067c1 100644
--- a/crates/eqwalizer/src/db.rs
+++ b/crates/eqwalizer/src/db.rs
@@ -19,7 +19,7 @@ use elp_base_db::AppType;
 use elp_base_db::FileId;
 use elp_base_db::ModuleName;
 use elp_base_db::ProjectId;
-use elp_base_db::RootQueryDb;
+use elp_base_db::SourceDatabase;
 use elp_types_db::StringId;
 use elp_types_db::eqwalizer::AST;
 use elp_types_db::eqwalizer::Id;
@@ -76,8 +76,8 @@ pub trait ELPDbApi {
     fn module_ipc_handle(&self, module: ModuleName) -> Option<Arc<Mutex<IpcHandle>>>;
 }
 
-#[ra_ap_query_group_macro::query_group]
-pub trait EqwalizerDiagnosticsDatabase: EqwalizerErlASTStorage + RootQueryDb + ELPDbApi {
+#[salsa::query_group(EqwalizerDiagnosticsDatabaseStorage)]
+pub trait EqwalizerDiagnosticsDatabase: EqwalizerErlASTStorage + SourceDatabase + ELPDbApi {
     #[salsa::input]
     fn eqwalizer_config(&self) -> Arc<EqwalizerConfig>;
 
diff --git a/crates/eqwalizer/src/lib.rs b/crates/eqwalizer/src/lib.rs
index 947fc84c6c..e8c7b18b92 100644
--- a/crates/eqwalizer/src/lib.rs
+++ b/crates/eqwalizer/src/lib.rs
@@ -277,14 +277,14 @@ fn do_typecheck(
     project_id: ProjectId,
 ) -> Result<EqwalizerDiagnostics, anyhow::Error> {
     // Never cache the results of this function
-    db.report_untracked_read();
+    db.salsa_runtime().report_untracked_read();
     let handle = Arc::new(Mutex::new(
         IpcHandle::from_command(&mut cmd)
             .with_context(|| format!("starting eqWAlizer process: {cmd:?}"))?,
     ));
     let mut diagnostics = EqwalizerDiagnostics::default();
     loop {
-        db.unwind_if_revision_cancelled();
+        db.unwind_if_cancelled();
         let msg = handle.lock().receive()?;
         match msg {
             MsgFromEqWAlizer::EnteringModule { module } => {
@@ -327,7 +327,7 @@ fn get_module_diagnostics(
     let mut handle = handle_mutex.lock();
     handle.send(&MsgToEqWAlizer::ELPEnteringModule)?;
     loop {
-        db.unwind_if_revision_cancelled();
+        db.unwind_if_cancelled();
         match handle.receive()? {
             MsgFromEqWAlizer::GetAstBytes { module, format } => {
                 log::debug!(
diff --git a/crates/hir/Cargo.toml b/crates/hir/Cargo.toml
index 84d2445bea..934619ca47 100644
--- a/crates/hir/Cargo.toml
+++ b/crates/hir/Cargo.toml
@@ -20,7 +20,6 @@ la-arena.workspace = true
 lazy_static.workspace = true
 log.workspace = true
 profile.workspace = true
-ra_ap_query-group-macro.workspace = true
 regex.workspace = true
 stdx.workspace = true
 tracing.workspace = true
diff --git a/crates/hir/src/body.rs b/crates/hir/src/body.rs
index b36f796599..c1acd67ce5 100644
--- a/crates/hir/src/body.rs
+++ b/crates/hir/src/body.rs
@@ -13,7 +13,7 @@ use std::sync::Arc;
 
 use elp_base_db::FileId;
 use elp_base_db::FileRange;
-use elp_base_db::RootQueryDb;
+use elp_base_db::SourceDatabase;
 use elp_syntax::AstNode;
 use elp_syntax::AstPtr;
 use elp_syntax::SourceFile;
@@ -1184,7 +1184,7 @@ impl<T: AstNode> InFileAstPtr<T> {
             None
         }
     }
-    pub fn to_ast(&self, db: &dyn RootQueryDb) -> T {
+    pub fn to_ast(&self, db: &dyn SourceDatabase) -> T {
         let parse = db.parse(self.file_id());
         self.0.value.to_node(parse.tree().syntax())
     }
@@ -1284,7 +1284,7 @@ impl BodySourceMap {
 #[cfg(test)]
 mod local_tests {
     use elp_base_db::FileId;
-    use elp_base_db::RootQueryDb;
+    use elp_base_db::SourceDatabase;
     use elp_base_db::fixture::WithFixture;
     use elp_syntax::AstNode;
     use elp_syntax::algo::find_node_at_offset;
diff --git a/crates/hir/src/body/scope.rs b/crates/hir/src/body/scope.rs
index 4584b58759..dd1da23e94 100644
--- a/crates/hir/src/body/scope.rs
+++ b/crates/hir/src/body/scope.rs
@@ -759,7 +759,7 @@ fn add_exported_scopes(
 #[cfg(test)]
 mod tests {
     use elp_base_db::FileId;
-    use elp_base_db::RootQueryDb;
+    use elp_base_db::SourceDatabase;
     use elp_base_db::assert_eq_text;
     use elp_base_db::extract_offset;
     use elp_base_db::fixture::WithFixture;
diff --git a/crates/hir/src/db.rs b/crates/hir/src/db.rs
index 207695d99a..783b30ae7c 100644
--- a/crates/hir/src/db.rs
+++ b/crates/hir/src/db.rs
@@ -11,7 +11,7 @@
 use std::sync::Arc;
 
 use elp_base_db::FileId;
-use elp_base_db::RootQueryDb;
+use elp_base_db::SourceDatabase;
 use elp_base_db::Upcast;
 use elp_base_db::salsa;
 use elp_syntax::ast;
@@ -50,12 +50,17 @@ use crate::edoc;
 use crate::edoc::EdocHeader;
 use crate::include;
 pub use crate::intern::InternDatabase;
+pub use crate::intern::InternDatabaseStorage;
 use crate::macro_exp;
 use crate::macro_exp::MacroResolution;
 
-#[ra_ap_query_group_macro::query_group]
+#[salsa::query_group(DefDatabaseStorage)]
 pub trait DefDatabase:
-    InternDatabase + Upcast<dyn InternDatabase> + RootQueryDb + Upcast<dyn RootQueryDb> + TypedSemantic
+    InternDatabase
+    + Upcast<dyn InternDatabase>
+    + SourceDatabase
+    + Upcast<dyn SourceDatabase>
+    + TypedSemantic
 {
     #[salsa::invoke(FormList::file_form_list_query)]
     fn file_form_list(&self, file_id: FileId) -> Arc<FormList>;
diff --git a/crates/hir/src/def_map.rs b/crates/hir/src/def_map.rs
index ea04a60a4f..6cb840f7f2 100644
--- a/crates/hir/src/def_map.rs
+++ b/crates/hir/src/def_map.rs
@@ -22,7 +22,6 @@ use std::sync::Arc;
 
 use elp_base_db::FileId;
 use elp_base_db::module_name;
-use elp_base_db::salsa::Cycle;
 use elp_syntax::AstNode;
 use elp_syntax::ast;
 use elp_syntax::match_ast;
@@ -46,7 +45,6 @@ use crate::PPDirective;
 use crate::RecordDef;
 use crate::TypeAliasDef;
 use crate::db::DefDatabase;
-use crate::db::DefDatabaseData;
 use crate::form_list::DeprecatedAttribute;
 use crate::form_list::DeprecatedDesc;
 use crate::form_list::DeprecatedFa;
@@ -378,11 +376,10 @@ impl DefMap {
     // Return just the local def map in such cases, not resolving nested includes at all
     pub(crate) fn recover_cycle(
         db: &dyn DefDatabase,
-        _cycle: &Cycle,
-        _data: DefDatabaseData,
-        file_id: FileId,
+        _cycle: &[String],
+        file_id: &FileId,
     ) -> Arc<DefMap> {
-        db.def_map_local(file_id)
+        db.def_map_local(*file_id)
     }
 
     pub fn get_by_function_id(&self, function_id: &InFile<FunctionDefId>) -> Option<&FunctionDef> {
diff --git a/crates/hir/src/edoc.rs b/crates/hir/src/edoc.rs
index 26959ef02a..7981acaec8 100644
--- a/crates/hir/src/edoc.rs
+++ b/crates/hir/src/edoc.rs
@@ -35,7 +35,7 @@ use std::sync::Arc;
 use std::sync::LazyLock;
 
 use elp_base_db::FileId;
-use elp_base_db::RootQueryDb;
+use elp_base_db::SourceDatabase;
 use elp_syntax::AstNode;
 use elp_syntax::AstPtr;
 use elp_syntax::Direction;
@@ -120,12 +120,12 @@ impl EdocHeader {
         ))
     }
 
-    pub fn prev_divider(&self, db: &dyn RootQueryDb) -> Option<SyntaxNode> {
+    pub fn prev_divider(&self, db: &dyn SourceDatabase) -> Option<SyntaxNode> {
         let first_comment = self.comments().next()?;
         divider(first_comment.to_ast(db).syntax(), Direction::Prev)
     }
 
-    pub fn next_divider(&self, db: &dyn RootQueryDb) -> Option<SyntaxNode> {
+    pub fn next_divider(&self, db: &dyn SourceDatabase) -> Option<SyntaxNode> {
         let last_comment = self.comments().last()?;
         divider(last_comment.to_ast(db).syntax(), Direction::Next)
     }
diff --git a/crates/hir/src/include.rs b/crates/hir/src/include.rs
index 3c8fb294c1..baf9e16bca 100644
--- a/crates/hir/src/include.rs
+++ b/crates/hir/src/include.rs
@@ -58,8 +58,7 @@ mod tests {
                     .resolve_include(InFile::new(file_id, idx))
                     .unwrap_or_else(|| panic!("unresolved include: {include:?}"));
                 let resolved_path = db
-                    .source_root(db.file_source_root(resolved).source_root_id(&db))
-                    .source_root(&db)
+                    .source_root(db.file_source_root(resolved))
                     .path_for_file(&resolved)
                     .unwrap()
                     .clone();
diff --git a/crates/hir/src/intern.rs b/crates/hir/src/intern.rs
index ad1e3edf52..e116c1a30f 100644
--- a/crates/hir/src/intern.rs
+++ b/crates/hir/src/intern.rs
@@ -11,12 +11,11 @@
 use std::sync::Arc;
 
 use elp_base_db::salsa;
-use elp_base_db::salsa::plumbing::AsId;
 
 use crate::Name;
 
-#[ra_ap_query_group_macro::query_group]
-pub trait InternDatabase: salsa::Database {
+#[salsa::query_group(InternDatabaseStorage)]
+pub trait InternDatabase {
     #[salsa::interned]
     fn atom(&self, name: Name) -> Atom;
 
@@ -27,19 +26,43 @@ pub trait InternDatabase: salsa::Database {
     fn ssr(&self, source: Arc<str>) -> SsrSource;
 }
 
-#[salsa::interned(no_lifetime)]
-pub struct Atom {
-    pub name: Name,
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct Atom(salsa::InternId);
+
+impl salsa::InternKey for Atom {
+    fn from_intern_id(v: salsa::InternId) -> Self {
+        Atom(v)
+    }
+
+    fn as_intern_id(&self) -> salsa::InternId {
+        self.0
+    }
 }
 
-#[salsa::interned(no_lifetime)]
-pub struct Var {
-    pub name: Name,
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct Var(salsa::InternId);
+
+impl salsa::InternKey for Var {
+    fn from_intern_id(v: salsa::InternId) -> Self {
+        Var(v)
+    }
+
+    fn as_intern_id(&self) -> salsa::InternId {
+        self.0
+    }
 }
 
-#[salsa::interned(no_lifetime)]
-pub struct SsrSource {
-    pub source: Arc<str>,
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct SsrSource(salsa::InternId);
+
+impl salsa::InternKey for SsrSource {
+    fn from_intern_id(v: salsa::InternId) -> Self {
+        SsrSource(v)
+    }
+
+    fn as_intern_id(&self) -> salsa::InternId {
+        self.0
+    }
 }
 
 impl Atom {
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index d64ac7b795..8f285b5005 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -9,7 +9,7 @@
  */
 
 use elp_base_db::FileId;
-use elp_base_db::RootQueryDb;
+use elp_base_db::SourceDatabase;
 use elp_syntax::ast;
 
 mod body;
@@ -195,7 +195,7 @@ impl<T> InFile<T> {
         self.with_value(&self.value)
     }
 
-    pub fn file_syntax(&self, db: &dyn RootQueryDb) -> ast::SourceFile {
+    pub fn file_syntax(&self, db: &dyn SourceDatabase) -> ast::SourceFile {
         db.parse(self.file_id).tree()
     }
 }
diff --git a/crates/hir/src/macro_exp.rs b/crates/hir/src/macro_exp.rs
index 4d85daae71..c7decdbfb4 100644
--- a/crates/hir/src/macro_exp.rs
+++ b/crates/hir/src/macro_exp.rs
@@ -9,7 +9,6 @@
  */
 
 use elp_base_db::FileId;
-use elp_base_db::salsa::Cycle;
 use elp_syntax::ast;
 
 use crate::Define;
@@ -21,7 +20,6 @@ use crate::Name;
 use crate::PPDirective;
 use crate::body::SSR_SOURCE_FILE_ID;
 use crate::db::DefDatabase;
-use crate::db::DefDatabaseData;
 use crate::form_list::FormListData;
 use crate::known;
 use crate::name::AsName;
@@ -172,10 +170,9 @@ pub(crate) fn local_resolve_query(
 // This handles the case of headers accidentally forming cycles during macro resolution.
 pub(crate) fn recover_cycle(
     _db: &dyn DefDatabase,
-    _cycle: &Cycle,
-    _data: DefDatabaseData,
-    _file_id: FileId,
-    _name: MacroName,
+    _cycle: &[String],
+    _file_id: &FileId,
+    _name: &MacroName,
 ) -> MacroResolution {
     MacroResolution::Unresolved
 }
@@ -304,7 +301,7 @@ pub fn macro_name(macro_call: &ast::MacroCallExpr) -> Option<MacroName> {
 #[cfg(test)]
 mod tests {
     use elp_base_db::FileRange;
-    use elp_base_db::RootQueryDb;
+    use elp_base_db::SourceDatabase;
     use elp_base_db::fixture::ChangeFixture;
     use elp_base_db::fixture::WithFixture;
     use elp_syntax::AstNode;
diff --git a/crates/hir/src/module_data.rs b/crates/hir/src/module_data.rs
index 4c77861f7a..3f82864db7 100644
--- a/crates/hir/src/module_data.rs
+++ b/crates/hir/src/module_data.rs
@@ -13,7 +13,7 @@ use std::sync::Arc;
 use elp_base_db::FileId;
 use elp_base_db::FileKind;
 use elp_base_db::ModuleName;
-use elp_base_db::RootQueryDb;
+use elp_base_db::SourceDatabase;
 use elp_syntax::AstNode;
 use elp_syntax::AstPtr;
 use elp_syntax::SmolStr;
@@ -65,20 +65,18 @@ pub struct File {
 }
 
 impl File {
-    pub fn source(&self, db: &dyn RootQueryDb) -> ast::SourceFile {
+    pub fn source(&self, db: &dyn SourceDatabase) -> ast::SourceFile {
         db.parse(self.file_id).tree()
     }
 
-    pub fn kind(&self, db: &dyn RootQueryDb) -> FileKind {
+    pub fn kind(&self, db: &dyn SourceDatabase) -> FileKind {
         db.file_kind(self.file_id)
     }
 
-    pub fn name(&self, db: &dyn RootQueryDb) -> SmolStr {
+    pub fn name(&self, db: &dyn SourceDatabase) -> SmolStr {
         // Context for T171541590
         let _ = stdx::panic_context::enter(format!("\nFile::name: {:?}", self.file_id));
-        let source_root = db
-            .source_root(db.file_source_root(self.file_id).source_root_id(db))
-            .source_root(db);
+        let source_root = db.source_root(db.file_source_root(self.file_id));
         if let Some((name, Some(ext))) = source_root
             .path_for_file(&self.file_id)
             .and_then(|path| path.name_and_extension())
@@ -127,7 +125,7 @@ pub struct FunctionClauseDef {
 }
 
 impl FunctionClauseDef {
-    pub fn source(&self, db: &dyn RootQueryDb) -> ast::FunDecl {
+    pub fn source(&self, db: &dyn SourceDatabase) -> ast::FunDecl {
         let source_file = self.file.source(db);
         self.function_clause.form_id.get(&source_file)
     }
@@ -174,7 +172,7 @@ pub struct FunctionDef {
 }
 
 impl FunctionDef {
-    pub fn source(&self, db: &dyn RootQueryDb) -> Vec<ast::FunDecl> {
+    pub fn source(&self, db: &dyn SourceDatabase) -> Vec<ast::FunDecl> {
         let source_file = self.file.source(db);
         self.function_clauses
             .iter()
@@ -182,11 +180,11 @@ impl FunctionDef {
             .collect()
     }
 
-    pub fn first_clause_name(&self, db: &dyn RootQueryDb) -> Option<ast::Name> {
+    pub fn first_clause_name(&self, db: &dyn SourceDatabase) -> Option<ast::Name> {
         self.source(db).first()?.name()
     }
 
-    pub fn range(&self, db: &dyn RootQueryDb) -> Option<TextRange> {
+    pub fn range(&self, db: &dyn SourceDatabase) -> Option<TextRange> {
         let sources = self.source(db);
         let start = sources.first()?;
         let end = sources.last()?;
@@ -224,7 +222,7 @@ impl FunctionDef {
         )
     }
 
-    pub fn spec_range(&self, db: &dyn RootQueryDb) -> Option<TextRange> {
+    pub fn spec_range(&self, db: &dyn SourceDatabase) -> Option<TextRange> {
         self.spec.as_ref().map(|spec| spec.range(db))
     }
 
@@ -268,7 +266,7 @@ impl FunctionDef {
         Some(res)
     }
 
-    pub fn arg_names(&self, db: &dyn RootQueryDb) -> Option<Vec<String>> {
+    pub fn arg_names(&self, db: &dyn SourceDatabase) -> Option<Vec<String>> {
         match &self.spec {
             Some(spec_def) => match spec_def.arg_names(db) {
                 Some(arg_names_from_spec) => {
@@ -385,17 +383,17 @@ pub struct SpecDef {
 }
 
 impl SpecDef {
-    pub fn source(&self, db: &dyn RootQueryDb) -> ast::Spec {
+    pub fn source(&self, db: &dyn SourceDatabase) -> ast::Spec {
         let source_file = self.file.source(db);
         self.spec.form_id.get(&source_file)
     }
 
-    pub fn range(&self, db: &dyn RootQueryDb) -> TextRange {
+    pub fn range(&self, db: &dyn SourceDatabase) -> TextRange {
         let source = self.source(db);
         source.syntax().text_range()
     }
 
-    pub fn arg_names(&self, db: &dyn RootQueryDb) -> Option<Vec<SpecArgName>> {
+    pub fn arg_names(&self, db: &dyn SourceDatabase) -> Option<Vec<SpecArgName>> {
         let spec = self.source(db);
         let first_sig = spec.sigs().next()?;
         Some(
@@ -451,12 +449,12 @@ pub struct RecordDef {
 }
 
 impl RecordDef {
-    pub fn source(&self, db: &dyn RootQueryDb) -> ast::RecordDecl {
+    pub fn source(&self, db: &dyn SourceDatabase) -> ast::RecordDecl {
         let source_file = self.file.source(db);
         self.record.form_id.get(&source_file)
     }
 
-    pub fn range(&self, db: &dyn RootQueryDb) -> TextRange {
+    pub fn range(&self, db: &dyn SourceDatabase) -> TextRange {
         let source = self.source(db);
         source.syntax().text_range()
     }
@@ -516,7 +514,7 @@ pub struct RecordFieldDef {
 }
 
 impl RecordFieldDef {
-    pub fn source(&self, db: &dyn RootQueryDb) -> ast::RecordField {
+    pub fn source(&self, db: &dyn SourceDatabase) -> ast::RecordField {
         let record = self.record.source(db);
         record.fields().nth(self.field.idx as usize).unwrap()
     }
@@ -536,7 +534,7 @@ pub enum TypeAliasSource {
 }
 
 impl TypeAliasDef {
-    pub fn source(&self, db: &dyn RootQueryDb) -> TypeAliasSource {
+    pub fn source(&self, db: &dyn SourceDatabase) -> TypeAliasSource {
         let source_file = self.file.source(db);
         match self.type_alias {
             TypeAlias::Opaque { form_id, .. } => TypeAliasSource::Opaque(form_id.get(&source_file)),
@@ -557,14 +555,14 @@ impl TypeAliasDef {
         }
     }
 
-    pub fn range(&self, db: &dyn RootQueryDb) -> Option<TextRange> {
+    pub fn range(&self, db: &dyn SourceDatabase) -> Option<TextRange> {
         let source = self.source(db);
         Some(source.syntax().text_range())
     }
 
     /// This information is used for completion.
     /// We deliberately return nothing for an opaque type
-    pub fn map_expr_for_completion(&self, db: &dyn RootQueryDb) -> Option<MapExpr> {
+    pub fn map_expr_for_completion(&self, db: &dyn SourceDatabase) -> Option<MapExpr> {
         let source = self.source(db);
         match source {
             TypeAliasSource::Regular(alias) => match alias.ty()? {
@@ -606,7 +604,7 @@ pub struct CallbackDef {
 }
 
 impl CallbackDef {
-    pub fn source(&self, db: &dyn RootQueryDb) -> ast::Callback {
+    pub fn source(&self, db: &dyn SourceDatabase) -> ast::Callback {
         let source_file = self.file.source(db);
         self.callback.form_id.get(&source_file)
     }
@@ -619,7 +617,7 @@ pub struct DefineDef {
 }
 
 impl DefineDef {
-    pub fn source(&self, db: &dyn RootQueryDb) -> ast::PpDefine {
+    pub fn source(&self, db: &dyn SourceDatabase) -> ast::PpDefine {
         let source_file = self.file.source(db);
         self.define.form_id.get(&source_file)
     }
@@ -635,7 +633,7 @@ pub struct VarDef {
 }
 
 impl VarDef {
-    pub fn source(&self, db: &dyn RootQueryDb) -> ast::Var {
+    pub fn source(&self, db: &dyn SourceDatabase) -> ast::Var {
         let source_file = self.file.source(db);
         self.var.to_node(source_file.syntax())
     }
@@ -651,7 +649,7 @@ fn is_in_otp(file_id: FileId, db: &dyn DefDatabase) -> bool {
     match db.file_app_data(file_id) {
         Some(app_data) => {
             let project_id = app_data.project_id;
-            db.project_data(project_id).project_data(db).otp_project_id == Some(project_id)
+            db.project_data(project_id).otp_project_id == Some(project_id)
         }
         None => false,
     }
diff --git a/crates/hir/src/sema.rs b/crates/hir/src/sema.rs
index 1b48827d46..86b1f8d687 100644
--- a/crates/hir/src/sema.rs
+++ b/crates/hir/src/sema.rs
@@ -97,6 +97,7 @@ use crate::fold::MacroStrategy;
 use crate::fold::ParenStrategy;
 use crate::fold::Strategy;
 pub use crate::intern::InternDatabase;
+pub use crate::intern::InternDatabaseStorage;
 use crate::resolver::Resolution;
 use crate::resolver::Resolver;
 
@@ -560,7 +561,7 @@ impl Semantic<'_> {
     }
 
     pub fn vardef_source(&self, def: &VarDef) -> ast::Var {
-        def.source(self.db)
+        def.source(self.db.upcast())
     }
 
     pub fn range_for_any(&self, body: &Body, expr_id: &AnyExprId) -> Option<FileRange> {
@@ -1647,7 +1648,7 @@ impl<T> Index<TermId> for InFunctionClauseBody<'_, T> {
 #[cfg(test)]
 mod tests {
     use elp_base_db::ProjectId;
-    use elp_base_db::RootQueryDb;
+    use elp_base_db::SourceDatabase;
     use elp_base_db::fixture::WithFixture;
     use elp_syntax::AstNode;
     use elp_syntax::algo::find_node_at_offset;
diff --git a/crates/hir/src/test_db.rs b/crates/hir/src/test_db.rs
index c13f46006c..d71bdaa9ef 100644
--- a/crates/hir/src/test_db.rs
+++ b/crates/hir/src/test_db.rs
@@ -14,23 +14,11 @@ use std::fmt;
 use std::panic;
 use std::sync::Arc;
 
-use elp_base_db::AppData;
-use elp_base_db::AppDataId;
-use elp_base_db::AppDataInput;
 use elp_base_db::FileId;
+use elp_base_db::FileLoader;
+use elp_base_db::FileLoaderDelegate;
 use elp_base_db::FileRange;
-use elp_base_db::FileSourceRootInput;
-use elp_base_db::FileText;
-use elp_base_db::Files;
-use elp_base_db::ProjectData;
-use elp_base_db::ProjectDataInput;
-use elp_base_db::ProjectId;
-use elp_base_db::RootQueryDb;
-use elp_base_db::SourceAppDataInput;
 use elp_base_db::SourceDatabase;
-use elp_base_db::SourceRoot;
-use elp_base_db::SourceRootId;
-use elp_base_db::SourceRootInput;
 use elp_base_db::Upcast;
 use elp_base_db::salsa;
 use elp_types_db::TypedSemantic;
@@ -38,15 +26,19 @@ use elp_types_db::eqwalizer;
 
 use crate::db::InternDatabase;
 
-#[salsa::db]
-#[derive(Default, Clone)]
+#[salsa::database(
+    elp_base_db::SourceDatabaseExtStorage,
+    elp_base_db::SourceDatabaseStorage,
+    crate::db::DefDatabaseStorage,
+    crate::db::InternDatabaseStorage
+)]
+#[derive(Default)]
 pub(crate) struct TestDB {
     storage: salsa::Storage<TestDB>,
-    files: Arc<Files>,
 }
 
-impl Upcast<dyn RootQueryDb> for TestDB {
-    fn upcast(&self) -> &(dyn RootQueryDb + 'static) {
+impl Upcast<dyn SourceDatabase> for TestDB {
+    fn upcast(&self) -> &(dyn SourceDatabase + 'static) {
         self
     }
 }
@@ -57,10 +49,7 @@ impl Upcast<dyn InternDatabase> for TestDB {
     }
 }
 
-#[salsa::db]
-impl salsa::Database for TestDB {
-    fn salsa_event(&self, _event: &dyn Fn() -> salsa::Event) {}
-}
+impl salsa::Database for TestDB {}
 
 impl fmt::Debug for TestDB {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -68,65 +57,14 @@ impl fmt::Debug for TestDB {
     }
 }
 
-#[salsa::db]
-impl SourceDatabase for TestDB {
-    fn file_text(&self, file_id: FileId) -> FileText {
-        self.files.file_text(file_id)
-    }
+impl panic::RefUnwindSafe for TestDB {}
 
-    fn set_file_text(&mut self, file_id: FileId, text: Arc<str>) {
-        let files = self.files.clone();
-        files.set_file_text(self, file_id, text);
-    }
-
-    fn source_root(&self, source_root_id: SourceRootId) -> SourceRootInput {
-        self.files.source_root(source_root_id)
-    }
-
-    fn set_source_root(&mut self, source_root_id: SourceRootId, source_root: Arc<SourceRoot>) {
-        let files = self.files.clone();
-        files.set_source_root(self, source_root_id, source_root);
-    }
-
-    fn file_source_root(&self, id: FileId) -> FileSourceRootInput {
-        self.files.file_source_root(id)
-    }
-
-    fn set_file_source_root(&mut self, id: FileId, source_root_id: SourceRootId) {
-        let files = self.files.clone();
-        files.set_file_source_root(self, id, source_root_id);
-    }
-
-    fn app_data_by_id(&self, id: AppDataId) -> AppDataInput {
-        self.files.app_data(id)
-    }
-
-    fn set_app_data_by_id(&mut self, id: AppDataId, app_data: Option<Arc<AppData>>) {
-        let files = self.files.clone();
-        files.set_app_data(self, id, app_data)
-    }
-
-    fn app_data_id(&self, source_root_id: SourceRootId) -> SourceAppDataInput {
-        self.files.source_app_data(source_root_id)
-    }
-
-    fn set_app_data_id(&mut self, id: SourceRootId, app_data_id: AppDataId) {
-        let files = self.files.clone();
-        files.set_source_app_data(self, id, app_data_id)
-    }
-
-    fn project_data(&self, project_id: ProjectId) -> ProjectDataInput {
-        self.files.project_data(project_id)
-    }
-
-    fn set_project_data(&mut self, id: ProjectId, project_data: Arc<ProjectData>) {
-        let files = self.files.clone();
-        files.set_project_data(self, id, project_data)
+impl FileLoader for TestDB {
+    fn file_text(&self, file_id: FileId) -> Arc<str> {
+        FileLoaderDelegate(self).file_text(file_id)
     }
 }
 
-impl panic::RefUnwindSafe for TestDB {}
-
 impl TypedSemantic for TestDB {
     fn eqwalizer_diagnostics(
         &self,
diff --git a/crates/ide/src/codemod_helpers.rs b/crates/ide/src/codemod_helpers.rs
index c6ae3905d6..3bb360f878 100644
--- a/crates/ide/src/codemod_helpers.rs
+++ b/crates/ide/src/codemod_helpers.rs
@@ -602,7 +602,7 @@ pub(crate) fn find_call_in_function<CallCtx, MakeCtx, Res>(
 mod tests {
     use elp_ide_db::RootDatabase;
     use elp_ide_db::elp_base_db::FileId;
-    use elp_ide_db::elp_base_db::RootQueryDb;
+    use elp_ide_db::elp_base_db::SourceDatabase;
     use elp_ide_db::elp_base_db::fixture::WithFixture;
     use elp_project_model::otp::otp_supported_by_eqwalizer;
     use elp_syntax::algo::find_node_at_offset;
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 454798eb3a..5175b7c444 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -37,7 +37,6 @@ use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::FileKind;
 use elp_ide_db::elp_base_db::FileRange;
 use elp_ide_db::elp_base_db::ProjectId;
-use elp_ide_db::elp_base_db::RootQueryDb;
 use elp_ide_db::erlang_service::DiagnosticLocation;
 use elp_ide_db::erlang_service::ParseError;
 use elp_ide_db::metadata::Kind;
@@ -74,6 +73,7 @@ use serde::Deserialize;
 use serde::Serialize;
 
 use crate::RootDatabase;
+use crate::SourceDatabase;
 use crate::common_test;
 
 mod application_env;
diff --git a/crates/ide/src/diagnostics/eqwalizer_assists/expected_type.rs b/crates/ide/src/diagnostics/eqwalizer_assists/expected_type.rs
index ad7c5f4513..31096f0112 100644
--- a/crates/ide/src/diagnostics/eqwalizer_assists/expected_type.rs
+++ b/crates/ide/src/diagnostics/eqwalizer_assists/expected_type.rs
@@ -68,7 +68,7 @@ pub fn expected_type(
                 if let [atom @ Type::AtomLitType(AtomLitType { .. }), other] = &arg_tys[..] {
                     if other == other2 {
                         // Add wrapping tuple to return
-                        let file_text = sema.db.file_text(file_id).text(sema.db);
+                        let file_text = sema.db.file_text(file_id);
                         let current = &file_text[d.range.start().into()..d.range.end().into()];
                         let replacement = format!("{{{atom}, {current}}}");
                         let edit = TextEdit::replace(d.range, replacement.clone());
diff --git a/crates/ide/src/diagnostics/module_mismatch.rs b/crates/ide/src/diagnostics/module_mismatch.rs
index 9db5574c34..f6f7a2405c 100644
--- a/crates/ide/src/diagnostics/module_mismatch.rs
+++ b/crates/ide/src/diagnostics/module_mismatch.rs
@@ -34,8 +34,8 @@ pub(crate) fn module_mismatch(
     let module_name = ast::ModuleAttribute::cast(node.clone())?.name()?;
     // Context for T171541590
     let _ = stdx::panic_context::enter(format!("\nmodule_mismatch: {file_id:?}"));
-    let root_id = sema.db.file_source_root(file_id).source_root_id(sema.db);
-    let root = sema.db.source_root(root_id).source_root(sema.db);
+    let root_id = sema.db.file_source_root(file_id);
+    let root = sema.db.source_root(root_id);
     let path = root.path_for_file(&file_id).unwrap();
     let filename = path.name_and_extension().unwrap_or_default().0;
     let loc = module_name.syntax().text_range();
diff --git a/crates/ide/src/fixture.rs b/crates/ide/src/fixture.rs
index ecebc29c7d..d141c756d5 100644
--- a/crates/ide/src/fixture.rs
+++ b/crates/ide/src/fixture.rs
@@ -13,7 +13,7 @@
 use elp_ide_db::RootDatabase;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::FileRange;
-use elp_ide_db::elp_base_db::RootQueryDb;
+use elp_ide_db::elp_base_db::SourceDatabase;
 use elp_ide_db::elp_base_db::fixture::ChangeFixture;
 use elp_ide_db::elp_base_db::fixture::WithFixture;
 use elp_project_model::test_fixture::DiagnosticsEnabled;
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index fbbbbb7738..69c039eab8 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -48,9 +48,10 @@ use elp_ide_db::elp_base_db::ModuleIndex;
 use elp_ide_db::elp_base_db::ModuleName;
 use elp_ide_db::elp_base_db::ProjectData;
 use elp_ide_db::elp_base_db::ProjectId;
-use elp_ide_db::elp_base_db::RootQueryDb;
 use elp_ide_db::elp_base_db::SourceDatabase;
+use elp_ide_db::elp_base_db::SourceDatabaseExt;
 use elp_ide_db::elp_base_db::salsa;
+use elp_ide_db::elp_base_db::salsa::ParallelDatabase;
 use elp_ide_db::eqwalizer::type_references;
 use elp_ide_db::erlang_service::ParseResult;
 use elp_ide_db::rename::RenameError;
@@ -206,7 +207,7 @@ impl AnalysisHost {
 /// `Analysis` are canceled (most method return `Err(Canceled)`).
 #[derive(Debug)]
 pub struct Analysis {
-    db: RootDatabase,
+    db: salsa::Snapshot<RootDatabase>,
 }
 
 // As a general design guideline, `Analysis` API are intended to be independent
@@ -383,10 +384,7 @@ impl Analysis {
         self.with_db(|db| {
             // Context for T171541590
             let _ = stdx::panic_context::enter(format!("\nproject_data: {file_id:?}"));
-            Some(
-                db.project_data(db.file_app_data(file_id)?.project_id)
-                    .project_data(db),
-            )
+            Some(db.project_data(db.file_app_data(file_id)?.project_id))
         })
     }
 
@@ -431,7 +429,7 @@ impl Analysis {
 
     /// Returns the contents of a file
     pub fn file_text(&self, file_id: FileId) -> Cancellable<Arc<str>> {
-        self.with_db(|db| db.file_text(file_id).text(db))
+        self.with_db(|db| db.file_text(file_id))
     }
 
     /// Returns the app_type for a file
diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index d7166ba37c..71586961cf 100644
--- a/crates/ide/src/rename.rs
+++ b/crates/ide/src/rename.rs
@@ -1153,7 +1153,7 @@ mod tests {
                     for indel in edit.1.into_iter() {
                         text_edit_builder.replace(indel.delete, indel.insert);
                     }
-                    let mut result = sema.db.file_text(file_id).text(sema.db).to_string();
+                    let mut result = sema.db.file_text(file_id).to_string();
                     let edit = text_edit_builder.finish();
                     edit.apply(&mut result);
                     let expected = analysis_after.file_text(file_id).unwrap().to_string();
diff --git a/crates/ide/src/tests.rs b/crates/ide/src/tests.rs
index 77d84f0013..418adf88da 100644
--- a/crates/ide/src/tests.rs
+++ b/crates/ide/src/tests.rs
@@ -16,7 +16,7 @@ use elp_ide_db::RootDatabase;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::FilePosition;
 use elp_ide_db::elp_base_db::FileRange;
-use elp_ide_db::elp_base_db::SourceDatabase;
+use elp_ide_db::elp_base_db::SourceDatabaseExt;
 use elp_ide_db::elp_base_db::assert_eq_text;
 use elp_ide_db::elp_base_db::fixture::WithFixture;
 use elp_ide_db::elp_base_db::remove_annotations;
@@ -109,11 +109,7 @@ pub(crate) fn check_filtered_ct_fix_with_config(
     let actual = {
         let source_change = fix.source_change.as_ref().unwrap();
         let file_id = *source_change.source_file_edits.keys().next().unwrap();
-        let mut actual = analysis
-            .db
-            .file_text(file_id)
-            .text(&analysis.db)
-            .to_string();
+        let mut actual = analysis.db.file_text(file_id).to_string();
 
         for edit in source_change.source_file_edits.values() {
             edit.apply(&mut actual);
@@ -230,11 +226,7 @@ pub(crate) fn check_nth_fix(
     let actual = {
         let source_change = fix.source_change.as_ref().unwrap();
         let file_id = *source_change.source_file_edits.keys().next().unwrap();
-        let mut actual = analysis
-            .db
-            .file_text(file_id)
-            .text(&analysis.db)
-            .to_string();
+        let mut actual = analysis.db.file_text(file_id).to_string();
 
         for edit in source_change.source_file_edits.values() {
             edit.apply(&mut actual);
@@ -361,11 +353,7 @@ pub(crate) fn check_specific_fix_with_config_and_adhoc(
     let actual = {
         let source_change = fix.source_change.as_ref().unwrap();
         let file_id = *source_change.source_file_edits.keys().next().unwrap();
-        let mut actual = analysis
-            .db
-            .file_text(file_id)
-            .text(&analysis.db)
-            .to_string();
+        let mut actual = analysis.db.file_text(file_id).to_string();
 
         for edit in source_change.source_file_edits.values() {
             edit.apply(&mut actual);
diff --git a/crates/ide_assists/src/assist_context.rs b/crates/ide_assists/src/assist_context.rs
index 5739294f26..1b4bcc5888 100644
--- a/crates/ide_assists/src/assist_context.rs
+++ b/crates/ide_assists/src/assist_context.rs
@@ -17,7 +17,7 @@ use elp_ide_db::assists::AssistUserInput;
 use elp_ide_db::assists::GroupLabel;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::FileRange;
-use elp_ide_db::elp_base_db::RootQueryDb;
+use elp_ide_db::elp_base_db::SourceDatabase;
 use elp_ide_db::source_change::SourceChangeBuilder;
 use elp_syntax::Direction;
 use elp_syntax::SourceFile;
diff --git a/crates/ide_assists/src/tests.rs b/crates/ide_assists/src/tests.rs
index 6ea0a30f5f..46fbbb0a04 100644
--- a/crates/ide_assists/src/tests.rs
+++ b/crates/ide_assists/src/tests.rs
@@ -19,8 +19,8 @@ use elp_ide_db::assists::AssistId;
 use elp_ide_db::assists::AssistKind;
 use elp_ide_db::assists::AssistUserInput;
 use elp_ide_db::assists::AssistUserInputType;
-use elp_ide_db::elp_base_db::RootQueryDb;
 use elp_ide_db::elp_base_db::SourceDatabase;
+use elp_ide_db::elp_base_db::SourceDatabaseExt;
 use elp_ide_db::elp_base_db::fixture::WithFixture;
 use elp_ide_db::elp_base_db::remove_annotations;
 use elp_ide_db::helpers::SnippetCap;
@@ -176,7 +176,7 @@ fn check(
     // Check that the fixture is syntactically valid
     if check_parse_error {
         // Check that we have a syntactically valid starting point
-        let text = sema.file_text(frange.file_id).text(sema);
+        let text = sema.file_text(frange.file_id);
         let parse = sema.parse(frange.file_id);
         let errors = parse.errors();
         if !errors.is_empty() {
@@ -246,11 +246,11 @@ fn check(
 
             let mut buf = String::new();
             for (file_id, edit) in source_change.source_file_edits {
-                let mut text = db.file_text(file_id).text(&db).as_ref().to_owned();
+                let mut text = db.file_text(file_id).as_ref().to_owned();
                 edit.apply(&mut text);
                 if !skip_header {
-                    let sr = db.file_source_root(file_id).source_root_id(&db);
-                    let sr = db.source_root(sr).source_root(&db);
+                    let sr = db.file_source_root(file_id);
+                    let sr = db.source_root(sr);
                     let path = sr.path_for_file(&file_id).unwrap();
                     format_to!(buf, "//- {}\n", path)
                 }
@@ -263,8 +263,8 @@ fn check(
                     initial_contents,
                 } = file_system_edit
                 {
-                    let sr = db.file_source_root(dst.anchor).source_root_id(&db);
-                    let sr = db.source_root(sr).source_root(&db);
+                    let sr = db.file_source_root(dst.anchor);
+                    let sr = db.source_root(sr);
                     let mut base = sr.path_for_file(&dst.anchor).unwrap().clone();
                     base.pop();
                     let created_file_path = format!("{}{}", base, &dst.path[1..]);
@@ -754,7 +754,7 @@ fn add_compile_option_1() {
     let mut builder = SourceChangeBuilder::new(file_id);
     helpers::add_compile_option(&sema, file_id, "blah", None, &mut builder);
     let source_change = builder.finish();
-    let mut changed = db.file_text(file_id).text(&db).to_string();
+    let mut changed = db.file_text(file_id).to_string();
     for edit in source_change.source_file_edits.values() {
         edit.apply(&mut changed);
     }
@@ -790,7 +790,7 @@ fn add_to_suite_basic() {
         &mut builder,
     );
     let source_change = builder.finish();
-    let mut changed = db.file_text(file_id).text(&db).to_string();
+    let mut changed = db.file_text(file_id).to_string();
     for edit in source_change.source_file_edits.values() {
         edit.apply(&mut changed);
     }
@@ -825,7 +825,7 @@ fn add_to_suite_existing_no_match() {
     let mut builder = SourceChangeBuilder::new(file_id);
     helpers::add_suite_0_option(&sema, file_id, "require", "foo", None, &mut builder);
     let source_change = builder.finish();
-    let mut changed = db.file_text(file_id).text(&db).to_string();
+    let mut changed = db.file_text(file_id).to_string();
     for edit in source_change.source_file_edits.values() {
         edit.apply(&mut changed);
     }
@@ -870,7 +870,7 @@ fn add_to_suite_existing_with_match() {
         &mut builder,
     );
     let source_change = builder.finish();
-    let mut changed = db.file_text(file_id).text(&db).to_string();
+    let mut changed = db.file_text(file_id).to_string();
     for edit in source_change.source_file_edits.values() {
         edit.apply(&mut changed);
     }
@@ -916,7 +916,7 @@ fn add_to_suite_existing_with_comment() {
         &mut builder,
     );
     let source_change = builder.finish();
-    let mut changed = db.file_text(file_id).text(&db).to_string();
+    let mut changed = db.file_text(file_id).to_string();
     for edit in source_change.source_file_edits.values() {
         edit.apply(&mut changed);
     }
@@ -963,7 +963,7 @@ fn add_to_suite_grouped_export() {
         &mut builder,
     );
     let source_change = builder.finish();
-    let mut changed = db.file_text(file_id).text(&db).to_string();
+    let mut changed = db.file_text(file_id).to_string();
     for edit in source_change.source_file_edits.values() {
         edit.apply(&mut changed);
     }
diff --git a/crates/ide_completion/src/ctx.rs b/crates/ide_completion/src/ctx.rs
index 75265ac361..20fbfb46fb 100644
--- a/crates/ide_completion/src/ctx.rs
+++ b/crates/ide_completion/src/ctx.rs
@@ -260,7 +260,7 @@ impl CtxKind {
 /// Tests of internals, delete when autocomplete is full-featured T126163525
 #[cfg(test)]
 mod ctx_tests {
-    use elp_base_db::RootQueryDb;
+    use elp_base_db::SourceDatabase;
     use elp_ide_db::RootDatabase;
     use elp_ide_db::elp_base_db::FilePosition;
     use elp_ide_db::elp_base_db::fixture::WithFixture;
diff --git a/crates/ide_completion/src/helpers.rs b/crates/ide_completion/src/helpers.rs
index 3d64901aaf..178bffeb5c 100644
--- a/crates/ide_completion/src/helpers.rs
+++ b/crates/ide_completion/src/helpers.rs
@@ -10,7 +10,7 @@
 
 use elp_base_db::FileId;
 use elp_base_db::FilePosition;
-use elp_base_db::RootQueryDb;
+use elp_base_db::SourceDatabase;
 use elp_syntax::AstNode;
 use elp_syntax::SmolStr;
 use elp_syntax::SourceFile;
@@ -134,7 +134,7 @@ pub(crate) fn should_include_args(next_token: &Option<SyntaxToken>) -> bool {
     }
 }
 
-fn function_arg_names(db: &dyn RootQueryDb, def: &FunctionDef) -> Option<String> {
+fn function_arg_names(db: &dyn SourceDatabase, def: &FunctionDef) -> Option<String> {
     let param_names = def.arg_names(db);
     let res = param_names?
         .iter()
@@ -149,7 +149,7 @@ fn function_arg_names(db: &dyn RootQueryDb, def: &FunctionDef) -> Option<String>
 }
 
 pub(crate) fn function_contents(
-    db: &dyn RootQueryDb,
+    db: &dyn SourceDatabase,
     def: &FunctionDef,
     function_name: &str,
     include_args: bool,
diff --git a/crates/ide_completion/src/macros.rs b/crates/ide_completion/src/macros.rs
index 715fe77505..3c4b77cfad 100644
--- a/crates/ide_completion/src/macros.rs
+++ b/crates/ide_completion/src/macros.rs
@@ -10,7 +10,7 @@
 
 use elp_base_db::FileId;
 use elp_base_db::IncludeCtx;
-use elp_base_db::RootQueryDb;
+use elp_base_db::SourceDatabase;
 use elp_base_db::VfsPath;
 use elp_base_db::path_for_file;
 use elp_syntax::AstNode;
@@ -197,7 +197,7 @@ const BUILT_IN: [Name; 8] = [
 // TODO: should this be done in the resolve step? Or, cached in the table
 // First make it work.
 pub fn get_include_file(
-    db: &dyn RootQueryDb,
+    db: &dyn SourceDatabase,
     file_id: FileId,
     included_file_id: FileId,
     include_path: VfsPath,
diff --git a/crates/ide_db/Cargo.toml b/crates/ide_db/Cargo.toml
index b3159b897b..babeee31b9 100644
--- a/crates/ide_db/Cargo.toml
+++ b/crates/ide_db/Cargo.toml
@@ -29,7 +29,6 @@ parking_lot.workspace = true
 paths.workspace = true
 profile.workspace = true
 regex.workspace = true
-ra_ap_query-group-macro.workspace = true
 rustc-hash.workspace = true
 serde.workspace = true
 stdx.workspace = true
diff --git a/crates/ide_db/src/common_test.rs b/crates/ide_db/src/common_test.rs
index 3601e4ead4..f8fb01214c 100644
--- a/crates/ide_db/src/common_test.rs
+++ b/crates/ide_db/src/common_test.rs
@@ -12,7 +12,7 @@ use std::sync::Arc;
 
 use elp_base_db::FileId;
 use elp_base_db::ProjectId;
-use elp_base_db::RootQueryDb;
+use elp_base_db::SourceDatabase;
 use elp_base_db::salsa;
 use elp_base_db::salsa::Database;
 use elp_erlang_service::CTInfoRequest;
@@ -42,8 +42,8 @@ pub enum CommonTestInfo {
     NoProjectInfoError,
 }
 
-#[ra_ap_query_group_macro::query_group(CommonTestDatabaseStorage)]
-pub trait CommonTestDatabase: DefDatabase + RootQueryDb + CommonTestLoader {
+#[salsa::query_group(CommonTestDatabaseStorage)]
+pub trait CommonTestDatabase: DefDatabase + SourceDatabase + CommonTestLoader {
     #[salsa::invoke(ct_info)]
     fn ct_info(&self, file_id: FileId) -> Arc<CommonTestInfo>;
 }
@@ -78,7 +78,7 @@ impl CommonTestLoader for crate::RootDatabase {
             should_request_groups,
             file_abstract_forms: module_ast.ast.clone(),
         };
-        match erlang_service.ct_info(module, request, || self.unwind_if_revision_cancelled()) {
+        match erlang_service.ct_info(module, request, || self.unwind_if_cancelled()) {
             Ok(result) => match result.all() {
                 Ok(all) => match result.groups() {
                     Ok(groups) => CommonTestInfo::Result { all, groups },
diff --git a/crates/ide_db/src/docs.rs b/crates/ide_db/src/docs.rs
index 7049764289..655a784cab 100644
--- a/crates/ide_db/src/docs.rs
+++ b/crates/ide_db/src/docs.rs
@@ -15,8 +15,8 @@ use std::sync::Arc;
 use std::vec;
 
 use elp_base_db::FileId;
-use elp_base_db::RootQueryDb;
 use elp_base_db::SourceDatabase;
+use elp_base_db::SourceDatabaseExt;
 use elp_base_db::Upcast;
 use elp_base_db::salsa;
 use elp_erlang_service::DocDiagnostic;
@@ -183,8 +183,8 @@ pub struct FileDoc {
 }
 
 // TODO Add an input so we know when to invalidate?
-#[ra_ap_query_group_macro::query_group]
-pub trait DocDatabase: DefDatabase + RootQueryDb + DocLoader + Upcast<dyn DefDatabase> {
+#[salsa::query_group(DocDatabaseStorage)]
+pub trait DocDatabase: DefDatabase + SourceDatabase + DocLoader + Upcast<dyn DefDatabase> {
     #[salsa::invoke(get_file_docs)]
     fn file_doc(&self, file_id: FileId) -> Arc<FileDoc>;
 
@@ -237,7 +237,7 @@ fn is_file_in_otp(db: &dyn DocDatabase, file_id: FileId) -> Option<bool> {
     let _ = stdx::panic_context::enter(format!("\nis_file_in_otp: {file_id:?}"));
     if let Some(app_data) = db.file_app_data(file_id) {
         let project_id = app_data.project_id;
-        Some(db.project_data(project_id).project_data(db).otp_project_id == Some(project_id))
+        Some(db.project_data(project_id).otp_project_id == Some(project_id))
     } else {
         log::error!(
             "Unknown application - could not load app_data to determine whether file is on OTP"
@@ -335,12 +335,12 @@ fn get_file_function_specs(def_db: &dyn DefDatabase, file_id: FileId) -> FxHashM
 
 impl DocLoader for crate::RootDatabase {
     fn load_doc_descriptions(&self, file_id: FileId, doc_origin: DocOrigin) -> FileDoc {
-        _ = SourceDatabase::file_text(self, file_id); // Take dependency on the contents of the file we're getting docs for
+        _ = SourceDatabaseExt::file_text(self, file_id); // Take dependency on the contents of the file we're getting docs for
         // Context for T171541590
         let _ = stdx::panic_context::enter(format!("\nload_doc_descriptions: {file_id:?}"));
-        let root_id = self.file_source_root(file_id).source_root_id(self);
-        let root = self.source_root(root_id).source_root(self);
-        let src_db: &dyn RootQueryDb = self.upcast();
+        let root_id = self.file_source_root(file_id);
+        let root = self.source_root(root_id);
+        let src_db: &dyn SourceDatabase = self.upcast();
         let app_data = if let Some(app_data) = src_db.file_app_data(file_id) {
             app_data
         } else {
@@ -373,8 +373,7 @@ impl DocLoader for crate::RootDatabase {
                 ast: None,
             },
         };
-        let raw_doc =
-            erlang_service.request_doc(doc_request, || src_db.unwind_if_revision_cancelled());
+        let raw_doc = erlang_service.request_doc(doc_request, || src_db.unwind_if_cancelled());
         match raw_doc {
             Ok(d) => FileDoc {
                 module_doc: Some(Doc {
diff --git a/crates/ide_db/src/eqwalizer.rs b/crates/ide_db/src/eqwalizer.rs
index 01e0be3e28..4deed79778 100644
--- a/crates/ide_db/src/eqwalizer.rs
+++ b/crates/ide_db/src/eqwalizer.rs
@@ -15,7 +15,6 @@ use elp_base_db::FileRange;
 use elp_base_db::FileSource;
 use elp_base_db::ModuleName;
 use elp_base_db::ProjectId;
-use elp_base_db::RootQueryDb;
 use elp_base_db::SourceDatabase;
 use elp_base_db::VfsPath;
 use elp_base_db::salsa;
@@ -53,9 +52,8 @@ impl EqwalizerLoader for crate::RootDatabase {
                 None => {
                     // Context for T171541590
                     let _ = stdx::panic_context::enter(format!("\ntypecheck: {module:?}"));
-                    let source_root_id =
-                        SourceDatabase::file_source_root(self, module).source_root_id(self);
-                    let source_root = self.source_root(source_root_id).source_root(self);
+                    let source_root_id = self.file_source_root(module);
+                    let source_root = self.source_root(source_root_id);
                     let path = source_root.path_for_file(&module);
                     log::error!("Can't find module for path: {path:?}");
                     continue;
@@ -66,11 +64,11 @@ impl EqwalizerLoader for crate::RootDatabase {
     }
 }
 
-#[ra_ap_query_group_macro::query_group]
+#[salsa::query_group(EqwalizerDatabaseStorage)]
 pub trait EqwalizerDatabase:
     EqwalizerDiagnosticsDatabase
     + EqwalizerAnalysesDatabase
-    + RootQueryDb
+    + SourceDatabase
     + EqwalizerLoader
     + ErlAstDatabase
 {
@@ -177,7 +175,7 @@ fn is_eqwalizer_enabled(db: &dyn EqwalizerDatabase, file_id: FileId, include_tes
         return false;
     };
     let project_id = app_data.project_id;
-    let project = db.project_data(project_id).project_data(db);
+    let project = db.project_data(project_id);
     let eqwalizer_config = &project.eqwalizer_config;
     let module_index = db.module_index(project_id);
     let is_src = module_index.file_source_for_file(file_id) == Some(FileSource::Src);
@@ -250,21 +248,17 @@ fn find_path_in_project(
     project_id: ProjectId,
     path: &VfsPath,
 ) -> Option<FileId> {
-    let project = db.project_data(project_id).project_data(db);
+    let project = db.project_data(project_id);
     let source_roots = &project.source_roots;
     let mut otp_source_roots = Vec::new();
     if let Some(otp_project_id) = project.otp_project_id {
-        let otp_project = db.project_data(otp_project_id).project_data(db);
+        let otp_project = db.project_data(otp_project_id);
         otp_source_roots = otp_project.source_roots.clone();
     }
     source_roots
         .iter()
         .chain(&otp_source_roots)
-        .find_map(|&source_root_id| {
-            db.source_root(source_root_id)
-                .source_root(db)
-                .file_for_path(path)
-        })
+        .find_map(|&source_root_id| db.source_root(source_root_id).file_for_path(path))
 }
 
 fn decl_location(
@@ -277,8 +271,8 @@ fn decl_location(
     let module_file_id = module_index.file_for_module(&module)?;
     // Context for T171541590
     let _ = stdx::panic_context::enter(format!("\ndecl_location: {module_file_id:?}"));
-    let source_root_id = db.file_source_root(module_file_id).source_root_id(db);
-    let source_root = db.source_root(source_root_id).source_root(db);
+    let source_root_id = db.file_source_root(module_file_id);
+    let source_root = db.source_root(source_root_id);
     let decl_file_path = &source_root.path_for_file(&module_file_id)?;
     let file_id = find_path_in_project(db, project_id, decl_file_path)?;
     let range: elp_syntax::TextRange = {
diff --git a/crates/ide_db/src/erl_ast.rs b/crates/ide_db/src/erl_ast.rs
index 0d6e1a2648..9e92add636 100644
--- a/crates/ide_db/src/erl_ast.rs
+++ b/crates/ide_db/src/erl_ast.rs
@@ -13,9 +13,9 @@ use std::sync::Arc;
 
 use elp_base_db::AbsPath;
 use elp_base_db::FileId;
+use elp_base_db::FileLoader;
 use elp_base_db::IncludeCtx;
 use elp_base_db::ProjectId;
-use elp_base_db::RootQueryDb;
 use elp_base_db::SourceDatabase;
 use elp_base_db::path_for_file;
 use elp_base_db::salsa;
@@ -61,7 +61,7 @@ impl AstLoader for crate::RootDatabase {
             CompileOption::ElpMetadata(elp_metadata),
         ];
         let path: PathBuf = path.to_path_buf().into();
-        let file_text = SourceDatabase::file_text(self, file_id).text(self);
+        let file_text = self.file_text(file_id);
         let req = ParseRequest {
             options,
             file_id,
@@ -73,7 +73,7 @@ impl AstLoader for crate::RootDatabase {
 
         erlang_service.request_parse(
             req,
-            || self.unwind_if_revision_cancelled(),
+            || self.unwind_if_cancelled(),
             &move |current_file_id, include_type, path| {
                 resolve_include(self, file_id, current_file_id, include_type, path)
             },
@@ -82,7 +82,7 @@ impl AstLoader for crate::RootDatabase {
 }
 
 fn resolve_include(
-    db: &dyn RootQueryDb,
+    db: &dyn SourceDatabase,
     orig_file_id: FileId,
     current_file_id: FileId,
     include_type: IncludeType,
@@ -99,15 +99,11 @@ fn resolve_include(
                 .resolve_include_doc(path)?,
         };
     let path = path_for_file(db, include_file_id).map(|vfs_path| vfs_path.to_string())?;
-    Some((
-        path,
-        include_file_id,
-        db.file_text(include_file_id).text(db),
-    ))
+    Some((path, include_file_id, db.file_text(include_file_id)))
 }
 
-#[ra_ap_query_group_macro::query_group(ErlAstDatabaseStorage)]
-pub trait ErlAstDatabase: RootQueryDb + AstLoader + LineIndexDatabase {
+#[salsa::query_group(ErlAstDatabaseStorage)]
+pub trait ErlAstDatabase: SourceDatabase + AstLoader + LineIndexDatabase {
     fn module_ast(&self, file_id: FileId) -> Arc<ParseResult>;
     fn elp_metadata(&self, file_id: FileId) -> Metadata;
 }
@@ -115,8 +111,8 @@ pub trait ErlAstDatabase: RootQueryDb + AstLoader + LineIndexDatabase {
 fn module_ast(db: &dyn ErlAstDatabase, file_id: FileId) -> Arc<ParseResult> {
     // Context for T171541590
     let _ = stdx::panic_context::enter(format!("\nmodule_ast: {file_id:?}"));
-    let root_id = db.file_source_root(file_id).source_root_id(db);
-    let root = db.source_root(root_id).source_root(db);
+    let root_id = db.file_source_root(file_id);
+    let root = db.source_root(root_id);
     let path = root.path_for_file(&file_id).unwrap().as_path().unwrap();
     let metadata = db.elp_metadata(file_id);
     let app_data = if let Some(app_data) = db.file_app_data(file_id) {
@@ -141,7 +137,7 @@ fn module_ast(db: &dyn ErlAstDatabase, file_id: FileId) -> Arc<ParseResult> {
 
 fn elp_metadata(db: &dyn ErlAstDatabase, file_id: FileId) -> Metadata {
     let line_index = db.file_line_index(file_id);
-    let file_text = db.file_text(file_id).text(db);
+    let file_text = db.file_text(file_id);
     let source = db.parse(file_id);
     metadata::collect_metadata(&line_index, &file_text, &source)
 }
diff --git a/crates/ide_db/src/lib.rs b/crates/ide_db/src/lib.rs
index c06cca5dad..d9c1f1d8d7 100644
--- a/crates/ide_db/src/lib.rs
+++ b/crates/ide_db/src/lib.rs
@@ -15,24 +15,13 @@ use std::path::PathBuf;
 use std::sync::Arc;
 
 use elp_base_db::AbsPathBuf;
-use elp_base_db::AppData;
-use elp_base_db::AppDataId;
-use elp_base_db::AppDataInput;
 use elp_base_db::FileId;
+use elp_base_db::FileLoader;
+use elp_base_db::FileLoaderDelegate;
 use elp_base_db::FilePosition;
 use elp_base_db::FileRange;
-use elp_base_db::FileSourceRootInput;
-use elp_base_db::FileText;
-use elp_base_db::Files;
-use elp_base_db::ProjectData;
-use elp_base_db::ProjectDataInput;
 use elp_base_db::ProjectId;
-use elp_base_db::RootQueryDb;
-use elp_base_db::SourceAppDataInput;
 use elp_base_db::SourceDatabase;
-use elp_base_db::SourceRoot;
-use elp_base_db::SourceRootId;
-use elp_base_db::SourceRootInput;
 use elp_base_db::Upcast;
 use elp_base_db::limit_logged_string;
 use elp_base_db::salsa;
@@ -111,11 +100,22 @@ pub trait EqwalizerProgressReporter: Send + Sync + RefUnwindSafe {
     fn done_module(&mut self, module: &str);
 }
 
-#[salsa::db]
+#[salsa::database(
+    LineIndexDatabaseStorage,
+    docs::DocDatabaseStorage,
+    elp_base_db::SourceDatabaseExtStorage,
+    elp_base_db::SourceDatabaseStorage,
+    eqwalizer::EqwalizerDatabaseStorage,
+    common_test::CommonTestDatabaseStorage,
+    elp_eqwalizer::db::EqwalizerDiagnosticsDatabaseStorage,
+    elp_eqwalizer::analyses::EqwalizerAnalysesDatabaseStorage,
+    erl_ast::ErlAstDatabaseStorage,
+    hir::db::InternDatabaseStorage,
+    hir::db::DefDatabaseStorage
+)]
 #[allow(clippy::type_complexity)]
 pub struct RootDatabase {
     storage: salsa::Storage<Self>,
-    files: Arc<Files>,
     erlang_services: Arc<AssertUnwindSafe<RwLock<FxHashMap<ProjectId, Connection>>>>,
     eqwalizer: Eqwalizer,
     eqwalizer_progress_reporter: EqwalizerProgressReporterBox,
@@ -125,7 +125,6 @@ impl Default for RootDatabase {
     fn default() -> Self {
         let mut db = RootDatabase {
             storage: salsa::Storage::default(),
-            files: Arc::default(),
             erlang_services: Arc::default(),
             eqwalizer: Eqwalizer::default(),
             eqwalizer_progress_reporter: EqwalizerProgressReporterBox::default(),
@@ -136,23 +135,8 @@ impl Default for RootDatabase {
     }
 }
 
-impl RefUnwindSafe for RootDatabase {}
-
-impl Clone for RootDatabase {
-    fn clone(&self) -> Self {
-        Self {
-            storage: self.storage.clone(),
-            files: self.files.clone(),
-            erlang_services: self.erlang_services.clone(),
-            eqwalizer: self.eqwalizer.clone(),
-            eqwalizer_progress_reporter: self.eqwalizer_progress_reporter.clone(),
-            ipc_handles: self.ipc_handles.clone(),
-        }
-    }
-}
-
-impl Upcast<dyn RootQueryDb> for RootDatabase {
-    fn upcast(&self) -> &(dyn RootQueryDb + 'static) {
+impl Upcast<dyn SourceDatabase> for RootDatabase {
+    fn upcast(&self) -> &(dyn SourceDatabase + 'static) {
         self
     }
 }
@@ -169,89 +153,37 @@ impl Upcast<dyn DefDatabase> for RootDatabase {
     }
 }
 
+impl FileLoader for RootDatabase {
+    fn file_text(&self, file_id: FileId) -> Arc<str> {
+        FileLoaderDelegate(self).file_text(file_id)
+    }
+}
+
 impl fmt::Debug for RootDatabase {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("RootDatabase").finish_non_exhaustive()
     }
 }
 
-#[salsa::db]
-impl salsa::Database for RootDatabase {
-    fn salsa_event(&self, _event: &dyn Fn() -> salsa::Event) {}
-}
+impl salsa::Database for RootDatabase {}
 
-#[salsa::db]
-impl SourceDatabase for RootDatabase {
-    fn file_text(&self, file_id: FileId) -> FileText {
-        self.files.file_text(file_id)
-    }
-
-    fn set_file_text(&mut self, file_id: FileId, text: Arc<str>) {
-        let files = self.files.clone();
-        files.set_file_text(self, file_id, text);
-    }
-
-    fn source_root(&self, source_root_id: SourceRootId) -> SourceRootInput {
-        self.files.source_root(source_root_id)
-    }
-
-    fn set_source_root(&mut self, source_root_id: SourceRootId, source_root: Arc<SourceRoot>) {
-        let files = self.files.clone();
-        files.set_source_root(self, source_root_id, source_root);
-    }
-
-    fn file_source_root(&self, id: FileId) -> FileSourceRootInput {
-        self.files.file_source_root(id)
-    }
-
-    fn set_file_source_root(&mut self, id: FileId, source_root_id: SourceRootId) {
-        let files = self.files.clone();
-        files.set_file_source_root(self, id, source_root_id);
-    }
-
-    fn app_data_by_id(&self, id: AppDataId) -> AppDataInput {
-        self.files.app_data(id)
-    }
-
-    fn set_app_data_by_id(&mut self, id: AppDataId, app_data: Option<Arc<AppData>>) {
-        let files = self.files.clone();
-        files.set_app_data(self, id, app_data)
-    }
-
-    fn app_data_id(&self, source_root_id: SourceRootId) -> SourceAppDataInput {
-        self.files.source_app_data(source_root_id)
-    }
-
-    fn set_app_data_id(&mut self, id: SourceRootId, app_data_id: AppDataId) {
-        let files = self.files.clone();
-        files.set_source_app_data(self, id, app_data_id)
-    }
-
-    fn project_data(&self, project_id: ProjectId) -> ProjectDataInput {
-        self.files.project_data(project_id)
-    }
-
-    fn set_project_data(&mut self, id: ProjectId, project_data: Arc<ProjectData>) {
-        let files = self.files.clone();
-        files.set_project_data(self, id, project_data)
-    }
-}
-
-impl RootDatabase {
-    pub fn snapshot(&self) -> Self {
-        Self {
-            storage: self.storage.clone(),
-            files: self.files.clone(),
+impl salsa::ParallelDatabase for RootDatabase {
+    fn snapshot(&self) -> salsa::Snapshot<RootDatabase> {
+        salsa::Snapshot::new(RootDatabase {
+            storage: self.storage.snapshot(),
             erlang_services: self.erlang_services.clone(),
             eqwalizer: self.eqwalizer.clone(),
             eqwalizer_progress_reporter: self.eqwalizer_progress_reporter.clone(),
             ipc_handles: self.ipc_handles.clone(),
-        }
+        })
     }
+}
 
+impl RootDatabase {
     pub fn request_cancellation(&mut self) {
         let _p = tracing::info_span!("RootDatabase::request_cancellation").entered();
-        self.synthetic_write(salsa::Durability::LOW);
+        self.salsa_runtime_mut()
+            .synthetic_write(salsa::Durability::LOW);
     }
 
     pub fn clear_erlang_services(&mut self) {
@@ -268,7 +200,7 @@ impl RootDatabase {
             .entry(project_id)
             .or_insert_with(|| {
                 let conn = Connection::start().expect("failed to establish connection");
-                let project_data = self.project_data(project_id).project_data(self);
+                let project_data = self.project_data(project_id);
                 let path: Vec<PathBuf> = project_data
                     .deps_ebins
                     .iter()
@@ -285,7 +217,7 @@ impl RootDatabase {
 
     pub fn update_erlang_service_paths(&self) {
         for (&project_id, connection) in self.erlang_services.read().iter() {
-            let project_data = self.project_data(project_id).project_data(self);
+            let project_data = self.project_data(project_id);
             let paths = project_data
                 .deps_ebins
                 .iter()
@@ -315,7 +247,7 @@ impl RootDatabase {
         // Context for T171541590
         let _ = stdx::panic_context::enter(format!("\nresolved_includes: {file_id:?}"));
         let project_id = self.file_app_data(file_id)?.project_id;
-        let root_abs = &self.project_data(project_id).project_data(self).root_dir;
+        let root_abs = &self.project_data(project_id).root_dir;
         let form_list = self.file_form_list(file_id);
         let line_index = self.file_line_index(file_id);
         let includes: Vec<_> = form_list
@@ -347,13 +279,13 @@ impl RootDatabase {
     }
 }
 
-#[ra_ap_query_group_macro::query_group(LineIndexDatabaseStorage)]
-pub trait LineIndexDatabase: RootQueryDb {
+#[salsa::query_group(LineIndexDatabaseStorage)]
+pub trait LineIndexDatabase: SourceDatabase {
     fn file_line_index(&self, file_id: FileId) -> Arc<LineIndex>;
 }
 
 fn file_line_index(db: &dyn LineIndexDatabase, file_id: FileId) -> Arc<LineIndex> {
-    let text = db.file_text(file_id).text(db);
+    let text = db.file_text(file_id);
     Arc::new(LineIndex::new(&text))
 }
 
@@ -383,8 +315,8 @@ impl Includes {
     ) -> Option<Utf8PathBuf> {
         // Context for T171541590
         let _ = stdx::panic_context::enter(format!("\napp_file_path: {file_id:?}"));
-        let root_id = db.file_source_root(file_id).source_root_id(db);
-        let root = db.source_root(root_id).source_root(db);
+        let root_id = db.file_source_root(file_id);
+        let root = db.source_root(root_id);
         let path = root.path_for_file(&file_id)?;
         let app_data = db.file_app_data(file_id)?;
 
@@ -485,7 +417,7 @@ impl TypedSemantic for RootDatabase {
 
 #[cfg(test)]
 mod tests {
-    use elp_base_db::RootQueryDb;
+    use elp_base_db::SourceDatabase;
     use elp_base_db::fixture::WithFixture;
     use elp_text_edit::TextRange;
 
diff --git a/crates/ide_db/src/search.rs b/crates/ide_db/src/search.rs
index cdf5aa6a2c..4c5c0a5a74 100644
--- a/crates/ide_db/src/search.rs
+++ b/crates/ide_db/src/search.rs
@@ -117,10 +117,9 @@ impl SearchScope {
     pub fn project(db: &dyn DefDatabase, project_id: ProjectId) -> SearchScope {
         let mut entries = FxHashMap::default();
 
-        for &source_root_id in &db.project_data(project_id).project_data(db).source_roots {
+        for &source_root_id in &db.project_data(project_id).source_roots {
             entries.extend(
                 db.source_root(source_root_id)
-                    .source_root(db)
                     .iter()
                     .map(|file_id| (file_id, None)),
             )
@@ -284,7 +283,7 @@ impl<'a> FindUsages<'a> {
             scope: &'a SearchScope,
         ) -> impl Iterator<Item = (Arc<str>, FileId, TextRange)> + 'a {
             scope.entries.iter().map(move |(&file_id, &search_range)| {
-                let text = sema.db.file_text(file_id).text(sema.db);
+                let text = sema.db.file_text(file_id);
                 let search_range =
                     search_range.unwrap_or_else(|| TextRange::up_to(TextSize::of(&*text)));
 
diff --git a/crates/ide_ssr/src/lib.rs b/crates/ide_ssr/src/lib.rs
index 122be5512f..17e9a6ac30 100644
--- a/crates/ide_ssr/src/lib.rs
+++ b/crates/ide_ssr/src/lib.rs
@@ -61,7 +61,7 @@ use std::sync::Arc;
 use elp_ide_db::RootDatabase;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::FileRange;
-use elp_ide_db::elp_base_db::SourceDatabase;
+use elp_ide_db::elp_base_db::SourceDatabaseExt;
 use elp_syntax::AstNode;
 use elp_syntax::SyntaxNode;
 use elp_syntax::TextRange;
@@ -428,7 +428,7 @@ impl<'a> MatchFinder<'a> {
     pub fn debug_where_text_equal(&self, file_id: FileId, snippet: &str) -> Vec<MatchDebugInfo> {
         let file = self.sema.parse(file_id);
         let mut res = Vec::new();
-        let file_text = self.sema.db.file_text(file_id).text(self.sema.db);
+        let file_text = self.sema.db.file_text(file_id);
         let mut remaining_text = &*file_text;
         let mut base = 0;
         let len = snippet.len() as u32;
@@ -530,7 +530,7 @@ impl SsrMatches {
 
 impl Match {
     pub fn matched_text(&self, db: &RootDatabase) -> String {
-        let file_text = SourceDatabase::file_text(db, self.range.file_id).text(db);
+        let file_text = db.file_text(self.range.file_id);
         file_text[self.range.range.start().into()..self.range.range.end().into()].to_string()
     }
 
@@ -752,7 +752,7 @@ mod test {
                         },
                         placeholders_by_var: {
                             Var(
-                                Id(3c00),
+                                0,
                             ): {
                                 AnyExprId(
                                     Expr(
@@ -838,7 +838,7 @@ mod test {
                         },
                         placeholders_by_var: {
                             Var(
-                                Id(3c00),
+                                0,
                             ): {
                                 AnyExprId(
                                     Expr(
diff --git a/crates/ide_ssr/src/tests.rs b/crates/ide_ssr/src/tests.rs
index 5b42e30ca1..108680853e 100644
--- a/crates/ide_ssr/src/tests.rs
+++ b/crates/ide_ssr/src/tests.rs
@@ -1570,7 +1570,7 @@ fn ssr_predicates_on_match_expr_pat() {
     expect![[r#"
         Some(
             Var(
-                Id(3803),
+                3,
             ),
         )
     "#]]
@@ -1584,7 +1584,7 @@ fn ssr_predicates_on_match_expr_pat() {
     expect![[r#"
         Some(
             Atom(
-                Id(6801),
+                1,
             ),
         )
     "#]]
@@ -1596,7 +1596,7 @@ fn ssr_predicates_on_match_expr_pat() {
     expect![[r#"
         Some(
             Var(
-                Id(3803),
+                3,
             ),
         )
     "#]]
@@ -1609,7 +1609,7 @@ fn ssr_predicates_on_match_expr_pat() {
     expect![[r#"
         Some(
             Var(
-                Id(3803),
+                3,
             ),
         )
     "#]]
@@ -1623,7 +1623,7 @@ fn ssr_predicates_on_match_expr_pat() {
     expect![[r#"
         Some(
             Atom(
-                Id(6802),
+                2,
             ),
         )
     "#]]

From 4319e99c865ba7d74d884d002b9488d001b3bb9f Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 6 Aug 2025 05:30:34 -0700
Subject: [PATCH 032/394] Add no_nowarn_suppressions linter

Summary: Raises a warning if a compile directive of type `nowarn_*` is used.

Reviewed By: TD5

Differential Revision: D79635553

fbshipit-source-id: 369c38f5b80bfa7cd3830cbef22da59aa8eed380
---
 .../eqwalize_all_bail_on_error_failure.pretty |  32 ++---
 .../standard/eqwalize_all_diagnostics.jsonl   |  14 +--
 .../standard/eqwalize_all_diagnostics.pretty  |  32 ++---
 .../eqwalize_all_diagnostics_gen.jsonl        |  14 +--
 .../test/standard/eqwalize_app_a.jsonl        |  14 +--
 .../test/standard/eqwalize_app_a.pretty       |  32 ++---
 .../standard/eqwalize_app_diagnostics.pretty  |  32 ++---
 .../eqwalize_app_diagnostics_gen.pretty       |  32 ++---
 .../eqwalize_app_diagnostics_gen_rebar.pretty |  32 ++---
 .../eqwalize_app_diagnostics_rebar.pretty     |  32 ++---
 .../eqwalize_target_diagnostics.pretty        |  32 ++---
 crates/elp/tests/slow-tests/main.rs           |  28 ++---
 crates/ide/src/diagnostics.rs                 |   2 +
 crates/ide/src/diagnostics/application_env.rs |   4 +-
 .../missing_compile_warn_missing_spec.rs      |   7 +-
 .../src/diagnostics/no_nowarn_suppressions.rs | 116 ++++++++++++++++++
 crates/ide_db/src/diagnostic_code.rs          |   4 +
 test_projects/standard/app_a/src/app_a.erl    |   1 +
 website/docs/erlang-error-index/w/W0054.md    |  28 +++++
 19 files changed, 322 insertions(+), 166 deletions(-)
 create mode 100644 crates/ide/src/diagnostics/no_nowarn_suppressions.rs
 create mode 100644 website/docs/erlang-error-index/w/W0054.md

diff --git a/crates/elp/src/resources/test/standard/eqwalize_all_bail_on_error_failure.pretty b/crates/elp/src/resources/test/standard/eqwalize_all_bail_on_error_failure.pretty
index 0f7abc9965..fc5bc27296 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_all_bail_on_error_failure.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_all_bail_on_error_failure.pretty
@@ -1,37 +1,37 @@
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-  ┌─ app_a/src/app_a.erl:9:5
-  │
-9 │     ?OK.
-  │     ^^^ 'error'.
+   ┌─ app_a/src/app_a.erl:10:5
+   │
+10 │     ?OK.
+   │     ^^^ 'error'.
 Expression has type:   'error'
 Context expected type: 'ok'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:13:5
+   ┌─ app_a/src/app_a.erl:14:5
    │
-13 │     error.
+14 │     error.
    │     ^^^^^ 'error'.
 Expression has type:   'error'
 Context expected type: 'ok'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:17:13
+   ┌─ app_a/src/app_a.erl:18:13
    │
-17 │     _ = 3 * an_atom, ok.
+18 │     _ = 3 * an_atom, ok.
    │             ^^^^^^^ 'an_atom'.
 Expression has type:   'an_atom'
 Context expected type: number()
 
 error: redundant_fixme (See https://fb.me/eqwalizer_errors#redundant_fixme)
-   ┌─ app_a/src/app_a.erl:55:5
+   ┌─ app_a/src/app_a.erl:56:5
    │
-55 │     % eqwalizer:fixme redundant issue should be reported
+56 │     % eqwalizer:fixme redundant issue should be reported
    │     ^^^^^^^^^^^^^^^^^ redundant fixme
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:77:5
+   ┌─ app_a/src/app_a.erl:78:5
    │
-77 │     X.
+78 │     X.
    │     ^
    │     │
    │     X.
@@ -49,9 +49,9 @@ Because in the expression's type:
 keys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ app_a/src/app_a.erl:101:5
+    ┌─ app_a/src/app_a.erl:102:5
     │
-101 │     X.
+102 │     X.
     │     ^
     │     │
     │     X.
@@ -80,9 +80,9 @@ Because in the expression's type:
   #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ app_a/src/app_a.erl:124:5
+    ┌─ app_a/src/app_a.erl:125:5
     │
-124 │     X.
+125 │     X.
     │     ^
     │     │
     │     X.
diff --git a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.jsonl b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.jsonl
index 7e5b7f1980..242981cf70 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.jsonl
+++ b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.jsonl
@@ -1,10 +1,10 @@
-{"path":"app_a/src/app_a.erl","line":9,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":13,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":17,"char":13,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":55,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: redundant_fixme","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nredundant fixme\n```\n\n> [docs on `redundant_fixme`](https://fb.me/eqwalizer_errors#redundant_fixme)"}
-{"path":"app_a/src/app_a.erl","line":77,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}\nContext expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}\n```\n```\nBecause in the expression's type:\n  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}\n  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}\n  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.\n\n------------------------------ Detailed message ------------------------------\n\nkeys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":101,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d => atom()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      Here the type is:     #{d => ..., ...}\n      Context expects type: #{d := ..., e := ..., ...}\n      The type of the expression is missing the following required keys: d, e.\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":124,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      #{ d =>\n        Here the type is:     pid()\n        Context expects type: atom()\n      , ... }\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
+{"path":"app_a/src/app_a.erl","line":10,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
+{"path":"app_a/src/app_a.erl","line":14,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
+{"path":"app_a/src/app_a.erl","line":18,"char":13,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
+{"path":"app_a/src/app_a.erl","line":56,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: redundant_fixme","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nredundant fixme\n```\n\n> [docs on `redundant_fixme`](https://fb.me/eqwalizer_errors#redundant_fixme)"}
+{"path":"app_a/src/app_a.erl","line":78,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}\nContext expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}\n```\n```\nBecause in the expression's type:\n  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}\n  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}\n  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.\n\n------------------------------ Detailed message ------------------------------\n\nkeys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
+{"path":"app_a/src/app_a.erl","line":102,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d => atom()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      Here the type is:     #{d => ..., ...}\n      Context expects type: #{d := ..., e := ..., ...}\n      The type of the expression is missing the following required keys: d, e.\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
+{"path":"app_a/src/app_a.erl","line":125,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      #{ d =>\n        Here the type is:     pid()\n        Context expects type: atom()\n      , ... }\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
 {"path":"app_a/test/app_a_SUITE.erl","line":18,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"app_a_test_helpers:fail()","replacement":null,"description":"```lang=error,counterexample\n`app_a_test_helpers:fail()`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
 {"path":"app_a/src/app_a_errors_generated.erl","line":8,"char":10,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'wrong_ret'","replacement":null,"description":"```lang=error,counterexample\n`'wrong_ret'`.\n\nExpression has type:   'wrong_ret'\nContext expected type: 'foo'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
 {"path":"app_a/src/app_a_lists.erl","line":576,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"flatmap(thing_to_list/1, List)","replacement":null,"description":"```lang=error,counterexample\n`flatmap(thing_to_list/1, List)`.\n\nExpression has type:   [term()]\nContext expected type: string()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
diff --git a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.pretty b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.pretty
index 0f7abc9965..fc5bc27296 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.pretty
@@ -1,37 +1,37 @@
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-  ┌─ app_a/src/app_a.erl:9:5
-  │
-9 │     ?OK.
-  │     ^^^ 'error'.
+   ┌─ app_a/src/app_a.erl:10:5
+   │
+10 │     ?OK.
+   │     ^^^ 'error'.
 Expression has type:   'error'
 Context expected type: 'ok'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:13:5
+   ┌─ app_a/src/app_a.erl:14:5
    │
-13 │     error.
+14 │     error.
    │     ^^^^^ 'error'.
 Expression has type:   'error'
 Context expected type: 'ok'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:17:13
+   ┌─ app_a/src/app_a.erl:18:13
    │
-17 │     _ = 3 * an_atom, ok.
+18 │     _ = 3 * an_atom, ok.
    │             ^^^^^^^ 'an_atom'.
 Expression has type:   'an_atom'
 Context expected type: number()
 
 error: redundant_fixme (See https://fb.me/eqwalizer_errors#redundant_fixme)
-   ┌─ app_a/src/app_a.erl:55:5
+   ┌─ app_a/src/app_a.erl:56:5
    │
-55 │     % eqwalizer:fixme redundant issue should be reported
+56 │     % eqwalizer:fixme redundant issue should be reported
    │     ^^^^^^^^^^^^^^^^^ redundant fixme
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:77:5
+   ┌─ app_a/src/app_a.erl:78:5
    │
-77 │     X.
+78 │     X.
    │     ^
    │     │
    │     X.
@@ -49,9 +49,9 @@ Because in the expression's type:
 keys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ app_a/src/app_a.erl:101:5
+    ┌─ app_a/src/app_a.erl:102:5
     │
-101 │     X.
+102 │     X.
     │     ^
     │     │
     │     X.
@@ -80,9 +80,9 @@ Because in the expression's type:
   #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ app_a/src/app_a.erl:124:5
+    ┌─ app_a/src/app_a.erl:125:5
     │
-124 │     X.
+125 │     X.
     │     ^
     │     │
     │     X.
diff --git a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics_gen.jsonl b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics_gen.jsonl
index 7e5b7f1980..242981cf70 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics_gen.jsonl
+++ b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics_gen.jsonl
@@ -1,10 +1,10 @@
-{"path":"app_a/src/app_a.erl","line":9,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":13,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":17,"char":13,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":55,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: redundant_fixme","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nredundant fixme\n```\n\n> [docs on `redundant_fixme`](https://fb.me/eqwalizer_errors#redundant_fixme)"}
-{"path":"app_a/src/app_a.erl","line":77,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}\nContext expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}\n```\n```\nBecause in the expression's type:\n  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}\n  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}\n  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.\n\n------------------------------ Detailed message ------------------------------\n\nkeys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":101,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d => atom()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      Here the type is:     #{d => ..., ...}\n      Context expects type: #{d := ..., e := ..., ...}\n      The type of the expression is missing the following required keys: d, e.\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":124,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      #{ d =>\n        Here the type is:     pid()\n        Context expects type: atom()\n      , ... }\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
+{"path":"app_a/src/app_a.erl","line":10,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
+{"path":"app_a/src/app_a.erl","line":14,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
+{"path":"app_a/src/app_a.erl","line":18,"char":13,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
+{"path":"app_a/src/app_a.erl","line":56,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: redundant_fixme","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nredundant fixme\n```\n\n> [docs on `redundant_fixme`](https://fb.me/eqwalizer_errors#redundant_fixme)"}
+{"path":"app_a/src/app_a.erl","line":78,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}\nContext expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}\n```\n```\nBecause in the expression's type:\n  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}\n  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}\n  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.\n\n------------------------------ Detailed message ------------------------------\n\nkeys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
+{"path":"app_a/src/app_a.erl","line":102,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d => atom()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      Here the type is:     #{d => ..., ...}\n      Context expects type: #{d := ..., e := ..., ...}\n      The type of the expression is missing the following required keys: d, e.\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
+{"path":"app_a/src/app_a.erl","line":125,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      #{ d =>\n        Here the type is:     pid()\n        Context expects type: atom()\n      , ... }\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
 {"path":"app_a/test/app_a_SUITE.erl","line":18,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"app_a_test_helpers:fail()","replacement":null,"description":"```lang=error,counterexample\n`app_a_test_helpers:fail()`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
 {"path":"app_a/src/app_a_errors_generated.erl","line":8,"char":10,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'wrong_ret'","replacement":null,"description":"```lang=error,counterexample\n`'wrong_ret'`.\n\nExpression has type:   'wrong_ret'\nContext expected type: 'foo'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
 {"path":"app_a/src/app_a_lists.erl","line":576,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"flatmap(thing_to_list/1, List)","replacement":null,"description":"```lang=error,counterexample\n`flatmap(thing_to_list/1, List)`.\n\nExpression has type:   [term()]\nContext expected type: string()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
diff --git a/crates/elp/src/resources/test/standard/eqwalize_app_a.jsonl b/crates/elp/src/resources/test/standard/eqwalize_app_a.jsonl
index cbf57215da..6e5f79207d 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_app_a.jsonl
+++ b/crates/elp/src/resources/test/standard/eqwalize_app_a.jsonl
@@ -1,7 +1,7 @@
-{"path":"app_a/src/app_a.erl","line":9,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":13,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":17,"char":13,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":55,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: redundant_fixme","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nredundant fixme\n```\n\n> [docs on `redundant_fixme`](https://fb.me/eqwalizer_errors#redundant_fixme)"}
-{"path":"app_a/src/app_a.erl","line":77,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}\nContext expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}\n```\n```\nBecause in the expression's type:\n  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}\n  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}\n  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.\n\n------------------------------ Detailed message ------------------------------\n\nkeys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":101,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d => atom()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      Here the type is:     #{d => ..., ...}\n      Context expects type: #{d := ..., e := ..., ...}\n      The type of the expression is missing the following required keys: d, e.\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":124,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      #{ d =>\n        Here the type is:     pid()\n        Context expects type: atom()\n      , ... }\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
+{"path":"app_a/src/app_a.erl","line":10,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
+{"path":"app_a/src/app_a.erl","line":14,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
+{"path":"app_a/src/app_a.erl","line":18,"char":13,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
+{"path":"app_a/src/app_a.erl","line":56,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: redundant_fixme","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nredundant fixme\n```\n\n> [docs on `redundant_fixme`](https://fb.me/eqwalizer_errors#redundant_fixme)"}
+{"path":"app_a/src/app_a.erl","line":78,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}\nContext expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}\n```\n```\nBecause in the expression's type:\n  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}\n  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}\n  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.\n\n------------------------------ Detailed message ------------------------------\n\nkeys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
+{"path":"app_a/src/app_a.erl","line":102,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d => atom()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      Here the type is:     #{d => ..., ...}\n      Context expects type: #{d := ..., e := ..., ...}\n      The type of the expression is missing the following required keys: d, e.\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
+{"path":"app_a/src/app_a.erl","line":125,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      #{ d =>\n        Here the type is:     pid()\n        Context expects type: atom()\n      , ... }\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
diff --git a/crates/elp/src/resources/test/standard/eqwalize_app_a.pretty b/crates/elp/src/resources/test/standard/eqwalize_app_a.pretty
index fcec8dea87..3cfdbd0dc2 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_app_a.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_app_a.pretty
@@ -1,37 +1,37 @@
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-  ┌─ app_a/src/app_a.erl:9:5
-  │
-9 │     ?OK.
-  │     ^^^ 'error'.
+   ┌─ app_a/src/app_a.erl:10:5
+   │
+10 │     ?OK.
+   │     ^^^ 'error'.
 Expression has type:   'error'
 Context expected type: 'ok'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:13:5
+   ┌─ app_a/src/app_a.erl:14:5
    │
-13 │     error.
+14 │     error.
    │     ^^^^^ 'error'.
 Expression has type:   'error'
 Context expected type: 'ok'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:17:13
+   ┌─ app_a/src/app_a.erl:18:13
    │
-17 │     _ = 3 * an_atom, ok.
+18 │     _ = 3 * an_atom, ok.
    │             ^^^^^^^ 'an_atom'.
 Expression has type:   'an_atom'
 Context expected type: number()
 
 error: redundant_fixme (See https://fb.me/eqwalizer_errors#redundant_fixme)
-   ┌─ app_a/src/app_a.erl:55:5
+   ┌─ app_a/src/app_a.erl:56:5
    │
-55 │     % eqwalizer:fixme redundant issue should be reported
+56 │     % eqwalizer:fixme redundant issue should be reported
    │     ^^^^^^^^^^^^^^^^^ redundant fixme
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:77:5
+   ┌─ app_a/src/app_a.erl:78:5
    │
-77 │     X.
+78 │     X.
    │     ^
    │     │
    │     X.
@@ -49,9 +49,9 @@ Because in the expression's type:
 keys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ app_a/src/app_a.erl:101:5
+    ┌─ app_a/src/app_a.erl:102:5
     │
-101 │     X.
+102 │     X.
     │     ^
     │     │
     │     X.
@@ -80,9 +80,9 @@ Because in the expression's type:
   #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ app_a/src/app_a.erl:124:5
+    ┌─ app_a/src/app_a.erl:125:5
     │
-124 │     X.
+125 │     X.
     │     ^
     │     │
     │     X.
diff --git a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics.pretty b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics.pretty
index ad4d5fb961..5aba82bc71 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics.pretty
@@ -1,37 +1,37 @@
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-  ┌─ app_a/src/app_a.erl:9:5
-  │
-9 │     ?OK.
-  │     ^^^ 'error'.
+   ┌─ app_a/src/app_a.erl:10:5
+   │
+10 │     ?OK.
+   │     ^^^ 'error'.
 Expression has type:   'error'
 Context expected type: 'ok'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:13:5
+   ┌─ app_a/src/app_a.erl:14:5
    │
-13 │     error.
+14 │     error.
    │     ^^^^^ 'error'.
 Expression has type:   'error'
 Context expected type: 'ok'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:17:13
+   ┌─ app_a/src/app_a.erl:18:13
    │
-17 │     _ = 3 * an_atom, ok.
+18 │     _ = 3 * an_atom, ok.
    │             ^^^^^^^ 'an_atom'.
 Expression has type:   'an_atom'
 Context expected type: number()
 
 error: redundant_fixme (See https://fb.me/eqwalizer_errors#redundant_fixme)
-   ┌─ app_a/src/app_a.erl:55:5
+   ┌─ app_a/src/app_a.erl:56:5
    │
-55 │     % eqwalizer:fixme redundant issue should be reported
+56 │     % eqwalizer:fixme redundant issue should be reported
    │     ^^^^^^^^^^^^^^^^^ redundant fixme
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:77:5
+   ┌─ app_a/src/app_a.erl:78:5
    │
-77 │     X.
+78 │     X.
    │     ^
    │     │
    │     X.
@@ -49,9 +49,9 @@ Because in the expression's type:
 keys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ app_a/src/app_a.erl:101:5
+    ┌─ app_a/src/app_a.erl:102:5
     │
-101 │     X.
+102 │     X.
     │     ^
     │     │
     │     X.
@@ -80,9 +80,9 @@ Because in the expression's type:
   #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ app_a/src/app_a.erl:124:5
+    ┌─ app_a/src/app_a.erl:125:5
     │
-124 │     X.
+125 │     X.
     │     ^
     │     │
     │     X.
diff --git a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen.pretty b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen.pretty
index ad4d5fb961..5aba82bc71 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen.pretty
@@ -1,37 +1,37 @@
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-  ┌─ app_a/src/app_a.erl:9:5
-  │
-9 │     ?OK.
-  │     ^^^ 'error'.
+   ┌─ app_a/src/app_a.erl:10:5
+   │
+10 │     ?OK.
+   │     ^^^ 'error'.
 Expression has type:   'error'
 Context expected type: 'ok'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:13:5
+   ┌─ app_a/src/app_a.erl:14:5
    │
-13 │     error.
+14 │     error.
    │     ^^^^^ 'error'.
 Expression has type:   'error'
 Context expected type: 'ok'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:17:13
+   ┌─ app_a/src/app_a.erl:18:13
    │
-17 │     _ = 3 * an_atom, ok.
+18 │     _ = 3 * an_atom, ok.
    │             ^^^^^^^ 'an_atom'.
 Expression has type:   'an_atom'
 Context expected type: number()
 
 error: redundant_fixme (See https://fb.me/eqwalizer_errors#redundant_fixme)
-   ┌─ app_a/src/app_a.erl:55:5
+   ┌─ app_a/src/app_a.erl:56:5
    │
-55 │     % eqwalizer:fixme redundant issue should be reported
+56 │     % eqwalizer:fixme redundant issue should be reported
    │     ^^^^^^^^^^^^^^^^^ redundant fixme
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:77:5
+   ┌─ app_a/src/app_a.erl:78:5
    │
-77 │     X.
+78 │     X.
    │     ^
    │     │
    │     X.
@@ -49,9 +49,9 @@ Because in the expression's type:
 keys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ app_a/src/app_a.erl:101:5
+    ┌─ app_a/src/app_a.erl:102:5
     │
-101 │     X.
+102 │     X.
     │     ^
     │     │
     │     X.
@@ -80,9 +80,9 @@ Because in the expression's type:
   #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ app_a/src/app_a.erl:124:5
+    ┌─ app_a/src/app_a.erl:125:5
     │
-124 │     X.
+125 │     X.
     │     ^
     │     │
     │     X.
diff --git a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen_rebar.pretty b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen_rebar.pretty
index da94db5a76..b72b8d1178 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen_rebar.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen_rebar.pretty
@@ -1,37 +1,37 @@
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-  ┌─ app_a/src/app_a.erl:9:5
-  │
-9 │     ?OK.
-  │     ^^^ 'error'.
+   ┌─ app_a/src/app_a.erl:10:5
+   │
+10 │     ?OK.
+   │     ^^^ 'error'.
 Expression has type:   'error'
 Context expected type: 'ok'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:13:5
+   ┌─ app_a/src/app_a.erl:14:5
    │
-13 │     error.
+14 │     error.
    │     ^^^^^ 'error'.
 Expression has type:   'error'
 Context expected type: 'ok'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:17:13
+   ┌─ app_a/src/app_a.erl:18:13
    │
-17 │     _ = 3 * an_atom, ok.
+18 │     _ = 3 * an_atom, ok.
    │             ^^^^^^^ 'an_atom'.
 Expression has type:   'an_atom'
 Context expected type: number()
 
 error: redundant_fixme (See https://fb.me/eqwalizer_errors#redundant_fixme)
-   ┌─ app_a/src/app_a.erl:55:5
+   ┌─ app_a/src/app_a.erl:56:5
    │
-55 │     % eqwalizer:fixme redundant issue should be reported
+56 │     % eqwalizer:fixme redundant issue should be reported
    │     ^^^^^^^^^^^^^^^^^ redundant fixme
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:77:5
+   ┌─ app_a/src/app_a.erl:78:5
    │
-77 │     X.
+78 │     X.
    │     ^
    │     │
    │     X.
@@ -49,9 +49,9 @@ Because in the expression's type:
 keys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ app_a/src/app_a.erl:101:5
+    ┌─ app_a/src/app_a.erl:102:5
     │
-101 │     X.
+102 │     X.
     │     ^
     │     │
     │     X.
@@ -80,9 +80,9 @@ Because in the expression's type:
   #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ app_a/src/app_a.erl:124:5
+    ┌─ app_a/src/app_a.erl:125:5
     │
-124 │     X.
+125 │     X.
     │     ^
     │     │
     │     X.
diff --git a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_rebar.pretty b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_rebar.pretty
index da94db5a76..b72b8d1178 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_rebar.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_rebar.pretty
@@ -1,37 +1,37 @@
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-  ┌─ app_a/src/app_a.erl:9:5
-  │
-9 │     ?OK.
-  │     ^^^ 'error'.
+   ┌─ app_a/src/app_a.erl:10:5
+   │
+10 │     ?OK.
+   │     ^^^ 'error'.
 Expression has type:   'error'
 Context expected type: 'ok'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:13:5
+   ┌─ app_a/src/app_a.erl:14:5
    │
-13 │     error.
+14 │     error.
    │     ^^^^^ 'error'.
 Expression has type:   'error'
 Context expected type: 'ok'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:17:13
+   ┌─ app_a/src/app_a.erl:18:13
    │
-17 │     _ = 3 * an_atom, ok.
+18 │     _ = 3 * an_atom, ok.
    │             ^^^^^^^ 'an_atom'.
 Expression has type:   'an_atom'
 Context expected type: number()
 
 error: redundant_fixme (See https://fb.me/eqwalizer_errors#redundant_fixme)
-   ┌─ app_a/src/app_a.erl:55:5
+   ┌─ app_a/src/app_a.erl:56:5
    │
-55 │     % eqwalizer:fixme redundant issue should be reported
+56 │     % eqwalizer:fixme redundant issue should be reported
    │     ^^^^^^^^^^^^^^^^^ redundant fixme
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:77:5
+   ┌─ app_a/src/app_a.erl:78:5
    │
-77 │     X.
+78 │     X.
    │     ^
    │     │
    │     X.
@@ -49,9 +49,9 @@ Because in the expression's type:
 keys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ app_a/src/app_a.erl:101:5
+    ┌─ app_a/src/app_a.erl:102:5
     │
-101 │     X.
+102 │     X.
     │     ^
     │     │
     │     X.
@@ -80,9 +80,9 @@ Because in the expression's type:
   #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ app_a/src/app_a.erl:124:5
+    ┌─ app_a/src/app_a.erl:125:5
     │
-124 │     X.
+125 │     X.
     │     ^
     │     │
     │     X.
diff --git a/crates/elp/src/resources/test/standard/eqwalize_target_diagnostics.pretty b/crates/elp/src/resources/test/standard/eqwalize_target_diagnostics.pretty
index ad4d5fb961..5aba82bc71 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_target_diagnostics.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_target_diagnostics.pretty
@@ -1,37 +1,37 @@
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-  ┌─ app_a/src/app_a.erl:9:5
-  │
-9 │     ?OK.
-  │     ^^^ 'error'.
+   ┌─ app_a/src/app_a.erl:10:5
+   │
+10 │     ?OK.
+   │     ^^^ 'error'.
 Expression has type:   'error'
 Context expected type: 'ok'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:13:5
+   ┌─ app_a/src/app_a.erl:14:5
    │
-13 │     error.
+14 │     error.
    │     ^^^^^ 'error'.
 Expression has type:   'error'
 Context expected type: 'ok'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:17:13
+   ┌─ app_a/src/app_a.erl:18:13
    │
-17 │     _ = 3 * an_atom, ok.
+18 │     _ = 3 * an_atom, ok.
    │             ^^^^^^^ 'an_atom'.
 Expression has type:   'an_atom'
 Context expected type: number()
 
 error: redundant_fixme (See https://fb.me/eqwalizer_errors#redundant_fixme)
-   ┌─ app_a/src/app_a.erl:55:5
+   ┌─ app_a/src/app_a.erl:56:5
    │
-55 │     % eqwalizer:fixme redundant issue should be reported
+56 │     % eqwalizer:fixme redundant issue should be reported
    │     ^^^^^^^^^^^^^^^^^ redundant fixme
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ app_a/src/app_a.erl:77:5
+   ┌─ app_a/src/app_a.erl:78:5
    │
-77 │     X.
+78 │     X.
    │     ^
    │     │
    │     X.
@@ -49,9 +49,9 @@ Because in the expression's type:
 keys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ app_a/src/app_a.erl:101:5
+    ┌─ app_a/src/app_a.erl:102:5
     │
-101 │     X.
+102 │     X.
     │     ^
     │     │
     │     X.
@@ -80,9 +80,9 @@ Because in the expression's type:
   #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ app_a/src/app_a.erl:124:5
+    ┌─ app_a/src/app_a.erl:125:5
     │
-124 │     X.
+125 │     X.
     │     ^
     │     │
     │     X.
diff --git a/crates/elp/tests/slow-tests/main.rs b/crates/elp/tests/slow-tests/main.rs
index 9ac135fe1b..98455e8850 100644
--- a/crates/elp/tests/slow-tests/main.rs
+++ b/crates/elp/tests/slow-tests/main.rs
@@ -196,11 +196,11 @@ fn test_e2e_eqwalizer_module() {
                       "range": {
                         "end": {
                           "character": 7,
-                          "line": 8
+                          "line": 9
                         },
                         "start": {
                           "character": 4,
-                          "line": 8
+                          "line": 9
                         }
                       },
                       "severity": 1,
@@ -215,11 +215,11 @@ fn test_e2e_eqwalizer_module() {
                       "range": {
                         "end": {
                           "character": 9,
-                          "line": 12
+                          "line": 13
                         },
                         "start": {
                           "character": 4,
-                          "line": 12
+                          "line": 13
                         }
                       },
                       "severity": 1,
@@ -234,11 +234,11 @@ fn test_e2e_eqwalizer_module() {
                       "range": {
                         "end": {
                           "character": 19,
-                          "line": 16
+                          "line": 17
                         },
                         "start": {
                           "character": 12,
-                          "line": 16
+                          "line": 17
                         }
                       },
                       "severity": 1,
@@ -253,11 +253,11 @@ fn test_e2e_eqwalizer_module() {
                       "range": {
                         "end": {
                           "character": 21,
-                          "line": 54
+                          "line": 55
                         },
                         "start": {
                           "character": 4,
-                          "line": 54
+                          "line": 55
                         }
                       },
                       "severity": 1,
@@ -272,11 +272,11 @@ fn test_e2e_eqwalizer_module() {
                       "range": {
                         "end": {
                           "character": 5,
-                          "line": 76
+                          "line": 77
                         },
                         "start": {
                           "character": 4,
-                          "line": 76
+                          "line": 77
                         }
                       },
                       "severity": 1,
@@ -291,11 +291,11 @@ fn test_e2e_eqwalizer_module() {
                       "range": {
                         "end": {
                           "character": 5,
-                          "line": 100
+                          "line": 101
                         },
                         "start": {
                           "character": 4,
-                          "line": 100
+                          "line": 101
                         }
                       },
                       "severity": 1,
@@ -310,11 +310,11 @@ fn test_e2e_eqwalizer_module() {
                       "range": {
                         "end": {
                           "character": 5,
-                          "line": 123
+                          "line": 124
                         },
                         "start": {
                           "character": 4,
-                          "line": 123
+                          "line": 124
                         }
                       },
                       "severity": 1,
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 5175b7c444..e568a2fcdc 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -110,6 +110,7 @@ mod no_catch;
 mod no_dialyzer_attribute;
 mod no_error_logger;
 mod no_garbage_collect;
+mod no_nowarn_suppressions;
 mod no_size;
 mod nonstandard_integer_formatting;
 mod record_tuple_match;
@@ -921,6 +922,7 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &binary_string_to_sigil::DESCRIPTOR,
         &no_catch::DESCRIPTOR,
         &no_error_logger::DESCRIPTOR,
+        &no_nowarn_suppressions::DESCRIPTOR,
     ]
 }
 
diff --git a/crates/ide/src/diagnostics/application_env.rs b/crates/ide/src/diagnostics/application_env.rs
index 52aa4b8993..59c3688e5b 100644
--- a/crates/ide/src/diagnostics/application_env.rs
+++ b/crates/ide/src/diagnostics/application_env.rs
@@ -244,12 +244,14 @@ fn check_valid_application(
 
 #[cfg(test)]
 mod tests {
+    use elp_ide_db::DiagnosticCode;
+
     use crate::diagnostics::DiagnosticsConfig;
     use crate::tests::check_diagnostics_with_config;
 
     #[track_caller]
     pub(crate) fn check_diagnostics(fixture: &str) {
-        let config = DiagnosticsConfig::default();
+        let config = DiagnosticsConfig::default().disable(DiagnosticCode::NoNoWarnSuppressions);
         check_diagnostics_with_config(config, fixture)
     }
 
diff --git a/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs b/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs
index fd6cc6e6d4..993b1aeeb5 100644
--- a/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs
+++ b/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs
@@ -198,7 +198,8 @@ mod tests {
     #[track_caller]
     pub(crate) fn check_fix(fixture_before: &str, fixture_after: Expect) {
         let config =
-            DiagnosticsConfig::default().enable(DiagnosticCode::MissingCompileWarnMissingSpec);
+            DiagnosticsConfig::default()
+                .enable(DiagnosticCode::MissingCompileWarnMissingSpec);
         check_fix_with_config(config, fixture_before, fixture_after)
     }
 
@@ -217,13 +218,15 @@ mod tests {
     pub(crate) fn check_diagnostics(fixture: &str) {
         let config = DiagnosticsConfig::default()
             .enable(DiagnosticCode::MissingCompileWarnMissingSpec)
+            .disable(DiagnosticCode::NoNoWarnSuppressions)
             .disable(DiagnosticCode::UnspecificInclude);
         check_diagnostics_with_config(config, fixture)
     }
 
     #[track_caller]
     pub(crate) fn check_diagnostics_no_enable(fixture: &str) {
-        let config = DiagnosticsConfig::default();
+        let config = DiagnosticsConfig::default()
+            .disable(DiagnosticCode::NoNoWarnSuppressions);
         check_diagnostics_with_config(config, fixture)
     }
 
diff --git a/crates/ide/src/diagnostics/no_nowarn_suppressions.rs b/crates/ide/src/diagnostics/no_nowarn_suppressions.rs
new file mode 100644
index 0000000000..54bb3c99a2
--- /dev/null
+++ b/crates/ide/src/diagnostics/no_nowarn_suppressions.rs
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is dual-licensed under either the MIT license found in the
+ * LICENSE-MIT file in the root directory of this source tree or the Apache
+ * License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+ * of this source tree. You may select, at your option, one of the
+ * above-listed licenses.
+ */
+
+use elp_ide_db::elp_base_db::FileId;
+use elp_syntax::AstNode;
+use elp_syntax::ast;
+use elp_syntax::match_ast;
+use hir::Semantic;
+use lazy_static::lazy_static;
+use regex::Regex;
+
+use crate::diagnostics::Diagnostic;
+use crate::diagnostics::DiagnosticCode;
+use crate::diagnostics::DiagnosticConditions;
+use crate::diagnostics::DiagnosticDescriptor;
+use crate::diagnostics::Severity;
+
+const DIAGNOSTIC_CODE: DiagnosticCode = DiagnosticCode::NoNoWarnSuppressions;
+const DIAGNOSTIC_MESSAGE: &str = "Do not suppress compiler warnings at module level.";
+const DIAGNOSTIC_SEVERITY: Severity = Severity::Warning;
+
+pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
+    conditions: DiagnosticConditions {
+        experimental: false,
+        include_generated: false,
+        include_tests: true,
+        default_disabled: false,
+    },
+    checker: &|diags, sema, file_id, _ext| {
+        no_warn_suppression(diags, sema, file_id);
+    },
+};
+
+fn no_warn_suppression(diagnostics: &mut Vec<Diagnostic>, sema: &Semantic, file_id: FileId) {
+    lazy_static! {
+        static ref NOWARN_REGEX: Regex = Regex::new(r"^nowarn_").unwrap();
+    }
+
+    let form_list = sema.db.file_form_list(file_id);
+    for (_compile_option_idx, compile_option) in form_list.compile_attributes() {
+        let attr = compile_option.form_id.get_ast(sema.db, file_id);
+        if let Some(expr) = attr.options() {
+            // Blindly search for any atom matching the nowarn_ prefix
+            for n in expr.syntax().descendants() {
+                match_ast! {
+                    match n {
+                        ast::Atom(atom) => {
+                            if let Some(atom_text) = atom.text() {
+                                if NOWARN_REGEX.is_match(&atom_text) {
+                                    let diagnostic = Diagnostic::new(
+                                        DIAGNOSTIC_CODE,
+                                        DIAGNOSTIC_MESSAGE,
+                                        atom.syntax().text_range(),
+                                    )
+                                    .with_ignore_fix(sema, file_id)
+                                    .with_severity(DIAGNOSTIC_SEVERITY);
+                                    diagnostics.push(diagnostic);
+                                }
+                            }
+                        },
+                        _ => {}
+                    }
+                }
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::tests;
+
+    #[test]
+    fn test_nowarn_atom() {
+        tests::check_diagnostics(
+            r#"
+  -module(main).
+  -compile(nowarn_export_all).
+  %%       ^^^^^^^^^^^^^^^^^ 💡 warning: Do not suppress compiler warnings at module level.
+              "#,
+        )
+    }
+
+    #[test]
+    fn test_nowarn_tuple() {
+        tests::check_diagnostics(
+            r#"
+  -module(main).
+  -compile({nowarn_unused_function, {unused_function, 1}}).
+  %%        ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Do not suppress compiler warnings at module level.
+              "#,
+        )
+    }
+
+    #[test]
+    fn test_nowarn_list() {
+        tests::check_diagnostics(
+            r#"
+  -module(main).
+  -compile([
+      nowarn_export_all,
+  %%  ^^^^^^^^^^^^^^^^^ 💡 warning: Do not suppress compiler warnings at module level.
+      {nowarn_unused_function, {unused_function, 1}}
+  %%   ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Do not suppress compiler warnings at module level.
+  ]).
+              "#,
+        )
+    }
+}
diff --git a/crates/ide_db/src/diagnostic_code.rs b/crates/ide_db/src/diagnostic_code.rs
index 48dfc4ea92..4373a1d012 100644
--- a/crates/ide_db/src/diagnostic_code.rs
+++ b/crates/ide_db/src/diagnostic_code.rs
@@ -87,6 +87,7 @@ pub enum DiagnosticCode {
     BinaryStringToSigil,
     NoCatch,
     NoErrorLogger,
+    NoNoWarnSuppressions,
 
     // Wrapper for erlang service diagnostic codes
     ErlangService(String),
@@ -234,6 +235,7 @@ impl DiagnosticCode {
             DiagnosticCode::BinaryStringToSigil => "W0051".to_string(),
             DiagnosticCode::NoCatch => "W0052".to_string(),
             DiagnosticCode::NoErrorLogger => "W0053".to_string(),
+            DiagnosticCode::NoNoWarnSuppressions => "W0054".to_string(),
 
             DiagnosticCode::ErlangService(c) => c.to_string(),
             DiagnosticCode::Eqwalizer(c) => format!("eqwalizer: {c}"),
@@ -329,6 +331,7 @@ impl DiagnosticCode {
             DiagnosticCode::BinaryStringToSigil => "binary_string_to_sigil".to_string(),
             DiagnosticCode::NoCatch => "no_catch".to_string(),
             DiagnosticCode::NoErrorLogger => "no_error_logger".to_string(),
+            DiagnosticCode::NoNoWarnSuppressions => "no_nowarn_suppressions".to_string(),
 
             DiagnosticCode::ErlangService(c) => c.to_string(),
             DiagnosticCode::Eqwalizer(c) => c.to_string(),
@@ -472,6 +475,7 @@ impl DiagnosticCode {
             DiagnosticCode::NoSize => false,
             DiagnosticCode::NoCatch => false,
             DiagnosticCode::NoErrorLogger => false,
+            DiagnosticCode::NoNoWarnSuppressions => false,
 
             DiagnosticCode::BinaryStringToSigil => false,
             DiagnosticCode::ErlangService(_) => false,
diff --git a/test_projects/standard/app_a/src/app_a.erl b/test_projects/standard/app_a/src/app_a.erl
index 5a48f370fc..e3a6950c71 100644
--- a/test_projects/standard/app_a/src/app_a.erl
+++ b/test_projects/standard/app_a/src/app_a.erl
@@ -1,4 +1,5 @@
 -module(app_a).
+% elp:ignore no_nowarn_suppressions
 -compile([export_all, nowarn_export_all]).
 -typing([eqwalizer]).
 
diff --git a/website/docs/erlang-error-index/w/W0054.md b/website/docs/erlang-error-index/w/W0054.md
new file mode 100644
index 0000000000..22d1219ff4
--- /dev/null
+++ b/website/docs/erlang-error-index/w/W0054.md
@@ -0,0 +1,28 @@
+---
+sidebar_position: 54
+---
+
+# W0054 - Do not suppress compiler warnings at module level
+
+## Warning
+
+```erlang
+-module(example).
+
+-compile([
+    nowarn_shadow_vars,
+%%  ^^^^^^^^^^^^^^^^^^ 💡 warning: Do not suppress compiler warnings at module level.
+    nowarn_unused_vars
+%%  ^^^^^^^^^^^^^^^^^^ 💡 warning: Do not suppress compiler warnings at module level.
+]).
+```
+
+This diagnostic is triggered when a `-compile` attribute is used to suppress
+compiler warnings with `nowarn_*` options.
+
+Warning suppressions prevent the compiler from reporting issues that could
+indicate problems in your code. Many of these warnings are indicating serious
+problems that should be fixed rather than suppressed.
+
+By addressing these issues directly rather than suppressing warnings, you'll
+have a more maintainable codebase.

From 5089e302704fcdfea5c77b3fbdd039731896568b Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 6 Aug 2025 05:30:34 -0700
Subject: [PATCH 033/394] Add malformed_include linter

Reviewed By: TD5

Differential Revision: D79645138

fbshipit-source-id: 58ccc18749c01501013d7b3ad2c9c1c21a816bdb
---
 crates/ide/src/diagnostics/application_env.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/ide/src/diagnostics/application_env.rs b/crates/ide/src/diagnostics/application_env.rs
index 59c3688e5b..fd12b7af89 100644
--- a/crates/ide/src/diagnostics/application_env.rs
+++ b/crates/ide/src/diagnostics/application_env.rs
@@ -319,7 +319,7 @@ mod tests {
             //- /my_app/src/main.erl app:my_app
             -module(main).
 
-            -include("my_app/include/my_header.hrl").
+            -include_lib("my_app/include/my_header.hrl").
 
             get_mine() ->
                 ?get(misc, key).

From 88fc8ec7d8bb629b07395c1402f86fb8be98d2dc Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 11 Aug 2025 08:47:57 -0700
Subject: [PATCH 034/394] Fix formatting

Summary: I noticed CI was broken on GitHub.

Reviewed By: jcpetruzza

Differential Revision: D80002359

fbshipit-source-id: 06db89f7a7b70116203ef98eb1c761ca401989a5
---
 .../src/diagnostics/missing_compile_warn_missing_spec.rs    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs b/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs
index 993b1aeeb5..308d2890c6 100644
--- a/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs
+++ b/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs
@@ -198,8 +198,7 @@ mod tests {
     #[track_caller]
     pub(crate) fn check_fix(fixture_before: &str, fixture_after: Expect) {
         let config =
-            DiagnosticsConfig::default()
-                .enable(DiagnosticCode::MissingCompileWarnMissingSpec);
+            DiagnosticsConfig::default().enable(DiagnosticCode::MissingCompileWarnMissingSpec);
         check_fix_with_config(config, fixture_before, fixture_after)
     }
 
@@ -225,8 +224,7 @@ mod tests {
 
     #[track_caller]
     pub(crate) fn check_diagnostics_no_enable(fixture: &str) {
-        let config = DiagnosticsConfig::default()
-            .disable(DiagnosticCode::NoNoWarnSuppressions);
+        let config = DiagnosticsConfig::default().disable(DiagnosticCode::NoNoWarnSuppressions);
         check_diagnostics_with_config(config, fixture)
     }
 

From 41f2e8799de5c9c5b33c62dcc6b38e6010ce446f Mon Sep 17 00:00:00 2001
From: Tom Davies <tomdavies@meta.com>
Date: Tue, 12 Aug 2025 04:34:33 -0700
Subject: [PATCH 035/394] Improve handling puralisation of CLI output

Summary: No need to have "Applying fix(es)" in our output when we know whether there's one or more elements. Instead, we can just pick the correct form.

Reviewed By: robertoaloi

Differential Revision: D79890374

fbshipit-source-id: f9604db74004619703c801c28477fb17b6b0015a
---
 crates/elp/src/bin/lint_cli.rs                                 | 3 ++-
 .../resources/test/linter/parse_elp_lint_adhoc_output.stdout   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/crates/elp/src/bin/lint_cli.rs b/crates/elp/src/bin/lint_cli.rs
index c08d6e065e..f81cc877e1 100644
--- a/crates/elp/src/bin/lint_cli.rs
+++ b/crates/elp/src/bin/lint_cli.rs
@@ -780,7 +780,8 @@ impl<'a> Lints<'a> {
                 fixes.iter().cloned().unzip();
             if format_normal {
                 writeln!(cli, "---------------------------------------------\n")?;
-                writeln!(cli, "Applying fix(es) in module '{name}' for")?;
+                let plural = if diagnostics.len() > 1 { "es" } else { "" };
+                writeln!(cli, "Applying fix{plural} in module '{name}' for")?;
                 for diagnostic in diagnostics {
                     print_diagnostic(
                         &diagnostic,
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_adhoc_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_adhoc_output.stdout
index 24a21a6cb2..5adeaace66 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_adhoc_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_adhoc_output.stdout
@@ -5,7 +5,7 @@ Diagnostics reported in 1 modules:
       4:4-4:34::[WeakWarning] [ad-hoc: application:get_env/2] 'application:get_env/2' called
 ---------------------------------------------
 
-Applying fix(es) in module 'app_b' for
+Applying fixes in module 'app_b' for
       7:4-7:35::[WeakWarning] [ad-hoc: application:get_env/2] 'application:get_env/2' called
       4:4-4:34::[WeakWarning] [ad-hoc: application:get_env/2] 'application:get_env/2' called
 @@ -1,8 +1,8 @@

From 18befb9e0f7437e15afca2595705de3e1b196326 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 12 Aug 2025 07:30:27 -0700
Subject: [PATCH 036/394] Add documentation on how to create a new linter

Reviewed By: TD5

Differential Revision: D80079152

fbshipit-source-id: 6ce3ec9eebff72c6c1ffd78a6a93ff90f338017b
---
 website/docs/contributing/linters.mdx | 290 ++++++++++++++++++++++++++
 1 file changed, 290 insertions(+)
 create mode 100644 website/docs/contributing/linters.mdx

diff --git a/website/docs/contributing/linters.mdx b/website/docs/contributing/linters.mdx
new file mode 100644
index 0000000000..734ebbf816
--- /dev/null
+++ b/website/docs/contributing/linters.mdx
@@ -0,0 +1,290 @@
+---
+sidebar_position: 1
+title: "Linters"
+---
+
+# Adding a new linter
+
+ELP provides a flexible framework for adding custom linters (diagnostics) to
+detect issues in Erlang code. This guide walks you through the process of
+creating a new linter.
+
+## Overview
+
+Linters in ELP are implemented as diagnostics that analyze Erlang code and
+report issues.
+Today ELP counts over [50 linters](https://github.com/WhatsApp/erlang-language-platform/tree/main/crates/ide/src/diagnostics),
+and the number is growing. It is usually a good idea to look at existing linters to ensure a similar functionality is not already provided and to get inspiration for a new linter.
+
+At high level, each linter consists of:
+
+1. A **DiagnosticCode** - A unique identifier for the diagnostic
+2. A **DiagnosticDescriptor** - Configuration for when and how the diagnostic runs
+3. **Tests** - A number of test cases for the diagnostic
+4. **Documentation** - A user-facing explanation of the diagnostic
+
+## Example: Detecting unsafe function calls
+
+Let's create a linter that warns about calls to a hypothetical
+`unsafe:operation/1` API that should be avoided in production code.
+
+### Step 1: Add the Diagnostic Code
+
+First, add a new variant to the `DiagnosticCode` enum in
+[`crates/ide_db/src/diagnostic_code.rs`](https://github.com/WhatsApp/erlang-language-platform/blob/main/crates/ide_db/src/diagnostic_code.rs):
+
+```rust
+pub enum DiagnosticCode {
+    // ... existing codes ...
+    UnsafeFunctionCall, // This is the new code
+
+    // Wrapper for erlang service diagnostic codes
+    ErlangService(String),
+    // Wrapper for EqWAlizer diagnostic codes
+    Eqwalizer(String),
+    // Used for ad-hoc diagnostics via lints/codemods
+    AdHoc(String),
+}
+```
+
+Ensure the code name is unique and descriptive.
+Then add a clause for each of the required methods:
+
+```rust
+impl DiagnosticCode {
+    // The `as_code` method returns a string representation of the code.
+    // This is used to identify the diagnostic in the UI and in the CLI.
+    // Each code emitted by ELP starts with a `W` prefix, followed by a 4-digit number.
+    // The number is assigned by the linter author and should be unique within the linter.
+    // Use the next available number in the sequence for your new linter.
+    pub fn as_code(&self) -> &'static str {
+        match self {
+            // ... existing cases ...
+            DiagnosticCode::UnsafeFunctionCall => "W0055", // Use next available number here
+
+            DiagnosticCode::ErlangService(c) => c.to_string(),
+            DiagnosticCode::Eqwalizer(c) => format!("eqwalizer: {c}"),
+            DiagnosticCode::AdHoc(c) => format!("ad-hoc: {c}"),
+        }
+    }
+
+    // The `as_label` method returns a human-readable label for the diagnostic.
+    // This is used to identify the diagnostic in the UI and in the CLI.
+    // The label should be unique and descriptive.
+    pub fn as_label(&self) -> &'static str {
+        match self {
+            // ... existing cases ...
+            DiagnosticCode::UnsafeFunctionCall => "unsafe_function_call", // Use snake_case here
+
+            DiagnosticCode::ErlangService(c) => c.to_string(),
+            DiagnosticCode::Eqwalizer(c) => c.to_string(),
+            DiagnosticCode::AdHoc(c) => format!("ad-hoc: {c}"),
+        }
+    }
+
+    // The `allows_fixme_comment` method determines if it should be possible to temporarily
+    // suppress the diagnostic by a `% elp:fixme` annotation.
+    pub fn allows_fixme_comment(&self) -> bool {
+        match self {
+            // ... existing cases ...
+            DiagnosticCode::UnsafeFunctionCall => false,
+
+            DiagnosticCode::ErlangService(_) => false,
+            DiagnosticCode::Eqwalizer(_) => false,
+            DiagnosticCode::AdHoc(_) => false,
+        }
+    }
+
+}
+```
+
+### Step 2: Create the diagnostic module
+
+Create a new file `elp/crates/ide/src/diagnostics/unsafe_function_call.rs`, with the following content.
+The code has comments to explain each part.
+
+```rust
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is dual-licensed under either the MIT license found in the
+ * LICENSE-MIT file in the root directory of this source tree or the Apache
+ * License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+ * of this source tree. You may select, at your option, one of the
+ * above-listed licenses.
+ */
+
+use elp_ide_db::DiagnosticCode;
+use elp_ide_ssr::match_pattern_in_file_functions;
+use hir::Strategy;
+use hir::fold::MacroStrategy;
+use hir::fold::ParenStrategy;
+
+use crate::diagnostics::Diagnostic;
+use crate::diagnostics::DiagnosticConditions;
+use crate::diagnostics::DiagnosticDescriptor;
+use crate::diagnostics::Severity;
+
+// This is the enum entry which will be used to identify the diagnostic
+const DIAGNOSTIC_CODE: DiagnosticCode = DiagnosticCode::UnsafeFunctionCall;
+// This is a human-readable message that will be displayed in the IDE
+const DIAGNOSTIC_MESSAGE: &str = "Do not use unsafe:operation/1 in production code.";
+// This is the severity of the diagnostic (Warning, Error, etc.)
+const DIAGNOSTIC_SEVERITY: Severity = Severity::Warning;
+// This is the strategy used to match the pattern in the code.
+const STRATEGY: Strategy = Strategy {
+    // In our case we want to expand macros before matching the pattern
+    macros: MacroStrategy::Expand,
+    // We don't care about parentheses in our case, so we ignore them
+    parens: ParenStrategy::InvisibleParens,
+};
+
+// This is the core of our linter.
+pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
+    // These are the conditions under which the diagnostic should run.
+    conditions: DiagnosticConditions {
+        experimental: false, // Experimental diagnostics are only enabled in `--experimental` mode
+        include_generated: false, // Do not run the linters against generated files
+        include_tests: false, // Do not run the linters against test files
+        default_disabled: false, // The diagnostic is enabled by default
+    },
+    // This is the function that will be called to run the diagnostic.
+    // `acc` is a vector of diagnostics which will be adding to.
+    checker: &|acc, sema, file_id, _ext| {
+        // We use the SSR mechanism to match calls to `unsafe:operation/1`.
+        let pattern = "ssr: unsafe:operation(_@).";
+        // We use the `match_pattern_in_file_functions` function to match the pattern in the code.
+        let matches = match_pattern_in_file_functions(sema, STRATEGY, file_id, pattern);
+        // We iterate over the matches and add a diagnostic for each one
+        matches.matches.iter().for_each(|m| {
+            // We create a new diagnostic with the code, message, and range of the match
+            let diagnostic = Diagnostic::new(DIAGNOSTIC_CODE, DIAGNOSTIC_MESSAGE, m.range.range)
+                .with_severity(DIAGNOSTIC_SEVERITY);
+            // We add the diagnostic to the accumulator
+            acc.push(diagnostic);
+        });
+    },
+};
+```
+
+### Step 3: Register the diagnostic
+
+Add your diagnostic module to [`elp/crates/ide/src/diagnostics.rs`](https://github.com/WhatsApp/erlang-language-platform/blob/main/crates/ide/src/diagnostics.rs):
+
+```rust
+// Add the module declaration
+mod unsafe_function_call;
+
+// Register the descriptor in the diagnostics_descriptors function
+pub fn diagnostics_descriptors() -> Vec<&'static DiagnosticDescriptor> {
+    vec![
+        // ... existing descriptors ...
+        &unsafe_function_call::DESCRIPTOR, // We add the descriptor here
+    ]
+}
+```
+
+### Step 4: Add tests
+
+At the bottom of the `unsafe_function_call.rs` file, add the following:
+
+```rust
+#[cfg(test)]
+mod tests {
+    use crate::tests::check_diagnostics;
+
+    #[test]
+    fn test_unsafe_function_call() {
+        check_diagnostics(
+            r#"
+            //- /src/main.erl
+            -module(main).
+            -export([warn/0]).
+            warn() ->
+                unsafe:operation(data),
+            %%  ^^^^^^^^^^^^^^^^^^^^^^ warning: Do not use unsafe:operation/1 in production code.
+                safe:operation(data).
+            //- /src/unsafe.erl
+            -module(unsafe).
+            -export([operation/1]).
+            operation(_) -> ok.
+            //- /src/safe.erl
+            -module(safe).
+            -export([operation/1]).
+            operation(_) -> ok.
+            "#,
+        );
+    }
+}
+```
+
+ELP uses convenient snapshot tests for checking diagnostics. The test above
+checks that the diagnostic is correctly reported when calling `unsafe:operation/1`.
+It also checks that the diagnostic is not reported when calling `safe:operation/1`.
+
+Always include comprehensive tests in your diagnostic module:
+
+1. **Positive cases** - Code that should trigger the diagnostic
+2. **Negative cases** - Similar code that should NOT trigger the diagnostic
+3. **Edge cases** - Boundary conditions and unusual syntax
+
+You can run the tests with the following command:
+
+```
+cargo test --package elp_ide --lib -- diagnostics::unsafe_function_call::tests::test_unsafe_function_call --exact --show-output
+```
+
+### Step 5: Create documentation
+
+Each new linter must be accompanied by a documentation file in Markdown format.
+Create the documentation file corresponding to your linter in:
+`elp/website/docs/erlang-error-index/w/W0055.md` (where `W0055` is the code we introduced):
+
+````markdown
+---
+sidebar_position: 55
+---
+
+# W0055 - Unsage Function Call
+
+This diagnostic warns about calls to `unsafe:operation/1`, which should be
+avoided in production code due to potential security or stability risks.
+`safe:operation/1` is a safer alternative that should be used instead.
+
+## Example
+
+```erlang
+-module(example).
+-export([do/1]).
+
+do(Data) ->
+    unsafe:operation(Data).
+%%  ^^^^^^^^^^^^^^^^^^^^^^ warning: Do not use unsafe:operation/1 in production code.
+```
+
+## Recommended fix
+
+Replace calls to `unsafe:operation/1` with a safer alternative, such as `safe:operation/1`.
+
+```erlang
+-module(example).
+-export([do/1]).
+
+do(Data) ->
+    safe:operation(Data).
+```
+````
+
+### Step 6: Try the new linter from the CLI
+
+After building ELP, you can try the new linter against a hypothetical `my_module` Erlang module:
+
+```
+cargo run --bin elp -- lint --project /path/to/your/project --module my_module --diagnostic-filter unsafe_function_call
+```
+
+```
+Diagnostics reported in 1 modules:
+  my_module: 1
+      29:4-29:25::[Warning] [W0055] Do not use unsafe:operation/1 in production code.
+```

From f6094dcae34eeeb0ce8a38ca05c020c32a06931a Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 12 Aug 2025 09:22:54 -0700
Subject: [PATCH 037/394] Auto-completion for --diagnostic-code argument

Summary: Small quality of life, so that users of the ELP CLI can auto-complete diagnostic codes. Both codes and labels are presented. We could perform some fuzzy matching, but for now let's keep things simple and match on the prefix provided.

Reviewed By: TD5

Differential Revision: D80093860

fbshipit-source-id: d2a97409c8f6f1e9cf548b47cd0c276d85b513e0
---
 crates/elp/src/bin/args.rs           | 24 +++++++++++++++++++++++-
 crates/ide_db/src/diagnostic_code.rs |  4 ++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index 8e7af5ff4f..5a26dfb111 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -17,6 +17,7 @@ use bpaf::Bpaf;
 use bpaf::Parser;
 use bpaf::construct;
 use bpaf::long;
+use elp_ide::elp_ide_db::DiagnosticCode;
 use elp_project_model::buck::BuckQueryConfig;
 use itertools::Itertools;
 use serde::Deserialize;
@@ -285,7 +286,7 @@ pub struct Lint {
     #[bpaf(argument("CODE"))]
     pub diagnostic_ignore: Option<String>,
     /// Filter out all reported diagnostics except this one, by code or label
-    #[bpaf(argument("CODE"))]
+    #[bpaf(argument("CODE"), complete(diagnostic_code_completer))]
     pub diagnostic_filter: Option<String>,
     #[bpaf(external(parse_experimental_diags))]
     pub experimental_diags: bool,
@@ -601,6 +602,27 @@ fn module_completer(input: &String) -> Vec<(String, Option<String>)> {
     get_suggesions(input, modules)
 }
 
+fn diagnostic_code_completer(input: &Option<String>) -> Vec<(String, Option<String>)> {
+    let codes: Vec<String> = DiagnosticCode::codes_iter()
+        .filter(|code| match code {
+            DiagnosticCode::DefaultCodeForEnumIter
+            | DiagnosticCode::ErlangService(_)
+            | DiagnosticCode::Eqwalizer(_)
+            | DiagnosticCode::AdHoc(_) => false,
+            _ => true,
+        })
+        .flat_map(|code| vec![code.as_code().to_string(), code.as_label().to_string()])
+        .collect();
+    codes
+        .into_iter()
+        .filter(|code| match input {
+            None => true,
+            Some(prefix) => code.starts_with(prefix),
+        })
+        .map(|c| (c.to_string(), None))
+        .collect::<Vec<_>>()
+}
+
 fn format_completer(_: &Option<String>) -> Vec<(String, Option<String>)> {
     vec![("json".to_string(), None)]
 }
diff --git a/crates/ide_db/src/diagnostic_code.rs b/crates/ide_db/src/diagnostic_code.rs
index 4373a1d012..2f91ab668e 100644
--- a/crates/ide_db/src/diagnostic_code.rs
+++ b/crates/ide_db/src/diagnostic_code.rs
@@ -484,6 +484,10 @@ impl DiagnosticCode {
             // @fb-only
         }
     }
+
+    pub fn codes_iter() -> impl Iterator<Item = DiagnosticCode> {
+        DiagnosticCode::iter()
+    }
 }
 
 lazy_static! {

From cc6748b955002e599ece1153942646bccde46625 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 18 Aug 2025 03:02:58 -0700
Subject: [PATCH 038/394] Limit check_used_functions to function definitions
 local to the module

Summary:
The helper function is used in a number of `DiagnosticTemplate` linters (`no_size`, `no_error_logger`, etc) to detect function calls matching a given spec.

By using the extended `def_map`, we also include calls in included file (via `-include` or `-include_lib`). This is most likely a non-desired behaviour, since we'd end up returning diagnostics for included files, too, with incorrect ranges.

This also makes the linters behaviour consistent with the other linters (e.g. `debugging_function`, `atoms_exhaustion`, etc) which use a local `def_map_local`.

This is a step in preparation of the factoring out of the linters boilerplate code into a single method.

Reviewed By: TD5

Differential Revision: D80243757

fbshipit-source-id: a0d4145639fc10179b6e53ce88c3e18bdd101015
---
 crates/ide/src/diagnostics/helpers.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/ide/src/diagnostics/helpers.rs b/crates/ide/src/diagnostics/helpers.rs
index dd16b2f027..ebfdd79ad1 100644
--- a/crates/ide/src/diagnostics/helpers.rs
+++ b/crates/ide/src/diagnostics/helpers.rs
@@ -51,7 +51,7 @@ pub(crate) fn check_used_functions(
         .iter()
         .flat_map(|u| u.matches.iter().map(|m| (m, &u.diagnostic_template)))
         .collect();
-    sema.def_map(file_id)
+    sema.def_map_local(file_id)
         .get_functions()
         .for_each(|(_, def)| check_function_with_diagnostic_template(diags, sema, def, &mfas));
 }

From 831ba8c5af4878e46f8d41acf556bd35aa7fcc83 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 18 Aug 2025 03:02:58 -0700
Subject: [PATCH 039/394] Introduce FunctionCallLinter trait

Summary:
# Context

Today, adding a linter to ELP today relies on [quite a bit of non-obvious boilerplate](https://whatsapp.github.io/erlang-language-platform/docs/contributing/linters/). Furthermore, each linter performs its own logical traversal of an Erlang module.

# Problem

Some time ago, a somewhat experimental [`DiagnosticTemplate`](https://www.internalfb.com/code/fbsource/[bc7dd2289948f9c9c392c27c6c8db79cf81421b1]/fbcode/whatsapp/elp/crates/ide/src/diagnostics/helpers.rs?lines=28) mechanism was introduced, to reduce the amount of boilerplate required, but the approach has certain limitations:

* It still requires specifying a number of details even when default behaviours are good enough
* It still requires the developer to traverse the module, assuming knowledge about `def_map` and `find_call_in_function`

# Solution

By leveraging a trait, we can limit the amount of boilerplate (and knowledge!) required by an ELP developer to add a new linter.

Given that a good number of the existing linters detect function call applications, I am starting here by factoring out the common code into a `FunctionCallLinter`, which can eventually be generalized further, to allow additional types of linters.

This diff introduces the new linter, and converts a first linter (`sets_version_v2`) to use the new trait.

To keep the changes minimal, I am copying the logic from `diagnostics_from_descriptors` to `diagnostics_from_linters`. Specifically, the extraction of the `is_generated` and `is_test`, populating the same `Descriptor` as before (just, in a transparent way to the user).

The extra filtering which was present in `diagnostics_from_linters` is not necessary in the new version, where we can assume a 1:1 relation between a linter and a code.

Finally, the `find_call_in_function` API is only called once, at the top level, once all the linter "specifications" are extracted.

Reviewed By: TD5

Differential Revision: D80341881

fbshipit-source-id: 68b972f32202309f28f7bcdaddd641513ac90d9f
---
 crates/ide/src/diagnostics.rs                | 99 +++++++++++++++++++-
 crates/ide/src/diagnostics/sets_version_2.rs | 63 +++++--------
 2 files changed, 123 insertions(+), 39 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index e568a2fcdc..2b01f97955 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -72,9 +72,14 @@ use regex::Regex;
 use serde::Deserialize;
 use serde::Serialize;
 
+use crate::FunctionMatch;
 use crate::RootDatabase;
 use crate::SourceDatabase;
+use crate::codemod_helpers::UseRange;
 use crate::common_test;
+use crate::diagnostics::helpers::DiagnosticTemplate;
+use crate::diagnostics::helpers::FunctionCallDiagnostic;
+use crate::diagnostics::helpers::check_used_functions;
 
 mod application_env;
 mod atoms_exhaustion;
@@ -467,6 +472,50 @@ impl<F> AdhocSemanticDiagnostics for F where
 {
 }
 
+// A trait that simplifies writing linters matching function calls
+pub(crate) trait FunctionCallLinter {
+    // A unique identifier for the linter.
+    fn id(&self) -> DiagnosticCode;
+
+    // A plain-text description for the linter. Displayed to the end user.
+    fn description(&self) -> String;
+
+    // The severity for the lint issue. It defaults to `Warning`.
+    fn severity(&self) -> Severity {
+        Severity::Warning
+    }
+
+    // Specify if the linter issues can be suppressed via a `% elp:ignore` comment.
+    fn can_be_suppressed(&self) -> bool {
+        true
+    }
+
+    // Specify if the linter should only run when the `--experimental` flag is specified.
+    fn is_experimental(&self) -> bool {
+        false
+    }
+
+    // Specify if the linter is enabled by default.
+    fn is_enabled(&self) -> bool {
+        true
+    }
+
+    // Specify if the linter should process generated files.
+    fn should_process_generated_files(&self) -> bool {
+        false
+    }
+
+    // Specify if the linter should process generated test files (including test helpers)
+    fn should_process_test_files(&self) -> bool {
+        true
+    }
+
+    // Specify the list of functions the linter should emit issues for
+    fn matches_functions(&self) -> Vec<FunctionMatch> {
+        vec![]
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct DiagnosticConditions {
     pub experimental: bool,
@@ -841,6 +890,7 @@ pub fn native_diagnostics(
             config,
             &diagnostics_descriptors(),
         );
+        diagnostics_from_linters(&mut res, &sema, file_id, config, linters());
 
         let parse_diagnostics = parse.errors().iter().take(128).map(|err| {
             let (code, message) = match err {
@@ -917,7 +967,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &undocumented_module::DESCRIPTOR,
         &no_garbage_collect::DESCRIPTOR,
         &no_dialyzer_attribute::DESCRIPTOR,
-        &sets_version_2::DESCRIPTOR,
         &no_size::DESCRIPTOR,
         &binary_string_to_sigil::DESCRIPTOR,
         &no_catch::DESCRIPTOR,
@@ -958,6 +1007,54 @@ pub fn diagnostics_from_descriptors(
     });
 }
 
+/// Registry for function call linters that enables single AST traversal
+pub(crate) fn linters() -> Vec<&'static dyn FunctionCallLinter> {
+    let mut linters: Vec<&'static dyn FunctionCallLinter> = vec![&sets_version_2::LINTER];
+    // @fb-only
+    linters
+}
+
+fn diagnostics_from_linters(
+    res: &mut Vec<Diagnostic>,
+    sema: &Semantic,
+    file_id: FileId,
+    config: &DiagnosticsConfig,
+    linters: Vec<&'static dyn FunctionCallLinter>,
+) {
+    let is_generated = sema.db.is_generated(file_id);
+    let is_test = sema
+        .db
+        .is_test_suite_or_test_helper(file_id)
+        .unwrap_or(false);
+
+    let mut specs = Vec::new();
+    for linter in linters {
+        let conditions = DiagnosticConditions {
+            experimental: linter.is_experimental(),
+            include_generated: linter.should_process_generated_files(),
+            include_tests: linter.should_process_test_files(),
+            default_disabled: !linter.is_enabled(),
+        };
+        if conditions.enabled(config, is_generated, is_test) {
+            let diagnostic_template = DiagnosticTemplate {
+                code: linter.id(),
+                message: linter.description(),
+                severity: linter.severity(),
+                with_ignore_fix: linter.can_be_suppressed(),
+                use_range: UseRange::NameOnly,
+            };
+            let spec = vec![FunctionCallDiagnostic {
+                diagnostic_template,
+                matches: linter.matches_functions(),
+            }];
+            specs.extend(spec);
+        }
+    }
+    if !specs.is_empty() {
+        check_used_functions(sema, file_id, &specs, res);
+    }
+}
+
 fn label_syntax_errors(
     source_file: &SourceFile,
     diagnostics: impl Iterator<Item = Diagnostic>,
diff --git a/crates/ide/src/diagnostics/sets_version_2.rs b/crates/ide/src/diagnostics/sets_version_2.rs
index ef84c8b696..6b6b8fa159 100644
--- a/crates/ide/src/diagnostics/sets_version_2.rs
+++ b/crates/ide/src/diagnostics/sets_version_2.rs
@@ -10,50 +10,37 @@
 
 use lazy_static::lazy_static;
 
-use super::DiagnosticConditions;
-use super::DiagnosticDescriptor;
-use super::helpers::DiagnosticTemplate;
-use super::helpers::check_used_functions;
 use crate::codemod_helpers::FunctionMatch;
-use crate::codemod_helpers::UseRange;
 use crate::diagnostics::DiagnosticCode;
-use crate::diagnostics::Severity;
-use crate::diagnostics::helpers::FunctionCallDiagnostic;
+use crate::diagnostics::FunctionCallLinter;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: false,
-        include_tests: false,
-        default_disabled: false,
-    },
-    checker: &|diags, sema, file_id, _ext| {
-        check_used_functions(sema, file_id, &USED_FUNCTIONS, diags);
-    },
-};
+pub(crate) struct SetsVersion2Linter;
 
-lazy_static! {
-    static ref USED_FUNCTIONS: Vec<FunctionCallDiagnostic> = make_static_used_functions();
+impl FunctionCallLinter for SetsVersion2Linter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::SetsVersion2
+    }
+    fn description(&self) -> String {
+        "Prefer `[{version, 2}]` when constructing a set.".to_string()
+    }
+    fn should_process_test_files(&self) -> bool {
+        false
+    }
+    fn matches_functions(&self) -> Vec<FunctionMatch> {
+        lazy_static! {
+            static ref MATCHES: Vec<FunctionMatch> = vec![
+                FunctionMatch::mfas("sets", "new", vec![0]),
+                FunctionMatch::mfas("sets", "from_list", vec![1]),
+            ]
+            .into_iter()
+            .flatten()
+            .collect();
+        }
+        MATCHES.clone()
+    }
 }
 
-fn make_static_used_functions() -> Vec<FunctionCallDiagnostic> {
-    vec![FunctionCallDiagnostic {
-        diagnostic_template: DiagnosticTemplate {
-            code: DiagnosticCode::SetsVersion2,
-            message: "Prefer `[{version, 2}]` when constructing a set.".to_string(),
-            severity: Severity::Warning,
-            with_ignore_fix: true,
-            use_range: UseRange::NameOnly,
-        },
-        matches: vec![
-            FunctionMatch::mfas("sets", "new", vec![0]),
-            FunctionMatch::mfas("sets", "from_list", vec![1]),
-        ]
-        .into_iter()
-        .flatten()
-        .collect(),
-    }]
-}
+pub static LINTER: SetsVersion2Linter = SetsVersion2Linter;
 
 #[cfg(test)]
 mod tests {

From 91079b1b33de08a97be99bd1318bdd28a4050545 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 18 Aug 2025 03:02:58 -0700
Subject: [PATCH 040/394] Introduce lazy_function_matches macro to avoid
 duplication

Summary:
# Context
Diagnostics are calculated for every `file_id` (i.e. module) in the system, causing multiple calls to extract the function matches. To avoid the overhead, the `lazy_static` macro is usually used.
# Problem
The code required to specify matches is quite verbose.
# Solution
Create a helper macro that minimizes the amount of code written by the lint author.

Note: ideally, we'd get rid of the multiple calls in the first place. That could be done as a next step.

Reviewed By: TD5

Differential Revision: D80342732

fbshipit-source-id: 4cd2f8635b12e083feb37c369f0703cace9b7c56
---
 crates/ide/src/diagnostics.rs                | 17 +++++++++++++++++
 crates/ide/src/diagnostics/sets_version_2.rs | 17 +++++------------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 2b01f97955..a2f0324d3f 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -148,6 +148,23 @@ pub use replace_in_spec::TypeReplacement;
 
 use self::eqwalizer_assists::add_eqwalizer_assists;
 
+/// Macro to create lazily-evaluated function matches for linters
+/// This centralizes the lazy_static logic to avoid repetition in every linter
+#[macro_export]
+macro_rules! lazy_function_matches {
+    ($($matches:expr),* $(,)?) => {
+        {
+            lazy_static::lazy_static! {
+                static ref MATCHES: Vec<$crate::FunctionMatch> = vec![$($matches),*]
+                    .into_iter()
+                    .flatten()
+                    .collect();
+            }
+            MATCHES.clone()
+        }
+    };
+}
+
 pub const DIAGNOSTIC_WHOLE_FILE_RANGE: TextRange = TextRange::empty(TextSize::new(0));
 
 /// A diagnostic may have a tag, which the client is allowed to use
diff --git a/crates/ide/src/diagnostics/sets_version_2.rs b/crates/ide/src/diagnostics/sets_version_2.rs
index 6b6b8fa159..a697a485f0 100644
--- a/crates/ide/src/diagnostics/sets_version_2.rs
+++ b/crates/ide/src/diagnostics/sets_version_2.rs
@@ -8,11 +8,10 @@
  * above-listed licenses.
  */
 
-use lazy_static::lazy_static;
-
 use crate::codemod_helpers::FunctionMatch;
 use crate::diagnostics::DiagnosticCode;
 use crate::diagnostics::FunctionCallLinter;
+use crate::lazy_function_matches;
 
 pub(crate) struct SetsVersion2Linter;
 
@@ -27,16 +26,10 @@ impl FunctionCallLinter for SetsVersion2Linter {
         false
     }
     fn matches_functions(&self) -> Vec<FunctionMatch> {
-        lazy_static! {
-            static ref MATCHES: Vec<FunctionMatch> = vec![
-                FunctionMatch::mfas("sets", "new", vec![0]),
-                FunctionMatch::mfas("sets", "from_list", vec![1]),
-            ]
-            .into_iter()
-            .flatten()
-            .collect();
-        }
-        MATCHES.clone()
+        lazy_function_matches![
+            FunctionMatch::mfas("sets", "new", vec![0]),
+            FunctionMatch::mfas("sets", "from_list", vec![1]),
+        ]
     }
 }
 

From 11b9e643f19cf39e25e906f19c462e84504526c0 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 18 Aug 2025 03:55:13 -0700
Subject: [PATCH 041/394] Convert the no_garbage_collect to use the
 FunctionCallLinter trait

Summary: Convert the `no_garbage_collect` linter to use the new trait, to showcase the amount of boilerplate removed.

Reviewed By: TD5

Differential Revision: D80344745

fbshipit-source-id: a8f42a2c844ba65d52e8ac89fcdd69f3172342d5
---
 crates/ide/src/diagnostics.rs                 |  4 +-
 .../ide/src/diagnostics/no_garbage_collect.rs | 78 ++++---------------
 2 files changed, 18 insertions(+), 64 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index a2f0324d3f..5bdc4f527f 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -982,7 +982,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &debugging_function::DESCRIPTOR,
         &duplicate_module::DESCRIPTOR,
         &undocumented_module::DESCRIPTOR,
-        &no_garbage_collect::DESCRIPTOR,
         &no_dialyzer_attribute::DESCRIPTOR,
         &no_size::DESCRIPTOR,
         &binary_string_to_sigil::DESCRIPTOR,
@@ -1026,7 +1025,8 @@ pub fn diagnostics_from_descriptors(
 
 /// Registry for function call linters that enables single AST traversal
 pub(crate) fn linters() -> Vec<&'static dyn FunctionCallLinter> {
-    let mut linters: Vec<&'static dyn FunctionCallLinter> = vec![&sets_version_2::LINTER];
+    let mut linters: Vec<&'static dyn FunctionCallLinter> =
+        vec![&sets_version_2::LINTER, &no_garbage_collect::LINTER];
     // @fb-only
     linters
 }
diff --git a/crates/ide/src/diagnostics/no_garbage_collect.rs b/crates/ide/src/diagnostics/no_garbage_collect.rs
index 8a3e672439..0507e267a3 100644
--- a/crates/ide/src/diagnostics/no_garbage_collect.rs
+++ b/crates/ide/src/diagnostics/no_garbage_collect.rs
@@ -8,75 +8,29 @@
  * above-listed licenses.
  */
 
-use elp_ide_db::elp_base_db::FileId;
-use hir::FunctionDef;
-use hir::Semantic;
-use lazy_static::lazy_static;
-
 use crate::FunctionMatch;
-use crate::codemod_helpers::CheckCallCtx;
-use crate::codemod_helpers::MatchCtx;
-use crate::codemod_helpers::find_call_in_function;
-use crate::diagnostics::Diagnostic;
 use crate::diagnostics::DiagnosticCode;
-use crate::diagnostics::DiagnosticConditions;
-use crate::diagnostics::DiagnosticDescriptor;
-use crate::diagnostics::Severity;
+use crate::diagnostics::FunctionCallLinter;
+use crate::lazy_function_matches;
 
-const DIAGNOSTIC_CODE: DiagnosticCode = DiagnosticCode::NoGarbageCollect;
-const DIAGNOSTIC_MESSAGE: &str = "Avoid forcing garbage collection.";
-const DIAGNOSTIC_SEVERITY: Severity = Severity::Warning;
+pub(crate) struct NoGarbageCollectLinter;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: false,
-        include_tests: false,
-        default_disabled: false,
-    },
-    checker: &|diags, sema, file_id, _ext| {
-        no_garbage_collect(diags, sema, file_id);
-    },
-};
-
-fn no_garbage_collect(diagnostics: &mut Vec<Diagnostic>, sema: &Semantic, file_id: FileId) {
-    lazy_static! {
-        static ref BAD_CALLS: Vec<FunctionMatch> =
-            vec![FunctionMatch::mf("erlang", "garbage_collect")];
-        static ref BAD_CALLS_MFAS: Vec<(&'static FunctionMatch, ())> = BAD_CALLS
-            .iter()
-            .map(|matcher| (matcher, ()))
-            .collect::<Vec<_>>();
+impl FunctionCallLinter for NoGarbageCollectLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::NoGarbageCollect
+    }
+    fn description(&self) -> String {
+        "Avoid forcing garbage collection.".to_string()
+    }
+    fn should_process_test_files(&self) -> bool {
+        false
+    }
+    fn matches_functions(&self) -> Vec<FunctionMatch> {
+        lazy_function_matches![vec![FunctionMatch::mf("erlang", "garbage_collect")]]
     }
-
-    sema.def_map_local(file_id)
-        .get_functions()
-        .for_each(|(_arity, def)| {
-            check_function(diagnostics, sema, def, &BAD_CALLS_MFAS);
-        });
 }
 
-fn check_function(
-    diags: &mut Vec<Diagnostic>,
-    sema: &Semantic,
-    def: &FunctionDef,
-    mfas: &[(&FunctionMatch, ())],
-) {
-    find_call_in_function(
-        diags,
-        sema,
-        def,
-        mfas,
-        &move |CheckCallCtx { .. }: CheckCallCtx<'_, ()>| Some(()),
-        &move |ctx @ MatchCtx { .. }| {
-            let range = ctx.range_mf_or_macro();
-            let diagnostic = Diagnostic::new(DIAGNOSTIC_CODE, DIAGNOSTIC_MESSAGE, range.range)
-                .with_ignore_fix(sema, def.file.file_id)
-                .with_severity(DIAGNOSTIC_SEVERITY);
-            Some(diagnostic)
-        },
-    );
-}
+pub static LINTER: NoGarbageCollectLinter = NoGarbageCollectLinter;
 
 #[cfg(test)]
 mod tests {

From 7d3938329cf1b69c83e0013ae9d152bf1ac960b2 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 18 Aug 2025 05:20:54 -0700
Subject: [PATCH 042/394] Convert the no_size linter to use the
 FunctionCallLinter trait

Summary: Convert the `no_size` linter to use the new trait, to showcase the amount of boilerplate removed.

Reviewed By: TD5

Differential Revision: D80346647

fbshipit-source-id: 201901a737a16740c0a2c3504e65a2cb84b2a1c6
---
 crates/ide/src/diagnostics.rs         |  8 ++--
 crates/ide/src/diagnostics/no_size.rs | 53 +++++++++------------------
 2 files changed, 22 insertions(+), 39 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 5bdc4f527f..873a7a3e82 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -983,7 +983,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &duplicate_module::DESCRIPTOR,
         &undocumented_module::DESCRIPTOR,
         &no_dialyzer_attribute::DESCRIPTOR,
-        &no_size::DESCRIPTOR,
         &binary_string_to_sigil::DESCRIPTOR,
         &no_catch::DESCRIPTOR,
         &no_error_logger::DESCRIPTOR,
@@ -1025,8 +1024,11 @@ pub fn diagnostics_from_descriptors(
 
 /// Registry for function call linters that enables single AST traversal
 pub(crate) fn linters() -> Vec<&'static dyn FunctionCallLinter> {
-    let mut linters: Vec<&'static dyn FunctionCallLinter> =
-        vec![&sets_version_2::LINTER, &no_garbage_collect::LINTER];
+    let mut linters: Vec<&'static dyn FunctionCallLinter> = vec![
+        &sets_version_2::LINTER,
+        &no_garbage_collect::LINTER,
+        &no_size::LINTER,
+    ];
     // @fb-only
     linters
 }
diff --git a/crates/ide/src/diagnostics/no_size.rs b/crates/ide/src/diagnostics/no_size.rs
index fe3f694b5f..5d347d7f1c 100644
--- a/crates/ide/src/diagnostics/no_size.rs
+++ b/crates/ide/src/diagnostics/no_size.rs
@@ -8,48 +8,29 @@
  * above-listed licenses.
  */
 
-use lazy_static::lazy_static;
-
-use super::DiagnosticConditions;
-use super::DiagnosticDescriptor;
-use super::helpers::DiagnosticTemplate;
-use super::helpers::check_used_functions;
 use crate::codemod_helpers::FunctionMatch;
-use crate::codemod_helpers::UseRange;
 use crate::diagnostics::DiagnosticCode;
-use crate::diagnostics::Severity;
-use crate::diagnostics::helpers::FunctionCallDiagnostic;
+use crate::diagnostics::FunctionCallLinter;
+use crate::lazy_function_matches;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: false,
-        include_tests: false,
-        default_disabled: false,
-    },
-    checker: &|diags, sema, file_id, _ext| {
-        check_used_functions(sema, file_id, &USED_FUNCTIONS, diags);
-    },
-};
+pub(crate) struct NoSizeLinter;
 
-lazy_static! {
-    static ref USED_FUNCTIONS: Vec<FunctionCallDiagnostic> = make_static_used_functions();
+impl FunctionCallLinter for NoSizeLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::NoSize
+    }
+    fn description(&self) -> String {
+        "Avoid using the `size/1` BIF.".to_string()
+    }
+    fn should_process_test_files(&self) -> bool {
+        false
+    }
+    fn matches_functions(&self) -> Vec<FunctionMatch> {
+        lazy_function_matches![vec![FunctionMatch::mfa("erlang", "size", 1)]]
+    }
 }
 
-fn make_static_used_functions() -> Vec<FunctionCallDiagnostic> {
-    vec![FunctionCallDiagnostic {
-        diagnostic_template: DiagnosticTemplate {
-            code: DiagnosticCode::NoSize,
-            message: "Avoid using the `size/1` BIF.".to_string(),
-            severity: Severity::Warning,
-            with_ignore_fix: true,
-            use_range: UseRange::NameOnly,
-        },
-        matches: vec![FunctionMatch::mfa("erlang", "size", 1)]
-            .into_iter()
-            .collect(),
-    }]
-}
+pub static LINTER: NoSizeLinter = NoSizeLinter;
 
 #[cfg(test)]
 mod tests {

From 7ac2ac08e58dc2d485506e3505ddf2ad18a52795 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 18 Aug 2025 05:20:54 -0700
Subject: [PATCH 043/394] Convert the no_error_logger linter to use the
 FunctionCallLinter trait

Summary: Convert the `no_error_logger` linter to use the new trait, to showcase the amount of boilerplate removed.

Reviewed By: TD5

Differential Revision: D80347608

fbshipit-source-id: 990ec52b486d2d88b98f81878a70af7eca43f970
---
 crates/ide/src/diagnostics.rs                 |  2 +-
 crates/ide/src/diagnostics/no_error_logger.rs | 49 ++++++-------------
 2 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 873a7a3e82..bfca10f2ea 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -985,7 +985,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &no_dialyzer_attribute::DESCRIPTOR,
         &binary_string_to_sigil::DESCRIPTOR,
         &no_catch::DESCRIPTOR,
-        &no_error_logger::DESCRIPTOR,
         &no_nowarn_suppressions::DESCRIPTOR,
     ]
 }
@@ -1028,6 +1027,7 @@ pub(crate) fn linters() -> Vec<&'static dyn FunctionCallLinter> {
         &sets_version_2::LINTER,
         &no_garbage_collect::LINTER,
         &no_size::LINTER,
+        &no_error_logger::LINTER,
     ];
     // @fb-only
     linters
diff --git a/crates/ide/src/diagnostics/no_error_logger.rs b/crates/ide/src/diagnostics/no_error_logger.rs
index 199c01bafb..c3e5475ba8 100644
--- a/crates/ide/src/diagnostics/no_error_logger.rs
+++ b/crates/ide/src/diagnostics/no_error_logger.rs
@@ -8,46 +8,29 @@
  * above-listed licenses.
  */
 
-use lazy_static::lazy_static;
-
 use crate::codemod_helpers::FunctionMatch;
-use crate::codemod_helpers::UseRange;
 use crate::diagnostics::DiagnosticCode;
-use crate::diagnostics::DiagnosticConditions;
-use crate::diagnostics::DiagnosticDescriptor;
+use crate::diagnostics::FunctionCallLinter;
 use crate::diagnostics::Severity;
-use crate::diagnostics::helpers::DiagnosticTemplate;
-use crate::diagnostics::helpers::FunctionCallDiagnostic;
-use crate::diagnostics::helpers::check_used_functions;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: false,
-        include_tests: true,
-        default_disabled: false,
-    },
-    checker: &|diags, sema, file_id, _ext| {
-        check_used_functions(sema, file_id, &USED_FUNCTIONS, diags);
-    },
-};
+pub(crate) struct NoErrorLoggerLinter;
 
-lazy_static! {
-    static ref USED_FUNCTIONS: Vec<FunctionCallDiagnostic> = make_static_used_functions();
+impl FunctionCallLinter for NoErrorLoggerLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::NoErrorLogger
+    }
+    fn description(&self) -> String {
+        "The `error_logger` module is deprecated.".to_string()
+    }
+    fn severity(&self) -> Severity {
+        Severity::Error
+    }
+    fn matches_functions(&self) -> Vec<FunctionMatch> {
+        crate::lazy_function_matches![vec![FunctionMatch::m("error_logger")]]
+    }
 }
 
-fn make_static_used_functions() -> Vec<FunctionCallDiagnostic> {
-    vec![FunctionCallDiagnostic {
-        diagnostic_template: DiagnosticTemplate {
-            code: DiagnosticCode::NoErrorLogger,
-            message: "The `error_logger` module is deprecated.".to_string(),
-            severity: Severity::Error,
-            with_ignore_fix: true,
-            use_range: UseRange::NameOnly,
-        },
-        matches: vec![FunctionMatch::m("error_logger")],
-    }]
-}
+pub static LINTER: NoErrorLoggerLinter = NoErrorLoggerLinter;
 
 #[cfg(test)]
 mod tests {

From c9158551233a10b6cd5c71f09e4553d941d47f2a Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 18 Aug 2025 05:20:54 -0700
Subject: [PATCH 044/394] Convert the no_eval linter to use the
 FunctionCallLinter trait

Summary:
Convert the `no_eval` linter to use the new trait, to remove duplication.
The linter had some custom  filtering logic, so extend the trait to allow an optional `should_process_file_id` callback.

Reviewed By: TD5

Differential Revision: D80443713

fbshipit-source-id: 1e971e1e6de1215a1771542a42b829c58ccb7279
---
 crates/ide/src/diagnostics.rs | 43 ++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index bfca10f2ea..9e2ec41f32 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -527,6 +527,11 @@ pub(crate) trait FunctionCallLinter {
         true
     }
 
+    // Specify if the linter should process the given file id.
+    fn should_process_file_id(&self, _sema: &Semantic, _file_id: FileId) -> bool {
+        true
+    }
+
     // Specify the list of functions the linter should emit issues for
     fn matches_functions(&self) -> Vec<FunctionMatch> {
         vec![]
@@ -1048,25 +1053,27 @@ fn diagnostics_from_linters(
 
     let mut specs = Vec::new();
     for linter in linters {
-        let conditions = DiagnosticConditions {
-            experimental: linter.is_experimental(),
-            include_generated: linter.should_process_generated_files(),
-            include_tests: linter.should_process_test_files(),
-            default_disabled: !linter.is_enabled(),
-        };
-        if conditions.enabled(config, is_generated, is_test) {
-            let diagnostic_template = DiagnosticTemplate {
-                code: linter.id(),
-                message: linter.description(),
-                severity: linter.severity(),
-                with_ignore_fix: linter.can_be_suppressed(),
-                use_range: UseRange::NameOnly,
+        if linter.should_process_file_id(sema, file_id) {
+            let conditions = DiagnosticConditions {
+                experimental: linter.is_experimental(),
+                include_generated: linter.should_process_generated_files(),
+                include_tests: linter.should_process_test_files(),
+                default_disabled: !linter.is_enabled(),
             };
-            let spec = vec![FunctionCallDiagnostic {
-                diagnostic_template,
-                matches: linter.matches_functions(),
-            }];
-            specs.extend(spec);
+            if conditions.enabled(config, is_generated, is_test) {
+                let diagnostic_template = DiagnosticTemplate {
+                    code: linter.id(),
+                    message: linter.description(),
+                    severity: linter.severity(),
+                    with_ignore_fix: linter.can_be_suppressed(),
+                    use_range: UseRange::NameOnly,
+                };
+                let spec = vec![FunctionCallDiagnostic {
+                    diagnostic_template,
+                    matches: linter.matches_functions(),
+                }];
+                specs.extend(spec);
+            }
         }
     }
     if !specs.is_empty() {

From 7ad39ba2528c89b238be4a62126b0754b95c8af9 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 18 Aug 2025 23:34:21 -0700
Subject: [PATCH 045/394] Split FunctionCallLinter into a generic and a
 specific part

Summary: In preparation for a `SsrLinter` trait, split the `FunctionCallLinter` into a generic and a specific part, so that the generic part can be used for `SsrLinter`.

Reviewed By: TD5

Differential Revision: D80451562

fbshipit-source-id: 916026c4955ef78d466a568ae9ce51d886c50534
---
 crates/ide/src/diagnostics.rs                    | 7 +++++--
 crates/ide/src/diagnostics/no_error_logger.rs    | 6 +++++-
 crates/ide/src/diagnostics/no_garbage_collect.rs | 6 +++++-
 crates/ide/src/diagnostics/no_size.rs            | 6 +++++-
 crates/ide/src/diagnostics/sets_version_2.rs     | 6 +++++-
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 9e2ec41f32..0f6a36d51b 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -489,8 +489,8 @@ impl<F> AdhocSemanticDiagnostics for F where
 {
 }
 
-// A trait that simplifies writing linters matching function calls
-pub(crate) trait FunctionCallLinter {
+// A base trait for linters
+pub(crate) trait Linter {
     // A unique identifier for the linter.
     fn id(&self) -> DiagnosticCode;
 
@@ -531,7 +531,10 @@ pub(crate) trait FunctionCallLinter {
     fn should_process_file_id(&self, _sema: &Semantic, _file_id: FileId) -> bool {
         true
     }
+}
 
+// A trait that simplifies writing linters matching function calls
+pub(crate) trait FunctionCallLinter: Linter {
     // Specify the list of functions the linter should emit issues for
     fn matches_functions(&self) -> Vec<FunctionMatch> {
         vec![]
diff --git a/crates/ide/src/diagnostics/no_error_logger.rs b/crates/ide/src/diagnostics/no_error_logger.rs
index c3e5475ba8..c0f348c387 100644
--- a/crates/ide/src/diagnostics/no_error_logger.rs
+++ b/crates/ide/src/diagnostics/no_error_logger.rs
@@ -11,11 +11,12 @@
 use crate::codemod_helpers::FunctionMatch;
 use crate::diagnostics::DiagnosticCode;
 use crate::diagnostics::FunctionCallLinter;
+use crate::diagnostics::Linter;
 use crate::diagnostics::Severity;
 
 pub(crate) struct NoErrorLoggerLinter;
 
-impl FunctionCallLinter for NoErrorLoggerLinter {
+impl Linter for NoErrorLoggerLinter {
     fn id(&self) -> DiagnosticCode {
         DiagnosticCode::NoErrorLogger
     }
@@ -25,6 +26,9 @@ impl FunctionCallLinter for NoErrorLoggerLinter {
     fn severity(&self) -> Severity {
         Severity::Error
     }
+}
+
+impl FunctionCallLinter for NoErrorLoggerLinter {
     fn matches_functions(&self) -> Vec<FunctionMatch> {
         crate::lazy_function_matches![vec![FunctionMatch::m("error_logger")]]
     }
diff --git a/crates/ide/src/diagnostics/no_garbage_collect.rs b/crates/ide/src/diagnostics/no_garbage_collect.rs
index 0507e267a3..f9eed8e6d6 100644
--- a/crates/ide/src/diagnostics/no_garbage_collect.rs
+++ b/crates/ide/src/diagnostics/no_garbage_collect.rs
@@ -11,11 +11,12 @@
 use crate::FunctionMatch;
 use crate::diagnostics::DiagnosticCode;
 use crate::diagnostics::FunctionCallLinter;
+use crate::diagnostics::Linter;
 use crate::lazy_function_matches;
 
 pub(crate) struct NoGarbageCollectLinter;
 
-impl FunctionCallLinter for NoGarbageCollectLinter {
+impl Linter for NoGarbageCollectLinter {
     fn id(&self) -> DiagnosticCode {
         DiagnosticCode::NoGarbageCollect
     }
@@ -25,6 +26,9 @@ impl FunctionCallLinter for NoGarbageCollectLinter {
     fn should_process_test_files(&self) -> bool {
         false
     }
+}
+
+impl FunctionCallLinter for NoGarbageCollectLinter {
     fn matches_functions(&self) -> Vec<FunctionMatch> {
         lazy_function_matches![vec![FunctionMatch::mf("erlang", "garbage_collect")]]
     }
diff --git a/crates/ide/src/diagnostics/no_size.rs b/crates/ide/src/diagnostics/no_size.rs
index 5d347d7f1c..c89d8f3404 100644
--- a/crates/ide/src/diagnostics/no_size.rs
+++ b/crates/ide/src/diagnostics/no_size.rs
@@ -11,11 +11,12 @@
 use crate::codemod_helpers::FunctionMatch;
 use crate::diagnostics::DiagnosticCode;
 use crate::diagnostics::FunctionCallLinter;
+use crate::diagnostics::Linter;
 use crate::lazy_function_matches;
 
 pub(crate) struct NoSizeLinter;
 
-impl FunctionCallLinter for NoSizeLinter {
+impl Linter for NoSizeLinter {
     fn id(&self) -> DiagnosticCode {
         DiagnosticCode::NoSize
     }
@@ -25,6 +26,9 @@ impl FunctionCallLinter for NoSizeLinter {
     fn should_process_test_files(&self) -> bool {
         false
     }
+}
+
+impl FunctionCallLinter for NoSizeLinter {
     fn matches_functions(&self) -> Vec<FunctionMatch> {
         lazy_function_matches![vec![FunctionMatch::mfa("erlang", "size", 1)]]
     }
diff --git a/crates/ide/src/diagnostics/sets_version_2.rs b/crates/ide/src/diagnostics/sets_version_2.rs
index a697a485f0..ccbd95db9e 100644
--- a/crates/ide/src/diagnostics/sets_version_2.rs
+++ b/crates/ide/src/diagnostics/sets_version_2.rs
@@ -11,11 +11,12 @@
 use crate::codemod_helpers::FunctionMatch;
 use crate::diagnostics::DiagnosticCode;
 use crate::diagnostics::FunctionCallLinter;
+use crate::diagnostics::Linter;
 use crate::lazy_function_matches;
 
 pub(crate) struct SetsVersion2Linter;
 
-impl FunctionCallLinter for SetsVersion2Linter {
+impl Linter for SetsVersion2Linter {
     fn id(&self) -> DiagnosticCode {
         DiagnosticCode::SetsVersion2
     }
@@ -25,6 +26,9 @@ impl FunctionCallLinter for SetsVersion2Linter {
     fn should_process_test_files(&self) -> bool {
         false
     }
+}
+
+impl FunctionCallLinter for SetsVersion2Linter {
     fn matches_functions(&self) -> Vec<FunctionMatch> {
         lazy_function_matches![
             FunctionMatch::mfas("sets", "new", vec![0]),

From b45e1748a22922e77c1bb80c2b1e7c2f36536e05 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 18 Aug 2025 23:34:21 -0700
Subject: [PATCH 046/394] Use more specific names to indicate function call
 linters

Summary: In preparation for introducing a new category of SSR-based linters.

Reviewed By: TD5

Differential Revision: D80462418

fbshipit-source-id: f86fcdc6e39a27f5b5175db6047ab4e511fd27d1
---
 crates/ide/src/diagnostics.rs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 0f6a36d51b..cf154788e0 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -915,7 +915,13 @@ pub fn native_diagnostics(
             config,
             &diagnostics_descriptors(),
         );
-        diagnostics_from_linters(&mut res, &sema, file_id, config, linters());
+        diagnostics_from_function_call_linters(
+            &mut res,
+            &sema,
+            file_id,
+            config,
+            function_call_linters(),
+        );
 
         let parse_diagnostics = parse.errors().iter().take(128).map(|err| {
             let (code, message) = match err {
@@ -1030,7 +1036,7 @@ pub fn diagnostics_from_descriptors(
 }
 
 /// Registry for function call linters that enables single AST traversal
-pub(crate) fn linters() -> Vec<&'static dyn FunctionCallLinter> {
+pub(crate) fn function_call_linters() -> Vec<&'static dyn FunctionCallLinter> {
     let mut linters: Vec<&'static dyn FunctionCallLinter> = vec![
         &sets_version_2::LINTER,
         &no_garbage_collect::LINTER,
@@ -1041,7 +1047,7 @@ pub(crate) fn linters() -> Vec<&'static dyn FunctionCallLinter> {
     linters
 }
 
-fn diagnostics_from_linters(
+fn diagnostics_from_function_call_linters(
     res: &mut Vec<Diagnostic>,
     sema: &Semantic,
     file_id: FileId,

From 5c64a0d01d7c5b188d3a190816f51ceabf1570ed Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 19 Aug 2025 03:15:24 -0700
Subject: [PATCH 047/394] Introduce SsrPatternsLinter trait

Summary:
Similar to the `FunctionCallLinter` introduced in D80341881, this introduces a `SsrPatternsLinter` trait which abstracts away a lot of the implementation details for Ssr-based linters, allowing the ELP developer to focus on the more important callback functions.

We convert the `UnnecessaryFoldToBuildMap` linter to showcase how the linter can be used in practice.

In the process, fix a few minor bugs in the linter, which emerged from the conversion.

Reviewed By: TD5

Differential Revision: D80462420

fbshipit-source-id: c3d047ff6a020e17194f7a93a0df85775cda6260
---
 crates/ide/src/diagnostics.rs                 | 126 +++++++++-
 .../unnecessary_fold_to_build_map.rs          | 222 ++++++++----------
 2 files changed, 224 insertions(+), 124 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index cf154788e0..2410c317d5 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -43,6 +43,7 @@ use elp_ide_db::metadata::Kind;
 use elp_ide_db::metadata::Metadata;
 use elp_ide_db::metadata::Source;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_ssr::match_pattern_in_file_functions;
 use elp_syntax::NodeOrToken;
 use elp_syntax::Parse;
 use elp_syntax::SourceFile;
@@ -66,6 +67,9 @@ use fxhash::FxHashSet;
 use hir::InFile;
 use hir::Semantic;
 use hir::db::DefDatabase;
+use hir::fold::MacroStrategy;
+use hir::fold::ParenStrategy;
+use hir::fold::Strategy;
 use itertools::Itertools;
 use lazy_static::lazy_static;
 use regex::Regex;
@@ -541,6 +545,93 @@ pub(crate) trait FunctionCallLinter: Linter {
     }
 }
 
+/// A trait that simplifies writing linters using SSR patterns
+pub(crate) trait SsrPatternsLinter: Linter {
+    /// Associated type for the pattern enum - each linter defines its own
+    type Context: Clone + fmt::Debug + PartialEq;
+
+    /// Specify the SSR patterns to match
+    /// Use the `Context`` to distinguish between each variant
+    fn patterns(&self) -> Vec<(String, Self::Context)>;
+
+    /// Customize the description based on each matched pattern.
+    /// If implemented, it overrides the value of the `description()`.
+    fn pattern_description(&self, _context: &Self::Context) -> String {
+        self.description()
+    }
+
+    /// Check if a match is valid
+    fn is_match_valid(
+        &self,
+        _context: &Self::Context,
+        _matched: &elp_ide_ssr::Match,
+        _sema: &Semantic,
+        _file_id: FileId,
+    ) -> Option<bool> {
+        Some(true)
+    }
+
+    /// Calculate fixes for a specific match
+    fn fixes(
+        &self,
+        _context: &Self::Context,
+        _matched: &elp_ide_ssr::Match,
+        _sema: &Semantic,
+        _file_id: FileId,
+    ) -> Option<Vec<Assist>> {
+        None
+    }
+
+    /// Additional categories for each diagnostic produced.
+    /// See the `Category` type for details.
+    fn add_categories(&self, _context: &Self::Context) -> Vec<Category> {
+        vec![]
+    }
+
+    /// Specify how to treat macros and parentheses.
+    /// See the `Strategy` type for details.
+    fn strategy(&self) -> Strategy {
+        Strategy {
+            macros: MacroStrategy::Expand,
+            parens: ParenStrategy::InvisibleParens,
+        }
+    }
+}
+
+// Instances of the SsrCheckPatternsLinter trait can specify a custom `Context` type,
+// which is passed around in callbacks.\
+// To be able to keep a registry of all linters in the `ssr_linters` function,
+// we define a blanket implementation for all the methods using the `Context``,
+// to keep the code generic while allowing individual linters to specify their own context type.
+pub(crate) trait SsrCheckPatterns: Linter {
+    fn diagnostics(&self, sema: &Semantic, file_id: FileId) -> Vec<Diagnostic>;
+}
+
+impl<T: SsrPatternsLinter> SsrCheckPatterns for T {
+    fn diagnostics(&self, sema: &Semantic, file_id: FileId) -> Vec<Diagnostic> {
+        let mut res = Vec::new();
+        for (pattern, context) in self.patterns() {
+            let matches = match_pattern_in_file_functions(sema, self.strategy(), file_id, &pattern);
+            for matched in &matches.matches {
+                if Some(true) == self.is_match_valid(&context, matched, sema, file_id) {
+                    let message = self.pattern_description(&context);
+                    let fixes = self.fixes(&context, matched, sema, file_id);
+                    let categories = self.add_categories(&context);
+                    let mut d = Diagnostic::new(self.id(), message, matched.range.range)
+                        .with_fixes(fixes)
+                        .add_categories(categories)
+                        .with_severity(self.severity());
+                    if self.can_be_suppressed() {
+                        d = d.with_ignore_fix(sema, file_id);
+                    }
+                    res.push(d);
+                }
+            }
+        }
+        res
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct DiagnosticConditions {
     pub experimental: bool,
@@ -922,6 +1013,7 @@ pub fn native_diagnostics(
             config,
             function_call_linters(),
         );
+        diagnostics_from_ssr_linters(&mut res, &sema, file_id, config, ssr_linters());
 
         let parse_diagnostics = parse.errors().iter().take(128).map(|err| {
             let (code, message) = match err {
@@ -975,7 +1067,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &nonstandard_integer_formatting::DESCRIPTOR,
         &unnecessary_map_from_list_around_comprehension::DESCRIPTOR,
         &unnecessary_map_to_list_in_comprehension::DESCRIPTOR,
-        &unnecessary_fold_to_build_map::DESCRIPTOR,
         &map_find_to_syntax::DESCRIPTOR,
         &expression_can_be_simplified::DESCRIPTOR,
         &application_env::DESCRIPTOR,
@@ -1047,6 +1138,11 @@ pub(crate) fn function_call_linters() -> Vec<&'static dyn FunctionCallLinter> {
     linters
 }
 
+/// Registry for SSR-based linters
+pub(crate) fn ssr_linters() -> Vec<&'static dyn SsrCheckPatterns> {
+    vec![&unnecessary_fold_to_build_map::LINTER]
+}
+
 fn diagnostics_from_function_call_linters(
     res: &mut Vec<Diagnostic>,
     sema: &Semantic,
@@ -1090,6 +1186,34 @@ fn diagnostics_from_function_call_linters(
     }
 }
 
+fn diagnostics_from_ssr_linters(
+    res: &mut Vec<Diagnostic>,
+    sema: &Semantic,
+    file_id: FileId,
+    config: &DiagnosticsConfig,
+    linters: Vec<&'static dyn SsrCheckPatterns>,
+) {
+    let is_generated = sema.db.is_generated(file_id);
+    let is_test = sema
+        .db
+        .is_test_suite_or_test_helper(file_id)
+        .unwrap_or(false);
+
+    for linter in linters {
+        if linter.should_process_file_id(sema, file_id) {
+            let conditions = DiagnosticConditions {
+                experimental: linter.is_experimental(),
+                include_generated: linter.should_process_generated_files(),
+                include_tests: linter.should_process_test_files(),
+                default_disabled: !linter.is_enabled(),
+            };
+            if conditions.enabled(config, is_generated, is_test) {
+                res.extend(linter.diagnostics(sema, file_id));
+            }
+        }
+    }
+}
+
 fn label_syntax_errors(
     source_file: &SourceFile,
     diagnostics: impl Iterator<Item = Diagnostic>,
diff --git a/crates/ide/src/diagnostics/unnecessary_fold_to_build_map.rs b/crates/ide/src/diagnostics/unnecessary_fold_to_build_map.rs
index 9f13c33b60..b9ab3654e5 100644
--- a/crates/ide/src/diagnostics/unnecessary_fold_to_build_map.rs
+++ b/crates/ide/src/diagnostics/unnecessary_fold_to_build_map.rs
@@ -27,64 +27,113 @@ use elp_ide_ssr::Match;
 use elp_ide_ssr::PlaceholderMatch;
 use elp_ide_ssr::SubId;
 use elp_ide_ssr::is_placeholder_a_var_from_body;
-use elp_ide_ssr::match_pattern_in_file_functions;
 use hir::AnyExprId;
 use hir::Body;
 use hir::Expr;
 use hir::Semantic;
-use hir::fold::MacroStrategy;
-use hir::fold::ParenStrategy;
-use hir::fold::Strategy;
 
-use crate::diagnostics::Category;
-use crate::diagnostics::Diagnostic;
-use crate::diagnostics::DiagnosticConditions;
-use crate::diagnostics::DiagnosticDescriptor;
+use crate::Assist;
+use crate::diagnostics::Linter;
 use crate::diagnostics::Severity;
+use crate::diagnostics::SsrPatternsLinter;
 use crate::fix;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: false,
-        include_tests: true,
-        default_disabled: false,
-    },
-    checker: &|acc, sema, file_id, _ext| {
-        unnecessary_fold_to_build_map_from_list_ssr(acc, sema, file_id);
-        unnecessary_fold_to_build_map_from_keys_ssr(acc, sema, file_id);
-    },
-};
+pub(crate) struct UnnecessaryFoldToBuildMapLinter;
+
+impl Linter for UnnecessaryFoldToBuildMapLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::UnnecessaryFoldToBuildMapFromList
+    }
+
+    fn description(&self) -> String {
+        "Unnecessary explicit fold to construct map.".to_string()
+    }
+
+    fn severity(&self) -> Severity {
+        Severity::WeakWarning
+    }
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub(crate) enum PatternKind {
+    FromList,
+    FromKeys,
+}
+
+impl SsrPatternsLinter for UnnecessaryFoldToBuildMapLinter {
+    type Context = PatternKind;
+
+    fn patterns(&self) -> Vec<(String, Self::Context)> {
+        vec![
+            (
+                format!(
+                    "ssr: lists:foldl(fun({{{KEY_VAR},{VALUE_VAR}}}, {ACC_VAR}) -> {ACC_VAR}#{{{KEY_VAR} => {VALUE_VAR}}} end, #{{}}, {LIST_VAR})."
+                ),
+                PatternKind::FromList,
+            ),
+            (
+                format!(
+                    "ssr: lists:foldl(fun({KEY_VAR}, {ACC_VAR}) -> {ACC_VAR}#{{{KEY_VAR} => {VALUE_VAR}}} end, #{{}}, {LIST_VAR})."
+                ),
+                PatternKind::FromKeys,
+            ),
+        ]
+    }
+
+    fn pattern_description(&self, context: &Self::Context) -> String {
+        let origin = match context {
+            PatternKind::FromList => "list".to_string(),
+            PatternKind::FromKeys => "keys".to_string(),
+        };
+        format!("Unnecessary explicit fold to construct map from {origin}.")
+    }
+
+    fn is_match_valid(
+        &self,
+        context: &Self::Context,
+        matched: &elp_ide_ssr::Match,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<bool> {
+        if matched.range.file_id != file_id {
+            // We've somehow ended up with a match in a different file - this means we've
+            // accidentally expanded a macro from a different file, or some other complex case that
+            // gets hairy, so bail out.
+            return None;
+        }
+        if let Some(comments) = matched.comments(sema) {
+            // Avoid clobbering comments in the original source code
+            if !comments.is_empty() {
+                return None;
+            }
+        }
+        match context {
+            PatternKind::FromList => from_list_match_is_valid(sema, matched),
+            PatternKind::FromKeys => from_keys_match_is_valid(sema, matched),
+        }
+    }
+
+    fn fixes(
+        &self,
+        context: &Self::Context,
+        matched: &elp_ide_ssr::Match,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<Assist>> {
+        match context {
+            PatternKind::FromList => from_list_fixes(sema, file_id, matched),
+            PatternKind::FromKeys => from_keys_fixes(sema, file_id, matched),
+        }
+    }
+}
+
+pub(crate) static LINTER: UnnecessaryFoldToBuildMapLinter = UnnecessaryFoldToBuildMapLinter;
 
 static KEY_VAR: &str = "_@Key";
 static VALUE_VAR: &str = "_@Value";
 static ACC_VAR: &str = "_@Acc";
 static LIST_VAR: &str = "_@List";
 
-fn unnecessary_fold_to_build_map_from_list_ssr(
-    diags: &mut Vec<Diagnostic>,
-    sema: &Semantic,
-    file_id: FileId,
-) {
-    let matches = match_pattern_in_file_functions(
-        sema,
-        Strategy {
-            macros: MacroStrategy::Expand,
-            parens: ParenStrategy::InvisibleParens,
-        },
-        file_id,
-        format!("ssr: lists:foldl(fun({{{KEY_VAR},{VALUE_VAR}}}, {ACC_VAR}) -> {ACC_VAR}#{{{KEY_VAR} => {VALUE_VAR}}} end, #{{}}, {LIST_VAR}).").as_str(),
-    );
-
-    matches.matches.iter().for_each(|m| {
-        if let Some(true) = from_list_match_is_valid(sema, m) {
-            if let Some(diagnostic) = make_diagnostic_maps_from_list(sema, file_id, m) {
-                diags.push(diagnostic);
-            }
-        }
-    });
-}
-
 fn from_list_match_is_valid(sema: &Semantic, m: &Match) -> Option<bool> {
     let body_arc = m.matched_node_body.get_body(sema)?;
     let body = body_arc.as_ref();
@@ -101,30 +150,6 @@ fn from_list_match_is_valid(sema: &Semantic, m: &Match) -> Option<bool> {
     )
 }
 
-fn unnecessary_fold_to_build_map_from_keys_ssr(
-    diags: &mut Vec<Diagnostic>,
-    sema: &Semantic,
-    file_id: FileId,
-) {
-    let matches = match_pattern_in_file_functions(
-        sema,
-        Strategy {
-            macros: MacroStrategy::Expand,
-            parens: ParenStrategy::InvisibleParens,
-        },
-        file_id,
-        format!("ssr: lists:foldl(fun({KEY_VAR}, {ACC_VAR}) -> {ACC_VAR}#{{{KEY_VAR} => {VALUE_VAR}}} end, #{{}}, {LIST_VAR}).").as_str(),
-    );
-
-    matches.matches.iter().for_each(|m| {
-        if let Some(true) = from_keys_match_is_valid(sema, m) {
-            if let Some(diagnostic) = make_diagnostic_maps_from_keys(sema, file_id, m) {
-                diags.push(diagnostic);
-            }
-        }
-    });
-}
-
 fn from_keys_match_is_valid(sema: &Semantic, m: &Match) -> Option<bool> {
     let body_arc = m.matched_node_body.get_body(sema)?;
     let body = body_arc.as_ref();
@@ -172,21 +197,9 @@ fn is_pure_expr(body: &Body, expr: Expr) -> bool {
     }
 }
 
-fn make_diagnostic_maps_from_list(
-    sema: &Semantic,
-    original_file_id: FileId,
-    matched: &Match,
-) -> Option<Diagnostic> {
-    let file_id = matched.range.file_id;
-    if file_id != original_file_id {
-        // We've somehow ended up with a match in a different file - this means we've
-        // accidentally expanded a macro from a different file, or some other complex case that
-        // gets hairy, so bail out.
-        return None;
-    }
+fn from_list_fixes(sema: &Semantic, file_id: FileId, matched: &Match) -> Option<Vec<Assist>> {
     let unncessary_fold_range = matched.range.range;
     let list_arg = matched.placeholder_text(sema, LIST_VAR)?;
-    let message = "Unnecessary explicit fold to construct map from list.".to_string();
     let mut builder = SourceChangeBuilder::new(file_id);
     let efficient_last = format!("maps:from_list({list_arg})");
     builder.replace(unncessary_fold_range, efficient_last);
@@ -196,60 +209,23 @@ fn make_diagnostic_maps_from_list(
         builder.finish(),
         unncessary_fold_range,
     )];
-    Some(
-        Diagnostic::new(
-            DiagnosticCode::UnnecessaryFoldToBuildMapFromList,
-            message,
-            unncessary_fold_range,
-        )
-        .with_severity(Severity::WeakWarning)
-        .with_ignore_fix(sema, file_id)
-        .with_fixes(Some(fixes)),
-    )
+    Some(fixes)
 }
 
-fn make_diagnostic_maps_from_keys(
-    sema: &Semantic,
-    original_file_id: FileId,
-    matched: &Match,
-) -> Option<Diagnostic> {
-    if let Some(comments) = matched.comments(sema) {
-        // Avoid clobbering comments in the original source code
-        if !comments.is_empty() {
-            return None;
-        }
-    }
-    let file_id = matched.range.file_id;
-    if file_id != original_file_id {
-        // We've somehow ended up with a match in a different file - this means we've
-        // accidentally expanded a macro from a different file, or some other complex case that
-        // gets hairy, so bail out.
-        return None;
-    }
+fn from_keys_fixes(sema: &Semantic, file_id: FileId, matched: &Match) -> Option<Vec<Assist>> {
     let unncessary_fold_range = matched.range.range;
     let list_arg = matched.placeholder_text(sema, LIST_VAR)?;
     let value = matched.placeholder_text(sema, VALUE_VAR)?;
-    let message = "Unnecessary explicit fold to construct map from list.".to_string();
     let mut builder = SourceChangeBuilder::new(file_id);
     let efficient_last = format!("maps:from_keys({list_arg}, {value})");
     builder.replace(unncessary_fold_range, efficient_last);
     let fixes = vec![fix(
-        "unnecessary_fold_to_build_map_from_list",
+        "unnecessary_fold_to_build_map_from_keys",
         "Rewrite to use maps:from_keys/2",
         builder.finish(),
         unncessary_fold_range,
     )];
-    Some(
-        Diagnostic::new(
-            DiagnosticCode::UnnecessaryFoldToBuildMapFromList,
-            message,
-            unncessary_fold_range,
-        )
-        .with_severity(Severity::WeakWarning)
-        .with_ignore_fix(sema, file_id)
-        .with_fixes(Some(fixes))
-        .add_categories([Category::SimplificationRule]),
-    )
+    Some(fixes)
 }
 
 #[cfg(test)]
@@ -285,7 +261,7 @@ mod tests {
 
          % elp:ignore W0017 (undefined_function)
          fn(List) -> lists:foldl(fun(K, Acc) -> Acc#{K => []} end, #{}, List).
-         %%          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: Unnecessary explicit fold to construct map from list.
+         %%          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: Unnecessary explicit fold to construct map from keys.
             "#,
         )
     }

From 2b1ecb38579e16c52cb4722c1d446f6ef7ade49c Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 19 Aug 2025 03:15:24 -0700
Subject: [PATCH 048/394] Convert binary_string_to_sigil linter to use
 SsrPatternsLinter trait

Summary:
Convert the `binary_to_sigil` linter to use the new `SsrPatternsLinter` trait.
This makes the linter code a lot more readable, decoupling the generic logic from the specific parts.

Reviewed By: TD5

Differential Revision: D80518920

fbshipit-source-id: 420a9aa073a41c2767a8d8158fdfe9e31d59888e
---
 crates/ide/src/diagnostics.rs                 |   6 +-
 .../src/diagnostics/binary_string_to_sigil.rs | 138 +++++++++---------
 2 files changed, 76 insertions(+), 68 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 2410c317d5..8910fd188c 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1088,7 +1088,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &duplicate_module::DESCRIPTOR,
         &undocumented_module::DESCRIPTOR,
         &no_dialyzer_attribute::DESCRIPTOR,
-        &binary_string_to_sigil::DESCRIPTOR,
         &no_catch::DESCRIPTOR,
         &no_nowarn_suppressions::DESCRIPTOR,
     ]
@@ -1140,7 +1139,10 @@ pub(crate) fn function_call_linters() -> Vec<&'static dyn FunctionCallLinter> {
 
 /// Registry for SSR-based linters
 pub(crate) fn ssr_linters() -> Vec<&'static dyn SsrCheckPatterns> {
-    vec![&unnecessary_fold_to_build_map::LINTER]
+    vec![
+        &unnecessary_fold_to_build_map::LINTER,
+        &binary_string_to_sigil::LINTER,
+    ]
 }
 
 fn diagnostics_from_function_call_linters(
diff --git a/crates/ide/src/diagnostics/binary_string_to_sigil.rs b/crates/ide/src/diagnostics/binary_string_to_sigil.rs
index 7684ddcb56..d3b6581b05 100644
--- a/crates/ide/src/diagnostics/binary_string_to_sigil.rs
+++ b/crates/ide/src/diagnostics/binary_string_to_sigil.rs
@@ -12,93 +12,99 @@
 //!
 //! Warn on code of the form `<<"bar">>` and suggest `~"bar"` (Erlang sigil syntax)
 
+use elp_ide_assists::Assist;
 use elp_ide_db::DiagnosticCode;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChangeBuilder;
-use elp_ide_ssr::Match;
-use elp_ide_ssr::match_pattern_in_file_functions;
 use elp_project_model::otp;
 use hir::Semantic;
+use hir::Strategy;
 use hir::fold::MacroStrategy;
 use hir::fold::ParenStrategy;
-use hir::fold::Strategy;
 
-use crate::diagnostics::Diagnostic;
-use crate::diagnostics::DiagnosticConditions;
-use crate::diagnostics::DiagnosticDescriptor;
+use crate::diagnostics::Linter;
 use crate::diagnostics::Severity;
+use crate::diagnostics::SsrPatternsLinter;
 use crate::fix;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: false,
-        include_tests: true,
-        default_disabled: false,
-    },
-    checker: &|acc, sema, file_id, _ext| {
-        if otp::supports_eep66_sigils() {
-            binary_string_to_sigil_ssr(acc, sema, file_id);
+pub(crate) struct BinaryStringToSigilLinter;
+
+impl Linter for BinaryStringToSigilLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::BinaryStringToSigil
+    }
+
+    fn description(&self) -> String {
+        "Binary string can be written using sigil syntax.".to_string()
+    }
+
+    fn severity(&self) -> Severity {
+        Severity::WeakWarning
+    }
+
+    fn is_enabled(&self) -> bool {
+        otp::supports_eep66_sigils()
+    }
+}
+
+impl SsrPatternsLinter for BinaryStringToSigilLinter {
+    type Context = ();
+
+    fn patterns(&self) -> Vec<(String, Self::Context)> {
+        vec![(format!("ssr: <<{STRING_CONTENT_VAR}>>."), ())]
+    }
+
+    fn is_match_valid(
+        &self,
+        _context: &Self::Context,
+        matched: &elp_ide_ssr::Match,
+        sema: &Semantic,
+        _file_id: FileId,
+    ) -> Option<bool> {
+        let string_content_match_src = matched.placeholder_text(sema, STRING_CONTENT_VAR)?;
+        // Only process if the content is a string literal (starts and ends with quotes)
+        if !string_content_match_src.starts_with('"') || !string_content_match_src.ends_with('"') {
+            return None;
         }
-    },
-};
+        // Ignore multi-line binary strings
+        if string_content_match_src.contains('\n') {
+            return None;
+        }
+        Some(true)
+    }
 
-static STRING_CONTENT_VAR: &str = "_@StringContent";
+    fn fixes(
+        &self,
+        _context: &Self::Context,
+        matched: &elp_ide_ssr::Match,
+        sema: &Semantic,
+        _file_id: FileId,
+    ) -> Option<Vec<Assist>> {
+        let string_content_match_src = matched.placeholder_text(sema, STRING_CONTENT_VAR)?;
+        let mut builder = SourceChangeBuilder::new(matched.range.file_id);
+        let sigil_string = format!("~{string_content_match_src}");
+        let binary_string_range = matched.range.range;
+        builder.replace(binary_string_range, sigil_string);
+        let fixes = vec![fix(
+            "binary_string_to_sigil",
+            "Convert to sigil syntax",
+            builder.finish(),
+            binary_string_range,
+        )];
+        Some(fixes)
+    }
 
-fn binary_string_to_sigil_ssr(diags: &mut Vec<Diagnostic>, sema: &Semantic, file_id: FileId) {
-    let matches = match_pattern_in_file_functions(
-        sema,
+    fn strategy(&self) -> Strategy {
         Strategy {
             macros: MacroStrategy::DoNotExpand,
             parens: ParenStrategy::InvisibleParens,
-        },
-        file_id,
-        format!("ssr: <<{STRING_CONTENT_VAR}>>.").as_str(),
-    );
-    matches.matches.iter().for_each(|m| {
-        if let Some(diagnostic) = make_diagnostic(sema, m) {
-            diags.push(diagnostic);
         }
-    });
+    }
 }
 
-fn make_diagnostic(sema: &Semantic, matched: &Match) -> Option<Diagnostic> {
-    let file_id = matched.range.file_id;
-    let binary_string_range = matched.range.range;
-    let string_content_match_src = matched.placeholder_text(sema, STRING_CONTENT_VAR)?;
+pub(crate) static LINTER: BinaryStringToSigilLinter = BinaryStringToSigilLinter;
 
-    // Only process if the content is a string literal (starts and ends with quotes)
-    if !string_content_match_src.starts_with('"') || !string_content_match_src.ends_with('"') {
-        return None;
-    }
-
-    // Ignore multi-line binary strings
-    if string_content_match_src.contains('\n') {
-        return None;
-    }
-
-    let mut builder = SourceChangeBuilder::new(file_id);
-    let sigil_string = format!("~{string_content_match_src}");
-    builder.replace(binary_string_range, sigil_string);
-    let fixes = vec![fix(
-        "binary_string_to_sigil",
-        "Convert to sigil syntax",
-        builder.finish(),
-        binary_string_range,
-    )];
-
-    let message = "Binary string can be written using sigil syntax.".to_string();
-    Some(
-        Diagnostic::new(
-            DiagnosticCode::BinaryStringToSigil,
-            message,
-            binary_string_range,
-        )
-        .with_severity(Severity::WeakWarning)
-        .with_ignore_fix(sema, file_id)
-        .with_fixes(Some(fixes)),
-    )
-}
+static STRING_CONTENT_VAR: &str = "_@StringContent";
 
 #[cfg(test)]
 mod tests {

From 9a72d25f082001598f27818bd0145600c00d8b3a Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 19 Aug 2025 03:15:24 -0700
Subject: [PATCH 049/394] Convert unnecessary_map_to_list_in_comprehension
 linter to use the SsrPatternsLinter trait

Summary: Convert the `unnecessary_map_to_list_in_comprehension` linter to use the new trait.

Reviewed By: TD5

Differential Revision: D80521249

fbshipit-source-id: ed4323548de50d7fe2bcad53a168a8d6f7906182
---
 crates/ide/src/diagnostics.rs                 |   2 +-
 ...nnecessary_map_to_list_in_comprehension.rs | 164 +++++++++---------
 2 files changed, 79 insertions(+), 87 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 8910fd188c..5be0b80782 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1066,7 +1066,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &map_insertion_to_syntax::DESCRIPTOR,
         &nonstandard_integer_formatting::DESCRIPTOR,
         &unnecessary_map_from_list_around_comprehension::DESCRIPTOR,
-        &unnecessary_map_to_list_in_comprehension::DESCRIPTOR,
         &map_find_to_syntax::DESCRIPTOR,
         &expression_can_be_simplified::DESCRIPTOR,
         &application_env::DESCRIPTOR,
@@ -1142,6 +1141,7 @@ pub(crate) fn ssr_linters() -> Vec<&'static dyn SsrCheckPatterns> {
     vec![
         &unnecessary_fold_to_build_map::LINTER,
         &binary_string_to_sigil::LINTER,
+        &unnecessary_map_to_list_in_comprehension::LINTER,
     ]
 }
 
diff --git a/crates/ide/src/diagnostics/unnecessary_map_to_list_in_comprehension.rs b/crates/ide/src/diagnostics/unnecessary_map_to_list_in_comprehension.rs
index 1dff615cb6..70dd8c4b77 100644
--- a/crates/ide/src/diagnostics/unnecessary_map_to_list_in_comprehension.rs
+++ b/crates/ide/src/diagnostics/unnecessary_map_to_list_in_comprehension.rs
@@ -15,103 +15,95 @@
 use elp_ide_db::DiagnosticCode;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChangeBuilder;
-use elp_ide_ssr::Match;
-use elp_ide_ssr::match_pattern_in_file_functions;
 use hir::Semantic;
-use hir::fold::MacroStrategy;
-use hir::fold::ParenStrategy;
-use hir::fold::Strategy;
 
-use crate::diagnostics::Diagnostic;
-use crate::diagnostics::DiagnosticConditions;
-use crate::diagnostics::DiagnosticDescriptor;
+use crate::diagnostics::Linter;
 use crate::diagnostics::Severity;
+use crate::diagnostics::SsrPatternsLinter;
 use crate::fix;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: false,
-        include_tests: true,
-        default_disabled: false,
-    },
-    checker: &|acc, sema, file_id, _ext| {
-        unnecessary_map_to_list_in_comprehension_ssr(acc, sema, file_id);
-    },
-};
+pub(crate) struct UnnecessaryMapToListInComprehensionLinter;
+
+impl Linter for UnnecessaryMapToListInComprehensionLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::UnnecessaryMapToListInComprehension
+    }
+
+    fn description(&self) -> String {
+        "Unnecessary intermediate list allocated.".to_string()
+    }
+
+    fn severity(&self) -> Severity {
+        Severity::WeakWarning
+    }
+}
+
+impl SsrPatternsLinter for UnnecessaryMapToListInComprehensionLinter {
+    type Context = ();
+
+    fn patterns(&self) -> Vec<(String, Self::Context)> {
+        vec![(
+            format!("ssr: [{BODY_VAR} || {{{KEY_VAR}, {VALUE_VAR}}} <- maps:to_list({MAP_VAR})]."),
+            (),
+        )]
+    }
+
+    fn is_match_valid(
+        &self,
+        _context: &Self::Context,
+        matched: &elp_ide_ssr::Match,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<bool> {
+        if let Some(comments) = matched.comments(sema) {
+            // Avoid clobbering comments in the original source code
+            if !comments.is_empty() {
+                return None;
+            }
+        }
+        if matched.range.file_id != file_id {
+            // We've somehow ended up with a match in a different file - this means we've
+            // accidentally expanded a macro from a different file, or some other complex case that
+            // gets hairy, so bail out.
+            return None;
+        }
+        Some(true)
+    }
+
+    fn fixes(
+        &self,
+        _context: &Self::Context,
+        matched: &elp_ide_ssr::Match,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<elp_ide_assists::Assist>> {
+        let inefficient_comprehension_range = matched.range.range;
+        let body = matched.placeholder_text(sema, BODY_VAR)?;
+        let key = matched.placeholder_text(sema, KEY_VAR)?;
+        let value = matched.placeholder_text(sema, VALUE_VAR)?;
+        let map = matched.placeholder_text(sema, MAP_VAR)?;
+
+        let mut builder = SourceChangeBuilder::new(file_id);
+        let direct_comprehension = format!("[{body} || {key} := {value} <- {map}]");
+        builder.replace(inefficient_comprehension_range, direct_comprehension);
+        let fixes = vec![fix(
+            "unnecessary_map_to_list_in_comprehension",
+            "Rewrite to iterate over the map directly",
+            builder.finish(),
+            inefficient_comprehension_range,
+        )];
+        Some(fixes)
+    }
+}
+
+pub(crate) static LINTER: UnnecessaryMapToListInComprehensionLinter =
+    UnnecessaryMapToListInComprehensionLinter;
 
 static MAP_VAR: &str = "_@Map";
 static KEY_VAR: &str = "_@Key";
 static VALUE_VAR: &str = "_@Value";
 static BODY_VAR: &str = "_@Body";
 
-fn unnecessary_map_to_list_in_comprehension_ssr(
-    diags: &mut Vec<Diagnostic>,
-    sema: &Semantic,
-    file_id: FileId,
-) {
-    let matches = match_pattern_in_file_functions(
-        sema,
-        Strategy {
-            macros: MacroStrategy::Expand,
-            parens: ParenStrategy::InvisibleParens,
-        },
-        file_id,
-        format!("ssr: [{BODY_VAR} || {{{KEY_VAR}, {VALUE_VAR}}} <- maps:to_list({MAP_VAR})].")
-            .as_str(),
-    );
-    matches.matches.iter().for_each(|m| {
-        if let Some(diagnostic) = make_diagnostic(sema, file_id, m) {
-            diags.push(diagnostic);
-        }
-    });
-}
-
-fn make_diagnostic(
-    sema: &Semantic,
-    original_file_id: FileId,
-    matched: &Match,
-) -> Option<Diagnostic> {
-    if let Some(comments) = matched.comments(sema) {
-        // Avoid clobbering comments in the original source code
-        if !comments.is_empty() {
-            return None;
-        }
-    }
-    let file_id = matched.range.file_id;
-    if matched.range.file_id != original_file_id {
-        // We've somehow ended up with a match in a different file - this means we've
-        // accidentally expanded a macro from a different file, or some other complex case that
-        // gets hairy, so bail out.
-        return None;
-    }
-    let inefficient_comprehension_range = matched.range.range;
-    let body = matched.placeholder_text(sema, BODY_VAR)?;
-    let key = matched.placeholder_text(sema, KEY_VAR)?;
-    let value = matched.placeholder_text(sema, VALUE_VAR)?;
-    let map = matched.placeholder_text(sema, MAP_VAR)?;
-    let message = "Unnecessary intermediate list allocated.".to_string();
-    let mut builder = SourceChangeBuilder::new(file_id);
-    let direct_comprehension = format!("[{body} || {key} := {value} <- {map}]");
-    builder.replace(inefficient_comprehension_range, direct_comprehension);
-    let fixes = vec![fix(
-        "unnecessary_map_to_list_in_comprehension",
-        "Rewrite to iterate over the map directly",
-        builder.finish(),
-        inefficient_comprehension_range,
-    )];
-    Some(
-        Diagnostic::new(
-            DiagnosticCode::UnnecessaryMapToListInComprehension,
-            message,
-            inefficient_comprehension_range,
-        )
-        .with_severity(Severity::WeakWarning)
-        .with_ignore_fix(sema, file_id)
-        .with_fixes(Some(fixes)),
-    )
-}
-
 #[cfg(test)]
 mod tests {
 

From 401e1714f55417e574c5822669e14ae7e0bac6b0 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 19 Aug 2025 23:29:48 -0700
Subject: [PATCH 050/394] Update todo comment for unused_function_args linter

Summary: One of the two tasks is completed, so update the comment.

Reviewed By: TD5

Differential Revision: D80527750

fbshipit-source-id: 4e1a7575229f65f24a074b47c333a4672342e86d
---
 crates/ide/src/diagnostics/unused_function_args.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/ide/src/diagnostics/unused_function_args.rs b/crates/ide/src/diagnostics/unused_function_args.rs
index 11a485ded8..394844f4a2 100644
--- a/crates/ide/src/diagnostics/unused_function_args.rs
+++ b/crates/ide/src/diagnostics/unused_function_args.rs
@@ -42,7 +42,7 @@ use crate::fix;
 
 pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
     conditions: DiagnosticConditions {
-        // TODO: disable this check when T151727890 and T151605845 are resolved
+        // TODO: Remove experimental once T151727890 is resolved
         experimental: true,
         include_generated: false,
         include_tests: true,

From 9e529d113c4456d08a87f0a0ffb6f352fe8abb50 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 19 Aug 2025 23:29:48 -0700
Subject: [PATCH 051/394] Update linter docs to use traits

Summary: Update the docs, which contained a SSR-based linter, to use the new trait.

Reviewed By: TD5

Differential Revision: D80527631

fbshipit-source-id: 9a0258b11818f005ebf3f2013b3ebd515512d592
---
 website/docs/contributing/linters.mdx | 100 ++++++++++++--------------
 1 file changed, 47 insertions(+), 53 deletions(-)

diff --git a/website/docs/contributing/linters.mdx b/website/docs/contributing/linters.mdx
index 734ebbf816..d09e50b716 100644
--- a/website/docs/contributing/linters.mdx
+++ b/website/docs/contributing/linters.mdx
@@ -19,7 +19,7 @@ and the number is growing. It is usually a good idea to look at existing linters
 At high level, each linter consists of:
 
 1. A **DiagnosticCode** - A unique identifier for the diagnostic
-2. A **DiagnosticDescriptor** - Configuration for when and how the diagnostic runs
+2. A linter **module** - A file where the linter is implemented
 3. **Tests** - A number of test cases for the diagnostic
 4. **Documentation** - A user-facing explanation of the diagnostic
 
@@ -98,7 +98,7 @@ impl DiagnosticCode {
 }
 ```
 
-### Step 2: Create the diagnostic module
+### Step 2: Create the linter module
 
 Create a new file `elp/crates/ide/src/diagnostics/unsafe_function_call.rs`, with the following content.
 The code has comments to explain each part.
@@ -115,56 +115,50 @@ The code has comments to explain each part.
  */
 
 use elp_ide_db::DiagnosticCode;
-use elp_ide_ssr::match_pattern_in_file_functions;
-use hir::Strategy;
-use hir::fold::MacroStrategy;
-use hir::fold::ParenStrategy;
 
-use crate::diagnostics::Diagnostic;
-use crate::diagnostics::DiagnosticConditions;
-use crate::diagnostics::DiagnosticDescriptor;
-use crate::diagnostics::Severity;
+use crate::diagnostics::Linter;
+use crate::diagnostics::SsrPatternsLinter;
 
-// This is the enum entry which will be used to identify the diagnostic
-const DIAGNOSTIC_CODE: DiagnosticCode = DiagnosticCode::UnsafeFunctionCall;
-// This is a human-readable message that will be displayed in the IDE
-const DIAGNOSTIC_MESSAGE: &str = "Do not use unsafe:operation/1 in production code.";
-// This is the severity of the diagnostic (Warning, Error, etc.)
-const DIAGNOSTIC_SEVERITY: Severity = Severity::Warning;
-// This is the strategy used to match the pattern in the code.
-const STRATEGY: Strategy = Strategy {
-    // In our case we want to expand macros before matching the pattern
-    macros: MacroStrategy::Expand,
-    // We don't care about parentheses in our case, so we ignore them
-    parens: ParenStrategy::InvisibleParens,
-};
+// We define a new linter, named `UnsafeFunctionCallLinter`
+pub(crate) struct UnsafeFunctionCallLinter;
 
-// This is the core of our linter.
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    // These are the conditions under which the diagnostic should run.
-    conditions: DiagnosticConditions {
-        experimental: false, // Experimental diagnostics are only enabled in `--experimental` mode
-        include_generated: false, // Do not run the linters against generated files
-        include_tests: false, // Do not run the linters against test files
-        default_disabled: false, // The diagnostic is enabled by default
-    },
-    // This is the function that will be called to run the diagnostic.
-    // `acc` is a vector of diagnostics which will be adding to.
-    checker: &|acc, sema, file_id, _ext| {
+// We implement the `Linter` trait. This is common to all kinds of ELP linters.
+impl Linter for UnsafeFunctionCallLinter {
+    // A unique identifier for the linter. This is the `DiagnosticCode` we just added.
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::UnsafeFunctionCall
+    }
+    // A human-readable description for the linter, which will be displayed in the IDE
+    fn description(&self) -> String {
+        "Do not use unsafe:operation/1 in production code.".to_string()
+    }
+    // By default test files (i.e. test suites and helpers) are processed by linters.
+    // Since we only care about "unsafe calls" from production code,
+    // here we override the default behaviour by skipping test files.
+    fn should_process_test_files(&self) -> bool {
+        false
+    }
+}
+
+// We will write our linter using the so-called "SSR" syntax.
+// SSR is a convenient way to match on parts of the Erlang AST.
+// Because of this, we decide to implement the additional `SsrPatternsLinter` trait.
+impl SsrPatternsLinter for UnsafeFunctionCallLinter {
+    // Linters can specify a custom context type. For now, we ignore it.
+    type Context = ();
+
+    // Here we specify which patterns we want to match.
+    // The function returns a vector of tuples, each one containing
+    // a SSR pattern and a context.
+    // For the time being, let's ignore the context.
+    // For SSR syntax, please refer to the `ide_ssr` crate.
+    // Here, we are matching on calls to the fully-qualified `unsafe:operation/1`
+    // function, ignoring its only argument.
+    fn patterns(&self) -> Vec<(String, Self::Context)> {
         // We use the SSR mechanism to match calls to `unsafe:operation/1`.
-        let pattern = "ssr: unsafe:operation(_@).";
-        // We use the `match_pattern_in_file_functions` function to match the pattern in the code.
-        let matches = match_pattern_in_file_functions(sema, STRATEGY, file_id, pattern);
-        // We iterate over the matches and add a diagnostic for each one
-        matches.matches.iter().for_each(|m| {
-            // We create a new diagnostic with the code, message, and range of the match
-            let diagnostic = Diagnostic::new(DIAGNOSTIC_CODE, DIAGNOSTIC_MESSAGE, m.range.range)
-                .with_severity(DIAGNOSTIC_SEVERITY);
-            // We add the diagnostic to the accumulator
-            acc.push(diagnostic);
-        });
-    },
-};
+        vec![("ssr: unsafe:operation(_@).".to_string(), ())]
+    }
+}
 ```
 
 ### Step 3: Register the diagnostic
@@ -175,11 +169,11 @@ Add your diagnostic module to [`elp/crates/ide/src/diagnostics.rs`](https://gith
 // Add the module declaration
 mod unsafe_function_call;
 
-// Register the descriptor in the diagnostics_descriptors function
-pub fn diagnostics_descriptors() -> Vec<&'static DiagnosticDescriptor> {
+// Register the linter in the `ssr_linters` function
+pub(crate) fn ssr_linters() -> Vec<&'static dyn FunctionCallLinter> {
     vec![
-        // ... existing descriptors ...
-        &unsafe_function_call::DESCRIPTOR, // We add the descriptor here
+        // ... existing linters ...
+        &unsafe_function_call::LINTER, // We add the linter here
     ]
 }
 ```
@@ -202,7 +196,7 @@ mod tests {
             -export([warn/0]).
             warn() ->
                 unsafe:operation(data),
-            %%  ^^^^^^^^^^^^^^^^^^^^^^ warning: Do not use unsafe:operation/1 in production code.
+            %%  ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Do not use unsafe:operation/1 in production code.
                 safe:operation(data).
             //- /src/unsafe.erl
             -module(unsafe).

From 0ce5e32714b115d83530cff7cc15a19fc79c9167 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 21 Aug 2025 04:38:27 -0700
Subject: [PATCH 052/394] Require mermaid dependency >= 11.10.0

Reviewed By: jcpetruzza

Differential Revision: D80683850

fbshipit-source-id: ab7b9cf18bae193a0bf7021086707bb25e1f275d
---
 website/package.json |   3 +-
 website/yarn.lock    | 608 ++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 541 insertions(+), 70 deletions(-)

diff --git a/website/package.json b/website/package.json
index d14528fe23..96873894ce 100644
--- a/website/package.json
+++ b/website/package.json
@@ -60,6 +60,7 @@
     "http-proxy-middleware": ">=2.0.9",
     "brace-expansion": ">=1.1.12",
     "webpack-dev-server": ">=5.2.1",
-    "on-headers": ">=1.1.0"
+    "on-headers": ">=1.1.0",
+    "mermaid": ">=11.10.0"
   }
 }
diff --git a/website/yarn.lock b/website/yarn.lock
index d4634fde1d..c07cd453c7 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -279,6 +279,19 @@
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.24"
 
+"@antfu/install-pkg@^1.0.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@antfu/install-pkg/-/install-pkg-1.1.0.tgz#78fa036be1a6081b5a77a5cf59f50c7752b6ba26"
+  integrity sha512-MGQsmw10ZyI+EJo45CdSER4zEb+p31LpDAFp2Z3gkSd1yqVZGi0Ebx++YTEMonJy4oChEMLsxZ64j8FH6sSqtQ==
+  dependencies:
+    package-manager-detector "^1.3.0"
+    tinyexec "^1.0.1"
+
+"@antfu/utils@^8.1.0":
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/@antfu/utils/-/utils-8.1.1.tgz#95b1947d292a9a2efffba2081796dcaa05ecedfb"
+  integrity sha512-Mex9nXf9vR6AhcXmMrlz/HVgYYZpVGJ6YlPgwl7UnaFpnshXs6EK/oa5Gpf3CzENMjkvEx2tQtntGnb7UtSTOQ==
+
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.0", "@babel/code-frame@^7.26.2", "@babel/code-frame@^7.8.3":
   version "7.26.2"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
@@ -1191,10 +1204,42 @@
     "@babel/helper-string-parser" "^7.25.9"
     "@babel/helper-validator-identifier" "^7.25.9"
 
-"@braintree/sanitize-url@^6.0.1":
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-6.0.4.tgz#923ca57e173c6b232bbbb07347b1be982f03e783"
-  integrity sha512-s3jaWicZd0pkP0jf5ysyHUI/RE7MHos6qlToFcGWXVp+ykHOy77OUMrfbgJ9it2C5bow7OIQwYYaHjk9XlBQ2A==
+"@braintree/sanitize-url@^7.0.4":
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-7.1.1.tgz#15e19737d946559289b915e5dad3b4c28407735e"
+  integrity sha512-i1L7noDNxtFyL5DmZafWy1wRVhGehQmzZaz1HiN5e7iylJMSZR7ekOV7NsIqa5qBldlLrsKv4HbgFUVlQrz8Mw==
+
+"@chevrotain/cst-dts-gen@11.0.3":
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/@chevrotain/cst-dts-gen/-/cst-dts-gen-11.0.3.tgz#5e0863cc57dc45e204ccfee6303225d15d9d4783"
+  integrity sha512-BvIKpRLeS/8UbfxXxgC33xOumsacaeCKAjAeLyOn7Pcp95HiRbrpl14S+9vaZLolnbssPIUuiUd8IvgkRyt6NQ==
+  dependencies:
+    "@chevrotain/gast" "11.0.3"
+    "@chevrotain/types" "11.0.3"
+    lodash-es "4.17.21"
+
+"@chevrotain/gast@11.0.3":
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/@chevrotain/gast/-/gast-11.0.3.tgz#e84d8880323fe8cbe792ef69ce3ffd43a936e818"
+  integrity sha512-+qNfcoNk70PyS/uxmj3li5NiECO+2YKZZQMbmjTqRI3Qchu8Hig/Q9vgkHpI3alNjr7M+a2St5pw5w5F6NL5/Q==
+  dependencies:
+    "@chevrotain/types" "11.0.3"
+    lodash-es "4.17.21"
+
+"@chevrotain/regexp-to-ast@11.0.3":
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/@chevrotain/regexp-to-ast/-/regexp-to-ast-11.0.3.tgz#11429a81c74a8e6a829271ce02fc66166d56dcdb"
+  integrity sha512-1fMHaBZxLFvWI067AVbGJav1eRY7N8DDvYCTwGBiE/ytKBgP8azTdgyrKyWZ9Mfh09eHWb5PgTSO8wi7U824RA==
+
+"@chevrotain/types@11.0.3":
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/@chevrotain/types/-/types-11.0.3.tgz#f8a03914f7b937f594f56eb89312b3b8f1c91848"
+  integrity sha512-gsiM3G8b58kZC2HaWR50gu6Y1440cHiJ+i3JUvcp/35JchYejb2+5MVeJK0iKThYpAa/P2PYFV4hoi44HD+aHQ==
+
+"@chevrotain/utils@11.0.3":
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/@chevrotain/utils/-/utils-11.0.3.tgz#e39999307b102cff3645ec4f5b3665f5297a2224"
+  integrity sha512-YslZMgtJUyuMbZ+aKvfF3x1f5liK4mWNxghFRv7jqRR9C3R3fAOGTTKvxXDa2Y1s9zSbcpuO0cAxDYsc9SrXoQ==
 
 "@colors/colors@1.5.0":
   version "1.5.0"
@@ -1999,6 +2044,25 @@
   dependencies:
     "@hapi/hoek" "^9.0.0"
 
+"@iconify/types@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@iconify/types/-/types-2.0.0.tgz#ab0e9ea681d6c8a1214f30cd741fe3a20cc57f57"
+  integrity sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==
+
+"@iconify/utils@^2.1.33":
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@iconify/utils/-/utils-2.3.0.tgz#1bbbf8c477ebe9a7cacaea78b1b7e8937f9cbfba"
+  integrity sha512-GmQ78prtwYW6EtzXRU1rY+KwOKfz32PD7iJh6Iyqw68GiKuoZ2A6pRtzWONz5VQJbp50mEjXh/7NkumtrAgRKA==
+  dependencies:
+    "@antfu/install-pkg" "^1.0.0"
+    "@antfu/utils" "^8.1.0"
+    "@iconify/types" "^2.0.0"
+    debug "^4.4.0"
+    globals "^15.14.0"
+    kolorist "^1.8.0"
+    local-pkg "^1.0.0"
+    mlly "^1.7.4"
+
 "@jest/schemas@^29.6.3":
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
@@ -2148,6 +2212,13 @@
   dependencies:
     "@types/mdx" "^2.0.0"
 
+"@mermaid-js/parser@^0.6.2":
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/@mermaid-js/parser/-/parser-0.6.2.tgz#6d505a33acb52ddeb592c596b14f9d92a30396a9"
+  integrity sha512-+PO02uGF6L6Cs0Bw8RpGhikVvMWEysfAyl27qTlroUB8jSWr1lL0Sf6zi78ZxlSnmgSY2AMMKVgghnN9jTtwkQ==
+  dependencies:
+    langium "3.3.1"
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
@@ -2396,23 +2467,216 @@
   dependencies:
     "@types/node" "*"
 
-"@types/d3-scale-chromatic@^3.0.0":
+"@types/d3-array@*":
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-3.2.1.tgz#1f6658e3d2006c4fceac53fde464166859f8b8c5"
+  integrity sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==
+
+"@types/d3-axis@*":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@types/d3-axis/-/d3-axis-3.0.6.tgz#e760e5765b8188b1defa32bc8bb6062f81e4c795"
+  integrity sha512-pYeijfZuBd87T0hGn0FO1vQ/cgLk6E1ALJjfkC0oJ8cbwkZl3TpgS8bVBLZN+2jjGgg38epgxb2zmoGtSfvgMw==
+  dependencies:
+    "@types/d3-selection" "*"
+
+"@types/d3-brush@*":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@types/d3-brush/-/d3-brush-3.0.6.tgz#c2f4362b045d472e1b186cdbec329ba52bdaee6c"
+  integrity sha512-nH60IZNNxEcrh6L1ZSMNA28rj27ut/2ZmI3r96Zd+1jrZD++zD3LsMIjWlvg4AYrHn/Pqz4CF3veCxGjtbqt7A==
+  dependencies:
+    "@types/d3-selection" "*"
+
+"@types/d3-chord@*":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@types/d3-chord/-/d3-chord-3.0.6.tgz#1706ca40cf7ea59a0add8f4456efff8f8775793d"
+  integrity sha512-LFYWWd8nwfwEmTZG9PfQxd17HbNPksHBiJHaKuY1XeqscXacsS2tyoo6OdRsjf+NQYeB6XrNL3a25E3gH69lcg==
+
+"@types/d3-color@*":
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-3.1.3.tgz#368c961a18de721da8200e80bf3943fb53136af2"
+  integrity sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==
+
+"@types/d3-contour@*":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@types/d3-contour/-/d3-contour-3.0.6.tgz#9ada3fa9c4d00e3a5093fed0356c7ab929604231"
+  integrity sha512-BjzLgXGnCWjUSYGfH1cpdo41/hgdWETu4YxpezoztawmqsvCeep+8QGfiY6YbDvfgHz/DkjeIkkZVJavB4a3rg==
+  dependencies:
+    "@types/d3-array" "*"
+    "@types/geojson" "*"
+
+"@types/d3-delaunay@*":
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/@types/d3-delaunay/-/d3-delaunay-6.0.4.tgz#185c1a80cc807fdda2a3fe960f7c11c4a27952e1"
+  integrity sha512-ZMaSKu4THYCU6sV64Lhg6qjf1orxBthaC161plr5KuPHo3CNm8DTHiLw/5Eq2b6TsNP0W0iJrUOFscY6Q450Hw==
+
+"@types/d3-dispatch@*":
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/@types/d3-dispatch/-/d3-dispatch-3.0.7.tgz#ef004d8a128046cfce434d17182f834e44ef95b2"
+  integrity sha512-5o9OIAdKkhN1QItV2oqaE5KMIiXAvDWBDPrD85e58Qlz1c1kI/J0NcqbEG88CoTwJrYe7ntUCVfeUl2UJKbWgA==
+
+"@types/d3-drag@*":
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/@types/d3-drag/-/d3-drag-3.0.7.tgz#b13aba8b2442b4068c9a9e6d1d82f8bcea77fc02"
+  integrity sha512-HE3jVKlzU9AaMazNufooRJ5ZpWmLIoc90A37WU2JMmeq28w1FQqCZswHZ3xR+SuxYftzHq6WU6KJHvqxKzTxxQ==
+  dependencies:
+    "@types/d3-selection" "*"
+
+"@types/d3-dsv@*":
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/@types/d3-dsv/-/d3-dsv-3.0.7.tgz#0a351f996dc99b37f4fa58b492c2d1c04e3dac17"
+  integrity sha512-n6QBF9/+XASqcKK6waudgL0pf/S5XHPPI8APyMLLUHd8NqouBGLsU8MgtO7NINGtPBtk9Kko/W4ea0oAspwh9g==
+
+"@types/d3-ease@*":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/d3-ease/-/d3-ease-3.0.2.tgz#e28db1bfbfa617076f7770dd1d9a48eaa3b6c51b"
+  integrity sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==
+
+"@types/d3-fetch@*":
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/@types/d3-fetch/-/d3-fetch-3.0.7.tgz#c04a2b4f23181aa376f30af0283dbc7b3b569980"
+  integrity sha512-fTAfNmxSb9SOWNB9IoG5c8Hg6R+AzUHDRlsXsDZsNp6sxAEOP0tkP3gKkNSO/qmHPoBFTxNrjDprVHDQDvo5aA==
+  dependencies:
+    "@types/d3-dsv" "*"
+
+"@types/d3-force@*":
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@types/d3-force/-/d3-force-3.0.10.tgz#6dc8fc6e1f35704f3b057090beeeb7ac674bff1a"
+  integrity sha512-ZYeSaCF3p73RdOKcjj+swRlZfnYpK1EbaDiYICEEp5Q6sUiqFaFQ9qgoshp5CzIyyb/yD09kD9o2zEltCexlgw==
+
+"@types/d3-format@*":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/d3-format/-/d3-format-3.0.4.tgz#b1e4465644ddb3fdf3a263febb240a6cd616de90"
+  integrity sha512-fALi2aI6shfg7vM5KiR1wNJnZ7r6UuggVqtDA+xiEdPZQwy/trcQaHnwShLuLdta2rTymCNpxYTiMZX/e09F4g==
+
+"@types/d3-geo@*":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@types/d3-geo/-/d3-geo-3.1.0.tgz#b9e56a079449174f0a2c8684a9a4df3f60522440"
+  integrity sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==
+  dependencies:
+    "@types/geojson" "*"
+
+"@types/d3-hierarchy@*":
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/@types/d3-hierarchy/-/d3-hierarchy-3.1.7.tgz#6023fb3b2d463229f2d680f9ac4b47466f71f17b"
+  integrity sha512-tJFtNoYBtRtkNysX1Xq4sxtjK8YgoWUNpIiUee0/jHGRwqvzYxkq0hGVbbOGSz+JgFxxRu4K8nb3YpG3CMARtg==
+
+"@types/d3-interpolate@*":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz#412b90e84870285f2ff8a846c6eb60344f12a41c"
+  integrity sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==
+  dependencies:
+    "@types/d3-color" "*"
+
+"@types/d3-path@*":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-path/-/d3-path-3.1.1.tgz#f632b380c3aca1dba8e34aa049bcd6a4af23df8a"
+  integrity sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==
+
+"@types/d3-polygon@*":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/d3-polygon/-/d3-polygon-3.0.2.tgz#dfae54a6d35d19e76ac9565bcb32a8e54693189c"
+  integrity sha512-ZuWOtMaHCkN9xoeEMr1ubW2nGWsp4nIql+OPQRstu4ypeZ+zk3YKqQT0CXVe/PYqrKpZAi+J9mTs05TKwjXSRA==
+
+"@types/d3-quadtree@*":
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/@types/d3-quadtree/-/d3-quadtree-3.0.6.tgz#d4740b0fe35b1c58b66e1488f4e7ed02952f570f"
+  integrity sha512-oUzyO1/Zm6rsxKRHA1vH0NEDG58HrT5icx/azi9MF1TWdtttWl0UIUsjEQBBh+SIkrpd21ZjEv7ptxWys1ncsg==
+
+"@types/d3-random@*":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/d3-random/-/d3-random-3.0.3.tgz#ed995c71ecb15e0cd31e22d9d5d23942e3300cfb"
+  integrity sha512-Imagg1vJ3y76Y2ea0871wpabqp613+8/r0mCLEBfdtqC7xMSfj9idOnmBYyMoULfHePJyxMAw3nWhJxzc+LFwQ==
+
+"@types/d3-scale-chromatic@*":
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.1.0.tgz#dc6d4f9a98376f18ea50bad6c39537f1b5463c39"
   integrity sha512-iWMJgwkK7yTRmWqRB5plb1kadXyQ5Sj8V/zYlFGMUBbIPKQScw+Dku9cAAMgJG+z5GYDoMjWGLVOvjghDEFnKQ==
 
-"@types/d3-scale@^4.0.3":
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-4.0.8.tgz#d409b5f9dcf63074464bf8ddfb8ee5a1f95945bb"
-  integrity sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==
+"@types/d3-scale@*":
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-4.0.9.tgz#57a2f707242e6fe1de81ad7bfcccaaf606179afb"
+  integrity sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==
   dependencies:
     "@types/d3-time" "*"
 
+"@types/d3-selection@*":
+  version "3.0.11"
+  resolved "https://registry.yarnpkg.com/@types/d3-selection/-/d3-selection-3.0.11.tgz#bd7a45fc0a8c3167a631675e61bc2ca2b058d4a3"
+  integrity sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w==
+
+"@types/d3-shape@*":
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/@types/d3-shape/-/d3-shape-3.1.7.tgz#2b7b423dc2dfe69c8c93596e673e37443348c555"
+  integrity sha512-VLvUQ33C+3J+8p+Daf+nYSOsjB4GXp19/S/aGo60m9h1v6XaxjiT82lKVWJCfzhtuZ3yD7i/TPeC/fuKLLOSmg==
+  dependencies:
+    "@types/d3-path" "*"
+
+"@types/d3-time-format@*":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@types/d3-time-format/-/d3-time-format-4.0.3.tgz#d6bc1e6b6a7db69cccfbbdd4c34b70632d9e9db2"
+  integrity sha512-5xg9rC+wWL8kdDj153qZcsJ0FWiFt0J5RB6LYUNZjwSnesfblqrI/bJ1wBdJ8OQfncgbJG5+2F+qfqnqyzYxyg==
+
 "@types/d3-time@*":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/@types/d3-time/-/d3-time-3.0.4.tgz#8472feecd639691450dd8000eb33edd444e1323f"
   integrity sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==
 
+"@types/d3-timer@*":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/d3-timer/-/d3-timer-3.0.2.tgz#70bbda77dc23aa727413e22e214afa3f0e852f70"
+  integrity sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==
+
+"@types/d3-transition@*":
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/@types/d3-transition/-/d3-transition-3.0.9.tgz#1136bc57e9ddb3c390dccc9b5ff3b7d2b8d94706"
+  integrity sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg==
+  dependencies:
+    "@types/d3-selection" "*"
+
+"@types/d3-zoom@*":
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/@types/d3-zoom/-/d3-zoom-3.0.8.tgz#dccb32d1c56b1e1c6e0f1180d994896f038bc40b"
+  integrity sha512-iqMC4/YlFCSlO8+2Ii1GGGliCAY4XdeG748w5vQUbevlbDu0zSjH/+jojorQVBK/se0j6DUFNPBGSqD3YWYnDw==
+  dependencies:
+    "@types/d3-interpolate" "*"
+    "@types/d3-selection" "*"
+
+"@types/d3@^7.4.3":
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/@types/d3/-/d3-7.4.3.tgz#d4550a85d08f4978faf0a4c36b848c61eaac07e2"
+  integrity sha512-lZXZ9ckh5R8uiFVt8ogUNf+pIrK4EsWrx2Np75WvF/eTpJ0FMHNhjXk8CKEx/+gpHbNQyJWehbFaTvqmHWB3ww==
+  dependencies:
+    "@types/d3-array" "*"
+    "@types/d3-axis" "*"
+    "@types/d3-brush" "*"
+    "@types/d3-chord" "*"
+    "@types/d3-color" "*"
+    "@types/d3-contour" "*"
+    "@types/d3-delaunay" "*"
+    "@types/d3-dispatch" "*"
+    "@types/d3-drag" "*"
+    "@types/d3-dsv" "*"
+    "@types/d3-ease" "*"
+    "@types/d3-fetch" "*"
+    "@types/d3-force" "*"
+    "@types/d3-format" "*"
+    "@types/d3-geo" "*"
+    "@types/d3-hierarchy" "*"
+    "@types/d3-interpolate" "*"
+    "@types/d3-path" "*"
+    "@types/d3-polygon" "*"
+    "@types/d3-quadtree" "*"
+    "@types/d3-random" "*"
+    "@types/d3-scale" "*"
+    "@types/d3-scale-chromatic" "*"
+    "@types/d3-selection" "*"
+    "@types/d3-shape" "*"
+    "@types/d3-time" "*"
+    "@types/d3-time-format" "*"
+    "@types/d3-timer" "*"
+    "@types/d3-transition" "*"
+    "@types/d3-zoom" "*"
+
 "@types/debug@^4.0.0":
   version "4.1.12"
   resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.12.tgz#a155f21690871953410df4b6b6f53187f0500917"
@@ -2501,6 +2765,11 @@
     "@types/jsonfile" "*"
     "@types/node" "*"
 
+"@types/geojson@*":
+  version "7946.0.16"
+  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.16.tgz#8ebe53d69efada7044454e3305c19017d97ced2a"
+  integrity sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==
+
 "@types/gtag.js@^0.0.12":
   version "0.0.12"
   resolved "https://registry.yarnpkg.com/@types/gtag.js/-/gtag.js-0.0.12.tgz#095122edca896689bdfcdd73b057e23064d23572"
@@ -3555,6 +3824,25 @@ cheerio@1.0.0-rc.12:
     parse5 "^7.0.0"
     parse5-htmlparser2-tree-adapter "^7.0.0"
 
+chevrotain-allstar@~0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/chevrotain-allstar/-/chevrotain-allstar-0.3.1.tgz#b7412755f5d83cc139ab65810cdb00d8db40e6ca"
+  integrity sha512-b7g+y9A0v4mxCW1qUhf3BSVPg+/NvGErk/dOkrDaHA0nQIQGAtrOjlX//9OQtRlSCy+x9rfB5N8yC71lH1nvMw==
+  dependencies:
+    lodash-es "^4.17.21"
+
+chevrotain@~11.0.3:
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/chevrotain/-/chevrotain-11.0.3.tgz#88ffc1fb4b5739c715807eaeedbbf200e202fc1b"
+  integrity sha512-ci2iJH6LeIkvP9eJW6gpueU8cnZhv85ELY8w8WiFtNjMHA5ad6pQLaJo9mEly/9qUyCpvqX8/POVUTf18/HFdw==
+  dependencies:
+    "@chevrotain/cst-dts-gen" "11.0.3"
+    "@chevrotain/gast" "11.0.3"
+    "@chevrotain/regexp-to-ast" "11.0.3"
+    "@chevrotain/types" "11.0.3"
+    "@chevrotain/utils" "11.0.3"
+    lodash-es "4.17.21"
+
 chokidar@^3.4.2, chokidar@^3.5.3, chokidar@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
@@ -3741,6 +4029,16 @@ compression@^1.7.4:
     safe-buffer "5.2.1"
     vary "~1.1.2"
 
+confbox@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/confbox/-/confbox-0.1.8.tgz#820d73d3b3c82d9bd910652c5d4d599ef8ff8b06"
+  integrity sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==
+
+confbox@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/confbox/-/confbox-0.2.2.tgz#8652f53961c74d9e081784beed78555974a9c110"
+  integrity sha512-1NB+BKqhtNipMsov4xI/NnhCKp9XG9NamYp5PVm9klAT0fsrNPjaFICsCFhNhwZJKNh7zB/3q8qXz0E9oaMNtQ==
+
 config-chain@^1.1.11:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
@@ -3853,6 +4151,13 @@ cose-base@^1.0.0:
   dependencies:
     layout-base "^1.0.0"
 
+cose-base@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cose-base/-/cose-base-2.2.0.tgz#1c395c35b6e10bb83f9769ca8b817d614add5c01"
+  integrity sha512-AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g==
+  dependencies:
+    layout-base "^2.0.0"
+
 cosmiconfig@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
@@ -4081,10 +4386,17 @@ cytoscape-cose-bilkent@^4.1.0:
   dependencies:
     cose-base "^1.0.0"
 
-cytoscape@^3.28.1:
-  version "3.30.4"
-  resolved "https://registry.yarnpkg.com/cytoscape/-/cytoscape-3.30.4.tgz#3404da0a159c00a1a3df2c85b2b43fdc66a0e28e"
-  integrity sha512-OxtlZwQl1WbwMmLiyPSEBuzeTIQnwZhJYYWFzZ2PhEHVFwpeaqNIkUzSiso00D98qk60l8Gwon2RP304d3BJ1A==
+cytoscape-fcose@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cytoscape-fcose/-/cytoscape-fcose-2.2.0.tgz#e4d6f6490df4fab58ae9cea9e5c3ab8d7472f471"
+  integrity sha512-ki1/VuRIHFCzxWNrsshHYPs6L7TvLu3DL+TyIGEsRcvVERmxokbf5Gdk7mFxZnTdiGtnA4cfSmjZJMviqSuZrQ==
+  dependencies:
+    cose-base "^2.2.0"
+
+cytoscape@^3.29.3:
+  version "3.33.1"
+  resolved "https://registry.yarnpkg.com/cytoscape/-/cytoscape-3.33.1.tgz#449e05d104b760af2912ab76482d24c01cdd4c97"
+  integrity sha512-iJc4TwyANnOGR1OmWhsS9ayRS3s+XQ185FmuHObThD+5AeJCakAAbWv8KimMTt08xCCLNgneQwFp+JRJOr9qGQ==
 
 "d3-array@1 - 2":
   version "2.12.1"
@@ -4321,7 +4633,7 @@ d3-zoom@3:
     d3-selection "2 - 3"
     d3-transition "2 - 3"
 
-d3@^7.4.0, d3@^7.8.2:
+d3@^7.9.0:
   version "7.9.0"
   resolved "https://registry.yarnpkg.com/d3/-/d3-7.9.0.tgz#579e7acb3d749caf8860bd1741ae8d371070cd5d"
   integrity sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==
@@ -4357,15 +4669,15 @@ d3@^7.4.0, d3@^7.8.2:
     d3-transition "3"
     d3-zoom "3"
 
-dagre-d3-es@7.0.10:
-  version "7.0.10"
-  resolved "https://registry.yarnpkg.com/dagre-d3-es/-/dagre-d3-es-7.0.10.tgz#19800d4be674379a3cd8c86a8216a2ac6827cadc"
-  integrity sha512-qTCQmEhcynucuaZgY5/+ti3X/rnszKZhEQH/ZdWdtP1tA/y3VoHJzcVrO9pjjJCNpigfscAtoUB5ONcd2wNn0A==
+dagre-d3-es@7.0.11:
+  version "7.0.11"
+  resolved "https://registry.yarnpkg.com/dagre-d3-es/-/dagre-d3-es-7.0.11.tgz#2237e726c0577bfe67d1a7cfd2265b9ab2c15c40"
+  integrity sha512-tvlJLyQf834SylNKax8Wkzco/1ias1OPw8DcUMDE7oUIoSEW25riQVuiu/0OWEFqT0cxHT3Pa9/D82Jr47IONw==
   dependencies:
-    d3 "^7.8.2"
+    d3 "^7.9.0"
     lodash-es "^4.17.21"
 
-dayjs@^1.11.7:
+dayjs@^1.11.13:
   version "1.11.13"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c"
   integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==
@@ -4396,6 +4708,13 @@ debug@^4.3.6:
   dependencies:
     ms "^2.1.3"
 
+debug@^4.4.0:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.1.tgz#e5a8bc6cbc4c6cd3e64308b0693a3d4fa550189b"
+  integrity sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==
+  dependencies:
+    ms "^2.1.3"
+
 decode-named-character-reference@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz#daabac9690874c394c81e4162a0304b35d824f0e"
@@ -4654,7 +4973,7 @@ domhandler@^5.0.2, domhandler@^5.0.3:
   dependencies:
     domelementtype "^2.3.0"
 
-dompurify@>=3.2.4, "dompurify@^3.0.5 <3.1.7":
+dompurify@>=3.2.4, dompurify@^3.2.5:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.2.4.tgz#af5a5a11407524431456cf18836c55d13441cd8e"
   integrity sha512-ysFSFEDVduQpyhzAob/kkuJjf5zWkZD8/A9ywSp1byueyuCfHamrCBa14/Oc2iiB0e51B+NpxSl5gmzn+Ms/mg==
@@ -4714,11 +5033,6 @@ electron-to-chromium@^1.5.41:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.71.tgz#d8b5dba1e55b320f2f4e9b1ca80738f53fcfec2b"
   integrity sha512-dB68l59BI75W1BUGVTAEJy45CEVuEGy9qPVVQ8pnHyHMn36PLPPoE1mjLH+lo9rKulO3HC2OhbACI/8tCqJBcA==
 
-elkjs@^0.9.0:
-  version "0.9.3"
-  resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.9.3.tgz#16711f8ceb09f1b12b99e971b138a8384a529161"
-  integrity sha512-f/ZeWvW/BCXbhGEf1Ujp29EASo/lk1FDnETgNKwJrsVvGZhUWCZyg3xLJjAsxfOmt8KjswHmI5EwCQcPMpOYhQ==
-
 emoji-regex@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
@@ -5055,6 +5369,11 @@ express@^4.21.2:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+exsolve@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/exsolve/-/exsolve-1.0.7.tgz#3b74e4c7ca5c5f9a19c3626ca857309fa99f9e9e"
+  integrity sha512-VO5fQUzZtI6C+vx4w/4BWJpg3s/5l+6pRQEHzFRM8WFi4XffSP1Z+4qi7GbjWbvRQEbdIco5mIMq+zX4rPuLrw==
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -5426,6 +5745,11 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
+globals@^15.14.0:
+  version "15.15.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-15.15.0.tgz#7c4761299d41c32b075715a4ce1ede7897ff72a8"
+  integrity sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==
+
 globby@^11.0.1, globby@^11.0.4, globby@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
@@ -5498,6 +5822,11 @@ gzip-size@^6.0.0:
   dependencies:
     duplexer "^0.1.2"
 
+hachure-fill@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/hachure-fill/-/hachure-fill-0.5.2.tgz#d19bc4cc8750a5962b47fb1300557a85fcf934cc"
+  integrity sha512-3GKBOn+m2LX9iq+JC1064cSFprJY4jL1jCXTcpnfER5HYE2l/4EfWSGzkPa/ZDBmYI0ZOEj5VHV/eKnPGkHuOg==
+
 handle-thing@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
@@ -6468,7 +6797,7 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-katex@>=0.16.21, katex@^0.16.9:
+katex@>=0.16.21, katex@^0.16.22:
   version "0.16.21"
   resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.21.tgz#8f63c659e931b210139691f2cc7bb35166b792a3"
   integrity sha512-XvqR7FgOHtWupfMiigNzmh+MgUVmDGU2kXZm899ZkPfcuoPuFxyHmXsgATDpFZDAXCI8tvinaVcDo8PIIJSo4A==
@@ -6482,7 +6811,7 @@ keyv@^4.5.3:
   dependencies:
     json-buffer "3.0.1"
 
-khroma@^2.0.0:
+khroma@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/khroma/-/khroma-2.1.0.tgz#45f2ce94ce231a437cf5b63c2e886e6eb42bbbb1"
   integrity sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw==
@@ -6502,6 +6831,22 @@ kleur@^4.0.3:
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-4.1.5.tgz#95106101795f7050c6c650f350c683febddb1780"
   integrity sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==
 
+kolorist@^1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/kolorist/-/kolorist-1.8.0.tgz#edddbbbc7894bc13302cdf740af6374d4a04743c"
+  integrity sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==
+
+langium@3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/langium/-/langium-3.3.1.tgz#da745a40d5ad8ee565090fed52eaee643be4e591"
+  integrity sha512-QJv/h939gDpvT+9SiLVlY7tZC3xB2qK57v0J04Sh9wpMb6MP1q8gB21L3WIo8T5P1MSMg3Ep14L7KkDCFG3y4w==
+  dependencies:
+    chevrotain "~11.0.3"
+    chevrotain-allstar "~0.3.0"
+    vscode-languageserver "~9.0.1"
+    vscode-languageserver-textdocument "~1.0.11"
+    vscode-uri "~3.0.8"
+
 latest-version@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-7.0.0.tgz#843201591ea81a4d404932eeb61240fe04e9e5da"
@@ -6522,6 +6867,11 @@ layout-base@^1.0.0:
   resolved "https://registry.yarnpkg.com/layout-base/-/layout-base-1.0.2.tgz#1291e296883c322a9dd4c5dd82063721b53e26e2"
   integrity sha512-8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg==
 
+layout-base@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/layout-base/-/layout-base-2.0.1.tgz#d0337913586c90f9c2c075292069f5c2da5dd285"
+  integrity sha512-dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==
+
 leven@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
@@ -6556,6 +6906,15 @@ loader-utils@^3.2.0:
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.3.1.tgz#735b9a19fd63648ca7adbd31c2327dfe281304e5"
   integrity sha512-FMJTLMXfCLMLfJxcX9PFqX5qD88Z5MRGaZCVzfuqeZSPsyiBzs+pahDQjbIWz2QIzPZz0NX9Zy4FX3lmK6YHIg==
 
+local-pkg@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/local-pkg/-/local-pkg-1.1.2.tgz#c03d208787126445303f8161619dc701afa4abb5"
+  integrity sha512-arhlxbFRmoQHl33a0Zkle/YWlmNwoyt6QNZEIJcqNbdrsix5Lvc4HyyI3EnwxTYlZYc32EbYrQ8SzEZ7dqgg9A==
+  dependencies:
+    mlly "^1.7.4"
+    pkg-types "^2.3.0"
+    quansync "^0.2.11"
+
 locate-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
@@ -6578,7 +6937,7 @@ locate-path@^7.1.0:
   dependencies:
     p-locate "^6.0.0"
 
-lodash-es@^4.17.21:
+lodash-es@4.17.21, lodash-es@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
   integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
@@ -6676,6 +7035,11 @@ markdown-table@^3.0.0:
   resolved "https://registry.yarnpkg.com/markdown-table/-/markdown-table-3.0.4.tgz#fe44d6d410ff9d6f2ea1797a3f60aa4d2b631c2a"
   integrity sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==
 
+marked@^16.0.0:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-16.2.0.tgz#c407a4f7ed3acc1110812525cfd1b0ed8502792c"
+  integrity sha512-LbbTuye+0dWRz2TS9KJ7wsnD4KAtpj0MVkWc90XvBa6AslXsT0hTBVH5k32pcSyHH1fst9XEFJunXHktVy0zlg==
+
 mdast-util-definitions@^5.0.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-5.1.2.tgz#9910abb60ac5d7115d6819b57ae0bcef07a3f7a7"
@@ -6719,7 +7083,7 @@ mdast-util-find-and-replace@^3.0.0, mdast-util-find-and-replace@^3.0.1:
     unist-util-is "^6.0.0"
     unist-util-visit-parents "^6.0.0"
 
-mdast-util-from-markdown@^1.0.0, mdast-util-from-markdown@^1.1.0, mdast-util-from-markdown@^1.3.0:
+mdast-util-from-markdown@^1.0.0, mdast-util-from-markdown@^1.1.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-1.3.1.tgz#9421a5a247f10d31d2faed2a30df5ec89ceafcf0"
   integrity sha512-4xTO/M8c82qBcnQc1tgpNtubGUW/Y1tBQ1B0i5CtSoelOLKFYlElIr3bvgREYYO5iRqbMY1YuqZng0GVOI8Qww==
@@ -7129,31 +7493,31 @@ merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-mermaid@^10.9.0:
-  version "10.9.3"
-  resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-10.9.3.tgz#90bc6f15c33dbe5d9507fed31592cc0d88fee9f7"
-  integrity sha512-V80X1isSEvAewIL3xhmz/rVmc27CVljcsbWxkxlWJWY/1kQa4XOABqpDl2qQLGKzpKm6WbTfUEKImBlUfFYArw==
+mermaid@>=11.10.0, mermaid@^10.9.0:
+  version "11.10.0"
+  resolved "https://registry.yarnpkg.com/mermaid/-/mermaid-11.10.0.tgz#4949f98d08cfdc4cda429372ed2f843a64c99946"
+  integrity sha512-oQsFzPBy9xlpnGxUqLbVY8pvknLlsNIJ0NWwi8SUJjhbP1IT0E0o1lfhU4iYV3ubpy+xkzkaOyDUQMn06vQElQ==
   dependencies:
-    "@braintree/sanitize-url" "^6.0.1"
-    "@types/d3-scale" "^4.0.3"
-    "@types/d3-scale-chromatic" "^3.0.0"
-    cytoscape "^3.28.1"
+    "@braintree/sanitize-url" "^7.0.4"
+    "@iconify/utils" "^2.1.33"
+    "@mermaid-js/parser" "^0.6.2"
+    "@types/d3" "^7.4.3"
+    cytoscape "^3.29.3"
     cytoscape-cose-bilkent "^4.1.0"
-    d3 "^7.4.0"
+    cytoscape-fcose "^2.2.0"
+    d3 "^7.9.0"
     d3-sankey "^0.12.3"
-    dagre-d3-es "7.0.10"
-    dayjs "^1.11.7"
-    dompurify "^3.0.5 <3.1.7"
-    elkjs "^0.9.0"
-    katex "^0.16.9"
-    khroma "^2.0.0"
+    dagre-d3-es "7.0.11"
+    dayjs "^1.11.13"
+    dompurify "^3.2.5"
+    katex "^0.16.22"
+    khroma "^2.1.0"
     lodash-es "^4.17.21"
-    mdast-util-from-markdown "^1.3.0"
-    non-layered-tidy-tree-layout "^2.0.2"
-    stylis "^4.1.3"
+    marked "^16.0.0"
+    roughjs "^4.6.6"
+    stylis "^4.3.6"
     ts-dedent "^2.2.0"
-    uuid "^9.0.0"
-    web-worker "^1.2.0"
+    uuid "^11.1.0"
 
 methods@~1.1.2:
   version "1.1.2"
@@ -8013,6 +8377,16 @@ mkdirp@0.3.0:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
   integrity sha512-OHsdUcVAQ6pOtg5JYWpCBo9W/GySVuwvP9hueRMW7UqshC0tbfzLv8wjySTPm3tfUZ/21CE9E1pJagOA91Pxew==
 
+mlly@^1.7.4:
+  version "1.7.4"
+  resolved "https://registry.yarnpkg.com/mlly/-/mlly-1.7.4.tgz#3d7295ea2358ec7a271eaa5d000a0f84febe100f"
+  integrity sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==
+  dependencies:
+    acorn "^8.14.0"
+    pathe "^2.0.1"
+    pkg-types "^1.3.0"
+    ufo "^1.5.4"
+
 mri@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"
@@ -8112,11 +8486,6 @@ node-releases@^2.0.18:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
   integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
 
-non-layered-tidy-tree-layout@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/non-layered-tidy-tree-layout/-/non-layered-tidy-tree-layout-2.0.2.tgz#57d35d13c356643fc296a55fb11ac15e74da7804"
-  integrity sha512-gkXMxRzUH+PB0ax9dUN0yYF0S25BqeAYqhgMaLUFmpXLEk7Fcu8f4emJuOAY0V8kjDICxROIKsTAKsV/v355xw==
-
 nopt@1.0.10:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
@@ -8328,6 +8697,11 @@ package-json@^8.1.0:
     registry-url "^6.0.0"
     semver "^7.3.7"
 
+package-manager-detector@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/package-manager-detector/-/package-manager-detector-1.3.0.tgz#b42d641c448826e03c2b354272456a771ce453c0"
+  integrity sha512-ZsEbbZORsyHuO00lY1kV3/t72yp6Ysay6Pd17ZAlNGuGwmWDLCJxFpRs0IzfXfj1o4icJOkUEioexFHzyPurSQ==
+
 param-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5"
@@ -8410,6 +8784,11 @@ path-browserify@^1.0.1:
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
   integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
 
+path-data-parser@0.1.0, path-data-parser@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/path-data-parser/-/path-data-parser-0.1.0.tgz#8f5ba5cc70fc7becb3dcefaea08e2659aba60b8c"
+  integrity sha512-NOnmBpt5Y2RWbuv0LMzsayp3lVylAHLPUTut412ZA3l+C4uw4ZVkQbjShYCQ8TCpUMdPapr4YjUqLYD6v68j+w==
+
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -8487,6 +8866,11 @@ path-type@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
+pathe@^2.0.1, pathe@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pathe/-/pathe-2.0.3.tgz#3ecbec55421685b70a9da872b2cff3e1cbed1716"
+  integrity sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==
+
 periscopic@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/periscopic/-/periscopic-3.1.0.tgz#7e9037bf51c5855bd33b48928828db4afa79d97a"
@@ -8518,6 +8902,24 @@ pkg-dir@^7.0.0:
   dependencies:
     find-up "^6.3.0"
 
+pkg-types@^1.3.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.3.1.tgz#bd7cc70881192777eef5326c19deb46e890917df"
+  integrity sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==
+  dependencies:
+    confbox "^0.1.8"
+    mlly "^1.7.4"
+    pathe "^2.0.1"
+
+pkg-types@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-2.3.0.tgz#037f2c19bd5402966ff6810e32706558cb5b5726"
+  integrity sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==
+  dependencies:
+    confbox "^0.2.2"
+    exsolve "^1.0.7"
+    pathe "^2.0.3"
+
 pkg-up@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
@@ -8525,6 +8927,19 @@ pkg-up@^3.1.0:
   dependencies:
     find-up "^3.0.0"
 
+points-on-curve@0.2.0, points-on-curve@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/points-on-curve/-/points-on-curve-0.2.0.tgz#7dbb98c43791859434284761330fa893cb81b4d1"
+  integrity sha512-0mYKnYYe9ZcqMCWhUjItv/oHjvgEsfKvnUTg8sAtnHr3GVy7rGkXCb6d5cSyqrWqL4k81b9CPg3urd+T7aop3A==
+
+points-on-path@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/points-on-path/-/points-on-path-0.2.1.tgz#553202b5424c53bed37135b318858eacff85dd52"
+  integrity sha512-25ClnWWuw7JbWZcgqY/gJ4FQWadKxGWk+3kR/7kD0tCaDtPPMj7oHu2ToLaVhfpnHrZzYby2w6tUA0eOIuUg8g==
+  dependencies:
+    path-data-parser "0.1.0"
+    points-on-curve "0.2.0"
+
 possible-typed-array-names@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f"
@@ -9178,6 +9593,11 @@ qs@6.13.0:
   dependencies:
     side-channel "^1.0.6"
 
+quansync@^0.2.11:
+  version "0.2.11"
+  resolved "https://registry.yarnpkg.com/quansync/-/quansync-0.2.11.tgz#f9c3adda2e1272e4f8cf3f1457b04cbdb4ee692a"
+  integrity sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==
+
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -9782,6 +10202,16 @@ robust-predicates@^3.0.2:
   resolved "https://registry.yarnpkg.com/robust-predicates/-/robust-predicates-3.0.2.tgz#d5b28528c4824d20fc48df1928d41d9efa1ad771"
   integrity sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==
 
+roughjs@^4.6.6:
+  version "4.6.6"
+  resolved "https://registry.yarnpkg.com/roughjs/-/roughjs-4.6.6.tgz#1059f49a5e0c80dee541a005b20cc322b222158b"
+  integrity sha512-ZUz/69+SYpFN/g/lUlo2FXcIjRkSu3nDarreVdGGndHEBJ6cXPdKguS8JGxwj5HA5xIbVKSmLgr5b3AWxtRfvQ==
+  dependencies:
+    hachure-fill "^0.5.2"
+    path-data-parser "^0.1.0"
+    points-on-curve "^0.2.0"
+    points-on-path "^0.2.1"
+
 rtl-detect@^1.0.4:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/rtl-detect/-/rtl-detect-1.1.2.tgz#ca7f0330af5c6bb626c15675c642ba85ad6273c6"
@@ -10315,10 +10745,10 @@ stylehacks@^6.1.1:
     browserslist "^4.23.0"
     postcss-selector-parser "^6.0.16"
 
-stylis@^4.1.3:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.4.tgz#ca5c6c4a35c4784e4e93a2a24dc4e9fa075250a4"
-  integrity sha512-osIBl6BGUmSfDkyH2mB7EFvCJntXDrLhKjHTRj/rK6xLH0yuPrHULDRQzKokSOD4VoorhtKpfcfW1GAntu8now==
+stylis@^4.3.6:
+  version "4.3.6"
+  resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.6.tgz#7c7b97191cb4f195f03ecab7d52f7902ed378320"
+  integrity sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==
 
 sucrase@^3.35.0:
   version "3.35.0"
@@ -10455,6 +10885,11 @@ tiny-warning@^1.0.0:
   resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
   integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
 
+tinyexec@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/tinyexec/-/tinyexec-1.0.1.tgz#70c31ab7abbb4aea0a24f55d120e5990bfa1e0b1"
+  integrity sha512-5uC6DDlmeqiOwCPmK9jMSdOuZTh8bU39Ys6yidB+UTt5hfZUPGAypSgFRiEp+jbi9qH40BLDvy85jIU88wKSqw==
+
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -10550,6 +10985,11 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
+ufo@^1.5.4:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.6.1.tgz#ac2db1d54614d1b22c1d603e3aef44a85d8f146b"
+  integrity sha512-9a4/uxlTWJ4+a5i0ooc1rU7C7YOw3wT+UGqdeNNHWnOF9qcMBgLRS+4IYUqbczewFx4mLEig6gawh7X6mFlEkA==
+
 undici-types@~6.20.0:
   version "6.20.0"
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.20.0.tgz#8171bf22c1f588d1554d55bf204bc624af388433"
@@ -10866,16 +11306,16 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
+uuid@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-11.1.0.tgz#9549028be1753bb934fc96e2bca09bb4105ae912"
+  integrity sha512-0/A9rDy9P7cJ+8w1c9WD9V//9Wj15Ce2MPz8Ri6032usz+NfePxx5AcN3bN+r6ZL6jEo066/yNYB3tn4pQEx+A==
+
 uuid@^8.3.2:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-uuid@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
-  integrity sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==
-
 uvu@^0.5.0:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/uvu/-/uvu-0.5.6.tgz#2754ca20bcb0bb59b64e9985e84d2e81058502df"
@@ -10969,6 +11409,41 @@ vfile@^6.0.0, vfile@^6.0.1:
     "@types/unist" "^3.0.0"
     vfile-message "^4.0.0"
 
+vscode-jsonrpc@8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz#f43dfa35fb51e763d17cd94dcca0c9458f35abf9"
+  integrity sha512-C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==
+
+vscode-languageserver-protocol@3.17.5:
+  version "3.17.5"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz#864a8b8f390835572f4e13bd9f8313d0e3ac4bea"
+  integrity sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==
+  dependencies:
+    vscode-jsonrpc "8.2.0"
+    vscode-languageserver-types "3.17.5"
+
+vscode-languageserver-textdocument@~1.0.11:
+  version "1.0.12"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.12.tgz#457ee04271ab38998a093c68c2342f53f6e4a631"
+  integrity sha512-cxWNPesCnQCcMPeenjKKsOCKQZ/L6Tv19DTRIGuLWe32lyzWhihGVJ/rcckZXJxfdKCFvRLS3fpBIsV/ZGX4zA==
+
+vscode-languageserver-types@3.17.5:
+  version "3.17.5"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz#3273676f0cf2eab40b3f44d085acbb7f08a39d8a"
+  integrity sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==
+
+vscode-languageserver@~9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz#500aef82097eb94df90d008678b0b6b5f474015b"
+  integrity sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==
+  dependencies:
+    vscode-languageserver-protocol "3.17.5"
+
+vscode-uri@~3.0.8:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.8.tgz#1770938d3e72588659a172d0fd4642780083ff9f"
+  integrity sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==
+
 warning@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
@@ -11001,11 +11476,6 @@ web-namespaces@^2.0.0:
   resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-2.0.1.tgz#1010ff7c650eccb2592cebeeaf9a1b253fd40692"
   integrity sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==
 
-web-worker@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/web-worker/-/web-worker-1.3.0.tgz#e5f2df5c7fe356755a5fb8f8410d4312627e6776"
-  integrity sha512-BSR9wyRsy/KOValMgd5kMyr3JzpdeoR9KVId8u5GVlTTAtNChlsE4yTxeY7zMdNSyOmoKBv8NH2qeRY9Tg+IaA==
-
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"

From e9c8ddce94f2a6c54e8b407037a99f688eb1f37d Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 21 Aug 2025 10:35:04 -0700
Subject: [PATCH 053/394] Add -moduledoc and -doc to the list of possibly
 misspelled attributes

Summary: Add `-moduledoc` and `-doc` to the list.

Reviewed By: jcpetruzza

Differential Revision: D80619815

fbshipit-source-id: 01559b23c9b24dd4b2ae89257e8d064548aa5af0
---
 .../src/diagnostics/misspelled_attribute.rs   | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/crates/ide/src/diagnostics/misspelled_attribute.rs b/crates/ide/src/diagnostics/misspelled_attribute.rs
index dafd2c1e1c..b61d3ac635 100644
--- a/crates/ide/src/diagnostics/misspelled_attribute.rs
+++ b/crates/ide/src/diagnostics/misspelled_attribute.rs
@@ -60,6 +60,7 @@ const KNOWN_ATTRIBUTES: &[&str] = &[
     "include_lib",
     "export_type",
     "behaviour",
+    "moduledoc",
     "callback",
     "dialyzer",
     "behavior",
@@ -81,6 +82,7 @@ const KNOWN_ATTRIBUTES: &[&str] = &[
     "nifs",
     "file",
     "vsn",
+    "doc",
 ];
 
 fn looks_like_misspelling(attr: &Attribute) -> Option<&str> {
@@ -213,4 +215,31 @@ mod tests {
             "didn't expect diagnostic errors in files: {diags:?}"
         );
     }
+
+    #[test]
+    fn test_module_doc() {
+        check_diagnostics(
+            r#"
+    -module(main).
+    -module_doc """
+%%%  ^^^^^^^^^^ 💡 error: misspelled attribute, saw 'module_doc' but expected 'moduledoc'
+    Hola
+    """.
+            "#,
+        );
+    }
+
+    #[test]
+    fn test_docs() {
+        check_diagnostics(
+            r#"
+    -module(main).
+    -docs """
+%%%  ^^^^ 💡 error: misspelled attribute, saw 'docs' but expected 'doc'
+    Hola
+    """.
+    foo() -> ok.
+            "#,
+        );
+    }
 }

From c841e792ed7b93856bff22d964491f12bedb1d2d Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 21 Aug 2025 11:01:16 -0700
Subject: [PATCH 054/394] Bump nodejs 18 -> 20

Summary: This should bring CI green again.

Reviewed By: TD5

Differential Revision: D80709800

fbshipit-source-id: 8c6f336d4e89cb567778987002f80ef8e9ab15f4
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d61805218c..1a42ba2e3c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -143,7 +143,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
       - name: Install VSCE
         run: npm install -g vsce
       - name: Prepare VS Code Extension to host binaries

From 90a3b84cc1a7ca54c1d413bb347be7925b3be21d Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 22 Aug 2025 02:39:38 -0700
Subject: [PATCH 055/394] Fix clippy warnings

Summary: Apply clippy suggestions. All occurrences relate to the [let chains](https://blog.rust-lang.org/2025/06/26/Rust-1.88.0/#let-chains) introduced in Rust 1.88. Remaining issues will be addressed in a follow-up.

Reviewed By: TD5

Differential Revision: D80718884

fbshipit-source-id: 9fb291bbcf7ef4a49c8d630288eae5d485c267cd
---
 crates/base_db/src/fixture.rs                 |    8 +-
 crates/base_db/src/lib.rs                     |   17 +-
 crates/elp/src/bin/args.rs                    |   10 +-
 crates/elp/src/bin/build_info_cli.rs          |   14 +-
 crates/elp/src/bin/explain_cli.rs             |   10 +-
 crates/elp/src/bin/glean.rs                   |  135 +-
 crates/elp/src/bin/lint_cli.rs                |   11 +-
 crates/elp/src/build/load.rs                  |   14 +-
 crates/elp/src/handlers.rs                    |   66 +-
 crates/elp/src/server.rs                      |   66 +-
 crates/elp/src/to_proto.rs                    |  100 +-
 crates/eqwalizer/src/ast/convert.rs           | 2422 ++++++++---------
 crates/eqwalizer/src/ast/mod.rs               |   23 +-
 crates/eqwalizer/src/ast/preprocess.rs        |   59 +-
 crates/hir/src/body/lower.rs                  |    8 +-
 crates/hir/src/body/tree_print.rs             |    8 +-
 crates/hir/src/code_complexity.rs             |    8 +-
 crates/hir/src/edoc.rs                        |   57 +-
 crates/hir/src/module_data.rs                 |   16 +-
 crates/hir/src/sema.rs                        |   62 +-
 crates/hir/src/sema/to_def.rs                 |    2 +-
 crates/ide/src/call_hierarchy.rs              |   35 +-
 crates/ide/src/codemod_helpers.rs             |   98 +-
 crates/ide/src/common_test.rs                 |   59 +-
 crates/ide/src/diagnostics.rs                 |   35 +-
 .../ide/src/diagnostics/boolean_precedence.rs |   78 +-
 .../ide/src/diagnostics/dependent_header.rs   |   21 +-
 .../src/diagnostics/deprecated_function.rs    |   24 +-
 crates/ide/src/diagnostics/edoc.rs            |   20 +-
 .../src/diagnostics/effect_free_statement.rs  |   18 +-
 .../eqwalizer_assists/expected_type.rs        |   32 +-
 .../eqwalizer_assists/unexported_type.rs      |   54 +-
 .../diagnostics/macro_precedence_suprise.rs   |   49 +-
 .../ide/src/diagnostics/map_find_to_syntax.rs |    8 +-
 .../diagnostics/map_insertion_to_syntax.rs    |   27 +-
 .../ide/src/diagnostics/mutable_variable.rs   |   55 +-
 .../src/diagnostics/no_dialyzer_attribute.rs  |    8 +-
 .../src/diagnostics/no_nowarn_suppressions.rs |    5 +-
 .../nonstandard_integer_formatting.rs         |   21 +-
 .../ide/src/diagnostics/record_tuple_match.rs |   23 +-
 .../src/diagnostics/redundant_assignment.rs   |   31 +-
 crates/ide/src/diagnostics/replace_call.rs    |   53 +-
 crates/ide/src/diagnostics/replace_in_spec.rs |   98 +-
 .../src/diagnostics/undocumented_function.rs  |    9 +-
 .../src/diagnostics/unused_function_args.rs   |   48 +-
 crates/ide/src/doc_links/otp_links.rs         |   24 +-
 crates/ide/src/extend_selection.rs            |   35 +-
 crates/ide/src/highlight_related.rs           |   16 +-
 crates/ide/src/inlay_hints/param_name.rs      |   39 +-
 crates/ide/src/runnables.rs                   |    8 +-
 crates/ide/src/signature_help.rs              |  109 +-
 crates/ide/src/syntax_highlighting.rs         |   48 +-
 .../src/handlers/bump_variables.rs            |   16 +-
 .../src/handlers/create_function.rs           |   90 +-
 .../src/handlers/inline_function.rs           |   57 +-
 crates/ide_assists/src/helpers.rs             |   40 +-
 crates/ide_completion/src/ctx.rs              |   16 +-
 crates/ide_completion/src/spec.rs             |   22 +-
 crates/ide_db/src/defs.rs                     |    8 +-
 crates/ide_db/src/metadata.rs                 |   33 +-
 crates/ide_db/src/rename.rs                   |    8 +-
 crates/ide_db/src/search.rs                   |   36 +-
 crates/ide_ssr/src/lib.rs                     |   70 +-
 crates/ide_ssr/src/matching.rs                |  115 +-
 crates/project_model/src/buck.rs              |   99 +-
 crates/project_model/src/test_fixture.rs      |   22 +-
 crates/syntax/src/lib.rs                      |   10 +-
 crates/syntax/src/ted.rs                      |   16 +-
 68 files changed, 2421 insertions(+), 2541 deletions(-)

diff --git a/crates/base_db/src/fixture.rs b/crates/base_db/src/fixture.rs
index e6db02c361..574e56e036 100644
--- a/crates/base_db/src/fixture.rs
+++ b/crates/base_db/src/fixture.rs
@@ -199,10 +199,10 @@ impl ChangeFixture {
 
             let app_name = entry.app_data.name.clone();
 
-            if let Some(otp_extra) = entry.otp {
-                if otp.is_none() {
-                    otp = Some(otp_extra);
-                }
+            if let Some(otp_extra) = entry.otp
+                && otp.is_none()
+            {
+                otp = Some(otp_extra);
             }
             app_map.combine(entry.app_data);
 
diff --git a/crates/base_db/src/lib.rs b/crates/base_db/src/lib.rs
index 04b258f2cd..aea2c413a1 100644
--- a/crates/base_db/src/lib.rs
+++ b/crates/base_db/src/lib.rs
@@ -264,16 +264,13 @@ fn module_index(db: &dyn SourceDatabase, project_id: ProjectId) -> Arc<ModuleInd
     for &source_root_id in &project_data.source_roots {
         let source_root = db.source_root(source_root_id);
         for file_id in source_root.iter() {
-            if db.file_kind(file_id).is_module() {
-                if let Some(app_data) = db.file_app_data(file_id) {
-                    if let Some((file_id, file_source, path)) =
-                        source_root.file_info(file_id, &app_data)
-                    {
-                        if let Some((name, Some("erl"))) = path.name_and_extension() {
-                            builder.insert(file_id, file_source, ModuleName::new(name));
-                        }
-                    }
-                }
+            if db.file_kind(file_id).is_module()
+                && let Some(app_data) = db.file_app_data(file_id)
+                && let Some((file_id, file_source, path)) =
+                    source_root.file_info(file_id, &app_data)
+                && let Some((name, Some("erl"))) = path.name_and_extension()
+            {
+                builder.insert(file_id, file_source, ModuleName::new(name));
             }
         }
     }
diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index 5a26dfb111..ecb0e2504f 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -589,11 +589,11 @@ fn module_completer(input: &String) -> Vec<(String, Option<String>)> {
             potential_path = path.parent();
             continue;
         } else {
-            if let Ok(content) = fs::read_to_string(file_path) {
-                if let Ok(config) = toml::from_str::<ModuleConfig>(&content) {
-                    for module_name in config.modules.into_iter() {
-                        modules.push(module_name)
-                    }
+            if let Ok(content) = fs::read_to_string(file_path)
+                && let Ok(config) = toml::from_str::<ModuleConfig>(&content)
+            {
+                for module_name in config.modules.into_iter() {
+                    modules.push(module_name)
                 }
             }
             break;
diff --git a/crates/elp/src/bin/build_info_cli.rs b/crates/elp/src/bin/build_info_cli.rs
index 9029927542..d091fc8e90 100644
--- a/crates/elp/src/bin/build_info_cli.rs
+++ b/crates/elp/src/bin/build_info_cli.rs
@@ -63,13 +63,13 @@ pub(crate) fn save_project_info(args: ProjectInfo, query_config: &BuckQueryConfi
         }
     };
 
-    if args.buck_query {
-        if let ProjectBuildData::Buck(buck) = &project.project_build_data {
-            let buck_targets_query = query_buck_targets_bxl(&buck.buck_conf, query_config);
-            writer.write_all(b"================buck targets query raw================\n")?;
-            writer.write_all(format!("{:#?}\n", &buck_targets_query).as_bytes())?;
-        };
-    }
+    if args.buck_query
+        && let ProjectBuildData::Buck(buck) = &project.project_build_data
+    {
+        let buck_targets_query = query_buck_targets_bxl(&buck.buck_conf, query_config);
+        writer.write_all(b"================buck targets query raw================\n")?;
+        writer.write_all(format!("{:#?}\n", &buck_targets_query).as_bytes())?;
+    };
     writer.write_all(b"================manifest================\n")?;
     writer.write_all(format!("{:#?}\n", &manifest).as_bytes())?;
     writer.write_all(b"================project_build_data================\n")?;
diff --git a/crates/elp/src/bin/explain_cli.rs b/crates/elp/src/bin/explain_cli.rs
index 5f00228aa3..feba2f77ba 100644
--- a/crates/elp/src/bin/explain_cli.rs
+++ b/crates/elp/src/bin/explain_cli.rs
@@ -15,11 +15,11 @@ use elp_ide::diagnostics::DiagnosticCode;
 use crate::args::Explain;
 
 pub fn explain(args: &Explain, cli: &mut dyn Cli) -> Result<()> {
-    if let Some(code) = DiagnosticCode::maybe_from_string(&args.code) {
-        if let Some(uri) = DiagnosticCode::as_uri(&code) {
-            let label = code.as_label();
-            return Ok(writeln!(cli, "{uri} ({label})")?);
-        }
+    if let Some(code) = DiagnosticCode::maybe_from_string(&args.code)
+        && let Some(uri) = DiagnosticCode::as_uri(&code)
+    {
+        let label = code.as_label();
+        return Ok(writeln!(cli, "{uri} ({label})")?);
     }
     Ok(writeln!(cli, "Unkwnown code: {}", args.code)?)
 }
diff --git a/crates/elp/src/bin/glean.rs b/crates/elp/src/bin/glean.rs
index 9597e35eff..f9566cb870 100644
--- a/crates/elp/src/bin/glean.rs
+++ b/crates/elp/src/bin/glean.rs
@@ -862,13 +862,13 @@ impl GleanIndexer {
         let project_data = db.project_data(project_id);
         let mut files = vec![];
         for &source_root_id in &project_data.source_roots {
-            if let Some(app_data) = db.app_data(source_root_id) {
-                if app_data.app_type == AppType::App {
-                    let source_root = db.source_root(source_root_id);
-                    for file_id in source_root.iter() {
-                        if let Some(path) = source_root.path_for_file(&file_id) {
-                            files.push((file_id, path.clone()));
-                        }
+            if let Some(app_data) = db.app_data(source_root_id)
+                && app_data.app_type == AppType::App
+            {
+                let source_root = db.source_root(source_root_id);
+                for file_id in source_root.iter() {
+                    if let Some(path) = source_root.path_for_file(&file_id) {
+                        files.push((file_id, path.clone()));
                     }
                 }
             }
@@ -1198,54 +1198,52 @@ impl GleanIndexer {
             vec![],
             &mut |mut acc, ctx| match &ctx.item {
                 hir::AnyExpr::Expr(Expr::Call { target, args }) => {
-                    if let Some((body, _, expr_source)) = ctx.body_with_expr_source(&sema) {
-                        if let Some(range) =
+                    if let Some((body, _, expr_source)) = ctx.body_with_expr_source(&sema)
+                        && let Some(range) =
                             Self::find_range(&sema, &ctx, &source_file, &expr_source)
+                    {
+                        let arity = args.len() as u32;
+                        if let Some(fact) =
+                            Self::resolve_call(&sema, target, arity, file_id, &body, range)
                         {
-                            let arity = args.len() as u32;
-                            if let Some(fact) =
-                                Self::resolve_call(&sema, target, arity, file_id, &body, range)
-                            {
-                                acc.push(fact);
-                            }
+                            acc.push(fact);
                         }
                     }
                     acc
                 }
                 hir::AnyExpr::Expr(Expr::CaptureFun { target, arity }) => {
-                    if let Some((body, range)) = ctx.find_range(&sema) {
-                        if range.file_id == file_id {
-                            let arity: Option<u32> = match &body[*arity] {
-                                Expr::Literal(Literal::Integer(int)) => int.value.try_into().ok(),
-                                _ => None,
-                            };
-                            if let Some(arity) = arity {
-                                if let Some(fact) = Self::resolve_call(
-                                    &sema,
-                                    target,
-                                    arity,
-                                    file_id,
-                                    &body,
-                                    range.range,
-                                ) {
-                                    acc.push(fact);
-                                }
-                            }
+                    if let Some((body, range)) = ctx.find_range(&sema)
+                        && range.file_id == file_id
+                    {
+                        let arity: Option<u32> = match &body[*arity] {
+                            Expr::Literal(Literal::Integer(int)) => int.value.try_into().ok(),
+                            _ => None,
+                        };
+                        if let Some(arity) = arity
+                            && let Some(fact) = Self::resolve_call(
+                                &sema,
+                                target,
+                                arity,
+                                file_id,
+                                &body,
+                                range.range,
+                            )
+                        {
+                            acc.push(fact);
                         }
                     }
                     acc
                 }
                 hir::AnyExpr::TypeExpr(TypeExpr::Call { target, args }) => {
-                    if let Some((body, _, expr_source)) = ctx.body_with_expr_source(&sema) {
-                        if let Some(range) =
+                    if let Some((body, _, expr_source)) = ctx.body_with_expr_source(&sema)
+                        && let Some(range) =
                             Self::find_range(&sema, &ctx, &source_file, &expr_source)
+                    {
+                        let arity = args.len() as u32;
+                        if let Some(fact) =
+                            Self::resolve_type(&sema, target, arity, file_id, &body, range)
                         {
-                            let arity = args.len() as u32;
-                            if let Some(fact) =
-                                Self::resolve_type(&sema, target, arity, file_id, &body, range)
-                            {
-                                acc.push(fact);
-                            }
+                            acc.push(fact);
                         }
                     }
                     acc
@@ -1458,20 +1456,19 @@ impl GleanIndexer {
                         let include = &form_list[*idx];
                         let ast = include.form_id().get_ast(db, file_id);
                         let range = ast.syntax().text_range().into();
-                        if let Some(file) = db.resolve_include(InFile::new(file_id, *idx)) {
-                            if let Some(path) = path_for_file(db, file) {
-                                if let Some((name, Some("hrl"))) = path.name_and_extension() {
-                                    let target = HeaderTarget {
-                                        file_id: file.into(),
-                                        name: format!("{name}.hrl"),
-                                    };
-                                    let xref = XRef {
-                                        source: range,
-                                        target: XRefTarget::Header(target.into()),
-                                    };
-                                    acc.push(xref);
-                                }
-                            }
+                        if let Some(file) = db.resolve_include(InFile::new(file_id, *idx))
+                            && let Some(path) = path_for_file(db, file)
+                            && let Some((name, Some("hrl"))) = path.name_and_extension()
+                        {
+                            let target = HeaderTarget {
+                                file_id: file.into(),
+                                name: format!("{name}.hrl"),
+                            };
+                            let xref = XRef {
+                                source: range,
+                                target: XRefTarget::Header(target.into()),
+                            };
+                            acc.push(xref);
                         }
                     }
                     acc
@@ -1480,20 +1477,20 @@ impl GleanIndexer {
                     let export = &form_list[idx];
                     let ast = export.form_id.get_ast(db, file_id);
                     for fun in ast.funs() {
-                        if let Some(na) = Self::fa_name_arity(&fun) {
-                            if let Some(def) = sema.def_map(file_id).get_function(&na) {
-                                let range = fun.syntax().text_range().into();
-                                let target = FunctionTarget {
-                                    file_id: def.file.file_id.into(),
-                                    name: na.name().to_string(),
-                                    arity: na.arity(),
-                                };
-                                let xref = XRef {
-                                    source: range,
-                                    target: XRefTarget::Function(target.into()),
-                                };
-                                acc.push(xref);
-                            }
+                        if let Some(na) = Self::fa_name_arity(&fun)
+                            && let Some(def) = sema.def_map(file_id).get_function(&na)
+                        {
+                            let range = fun.syntax().text_range().into();
+                            let target = FunctionTarget {
+                                file_id: def.file.file_id.into(),
+                                name: na.name().to_string(),
+                                arity: na.arity(),
+                            };
+                            let xref = XRef {
+                                source: range,
+                                target: XRefTarget::Function(target.into()),
+                            };
+                            acc.push(xref);
                         }
                     }
                     acc
diff --git a/crates/elp/src/bin/lint_cli.rs b/crates/elp/src/bin/lint_cli.rs
index f81cc877e1..2259ca5ce0 100644
--- a/crates/elp/src/bin/lint_cli.rs
+++ b/crates/elp/src/bin/lint_cli.rs
@@ -261,12 +261,11 @@ pub fn do_codemod(
                 do_parse_all(cli, &analysis, &loaded.project_id, diagnostics_config, args)?
             }
             (Some(file_id), Some(name)) => {
-                if let Some(app) = &args.app {
-                    if let Ok(Some(file_app)) = analysis.file_app_name(file_id) {
-                        if file_app != AppName(app.to_string()) {
-                            panic!("Module {} does not belong to app {}", name.as_str(), app)
-                        }
-                    }
+                if let Some(app) = &args.app
+                    && let Ok(Some(file_app)) = analysis.file_app_name(file_id)
+                    && file_app != AppName(app.to_string())
+                {
+                    panic!("Module {} does not belong to app {}", name.as_str(), app)
                 }
                 do_parse_one(&analysis, diagnostics_config, file_id, &name, args)?
                     .map_or(vec![], |x| vec![x])
diff --git a/crates/elp/src/build/load.rs b/crates/elp/src/build/load.rs
index 25a20889c2..cb9cb6570f 100644
--- a/crates/elp/src/build/load.rs
+++ b/crates/elp/src/build/load.rs
@@ -197,13 +197,13 @@ fn load_database(
 
     let changes = vfs.take_changes();
     for (_file_id, file) in changes {
-        if file.exists() {
-            if let vfs::Change::Create(v, _) | vfs::Change::Modify(v, _) = file.change {
-                let document = Document::from_bytes(&v);
-                let (text, line_ending) = document.vfs_to_salsa();
-                db.set_file_text(file.file_id, Arc::from(text));
-                line_ending_map.insert(file.file_id, line_ending);
-            }
+        if file.exists()
+            && let vfs::Change::Create(v, _) | vfs::Change::Modify(v, _) = file.change
+        {
+            let document = Document::from_bytes(&v);
+            let (text, line_ending) = document.vfs_to_salsa();
+            db.set_file_text(file.file_id, Arc::from(text));
+            line_ending_map.insert(file.file_id, line_ending);
         }
     }
 
diff --git a/crates/elp/src/handlers.rs b/crates/elp/src/handlers.rs
index 707d392069..8fa9ef7665 100644
--- a/crates/elp/src/handlers.rs
+++ b/crates/elp/src/handlers.rs
@@ -545,33 +545,33 @@ pub(crate) fn handle_hover(snap: Snapshot, params: HoverParams) -> Result<Option
 
     let mut docs: Vec<(Doc, Option<FileRange>)> = Vec::default();
 
-    if snap.config.types_on_hover() {
-        if let Some(type_info) = snap.analysis.type_at_position(query_range)? {
-            let (ty, range) = &*type_info;
-            let text = &snap.analysis.file_text(range.file_id)?[range.range];
-            let type_doc = Doc::new(format!("```erlang\n{text} :: {ty}\n```\n"));
-            docs.push((type_doc, Some(range.to_owned())));
-            let refs = snap.analysis.type_references(range.file_id, ty)?;
-            if !refs.is_empty() {
-                let goto_list = refs
-                    .into_iter()
-                    .flat_map(|(name, range)| {
-                        to_proto::location(&snap, range)
-                            .map(|loc| {
-                                format!(
-                                    "[{}]({}#L{}-{})",
-                                    name,
-                                    loc.uri,
-                                    loc.range.start.line + 1,
-                                    loc.range.end.line + 1
-                                )
-                            })
-                            .ok()
-                    })
-                    .join(" | ");
-                let goto_docs = Doc::new(format!("Go to: {goto_list}"));
-                docs.push((goto_docs, None));
-            }
+    if snap.config.types_on_hover()
+        && let Some(type_info) = snap.analysis.type_at_position(query_range)?
+    {
+        let (ty, range) = &*type_info;
+        let text = &snap.analysis.file_text(range.file_id)?[range.range];
+        let type_doc = Doc::new(format!("```erlang\n{text} :: {ty}\n```\n"));
+        docs.push((type_doc, Some(range.to_owned())));
+        let refs = snap.analysis.type_references(range.file_id, ty)?;
+        if !refs.is_empty() {
+            let goto_list = refs
+                .into_iter()
+                .flat_map(|(name, range)| {
+                    to_proto::location(&snap, range)
+                        .map(|loc| {
+                            format!(
+                                "[{}]({}#L{}-{})",
+                                name,
+                                loc.uri,
+                                loc.range.start.line + 1,
+                                loc.range.end.line + 1
+                            )
+                        })
+                        .ok()
+                })
+                .join(" | ");
+            let goto_docs = Doc::new(format!("Go to: {goto_list}"));
+            docs.push((goto_docs, None));
         }
     }
 
@@ -844,12 +844,12 @@ pub(crate) fn handle_semantic_tokens_full_delta(
     let mut cache = snap.semantic_tokens_cache.lock();
     let cached_tokens = cache.entry(params.text_document.uri).or_default();
 
-    if let Some(prev_id) = &cached_tokens.result_id {
-        if *prev_id == params.previous_result_id {
-            let delta = to_proto::semantic_token_delta(cached_tokens, &semantic_tokens);
-            *cached_tokens = semantic_tokens;
-            return Ok(Some(delta.into()));
-        }
+    if let Some(prev_id) = &cached_tokens.result_id
+        && *prev_id == params.previous_result_id
+    {
+        let delta = to_proto::semantic_token_delta(cached_tokens, &semantic_tokens);
+        *cached_tokens = semantic_tokens;
+        return Ok(Some(delta.into()));
     }
 
     *cached_tokens = semantic_tokens.clone();
diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index 83d85af49a..d9b7e1ca26 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -382,10 +382,10 @@ impl Server {
         }
 
         while let Some(event) = self.next_event() {
-            if let Event::Lsp(lsp_server::Message::Notification(notif)) = &event {
-                if notif.method == notification::Exit::METHOD {
-                    return Ok(());
-                }
+            if let Event::Lsp(lsp_server::Message::Notification(notif)) = &event
+                && notif.method == notification::Exit::METHOD
+            {
+                return Ok(());
             }
             let _timer1 = timeit_exceeds!("main_loop_health", SLOW_DURATION);
             let _timer2 = timeit_exceeds!(format!("slow_event:{:?}", event), TOO_SLOW_DURATION);
@@ -1027,16 +1027,14 @@ impl Server {
                         .write()
                         .insert(file.file_id, line_endings);
                 }
-                if let Some(path) = vfs.file_path(file.file_id).as_path() {
-                    if let Some(app_data_id) = self.unresolved_app_id_paths.get(&path.to_path_buf())
-                    {
-                        set_app_data_id_by_file(raw_database, file.file_id, *app_data_id);
-                        // This is not really necessary, but we do it
-                        // to be able to check that we resolve them
-                        // all eventually
-                        Arc::make_mut(&mut self.unresolved_app_id_paths)
-                            .remove(&path.to_path_buf());
-                    }
+                if let Some(path) = vfs.file_path(file.file_id).as_path()
+                    && let Some(app_data_id) = self.unresolved_app_id_paths.get(&path.to_path_buf())
+                {
+                    set_app_data_id_by_file(raw_database, file.file_id, *app_data_id);
+                    // This is not really necessary, but we do it
+                    // to be able to check that we resolve them
+                    // all eventually
+                    Arc::make_mut(&mut self.unresolved_app_id_paths).remove(&path.to_path_buf());
                 }
 
                 // causes us to remove stale squiggles from the UI.
@@ -1480,22 +1478,20 @@ impl Server {
 
     fn show_message_request(&mut self, params: ShowMessageRequestParams) {
         self.send_request::<request::ShowMessageRequest>(params, |this, resp| {
-            if let Some(res) = resp.result {
-                if let Ok(hm) = serde_json::from_value::<HashMap<String, String>>(res) {
-                    if let Some(url) = hm.get("URL") {
-                        if let Ok(uri) = Url::from_str(url) {
-                            this.send_request::<request::ShowDocument>(
-                                ShowDocumentParams {
-                                    uri,
-                                    external: Some(true),
-                                    take_focus: Some(true),
-                                    selection: None,
-                                },
-                                |_, _| Ok(()),
-                            );
-                        }
-                    }
-                }
+            if let Some(res) = resp.result
+                && let Ok(hm) = serde_json::from_value::<HashMap<String, String>>(res)
+                && let Some(url) = hm.get("URL")
+                && let Ok(uri) = Url::from_str(url)
+            {
+                this.send_request::<request::ShowDocument>(
+                    ShowDocumentParams {
+                        uri,
+                        external: Some(true),
+                        take_focus: Some(true),
+                        selection: None,
+                    },
+                    |_, _| Ok(()),
+                );
             }
 
             Ok(())
@@ -1581,8 +1577,8 @@ impl Server {
                     if loader.clear(&paths) {
                         for path in paths {
                             let manifest = loader.load_manifest_if_new(&path);
-                            if let Some((elp_config, main, fallback)) = manifest {
-                                if let Ok(project) = Server::load_project_or_fallback(
+                            if let Some((elp_config, main, fallback)) = manifest
+                                && let Ok(project) = Server::load_project_or_fallback(
                                     &path,
                                     elp_config,
                                     main,
@@ -1590,9 +1586,9 @@ impl Server {
                                     &sender,
                                     &query_config,
                                     &spinner,
-                                ) {
-                                    projects.push(project);
-                                }
+                                )
+                            {
+                                projects.push(project);
                             }
                         }
                         log::info!("did reload projects");
diff --git a/crates/elp/src/to_proto.rs b/crates/elp/src/to_proto.rs
index 5bdc9a9b57..1199a64c9c 100644
--- a/crates/elp/src/to_proto.rs
+++ b/crates/elp/src/to_proto.rs
@@ -687,58 +687,58 @@ pub(crate) fn code_lens(
             match project_build_data {
                 ProjectBuildData::Buck(project) => {
                     let file_id = run.nav.file_id;
-                    if let Some(file_path) = snap.file_id_to_path(file_id) {
-                        if let Some(target) = project.target(&file_path) {
-                            let r = buck2_test_runnable(
-                                snap,
-                                run.clone(),
-                                lens_config.buck2_mode.clone(),
-                                target.clone(),
-                                lens_config.run_coverage,
-                            );
-                            if lens_config.run_interactive {
-                                let interactive_r = buck2_run_runnable(snap, run.clone(), target);
-                                match run.kind {
-                                    RunnableKind::Suite { .. } => {
-                                        let run_command = command::open_interactive(
-                                            &interactive_r,
-                                            run_interactive_title,
-                                        );
-                                        acc.push(lsp_types::CodeLens {
-                                            range: annotation_range,
-                                            command: Some(run_command),
-                                            data: None,
-                                        });
-                                    }
-                                    RunnableKind::Test { .. } => {
-                                        let run_command = command::run_interactive(
-                                            &interactive_r,
-                                            run_interactive_title,
-                                        );
-                                        acc.push(lsp_types::CodeLens {
-                                            range: annotation_range,
-                                            command: Some(run_command),
-                                            data: None,
-                                        });
-                                    }
+                    if let Some(file_path) = snap.file_id_to_path(file_id)
+                        && let Some(target) = project.target(&file_path)
+                    {
+                        let r = buck2_test_runnable(
+                            snap,
+                            run.clone(),
+                            lens_config.buck2_mode.clone(),
+                            target.clone(),
+                            lens_config.run_coverage,
+                        );
+                        if lens_config.run_interactive {
+                            let interactive_r = buck2_run_runnable(snap, run.clone(), target);
+                            match run.kind {
+                                RunnableKind::Suite { .. } => {
+                                    let run_command = command::open_interactive(
+                                        &interactive_r,
+                                        run_interactive_title,
+                                    );
+                                    acc.push(lsp_types::CodeLens {
+                                        range: annotation_range,
+                                        command: Some(run_command),
+                                        data: None,
+                                    });
+                                }
+                                RunnableKind::Test { .. } => {
+                                    let run_command = command::run_interactive(
+                                        &interactive_r,
+                                        run_interactive_title,
+                                    );
+                                    acc.push(lsp_types::CodeLens {
+                                        range: annotation_range,
+                                        command: Some(run_command),
+                                        data: None,
+                                    });
                                 }
                             }
-                            if lens_config.run {
-                                let run_command = command::run_single(&r, run_title);
-                                acc.push(lsp_types::CodeLens {
-                                    range: annotation_range,
-                                    command: Some(run_command),
-                                    data: None,
-                                });
-                            }
-                            if lens_config.debug {
-                                let debug_command = command::debug_single(&r, debug_title);
-                                acc.push(lsp_types::CodeLens {
-                                    range: annotation_range,
-                                    command: Some(debug_command),
-                                    data: None,
-                                });
-                            }
+                        }
+                        if lens_config.run {
+                            let run_command = command::run_single(&r, run_title);
+                            acc.push(lsp_types::CodeLens {
+                                range: annotation_range,
+                                command: Some(run_command),
+                                data: None,
+                            });
+                        }
+                        if lens_config.debug {
+                            let debug_command = command::debug_single(&r, debug_title);
+                            acc.push(lsp_types::CodeLens {
+                                range: annotation_range,
+                                command: Some(debug_command),
+                                data: None,
+                            });
                         }
                     }
                 }
diff --git a/crates/eqwalizer/src/ast/convert.rs b/crates/eqwalizer/src/ast/convert.rs
index 5500749d16..fbd1f0e71d 100644
--- a/crates/eqwalizer/src/ast/convert.rs
+++ b/crates/eqwalizer/src/ast/convert.rs
@@ -220,12 +220,11 @@ impl Converter {
                 }
             }
             Term::List(list) => {
-                if let [Term::Tuple(_), Term::Tuple(loc)] = &list.elements[..] {
-                    if let [Term::Atom(eetf::Atom { name }), pos] = &loc.elements[..] {
-                        if name == "location" {
-                            return self.convert_pos(pos);
-                        }
-                    }
+                if let [Term::Tuple(_), Term::Tuple(loc)] = &list.elements[..]
+                    && let [Term::Atom(eetf::Atom { name }), pos] = &loc.elements[..]
+                    && name == "location"
+                {
+                    return self.convert_pos(pos);
                 }
             }
             Term::FixInteger(l) => {
@@ -266,12 +265,11 @@ impl Converter {
     }
 
     fn convert_varname(&self, v: &eetf::Term) -> Result<StringId, ConversionError> {
-        if let Term::Tuple(var) = v {
-            if let [Term::Atom(v), _, Term::Atom(name)] = &var.elements[..] {
-                if v.name == "var" {
-                    return Ok(StringId::from(&name.name));
-                }
-            }
+        if let Term::Tuple(var) = v
+            && let [Term::Atom(v), _, Term::Atom(name)] = &var.elements[..]
+            && v.name == "var"
+        {
+            return Ok(StringId::from(&name.name));
         }
         Err(ConversionError::InvalidVarName)
     }
@@ -332,36 +330,35 @@ impl Converter {
                 }
             }
             ("file", Term::Tuple(file)) => {
-                if let [Term::ByteList(name), line] = &file.elements[..] {
-                    if let Some(line) = self.convert_line(line) {
-                        let filename = std::str::from_utf8(&name.bytes)
-                            .map_err(|_| ConversionError::InvalidFile)?
-                            .into();
-                        self.current_file = Some(filename);
-                        return Ok(Some(ExternalForm::File(FileAttr {
-                            file: filename,
-                            start: line,
-                            pos,
-                        })));
-                    }
+                if let [Term::ByteList(name), line] = &file.elements[..]
+                    && let Some(line) = self.convert_line(line)
+                {
+                    let filename = std::str::from_utf8(&name.bytes)
+                        .map_err(|_| ConversionError::InvalidFile)?
+                        .into();
+                    self.current_file = Some(filename);
+                    return Ok(Some(ExternalForm::File(FileAttr {
+                        file: filename,
+                        start: line,
+                        pos,
+                    })));
                 }
             }
             ("elp_metadata", Term::List(prop_list)) => {
                 for prop in prop_list.elements.iter() {
-                    if let Term::Tuple(prop) = prop {
-                        if let [Term::Atom(tag), Term::List(raw_fixmes)] = &prop.elements[..] {
-                            if tag.name == "eqwalizer_fixmes" {
-                                let fixmes = raw_fixmes
-                                    .elements
-                                    .iter()
-                                    .map(|f| self.convert_fixme(f))
-                                    .collect::<Result<Vec<_>, _>>()?;
-                                return Ok(Some(ExternalForm::ElpMetadata(ElpMetadataAttr {
-                                    pos,
-                                    fixmes,
-                                })));
-                            }
-                        }
+                    if let Term::Tuple(prop) = prop
+                        && let [Term::Atom(tag), Term::List(raw_fixmes)] = &prop.elements[..]
+                        && tag.name == "eqwalizer_fixmes"
+                    {
+                        let fixmes = raw_fixmes
+                            .elements
+                            .iter()
+                            .map(|f| self.convert_fixme(f))
+                            .collect::<Result<Vec<_>, _>>()?;
+                        return Ok(Some(ExternalForm::ElpMetadata(ElpMetadataAttr {
+                            pos,
+                            fixmes,
+                        })));
                     }
                 }
             }
@@ -494,30 +491,29 @@ impl Converter {
     }
 
     fn convert_fixme(&self, fixme: &eetf::Term) -> Result<Fixme, ConversionError> {
-        if let Term::Tuple(data) = fixme {
-            if let [
+        if let Term::Tuple(data) = fixme
+            && let [
                 Term::FixInteger(comment_start),
                 Term::FixInteger(comment_end),
                 Term::FixInteger(suppression_start),
                 Term::FixInteger(suppression_end),
                 Term::Atom(ignore),
             ] = &data.elements[..]
-            {
-                let comment = TextRange {
-                    start_byte: comment_start.value as u32,
-                    end_byte: comment_end.value as u32,
-                };
-                let suppression = TextRange {
-                    start_byte: suppression_start.value as u32,
-                    end_byte: suppression_end.value as u32,
-                };
-                let is_ignore = ignore.name == "true";
-                return Ok(Fixme {
-                    comment,
-                    suppression,
-                    is_ignore,
-                });
-            }
+        {
+            let comment = TextRange {
+                start_byte: comment_start.value as u32,
+                end_byte: comment_end.value as u32,
+            };
+            let suppression = TextRange {
+                start_byte: suppression_start.value as u32,
+                end_byte: suppression_end.value as u32,
+            };
+            let is_ignore = ignore.name == "true";
+            return Ok(Fixme {
+                comment,
+                suppression,
+                is_ignore,
+            });
         }
         Err(ConversionError::InvalidFixme)
     }
@@ -557,36 +553,34 @@ impl Converter {
     }
 
     fn convert_clause(&self, clause: &eetf::Term) -> Result<Clause, ConversionError> {
-        if let Term::Tuple(cl) = clause {
-            if let [
+        if let Term::Tuple(cl) = clause
+            && let [
                 Term::Atom(tag),
                 pos,
                 Term::List(pats),
                 Term::List(guards),
                 Term::List(exprs),
             ] = &cl.elements[..]
-            {
-                if tag.name == "clause" {
-                    let pos = self.convert_pos(pos)?;
-                    let pats = pats
-                        .elements
-                        .iter()
-                        .map(|p| self.convert_pat(p))
-                        .collect::<Result<Vec<_>, _>>()?;
-                    let guards = guards
-                        .elements
-                        .iter()
-                        .map(|g| self.convert_guard(g))
-                        .collect::<Result<Vec<_>, _>>()?;
-                    let exprs = self.convert_exprs(exprs)?;
-                    return Ok(Clause {
-                        pats,
-                        guards,
-                        body: Body { exprs },
-                        pos,
-                    });
-                }
-            }
+            && tag.name == "clause"
+        {
+            let pos = self.convert_pos(pos)?;
+            let pats = pats
+                .elements
+                .iter()
+                .map(|p| self.convert_pat(p))
+                .collect::<Result<Vec<_>, _>>()?;
+            let guards = guards
+                .elements
+                .iter()
+                .map(|g| self.convert_guard(g))
+                .collect::<Result<Vec<_>, _>>()?;
+            let exprs = self.convert_exprs(exprs)?;
+            return Ok(Clause {
+                pats,
+                guards,
+                body: Body { exprs },
+                pos,
+            });
         }
         Err(ConversionError::InvalidClause)
     }
@@ -629,23 +623,21 @@ impl Converter {
     }
 
     fn convert_atom_lit(&self, atom: &eetf::Term) -> Result<StringId, ConversionError> {
-        if let Term::Tuple(data) = atom {
-            if let [Term::Atom(kind), _, Term::Atom(val)] = &data.elements[..] {
-                if kind.name == "atom" {
-                    return Ok(StringId::from(&val.name));
-                }
-            }
+        if let Term::Tuple(data) = atom
+            && let [Term::Atom(kind), _, Term::Atom(val)] = &data.elements[..]
+            && kind.name == "atom"
+        {
+            return Ok(StringId::from(&val.name));
         }
         Err(ConversionError::InvalidAtomLit)
     }
 
     fn convert_int_lit(&self, atom: &eetf::Term) -> Result<i32, ConversionError> {
-        if let Term::Tuple(data) = atom {
-            if let [Term::Atom(kind), _, Term::FixInteger(val)] = &data.elements[..] {
-                if kind.name == "integer" {
-                    return Ok(val.value);
-                }
-            }
+        if let Term::Tuple(data) = atom
+            && let [Term::Atom(kind), _, Term::FixInteger(val)] = &data.elements[..]
+            && kind.name == "integer"
+        {
+            return Ok(val.value);
         }
         Err(ConversionError::InvalidIntLit)
     }
@@ -654,26 +646,26 @@ impl Converter {
         let mut exprs = vec![];
         let mut expr = expr;
         loop {
-            if let Term::Tuple(tuple) = expr {
-                if let [Term::Atom(kind), pos, args @ ..] = &tuple.elements[..] {
-                    match (kind.name.as_str(), args) {
-                        ("cons", [he, te]) => {
-                            let pos = self.convert_pos(pos)?;
-                            let h = self.convert_expr(he)?;
-                            expr = te;
-                            exprs.push((pos, h));
-                            continue;
-                        }
-                        _ => {
-                            let end = self.convert_expr(expr)?;
-                            return Ok(exprs.into_iter().rev().fold(end, |t, (pos, h)| {
-                                Expr::Cons(Cons {
-                                    pos,
-                                    h: Box::new(h),
-                                    t: Box::new(t),
-                                })
-                            }));
-                        }
+            if let Term::Tuple(tuple) = expr
+                && let [Term::Atom(kind), pos, args @ ..] = &tuple.elements[..]
+            {
+                match (kind.name.as_str(), args) {
+                    ("cons", [he, te]) => {
+                        let pos = self.convert_pos(pos)?;
+                        let h = self.convert_expr(he)?;
+                        expr = te;
+                        exprs.push((pos, h));
+                        continue;
+                    }
+                    _ => {
+                        let end = self.convert_expr(expr)?;
+                        return Ok(exprs.into_iter().rev().fold(end, |t, (pos, h)| {
+                            Expr::Cons(Cons {
+                                pos,
+                                h: Box::new(h),
+                                t: Box::new(t),
+                            })
+                        }));
                     }
                 }
             }
@@ -690,490 +682,487 @@ impl Converter {
     }
 
     fn convert_expr(&self, expr: &eetf::Term) -> Result<Expr, ConversionError> {
-        if let Term::Tuple(tuple) = expr {
-            if let [Term::Atom(kind), pos, args @ ..] = &tuple.elements[..] {
-                let pos = self.convert_pos(pos)?;
-                match (kind.name.as_str(), args) {
-                    ("match", [pat, exp]) => {
-                        let pat = self.convert_pat(pat)?;
-                        let expr = self.convert_expr(exp)?;
-                        return Ok(Expr::Match(Match {
-                            pos,
-                            pat,
-                            expr: Box::new(expr),
-                        }));
-                    }
-                    ("var", [Term::Atom(name)]) => {
-                        return Ok(Expr::Var(Var {
-                            pos,
-                            n: StringId::from(&name.name),
-                        }));
-                    }
-                    ("tuple", [Term::List(exps)]) => {
-                        let elems = self.convert_exprs(exps)?;
-                        return Ok(Expr::Tuple(Tuple { pos, elems }));
-                    }
-                    ("nil", []) => {
-                        return Ok(Expr::NilLit(NilLit { pos }));
-                    }
-                    ("cons", _) => {
-                        return self.convert_cons(expr);
-                    }
-                    ("bin", [Term::List(bin_elems)]) => {
-                        let elems = bin_elems
+        if let Term::Tuple(tuple) = expr
+            && let [Term::Atom(kind), pos, args @ ..] = &tuple.elements[..]
+        {
+            let pos = self.convert_pos(pos)?;
+            match (kind.name.as_str(), args) {
+                ("match", [pat, exp]) => {
+                    let pat = self.convert_pat(pat)?;
+                    let expr = self.convert_expr(exp)?;
+                    return Ok(Expr::Match(Match {
+                        pos,
+                        pat,
+                        expr: Box::new(expr),
+                    }));
+                }
+                ("var", [Term::Atom(name)]) => {
+                    return Ok(Expr::Var(Var {
+                        pos,
+                        n: StringId::from(&name.name),
+                    }));
+                }
+                ("tuple", [Term::List(exps)]) => {
+                    let elems = self.convert_exprs(exps)?;
+                    return Ok(Expr::Tuple(Tuple { pos, elems }));
+                }
+                ("nil", []) => {
+                    return Ok(Expr::NilLit(NilLit { pos }));
+                }
+                ("cons", _) => {
+                    return self.convert_cons(expr);
+                }
+                ("bin", [Term::List(bin_elems)]) => {
+                    let elems = bin_elems
+                        .elements
+                        .iter()
+                        .map(|e| self.convert_binary_elem(e))
+                        .collect::<Result<Vec<_>, _>>()?;
+                    return Ok(Expr::Binary(Binary { pos, elems }));
+                }
+                ("op", [Term::Atom(op), e1, e2]) => {
+                    let arg_1 = self.convert_expr(e1)?;
+                    let arg_2 = self.convert_expr(e2)?;
+                    return Ok(Expr::BinOp(BinOp {
+                        pos,
+                        op: StringId::from(&op.name),
+                        arg_1: Box::new(arg_1),
+                        arg_2: Box::new(arg_2),
+                    }));
+                }
+                ("op", [Term::Atom(op), e]) => {
+                    let arg = self.convert_expr(e)?;
+                    return Ok(Expr::UnOp(UnOp {
+                        pos,
+                        op: StringId::from(&op.name),
+                        arg: Box::new(arg),
+                    }));
+                }
+                ("record", [Term::Atom(name), Term::List(fields)]) => {
+                    return Ok(Expr::RecordCreate(RecordCreate {
+                        pos,
+                        rec_name: StringId::from(&name.name),
+                        fields: fields
                             .elements
                             .iter()
-                            .map(|e| self.convert_binary_elem(e))
-                            .collect::<Result<Vec<_>, _>>()?;
-                        return Ok(Expr::Binary(Binary { pos, elems }));
-                    }
-                    ("op", [Term::Atom(op), e1, e2]) => {
-                        let arg_1 = self.convert_expr(e1)?;
-                        let arg_2 = self.convert_expr(e2)?;
-                        return Ok(Expr::BinOp(BinOp {
-                            pos,
-                            op: StringId::from(&op.name),
-                            arg_1: Box::new(arg_1),
-                            arg_2: Box::new(arg_2),
-                        }));
-                    }
-                    ("op", [Term::Atom(op), e]) => {
-                        let arg = self.convert_expr(e)?;
-                        return Ok(Expr::UnOp(UnOp {
-                            pos,
-                            op: StringId::from(&op.name),
-                            arg: Box::new(arg),
-                        }));
-                    }
-                    ("record", [Term::Atom(name), Term::List(fields)]) => {
-                        return Ok(Expr::RecordCreate(RecordCreate {
-                            pos,
-                            rec_name: StringId::from(&name.name),
-                            fields: fields
-                                .elements
-                                .iter()
-                                .map(|f| self.convert_rec_field_expr(f))
-                                .collect::<Result<Vec<_>, _>>()?,
-                        }));
-                    }
-                    ("record", [expr, Term::Atom(name), Term::List(fields)]) => {
-                        return Ok(Expr::RecordUpdate(RecordUpdate {
-                            pos,
-                            expr: Box::new(self.convert_expr(expr)?),
-                            rec_name: StringId::from(&name.name),
-                            fields: fields
-                                .elements
-                                .iter()
-                                .map(|f| match self.convert_rec_field_expr(f) {
-                                    Ok(RecordField::RecordFieldNamed(field)) => Ok(field),
-                                    _ => Err(ConversionError::InvalidRecordUpdateField),
-                                })
-                                .collect::<Result<Vec<RecordFieldNamed>, ConversionError>>()?,
-                        }));
-                    }
-                    ("record_index", [Term::Atom(name), field]) => {
-                        return Ok(Expr::RecordIndex(RecordIndex {
-                            pos,
-                            rec_name: StringId::from(&name.name),
-                            field_name: self.convert_atom_lit(field)?,
-                        }));
-                    }
-                    ("record_field", [expr, Term::Atom(name), field]) => {
-                        return Ok(Expr::RecordSelect(RecordSelect {
-                            pos,
-                            expr: Box::new(self.convert_expr(expr)?),
-                            rec_name: StringId::from(&name.name),
-                            field_name: self.convert_atom_lit(field)?,
-                        }));
-                    }
-                    ("map", [Term::List(assocs)]) => {
-                        return Ok(Expr::MapCreate(MapCreate {
-                            pos,
-                            kvs: assocs
-                                .elements
-                                .iter()
-                                .map(|kv| self.convert_create_kv(kv))
-                                .collect::<Result<Vec<_>, _>>()?,
-                        }));
-                    }
-                    ("map", [expr, Term::List(assocs)]) => {
-                        let map = self.convert_expr(expr)?;
-                        return Ok(Expr::MapUpdate(MapUpdate {
-                            pos,
-                            map: Box::new(map),
-                            kvs: assocs
-                                .elements
-                                .iter()
-                                .map(|kv| self.convert_kv(kv))
-                                .collect::<Result<Vec<_>, _>>()?,
-                        }));
-                    }
-                    ("catch", [expr]) => {
-                        return Ok(Expr::Catch(Catch {
-                            pos,
-                            expr: Box::new(self.convert_expr(expr)?),
-                        }));
-                    }
-                    ("call", [expr, Term::List(args)]) => {
-                        let args: Vec<Expr> = self.convert_exprs(args)?;
-                        let arity = args.len() as u32;
-                        if let Term::Tuple(call) = expr {
-                            match &call.elements[..] {
-                                [Term::Atom(remote), _, m, f] if remote.name == "remote" => {
-                                    if let (Ok(m), Ok(f)) =
-                                        (self.convert_atom_lit(m), self.convert_atom_lit(f))
-                                    {
-                                        let id = RemoteId {
-                                            module: m,
-                                            name: f,
-                                            arity,
-                                        };
-                                        return Ok(Expr::RemoteCall(RemoteCall { pos, id, args }));
-                                    }
+                            .map(|f| self.convert_rec_field_expr(f))
+                            .collect::<Result<Vec<_>, _>>()?,
+                    }));
+                }
+                ("record", [expr, Term::Atom(name), Term::List(fields)]) => {
+                    return Ok(Expr::RecordUpdate(RecordUpdate {
+                        pos,
+                        expr: Box::new(self.convert_expr(expr)?),
+                        rec_name: StringId::from(&name.name),
+                        fields: fields
+                            .elements
+                            .iter()
+                            .map(|f| match self.convert_rec_field_expr(f) {
+                                Ok(RecordField::RecordFieldNamed(field)) => Ok(field),
+                                _ => Err(ConversionError::InvalidRecordUpdateField),
+                            })
+                            .collect::<Result<Vec<RecordFieldNamed>, ConversionError>>()?,
+                    }));
+                }
+                ("record_index", [Term::Atom(name), field]) => {
+                    return Ok(Expr::RecordIndex(RecordIndex {
+                        pos,
+                        rec_name: StringId::from(&name.name),
+                        field_name: self.convert_atom_lit(field)?,
+                    }));
+                }
+                ("record_field", [expr, Term::Atom(name), field]) => {
+                    return Ok(Expr::RecordSelect(RecordSelect {
+                        pos,
+                        expr: Box::new(self.convert_expr(expr)?),
+                        rec_name: StringId::from(&name.name),
+                        field_name: self.convert_atom_lit(field)?,
+                    }));
+                }
+                ("map", [Term::List(assocs)]) => {
+                    return Ok(Expr::MapCreate(MapCreate {
+                        pos,
+                        kvs: assocs
+                            .elements
+                            .iter()
+                            .map(|kv| self.convert_create_kv(kv))
+                            .collect::<Result<Vec<_>, _>>()?,
+                    }));
+                }
+                ("map", [expr, Term::List(assocs)]) => {
+                    let map = self.convert_expr(expr)?;
+                    return Ok(Expr::MapUpdate(MapUpdate {
+                        pos,
+                        map: Box::new(map),
+                        kvs: assocs
+                            .elements
+                            .iter()
+                            .map(|kv| self.convert_kv(kv))
+                            .collect::<Result<Vec<_>, _>>()?,
+                    }));
+                }
+                ("catch", [expr]) => {
+                    return Ok(Expr::Catch(Catch {
+                        pos,
+                        expr: Box::new(self.convert_expr(expr)?),
+                    }));
+                }
+                ("call", [expr, Term::List(args)]) => {
+                    let args: Vec<Expr> = self.convert_exprs(args)?;
+                    let arity = args.len() as u32;
+                    if let Term::Tuple(call) = expr {
+                        match &call.elements[..] {
+                            [Term::Atom(remote), _, m, f] if remote.name == "remote" => {
+                                if let (Ok(m), Ok(f)) =
+                                    (self.convert_atom_lit(m), self.convert_atom_lit(f))
+                                {
+                                    let id = RemoteId {
+                                        module: m,
+                                        name: f,
+                                        arity,
+                                    };
+                                    return Ok(Expr::RemoteCall(RemoteCall { pos, id, args }));
                                 }
-                                [Term::Atom(atom), _, Term::Atom(fname)] if atom.name == "atom" => {
-                                    let local_id = Id {
+                            }
+                            [Term::Atom(atom), _, Term::Atom(fname)] if atom.name == "atom" => {
+                                let local_id = Id {
+                                    name: StringId::from(&fname.name),
+                                    arity,
+                                };
+                                if compiler_macro::is_compiler_macro(&local_id) {
+                                    let remote_id = RemoteId {
+                                        module: *compiler_macro::FAKE_MODULE,
                                         name: StringId::from(&fname.name),
                                         arity,
                                     };
-                                    if compiler_macro::is_compiler_macro(&local_id) {
-                                        let remote_id = RemoteId {
-                                            module: *compiler_macro::FAKE_MODULE,
-                                            name: StringId::from(&fname.name),
-                                            arity,
-                                        };
-                                        return Ok(Expr::RemoteCall(RemoteCall {
-                                            pos,
-                                            id: remote_id,
-                                            args,
-                                        }));
-                                    } else if auto_import::is_auto_imported(&local_id)
-                                        && !self.no_auto_imports.contains(&local_id)
-                                    {
-                                        let remote_id = RemoteId {
-                                            module: *ERLANG,
-                                            name: StringId::from(&fname.name),
-                                            arity,
-                                        };
-                                        return Ok(Expr::RemoteCall(RemoteCall {
-                                            pos,
-                                            id: remote_id,
-                                            args,
-                                        }));
-                                    } else {
-                                        return Ok(Expr::LocalCall(LocalCall {
-                                            pos,
-                                            id: local_id,
-                                            args,
-                                        }));
-                                    }
-                                }
-                                _ => (),
-                            }
-                        }
-                        return Ok(Expr::DynCall(DynCall {
-                            pos,
-                            f: Box::new(self.convert_expr(expr)?),
-                            args,
-                        }));
-                    }
-                    ("lc", [template, Term::List(qualifiers)]) => {
-                        return Ok(Expr::LComprehension(LComprehension {
-                            pos,
-                            template: Box::new(self.convert_expr(template)?),
-                            qualifiers: qualifiers
-                                .elements
-                                .iter()
-                                .map(|q| self.convert_qualifier(q))
-                                .collect::<Result<Vec<_>, _>>()?,
-                        }));
-                    }
-                    ("bc", [template, Term::List(qualifiers)]) => {
-                        return Ok(Expr::BComprehension(BComprehension {
-                            pos,
-                            template: Box::new(self.convert_expr(template)?),
-                            qualifiers: qualifiers
-                                .elements
-                                .iter()
-                                .map(|q| self.convert_qualifier(q))
-                                .collect::<Result<Vec<_>, _>>()?,
-                        }));
-                    }
-                    ("mc", [template, Term::List(qualifiers)]) => {
-                        let (k_template, v_template) = self.convert_create_kv(template)?;
-                        return Ok(Expr::MComprehension(MComprehension {
-                            pos,
-                            k_template: Box::new(k_template),
-                            v_template: Box::new(v_template),
-                            qualifiers: qualifiers
-                                .elements
-                                .iter()
-                                .map(|q| self.convert_qualifier(q))
-                                .collect::<Result<Vec<_>, _>>()?,
-                        }));
-                    }
-                    ("block", [Term::List(exps)]) => {
-                        return Ok(Expr::Block(Block {
-                            pos,
-                            body: Body {
-                                exprs: self.convert_exprs(exps)?,
-                            },
-                        }));
-                    }
-                    ("if", [Term::List(clauses)]) => {
-                        return Ok(Expr::If(If {
-                            pos,
-                            clauses: self.convert_clauses(clauses)?,
-                        }));
-                    }
-                    ("case", [expr, Term::List(clauses)]) => {
-                        return Ok(Expr::Case(Case {
-                            pos,
-                            expr: Box::new(self.convert_expr(expr)?),
-                            clauses: self.convert_clauses(clauses)?,
-                        }));
-                    }
-                    (
-                        "try",
-                        [
-                            Term::List(body),
-                            Term::List(try_clauses),
-                            Term::List(catch_clauses),
-                            Term::List(after),
-                        ],
-                    ) => {
-                        let try_body = Body {
-                            exprs: self.convert_exprs(body)?,
-                        };
-                        let try_clauses: Vec<Clause> = self.convert_clauses(try_clauses)?;
-                        let catch_clauses = self.convert_clauses(catch_clauses)?;
-                        let after: Vec<Expr> = self.convert_exprs(after)?;
-                        let after_body = if after.is_empty() {
-                            None
-                        } else {
-                            Some(Body { exprs: after })
-                        };
-                        if try_clauses.is_empty() {
-                            return Ok(Expr::TryCatchExpr(TryCatchExpr {
-                                pos,
-                                try_body,
-                                catch_clauses,
-                                after_body,
-                            }));
-                        } else {
-                            return Ok(Expr::TryOfCatchExpr(TryOfCatchExpr {
-                                pos,
-                                try_clauses,
-                                try_body,
-                                catch_clauses,
-                                after_body,
-                            }));
-                        }
-                    }
-                    ("receive", [Term::List(clauses)]) => {
-                        return Ok(Expr::Receive(Receive {
-                            pos,
-                            clauses: self.convert_clauses(clauses)?,
-                        }));
-                    }
-                    ("receive", [Term::List(clauses), timeout, Term::List(defaults)]) => {
-                        let timeout_exprs = self.convert_exprs(defaults)?;
-                        let timeout_body = Body {
-                            exprs: timeout_exprs,
-                        };
-                        return Ok(Expr::ReceiveWithTimeout(ReceiveWithTimeout {
-                            pos,
-                            clauses: self.convert_clauses(clauses)?,
-                            timeout: Box::new(self.convert_expr(timeout)?),
-                            timeout_body,
-                        }));
-                    }
-                    ("fun", [Term::Tuple(decl)]) => match &decl.elements[..] {
-                        [Term::Atom(kind), Term::List(clauses)] if kind.name == "clauses" => {
-                            return Ok(Expr::Lambda(Lambda {
-                                pos,
-                                clauses: self.convert_clauses(clauses)?,
-                                name: None,
-                            }));
-                        }
-                        [Term::Atom(kind), Term::Atom(name), Term::FixInteger(arity)]
-                            if kind.name == "function" =>
-                        {
-                            let name = StringId::from(&name.name);
-                            let local_id = Id {
-                                name,
-                                arity: arity.value as u32,
-                            };
-                            if auto_import::is_auto_imported(&local_id)
-                                && !self.no_auto_imports.contains(&local_id)
-                            {
-                                let remote_id = RemoteId {
-                                    module: *ERLANG,
-                                    name,
-                                    arity: arity.value as u32,
-                                };
-                                return Ok(Expr::RemoteFun(RemoteFun { pos, id: remote_id }));
-                            } else {
-                                return Ok(Expr::LocalFun(LocalFun { pos, id: local_id }));
-                            }
-                        }
-                        [Term::Atom(kind), module, name, arity] if kind.name == "function" => {
-                            match (
-                                self.convert_atom_lit(module),
-                                self.convert_atom_lit(name),
-                                self.convert_int_lit(arity),
-                            ) {
-                                (Ok(module), Ok(name), Ok(arity)) => {
-                                    let remote_id = RemoteId {
-                                        module,
-                                        name,
-                                        arity: arity as u32,
-                                    };
-                                    return Ok(Expr::RemoteFun(RemoteFun { pos, id: remote_id }));
-                                }
-                                _ => {
-                                    return Ok(Expr::DynRemoteFunArity(DynRemoteFunArity {
+                                    return Ok(Expr::RemoteCall(RemoteCall {
                                         pos,
-                                        module: Box::new(self.convert_expr(module)?),
-                                        name: Box::new(self.convert_expr(name)?),
-                                        arity: Box::new(self.convert_expr(arity)?),
+                                        id: remote_id,
+                                        args,
+                                    }));
+                                } else if auto_import::is_auto_imported(&local_id)
+                                    && !self.no_auto_imports.contains(&local_id)
+                                {
+                                    let remote_id = RemoteId {
+                                        module: *ERLANG,
+                                        name: StringId::from(&fname.name),
+                                        arity,
+                                    };
+                                    return Ok(Expr::RemoteCall(RemoteCall {
+                                        pos,
+                                        id: remote_id,
+                                        args,
+                                    }));
+                                } else {
+                                    return Ok(Expr::LocalCall(LocalCall {
+                                        pos,
+                                        id: local_id,
+                                        args,
                                     }));
                                 }
                             }
+                            _ => (),
                         }
-                        _ => (),
-                    },
-                    ("named_fun", [Term::Atom(name), Term::List(clauses)]) => {
+                    }
+                    return Ok(Expr::DynCall(DynCall {
+                        pos,
+                        f: Box::new(self.convert_expr(expr)?),
+                        args,
+                    }));
+                }
+                ("lc", [template, Term::List(qualifiers)]) => {
+                    return Ok(Expr::LComprehension(LComprehension {
+                        pos,
+                        template: Box::new(self.convert_expr(template)?),
+                        qualifiers: qualifiers
+                            .elements
+                            .iter()
+                            .map(|q| self.convert_qualifier(q))
+                            .collect::<Result<Vec<_>, _>>()?,
+                    }));
+                }
+                ("bc", [template, Term::List(qualifiers)]) => {
+                    return Ok(Expr::BComprehension(BComprehension {
+                        pos,
+                        template: Box::new(self.convert_expr(template)?),
+                        qualifiers: qualifiers
+                            .elements
+                            .iter()
+                            .map(|q| self.convert_qualifier(q))
+                            .collect::<Result<Vec<_>, _>>()?,
+                    }));
+                }
+                ("mc", [template, Term::List(qualifiers)]) => {
+                    let (k_template, v_template) = self.convert_create_kv(template)?;
+                    return Ok(Expr::MComprehension(MComprehension {
+                        pos,
+                        k_template: Box::new(k_template),
+                        v_template: Box::new(v_template),
+                        qualifiers: qualifiers
+                            .elements
+                            .iter()
+                            .map(|q| self.convert_qualifier(q))
+                            .collect::<Result<Vec<_>, _>>()?,
+                    }));
+                }
+                ("block", [Term::List(exps)]) => {
+                    return Ok(Expr::Block(Block {
+                        pos,
+                        body: Body {
+                            exprs: self.convert_exprs(exps)?,
+                        },
+                    }));
+                }
+                ("if", [Term::List(clauses)]) => {
+                    return Ok(Expr::If(If {
+                        pos,
+                        clauses: self.convert_clauses(clauses)?,
+                    }));
+                }
+                ("case", [expr, Term::List(clauses)]) => {
+                    return Ok(Expr::Case(Case {
+                        pos,
+                        expr: Box::new(self.convert_expr(expr)?),
+                        clauses: self.convert_clauses(clauses)?,
+                    }));
+                }
+                (
+                    "try",
+                    [
+                        Term::List(body),
+                        Term::List(try_clauses),
+                        Term::List(catch_clauses),
+                        Term::List(after),
+                    ],
+                ) => {
+                    let try_body = Body {
+                        exprs: self.convert_exprs(body)?,
+                    };
+                    let try_clauses: Vec<Clause> = self.convert_clauses(try_clauses)?;
+                    let catch_clauses = self.convert_clauses(catch_clauses)?;
+                    let after: Vec<Expr> = self.convert_exprs(after)?;
+                    let after_body = if after.is_empty() {
+                        None
+                    } else {
+                        Some(Body { exprs: after })
+                    };
+                    if try_clauses.is_empty() {
+                        return Ok(Expr::TryCatchExpr(TryCatchExpr {
+                            pos,
+                            try_body,
+                            catch_clauses,
+                            after_body,
+                        }));
+                    } else {
+                        return Ok(Expr::TryOfCatchExpr(TryOfCatchExpr {
+                            pos,
+                            try_clauses,
+                            try_body,
+                            catch_clauses,
+                            after_body,
+                        }));
+                    }
+                }
+                ("receive", [Term::List(clauses)]) => {
+                    return Ok(Expr::Receive(Receive {
+                        pos,
+                        clauses: self.convert_clauses(clauses)?,
+                    }));
+                }
+                ("receive", [Term::List(clauses), timeout, Term::List(defaults)]) => {
+                    let timeout_exprs = self.convert_exprs(defaults)?;
+                    let timeout_body = Body {
+                        exprs: timeout_exprs,
+                    };
+                    return Ok(Expr::ReceiveWithTimeout(ReceiveWithTimeout {
+                        pos,
+                        clauses: self.convert_clauses(clauses)?,
+                        timeout: Box::new(self.convert_expr(timeout)?),
+                        timeout_body,
+                    }));
+                }
+                ("fun", [Term::Tuple(decl)]) => match &decl.elements[..] {
+                    [Term::Atom(kind), Term::List(clauses)] if kind.name == "clauses" => {
                         return Ok(Expr::Lambda(Lambda {
                             pos,
                             clauses: self.convert_clauses(clauses)?,
-                            name: Some(StringId::from(&name.name)),
+                            name: None,
                         }));
                     }
-                    ("atom", [Term::Atom(value)]) => {
-                        return Ok(Expr::AtomLit(AtomLit {
-                            pos,
-                            s: StringId::from(&value.name),
-                        }));
-                    }
-                    ("float", [Term::Float(_)]) => {
-                        return Ok(Expr::FloatLit(FloatLit { pos }));
-                    }
-                    ("char" | "integer", [Term::BigInteger(_)]) => {
-                        return Ok(Expr::IntLit(IntLit { pos, value: None }));
-                    }
-                    ("char" | "integer", [Term::FixInteger(value)]) => {
-                        return Ok(Expr::IntLit(IntLit {
-                            pos,
-                            value: Some(value.value),
-                        }));
-                    }
-                    ("string", [Term::List(elems)]) if elems.is_nil() => {
-                        return Ok(Expr::StringLit(StringLit { pos, empty: true }));
-                    }
-                    ("string", [_]) => {
-                        return Ok(Expr::StringLit(StringLit { pos, empty: false }));
-                    }
-                    ("remote", [module, name]) => {
-                        return Ok(Expr::DynRemoteFun(DynRemoteFun {
-                            pos,
-                            module: Box::new(self.convert_expr(module)?),
-                            name: Box::new(self.convert_expr(name)?),
-                        }));
-                    }
-                    ("maybe", [Term::List(exprs)]) => {
-                        return Ok(Expr::Maybe(Maybe {
-                            pos,
-                            body: Body {
-                                exprs: self.convert_exprs(exprs)?,
-                            },
-                        }));
-                    }
-                    ("maybe", [Term::List(exprs), Term::Tuple(m_else)]) => {
-                        if let [Term::Atom(at_else), _, Term::List(clauses)] = &m_else.elements[..]
+                    [Term::Atom(kind), Term::Atom(name), Term::FixInteger(arity)]
+                        if kind.name == "function" =>
+                    {
+                        let name = StringId::from(&name.name);
+                        let local_id = Id {
+                            name,
+                            arity: arity.value as u32,
+                        };
+                        if auto_import::is_auto_imported(&local_id)
+                            && !self.no_auto_imports.contains(&local_id)
                         {
-                            if at_else.name == "else" {
-                                return Ok(Expr::MaybeElse(MaybeElse {
+                            let remote_id = RemoteId {
+                                module: *ERLANG,
+                                name,
+                                arity: arity.value as u32,
+                            };
+                            return Ok(Expr::RemoteFun(RemoteFun { pos, id: remote_id }));
+                        } else {
+                            return Ok(Expr::LocalFun(LocalFun { pos, id: local_id }));
+                        }
+                    }
+                    [Term::Atom(kind), module, name, arity] if kind.name == "function" => {
+                        match (
+                            self.convert_atom_lit(module),
+                            self.convert_atom_lit(name),
+                            self.convert_int_lit(arity),
+                        ) {
+                            (Ok(module), Ok(name), Ok(arity)) => {
+                                let remote_id = RemoteId {
+                                    module,
+                                    name,
+                                    arity: arity as u32,
+                                };
+                                return Ok(Expr::RemoteFun(RemoteFun { pos, id: remote_id }));
+                            }
+                            _ => {
+                                return Ok(Expr::DynRemoteFunArity(DynRemoteFunArity {
                                     pos,
-                                    body: Body {
-                                        exprs: self.convert_exprs(exprs)?,
-                                    },
-                                    else_clauses: self.convert_clauses(clauses)?,
+                                    module: Box::new(self.convert_expr(module)?),
+                                    name: Box::new(self.convert_expr(name)?),
+                                    arity: Box::new(self.convert_expr(arity)?),
                                 }));
                             }
                         }
                     }
-                    ("maybe_match", [exp1, exp2]) => {
-                        return Ok(Expr::MaybeMatch(MaybeMatch {
-                            pos,
-                            pat: self.convert_pat(exp1)?,
-                            arg: Box::new(self.convert_expr(exp2)?),
-                        }));
-                    }
-                    ("checked_cast", [exp, ty]) => {
-                        let expr = self.convert_expr(exp)?;
-                        let tp = self.convert_type(ty)?;
-                        return Ok(Expr::TypeCast(TypeCast {
-                            pos,
-                            expr: Box::new(expr),
-                            ty: tp,
-                            checked: true,
-                        }));
-                    }
-                    ("unchecked_cast", [exp, ty]) => {
-                        let expr = self.convert_expr(exp)?;
-                        let tp = self.convert_type(ty)?;
-                        return Ok(Expr::TypeCast(TypeCast {
-                            pos,
-                            expr: Box::new(expr),
-                            ty: tp,
-                            checked: false,
-                        }));
-                    }
                     _ => (),
+                },
+                ("named_fun", [Term::Atom(name), Term::List(clauses)]) => {
+                    return Ok(Expr::Lambda(Lambda {
+                        pos,
+                        clauses: self.convert_clauses(clauses)?,
+                        name: Some(StringId::from(&name.name)),
+                    }));
                 }
+                ("atom", [Term::Atom(value)]) => {
+                    return Ok(Expr::AtomLit(AtomLit {
+                        pos,
+                        s: StringId::from(&value.name),
+                    }));
+                }
+                ("float", [Term::Float(_)]) => {
+                    return Ok(Expr::FloatLit(FloatLit { pos }));
+                }
+                ("char" | "integer", [Term::BigInteger(_)]) => {
+                    return Ok(Expr::IntLit(IntLit { pos, value: None }));
+                }
+                ("char" | "integer", [Term::FixInteger(value)]) => {
+                    return Ok(Expr::IntLit(IntLit {
+                        pos,
+                        value: Some(value.value),
+                    }));
+                }
+                ("string", [Term::List(elems)]) if elems.is_nil() => {
+                    return Ok(Expr::StringLit(StringLit { pos, empty: true }));
+                }
+                ("string", [_]) => {
+                    return Ok(Expr::StringLit(StringLit { pos, empty: false }));
+                }
+                ("remote", [module, name]) => {
+                    return Ok(Expr::DynRemoteFun(DynRemoteFun {
+                        pos,
+                        module: Box::new(self.convert_expr(module)?),
+                        name: Box::new(self.convert_expr(name)?),
+                    }));
+                }
+                ("maybe", [Term::List(exprs)]) => {
+                    return Ok(Expr::Maybe(Maybe {
+                        pos,
+                        body: Body {
+                            exprs: self.convert_exprs(exprs)?,
+                        },
+                    }));
+                }
+                ("maybe", [Term::List(exprs), Term::Tuple(m_else)]) => {
+                    if let [Term::Atom(at_else), _, Term::List(clauses)] = &m_else.elements[..]
+                        && at_else.name == "else"
+                    {
+                        return Ok(Expr::MaybeElse(MaybeElse {
+                            pos,
+                            body: Body {
+                                exprs: self.convert_exprs(exprs)?,
+                            },
+                            else_clauses: self.convert_clauses(clauses)?,
+                        }));
+                    }
+                }
+                ("maybe_match", [exp1, exp2]) => {
+                    return Ok(Expr::MaybeMatch(MaybeMatch {
+                        pos,
+                        pat: self.convert_pat(exp1)?,
+                        arg: Box::new(self.convert_expr(exp2)?),
+                    }));
+                }
+                ("checked_cast", [exp, ty]) => {
+                    let expr = self.convert_expr(exp)?;
+                    let tp = self.convert_type(ty)?;
+                    return Ok(Expr::TypeCast(TypeCast {
+                        pos,
+                        expr: Box::new(expr),
+                        ty: tp,
+                        checked: true,
+                    }));
+                }
+                ("unchecked_cast", [exp, ty]) => {
+                    let expr = self.convert_expr(exp)?;
+                    let tp = self.convert_type(ty)?;
+                    return Ok(Expr::TypeCast(TypeCast {
+                        pos,
+                        expr: Box::new(expr),
+                        ty: tp,
+                        checked: false,
+                    }));
+                }
+                _ => (),
             }
         }
         Err(ConversionError::InvalidExpr)
     }
 
     fn convert_create_kv(&self, kv: &eetf::Term) -> Result<(Expr, Expr), ConversionError> {
-        if let Term::Tuple(kv) = kv {
-            if let [Term::Atom(atom_assoc), _, exp1, exp2] = &kv.elements[..] {
-                if atom_assoc.name == "map_field_assoc" {
-                    return Ok((self.convert_expr(exp1)?, self.convert_expr(exp2)?));
-                }
-            }
+        if let Term::Tuple(kv) = kv
+            && let [Term::Atom(atom_assoc), _, exp1, exp2] = &kv.elements[..]
+            && atom_assoc.name == "map_field_assoc"
+        {
+            return Ok((self.convert_expr(exp1)?, self.convert_expr(exp2)?));
         }
         Err(ConversionError::InvalidMapAssoc)
     }
 
     fn convert_kv(&self, kv: &eetf::Term) -> Result<(Expr, Expr), ConversionError> {
-        if let Term::Tuple(kv) = kv {
-            if let [_, _, exp1, exp2] = &kv.elements[..] {
-                return Ok((self.convert_expr(exp1)?, self.convert_expr(exp2)?));
-            }
+        if let Term::Tuple(kv) = kv
+            && let [_, _, exp1, exp2] = &kv.elements[..]
+        {
+            return Ok((self.convert_expr(exp1)?, self.convert_expr(exp2)?));
         }
         Err(ConversionError::InvalidKV)
     }
 
     fn convert_rec_field_expr(&self, field: &eetf::Term) -> Result<RecordField, ConversionError> {
-        if let Term::Tuple(field) = field {
-            if let [Term::Atom(atom_field), _, name, exp] = &field.elements[..] {
-                if atom_field.name == "record_field" {
-                    match self.convert_rec_field_name(name)? {
-                        Some(name) => {
-                            return Ok(RecordField::RecordFieldNamed(RecordFieldNamed {
-                                name,
-                                value: self.convert_expr(exp)?,
-                            }));
-                        }
-                        None => {
-                            return Ok(RecordField::RecordFieldGen(RecordFieldGen {
-                                value: self.convert_expr(exp)?,
-                            }));
-                        }
-                    }
+        if let Term::Tuple(field) = field
+            && let [Term::Atom(atom_field), _, name, exp] = &field.elements[..]
+            && atom_field.name == "record_field"
+        {
+            match self.convert_rec_field_name(name)? {
+                Some(name) => {
+                    return Ok(RecordField::RecordFieldNamed(RecordFieldNamed {
+                        name,
+                        value: self.convert_expr(exp)?,
+                    }));
+                }
+                None => {
+                    return Ok(RecordField::RecordFieldGen(RecordFieldGen {
+                        value: self.convert_expr(exp)?,
+                    }));
                 }
             }
         }
@@ -1199,157 +1188,157 @@ impl Converter {
     }
 
     fn convert_binary_elem(&self, elem: &eetf::Term) -> Result<BinaryElem, ConversionError> {
-        if let Term::Tuple(be) = elem {
-            if let [Term::Atom(atom_be), pos, elem, size, spec] = &be.elements[..] {
-                let pos = self.convert_pos(pos)?;
-                let specifier = self.convert_specifier(spec);
-                let size = {
-                    match size {
-                        Term::Atom(a) if a.name == "default" => None,
-                        e => Some(self.convert_expr(e)?),
-                    }
-                };
-                if atom_be.name == "bin_element" {
-                    return Ok(BinaryElem {
-                        pos,
-                        size,
-                        specifier,
-                        expr: self.convert_expr(elem)?,
-                    });
+        if let Term::Tuple(be) = elem
+            && let [Term::Atom(atom_be), pos, elem, size, spec] = &be.elements[..]
+        {
+            let pos = self.convert_pos(pos)?;
+            let specifier = self.convert_specifier(spec);
+            let size = {
+                match size {
+                    Term::Atom(a) if a.name == "default" => None,
+                    e => Some(self.convert_expr(e)?),
                 }
+            };
+            if atom_be.name == "bin_element" {
+                return Ok(BinaryElem {
+                    pos,
+                    size,
+                    specifier,
+                    expr: self.convert_expr(elem)?,
+                });
             }
         }
         Err(ConversionError::InvalidBinaryElem)
     }
 
     fn convert_pat(&self, pat: &eetf::Term) -> Result<Pat, ConversionError> {
-        if let Term::Tuple(pat) = pat {
-            if let [Term::Atom(kind), pos, args @ ..] = &pat.elements[..] {
-                let pos = self.convert_pos(pos)?;
-                match (kind.name.as_str(), args) {
-                    ("match", [pat1, pat2]) => {
-                        return Ok(Pat::PatMatch(PatMatch {
-                            pos,
-                            pat: Box::new(self.convert_pat(pat1)?),
-                            arg: Box::new(self.convert_pat(pat2)?),
-                        }));
-                    }
-                    ("var", [Term::Atom(v)]) if v.name == "_" => {
-                        return Ok(Pat::PatWild(PatWild { pos }));
-                    }
-                    ("var", [Term::Atom(v)]) => {
-                        return Ok(Pat::PatVar(PatVar {
-                            pos,
-                            n: StringId::from(&v.name),
-                        }));
-                    }
-                    ("tuple", [Term::List(pats)]) => {
-                        return Ok(Pat::PatTuple(PatTuple {
-                            pos,
-                            elems: pats
-                                .elements
-                                .iter()
-                                .map(|p| self.convert_pat(p))
-                                .collect::<Result<Vec<_>, _>>()?,
-                        }));
-                    }
-                    ("nil", []) => {
-                        return Ok(Pat::PatNil(PatNil { pos }));
-                    }
-                    ("cons", [hpat, tpat]) => {
-                        return Ok(Pat::PatCons(PatCons {
-                            pos,
-                            h: Box::new(self.convert_pat(hpat)?),
-                            t: Box::new(self.convert_pat(tpat)?),
-                        }));
-                    }
-                    ("atom", [Term::Atom(v)]) => {
-                        return Ok(Pat::PatAtom(PatAtom {
-                            pos,
-                            s: StringId::from(&v.name),
-                        }));
-                    }
-                    ("float", [_]) => {
-                        return Ok(Pat::PatNumber(PatNumber { pos }));
-                    }
-                    ("char" | "integer", [Term::BigInteger(_)]) => {
-                        return Ok(Pat::PatInt(PatInt { pos }));
-                    }
-                    ("char" | "integer", [Term::FixInteger(_)]) => {
-                        return Ok(Pat::PatInt(PatInt { pos }));
-                    }
-                    ("string", [_]) => {
-                        return Ok(Pat::PatString(PatString { pos }));
-                    }
-                    ("bin", [Term::List(bin_elems)]) => {
-                        return Ok(Pat::PatBinary(PatBinary {
-                            pos,
-                            elems: bin_elems
-                                .elements
-                                .iter()
-                                .map(|be| self.convert_pat_binary_elem(be))
-                                .collect::<Result<Vec<_>, _>>()?,
-                        }));
-                    }
-                    ("op", [Term::Atom(op), pat1, pat2]) => {
-                        return Ok(Pat::PatBinOp(PatBinOp {
-                            pos,
-                            op: StringId::from(&op.name),
-                            arg_1: Box::new(self.convert_pat(pat1)?),
-                            arg_2: Box::new(self.convert_pat(pat2)?),
-                        }));
-                    }
-                    ("op", [Term::Atom(op), pat]) => {
-                        return Ok(Pat::PatUnOp(PatUnOp {
-                            pos,
-                            op: StringId::from(&op.name),
-                            arg: Box::new(self.convert_pat(pat)?),
-                        }));
-                    }
-                    ("record", [Term::Atom(name), Term::List(fields)]) => {
-                        let fields_named = fields
-                            .elements
-                            .iter()
-                            .map(|f| self.convert_pat_record_field(f))
-                            .collect::<Result<Vec<_>, _>>()?
-                            .into_iter()
-                            .flatten()
-                            .collect();
-                        let gen_ = fields
-                            .elements
-                            .iter()
-                            .map(|f| self.convert_pat_record_field_gen(f))
-                            .collect::<Result<Vec<_>, _>>()?
-                            .into_iter()
-                            .flatten()
-                            .next()
-                            .map(Box::new);
-                        return Ok(Pat::PatRecord(PatRecord {
-                            pos,
-                            rec_name: StringId::from(&name.name),
-                            fields: fields_named,
-                            gen_,
-                        }));
-                    }
-                    ("record_index", [Term::Atom(name), field_name]) => {
-                        return Ok(Pat::PatRecordIndex(PatRecordIndex {
-                            pos,
-                            rec_name: StringId::from(&name.name),
-                            field_name: self.convert_atom_lit(field_name)?,
-                        }));
-                    }
-                    ("map", [Term::List(kvs)]) => {
-                        return Ok(Pat::PatMap(PatMap {
-                            pos,
-                            kvs: kvs
-                                .elements
-                                .iter()
-                                .map(|kv| self.convert_pat_kv(kv))
-                                .collect::<Result<Vec<_>, _>>()?,
-                        }));
-                    }
-                    _ => (),
+        if let Term::Tuple(pat) = pat
+            && let [Term::Atom(kind), pos, args @ ..] = &pat.elements[..]
+        {
+            let pos = self.convert_pos(pos)?;
+            match (kind.name.as_str(), args) {
+                ("match", [pat1, pat2]) => {
+                    return Ok(Pat::PatMatch(PatMatch {
+                        pos,
+                        pat: Box::new(self.convert_pat(pat1)?),
+                        arg: Box::new(self.convert_pat(pat2)?),
+                    }));
                 }
+                ("var", [Term::Atom(v)]) if v.name == "_" => {
+                    return Ok(Pat::PatWild(PatWild { pos }));
+                }
+                ("var", [Term::Atom(v)]) => {
+                    return Ok(Pat::PatVar(PatVar {
+                        pos,
+                        n: StringId::from(&v.name),
+                    }));
+                }
+                ("tuple", [Term::List(pats)]) => {
+                    return Ok(Pat::PatTuple(PatTuple {
+                        pos,
+                        elems: pats
+                            .elements
+                            .iter()
+                            .map(|p| self.convert_pat(p))
+                            .collect::<Result<Vec<_>, _>>()?,
+                    }));
+                }
+                ("nil", []) => {
+                    return Ok(Pat::PatNil(PatNil { pos }));
+                }
+                ("cons", [hpat, tpat]) => {
+                    return Ok(Pat::PatCons(PatCons {
+                        pos,
+                        h: Box::new(self.convert_pat(hpat)?),
+                        t: Box::new(self.convert_pat(tpat)?),
+                    }));
+                }
+                ("atom", [Term::Atom(v)]) => {
+                    return Ok(Pat::PatAtom(PatAtom {
+                        pos,
+                        s: StringId::from(&v.name),
+                    }));
+                }
+                ("float", [_]) => {
+                    return Ok(Pat::PatNumber(PatNumber { pos }));
+                }
+                ("char" | "integer", [Term::BigInteger(_)]) => {
+                    return Ok(Pat::PatInt(PatInt { pos }));
+                }
+                ("char" | "integer", [Term::FixInteger(_)]) => {
+                    return Ok(Pat::PatInt(PatInt { pos }));
+                }
+                ("string", [_]) => {
+                    return Ok(Pat::PatString(PatString { pos }));
+                }
+                ("bin", [Term::List(bin_elems)]) => {
+                    return Ok(Pat::PatBinary(PatBinary {
+                        pos,
+                        elems: bin_elems
+                            .elements
+                            .iter()
+                            .map(|be| self.convert_pat_binary_elem(be))
+                            .collect::<Result<Vec<_>, _>>()?,
+                    }));
+                }
+                ("op", [Term::Atom(op), pat1, pat2]) => {
+                    return Ok(Pat::PatBinOp(PatBinOp {
+                        pos,
+                        op: StringId::from(&op.name),
+                        arg_1: Box::new(self.convert_pat(pat1)?),
+                        arg_2: Box::new(self.convert_pat(pat2)?),
+                    }));
+                }
+                ("op", [Term::Atom(op), pat]) => {
+                    return Ok(Pat::PatUnOp(PatUnOp {
+                        pos,
+                        op: StringId::from(&op.name),
+                        arg: Box::new(self.convert_pat(pat)?),
+                    }));
+                }
+                ("record", [Term::Atom(name), Term::List(fields)]) => {
+                    let fields_named = fields
+                        .elements
+                        .iter()
+                        .map(|f| self.convert_pat_record_field(f))
+                        .collect::<Result<Vec<_>, _>>()?
+                        .into_iter()
+                        .flatten()
+                        .collect();
+                    let gen_ = fields
+                        .elements
+                        .iter()
+                        .map(|f| self.convert_pat_record_field_gen(f))
+                        .collect::<Result<Vec<_>, _>>()?
+                        .into_iter()
+                        .flatten()
+                        .next()
+                        .map(Box::new);
+                    return Ok(Pat::PatRecord(PatRecord {
+                        pos,
+                        rec_name: StringId::from(&name.name),
+                        fields: fields_named,
+                        gen_,
+                    }));
+                }
+                ("record_index", [Term::Atom(name), field_name]) => {
+                    return Ok(Pat::PatRecordIndex(PatRecordIndex {
+                        pos,
+                        rec_name: StringId::from(&name.name),
+                        field_name: self.convert_atom_lit(field_name)?,
+                    }));
+                }
+                ("map", [Term::List(kvs)]) => {
+                    return Ok(Pat::PatMap(PatMap {
+                        pos,
+                        kvs: kvs
+                            .elements
+                            .iter()
+                            .map(|kv| self.convert_pat_kv(kv))
+                            .collect::<Result<Vec<_>, _>>()?,
+                    }));
+                }
+                _ => (),
             }
         }
         Err(ConversionError::InvalidPattern)
@@ -1447,160 +1436,160 @@ impl Converter {
     }
 
     fn convert_test(&self, test: &eetf::Term) -> Result<Test, ConversionError> {
-        if let Term::Tuple(elems) = test {
-            if let [Term::Atom(kind), pos, args @ ..] = &elems.elements[..] {
-                let pos = self.convert_pos(pos)?;
-                match (kind.name.as_str(), args) {
-                    ("var", [Term::Atom(name)]) => {
-                        return Ok(Test::TestVar(TestVar {
-                            pos,
-                            v: StringId::from(&name.name),
-                        }));
+        if let Term::Tuple(elems) = test
+            && let [Term::Atom(kind), pos, args @ ..] = &elems.elements[..]
+        {
+            let pos = self.convert_pos(pos)?;
+            match (kind.name.as_str(), args) {
+                ("var", [Term::Atom(name)]) => {
+                    return Ok(Test::TestVar(TestVar {
+                        pos,
+                        v: StringId::from(&name.name),
+                    }));
+                }
+                ("tuple", [Term::List(tests)]) => {
+                    let tests = tests
+                        .elements
+                        .iter()
+                        .map(|t| self.convert_test(t))
+                        .collect::<Result<Vec<_>, _>>()?;
+                    return Ok(Test::TestTuple(TestTuple { pos, elems: tests }));
+                }
+                ("nil", []) => {
+                    return Ok(Test::TestNil(TestNil { pos }));
+                }
+                ("cons", [h, t]) => {
+                    return Ok(Test::TestCons(TestCons {
+                        pos,
+                        h: Box::new(self.convert_test(h)?),
+                        t: Box::new(self.convert_test(t)?),
+                    }));
+                }
+                ("bin", [_]) => {
+                    return Ok(Test::TestBinaryLit(TestBinaryLit { pos }));
+                }
+                ("op", [Term::Atom(op), arg1, arg2]) => {
+                    return Ok(Test::TestBinOp(TestBinOp {
+                        pos,
+                        op: StringId::from(&op.name),
+                        arg_1: Box::new(self.convert_test(arg1)?),
+                        arg_2: Box::new(self.convert_test(arg2)?),
+                    }));
+                }
+                ("op", [Term::Atom(op), arg1]) => {
+                    return Ok(Test::TestUnOp(TestUnOp {
+                        pos,
+                        op: StringId::from(&op.name),
+                        arg: Box::new(self.convert_test(arg1)?),
+                    }));
+                }
+                ("record", [Term::Atom(name), Term::List(fields)]) => {
+                    let tests = fields
+                        .elements
+                        .iter()
+                        .map(|f| self.convert_test_record_field(f))
+                        .collect::<Result<Vec<_>, _>>()?;
+                    return Ok(Test::TestRecordCreate(TestRecordCreate {
+                        pos,
+                        rec_name: StringId::from(&name.name),
+                        fields: tests,
+                    }));
+                }
+                ("record_index", [Term::Atom(name), field]) => {
+                    let field_name = self.convert_atom_lit(field)?;
+                    return Ok(Test::TestRecordIndex(TestRecordIndex {
+                        pos,
+                        rec_name: StringId::from(&name.name),
+                        field_name,
+                    }));
+                }
+                ("record_field", [test, Term::Atom(name), field]) => {
+                    let field_name = self.convert_atom_lit(field)?;
+                    let test = self.convert_test(test)?;
+                    return Ok(Test::TestRecordSelect(TestRecordSelect {
+                        pos,
+                        rec: Box::new(test),
+                        rec_name: StringId::from(&name.name),
+                        field_name,
+                    }));
+                }
+                ("map", [Term::List(kvs)]) => {
+                    let tests = kvs
+                        .elements
+                        .iter()
+                        .map(|kv| self.convert_test_kv(kv))
+                        .collect::<Result<Vec<_>, _>>()?;
+                    return Ok(Test::TestMapCreate(TestMapCreate { pos, kvs: tests }));
+                }
+                ("map", [t, Term::List(kvs)]) => {
+                    let map = self.convert_test(t)?;
+                    let kvs = kvs
+                        .elements
+                        .iter()
+                        .map(|kv| self.convert_test_kv(kv))
+                        .collect::<Result<Vec<_>, _>>()?;
+                    return Ok(Test::TestMapUpdate(TestMapUpdate {
+                        pos,
+                        map: Box::new(map),
+                        kvs,
+                    }));
+                }
+                ("call", [Term::Tuple(expr), Term::List(args)]) => {
+                    if let [Term::Atom(remote), _, module, fname] = &expr.elements[..]
+                        && remote.name == "remote"
+                    {
+                        let module = self.convert_atom_lit(module)?;
+                        if module == *ERLANG {
+                            let fname = self.convert_atom_lit(fname)?;
+                            let id = Id {
+                                name: fname,
+                                arity: args.elements.len() as u32,
+                            };
+                            let args = args
+                                .elements
+                                .iter()
+                                .map(|t| self.convert_test(t))
+                                .collect::<Result<Vec<_>, _>>()?;
+                            return Ok(Test::TestCall(TestCall { pos, id, args }));
+                        }
                     }
-                    ("tuple", [Term::List(tests)]) => {
-                        let tests = tests
+                    if let [Term::Atom(atom), _, Term::Atom(fname)] = &expr.elements[..]
+                        && atom.name == "atom"
+                    {
+                        let id = Id {
+                            name: StringId::from(&fname.name),
+                            arity: args.elements.len() as u32,
+                        };
+                        let args = args
                             .elements
                             .iter()
                             .map(|t| self.convert_test(t))
                             .collect::<Result<Vec<_>, _>>()?;
-                        return Ok(Test::TestTuple(TestTuple { pos, elems: tests }));
+                        return Ok(Test::TestCall(TestCall { pos, id, args }));
                     }
-                    ("nil", []) => {
-                        return Ok(Test::TestNil(TestNil { pos }));
-                    }
-                    ("cons", [h, t]) => {
-                        return Ok(Test::TestCons(TestCons {
-                            pos,
-                            h: Box::new(self.convert_test(h)?),
-                            t: Box::new(self.convert_test(t)?),
-                        }));
-                    }
-                    ("bin", [_]) => {
-                        return Ok(Test::TestBinaryLit(TestBinaryLit { pos }));
-                    }
-                    ("op", [Term::Atom(op), arg1, arg2]) => {
-                        return Ok(Test::TestBinOp(TestBinOp {
-                            pos,
-                            op: StringId::from(&op.name),
-                            arg_1: Box::new(self.convert_test(arg1)?),
-                            arg_2: Box::new(self.convert_test(arg2)?),
-                        }));
-                    }
-                    ("op", [Term::Atom(op), arg1]) => {
-                        return Ok(Test::TestUnOp(TestUnOp {
-                            pos,
-                            op: StringId::from(&op.name),
-                            arg: Box::new(self.convert_test(arg1)?),
-                        }));
-                    }
-                    ("record", [Term::Atom(name), Term::List(fields)]) => {
-                        let tests = fields
-                            .elements
-                            .iter()
-                            .map(|f| self.convert_test_record_field(f))
-                            .collect::<Result<Vec<_>, _>>()?;
-                        return Ok(Test::TestRecordCreate(TestRecordCreate {
-                            pos,
-                            rec_name: StringId::from(&name.name),
-                            fields: tests,
-                        }));
-                    }
-                    ("record_index", [Term::Atom(name), field]) => {
-                        let field_name = self.convert_atom_lit(field)?;
-                        return Ok(Test::TestRecordIndex(TestRecordIndex {
-                            pos,
-                            rec_name: StringId::from(&name.name),
-                            field_name,
-                        }));
-                    }
-                    ("record_field", [test, Term::Atom(name), field]) => {
-                        let field_name = self.convert_atom_lit(field)?;
-                        let test = self.convert_test(test)?;
-                        return Ok(Test::TestRecordSelect(TestRecordSelect {
-                            pos,
-                            rec: Box::new(test),
-                            rec_name: StringId::from(&name.name),
-                            field_name,
-                        }));
-                    }
-                    ("map", [Term::List(kvs)]) => {
-                        let tests = kvs
-                            .elements
-                            .iter()
-                            .map(|kv| self.convert_test_kv(kv))
-                            .collect::<Result<Vec<_>, _>>()?;
-                        return Ok(Test::TestMapCreate(TestMapCreate { pos, kvs: tests }));
-                    }
-                    ("map", [t, Term::List(kvs)]) => {
-                        let map = self.convert_test(t)?;
-                        let kvs = kvs
-                            .elements
-                            .iter()
-                            .map(|kv| self.convert_test_kv(kv))
-                            .collect::<Result<Vec<_>, _>>()?;
-                        return Ok(Test::TestMapUpdate(TestMapUpdate {
-                            pos,
-                            map: Box::new(map),
-                            kvs,
-                        }));
-                    }
-                    ("call", [Term::Tuple(expr), Term::List(args)]) => {
-                        if let [Term::Atom(remote), _, module, fname] = &expr.elements[..] {
-                            if remote.name == "remote" {
-                                let module = self.convert_atom_lit(module)?;
-                                if module == *ERLANG {
-                                    let fname = self.convert_atom_lit(fname)?;
-                                    let id = Id {
-                                        name: fname,
-                                        arity: args.elements.len() as u32,
-                                    };
-                                    let args = args
-                                        .elements
-                                        .iter()
-                                        .map(|t| self.convert_test(t))
-                                        .collect::<Result<Vec<_>, _>>()?;
-                                    return Ok(Test::TestCall(TestCall { pos, id, args }));
-                                }
-                            }
-                        }
-                        if let [Term::Atom(atom), _, Term::Atom(fname)] = &expr.elements[..] {
-                            if atom.name == "atom" {
-                                let id = Id {
-                                    name: StringId::from(&fname.name),
-                                    arity: args.elements.len() as u32,
-                                };
-                                let args = args
-                                    .elements
-                                    .iter()
-                                    .map(|t| self.convert_test(t))
-                                    .collect::<Result<Vec<_>, _>>()?;
-                                return Ok(Test::TestCall(TestCall { pos, id, args }));
-                            }
-                        }
-                    }
-                    ("atom", [Term::Atom(value)]) => {
-                        return Ok(Test::TestAtom(TestAtom {
-                            pos,
-                            s: StringId::from(&value.name),
-                        }));
-                    }
-                    ("float", [_]) => {
-                        return Ok(Test::TestNumber(TestNumber { pos, lit: None }));
-                    }
-                    ("char" | "integer", [Term::BigInteger(_)]) => {
-                        return Ok(Test::TestNumber(TestNumber { pos, lit: None }));
-                    }
-                    ("char" | "integer", [Term::FixInteger(v)]) => {
-                        return Ok(Test::TestNumber(TestNumber {
-                            pos,
-                            lit: Some(v.value),
-                        }));
-                    }
-                    ("string", [_]) => {
-                        return Ok(Test::TestString(TestString { pos }));
-                    }
-                    _ => (),
                 }
+                ("atom", [Term::Atom(value)]) => {
+                    return Ok(Test::TestAtom(TestAtom {
+                        pos,
+                        s: StringId::from(&value.name),
+                    }));
+                }
+                ("float", [_]) => {
+                    return Ok(Test::TestNumber(TestNumber { pos, lit: None }));
+                }
+                ("char" | "integer", [Term::BigInteger(_)]) => {
+                    return Ok(Test::TestNumber(TestNumber { pos, lit: None }));
+                }
+                ("char" | "integer", [Term::FixInteger(v)]) => {
+                    return Ok(Test::TestNumber(TestNumber {
+                        pos,
+                        lit: Some(v.value),
+                    }));
+                }
+                ("string", [_]) => {
+                    return Ok(Test::TestString(TestString { pos }));
+                }
+                _ => (),
             }
         }
         Err(ConversionError::InvalidTest)
@@ -1610,24 +1599,23 @@ impl Converter {
         &self,
         term: &eetf::Term,
     ) -> Result<TestRecordField, ConversionError> {
-        if let Term::Tuple(elems) = term {
-            if let [Term::Atom(kind), _, name, val] = &elems.elements[..] {
-                if kind.name == "record_field" {
-                    match self.convert_rec_field_name(name)? {
-                        Some(field_name) => {
-                            return Ok(TestRecordField::TestRecordFieldNamed(
-                                TestRecordFieldNamed {
-                                    name: field_name,
-                                    value: self.convert_test(val)?,
-                                },
-                            ));
-                        }
-                        None => {
-                            return Ok(TestRecordField::TestRecordFieldGen(TestRecordFieldGen {
-                                value: self.convert_test(val)?,
-                            }));
-                        }
-                    }
+        if let Term::Tuple(elems) = term
+            && let [Term::Atom(kind), _, name, val] = &elems.elements[..]
+            && kind.name == "record_field"
+        {
+            match self.convert_rec_field_name(name)? {
+                Some(field_name) => {
+                    return Ok(TestRecordField::TestRecordFieldNamed(
+                        TestRecordFieldNamed {
+                            name: field_name,
+                            value: self.convert_test(val)?,
+                        },
+                    ));
+                }
+                None => {
+                    return Ok(TestRecordField::TestRecordFieldGen(TestRecordFieldGen {
+                        value: self.convert_test(val)?,
+                    }));
                 }
             }
         }
@@ -1635,10 +1623,10 @@ impl Converter {
     }
 
     fn convert_test_kv(&self, term: &eetf::Term) -> Result<(Test, Test), ConversionError> {
-        if let Term::Tuple(elems) = term {
-            if let [_, _, t1, t2] = &elems.elements[..] {
-                return Ok((self.convert_test(t1)?, self.convert_test(t2)?));
-            }
+        if let Term::Tuple(elems) = term
+            && let [_, _, t1, t2] = &elems.elements[..]
+        {
+            return Ok((self.convert_test(t1)?, self.convert_test(t2)?));
         }
         Err(ConversionError::InvalidKVTest)
     }
@@ -1671,27 +1659,27 @@ impl Converter {
                     }));
                 }
                 [Term::Atom(kind), _, Term::Tuple(m_elems), exp] if kind.name == "m_generate" => {
-                    if let [Term::Atom(m_kind), _, k_pat, v_pat] = &m_elems.elements[..] {
-                        if m_kind.name == "map_field_exact" {
-                            return Ok(Qualifier::MGenerate(MGenerate {
-                                k_pat: self.convert_pat(k_pat)?,
-                                v_pat: self.convert_pat(v_pat)?,
-                                expr: self.convert_expr(exp)?,
-                            }));
-                        }
+                    if let [Term::Atom(m_kind), _, k_pat, v_pat] = &m_elems.elements[..]
+                        && m_kind.name == "map_field_exact"
+                    {
+                        return Ok(Qualifier::MGenerate(MGenerate {
+                            k_pat: self.convert_pat(k_pat)?,
+                            v_pat: self.convert_pat(v_pat)?,
+                            expr: self.convert_expr(exp)?,
+                        }));
                     }
                 }
                 [Term::Atom(kind), _, Term::Tuple(m_elems), exp]
                     if kind.name == "m_generate_strict" =>
                 {
-                    if let [Term::Atom(m_kind), _, k_pat, v_pat] = &m_elems.elements[..] {
-                        if m_kind.name == "map_field_exact" {
-                            return Ok(Qualifier::MGenerateStrict(MGenerateStrict {
-                                k_pat: self.convert_pat(k_pat)?,
-                                v_pat: self.convert_pat(v_pat)?,
-                                expr: self.convert_expr(exp)?,
-                            }));
-                        }
+                    if let [Term::Atom(m_kind), _, k_pat, v_pat] = &m_elems.elements[..]
+                        && m_kind.name == "map_field_exact"
+                    {
+                        return Ok(Qualifier::MGenerateStrict(MGenerateStrict {
+                            k_pat: self.convert_pat(k_pat)?,
+                            v_pat: self.convert_pat(v_pat)?,
+                            expr: self.convert_expr(exp)?,
+                        }));
                     }
                 }
                 [Term::Atom(kind), _, Term::List(generators)] if kind.name == "zip" => {
@@ -1743,54 +1731,53 @@ impl Converter {
     }
 
     fn convert_fun_spec(&self, spec: &eetf::Term) -> Result<ConstrainedFunType, ConversionError> {
-        if let Term::Tuple(spec) = spec {
-            if let [Term::Atom(ty), pos, Term::Atom(kind), Term::List(decl)] = &spec.elements[..] {
-                if ty.name != "type" {
-                    return Err(ConversionError::InvalidFunSpec);
-                }
-                if kind.name == "fun" {
-                    if let [Term::Tuple(dom), result] = &decl.elements[..] {
-                        if let [Term::Atom(ty), pos, Term::Atom(kind), Term::List(args)] =
-                            &dom.elements[..]
-                        {
-                            if ty.name != "type" || kind.name != "product" {
-                                return Err(ConversionError::InvalidFunSpec);
-                            }
-                            let pos = self.convert_pos(pos)?;
-                            let res_ty = self.convert_type(result)?;
-                            let arg_tys = args
-                                .elements
-                                .iter()
-                                .map(|t| self.convert_type(t))
-                                .collect::<Result<Vec<_>, _>>()?;
-                            let ty = FunExtType {
-                                pos: pos.clone(),
-                                arg_tys,
-                                res_ty: Box::new(res_ty),
-                            };
-                            return Ok(ConstrainedFunType {
-                                pos,
-                                ty,
-                                constraints: vec![],
-                            });
-                        }
+        if let Term::Tuple(spec) = spec
+            && let [Term::Atom(ty), pos, Term::Atom(kind), Term::List(decl)] = &spec.elements[..]
+        {
+            if ty.name != "type" {
+                return Err(ConversionError::InvalidFunSpec);
+            }
+            if kind.name == "fun" {
+                if let [Term::Tuple(dom), result] = &decl.elements[..]
+                    && let [Term::Atom(ty), pos, Term::Atom(kind), Term::List(args)] =
+                        &dom.elements[..]
+                {
+                    if ty.name != "type" || kind.name != "product" {
+                        return Err(ConversionError::InvalidFunSpec);
                     }
-                } else if kind.name == "bounded_fun" {
                     let pos = self.convert_pos(pos)?;
-                    if let [ft, Term::List(constraints)] = &decl.elements[..] {
-                        let fun_type = self.convert_type(ft)?;
-                        let constraints = constraints
-                            .elements
-                            .iter()
-                            .map(|c| self.convert_constraint(c))
-                            .collect::<Result<Vec<_>, _>>()?;
-                        if let ExtType::FunExtType(ty) = fun_type {
-                            return Ok(ConstrainedFunType {
-                                pos,
-                                ty,
-                                constraints,
-                            });
-                        }
+                    let res_ty = self.convert_type(result)?;
+                    let arg_tys = args
+                        .elements
+                        .iter()
+                        .map(|t| self.convert_type(t))
+                        .collect::<Result<Vec<_>, _>>()?;
+                    let ty = FunExtType {
+                        pos: pos.clone(),
+                        arg_tys,
+                        res_ty: Box::new(res_ty),
+                    };
+                    return Ok(ConstrainedFunType {
+                        pos,
+                        ty,
+                        constraints: vec![],
+                    });
+                }
+            } else if kind.name == "bounded_fun" {
+                let pos = self.convert_pos(pos)?;
+                if let [ft, Term::List(constraints)] = &decl.elements[..] {
+                    let fun_type = self.convert_type(ft)?;
+                    let constraints = constraints
+                        .elements
+                        .iter()
+                        .map(|c| self.convert_constraint(c))
+                        .collect::<Result<Vec<_>, _>>()?;
+                    if let ExtType::FunExtType(ty) = fun_type {
+                        return Ok(ConstrainedFunType {
+                            pos,
+                            ty,
+                            constraints,
+                        });
                     }
                 }
             }
@@ -1799,22 +1786,18 @@ impl Converter {
     }
 
     fn convert_constraint(&self, cons: &eetf::Term) -> Result<Constraint, ConversionError> {
-        if let Term::Tuple(cons) = cons {
-            if let [Term::Atom(ty), pos, Term::Atom(cs), Term::List(decl)] = &cons.elements[..] {
-                if let [is_sub, Term::List(vt)] = &decl.elements[..] {
-                    if let [v, t] = &vt.elements[..] {
-                        if ty.name == "type"
-                            && cs.name == "constraint"
-                            && self.convert_atom_lit(is_sub)? == "is_subtype"
-                        {
-                            let pos = self.convert_pos(pos)?;
-                            let t_var = self.convert_varname(v)?;
-                            let ty = self.convert_type(t)?;
-                            return Ok(Constraint { pos, t_var, ty });
-                        }
-                    }
-                }
-            }
+        if let Term::Tuple(cons) = cons
+            && let [Term::Atom(ty), pos, Term::Atom(cs), Term::List(decl)] = &cons.elements[..]
+            && let [is_sub, Term::List(vt)] = &decl.elements[..]
+            && let [v, t] = &vt.elements[..]
+            && ty.name == "type"
+            && cs.name == "constraint"
+            && self.convert_atom_lit(is_sub)? == "is_subtype"
+        {
+            let pos = self.convert_pos(pos)?;
+            let t_var = self.convert_varname(v)?;
+            let ty = self.convert_type(t)?;
+            return Ok(Constraint { pos, t_var, ty });
         }
         Err(ConversionError::InvalidFunConstraint)
     }
@@ -1824,43 +1807,43 @@ impl Converter {
         prop: &eetf::Term,
         allow_dict: bool,
     ) -> Result<ExtProp, ConversionError> {
-        if let Term::Tuple(prop) = prop {
-            if let [Term::Atom(ty), pos, Term::Atom(kind), Term::List(kv)] = &prop.elements[..] {
-                if ty.name != "type" {
-                    return Err(ConversionError::InvalidPropType);
-                }
-                let pos = self.convert_pos(pos)?;
-                if let [kt, vt] = &kv.elements[..] {
-                    let key_type = self.convert_type(kt)?;
-                    let val_type = self.convert_type(vt)?;
-                    if kind.name == "map_field_assoc" {
-                        if key_type.is_key() || allow_dict {
-                            return Ok(ExtProp::OptExtProp(OptExtProp {
-                                pos,
-                                key: key_type,
-                                tp: val_type,
-                            }));
-                        } else {
-                            return Ok(ExtProp::OptBadExtProp(OptBadExtProp {
-                                pos,
-                                key: key_type,
-                                tp: val_type,
-                            }));
-                        }
-                    } else if kind.name == "map_field_exact" {
-                        if key_type.is_key() {
-                            return Ok(ExtProp::ReqExtProp(ReqExtProp {
-                                pos,
-                                key: key_type,
-                                tp: val_type,
-                            }));
-                        } else {
-                            return Ok(ExtProp::ReqBadExtProp(ReqBadExtProp {
-                                pos,
-                                key: key_type,
-                                tp: val_type,
-                            }));
-                        }
+        if let Term::Tuple(prop) = prop
+            && let [Term::Atom(ty), pos, Term::Atom(kind), Term::List(kv)] = &prop.elements[..]
+        {
+            if ty.name != "type" {
+                return Err(ConversionError::InvalidPropType);
+            }
+            let pos = self.convert_pos(pos)?;
+            if let [kt, vt] = &kv.elements[..] {
+                let key_type = self.convert_type(kt)?;
+                let val_type = self.convert_type(vt)?;
+                if kind.name == "map_field_assoc" {
+                    if key_type.is_key() || allow_dict {
+                        return Ok(ExtProp::OptExtProp(OptExtProp {
+                            pos,
+                            key: key_type,
+                            tp: val_type,
+                        }));
+                    } else {
+                        return Ok(ExtProp::OptBadExtProp(OptBadExtProp {
+                            pos,
+                            key: key_type,
+                            tp: val_type,
+                        }));
+                    }
+                } else if kind.name == "map_field_exact" {
+                    if key_type.is_key() {
+                        return Ok(ExtProp::ReqExtProp(ReqExtProp {
+                            pos,
+                            key: key_type,
+                            tp: val_type,
+                        }));
+                    } else {
+                        return Ok(ExtProp::ReqBadExtProp(ReqBadExtProp {
+                            pos,
+                            key: key_type,
+                            tp: val_type,
+                        }));
                     }
                 }
             }
@@ -1891,233 +1874,234 @@ impl Converter {
     }
 
     fn convert_type(&self, ty: &eetf::Term) -> Result<ExtType, ConversionError> {
-        if let Term::Tuple(ty) = ty {
-            if let [Term::Atom(kind), pos, def @ ..] = &ty.elements[..] {
-                let pos = self.convert_pos(pos)?;
-                match (kind.name.as_str(), def) {
-                    ("ann_type", [Term::List(ty)]) => {
-                        if let [_, tp] = &ty.elements[..] {
-                            return self.convert_type(tp);
-                        }
+        if let Term::Tuple(ty) = ty
+            && let [Term::Atom(kind), pos, def @ ..] = &ty.elements[..]
+        {
+            let pos = self.convert_pos(pos)?;
+            match (kind.name.as_str(), def) {
+                ("ann_type", [Term::List(ty)]) => {
+                    if let [_, tp] = &ty.elements[..] {
+                        return self.convert_type(tp);
                     }
-                    ("atom", [Term::Atom(val)]) => {
-                        return Ok(ExtType::AtomLitExtType(AtomLitExtType {
-                            pos,
-                            atom: StringId::from(&val.name),
-                        }));
-                    }
-                    ("type", [Term::Atom(fun), Term::List(ty)])
-                        if fun.name == "fun" && !ty.is_nil() =>
-                    {
-                        if let [Term::Tuple(dom), res_ty] = &ty.elements[..] {
-                            let res_ty = self.convert_type(res_ty)?;
-                            if let [Term::Atom(dom_ty), _, Term::Atom(dom_kind), args @ ..] =
-                                &dom.elements[..]
+                }
+                ("atom", [Term::Atom(val)]) => {
+                    return Ok(ExtType::AtomLitExtType(AtomLitExtType {
+                        pos,
+                        atom: StringId::from(&val.name),
+                    }));
+                }
+                ("type", [Term::Atom(fun), Term::List(ty)])
+                    if fun.name == "fun" && !ty.is_nil() =>
+                {
+                    if let [Term::Tuple(dom), res_ty] = &ty.elements[..] {
+                        let res_ty = self.convert_type(res_ty)?;
+                        if let [Term::Atom(dom_ty), _, Term::Atom(dom_kind), args @ ..] =
+                            &dom.elements[..]
+                        {
+                            if dom_ty.name == "type" && dom_kind.name == "any" {
+                                return Ok(ExtType::AnyArityFunExtType(AnyArityFunExtType {
+                                    pos,
+                                    res_ty: Box::new(res_ty),
+                                }));
+                            }
+                            if dom_ty.name == "type"
+                                && dom_kind.name == "product"
+                                && let [Term::List(args)] = args
                             {
-                                if dom_ty.name == "type" && dom_kind.name == "any" {
-                                    return Ok(ExtType::AnyArityFunExtType(AnyArityFunExtType {
-                                        pos,
-                                        res_ty: Box::new(res_ty),
-                                    }));
-                                }
-                                if dom_ty.name == "type" && dom_kind.name == "product" {
-                                    if let [Term::List(args)] = args {
-                                        let arg_tys = args
-                                            .elements
-                                            .iter()
-                                            .map(|a| self.convert_type(a))
-                                            .collect::<Result<Vec<_>, _>>()?;
-                                        return Ok(ExtType::FunExtType(FunExtType {
-                                            pos,
-                                            arg_tys,
-                                            res_ty: Box::new(res_ty),
-                                        }));
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    ("type", [Term::Atom(kind), Term::List(range)]) if kind.name == "range" => {
-                        if let [_range_first, _range_last] = &range.elements[..] {
-                            return Ok(ExtType::int_ext_type(pos));
-                        }
-                    }
-                    ("type", [Term::Atom(kind), def]) if kind.name == "map" => match def {
-                        Term::Atom(a) if a.name == "any" => {
-                            return Ok(ExtType::AnyMapExtType(AnyMapExtType { pos }));
-                        }
-                        Term::List(assoc) if assoc.elements.is_empty() => {
-                            return Ok(ExtType::MapExtType(MapExtType {
-                                props: Vec::new(),
-                                pos,
-                            }));
-                        }
-                        Term::List(assoc) => {
-                            let mut allow_dict = true;
-                            let mut props = vec![];
-                            for prop in assoc.elements.iter() {
-                                let converted_prop = self.convert_prop_type(prop, allow_dict)?;
-                                if converted_prop.is_ok() && !converted_prop.key().is_key() {
-                                    // We have a default prop, reject the following ones
-                                    allow_dict = false;
-                                }
-                                props.push(converted_prop);
-                            }
-                            return Ok(ExtType::MapExtType(MapExtType { props, pos }));
-                        }
-                        _ => (),
-                    },
-                    ("type", [Term::Atom(kind), Term::List(decl)]) if kind.name == "record" => {
-                        if let [record_name, field_tys @ ..] = &decl.elements[..] {
-                            let record_name = self.convert_atom_lit(record_name)?;
-                            if field_tys.is_empty() {
-                                return Ok(ExtType::RecordExtType(RecordExtType {
-                                    pos,
-                                    name: record_name,
-                                }));
-                            } else {
-                                let refined_fields = field_tys
+                                let arg_tys = args
+                                    .elements
                                     .iter()
-                                    .map(|ty| self.convert_refined_field(ty))
+                                    .map(|a| self.convert_type(a))
                                     .collect::<Result<Vec<_>, _>>()?;
-                                return Ok(ExtType::RecordRefinedExtType(RecordRefinedExtType {
+                                return Ok(ExtType::FunExtType(FunExtType {
                                     pos,
-                                    name: record_name,
-                                    refined_fields,
+                                    arg_tys,
+                                    res_ty: Box::new(res_ty),
                                 }));
                             }
                         }
                     }
-                    ("remote_type", [Term::List(decl)]) => {
-                        if let [module, name, Term::List(args)] = &decl.elements[..] {
-                            let module = self.convert_atom_lit(module)?;
-                            let name = self.convert_atom_lit(name)?;
-                            let id = RemoteId {
-                                module,
-                                name,
-                                arity: args.elements.len() as u32,
-                            };
-                            let args = args
-                                .elements
-                                .iter()
-                                .map(|ty| self.convert_type(ty))
-                                .collect::<Result<Vec<_>, _>>()?;
-                            return Ok(ExtType::RemoteExtType(RemoteExtType { pos, id, args }));
+                }
+                ("type", [Term::Atom(kind), Term::List(range)]) if kind.name == "range" => {
+                    if let [_range_first, _range_last] = &range.elements[..] {
+                        return Ok(ExtType::int_ext_type(pos));
+                    }
+                }
+                ("type", [Term::Atom(kind), def]) if kind.name == "map" => match def {
+                    Term::Atom(a) if a.name == "any" => {
+                        return Ok(ExtType::AnyMapExtType(AnyMapExtType { pos }));
+                    }
+                    Term::List(assoc) if assoc.elements.is_empty() => {
+                        return Ok(ExtType::MapExtType(MapExtType {
+                            props: Vec::new(),
+                            pos,
+                        }));
+                    }
+                    Term::List(assoc) => {
+                        let mut allow_dict = true;
+                        let mut props = vec![];
+                        for prop in assoc.elements.iter() {
+                            let converted_prop = self.convert_prop_type(prop, allow_dict)?;
+                            if converted_prop.is_ok() && !converted_prop.key().is_key() {
+                                // We have a default prop, reject the following ones
+                                allow_dict = false;
+                            }
+                            props.push(converted_prop);
                         }
+                        return Ok(ExtType::MapExtType(MapExtType { props, pos }));
                     }
-                    ("user_type", [Term::Atom(name), Term::List(params)]) => {
-                        let id = Id {
-                            name: StringId::from(&name.name),
-                            arity: params.elements.len() as u32,
-                        };
-                        let args = params
-                            .elements
-                            .iter()
-                            .map(|ty| self.convert_type(ty))
-                            .collect::<Result<Vec<_>, _>>()?;
-                        return Ok(ExtType::LocalExtType(LocalExtType { pos, id, args }));
-                    }
-                    ("integer", [Term::BigInteger(_)]) => {
-                        return Ok(ExtType::IntLitExtType(IntLitExtType { pos }));
-                    }
-                    ("char", [Term::BigInteger(_)]) => {
-                        return Ok(ExtType::char_ext_type(pos));
-                    }
-                    ("integer", [Term::FixInteger(_)]) => {
-                        return Ok(ExtType::IntLitExtType(IntLitExtType { pos }));
-                    }
-                    ("char", [Term::FixInteger(_)]) => {
-                        return Ok(ExtType::char_ext_type(pos));
-                    }
-                    ("op", [Term::Atom(op), _]) => {
-                        return Ok(ExtType::UnOpType(UnOpType {
-                            pos,
-                            op: StringId::from(&op.name),
-                        }));
-                    }
-                    ("op", [Term::Atom(op), _, _]) => {
-                        return Ok(ExtType::BinOpType(BinOpType {
-                            pos,
-                            op: StringId::from(&op.name),
-                        }));
-                    }
-                    ("type", [Term::Atom(kind), Term::Atom(param)])
-                        if kind.name == "tuple" && param.name == "any" =>
-                    {
-                        return Ok(ExtType::tuple_ext_type(pos));
-                    }
-                    ("type", [Term::Atom(kind), Term::List(params)]) if kind.name == "tuple" => {
-                        let arg_tys = params
-                            .elements
-                            .iter()
-                            .map(|ty| self.convert_type(ty))
-                            .collect::<Result<Vec<_>, _>>()?;
-                        return Ok(ExtType::TupleExtType(TupleExtType { pos, arg_tys }));
-                    }
-                    ("type", [Term::Atom(kind), Term::List(params)]) if kind.name == "union" => {
-                        let tys = params
-                            .elements
-                            .iter()
-                            .map(|ty| self.convert_type(ty))
-                            .collect::<Result<Vec<_>, _>>()?;
-                        return Ok(ExtType::UnionExtType(UnionExtType { pos, tys }));
-                    }
-                    ("var", [Term::Atom(var)]) if var.name == "_" => {
-                        return Ok(ExtType::any_ext_type(pos));
-                    }
-                    ("var", [Term::Atom(var)]) => {
-                        return Ok(ExtType::VarExtType(VarExtType {
-                            pos,
-                            name: StringId::from(&var.name),
-                        }));
-                    }
-                    ("type", [Term::Atom(kind), Term::List(args)])
-                        if (kind.name == "list" || kind.name == "nonempty_list") =>
-                    {
-                        if args.is_nil() {
-                            return Ok(ExtType::AnyListExtType(AnyListExtType { pos }));
-                        } else if args.elements.len() == 1 {
-                            let t = self.convert_type(args.elements.first().unwrap())?;
-                            return Ok(ExtType::ListExtType(ListExtType {
+                    _ => (),
+                },
+                ("type", [Term::Atom(kind), Term::List(decl)]) if kind.name == "record" => {
+                    if let [record_name, field_tys @ ..] = &decl.elements[..] {
+                        let record_name = self.convert_atom_lit(record_name)?;
+                        if field_tys.is_empty() {
+                            return Ok(ExtType::RecordExtType(RecordExtType {
                                 pos,
-                                t: Box::new(t),
+                                name: record_name,
+                            }));
+                        } else {
+                            let refined_fields = field_tys
+                                .iter()
+                                .map(|ty| self.convert_refined_field(ty))
+                                .collect::<Result<Vec<_>, _>>()?;
+                            return Ok(ExtType::RecordRefinedExtType(RecordRefinedExtType {
+                                pos,
+                                name: record_name,
+                                refined_fields,
                             }));
                         }
                     }
-                    ("type", [Term::Atom(kind), Term::List(args)])
-                        if (kind.name == "maybe_improper_list"
-                            || kind.name == "nonempty_improper_list"
-                            || kind.name == "nonempty_maybe_improper_list")
-                            && args.elements.len() == 2 =>
-                    {
+                }
+                ("remote_type", [Term::List(decl)]) => {
+                    if let [module, name, Term::List(args)] = &decl.elements[..] {
+                        let module = self.convert_atom_lit(module)?;
+                        let name = self.convert_atom_lit(name)?;
+                        let id = RemoteId {
+                            module,
+                            name,
+                            arity: args.elements.len() as u32,
+                        };
+                        let args = args
+                            .elements
+                            .iter()
+                            .map(|ty| self.convert_type(ty))
+                            .collect::<Result<Vec<_>, _>>()?;
+                        return Ok(ExtType::RemoteExtType(RemoteExtType { pos, id, args }));
+                    }
+                }
+                ("user_type", [Term::Atom(name), Term::List(params)]) => {
+                    let id = Id {
+                        name: StringId::from(&name.name),
+                        arity: params.elements.len() as u32,
+                    };
+                    let args = params
+                        .elements
+                        .iter()
+                        .map(|ty| self.convert_type(ty))
+                        .collect::<Result<Vec<_>, _>>()?;
+                    return Ok(ExtType::LocalExtType(LocalExtType { pos, id, args }));
+                }
+                ("integer", [Term::BigInteger(_)]) => {
+                    return Ok(ExtType::IntLitExtType(IntLitExtType { pos }));
+                }
+                ("char", [Term::BigInteger(_)]) => {
+                    return Ok(ExtType::char_ext_type(pos));
+                }
+                ("integer", [Term::FixInteger(_)]) => {
+                    return Ok(ExtType::IntLitExtType(IntLitExtType { pos }));
+                }
+                ("char", [Term::FixInteger(_)]) => {
+                    return Ok(ExtType::char_ext_type(pos));
+                }
+                ("op", [Term::Atom(op), _]) => {
+                    return Ok(ExtType::UnOpType(UnOpType {
+                        pos,
+                        op: StringId::from(&op.name),
+                    }));
+                }
+                ("op", [Term::Atom(op), _, _]) => {
+                    return Ok(ExtType::BinOpType(BinOpType {
+                        pos,
+                        op: StringId::from(&op.name),
+                    }));
+                }
+                ("type", [Term::Atom(kind), Term::Atom(param)])
+                    if kind.name == "tuple" && param.name == "any" =>
+                {
+                    return Ok(ExtType::tuple_ext_type(pos));
+                }
+                ("type", [Term::Atom(kind), Term::List(params)]) if kind.name == "tuple" => {
+                    let arg_tys = params
+                        .elements
+                        .iter()
+                        .map(|ty| self.convert_type(ty))
+                        .collect::<Result<Vec<_>, _>>()?;
+                    return Ok(ExtType::TupleExtType(TupleExtType { pos, arg_tys }));
+                }
+                ("type", [Term::Atom(kind), Term::List(params)]) if kind.name == "union" => {
+                    let tys = params
+                        .elements
+                        .iter()
+                        .map(|ty| self.convert_type(ty))
+                        .collect::<Result<Vec<_>, _>>()?;
+                    return Ok(ExtType::UnionExtType(UnionExtType { pos, tys }));
+                }
+                ("var", [Term::Atom(var)]) if var.name == "_" => {
+                    return Ok(ExtType::any_ext_type(pos));
+                }
+                ("var", [Term::Atom(var)]) => {
+                    return Ok(ExtType::VarExtType(VarExtType {
+                        pos,
+                        name: StringId::from(&var.name),
+                    }));
+                }
+                ("type", [Term::Atom(kind), Term::List(args)])
+                    if (kind.name == "list" || kind.name == "nonempty_list") =>
+                {
+                    if args.is_nil() {
+                        return Ok(ExtType::AnyListExtType(AnyListExtType { pos }));
+                    } else if args.elements.len() == 1 {
                         let t = self.convert_type(args.elements.first().unwrap())?;
                         return Ok(ExtType::ListExtType(ListExtType {
                             pos,
                             t: Box::new(t),
                         }));
                     }
-                    ("type", [Term::Atom(kind), Term::List(args)]) if args.is_nil() => {
-                        let builtin = Type::builtin_type(&kind.name);
-                        if builtin.is_none() {
-                            return Err(ConversionError::UnknownBuiltin(kind.name.clone(), 0));
-                        } else {
-                            return Ok(ExtType::BuiltinExtType(BuiltinExtType {
-                                pos,
-                                name: StringId::from(&kind.name),
-                            }));
-                        }
-                    }
-                    ("type", [Term::Atom(kind), Term::List(params)]) if kind.name == "binary" => {
-                        if params.elements.len() == 1 || params.elements.len() == 2 {
-                            return Ok(ExtType::binary_ext_type(pos));
-                        }
-                    }
-                    ("type", [Term::Atom(name), Term::List(params)]) => {
-                        let arity = params.elements.len();
-                        return Err(ConversionError::UnknownBuiltin(name.name.clone(), arity));
-                    }
-                    _ => (),
                 }
+                ("type", [Term::Atom(kind), Term::List(args)])
+                    if (kind.name == "maybe_improper_list"
+                        || kind.name == "nonempty_improper_list"
+                        || kind.name == "nonempty_maybe_improper_list")
+                        && args.elements.len() == 2 =>
+                {
+                    let t = self.convert_type(args.elements.first().unwrap())?;
+                    return Ok(ExtType::ListExtType(ListExtType {
+                        pos,
+                        t: Box::new(t),
+                    }));
+                }
+                ("type", [Term::Atom(kind), Term::List(args)]) if args.is_nil() => {
+                    let builtin = Type::builtin_type(&kind.name);
+                    if builtin.is_none() {
+                        return Err(ConversionError::UnknownBuiltin(kind.name.clone(), 0));
+                    } else {
+                        return Ok(ExtType::BuiltinExtType(BuiltinExtType {
+                            pos,
+                            name: StringId::from(&kind.name),
+                        }));
+                    }
+                }
+                ("type", [Term::Atom(kind), Term::List(params)]) if kind.name == "binary" => {
+                    if params.elements.len() == 1 || params.elements.len() == 2 {
+                        return Ok(ExtType::binary_ext_type(pos));
+                    }
+                }
+                ("type", [Term::Atom(name), Term::List(params)]) => {
+                    let arity = params.elements.len();
+                    return Err(ConversionError::UnknownBuiltin(name.name.clone(), arity));
+                }
+                _ => (),
             }
         }
         Err(ConversionError::InvalidType)
@@ -2125,10 +2109,10 @@ impl Converter {
 
     fn convert_form(&mut self, term: &eetf::Term) -> Result<Option<ExternalForm>, ConversionError> {
         if let Term::Tuple(tuple) = term {
-            if let [Term::Atom(atom), _] = &tuple.elements[..] {
-                if atom.name == "eof" {
-                    return Ok(None);
-                }
+            if let [Term::Atom(atom), _] = &tuple.elements[..]
+                && atom.name == "eof"
+            {
+                return Ok(None);
             }
             if let [Term::Atom(atom), _] = &tuple.elements[..] {
                 // incorrect moduledoc may produce warnings
@@ -2137,11 +2121,11 @@ impl Converter {
                     return Ok(None);
                 }
             }
-            if let [Term::Atom(attr), pos, Term::Atom(kind), args] = &tuple.elements[..] {
-                if attr.name == "attribute" {
-                    let pos = self.convert_pos(pos)?;
-                    return self.convert_attribute(kind, args, pos);
-                }
+            if let [Term::Atom(attr), pos, Term::Atom(kind), args] = &tuple.elements[..]
+                && attr.name == "attribute"
+            {
+                let pos = self.convert_pos(pos)?;
+                return self.convert_attribute(kind, args, pos);
             }
             if let [
                 Term::Atom(fun),
@@ -2150,15 +2134,14 @@ impl Converter {
                 Term::FixInteger(arity),
                 Term::List(clauses),
             ] = &tuple.elements[..]
+                && fun.name == "function"
             {
-                if fun.name == "function" {
-                    if !self.filter_stub {
-                        let pos = self.convert_pos(pos)?;
-                        let arity = arity.value as u32;
-                        return Ok(Some(self.convert_function(name, arity, clauses, pos)?));
-                    } else {
-                        return Ok(None);
-                    }
+                if !self.filter_stub {
+                    let pos = self.convert_pos(pos)?;
+                    let arity = arity.value as u32;
+                    return Ok(Some(self.convert_function(name, arity, clauses, pos)?));
+                } else {
+                    return Ok(None);
                 }
             }
         }
@@ -2166,22 +2149,19 @@ impl Converter {
     }
 
     fn extract_no_auto_import(&self, term: &eetf::Term) -> Option<Vec<ast::Id>> {
-        if let Term::Tuple(tuple) = term {
-            if let [Term::Atom(attr), _, Term::Atom(kind), Term::Tuple(args)] = &tuple.elements[..]
-            {
-                if attr.name == "attribute" && kind.name == "compile" {
-                    if let [Term::Atom(no_auto), Term::List(ids)] = &args.elements[..] {
-                        if no_auto.name == "no_auto_import" {
-                            return Some(
-                                ids.elements
-                                    .iter()
-                                    .flat_map(|id| self.convert_id(id))
-                                    .collect(),
-                            );
-                        }
-                    }
-                }
-            }
+        if let Term::Tuple(tuple) = term
+            && let [Term::Atom(attr), _, Term::Atom(kind), Term::Tuple(args)] = &tuple.elements[..]
+            && attr.name == "attribute"
+            && kind.name == "compile"
+            && let [Term::Atom(no_auto), Term::List(ids)] = &args.elements[..]
+            && no_auto.name == "no_auto_import"
+        {
+            return Some(
+                ids.elements
+                    .iter()
+                    .flat_map(|id| self.convert_id(id))
+                    .collect(),
+            );
         }
         None
     }
diff --git a/crates/eqwalizer/src/ast/mod.rs b/crates/eqwalizer/src/ast/mod.rs
index 513ff924f1..4a193571b0 100644
--- a/crates/eqwalizer/src/ast/mod.rs
+++ b/crates/eqwalizer/src/ast/mod.rs
@@ -158,13 +158,12 @@ impl fmt::Display for TypeConversionError {
 
 pub fn from_bytes(bytes: &Vec<u8>, filter_stub: bool) -> Result<AST, Error> {
     let term = eetf::Term::decode(Cursor::new(bytes))?;
-    if let Term::Tuple(res) = term {
-        if let [Term::Atom(ok), forms, _] = &res.elements[..] {
-            if ok.name == "ok" {
-                let converted_forms = convert::convert_forms(forms, false, filter_stub)?;
-                return Ok(preprocess::preprocess(converted_forms));
-            }
-        }
+    if let Term::Tuple(res) = term
+        && let [Term::Atom(ok), forms, _] = &res.elements[..]
+        && ok.name == "ok"
+    {
+        let converted_forms = convert::convert_forms(forms, false, filter_stub)?;
+        return Ok(preprocess::preprocess(converted_forms));
     }
     Err(Error::ConversionError(ConversionError::InvalidDecode))
 }
@@ -192,11 +191,11 @@ pub fn from_beam(bytes: &Vec<u8>) -> Result<AST, Error> {
         let length = u32::from_be_bytes(buf);
         if &tag == b"Dbgi" || &tag == b"Abst" {
             let t1 = Term::decode(&mut cursor)?;
-            if let Term::Tuple(terms) = t1 {
-                if let Term::Tuple(terms) = &terms.elements[2] {
-                    let ast = &terms.elements[0];
-                    return Ok(convert::convert_forms(ast, true, true)?);
-                }
+            if let Term::Tuple(terms) = t1
+                && let Term::Tuple(terms) = &terms.elements[2]
+            {
+                let ast = &terms.elements[0];
+                return Ok(convert::convert_forms(ast, true, true)?);
             }
         } else {
             cursor.consume(((length + 3) & !3) as usize);
diff --git a/crates/eqwalizer/src/ast/preprocess.rs b/crates/eqwalizer/src/ast/preprocess.rs
index a36892b27f..d38b6751a2 100644
--- a/crates/eqwalizer/src/ast/preprocess.rs
+++ b/crates/eqwalizer/src/ast/preprocess.rs
@@ -179,36 +179,35 @@ impl Preprocessor {
             }
             Expr::Lambda(lambda) if lambda.clauses.len() == 1 => {
                 let clause = &lambda.clauses[0];
-                if let [body] = &clause.body.exprs[..] {
-                    if let [pat] = &clause.pats[..] {
-                        if let Some(test) = as_test(body.clone()) {
-                            return Expr::Lambda(Lambda {
-                                pos: lambda.pos.clone(),
-                                name: lambda.name,
-                                clauses: vec![
-                                    Clause {
-                                        pos: clause.pos.clone(),
-                                        pats: vec![pat.clone()],
-                                        guards: vec![Guard { tests: vec![test] }],
-                                        body: Body {
-                                            exprs: vec![Expr::atom_true(clause.pos.clone())],
-                                        },
-                                    },
-                                    Clause {
-                                        pos: clause.pos.clone(),
-                                        pats: vec![Pat::PatVar(PatVar {
-                                            pos: clause.pos.clone(),
-                                            n: self.fresh_var(),
-                                        })],
-                                        guards: vec![],
-                                        body: Body {
-                                            exprs: vec![Expr::atom_false(clause.pos.clone())],
-                                        },
-                                    },
-                                ],
-                            });
-                        }
-                    }
+                if let [body] = &clause.body.exprs[..]
+                    && let [pat] = &clause.pats[..]
+                    && let Some(test) = as_test(body.clone())
+                {
+                    return Expr::Lambda(Lambda {
+                        pos: lambda.pos.clone(),
+                        name: lambda.name,
+                        clauses: vec![
+                            Clause {
+                                pos: clause.pos.clone(),
+                                pats: vec![pat.clone()],
+                                guards: vec![Guard { tests: vec![test] }],
+                                body: Body {
+                                    exprs: vec![Expr::atom_true(clause.pos.clone())],
+                                },
+                            },
+                            Clause {
+                                pos: clause.pos.clone(),
+                                pats: vec![Pat::PatVar(PatVar {
+                                    pos: clause.pos.clone(),
+                                    n: self.fresh_var(),
+                                })],
+                                guards: vec![],
+                                body: Body {
+                                    exprs: vec![Expr::atom_false(clause.pos.clone())],
+                                },
+                            },
+                        ],
+                    });
                 }
                 Expr::Lambda(lambda)
             }
diff --git a/crates/hir/src/body/lower.rs b/crates/hir/src/body/lower.rs
index 89a0fcb5ec..f6a03b8a2c 100644
--- a/crates/hir/src/body/lower.rs
+++ b/crates/hir/src/body/lower.rs
@@ -183,10 +183,10 @@ impl<'a> Ctx<'a> {
     fn get_macro_information(&self) -> MacroInformation {
         let mut macro_map: FxHashMap<MacroSource, ResolvedMacro> = FxHashMap::default();
         self.macro_stack.iter().for_each(|e| {
-            if let Some(macro_source) = self.macro_source_map.get(&e.name) {
-                if let Some(resolution) = self.source_map.macro_map.get(macro_source) {
-                    macro_map.insert(*macro_source, *resolution);
-                }
+            if let Some(macro_source) = self.macro_source_map.get(&e.name)
+                && let Some(resolution) = self.source_map.macro_map.get(macro_source)
+            {
+                macro_map.insert(*macro_source, *resolution);
             }
         });
         (self.macro_stack.clone(), self.macro_stack_id, macro_map)
diff --git a/crates/hir/src/body/tree_print.rs b/crates/hir/src/body/tree_print.rs
index 92d88b1bbf..ff89265c10 100644
--- a/crates/hir/src/body/tree_print.rs
+++ b/crates/hir/src/body/tree_print.rs
@@ -126,10 +126,10 @@ pub(crate) fn print_function(
 ) -> String {
     let mut out = String::new();
 
-    if let Some((_, clause)) = body.clauses.iter().next() {
-        if let Some(na) = clause.name.clone() {
-            write!(out, "function: {na}").ok();
-        }
+    if let Some((_, clause)) = body.clauses.iter().next()
+        && let Some(na) = clause.name.clone()
+    {
+        write!(out, "function: {na}").ok();
     };
     let mut sep = "";
     for (_idx, clause) in body.clauses.iter() {
diff --git a/crates/hir/src/code_complexity.rs b/crates/hir/src/code_complexity.rs
index a7a787349e..38ef93c8ea 100644
--- a/crates/hir/src/code_complexity.rs
+++ b/crates/hir/src/code_complexity.rs
@@ -26,10 +26,10 @@ pub fn compute(sema: &Semantic, def: &FunctionDef, score_cap: Option<usize>) ->
     for decl in def.source(sema.db.upcast()) {
         for _line in decl.syntax().text().to_string().lines() {
             score += 1;
-            if let Some(score_cap) = score_cap {
-                if score >= score_cap {
-                    break;
-                }
+            if let Some(score_cap) = score_cap
+                && score >= score_cap
+            {
+                break;
             }
         }
     }
diff --git a/crates/hir/src/edoc.rs b/crates/hir/src/edoc.rs
index 7981acaec8..5061e79e23 100644
--- a/crates/hir/src/edoc.rs
+++ b/crates/hir/src/edoc.rs
@@ -158,10 +158,10 @@ impl EdocHeader {
 
     pub fn doc_content(&self) -> String {
         let mut res = String::new();
-        if let Some(doc) = &self.doc {
-            if let Some(markdown) = doc.to_markdown() {
-                res.push_str(&markdown);
-            }
+        if let Some(doc) = &self.doc
+            && let Some(markdown) = doc.to_markdown()
+        {
+            res.push_str(&markdown);
         }
         res
     }
@@ -210,10 +210,10 @@ impl EdocHeader {
                 EdocHeaderKind::Module => "-moduledoc hidden.",
                 EdocHeaderKind::Function => "-doc hidden.",
             };
-            if let Some(doc) = &self.doc {
-                if doc.to_markdown().is_some() {
-                    bug_9672 = true;
-                }
+            if let Some(doc) = &self.doc
+                && doc.to_markdown().is_some()
+            {
+                bug_9672 = true;
             }
             if bug_9672 {
                 // Due to a bug in OTP, we cannot add the hidden attribute if there's actual documentation
@@ -266,10 +266,10 @@ impl EdocHeader {
         if !params_metadata.is_empty() {
             res.push_str(&format!("params => #{{{}}}, ", params_metadata.trim()));
         }
-        if let Some(equiv) = &self.equiv {
-            if let Some(equivalent_to) = equiv.to_markdown() {
-                res.push_str(&format!("equiv => {}, ", equivalent_to.trim()));
-            }
+        if let Some(equiv) = &self.equiv
+            && let Some(equivalent_to) = equiv.to_markdown()
+        {
+            res.push_str(&format!("equiv => {}, ", equivalent_to.trim()));
         }
         let prefix = match self.kind {
             EdocHeaderKind::Module => "moduledoc",
@@ -310,13 +310,11 @@ fn is_divider(text: &str) -> bool {
 fn divider(syntax: &SyntaxNode, direction: Direction) -> Option<SyntaxNode> {
     if let Some(NodeOrToken::Node(node)) =
         algo::non_whitespace_sibling(NodeOrToken::Node(syntax.clone()), direction)
+        && node.kind() == SyntaxKind::COMMENT
+        && is_divider(&node.text().to_string())
+        && !next_to_empty_line(&node, direction)
     {
-        if node.kind() == SyntaxKind::COMMENT
-            && is_divider(&node.text().to_string())
-            && !next_to_empty_line(&node, direction)
-        {
-            return Some(node);
-        }
+        return Some(node);
     }
     None
 }
@@ -568,12 +566,11 @@ impl ParseContext {
         self.current_tag = tag
     }
     fn process_tag(&mut self) {
-        if let Some(last_comment) = self.lines.last() {
-            if let Some(content) = &last_comment.content {
-                if is_divider(content) {
-                    _ = self.lines.pop();
-                }
-            }
+        if let Some(last_comment) = self.lines.last()
+            && let Some(content) = &last_comment.content
+            && is_divider(content)
+        {
+            _ = self.lines.pop();
         }
         if let Some(tag_name) = &self.current_tag {
             match &tag_name.kind {
@@ -708,12 +705,12 @@ fn parse_edoc(
         let syntax = InFileAstPtr::new(form.file_id(), AstPtr::new(comment));
         match extract_edoc_tag_and_content(&text) {
             None => {
-                if let Some(captures) = COPYRIGHT_RE.captures(&text) {
-                    if let Some(content) = captures.get(1) {
-                        context
-                            .plaintext_copyrights
-                            .insert(content.as_str().to_string());
-                    }
+                if let Some(captures) = COPYRIGHT_RE.captures(&text)
+                    && let Some(content) = captures.get(1)
+                {
+                    context
+                        .plaintext_copyrights
+                        .insert(content.as_str().to_string());
                 }
                 if let Some(tag) = &context.current_tag {
                     context.ranges.push(comment.syntax().text_range());
diff --git a/crates/hir/src/module_data.rs b/crates/hir/src/module_data.rs
index 3f82864db7..620679d60d 100644
--- a/crates/hir/src/module_data.rs
+++ b/crates/hir/src/module_data.rs
@@ -309,14 +309,14 @@ impl FunctionDef {
 
     fn parameters_doc_from_doc_attribute(&self, db: &dyn DefDatabase) -> FxHashMap<String, String> {
         let mut res = FxHashMap::default();
-        if let Some(doc_metadata) = self.doc_metadata(db) {
-            if let Some(ast::Expr::MapExpr(doc_metadata)) = doc_metadata.value() {
-                let params = doc_metadata_params(&doc_metadata);
-                if let Some(ast::Expr::MapExpr(params)) = params {
-                    for param in params.fields() {
-                        if let Some((key, value)) = as_param(param) {
-                            res.insert(key, value);
-                        }
+        if let Some(doc_metadata) = self.doc_metadata(db)
+            && let Some(ast::Expr::MapExpr(doc_metadata)) = doc_metadata.value()
+        {
+            let params = doc_metadata_params(&doc_metadata);
+            if let Some(ast::Expr::MapExpr(params)) = params {
+                for param in params.fields() {
+                    if let Some((key, value)) = as_param(param) {
+                        res.insert(key, value);
                     }
                 }
             }
diff --git a/crates/hir/src/sema.rs b/crates/hir/src/sema.rs
index 86b1f8d687..954ebf8bf7 100644
--- a/crates/hir/src/sema.rs
+++ b/crates/hir/src/sema.rs
@@ -852,22 +852,22 @@ impl Semantic<'_> {
         // clause, and it has equivalents in another leg, then these
         // are also found.
         in_clause.body_exprs().for_each(|(expr_id, expr)| {
-            if let Expr::Var(v) = expr {
-                if let Some(ds) = resolver.resolve_expr_id(v, expr_id).cloned() {
-                    let ds_set = FxHashSet::from_iter(ds);
-                    if resolved_set.intersection(&ds_set).next().is_some() {
-                        resolved_set.extend(ds_set);
-                    }
+            if let Expr::Var(v) = expr
+                && let Some(ds) = resolver.resolve_expr_id(v, expr_id).cloned()
+            {
+                let ds_set = FxHashSet::from_iter(ds);
+                if resolved_set.intersection(&ds_set).next().is_some() {
+                    resolved_set.extend(ds_set);
                 }
             }
         });
         in_clause.body_pats().for_each(|(pat_id, pat)| {
-            if let Pat::Var(v) = pat {
-                if let Some(ds) = resolver.resolve_pat_id(v, pat_id).cloned() {
-                    let ds_set = FxHashSet::from_iter(ds);
-                    if resolved_set.intersection(&ds_set).next().is_some() {
-                        resolved_set.extend(ds_set);
-                    }
+            if let Pat::Var(v) = pat
+                && let Some(ds) = resolver.resolve_pat_id(v, pat_id).cloned()
+            {
+                let ds_set = FxHashSet::from_iter(ds);
+                if resolved_set.intersection(&ds_set).next().is_some() {
+                    resolved_set.extend(ds_set);
                 }
             }
         });
@@ -1061,29 +1061,21 @@ impl Semantic<'_> {
             *pat_id,
             FxHashSet::default(),
             &mut |mut acc, ctx| {
-                if let AnyExprId::Pat(pat_id) = ctx.item_id {
-                    if let Pat::Var(var) = &resolver[pat_id] {
-                        if let Some(pat_ids) = resolver.value.resolve_pat_id(var, pat_id) {
-                            pat_ids.iter().for_each(|def_pat_id| {
-                                if &pat_id != def_pat_id {
-                                    if let Some(pat_ptr) = body_map.pat(pat_id) {
-                                        if let Some(ast::Expr::ExprMax(ast::ExprMax::Var(var))) =
-                                            pat_ptr.to_node(&parse)
-                                        {
-                                            if var.syntax().text() != "_" {
-                                                acc.insert((
-                                                    resolver.function_clause_id,
-                                                    pat_id,
-                                                    var,
-                                                ));
-                                            }
-                                        }
-                                    };
-                                }
-                            });
-                        }
-                    };
-                }
+                if let AnyExprId::Pat(pat_id) = ctx.item_id
+                    && let Pat::Var(var) = &resolver[pat_id]
+                    && let Some(pat_ids) = resolver.value.resolve_pat_id(var, pat_id)
+                {
+                    pat_ids.iter().for_each(|def_pat_id| {
+                        if &pat_id != def_pat_id
+                            && let Some(pat_ptr) = body_map.pat(pat_id)
+                            && let Some(ast::Expr::ExprMax(ast::ExprMax::Var(var))) =
+                                pat_ptr.to_node(&parse)
+                            && var.syntax().text() != "_"
+                        {
+                            acc.insert((resolver.function_clause_id, pat_id, var));
+                        };
+                    });
+                };
                 acc
             },
         )
diff --git a/crates/hir/src/sema/to_def.rs b/crates/hir/src/sema/to_def.rs
index 83ff57e88a..6bbef6c687 100644
--- a/crates/hir/src/sema/to_def.rs
+++ b/crates/hir/src/sema/to_def.rs
@@ -471,7 +471,7 @@ impl ToDef for ast::Fa {
                         .cloned()
                         .map(FaDef::Callback)
                 },
-                _ => return None,
+                _ => None,
             }
         }
     }
diff --git a/crates/ide/src/call_hierarchy.rs b/crates/ide/src/call_hierarchy.rs
index 4d469c5412..d7a5842857 100644
--- a/crates/ide/src/call_hierarchy.rs
+++ b/crates/ide/src/call_hierarchy.rs
@@ -88,14 +88,14 @@ fn process_call_range(
     let def_map = sema.def_map(file_id);
     let enclosing_function_def = def_map.get_function(enclosing_function_name)?;
     let mut enclosing_function_nav = enclosing_function_def.to_nav(sema.db);
-    if file_id != position_file_id {
-        if let Some(module_name) = sema.module_name(file_id) {
-            enclosing_function_nav.name = SmolStr::new(format!(
-                "{}:{}",
-                module_name.as_str(),
-                enclosing_function_nav.name
-            ))
-        }
+    if file_id != position_file_id
+        && let Some(module_name) = sema.module_name(file_id)
+    {
+        enclosing_function_nav.name = SmolStr::new(format!(
+            "{}:{}",
+            module_name.as_str(),
+            enclosing_function_nav.name
+        ))
     }
     calls.add(enclosing_function_nav, *range);
     Some(())
@@ -136,18 +136,15 @@ pub(crate) fn outgoing_calls(db: &RootDatabase, position: FilePosition) -> Optio
                             nav.name = label
                         }
                         if let Some(expr) = &function_body.get_body_map(clause_id).any(ctx.item_id)
+                            && let Some(node) = expr.to_node(&source_file)
+                            && let Some(call) = algo::find_node_at_offset::<ast::Call>(
+                                node.syntax(),
+                                node.syntax().text_range().start(),
+                            )
+                            && let Some(expr) = call.expr()
                         {
-                            if let Some(node) = expr.to_node(&source_file) {
-                                if let Some(call) = algo::find_node_at_offset::<ast::Call>(
-                                    node.syntax(),
-                                    node.syntax().text_range().start(),
-                                ) {
-                                    if let Some(expr) = call.expr() {
-                                        let range = expr.syntax().text_range();
-                                        calls.add(nav, range);
-                                    }
-                                }
-                            }
+                            let range = expr.syntax().text_range();
+                            calls.add(nav, range);
                         }
                     }
                 }
diff --git a/crates/ide/src/codemod_helpers.rs b/crates/ide/src/codemod_helpers.rs
index 3bb360f878..ea11b664ae 100644
--- a/crates/ide/src/codemod_helpers.rs
+++ b/crates/ide/src/codemod_helpers.rs
@@ -423,17 +423,17 @@ impl TryFrom<&str> for MFA {
         lazy_static! {
             static ref RE: Regex = Regex::new(r"^([^:]+):([^:]+)\/(\d+)$").unwrap();
         }
-        if let Some(captures) = RE.captures(value) {
-            if captures.len() > 3 {
-                let arity = captures[3]
-                    .parse::<u32>()
-                    .unwrap_or_else(|_| panic!("bad arity field for `{value}'"));
-                return Ok(MFA {
-                    module: captures[1].to_string(),
-                    name: captures[2].to_string(),
-                    arity,
-                });
-            }
+        if let Some(captures) = RE.captures(value)
+            && captures.len() > 3
+        {
+            let arity = captures[3]
+                .parse::<u32>()
+                .unwrap_or_else(|_| panic!("bad arity field for `{value}'"));
+            return Ok(MFA {
+                module: captures[1].to_string(),
+                name: captures[2].to_string(),
+                arity,
+            });
         }
         Err(format!("invalid MFA '{value}'"))
     }
@@ -544,48 +544,46 @@ pub(crate) fn find_call_in_function<CallCtx, MakeCtx, Res>(
                 },
                 AnyExpr::Expr(Expr::Call { target, args }) => Some((target, Args::Args(args))),
                 _ => None,
-            } {
-                if let Some((mfa, t)) = matcher.get_match(
-                    &target,
-                    args.arity(),
-                    Some(&args.as_vec()),
-                    sema,
-                    &def_fb.body(clause_id),
-                ) {
-                    let in_clause = &def_fb.in_clause(clause_id);
-                    let context = CheckCallCtx {
-                        mfa,
-                        parents: ctx.parents,
-                        t,
-                        target: &target,
-                        args: args.clone(),
-                        in_clause,
+            } && let Some((mfa, t)) = matcher.get_match(
+                &target,
+                args.arity(),
+                Some(&args.as_vec()),
+                sema,
+                &def_fb.body(clause_id),
+            ) {
+                let in_clause = &def_fb.in_clause(clause_id);
+                let context = CheckCallCtx {
+                    mfa,
+                    parents: ctx.parents,
+                    t,
+                    target: &target,
+                    args: args.clone(),
+                    in_clause,
+                };
+                if let Some(extra) = check_call(context) {
+                    // Got one.
+                    let call_expr_id = if let Some(expr_id) = ctx.in_macro {
+                        expr_id.idx
+                    } else {
+                        ctx.item_id
                     };
-                    if let Some(extra) = check_call(context) {
-                        // Got one.
-                        let call_expr_id = if let Some(expr_id) = ctx.in_macro {
-                            expr_id.idx
+                    if let Some(range) = &def_fb.range_for_any(clause_id, call_expr_id) {
+                        let range_surface_mf = if ctx.in_macro.is_none() {
+                            target.range(in_clause)
                         } else {
-                            ctx.item_id
+                            // We need to rather use the full range, of the macro
+                            None
                         };
-                        if let Some(range) = &def_fb.range_for_any(clause_id, call_expr_id) {
-                            let range_surface_mf = if ctx.in_macro.is_none() {
-                                target.range(in_clause)
-                            } else {
-                                // We need to rather use the full range, of the macro
-                                None
-                            };
-                            if let Some(diag) = make(MatchCtx {
-                                sema,
-                                def_fb: in_clause,
-                                target: &target,
-                                args,
-                                extra: &extra,
-                                range_surface_mf,
-                                range: *range,
-                            }) {
-                                res.push(diag)
-                            }
+                        if let Some(diag) = make(MatchCtx {
+                            sema,
+                            def_fb: in_clause,
+                            target: &target,
+                            args,
+                            extra: &extra,
+                            range_surface_mf,
+                            range: *range,
+                        }) {
+                            res.push(diag)
                         }
                     }
                 }
diff --git a/crates/ide/src/common_test.rs b/crates/ide/src/common_test.rs
index 38edf8be25..eea87c4422 100644
--- a/crates/ide/src/common_test.rs
+++ b/crates/ide/src/common_test.rs
@@ -105,18 +105,17 @@ fn eval_error_diagnostic(
     def_map: &Arc<DefMap>,
     name: &NameArity,
 ) {
-    if let Some(def) = def_map.get_function(name) {
-        if let Some(name) = def.first_clause_name(sema.db.upcast()) {
-            let range = name.syntax().text_range();
-            let d = Diagnostic::new(
-                DiagnosticCode::CannotEvaluateCTCallbacks,
-                "Could not evaluate function. No code lenses for tests will be available."
-                    .to_string(),
-                range,
-            )
-            .with_severity(Severity::Warning);
-            res.push(d);
-        }
+    if let Some(def) = def_map.get_function(name)
+        && let Some(name) = def.first_clause_name(sema.db.upcast())
+    {
+        let range = name.syntax().text_range();
+        let d = Diagnostic::new(
+            DiagnosticCode::CannotEvaluateCTCallbacks,
+            "Could not evaluate function. No code lenses for tests will be available.".to_string(),
+            range,
+        )
+        .with_severity(Severity::Warning);
+        res.push(d);
     }
 }
 
@@ -146,12 +145,10 @@ fn exported_test_ranges(sema: &Semantic, file_id: FileId) -> FxHashMap<NameArity
         if def.exported
             && !KNOWN_FUNCTIONS_ARITY_1.contains(name_arity)
             && !excludes.contains(name_arity)
+            && let Some(name) = def.source(sema.db.upcast()).first().and_then(|f| f.name())
+            && name_arity.arity() == 1
         {
-            if let Some(name) = def.source(sema.db.upcast()).first().and_then(|f| f.name()) {
-                if name_arity.arity() == 1 {
-                    res.insert(name_arity.clone(), name.syntax().text_range());
-                }
-            }
+            res.insert(name_arity.clone(), name.syntax().text_range());
         }
     }
     res
@@ -175,21 +172,21 @@ pub fn runnables(
     groups: &FxHashMap<SmolStr, GroupDef>,
 ) -> Result<Vec<Runnable>, ()> {
     let mut res = Vec::new();
-    if let Some(module_name) = sema.module_name(file_id) {
-        if is_suite(&module_name) {
-            // Add a runnable for the entire test suite
-            if let Some(suite_runnable) = suite_to_runnable(sema, file_id) {
-                res.push(suite_runnable);
-            }
-            runnables_for_test_defs(
-                &mut res,
-                sema,
-                file_id,
-                all.iter(),
-                FxHashSet::default(),
-                groups,
-            );
+    if let Some(module_name) = sema.module_name(file_id)
+        && is_suite(&module_name)
+    {
+        // Add a runnable for the entire test suite
+        if let Some(suite_runnable) = suite_to_runnable(sema, file_id) {
+            res.push(suite_runnable);
         }
+        runnables_for_test_defs(
+            &mut res,
+            sema,
+            file_id,
+            all.iter(),
+            FxHashSet::default(),
+            groups,
+        );
     }
     Ok(res)
 }
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 5be0b80782..476ef31e0d 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1360,14 +1360,14 @@ fn check_missing_sep<Node: AstNode + std::fmt::Debug>(
 
     for node in nodes.skip(1) {
         let syntax = node.syntax();
-        if let Some(previous) = non_whitespace_prev_token(syntax) {
-            if previous.kind() != separator {
-                diagnostics.push(make_missing_diagnostic(
-                    previous.text_range(),
-                    item,
-                    code.to_string(),
-                ))
-            }
+        if let Some(previous) = non_whitespace_prev_token(syntax)
+            && previous.kind() != separator
+        {
+            diagnostics.push(make_missing_diagnostic(
+                previous.text_range(),
+                item,
+                code.to_string(),
+            ))
         }
     }
 
@@ -1375,16 +1375,15 @@ fn check_missing_sep<Node: AstNode + std::fmt::Debug>(
 }
 
 fn record_decl_check_missing_comma(record: ast::RecordDecl) -> Vec<Diagnostic> {
-    if let Some(name) = record.name() {
-        if let Some(next) = non_whitespace_next_token(name.syntax()) {
-            if next.kind() != SyntaxKind::ANON_COMMA {
-                return vec![make_missing_diagnostic(
-                    name.syntax().text_range(),
-                    ",",
-                    "missing_comma".to_string(),
-                )];
-            }
-        }
+    if let Some(name) = record.name()
+        && let Some(next) = non_whitespace_next_token(name.syntax())
+        && next.kind() != SyntaxKind::ANON_COMMA
+    {
+        return vec![make_missing_diagnostic(
+            name.syntax().text_range(),
+            ",",
+            "missing_comma".to_string(),
+        )];
     }
 
     vec![]
diff --git a/crates/ide/src/diagnostics/boolean_precedence.rs b/crates/ide/src/diagnostics/boolean_precedence.rs
index cdddb76e44..86650651f7 100644
--- a/crates/ide/src/diagnostics/boolean_precedence.rs
+++ b/crates/ide/src/diagnostics/boolean_precedence.rs
@@ -124,47 +124,47 @@ fn report(
     */
     let (binop, b_lhs, b_rhs) = binop;
     let body = def_fb.body(clause_id);
-    if let ParentId::HirIdx(hir_idx) = ctx.parent() {
-        if let AnyExprRef::Expr(Expr::BinaryOp { lhs, rhs, op: _ }) = &body.get_any(hir_idx.idx) {
-            let lhs_complex = AnyExprId::Expr(*rhs) == ctx.item_id;
-            let rhs_complex = AnyExprId::Expr(*lhs) == ctx.item_id;
-            if !lhs_complex && !rhs_complex {
-                return None;
+    if let ParentId::HirIdx(hir_idx) = ctx.parent()
+        && let AnyExprRef::Expr(Expr::BinaryOp { lhs, rhs, op: _ }) = &body.get_any(hir_idx.idx)
+    {
+        let lhs_complex = AnyExprId::Expr(*rhs) == ctx.item_id;
+        let rhs_complex = AnyExprId::Expr(*lhs) == ctx.item_id;
+        if !lhs_complex && !rhs_complex {
+            return None;
+        }
+        let map = def_fb.get_body_map(clause_id);
+        let add_parens_range = if rhs_complex {
+            let b_rhs_ast_ptr = map.expr(b_rhs)?;
+            let rhs_ast_ptr = map.expr(*rhs)?;
+            TextRange::new(
+                b_rhs_ast_ptr.range().range.start(),
+                rhs_ast_ptr.range().range.end(),
+            )
+        } else {
+            let lhs_ast_ptr = map.expr(*lhs)?;
+            let b_lhs_ast_ptr = map.expr(b_lhs)?;
+            TextRange::new(
+                lhs_ast_ptr.range().range.start(),
+                b_lhs_ast_ptr.range().range.end(),
+            )
+        };
+        let expr_source = map.any(ctx.item_id)?;
+        let source = sema.db.parse(file_id).tree();
+        if let Some(ast::Expr::BinaryOpExpr(binop_ast)) =
+            unwrap_parens(&expr_source.to_node(&InFile::new(file_id, source))?)
+        {
+            let (_op, token) = binop_ast.op()?;
+            let range = token.text_range();
+            let preceding_ws_range = include_preceding_whitespace(&token);
+            let mut d = make_diagnostic(file_id, range, preceding_ws_range, binop)
+                .with_ignore_fix(sema, def_fb.file_id());
+            if lhs_complex {
+                add_parens_fix(file_id, &range, add_parens_range, "LHS", &mut d);
             }
-            let map = def_fb.get_body_map(clause_id);
-            let add_parens_range = if rhs_complex {
-                let b_rhs_ast_ptr = map.expr(b_rhs)?;
-                let rhs_ast_ptr = map.expr(*rhs)?;
-                TextRange::new(
-                    b_rhs_ast_ptr.range().range.start(),
-                    rhs_ast_ptr.range().range.end(),
-                )
-            } else {
-                let lhs_ast_ptr = map.expr(*lhs)?;
-                let b_lhs_ast_ptr = map.expr(b_lhs)?;
-                TextRange::new(
-                    lhs_ast_ptr.range().range.start(),
-                    b_lhs_ast_ptr.range().range.end(),
-                )
-            };
-            let expr_source = map.any(ctx.item_id)?;
-            let source = sema.db.parse(file_id).tree();
-            if let Some(ast::Expr::BinaryOpExpr(binop_ast)) =
-                unwrap_parens(&expr_source.to_node(&InFile::new(file_id, source))?)
-            {
-                let (_op, token) = binop_ast.op()?;
-                let range = token.text_range();
-                let preceding_ws_range = include_preceding_whitespace(&token);
-                let mut d = make_diagnostic(file_id, range, preceding_ws_range, binop)
-                    .with_ignore_fix(sema, def_fb.file_id());
-                if lhs_complex {
-                    add_parens_fix(file_id, &range, add_parens_range, "LHS", &mut d);
-                }
-                if rhs_complex {
-                    add_parens_fix(file_id, &range, add_parens_range, "RHS", &mut d);
-                }
-                diagnostics.push(d);
+            if rhs_complex {
+                add_parens_fix(file_id, &range, add_parens_range, "RHS", &mut d);
             }
+            diagnostics.push(d);
         }
     };
     Some(())
diff --git a/crates/ide/src/diagnostics/dependent_header.rs b/crates/ide/src/diagnostics/dependent_header.rs
index 0c44520e42..d3b786e240 100644
--- a/crates/ide/src/diagnostics/dependent_header.rs
+++ b/crates/ide/src/diagnostics/dependent_header.rs
@@ -70,17 +70,16 @@ fn dependent_header(
                         _ => None,
                     } {
                         let record_name = sema.db.lookup_atom(name);
-                        if def_map.get_record(&record_name).is_none() {
-                            if let Some(in_file_ast_ptr) = body_map.any(ctx.item_id) {
-                                if let Some(expr_ast) = in_file_ast_ptr.to_node(&source_file) {
-                                    let diagnostic_range = match extract_record_name(&expr_ast) {
-                                        Some(name) => name.syntax().text_range(),
-                                        None => expr_ast.syntax().text_range(),
-                                    };
-                                    let d = make_diagnostic(diagnostic_range, record_name);
-                                    diagnostics.push(d);
-                                }
-                            }
+                        if def_map.get_record(&record_name).is_none()
+                            && let Some(in_file_ast_ptr) = body_map.any(ctx.item_id)
+                            && let Some(expr_ast) = in_file_ast_ptr.to_node(&source_file)
+                        {
+                            let diagnostic_range = match extract_record_name(&expr_ast) {
+                                Some(name) => name.syntax().text_range(),
+                                None => expr_ast.syntax().text_range(),
+                            };
+                            let d = make_diagnostic(diagnostic_range, record_name);
+                            diagnostics.push(d);
                         }
                     };
                     acc
diff --git a/crates/ide/src/diagnostics/deprecated_function.rs b/crates/ide/src/diagnostics/deprecated_function.rs
index 971a384a56..3162a95954 100644
--- a/crates/ide/src/diagnostics/deprecated_function.rs
+++ b/crates/ide/src/diagnostics/deprecated_function.rs
@@ -139,18 +139,18 @@ fn check_function(
                         } else {
                             ctx.item_id
                         };
-                        if let Some(range) = def_fb.range_for_any(clause_id, expr_id) {
-                            if def.file.file_id == range.file_id {
-                                let d = make_diagnostic(range.range, &target_def, details)
-                                    .with_fixes(Some(vec![fix_xref_ignore(
-                                        sema,
-                                        def_fb.file_id(),
-                                        &target_def,
-                                        range.range,
-                                    )]))
-                                    .with_ignore_fix(sema, def_fb.file_id());
-                                diagnostics.push(d)
-                            }
+                        if let Some(range) = def_fb.range_for_any(clause_id, expr_id)
+                            && def.file.file_id == range.file_id
+                        {
+                            let d = make_diagnostic(range.range, &target_def, details)
+                                .with_fixes(Some(vec![fix_xref_ignore(
+                                    sema,
+                                    def_fb.file_id(),
+                                    &target_def,
+                                    range.range,
+                                )]))
+                                .with_ignore_fix(sema, def_fb.file_id());
+                            diagnostics.push(d)
                         }
                     }
                 }
diff --git a/crates/ide/src/diagnostics/edoc.rs b/crates/ide/src/diagnostics/edoc.rs
index ac09034315..1f708b51ea 100644
--- a/crates/ide/src/diagnostics/edoc.rs
+++ b/crates/ide/src/diagnostics/edoc.rs
@@ -76,16 +76,16 @@ fn check(diagnostics: &mut Vec<Diagnostic>, sema: &Semantic, file_id: FileId) {
                         doc_start,
                     ));
                 }
-            } else if let Some(hidden) = &header.hidden {
-                if let Some(doc_start) = header.start() {
-                    diagnostics.push(old_edoc_syntax_diagnostic(
-                        sema,
-                        file_id,
-                        hidden.range,
-                        header,
-                        doc_start,
-                    ));
-                }
+            } else if let Some(hidden) = &header.hidden
+                && let Some(doc_start) = header.start()
+            {
+                diagnostics.push(old_edoc_syntax_diagnostic(
+                    sema,
+                    file_id,
+                    hidden.range,
+                    header,
+                    doc_start,
+                ));
             }
         }
     }
diff --git a/crates/ide/src/diagnostics/effect_free_statement.rs b/crates/ide/src/diagnostics/effect_free_statement.rs
index 13771e0faa..a5a1a138a9 100644
--- a/crates/ide/src/diagnostics/effect_free_statement.rs
+++ b/crates/ide/src/diagnostics/effect_free_statement.rs
@@ -68,16 +68,14 @@ fn effect_free_statement(diags: &mut Vec<Diagnostic>, sema: &Semantic, file_id:
                 if let AnyExprId::Expr(expr_id) = ctx.item_id {
                     let body_map = def_fb.get_body_map(clause_id);
                     let in_clause = def_fb.in_clause(clause_id);
-                    if let Some(in_file_ast_ptr) = body_map.expr(expr_id) {
-                        if let Some(expr_ast) = in_file_ast_ptr.to_node(&source_file) {
-                            if is_statement(&expr_ast)
-                                && !is_macro_usage(&expr_ast)
-                                && has_no_effect(in_clause, &expr_id)
-                                && is_followed_by(SyntaxKind::ANON_COMMA, &expr_ast)
-                            {
-                                diags.push(make_diagnostic(file_id, &expr_ast));
-                            }
-                        }
+                    if let Some(in_file_ast_ptr) = body_map.expr(expr_id)
+                        && let Some(expr_ast) = in_file_ast_ptr.to_node(&source_file)
+                        && is_statement(&expr_ast)
+                        && !is_macro_usage(&expr_ast)
+                        && has_no_effect(in_clause, &expr_id)
+                        && is_followed_by(SyntaxKind::ANON_COMMA, &expr_ast)
+                    {
+                        diags.push(make_diagnostic(file_id, &expr_ast));
                     }
                 }
             },
diff --git a/crates/ide/src/diagnostics/eqwalizer_assists/expected_type.rs b/crates/ide/src/diagnostics/eqwalizer_assists/expected_type.rs
index 31096f0112..ff8226b611 100644
--- a/crates/ide/src/diagnostics/eqwalizer_assists/expected_type.rs
+++ b/crates/ide/src/diagnostics/eqwalizer_assists/expected_type.rs
@@ -65,23 +65,23 @@ pub fn expected_type(
 
             // 2-Tuple with leading atom vs just the second part
             (Type::TupleType(TupleType { arg_tys }), other2) => {
-                if let [atom @ Type::AtomLitType(AtomLitType { .. }), other] = &arg_tys[..] {
-                    if other == other2 {
-                        // Add wrapping tuple to return
-                        let file_text = sema.db.file_text(file_id);
-                        let current = &file_text[d.range.start().into()..d.range.end().into()];
-                        let replacement = format!("{{{atom}, {current}}}");
-                        let edit = TextEdit::replace(d.range, replacement.clone());
-                        diagnostic.add_fix(fix(
-                            "fix_expected_type",
-                            format!("Update returned value to '{replacement}'").as_str(),
-                            SourceChange::from_text_edit(file_id, edit),
-                            d.range,
-                        ));
+                if let [atom @ Type::AtomLitType(AtomLitType { .. }), other] = &arg_tys[..]
+                    && other == other2
+                {
+                    // Add wrapping tuple to return
+                    let file_text = sema.db.file_text(file_id);
+                    let current = &file_text[d.range.start().into()..d.range.end().into()];
+                    let replacement = format!("{{{atom}, {current}}}");
+                    let edit = TextEdit::replace(d.range, replacement.clone());
+                    diagnostic.add_fix(fix(
+                        "fix_expected_type",
+                        format!("Update returned value to '{replacement}'").as_str(),
+                        SourceChange::from_text_edit(file_id, edit),
+                        d.range,
+                    ));
 
-                        // Remove tuple from spec
-                        add_spec_fix(sema, file_id, got, diagnostic);
-                    }
+                    // Remove tuple from spec
+                    add_spec_fix(sema, file_id, got, diagnostic);
                 }
             }
 
diff --git a/crates/ide/src/diagnostics/eqwalizer_assists/unexported_type.rs b/crates/ide/src/diagnostics/eqwalizer_assists/unexported_type.rs
index 22001ba0ea..a0aad80973 100644
--- a/crates/ide/src/diagnostics/eqwalizer_assists/unexported_type.rs
+++ b/crates/ide/src/diagnostics/eqwalizer_assists/unexported_type.rs
@@ -43,35 +43,33 @@ pub fn unexported_type(
                     },
             }),
     }) = &d.diagnostic
+        && let Some(module) = resolve_module_name(sema, file_id, module)
     {
-        if let Some(module) = resolve_module_name(sema, file_id, module) {
-            let name = NameArity::new(Name::from_erlang_service(name), *arity);
-            if let Some(type_alias) = sema
-                .db
-                .def_map(module.file.file_id)
-                .get_types()
-                .get(&name)
-                .cloned()
-            {
-                if !type_alias.exported {
-                    let mut builder = SourceChangeBuilder::new(module.file.file_id);
-                    helpers::ExportBuilder::new(
-                        sema,
-                        module.file.file_id,
-                        ExportForm::Types,
-                        &[name.clone()],
-                        &mut builder,
-                    )
-                    .finish();
-                    let edit = builder.finish();
-                    diagnostic.add_fix(fix(
-                        "export_type",
-                        format!("Export the type `{name}`").as_str(),
-                        edit,
-                        diagnostic.range,
-                    ))
-                }
-            }
+        let name = NameArity::new(Name::from_erlang_service(name), *arity);
+        if let Some(type_alias) = sema
+            .db
+            .def_map(module.file.file_id)
+            .get_types()
+            .get(&name)
+            .cloned()
+            && !type_alias.exported
+        {
+            let mut builder = SourceChangeBuilder::new(module.file.file_id);
+            helpers::ExportBuilder::new(
+                sema,
+                module.file.file_id,
+                ExportForm::Types,
+                &[name.clone()],
+                &mut builder,
+            )
+            .finish();
+            let edit = builder.finish();
+            diagnostic.add_fix(fix(
+                "export_type",
+                format!("Export the type `{name}`").as_str(),
+                edit,
+                diagnostic.range,
+            ))
         }
     }
 }
diff --git a/crates/ide/src/diagnostics/macro_precedence_suprise.rs b/crates/ide/src/diagnostics/macro_precedence_suprise.rs
index c962c40cd3..eb982359e2 100644
--- a/crates/ide/src/diagnostics/macro_precedence_suprise.rs
+++ b/crates/ide/src/diagnostics/macro_precedence_suprise.rs
@@ -60,32 +60,31 @@ fn check_file(acc: &mut Vec<Diagnostic>, sema: &Semantic, file_id: &FileId) {
     };
 
     fold_file_functions(sema, fold_strategy, *file_id, (), &mut |_acc, ctx| {
-        if let AnyExpr::Expr(Expr::MacroCall { expansion, .. }) = &ctx.item {
-            if let Some((body, _body_map, ast)) = ctx.body_with_expr_source(sema) {
-                let visible_parens_body = body.index_with_strategy(index_strategy);
-                if let Expr::BinaryOp { .. } = &visible_parens_body[*expansion] {
-                    if let ParentId::HirIdx(hir_idx) = ctx.parent() {
-                        if hir_idx.body_origin == ctx.body_origin {
-                            // We can have nested macro
-                            // calls, which are not
-                            // visible in the
-                            // visible_parens_body. Report
-                            // on the top-level one only.
-                            let fold_body = body.index_with_strategy(fold_strategy);
-                            match &fold_body.get_any(hir_idx.idx) {
-                                AnyExprRef::Expr(Expr::MacroCall { .. }) => {}
-                                _ => {
-                                    if let AnyExprRef::Expr(Expr::BinaryOp { .. }) =
-                                        &visible_parens_body.get_any(hir_idx.idx)
-                                    {
-                                        make_diagnostic(acc, file_id, ast);
-                                    }
-                                }
-                            };
+        if let AnyExpr::Expr(Expr::MacroCall { expansion, .. }) = &ctx.item
+            && let Some((body, _body_map, ast)) = ctx.body_with_expr_source(sema)
+        {
+            let visible_parens_body = body.index_with_strategy(index_strategy);
+            if let Expr::BinaryOp { .. } = &visible_parens_body[*expansion]
+                && let ParentId::HirIdx(hir_idx) = ctx.parent()
+                && hir_idx.body_origin == ctx.body_origin
+            {
+                // We can have nested macro
+                // calls, which are not
+                // visible in the
+                // visible_parens_body. Report
+                // on the top-level one only.
+                let fold_body = body.index_with_strategy(fold_strategy);
+                match &fold_body.get_any(hir_idx.idx) {
+                    AnyExprRef::Expr(Expr::MacroCall { .. }) => {}
+                    _ => {
+                        if let AnyExprRef::Expr(Expr::BinaryOp { .. }) =
+                            &visible_parens_body.get_any(hir_idx.idx)
+                        {
+                            make_diagnostic(acc, file_id, ast);
                         }
-                    };
-                }
-            }
+                    }
+                };
+            };
         }
     });
 }
diff --git a/crates/ide/src/diagnostics/map_find_to_syntax.rs b/crates/ide/src/diagnostics/map_find_to_syntax.rs
index 79e890099a..2bb80e9307 100644
--- a/crates/ide/src/diagnostics/map_find_to_syntax.rs
+++ b/crates/ide/src/diagnostics/map_find_to_syntax.rs
@@ -232,10 +232,10 @@ fn from_ssr(diags: &mut Vec<Diagnostic>, sema: &Semantic, file_id: FileId, patte
             let body = body_arc.as_ref();
             if is_match_valid_pat(body, key) && is_match_valid_pat(body, value) {
                 if let Some(value2) = maybe_value2 {
-                    if is_match_valid_pat(body, value2) {
-                        if let Some(diagnostic) = make_diagnostic(sema, file_id, m) {
-                            diags.push(diagnostic)
-                        }
+                    if is_match_valid_pat(body, value2)
+                        && let Some(diagnostic) = make_diagnostic(sema, file_id, m)
+                    {
+                        diags.push(diagnostic)
                     }
                 } else if let Some(diagnostic) = make_diagnostic(sema, file_id, m) {
                     diags.push(diagnostic)
diff --git a/crates/ide/src/diagnostics/map_insertion_to_syntax.rs b/crates/ide/src/diagnostics/map_insertion_to_syntax.rs
index 75ec6c27cf..20fef36dab 100644
--- a/crates/ide/src/diagnostics/map_insertion_to_syntax.rs
+++ b/crates/ide/src/diagnostics/map_insertion_to_syntax.rs
@@ -96,14 +96,11 @@ fn map_put_to_syntax_ssr(diags: &mut Vec<Diagnostic>, sema: &Semantic, file_id:
         format!("ssr: maps:put({KEY_VAR},{VALUE_VAR},{MAP_VAR}).").as_str(),
     );
     matches.matches.iter().for_each(|m| {
-        if let Some(map_match) = m.get_placeholder_match(sema, MAP_VAR) {
-            if is_placeholder_a_var_from_sema_and_match(sema, m, &map_match) {
-                if let Some(diagnostic) =
-                    make_diagnostic(sema, file_id, m, MapInsertionFunction::Put)
-                {
-                    diags.push(diagnostic)
-                }
-            }
+        if let Some(map_match) = m.get_placeholder_match(sema, MAP_VAR)
+            && is_placeholder_a_var_from_sema_and_match(sema, m, &map_match)
+            && let Some(diagnostic) = make_diagnostic(sema, file_id, m, MapInsertionFunction::Put)
+        {
+            diags.push(diagnostic)
         }
     });
 }
@@ -119,14 +116,12 @@ fn map_update_to_syntax_ssr(diags: &mut Vec<Diagnostic>, sema: &Semantic, file_i
         format!("ssr: maps:update({KEY_VAR},{VALUE_VAR},{MAP_VAR}).").as_str(),
     );
     matches.matches.iter().for_each(|m| {
-        if let Some(map_match) = m.get_placeholder_match(sema, MAP_VAR) {
-            if is_placeholder_a_var_from_sema_and_match(sema, m, &map_match) {
-                if let Some(diagnostic) =
-                    make_diagnostic(sema, file_id, m, MapInsertionFunction::Update)
-                {
-                    diags.push(diagnostic)
-                }
-            }
+        if let Some(map_match) = m.get_placeholder_match(sema, MAP_VAR)
+            && is_placeholder_a_var_from_sema_and_match(sema, m, &map_match)
+            && let Some(diagnostic) =
+                make_diagnostic(sema, file_id, m, MapInsertionFunction::Update)
+        {
+            diags.push(diagnostic)
         }
     });
 }
diff --git a/crates/ide/src/diagnostics/mutable_variable.rs b/crates/ide/src/diagnostics/mutable_variable.rs
index 4bf4a4c73b..42a698eaa4 100644
--- a/crates/ide/src/diagnostics/mutable_variable.rs
+++ b/crates/ide/src/diagnostics/mutable_variable.rs
@@ -78,35 +78,32 @@ fn mutable_variable_bug(
     sema.def_map(file_id)
         .get_function_clauses()
         .for_each(|(_, def)| {
-            if def.file.file_id == file_id {
-                if let Some(bound_vars) = bound_vars_by_function.get(&def.function_clause_id) {
-                    let in_clause = def.in_clause(sema, def);
-                    in_clause.fold_clause(
-                        Strategy {
-                            macros: MacroStrategy::Expand,
-                            parens: ParenStrategy::InvisibleParens,
-                        },
-                        (),
-                        &mut |acc, ctx| {
-                            if let AnyExpr::Expr(Expr::Match { lhs: _, rhs }) = ctx.item {
-                                if let Expr::Match { lhs, rhs: _ } = &in_clause[rhs] {
-                                    if bound_vars.contains(lhs) {
-                                        if let Some(range) = in_clause.range_for_any(ctx.item_id) {
-                                            if range.file_id == def.file.file_id {
-                                                diags.push(Diagnostic::new(
-                                                    DiagnosticCode::MutableVarBug,
-                                                    "Possible mutable variable bug",
-                                                    range.range,
-                                                ));
-                                            }
-                                        }
-                                    }
-                                }
-                            };
-                            acc
-                        },
-                    );
-                }
+            if def.file.file_id == file_id
+                && let Some(bound_vars) = bound_vars_by_function.get(&def.function_clause_id)
+            {
+                let in_clause = def.in_clause(sema, def);
+                in_clause.fold_clause(
+                    Strategy {
+                        macros: MacroStrategy::Expand,
+                        parens: ParenStrategy::InvisibleParens,
+                    },
+                    (),
+                    &mut |acc, ctx| {
+                        if let AnyExpr::Expr(Expr::Match { lhs: _, rhs }) = ctx.item
+                            && let Expr::Match { lhs, rhs: _ } = &in_clause[rhs]
+                            && bound_vars.contains(lhs)
+                            && let Some(range) = in_clause.range_for_any(ctx.item_id)
+                            && range.file_id == def.file.file_id
+                        {
+                            diags.push(Diagnostic::new(
+                                DiagnosticCode::MutableVarBug,
+                                "Possible mutable variable bug",
+                                range.range,
+                            ));
+                        };
+                        acc
+                    },
+                );
             }
         });
 
diff --git a/crates/ide/src/diagnostics/no_dialyzer_attribute.rs b/crates/ide/src/diagnostics/no_dialyzer_attribute.rs
index 2a43e7d4bc..ec67123aa9 100644
--- a/crates/ide/src/diagnostics/no_dialyzer_attribute.rs
+++ b/crates/ide/src/diagnostics/no_dialyzer_attribute.rs
@@ -37,10 +37,10 @@ pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
 fn no_dialyzer_attribute(diagnostics: &mut Vec<Diagnostic>, sema: &Semantic, file_id: FileId) {
     let form_list = sema.db.file_form_list(file_id);
     form_list.attributes().for_each(|(_idx, attr)| {
-        if attr.name == known::dialyzer {
-            if let Some(diagnostic) = make_diagnostic(sema, file_id, attr) {
-                diagnostics.push(diagnostic);
-            }
+        if attr.name == known::dialyzer
+            && let Some(diagnostic) = make_diagnostic(sema, file_id, attr)
+        {
+            diagnostics.push(diagnostic);
         }
     });
 }
diff --git a/crates/ide/src/diagnostics/no_nowarn_suppressions.rs b/crates/ide/src/diagnostics/no_nowarn_suppressions.rs
index 54bb3c99a2..f0484f0256 100644
--- a/crates/ide/src/diagnostics/no_nowarn_suppressions.rs
+++ b/crates/ide/src/diagnostics/no_nowarn_suppressions.rs
@@ -52,8 +52,8 @@ fn no_warn_suppression(diagnostics: &mut Vec<Diagnostic>, sema: &Semantic, file_
                 match_ast! {
                     match n {
                         ast::Atom(atom) => {
-                            if let Some(atom_text) = atom.text() {
-                                if NOWARN_REGEX.is_match(&atom_text) {
+                            if let Some(atom_text) = atom.text()
+                                && NOWARN_REGEX.is_match(&atom_text) {
                                     let diagnostic = Diagnostic::new(
                                         DIAGNOSTIC_CODE,
                                         DIAGNOSTIC_MESSAGE,
@@ -63,7 +63,6 @@ fn no_warn_suppression(diagnostics: &mut Vec<Diagnostic>, sema: &Semantic, file_
                                     .with_severity(DIAGNOSTIC_SEVERITY);
                                     diagnostics.push(diagnostic);
                                 }
-                            }
                         },
                         _ => {}
                     }
diff --git a/crates/ide/src/diagnostics/nonstandard_integer_formatting.rs b/crates/ide/src/diagnostics/nonstandard_integer_formatting.rs
index 8069b9bc0c..cb353cc63a 100644
--- a/crates/ide/src/diagnostics/nonstandard_integer_formatting.rs
+++ b/crates/ide/src/diagnostics/nonstandard_integer_formatting.rs
@@ -87,17 +87,16 @@ fn check_function(
                     let src_ast = src_ptr.to_ast(db);
                     let src_syntax = src_ast.syntax();
                     let src_text = src_syntax.text().to_string();
-                    if let Some(formatted_src_text) = format_integer(integer_to_format) {
-                        if formatted_src_text != src_text {
-                            if let Some(diagnostic) = make_diagnostic(
-                                sema,
-                                file_id,
-                                src_syntax.text_range(),
-                                &formatted_src_text,
-                            ) {
-                                diagnostics.push(diagnostic);
-                            }
-                        }
+                    if let Some(formatted_src_text) = format_integer(integer_to_format)
+                        && formatted_src_text != src_text
+                        && let Some(diagnostic) = make_diagnostic(
+                            sema,
+                            file_id,
+                            src_syntax.text_range(),
+                            &formatted_src_text,
+                        )
+                    {
+                        diagnostics.push(diagnostic);
                     }
                 }
             }
diff --git a/crates/ide/src/diagnostics/record_tuple_match.rs b/crates/ide/src/diagnostics/record_tuple_match.rs
index 32cb4d5713..019d6a57f5 100644
--- a/crates/ide/src/diagnostics/record_tuple_match.rs
+++ b/crates/ide/src/diagnostics/record_tuple_match.rs
@@ -57,18 +57,17 @@ fn check_function(acc: &mut Vec<Diagnostic>, sema: &Semantic, def: &FunctionDef)
         (),
         &mut |_acc, clause_id, ctx| {
             let in_clause = def_fb.in_clause(clause_id);
-            if let AnyExpr::Pat(Pat::Tuple { pats }) = &ctx.item {
-                if let Some(pat) = pats.first() {
-                    if let Pat::Literal(Literal::Atom(atom)) = &in_clause[*pat] {
-                        let def_map = sema.def_map(def.file.file_id);
-                        let record_name = &(*atom).as_name(sema.db.upcast());
-                        if let Some(record) = def_map.get_record(record_name) {
-                            if pats.len() == record.record.fields.len() + 1 {
-                                let range = in_clause.range_for_pat(*pat);
-                                report(def.file.file_id, record_name, range, acc);
-                            }
-                        }
-                    }
+            if let AnyExpr::Pat(Pat::Tuple { pats }) = &ctx.item
+                && let Some(pat) = pats.first()
+                && let Pat::Literal(Literal::Atom(atom)) = &in_clause[*pat]
+            {
+                let def_map = sema.def_map(def.file.file_id);
+                let record_name = &(*atom).as_name(sema.db.upcast());
+                if let Some(record) = def_map.get_record(record_name)
+                    && pats.len() == record.record.fields.len() + 1
+                {
+                    let range = in_clause.range_for_pat(*pat);
+                    report(def.file.file_id, record_name, range, acc);
                 }
             };
         },
diff --git a/crates/ide/src/diagnostics/redundant_assignment.rs b/crates/ide/src/diagnostics/redundant_assignment.rs
index 19973fb2ad..1521d4117c 100644
--- a/crates/ide/src/diagnostics/redundant_assignment.rs
+++ b/crates/ide/src/diagnostics/redundant_assignment.rs
@@ -72,23 +72,20 @@ fn process_matches(diags: &mut Vec<Diagnostic>, sema: &Semantic, def: &FunctionD
         (),
         &mut |_acc, clause_id, ctx| {
             let in_clause = def_fb.in_clause(clause_id);
-            if let AnyExprId::Expr(expr_id) = ctx.item_id {
-                if let AnyExpr::Expr(Expr::Match { lhs, rhs }) = ctx.item {
-                    if let Pat::Var(_) = &in_clause[lhs] {
-                        if let Expr::Var(_) = &in_clause[rhs] {
-                            if let Some(diag) = is_var_assignment_to_unused_var(
-                                sema,
-                                in_clause,
-                                def.file.file_id,
-                                expr_id,
-                                lhs,
-                                rhs,
-                            ) {
-                                diags.push(diag);
-                            }
-                        }
-                    }
-                }
+            if let AnyExprId::Expr(expr_id) = ctx.item_id
+                && let AnyExpr::Expr(Expr::Match { lhs, rhs }) = ctx.item
+                && let Pat::Var(_) = &in_clause[lhs]
+                && let Expr::Var(_) = &in_clause[rhs]
+                && let Some(diag) = is_var_assignment_to_unused_var(
+                    sema,
+                    in_clause,
+                    def.file.file_id,
+                    expr_id,
+                    lhs,
+                    rhs,
+                )
+            {
+                diags.push(diag);
             }
         },
     );
diff --git a/crates/ide/src/diagnostics/replace_call.rs b/crates/ide/src/diagnostics/replace_call.rs
index 76b8b5e07b..80c0ec3e97 100644
--- a/crates/ide/src/diagnostics/replace_call.rs
+++ b/crates/ide/src/diagnostics/replace_call.rs
@@ -220,10 +220,11 @@ fn replace_call(
                         .map(|source| source.to_string())
                 })
                 .collect();
-            if let Some(args_str) = opt_args_str {
-                if !args_str.is_empty() {
-                    let mut permuted_args: Vec<&String> = Vec::default();
-                    perm.iter().for_each(|new| {
+            if let Some(args_str) = opt_args_str
+                && !args_str.is_empty()
+            {
+                let mut permuted_args: Vec<&String> = Vec::default();
+                perm.iter().for_each(|new| {
                     let new = *new as usize;
                     if new < args_str.len() {
                         permuted_args.push(&args_str[new]);
@@ -236,19 +237,18 @@ fn replace_call(
                         );
                     }
                 });
-                    let replacement = permuted_args.iter().join(", ");
-                    if let Some(range_args) = args
-                        .iter()
-                        .map(|&id| {
-                            in_clause
-                                .range_for_expr(id)
-                                .expect("arg in permutation not found in function body.")
-                                .range
-                        })
-                        .reduce(|a, b| a.cover(b))
-                    {
-                        edit_builder.replace(range_args, replacement);
-                    }
+                let replacement = permuted_args.iter().join(", ");
+                if let Some(range_args) = args
+                    .iter()
+                    .map(|&id| {
+                        in_clause
+                            .range_for_expr(id)
+                            .expect("arg in permutation not found in function body.")
+                            .range
+                    })
+                    .reduce(|a, b| a.cover(b))
+                {
+                    edit_builder.replace(range_args, replacement);
                 }
             }
             Some(edit_builder.finish())
@@ -333,21 +333,12 @@ fn match_fun_ref_in_list_in_call_arg<T>(
                         target,
                         arity: arity_expr_id,
                     } = list_elem
+                        && let Expr::Literal(Literal::Integer(arity)) = &in_clause[*arity_expr_id]
+                        && matcher
+                            .get_match(target, arity.value as u32, None, sema, &in_clause.body())
+                            .is_some()
                     {
-                        if let Expr::Literal(Literal::Integer(arity)) = &in_clause[*arity_expr_id] {
-                            if matcher
-                                .get_match(
-                                    target,
-                                    arity.value as u32,
-                                    None,
-                                    sema,
-                                    &in_clause.body(),
-                                )
-                                .is_some()
-                            {
-                                result.push((*list_elem_id, target.clone(), arity.value as u32));
-                            }
-                        }
+                        result.push((*list_elem_id, target.clone(), arity.value as u32));
                     }
                 })
             }
diff --git a/crates/ide/src/diagnostics/replace_in_spec.rs b/crates/ide/src/diagnostics/replace_in_spec.rs
index 1126860234..0c43154064 100644
--- a/crates/ide/src/diagnostics/replace_in_spec.rs
+++ b/crates/ide/src/diagnostics/replace_in_spec.rs
@@ -70,60 +70,56 @@ pub fn replace_in_spec(
             )
             .collect();
         def_map.get_functions().for_each(|(na, def)| {
-            if possibles.contains(&(&na.name().to_string(), &na.arity())) {
-                if let Some(spec) = &def.spec {
-                    let spec_id = InFile::new(spec.file.file_id, spec.spec_id);
-                    let spec = sema.db.spec_body(spec_id);
-                    Spec::fold(
-                        sema,
-                        Strategy {
-                            macros: MacroStrategy::Expand,
-                            parens: ParenStrategy::InvisibleParens,
-                        },
-                        spec_id,
-                        (),
-                        &mut |_acc, ctx| {
-                            if let AnyExpr::TypeExpr(TypeExpr::Call { target, ref args }) = ctx.item
+            if possibles.contains(&(&na.name().to_string(), &na.arity()))
+                && let Some(spec) = &def.spec
+            {
+                let spec_id = InFile::new(spec.file.file_id, spec.spec_id);
+                let spec = sema.db.spec_body(spec_id);
+                Spec::fold(
+                    sema,
+                    Strategy {
+                        macros: MacroStrategy::Expand,
+                        parens: ParenStrategy::InvisibleParens,
+                    },
+                    spec_id,
+                    (),
+                    &mut |_acc, ctx| {
+                        if let AnyExpr::TypeExpr(TypeExpr::Call { target, ref args }) = ctx.item {
+                            let arity = args.len();
+                            let type_label = target.label(arity as u32, sema, &spec.body);
+                            let from_label: SmolStr = action_from.label().into();
+                            if type_label == Some(from_label)
+                                && let Some(range) = spec.body.range_for_any(sema, ctx.item_id)
+                                && range.file_id == file_id
                             {
-                                let arity = args.len();
-                                let type_label = target.label(arity as u32, sema, &spec.body);
-                                let from_label: SmolStr = action_from.label().into();
-                                if type_label == Some(from_label) {
-                                    if let Some(range) = spec.body.range_for_any(sema, ctx.item_id)
-                                    {
-                                        if range.file_id == file_id {
-                                            let mut edit_builder = TextEdit::builder();
-                                            edit_builder
-                                                .replace(range.range, action_to.to_string());
-                                            let edit = edit_builder.finish();
+                                let mut edit_builder = TextEdit::builder();
+                                edit_builder.replace(range.range, action_to.to_string());
+                                let edit = edit_builder.finish();
 
-                                            let diag_label = format!(
-                                                "Replace '{}' with '{}'",
-                                                &action_from.label(),
-                                                action_to
-                                            );
+                                let diag_label = format!(
+                                    "Replace '{}' with '{}'",
+                                    &action_from.label(),
+                                    action_to
+                                );
 
-                                            let diag = Diagnostic::new(
-                                                DiagnosticCode::AdHoc(action_from.label()),
-                                                diag_label.clone(),
-                                                range.range,
-                                            )
-                                            .with_severity(Severity::WeakWarning)
-                                            .experimental()
-                                            .with_fixes(Some(vec![fix(
-                                                "replace_type",
-                                                &diag_label,
-                                                SourceChange::from_text_edit(file_id, edit),
-                                                range.range,
-                                            )]));
-                                            diags.push(diag);
-                                        }
-                                    }
-                                }
-                            };
-                        },
-                    )
-                }
+                                let diag = Diagnostic::new(
+                                    DiagnosticCode::AdHoc(action_from.label()),
+                                    diag_label.clone(),
+                                    range.range,
+                                )
+                                .with_severity(Severity::WeakWarning)
+                                .experimental()
+                                .with_fixes(Some(vec![fix(
+                                    "replace_type",
+                                    &diag_label,
+                                    SourceChange::from_text_edit(file_id, edit),
+                                    range.range,
+                                )]));
+                                diags.push(diag);
+                            }
+                        };
+                    },
+                )
             }
         });
     }
diff --git a/crates/ide/src/diagnostics/undocumented_function.rs b/crates/ide/src/diagnostics/undocumented_function.rs
index a0d9e465ea..8e67dae85f 100644
--- a/crates/ide/src/diagnostics/undocumented_function.rs
+++ b/crates/ide/src/diagnostics/undocumented_function.rs
@@ -96,12 +96,11 @@ fn check_function(
         && def.doc_id.is_none()
         && def.doc_metadata_id.is_none()
         && def.edoc_comments(sema.db).is_none()
+        && let Some(name_range) = def.name_range(sema.db)
     {
-        if let Some(name_range) = def.name_range(sema.db) {
-            let diagnostic = Diagnostic::new(DIAGNOSTIC_CODE, DIAGNOSTIC_MESSAGE, name_range)
-                .with_severity(DIAGNOSTIC_SEVERITY);
-            diagnostics.push(diagnostic);
-        }
+        let diagnostic = Diagnostic::new(DIAGNOSTIC_CODE, DIAGNOSTIC_MESSAGE, name_range)
+            .with_severity(DIAGNOSTIC_SEVERITY);
+        diagnostics.push(diagnostic);
     }
 }
 
diff --git a/crates/ide/src/diagnostics/unused_function_args.rs b/crates/ide/src/diagnostics/unused_function_args.rs
index 394844f4a2..dbe7cd6152 100644
--- a/crates/ide/src/diagnostics/unused_function_args.rs
+++ b/crates/ide/src/diagnostics/unused_function_args.rs
@@ -78,34 +78,31 @@ fn unused_function_args(diags: &mut Vec<Diagnostic>, sema: &Semantic, file_id: F
                     *clause_arg_pat_id,
                     (),
                     &mut |(), ctx| {
-                        if let AnyExprId::Pat(pat_id) = ctx.item_id {
-                            if let Some(var) = match ctx.item {
+                        if let AnyExprId::Pat(pat_id) = ctx.item_id
+                            && let Some(var) = match ctx.item {
                                 AnyExpr::Pat(pat) => pat.as_var(),
                                 _ => None,
-                            } {
-                                if is_unused_var(sema, &in_clause, &body_map, &source_file, &pat_id)
-                                {
-                                    let var_name = var.as_string(sema.db.upcast());
-                                    if !var_name.starts_with('_') {
-                                        unused_vars_with_wrong_name.insert(pat_id, var_name);
-                                    }
-                                }
+                            }
+                            && is_unused_var(sema, &in_clause, &body_map, &source_file, &pat_id)
+                        {
+                            let var_name = var.as_string(sema.db.upcast());
+                            if !var_name.starts_with('_') {
+                                unused_vars_with_wrong_name.insert(pat_id, var_name);
                             }
                         }
                     },
                 );
             }
 
-            if !unused_vars_with_wrong_name.is_empty() {
-                if let Some(replacements) =
+            if !unused_vars_with_wrong_name.is_empty()
+                && let Some(replacements) =
                     pick_new_unused_var_names(sema, &in_clause, &unused_vars_with_wrong_name)
-                {
-                    for (pat_id, new_name) in replacements.iter() {
-                        if let Some(range) = in_clause.range_for_pat(*pat_id) {
-                            if range.file_id == file_id {
-                                diags.push(make_diagnostic(file_id, range.range, new_name.clone()));
-                            }
-                        }
+            {
+                for (pat_id, new_name) in replacements.iter() {
+                    if let Some(range) = in_clause.range_for_pat(*pat_id)
+                        && range.file_id == file_id
+                    {
+                        diags.push(make_diagnostic(file_id, range.range, new_name.clone()));
                     }
                 }
             }
@@ -121,14 +118,13 @@ fn is_unused_var(
 ) -> bool {
     match &in_clause[*pat_id].as_var() {
         Some(_var) => {
-            if let Some(infile_ast_ptr) = body_map.pat(*pat_id) {
-                if let Some(ast::Expr::ExprMax(ast::ExprMax::Var(ast_var))) =
+            if let Some(infile_ast_ptr) = body_map.pat(*pat_id)
+                && let Some(ast::Expr::ExprMax(ast::ExprMax::Var(ast_var))) =
                     infile_ast_ptr.to_node(source_file)
-                {
-                    let infile_ast_var = InFile::new(source_file.file_id, &ast_var);
-                    if let Some(var_usages) = sema.find_local_usages_ast(infile_ast_var) {
-                        return var_usages.len() == 1;
-                    }
+            {
+                let infile_ast_var = InFile::new(source_file.file_id, &ast_var);
+                if let Some(var_usages) = sema.find_local_usages_ast(infile_ast_var) {
+                    return var_usages.len() == 1;
                 }
             }
             false
diff --git a/crates/ide/src/doc_links/otp_links.rs b/crates/ide/src/doc_links/otp_links.rs
index f77030e028..6c8d431355 100644
--- a/crates/ide/src/doc_links/otp_links.rs
+++ b/crates/ide/src/doc_links/otp_links.rs
@@ -29,18 +29,18 @@ pub(crate) fn links(res: &mut Vec<DocLink>, sema: &Semantic, def: &SymbolDefinit
             }
         }
         SymbolDefinition::Function(function_def) => {
-            if function_def.is_in_otp(sema.db) {
-                if let Some(module_name) = sema.module_name(function_def.file.file_id) {
-                    let module_name = module_name.to_string();
-                    let function_name = function_def.name.name();
-                    let function_arity = function_def.name.arity();
-                    let title = format!("{module_name}:{function_name}/{function_arity}");
-                    let uri = format!(
-                        "{OTP_BASE_URL}/doc/man/{module_name}.html#{function_name}/{function_arity}"
-                    );
-                    let link = DocLink { title, uri };
-                    res.push(link);
-                }
+            if function_def.is_in_otp(sema.db)
+                && let Some(module_name) = sema.module_name(function_def.file.file_id)
+            {
+                let module_name = module_name.to_string();
+                let function_name = function_def.name.name();
+                let function_arity = function_def.name.arity();
+                let title = format!("{module_name}:{function_name}/{function_arity}");
+                let uri = format!(
+                    "{OTP_BASE_URL}/doc/man/{module_name}.html#{function_name}/{function_arity}"
+                );
+                let link = DocLink { title, uri };
+                res.push(link);
             }
         }
         _ => (),
diff --git a/crates/ide/src/extend_selection.rs b/crates/ide/src/extend_selection.rs
index c05321f812..cf5abd5dba 100644
--- a/crates/ide/src/extend_selection.rs
+++ b/crates/ide/src/extend_selection.rs
@@ -120,10 +120,10 @@ fn try_extend_selection(root: &SyntaxNode, frange: FileRange) -> Option<TextRang
 
     let node = shallowest_node(&node);
 
-    if node.parent().map(|n| list_kinds.contains(&n.kind())) == Some(true) {
-        if let Some(range) = extend_list_item(&node) {
-            return Some(range);
-        }
+    if node.parent().map(|n| list_kinds.contains(&n.kind())) == Some(true)
+        && let Some(range) = extend_list_item(&node)
+    {
+        return Some(range);
     }
 
     node.parent().map(|it| it.text_range())
@@ -171,19 +171,20 @@ fn extend_ws(root: &SyntaxNode, ws: SyntaxToken, offset: TextSize) -> TextRange
     let prefix = TextRange::new(ws.text_range().start(), offset) - ws.text_range().start();
     let ws_suffix = &ws_text[suffix];
     let ws_prefix = &ws_text[prefix];
-    if ws_text.contains('\n') && !ws_suffix.contains('\n') {
-        if let Some(node) = ws.next_sibling_or_token() {
-            let start = match ws_prefix.rfind('\n') {
-                Some(idx) => ws.text_range().start() + TextSize::from((idx + 1) as u32),
-                None => node.text_range().start(),
-            };
-            let end = if root.text().char_at(node.text_range().end()) == Some('\n') {
-                node.text_range().end() + TextSize::of('\n')
-            } else {
-                node.text_range().end()
-            };
-            return TextRange::new(start, end);
-        }
+    if ws_text.contains('\n')
+        && !ws_suffix.contains('\n')
+        && let Some(node) = ws.next_sibling_or_token()
+    {
+        let start = match ws_prefix.rfind('\n') {
+            Some(idx) => ws.text_range().start() + TextSize::from((idx + 1) as u32),
+            None => node.text_range().start(),
+        };
+        let end = if root.text().char_at(node.text_range().end()) == Some('\n') {
+            node.text_range().end() + TextSize::of('\n')
+        } else {
+            node.text_range().end()
+        };
+        return TextRange::new(start, end);
     }
     ws.text_range()
 }
diff --git a/crates/ide/src/highlight_related.rs b/crates/ide/src/highlight_related.rs
index 05e0e022a2..d8740f2785 100644
--- a/crates/ide/src/highlight_related.rs
+++ b/crates/ide/src/highlight_related.rs
@@ -73,14 +73,14 @@ fn find_local_refs(sema: &Semantic<'_>, position: FilePosition) -> Option<Vec<Hi
                 }
             })
             .collect();
-        if declaration.file_id == position.file_id {
-            if let Some(highlight_ranges) = declaration.highlight_ranges {
-                for range in highlight_ranges {
-                    references.push(HighlightedRange {
-                        range,
-                        category: decl_category,
-                    });
-                }
+        if declaration.file_id == position.file_id
+            && let Some(highlight_ranges) = declaration.highlight_ranges
+        {
+            for range in highlight_ranges {
+                references.push(HighlightedRange {
+                    range,
+                    category: decl_category,
+                });
             }
         };
 
diff --git a/crates/ide/src/inlay_hints/param_name.rs b/crates/ide/src/inlay_hints/param_name.rs
index 396c3d5ff9..cf16198dfe 100644
--- a/crates/ide/src/inlay_hints/param_name.rs
+++ b/crates/ide/src/inlay_hints/param_name.rs
@@ -54,29 +54,24 @@ pub(super) fn hints(
                         if let Some(call_def) = target.resolve_call(arity, sema, file_id, body) {
                             let param_names = &call_def.function_clauses[0].param_names;
                             for (param_name, arg) in param_names.iter().zip(args) {
-                                if should_hint(sema.db.upcast(), param_name, &body[arg]) {
-                                    if let Some(arg_range) =
+                                if should_hint(sema.db.upcast(), param_name, &body[arg])
+                                    && let Some(arg_range) =
                                         function_body.range_for_expr(clause_id, arg)
-                                    {
-                                        if range_limit.is_none()
-                                            || range_limit.unwrap().contains_range(arg_range.range)
-                                        {
-                                            if let ParamName::Name(param_name) = param_name {
-                                                if arg_range.file_id == file_id {
-                                                    let hint = InlayHint {
-                                                        range: arg_range.range,
-                                                        kind: InlayKind::Parameter,
-                                                        label: InlayHintLabel::simple(
-                                                            param_name.as_str(),
-                                                            None,
-                                                            None,
-                                                        ),
-                                                    };
-                                                    res.push(hint);
-                                                }
-                                            }
-                                        }
-                                    }
+                                    && (range_limit.is_none()
+                                        || range_limit.unwrap().contains_range(arg_range.range))
+                                    && let ParamName::Name(param_name) = param_name
+                                    && arg_range.file_id == file_id
+                                {
+                                    let hint = InlayHint {
+                                        range: arg_range.range,
+                                        kind: InlayKind::Parameter,
+                                        label: InlayHintLabel::simple(
+                                            param_name.as_str(),
+                                            None,
+                                            None,
+                                        ),
+                                    };
+                                    res.push(hint);
                                 }
                             }
                         }
diff --git a/crates/ide/src/runnables.rs b/crates/ide/src/runnables.rs
index aeeb947481..ae82db0960 100644
--- a/crates/ide/src/runnables.rs
+++ b/crates/ide/src/runnables.rs
@@ -81,10 +81,10 @@ impl Runnable {
         coverage_enabled: bool,
     ) -> Vec<String> {
         let mut args = Vec::new();
-        if let Some(mode) = mode {
-            if !mode.is_empty() {
-                args.push(mode)
-            }
+        if let Some(mode) = mode
+            && !mode.is_empty()
+        {
+            args.push(mode)
         };
         match &self.kind {
             RunnableKind::Test { .. } => {
diff --git a/crates/ide/src/signature_help.rs b/crates/ide/src/signature_help.rs
index 0c423c3cf5..70f00d9503 100644
--- a/crates/ide/src/signature_help.rs
+++ b/crates/ide/src/signature_help.rs
@@ -91,51 +91,48 @@ pub(crate) fn signature_help(
 
     let mut res = Vec::new();
 
-    if let Some(args) = call.args() {
-        if args
+    if let Some(args) = call.args()
+        && args
             .syntax()
             .text_range()
             .contains_range(token.text_range())
-        {
-            if let hir::Expr::Call { target, args } = &call_expr[call_expr.value] {
-                let arity = args.len() as u32;
-                match target {
-                    CallTarget::Local { name } => {
-                        let fun_atom = &call_expr[*name].as_atom()?;
-                        let fun_name = sema.db.lookup_atom(*fun_atom);
-                        signature_help_for_call(
-                            &mut res,
-                            sema,
-                            db,
-                            position.file_id,
-                            None,
-                            fun_name,
-                            arity,
-                            active_parameter,
-                        )
-                    }
-                    CallTarget::Remote { module, name, .. } => {
-                        let module_atom = &call_expr[*module].as_atom()?;
-                        let module_name = sema.db.lookup_atom(*module_atom);
-                        let fun_atom = &call_expr[*name].as_atom()?;
-                        let fun_name = sema.db.lookup_atom(*fun_atom);
-                        let module =
-                            sema.resolve_module_name(position.file_id, module_name.as_str())?;
-                        signature_help_for_call(
-                            &mut res,
-                            sema,
-                            db,
-                            module.file.file_id,
-                            Some(module_name),
-                            fun_name,
-                            arity,
-                            active_parameter,
-                        )
-                    }
-                }
-            };
+        && let hir::Expr::Call { target, args } = &call_expr[call_expr.value]
+    {
+        let arity = args.len() as u32;
+        match target {
+            CallTarget::Local { name } => {
+                let fun_atom = &call_expr[*name].as_atom()?;
+                let fun_name = sema.db.lookup_atom(*fun_atom);
+                signature_help_for_call(
+                    &mut res,
+                    sema,
+                    db,
+                    position.file_id,
+                    None,
+                    fun_name,
+                    arity,
+                    active_parameter,
+                )
+            }
+            CallTarget::Remote { module, name, .. } => {
+                let module_atom = &call_expr[*module].as_atom()?;
+                let module_name = sema.db.lookup_atom(*module_atom);
+                let fun_atom = &call_expr[*name].as_atom()?;
+                let fun_name = sema.db.lookup_atom(*fun_atom);
+                let module = sema.resolve_module_name(position.file_id, module_name.as_str())?;
+                signature_help_for_call(
+                    &mut res,
+                    sema,
+                    db,
+                    module.file.file_id,
+                    Some(module_name),
+                    fun_name,
+                    arity,
+                    active_parameter,
+                )
+            }
         }
-    }
+    };
     Some((res, active_parameter))
 }
 
@@ -175,21 +172,21 @@ fn signature_help_for_call(
             }
             None => {
                 // Function could be imported
-                if let Some(module_name) = def_map.get_imports().get(name_arity) {
-                    if let Some(module) = sema.resolve_module_name(file_id, module_name) {
-                        let def_map = sema.def_map(module.file.file_id);
-                        if let Some(def) = def_map.get_function(name_arity) {
-                            let help = build_signature_help(
-                                db,
-                                &sema,
-                                module.file.file_id,
-                                def,
-                                active_parameter,
-                                Some(module_name.clone()),
-                                &fun_name,
-                            );
-                            res.push(help)
-                        }
+                if let Some(module_name) = def_map.get_imports().get(name_arity)
+                    && let Some(module) = sema.resolve_module_name(file_id, module_name)
+                {
+                    let def_map = sema.def_map(module.file.file_id);
+                    if let Some(def) = def_map.get_function(name_arity) {
+                        let help = build_signature_help(
+                            db,
+                            &sema,
+                            module.file.file_id,
+                            def,
+                            active_parameter,
+                            Some(module_name.clone()),
+                            &fun_name,
+                        );
+                        res.push(help)
                     }
                 }
             }
diff --git a/crates/ide/src/syntax_highlighting.rs b/crates/ide/src/syntax_highlighting.rs
index e08b4873e8..da3a6d85ad 100644
--- a/crates/ide/src/syntax_highlighting.rs
+++ b/crates/ide/src/syntax_highlighting.rs
@@ -278,22 +278,22 @@ fn types_highlight(
         if def.exported {
             let type_alias_source = def.source(sema.db.upcast());
 
-            if let Some(type_name) = type_alias_source.type_name() {
-                if let Some(name) = type_name.name() {
-                    let range = name.syntax().text_range();
+            if let Some(type_name) = type_alias_source.type_name()
+                && let Some(name) = type_name.name()
+            {
+                let range = name.syntax().text_range();
 
-                    // The base highlighing currently uses SymbolKind::Function.
-                    // We cannot set a modifier only. so must repeat it here.
-                    let highlight = HlTag::Symbol(SymbolKind::Function) | HlMod::ExportedType;
+                // The base highlighing currently uses SymbolKind::Function.
+                // We cannot set a modifier only. so must repeat it here.
+                let highlight = HlTag::Symbol(SymbolKind::Function) | HlMod::ExportedType;
 
-                    // Element inside the viewport, need to highlight
-                    if range_to_highlight.intersect(range).is_some() {
-                        hl.add(HlRange {
-                            range,
-                            highlight,
-                            binding_hash: None,
-                        })
-                    }
+                // Element inside the viewport, need to highlight
+                if range_to_highlight.intersect(range).is_some() {
+                    hl.add(HlRange {
+                        range,
+                        highlight,
+                        binding_hash: None,
+                    })
                 }
             };
         }
@@ -310,16 +310,16 @@ fn dynamic_usages_highlight(
 
     if let Some(types) = types {
         types.iter().for_each(|(r, t)| {
-            if is_dynamic(t) {
-                if let Pos::TextRange(eq_range) = r {
-                    let range: TextRange = (eq_range.clone()).into();
-                    if range_to_highlight.intersect(range).is_some() {
-                        hl.add(HlRange {
-                            range,
-                            highlight: highlight_dynamic,
-                            binding_hash: None,
-                        });
-                    }
+            if is_dynamic(t)
+                && let Pos::TextRange(eq_range) = r
+            {
+                let range: TextRange = (eq_range.clone()).into();
+                if range_to_highlight.intersect(range).is_some() {
+                    hl.add(HlRange {
+                        range,
+                        highlight: highlight_dynamic,
+                        binding_hash: None,
+                    });
                 }
             }
         });
diff --git a/crates/ide_assists/src/handlers/bump_variables.rs b/crates/ide_assists/src/handlers/bump_variables.rs
index 47a246a9ad..8ba62011f6 100644
--- a/crates/ide_assists/src/handlers/bump_variables.rs
+++ b/crates/ide_assists/src/handlers/bump_variables.rs
@@ -76,18 +76,18 @@ pub(crate) fn bump_variables(acc: &mut Assists, ctx: &AssistContext) -> Option<(
             FxHashSet::default(),
             &mut |mut acc, ctx| match ctx.item {
                 AnyExpr::Expr(Expr::Var(v)) => {
-                    if let Some(expr) = body_map.any(ctx.item_id) {
-                        if expr.file_id() == file_id {
-                            acc.insert((v, expr));
-                        }
+                    if let Some(expr) = body_map.any(ctx.item_id)
+                        && expr.file_id() == file_id
+                    {
+                        acc.insert((v, expr));
                     }
                     acc
                 }
                 AnyExpr::Pat(Pat::Var(v)) => {
-                    if let Some(pat) = body_map.any(ctx.item_id) {
-                        if pat.file_id() == file_id {
-                            acc.insert((v, pat));
-                        }
+                    if let Some(pat) = body_map.any(ctx.item_id)
+                        && pat.file_id() == file_id
+                    {
+                        acc.insert((v, pat));
                     }
                     acc
                 }
diff --git a/crates/ide_assists/src/handlers/create_function.rs b/crates/ide_assists/src/handlers/create_function.rs
index 59d1da89c5..764d551d05 100644
--- a/crates/ide_assists/src/handlers/create_function.rs
+++ b/crates/ide_assists/src/handlers/create_function.rs
@@ -37,60 +37,60 @@ use crate::Assists;
 // ```
 pub(crate) fn create_function(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
     for d in ctx.diagnostics {
-        if let AssistContextDiagnosticCode::UndefinedFunction = d.code {
-            if ctx.classify_offset().is_none() {
-                let call: ast::Call = ctx.find_node_at_offset()?;
-                let function_id = ctx
-                    .sema
-                    .find_enclosing_function(ctx.file_id(), call.syntax())?;
+        if let AssistContextDiagnosticCode::UndefinedFunction = d.code
+            && ctx.classify_offset().is_none()
+        {
+            let call: ast::Call = ctx.find_node_at_offset()?;
+            let function_id = ctx
+                .sema
+                .find_enclosing_function(ctx.file_id(), call.syntax())?;
 
-                let call_expr = ctx
-                    .sema
-                    .to_expr(InFile::new(ctx.file_id(), &ast::Expr::Call(call.clone())))?;
-                if let Expr::Call { target, args } = &call_expr[call_expr.value] {
-                    let (module_name, function_name) = match &target {
-                        hir::CallTarget::Local { name } => {
-                            let fun_atom = &call_expr[*name].as_atom()?;
-                            let fun_name = ctx.sema.db.lookup_atom(*fun_atom).to_string();
-                            (None, fun_name)
-                        }
-                        hir::CallTarget::Remote { module, name, .. } => {
-                            let module = &call_expr[*module].as_atom()?;
-                            let fun_atom = &call_expr[*name].as_atom()?;
-                            let fun_name = ctx.sema.db.lookup_atom(*fun_atom).to_string();
-                            (Some(*module), fun_name)
-                        }
-                    };
-                    let function_arity = args.len();
-
-                    let form_list = ctx.db().file_form_list(ctx.file_id());
-                    if let Some(module_name) = module_name {
-                        let module_name = ctx.db().lookup_atom(module_name);
-                        let module_attr = form_list.module_attribute()?;
-                        if module_name != module_attr.name {
-                            // Only inline qualified function calls if
-                            // they refer to the module we are in.
-                            // TODO: implied main module?
-                            return None;
-                        }
+            let call_expr = ctx
+                .sema
+                .to_expr(InFile::new(ctx.file_id(), &ast::Expr::Call(call.clone())))?;
+            if let Expr::Call { target, args } = &call_expr[call_expr.value] {
+                let (module_name, function_name) = match &target {
+                    hir::CallTarget::Local { name } => {
+                        let fun_atom = &call_expr[*name].as_atom()?;
+                        let fun_name = ctx.sema.db.lookup_atom(*fun_atom).to_string();
+                        (None, fun_name)
                     }
-                    let function_args = ctx.create_function_args(args, &call_expr.body());
+                    hir::CallTarget::Remote { module, name, .. } => {
+                        let module = &call_expr[*module].as_atom()?;
+                        let fun_atom = &call_expr[*name].as_atom()?;
+                        let fun_name = ctx.sema.db.lookup_atom(*fun_atom).to_string();
+                        (Some(*module), fun_name)
+                    }
+                };
+                let function_arity = args.len();
 
-                    let fun_def = ctx
-                        .sema
-                        .function_def(&InFile::new(ctx.file_id(), function_id))?;
-                    let function_range = fun_def.range(ctx.sema.db.upcast())?;
+                let form_list = ctx.db().file_form_list(ctx.file_id());
+                if let Some(module_name) = module_name {
+                    let module_name = ctx.db().lookup_atom(module_name);
+                    let module_attr = form_list.module_attribute()?;
+                    if module_name != module_attr.name {
+                        // Only inline qualified function calls if
+                        // they refer to the module we are in.
+                        // TODO: implied main module?
+                        return None;
+                    }
+                }
+                let function_args = ctx.create_function_args(args, &call_expr.body());
 
-                    let insert = function_range.end() + TextSize::from(1);
+                let fun_def = ctx
+                    .sema
+                    .function_def(&InFile::new(ctx.file_id(), function_id))?;
+                let function_range = fun_def.range(ctx.sema.db.upcast())?;
 
-                    let id = AssistId("create_function", AssistKind::QuickFix);
-                    let message = format!("Create function `{function_name}/{function_arity}`");
-                    acc.add_from_diagnostic(id, message, None, (*d).clone(), function_range, None, |builder| {
+                let insert = function_range.end() + TextSize::from(1);
+
+                let id = AssistId("create_function", AssistKind::QuickFix);
+                let message = format!("Create function `{function_name}/{function_arity}`");
+                acc.add_from_diagnostic(id, message, None, (*d).clone(), function_range, None, |builder| {
                         let text = format!("\n{function_name}({function_args}) ->\n    erlang:error(not_implemented).\n\n");
                         builder.edit_file(ctx.frange.file_id);
                         builder.insert(insert, text)
                     });
-                }
             }
         }
     }
diff --git a/crates/ide_assists/src/handlers/inline_function.rs b/crates/ide_assists/src/handlers/inline_function.rs
index 9fb231eb86..69dbb1c55d 100644
--- a/crates/ide_assists/src/handlers/inline_function.rs
+++ b/crates/ide_assists/src/handlers/inline_function.rs
@@ -102,10 +102,10 @@ pub(crate) fn inline_function(acc: &mut Assists, ctx: &AssistContext) -> Option<
         move |builder| {
             let file_id = ctx.frange.file_id;
             let ast_fun = fun.source(ctx.db().upcast());
-            if delete_definition {
-                if let Some(delete_ranges) = ranges_for_delete_function(ctx, &ast_fun[0]) {
-                    delete_ranges.delete(builder);
-                }
+            if delete_definition
+                && let Some(delete_ranges) = ranges_for_delete_function(ctx, &ast_fun[0])
+            {
+                delete_ranges.delete(builder);
             }
             for call in references {
                 let infile_ast_fun = InFile::new(fun.file.file_id, &ast_fun);
@@ -115,8 +115,7 @@ pub(crate) fn inline_function(acc: &mut Assists, ctx: &AssistContext) -> Option<
                 if ast_fun.len() == 1 {
                     if let Some(ast::FunctionOrMacroClause::FunctionClause(ast_clause)) =
                         ast_fun[0].clause()
-                    {
-                        if let Some(clause) =
+                        && let Some(clause) =
                             function_body.clauses.iter().next().map(|(_, clause)| {
                                 InFunctionClauseBody::new(
                                     &ctx.sema,
@@ -126,18 +125,16 @@ pub(crate) fn inline_function(acc: &mut Assists, ctx: &AssistContext) -> Option<
                                     (),
                                 )
                             })
-                        {
-                            if let Some((range, replacement)) = inline_single_function_clause(
-                                &ctx.sema,
-                                file_id,
-                                &infile_ast_fun,
-                                &ast_clause,
-                                &call,
-                                &clause,
-                            ) {
-                                builder.replace(range, replacement)
-                            }
-                        }
+                        && let Some((range, replacement)) = inline_single_function_clause(
+                            &ctx.sema,
+                            file_id,
+                            &infile_ast_fun,
+                            &ast_clause,
+                            &call,
+                            &clause,
+                        )
+                    {
+                        builder.replace(range, replacement)
                     };
                 } else if let Some((range, replacement)) =
                     inline_function_as_case(&infile_ast_fun, &call)
@@ -291,10 +288,10 @@ fn assign_params_for_begin(
         } else {
             false
         };
-        if idx == 0 {
-            if let Some(leading_comments) = get_val_preceding_comments(val.syntax()) {
-                final_text.push_str((format!("\n{body_indent}{leading_comments}")).as_str());
-            }
+        if idx == 0
+            && let Some(leading_comments) = get_val_preceding_comments(val.syntax())
+        {
+            final_text.push_str((format!("\n{body_indent}{leading_comments}")).as_str());
         };
 
         let var_str = var.syntax().text();
@@ -442,10 +439,10 @@ fn inline_simple_function_clause(
 }
 
 fn param_substitution(mvar: &ast::Name, val: &ast::Expr) -> bool {
-    if let ast::Name::Var(var) = mvar {
-        if let Some((_, needed)) = parens_needed(val, var) {
-            return needed;
-        }
+    if let ast::Name::Var(var) = mvar
+        && let Some((_, needed)) = parens_needed(val, var)
+    {
+        return needed;
     }
     false
 }
@@ -670,10 +667,10 @@ fn can_inline_function(ctx: &AssistContext) -> Option<InlineData> {
             usages.iter().for_each(|(_file_id, names)| {
                 for name_like in names {
                     if let Some(call) = get_call(name_like.syntax()) {
-                        if let Some(name) = call.expr() {
-                            if name.syntax().text_range().contains(ctx.offset()) {
-                                selected_call_reference.push(call.clone());
-                            }
+                        if let Some(name) = call.expr()
+                            && name.syntax().text_range().contains(ctx.offset())
+                        {
+                            selected_call_reference.push(call.clone());
                         }
                         all_references.push(call.clone());
                     };
diff --git a/crates/ide_assists/src/helpers.rs b/crates/ide_assists/src/helpers.rs
index 6170b112b3..bb2a38cf1b 100644
--- a/crates/ide_assists/src/helpers.rs
+++ b/crates/ide_assists/src/helpers.rs
@@ -141,10 +141,10 @@ pub(crate) fn skip_trailing_separator(node: &SyntaxNode) -> Option<TextRange> {
         (*n).next_sibling_or_token()
     });
     for element in elements {
-        if let Some(t) = &SyntaxElement::into_token(element) {
-            if t.kind() != SyntaxKind::WHITESPACE {
-                return Some(t.text_range());
-            }
+        if let Some(t) = &SyntaxElement::into_token(element)
+            && t.kind() != SyntaxKind::WHITESPACE
+        {
+            return Some(t.text_range());
         }
     }
     None
@@ -175,10 +175,10 @@ pub(crate) fn skip_trailing_newline(node: &SyntaxNode) -> Option<TextRange> {
 
 /// Extend the token `TextRange` to include preceding whitespace
 pub fn include_preceding_whitespace(token: &SyntaxToken) -> TextRange {
-    if let Some(prev) = token.prev_token() {
-        if let Some(prev) = algo::skip_whitespace_token(prev, Direction::Prev) {
-            return TextRange::new(prev.text_range().end(), token.text_range().end());
-        }
+    if let Some(prev) = token.prev_token()
+        && let Some(prev) = algo::skip_whitespace_token(prev, Direction::Prev)
+    {
+        return TextRange::new(prev.text_range().end(), token.text_range().end());
     }
     token.text_range()
 }
@@ -428,10 +428,9 @@ pub fn adjacent_newline(syntax: &SyntaxNode) -> Option<SyntaxToken> {
 pub fn extend_range(syntax: &SyntaxNode) -> TextRange {
     if let Some(NodeOrToken::Node(node)) =
         algo::non_whitespace_sibling(NodeOrToken::Node(syntax.clone()), Direction::Next)
+        && node.kind() == syntax.kind()
     {
-        if node.kind() == syntax.kind() {
-            return extend_form_range_for_delete(syntax);
-        }
+        return extend_form_range_for_delete(syntax);
     }
     extend_range_to_adjacent_newline(syntax)
 }
@@ -598,16 +597,15 @@ fn add_or_update_list(list: &ast::List, key: &str, value: &str, builder: &mut So
     let option = format!("{{{key}, {value}}}");
     let mut done = false;
     list.exprs().for_each(|e| {
-        if let ast::Expr::ExprMax(ast::ExprMax::Tuple(e)) = e {
-            if let Some(ast::Expr::ExprMax(ast::ExprMax::Atom(a))) = e.expr().next() {
-                if a.text() == Some(key.to_string()) {
-                    if e.syntax().text().to_string() != option {
-                        // We found an existing key, with different value, replace the tuple with the new one
-                        builder.replace(e.syntax().text_range(), option.to_string());
-                    };
-                    done = true;
-                }
-            }
+        if let ast::Expr::ExprMax(ast::ExprMax::Tuple(e)) = e
+            && let Some(ast::Expr::ExprMax(ast::ExprMax::Atom(a))) = e.expr().next()
+            && a.text() == Some(key.to_string())
+        {
+            if e.syntax().text().to_string() != option {
+                // We found an existing key, with different value, replace the tuple with the new one
+                builder.replace(e.syntax().text_range(), option.to_string());
+            };
+            done = true;
         };
     });
     if !done {
diff --git a/crates/ide_completion/src/ctx.rs b/crates/ide_completion/src/ctx.rs
index 20fbfb46fb..22e385e3fa 100644
--- a/crates/ide_completion/src/ctx.rs
+++ b/crates/ide_completion/src/ctx.rs
@@ -89,10 +89,10 @@ impl CtxKind {
         algo::find_node_at_offset::<ast::Spec>(node, offset).is_some()
     }
     fn is_dialyzer(node: &SyntaxNode, offset: TextSize) -> bool {
-        if let Some(wild_attr) = algo::find_node_at_offset::<ast::WildAttribute>(node, offset) {
-            if let Some(name) = wild_attr.name() {
-                return name.syntax().text() == "-dialyzer";
-            }
+        if let Some(wild_attr) = algo::find_node_at_offset::<ast::WildAttribute>(node, offset)
+            && let Some(name) = wild_attr.name()
+        {
+            return name.syntax().text() == "-dialyzer";
         }
         false
     }
@@ -135,13 +135,11 @@ impl CtxKind {
                             },
                             ast::MatchExpr(parent) => {
                                 let prev_token = Self::previous_non_trivia_sibling_or_token(parent.syntax());
-                                if Self::is_in_error(node, offset) {
-                                    if let Some(NodeOrToken::Token(token)) = prev_token {
-                                        if token.kind() == SyntaxKind::ANON_CASE {
+                                if Self::is_in_error(node, offset)
+                                    && let Some(NodeOrToken::Token(token)) = prev_token
+                                        && token.kind() == SyntaxKind::ANON_CASE {
                                             return false;
                                         }
-                                    }
-                                }
                                 if let Some(it) = parent.lhs() {
                                     return is_match(it.syntax())
                                 }
diff --git a/crates/ide_completion/src/spec.rs b/crates/ide_completion/src/spec.rs
index 963f1dfc87..6a0061e914 100644
--- a/crates/ide_completion/src/spec.rs
+++ b/crates/ide_completion/src/spec.rs
@@ -41,19 +41,17 @@ pub(crate) fn add_completions(
         ] if trigger.is_none() => {
             if let Some(spec) =
                 algo::find_node_at_offset::<ast::Spec>(parsed.value.syntax(), file_position.offset)
+                && let Some(sp) = sema.find_form::<ast::Spec>(InFile::new(parsed.file_id, &spec))
+                && let Some(mut completion) = helpers::name_arity_to_call_completion(
+                    sema,
+                    file_position.file_id,
+                    &sp.name,
+                    spec_fun_prefix.text(),
+                    next_token,
+                )
             {
-                if let Some(sp) = sema.find_form::<ast::Spec>(InFile::new(parsed.file_id, &spec)) {
-                    if let Some(mut completion) = helpers::name_arity_to_call_completion(
-                        sema,
-                        file_position.file_id,
-                        &sp.name,
-                        spec_fun_prefix.text(),
-                        next_token,
-                    ) {
-                        fun_completion_to_spec(&mut completion);
-                        acc.push(completion);
-                    }
-                }
+                fun_completion_to_spec(&mut completion);
+                acc.push(completion);
             }
 
             let def_map = sema.def_map(file_position.file_id);
diff --git a/crates/ide_db/src/defs.rs b/crates/ide_db/src/defs.rs
index f6246db20f..f857f0cf86 100644
--- a/crates/ide_db/src/defs.rs
+++ b/crates/ide_db/src/defs.rs
@@ -524,10 +524,10 @@ fn named_is_record(
     module: Option<&ExprId>,
     name: &ExprId,
 ) -> Option<()> {
-    if let Some(module) = module {
-        if body.get_atom_name(sema, module)? != known::erlang {
-            return None;
-        }
+    if let Some(module) = module
+        && body.get_atom_name(sema, module)? != known::erlang
+    {
+        return None;
     }
     if body.get_atom_name(sema, name)? != known::is_record {
         return None;
diff --git a/crates/ide_db/src/metadata.rs b/crates/ide_db/src/metadata.rs
index 3f7b94ef1e..10bf07b812 100644
--- a/crates/ide_db/src/metadata.rs
+++ b/crates/ide_db/src/metadata.rs
@@ -163,25 +163,24 @@ pub fn collect_metadata(
                 .syntax_node()
                 .token_at_offset(pattern_end)
                 .left_biased()
+                && token.kind() == SyntaxKind::COMMENT
             {
-                if token.kind() == SyntaxKind::COMMENT {
-                    let suppression_range = get_suppression_range(line_index, line_num, file_text);
-                    let comment = token.to_string();
-                    let comment_range = TextRange::new(pattern_start, pattern_end);
-                    let codes = comment
-                        .split_whitespace()
-                        .filter_map(DiagnosticCode::maybe_from_string)
-                        .collect();
+                let suppression_range = get_suppression_range(line_index, line_num, file_text);
+                let comment = token.to_string();
+                let comment_range = TextRange::new(pattern_start, pattern_end);
+                let codes = comment
+                    .split_whitespace()
+                    .filter_map(DiagnosticCode::maybe_from_string)
+                    .collect();
 
-                    annotations.push(Annotation {
-                        comment,
-                        comment_range,
-                        suppression_range,
-                        codes,
-                        source: pattern.source,
-                        kind: pattern.kind,
-                    });
-                }
+                annotations.push(Annotation {
+                    comment,
+                    comment_range,
+                    suppression_range,
+                    codes,
+                    source: pattern.source,
+                    kind: pattern.kind,
+                });
             }
         }
     }
diff --git a/crates/ide_db/src/rename.rs b/crates/ide_db/src/rename.rs
index 8bba7219d0..425bbf6a41 100644
--- a/crates/ide_db/src/rename.rs
+++ b/crates/ide_db/src/rename.rs
@@ -170,10 +170,10 @@ impl SymbolDefinition {
                 let mut def_usages = Vec::default();
                 let funs = function.source(sema.db.upcast());
                 for fun in funs {
-                    if let Some(ast::FunctionOrMacroClause::FunctionClause(fc)) = fun.clause() {
-                        if let Some(name) = fc.name() {
-                            def_usages.push(NameLike::Name(name));
-                        }
+                    if let Some(ast::FunctionOrMacroClause::FunctionClause(fc)) = fun.clause()
+                        && let Some(name) = fc.name()
+                    {
+                        def_usages.push(NameLike::Name(name));
                     };
                 }
                 if safety_check == SafetyChecks::Yes {
diff --git a/crates/ide_db/src/search.rs b/crates/ide_db/src/search.rs
index 4c5c0a5a74..20b4f050b4 100644
--- a/crates/ide_db/src/search.rs
+++ b/crates/ide_db/src/search.rs
@@ -295,27 +295,27 @@ impl<'a> FindUsages<'a> {
             let tree = Lazy::new(move || sema.parse(file_id).value.syntax().clone());
             // Search for occurrences of the items name
             for offset in match_indices(&text, &finder, search_range) {
-                if let Some(name) = algo::find_node_at_offset::<NameLike>(&tree, offset) {
-                    if let Some(token) = name.syntax().first_token() {
-                        match SymbolClass::classify(sema, InFile::new(file_id, token)) {
-                            Some(SymbolClass::Definition(_)) => {}
-                            Some(SymbolClass::Reference {
-                                refs: _,
-                                typ: ReferenceType::Fuzzy,
-                            }) => {}
-                            Some(SymbolClass::Reference { refs, typ }) => {
-                                if refs.iter().any(|def| {
-                                    def == self.def
-                                        && !(self.direct_only && typ != ReferenceType::Direct)
-                                }) {
-                                    match sink(file_id, name) {
-                                        ControlFlow::Continue(()) => {}
-                                        ControlFlow::Break(()) => return,
-                                    }
+                if let Some(name) = algo::find_node_at_offset::<NameLike>(&tree, offset)
+                    && let Some(token) = name.syntax().first_token()
+                {
+                    match SymbolClass::classify(sema, InFile::new(file_id, token)) {
+                        Some(SymbolClass::Definition(_)) => {}
+                        Some(SymbolClass::Reference {
+                            refs: _,
+                            typ: ReferenceType::Fuzzy,
+                        }) => {}
+                        Some(SymbolClass::Reference { refs, typ }) => {
+                            if refs.iter().any(|def| {
+                                def == self.def
+                                    && !(self.direct_only && typ != ReferenceType::Direct)
+                            }) {
+                                match sink(file_id, name) {
+                                    ControlFlow::Continue(()) => {}
+                                    ControlFlow::Break(()) => return,
                                 }
                             }
-                            None => {}
                         }
+                        None => {}
                     }
                 }
             }
diff --git a/crates/ide_ssr/src/lib.rs b/crates/ide_ssr/src/lib.rs
index 17e9a6ac30..db521cff62 100644
--- a/crates/ide_ssr/src/lib.rs
+++ b/crates/ide_ssr/src/lib.rs
@@ -465,43 +465,39 @@ impl<'a> MatchFinder<'a> {
             if !node_range.contains_range(range.range) {
                 continue;
             }
-            if node_range == range.range {
-                if let Some(expr) = ast::Expr::cast(node.clone()) {
-                    if let Some(in_clause_expr) =
-                        self.sema.to_expr(InFile::new(range.file_id, &expr))
-                    {
-                        for rule in &self.rules {
-                            let any_expr_id = AnyExprId::Expr(in_clause_expr.value);
-                            let body_origin = in_clause_expr.body().origin;
-                            let pattern_body =
-                                rule.get_body(self.sema).expect("Cannot get pattern_body");
-                            let pattern_body = fold_body(self.strategy, &pattern_body);
-                            let code_body = &body_origin
-                                .get_body(self.sema)
-                                .expect("Could not get code Body");
-                            let code_body = fold_body(self.strategy, code_body);
-                            out.push(MatchDebugInfo {
-                                matched: matching::get_match(
-                                    true,
-                                    rule,
-                                    &rule.pattern_sub_id_for_code(&pattern_body, &any_expr_id),
-                                    &body_origin,
-                                    &any_expr_id,
-                                    restrict_range,
-                                    self.sema,
-                                    &code_body,
-                                    &pattern_body,
-                                )
-                                .map_err(|e| MatchFailureReason {
-                                    reason: e.reason.unwrap_or_else(|| {
-                                        "Match failed, but no reason was given".to_owned()
-                                    }),
-                                }),
-                                pattern: InSsr::new(rule.ssr_source, rule.pattern_node.clone()),
-                                node: node.clone(),
-                            });
-                        }
-                    }
+            if node_range == range.range
+                && let Some(expr) = ast::Expr::cast(node.clone())
+                && let Some(in_clause_expr) = self.sema.to_expr(InFile::new(range.file_id, &expr))
+            {
+                for rule in &self.rules {
+                    let any_expr_id = AnyExprId::Expr(in_clause_expr.value);
+                    let body_origin = in_clause_expr.body().origin;
+                    let pattern_body = rule.get_body(self.sema).expect("Cannot get pattern_body");
+                    let pattern_body = fold_body(self.strategy, &pattern_body);
+                    let code_body = &body_origin
+                        .get_body(self.sema)
+                        .expect("Could not get code Body");
+                    let code_body = fold_body(self.strategy, code_body);
+                    out.push(MatchDebugInfo {
+                        matched: matching::get_match(
+                            true,
+                            rule,
+                            &rule.pattern_sub_id_for_code(&pattern_body, &any_expr_id),
+                            &body_origin,
+                            &any_expr_id,
+                            restrict_range,
+                            self.sema,
+                            &code_body,
+                            &pattern_body,
+                        )
+                        .map_err(|e| MatchFailureReason {
+                            reason: e.reason.unwrap_or_else(|| {
+                                "Match failed, but no reason was given".to_owned()
+                            }),
+                        }),
+                        pattern: InSsr::new(rule.ssr_source, rule.pattern_node.clone()),
+                        node: node.clone(),
+                    });
                 }
             }
             self.output_debug_for_nodes_at_range(&node, range, restrict_range, out);
diff --git a/crates/ide_ssr/src/matching.rs b/crates/ide_ssr/src/matching.rs
index 5caa9890ad..a7193ee179 100644
--- a/crates/ide_ssr/src/matching.rs
+++ b/crates/ide_ssr/src/matching.rs
@@ -371,15 +371,13 @@ impl<'a> Matcher<'a> {
     }
 
     fn try_match(&self, debug_active: bool, code: &SubId) -> Result<Match, MatchFailed> {
-        if debug_active {
-            if let SubId::AnyExprId(any_expr_id) = code {
-                println!(
-                    "Matcher::try_match:code:---------------\n{}----------------\n",
-                    self.code_body
-                        .body
-                        .tree_print_any_expr(self.sema.db.upcast(), *any_expr_id)
-                );
-            }
+        if debug_active && let SubId::AnyExprId(any_expr_id) = code {
+            println!(
+                "Matcher::try_match:code:---------------\n{}----------------\n",
+                self.code_body
+                    .body
+                    .tree_print_any_expr(self.sema.db.upcast(), *any_expr_id)
+            );
         }
 
         // First pass at matching, where we check that node types and idents match.
@@ -410,12 +408,11 @@ impl<'a> Matcher<'a> {
     /// want to fail the match if we're working with a node that
     /// didn't originate from the location of the macro call.
     fn validate_range(&self, range: &FileRange) -> Result<(), MatchFailed> {
-        if let Some(restrict_range) = &self.restrict_range {
-            if restrict_range.file_id != range.file_id
-                || !restrict_range.range.contains_range(range.range)
-            {
-                fail_match!("Node originated from a macro");
-            }
+        if let Some(restrict_range) = &self.restrict_range
+            && (restrict_range.file_id != range.file_id
+                || !restrict_range.range.contains_range(range.range))
+        {
+            fail_match!("Node originated from a macro");
         }
         Ok(())
     }
@@ -464,53 +461,51 @@ impl<'a> Matcher<'a> {
         code: &SubId,
         phase: &mut Phase<'_>,
     ) -> Result<bool, MatchFailed> {
-        if self.is_placeholder(pattern) {
-            if let Some(placeholder) = self.get_placeholder_for_node(pattern) {
-                if let Phase::Second(matches_out) = phase {
-                    // check constraints
-                    if let Some(condition) = self.rule.conditions.get(placeholder) {
-                        self.check_condition(code, condition)?;
-                    }
-                    if let Some(original_range) = self.get_code_range(code) {
-                        // We validated the range for the node
-                        // when we started the match, so the
-                        // placeholder probably can't fail range
-                        // validation, but just to be safe...
-                        self.validate_range(&original_range)?;
-
-                        // If there is already a match for the same
-                        // placeholder.var, fail if they are not compatible.
-                        if let Some(match_ids) =
-                            matches_out.placeholders_by_var.get(&placeholder.var)
-                        {
-                            for match_id in match_ids.iter() {
-                                if let Some(m) = matches_out.placeholder_values.get(match_id) {
-                                    if !m.equivalent(self.sema, self.rule, self.code_body, code) {
-                                        fail_match!(
-                                            "placeholder match failed: different occurrences do not match:\n---------------\n{:?}\n-----------",
-                                            &m
-                                        );
-                                    }
-                                }
-                            }
-                            // })
-                        }
-
-                        matches_out.placeholder_values.insert(
-                            pattern.clone(),
-                            PlaceholderMatch::new(original_range, code.clone()),
-                        );
-                        matches_out
-                            .placeholders_by_var
-                            .entry(placeholder.var)
-                            .and_modify(|s| {
-                                s.insert(pattern.clone());
-                            })
-                            .or_insert(FxHashSet::from_iter(vec![pattern.clone()]));
-                    }
+        if self.is_placeholder(pattern)
+            && let Some(placeholder) = self.get_placeholder_for_node(pattern)
+        {
+            if let Phase::Second(matches_out) = phase {
+                // check constraints
+                if let Some(condition) = self.rule.conditions.get(placeholder) {
+                    self.check_condition(code, condition)?;
+                }
+                if let Some(original_range) = self.get_code_range(code) {
+                    // We validated the range for the node
+                    // when we started the match, so the
+                    // placeholder probably can't fail range
+                    // validation, but just to be safe...
+                    self.validate_range(&original_range)?;
+
+                    // If there is already a match for the same
+                    // placeholder.var, fail if they are not compatible.
+                    if let Some(match_ids) = matches_out.placeholders_by_var.get(&placeholder.var) {
+                        for match_id in match_ids.iter() {
+                            if let Some(m) = matches_out.placeholder_values.get(match_id)
+                                && !m.equivalent(self.sema, self.rule, self.code_body, code)
+                            {
+                                fail_match!(
+                                    "placeholder match failed: different occurrences do not match:\n---------------\n{:?}\n-----------",
+                                    &m
+                                );
+                            }
+                        }
+                        // })
+                    }
+
+                    matches_out.placeholder_values.insert(
+                        pattern.clone(),
+                        PlaceholderMatch::new(original_range, code.clone()),
+                    );
+                    matches_out
+                        .placeholders_by_var
+                        .entry(placeholder.var)
+                        .and_modify(|s| {
+                            s.insert(pattern.clone());
+                        })
+                        .or_insert(FxHashSet::from_iter(vec![pattern.clone()]));
                 }
-                return Ok(true);
             }
+            return Ok(true);
         }
         Ok(false)
     }
diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 56b3e69516..ac6b7d3403 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -195,29 +195,29 @@ impl IncludeMapping {
         if let Ok(paths) = Utf8PathBuf::from(path).read_dir_utf8() {
             for path in paths.flatten() {
                 let path = path.into_path();
-                if let Some("hrl") = path.extension() {
-                    if let Some(basename) = path.file_name() {
-                        // We encode the local include string as follows
-                        // - First an indicator to flag that it is local
-                        // - Next the app name that it is local to
-                        // - Then the base file name.
-                        // We always do the local lookup in the
-                        // context of a specific app, this ensures the
-                        // app matches, and allows different apps to
-                        // use the same include file base name.
-                        let local_include = SmolStr::new(format!(
-                            "{LOCAL_LOOKUP_INCLUDE_PREFIX}:{app_name}:{basename}"
-                        ));
-                        let trimmed_app_name =
-                            app_name.strip_suffix("_includes_only").unwrap_or(app_name);
-                        let remote_include = SmolStr::new(format!(
-                            "{REMOTE_LOOKUP_INCLUDE_PREFIX}:{trimmed_app_name}/include/{basename}"
-                        ));
-                        let path = AbsPathBuf::assert(path);
-                        // TODO: remove clone()
-                        self.insert(local_include, path.clone());
-                        self.insert(remote_include, path);
-                    }
+                if let Some("hrl") = path.extension()
+                    && let Some(basename) = path.file_name()
+                {
+                    // We encode the local include string as follows
+                    // - First an indicator to flag that it is local
+                    // - Next the app name that it is local to
+                    // - Then the base file name.
+                    // We always do the local lookup in the
+                    // context of a specific app, this ensures the
+                    // app matches, and allows different apps to
+                    // use the same include file base name.
+                    let local_include = SmolStr::new(format!(
+                        "{LOCAL_LOOKUP_INCLUDE_PREFIX}:{app_name}:{basename}"
+                    ));
+                    let trimmed_app_name =
+                        app_name.strip_suffix("_includes_only").unwrap_or(app_name);
+                    let remote_include = SmolStr::new(format!(
+                        "{REMOTE_LOOKUP_INCLUDE_PREFIX}:{trimmed_app_name}/include/{basename}"
+                    ));
+                    let path = AbsPathBuf::assert(path);
+                    // TODO: remove clone()
+                    self.insert(local_include, path.clone());
+                    self.insert(remote_include, path);
                 }
             }
         }
@@ -256,10 +256,10 @@ impl IncludeMapping {
         path: &SmolStr,
         visited: &mut FxHashSet<TargetFullName>,
     ) -> Option<AbsPathBuf> {
-        if let Some(app_name) = self.app_names_rev.get(current) {
-            if let Some(abs_path) = self.get(IncludeMappingScope::Local(app_name.clone()), path) {
-                return Some(abs_path.clone());
-            }
+        if let Some(app_name) = self.app_names_rev.get(current)
+            && let Some(abs_path) = self.get(IncludeMappingScope::Local(app_name.clone()), path)
+        {
+            return Some(abs_path.clone());
         }
 
         if visited.contains(current) {
@@ -533,40 +533,39 @@ fn load_buck_targets_bxl(
     let mut used_deps = FxHashSet::default();
 
     for (name, buck_target) in &buck_targets {
-        if buck_target.origin != BuckTargetOrigin::Prelude {
-            if let Ok(target) = make_buck_target(
+        if buck_target.origin != BuckTargetOrigin::Prelude
+            && let Ok(target) = make_buck_target(
                 root,
                 name,
                 buck_target,
                 buck_config.build_deps,
                 &mut dep_path,
                 &mut target_info,
-            ) {
-                for target_name in &target.apps {
-                    used_deps.insert(target_name.clone());
-                }
-                for target_name in &target.deps {
-                    used_deps.insert(target_name.clone());
-                }
-                target_info.targets.insert(name.clone(), target);
+            )
+        {
+            for target_name in &target.apps {
+                used_deps.insert(target_name.clone());
             }
+            for target_name in &target.deps {
+                used_deps.insert(target_name.clone());
+            }
+            target_info.targets.insert(name.clone(), target);
         }
     }
     // Insert used prelude values too
     for name in &used_deps {
-        if let Some(buck_target) = &buck_targets.get(name) {
-            if buck_target.origin == BuckTargetOrigin::Prelude {
-                if let Ok(target) = make_buck_target(
-                    root,
-                    name,
-                    buck_target,
-                    buck_config.build_deps,
-                    &mut dep_path,
-                    &mut target_info,
-                ) {
-                    target_info.targets.insert(name.clone(), target);
-                }
-            }
+        if let Some(buck_target) = &buck_targets.get(name)
+            && buck_target.origin == BuckTargetOrigin::Prelude
+            && let Ok(target) = make_buck_target(
+                root,
+                name,
+                buck_target,
+                buck_config.build_deps,
+                &mut dep_path,
+                &mut target_info,
+            )
+        {
+            target_info.targets.insert(name.clone(), target);
         }
     }
     Ok(target_info)
diff --git a/crates/project_model/src/test_fixture.rs b/crates/project_model/src/test_fixture.rs
index 496144bb2b..0354e5509c 100644
--- a/crates/project_model/src/test_fixture.rs
+++ b/crates/project_model/src/test_fixture.rs
@@ -379,13 +379,12 @@ impl FixtureWithProjectMeta {
             let app_name = app_name.unwrap_or(AppName("test-fixture".to_string()));
             let abs_path = AbsPathBuf::assert(Utf8PathBuf::from(path.clone()));
             let mut src_dirs = vec![];
-            if let Some(ext) = abs_path.extension() {
-                if ext == "erl" {
-                    if let Some(parent) = abs_path.parent() {
-                        let path = parent.to_path_buf();
-                        src_dirs.push(path)
-                    }
-                }
+            if let Some(ext) = abs_path.extension()
+                && ext == "erl"
+                && let Some(parent) = abs_path.parent()
+            {
+                let path = parent.to_path_buf();
+                src_dirs.push(path)
             }
             (
                 None,
@@ -491,12 +490,11 @@ pub fn extract_annotations(text: &str) -> (Vec<(TextRange, String)>, String) {
                 if let Some(anno) = line.strip_prefix(TOP_OF_FILE_MARKER) {
                     res.push((*TOP_OF_FILE_RANGE, anno.trim_end().to_string()));
                 }
-            } else if line.starts_with(&(CURSOR_MARKER.to_string() + TOP_OF_FILE_MARKER)) {
-                if let Some(anno) =
+            } else if line.starts_with(&(CURSOR_MARKER.to_string() + TOP_OF_FILE_MARKER))
+                && let Some(anno) =
                     line.strip_prefix(&(CURSOR_MARKER.to_string() + TOP_OF_FILE_MARKER))
-                {
-                    res.push((*TOP_OF_FILE_RANGE, anno.trim_end().to_string()));
-                }
+            {
+                res.push((*TOP_OF_FILE_RANGE, anno.trim_end().to_string()));
             }
         } else if line.contains(TOP_OF_FILE_MARKER) {
             panic!(
diff --git a/crates/syntax/src/lib.rs b/crates/syntax/src/lib.rs
index e1c14f14a1..a93fb77bfa 100644
--- a/crates/syntax/src/lib.rs
+++ b/crates/syntax/src/lib.rs
@@ -202,11 +202,11 @@ impl<'tree, 'text> Converter<'tree, 'text> {
     }
 
     fn exit_node(&mut self, node: Node, is_root: bool) {
-        if let Some(syntax_error_node) = &self.pending_syntax_error {
-            if &node == syntax_error_node {
-                self.error_syntax(node.byte_range());
-                self.pending_syntax_error = None;
-            }
+        if let Some(syntax_error_node) = &self.pending_syntax_error
+            && &node == syntax_error_node
+        {
+            self.error_syntax(node.byte_range());
+            self.pending_syntax_error = None;
         }
         if !((is_root && node.is_error()) || node.is_missing() || node.child_count() == 0) {
             let range = node.byte_range();
diff --git a/crates/syntax/src/ted.rs b/crates/syntax/src/ted.rs
index 061d6b3732..b9f05a590a 100644
--- a/crates/syntax/src/ted.rs
+++ b/crates/syntax/src/ted.rs
@@ -96,15 +96,15 @@ pub fn insert_raw(position: Position, elem: impl Element) {
     insert_all_raw(position, vec![elem.syntax_element()]);
 }
 pub fn insert_all(position: Position, mut elements: Vec<SyntaxElement>) {
-    if let Some(first) = elements.first() {
-        if let Some(ws) = ws_before(&position, first) {
-            elements.insert(0, ws.into());
-        }
+    if let Some(first) = elements.first()
+        && let Some(ws) = ws_before(&position, first)
+    {
+        elements.insert(0, ws.into());
     }
-    if let Some(last) = elements.last() {
-        if let Some(ws) = ws_after(&position, last) {
-            elements.push(ws.into());
-        }
+    if let Some(last) = elements.last()
+        && let Some(ws) = ws_after(&position, last)
+    {
+        elements.push(ws.into());
     }
     insert_all_raw(position, elements);
 }

From d6a14737b6fd2efd78be1e07b4221acf1d4e1e67 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 22 Aug 2025 02:39:38 -0700
Subject: [PATCH 056/394] Fix mismatched lifetime syntaxes lint issues

Summary:
Rust 1.89 introduces a [mismatched lifetime syntaxes lint](https://blog.rust-lang.org/2025/08/07/Rust-1.89.0/#mismatched-lifetime-syntaxes-lint), which warns the developer in case a lifetime is inferred in types where it isn't syntactically obvious that a lifetime is even present.

This diff fixes those cases according to the lint suggestion (no auto-fix was present).

Reviewed By: TD5

Differential Revision: D80784504

fbshipit-source-id: 8c65667792a33c4fa610ee083f72188dbeaab0dd
---
 crates/base_db/src/lib.rs          |  2 +-
 crates/base_db/src/module_index.rs |  2 +-
 crates/eqwalizer/src/ast/subst.rs  |  2 +-
 crates/hir/src/body.rs             |  2 +-
 crates/hir/src/edoc.rs             |  8 ++++----
 crates/hir/src/fold.rs             |  4 ++--
 crates/hir/src/form_list.rs        |  2 +-
 crates/hir/src/name.rs             |  2 +-
 crates/hir/src/sema.rs             | 22 +++++++++++-----------
 crates/project_model/src/buck.rs   |  2 +-
 crates/project_model/src/lib.rs    |  2 +-
 crates/syntax/src/ast/node_ext.rs  | 14 +++++++-------
 crates/syntax/src/unescape.rs      |  2 +-
 13 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/crates/base_db/src/lib.rs b/crates/base_db/src/lib.rs
index aea2c413a1..6b3757ff43 100644
--- a/crates/base_db/src/lib.rs
+++ b/crates/base_db/src/lib.rs
@@ -559,7 +559,7 @@ impl<T: SourceDatabaseExt> FileLoader for FileLoaderDelegate<&'_ T> {
 
 /// If the `input` string represents an atom, and needs quoting, quote
 /// it.
-pub fn to_quoted_string(input: &str) -> Cow<str> {
+pub fn to_quoted_string(input: &str) -> Cow<'_, str> {
     fn is_valid_atom(input: &str) -> bool {
         let mut chars = input.chars();
         chars.next().is_some_and(|c| c.is_lowercase())
diff --git a/crates/base_db/src/module_index.rs b/crates/base_db/src/module_index.rs
index 389f98ce44..5f245dd9d5 100644
--- a/crates/base_db/src/module_index.rs
+++ b/crates/base_db/src/module_index.rs
@@ -35,7 +35,7 @@ impl ModuleName {
         self
     }
 
-    pub fn to_quoted_string(&self) -> Cow<str> {
+    pub fn to_quoted_string(&self) -> Cow<'_, str> {
         to_quoted_string(self.as_str())
     }
 }
diff --git a/crates/eqwalizer/src/ast/subst.rs b/crates/eqwalizer/src/ast/subst.rs
index 9404ae30bb..215a736e0d 100644
--- a/crates/eqwalizer/src/ast/subst.rs
+++ b/crates/eqwalizer/src/ast/subst.rs
@@ -95,7 +95,7 @@ impl Subst<'_> {
         ts.into_iter().map(|t| self.apply(t)).collect()
     }
 
-    fn subtract(&self, vars: &[u32]) -> Subst {
+    fn subtract(&self, vars: &[u32]) -> Subst<'_> {
         let mut sub = self.sub.to_owned();
         vars.iter().for_each(|v| {
             sub.remove(v);
diff --git a/crates/hir/src/body.rs b/crates/hir/src/body.rs
index c1acd67ce5..e4731ddc87 100644
--- a/crates/hir/src/body.rs
+++ b/crates/hir/src/body.rs
@@ -318,7 +318,7 @@ impl Body {
     /// visibility of features like parens and macros. The default
     /// indexing on `Body` keeps both invisible. If they need to be
     /// seen, make a `FoldBody` with the appropriate strategy.
-    pub fn index_with_strategy(&self, strategy: Strategy) -> FoldBody {
+    pub fn index_with_strategy(&self, strategy: Strategy) -> FoldBody<'_> {
         fold_body(strategy, self)
     }
 
diff --git a/crates/hir/src/edoc.rs b/crates/hir/src/edoc.rs
index 5061e79e23..e51aca3e07 100644
--- a/crates/hir/src/edoc.rs
+++ b/crates/hir/src/edoc.rs
@@ -290,7 +290,7 @@ fn capitalize_first_char(word: &str) -> Option<String> {
         .map(|char| char.to_uppercase().to_string() + chars.as_str())
 }
 
-fn decode_html_entities(text: &str) -> Cow<str> {
+fn decode_html_entities(text: &str) -> Cow<'_, str> {
     let decoded = htmlentity::entity::decode(text.as_bytes());
     if decoded.entity_count() == 0 {
         Cow::Borrowed(text)
@@ -886,17 +886,17 @@ fn extract_edoc_tag_and_content(comment: &str) -> Option<(TextRange, &str, &str,
     ))
 }
 
-fn convert_single_quotes(comment: &str) -> Cow<str> {
+fn convert_single_quotes(comment: &str) -> Cow<'_, str> {
     static RE: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"`([^']*)'").unwrap());
     RE.replace_all(comment, "`$1`")
 }
 
-fn convert_triple_quotes(comment: &str) -> Cow<str> {
+fn convert_triple_quotes(comment: &str) -> Cow<'_, str> {
     static RE: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"'''[']*").unwrap());
     RE.replace_all(comment, "```")
 }
 
-fn convert_link_macros(comment: &str) -> Cow<str> {
+fn convert_link_macros(comment: &str) -> Cow<'_, str> {
     static RE: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"\{@link\s+([^\s]+)\}").unwrap());
     RE.replace_all(comment, |captures: &regex::Captures<'_>| {
         if let Some(m) = captures.get(1) {
diff --git a/crates/hir/src/fold.rs b/crates/hir/src/fold.rs
index 8b1f6281a0..e28a81d0fe 100644
--- a/crates/hir/src/fold.rs
+++ b/crates/hir/src/fold.rs
@@ -63,7 +63,7 @@ use crate::expr::MaybeExpr;
 
 /// Choose the appropriate `FoldBody` to ensure macros and parens are
 /// visible or not according to the chosen strategy.
-pub fn fold_body(strategy: Strategy, body: &Body) -> FoldBody {
+pub fn fold_body(strategy: Strategy, body: &Body) -> FoldBody<'_> {
     match strategy.macros {
         MacroStrategy::DoNotExpand | MacroStrategy::ExpandButIncludeMacroCall => FoldBody {
             body,
@@ -78,7 +78,7 @@ pub fn fold_body(strategy: Strategy, body: &Body) -> FoldBody {
     }
 }
 
-pub fn default_fold_body(body: &Body) -> FoldBody {
+pub fn default_fold_body(body: &Body) -> FoldBody<'_> {
     fold_body(
         Strategy {
             macros: MacroStrategy::Expand,
diff --git a/crates/hir/src/form_list.rs b/crates/hir/src/form_list.rs
index 4d6ec2cf2a..560befbb4b 100644
--- a/crates/hir/src/form_list.rs
+++ b/crates/hir/src/form_list.rs
@@ -196,7 +196,7 @@ impl FormList {
         self.define_id_map.get(define).copied()
     }
 
-    pub fn get(&self, idx: FormIdx) -> Form {
+    pub fn get(&self, idx: FormIdx) -> Form<'_> {
         match idx {
             FormIdx::ModuleAttribute(idx) => Form::ModuleAttribute(&self[idx]),
             FormIdx::FunctionClause(idx) => Form::FunctionClause(&self[idx]),
diff --git a/crates/hir/src/name.rs b/crates/hir/src/name.rs
index 1dedc7e24d..8444289e83 100644
--- a/crates/hir/src/name.rs
+++ b/crates/hir/src/name.rs
@@ -68,7 +68,7 @@ impl Name {
         &self.0
     }
 
-    pub fn to_quoted_string(&self) -> Cow<str> {
+    pub fn to_quoted_string(&self) -> Cow<'_, str> {
         if self == &Self::MISSING {
             Cow::Borrowed(self.as_str())
         } else {
diff --git a/crates/hir/src/sema.rs b/crates/hir/src/sema.rs
index 954ebf8bf7..cf88e0cf3d 100644
--- a/crates/hir/src/sema.rs
+++ b/crates/hir/src/sema.rs
@@ -162,7 +162,7 @@ impl Semantic<'_> {
         def_map.function_def_id(&function_id.value).cloned()
     }
 
-    pub fn to_expr(&self, expr: InFile<&ast::Expr>) -> Option<InFunctionClauseBody<ExprId>> {
+    pub fn to_expr(&self, expr: InFile<&ast::Expr>) -> Option<InFunctionClauseBody<'_, ExprId>> {
         let function_id =
             self.find_enclosing_function_clause_id(expr.file_id, expr.value.syntax())?;
         let (body, body_map) = self
@@ -178,7 +178,7 @@ impl Semantic<'_> {
         })
     }
 
-    pub fn to_pat(&self, expr: InFile<&ast::Expr>) -> Option<InFunctionClauseBody<PatId>> {
+    pub fn to_pat(&self, expr: InFile<&ast::Expr>) -> Option<InFunctionClauseBody<'_, PatId>> {
         let function_id =
             self.find_enclosing_function_clause_id(expr.file_id, expr.value.syntax())?;
         let (body, body_map) = self
@@ -194,7 +194,7 @@ impl Semantic<'_> {
         })
     }
 
-    pub fn to_function_body(&self, function_id: InFile<FunctionDefId>) -> InFunctionBody<()> {
+    pub fn to_function_body(&self, function_id: InFile<FunctionDefId>) -> InFunctionBody<'_, ()> {
         let body = self.db.function_body(function_id);
         InFunctionBody::new(self, body, function_id, ())
     }
@@ -202,7 +202,7 @@ impl Semantic<'_> {
     pub fn to_function_clause_body(
         &self,
         function_clause_id: InFile<FunctionClauseId>,
-    ) -> InFunctionClauseBody<()> {
+    ) -> InFunctionClauseBody<'_, ()> {
         let (body, body_map) = self.db.function_clause_body_with_source(function_clause_id);
         InFunctionClauseBody {
             sema: self,
@@ -692,7 +692,7 @@ impl Semantic<'_> {
         &self,
         file_id: FileId,
         syntax: &SyntaxNode,
-    ) -> Option<InFunctionClauseBody<Resolver>> {
+    ) -> Option<InFunctionClauseBody<'_, Resolver>> {
         let function_clause_id = self.find_enclosing_function_clause_id(file_id, syntax)?;
         self.ast_clause_resolver(InFile::new(file_id, function_clause_id))
     }
@@ -700,7 +700,7 @@ impl Semantic<'_> {
     pub fn ast_clause_resolver(
         &self,
         function_clause_id: InFile<FunctionClauseId>,
-    ) -> Option<InFunctionClauseBody<Resolver>> {
+    ) -> Option<InFunctionClauseBody<'_, Resolver>> {
         let body = self.db.function_clause_body(function_clause_id);
         let scopes = self.db.function_clause_scopes(function_clause_id);
         let resolver = Resolver::new(scopes);
@@ -716,7 +716,7 @@ impl Semantic<'_> {
     pub fn clause_resolver(
         &self,
         function_clause_id: InFile<FunctionClauseId>,
-    ) -> Option<InFunctionClauseBody<Resolver>> {
+    ) -> Option<InFunctionClauseBody<'_, Resolver>> {
         let body = self.db.function_clause_body(function_clause_id);
         let scopes = self.db.function_clause_scopes(function_clause_id);
         let resolver = Resolver::new(scopes);
@@ -1268,11 +1268,11 @@ impl<'a, T: Clone> InFunctionBody<'a, T> {
         }
     }
 
-    pub fn as_ref(&self) -> InFunctionBody<&T> {
+    pub fn as_ref(&self) -> InFunctionBody<'_, &T> {
         self.with_value(&self.value)
     }
 
-    pub fn with_value<U>(&self, value: U) -> InFunctionBody<U>
+    pub fn with_value<U>(&self, value: U) -> InFunctionBody<'_, U>
     where
         U: Clone,
     {
@@ -1389,11 +1389,11 @@ impl<'a, T> InFunctionClauseBody<'a, T> {
         }
     }
 
-    pub fn as_ref(&self) -> InFunctionClauseBody<&T> {
+    pub fn as_ref(&self) -> InFunctionClauseBody<'_, &T> {
         self.with_value(&self.value)
     }
 
-    pub fn with_value<U>(&self, value: U) -> InFunctionClauseBody<U> {
+    pub fn with_value<U>(&self, value: U) -> InFunctionClauseBody<'_, U> {
         InFunctionClauseBody {
             sema: self.sema,
             body: self.body.clone(),
diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index ac6b7d3403..5d4d68265a 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -105,7 +105,7 @@ impl BuckConfig {
         self.buck_root.as_ref().unwrap()
     }
 
-    pub fn source_root(&self) -> Cow<AbsPathBuf> {
+    pub fn source_root(&self) -> Cow<'_, AbsPathBuf> {
         let buck_root = self.buck_root();
         match self.source_root {
             None => Cow::Borrowed(buck_root),
diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs
index 27ebc959b6..4172e26f77 100644
--- a/crates/project_model/src/lib.rs
+++ b/crates/project_model/src/lib.rs
@@ -758,7 +758,7 @@ impl Project {
             .filter(|app| app.app_type == AppType::Otp)
     }
 
-    pub fn root(&self) -> Cow<AbsPathBuf> {
+    pub fn root(&self) -> Cow<'_, AbsPathBuf> {
         match &self.project_build_data {
             ProjectBuildData::Otp => Cow::Borrowed(&self.otp.lib_dir),
             ProjectBuildData::Rebar(rebar) => Cow::Borrowed(&rebar.root),
diff --git a/crates/syntax/src/ast/node_ext.rs b/crates/syntax/src/ast/node_ext.rs
index f6e9626442..5a3ccdb7db 100644
--- a/crates/syntax/src/ast/node_ext.rs
+++ b/crates/syntax/src/ast/node_ext.rs
@@ -99,7 +99,7 @@ fn match_clause_separator(c: &SyntaxToken) -> Option<ClauseSeparator> {
 }
 
 impl nodes::Atom {
-    pub fn raw_text(&self) -> TokenText {
+    pub fn raw_text(&self) -> TokenText<'_> {
         text_of_token(self.syntax())
     }
 
@@ -111,7 +111,7 @@ impl nodes::Atom {
 pub const SSR_PLACEHOLDER_PREFIX: &str = "_@";
 
 impl nodes::Var {
-    pub fn text(&self) -> TokenText {
+    pub fn text(&self) -> TokenText<'_> {
         text_of_token(self.syntax())
     }
 
@@ -124,30 +124,30 @@ impl nodes::Var {
 }
 
 impl nodes::Char {
-    pub fn text(&self) -> TokenText {
+    pub fn text(&self) -> TokenText<'_> {
         text_of_token(self.syntax())
     }
 }
 
 impl nodes::Float {
-    pub fn text(&self) -> TokenText {
+    pub fn text(&self) -> TokenText<'_> {
         text_of_token(self.syntax())
     }
 }
 
 impl nodes::Integer {
-    pub fn text(&self) -> TokenText {
+    pub fn text(&self) -> TokenText<'_> {
         text_of_token(self.syntax())
     }
 }
 
 impl nodes::String {
-    pub fn text(&self) -> TokenText {
+    pub fn text(&self) -> TokenText<'_> {
         text_of_token(self.syntax())
     }
 }
 
-fn text_of_token(node: &SyntaxNode) -> TokenText {
+fn text_of_token(node: &SyntaxNode) -> TokenText<'_> {
     fn first_token(green_ref: &GreenNodeData) -> &GreenTokenData {
         green_ref
             .children()
diff --git a/crates/syntax/src/unescape.rs b/crates/syntax/src/unescape.rs
index 3421cb2a84..01c2dc288f 100644
--- a/crates/syntax/src/unescape.rs
+++ b/crates/syntax/src/unescape.rs
@@ -28,7 +28,7 @@ macro_rules! try_option {
 /// backslash characters and converts it to a string with the proper
 /// escaped characters, according to Erlang syntax.
 /// Only unescape if the string is surrounded by ' or " chars
-pub fn unescape_string(s_in: &str) -> Option<Cow<str>> {
+pub fn unescape_string(s_in: &str) -> Option<Cow<'_, str>> {
     if !s_in.contains(['\'', '"', '\\', '$']) {
         return Some(Cow::Borrowed(s_in));
     }

From bde703dc5313721aec61108797359f20d13231d9 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 22 Aug 2025 02:39:38 -0700
Subject: [PATCH 057/394] Fix miscellaneous issues reported by clippy in Rust
 1.89

Summary: As per title.

Reviewed By: TD5

Differential Revision: D80785422

fbshipit-source-id: dfe5c8832c273f4f4defcc924ca40dcb6a371318
---
 .../eqwalizer_assists/unexported_type.rs      |  2 +-
 crates/syntax/src/ast/node_ext.rs             | 24 -------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/crates/ide/src/diagnostics/eqwalizer_assists/unexported_type.rs b/crates/ide/src/diagnostics/eqwalizer_assists/unexported_type.rs
index a0aad80973..61b4bfee32 100644
--- a/crates/ide/src/diagnostics/eqwalizer_assists/unexported_type.rs
+++ b/crates/ide/src/diagnostics/eqwalizer_assists/unexported_type.rs
@@ -59,7 +59,7 @@ pub fn unexported_type(
                 sema,
                 module.file.file_id,
                 ExportForm::Types,
-                &[name.clone()],
+                std::slice::from_ref(&name),
                 &mut builder,
             )
             .finish();
diff --git a/crates/syntax/src/ast/node_ext.rs b/crates/syntax/src/ast/node_ext.rs
index 5a3ccdb7db..67d3f2261e 100644
--- a/crates/syntax/src/ast/node_ext.rs
+++ b/crates/syntax/src/ast/node_ext.rs
@@ -35,7 +35,6 @@ use super::PpDefine;
 use super::UnaryOp;
 use super::generated::nodes;
 use super::operators::GeneratorOp;
-use crate::SyntaxKind;
 use crate::SyntaxKind::*;
 use crate::SyntaxToken;
 use crate::ast::AstNode;
@@ -164,29 +163,6 @@ fn text_of_token(node: &SyntaxNode) -> TokenText<'_> {
 
 // ---------------------------------------------------------------------
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
-pub struct Comment {
-    pub(crate) syntax: SyntaxNode,
-}
-
-impl AstNode for Comment {
-    fn can_cast(kind: SyntaxKind) -> bool {
-        kind == COMMENT
-    }
-    fn cast(syntax: SyntaxNode) -> Option<Self> {
-        if Self::can_cast(syntax.kind()) {
-            Some(Self { syntax })
-        } else {
-            None
-        }
-    }
-    fn syntax(&self) -> &SyntaxNode {
-        &self.syntax
-    }
-}
-
-// ---------------------------------------------------------------------
-
 /// Used for macro arity definitions. It distinguishes between
 ///  `-define(FOO,x).  => None
 ///  `-define(FOO(),x).  => Some(0)

From 6510089d8538a58b92a7b1be749d24df8ad69609 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 22 Aug 2025 05:11:43 -0700
Subject: [PATCH 058/394] Add Windows pipeline (excluding tests for now)

Summary:
Given preliminary Windows support was introduced via https://github.com/WhatsApp/erlang-language-platform/pull/111, it sounds reasonable to add a Windows pipeline to CI.

Tests are currently omitted, since failing. The next step would be to figure out why.

The pipeline could use some refactoring, which can be done separately.

Reviewed By: TD5

Differential Revision: D80716715

fbshipit-source-id: c07eb94e94efa2079880c0507e255ec659a1904d
---
 .github/workflows/ci.yml | 146 ++++++++++++++++++++++++++++++++-------
 1 file changed, 122 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1a42ba2e3c..91a6511aeb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,27 +3,27 @@ on:
   push: {}
   release:
     types: [published]
-env:
-  EQWALIZER_DIR: ${{ github.workspace }}/eqwalizer/eqwalizer
-  ELP_EQWALIZER_PATH: ${{ github.workspace }}/eqwalizer/eqwalizer/eqwalizer
 
 jobs:
   ci:
     strategy:
       fail-fast: false
       matrix:
-        platform-arch: [ubuntu-22.04-x64, ubuntu-22.04-arm, macos-13-x64, macos-latest-arm]
+        platform-arch: [ubuntu-22.04-x64, ubuntu-22.04-arm, macos-13-x64, macos-latest-arm, windows-latest-x64]
         otp-version: [26.2, 27.3, 28.0]
         include:
           - otp-version: 26.2
             brew-otp-version: 26
             vscode-publish: true
+            choco-otp-version: 26.2.5.13
           - otp-version: 27.3
             brew-otp-version: 27
             vscode-publish: false
+            choco-otp-version: 27.3.4
           - otp-version: 28.0
             brew-otp-version: 28
             vscode-publish: false
+            choco-otp-version: 28.0.1
           - platform-arch: ubuntu-22.04-x64
             platform: ubuntu-22.04
             os: linux
@@ -44,6 +44,11 @@ jobs:
             os: macos
             target: aarch64-apple-darwin
             vscode-target: darwin-arm64
+          - platform-arch: windows-latest-x64
+            platform: windows-latest
+            os: windows
+            target: x86_64-pc-windows-msvc
+            vscode-target: win32-x64
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Checkout erlang-language-platform
@@ -73,8 +78,8 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y crossbuild-essential-arm64
-      - name: Install Erlang/OTP (Linux Only)
-        if: matrix.os == 'linux'
+      - name: Install Erlang/OTP (Linux, Windows)
+        if: matrix.os == 'linux' || matrix.os == 'windows'
         uses: erlef/setup-beam@v1
         with:
           otp-version: ${{ matrix.otp-version }}
@@ -92,38 +97,101 @@ jobs:
         run: erl -eval 'erlang:display(erlang:system_info(otp_release)), halt().' -noshell
       - name: Install rebar3
         run: "mkdir rebar3 && curl https://s3.amazonaws.com/rebar3/rebar3 -o rebar3/rebar3 && chmod +x rebar3/rebar3"
-      - name: Add rebar3 to path
+      - name: Create rebar3.cmd (Windows Only)
+        if: matrix.os == 'windows'
+        working-directory: rebar3
+        run: |
+          echo '@echo off' > rebar3.cmd
+          echo 'setlocal' >> rebar3.cmd
+          echo 'set rebarscript=%~f0' >> rebar3.cmd
+          echo 'escript.exe "%rebarscript:.cmd=%" %*' >> rebar3.cmd
+      - name: Add rebar3 to path (No Windows)
+        if: matrix.os != 'windows'
         run: 'echo "$GITHUB_WORKSPACE/rebar3" >> $GITHUB_PATH'
-      - name: Verify rebar3 version
+      - name: Add rebar3 to path (Windows Only)
+        if: matrix.os == 'windows'
+        run: '"$env:GITHUB_WORKSPACE\rebar3" | Out-File -FilePath "$env:GITHUB_PATH" -Append'
+      - name: Verify rebar3 version (No Windows)
+        if: matrix.os != 'windows'
         run: rebar3 version
-      - name: Assemble eqwalizer.jar
+      - name: Verify rebar3 version (Windows Only)
+        if: matrix.os == 'windows'
+        run: rebar3.cmd version
+      - name: Assemble eqwalizer.jar (No Windows)
+        if: matrix.os != 'windows'
         working-directory: eqwalizer/eqwalizer
         run: "sbt assembly"
-      - name: Assemble eqwalizer binary
+      - name: Assemble eqwalizer.jar (Windows Only)
+        if: matrix.os == 'windows'
+        working-directory: eqwalizer\eqwalizer
+        run: "sbt assembly"
+        shell: bash
+      - name: Assemble eqwalizer binary (No Windows)
+        if: matrix.os != 'windows'
         working-directory: eqwalizer/eqwalizer
         run: 'native-image -H:IncludeResources=application.conf --no-server --no-fallback -jar target/scala-3.6.4/eqwalizer.jar eqwalizer'
+      - name: Assemble eqwalizer binary (Windows Only)
+        if: matrix.os == 'windows'
+        working-directory: eqwalizer\eqwalizer
+        run: 'native-image -H:IncludeResources=application.conf --no-server --no-fallback -jar target\scala-3.6.4\eqwalizer.jar eqwalizer'
       - name: Ensure elp is formatted
         run: 'cargo fmt -- --check'
+      - name: Configure Environment (No Windows)
+        if: matrix.os != 'windows'
+        run: |
+          echo "EQWALIZER_DIR=${{ github.workspace }}/eqwalizer/eqwalizer" >> $GITHUB_ENV
+          echo "ELP_EQWALIZER_PATH=${{ github.workspace }}/eqwalizer/eqwalizer/eqwalizer" >> $GITHUB_ENV
+      - name: Configure Environment (Windows Only)
+        if: matrix.os == 'windows'
+        run: |
+          echo "EQWALIZER_DIR=${{ github.workspace }}\eqwalizer\eqwalizer" >> $env:GITHUB_ENV
+          echo "ELP_EQWALIZER_PATH=${{ github.workspace }}\eqwalizer\eqwalizer\eqwalizer.exe" >> $env:GITHUB_ENV
       - name: Test elp
-        # Do not run the tests in case of cross-compilation
-        if: matrix.platform-arch != 'macos-latest-arm'
+        # Do not run the tests in case of cross-compilation or on Windows
+        if: matrix.platform-arch != 'macos-latest-arm' && matrix.os != 'windows'
         run: 'cargo test --no-default-features --workspace --target ${{ matrix.target }}'
-      - name: Build elp
+      - name: Build elp (No Windows)
+        if: matrix.os != 'windows'
         run: 'cargo build --release  --target ${{ matrix.target }} --config target.aarch64-unknown-linux-gnu.linker=\"aarch64-linux-gnu-gcc\"'
-      - name: Add elp to path
+      - name: Build elp (Windows Only)
+        if: matrix.os == 'windows'
+        run: 'cargo build --release  --target ${{ matrix.target }}'
+      - name: Add elp to path (No Windows)
+        if: matrix.os != 'windows'
         run: 'echo "$GITHUB_WORKSPACE/target/${{ matrix.target}}/release" >> $GITHUB_PATH'
-      - name: Upload elp binary
+      - name: Add elp to path (Windows Only)
+        if: matrix.os == 'windows'
+        run: '"$env:GITHUB_WORKSPACE\target\${{ matrix.target }}\release" | Out-File -FilePath "$env:GITHUB_PATH" -Append'
+      - name: Upload elp binary (No Windows)
+        if: matrix.os != 'windows'
         uses: "actions/upload-artifact@v4"
         with:
           name: elp-${{ matrix.os }}-${{ matrix.target }}-otp-${{ matrix.otp-version }}
-          path: target/${{ matrix.target}}/release/elp
-      - name: Upload eqwalizer native binary
+          path: target/${{ matrix.target }}/release/elp
+      - name: Upload elp binary (Windows Only)
+        if: matrix.os == 'windows'
+        uses: "actions/upload-artifact@v4"
+        with:
+          name: elp-${{ matrix.os }}-${{ matrix.target }}-otp-${{ matrix.otp-version }}
+          path: target\${{ matrix.target }}\release\elp.exe
+      - name: Upload eqwalizer native binary (No Windows)
+        if: matrix.os != 'windows'
         uses: "actions/upload-artifact@v4"
         with:
           name: eqwalizer-${{ matrix.os }}-${{ matrix.target }}-otp-${{ matrix.otp-version }}
           path: ./eqwalizer/eqwalizer/eqwalizer
-      - name: Make elp-${{ matrix.os }}-otp-${{ matrix.otp-version }}.tar.gz
+      - name: Upload eqwalizer native binary (Windows Only)
+        if: matrix.os == 'windows'
+        uses: "actions/upload-artifact@v4"
+        with:
+          name: eqwalizer-${{ matrix.os }}-${{ matrix.target }}-otp-${{ matrix.otp-version }}
+          path: .\eqwalizer\eqwalizer\eqwalizer.exe
+      - name: Make elp-${{ matrix.os }}-otp-${{ matrix.otp-version }}.tar.gz (No Windows)
+        if: matrix.os != 'windows'
         run: 'tar -zcvf elp-${{ matrix.os }}-otp-${{ matrix.otp-version }}.tar.gz -C target/${{ matrix.target}}/release/ elp'
+      - name: Make elp-${{ matrix.os }}-otp-${{ matrix.otp-version }}.tar.gz (Windows Only)
+        if: matrix.os == 'windows'
+        run: 'tar -zcvf elp-${{ matrix.os }}-otp-${{ matrix.otp-version }}.tar.gz -C target\${{ matrix.target}}\release elp.exe'
       - env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         id: get_release_url
@@ -146,12 +214,25 @@ jobs:
           node-version: 20
       - name: Install VSCE
         run: npm install -g vsce
-      - name: Prepare VS Code Extension to host binaries
+      - name: Prepare VS Code Extension to host binaries (No Windows)
+        if: matrix.os != 'windows'
         run: mkdir -p editors/code/bin
-      - name: Package eqWAlizer binary into VS Code Extension
+      - name: Prepare VS Code Extension to host binaries (Windows Only)
+        if: matrix.os == 'windows'
+        run: if not exist "editors\code\bin" mkdir "editors\code\bin"
+        shell: cmd
+      - name: Package eqWAlizer binary into VS Code Extension (No Windows)
+        if: matrix.os != 'windows'
         run: cp eqwalizer/eqwalizer/eqwalizer editors/code/bin
-      - name: Package ELP binary into VS Code Extension
+      - name: Package eqWAlizer binary into VS Code Extension (Windows Only)
+        if: matrix.os == 'windows'
+        run: cp eqwalizer\eqwalizer\eqwalizer.exe editors\code\bin
+      - name: Package ELP binary into VS Code Extension (No Windows)
+        if: matrix.os != 'windows'
         run: cp target/${{ matrix.target}}/release/elp editors/code/bin
+      - name: Package ELP binary into VS Code Extension (Windows Only)
+        if: matrix.os == 'windows'
+        run: cp target\${{ matrix.target}}\release\elp.exe editors\code\bin
       - name: Ensure binaries are executable
         run: chmod +x editors/code/bin/*
       - name: npm install
@@ -166,21 +247,38 @@ jobs:
       - name: Rename Package
         working-directory: editors/code
         run: mv erlang-language-platform-*.vsix erlang-language-platform.vsix
-      - name: Upload Extension
+      - name: Upload Extension (No Windows)
+        if: matrix.os != 'windows'
         uses: "actions/upload-artifact@v4"
         with:
           name: elp-${{ matrix.os}}-${{ matrix.target }}-otp-${{ matrix.otp-version }}.vsix
           path: editors/code/erlang-language-platform.vsix
+      - name: Upload Extension (Windows Only)
+        if: matrix.os == 'windows'
+        uses: "actions/upload-artifact@v4"
+        with:
+          name: elp-${{ matrix.os}}-${{ matrix.target }}-otp-${{ matrix.otp-version }}.vsix
+          path: editors\code\erlang-language-platform.vsix
       - env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-        name: Upload Extension Package
-        if: ${{ github.event_name == 'release' }}
+        name: Upload Extension Package (No Windows)
+        if: ${{ github.event_name == 'release' && matrix.os != 'windows' }}
         uses: "actions/upload-release-asset@v1.0.2"
         with:
           asset_content_type: application/octet-stream
           asset_name: elp-${{ matrix.os }}-${{ matrix.target }}-otp-${{ matrix.otp-version }}.vsix
           asset_path: editors/code/erlang-language-platform.vsix
           upload_url: "${{ steps.get_release_url.outputs.upload_url }}"
+      - env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        name: Upload Extension Package (Windows Only)
+        if: ${{ github.event_name == 'release' && matrix.os == 'windows' }}
+        uses: "actions/upload-release-asset@v1.0.2"
+        with:
+          asset_content_type: application/octet-stream
+          asset_name: elp-${{ matrix.os }}-${{ matrix.target }}-otp-${{ matrix.otp-version }}.vsix
+          asset_path: editors\code\erlang-language-platform.vsix
+          upload_url: "${{ steps.get_release_url.outputs.upload_url }}"
       - name: Publish extension to marketplace
         working-directory: editors/code
         if: ${{ github.event_name == 'release' && matrix.vscode-publish }}

From a26ad390354342749552f49b9c78950fed1c722a Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 22 Aug 2025 07:40:14 -0700
Subject: [PATCH 059/394] Move setup-erlang to separate GitHub action

Summary:
By moving the Erlang/OTP setup to its own composite action, we make the CI pipeline more readable as a whole.
This also enables an additional Erlang/OTP setup phase for building EDB (which requires OTP 27) via a dedicated workflow.

Reviewed By: TD5

Differential Revision: D80802298

fbshipit-source-id: ea319b4a9a16d2f3a3cca140ce9313d146531bef
---
 .github/actions/setup-erlang/action.yml | 61 +++++++++++++++++++++++++
 .github/workflows/ci.yml                | 41 ++---------------
 2 files changed, 65 insertions(+), 37 deletions(-)
 create mode 100644 .github/actions/setup-erlang/action.yml

diff --git a/.github/actions/setup-erlang/action.yml b/.github/actions/setup-erlang/action.yml
new file mode 100644
index 0000000000..5016eff3ec
--- /dev/null
+++ b/.github/actions/setup-erlang/action.yml
@@ -0,0 +1,61 @@
+name: 'Setup Erlang/OTP'
+description: 'Setup Erlang/OTP + rebar3'
+inputs:
+  os:
+    required: true
+  otp-version:
+    required: true
+  brew-otp-version:
+    required: true
+
+runs:
+  using: composite
+  steps:
+  - name: Install Erlang/OTP (Linux, Windows)
+    if: inputs.os == 'linux' || inputs.os == 'windows'
+    uses: erlef/setup-beam@v1
+    with:
+      otp-version: ${{ inputs.otp-version }}
+      install-rebar: false
+      install-hex: false
+  - name: Install Erlang/OTP (MacOS Only)
+    if: inputs.os == 'macos'
+    run: brew install erlang@${{ inputs.brew-otp-version }}
+    shell: bash
+  - name: Add erl to path (MacOS Only)
+    if: inputs.os == 'macos'
+    run: |
+      echo '/opt/homebrew/opt/erlang@${{ inputs.brew-otp-version }}/bin' >> $GITHUB_PATH
+      echo '/usr/local/opt/erlang@${{ inputs.brew-otp-version }}/bin' >> $GITHUB_PATH
+    shell: bash
+  - name: Verify Erlang version
+    run: erl -eval 'erlang:display(erlang:system_info(otp_release)), halt().' -noshell
+    shell: bash
+  - name: Install rebar3
+    run: "mkdir rebar3 && curl https://s3.amazonaws.com/rebar3/rebar3 -o rebar3/rebar3 && chmod +x rebar3/rebar3"
+    shell: bash
+  - name: Create rebar3.cmd (Windows Only)
+    if: inputs.os == 'windows'
+    working-directory: rebar3
+    run: |
+      echo '@echo off' > rebar3.cmd
+      echo 'setlocal' >> rebar3.cmd
+      echo 'set rebarscript=%~f0' >> rebar3.cmd
+      echo 'escript.exe "%rebarscript:.cmd=%" %*' >> rebar3.cmd
+    shell: pwsh
+  - name: Add rebar3 to path (No Windows)
+    if: inputs.os != 'windows'
+    run: 'echo "$GITHUB_WORKSPACE/rebar3" >> $GITHUB_PATH'
+    shell: bash
+  - name: Add rebar3 to path (Windows Only)
+    if: inputs.os == 'windows'
+    run: '"$env:GITHUB_WORKSPACE\rebar3" | Out-File -FilePath "$env:GITHUB_PATH" -Append'
+    shell: pwsh
+  - name: Verify rebar3 version (No Windows)
+    if: inputs.os != 'windows'
+    run: rebar3 version
+    shell: bash
+  - name: Verify rebar3 version (Windows Only)
+    if: inputs.os == 'windows'
+    run: rebar3.cmd version
+    shell: cmd
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 91a6511aeb..411e95344c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -78,45 +78,12 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y crossbuild-essential-arm64
-      - name: Install Erlang/OTP (Linux, Windows)
-        if: matrix.os == 'linux' || matrix.os == 'windows'
-        uses: erlef/setup-beam@v1
+      - id: setup-erlang
+        uses: ./.github/actions/setup-erlang
         with:
+          os: ${{ matrix.os }}
           otp-version: ${{ matrix.otp-version }}
-          install-rebar: false
-          install-hex: false
-      - name: Install Erlang/OTP (MacOS Only)
-        if: matrix.os == 'macos'
-        run: brew install erlang@${{ matrix.brew-otp-version }}
-      - name: Add erl to path (MacOS Only)
-        if: matrix.os == 'macos'
-        run: |
-          echo '/opt/homebrew/opt/erlang@${{ matrix.brew-otp-version }}/bin' >> $GITHUB_PATH
-          echo '/usr/local/opt/erlang@${{ matrix.brew-otp-version }}/bin' >> $GITHUB_PATH
-      - name: Verify Erlang version
-        run: erl -eval 'erlang:display(erlang:system_info(otp_release)), halt().' -noshell
-      - name: Install rebar3
-        run: "mkdir rebar3 && curl https://s3.amazonaws.com/rebar3/rebar3 -o rebar3/rebar3 && chmod +x rebar3/rebar3"
-      - name: Create rebar3.cmd (Windows Only)
-        if: matrix.os == 'windows'
-        working-directory: rebar3
-        run: |
-          echo '@echo off' > rebar3.cmd
-          echo 'setlocal' >> rebar3.cmd
-          echo 'set rebarscript=%~f0' >> rebar3.cmd
-          echo 'escript.exe "%rebarscript:.cmd=%" %*' >> rebar3.cmd
-      - name: Add rebar3 to path (No Windows)
-        if: matrix.os != 'windows'
-        run: 'echo "$GITHUB_WORKSPACE/rebar3" >> $GITHUB_PATH'
-      - name: Add rebar3 to path (Windows Only)
-        if: matrix.os == 'windows'
-        run: '"$env:GITHUB_WORKSPACE\rebar3" | Out-File -FilePath "$env:GITHUB_PATH" -Append'
-      - name: Verify rebar3 version (No Windows)
-        if: matrix.os != 'windows'
-        run: rebar3 version
-      - name: Verify rebar3 version (Windows Only)
-        if: matrix.os == 'windows'
-        run: rebar3.cmd version
+          brew-otp-version: ${{ matrix.brew-otp-version}}
       - name: Assemble eqwalizer.jar (No Windows)
         if: matrix.os != 'windows'
         working-directory: eqwalizer/eqwalizer

From 0809b9c9c0f561bf9b6948d431b97387c2f44160 Mon Sep 17 00:00:00 2001
From: Luke Bakken <lrbakken@amazon.com>
Date: Fri, 22 Aug 2025 08:59:06 -0700
Subject: [PATCH 060/394] Fix issue where W0008 could not be disabled (#114)

Summary:
Fixes https://github.com/WhatsApp/erlang-language-platform/issues/113

Pull Request resolved: https://github.com/WhatsApp/erlang-language-platform/pull/114

Reviewed By: TD5

Differential Revision: D80779500

Pulled By: robertoaloi

fbshipit-source-id: bd1693d081712e60e4c893f4d496c49e93b60057
---
 CONTRIBUTING.md               | 2 +-
 crates/ide/src/diagnostics.rs | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f9ab793705..f84552a442 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -20,7 +20,7 @@ We actively welcome your pull requests.
 
 1. Fork the repo and create your branch from `main`.
 2. If you've added code that should be tested, add tests.
-3. Ensure the test suite passes.
+3. Ensure the test suite passes and that the code is formatted correctly (`cargo fmt -- --check`)
 4. If you haven't already, complete the Contributor License Agreement ("CLA").
 
 ## Contributor License Agreement ("CLA")
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 476ef31e0d..6555f95881 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1829,7 +1829,9 @@ pub fn ct_diagnostics(
     };
     let metadata = db.elp_metadata(file_id);
     res.into_iter()
-        .filter(|d| !d.should_be_suppressed(&metadata, config))
+        .filter(|d| {
+            !config.disabled.contains(&d.code) && !d.should_be_suppressed(&metadata, config)
+        })
         .collect()
 }
 

From 406d5acfcf74f6c00fda2ed1180b143a5e990108 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 25 Aug 2025 00:58:48 -0700
Subject: [PATCH 061/394] Build EDB debugger and package it with the extension

Summary:
We want to package a copy of the EDB debugger together with the ELP VS Code extension, to make the setup process as simple as possible for end users.

* Create a dedicated action that builds the otp-28 branch of EDB and produces an escript
* Adds a new `edb` workflow` which uses the new action, producing an artifact
* Fetch the artifact from the main `ci` job and package it with the extension

Reviewed By: TD5

Differential Revision: D80805822

fbshipit-source-id: 83853ca9ec93d9cd008139256bc6a9bc6931c5e2
---
 .github/actions/build-edb/action.yml | 28 ++++++++++++++++++++++
 .github/workflows/ci.yml             | 35 ++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)
 create mode 100644 .github/actions/build-edb/action.yml

diff --git a/.github/actions/build-edb/action.yml b/.github/actions/build-edb/action.yml
new file mode 100644
index 0000000000..96f6046a8a
--- /dev/null
+++ b/.github/actions/build-edb/action.yml
@@ -0,0 +1,28 @@
+name: 'Build EDB'
+description: 'Build the EDB debugger from source'
+inputs:
+  os:
+    required: true
+  target:
+    required: true
+  otp-version:
+    required: true
+
+runs:
+  using: composite
+  steps:
+  - name: Checkout EDB
+    uses: "actions/checkout@v4"
+    with:
+      repository: WhatsApp/edb
+      path: edb
+      ref: otp-28.0
+  - name: Build EDB
+    run: rebar3 escriptize
+    shell: bash
+    working-directory: edb
+  - name: Upload EDB binary
+    uses: "actions/upload-artifact@v4"
+    with:
+      name: edb
+      path: edb/_build/default/bin/edb
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 411e95344c..762a15136f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,6 +5,24 @@ on:
     types: [published]
 
 jobs:
+  edb:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout erlang-language-platform
+        uses: "actions/checkout@v3"
+      - id: setup-erlang
+        uses: ./.github/actions/setup-erlang
+        with:
+          os: linux
+          otp-version: 27.3
+          brew-otp-version: 27
+      - id: build-edb
+        uses: ./.github/actions/build-edb
+        with:
+          os: ${{ matrix.os }}
+          target: ${{ matrix.target }}
+          otp-version: ${{ matrix.otp-version}}
+
   ci:
     strategy:
       fail-fast: false
@@ -50,6 +68,7 @@ jobs:
             target: x86_64-pc-windows-msvc
             vscode-target: win32-x64
     runs-on: ${{ matrix.platform }}
+    needs: edb
     steps:
       - name: Checkout erlang-language-platform
         uses: "actions/checkout@v3"
@@ -188,6 +207,22 @@ jobs:
         if: matrix.os == 'windows'
         run: if not exist "editors\code\bin" mkdir "editors\code\bin"
         shell: cmd
+      - name: Fetch EDB escript
+        uses: actions/download-artifact@v4
+        with:
+          name: edb
+      - name: Ensure escript is executable
+        run: chmod +x edb
+        shell: bash
+      - name: Verify EDB escript
+        run: ./edb -h || true
+        shell: bash
+      - name: Package EDB escript into VS Code Extension (No Windows)
+        if: matrix.os != 'windows'
+        run: cp edb editors/code/bin
+      - name: Package EDB escript into VS Code Extension (Windows Only)
+        if: matrix.os == 'windows'
+        run: cp edb editors\code\bin
       - name: Package eqWAlizer binary into VS Code Extension (No Windows)
         if: matrix.os != 'windows'
         run: cp eqwalizer/eqwalizer/eqwalizer editors/code/bin

From d002bbd4c1aa8572835bc6e70e48747e65d2976c Mon Sep 17 00:00:00 2001
From: Cj Longoria <cjlongoria@meta.com>
Date: Tue, 26 Aug 2025 01:58:03 -0700
Subject: [PATCH 062/394] Edition 2024 cleanup: rename `expr_2021` -> `expr`

Summary:
X-link: https://github.com/meta-pytorch/monarch/pull/949

This renames `expr_2021` to `expr` for rust macros. The `expr_2021` was used during the Rust Edition upgrade to ensure compatibility between the two editions. Now that we are using Rust Edition 2024 as the default, and none of the macros are triggering a build failure with this rename, we can rename this back to `expr`

Reviewed By: diliop

Differential Revision: D80508019

fbshipit-source-id: 5ebdc9a11067ff66d2ec475790e9df97a6e1fa46
---
 crates/base_db/src/test_utils.rs | 4 ++--
 crates/elp/src/bin/lint_cli.rs   | 2 +-
 crates/elp/src/bin/main.rs       | 2 +-
 crates/elp/src/config.rs         | 6 +++---
 crates/elp_log/src/lib.rs        | 6 +++---
 crates/hir/src/body/tests.rs     | 2 +-
 crates/ide_db/src/rename.rs      | 4 ++--
 crates/ide_ssr/src/errors.rs     | 4 ++--
 crates/ide_ssr/src/matching.rs   | 4 ++--
 crates/syntax/src/lib.rs         | 6 +++---
 crates/syntax/src/unescape.rs    | 2 +-
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/crates/base_db/src/test_utils.rs b/crates/base_db/src/test_utils.rs
index fa478eb385..f0192a368a 100644
--- a/crates/base_db/src/test_utils.rs
+++ b/crates/base_db/src/test_utils.rs
@@ -22,10 +22,10 @@ pub use dissimilar::diff as __diff;
 /// `eprintln!()` macro in case of text inequality.
 #[macro_export]
 macro_rules! assert_eq_text {
-    ($left:expr_2021, $right:expr_2021) => {
+    ($left:expr, $right:expr) => {
         assert_eq_text!($left, $right,)
     };
-    ($left:expr_2021, $right:expr_2021, $($tt:tt)*) => {{
+    ($left:expr, $right:expr, $($tt:tt)*) => {{
         let left = $left;
         let right = $right;
         if left != right {
diff --git a/crates/elp/src/bin/lint_cli.rs b/crates/elp/src/bin/lint_cli.rs
index 2259ca5ce0..3b81a8e119 100644
--- a/crates/elp/src/bin/lint_cli.rs
+++ b/crates/elp/src/bin/lint_cli.rs
@@ -950,7 +950,7 @@ mod tests {
     use crate::args::Command;
 
     macro_rules! args_vec {
-        ($($e:expr_2021$(,)?)+) => {
+        ($($e:expr$(,)?)+) => {
             vec![$(OsString::from($e),)+]
         }
     }
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index b37f57c034..142b4f952e 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -237,7 +237,7 @@ mod tests {
     const BUCK_QUERY_CONFIG: BuckQueryConfig = BuckQueryConfig::BuildGeneratedCode;
 
     macro_rules! args_vec {
-        ($($e:expr_2021$(,)?)+) => {
+        ($($e:expr$(,)?)+) => {
             vec![$(OsString::from($e),)+]
         }
     }
diff --git a/crates/elp/src/config.rs b/crates/elp/src/config.rs
index a631721a94..fab48abbe1 100644
--- a/crates/elp/src/config.rs
+++ b/crates/elp/src/config.rs
@@ -143,12 +143,12 @@ pub struct EqwalizerConfig {
 }
 
 macro_rules! try_ {
-    ($expr:expr_2021) => {
+    ($expr:expr) => {
         || -> _ { Some($expr) }()
     };
 }
 macro_rules! try_or {
-    ($expr:expr_2021, $or:expr_2021) => {
+    ($expr:expr, $or:expr) => {
         try_!($expr).unwrap_or($or)
     };
 }
@@ -401,7 +401,7 @@ macro_rules! _config_data {
     (struct $name:ident {
         $(
             $(#[doc=$doc:literal])*
-            $field:ident $(| $alias:ident)*: $ty:ty = $default:expr_2021,
+            $field:ident $(| $alias:ident)*: $ty:ty = $default:expr,
         )*
     }) => {
         #[allow(non_snake_case)]
diff --git a/crates/elp_log/src/lib.rs b/crates/elp_log/src/lib.rs
index 29bb2bf80b..ffe41e64e9 100644
--- a/crates/elp_log/src/lib.rs
+++ b/crates/elp_log/src/lib.rs
@@ -128,7 +128,7 @@ impl Log for Logger {
 /// so `drop` happens at the end of the function
 #[macro_export]
 macro_rules! timeit {
-    ($display:expr_2021) => {
+    ($display:expr) => {
         $crate::TimeIt::new(module_path!(), $display, $crate::Telemetry::No)
     };
     ($($arg:tt)+) => {
@@ -140,7 +140,7 @@ macro_rules! timeit {
 /// Same as timeit!, but also send a LSP telemetry/event
 #[macro_export]
 macro_rules! timeit_with_telemetry {
-    ($display:expr_2021) => {
+    ($display:expr) => {
         $crate::TimeIt::new(module_path!(), $display, $crate::Telemetry::Always)
     };
     ($($arg:tt)+) => {
@@ -152,7 +152,7 @@ macro_rules! timeit_with_telemetry {
 /// Same as timeit_with_telemetry!, but do work only if latency is more than configured value
 #[macro_export]
 macro_rules! timeit_exceeds {
-    ($display:expr_2021, $duration:expr_2021) => {
+    ($display:expr, $duration:expr) => {
         $crate::TimeIt::new(
             module_path!(),
             $display,
diff --git a/crates/hir/src/body/tests.rs b/crates/hir/src/body/tests.rs
index a782df6022..f8c48a7fbc 100644
--- a/crates/hir/src/body/tests.rs
+++ b/crates/hir/src/body/tests.rs
@@ -2436,7 +2436,7 @@ fn triple_quoted_strings_2() {
 // - Proper location reporting for failing tests
 macro_rules! my_expect {
     [$data:literal] => { $crate::expect![[$data]] };
-    [[$data:expr_2021]] => {expect_test::Expect {
+    [[$data:expr]] => {expect_test::Expect {
         position: expect_test::Position {
             file: file!(),
             line: line!(),
diff --git a/crates/ide_db/src/rename.rs b/crates/ide_db/src/rename.rs
index 425bbf6a41..c25ee41e2a 100644
--- a/crates/ide_db/src/rename.rs
+++ b/crates/ide_db/src/rename.rs
@@ -42,8 +42,8 @@ impl fmt::Display for RenameError {
 
 #[macro_export]
 macro_rules! _format_err {
-    ($fmt:expr_2021) => { RenameError(format!($fmt)) };
-    ($fmt:expr_2021, $($arg:tt)+) => { RenameError(format!($fmt, $($arg)+)) }
+    ($fmt:expr) => { RenameError(format!($fmt)) };
+    ($fmt:expr, $($arg:tt)+) => { RenameError(format!($fmt, $($arg)+)) }
 }
 pub use _format_err as format_err;
 
diff --git a/crates/ide_ssr/src/errors.rs b/crates/ide_ssr/src/errors.rs
index 3919c620b5..4180be0973 100644
--- a/crates/ide_ssr/src/errors.rs
+++ b/crates/ide_ssr/src/errors.rs
@@ -12,8 +12,8 @@
 
 /// Constructs an SsrError taking arguments like the format macro.
 macro_rules! _error {
-    ($fmt:expr_2021) => {$crate::SsrError::new(format!($fmt))};
-    ($fmt:expr_2021, $($arg:tt)+) => {$crate::SsrError::new(format!($fmt, $($arg)+))}
+    ($fmt:expr) => {$crate::SsrError::new(format!($fmt))};
+    ($fmt:expr, $($arg:tt)+) => {$crate::SsrError::new(format!($fmt, $($arg)+))}
 }
 #[allow(unused_imports)]
 pub(crate) use _error as error;
diff --git a/crates/ide_ssr/src/matching.rs b/crates/ide_ssr/src/matching.rs
index a7193ee179..b60100fe4d 100644
--- a/crates/ide_ssr/src/matching.rs
+++ b/crates/ide_ssr/src/matching.rs
@@ -63,7 +63,7 @@ use crate::get_literal_subid;
 
 // Creates a match error.
 macro_rules! match_error {
-    ($e:expr_2021) => {{
+    ($e:expr) => {{
             MatchFailed {
                 reason: if recording_match_fail_reasons() {
                     Some(format!("{}", $e))
@@ -72,7 +72,7 @@ macro_rules! match_error {
                 }
             }
     }};
-    ($fmt:expr_2021, $($arg:tt)+) => {{
+    ($fmt:expr, $($arg:tt)+) => {{
         MatchFailed {
             reason: if recording_match_fail_reasons() {
                 Some(format!($fmt, $($arg)+))
diff --git a/crates/syntax/src/lib.rs b/crates/syntax/src/lib.rs
index a93fb77bfa..521c0f988d 100644
--- a/crates/syntax/src/lib.rs
+++ b/crates/syntax/src/lib.rs
@@ -374,9 +374,9 @@ impl SourceFile {
 macro_rules! match_ast {
     (match $node:ident { $($tt:tt)* }) => { match_ast!(match ($node) { $($tt)* }) };
 
-    (match ($node:expr_2021) {
-        $( ast::$ast:ident($it:pat) => $res:expr_2021, )*
-        _ => $catch_all:expr_2021 $(,)?
+    (match ($node:expr) {
+        $( ast::$ast:ident($it:pat) => $res:expr, )*
+        _ => $catch_all:expr $(,)?
     }) => {{
         $( if let Some($it) = ast::$ast::cast($node.clone()) { $res } else )*
         { $catch_all }
diff --git a/crates/syntax/src/unescape.rs b/crates/syntax/src/unescape.rs
index 01c2dc288f..e853b3c3c4 100644
--- a/crates/syntax/src/unescape.rs
+++ b/crates/syntax/src/unescape.rs
@@ -16,7 +16,7 @@ use std::collections::VecDeque;
 use std::ops::BitAnd;
 
 macro_rules! try_option {
-    ($o:expr_2021) => {
+    ($o:expr) => {
         match $o {
             Some(s) => s,
             None => return None,

From 53b07412a515bc7a6680ccce73e317c6abfd791f Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 26 Aug 2025 02:52:25 -0700
Subject: [PATCH 063/394] Run GitHub CI on Pull Requests to main

Summary:
We currently run the main CI job on pushes only. This means we don't automatically run CI on pull requests from third-party users.
This is not ideal and can create delays for trivial issues such as bad formatting (see [example](https://github.com/WhatsApp/erlang-language-platform/pull/114)).

Reviewed By: TD5

Differential Revision: D80930880

fbshipit-source-id: d3f5a460fdf92a3e7a1842e07a0b97e098a7c197
---
 .github/workflows/ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 762a15136f..e5166af388 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,9 @@
 name: ELP CI
 on:
   push: {}
+  pull_request:
+    branches:
+      - main
   release:
     types: [published]
 

From 623b636ce3a03b7491ec772534918f6e397527d2 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 26 Aug 2025 02:52:25 -0700
Subject: [PATCH 064/394] Do not publish the Windows extension to the
 Marketplace yet

Summary:
Support for Windows is still in progress. Tests are failing and users report several issues. See https://github.com/WhatsApp/erlang-language-platform/issues/26 for details.
Until we have a stable Windows CI pipeline which runs all tests, do not publish the Windows version of the extension to the official marketplace.
The extension can still be manually downloaded from the ELP website as an artifact and installed as a .VSIX package.

Reviewed By: TD5

Differential Revision: D80931197

fbshipit-source-id: 5e3f1a2c44575464921877d4395d241095dc7829
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e5166af388..d224d6fce7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -286,5 +286,5 @@ jobs:
           upload_url: "${{ steps.get_release_url.outputs.upload_url }}"
       - name: Publish extension to marketplace
         working-directory: editors/code
-        if: ${{ github.event_name == 'release' && matrix.vscode-publish }}
+        if: ${{ github.event_name == 'release' && matrix.vscode-publish }} && matrix.os != 'windows'
         run: vsce publish -p ${{ secrets.VSCE_PAT }} --packagePath erlang-language-platform.vsix

From 86aef83e6c27b2d25c3e3a8b6c21355f6a55a7df Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 26 Aug 2025 02:52:25 -0700
Subject: [PATCH 065/394] Enable logging support in VS Code

Summary:
This [enables](https://code.visualstudio.com/api/language-extensions/language-server-extension-guide#logging-support-for-language-server) the user to trace the communication between VS Code and the ELP languages server.

Renaming the client into "erlang-elp" to make the option easier to find via the VS Code settings.

Reviewed By: TD5

Differential Revision: D80936548

fbshipit-source-id: c5960f4115d900f5ea92dec291de772d8932e4ed
---
 editors/code/client/src/extension.ts |  2 +-
 editors/code/package.json            | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/editors/code/client/src/extension.ts b/editors/code/client/src/extension.ts
index 167b47589a..043f4f8e80 100644
--- a/editors/code/client/src/extension.ts
+++ b/editors/code/client/src/extension.ts
@@ -68,7 +68,7 @@ export function activate(context: vscode.ExtensionContext) {
 
 	// Create the language client and start the client.
 	client = new LanguageClient(
-		'elp',
+		'erlang-elp',
 		'Erlang Language Platform',
 		serverOptions,
 		clientOptions
diff --git a/editors/code/package.json b/editors/code/package.json
index 7dd026d352..79c8ff1587 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -214,6 +214,17 @@
       "type": "object",
       "title": "Erlang Language Platform",
       "properties": {
+        "erlang-elp.trace.server": {
+          "scope": "window",
+          "type": "string",
+          "enum": [
+            "off",
+            "messages",
+            "verbose"
+          ],
+          "default": "off",
+          "description": "Traces the communication between VS Code and the Erlang language server."
+        },
         "elpClient.serverPath": {
           "type": "string",
           "description": "The path to the ELP executable. If empty, uses the binary included in the extension",

From 833e2c45d9325412303f05906345fd4e0f4b0ddf Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 26 Aug 2025 02:52:25 -0700
Subject: [PATCH 066/394] Ensure default edb command works

Summary: The command should be a path, not a uri. Since this was misconfigured, the debug lens for rebar3 was failing when no custom command was specified.

Reviewed By: jcpetruzza

Differential Revision: D80962151

fbshipit-source-id: f29e697560d48b9eba4687dd1b391c505d32782e
---
 editors/code/client/src/debugger.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editors/code/client/src/debugger.ts b/editors/code/client/src/debugger.ts
index a02b971f75..0477daf82a 100644
--- a/editors/code/client/src/debugger.ts
+++ b/editors/code/client/src/debugger.ts
@@ -47,7 +47,7 @@ class DebugAdapterExecutableFactory implements vscode.DebugAdapterDescriptorFact
             command = commandString.split(' ')[0];
             args = commandString.split(' ').slice(1);
         } else {
-            command = vscode.Uri.joinPath(this.extensionUri, 'bin', 'edb').toString();
+            command = vscode.Uri.joinPath(this.extensionUri, 'bin', 'edb').fsPath;
             args = ['dap'];
         }
         const options = { env: { "PATH": dapConfig.withErlangInstallationPath() } };

From 209db6e0c42f5c221d902af6e05ad6c4270b6b52 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 26 Aug 2025 02:52:25 -0700
Subject: [PATCH 067/394] Fix Clippy warnings for tests

Summary:
Addresses Clippy warnings for tests.
Related to [let chains](https://blog.rust-lang.org/2025/06/26/Rust-1.88.0/?fbclid=IwY2xjawMZlfZleHRuA2FlbQIxMQBicmlkETFZdWg3aGVrZlZwakVzOEV2AR6XT2oWkJW0KPKWUeE0_vz-40h0gKiqx6v954U555KtrFVvULhNPcbYjwmK-w_aem_iY-lSo4VVyeAXIT4aXkaVQ#let-chains), introduced in 1.88, and the removal of an unnecessary `concat!`.

Reviewed By: TD5

Differential Revision: D80964270

fbshipit-source-id: 44fee57e7f94706e8a89f48e169c64dfd68b350e
---
 crates/hir/src/edoc.rs                        | 104 +++++++++---------
 .../ide/src/diagnostics/missing_separator.rs  |   2 +-
 crates/ide/src/fixture.rs                     |   7 +-
 crates/ide_assists/src/tests.rs               |  13 +--
 4 files changed, 62 insertions(+), 64 deletions(-)

diff --git a/crates/hir/src/edoc.rs b/crates/hir/src/edoc.rs
index e51aca3e07..5cfb375ce4 100644
--- a/crates/hir/src/edoc.rs
+++ b/crates/hir/src/edoc.rs
@@ -942,33 +942,33 @@ mod tests {
                 },
             )| {
                 buf.push_str(&format!("{kind:?}\n"));
-                if let Some(doc) = doc {
-                    if !doc.lines.is_empty() {
-                        buf.push_str("  doc\n");
-                        doc.lines.iter().for_each(|line| {
-                            if let Some(text) = &line.content {
-                                buf.push_str(&format!(
-                                    "    {:?}: \"{}\"\n",
-                                    line.syntax.range().range,
-                                    text
-                                ));
-                            }
-                        });
-                    }
+                if let Some(doc) = doc
+                    && !doc.lines.is_empty()
+                {
+                    buf.push_str("  doc\n");
+                    doc.lines.iter().for_each(|line| {
+                        if let Some(text) = &line.content {
+                            buf.push_str(&format!(
+                                "    {:?}: \"{}\"\n",
+                                line.syntax.range().range,
+                                text
+                            ));
+                        }
+                    });
                 }
-                if let Some(Tag { lines, .. }) = deprecated {
-                    if !lines.is_empty() {
-                        buf.push_str("  deprecated\n");
-                        lines.iter().for_each(|line| {
-                            if let Some(text) = &line.content {
-                                buf.push_str(&format!(
-                                    "    {:?}: \"{}\"\n",
-                                    line.syntax.range().range,
-                                    text
-                                ));
-                            }
-                        });
-                    }
+                if let Some(Tag { lines, .. }) = deprecated
+                    && !lines.is_empty()
+                {
+                    buf.push_str("  deprecated\n");
+                    lines.iter().for_each(|line| {
+                        if let Some(text) = &line.content {
+                            buf.push_str(&format!(
+                                "    {:?}: \"{}\"\n",
+                                line.syntax.range().range,
+                                text
+                            ));
+                        }
+                    });
                 }
                 if !params.is_empty() {
                     buf.push_str("  params\n");
@@ -987,33 +987,33 @@ mod tests {
                         }
                     });
                 }
-                if let Some(Tag { lines, .. }) = returns {
-                    if !lines.is_empty() {
-                        buf.push_str("  returns\n");
-                        lines.iter().for_each(|line| {
-                            if let Some(text) = &line.content {
-                                buf.push_str(&format!(
-                                    "    {:?}: \"{}\"\n",
-                                    line.syntax.range().range,
-                                    text
-                                ));
-                            }
-                        });
-                    }
+                if let Some(Tag { lines, .. }) = returns
+                    && !lines.is_empty()
+                {
+                    buf.push_str("  returns\n");
+                    lines.iter().for_each(|line| {
+                        if let Some(text) = &line.content {
+                            buf.push_str(&format!(
+                                "    {:?}: \"{}\"\n",
+                                line.syntax.range().range,
+                                text
+                            ));
+                        }
+                    });
                 }
-                if let Some(Tag { lines, .. }) = equiv {
-                    if !lines.is_empty() {
-                        buf.push_str("  equiv\n");
-                        lines.iter().for_each(|line| {
-                            if let Some(text) = &line.content {
-                                buf.push_str(&format!(
-                                    "    {:?}: \"{}\"\n",
-                                    line.syntax.range().range,
-                                    text
-                                ));
-                            }
-                        });
-                    }
+                if let Some(Tag { lines, .. }) = equiv
+                    && !lines.is_empty()
+                {
+                    buf.push_str("  equiv\n");
+                    lines.iter().for_each(|line| {
+                        if let Some(text) = &line.content {
+                            buf.push_str(&format!(
+                                "    {:?}: \"{}\"\n",
+                                line.syntax.range().range,
+                                text
+                            ));
+                        }
+                    });
                 }
                 if let Some(Tag { .. }) = hidden {
                     buf.push_str("  hidden\n");
diff --git a/crates/ide/src/diagnostics/missing_separator.rs b/crates/ide/src/diagnostics/missing_separator.rs
index 5d421a2a30..f5c8713cae 100644
--- a/crates/ide/src/diagnostics/missing_separator.rs
+++ b/crates/ide/src/diagnostics/missing_separator.rs
@@ -126,7 +126,7 @@ mod tests {
 
     #[test]
     fn fun_decl_missing_semi_no_warning() {
-        let text = concat!("foo(2)->3.");
+        let text = "foo(2)->3.";
 
         let parsed = ast::SourceFile::parse_text(text);
         let d = form_missing_separator_diagnostics(&parsed);
diff --git a/crates/ide/src/fixture.rs b/crates/ide/src/fixture.rs
index d141c756d5..e0fe9783cf 100644
--- a/crates/ide/src/fixture.rs
+++ b/crates/ide/src/fixture.rs
@@ -110,10 +110,9 @@ pub fn diagnostics_for(
             diagnostics.set_erlang_service(file_id, diags)
         }
     }
-    if *use_eqwalizer {
-        if let Some(diags) = analysis.eqwalizer_diagnostics_for_file(file_id).unwrap() {
-            diagnostics.set_eqwalizer(file_id, diags);
-        }
+    if *use_eqwalizer && let Some(diags) = analysis.eqwalizer_diagnostics_for_file(file_id).unwrap()
+    {
+        diagnostics.set_eqwalizer(file_id, diags);
     }
     if *use_ct {
         diagnostics.set_ct(file_id, analysis.ct_diagnostics(file_id, config).unwrap());
diff --git a/crates/ide_assists/src/tests.rs b/crates/ide_assists/src/tests.rs
index 46fbbb0a04..9998c23ec9 100644
--- a/crates/ide_assists/src/tests.rs
+++ b/crates/ide_assists/src/tests.rs
@@ -163,13 +163,12 @@ fn check(
     let context_diagnostics = fixture.annotations_by_file_id(&file_id);
     let mut diagnostics = vec![];
     for (range, text) in &context_diagnostics {
-        if let Some((code_and_bulb, message)) = text.split_once(':') {
-            if let Some(code_string) = code_and_bulb.strip_prefix("💡 ") {
-                if let Ok(code) = AssistContextDiagnosticCode::from_str(code_string) {
-                    let d = AssistContextDiagnostic::new(code, message.trim().to_string(), *range);
-                    diagnostics.push(d)
-                }
-            }
+        if let Some((code_and_bulb, message)) = text.split_once(':')
+            && let Some(code_string) = code_and_bulb.strip_prefix("💡 ")
+            && let Ok(code) = AssistContextDiagnosticCode::from_str(code_string)
+        {
+            let d = AssistContextDiagnostic::new(code, message.trim().to_string(), *range);
+            diagnostics.push(d)
         }
     }
 

From 9a68ab90255cf36919efe3d8424eec37c4016ea1 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 26 Aug 2025 04:53:03 -0700
Subject: [PATCH 068/394] Bump VS Code extension for imminent release

Summary: As per title.

Reviewed By: acw224

Differential Revision: D81026946

fbshipit-source-id: 95a5b2c04671cf8bad3f0df9c36424f16f8359b4
---
 editors/code/package-lock.json | 4 ++--
 editors/code/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 298ab19203..fa3141f0a2 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "erlang-language-platform",
-  "version": "0.38.0",
+  "version": "0.39.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "erlang-language-platform",
-      "version": "0.38.0",
+      "version": "0.39.0",
       "hasInstallScript": true,
       "license": "Apache2",
       "devDependencies": {
diff --git a/editors/code/package.json b/editors/code/package.json
index 79c8ff1587..2a1ebe2a29 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -3,7 +3,7 @@
   "description": "Erlang language server",
   "author": "Meta Platforms, Inc",
   "license": "Apache2",
-  "version": "0.38.0",
+  "version": "0.39.0",
   "icon": "images/elp-logo-color.png",
   "homepage": "https://whatsapp.github.io/erlang-language-platform/",
   "repository": {

From c601bce6060d761ddc1128b129b627bb429c38f9 Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Tue, 26 Aug 2025 06:22:02 -0700
Subject: [PATCH 069/394] Bad map error message -- snapshot

Summary: As title, see snapshot

Reviewed By: TD5

Differential Revision: D80941799

fbshipit-source-id: bc78d4ffa98c47fc0335723121f7b4846cb022a1
---
 .../check/error_messages-OTP-27.pretty        | 29 ++++++++++++++++++-
 .../check/src/error_messages.erl              |  3 ++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-27.pretty
index 2468ea1473..2c006acf5a 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-27.pretty
@@ -50,4 +50,31 @@ Because in the expression's type:
   because
   #{bar => 'a' | 'b'} | #{baz => 'a' | 'b'} is not compatible with #{bar => 'a'}
 
-2 ERRORS
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/error_messages.erl:22:22
+   │
+22 │ no_map_rewrite(M) -> M.
+   │                      ^
+   │                      │
+   │                      M.
+Expression has type:   #{'undefined' | binary() => atom()}
+Context expected type: #{binary() => atom()}
+   │                      
+
+Because in the expression's type:
+  #{ map domains are incompatible:
+    Here the type is a union type with some valid candidates: binary()
+    However the following candidate: none()
+    Differs from the expected type:  binary()
+  , ... }
+
+------------------------------ Detailed message ------------------------------
+
+  #{'undefined' | binary() => atom()} is not compatible with #{binary() => atom()}
+  the default associations are not compatible
+  because
+  'undefined' | binary() is not compatible with binary()
+  because
+  'undefined' is not compatible with binary()
+
+3 ERRORS
diff --git a/test_projects/eqwalizer_tests/check/src/error_messages.erl b/test_projects/eqwalizer_tests/check/src/error_messages.erl
index 9778cec22c..533b6a54a9 100644
--- a/test_projects/eqwalizer_tests/check/src/error_messages.erl
+++ b/test_projects/eqwalizer_tests/check/src/error_messages.erl
@@ -17,3 +17,6 @@ map_candidates(M) -> M.
 
 -spec map_candidates_2([#{bar => a | b} | #{baz => a | b}]) -> [#{bar => a}].
 map_candidates_2(M) -> M.
+
+-spec no_map_rewrite(#{undefined | binary() => atom()}) -> #{binary() => atom()}.
+no_map_rewrite(M) -> M.

From 19aef6a3b1357474fa1fe07de20ee229f00ddab5 Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Tue, 26 Aug 2025 06:22:02 -0700
Subject: [PATCH 070/394] Fix bad maps error message

Summary:
`MapType.apply` processes its arguments, so that the "shape part" of the map is extracted from the default association if possible.
This causes an issue in error messages if the issue comes from an atom literal in the default association.
Use `new` instead of `apply` to circumvent this.

Reviewed By: ilya-klyuchnikov

Differential Revision: D80941187

fbshipit-source-id: 1ef8afa9894ec25820b450ac7f56d2cfbb7dcdc4
---
 .../test/eqwalizer_tests/check/error_messages-OTP-27.pretty     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-27.pretty
index 2c006acf5a..36a53d012c 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-27.pretty
@@ -64,7 +64,7 @@ Context expected type: #{binary() => atom()}
 Because in the expression's type:
   #{ map domains are incompatible:
     Here the type is a union type with some valid candidates: binary()
-    However the following candidate: none()
+    However the following candidate: 'undefined'
     Differs from the expected type:  binary()
   , ... }
 

From 769678f3d504da579f3e1d30d1d4ff14ba98e8ee Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Tue, 26 Aug 2025 06:22:02 -0700
Subject: [PATCH 071/394] Record -> tuple conversions in error -- snapshots

Summary: Records are sometimes needlessly converted to tuples in error messages, see snapshots.

Reviewed By: TD5

Differential Revision: D80942529

fbshipit-source-id: cfd2b9d657b113dd0888ef6079a61523d7cd7ba2
---
 .../check/error_messages-OTP-27.pretty        | 65 ++++++++++++++++++-
 .../check/src/error_messages.erl              | 11 ++++
 2 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-27.pretty
index 36a53d012c..4265a25e92 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-27.pretty
@@ -77,4 +77,67 @@ Because in the expression's type:
   because
   'undefined' is not compatible with binary()
 
-3 ERRORS
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/error_messages.erl:27:32
+   │
+27 │ no_record_conversion_1(Foo) -> Foo.
+   │                                ^^^
+   │                                │
+   │                                Foo.
+Expression has type:   #foo{}
+Context expected type: {'foobar', atom()}
+   │                                
+
+Because in the expression's type:
+  Here the type is:     {'foo', atom(), atom()}
+  Context expects type: {'foobar', atom()}
+
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/error_messages.erl:30:32
+   │
+30 │ no_record_conversion_2(Foo) -> Foo.
+   │                                ^^^
+   │                                │
+   │                                Foo.
+Expression has type:   #foo{}
+Context expected type: {binary(), atom(), atom()}
+   │                                
+
+Because in the expression's type:
+  { 
+    Here the type is:     'foo'
+    Context expects type: binary()
+  , atom(), atom()}
+
+------------------------------ Detailed message ------------------------------
+
+  at tuple index 1:
+  {'foo', atom(), atom()} is not compatible with {binary(), atom(), atom()}
+  because
+  'foo' is not compatible with binary()
+
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/error_messages.erl:33:27
+   │
+33 │ record_conversion(Foo) -> Foo.
+   │                           ^^^
+   │                           │
+   │                           Foo.
+Expression has type:   #foo{}
+Context expected type: {'foo', binary(), atom()}
+   │                           
+
+Because in the expression's type:
+  { 'foo', 
+    Here the type is:     atom()
+    Context expects type: binary()
+  , atom()}
+
+------------------------------ Detailed message ------------------------------
+
+  at tuple index 2:
+  {'foo', atom(), atom()} is not compatible with {'foo', binary(), atom()}
+  because
+  atom() is not compatible with binary()
+
+6 ERRORS
diff --git a/test_projects/eqwalizer_tests/check/src/error_messages.erl b/test_projects/eqwalizer_tests/check/src/error_messages.erl
index 533b6a54a9..edeab66990 100644
--- a/test_projects/eqwalizer_tests/check/src/error_messages.erl
+++ b/test_projects/eqwalizer_tests/check/src/error_messages.erl
@@ -20,3 +20,14 @@ map_candidates_2(M) -> M.
 
 -spec no_map_rewrite(#{undefined | binary() => atom()}) -> #{binary() => atom()}.
 no_map_rewrite(M) -> M.
+
+-record(foo, {bar :: atom(), baz :: atom()}).
+
+-spec no_record_conversion_1(#foo{}) -> {foobar, atom()}.
+no_record_conversion_1(Foo) -> Foo.
+
+-spec no_record_conversion_2(#foo{}) -> {binary(), atom(), atom()}.
+no_record_conversion_2(Foo) -> Foo.
+
+-spec record_conversion(#foo{}) -> {foo, binary(), atom()}.
+record_conversion(Foo) -> Foo.

From 7d07852ff2e626a6ce0c5db630fad99d0d5dafe5 Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Tue, 26 Aug 2025 06:22:02 -0700
Subject: [PATCH 072/394] Avoid unecessary record->tuple conversions in errors

Summary: Use heuristic to allow conversion of record to tuple in error messages (matching arity + first component being an atom).

Reviewed By: TD5

Differential Revision: D80942528

fbshipit-source-id: 469350986416d5b05cd685acada4838a66453766
---
 .../check/error_messages-OTP-27.pretty          | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-27.pretty
index 4265a25e92..ee63204870 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-27.pretty
@@ -81,16 +81,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    ┌─ check/src/error_messages.erl:27:32
    │
 27 │ no_record_conversion_1(Foo) -> Foo.
-   │                                ^^^
-   │                                │
-   │                                Foo.
+   │                                ^^^ Foo.
 Expression has type:   #foo{}
 Context expected type: {'foobar', atom()}
-   │                                
-
-Because in the expression's type:
-  Here the type is:     {'foo', atom(), atom()}
-  Context expects type: {'foobar', atom()}
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/error_messages.erl:30:32
@@ -103,14 +96,6 @@ Expression has type:   #foo{}
 Context expected type: {binary(), atom(), atom()}
    │                                
 
-Because in the expression's type:
-  { 
-    Here the type is:     'foo'
-    Context expects type: binary()
-  , atom(), atom()}
-
------------------------------- Detailed message ------------------------------
-
   at tuple index 1:
   {'foo', atom(), atom()} is not compatible with {binary(), atom(), atom()}
   because

From 5e7814c032ca115938199adae5528c7f72c51e49 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 26 Aug 2025 07:05:36 -0700
Subject: [PATCH 073/394] Fix check for publishing Erlang extenstion to
 marketplace

Summary: The check did not work as expected, most likely due to the incorrect placing of the expression. This caused the publishing to be attempted on a regular commit. To avoid unnecessary publish operations, fix the expression.

Reviewed By: Balajiganapathi

Differential Revision: D81033766

fbshipit-source-id: 40f52ab9d7f6a4a41f30f4ebc278e9808409fe78
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d224d6fce7..8d9d952c4f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -286,5 +286,5 @@ jobs:
           upload_url: "${{ steps.get_release_url.outputs.upload_url }}"
       - name: Publish extension to marketplace
         working-directory: editors/code
-        if: ${{ github.event_name == 'release' && matrix.vscode-publish }} && matrix.os != 'windows'
+        if: ${{ github.event_name == 'release' && matrix.vscode-publish && matrix.os != 'windows' }}
         run: vsce publish -p ${{ secrets.VSCE_PAT }} --packagePath erlang-language-platform.vsix

From d39f760c7b9756063d640ef421370c335e2e21eb Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Thu, 28 Aug 2025 08:59:39 -0700
Subject: [PATCH 074/394] Update fixtures for OTP 26 and 28

Summary: Copied OTP 27 expected output.

Reviewed By: TD5

Differential Revision: D81229177

fbshipit-source-id: 1018be53c8e10e928e8ec88d46a6d2416d0a57ba
---
 .../check/error_messages-OTP-26.pretty        | 77 ++++++++++++++++++-
 .../check/error_messages-OTP-28.pretty        | 77 ++++++++++++++++++-
 2 files changed, 152 insertions(+), 2 deletions(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-26.pretty
index 2468ea1473..ee63204870 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-26.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-26.pretty
@@ -50,4 +50,79 @@ Because in the expression's type:
   because
   #{bar => 'a' | 'b'} | #{baz => 'a' | 'b'} is not compatible with #{bar => 'a'}
 
-2 ERRORS
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/error_messages.erl:22:22
+   │
+22 │ no_map_rewrite(M) -> M.
+   │                      ^
+   │                      │
+   │                      M.
+Expression has type:   #{'undefined' | binary() => atom()}
+Context expected type: #{binary() => atom()}
+   │                      
+
+Because in the expression's type:
+  #{ map domains are incompatible:
+    Here the type is a union type with some valid candidates: binary()
+    However the following candidate: 'undefined'
+    Differs from the expected type:  binary()
+  , ... }
+
+------------------------------ Detailed message ------------------------------
+
+  #{'undefined' | binary() => atom()} is not compatible with #{binary() => atom()}
+  the default associations are not compatible
+  because
+  'undefined' | binary() is not compatible with binary()
+  because
+  'undefined' is not compatible with binary()
+
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/error_messages.erl:27:32
+   │
+27 │ no_record_conversion_1(Foo) -> Foo.
+   │                                ^^^ Foo.
+Expression has type:   #foo{}
+Context expected type: {'foobar', atom()}
+
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/error_messages.erl:30:32
+   │
+30 │ no_record_conversion_2(Foo) -> Foo.
+   │                                ^^^
+   │                                │
+   │                                Foo.
+Expression has type:   #foo{}
+Context expected type: {binary(), atom(), atom()}
+   │                                
+
+  at tuple index 1:
+  {'foo', atom(), atom()} is not compatible with {binary(), atom(), atom()}
+  because
+  'foo' is not compatible with binary()
+
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/error_messages.erl:33:27
+   │
+33 │ record_conversion(Foo) -> Foo.
+   │                           ^^^
+   │                           │
+   │                           Foo.
+Expression has type:   #foo{}
+Context expected type: {'foo', binary(), atom()}
+   │                           
+
+Because in the expression's type:
+  { 'foo', 
+    Here the type is:     atom()
+    Context expects type: binary()
+  , atom()}
+
+------------------------------ Detailed message ------------------------------
+
+  at tuple index 2:
+  {'foo', atom(), atom()} is not compatible with {'foo', binary(), atom()}
+  because
+  atom() is not compatible with binary()
+
+6 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-28.pretty
index 2468ea1473..ee63204870 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-28.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-28.pretty
@@ -50,4 +50,79 @@ Because in the expression's type:
   because
   #{bar => 'a' | 'b'} | #{baz => 'a' | 'b'} is not compatible with #{bar => 'a'}
 
-2 ERRORS
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/error_messages.erl:22:22
+   │
+22 │ no_map_rewrite(M) -> M.
+   │                      ^
+   │                      │
+   │                      M.
+Expression has type:   #{'undefined' | binary() => atom()}
+Context expected type: #{binary() => atom()}
+   │                      
+
+Because in the expression's type:
+  #{ map domains are incompatible:
+    Here the type is a union type with some valid candidates: binary()
+    However the following candidate: 'undefined'
+    Differs from the expected type:  binary()
+  , ... }
+
+------------------------------ Detailed message ------------------------------
+
+  #{'undefined' | binary() => atom()} is not compatible with #{binary() => atom()}
+  the default associations are not compatible
+  because
+  'undefined' | binary() is not compatible with binary()
+  because
+  'undefined' is not compatible with binary()
+
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/error_messages.erl:27:32
+   │
+27 │ no_record_conversion_1(Foo) -> Foo.
+   │                                ^^^ Foo.
+Expression has type:   #foo{}
+Context expected type: {'foobar', atom()}
+
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/error_messages.erl:30:32
+   │
+30 │ no_record_conversion_2(Foo) -> Foo.
+   │                                ^^^
+   │                                │
+   │                                Foo.
+Expression has type:   #foo{}
+Context expected type: {binary(), atom(), atom()}
+   │                                
+
+  at tuple index 1:
+  {'foo', atom(), atom()} is not compatible with {binary(), atom(), atom()}
+  because
+  'foo' is not compatible with binary()
+
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/error_messages.erl:33:27
+   │
+33 │ record_conversion(Foo) -> Foo.
+   │                           ^^^
+   │                           │
+   │                           Foo.
+Expression has type:   #foo{}
+Context expected type: {'foo', binary(), atom()}
+   │                           
+
+Because in the expression's type:
+  { 'foo', 
+    Here the type is:     atom()
+    Context expects type: binary()
+  , atom()}
+
+------------------------------ Detailed message ------------------------------
+
+  at tuple index 2:
+  {'foo', atom(), atom()} is not compatible with {'foo', binary(), atom()}
+  because
+  atom() is not compatible with binary()
+
+6 ERRORS

From b1c04cf3d135de16cde3abbb2917f87d32fcf2e8 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 28 Aug 2025 11:37:42 -0700
Subject: [PATCH 075/394] Ensure rebar3 shell terminates after a test case is
 completed during debugging

Summary:
After debugging a test case via the debug lenses in a rebar3 shell, the shell would stay open.

This diff ensures the shell is terminated on test completion.

Reviewed By: jcpetruzza

Differential Revision: D81242618

fbshipit-source-id: 20f0c03665db73262b8de5b5e2f347c73d64b349
---
 editors/code/client/src/commands.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/editors/code/client/src/commands.ts b/editors/code/client/src/commands.ts
index 0ec38e3c5e..56ca7e8547 100644
--- a/editors/code/client/src/commands.ts
+++ b/editors/code/client/src/commands.ts
@@ -115,7 +115,7 @@ export async function debugSingle(runnable: Runnable): Promise<void> {
             cwd: "${workspaceFolder}",
             args: ["bash", "-c", "rebar3 as test shell --eval \"$EDB_DAP_NODE_INIT, $REBAR3_SHELL_CT_RUN_CMD\""],
             env: {
-                REBAR3_SHELL_CT_RUN_CMD: `gen_server:cast(self(), {cmd, default, ct, \"${runnable.args.args.join(" ")}\"})`,
+                REBAR3_SHELL_CT_RUN_CMD: `Agent = self(), spawn(fun() -> catch gen_server:call(Agent, {cmd, default, ct, \"${runnable.args.args.join(" ")}\"}, infinity), erlang:halt(0) end)`,
                 "PATH": dapConfig.withErlangInstallationPath(),
             },
             argsCanBeInterpretedByShell: false,

From 961ac3ba761e69059854acb585c797cf9cccfaec Mon Sep 17 00:00:00 2001
From: Ben Mehlow <bmehne@meta.com>
Date: Thu, 28 Aug 2025 15:54:02 -0700
Subject: [PATCH 076/394] Convert apply_to to a apply_to_regex

Summary:
This is a best-effort conversion from the deprecated glob to a regex, using a hand-written glob-to-regex compiler.  We could use glob.translate if we were on python 3.13 or we could use fnmatch.translate if it supported '**'.  Both produce less readable results than I think the hand-rolled parser.

I have inspected each result to look for issues and I didn't see any.

Reviewed By: markisaa

Differential Revision: D81066431

fbshipit-source-id: 2b66f2ca1f70b2b76c53aaf9e715b2951abb2bfa
---
 .llms/rules/elp_development.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.llms/rules/elp_development.md b/.llms/rules/elp_development.md
index b92c227c6c..0f7e215021 100644
--- a/.llms/rules/elp_development.md
+++ b/.llms/rules/elp_development.md
@@ -1,6 +1,6 @@
 ---
 llms-gk: 'devmate_elp_development_md'
-apply_to: '*.rs,*.md'
+apply_to_regex: '^(.*\.rs|.*\.md)$'
 ---
 
 # ELP Development Rules for LLMs

From 65342b9efcc7edebbcb1a811d4a895f91033964f Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 1 Sep 2025 01:36:19 -0700
Subject: [PATCH 077/394] Improve document symbols calculation and
 visualization

Summary:
When showing document symbols we were always printing each function in MFA format, accompanied by eventual clauses as "children". In the case where a function was made by a single clause, this led to an unnecessary duplication since both the MFA and the full-version (including arguments) was shown.

This diff ensures that, for functions with a single clause, only the MFA format is visualized.

In the process, a few other improvements were applied to the way we calculate document symbols:

* The logic for extracting information such as name and range was moved to the `module_data` for clarity and reuse
* The `to_document_symbol` now returns an `Option`, making the code slightly simpler
* The `document_symbols` module now avoids operating at AST level directly

One slightly annoying thing is that we don't store the function clause definitions as part of a function def, so we need to reach out to the `def_map` to extract them

Reviewed By: TD5

Differential Revision: D81321568

fbshipit-source-id: 180150b0927b7640863c2c38d470fceaf6236bcb
---
 crates/hir/src/def_map.rs          |   2 +-
 crates/hir/src/module_data.rs      |  42 ++++++++
 crates/ide/src/document_symbols.rs | 165 ++++++++++++++---------------
 3 files changed, 120 insertions(+), 89 deletions(-)

diff --git a/crates/hir/src/def_map.rs b/crates/hir/src/def_map.rs
index 6cb840f7f2..4c32c4e4a6 100644
--- a/crates/hir/src/def_map.rs
+++ b/crates/hir/src/def_map.rs
@@ -59,7 +59,7 @@ use crate::name::erlang_funs;
 pub struct DefMap {
     included: FxHashSet<FileId>,
 
-    function_clauses: FxHashMap<FunctionClauseId, FunctionClauseDef>,
+    pub function_clauses: FxHashMap<FunctionClauseId, FunctionClauseDef>,
     functions: FxHashMap<InFile<FunctionDefId>, FunctionDef>,
 
     function_clauses_by_fa: FxHashMap<NameArity, FunctionClauseId>,
diff --git a/crates/hir/src/module_data.rs b/crates/hir/src/module_data.rs
index 620679d60d..b24aa5df73 100644
--- a/crates/hir/src/module_data.rs
+++ b/crates/hir/src/module_data.rs
@@ -21,6 +21,7 @@ use elp_syntax::SyntaxNode;
 use elp_syntax::TextRange;
 use elp_syntax::ast;
 use elp_syntax::ast::Expr;
+use elp_syntax::ast::FunctionOrMacroClause;
 use elp_syntax::ast::MapExpr;
 use elp_syntax::ast::MapField;
 use elp_syntax::ast::WildAttribute;
@@ -130,6 +131,29 @@ impl FunctionClauseDef {
         self.function_clause.form_id.get(&source_file)
     }
 
+    pub fn range(&self, db: &dyn SourceDatabase) -> TextRange {
+        let source = self.source(db);
+        source.syntax().text_range()
+    }
+
+    pub fn name_range(&self, db: &dyn SourceDatabase) -> Option<TextRange> {
+        Some(self.source(db).name()?.syntax().text_range())
+    }
+
+    pub fn label(&self, db: &dyn SourceDatabase) -> String {
+        let source = self.source(db);
+        let name = self.function_clause.name.name();
+        let args = match source.clause() {
+            None => Name::MISSING.to_string(),
+            Some(FunctionOrMacroClause::FunctionClause(clause)) => match clause.args() {
+                None => Name::MISSING.to_string(),
+                Some(args) => args.to_string(),
+            },
+            Some(FunctionOrMacroClause::MacroCallExpr(expr)) => expr.syntax().text().to_string(),
+        };
+        format!("{name}{args}")
+    }
+
     pub fn in_clause<'a, T>(
         &self,
         sema: &'a Semantic<'a>,
@@ -459,6 +483,10 @@ impl RecordDef {
         source.syntax().text_range()
     }
 
+    pub fn name_range(&self, db: &dyn SourceDatabase) -> Option<TextRange> {
+        Some(self.source(db).name()?.syntax().text_range())
+    }
+
     pub fn fields(
         &self,
         db: &dyn DefDatabase,
@@ -560,6 +588,11 @@ impl TypeAliasDef {
         Some(source.syntax().text_range())
     }
 
+    pub fn name_range(&self, db: &dyn SourceDatabase) -> Option<TextRange> {
+        let range = self.source(db).type_name()?.syntax().text_range();
+        Some(range)
+    }
+
     /// This information is used for completion.
     /// We deliberately return nothing for an opaque type
     pub fn map_expr_for_completion(&self, db: &dyn SourceDatabase) -> Option<MapExpr> {
@@ -621,6 +654,15 @@ impl DefineDef {
         let source_file = self.file.source(db);
         self.define.form_id.get(&source_file)
     }
+
+    pub fn range(&self, db: &dyn SourceDatabase) -> TextRange {
+        let source = self.source(db);
+        source.syntax().text_range()
+    }
+
+    pub fn name_range(&self, db: &dyn SourceDatabase) -> Option<TextRange> {
+        Some(self.source(db).name()?.syntax().text_range())
+    }
 }
 
 #[derive(Clone, PartialEq, Eq, Debug)]
diff --git a/crates/ide/src/document_symbols.rs b/crates/ide/src/document_symbols.rs
index 7baf10640a..390a975132 100644
--- a/crates/ide/src/document_symbols.rs
+++ b/crates/ide/src/document_symbols.rs
@@ -13,12 +13,11 @@ use std::fmt;
 use elp_ide_db::RootDatabase;
 use elp_ide_db::SymbolKind;
 use elp_ide_db::elp_base_db::FileId;
-use elp_syntax::AstNode;
 use elp_syntax::TextRange;
-use elp_syntax::ast::FunctionOrMacroClause;
+use hir::DefMap;
 use hir::DefineDef;
+use hir::FunctionClauseDef;
 use hir::FunctionDef;
-use hir::Name;
 use hir::RecordDef;
 use hir::Semantic;
 use hir::TypeAliasDef;
@@ -50,74 +49,66 @@ impl fmt::Display for DocumentSymbol {
 }
 
 pub trait ToDocumentSymbol {
-    fn to_document_symbol(&self, db: &dyn DefDatabase) -> DocumentSymbol;
+    fn to_document_symbol(&self, db: &dyn DefDatabase, def_map: &DefMap) -> Option<DocumentSymbol>;
 }
 
 impl ToDocumentSymbol for FunctionDef {
-    fn to_document_symbol(&self, db: &dyn DefDatabase) -> DocumentSymbol {
-        let source = self.source(db.upcast());
-        let range = self
-            .range(db.upcast())
-            .unwrap_or(TextRange::new(0.into(), 0.into())); // default should never be needed
+    fn to_document_symbol(&self, db: &dyn DefDatabase, def_map: &DefMap) -> Option<DocumentSymbol> {
         let mut children = Vec::new();
-        for fun_clause in source.iter() {
-            if let Some(clause) = fun_clause.clause() {
-                let function_name = self.name.to_string();
-                let function_name_no_arity = self.name.name().to_string();
-                let clause_name = match &clause {
-                    FunctionOrMacroClause::FunctionClause(clause) => match clause.args() {
-                        None => Name::MISSING.to_string(),
-                        Some(args) => args.to_string(),
-                    },
-                    FunctionOrMacroClause::MacroCallExpr(_) => Name::MISSING.to_string(),
-                };
-                let range = clause.syntax().text_range();
-                let selection_range = match &clause {
-                    FunctionOrMacroClause::FunctionClause(clause) => match clause.name() {
-                        None => range,
-                        Some(name) => name.syntax().text_range(),
-                    },
-                    FunctionOrMacroClause::MacroCallExpr(_) => range,
-                };
-                let symbol = DocumentSymbol {
-                    name: format!("{function_name_no_arity}{clause_name}"),
-                    kind: SymbolKind::Function,
-                    range,
-                    selection_range,
-                    deprecated: self.deprecated,
-                    detail: Some(function_name),
-                    children: None,
-                };
-                children.push(symbol);
+        if self.function_clause_ids.len() > 1 {
+            for clause_id in &self.function_clause_ids {
+                if let Some(function_clause_def) = def_map.function_clauses.get(clause_id)
+                    && let Some(child) = function_clause_def.to_document_symbol(db, def_map)
+                {
+                    children.push(child);
+                }
             }
         }
-        let selection_range = children.first().map_or(range, |c| c.selection_range);
         let children = if !children.is_empty() {
             Some(children)
         } else {
             None
         };
-        DocumentSymbol {
+        let symbol = DocumentSymbol {
             name: self.name.to_string(),
             kind: SymbolKind::Function,
-            range,
-            selection_range,
+            range: self.range(db)?,
+            selection_range: self.name_range(db)?,
             deprecated: self.deprecated,
             detail: None,
             children,
-        }
+        };
+        Some(symbol)
+    }
+}
+
+impl ToDocumentSymbol for FunctionClauseDef {
+    fn to_document_symbol(&self, db: &dyn DefDatabase, def_map: &DefMap) -> Option<DocumentSymbol> {
+        let deprecated = def_map.is_deprecated(&self.function_clause.name);
+        let range = self.range(db);
+        let selection_range = self.name_range(db).unwrap_or(range);
+        let symbol = DocumentSymbol {
+            name: self.label(db),
+            kind: SymbolKind::Function,
+            range,
+            selection_range,
+            deprecated,
+            detail: Some(self.function_clause.name.to_string()),
+            children: None,
+        };
+        Some(symbol)
     }
 }
 
 impl ToDocumentSymbol for TypeAliasDef {
-    fn to_document_symbol(&self, db: &dyn DefDatabase) -> DocumentSymbol {
-        let source = self.source(db.upcast());
-        let range = source.syntax().text_range();
-        let selection_range = match &source.type_name() {
-            None => range,
-            Some(name) => name.syntax().text_range(),
-        };
-        DocumentSymbol {
+    fn to_document_symbol(
+        &self,
+        db: &dyn DefDatabase,
+        _def_map: &DefMap,
+    ) -> Option<DocumentSymbol> {
+        let range = self.range(db)?;
+        let selection_range = self.name_range(db).unwrap_or(range);
+        let symbol = DocumentSymbol {
             name: self.name().to_string(),
             kind: SymbolKind::Type,
             range,
@@ -125,19 +116,20 @@ impl ToDocumentSymbol for TypeAliasDef {
             deprecated: false,
             detail: None,
             children: None,
-        }
+        };
+        Some(symbol)
     }
 }
 
 impl ToDocumentSymbol for RecordDef {
-    fn to_document_symbol(&self, db: &dyn DefDatabase) -> DocumentSymbol {
-        let source = self.source(db.upcast());
-        let range = source.syntax().text_range();
-        let selection_range = match &source.name() {
-            None => range,
-            Some(name) => name.syntax().text_range(),
-        };
-        DocumentSymbol {
+    fn to_document_symbol(
+        &self,
+        db: &dyn DefDatabase,
+        _def_map: &DefMap,
+    ) -> Option<DocumentSymbol> {
+        let range = self.range(db);
+        let selection_range = self.name_range(db).unwrap_or(range);
+        let symbol = DocumentSymbol {
             name: self.record.name.to_string(),
             kind: SymbolKind::Record,
             range,
@@ -145,20 +137,20 @@ impl ToDocumentSymbol for RecordDef {
             deprecated: false,
             detail: None,
             children: None,
-        }
+        };
+        Some(symbol)
     }
 }
 
 impl ToDocumentSymbol for DefineDef {
-    fn to_document_symbol(&self, db: &dyn DefDatabase) -> DocumentSymbol {
-        let source = self.source(db.upcast());
-        let range = source.syntax().text_range();
-        let selection_range = if let Some(lhs) = &source.lhs() {
-            lhs.syntax().text_range()
-        } else {
-            range
-        };
-        DocumentSymbol {
+    fn to_document_symbol(
+        &self,
+        db: &dyn DefDatabase,
+        _def_map: &DefMap,
+    ) -> Option<DocumentSymbol> {
+        let range = self.range(db);
+        let selection_range = self.name_range(db).unwrap_or(range);
+        let symbol = DocumentSymbol {
             name: self.define.name.to_string(),
             kind: SymbolKind::Define,
             range,
@@ -166,7 +158,8 @@ impl ToDocumentSymbol for DefineDef {
             deprecated: false,
             detail: None,
             children: None,
-        }
+        };
+        Some(symbol)
     }
 }
 
@@ -189,21 +182,25 @@ pub(crate) fn document_symbols(db: &RootDatabase, file_id: FileId) -> Vec<Docume
 
     let mut res = Vec::new();
 
-    for (name, def) in def_map.get_functions() {
-        let mut symbol = def.to_document_symbol(db);
-        if def_map.is_deprecated(name) {
-            symbol.deprecated = true;
+    for (_name, def) in def_map.get_functions() {
+        if let Some(symbol) = def.to_document_symbol(db, &def_map) {
+            res.push(symbol);
         }
-        res.push(symbol);
     }
     for def in def_map.get_records().values() {
-        res.push(def.to_document_symbol(db));
+        if let Some(symbol) = def.to_document_symbol(db, &def_map) {
+            res.push(symbol);
+        }
     }
     for def in def_map.get_macros().values() {
-        res.push(def.to_document_symbol(db));
+        if let Some(symbol) = def.to_document_symbol(db, &def_map) {
+            res.push(symbol);
+        }
     }
     for def in def_map.get_types().values() {
-        res.push(def.to_document_symbol(db));
+        if let Some(symbol) = def.to_document_symbol(db, &def_map) {
+            res.push(symbol);
+        }
     }
 
     res.sort_by(|a, b| a.range.start().cmp(&b.range.start()));
@@ -272,25 +269,21 @@ mod tests {
    -define(MEANING_OF_LIFE, 42).
 %%         ^^^^^^^^^^^^^^^ Define | MEANING_OF_LIFE
    -define(MEANING_OF_LIFE(X), X). % You are the owner of your own destiny.
-%%         ^^^^^^^^^^^^^^^^^^ Define | MEANING_OF_LIFE/1
+%%         ^^^^^^^^^^^^^^^ Define | MEANING_OF_LIFE/1
 
    a(_) -> a.
 %% ^ Function | a/1
-%% ^ Function | a(_) | a/1
    b() -> b.
 %% ^ Function | b/0
-%% ^ Function | b() | b/0
 
    c() ->
 %% ^ Function | c/0
-%% ^ Function | c() | c/0
      a(),
      b(),
      ok.
 
    ?MEANING_OF_LIFE(X, Y) ->
 %% ^^^^^^^^^^^^^^^^ Function | [missing name]/2
-%% ^^^^^^^^^^^^^^^^ Function | [missing name](X, Y) | [missing name]/2
      X + Y.
 "#,
         );
@@ -305,10 +298,8 @@ mod tests {
    -deprecated({a, 1}).
    a(_) -> a.
 %% ^ Function | a/1 | deprecated
-%% ^ Function | a(_) | a/1 | deprecated
    b() -> b.
 %% ^ Function | b/0
-%% ^ Function | b() | b/0
 "#,
         );
     }
@@ -327,7 +318,6 @@ mod tests {
 %% ^ Function | a(2) | a/1 | deprecated
    b() -> b.
 %% ^ Function | b/0
-%% ^ Function | b() | b/0
 "#,
         );
     }
@@ -353,7 +343,6 @@ mod tests {
 %%        ^^^^^^^^^^^^ Type | local_type/0
     local_function() -> ok.
 %%  ^^^^^^^^^^^^^^ Function | local_function/0
-%%  ^^^^^^^^^^^^^^ Function | local_function() | local_function/0
 "#,
         );
     }

From 9210506a30f6f7e59054f3f453f37e2ca8931216 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 1 Sep 2025 01:36:32 -0700
Subject: [PATCH 078/394] Bump VS Code extension for imminent release

Summary: As per title.

Reviewed By: jcpetruzza

Differential Revision: D81431127

fbshipit-source-id: 504a9db3b1434ebd80f0c01004d941404bba8199
---
 editors/code/package-lock.json | 4 ++--
 editors/code/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index fa3141f0a2..48f3d8bf01 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "erlang-language-platform",
-  "version": "0.39.0",
+  "version": "0.40.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "erlang-language-platform",
-      "version": "0.39.0",
+      "version": "0.40.0",
       "hasInstallScript": true,
       "license": "Apache2",
       "devDependencies": {
diff --git a/editors/code/package.json b/editors/code/package.json
index 2a1ebe2a29..62f7339aae 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -3,7 +3,7 @@
   "description": "Erlang language server",
   "author": "Meta Platforms, Inc",
   "license": "Apache2",
-  "version": "0.39.0",
+  "version": "0.40.0",
   "icon": "images/elp-logo-color.png",
   "homepage": "https://whatsapp.github.io/erlang-language-platform/",
   "repository": {

From 71b12e9841641d6bb9a84b9d973b1054e3d9921d Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 1 Sep 2025 04:43:58 -0700
Subject: [PATCH 079/394] Show suite code lenses even if all/groups cannot be
 evaluated

Summary:
If the `all/0` and/or `groups/0` function cannot be evaluated, the `ct_info` function returns an error, in which case we don't show any CT code lenses for the module.

This is not necessary, and there's still value in showing the suite-level code lenses (`Run all tests`, `Debug`, `Open REPL`).

Reviewed By: jcpetruzza

Differential Revision: D81325221

fbshipit-source-id: 4e70f0c56426a414ae412f6ddb4f6e4c93a6714d
---
 crates/ide/src/lib.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index 69c039eab8..51bc919b43 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -66,6 +66,8 @@ use elp_syntax::label::Label;
 use elp_types_db::eqwalizer;
 use elp_types_db::eqwalizer::types::Type;
 use expand_macro::ExpandedMacro;
+use fxhash::FxHashMap;
+use fxhash::FxHashSet;
 use handlers::get_docs;
 use handlers::goto_definition;
 use handlers::goto_type_definition;
@@ -726,7 +728,12 @@ impl Analysis {
             CommonTestInfo::Result { all, groups } => {
                 annotations::ct_annotations(db, file_id, all, groups)
             }
-            _ => annotations::annotations(db, file_id),
+            _ => annotations::ct_annotations(
+                db,
+                file_id,
+                &FxHashSet::default(),
+                &FxHashMap::default(),
+            ),
         })
     }
 

From 050a9f878ef76b07c1e9c449c8a90c98e1e87766 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 1 Sep 2025 05:44:01 -0700
Subject: [PATCH 080/394] Test suite debug lens opens an interactive session
 rather than run all tests

Summary:
Historically, each Common Test suite was accompanied by a suite-level "debug" lens, which would run all tests in debug mode.
This is rarely what developers want. Developers would normally debug a testcase at the time, meaning they would use the test-level debug lens instead. Data shows that the suite-level debug lens is only used in 3.8% of the cases ([query](https://fburl.com/scuba/vscode_chronicle_extension_events/cmrdl3k9)).

This diff repurposes the suite-level debug lens to open an interactive debug session instead, without running any test. This makes it more convenient for developers to open a debug shell. The alternative would be to use the generic "debug" button in VS Code, but then they would need to manually load the suite code in the test shell, a counter-intutive workflow.

The "run in repl" lens has also been adjusted to be able to run the lens in a debug shell, if one is available.

Reviewed By: jcpetruzza

Differential Revision: D81436947

fbshipit-source-id: 40ccec14849a59c7083db09783f8f55b76c7747a
---
 crates/elp/src/to_proto.rs  | 35 +++++++++++++++++++++++++++++------
 crates/ide/src/runnables.rs |  2 +-
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/crates/elp/src/to_proto.rs b/crates/elp/src/to_proto.rs
index 1199a64c9c..efb763d442 100644
--- a/crates/elp/src/to_proto.rs
+++ b/crates/elp/src/to_proto.rs
@@ -733,12 +733,24 @@ pub(crate) fn code_lens(
                             });
                         }
                         if lens_config.debug {
-                            let debug_command = command::debug_single(&r, debug_title);
-                            acc.push(lsp_types::CodeLens {
-                                range: annotation_range,
-                                command: Some(debug_command),
-                                data: None,
-                            });
+                            match run.kind {
+                                RunnableKind::Suite { .. } => {
+                                    let debug_command = command::debug_interactive(&r, debug_title);
+                                    acc.push(lsp_types::CodeLens {
+                                        range: annotation_range,
+                                        command: Some(debug_command),
+                                        data: None,
+                                    });
+                                }
+                                RunnableKind::Test { .. } => {
+                                    let debug_command = command::debug_single(&r, debug_title);
+                                    acc.push(lsp_types::CodeLens {
+                                        range: annotation_range,
+                                        command: Some(debug_command),
+                                        data: None,
+                                    });
+                                }
+                            }
                         }
                     }
                 }
@@ -813,6 +825,17 @@ pub(crate) mod command {
         }
     }
 
+    pub(crate) fn debug_interactive(
+        runnable: &lsp_ext::Runnable,
+        title: &str,
+    ) -> lsp_types::Command {
+        lsp_types::Command {
+            title: title.to_string(),
+            command: "elp.debugInteractive".into(),
+            arguments: Some(vec![to_value(runnable).unwrap()]),
+        }
+    }
+
     pub(crate) fn debug_single(runnable: &lsp_ext::Runnable, title: &str) -> lsp_types::Command {
         lsp_types::Command {
             title: title.to_string(),
diff --git a/crates/ide/src/runnables.rs b/crates/ide/src/runnables.rs
index ae82db0960..4b2348f610 100644
--- a/crates/ide/src/runnables.rs
+++ b/crates/ide/src/runnables.rs
@@ -175,7 +175,7 @@ impl Runnable {
                     format!("▶\u{fe0e} Debug (in {name})")
                 }
             },
-            RunnableKind::Suite { .. } => "▶\u{fe0e} Debug".to_string(),
+            RunnableKind::Suite { .. } => "▶\u{fe0e} Open Debug REPL".to_string(),
         }
     }
 }

From 1e496247fbee269b79c887ff29a744bd2ef4f393 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 2 Sep 2025 04:45:26 -0700
Subject: [PATCH 081/394] Be able to override diagnostic severities via config

Summary:
Severity is currently hardcoded by linters and there's no mechanism to override it. This is inconvenient for two reasons:

* Changing the severity for the linter requires an ELP release
* The linting experience cannot be easily customized by the external community

This is a first step towards a more generic linter configuration mechanism for ELP, which will incrementally expanded.
Since this is currently respected only by the linters implementing the `Linter` trait, we keep the feature currently undocumented.

Reviewed By: TD5

Differential Revision: D81443678

fbshipit-source-id: 17783df15cabb0f7c16493a461e457fd214b2bc6
---
 crates/elp/src/bin/lint_cli.rs |   5 ++
 crates/elp/src/lib.rs          |  22 +++++++
 crates/ide/src/diagnostics.rs  | 117 ++++++++++++++++++++++++++++++++-
 3 files changed, 141 insertions(+), 3 deletions(-)

diff --git a/crates/elp/src/bin/lint_cli.rs b/crates/elp/src/bin/lint_cli.rs
index 3b81a8e119..8bfd352a74 100644
--- a/crates/elp/src/bin/lint_cli.rs
+++ b/crates/elp/src/bin/lint_cli.rs
@@ -942,6 +942,7 @@ mod tests {
     use elp_ide::diagnostics::Replacement;
     use expect_test::Expect;
     use expect_test::expect;
+    use fxhash::FxHashMap;
 
     use super::LintConfig;
     use super::do_codemod;
@@ -966,6 +967,7 @@ mod tests {
             },
             enabled_lints: vec![DiagnosticCode::HeadMismatch],
             disabled_lints: vec![],
+            linters: FxHashMap::default(),
         })
         .unwrap();
 
@@ -983,6 +985,8 @@ mod tests {
             [ad_hoc_lints.lints.action]
             action = "Replace"
             type = "UseOk"
+
+            [linters]
         "#]]
         .assert_eq(&result);
     }
@@ -1006,6 +1010,7 @@ mod tests {
                 ad_hoc_lints: LintsFromConfig {
                     lints: [],
                 },
+                linters: {},
             }
         "#]]
         .assert_debug_eq(&lint_config);
diff --git a/crates/elp/src/lib.rs b/crates/elp/src/lib.rs
index caecb2b2f5..a75db798c2 100644
--- a/crates/elp/src/lib.rs
+++ b/crates/elp/src/lib.rs
@@ -164,7 +164,9 @@ mod tests {
     use elp_ide::diagnostics::ReplaceCall;
     use elp_ide::diagnostics::ReplaceCallAction;
     use elp_ide::diagnostics::Replacement;
+    use elp_ide::diagnostics::Severity;
     use expect_test::expect;
+    use fxhash::FxHashMap;
 
     use crate::LintConfig;
 
@@ -187,6 +189,7 @@ mod tests {
                     }),
                 ],
             },
+            linters: FxHashMap::default(),
         };
         expect![[r#"
             enabled_lints = ["W0011"]
@@ -214,6 +217,8 @@ mod tests {
             action = "Replace"
             type = "ArgsPermutation"
             perm = [1, 2]
+
+            [linters]
         "#]]
         .assert_eq(&toml::to_string::<LintConfig>(&lint_config).unwrap());
     }
@@ -227,4 +232,21 @@ mod tests {
         assert_eq!(config.enabled_lints, vec![]);
         assert_eq!(config.disabled_lints, vec![]);
     }
+
+    #[test]
+    fn serde_read_lint_config_linters_overrides() {
+        let content = r#"
+            [linters.no_garbage_collect]
+            severity = "error"
+            "#;
+        let config = toml::from_str::<LintConfig>(content).unwrap();
+        assert_eq!(
+            config
+                .linters
+                .get(&DiagnosticCode::NoGarbageCollect)
+                .unwrap()
+                .severity,
+            Some(Severity::Error)
+        );
+    }
 }
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 6555f95881..5b80b95535 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -727,6 +727,7 @@ pub struct DiagnosticsConfig {
     pub disabled: FxHashSet<DiagnosticCode>,
     pub enabled: EnabledDiagnostics,
     pub lints_from_config: LintsFromConfig,
+    pub lint_config: Option<LintConfig>,
     pub include_generated: bool,
     pub include_suppressed: bool,
     pub include_otp: bool,
@@ -786,6 +787,7 @@ impl DiagnosticsConfig {
             self.enabled = EnabledDiagnostics::from_set(allowed_diagnostics);
         }
         self.lints_from_config = lint_config.ad_hoc_lints.clone();
+        self.lint_config = Some(lint_config.clone());
         self.request_erlang_service_diagnostics = self.request_erlang_service_diagnostics();
         Ok(self)
     }
@@ -850,11 +852,18 @@ impl DiagnosticsConfig {
     }
 }
 
+impl LintConfig {
+    /// Get the severity override for a linter based on its diagnostic code
+    pub fn get_severity_override(&self, diagnostic_code: &DiagnosticCode) -> Option<Severity> {
+        self.linters.get(diagnostic_code)?.severity
+    }
+}
+
 // ---------------------------------------------------------------------
 
 /// Configuration file format for lints. Deserialized from .toml
 /// initially.  But could by anything supported by serde.
-#[derive(Deserialize, Serialize, Default, Debug)]
+#[derive(Deserialize, Serialize, Default, Debug, Clone)]
 pub struct LintConfig {
     #[serde(default)]
     pub enabled_lints: Vec<DiagnosticCode>,
@@ -862,6 +871,49 @@ pub struct LintConfig {
     pub disabled_lints: Vec<DiagnosticCode>,
     #[serde(default)]
     pub ad_hoc_lints: LintsFromConfig,
+    #[serde(default)]
+    pub linters: FxHashMap<DiagnosticCode, LinterConfig>,
+}
+
+/// Configuration for a specific linter that allows overriding default settings
+#[derive(Deserialize, Serialize, Debug, Clone)]
+#[derive(Default)]
+pub struct LinterConfig {
+    pub severity: Option<Severity>,
+}
+
+impl<'de> Deserialize<'de> for Severity {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        let s = String::deserialize(deserializer)?;
+        match s.to_lowercase().as_str() {
+            "error" => Ok(Severity::Error),
+            "warning" => Ok(Severity::Warning),
+            "weak" => Ok(Severity::WeakWarning),
+            "info" => Ok(Severity::Information),
+            _ => Err(serde::de::Error::custom(format!(
+                "Unknown severity: {}. Expected one of: error, warning, info, weak",
+                s
+            ))),
+        }
+    }
+}
+
+impl Serialize for Severity {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        let s = match self {
+            Severity::Error => "error",
+            Severity::Warning => "warning",
+            Severity::WeakWarning => "weak",
+            Severity::Information => "info",
+        };
+        serializer.serialize_str(s)
+    }
 }
 
 // ---------------------------------------------------------------------
@@ -1168,10 +1220,19 @@ fn diagnostics_from_function_call_linters(
                 default_disabled: !linter.is_enabled(),
             };
             if conditions.enabled(config, is_generated, is_test) {
+                // Check if there is a severity override in the config
+                let severity = if let Some(lint_config) = config.lint_config.as_ref() {
+                    lint_config
+                        .get_severity_override(&linter.id())
+                        .unwrap_or_else(|| linter.severity())
+                } else {
+                    linter.severity()
+                };
+
                 let diagnostic_template = DiagnosticTemplate {
                     code: linter.id(),
                     message: linter.description(),
-                    severity: linter.severity(),
+                    severity,
                     with_ignore_fix: linter.can_be_suppressed(),
                     use_range: UseRange::NameOnly,
                 };
@@ -1210,7 +1271,20 @@ fn diagnostics_from_ssr_linters(
                 default_disabled: !linter.is_enabled(),
             };
             if conditions.enabled(config, is_generated, is_test) {
-                res.extend(linter.diagnostics(sema, file_id));
+                let mut diagnostics = linter.diagnostics(sema, file_id);
+
+                // Apply severity overrides for SSR linters
+                if let Some(lint_config) = config.lint_config.as_ref() {
+                    for diagnostic in &mut diagnostics {
+                        if let Some(override_severity) =
+                            lint_config.get_severity_override(&linter.id())
+                        {
+                            diagnostic.severity = override_severity;
+                        }
+                    }
+                }
+
+                res.extend(diagnostics);
             }
         }
     }
@@ -3041,4 +3115,41 @@ baz(1)->4.
             );
         }
     }
+
+    #[test]
+    fn test_linter_severity_override() {
+        let mut lint_config = LintConfig::default();
+        lint_config.linters.insert(
+            DiagnosticCode::NoGarbageCollect,
+            LinterConfig {
+                severity: Some(Severity::Error),
+            },
+        );
+
+        let config = DiagnosticsConfig::default()
+            .configure_diagnostics(
+                &lint_config,
+                &Some("no_garbage_collect".to_string()),
+                &None,
+                FallBackToAll::No,
+            )
+            .unwrap();
+        check_diagnostics_with_config(
+            config,
+            r#"
+            //- /src/main.erl
+            -module(main).
+            -export([error/0]).
+
+            -spec error() -> ok.
+            error() ->
+                erlang:garbage_collect().
+            %%  ^^^^^^^^^^^^^^^^^^^^^^ 💡 error: Avoid forcing garbage collection.
+            //- /opt/lib/stdlib-3.17/src/erlang.erl otp_app:/opt/lib/stdlib-3.17
+            -module(erlang).
+            -export([garbage_collect/0]).
+            garbage_collect() -> ok.
+            "#,
+        );
+    }
 }

From 04ec06feb0f1ac268017dfef7bb577a3c87b1926 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 2 Sep 2025 04:45:26 -0700
Subject: [PATCH 082/394] Be able to override a linter's include_test property
 via config

Summary:
Similarly to D81443678, make the `include_tests` property also configurable.

The duplication between `diagnostics_from_function_call_linters` and `diagnostics_from_ssr_linters` will be addressed separately.

Reviewed By: TD5

Differential Revision: D81449612

fbshipit-source-id: 2c40afd9a4c70092be5a2476f5afffee06789d40
---
 crates/ide/src/diagnostics.rs | 66 +++++++++++++++++++++++++++++++++--
 1 file changed, 64 insertions(+), 2 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 5b80b95535..76ae6a7e62 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -857,6 +857,11 @@ impl LintConfig {
     pub fn get_severity_override(&self, diagnostic_code: &DiagnosticCode) -> Option<Severity> {
         self.linters.get(diagnostic_code)?.severity
     }
+
+    /// Get the include_tests override for a linter based on its diagnostic code
+    pub fn get_include_tests_override(&self, diagnostic_code: &DiagnosticCode) -> Option<bool> {
+        self.linters.get(diagnostic_code)?.include_tests
+    }
 }
 
 // ---------------------------------------------------------------------
@@ -880,6 +885,7 @@ pub struct LintConfig {
 #[derive(Default)]
 pub struct LinterConfig {
     pub severity: Option<Severity>,
+    pub include_tests: Option<bool>,
 }
 
 impl<'de> Deserialize<'de> for Severity {
@@ -1213,10 +1219,19 @@ fn diagnostics_from_function_call_linters(
     let mut specs = Vec::new();
     for linter in linters {
         if linter.should_process_file_id(sema, file_id) {
+            // Check if there is an include_tests override in the config
+            let include_tests = if let Some(lint_config) = config.lint_config.as_ref() {
+                lint_config
+                    .get_include_tests_override(&linter.id())
+                    .unwrap_or_else(|| linter.should_process_test_files())
+            } else {
+                linter.should_process_test_files()
+            };
+
             let conditions = DiagnosticConditions {
                 experimental: linter.is_experimental(),
                 include_generated: linter.should_process_generated_files(),
-                include_tests: linter.should_process_test_files(),
+                include_tests,
                 default_disabled: !linter.is_enabled(),
             };
             if conditions.enabled(config, is_generated, is_test) {
@@ -1264,10 +1279,19 @@ fn diagnostics_from_ssr_linters(
 
     for linter in linters {
         if linter.should_process_file_id(sema, file_id) {
+            // Check if there is an include_tests override in the config
+            let include_tests = if let Some(lint_config) = config.lint_config.as_ref() {
+                lint_config
+                    .get_include_tests_override(&linter.id())
+                    .unwrap_or_else(|| linter.should_process_test_files())
+            } else {
+                linter.should_process_test_files()
+            };
+
             let conditions = DiagnosticConditions {
                 experimental: linter.is_experimental(),
                 include_generated: linter.should_process_generated_files(),
-                include_tests: linter.should_process_test_files(),
+                include_tests,
                 default_disabled: !linter.is_enabled(),
             };
             if conditions.enabled(config, is_generated, is_test) {
@@ -3123,6 +3147,7 @@ baz(1)->4.
             DiagnosticCode::NoGarbageCollect,
             LinterConfig {
                 severity: Some(Severity::Error),
+                include_tests: None,
             },
         );
 
@@ -3152,4 +3177,41 @@ baz(1)->4.
             "#,
         );
     }
+
+    #[test]
+    fn test_linter_include_tests_override() {
+        let mut lint_config = LintConfig::default();
+        lint_config.linters.insert(
+            DiagnosticCode::NoGarbageCollect,
+            LinterConfig {
+                severity: None,
+                include_tests: Some(true),
+            },
+        );
+
+        let config = DiagnosticsConfig::default()
+            .configure_diagnostics(
+                &lint_config,
+                &Some("no_garbage_collect".to_string()),
+                &None,
+                FallBackToAll::No,
+            )
+            .unwrap();
+        check_diagnostics_with_config(
+            config,
+            r#"
+            //- /test/main_SUITE.erl extra:test
+            -module(main_SUITE).
+            -export([warning/0]).
+
+            warning() ->
+                erlang:garbage_collect().
+            %%  ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Avoid forcing garbage collection.
+            //- /opt/lib/stdlib-3.17/src/erlang.erl otp_app:/opt/lib/stdlib-3.17
+            -module(erlang).
+            -export([garbage_collect/0]).
+            garbage_collect() -> ok.
+            "#,
+        );
+    }
 }

From a92b4eea99166d6bd8fd9344ae39a19ec498e80d Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 2 Sep 2025 04:45:26 -0700
Subject: [PATCH 083/394] Be able to override a linter's include_generated
 property via config

Summary: Similarly to the other properties.

Reviewed By: TD5

Differential Revision: D81450512

fbshipit-source-id: 4002024a72d5e6af87583a2502d7f2edf861aaf2
---
 crates/ide/src/diagnostics.rs | 73 ++++++++++++++++++++++++++++++++++-
 1 file changed, 71 insertions(+), 2 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 76ae6a7e62..ef1f95e514 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -862,6 +862,11 @@ impl LintConfig {
     pub fn get_include_tests_override(&self, diagnostic_code: &DiagnosticCode) -> Option<bool> {
         self.linters.get(diagnostic_code)?.include_tests
     }
+
+    /// Get the include_generated override for a linter based on its diagnostic code
+    pub fn get_include_generated_override(&self, diagnostic_code: &DiagnosticCode) -> Option<bool> {
+        self.linters.get(diagnostic_code)?.include_generated
+    }
 }
 
 // ---------------------------------------------------------------------
@@ -886,6 +891,7 @@ pub struct LintConfig {
 pub struct LinterConfig {
     pub severity: Option<Severity>,
     pub include_tests: Option<bool>,
+    pub include_generated: Option<bool>,
 }
 
 impl<'de> Deserialize<'de> for Severity {
@@ -1228,9 +1234,18 @@ fn diagnostics_from_function_call_linters(
                 linter.should_process_test_files()
             };
 
+            // Check if there is an include_generated override in the config
+            let include_generated = if let Some(lint_config) = config.lint_config.as_ref() {
+                lint_config
+                    .get_include_generated_override(&linter.id())
+                    .unwrap_or_else(|| linter.should_process_generated_files())
+            } else {
+                linter.should_process_generated_files()
+            };
+
             let conditions = DiagnosticConditions {
                 experimental: linter.is_experimental(),
-                include_generated: linter.should_process_generated_files(),
+                include_generated,
                 include_tests,
                 default_disabled: !linter.is_enabled(),
             };
@@ -1288,9 +1303,18 @@ fn diagnostics_from_ssr_linters(
                 linter.should_process_test_files()
             };
 
+            // Check if there is an include_generated override in the config
+            let include_generated = if let Some(lint_config) = config.lint_config.as_ref() {
+                lint_config
+                    .get_include_generated_override(&linter.id())
+                    .unwrap_or_else(|| linter.should_process_generated_files())
+            } else {
+                linter.should_process_generated_files()
+            };
+
             let conditions = DiagnosticConditions {
                 experimental: linter.is_experimental(),
-                include_generated: linter.should_process_generated_files(),
+                include_generated,
                 include_tests,
                 default_disabled: !linter.is_enabled(),
             };
@@ -3148,6 +3172,7 @@ baz(1)->4.
             LinterConfig {
                 severity: Some(Severity::Error),
                 include_tests: None,
+                include_generated: None,
             },
         );
 
@@ -3186,6 +3211,7 @@ baz(1)->4.
             LinterConfig {
                 severity: None,
                 include_tests: Some(true),
+                include_generated: None,
             },
         );
 
@@ -3214,4 +3240,47 @@ baz(1)->4.
             "#,
         );
     }
+
+    #[test]
+    fn test_linter_include_generated_override() {
+        let mut lint_config = LintConfig::default();
+        lint_config.linters.insert(
+            DiagnosticCode::NoGarbageCollect,
+            LinterConfig {
+                severity: None,
+                include_tests: None,
+                include_generated: Some(true),
+            },
+        );
+
+        let config = DiagnosticsConfig::default()
+            .configure_diagnostics(
+                &lint_config,
+                &Some("no_garbage_collect".to_string()),
+                &None,
+                FallBackToAll::No,
+            )
+            .unwrap()
+            .set_include_generated(true);
+        check_diagnostics_with_config(
+            config,
+            &format!(
+                r#"
+            //- /src/main.erl
+            % @{}
+            -module(main).
+            -export([warning/0]).
+
+            warning() ->
+                erlang:garbage_collect().
+            %%  ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Avoid forcing garbage collection.
+            //- /opt/lib/stdlib-3.17/src/erlang.erl otp_app:/opt/lib/stdlib-3.17
+            -module(erlang).
+            -export([garbage_collect/0]).
+            garbage_collect() -> ok.
+            "#,
+                "generated" // Separate string, to avoid to mark this module itself as generated
+            ),
+        );
+    }
 }

From 6dbb64aa35ddede43d2e9362d8b0a34e65634417 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 2 Sep 2025 04:45:26 -0700
Subject: [PATCH 084/394] Be able to override a linter's experimental property
 via config

Summary: Be able to override the `experimental` property of a linter via config.

Reviewed By: TD5

Differential Revision: D81450739

fbshipit-source-id: c18b449249d48fc089709d17a5d6b1c1560db6f3
---
 crates/ide/src/diagnostics.rs | 79 +++++++++++++++++++++++++++++++----
 1 file changed, 72 insertions(+), 7 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index ef1f95e514..a3756dd8c3 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -867,6 +867,11 @@ impl LintConfig {
     pub fn get_include_generated_override(&self, diagnostic_code: &DiagnosticCode) -> Option<bool> {
         self.linters.get(diagnostic_code)?.include_generated
     }
+
+    /// Get the experimental override for a linter based on its diagnostic code
+    pub fn get_experimental_override(&self, diagnostic_code: &DiagnosticCode) -> Option<bool> {
+        self.linters.get(diagnostic_code)?.experimental
+    }
 }
 
 // ---------------------------------------------------------------------
@@ -892,6 +897,7 @@ pub struct LinterConfig {
     pub severity: Option<Severity>,
     pub include_tests: Option<bool>,
     pub include_generated: Option<bool>,
+    pub experimental: Option<bool>,
 }
 
 impl<'de> Deserialize<'de> for Severity {
@@ -1243,8 +1249,17 @@ fn diagnostics_from_function_call_linters(
                 linter.should_process_generated_files()
             };
 
+            // Check if there is an experimental override in the config
+            let experimental = if let Some(lint_config) = config.lint_config.as_ref() {
+                lint_config
+                    .get_experimental_override(&linter.id())
+                    .unwrap_or_else(|| linter.is_experimental())
+            } else {
+                linter.is_experimental()
+            };
+
             let conditions = DiagnosticConditions {
-                experimental: linter.is_experimental(),
+                experimental,
                 include_generated,
                 include_tests,
                 default_disabled: !linter.is_enabled(),
@@ -1312,8 +1327,17 @@ fn diagnostics_from_ssr_linters(
                 linter.should_process_generated_files()
             };
 
+            // Check if there is an experimental override in the config
+            let experimental = if let Some(lint_config) = config.lint_config.as_ref() {
+                lint_config
+                    .get_experimental_override(&linter.id())
+                    .unwrap_or_else(|| linter.is_experimental())
+            } else {
+                linter.is_experimental()
+            };
+
             let conditions = DiagnosticConditions {
-                experimental: linter.is_experimental(),
+                experimental,
                 include_generated,
                 include_tests,
                 default_disabled: !linter.is_enabled(),
@@ -3173,6 +3197,7 @@ baz(1)->4.
                 severity: Some(Severity::Error),
                 include_tests: None,
                 include_generated: None,
+                experimental: None,
             },
         );
 
@@ -3212,6 +3237,7 @@ baz(1)->4.
                 severity: None,
                 include_tests: Some(true),
                 include_generated: None,
+                experimental: None,
             },
         );
 
@@ -3250,6 +3276,7 @@ baz(1)->4.
                 severity: None,
                 include_tests: None,
                 include_generated: Some(true),
+                experimental: None,
             },
         );
 
@@ -3264,11 +3291,9 @@ baz(1)->4.
             .set_include_generated(true);
         check_diagnostics_with_config(
             config,
-            &format!(
-                r#"
-            //- /src/main.erl
-            % @{}
-            -module(main).
+            r#"
+            //- /src/main_generated.erl extra:generated
+            -module(main_generated).
             -export([warning/0]).
 
             warning() ->
@@ -3278,6 +3303,46 @@ baz(1)->4.
             -module(erlang).
             -export([garbage_collect/0]).
             garbage_collect() -> ok.
+            "#,
+        );
+    }
+
+    #[test]
+    fn test_linter_experimental_override() {
+        let mut lint_config = LintConfig::default();
+        lint_config.linters.insert(
+            DiagnosticCode::NoGarbageCollect,
+            LinterConfig {
+                severity: None,
+                include_tests: None,
+                include_generated: None,
+                experimental: Some(true),
+            },
+        );
+
+        let config = DiagnosticsConfig::default()
+            .configure_diagnostics(
+                &lint_config,
+                &Some("no_garbage_collect".to_string()),
+                &None,
+                FallBackToAll::No,
+            )
+            .unwrap();
+        check_diagnostics_with_config(
+            config,
+            &format!(
+                r#"
+            //- /src/main.erl
+            % @{}
+            -module(main).
+            -export([warning/0]).
+
+            warning() ->
+                erlang:garbage_collect().
+            //- /opt/lib/stdlib-3.17/src/erlang.erl otp_app:/opt/lib/stdlib-3.17
+            -module(erlang).
+            -export([garbage_collect/0]).
+            garbage_collect() -> ok.
             "#,
                 "generated" // Separate string, to avoid to mark this module itself as generated
             ),

From 2d8c4a03cfcf91aafcde317a9b445e886f774c3a Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 2 Sep 2025 04:45:26 -0700
Subject: [PATCH 085/394] Avoid duplication to extract linter conditions

Summary:
Start removing the duplication for handling different types of linters. Here we extract the conditions calculations into a helper function.
This will be further simplified later.

Reviewed By: TD5

Differential Revision: D81474341

fbshipit-source-id: b69796d6d36533e48c2ae3fff0783613be3535d6
---
 crates/ide/src/diagnostics.rs | 98 ++++++++++++-----------------------
 1 file changed, 32 insertions(+), 66 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index a3756dd8c3..6f47fff98d 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -537,6 +537,36 @@ pub(crate) trait Linter {
     }
 }
 
+fn conditions(linter: &dyn Linter, config: &DiagnosticsConfig) -> DiagnosticConditions {
+    let include_tests = if let Some(lint_config) = config.lint_config.as_ref() {
+        lint_config
+            .get_include_tests_override(&linter.id())
+            .unwrap_or_else(|| linter.should_process_test_files())
+    } else {
+        linter.should_process_test_files()
+    };
+    let include_generated = if let Some(lint_config) = config.lint_config.as_ref() {
+        lint_config
+            .get_include_generated_override(&linter.id())
+            .unwrap_or_else(|| linter.should_process_generated_files())
+    } else {
+        linter.should_process_generated_files()
+    };
+    let experimental = if let Some(lint_config) = config.lint_config.as_ref() {
+        lint_config
+            .get_experimental_override(&linter.id())
+            .unwrap_or_else(|| linter.is_experimental())
+    } else {
+        linter.is_experimental()
+    };
+    DiagnosticConditions {
+        experimental,
+        include_generated,
+        include_tests,
+        default_disabled: !linter.is_enabled(),
+    }
+}
+
 // A trait that simplifies writing linters matching function calls
 pub(crate) trait FunctionCallLinter: Linter {
     // Specify the list of functions the linter should emit issues for
@@ -1231,39 +1261,7 @@ fn diagnostics_from_function_call_linters(
     let mut specs = Vec::new();
     for linter in linters {
         if linter.should_process_file_id(sema, file_id) {
-            // Check if there is an include_tests override in the config
-            let include_tests = if let Some(lint_config) = config.lint_config.as_ref() {
-                lint_config
-                    .get_include_tests_override(&linter.id())
-                    .unwrap_or_else(|| linter.should_process_test_files())
-            } else {
-                linter.should_process_test_files()
-            };
-
-            // Check if there is an include_generated override in the config
-            let include_generated = if let Some(lint_config) = config.lint_config.as_ref() {
-                lint_config
-                    .get_include_generated_override(&linter.id())
-                    .unwrap_or_else(|| linter.should_process_generated_files())
-            } else {
-                linter.should_process_generated_files()
-            };
-
-            // Check if there is an experimental override in the config
-            let experimental = if let Some(lint_config) = config.lint_config.as_ref() {
-                lint_config
-                    .get_experimental_override(&linter.id())
-                    .unwrap_or_else(|| linter.is_experimental())
-            } else {
-                linter.is_experimental()
-            };
-
-            let conditions = DiagnosticConditions {
-                experimental,
-                include_generated,
-                include_tests,
-                default_disabled: !linter.is_enabled(),
-            };
+            let conditions = conditions(linter, config);
             if conditions.enabled(config, is_generated, is_test) {
                 // Check if there is a severity override in the config
                 let severity = if let Some(lint_config) = config.lint_config.as_ref() {
@@ -1309,39 +1307,7 @@ fn diagnostics_from_ssr_linters(
 
     for linter in linters {
         if linter.should_process_file_id(sema, file_id) {
-            // Check if there is an include_tests override in the config
-            let include_tests = if let Some(lint_config) = config.lint_config.as_ref() {
-                lint_config
-                    .get_include_tests_override(&linter.id())
-                    .unwrap_or_else(|| linter.should_process_test_files())
-            } else {
-                linter.should_process_test_files()
-            };
-
-            // Check if there is an include_generated override in the config
-            let include_generated = if let Some(lint_config) = config.lint_config.as_ref() {
-                lint_config
-                    .get_include_generated_override(&linter.id())
-                    .unwrap_or_else(|| linter.should_process_generated_files())
-            } else {
-                linter.should_process_generated_files()
-            };
-
-            // Check if there is an experimental override in the config
-            let experimental = if let Some(lint_config) = config.lint_config.as_ref() {
-                lint_config
-                    .get_experimental_override(&linter.id())
-                    .unwrap_or_else(|| linter.is_experimental())
-            } else {
-                linter.is_experimental()
-            };
-
-            let conditions = DiagnosticConditions {
-                experimental,
-                include_generated,
-                include_tests,
-                default_disabled: !linter.is_enabled(),
-            };
+            let conditions = conditions(linter, config);
             if conditions.enabled(config, is_generated, is_test) {
                 let mut diagnostics = linter.diagnostics(sema, file_id);
 

From be360da10e31d1f0ec17644f04b00c2110940727 Mon Sep 17 00:00:00 2001
From: Tom Davies <tomdavies@meta.com>
Date: Wed, 3 Sep 2025 04:10:11 -0700
Subject: [PATCH 086/394] Fix wording in W0030 diagnostic docs (dedicated
 `maps:put/3` syntax)

Summary:
Fixes broken wording in the docs.

Created from CodeHub with https://fburl.com/edit-in-codehub

Reviewed By: jcpetruzza

Differential Revision: D81518020

fbshipit-source-id: d34f487ff1a21e07d32560f732c69bc77f5fe715
---
 website/docs/erlang-error-index/w/W0030.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/docs/erlang-error-index/w/W0030.md b/website/docs/erlang-error-index/w/W0030.md
index 252e7169b9..cc8f981d1b 100644
--- a/website/docs/erlang-error-index/w/W0030.md
+++ b/website/docs/erlang-error-index/w/W0030.md
@@ -24,7 +24,7 @@ the map update syntax directly.
 If the keys are constants known at compile-time, using the map update syntax
 with the `=>` operator is more efficient than multiple calls to `maps:put/3`,
 especially for small maps. This implies than using the `=>` operator should
-making future additions to the code also both performant and clear.
+make future additions to the code both more performant and more clear.
 
 To fix the issue, use the built-in `Map#{Key => Value}` syntax to insert the
 `Key` and `Value` into the `Map`:

From 43614330fa2fc25c513da1091f72b75fe2ea9853 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 3 Sep 2025 10:07:47 -0700
Subject: [PATCH 087/394] Avoid duplication in treating function / ssr linters

Summary: Merge the processing of FunctionCallLinters / SSrLinters into a single function, avoid code duplication.

Reviewed By: TD5

Differential Revision: D81474340

fbshipit-source-id: 87df4ed02248bf16c8fe0bfc537fb9b05cdd44a3
---
 crates/ide/src/diagnostics.rs | 173 ++++++++++++++++------------------
 1 file changed, 80 insertions(+), 93 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 6f47fff98d..f939d73af2 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -537,7 +537,12 @@ pub(crate) trait Linter {
     }
 }
 
-fn conditions(linter: &dyn Linter, config: &DiagnosticsConfig) -> DiagnosticConditions {
+fn should_run(
+    linter: &dyn Linter,
+    config: &DiagnosticsConfig,
+    is_generated: bool,
+    is_test: bool,
+) -> bool {
     let include_tests = if let Some(lint_config) = config.lint_config.as_ref() {
         lint_config
             .get_include_tests_override(&linter.id())
@@ -559,12 +564,13 @@ fn conditions(linter: &dyn Linter, config: &DiagnosticsConfig) -> DiagnosticCond
     } else {
         linter.is_experimental()
     };
-    DiagnosticConditions {
+    let conditions = DiagnosticConditions {
         experimental,
         include_generated,
         include_tests,
         default_disabled: !linter.is_enabled(),
-    }
+    };
+    conditions.enabled(config, is_generated, is_test)
 }
 
 // A trait that simplifies writing linters matching function calls
@@ -634,11 +640,11 @@ pub(crate) trait SsrPatternsLinter: Linter {
 // we define a blanket implementation for all the methods using the `Context``,
 // to keep the code generic while allowing individual linters to specify their own context type.
 pub(crate) trait SsrCheckPatterns: Linter {
-    fn diagnostics(&self, sema: &Semantic, file_id: FileId) -> Vec<Diagnostic>;
+    fn diagnostics(&self, sema: &Semantic, file_id: FileId, severity: Severity) -> Vec<Diagnostic>;
 }
 
 impl<T: SsrPatternsLinter> SsrCheckPatterns for T {
-    fn diagnostics(&self, sema: &Semantic, file_id: FileId) -> Vec<Diagnostic> {
+    fn diagnostics(&self, sema: &Semantic, file_id: FileId, severity: Severity) -> Vec<Diagnostic> {
         let mut res = Vec::new();
         for (pattern, context) in self.patterns() {
             let matches = match_pattern_in_file_functions(sema, self.strategy(), file_id, &pattern);
@@ -650,7 +656,7 @@ impl<T: SsrPatternsLinter> SsrCheckPatterns for T {
                     let mut d = Diagnostic::new(self.id(), message, matched.range.range)
                         .with_fixes(fixes)
                         .add_categories(categories)
-                        .with_severity(self.severity());
+                        .with_severity(severity);
                     if self.can_be_suppressed() {
                         d = d.with_ignore_fix(sema, file_id);
                     }
@@ -1106,14 +1112,7 @@ pub fn native_diagnostics(
             config,
             &diagnostics_descriptors(),
         );
-        diagnostics_from_function_call_linters(
-            &mut res,
-            &sema,
-            file_id,
-            config,
-            function_call_linters(),
-        );
-        diagnostics_from_ssr_linters(&mut res, &sema, file_id, config, ssr_linters());
+        diagnostics_from_linters(&mut res, &sema, file_id, config, linters());
 
         let parse_diagnostics = parse.errors().iter().take(128).map(|err| {
             let (code, message) = match err {
@@ -1224,33 +1223,47 @@ pub fn diagnostics_from_descriptors(
     });
 }
 
-/// Registry for function call linters that enables single AST traversal
-pub(crate) fn function_call_linters() -> Vec<&'static dyn FunctionCallLinter> {
-    let mut linters: Vec<&'static dyn FunctionCallLinter> = vec![
-        &sets_version_2::LINTER,
-        &no_garbage_collect::LINTER,
-        &no_size::LINTER,
-        &no_error_logger::LINTER,
+/// Enum to represent either type of linter for unified processing
+pub(crate) enum DiagnosticLinter {
+    FunctionCall(&'static dyn FunctionCallLinter),
+    SsrPatterns(&'static dyn SsrCheckPatterns),
+}
+
+impl DiagnosticLinter {
+    fn as_linter(&self) -> &dyn Linter {
+        match self {
+            DiagnosticLinter::FunctionCall(linter) => *linter,
+            DiagnosticLinter::SsrPatterns(linter) => *linter,
+        }
+    }
+}
+
+/// Unified registry for all types of linters
+pub(crate) fn linters() -> Vec<DiagnosticLinter> {
+    let mut all_linters = vec![
+        // Function call linters
+        DiagnosticLinter::FunctionCall(&sets_version_2::LINTER),
+        DiagnosticLinter::FunctionCall(&no_garbage_collect::LINTER),
+        DiagnosticLinter::FunctionCall(&no_size::LINTER),
+        DiagnosticLinter::FunctionCall(&no_error_logger::LINTER),
+        // SSR linters
+        DiagnosticLinter::SsrPatterns(&unnecessary_fold_to_build_map::LINTER),
+        DiagnosticLinter::SsrPatterns(&binary_string_to_sigil::LINTER),
+        DiagnosticLinter::SsrPatterns(&unnecessary_map_to_list_in_comprehension::LINTER),
     ];
+
+    // Add meta-only linters
     // @fb-only
-    linters
+
+    all_linters
 }
 
-/// Registry for SSR-based linters
-pub(crate) fn ssr_linters() -> Vec<&'static dyn SsrCheckPatterns> {
-    vec![
-        &unnecessary_fold_to_build_map::LINTER,
-        &binary_string_to_sigil::LINTER,
-        &unnecessary_map_to_list_in_comprehension::LINTER,
-    ]
-}
-
-fn diagnostics_from_function_call_linters(
+fn diagnostics_from_linters(
     res: &mut Vec<Diagnostic>,
     sema: &Semantic,
     file_id: FileId,
     config: &DiagnosticsConfig,
-    linters: Vec<&'static dyn FunctionCallLinter>,
+    linters: Vec<DiagnosticLinter>,
 ) {
     let is_generated = sema.db.is_generated(file_id);
     let is_test = sema
@@ -1259,75 +1272,49 @@ fn diagnostics_from_function_call_linters(
         .unwrap_or(false);
 
     let mut specs = Vec::new();
-    for linter in linters {
-        if linter.should_process_file_id(sema, file_id) {
-            let conditions = conditions(linter, config);
-            if conditions.enabled(config, is_generated, is_test) {
-                // Check if there is a severity override in the config
-                let severity = if let Some(lint_config) = config.lint_config.as_ref() {
-                    lint_config
-                        .get_severity_override(&linter.id())
-                        .unwrap_or_else(|| linter.severity())
-                } else {
-                    linter.severity()
-                };
 
-                let diagnostic_template = DiagnosticTemplate {
-                    code: linter.id(),
-                    message: linter.description(),
-                    severity,
-                    with_ignore_fix: linter.can_be_suppressed(),
-                    use_range: UseRange::NameOnly,
-                };
-                let spec = vec![FunctionCallDiagnostic {
-                    diagnostic_template,
-                    matches: linter.matches_functions(),
-                }];
-                specs.extend(spec);
+    for l in linters {
+        let linter = l.as_linter();
+        let code = linter.id();
+        if linter.should_process_file_id(sema, file_id)
+            && should_run(linter, config, is_generated, is_test)
+        {
+            let severity = if let Some(lint_config) = config.lint_config.as_ref() {
+                lint_config
+                    .get_severity_override(&linter.id())
+                    .unwrap_or_else(|| linter.severity())
+            } else {
+                linter.severity()
+            };
+            match l {
+                DiagnosticLinter::FunctionCall(function_linter) => {
+                    let diagnostic_template = DiagnosticTemplate {
+                        code,
+                        message: linter.description(),
+                        severity,
+                        with_ignore_fix: linter.can_be_suppressed(),
+                        use_range: UseRange::NameOnly,
+                    };
+                    let spec = vec![FunctionCallDiagnostic {
+                        diagnostic_template,
+                        matches: function_linter.matches_functions(),
+                    }];
+                    specs.extend(spec);
+                }
+                DiagnosticLinter::SsrPatterns(ssr_linter) => {
+                    let diagnostics = ssr_linter.diagnostics(sema, file_id, severity);
+                    res.extend(diagnostics);
+                }
             }
         }
     }
+
+    // Handle function call linters specs
     if !specs.is_empty() {
         check_used_functions(sema, file_id, &specs, res);
     }
 }
 
-fn diagnostics_from_ssr_linters(
-    res: &mut Vec<Diagnostic>,
-    sema: &Semantic,
-    file_id: FileId,
-    config: &DiagnosticsConfig,
-    linters: Vec<&'static dyn SsrCheckPatterns>,
-) {
-    let is_generated = sema.db.is_generated(file_id);
-    let is_test = sema
-        .db
-        .is_test_suite_or_test_helper(file_id)
-        .unwrap_or(false);
-
-    for linter in linters {
-        if linter.should_process_file_id(sema, file_id) {
-            let conditions = conditions(linter, config);
-            if conditions.enabled(config, is_generated, is_test) {
-                let mut diagnostics = linter.diagnostics(sema, file_id);
-
-                // Apply severity overrides for SSR linters
-                if let Some(lint_config) = config.lint_config.as_ref() {
-                    for diagnostic in &mut diagnostics {
-                        if let Some(override_severity) =
-                            lint_config.get_severity_override(&linter.id())
-                        {
-                            diagnostic.severity = override_severity;
-                        }
-                    }
-                }
-
-                res.extend(diagnostics);
-            }
-        }
-    }
-}
-
 fn label_syntax_errors(
     source_file: &SourceFile,
     diagnostics: impl Iterator<Item = Diagnostic>,

From 2d6afacd9271e2c69ecfd36bb3c541cad3f8facb Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 3 Sep 2025 10:07:47 -0700
Subject: [PATCH 088/394] Allowing specifying a custom cli_severity/override

Summary: The property will be later used by some of the linters (e.g `debugging_functions`).

Reviewed By: TD5

Differential Revision: D81481377

fbshipit-source-id: d1cf925f63dea74a2ef42b1bed8b13de27b32e97
---
 crates/ide/src/diagnostics.rs         | 34 +++++++++++++++++++++++----
 crates/ide/src/diagnostics/helpers.rs |  5 +++-
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index f939d73af2..15d1a8e241 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -506,6 +506,11 @@ pub(crate) trait Linter {
         Severity::Warning
     }
 
+    // For CLI, when using the --use-cli-severity flag. It defaults to `severity()`
+    fn cli_severity(&self) -> Severity {
+        self.severity()
+    }
+
     // Specify if the linter issues can be suppressed via a `% elp:ignore` comment.
     fn can_be_suppressed(&self) -> bool {
         true
@@ -640,11 +645,23 @@ pub(crate) trait SsrPatternsLinter: Linter {
 // we define a blanket implementation for all the methods using the `Context``,
 // to keep the code generic while allowing individual linters to specify their own context type.
 pub(crate) trait SsrCheckPatterns: Linter {
-    fn diagnostics(&self, sema: &Semantic, file_id: FileId, severity: Severity) -> Vec<Diagnostic>;
+    fn diagnostics(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+        severity: Severity,
+        cli_severity: Severity,
+    ) -> Vec<Diagnostic>;
 }
 
 impl<T: SsrPatternsLinter> SsrCheckPatterns for T {
-    fn diagnostics(&self, sema: &Semantic, file_id: FileId, severity: Severity) -> Vec<Diagnostic> {
+    fn diagnostics(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+        severity: Severity,
+        cli_severity: Severity,
+    ) -> Vec<Diagnostic> {
         let mut res = Vec::new();
         for (pattern, context) in self.patterns() {
             let matches = match_pattern_in_file_functions(sema, self.strategy(), file_id, &pattern);
@@ -656,7 +673,8 @@ impl<T: SsrPatternsLinter> SsrCheckPatterns for T {
                     let mut d = Diagnostic::new(self.id(), message, matched.range.range)
                         .with_fixes(fixes)
                         .add_categories(categories)
-                        .with_severity(severity);
+                        .with_severity(severity)
+                        .with_cli_severity(cli_severity);
                     if self.can_be_suppressed() {
                         d = d.with_ignore_fix(sema, file_id);
                     }
@@ -1286,12 +1304,20 @@ fn diagnostics_from_linters(
             } else {
                 linter.severity()
             };
+            let cli_severity = if let Some(lint_config) = config.lint_config.as_ref() {
+                lint_config
+                    .get_severity_override(&linter.id())
+                    .unwrap_or_else(|| linter.cli_severity())
+            } else {
+                linter.cli_severity()
+            };
             match l {
                 DiagnosticLinter::FunctionCall(function_linter) => {
                     let diagnostic_template = DiagnosticTemplate {
                         code,
                         message: linter.description(),
                         severity,
+                        cli_severity,
                         with_ignore_fix: linter.can_be_suppressed(),
                         use_range: UseRange::NameOnly,
                     };
@@ -1302,7 +1328,7 @@ fn diagnostics_from_linters(
                     specs.extend(spec);
                 }
                 DiagnosticLinter::SsrPatterns(ssr_linter) => {
-                    let diagnostics = ssr_linter.diagnostics(sema, file_id, severity);
+                    let diagnostics = ssr_linter.diagnostics(sema, file_id, severity, cli_severity);
                     res.extend(diagnostics);
                 }
             }
diff --git a/crates/ide/src/diagnostics/helpers.rs b/crates/ide/src/diagnostics/helpers.rs
index ebfdd79ad1..566410fd53 100644
--- a/crates/ide/src/diagnostics/helpers.rs
+++ b/crates/ide/src/diagnostics/helpers.rs
@@ -29,6 +29,7 @@ pub(crate) struct DiagnosticTemplate {
     pub(crate) code: DiagnosticCode,
     pub(crate) message: String,
     pub(crate) severity: Severity,
+    pub(crate) cli_severity: Severity,
     pub(crate) with_ignore_fix: bool,
     pub(crate) use_range: UseRange,
 }
@@ -77,7 +78,8 @@ pub(crate) fn check_function_with_diagnostic_template(
             let range = ctx.range(&extra.use_range);
             if range.file_id == def.file.file_id {
                 let diag = Diagnostic::new(extra.code.clone(), extra.message.clone(), range.range)
-                    .with_severity(extra.severity);
+                    .with_severity(extra.severity)
+                    .with_cli_severity(extra.cli_severity);
                 let diag = if extra.with_ignore_fix {
                     diag.with_ignore_fix(sema, def_fb.file_id())
                 } else {
@@ -130,6 +132,7 @@ mod tests {
                             code: DiagnosticCode::AdHoc("a code".to_string()),
                             message: "diagnostic message".to_string(),
                             severity: Severity::Warning,
+                            cli_severity: Severity::Warning,
                             with_ignore_fix: true,
                             use_range: UseRange::WithArgs,
                         },

From 2dc5420836a2e2a536fc5f6d22183205c2cbbdc0 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 3 Sep 2025 10:07:47 -0700
Subject: [PATCH 089/394] Support custom fixes in FunctionCallLinter trait

Summary:
Allow instances of the `FunctionCallLinter` trait to implement two new custom methods:

* `is_valid_match`
* `fixes`

The first one, given the *call context* allows to validate each match and return a linter-specific context which is passed around to the other functions.

The `fixes` method allows a linter to specify custom fixes. It receives the context produced by the `is_valid_match` method as part of the *match context*.

The `debugging_function` is then converted to use the new approach, becoming much simpler.

The templating mechanism from the `helpers` module is totally gone, and replaced by the new trait-based one.

There's one performance implication: when the `FunctionCallLinter` trait was introduced, we started collecting "specs" and performing a fold only once. While this approach was convenient, it would have made implementing this new functionality a lot more complicated. Instead, I propose we sacrifice the extra folds (after all, that was state of the world before traits) for the time being. This brings the function call linters closer to the SSR-based ones. Then we can think of a different approach for folding/visiting.

Reviewed By: jcpetruzza

Differential Revision: D81516582

fbshipit-source-id: 6b9dd28b91eb272a670c5bf8679660c600c8611a
---
 crates/ide/src/diagnostics.rs                 | 125 +++++++++----
 .../ide/src/diagnostics/debugging_function.rs | 168 +++++++-----------
 crates/ide/src/diagnostics/helpers.rs         | 156 ----------------
 crates/ide/src/diagnostics/no_error_logger.rs |   2 +
 .../ide/src/diagnostics/no_garbage_collect.rs |   2 +
 crates/ide/src/diagnostics/no_size.rs         |   2 +
 crates/ide/src/diagnostics/sets_version_2.rs  |   2 +
 7 files changed, 163 insertions(+), 294 deletions(-)
 delete mode 100644 crates/ide/src/diagnostics/helpers.rs

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 15d1a8e241..adeaae41a7 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -79,11 +79,11 @@ use serde::Serialize;
 use crate::FunctionMatch;
 use crate::RootDatabase;
 use crate::SourceDatabase;
+use crate::codemod_helpers::CheckCallCtx;
+use crate::codemod_helpers::MatchCtx;
 use crate::codemod_helpers::UseRange;
+use crate::codemod_helpers::find_call_in_function;
 use crate::common_test;
-use crate::diagnostics::helpers::DiagnosticTemplate;
-use crate::diagnostics::helpers::FunctionCallDiagnostic;
-use crate::diagnostics::helpers::check_used_functions;
 
 mod application_env;
 mod atoms_exhaustion;
@@ -101,7 +101,6 @@ mod eqwalizer_assists;
 mod expression_can_be_simplified;
 mod from_config;
 mod head_mismatch;
-mod helpers;
 mod inefficient_enumerate;
 mod inefficient_flatlength;
 mod inefficient_last;
@@ -580,10 +579,87 @@ fn should_run(
 
 // A trait that simplifies writing linters matching function calls
 pub(crate) trait FunctionCallLinter: Linter {
+    /// Associated type - each linter defines its own
+    type Context: Clone + fmt::Debug + PartialEq + Default;
+
     // Specify the list of functions the linter should emit issues for
     fn matches_functions(&self) -> Vec<FunctionMatch> {
         vec![]
     }
+
+    // Custom check for the function call. Returning None for a given call skips processing.
+    // By default all calls are included.
+    // The callback returns a function that can be used in subsequent callbacks.
+    fn is_match_valid(&self, _check_call_context: &CheckCallCtx<'_, ()>) -> Option<Self::Context> {
+        Some(Self::Context::default())
+    }
+
+    /// Return an optional vector of quick-fixes
+    fn fixes(
+        &self,
+        _match_context: &MatchCtx<Self::Context>,
+        _sema: &Semantic,
+        _file_id: FileId,
+    ) -> Option<Vec<Assist>> {
+        None
+    }
+}
+
+// Instances of the FunctionCallLinter trait can specify a custom `Context` type,
+// which is passed around in callbacks.
+// To be able to keep a registry of all linters we define a blanket implementation for all the methods using the `Context`,
+// to keep the code generic while allowing individual linters to specify their own context type.
+pub(crate) trait FunctionCallDiagnostics: Linter {
+    fn diagnostics(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+        severity: Severity,
+        cli_severity: Severity,
+    ) -> Vec<Diagnostic>;
+}
+
+impl<T: FunctionCallLinter> FunctionCallDiagnostics for T {
+    fn diagnostics(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+        severity: Severity,
+        cli_severity: Severity,
+    ) -> Vec<Diagnostic> {
+        let mut diagnostics = Vec::new();
+        let matches = self.matches_functions();
+        let mfas: Vec<(&FunctionMatch, ())> = matches.iter().map(|m| (m, ())).collect();
+        sema.def_map_local(file_id)
+            .get_functions()
+            .for_each(|(_, def)| {
+                find_call_in_function(
+                    &mut diagnostics,
+                    sema,
+                    def,
+                    &mfas,
+                    &move |ctx| self.is_match_valid(&ctx),
+                    &move |ctx @ MatchCtx { sema, def_fb, .. }| {
+                        let range = ctx.range(&UseRange::NameOnly);
+                        if range.file_id == def.file.file_id {
+                            let fixes = self.fixes(&ctx, sema, file_id);
+                            let mut diag =
+                                Diagnostic::new(self.id(), self.description(), range.range)
+                                    .with_fixes(fixes)
+                                    .with_severity(severity)
+                                    .with_cli_severity(cli_severity);
+                            if self.can_be_suppressed() {
+                                diag = diag.with_ignore_fix(sema, def_fb.file_id());
+                            };
+                            Some(diag)
+                        } else {
+                            None
+                        }
+                    },
+                );
+            });
+        diagnostics
+    }
 }
 
 /// A trait that simplifies writing linters using SSR patterns
@@ -639,12 +715,11 @@ pub(crate) trait SsrPatternsLinter: Linter {
     }
 }
 
-// Instances of the SsrCheckPatternsLinter trait can specify a custom `Context` type,
-// which is passed around in callbacks.\
-// To be able to keep a registry of all linters in the `ssr_linters` function,
-// we define a blanket implementation for all the methods using the `Context``,
+// Instances of the SsrPatternsLinter trait can specify a custom `Context` type,
+// which is passed around in callbacks.
+// To be able to keep a registry of all linters we define a blanket implementation for all the methods using the `Context`,
 // to keep the code generic while allowing individual linters to specify their own context type.
-pub(crate) trait SsrCheckPatterns: Linter {
+pub(crate) trait SsrPatternsDiagnostics: Linter {
     fn diagnostics(
         &self,
         sema: &Semantic,
@@ -654,7 +729,7 @@ pub(crate) trait SsrCheckPatterns: Linter {
     ) -> Vec<Diagnostic>;
 }
 
-impl<T: SsrPatternsLinter> SsrCheckPatterns for T {
+impl<T: SsrPatternsLinter> SsrPatternsDiagnostics for T {
     fn diagnostics(
         &self,
         sema: &Semantic,
@@ -1200,7 +1275,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &edoc::DESCRIPTOR,
         &macro_precedence_suprise::DESCRIPTOR,
         &undocumented_function::DESCRIPTOR,
-        &debugging_function::DESCRIPTOR,
         &duplicate_module::DESCRIPTOR,
         &undocumented_module::DESCRIPTOR,
         &no_dialyzer_attribute::DESCRIPTOR,
@@ -1243,8 +1317,8 @@ pub fn diagnostics_from_descriptors(
 
 /// Enum to represent either type of linter for unified processing
 pub(crate) enum DiagnosticLinter {
-    FunctionCall(&'static dyn FunctionCallLinter),
-    SsrPatterns(&'static dyn SsrCheckPatterns),
+    FunctionCall(&'static dyn FunctionCallDiagnostics),
+    SsrPatterns(&'static dyn SsrPatternsDiagnostics),
 }
 
 impl DiagnosticLinter {
@@ -1264,6 +1338,7 @@ pub(crate) fn linters() -> Vec<DiagnosticLinter> {
         DiagnosticLinter::FunctionCall(&no_garbage_collect::LINTER),
         DiagnosticLinter::FunctionCall(&no_size::LINTER),
         DiagnosticLinter::FunctionCall(&no_error_logger::LINTER),
+        DiagnosticLinter::FunctionCall(&debugging_function::LINTER),
         // SSR linters
         DiagnosticLinter::SsrPatterns(&unnecessary_fold_to_build_map::LINTER),
         DiagnosticLinter::SsrPatterns(&binary_string_to_sigil::LINTER),
@@ -1289,11 +1364,8 @@ fn diagnostics_from_linters(
         .is_test_suite_or_test_helper(file_id)
         .unwrap_or(false);
 
-    let mut specs = Vec::new();
-
     for l in linters {
         let linter = l.as_linter();
-        let code = linter.id();
         if linter.should_process_file_id(sema, file_id)
             && should_run(linter, config, is_generated, is_test)
         {
@@ -1313,19 +1385,9 @@ fn diagnostics_from_linters(
             };
             match l {
                 DiagnosticLinter::FunctionCall(function_linter) => {
-                    let diagnostic_template = DiagnosticTemplate {
-                        code,
-                        message: linter.description(),
-                        severity,
-                        cli_severity,
-                        with_ignore_fix: linter.can_be_suppressed(),
-                        use_range: UseRange::NameOnly,
-                    };
-                    let spec = vec![FunctionCallDiagnostic {
-                        diagnostic_template,
-                        matches: function_linter.matches_functions(),
-                    }];
-                    specs.extend(spec);
+                    let diagnostics =
+                        function_linter.diagnostics(sema, file_id, severity, cli_severity);
+                    res.extend(diagnostics);
                 }
                 DiagnosticLinter::SsrPatterns(ssr_linter) => {
                     let diagnostics = ssr_linter.diagnostics(sema, file_id, severity, cli_severity);
@@ -1334,11 +1396,6 @@ fn diagnostics_from_linters(
             }
         }
     }
-
-    // Handle function call linters specs
-    if !specs.is_empty() {
-        check_used_functions(sema, file_id, &specs, res);
-    }
 }
 
 fn label_syntax_errors(
diff --git a/crates/ide/src/diagnostics/debugging_function.rs b/crates/ide/src/diagnostics/debugging_function.rs
index a658ee9561..83cbc4efa3 100644
--- a/crates/ide/src/diagnostics/debugging_function.rs
+++ b/crates/ide/src/diagnostics/debugging_function.rs
@@ -10,129 +10,90 @@
 
 use elp_ide_assists::Assist;
 use elp_ide_db::elp_base_db::FileId;
-use elp_ide_db::elp_base_db::FileRange;
 use elp_ide_db::source_change::SourceChangeBuilder;
 use elp_text_edit::TextRange;
-use hir::FunctionDef;
 use hir::Semantic;
-use lazy_static::lazy_static;
 
 use crate::FunctionMatch;
 use crate::codemod_helpers::CheckCallCtx;
 use crate::codemod_helpers::MatchCtx;
-use crate::codemod_helpers::find_call_in_function;
 use crate::codemod_helpers::statement_range;
-use crate::diagnostics::Diagnostic;
 use crate::diagnostics::DiagnosticCode;
-use crate::diagnostics::DiagnosticConditions;
-use crate::diagnostics::DiagnosticDescriptor;
+use crate::diagnostics::FunctionCallLinter;
+use crate::diagnostics::Linter;
 use crate::diagnostics::Severity;
+use crate::diagnostics::meta_only;
 // @fb-only
 
-const DIAGNOSTIC_CODE: DiagnosticCode = DiagnosticCode::DebuggingFunction;
-const DIAGNOSTIC_MESSAGE: &str = "Debugging functions should only be used during local debugging and usages should not be checked in.";
-const DIAGNOSTIC_SEVERITY: Severity = Severity::WeakWarning; // For IDE
-const DIAGNOSTIC_CLI_SEVERITY: Severity = Severity::Error; // For CLI, when using the --use-cli-severity flag
-const REMOVE_FIX_ID: &str = "remove_invocation";
-const REMOVE_FIX_LABEL: &str = "Remove invocation";
+pub(crate) struct NoDebuggingFunctionLinter;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: true,
-        include_tests: true,
-        default_disabled: false,
-    },
-    checker: &|diags, sema, file_id, _ext| {
-        debugging_functions(diags, sema, file_id);
-    },
-};
-
-fn debugging_functions(diagnostics: &mut Vec<Diagnostic>, sema: &Semantic, file_id: FileId) {
-    lazy_static! {
-        static ref BAD_CALLS: Vec<FunctionMatch> =
-            vec![FunctionMatch::m("redbug"),]
-            .into_iter()
-            // @fb-only
-            .collect();
-        static ref BAD_CALLS_MFAS: Vec<(&'static FunctionMatch, ())> = BAD_CALLS
-            .iter()
-            .map(|matcher| (matcher, ()))
-            .collect::<Vec<_>>();
+impl Linter for NoDebuggingFunctionLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::DebuggingFunction
     }
-
-    sema.def_map_local(file_id)
-        .get_functions()
-        .for_each(|(_arity, def)| {
-            check_function(diagnostics, sema, def, &BAD_CALLS_MFAS, file_id);
-        });
-}
-
-fn check_function(
-    diags: &mut Vec<Diagnostic>,
-    sema: &Semantic,
-    def: &FunctionDef,
-    mfas: &[(&FunctionMatch, ())],
-    file_id: FileId,
-) {
-    let source_file = sema.parse(file_id);
-    find_call_in_function(
-        diags,
-        sema,
-        def,
-        mfas,
-        &move |CheckCallCtx { parents, .. }: CheckCallCtx<'_, ()>| {
-            let call_expr_id = parents.last().cloned();
-            Some(call_expr_id)
-        },
-        &move |MatchCtx {
-                   sema,
-                   range_surface_mf,
-                   def_fb,
-                   extra,
-                   ..
-               }| {
-            if let Some(hir::fold::ParentId::HirIdx(hir_idx)) = &extra {
-                if let Some(expr_id) = hir_idx.as_expr_id() {
-                    let body_map = def_fb.get_body_map();
-                    let in_file_ast_ptr = body_map.expr(expr_id)?;
-                    let expr_ast = in_file_ast_ptr.to_node(&source_file)?;
-                    let range = statement_range(&expr_ast);
-                    make_diagnostic(sema, def.file.file_id, range_surface_mf, range)
-                } else {
-                    None
-                }
-            } else {
-                None
-            }
-        },
-    );
-}
-
-fn make_diagnostic(
-    sema: &Semantic,
-    file_id: FileId,
-    range_mf_only: Option<FileRange>,
-    range: TextRange,
-) -> Option<Diagnostic> {
-    let range_mf_only = range_mf_only?;
-    if range_mf_only.file_id == file_id {
-        let diagnostic = Diagnostic::new(DIAGNOSTIC_CODE, DIAGNOSTIC_MESSAGE, range_mf_only.range)
-            .with_severity(DIAGNOSTIC_SEVERITY)
-            .with_cli_severity(DIAGNOSTIC_CLI_SEVERITY)
-            .with_fixes(Some(vec![remove_fix(file_id, range)]))
-            .with_ignore_fix(sema, file_id);
-        Some(diagnostic)
-    } else {
-        None
+    fn description(&self) -> String {
+        "Debugging functions should only be used during local debugging and usages should not be checked in.".to_string()
+    }
+    fn severity(&self) -> Severity {
+        Severity::WeakWarning
+    }
+    fn cli_severity(&self) -> Severity {
+        Severity::Error
+    }
+    fn should_process_generated_files(&self) -> bool {
+        true
     }
 }
 
+impl FunctionCallLinter for NoDebuggingFunctionLinter {
+    type Context = Option<hir::fold::ParentId>;
+
+    fn matches_functions(&self) -> Vec<FunctionMatch> {
+        lazy_function_matches![
+            vec![FunctionMatch::m("redbug")]
+                .into_iter()
+                // @fb-only
+                .collect::<Vec<_>>()
+        ]
+    }
+
+    fn is_match_valid(&self, context: &CheckCallCtx<'_, ()>) -> Option<Self::Context> {
+        let call_expr_id = context.parents.last().cloned();
+        Some(call_expr_id)
+    }
+
+    fn fixes(
+        &self,
+        match_context: &MatchCtx<Self::Context>,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<Assist>> {
+        let source_file = sema.parse(file_id);
+        if let Some(hir::fold::ParentId::HirIdx(hir_idx)) = &match_context.extra {
+            let expr_id = hir_idx.as_expr_id()?;
+            let body_map = match_context.def_fb.get_body_map();
+            let in_file_ast_ptr = body_map.expr(expr_id)?;
+            let expr_ast = in_file_ast_ptr.to_node(&source_file)?;
+            let range = statement_range(&expr_ast);
+            Some(vec![remove_fix(file_id, range)])
+        } else {
+            None
+        }
+    }
+}
+
+pub static LINTER: NoDebuggingFunctionLinter = NoDebuggingFunctionLinter;
+
 fn remove_fix(file_id: FileId, range: TextRange) -> Assist {
     let mut builder = SourceChangeBuilder::new(file_id);
     builder.delete(range);
     let source_change = builder.finish();
-    crate::fix(REMOVE_FIX_ID, REMOVE_FIX_LABEL, source_change, range)
+    crate::fix(
+        "remove_invocation",
+        "Remove invocation",
+        source_change,
+        range,
+    )
 }
 
 #[cfg(test)]
@@ -140,7 +101,6 @@ mod tests {
 
     use expect_test::expect;
 
-    use crate::diagnostics::debugging_function::REMOVE_FIX_LABEL;
     use crate::tests;
 
     #[test]
@@ -223,7 +183,7 @@ main() ->
     #[test]
     fn test_redbug_remove_fix() {
         tests::check_specific_fix(
-            REMOVE_FIX_LABEL,
+            "Remove invocation",
             r#"
 //- /src/main.erl
 -module(main).
diff --git a/crates/ide/src/diagnostics/helpers.rs b/crates/ide/src/diagnostics/helpers.rs
deleted file mode 100644
index 566410fd53..0000000000
--- a/crates/ide/src/diagnostics/helpers.rs
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is dual-licensed under either the MIT license found in the
- * LICENSE-MIT file in the root directory of this source tree or the Apache
- * License, Version 2.0 found in the LICENSE-APACHE file in the root directory
- * of this source tree. You may select, at your option, one of the
- * above-listed licenses.
- */
-
-//! Helpers for writing diagnostics
-
-use elp_ide_db::DiagnosticCode;
-use elp_ide_db::elp_base_db::FileId;
-use hir::FunctionDef;
-use hir::Semantic;
-
-use super::Diagnostic;
-use super::Severity;
-use crate::FunctionMatch;
-use crate::codemod_helpers::MatchCtx;
-use crate::codemod_helpers::UseRange;
-use crate::codemod_helpers::find_call_in_function;
-
-// ---------------------------------------------------------------------
-
-#[derive(Debug)]
-pub(crate) struct DiagnosticTemplate {
-    pub(crate) code: DiagnosticCode,
-    pub(crate) message: String,
-    pub(crate) severity: Severity,
-    pub(crate) cli_severity: Severity,
-    pub(crate) with_ignore_fix: bool,
-    pub(crate) use_range: UseRange,
-}
-
-/// Define a checker for a function that should not be used. Generate
-/// a diagnostic according to the template if it is found.
-#[derive(Debug)]
-pub(crate) struct FunctionCallDiagnostic {
-    pub(crate) diagnostic_template: DiagnosticTemplate,
-    pub(crate) matches: Vec<FunctionMatch>,
-}
-
-pub(crate) fn check_used_functions(
-    sema: &Semantic,
-    file_id: FileId,
-    used_functions: &[FunctionCallDiagnostic],
-    diags: &mut Vec<Diagnostic>,
-) {
-    let mfas: Vec<(&FunctionMatch, &DiagnosticTemplate)> = used_functions
-        .iter()
-        .flat_map(|u| u.matches.iter().map(|m| (m, &u.diagnostic_template)))
-        .collect();
-    sema.def_map_local(file_id)
-        .get_functions()
-        .for_each(|(_, def)| check_function_with_diagnostic_template(diags, sema, def, &mfas));
-}
-
-pub(crate) fn check_function_with_diagnostic_template(
-    diags: &mut Vec<Diagnostic>,
-    sema: &Semantic,
-    def: &FunctionDef,
-    mfas: &[(&FunctionMatch, &DiagnosticTemplate)],
-) {
-    find_call_in_function(
-        diags,
-        sema,
-        def,
-        mfas,
-        &move |ctx| Some(*ctx.t),
-        &move |ctx @ MatchCtx {
-                   sema,
-                   def_fb,
-                   extra,
-                   ..
-               }: MatchCtx<'_, &DiagnosticTemplate>| {
-            let range = ctx.range(&extra.use_range);
-            if range.file_id == def.file.file_id {
-                let diag = Diagnostic::new(extra.code.clone(), extra.message.clone(), range.range)
-                    .with_severity(extra.severity)
-                    .with_cli_severity(extra.cli_severity);
-                let diag = if extra.with_ignore_fix {
-                    diag.with_ignore_fix(sema, def_fb.file_id())
-                } else {
-                    diag
-                };
-                Some(diag)
-            } else {
-                None
-            }
-        },
-    );
-}
-
-// ---------------------------------------------------------------------
-
-#[cfg(test)]
-mod tests {
-    use elp_ide_db::DiagnosticCode;
-
-    use super::DiagnosticTemplate;
-    use super::FunctionCallDiagnostic;
-    use super::check_used_functions;
-    use crate::FunctionMatch;
-    use crate::codemod_helpers::UseRange;
-    use crate::diagnostics::AdhocSemanticDiagnostics;
-    use crate::diagnostics::DiagnosticsConfig;
-    use crate::diagnostics::Severity;
-    use crate::tests::check_diagnostics_with_config_and_ad_hoc;
-
-    #[track_caller]
-    pub(crate) fn check_diagnostics_with_ad_hoc_semantics(
-        ad_hoc_semantic_diagnostics: Vec<&dyn AdhocSemanticDiagnostics>,
-        fixture: &str,
-    ) {
-        let config = DiagnosticsConfig::default()
-            .set_experimental(true)
-            .disable(DiagnosticCode::UndefinedFunction);
-        check_diagnostics_with_config_and_ad_hoc(config, &ad_hoc_semantic_diagnostics, fixture)
-    }
-
-    #[test]
-    fn unused_function() {
-        check_diagnostics_with_ad_hoc_semantics(
-            vec![&|acc, sema, file_id, _ext| {
-                check_used_functions(
-                    sema,
-                    file_id,
-                    &[FunctionCallDiagnostic {
-                        diagnostic_template: DiagnosticTemplate {
-                            code: DiagnosticCode::AdHoc("a code".to_string()),
-                            message: "diagnostic message".to_string(),
-                            severity: Severity::Warning,
-                            cli_severity: Severity::Warning,
-                            with_ignore_fix: true,
-                            use_range: UseRange::WithArgs,
-                        },
-                        matches: vec![FunctionMatch::mfas("main", "foo", vec![0])]
-                            .into_iter()
-                            .flatten()
-                            .collect(),
-                    }],
-                    acc,
-                );
-            }],
-            r#"
-             -module(main).
-             -export([foo/0]).
-             foo() -> main:foo().
-             %%       ^^^^^^^^^^ 💡 warning: diagnostic message
-
-            "#,
-        )
-    }
-}
diff --git a/crates/ide/src/diagnostics/no_error_logger.rs b/crates/ide/src/diagnostics/no_error_logger.rs
index c0f348c387..d1a0da221a 100644
--- a/crates/ide/src/diagnostics/no_error_logger.rs
+++ b/crates/ide/src/diagnostics/no_error_logger.rs
@@ -29,6 +29,8 @@ impl Linter for NoErrorLoggerLinter {
 }
 
 impl FunctionCallLinter for NoErrorLoggerLinter {
+    type Context = ();
+
     fn matches_functions(&self) -> Vec<FunctionMatch> {
         crate::lazy_function_matches![vec![FunctionMatch::m("error_logger")]]
     }
diff --git a/crates/ide/src/diagnostics/no_garbage_collect.rs b/crates/ide/src/diagnostics/no_garbage_collect.rs
index f9eed8e6d6..af2d74e3ee 100644
--- a/crates/ide/src/diagnostics/no_garbage_collect.rs
+++ b/crates/ide/src/diagnostics/no_garbage_collect.rs
@@ -29,6 +29,8 @@ impl Linter for NoGarbageCollectLinter {
 }
 
 impl FunctionCallLinter for NoGarbageCollectLinter {
+    type Context = ();
+
     fn matches_functions(&self) -> Vec<FunctionMatch> {
         lazy_function_matches![vec![FunctionMatch::mf("erlang", "garbage_collect")]]
     }
diff --git a/crates/ide/src/diagnostics/no_size.rs b/crates/ide/src/diagnostics/no_size.rs
index c89d8f3404..5524a3655f 100644
--- a/crates/ide/src/diagnostics/no_size.rs
+++ b/crates/ide/src/diagnostics/no_size.rs
@@ -29,6 +29,8 @@ impl Linter for NoSizeLinter {
 }
 
 impl FunctionCallLinter for NoSizeLinter {
+    type Context = ();
+
     fn matches_functions(&self) -> Vec<FunctionMatch> {
         lazy_function_matches![vec![FunctionMatch::mfa("erlang", "size", 1)]]
     }
diff --git a/crates/ide/src/diagnostics/sets_version_2.rs b/crates/ide/src/diagnostics/sets_version_2.rs
index ccbd95db9e..44a228d717 100644
--- a/crates/ide/src/diagnostics/sets_version_2.rs
+++ b/crates/ide/src/diagnostics/sets_version_2.rs
@@ -29,6 +29,8 @@ impl Linter for SetsVersion2Linter {
 }
 
 impl FunctionCallLinter for SetsVersion2Linter {
+    type Context = ();
+
     fn matches_functions(&self) -> Vec<FunctionMatch> {
         lazy_function_matches![
             FunctionMatch::mfas("sets", "new", vec![0]),

From 26c8c3058a468e82b6d55bf408bb958749f9a5b0 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 3 Sep 2025 10:07:47 -0700
Subject: [PATCH 090/394] Convert atoms exhaustion linter to use the
 FunctionCallLinter trait

Summary:
Convert the `atoms_exhaustion` linter to use the `Linter` trait.
To enable this, ensures `sema` is available in the `is_match_valid` method.

Reviewed By: jcpetruzza

Differential Revision: D81589208

fbshipit-source-id: a41788a0d5979737550749b007f3d7b2d9413b3f
---
 crates/ide/src/diagnostics.rs                 |  10 +-
 .../ide/src/diagnostics/atoms_exhaustion.rs   | 156 +++++++-----------
 .../ide/src/diagnostics/debugging_function.rs |   6 +-
 3 files changed, 75 insertions(+), 97 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index adeaae41a7..8e6c641def 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -590,7 +590,11 @@ pub(crate) trait FunctionCallLinter: Linter {
     // Custom check for the function call. Returning None for a given call skips processing.
     // By default all calls are included.
     // The callback returns a function that can be used in subsequent callbacks.
-    fn is_match_valid(&self, _check_call_context: &CheckCallCtx<'_, ()>) -> Option<Self::Context> {
+    fn is_match_valid(
+        &self,
+        _check_call_context: &CheckCallCtx<'_, ()>,
+        _sema: &Semantic,
+    ) -> Option<Self::Context> {
         Some(Self::Context::default())
     }
 
@@ -638,7 +642,7 @@ impl<T: FunctionCallLinter> FunctionCallDiagnostics for T {
                     sema,
                     def,
                     &mfas,
-                    &move |ctx| self.is_match_valid(&ctx),
+                    &move |ctx| self.is_match_valid(&ctx, sema),
                     &move |ctx @ MatchCtx { sema, def_fb, .. }| {
                         let range = ctx.range(&UseRange::NameOnly);
                         if range.file_id == def.file.file_id {
@@ -1268,7 +1272,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &head_mismatch::DESCRIPTOR_SEMANTIC,
         &missing_separator::DESCRIPTOR,
         &cross_node_eval::DESCRIPTOR,
-        &atoms_exhaustion::DESCRIPTOR,
         &boolean_precedence::DESCRIPTOR,
         &record_tuple_match::DESCRIPTOR,
         &unspecific_include::DESCRIPTOR,
@@ -1339,6 +1342,7 @@ pub(crate) fn linters() -> Vec<DiagnosticLinter> {
         DiagnosticLinter::FunctionCall(&no_size::LINTER),
         DiagnosticLinter::FunctionCall(&no_error_logger::LINTER),
         DiagnosticLinter::FunctionCall(&debugging_function::LINTER),
+        DiagnosticLinter::FunctionCall(&atoms_exhaustion::LINTER),
         // SSR linters
         DiagnosticLinter::SsrPatterns(&unnecessary_fold_to_build_map::LINTER),
         DiagnosticLinter::SsrPatterns(&binary_string_to_sigil::LINTER),
diff --git a/crates/ide/src/diagnostics/atoms_exhaustion.rs b/crates/ide/src/diagnostics/atoms_exhaustion.rs
index b83ad2a387..8249eef757 100644
--- a/crates/ide/src/diagnostics/atoms_exhaustion.rs
+++ b/crates/ide/src/diagnostics/atoms_exhaustion.rs
@@ -9,112 +9,82 @@
  */
 
 use elp_ide_db::elp_base_db::FileId;
-use elp_text_edit::TextRange;
-use hir::FunctionDef;
 use hir::Semantic;
-use lazy_static::lazy_static;
 
-use super::DiagnosticConditions;
-use super::DiagnosticDescriptor;
 use crate::FunctionMatch;
-use crate::codemod_helpers::MatchCtx;
-use crate::codemod_helpers::find_call_in_function;
+use crate::codemod_helpers::CheckCallCtx;
 // @fb-only
-use crate::diagnostics::Diagnostic;
 use crate::diagnostics::DiagnosticCode;
-use crate::diagnostics::Severity;
+use crate::diagnostics::FunctionCallLinter;
+use crate::diagnostics::Linter;
+use crate::lazy_function_matches;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: true,
-        include_tests: false,
-        default_disabled: false,
-    },
-    checker: &|diags, sema, file_id, _ext| {
-        atoms_exhaustion(diags, sema, file_id);
-    },
-};
+pub(crate) struct AtomsExhaustionLinter;
 
-fn atoms_exhaustion(diagnostics: &mut Vec<Diagnostic>, sema: &Semantic, file_id: FileId) {
-    lazy_static! {
-        static ref BAD_CALLS: Vec<FunctionMatch> = vec![
-            FunctionMatch::mfa("erlang", "binary_to_atom", 1),
-            FunctionMatch::mfa("erlang", "binary_to_atom", 2),
-            FunctionMatch::mfa("erlang", "list_to_atom", 1),
-            // T187850479: Make it configurable
-            // FunctionMatch::mfa("erlang", "binary_to_term", 1),
-            // FunctionMatch::mfa("erlang", "binary_to_term", 2),
-        ]
-        .into_iter()
+impl Linter for AtomsExhaustionLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::AtomsExhaustion
+    }
+    fn description(&self) -> String {
+        "Risk of atoms exhaustion.".to_string()
+    }
+    fn should_process_generated_files(&self) -> bool {
+        true
+    }
+    fn should_process_test_files(&self) -> bool {
+        false
+    }
+    fn should_process_file_id(&self, sema: &Semantic, file_id: FileId) -> bool {
         // @fb-only
-        .collect();
+        true // @oss-only
+    }
+}
 
-        static ref BAD_CALLS_MFAS: Vec<(&'static FunctionMatch, ())> = BAD_CALLS
-            .iter()
-            .map(|matcher| (matcher, ()))
-            .collect::<Vec<_>>();
+impl FunctionCallLinter for AtomsExhaustionLinter {
+    type Context = ();
+
+    fn matches_functions(&self) -> Vec<FunctionMatch> {
+        lazy_function_matches![
+            vec![
+                FunctionMatch::mfa("erlang", "binary_to_atom", 1),
+                FunctionMatch::mfa("erlang", "binary_to_atom", 2),
+                FunctionMatch::mfa("erlang", "list_to_atom", 1),
+                // T187850479: Make it configurable
+                // FunctionMatch::mfa("erlang", "binary_to_term", 1),
+                // FunctionMatch::mfa("erlang", "binary_to_term", 2),
+            ]
+            .into_iter()
+            // @fb-only
+            .collect::<Vec<_>>()
+        ]
     }
 
-    sema.def_map_local(file_id)
-        .get_functions()
-        .for_each(|(_arity, def)| {
+    fn is_match_valid(
+        &self,
+        context: &CheckCallCtx<'_, ()>,
+        sema: &Semantic,
+    ) -> Option<Self::Context> {
+        // @fb-only
             // @fb-only
-            let is_relevant = true; // @oss-only
-            if is_relevant {
-                check_function(diagnostics, sema, def, &BAD_CALLS_MFAS);
-            }
-        });
-}
-
-fn check_function(
-    diags: &mut Vec<Diagnostic>,
-    sema: &Semantic,
-    def: &FunctionDef,
-    mfas: &[(&FunctionMatch, ())],
-) {
-    #[rustfmt::skip]
-    find_call_in_function(
-        diags,
-        sema,
-        def,
-        mfas,
-        &move |ctx| {
-            // @fb-only
-                // @fb-only
-            let is_safe = false; // @oss-only
-            if !is_safe {
-                match ctx.args.as_vec()[..] {
-                    [_, options] => {
-                        let body = ctx.in_clause.body();
-                        match &body[options].literal_list_contains_atom(ctx.in_clause, "safe") {
-                            Some(true) => None,
-                            _ => Some(("".to_string(), "".to_string())),
-                        }
+        let is_safe = false; // @oss-only
+        if !is_safe {
+            match context.args.as_vec()[..] {
+                [_, options] => {
+                    let body = context.in_clause.body();
+                    match &body[options].literal_list_contains_atom(context.in_clause, "safe") {
+                        Some(true) => None,
+                        _ => Some(()),
                     }
-                    _ => Some(("".to_string(), "".to_string())),
                 }
-            } else {
-                None
+                _ => Some(()),
             }
-        },
-        &move |MatchCtx { sema, range, .. }| {
-            if range.file_id == def.file.file_id {
-                let diag = make_diagnostic(sema, def.file.file_id, range.range);
-                Some(diag)
-            } else {
-                None
-            }
-        },
-    );
+        } else {
+            None
+        }
+    }
 }
 
-fn make_diagnostic(sema: &Semantic, file_id: FileId, range: TextRange) -> Diagnostic {
-    let message = "Risk of atoms exhaustion.".to_string();
-    Diagnostic::new(DiagnosticCode::AtomsExhaustion, message, range)
-        .with_severity(Severity::Warning)
-        .with_ignore_fix(sema, file_id)
-}
+pub static LINTER: AtomsExhaustionLinter = AtomsExhaustionLinter;
 
 #[cfg(test)]
 mod tests {
@@ -130,9 +100,9 @@ mod tests {
    -export([main/0]).
    main() ->
      erlang:list_to_atom(foo),
-%%   ^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Risk of atoms exhaustion.
+%%   ^^^^^^^^^^^^^^^^^^^ 💡 warning: Risk of atoms exhaustion.
      list_to_atom(foo).
-%%   ^^^^^^^^^^^^^^^^^ 💡 warning: Risk of atoms exhaustion.
+%%   ^^^^^^^^^^^^ 💡 warning: Risk of atoms exhaustion.
 
 //- /opt/lib/stdlib-3.17/src/erlang.erl otp_app:/opt/lib/stdlib-3.17
    -module(erlang).
@@ -151,9 +121,9 @@ mod tests {
    -export([main/0]).
    main() ->
      erlang:binary_to_atom(foo),
-%%   ^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Risk of atoms exhaustion.
+%%   ^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Risk of atoms exhaustion.
      binary_to_atom(foo).
-%%   ^^^^^^^^^^^^^^^^^^^ 💡 warning: Risk of atoms exhaustion.
+%%   ^^^^^^^^^^^^^^ 💡 warning: Risk of atoms exhaustion.
 
 //- /opt/lib/stdlib-3.17/src/erlang.erl otp_app:/opt/lib/stdlib-3.17
    -module(erlang).
diff --git a/crates/ide/src/diagnostics/debugging_function.rs b/crates/ide/src/diagnostics/debugging_function.rs
index 83cbc4efa3..6f72cc4f2d 100644
--- a/crates/ide/src/diagnostics/debugging_function.rs
+++ b/crates/ide/src/diagnostics/debugging_function.rs
@@ -57,7 +57,11 @@ impl FunctionCallLinter for NoDebuggingFunctionLinter {
         ]
     }
 
-    fn is_match_valid(&self, context: &CheckCallCtx<'_, ()>) -> Option<Self::Context> {
+    fn is_match_valid(
+        &self,
+        context: &CheckCallCtx<'_, ()>,
+        _sema: &Semantic,
+    ) -> Option<Self::Context> {
         let call_expr_id = context.parents.last().cloned();
         Some(call_expr_id)
     }

From 3caae9249caa5e3daf69ae8eba60d3125a52ab13 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 4 Sep 2025 01:04:33 -0700
Subject: [PATCH 091/394] Refactor definition of linters

Summary: Clearer definition of linters.

Reviewed By: jcpetruzza, TD5

Differential Revision: D81589873

fbshipit-source-id: b8ee681fce7dd834759eedde69e1b893f03c0052
---
 crates/ide/src/diagnostics.rs | 45 +++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 8e6c641def..5e65ca5f45 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1333,21 +1333,40 @@ impl DiagnosticLinter {
     }
 }
 
+/// Function call linters that detect issues in function calls
+const FUNCTION_CALL_LINTERS: &[&dyn FunctionCallDiagnostics] = &[
+    &sets_version_2::LINTER,
+    &no_garbage_collect::LINTER,
+    &no_size::LINTER,
+    &no_error_logger::LINTER,
+    &debugging_function::LINTER,
+    &atoms_exhaustion::LINTER,
+];
+
+/// SSR pattern linters that use structural search and replace patterns
+const SSR_PATTERN_LINTERS: &[&dyn SsrPatternsDiagnostics] = &[
+    &unnecessary_fold_to_build_map::LINTER,
+    &binary_string_to_sigil::LINTER,
+    &unnecessary_map_to_list_in_comprehension::LINTER,
+];
+
 /// Unified registry for all types of linters
 pub(crate) fn linters() -> Vec<DiagnosticLinter> {
-    let mut all_linters = vec![
-        // Function call linters
-        DiagnosticLinter::FunctionCall(&sets_version_2::LINTER),
-        DiagnosticLinter::FunctionCall(&no_garbage_collect::LINTER),
-        DiagnosticLinter::FunctionCall(&no_size::LINTER),
-        DiagnosticLinter::FunctionCall(&no_error_logger::LINTER),
-        DiagnosticLinter::FunctionCall(&debugging_function::LINTER),
-        DiagnosticLinter::FunctionCall(&atoms_exhaustion::LINTER),
-        // SSR linters
-        DiagnosticLinter::SsrPatterns(&unnecessary_fold_to_build_map::LINTER),
-        DiagnosticLinter::SsrPatterns(&binary_string_to_sigil::LINTER),
-        DiagnosticLinter::SsrPatterns(&unnecessary_map_to_list_in_comprehension::LINTER),
-    ];
+    let mut all_linters = Vec::new();
+
+    // Add function call linters
+    all_linters.extend(
+        FUNCTION_CALL_LINTERS
+            .iter()
+            .map(|linter| DiagnosticLinter::FunctionCall(*linter)),
+    );
+
+    // Add SSR pattern linters
+    all_linters.extend(
+        SSR_PATTERN_LINTERS
+            .iter()
+            .map(|linter| DiagnosticLinter::SsrPatterns(*linter)),
+    );
 
     // Add meta-only linters
     // @fb-only

From 6faa9f865ad5b65a8c52745cac61f6f5fb44aa7b Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 5 Sep 2025 05:20:33 -0700
Subject: [PATCH 092/394] Ignore formatting to avoid fb_only/oss_only
 inconsistency

Summary:
To avoid a GitHub CI failure as in:

https://github.com/WhatsApp/erlang-language-platform/actions/runs/17457515576/job/49574340083

Reviewed By: alanz

Differential Revision: D81774626

fbshipit-source-id: a452985ed3d1f2022b627130f75a481e0521db59
---
 crates/ide/src/diagnostics/atoms_exhaustion.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/ide/src/diagnostics/atoms_exhaustion.rs b/crates/ide/src/diagnostics/atoms_exhaustion.rs
index 8249eef757..334bf86853 100644
--- a/crates/ide/src/diagnostics/atoms_exhaustion.rs
+++ b/crates/ide/src/diagnostics/atoms_exhaustion.rs
@@ -64,6 +64,7 @@ impl FunctionCallLinter for AtomsExhaustionLinter {
         context: &CheckCallCtx<'_, ()>,
         sema: &Semantic,
     ) -> Option<Self::Context> {
+        #[rustfmt::skip]
         // @fb-only
             // @fb-only
         let is_safe = false; // @oss-only

From 1897fe15bf50bc7e8844976613e114722ddaef4c Mon Sep 17 00:00:00 2001
From: "Brian Suh (WhatsApp)" <bsuh@meta.com>
Date: Fri, 5 Sep 2025 09:56:07 -0700
Subject: [PATCH 093/394] add links to logview

Summary: add logview link into the macro doc

Reviewed By: robertoaloi

Differential Revision: D81513245

fbshipit-source-id: 37768bd67e9f6cdca774343c849a51a33dee1ede
---
 crates/elp/src/bin/glean.rs | 46 +++++++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/crates/elp/src/bin/glean.rs b/crates/elp/src/bin/glean.rs
index f9566cb870..da9bcf1b53 100644
--- a/crates/elp/src/bin/glean.rs
+++ b/crates/elp/src/bin/glean.rs
@@ -8,6 +8,7 @@
  * above-listed licenses.
  */
 
+use core::option::Option::None;
 use std::io::Write;
 use std::mem;
 use std::path::Path;
@@ -300,6 +301,8 @@ pub(crate) struct MacroTarget {
     expansion: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     ods_url: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    logview_url: Option<String>,
 }
 
 #[derive(Serialize, Debug)]
@@ -928,12 +931,22 @@ impl GleanIndexer {
                         let range = def.source(db).syntax().text_range();
                         let text = &db.file_text(id)[range];
                         let text = format!("```erlang\n{text}\n```");
-                        let doc = match (&x.key.expansion, &x.key.ods_url) {
-                            (None, None) => text,
-                            (None, Some(o)) => format!("[ODS]({o})\n{text}"),
-                            (Some(e), None) => format!("{text}\n---\n\n{e}"),
-                            (Some(e), Some(o)) => format!("[ODS]({o})\n{text}\n---\n\n{e}"),
-                        };
+                        let doc = format!(
+                            "{}{}{}{}",
+                            x.key
+                                .ods_url
+                                .as_ref()
+                                .map_or(String::new(), |o| format!("[ODS]({})\n", o)),
+                            x.key
+                                .logview_url
+                                .as_ref()
+                                .map_or(String::new(), |l| format!("[LogView]({})\n", l)),
+                            text,
+                            x.key
+                                .expansion
+                                .as_ref()
+                                .map_or(String::new(), |e| format!("\n---\n\n{}", e))
+                        );
                         let decl = Declaration::MacroDeclaration(
                             MacroDecl {
                                 name: x.key.name.clone(),
@@ -1619,6 +1632,7 @@ impl GleanIndexer {
             arity: define.name.arity(),
             expansion,
             ods_url: None,
+            logview_url: None,
         };
         Some(XRef {
             source: range.into(),
@@ -2486,6 +2500,19 @@ mod tests {
         // @fb-only
     }
 
+    #[test]
+    fn xref_macro_logview_v2_test() {
+        let spec = r#"
+        //- /src/macro.erl
+            -module(macro).
+            -define(LOG_E(X), (fun() -> wa_log:send_if(X) end)()).
+            baz(atom) -> ?LOG_E("test"),
+        %%                ^^^^^ macro.erl/macro/LOG_E/97/has_logview/fun () -> 'wa_log':'send_if'( "test" ) end()
+
+        "#;
+        // @fb-only
+    }
+
     #[test]
     fn xref_macro_in_pat_v2_test() {
         let spec = r#"
@@ -2818,9 +2845,10 @@ mod tests {
                         Some(arity) => arity.to_string(),
                         None => "no_arity".to_string(),
                     };
-                    let ods_link = match &xref.key.ods_url {
-                        Some(_) => "has_ods",
-                        None => "no_ods",
+                    let ods_link = match (&xref.key.ods_url, &xref.key.logview_url) {
+                        (Some(_), _) => "has_ods",
+                        (None, Some(_)) => "has_logview",
+                        (None, None) => "no_ods",
                     };
                     let exp = match &xref.key.expansion {
                         Some(exp) => exp

From d55260aaa4b69773a5a6b0680e297ccb5d984ad8 Mon Sep 17 00:00:00 2001
From: "Brian Suh (WhatsApp)" <bsuh@meta.com>
Date: Fri, 5 Sep 2025 09:56:07 -0700
Subject: [PATCH 094/394] add links to wam browser

Summary: add wam browser link into the record doc

Reviewed By: robertoaloi

Differential Revision: D81522678

fbshipit-source-id: 115f64f117b46eabe7131a3936e673ad6c32a30e
---
 crates/elp/src/bin/glean.rs | 83 ++++++++++++++++++++++++++++++++-----
 1 file changed, 73 insertions(+), 10 deletions(-)

diff --git a/crates/elp/src/bin/glean.rs b/crates/elp/src/bin/glean.rs
index da9bcf1b53..3662dd4006 100644
--- a/crates/elp/src/bin/glean.rs
+++ b/crates/elp/src/bin/glean.rs
@@ -317,6 +317,8 @@ pub(crate) struct RecordTarget {
     #[serde(rename = "file")]
     file_id: GleanFileId,
     name: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    wam_url: Option<String>,
 }
 
 #[derive(Serialize, Debug)]
@@ -969,6 +971,38 @@ impl GleanIndexer {
                         x.key.arity = Some(xref.source.start);
                     }
                 }
+                XRefTarget::Record(x) => {
+                    // Add WAM documentation for records that have wam_url
+                    if let Some(wam_url) = &x.key.wam_url {
+                        let id: FileId = x.key.file_id.clone().into();
+                        let def_map = db.def_map(id);
+                        let record_name = Name::from_erlang_service(&x.key.name);
+                        if let Some(def) = def_map.get_record(&record_name) {
+                            let range = def.source(db).syntax().text_range();
+                            let text = &db.file_text(id)[range];
+                            let text = format!("```erlang\n{text}\n```");
+                            let doc = format!("[WAM]({})\n{}", wam_url, text);
+                            let decl = Declaration::RecordDeclaration(
+                                RecordDecl {
+                                    name: x.key.name.clone(),
+                                    span: xref.source.clone(),
+                                }
+                                .into(),
+                            );
+                            let doc_decl = Declaration::DocDeclaration(
+                                DocDecl {
+                                    target: Box::new(decl.clone()),
+                                    span: xref.source.clone(),
+                                    text: doc,
+                                }
+                                .into(),
+                            );
+                            file_decl.declarations.push(decl);
+                            file_decl.declarations.push(doc_decl);
+                            x.key.file_id = file_id.into();
+                        }
+                    }
+                }
                 _ => (),
             }
         }
@@ -1725,12 +1759,19 @@ impl GleanIndexer {
         let (_, _, expr_source) = ctx.body_with_expr_source(sema)?;
         let source_file = sema.parse(file_id);
         let range = Self::find_range(sema, ctx, &source_file, &expr_source)?;
+
+        // Check if this is a WAM event record and build link
+        use elp_ide::meta_only::wam_links;
+        let wam_ctx = wam_links::WamEventCtx::new(sema.db.upcast());
+        let wam_url = wam_ctx.build_wam_link(name).map(|link| link.url());
+
         Some(XRef {
             source: range.into(),
             target: XRefTarget::Record(
                 RecordTarget {
                     file_id: def.file.file_id.into(),
                     name: def.record.name.to_string(),
+                    wam_url,
                 }
                 .into(),
             ),
@@ -2288,7 +2329,7 @@ mod tests {
         }).
         baz(A) ->
             #query{ size = A }.
-        %%  ^^^^^^ glean_module9.erl/rec/query
+        %%  ^^^^^^ glean_module9.erl/rec/query/no_wam
         "#;
 
         xref_v2_check(spec);
@@ -2318,9 +2359,9 @@ mod tests {
         -record(stats, {count, time}).
         baz(Time) ->
             [{#stats.count, 1},
-        %%    ^^^^^^ glean_module10.erl/rec/stats
+        %%    ^^^^^^ glean_module10.erl/rec/stats/no_wam
             {#stats.time, Time}].
-        %%   ^^^^^^ glean_module10.erl/rec/stats
+        %%   ^^^^^^ glean_module10.erl/rec/stats/no_wam
 
         "#;
 
@@ -2349,7 +2390,7 @@ mod tests {
         -record(stats, {count, time}).
         baz(Stats) ->
             Stats#stats.count.
-        %%       ^^^^^^ glean_module11.erl/rec/stats
+        %%       ^^^^^^ glean_module11.erl/rec/stats/no_wam
         "#;
 
         xref_v2_check(spec);
@@ -2377,7 +2418,7 @@ mod tests {
         -record(stats, {count, time}).
         baz(Stats, NewCnt) ->
             Stats#stats{count = NewCnt}.
-        %%       ^^^^^^ glean_module12.erl/rec/stats
+        %%       ^^^^^^ glean_module12.erl/rec/stats/no_wam
         "#;
 
         xref_v2_check(spec);
@@ -2407,7 +2448,7 @@ mod tests {
         -record(stats, {count, time}).
         baz(Stats) ->
             #stats{count = Count, time = Time} = Stats.
-        %%  ^^^^^^ glean_module13.erl/rec/stats
+        %%  ^^^^^^ glean_module13.erl/rec/stats/no_wam
         "#;
 
         xref_v2_check(spec);
@@ -2431,7 +2472,7 @@ mod tests {
         //- /glean/app_glean/src/glean_module14.erl
         -record(rec, {field}).
         foo(#rec.field) -> ok.
-        %%  ^^^^ glean_module14.erl/rec/rec
+        %%  ^^^^ glean_module14.erl/rec/rec/no_wam
         "#;
 
         xref_v2_check(spec);
@@ -2457,15 +2498,31 @@ mod tests {
         //- /glean/app_glean/src/glean_module15.erl
         -record(stats, {count, time}).
         -spec baz() -> #stats{}.
-        %%             ^^^^^^ glean_module15.erl/rec/stats
+        %%             ^^^^^^ glean_module15.erl/rec/stats/no_wam
         baz() ->
             #stats{count = 1, time = 2}.
-        %%  ^^^^^^ glean_module15.erl/rec/stats
+        %%  ^^^^^^ glean_module15.erl/rec/stats/no_wam
         "#;
 
         xref_v2_check(spec);
     }
 
+    #[test]
+    fn xref_wam_record_v2_test() {
+        let spec = r#"
+        //- /src/record.erl
+            -module(record).
+            -record(wam_event_chatd_c2s_logout, {data, reason}).
+
+            baz(Data) ->
+                Event = #wam_event_chatd_c2s_logout{data = Data},
+            %%          ^^^^^^^^^^^^^^^^^^^^^^^^^^^ record.erl/rec/wam_event_chatd_c2s_logout/has_wam
+                Event.
+
+        "#;
+        // @fb-only
+    }
+
     #[test]
     fn xref_macro_v2_test() {
         let spec = r#"
@@ -2866,7 +2923,13 @@ mod tests {
                     )
                 }
                 XRefTarget::Header(_) => f.write_str("header"),
-                XRefTarget::Record(xref) => f.write_str(format!("rec/{}", xref.key.name).as_str()),
+                XRefTarget::Record(xref) => {
+                    let wam_link = match &xref.key.wam_url {
+                        Some(_) => "has_wam",
+                        None => "no_wam",
+                    };
+                    f.write_str(format!("rec/{}/{}", xref.key.name, wam_link).as_str())
+                }
                 XRefTarget::Type(xref) => {
                     f.write_str(format!("type/{}/{}", xref.key.name, xref.key.arity).as_str())
                 }

From b1f429ad86be97bececbfc3da0ba170114e1c036 Mon Sep 17 00:00:00 2001
From: "Brian Suh (WhatsApp)" <bsuh@meta.com>
Date: Fri, 5 Sep 2025 09:56:07 -0700
Subject: [PATCH 095/394] add links to scuba

Summary: add scuba links to macro doc

Reviewed By: robertoaloi

Differential Revision: D81545729

fbshipit-source-id: 8b87e01ebfbc715de33cab0a60f2f93c41244915
---
 crates/elp/src/bin/glean.rs | 52 +++++++++++++++++++++++++++++++++----
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/crates/elp/src/bin/glean.rs b/crates/elp/src/bin/glean.rs
index 3662dd4006..64612b65c3 100644
--- a/crates/elp/src/bin/glean.rs
+++ b/crates/elp/src/bin/glean.rs
@@ -303,6 +303,8 @@ pub(crate) struct MacroTarget {
     ods_url: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     logview_url: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    scuba_urls: Option<Vec<(String, String)>>,
 }
 
 #[derive(Serialize, Debug)]
@@ -933,8 +935,28 @@ impl GleanIndexer {
                         let range = def.source(db).syntax().text_range();
                         let text = &db.file_text(id)[range];
                         let text = format!("```erlang\n{text}\n```");
+                        let scuba_links =
+                            x.key
+                                .scuba_urls
+                                .as_ref()
+                                .map_or(String::new(), |scuba_urls| {
+                                    scuba_urls
+                                        .iter()
+                                        .map(|(display_name, url)| {
+                                            format!("[{}]({})", display_name, url)
+                                        })
+                                        .collect::<Vec<_>>()
+                                        .join(" | ")
+                                });
+
+                        let scuba_section = if !scuba_links.is_empty() {
+                            format!("Scuba: {}\n", scuba_links)
+                        } else {
+                            String::new()
+                        };
+
                         let doc = format!(
-                            "{}{}{}{}",
+                            "{}{}{}{}{}",
                             x.key
                                 .ods_url
                                 .as_ref()
@@ -943,6 +965,7 @@ impl GleanIndexer {
                                 .logview_url
                                 .as_ref()
                                 .map_or(String::new(), |l| format!("[LogView]({})\n", l)),
+                            scuba_section,
                             text,
                             x.key
                                 .expansion
@@ -1667,6 +1690,7 @@ impl GleanIndexer {
             expansion,
             ods_url: None,
             logview_url: None,
+            scuba_urls: None,
         };
         Some(XRef {
             source: range.into(),
@@ -2570,6 +2594,19 @@ mod tests {
         // @fb-only
     }
 
+    #[test]
+    fn xref_macro_scuba_v2_test() {
+        let spec = r#"
+        //- /src/macro.erl
+            -module(macro).
+            -define(LOG_SCUBA(X), wa_scuba:log_tablename(pii, X)).
+            baz(atom) -> ?LOG_SCUBA(test_event),
+        %%                ^^^^^^^^^ macro.erl/macro/LOG_SCUBA/97/has_scuba/'wa_scuba':'log_tablename'( 'pii', 'test_event' )
+
+        "#;
+        // @fb-only
+    }
+
     #[test]
     fn xref_macro_in_pat_v2_test() {
         let spec = r#"
@@ -2902,10 +2939,15 @@ mod tests {
                         Some(arity) => arity.to_string(),
                         None => "no_arity".to_string(),
                     };
-                    let ods_link = match (&xref.key.ods_url, &xref.key.logview_url) {
-                        (Some(_), _) => "has_ods",
-                        (None, Some(_)) => "has_logview",
-                        (None, None) => "no_ods",
+                    let ods_link = match (
+                        &xref.key.ods_url,
+                        &xref.key.logview_url,
+                        &xref.key.scuba_urls,
+                    ) {
+                        (Some(_), _, _) => "has_ods",
+                        (None, Some(_), _) => "has_logview",
+                        (None, None, Some(_)) => "has_scuba",
+                        (None, None, None) => "no_ods",
                     };
                     let exp = match &xref.key.expansion {
                         Some(exp) => exp

From ab12249dacf074580d043c8b452bbd3ac2c8b9f5 Mon Sep 17 00:00:00 2001
From: "Brian Suh (WhatsApp)" <bsuh@meta.com>
Date: Fri, 5 Sep 2025 09:56:07 -0700
Subject: [PATCH 096/394] add gatekeeper for new links

Reviewed By: robertoaloi

Differential Revision: D81690172

fbshipit-source-id: cb3986344d75fbdf77350d240c502ad145b7db9d
---
 crates/elp/src/config.rs                      | 41 ++++++++++++++++++-
 .../src/resources/test/config_stanza.stdout   | 15 +++++++
 crates/elp/src/to_proto.rs                    | 10 ++++-
 crates/ide/src/annotations.rs                 | 11 +++++
 crates/ide/src/lib.rs                         |  1 +
 5 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/crates/elp/src/config.rs b/crates/elp/src/config.rs
index fab48abbe1..432382a0c0 100644
--- a/crates/elp/src/config.rs
+++ b/crates/elp/src/config.rs
@@ -89,6 +89,12 @@ config_data! {
       /// Whether to show the `Link` lenses. Only applies when
       /// `#elp.lens.enable#` is set.
       lens_links_enable: bool = json! { false },
+      /// Whether to enable LogView lens links.
+      lens_logview_links: bool = json! { false },
+      /// Whether to enable Scuba lens links.
+      lens_scuba_links: bool = json! { false },
+      /// Whether to enable WAM lens links.
+      lens_wam_links: bool = json! { false },
       /// Configure LSP-based logging using env_logger syntax.
       log: String = json! { "error" },
       /// Whether to show Signature Help.
@@ -128,6 +134,9 @@ pub struct LensConfig {
     pub buck2_mode: Option<String>,
     pub debug: bool,
     pub links: bool,
+    pub logview_links: bool,
+    pub scuba_links: bool,
+    pub wam_links: bool,
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -323,6 +332,9 @@ impl Config {
                 && self.data.lens_run_coverage_enable,
             debug: self.data.lens_enable && self.data.lens_debug_enable,
             links: self.data.lens_enable && self.data.lens_links_enable,
+            logview_links: self.data.lens_enable && self.data.lens_logview_links,
+            scuba_links: self.data.lens_enable && self.data.lens_scuba_links,
+            wam_links: self.data.lens_enable && self.data.lens_wam_links,
         }
     }
 
@@ -375,6 +387,18 @@ impl Config {
         self.data.eqwalizer_all = value;
     }
 
+    pub fn set_lens_logview_links(&mut self, value: bool) {
+        self.data.lens_logview_links = value;
+    }
+
+    pub fn set_lens_scuba_links(&mut self, value: bool) {
+        self.data.lens_scuba_links = value;
+    }
+
+    pub fn set_lens_wam_links(&mut self, value: bool) {
+        self.data.lens_wam_links = value;
+    }
+
     pub fn inlay_hints(&self) -> InlayHintsConfig {
         InlayHintsConfig {
             parameter_hints: self.data.inlayHints_parameterHints_enable,
@@ -580,7 +604,7 @@ mod tests {
 
         let s = remove_ws(&schema);
 
-        expect![[r#""elp.diagnostics.disabled":{"default":[],"items":{"type":"string"},"markdownDescription":"ListofELPdiagnosticstodisable.","type":"array","uniqueItems":true},"elp.diagnostics.enableExperimental":{"default":false,"markdownDescription":"WhethertoshowexperimentalELPdiagnosticsthatmight\nhavemorefalsepositivesthanusual.","type":"boolean"},"elp.diagnostics.enableOtp":{"default":false,"markdownDescription":"WhethertoreportdiagnosticsforOTPfiles.","type":"boolean"},"elp.diagnostics.onSave.enable":{"default":false,"markdownDescription":"Updatenativediagnosticsonlywhenthefileissaved.","type":"boolean"},"elp.edoc.enable":{"default":false,"markdownDescription":"WhethertoreportEDocdiagnostics.","type":"boolean"},"elp.eqwalizer.all":{"default":false,"markdownDescription":"WhethertoreportEqwalizerdiagnosticsforthewholeprojectandnotonlyforopenedfiles.","type":"boolean"},"elp.eqwalizer.chunkSize":{"default":100,"markdownDescription":"Chunksizetouseforproject-wideeqwalization.","minimum":0,"type":"integer"},"elp.eqwalizer.maxTasks":{"default":32,"markdownDescription":"Maximumnumberoftaskstoruninparallelforproject-wideeqwalization.","minimum":0,"type":"integer"},"elp.highlightDynamic.enable":{"default":false,"markdownDescription":"Ifenabled,highlightvariableswithtype`dynamic()`whenEqwalizerresultsareavailable.","type":"boolean"},"elp.hoverActions.docLinks.enable":{"default":false,"markdownDescription":"WhethertoshowHoverActionsoftype`docs`.Onlyapplieswhen\n`#elp.hoverActions.enable#`isset.","type":"boolean"},"elp.hoverActions.enable":{"default":false,"markdownDescription":"WhethertoshowHoverActions.","type":"boolean"},"elp.inlayHints.parameterHints.enable":{"default":true,"markdownDescription":"Whethertoshowfunctionparameternameinlayhintsatthecall\nsite.","type":"boolean"},"elp.lens.buck2.mode":{"default":null,"markdownDescription":"Thebuck2modetouseforrunningtestsviathecodelenses.","type":["null","string"]},"elp.lens.debug.enable":{"default":false,"markdownDescription":"Whethertoshowthe`Debug`lenses.Onlyapplieswhen\n`#elp.lens.enable#`isset.","type":"boolean"},"elp.lens.enable":{"default":false,"markdownDescription":"WhethertoshowCodeLensesinErlangfiles.","type":"boolean"},"elp.lens.links.enable":{"default":false,"markdownDescription":"Whethertoshowthe`Link`lenses.Onlyapplieswhen\n`#elp.lens.enable#`isset.","type":"boolean"},"elp.lens.run.coverage.enable":{"default":true,"markdownDescription":"Displaycodecoverageinformationwhenrunningtestsviathe\nCodeLenses.Onlyapplieswhen`#elp.lens.enabled`and\n`#elp.lens.run.enable#`areset.","type":"boolean"},"elp.lens.run.enable":{"default":false,"markdownDescription":"Whethertoshowthe`Run`lenses.Onlyapplieswhen\n`#elp.lens.enable#`isset.","type":"boolean"},"elp.lens.run.interactive.enable":{"default":false,"markdownDescription":"Whethertoshowthe`RunInteractive`lenses.Onlyapplieswhen\n`#elp.lens.enable#`isset.","type":"boolean"},"elp.log":{"default":"error","markdownDescription":"ConfigureLSP-basedloggingusingenv_loggersyntax.","type":"string"},"elp.signatureHelp.enable":{"default":true,"markdownDescription":"WhethertoshowSignatureHelp.","type":"boolean"},"elp.typesOnHover.enable":{"default":false,"markdownDescription":"Displaytypeswhenhoveringoverexpressions.","type":"boolean"},"#]]
+        expect![[r#""elp.diagnostics.disabled":{"default":[],"items":{"type":"string"},"markdownDescription":"ListofELPdiagnosticstodisable.","type":"array","uniqueItems":true},"elp.diagnostics.enableExperimental":{"default":false,"markdownDescription":"WhethertoshowexperimentalELPdiagnosticsthatmight\nhavemorefalsepositivesthanusual.","type":"boolean"},"elp.diagnostics.enableOtp":{"default":false,"markdownDescription":"WhethertoreportdiagnosticsforOTPfiles.","type":"boolean"},"elp.diagnostics.onSave.enable":{"default":false,"markdownDescription":"Updatenativediagnosticsonlywhenthefileissaved.","type":"boolean"},"elp.edoc.enable":{"default":false,"markdownDescription":"WhethertoreportEDocdiagnostics.","type":"boolean"},"elp.eqwalizer.all":{"default":false,"markdownDescription":"WhethertoreportEqwalizerdiagnosticsforthewholeprojectandnotonlyforopenedfiles.","type":"boolean"},"elp.eqwalizer.chunkSize":{"default":100,"markdownDescription":"Chunksizetouseforproject-wideeqwalization.","minimum":0,"type":"integer"},"elp.eqwalizer.maxTasks":{"default":32,"markdownDescription":"Maximumnumberoftaskstoruninparallelforproject-wideeqwalization.","minimum":0,"type":"integer"},"elp.highlightDynamic.enable":{"default":false,"markdownDescription":"Ifenabled,highlightvariableswithtype`dynamic()`whenEqwalizerresultsareavailable.","type":"boolean"},"elp.hoverActions.docLinks.enable":{"default":false,"markdownDescription":"WhethertoshowHoverActionsoftype`docs`.Onlyapplieswhen\n`#elp.hoverActions.enable#`isset.","type":"boolean"},"elp.hoverActions.enable":{"default":false,"markdownDescription":"WhethertoshowHoverActions.","type":"boolean"},"elp.inlayHints.parameterHints.enable":{"default":true,"markdownDescription":"Whethertoshowfunctionparameternameinlayhintsatthecall\nsite.","type":"boolean"},"elp.lens.buck2.mode":{"default":null,"markdownDescription":"Thebuck2modetouseforrunningtestsviathecodelenses.","type":["null","string"]},"elp.lens.debug.enable":{"default":false,"markdownDescription":"Whethertoshowthe`Debug`lenses.Onlyapplieswhen\n`#elp.lens.enable#`isset.","type":"boolean"},"elp.lens.enable":{"default":false,"markdownDescription":"WhethertoshowCodeLensesinErlangfiles.","type":"boolean"},"elp.lens.links.enable":{"default":false,"markdownDescription":"Whethertoshowthe`Link`lenses.Onlyapplieswhen\n`#elp.lens.enable#`isset.","type":"boolean"},"elp.lens.logview.links":{"default":false,"markdownDescription":"WhethertoenableLogViewlenslinks.","type":"boolean"},"elp.lens.run.coverage.enable":{"default":true,"markdownDescription":"Displaycodecoverageinformationwhenrunningtestsviathe\nCodeLenses.Onlyapplieswhen`#elp.lens.enabled`and\n`#elp.lens.run.enable#`areset.","type":"boolean"},"elp.lens.run.enable":{"default":false,"markdownDescription":"Whethertoshowthe`Run`lenses.Onlyapplieswhen\n`#elp.lens.enable#`isset.","type":"boolean"},"elp.lens.run.interactive.enable":{"default":false,"markdownDescription":"Whethertoshowthe`RunInteractive`lenses.Onlyapplieswhen\n`#elp.lens.enable#`isset.","type":"boolean"},"elp.lens.scuba.links":{"default":false,"markdownDescription":"WhethertoenableScubalenslinks.","type":"boolean"},"elp.lens.wam.links":{"default":false,"markdownDescription":"WhethertoenableWAMlenslinks.","type":"boolean"},"elp.log":{"default":"error","markdownDescription":"ConfigureLSP-basedloggingusingenv_loggersyntax.","type":"string"},"elp.signatureHelp.enable":{"default":true,"markdownDescription":"WhethertoshowSignatureHelp.","type":"boolean"},"elp.typesOnHover.enable":{"default":false,"markdownDescription":"Displaytypeswhenhoveringoverexpressions.","type":"boolean"},"#]]
         .assert_eq(s.as_str());
 
         expect![[r#"
@@ -673,6 +697,11 @@ mod tests {
               "markdownDescription": "Whether to show the `Link` lenses. Only applies when\n`#elp.lens.enable#` is set.",
               "type": "boolean"
             },
+            "elp.lens.logview.links": {
+              "default": false,
+              "markdownDescription": "Whether to enable LogView lens links.",
+              "type": "boolean"
+            },
             "elp.lens.run.coverage.enable": {
               "default": true,
               "markdownDescription": "Display code coverage information when running tests via the\nCode Lenses. Only applies when `#elp.lens.enabled` and\n`#elp.lens.run.enable#` are set.",
@@ -688,6 +717,16 @@ mod tests {
               "markdownDescription": "Whether to show the `Run Interactive` lenses. Only applies when\n`#elp.lens.enable#` is set.",
               "type": "boolean"
             },
+            "elp.lens.scuba.links": {
+              "default": false,
+              "markdownDescription": "Whether to enable Scuba lens links.",
+              "type": "boolean"
+            },
+            "elp.lens.wam.links": {
+              "default": false,
+              "markdownDescription": "Whether to enable WAM lens links.",
+              "type": "boolean"
+            },
             "elp.log": {
               "default": "error",
               "markdownDescription": "Configure LSP-based logging using env_logger syntax.",
diff --git a/crates/elp/src/resources/test/config_stanza.stdout b/crates/elp/src/resources/test/config_stanza.stdout
index 09531aa223..bdd5c8b487 100644
--- a/crates/elp/src/resources/test/config_stanza.stdout
+++ b/crates/elp/src/resources/test/config_stanza.stdout
@@ -88,6 +88,11 @@
     "markdownDescription": "Whether to show the `Link` lenses. Only applies when\n`#elp.lens.enable#` is set.",
     "type": "boolean"
   },
+  "elp.lens.logview.links": {
+    "default": false,
+    "markdownDescription": "Whether to enable LogView lens links.",
+    "type": "boolean"
+  },
   "elp.lens.run.coverage.enable": {
     "default": true,
     "markdownDescription": "Display code coverage information when running tests via the\nCode Lenses. Only applies when `#elp.lens.enabled` and\n`#elp.lens.run.enable#` are set.",
@@ -103,6 +108,16 @@
     "markdownDescription": "Whether to show the `Run Interactive` lenses. Only applies when\n`#elp.lens.enable#` is set.",
     "type": "boolean"
   },
+  "elp.lens.scuba.links": {
+    "default": false,
+    "markdownDescription": "Whether to enable Scuba lens links.",
+    "type": "boolean"
+  },
+  "elp.lens.wam.links": {
+    "default": false,
+    "markdownDescription": "Whether to enable WAM lens links.",
+    "type": "boolean"
+  },
   "elp.log": {
     "default": "error",
     "markdownDescription": "Configure LSP-based logging using env_logger syntax.",
diff --git a/crates/elp/src/to_proto.rs b/crates/elp/src/to_proto.rs
index efb763d442..fe98d1c9a3 100644
--- a/crates/elp/src/to_proto.rs
+++ b/crates/elp/src/to_proto.rs
@@ -26,6 +26,7 @@ use elp_ide::HoverAction;
 use elp_ide::InlayHintLabel;
 use elp_ide::InlayHintLabelPart;
 use elp_ide::InlayKind;
+use elp_ide::LinkKind;
 use elp_ide::NavigationTarget;
 use elp_ide::Runnable;
 use elp_ide::RunnableKind;
@@ -778,7 +779,14 @@ pub(crate) fn code_lens(
             }
         }
         AnnotationKind::Link(link) => {
-            if lens_config.links {
+            if lens_config.links
+                && match link.kind {
+                    LinkKind::LogView => lens_config.logview_links,
+                    LinkKind::Scuba => lens_config.scuba_links,
+                    LinkKind::WAM => lens_config.wam_links,
+                    _ => true,
+                }
+            {
                 let annotation_range = range(line_index, annotation.range);
                 let url = link.url;
                 let text = link.text;
diff --git a/crates/ide/src/annotations.rs b/crates/ide/src/annotations.rs
index 97b67811c3..7565b8783b 100644
--- a/crates/ide/src/annotations.rs
+++ b/crates/ide/src/annotations.rs
@@ -37,8 +37,19 @@ pub enum AnnotationKind {
     Link(Link),
 }
 
+#[derive(Debug)]
+pub enum LinkKind {
+    Configerator,
+    ExDocs,
+    LogView,
+    ODS,
+    Scuba,
+    WAM,
+}
+
 #[derive(Debug)]
 pub struct Link {
+    pub kind: LinkKind,
     pub file_id: FileId,
     pub text_range: TextRange,
     pub url: String,
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index 51bc919b43..5b55b0c77b 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -112,6 +112,7 @@ mod highlight_related;
 
 pub use annotations::Annotation;
 pub use annotations::AnnotationKind;
+pub use annotations::LinkKind;
 pub use codemod_helpers::FunctionMatch;
 pub use codemod_helpers::MFA;
 pub use common_test::GroupName;

From 12ecfe5bb0e0c6046317d9902fe73ce8d3c91780 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 8 Sep 2025 01:53:36 -0700
Subject: [PATCH 097/394] Fix location of meta-only comment

Summary: This was causing a GitHub CI failure: https://github.com/WhatsApp/erlang-language-platform/actions/runs/17499526383/job/49708914718

Reviewed By: alanz

Differential Revision: D81902529

fbshipit-source-id: a9007bc6cc61ab52e93217d85036b52ada507250
---
 crates/ide/src/diagnostics/debugging_function.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/ide/src/diagnostics/debugging_function.rs b/crates/ide/src/diagnostics/debugging_function.rs
index 6f72cc4f2d..2e8607ccb7 100644
--- a/crates/ide/src/diagnostics/debugging_function.rs
+++ b/crates/ide/src/diagnostics/debugging_function.rs
@@ -22,8 +22,8 @@ use crate::diagnostics::DiagnosticCode;
 use crate::diagnostics::FunctionCallLinter;
 use crate::diagnostics::Linter;
 use crate::diagnostics::Severity;
-use crate::diagnostics::meta_only;
 // @fb-only
+use crate::lazy_function_matches;
 
 pub(crate) struct NoDebuggingFunctionLinter;
 

From a826c8c47d4d12fea8dd0975c8b18b3d5a7196b7 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 8 Sep 2025 02:51:14 -0700
Subject: [PATCH 098/394] Fix OSS compilation of glean.rs

Reviewed By: alanz

Differential Revision: D81907094

fbshipit-source-id: 68d4569ad46028f4adda199eeb73cd2035830aa9
---
 crates/elp/src/bin/glean.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/elp/src/bin/glean.rs b/crates/elp/src/bin/glean.rs
index 64612b65c3..52f1d1ea9c 100644
--- a/crates/elp/src/bin/glean.rs
+++ b/crates/elp/src/bin/glean.rs
@@ -1784,10 +1784,10 @@ impl GleanIndexer {
         let source_file = sema.parse(file_id);
         let range = Self::find_range(sema, ctx, &source_file, &expr_source)?;
 
-        // Check if this is a WAM event record and build link
-        use elp_ide::meta_only::wam_links;
-        let wam_ctx = wam_links::WamEventCtx::new(sema.db.upcast());
-        let wam_url = wam_ctx.build_wam_link(name).map(|link| link.url());
+        // @fb-only
+        // @fb-only
+        // @fb-only
+        let wam_url = None; // @oss-only
 
         Some(XRef {
             source: range.into(),

From 1f0e95596d0b22cbb350a46ff3d9bad4100da123 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 8 Sep 2025 03:07:32 -0700
Subject: [PATCH 099/394] detect new project source files

Summary:
# Context

When working with a buck2 project, we do not simply use source roots, as a given buck2 target can be configured to use files and dependencies from anywhere.

To cope with this, we build an include-file lookup structure at project loading time, which is partly populated with information from the output of the bxl query.

If a new `.hrl` or `.erl` file is added, it is not obvious which target is should be part of, to update the relevant application and include file lookup table.

# This Diff

This diff takes a conservative approach to files being added, as they should be a reasonable rare occurrence.

It checks for a notification of a newly created source file (once in the `Running` state), and if so triggers a project reload.  The query for this happens in a separate thread, and when there is a valid result it is applied.  Since there is only an additional file, most of salsa should still be valid, so it does not cause cascading changes.  Existing file ids are retained, as Vfs is not flushed in the process.

Reviewed By: robertoaloi

Differential Revision: D81783795

fbshipit-source-id: 19012379179d0d841bc4b0b24ccd3011e1bfab5d
---
 crates/elp/src/server.rs | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index d9b7e1ca26..634854bf24 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -201,6 +201,23 @@ pub enum Status {
     ShuttingDown,
 }
 
+/// For buck projects we cannot rely on source roots, so if a new file
+/// is added we need to query the project model for where it fits in.
+/// But we must distinguish between the initial load, where every file
+/// shows up as newly created, and files added after the initial load.
+/// There is a wrinkle, in that we receive a VFS loader complete
+/// message immediately after the last batch of files is loaded, but
+/// before we have processed changes.  In order to not trigger a
+/// project reload through thinking this are newly added, we introduce
+/// a state tracker, which steps to the final state after the VFS
+/// changes are processed.
+#[derive(PartialEq)]
+pub enum InitialLoading {
+    Initial,
+    DoneButVfsChanges,
+    Done,
+}
+
 impl Status {
     pub fn as_lsp_status(&self) -> lsp_ext::Status {
         match self {
@@ -251,6 +268,7 @@ pub struct Server {
     status: Status,
     projects: Arc<Vec<Project>>,
     project_loader: Arc<Mutex<ProjectLoader>>,
+    initial_load_status: InitialLoading,
     reload_manager: Arc<Mutex<ReloadManager>>,
     unresolved_app_id_paths: Arc<FxHashMap<AbsPathBuf, AppDataId>>,
     update_app_data_ids: bool,
@@ -317,6 +335,7 @@ impl Server {
             status: Status::Initialising,
             projects: Arc::new(vec![]),
             project_loader: Arc::new(Mutex::new(ProjectLoader::new())),
+            initial_load_status: InitialLoading::Initial,
             reload_manager: Arc::new(Mutex::new(ReloadManager::new())),
             unresolved_app_id_paths: Arc::new(FxHashMap::default()),
             update_app_data_ids: false,
@@ -934,6 +953,7 @@ impl Server {
                     self.show_message(params);
                 }
                 self.transition(Status::Running);
+                self.initial_load_status = InitialLoading::DoneButVfsChanges;
                 self.schedule_compile_deps();
                 self.schedule_cache();
                 // Not all clients send config in the `initialize` message, request it
@@ -1027,6 +1047,15 @@ impl Server {
                         .write()
                         .insert(file.file_id, line_endings);
                 }
+
+                if self.initial_load_status == InitialLoading::Done
+                    && let vfs::Change::Create(_, _) = &file.change
+                    && let Some(path) = vfs.file_path(file.file_id).as_path()
+                    && (path.extension() == Some("hrl") || path.extension() == Some("erl"))
+                {
+                    self.reload_manager.lock().add(path.to_path_buf());
+                }
+
                 if let Some(path) = vfs.file_path(file.file_id).as_path()
                     && let Some(app_data_id) = self.unresolved_app_id_paths.get(&path.to_path_buf())
                 {
@@ -1052,6 +1081,9 @@ impl Server {
                 raw_database.set_file_text(file.file_id, Arc::from(""));
             };
         }
+        if self.initial_load_status == InitialLoading::DoneButVfsChanges {
+            self.initial_load_status = InitialLoading::Done;
+        }
 
         if self.update_app_data_ids {
             // We process the changes for files opened before project

From a787db0b483297e1b7d7001f02356f0a9f3311c0 Mon Sep 17 00:00:00 2001
From: Tom Davies <tomdavies@meta.com>
Date: Mon, 8 Sep 2025 08:11:33 -0700
Subject: [PATCH 100/394] Partially fix escaping when pretty printing strings

Summary:
Previously, we didn't escape erlang strings and atoms correctly - we'd wrap them in quotes when pretty printing, but didn't escape Erlang's special characters. We add that here. **This does not offer a complete solution**, merely a step in the right direction: We don't try to handle `erl_features` keywords, for example, since they are much more complex to track.

See official Erlang implementation as a reference: https://github.com/erlang/otp/blob/ae81b2f6ff2d541c01242f12cdbd5238aa4b26bd/lib/stdlib/src/io_lib.erl#L971

Reviewed By: alanz

Differential Revision: D81776458

fbshipit-source-id: 0d7058d6e4c564005b3c4d5bc56846dd3938f277
---
 crates/elp/src/bin/glean.rs    |  12 +-
 crates/hir/src/body/pretty.rs  |  20 +-
 crates/hir/src/body/tests.rs   | 373 ++++++++++++++++-----------------
 crates/hir/src/lib.rs          |   1 +
 crates/hir/src/quote.rs        | 293 ++++++++++++++++++++++++++
 crates/ide/src/expand_macro.rs |  78 +++----
 6 files changed, 537 insertions(+), 240 deletions(-)
 create mode 100644 crates/hir/src/quote.rs

diff --git a/crates/elp/src/bin/glean.rs b/crates/elp/src/bin/glean.rs
index 52f1d1ea9c..f9bf740eac 100644
--- a/crates/elp/src/bin/glean.rs
+++ b/crates/elp/src/bin/glean.rs
@@ -2562,7 +2562,7 @@ mod tests {
             baz(1) -> ?TAU;
         %%             ^^^ macro.erl/macro/TAU/117/no_ods/6.28
             baz(N) -> ?MAX(N, 200).
-        %%             ^^^ macro.erl/macro/MAX/137/no_ods/if (N > 200) -> N; 'true' -> 200 end
+        %%             ^^^ macro.erl/macro/MAX/137/no_ods/if (N > 200) -> N; true -> 200 end
 
         "#;
         xref_v2_check(spec);
@@ -2575,7 +2575,7 @@ mod tests {
             -module(macro).
             -define(COUNT_INFRA(X), wa_stats_counter:count(X)).
             baz(atom) -> ?COUNT_INFRA(atom),
-        %%                ^^^^^^^^^^^ macro.erl/macro/COUNT_INFRA/94/has_ods/'wa_stats_counter':'count'( 'atom' )
+        %%                ^^^^^^^^^^^ macro.erl/macro/COUNT_INFRA/94/has_ods/wa_stats_counter:count( atom )
 
         "#;
         // @fb-only
@@ -2588,7 +2588,7 @@ mod tests {
             -module(macro).
             -define(LOG_E(X), (fun() -> wa_log:send_if(X) end)()).
             baz(atom) -> ?LOG_E("test"),
-        %%                ^^^^^ macro.erl/macro/LOG_E/97/has_logview/fun () -> 'wa_log':'send_if'( "test" ) end()
+        %%                ^^^^^ macro.erl/macro/LOG_E/97/has_logview/fun () -> wa_log:send_if( "test" ) end()
 
         "#;
         // @fb-only
@@ -2601,7 +2601,7 @@ mod tests {
             -module(macro).
             -define(LOG_SCUBA(X), wa_scuba:log_tablename(pii, X)).
             baz(atom) -> ?LOG_SCUBA(test_event),
-        %%                ^^^^^^^^^ macro.erl/macro/LOG_SCUBA/97/has_scuba/'wa_scuba':'log_tablename'( 'pii', 'test_event' )
+        %%                ^^^^^^^^^ macro.erl/macro/LOG_SCUBA/97/has_scuba/wa_scuba:log_tablename( pii, test_event )
 
         "#;
         // @fb-only
@@ -2629,7 +2629,7 @@ mod tests {
             -define(TYPE, integer()).
 
             -spec baz(ok) -> ?TYPE.
-        %%                    ^^^^ macro.erl/macro/TYPE/73/no_ods/'erlang':'integer'()
+        %%                    ^^^^ macro.erl/macro/TYPE/73/no_ods/erlang:integer()
             baz(ok) -> 1.
 
         "#;
@@ -2643,7 +2643,7 @@ mod tests {
             -module(macro).
            -define(FOO(X), X).
            -wild(?FOO(atom)).
-        %%        ^^^ macro.erl/macro/FOO/53/no_ods/'atom'
+        %%        ^^^ macro.erl/macro/FOO/53/no_ods/atom
 
         "#;
         xref_v2_check(spec);
diff --git a/crates/hir/src/body/pretty.rs b/crates/hir/src/body/pretty.rs
index fae31c3b0a..e19c97e637 100644
--- a/crates/hir/src/body/pretty.rs
+++ b/crates/hir/src/body/pretty.rs
@@ -8,6 +8,7 @@
  * above-listed licenses.
  */
 
+use core::iter::Iterator;
 use std::fmt;
 use std::fmt::Write as _;
 use std::str;
@@ -48,6 +49,7 @@ use crate::expr::Guards;
 use crate::expr::MaybeExpr;
 use crate::expr::SsrPlaceholder;
 use crate::expr::StringVariant;
+use crate::quote;
 
 pub fn print_function_clause(
     db: &dyn InternDatabase,
@@ -849,12 +851,20 @@ impl<'a> Printer<'a> {
 
     fn print_literal(&mut self, lit: &Literal) -> fmt::Result {
         match lit {
-            Literal::String(StringVariant::Normal(string)) => write!(self, "{string:?}"),
-            Literal::String(StringVariant::Verbatim(string)) => {
-                write!(self, "{string}")
+            Literal::String(StringVariant::Normal(string)) => {
+                write!(self, "{}", quote::escape_and_quote_string(string))
+            }
+            Literal::String(StringVariant::Verbatim(string)) => {
+                write!(self, "{}", quote::escape_and_quote_string(string))
+            }
+            Literal::Char(char) => write!(self, "${char}"), // TODO Escaping
+            Literal::Atom(atom) => {
+                write!(
+                    self,
+                    "{}",
+                    quote::escape_and_quote_atom(self.db.lookup_atom(*atom).as_str())
+                )
             }
-            Literal::Char(char) => write!(self, "${char}"),
-            Literal::Atom(atom) => write!(self, "'{}'", self.db.lookup_atom(*atom)),
             Literal::Integer(int) => write!(self, "{}", int.value), // TODO: other bases
             Literal::Float(float) => write!(self, "{}", f64::from_bits(*float)),
         }
diff --git a/crates/hir/src/body/tests.rs b/crates/hir/src/body/tests.rs
index f8c48a7fbc..dd5e5e4699 100644
--- a/crates/hir/src/body/tests.rs
+++ b/crates/hir/src/body/tests.rs
@@ -162,8 +162,8 @@ fn simple() {
 foo(ok) -> ok.
 "#,
         expect![[r#"
-            foo('ok') ->
-                'ok'.
+            foo(ok) ->
+                ok.
         "#]],
     );
 }
@@ -304,8 +304,8 @@ foo({a, b}) -> {1, 2, 3}.
 "#,
         expect![[r#"
             foo({
-                'a',
-                'b'
+                a,
+                b
             }) ->
                 {
                     1,
@@ -324,8 +324,8 @@ foo([a, b]) -> [1, 2, 3].
 "#,
         expect![[r#"
             foo([
-                'a',
-                'b'
+                a,
+                b
             ]) ->
                 [
                     1,
@@ -341,8 +341,8 @@ foo([a | b]) -> [1, 2 | 3].
 "#,
         expect![[r#"
             foo([
-                'a'
-                | 'b'
+                a
+                | b
             ]) ->
                 [
                     1,
@@ -400,14 +400,14 @@ fn map() {
         r#"
 foo(#{1 + 2 := 3 + 4}) -> #{a => b}.
 "#,
-        expect![[r##"
+        expect![[r#"
             foo(#{
                 (1 + 2) := (3 + 4)
             }) ->
                 #{
-                    'a' => 'b'
+                    a => b
                 }.
-        "##]],
+        "#]],
     );
 }
 
@@ -417,15 +417,15 @@ fn map_update() {
         r#"
 foo() -> #{a => b}#{a := b, c => d}.
 "#,
-        expect![[r##"
+        expect![[r#"
             foo() ->
                 #{
-                    'a' => 'b'
+                    a => b
                 }#{
-                    'a' := 'b',
-                    'c' => 'd'
+                    a := b,
+                    c => d
                 }.
-        "##]],
+        "#]],
     );
 }
 
@@ -474,18 +474,18 @@ fn record_update() {
 foo1() -> Expr#record{field = undefined}.
 foo2() -> Expr#record{field = ok, missing = }.
 "#,
-        expect![[r##"
+        expect![[r#"
             foo1() ->
                 Expr#record{
-                    field = 'undefined'
+                    field = undefined
                 }.
 
             foo2() ->
                 Expr#record{
-                    field = 'ok',
+                    field = ok,
                     missing = [missing]
                 }.
-        "##]],
+        "#]],
     );
 }
 
@@ -563,13 +563,13 @@ foo() ->
             foo() ->
                 case (1 + 2) of
                     X when
-                        (X andalso 'true');
+                        (X andalso true);
                         (X < 100),
                         (X >= 5)
                     ->
-                        'ok';
+                        ok;
                     _ ->
-                        'error'
+                        error
                 end.
         "#]],
     );
@@ -589,14 +589,14 @@ foo() ->
         expect![[r#"
             foo() ->
                 receive
-                    'ok' when
-                        'true'
+                    ok when
+                        true
                     ->
-                        'ok';
+                        ok;
                     _ ->
-                        'error'
+                        error
                 after Timeout ->
-                    'timeout'
+                    timeout
                 end.
         "#]],
     );
@@ -614,12 +614,12 @@ foo() ->
 "#,
         expect![[r#"
             foo() ->
-                'foo'(),
-                'erlang':'size'(
+                foo(),
+                erlang:size(
                     A
                 ),
-                'size'(),
-                'foo':'bar'(
+                size(),
+                foo:bar(
                     A
                 ).
         "#]],
@@ -638,9 +638,9 @@ foo() ->
 "#,
         expect![[r#"
             foo() ->
-                fun 'foo'/1,
-                fun 'erlang':'halt'/0,
-                fun 'mod':'foo'/1,
+                fun foo/1,
+                fun erlang:halt/0,
+                fun mod:foo/1,
                 fun Mod:Foo/Arity.
         "#]],
     );
@@ -658,12 +658,12 @@ foo() ->
         expect![[r#"
             foo() ->
                 if
-                    'erlang':'is_atom'(
+                    erlang:is_atom(
                         X
                     ) ->
-                        'ok';
-                    'true' ->
-                        'error'
+                        ok;
+                    true ->
+                        error
                 end.
         "#]],
     );
@@ -690,16 +690,16 @@ foo() ->
                     2
                 of
                     _ ->
-                        'ok'
+                        ok
                 catch
                     Pat when
-                        'true'
+                        true
                     ->
-                        'ok';
-                    'error':'undef':Stack ->
+                        ok;
+                    error:undef:Stack ->
                         Stack
                 after
-                    'ok'
+                    ok
                 end.
         "#]],
     );
@@ -817,10 +817,10 @@ foo() ->
         expect![[r#"
             foo() ->
                 fun
-                    ('ok') ->
-                        'ok';
-                    ('error') ->
-                        'error'
+                    (ok) ->
+                        ok;
+                    (error) ->
+                        error
                 end,
                 fun
                     Named() ->
@@ -839,8 +839,8 @@ foo((ok), ()) ->
     ().
 "#,
         expect![[r#"
-            foo('ok', [missing]) ->
-                'ok',
+            foo(ok, [missing]) ->
+                ok,
                 [missing].
         "#]],
     );
@@ -880,7 +880,7 @@ foo(bar()) -> ok.
 "#,
         expect![[r#"
             foo([missing]) ->
-                'ok'.
+                ok.
         "#]],
     );
 }
@@ -893,7 +893,7 @@ foo(catch 1) -> ok.
 "#,
         expect![[r#"
             foo([missing]) ->
-                'ok'.
+                ok.
         "#]],
     );
 }
@@ -906,7 +906,7 @@ foo(X#{}) -> ok.
 "#,
         expect![[r#"
             foo([missing]) ->
-                'ok'.
+                ok.
         "#]],
     );
 }
@@ -945,7 +945,7 @@ foo(X#foo.bar) -> ok.
 "#,
         expect![[r#"
             foo([missing]) ->
-                'ok'.
+                ok.
         "#]],
     );
 }
@@ -958,7 +958,7 @@ foo(X#foo{}) -> ok.
 "#,
         expect![[r#"
             foo([missing]) ->
-                'ok'.
+                ok.
         "#]],
     );
 }
@@ -984,7 +984,7 @@ foo(fun() -> ok end) -> ok.
 "#,
         expect![[r#"
             foo([missing]) ->
-                'ok'.
+                ok.
         "#]],
     );
 }
@@ -997,7 +997,7 @@ foo(<<Byte || Byte <- List>>, [Byte || Byte <- List]]) -> ok.
 "#,
         expect![[r#"
             foo([missing], [missing]) ->
-                'ok'.
+                ok.
         "#]],
     );
 }
@@ -1010,7 +1010,7 @@ foo(begin foo end) -> ok.
 "#,
         expect![[r#"
             foo([missing]) ->
-                'ok'.
+                ok.
         "#]],
     );
 }
@@ -1023,7 +1023,7 @@ foo(case X of _ -> ok end) -> ok.
 "#,
         expect![[r#"
             foo([missing]) ->
-                'ok'.
+                ok.
         "#]],
     );
 }
@@ -1036,7 +1036,7 @@ foo(fun erlang:self/0, fun foo/2) -> ok.
 "#,
         expect![[r#"
             foo([missing], [missing]) ->
-                'ok'.
+                ok.
         "#]],
     );
 }
@@ -1062,7 +1062,7 @@ foo(if true -> ok end) -> ok.
 "#,
         expect![[r#"
             foo([missing]) ->
-                'ok'.
+                ok.
         "#]],
     );
 }
@@ -1088,7 +1088,7 @@ foo(receive _ -> ok after X -> timeout end) -> ok.
 "#,
         expect![[r#"
             foo([missing]) ->
-                'ok'.
+                ok.
         "#]],
     );
 }
@@ -1101,7 +1101,7 @@ foo(try 1 of _ -> ok catch _ -> error end) -> ok.
 "#,
         expect![[r#"
             foo([missing]) ->
-                'ok'.
+                ok.
         "#]],
     );
 }
@@ -1132,8 +1132,8 @@ foo() ->
         expect![[r#"
             foo() ->
                 case X of
-                    'ok' ->
-                        'ok'
+                    ok ->
+                        ok
                 end.
         "#]],
     );
@@ -1159,7 +1159,7 @@ fn simple_type() {
 -type foo() :: ok.
 "#,
         expect![[r#"
-            -type foo() :: 'ok'.
+            -type foo() :: ok.
         "#]],
     );
 }
@@ -1171,7 +1171,7 @@ fn simple_nominal_type() {
 -nominal foo() :: ok.
 "#,
         expect![[r#"
-            -nominal foo() :: 'ok'.
+            -nominal foo() :: ok.
         "#]],
     );
 }
@@ -1183,7 +1183,7 @@ fn simple_opaque() {
 -opaque foo() :: ok.
 "#,
         expect![[r#"
-            -opaque foo() :: 'ok'.
+            -opaque foo() :: ok.
         "#]],
     );
 }
@@ -1219,7 +1219,7 @@ fn ann_type() {
 -type foo() :: A :: any().
 "#,
         expect![[r#"
-            -type foo() :: (A  :: 'erlang':'any'()).
+            -type foo() :: (A  :: erlang:any()).
         "#]],
     );
 }
@@ -1232,9 +1232,9 @@ fn list_type() {
 -type bar() :: [bar, ...].
 "#,
         expect![[r#"
-            -type foo() :: ['foo'].
+            -type foo() :: [foo].
 
-            -type bar() :: ['bar', ...].
+            -type bar() :: [bar, ...].
         "#]],
     );
 }
@@ -1247,9 +1247,9 @@ fn tuple_type() {
 "#,
         expect![[r#"
             -type foo() :: {
-                'a',
-                'b',
-                'c'
+                a,
+                b,
+                c
             }.
         "#]],
     );
@@ -1273,12 +1273,12 @@ fn map_type() {
         r#"
 -type foo() :: #{a => b, c := d}.
 "#,
-        expect![[r##"
+        expect![[r#"
             -type foo() :: #{
-                'a' => 'b',
-                'c' := 'd'
+                a => b,
+                c := d
             }.
-        "##]],
+        "#]],
     );
 }
 
@@ -1294,11 +1294,11 @@ fn fun_type() {
         expect![[r#"
             -type foo1() :: fun().
 
-            -type foo2() :: fun(() -> 'ok').
+            -type foo2() :: fun(() -> ok).
 
-            -type foo3() :: fun(('a', 'b') -> 'ok').
+            -type foo3() :: fun((a, b) -> ok).
 
-            -type foo4() :: fun((...) -> 'ok').
+            -type foo4() :: fun((...) -> ok).
         "#]],
     );
 }
@@ -1313,22 +1313,22 @@ fn union_type() {
 "#,
         expect![[r#"
             -type foo1() :: (
-                'a' |
-                'b'
+                a |
+                b
             ).
 
             -type foo2() :: (
-                'a' |
-                'b' |
-                'c'
+                a |
+                b |
+                c
             ).
 
             -type foo3() :: (
                 (
-                    'a' |
-                    'b'
+                    a |
+                    b
                 ) |
-                'c'
+                c
             ).
         "#]],
     );
@@ -1354,17 +1354,17 @@ fn call_type() {
 -type remote(A) :: module:remote(A | integer()).
 "#,
         expect![[r#"
-            -type local(A) :: 'local'(
+            -type local(A) :: local(
                 (
                     A |
-                    'erlang':'integer'()
+                    erlang:integer()
                 )
             ).
 
-            -type remote(A) :: 'module':'remote'(
+            -type remote(A) :: module:remote(
                 (
                     A |
-                    'erlang':'integer'()
+                    erlang:integer()
                 )
             ).
         "#]],
@@ -1379,8 +1379,8 @@ fn call_type_erlang_bif() {
 "#,
         expect![[r#"
             -type remote() :: (
-                'erlang':'pid'() |
-                'erlang':'pid'()
+                erlang:pid() |
+                erlang:pid()
             ).
         "#]],
     );
@@ -1398,7 +1398,7 @@ fn record_type() {
             -type foo1() :: #record{}.
 
             -type foo2(B) :: #record{
-                a :: 'erlang':'integer'(),
+                a :: erlang:integer(),
                 b :: B
             }.
 
@@ -1429,7 +1429,7 @@ fn simple_spec() {
 "#,
         expect![[r#"
             -spec foo
-                () -> 'ok'.
+                () -> ok.
         "#]],
     );
 }
@@ -1442,7 +1442,7 @@ fn simple_callback() {
 "#,
         expect![[r#"
             -callback foo
-                () -> 'ok'.
+                () -> ok.
         "#]],
     );
 }
@@ -1456,8 +1456,8 @@ fn multi_sig_spec() {
 "#,
         expect![[r#"
             -spec foo
-                ('erlang':'atom'()) -> 'erlang':'atom'();
-                ('erlang':'integer'()) -> 'erlang':'integer'().
+                (erlang:atom()) -> erlang:atom();
+                (erlang:integer()) -> erlang:integer().
         "#]],
     );
 }
@@ -1470,7 +1470,7 @@ fn ann_var_spec() {
 "#,
         expect![[r#"
             -spec foo
-                ((A  :: 'erlang':'any'())) -> 'ok'.
+                ((A  :: erlang:any())) -> ok.
         "#]],
     );
 }
@@ -1485,7 +1485,7 @@ fn guarded_spec() {
         expect![[r#"
             -spec foo
                 (A) -> A
-                    when A :: 'erlang':'any'().
+                    when A :: erlang:any().
         "#]],
     );
 }
@@ -1509,15 +1509,15 @@ fn record_definition() {
             }).
 
             -record(foo, {
-                field = 'value'
+                field = value
             }).
 
             -record(foo, {
-                field :: 'type'
+                field :: type
             }).
 
             -record(foo, {
-                field = 'value' :: 'type'
+                field = value :: type
             }).
         "#]],
     );
@@ -1531,7 +1531,7 @@ fn simple_term() {
 -missing_value().
 "#,
         expect![[r#"
-            -foo('ok').
+            -foo(ok).
 
             -missing_value([missing]).
         "#]],
@@ -1548,7 +1548,7 @@ fn tuple_term() {
             -foo({
                 1,
                 2,
-                'ok',
+                ok,
                 "abc"
             }).
         "#]],
@@ -1645,15 +1645,15 @@ fn binary_op_term() {
 "#,
         expect![[r#"
             -foo({
-                'foo',
+                foo,
                 1
             }).
 
             -compile({
-                'inline',
+                inline,
                 [
                     {
-                        'foo',
+                        foo,
                         1
                     }
                 ]
@@ -1701,7 +1701,7 @@ foo(1) -> 1;
             foo(1) ->
                 1;
             foo(_) ->
-                'ok'.
+                ok.
         "#]],
     );
 }
@@ -1720,7 +1720,7 @@ foo(1) -> 1.
                 1.
 
             bar(_) ->
-                'ok'.
+                ok.
         "#]],
     );
 }
@@ -1738,7 +1738,7 @@ foo(1) -> 1;
             foo(1) ->
                 1;
             foo(_) ->
-                'ok'.
+                ok.
         "#]],
     );
 }
@@ -1758,7 +1758,7 @@ fn expand_macro_function_multiple_clauses() {
             foo(1) ->
                 1;
             foo(_) ->
-                'ok'.
+                ok.
         "#]],
     );
 }
@@ -1781,7 +1781,7 @@ fn expand_macro_function_multiple_files() {
             foo(1) ->
                 1;
             foo(_) ->
-                'ok'.
+                ok.
         "#]],
     );
 }
@@ -1826,7 +1826,7 @@ foo() -> ?NAME(2).
 "#,
         expect![[r#"
             foo() ->
-                'name'(
+                name(
                     2
                 ).
         "#]],
@@ -1843,7 +1843,7 @@ foo() -> ?NAME(2).
 "#,
         expect![[r#"
             foo() ->
-                'module':'name'(
+                module:name(
                     2
                 ).
         "#]],
@@ -1862,7 +1862,7 @@ foo(?PAT) -> ok.
             foo([
                 _
             ]) ->
-                'ok'.
+                ok.
         "#]],
     );
 }
@@ -1879,7 +1879,7 @@ foo(?PAT(_)) -> ok.
             foo([
                 _
             ]) ->
-                'ok'.
+                ok.
         "#]],
     );
 }
@@ -1894,8 +1894,8 @@ fn expand_macro_type() {
 "#,
         expect![[r#"
             -type foo() :: (
-                'a' |
-                'b'
+                a |
+                b
             ).
         "#]],
     );
@@ -1910,7 +1910,7 @@ fn expand_macro_type_call() {
 -type foo() :: ?NAME().
 "#,
         expect![[r#"
-            -type foo() :: 'name'().
+            -type foo() :: name().
         "#]],
     );
 }
@@ -1924,7 +1924,7 @@ fn expand_macro_remote_type() {
 -type foo() :: ?NAME().
 "#,
         expect![[r#"
-            -type foo() :: 'module':'name'().
+            -type foo() :: module:name().
         "#]],
     );
 }
@@ -1939,8 +1939,8 @@ fn expand_macro_var_in_type() {
 "#,
         expect![[r#"
             -type foo() :: (
-                'a' |
-                'b'
+                a |
+                b
             ).
         "#]],
     );
@@ -1994,11 +1994,11 @@ foo() ->
 "#,
         expect![[r#"
             foo() ->
-                case 'bar'() of
-                    'ok' ->
-                        'ok';
+                case bar() of
+                    ok ->
+                        ok;
                     _ ->
-                        'error'
+                        error
                 end.
         "#]],
     );
@@ -2016,8 +2016,8 @@ foo() ->
 "#,
         expect![[r#"
             foo() ->
-                fun 'local'/1,
-                fun 'remote':'function'/2.
+                fun local/1,
+                fun remote:function/2.
         "#]],
     );
 }
@@ -2034,7 +2034,7 @@ foo() ->
         expect![[r#"
             foo() ->
                 #name{
-                    name = 'name'
+                    name = name
                 }.
         "#]],
     );
@@ -2055,28 +2055,28 @@ foo() ->
         expect![[r#"
             foo() ->
                 {
-                    'm1',
+                    m1,
                     {
-                        'm2',
+                        m2,
                         1,
                         {
-                            'm3',
+                            m3,
                             {
-                                'm3',
+                                m3,
                                 2
                             }
                         }
                     }
                 },
                 {
-                    'm1',
+                    m1,
                     {
-                        'm2',
+                        m2,
                         A,
                         {
-                            'm3',
+                            m3,
                             {
-                                'm3',
+                                m3,
                                 B
                             }
                         }
@@ -2093,8 +2093,8 @@ fn expand_built_in_function_name() {
 foo(?FUNCTION_NAME) -> ?FUNCTION_NAME.
 "#,
         expect![[r#"
-            foo('foo') ->
-                'foo'.
+            foo(foo) ->
+                foo.
         "#]],
     );
 
@@ -2104,7 +2104,7 @@ foo() -> ?FUNCTION_NAME().
 "#,
         expect![[r#"
             foo() ->
-                'foo'().
+                foo().
         "#]],
     );
 }
@@ -2201,10 +2201,10 @@ fn expand_built_in_module() {
 foo(?MODULE) -> ?MODULE.
 "#,
         expect![[r#"
-            -type foo() :: 'foobar'.
+            -type foo() :: foobar.
 
-            foo('foobar') ->
-                'foobar'.
+            foo(foobar) ->
+                foobar.
         "#]],
     );
 }
@@ -2318,19 +2318,19 @@ maybe
     A + B
 end."#,
         expect![[r#"
-        foo() ->
-            maybe
-                {
-                    'ok',
-                    A
-                } ?= 'a'(),
-                'true' = (A >= 0),
-                {
-                    'ok',
-                    B
-                } ?= 'b'(),
-                (A + B)
-            end.
+            foo() ->
+                maybe
+                    {
+                        ok,
+                        A
+                    } ?= a(),
+                    true = (A >= 0),
+                    {
+                        ok,
+                        B
+                    } ?= b(),
+                    (A + B)
+                end.
         "#]],
     );
 }
@@ -2349,22 +2349,22 @@ else
     Other when Other == 0 -> error
 end."#,
         expect![[r#"
-        foo() ->
-            maybe
-                {
-                    'ok',
+            foo() ->
+                maybe
+                    {
+                        ok,
+                        A
+                    } ?= a(),
+                    true = (A >= 0),
                     A
-                } ?= 'a'(),
-                'true' = (A >= 0),
-                A
-            else
-                'error' ->
-                    'error';
-                Other when
-                    (Other == 0)
-                ->
-                    'error'
-            end.
+                else
+                    error ->
+                        error;
+                    Other when
+                        (Other == 0)
+                    ->
+                        error
+                end.
         "#]],
     );
 }
@@ -2378,9 +2378,9 @@ fn fundecl_clauses_1() {
         "#,
         expect![[r#"
             foo(0) ->
-                'ok';
+                ok;
             foo(_) ->
-                'not_ok'.
+                not_ok.
         "#]],
     );
 }
@@ -2397,10 +2397,7 @@ fn triple_quoted_strings_1() {
         "#,
         expect![[r#"
             foo() ->
-                """
-                         hello
-                         there
-                         """.
+                "\"\"\"\n         hello\n         there\n         \"\"\"".
         "#]],
     );
 }
@@ -2418,11 +2415,7 @@ fn triple_quoted_strings_2() {
         "#,
         expect![[r#"
             foo() ->
-                """"""
-                         hello
-                          """
-                         there
-                         """""".
+                "\"\"\"\"\"\"\n         hello\n          \"\"\"\n         there\n         \"\"\"\"\"\"".
         "#]],
     );
 }
@@ -2456,7 +2449,7 @@ macro_rules! my_expect {
 const QUOTED_BINARY_EXPECT: &str = r#"
             f() ->
                 <<
-                    "ab\"c\"\u{7f}"/utf8
+                    "ab\"c\"\d"/utf8
                 >>.
         "#;
 
@@ -2570,7 +2563,7 @@ fn verbatim_binary_in_verbatim_sigil_tq_string() {
 
 const QUOTED_STRING_EXPECT: &str = r#"
             f() ->
-                "ab\"c\"\u{7f}".
+                "ab\"c\"\d".
         "#;
 
 #[test]
@@ -2686,7 +2679,7 @@ fn verbatim_binary_sigil_in_pat() {
             f(<<
                 "ab\"c\"\\d"/utf8
             >>) ->
-                'ok'.
+                ok.
         "#]],
     );
 }
@@ -2731,8 +2724,8 @@ fn lowering_with_error_nodes() {
             f(1a) -> ok begin 1 end.
         "#,
         expect![[r#"
-            f('a') ->
-                'ok'.
+            f(a) ->
+                ok.
         "#]],
     );
 }
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 8f285b5005..11d4b40971 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -26,6 +26,7 @@ mod intern;
 mod macro_exp;
 mod module_data;
 mod name;
+pub mod quote;
 pub mod resolver;
 pub mod sema;
 #[cfg(test)]
diff --git a/crates/hir/src/quote.rs b/crates/hir/src/quote.rs
new file mode 100644
index 0000000000..0dc09f79cb
--- /dev/null
+++ b/crates/hir/src/quote.rs
@@ -0,0 +1,293 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is dual-licensed under either the MIT license found in the
+ * LICENSE-MIT file in the root directory of this source tree or the Apache
+ * License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+ * of this source tree. You may select, at your option, one of the
+ * above-listed licenses.
+ */
+
+pub fn escape_and_quote_string(raw: &str) -> String {
+    escape_and_quote(StringLike::ListString, raw)
+}
+
+pub fn escape_and_quote_binary_string(raw: &str) -> String {
+    escape_and_quote(StringLike::BinaryString, raw)
+}
+
+pub fn escape_and_quote_atom(raw: &str) -> String {
+    escape_and_quote(StringLike::Atom, raw)
+}
+
+#[derive(Eq, PartialEq)]
+enum StringLike {
+    Atom,
+    ListString,
+    BinaryString,
+}
+
+// See reference implementation:
+// https://github.com/erlang/otp/blob/ae81b2f6ff2d541c01242f12cdbd5238aa4b26bd/lib/stdlib/src/io_lib.erl#L1120
+//
+// N.B. assumes Erlang's unicode mode
+fn escape_and_quote(kind: StringLike, raw: &str) -> String {
+    let mut result = String::with_capacity(raw.len());
+    // Open quotes
+    match kind {
+        StringLike::Atom if atom_needs_escape(raw) => result.push('\''),
+        StringLike::Atom => {}
+        StringLike::ListString => result.push('\"'),
+        StringLike::BinaryString => result.push_str("~\""),
+    }
+    // String-like contents
+    for char in raw.chars() {
+        match char {
+            '\n' => result.push_str(r"\n"),
+            '\t' => result.push_str(r"\t"),
+            '\r' => result.push_str(r"\r"),
+            '\x0B' => result.push_str(r"\v"),
+            '\x08' => result.push_str(r"\b"),
+            '\x0F' => result.push_str(r"\f"),
+            '\x1B' => result.push_str(r"\e"),
+            '\x7F' => result.push_str(r"\d"),
+            '\\' => result.push_str(r"\\"),
+            '\'' if kind == StringLike::Atom => {
+                result.push_str("\\'");
+            }
+            '\"' if kind == StringLike::BinaryString || kind == StringLike::ListString => {
+                result.push_str("\\\"");
+            }
+            _ if (' '..='~').contains(&char) => result.push(char),
+            _ if (char < '\u{00A0}') => {
+                result.push('\\');
+                result.push(char::from_u32((Into::<u32>::into(char) >> 6) + 48).unwrap());
+                result.push(char::from_u32(((Into::<u32>::into(char) >> 3) & 7) + 48).unwrap());
+                result.push(char::from_u32((Into::<u32>::into(char) & 7) + 48).unwrap());
+            }
+            _ => result.push(char),
+        }
+    }
+    // Close quotes
+    match kind {
+        StringLike::Atom if atom_needs_escape(raw) => result.push('\''),
+        StringLike::Atom => {}
+        StringLike::ListString => result.push('\"'),
+        StringLike::BinaryString => result.push('\"'),
+    }
+    result
+}
+
+// See: https://github.com/erlang/otp/blob/d04f6a0b261cf23e316e48e2febe14b30c592dc5/lib/stdlib/src/erl_scan.erl#L2272
+pub fn atom_is_reserved_word(raw: &str) -> bool {
+    match raw {
+        "after" => true,
+        "begin" => true,
+        "case" => true,
+        "try" => true,
+        "cond" => true,
+        "catch" => true,
+        "andalso" => true,
+        "orelse" => true,
+        "end" => true,
+        "fun" => true,
+        "if" => true,
+        "let" => true,
+        "of" => true,
+        "receive" => true,
+        "when" => true,
+        "bnot" => true,
+        "not" => true,
+        "div" => true,
+        "rem" => true,
+        "band" => true,
+        "and" => true,
+        "bor" => true,
+        "bxor" => true,
+        "bsl" => true,
+        "bsr" => true,
+        "or" => true,
+        "xor" => true,
+        _ => false,
+    }
+}
+
+pub fn atom_needs_escape(raw: &str) -> bool {
+    // TODO Handle erl_features too
+    if raw.is_empty() || atom_is_reserved_word(raw) {
+        true
+    } else {
+        // We already checked that the atom is not empty, so it's safe to unwrap the first char
+        let first_char = raw.chars().next().unwrap();
+        // First char is checked differently to subsequent chars:
+        // https://github.com/erlang/otp/blob/ae81b2f6ff2d541c01242f12cdbd5238aa4b26bd/lib/stdlib/src/io_lib.erl#L934
+        if first_char.is_ascii_lowercase()
+            || (('ß'..='ÿ').contains(&first_char) && first_char != '÷')
+        {
+            // See: https://github.com/erlang/otp/blob/ae81b2f6ff2d541c01242f12cdbd5238aa4b26bd/lib/stdlib/src/io_lib.erl#L943
+            !raw.chars().all(|char: char| {
+                char.is_ascii_lowercase()
+                    || (('ß'..='ÿ').contains(&char) && char != '÷')
+                    || char.is_ascii_uppercase()
+                    || (('À'..='Þ').contains(&char) && char != '×')
+                    || char.is_ascii_digit()
+                    || (char == '_')
+                    || (char == '@')
+            })
+        } else {
+            true
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    use expect_test::expect;
+
+    use crate::quote::escape_and_quote_atom;
+    use crate::quote::escape_and_quote_binary_string;
+    use crate::quote::escape_and_quote_string;
+
+    #[test]
+    fn check_simple_atom_that_does_not_need_quotes() {
+        expect![[r#"foo"#]].assert_eq(&escape_and_quote_atom("foo"))
+    }
+
+    #[test]
+    fn check_underscore_atom_does_not_need_quotes() {
+        expect![[r#"foo_bar"#]].assert_eq(&escape_and_quote_atom("foo_bar"))
+    }
+
+    #[test]
+    fn check_initial_underscore_atom_does_need_quotes() {
+        expect![[r#"'_foo_bar'"#]].assert_eq(&escape_and_quote_atom("_foo_bar"))
+    }
+
+    #[test]
+    fn check_lone_underscore_atom_does_need_quotes() {
+        expect![[r#"'_'"#]].assert_eq(&escape_and_quote_atom("_"))
+    }
+
+    #[test]
+    fn check_at_atom_does_not_need_quotes() {
+        expect![[r#"foo@bar"#]].assert_eq(&escape_and_quote_atom("foo@bar"))
+    }
+
+    #[test]
+    fn check_initial_at_atom_does_need_quotes() {
+        expect![[r#"'@foo'"#]].assert_eq(&escape_and_quote_atom("@foo"))
+    }
+
+    #[test]
+    fn check_lone_at_atom_does_need_quotes() {
+        expect![[r#"'@'"#]].assert_eq(&escape_and_quote_atom("@"))
+    }
+
+    #[test]
+    fn check_empty_atom_is_quoted() {
+        expect![[r#"''"#]].assert_eq(&escape_and_quote_atom(""))
+    }
+
+    #[test]
+    fn check_simple_string() {
+        expect![[r#""foo""#]].assert_eq(&escape_and_quote_string("foo"))
+    }
+
+    #[test]
+    fn check_simple_binary_string() {
+        expect![[r#"~"foo""#]].assert_eq(&escape_and_quote_binary_string("foo"))
+    }
+
+    #[test]
+    fn check_emoji_atom() {
+        expect![[r#"'🦹🏻‍♂️'"#]].assert_eq(&escape_and_quote_atom("🦹🏻‍♂️"))
+    }
+
+    #[test]
+    fn check_emoji_string() {
+        expect![[r#""🦹🏻‍♂️""#]].assert_eq(&escape_and_quote_string("🦹🏻‍♂️"))
+    }
+
+    #[test]
+    fn check_emoji_binary_string() {
+        expect![[r#"~"🦹🏻‍♂️""#]].assert_eq(&escape_and_quote_binary_string("🦹🏻‍♂️"))
+    }
+
+    #[test]
+    fn check_erlang_escape_chars_atom() {
+        expect![[r#"'\n\t\r\v\b\f\e\d'"#]]
+            .assert_eq(&escape_and_quote_atom("\n\t\r\x0B\x08\x0F\x1B\x7F"))
+    }
+
+    #[test]
+    fn check_erlang_escape_chars_string() {
+        expect![[r#""\n\t\r\v\b\f\e\d""#]]
+            .assert_eq(&escape_and_quote_string("\n\t\r\x0B\x08\x0F\x1B\x7F"))
+    }
+
+    #[test]
+    fn check_erlang_escape_chars_binary_string() {
+        expect![[r#"~"\n\t\r\v\b\f\e\d""#]].assert_eq(&escape_and_quote_binary_string(
+            "\n\t\r\x0B\x08\x0F\x1B\x7F",
+        ))
+    }
+
+    #[test]
+    fn check_erlang_backslash_char_atom() {
+        expect![[r#"'\\'"#]].assert_eq(&escape_and_quote_atom(r"\"))
+    }
+
+    #[test]
+    fn check_erlang_backslash_char_string() {
+        expect![[r#""\\""#]].assert_eq(&escape_and_quote_string(r"\"))
+    }
+
+    #[test]
+    fn check_erlang_backslash_char_binary_string() {
+        expect![[r#"~"\\""#]].assert_eq(&escape_and_quote_binary_string(r"\"))
+    }
+
+    #[test]
+    fn check_erlang_quote_char_atom() {
+        expect![[r#"'\''"#]].assert_eq(&escape_and_quote_atom(r"'"))
+    }
+
+    #[test]
+    fn check_erlang_quote_char_string() {
+        expect![[r#""\"""#]].assert_eq(&escape_and_quote_string("\""))
+    }
+
+    #[test]
+    fn check_erlang_quote_char_binary_string() {
+        expect![[r#"~"\"""#]].assert_eq(&escape_and_quote_binary_string("\""))
+    }
+
+    #[test]
+    fn check_needs_quote_for_simple_atom() {
+        assert!(!crate::quote::atom_needs_escape("foo"))
+    }
+
+    #[test]
+    fn check_needs_quote_for_empty_atom() {
+        assert!(crate::quote::atom_needs_escape(""))
+    }
+
+    #[test]
+    fn check_needs_quote_for_atom_with_special_characters() {
+        assert!(crate::quote::atom_needs_escape("foo bar"));
+        assert!(crate::quote::atom_needs_escape("foo÷bar"));
+        assert!(crate::quote::atom_needs_escape("foo😵‍💫bar"));
+        assert!(crate::quote::atom_needs_escape("foo'bar"))
+    }
+
+    #[test]
+    fn check_atom_is_reserved_keyword_true() {
+        assert!(crate::quote::atom_is_reserved_word("andalso"))
+    }
+
+    #[test]
+    fn check_atom_is_reserved_keyword_false() {
+        assert!(!crate::quote::atom_is_reserved_word("foo"))
+    }
+}
diff --git a/crates/ide/src/expand_macro.rs b/crates/ide/src/expand_macro.rs
index 8e0236aaed..95735a904d 100644
--- a/crates/ide/src/expand_macro.rs
+++ b/crates/ide/src/expand_macro.rs
@@ -116,7 +116,7 @@ bar() -> ?F~OO.
 "#,
             expect![[r#"
                 FOO
-                'foo'
+                foo
             "#]],
         );
     }
@@ -131,7 +131,7 @@ bar() -> ?F~OO.
 "#,
             expect![[r#"
                 FOO
-                ('foo' + 1)
+                (foo + 1)
             "#]],
         );
     }
@@ -146,7 +146,7 @@ bar() -> ?F~OO(4).
 "#,
             expect![[r#"
                 FOO/1
-                ('foo' + 4)
+                (foo + 4)
             "#]],
         );
     }
@@ -161,7 +161,7 @@ bar() -> ?F~OO(4,5).
 "#,
             expect![[r#"
                 FOO/2
-                ((('foo' + 4) + 5) + 1)
+                (((foo + 4) + 5) + 1)
             "#]],
         );
     }
@@ -176,7 +176,7 @@ bar() -> ?F~OO(4,(baz(42))).
 "#,
             expect![[r#"
                 FOO/2
-                ((('foo' + 4) + 'baz'(
+                (((foo + 4) + baz(
                     42
                 )) + 1)
             "#]],
@@ -217,7 +217,7 @@ bar() -> ?F~OO(4).
 "#,
             expect![[r#"
                 FOO/1
-                (('foo' + 4) + [missing])
+                ((foo + 4) + [missing])
             "#]],
         );
     }
@@ -233,7 +233,7 @@ bar() -> ?F~OO(4).
 "#,
             expect![[r#"
                 FOO/1
-                (('foo' + 4) + 'baz')
+                ((foo + 4) + baz)
             "#]],
         );
     }
@@ -250,7 +250,7 @@ bar() -> ?F~OO(4).
 "#,
             expect![[r#"
                 FOO/1
-                (('foo' + 4) + [missing])
+                ((foo + 4) + [missing])
             "#]],
         );
     }
@@ -267,7 +267,7 @@ bar() -> ?F~OO(4).
 "#,
             expect![[r#"
                 FOO/1
-                (('foo' + 4) + 'foo'(
+                ((foo + 4) + foo(
                     6
                 ))
             "#]],
@@ -338,36 +338,36 @@ baz() ->
                     fun
                         () ->
                             {
-                                'ok',
+                                ok,
                                 Actual
-                            } = 'lookup_mod':'get'(
-                                'a_mod':'get_val'(
+                            } = lookup_mod:get(
+                                a_mod:get_val(
                                     Alice
                                 ),
-                                'val'
+                                val
                             ),
                             [missing],
                             DebugComment = [
                                 {
-                                    'actual',
+                                    actual,
                                     Actual
                                 },
                                 {
-                                    'expected',
+                                    expected,
                                     []
                                 }
                             ],
                             SortFun = fun
                                 (A, B) ->
-                                    ('maps':'get'(
-                                        'code',
+                                    (maps:get(
+                                        code,
                                         A
-                                    ) =< 'maps':'get'(
-                                        'code',
+                                    ) =< maps:get(
+                                        code,
                                         B
                                     ))
                             end,
-                            'lists':'foreach'(
+                            lists:foreach(
                                 fun
                                     ({
                                         ExpectedVal,
@@ -375,25 +375,25 @@ baz() ->
                                     }) ->
                                         [missing],
                                         [missing],
-                                        ExpectedType = case 'val' of
-                                            'all' ->
-                                                'maps':'get'(
-                                                    'type',
+                                        ExpectedType = case val of
+                                            all ->
+                                                maps:get(
+                                                    type,
                                                     ExpectedVal,
-                                                    'missing_expected_type'
+                                                    missing_expected_type
                                                 );
                                             _ ->
-                                                'val'
+                                                val
                                         end,
                                         [missing],
                                         [missing]
                                 end,
-                                'lists':'zip'(
-                                    'lists':'sort'(
+                                lists:zip(
+                                    lists:sort(
                                         SortFun,
                                         []
                                     ),
-                                    'lists':'sort'(
+                                    lists:sort(
                                         SortFun,
                                         Actual
                                     )
@@ -428,15 +428,15 @@ baz() ->
 "#,
             expect![[r#"
                 assertQrs/3
-                ExpectedType = case 'qr_type_message' of
-                    'qr_type_all' ->
-                        'maps':'get'(
-                            'type',
+                ExpectedType = case qr_type_message of
+                    qr_type_all ->
+                        maps:get(
+                            type,
                             ExpectedQr,
-                            'missing_expected_type'
+                            missing_expected_type
                         );
                     _ ->
-                        'qr_type_message'
+                        qr_type_message
                 end
             "#]],
         );
@@ -463,7 +463,7 @@ baz() ->
                 FOO/1
                 case 3 of
                     1 ->
-                        'one';
+                        one;
                     _ ->
                         3
                 end
@@ -500,7 +500,7 @@ f() ->
 "#,
             expect![[r#"
                 C
-                'm':'f'()
+                m:f()
             "#]],
         );
     }
@@ -515,7 +515,7 @@ f() ->
 "#,
             expect![[r#"
                 C
-                'm':'f'(
+                m:f(
                     1,
                     2
                 )
@@ -566,7 +566,7 @@ get_partition(Who) ->
 "#,
             expect![[r#"
                 HASH_FUN
-                'wa_pg2':'hash'(
+                wa_pg2:hash(
                     Who,
                     5
                 )

From fb24c22520aeb197f40ec869a75a14acc49085f7 Mon Sep 17 00:00:00 2001
From: Tom Davies <tomdavies@meta.com>
Date: Mon, 8 Sep 2025 08:11:33 -0700
Subject: [PATCH 101/394] Add linter to find and fix expressions which could be
 string literals
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
Diagnostic and quick fix for simple string-related expressions which would generally be better as literals.

e.g.:

```erlang
fn() ->
    atom_to_list(foo).
%%  ^^^^^^^^^^^^^^^^^ 💡 information: Could be rewritten as a string literal.
```

becomes

```erlang
fn() ->
    "foo".
```

Reviewed By: alanz

Differential Revision: D81578353

fbshipit-source-id: 51d73cd4ad9c01b39d90f97115f89d8469bdea16
---
 crates/ide/src/diagnostics.rs                 |   5 +-
 .../diagnostics/could_be_a_string_literal.rs  | 997 ++++++++++++++++++
 crates/ide_db/src/diagnostic_code.rs          |   5 +-
 crates/ide_ssr/src/lib.rs                     |  10 +
 crates/ide_ssr/src/matching.rs                |  25 +
 website/docs/erlang-error-index/w/W0055.md    |  47 +
 6 files changed, 1087 insertions(+), 2 deletions(-)
 create mode 100644 crates/ide/src/diagnostics/could_be_a_string_literal.rs
 create mode 100644 website/docs/erlang-error-index/w/W0055.md

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 5e65ca5f45..22d8f7e133 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -89,6 +89,7 @@ mod application_env;
 mod atoms_exhaustion;
 mod binary_string_to_sigil;
 mod boolean_precedence;
+mod could_be_a_string_literal;
 mod cross_node_eval;
 mod debugging_function;
 mod dependent_header;
@@ -743,7 +744,8 @@ impl<T: SsrPatternsLinter> SsrPatternsDiagnostics for T {
     ) -> Vec<Diagnostic> {
         let mut res = Vec::new();
         for (pattern, context) in self.patterns() {
-            let matches = match_pattern_in_file_functions(sema, self.strategy(), file_id, &pattern);
+            let strategy = self.strategy();
+            let matches = match_pattern_in_file_functions(sema, strategy, file_id, &pattern);
             for matched in &matches.matches {
                 if Some(true) == self.is_match_valid(&context, matched, sema, file_id) {
                     let message = self.pattern_description(&context);
@@ -1348,6 +1350,7 @@ const SSR_PATTERN_LINTERS: &[&dyn SsrPatternsDiagnostics] = &[
     &unnecessary_fold_to_build_map::LINTER,
     &binary_string_to_sigil::LINTER,
     &unnecessary_map_to_list_in_comprehension::LINTER,
+    &could_be_a_string_literal::LINTER,
 ];
 
 /// Unified registry for all types of linters
diff --git a/crates/ide/src/diagnostics/could_be_a_string_literal.rs b/crates/ide/src/diagnostics/could_be_a_string_literal.rs
new file mode 100644
index 0000000000..0091f559f5
--- /dev/null
+++ b/crates/ide/src/diagnostics/could_be_a_string_literal.rs
@@ -0,0 +1,997 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is dual-licensed under either the MIT license found in the
+ * LICENSE-MIT file in the root directory of this source tree or the Apache
+ * License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+ * of this source tree. You may select, at your option, one of the
+ * above-listed licenses.
+ */
+
+use elp_ide_db::DiagnosticCode;
+use elp_ide_db::elp_base_db::FileId;
+use elp_ide_db::source_change::SourceChangeBuilder;
+use hir::Semantic;
+use hir::Strategy;
+use hir::StringVariant;
+use hir::fold::MacroStrategy;
+use hir::fold::ParenStrategy;
+use hir::quote::escape_and_quote_atom;
+use hir::quote::escape_and_quote_binary_string;
+use hir::quote::escape_and_quote_string;
+
+use crate::Assist;
+use crate::diagnostics::Linter;
+use crate::diagnostics::Severity;
+use crate::diagnostics::SsrPatternsLinter;
+use crate::fix;
+
+pub(crate) static LINTER: CouldBeAStringLiteralLinter = CouldBeAStringLiteralLinter;
+
+pub(crate) struct CouldBeAStringLiteralLinter;
+
+impl Linter for CouldBeAStringLiteralLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::CouldBeAStringLiteral
+    }
+
+    fn description(&self) -> String {
+        "Could be rewritten as a literal.".to_string()
+    }
+
+    fn severity(&self) -> Severity {
+        Severity::Information
+    }
+}
+
+const STRING_VAR: &str = "_@StringLike";
+
+#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
+pub(crate) enum StringKind {
+    List,
+    Binary,
+    Atom,
+}
+
+#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
+pub(crate) struct StringRewrite {
+    from: StringKind,
+    to: StringKind,
+}
+
+impl SsrPatternsLinter for CouldBeAStringLiteralLinter {
+    type Context = StringRewrite;
+
+    fn patterns(&self) -> Vec<(String, Self::Context)> {
+        vec![
+            (
+                format!("ssr: list_to_binary({STRING_VAR})."),
+                StringRewrite {
+                    from: StringKind::List,
+                    to: StringKind::Binary,
+                },
+            ),
+            (
+                format!("ssr: list_to_atom({STRING_VAR})."),
+                StringRewrite {
+                    from: StringKind::List,
+                    to: StringKind::Atom,
+                },
+            ),
+            (
+                format!("ssr: atom_to_list({STRING_VAR})."),
+                StringRewrite {
+                    from: StringKind::Atom,
+                    to: StringKind::List,
+                },
+            ),
+            (
+                format!("ssr: atom_to_binary({STRING_VAR})."),
+                StringRewrite {
+                    from: StringKind::Atom,
+                    to: StringKind::Binary,
+                },
+            ),
+        ]
+    }
+
+    fn pattern_description(&self, context: &Self::Context) -> String {
+        match context.to {
+            StringKind::List => "Could be rewritten as a string literal.".to_string(),
+            StringKind::Binary => "Could be rewritten as a binary string literal.".to_string(),
+            StringKind::Atom => "Could be rewritten as an atom literal.".to_string(),
+        }
+    }
+
+    fn is_match_valid(
+        &self,
+        context: &Self::Context,
+        matched: &elp_ide_ssr::Match,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<bool> {
+        if matched.range.file_id != file_id {
+            // We've somehow ended up with a match in a different file - this means we've
+            // accidentally expanded a macro from a different file, or some other complex case that
+            // gets hairy, so bail out.
+            return None;
+        }
+        if let Some(comments) = matched.comments(sema) {
+            // Avoid clobbering comments in the original source code
+            if !comments.is_empty() {
+                return None;
+            }
+        }
+
+        if let Some(true) = matched.placeholder_is_macro(sema, STRING_VAR) {
+            None
+        } else {
+            match context.from {
+                StringKind::List => Some(Option::is_some(
+                    &matched.placeholder_is_string(sema, STRING_VAR),
+                )),
+                StringKind::Binary => None, // Possible future work
+                StringKind::Atom => Some(Option::is_some(
+                    &matched.placeholder_is_atom(sema, STRING_VAR),
+                )),
+            }
+        }
+    }
+
+    fn fixes(
+        &self,
+        context: &Self::Context,
+        matched: &elp_ide_ssr::Match,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<Assist>> {
+        let unnecessary_non_literal_range = matched.range.range;
+        let mut builder = SourceChangeBuilder::new(file_id);
+        match *context {
+            StringRewrite {
+                from: StringKind::List,
+                to: StringKind::Binary,
+            } => {
+                if let StringVariant::Normal(list_string_value) =
+                    matched.placeholder_is_string(sema, STRING_VAR)?
+                {
+                    builder.replace(
+                        unnecessary_non_literal_range,
+                        escape_and_quote_binary_string(&list_string_value),
+                    );
+                    Some(vec![fix(
+                        "rewrite_as_a_binary_string_literal",
+                        "Rewrite as a binary string literal",
+                        builder.finish(),
+                        unnecessary_non_literal_range,
+                    )])
+                } else {
+                    None
+                }
+            }
+            StringRewrite {
+                from: StringKind::List,
+                to: StringKind::Atom,
+            } => {
+                if let StringVariant::Normal(list_string_value) =
+                    matched.placeholder_is_string(sema, STRING_VAR)?
+                {
+                    builder.replace(
+                        unnecessary_non_literal_range,
+                        escape_and_quote_atom(&list_string_value),
+                    );
+                    Some(vec![fix(
+                        "rewrite_as_an_atom_literal",
+                        "Rewrite as an atom literal",
+                        builder.finish(),
+                        unnecessary_non_literal_range,
+                    )])
+                } else {
+                    None
+                }
+            }
+            StringRewrite {
+                from: StringKind::Atom,
+                to: StringKind::List,
+            } => {
+                let atom = matched.placeholder_is_atom(sema, STRING_VAR)?;
+                builder.replace(
+                    unnecessary_non_literal_range,
+                    escape_and_quote_string(&atom.as_string(sema.db.upcast())),
+                );
+                Some(vec![fix(
+                    "rewrite_as_a_string_literal",
+                    "Rewrite as a string literal",
+                    builder.finish(),
+                    unnecessary_non_literal_range,
+                )])
+            }
+            StringRewrite {
+                from: StringKind::Atom,
+                to: StringKind::Binary,
+            } => {
+                let atom = matched.placeholder_is_atom(sema, STRING_VAR)?;
+                let list_string = escape_and_quote_binary_string(&atom.as_string(sema.db.upcast()));
+                builder.replace(unnecessary_non_literal_range, list_string);
+                Some(vec![fix(
+                    "rewrite_as_a_binary_string_literal",
+                    "Rewrite as a binary string literal",
+                    builder.finish(),
+                    unnecessary_non_literal_range,
+                )])
+            }
+            _ => None,
+        }
+    }
+
+    fn strategy(&self) -> Strategy {
+        Strategy {
+            // Macros are a form of documentation and normalization, so we should not inline them
+            macros: MacroStrategy::DoNotExpand,
+            parens: ParenStrategy::InvisibleParens,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    use expect_test::Expect;
+    use expect_test::expect;
+
+    use crate::diagnostics::Diagnostic;
+    use crate::diagnostics::DiagnosticCode;
+    use crate::tests;
+
+    fn filter(d: &Diagnostic) -> bool {
+        d.code == DiagnosticCode::CouldBeAStringLiteral
+    }
+
+    #[track_caller]
+    fn check_diagnostics(fixture: &str) {
+        tests::check_filtered_diagnostics(fixture, &filter)
+    }
+
+    #[track_caller]
+    fn check_fix(fixture_before: &str, fixture_after: Expect) {
+        tests::check_fix(fixture_before, fixture_after)
+    }
+
+    #[test]
+    fn detects_list_to_binary() {
+        check_diagnostics(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> list_to_binary("foo").
+         %%      ^^^^^^^^^^^^^^^^^^^^^ 💡 information: Could be rewritten as a binary string literal.
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([list_to_binary/1]).
+         list_to_binary(_List) -> error(not_impl).
+            "#,
+        )
+    }
+
+    #[test]
+    fn fixes_list_to_binary() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> li~st_to_binary("foo").
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([list_to_binary/1]).
+         list_to_binary(_List) -> error(not_impl).
+         "#,
+            expect![[r#"
+         -module(main).
+
+         fn() -> ~"foo".
+         
+         "#]],
+        )
+    }
+
+    #[test]
+    fn detects_list_to_binary_fully_qualified() {
+        check_diagnostics(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> erlang:list_to_binary("foo").
+         %%      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 information: Could be rewritten as a binary string literal.
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([list_to_binary/1]).
+         list_to_binary(_List) -> error(not_impl).
+            "#,
+        )
+    }
+
+    #[test]
+    fn fixes_list_to_binary_fully_qualified() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> erlang:li~st_to_binary("foo").
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([list_to_binary/1]).
+         list_to_binary(_List) -> error(not_impl).
+            "#,
+            expect![[r#"
+         -module(main).
+
+         fn() -> ~"foo".
+
+         "#]],
+        )
+    }
+
+    #[test]
+    fn detects_list_to_atom() {
+        check_diagnostics(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> list_to_atom("foo").
+         %%      ^^^^^^^^^^^^^^^^^^^ 💡 information: Could be rewritten as an atom literal.
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([list_to_atom/1]).
+         list_to_atom(_Atom) -> error(not_impl).
+            "#,
+        )
+    }
+
+    #[test]
+    fn fixes_list_to_atom() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> li~st_to_atom("foo").
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([list_to_atom/1]).
+         list_to_atom(_Atom) -> error(not_impl).
+            "#,
+            expect![[r#"
+         -module(main).
+
+         fn() -> foo.
+
+         "#]],
+        )
+    }
+
+    #[test]
+    fn detects_list_to_atom_fully_qualified() {
+        check_diagnostics(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> erlang:list_to_atom("foo").
+         %%      ^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 information: Could be rewritten as an atom literal.
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([list_to_atom/1]).
+         list_to_atom(_Atom) -> error(not_impl).
+            "#,
+        )
+    }
+
+    #[test]
+    fn fixes_list_to_atom_fully_qualified() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> erlang:li~st_to_atom("foo").
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([list_to_atom/1]).
+         list_to_atom(_Atom) -> error(not_impl).
+            "#,
+            expect![[r#"
+         -module(main).
+
+         fn() -> foo.
+
+         "#]],
+        )
+    }
+
+    #[test]
+    fn detects_atom_to_binary() {
+        check_diagnostics(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> atom_to_binary(foo).
+         %%      ^^^^^^^^^^^^^^^^^^^ 💡 information: Could be rewritten as a binary string literal.
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([atom_to_binary/1]).
+         atom_to_binary(_Atom) -> error(not_impl).
+            "#,
+        )
+    }
+
+    #[test]
+    fn fixes_atom_to_binary() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> atom_to_b~inary(foo).
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([atom_to_binary/1]).
+         atom_to_binary(_Atom) -> error(not_impl).
+            "#,
+            expect![[r#"
+         -module(main).
+
+         fn() -> ~"foo".
+
+         "#]],
+        )
+    }
+
+    #[test]
+    fn detects_atom_to_binary_fully_qualified() {
+        check_diagnostics(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> erlang:atom_to_binary(foo).
+         %%      ^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 information: Could be rewritten as a binary string literal.
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([atom_to_binary/1]).
+         atom_to_binary(_Atom) -> error(not_impl).
+            "#,
+        )
+    }
+
+    #[test]
+    fn fixes_atom_to_binary_fully_qualified() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> erlang:atom_to_~binary(foo).
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([atom_to_binary/1]).
+         atom_to_binary(_Atom) -> error(not_impl).
+            "#,
+            expect![[r#"
+         -module(main).
+
+         fn() -> ~"foo".
+
+         "#]],
+        )
+    }
+
+    #[test]
+    fn detects_atom_to_list() {
+        check_diagnostics(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> atom_to_list(foo).
+         %%      ^^^^^^^^^^^^^^^^^ 💡 information: Could be rewritten as a string literal.
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([atom_to_list/1]).
+         atom_to_list(_Atom) -> error(not_impl).
+            "#,
+        )
+    }
+
+    #[test]
+    fn fixes_atom_to_list() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> atom_~to_list(foo).
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([atom_to_list/1]).
+         atom_to_list(_Atom) -> error(not_impl).
+            "#,
+            expect![[r#"
+         -module(main).
+
+         fn() -> "foo".
+
+         "#]],
+        )
+    }
+
+    #[test]
+    fn detects_atom_to_list_fully_qualified() {
+        check_diagnostics(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> erlang:atom_to_list(foo).
+         %%      ^^^^^^^^^^^^^^^^^^^^^^^^ 💡 information: Could be rewritten as a string literal.
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([atom_to_list/1]).
+         atom_to_list(_Atom) -> error(not_impl).
+            "#,
+        )
+    }
+
+    #[test]
+    fn fixes_atom_to_list_fully_qualified() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> erlang:at~om_to_list(foo).
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([atom_to_list/1]).
+         atom_to_list(_Atom) -> error(not_impl).
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([atom_to_list/1]).
+         atom_to_list(_Atom) -> error(not_impl).
+            "#,
+            expect![[r#"
+         -module(main).
+
+         fn() -> "foo".
+
+         "#]],
+        )
+    }
+
+    #[test]
+    fn ignores_potential_literals_behind_macros() {
+        // Macros are a form of documentation and normalization, so we should not
+        // effectively inline them by rewriting them to some function of their expansion.
+        check_diagnostics(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         -define(STR(X), X).
+
+         fn() -> list_to_binary(?STR("foo")).
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([list_to_binary/1]).
+         list_to_binary(_List) -> error(not_impl).
+            "#,
+        );
+        check_diagnostics(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         -define(ATOM(X), X).
+
+         fn() -> atom_to_binary(?ATOM(foo)).
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([atom_to_binary/1]).
+         atom_to_binary(_Atom) -> error(not_impl).
+            "#,
+        );
+        check_diagnostics(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         -define(FOO(), "foo").
+
+         fn() -> list_to_binary(?FOO()).
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([list_to_binary/1]).
+         list_to_binary(_List) -> error(not_impl).
+            "#,
+        );
+        check_diagnostics(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         -define(FOO, "foo").
+
+         fn() -> list_to_binary(?FOO).
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([list_to_binary/1]).
+         list_to_binary(_List) -> error(not_impl).
+            "#,
+        );
+        check_diagnostics(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         -define(FOO, foo).
+
+         fn() -> atom_to_list(?FOO).
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([atom_to_list/1]).
+         atom_to_list(_Atom) -> error(not_impl).
+            "#,
+        )
+    }
+
+    // ================= Dealing with special characters =================
+
+    #[test]
+    fn fixes_list_to_binary_emoji() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> li~st_to_binary("fo🥰o").
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([list_to_binary/1]).
+         list_to_binary(_List) -> error(not_impl).
+            "#,
+            expect![[r#"
+         -module(main).
+
+         fn() -> ~"fo🥰o".
+
+         "#]],
+        )
+    }
+
+    #[test]
+    fn fixes_list_to_atom_emoji() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> li~st_to_atom("fo🦹🏻‍♂️o").
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([list_to_atom/1]).
+         list_to_atom(_List) -> error(not_impl).
+            "#,
+            expect![[r#"
+         -module(main).
+
+         fn() -> 'fo🦹🏻‍♂️o'.
+
+         "#]],
+        )
+    }
+
+    #[test]
+    fn fixes_atom_to_binary_emoji() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> atom_to_bina~ry('fo🦹🏻‍♂️o').
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([atom_to_binary/1]).
+         atom_to_binary(_Atom) -> error(not_impl).
+            "#,
+            expect![[r#"
+         -module(main).
+
+         fn() -> ~"fo🦹🏻‍♂️o".
+
+         "#]],
+        )
+    }
+
+    #[test]
+    fn fixes_atom_to_list_emoji() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> atom_~to_list('fo🦹🏻‍♂️o').
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([atom_to_list/1]).
+         atom_to_list(_Atom) -> error(not_impl).
+            "#,
+            expect![[r#"
+         -module(main).
+
+         fn() -> "fo🦹🏻‍♂️o".
+
+         "#]],
+        )
+    }
+
+    #[test]
+    fn fixes_list_to_binary_quotes() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> li~st_to_binary("\"'").
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([list_to_binary/1]).
+         list_to_binary(_List) -> error(not_impl).
+            "#,
+            expect![[r#"
+         -module(main).
+
+         fn() -> ~"\"'".
+
+         "#]],
+        )
+    }
+
+    #[test]
+    fn fixes_list_to_atom_quotes() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> li~st_to_atom("\"'").
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([list_to_atom/1]).
+         list_to_atom(_Atom) -> error(not_impl).
+            "#,
+            expect![[r#"
+         -module(main).
+
+         fn() -> '"\''.
+
+         "#]],
+        )
+    }
+
+    #[test]
+    fn fixes_atom_to_binary_quotes() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> atom_to_bin~ary('"\'').
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([atom_to_binary/1]).
+         atom_to_binary(_Atom) -> error(not_impl).
+            "#,
+            expect![[r#"
+         -module(main).
+
+         fn() -> ~"\"'".
+
+         "#]],
+        )
+    }
+
+    #[test]
+    fn fixes_atom_to_list_quotes() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> atom_~to_list('"\'').
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([atom_to_list/1]).
+         atom_to_list(_Atom) -> error(not_impl).
+            "#,
+            expect![[r#"
+         -module(main).
+
+         fn() -> "\"'".
+
+         "#]],
+        )
+    }
+
+    #[test]
+    fn fixes_list_to_binary_escapes() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> li~st_to_binary("A\sB\nC\tD").
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([list_to_binary/1]).
+         list_to_binary(_List) -> error(not_impl).
+            "#,
+            expect![[r#"
+         -module(main).
+
+         fn() -> ~"A B\nC\tD".
+
+         "#]],
+        )
+    }
+
+    #[test]
+    fn fixes_list_to_atom_escapes() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> li~st_to_atom("A\sB\nC\tD").
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([list_to_atom/1]).
+         list_to_atom(_Atom) -> error(not_impl).
+            "#,
+            expect![[r#"
+         -module(main).
+
+         fn() -> 'A B\nC\tD'.
+
+         "#]],
+        )
+    }
+
+    #[test]
+    fn fixes_atom_to_binary_escapes() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> atom_to_bin~ary('A\sB\nC\tD').
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([atom_to_binary/1]).
+         atom_to_binary(_Atom) -> error(not_impl).
+            "#,
+            expect![[r#"
+                -module(main).
+
+                fn() -> ~"A B\nC\tD".
+
+                "#]],
+        )
+    }
+
+    #[test]
+    fn fixes_atom_to_list_escapes() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> atom_~to_list('A\sB\nC\tD').
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([atom_to_list/1]).
+         atom_to_list(_Atom) -> error(not_impl).
+            "#,
+            expect![[r#"
+         -module(main).
+
+         fn() -> "A B\nC\tD".
+
+         "#]],
+        )
+    }
+
+    #[test]
+    fn fixes_list_to_atom_keyword_is_quoted() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> li~st_to_atom("orelse").
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([list_to_atom/1]).
+         list_to_atom(_Atom) -> error(not_impl).
+            "#,
+            expect![[r#"
+         -module(main).
+
+         fn() -> 'orelse'.
+
+         "#]],
+        )
+    }
+
+    #[test]
+    fn fixes_list_to_atom_underscore_is_quoted() {
+        check_fix(
+            r#"
+         //- /src/main.erl
+         -module(main).
+
+         fn() -> li~st_to_atom("_").
+
+         //- /src/erlang.erl
+         -module(erlang).
+         -export([list_to_atom/1]).
+         list_to_atom(_Atom) -> error(not_impl).
+            "#,
+            expect![[r#"
+         -module(main).
+
+         fn() -> '_'.
+
+         "#]],
+        )
+    }
+}
diff --git a/crates/ide_db/src/diagnostic_code.rs b/crates/ide_db/src/diagnostic_code.rs
index 2f91ab668e..9bda306e96 100644
--- a/crates/ide_db/src/diagnostic_code.rs
+++ b/crates/ide_db/src/diagnostic_code.rs
@@ -88,6 +88,7 @@ pub enum DiagnosticCode {
     NoCatch,
     NoErrorLogger,
     NoNoWarnSuppressions,
+    CouldBeAStringLiteral,
 
     // Wrapper for erlang service diagnostic codes
     ErlangService(String),
@@ -236,7 +237,7 @@ impl DiagnosticCode {
             DiagnosticCode::NoCatch => "W0052".to_string(),
             DiagnosticCode::NoErrorLogger => "W0053".to_string(),
             DiagnosticCode::NoNoWarnSuppressions => "W0054".to_string(),
-
+            DiagnosticCode::CouldBeAStringLiteral => "W0055".to_string(),
             DiagnosticCode::ErlangService(c) => c.to_string(),
             DiagnosticCode::Eqwalizer(c) => format!("eqwalizer: {c}"),
             DiagnosticCode::AdHoc(c) => format!("ad-hoc: {c}"),
@@ -332,6 +333,7 @@ impl DiagnosticCode {
             DiagnosticCode::NoCatch => "no_catch".to_string(),
             DiagnosticCode::NoErrorLogger => "no_error_logger".to_string(),
             DiagnosticCode::NoNoWarnSuppressions => "no_nowarn_suppressions".to_string(),
+            DiagnosticCode::CouldBeAStringLiteral => "could_be_a_binary_string_literal".to_string(),
 
             DiagnosticCode::ErlangService(c) => c.to_string(),
             DiagnosticCode::Eqwalizer(c) => c.to_string(),
@@ -422,6 +424,7 @@ impl DiagnosticCode {
             DiagnosticCode::RecordTupleMatch => true,
             DiagnosticCode::DebuggingFunction => true,
             DiagnosticCode::NonStandardIntegerFormatting => true,
+            DiagnosticCode::CouldBeAStringLiteral => true,
 
             // False
             DiagnosticCode::DefaultCodeForEnumIter => false,
diff --git a/crates/ide_ssr/src/lib.rs b/crates/ide_ssr/src/lib.rs
index db521cff62..826bec641f 100644
--- a/crates/ide_ssr/src/lib.rs
+++ b/crates/ide_ssr/src/lib.rs
@@ -618,6 +618,16 @@ impl Match {
         let body = self.matched_node_body.get_body(sema)?;
         placeholder_match.is_var(&body)
     }
+
+    pub fn placeholder_is_macro(&self, sema: &Semantic, placeholder_name: &str) -> Option<bool> {
+        let body = self.matched_node_body.get_body(sema)?;
+        let body_with_visible_macros = body.index_with_strategy(Strategy {
+            macros: MacroStrategy::DoNotExpand,
+            parens: ParenStrategy::InvisibleParens,
+        });
+        let placeholder_match = self.get_placeholder_match(sema, placeholder_name)?;
+        placeholder_match.is_macro(&body_with_visible_macros)
+    }
 }
 
 pub struct MatchDebugInfo {
diff --git a/crates/ide_ssr/src/matching.rs b/crates/ide_ssr/src/matching.rs
index b60100fe4d..2ec0e192ed 100644
--- a/crates/ide_ssr/src/matching.rs
+++ b/crates/ide_ssr/src/matching.rs
@@ -218,6 +218,31 @@ impl PlaceholderMatch {
         }
     }
 
+    // N.B. that if the body was not indexed with macros included, you definitely will not find any!
+    // As such, if you want to find macros you will need to make sure you used `MacroStrategy::DoNotExpand`
+    // or `MacroStrategy::ExpandButIncludeMacroCall` when constructing the `Body` given as an argument here.
+    pub fn is_macro(&self, body: &FoldBody) -> Option<bool> {
+        match self.code_id {
+            SubId::AnyExprId(AnyExprId::Expr(expr_id)) => match &body[expr_id] {
+                Expr::MacroCall { .. } => Some(true),
+                _ => Some(false),
+            },
+            SubId::AnyExprId(AnyExprId::Pat(pat_id)) => match &body[pat_id] {
+                Pat::MacroCall { .. } => Some(true),
+                _ => Some(false),
+            },
+            SubId::AnyExprId(AnyExprId::TypeExpr(type_expr_id)) => match &body[type_expr_id] {
+                TypeExpr::MacroCall { .. } => Some(true),
+                _ => Some(false),
+            },
+            SubId::AnyExprId(AnyExprId::Term(term_id)) => match &body[term_id] {
+                Term::MacroCall { .. } => Some(true),
+                _ => Some(false),
+            },
+            _ => Some(false),
+        }
+    }
+
     /// Return any comments on the matched item
     pub fn comments(&self, sema: &Semantic, body_map: &BodySourceMap) -> Option<Vec<ast::Comment>> {
         match self.code_id {
diff --git a/website/docs/erlang-error-index/w/W0055.md b/website/docs/erlang-error-index/w/W0055.md
new file mode 100644
index 0000000000..b0a18051e2
--- /dev/null
+++ b/website/docs/erlang-error-index/w/W0055.md
@@ -0,0 +1,47 @@
+---
+sidebar_position: 55
+---
+
+# W0055 - Could be a string literal
+
+## Information
+
+```erlang
+-module(example).
+
+foo() ->
+    atom_to_list(foo).
+%%  ^^^^^^^^^^^^^^^^^ 💡 information: Could be rewritten as a string literal.
+
+bar() ->
+    atom_to_binary(bar).
+%%  ^^^^^^^^^^^^^^^^^^^ 💡 information: Could be rewritten as a binary string literal.
+
+baz() ->
+    list_to_atom("baz").
+%%  ^^^^^^^^^^^^^^^^^^^ 💡 information: Could be rewritten as an atom literal.
+```
+
+This diagnostic is triggered when a string or atom literal is immediately converted to a
+different string or atom type.
+
+Whilst the compiler will often optimise these conversions away, it is still good practice to
+to use the literal type that is most appropriate for the context in order to keep the code
+clear and concise.
+
+## Fix
+
+Rewrite the value as a literal of the appropriate type.
+
+```erlang
+-module(example).
+
+foo() ->
+    "foo".
+
+bar() ->
+    ~"bar".
+
+baz() ->
+    baz.
+```

From 5ee11110752414ae988258e61fb80179fb442e55 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 10 Sep 2025 03:26:26 -0700
Subject: [PATCH 102/394] Mitigate false positive undefined function for lager

Summary:
We received various reports of false positives for the `W0017` (`undefined_function`) linter. In both cases this was due to the usage of the [`lager`](https://github.com/erlang-lager/lager) logging library, which relies on a parse transformation, causing functions such as `lager:warning/X` or `lager:error/X` to be recognized as undefined.

While the medium-term plan is to allow linters to get a custom config such as:

```
[linters.undefined_function]
excludes = [
  "lager",
  "some:call",
  "some:other/3"
]
```

For the time being, add `lager` to the hard-coded exclusion list, to mitigate the issue, reducing noise for end users.

Reviewed By: TD5

Differential Revision: D82094926

fbshipit-source-id: e73eb0ca4315a17e63d35938801badd44d7ac7fd
---
 crates/hir/src/name.rs                           |  1 +
 crates/ide/src/diagnostics/undefined_function.rs | 14 ++++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/crates/hir/src/name.rs b/crates/hir/src/name.rs
index 8444289e83..00ce2f89f1 100644
--- a/crates/hir/src/name.rs
+++ b/crates/hir/src/name.rs
@@ -262,6 +262,7 @@ pub mod known {
         handle,
         hidden,
         is_record,
+        lager,
         main,
         module_info,
         ok,
diff --git a/crates/ide/src/diagnostics/undefined_function.rs b/crates/ide/src/diagnostics/undefined_function.rs
index a32bb9765c..9ae17f53a2 100644
--- a/crates/ide/src/diagnostics/undefined_function.rs
+++ b/crates/ide/src/diagnostics/undefined_function.rs
@@ -148,8 +148,10 @@ fn is_automatically_added(sema: &Semantic, module: Module, function: &Expr, arit
     function_name_is_behaviour_info && arity == 1 && module_has_callbacks_defined
 }
 
+// T237551085: Once linters can take a custom configuration via the TOML files, move this to a config
 fn in_exclusion_list(sema: &Semantic, module: &Expr, function: &Expr, arity: u32) -> bool {
     sema.is_atom_named(function, &known::module_info) && (arity == 0 || arity == 1)
+        || sema.is_atom_named(module, &known::lager)
         || sema.is_atom_named(module, &known::graphql_scanner)
         || sema.is_atom_named(module, &known::graphql_parser)
         || sema.is_atom_named(module, &known::thrift_scanner)
@@ -593,4 +595,16 @@ private() -> ok.
             "#,
         )
     }
+
+    #[test]
+    fn test_exclusion_list() {
+        check_diagnostics(
+            r#"
+    //- /src/main.erl
+    -module(main).
+    main() ->
+      lager:warning("Some ~p", [Message]).
+            "#,
+        )
+    }
 }

From ff9c0b89c838f12d12735cc1a6dc391c7a82282c Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 11 Sep 2025 06:06:54 -0700
Subject: [PATCH 103/394] Add support for interactive debugging for rebar3
 projects

Summary:
This diff brings feature parity when it comes to code lenses between `rebar3` and `buck2` projects. Specifically:

* Adds the `openInteractive` command to the OSS extension, which starts a rebar3 shell
* Adds the `debugInteractive` command to the OSS extension, which starts a rebar3 shell in debug mode (no tests are run)
* Adds the `runInteractive` command to the OSS extension, which runs the test in an open shell (either a debugging one or not)
* It enables the "debug" and "interactive" lenses by default
* It adds some extra logging

Reviewed By: alanz

Differential Revision: D82101533

fbshipit-source-id: cb051a1b6a968bc603d81d7045bfd9e34ddb5b73
---
 crates/elp/src/lsp_ext.rs           | 20 +++++++-
 crates/elp/src/to_proto.rs          | 74 +++++++++++++++++++++--------
 editors/code/client/src/commands.ts | 68 ++++++++++++++++++++++++--
 editors/code/package.json           |  4 +-
 4 files changed, 140 insertions(+), 26 deletions(-)

diff --git a/crates/elp/src/lsp_ext.rs b/crates/elp/src/lsp_ext.rs
index ed6c655a75..30b4536223 100644
--- a/crates/elp/src/lsp_ext.rs
+++ b/crates/elp/src/lsp_ext.rs
@@ -148,11 +148,10 @@ impl Runnable {
         }
     }
 
-    pub fn rebar3_test(
+    pub fn rebar3_ct(
         runnable: elp_ide::Runnable,
         location: Option<lsp_types::LocationLink>,
         workspace_root: PathBuf,
-        _coverage_enabled: bool,
     ) -> Self {
         Self {
             label: "Rebar3".to_string(),
@@ -165,6 +164,23 @@ impl Runnable {
             }),
         }
     }
+
+    pub fn rebar3_shell(
+        _runnable: elp_ide::Runnable,
+        location: Option<lsp_types::LocationLink>,
+        workspace_root: PathBuf,
+    ) -> Self {
+        Self {
+            label: "Rebar3".to_string(),
+            location,
+            kind: RunnableKind::Rebar3,
+            args: RunnableArgs::Rebar3(Rebar3RunnableArgs {
+                workspace_root,
+                command: "as".to_string(),
+                args: vec!["test".to_string(), "shell".to_string()],
+            }),
+        }
+    }
 }
 
 #[derive(Serialize, Deserialize, Debug)]
diff --git a/crates/elp/src/to_proto.rs b/crates/elp/src/to_proto.rs
index fe98d1c9a3..f9263cfcab 100644
--- a/crates/elp/src/to_proto.rs
+++ b/crates/elp/src/to_proto.rs
@@ -641,19 +641,16 @@ pub(crate) fn buck2_test_runnable(
     )
 }
 
-pub(crate) fn rebar3_test_runnable(
-    snap: &Snapshot,
-    runnable: Runnable,
-    coverage_enabled: bool,
-) -> lsp_ext::Runnable {
+pub(crate) fn rebar3_ct_runnable(snap: &Snapshot, runnable: Runnable) -> lsp_ext::Runnable {
     let file_id = runnable.nav.file_id;
     let location = location_link(snap, None, runnable.clone().nav).ok();
-    lsp_ext::Runnable::rebar3_test(
-        runnable,
-        location,
-        snap.workspace_root(file_id).into(),
-        coverage_enabled,
-    )
+    lsp_ext::Runnable::rebar3_ct(runnable, location, snap.workspace_root(file_id).into())
+}
+
+pub(crate) fn rebar3_shell_runnable(snap: &Snapshot, runnable: Runnable) -> lsp_ext::Runnable {
+    let file_id = runnable.nav.file_id;
+    let location = location_link(snap, None, runnable.clone().nav).ok();
+    lsp_ext::Runnable::rebar3_shell(runnable, location, snap.workspace_root(file_id).into())
 }
 
 pub(crate) fn buck2_run_runnable(
@@ -756,9 +753,34 @@ pub(crate) fn code_lens(
                     }
                 }
                 ProjectBuildData::Rebar(_) => {
-                    let r = rebar3_test_runnable(snap, run.clone(), lens_config.run_coverage);
+                    let ct_runnable = rebar3_ct_runnable(snap, run.clone());
+                    let shell_runnable = rebar3_shell_runnable(snap, run.clone());
+                    if lens_config.run_interactive {
+                        match run.kind {
+                            RunnableKind::Suite { .. } => {
+                                let command = command::open_interactive(
+                                    &shell_runnable,
+                                    run_interactive_title,
+                                );
+                                acc.push(lsp_types::CodeLens {
+                                    range: annotation_range,
+                                    command: Some(command),
+                                    data: None,
+                                });
+                            }
+                            RunnableKind::Test { .. } => {
+                                let command =
+                                    command::run_interactive(&ct_runnable, run_interactive_title);
+                                acc.push(lsp_types::CodeLens {
+                                    range: annotation_range,
+                                    command: Some(command),
+                                    data: None,
+                                });
+                            }
+                        }
+                    }
                     if lens_config.run {
-                        let run_command = command::run_single(&r, run_title);
+                        let run_command = command::run_single(&ct_runnable, run_title);
                         acc.push(lsp_types::CodeLens {
                             range: annotation_range,
                             command: Some(run_command),
@@ -766,12 +788,26 @@ pub(crate) fn code_lens(
                         });
                     }
                     if lens_config.debug {
-                        let debug_command = command::debug_single(&r, debug_title);
-                        acc.push(lsp_types::CodeLens {
-                            range: annotation_range,
-                            command: Some(debug_command),
-                            data: None,
-                        });
+                        match run.kind {
+                            RunnableKind::Suite { .. } => {
+                                let debug_command =
+                                    command::debug_interactive(&ct_runnable, debug_title);
+                                acc.push(lsp_types::CodeLens {
+                                    range: annotation_range,
+                                    command: Some(debug_command),
+                                    data: None,
+                                });
+                            }
+                            RunnableKind::Test { .. } => {
+                                let debug_command =
+                                    command::debug_single(&ct_runnable, debug_title);
+                                acc.push(lsp_types::CodeLens {
+                                    range: annotation_range,
+                                    command: Some(debug_command),
+                                    data: None,
+                                });
+                            }
+                        }
                     }
                 }
                 ProjectBuildData::Static(_) => {}
diff --git a/editors/code/client/src/commands.ts b/editors/code/client/src/commands.ts
index 56ca7e8547..04984626b3 100644
--- a/editors/code/client/src/commands.ts
+++ b/editors/code/client/src/commands.ts
@@ -12,6 +12,7 @@ import * as vscode from 'vscode';
 import * as dapConfig from './dapConfig';
 import * as edbDebugger from './debugger';
 import { LanguageClient } from 'vscode-languageclient/node';
+import { outputChannel } from './logging';
 
 export type Runnable = {
     label: string;
@@ -32,6 +33,11 @@ export type CommonRunnableArgs = {
     workspaceRoot: string;
 };
 
+const log = outputChannel();
+
+const EDB_SHELL_TITLE = "EDB Shell";
+const REBAR3_SHELL_TITLE = "elp: Rebar3";
+
 export function registerCommands(context: vscode.ExtensionContext, client: LanguageClient) {
     context.subscriptions.push(
         vscode.commands.registerCommand(
@@ -43,7 +49,25 @@ export function registerCommands(context: vscode.ExtensionContext, client: Langu
         vscode.commands.registerCommand(
             'elp.debugSingle',
             async (runnable: Runnable) => {
-                await debugSingle(runnable);
+                await debug(runnable, false);
+            },
+        ),
+        vscode.commands.registerCommand(
+            'elp.openInteractive',
+            async (runnable: Runnable) => {
+                await openInteractive(runnable);
+            },
+        ),
+        vscode.commands.registerCommand(
+            'elp.debugInteractive',
+            async (runnable: Runnable) => {
+                await debug(runnable, true);
+            },
+        ),
+        vscode.commands.registerCommand(
+            'elp.runInteractive',
+            async (runnable: Runnable) => {
+                await runInteractive(runnable);
             },
         ),
         vscode.commands.registerCommand(
@@ -56,6 +80,7 @@ export function registerCommands(context: vscode.ExtensionContext, client: Langu
 }
 
 export function runSingle(runnable: Runnable): Thenable<vscode.TaskExecution> {
+    log.appendLine(`Run single: ${runnable.kind}`);
     const task = createTask(runnable);
     task.group = vscode.TaskGroup.Build;
     task.presentationOptions = {
@@ -67,6 +92,37 @@ export function runSingle(runnable: Runnable): Thenable<vscode.TaskExecution> {
     return vscode.tasks.executeTask(task);
 }
 
+export async function runInteractive(runnable: Runnable): Promise<void> {
+  const terminal = vscode.window.terminals.find(
+    terminal => terminal.name.includes(REBAR3_SHELL_TITLE) || terminal.name.includes(EDB_SHELL_TITLE),
+  );
+  const run_cmd = `r3:do(\"ct ${runnable.args.args.join(" ")}\").`;
+  if (terminal) {
+    terminal.show();
+    terminal.sendText(run_cmd);
+  } else {
+    await vscode.window
+      .showInformationMessage('No active REPL. Open one, first.', 'Open REPL')
+      .then(async selection => {
+        if (selection === 'Open REPL') {
+          await vscode.commands.executeCommand("elp.openInteractive");
+        }
+      });
+  }
+}
+
+export function openInteractive(runnable: Runnable): Thenable<vscode.TaskExecution> {
+  const task = createTask(runnable);
+  task.group = vscode.TaskGroup.Build;
+  task.presentationOptions = {
+    reveal: vscode.TaskRevealKind.Always,
+    panel: vscode.TaskPanelKind.Dedicated,
+    clear: true,
+  };
+  const command = [runnable.args.command, ...runnable.args.args].join(' ');
+  return vscode.tasks.executeTask(task);
+}
+
 export function createTask(runnable: Runnable): vscode.Task {
     const command = runnable.kind;
     const args = [runnable.args.command, ...runnable.args.args];
@@ -105,17 +161,22 @@ export function buildTask(
     return new vscode.Task(definition, vscode.TaskScope.Workspace, name, task_source, exec, []);
 }
 
-export async function debugSingle(runnable: Runnable): Promise<void> {
+export async function debug(runnable: Runnable, interactive: boolean): Promise<void> {
+    log.appendLine(`Debug: ${runnable.kind}, interactive: ${interactive}`);
+    const cmd = interactive
+        ? 'ok'
+        : `Agent = self(), spawn(fun() -> catch gen_server:call(Agent, {cmd, default, ct, \"${runnable.args.args.join(" ")}\"}, infinity), erlang:halt(0) end)`;
     const debugConfiguration = {
         type: edbDebugger.DEBUG_TYPE,
         name: 'Erlang EDB',
         request: 'launch',
         runInTerminal: {
             kind: "integrated",
+            title: EDB_SHELL_TITLE,
             cwd: "${workspaceFolder}",
             args: ["bash", "-c", "rebar3 as test shell --eval \"$EDB_DAP_NODE_INIT, $REBAR3_SHELL_CT_RUN_CMD\""],
             env: {
-                REBAR3_SHELL_CT_RUN_CMD: `Agent = self(), spawn(fun() -> catch gen_server:call(Agent, {cmd, default, ct, \"${runnable.args.args.join(" ")}\"}, infinity), erlang:halt(0) end)`,
+                REBAR3_SHELL_CT_RUN_CMD: cmd,
                 "PATH": dapConfig.withErlangInstallationPath(),
             },
             argsCanBeInterpretedByShell: false,
@@ -126,5 +187,6 @@ export async function debugSingle(runnable: Runnable): Promise<void> {
             timeout: 60,
         },
     };
+    log.appendLine(JSON.stringify(debugConfiguration, null, 2));
     await vscode.debug.startDebugging(undefined, debugConfiguration);
 }
diff --git a/editors/code/package.json b/editors/code/package.json
index 62f7339aae..87ab7d9e3f 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -307,7 +307,7 @@
           "type": "boolean"
         },
         "elp.lens.debug.enable": {
-          "default": false,
+          "default": true,
           "markdownDescription": "Whether to show the `Debug` lenses. Only applies when\n`#elp.lens.enable#` is set.",
           "type": "boolean"
         },
@@ -332,7 +332,7 @@
           "type": "boolean"
         },
         "elp.lens.run.interactive.enable": {
-          "default": false,
+          "default": true,
           "markdownDescription": "Whether to show the `Run Interactive` lenses. Only applies when\n`#elp.lens.enable#` is set.",
           "type": "boolean"
         },

From 2edd91934fc75df8b7a313861b757d26833d1738 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 11 Sep 2025 08:15:04 -0700
Subject: [PATCH 104/394] Bump OSS VS Code extension for imminent release

Summary: Bump the extension to `0.41.0`.

Reviewed By: mapoulin

Differential Revision: D82220520

fbshipit-source-id: b33f40d92919bdedfeee5fb4c65875d0c6159623
---
 editors/code/package-lock.json | 4 ++--
 editors/code/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 48f3d8bf01..98c19db4c7 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "erlang-language-platform",
-  "version": "0.40.0",
+  "version": "0.41.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "erlang-language-platform",
-      "version": "0.40.0",
+      "version": "0.41.0",
       "hasInstallScript": true,
       "license": "Apache2",
       "devDependencies": {
diff --git a/editors/code/package.json b/editors/code/package.json
index 87ab7d9e3f..840dc20ae3 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -3,7 +3,7 @@
   "description": "Erlang language server",
   "author": "Meta Platforms, Inc",
   "license": "Apache2",
-  "version": "0.40.0",
+  "version": "0.41.0",
   "icon": "images/elp-logo-color.png",
   "homepage": "https://whatsapp.github.io/erlang-language-platform/",
   "repository": {

From 981d2546286ba020193a0c8e82dc256cf1df44e1 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Thu, 11 Sep 2025 08:45:47 -0700
Subject: [PATCH 105/394] Add tasks for common ELP dev actions

Summary:
VS Code allows project-specific tasks to be configured for a project.

Add some ones for ELP development on an OD, so the various build flavours and clippy checks can be invoked.

Reviewed By: TD5

Differential Revision: D82212928

fbshipit-source-id: daf2502db247ca60f216ec84a7bbae0f54f29225
---
 .vscode/tasks.json | 89 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 .vscode/tasks.json

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 0000000000..e3040f1a5f
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,89 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "ELP: build (debug)",
+            "type": "shell",
+            "command": "/data/sandcastle/boxes/fbsource/fbcode/whatsapp/elp/meta/cargo.sh build",
+            "group": {
+                "kind": "build",
+                "is_default": true,
+
+            },
+            "presentation": {
+                "reveal": "always",
+                "panel": "new"
+            }
+        },
+        {
+            "label": "ELP: build (release)",
+            "type": "shell",
+            "command": "/data/sandcastle/boxes/fbsource/fbcode/whatsapp/elp/meta/cargo.sh build --release",
+            "group": {
+                "kind": "build",
+                "is_default": true,
+
+            },
+            "presentation": {
+                "reveal": "always",
+                "panel": "new"
+            }
+        },
+        {
+            "label": "ELP: build (release-thin)",
+            "type": "shell",
+            "command": "/data/sandcastle/boxes/fbsource/fbcode/whatsapp/elp/meta/cargo.sh build --profile release-thin --bins",
+            "group": {
+                "kind": "build",
+                "is_default": true,
+
+            },
+            "presentation": {
+                "reveal": "always",
+                "panel": "new"
+            }
+        },
+        {
+            "label": "ELP: run clippy on workspace",
+            "type": "shell",
+            "command": "/data/sandcastle/boxes/fbsource/fbcode/whatsapp/elp/meta/clippy.sh --workspace --tests",
+            "group": {
+                "kind": "build",
+                "is_default": true,
+
+            },
+            "presentation": {
+                "reveal": "always",
+                "panel": "new"
+            }
+        },
+        {
+            "label": "ELP: run clippy on workspace, apply fixes",
+            "type": "shell",
+            "command": "/data/sandcastle/boxes/fbsource/fbcode/whatsapp/elp/meta/clippy.sh --workspace --tests --fix",
+            "group": {
+                "kind": "build",
+                "is_default": true,
+
+            },
+            "presentation": {
+                "reveal": "always",
+                "panel": "new"
+            }
+        },
+        {
+            "label": "ELP: run tests on workspace",
+            "type": "shell",
+            "command": "/data/sandcastle/boxes/fbsource/fbcode/whatsapp/elp/meta/cargo.sh test --workspace",
+            "group": {
+                "kind": "build",
+                "is_default": true,
+
+            },
+            "presentation": {
+                "reveal": "always",
+                "panel": "new"
+            }
+        },
+    ]
+}

From 92a009df6363742c99e2377c8f66776d322d2925 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 12 Sep 2025 02:39:39 -0700
Subject: [PATCH 106/394] Make tasks.json work for internal and OSS usage

Summary: Use relative paths to invoke the meta-specific commands, and provide alternatives using `cargo`, configured via Shipit

Reviewed By: robertoaloi

Differential Revision: D82296502

fbshipit-source-id: 854591848d4c5212cf0cd0eda57559acf5cc7411
---
 .vscode/tasks.json | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index e3040f1a5f..51f0340659 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -4,7 +4,8 @@
         {
             "label": "ELP: build (debug)",
             "type": "shell",
-            "command": "/data/sandcastle/boxes/fbsource/fbcode/whatsapp/elp/meta/cargo.sh build",
+            // @fb-only
+            "command": "cargo build", // @oss-only
             "group": {
                 "kind": "build",
                 "is_default": true,
@@ -18,7 +19,8 @@
         {
             "label": "ELP: build (release)",
             "type": "shell",
-            "command": "/data/sandcastle/boxes/fbsource/fbcode/whatsapp/elp/meta/cargo.sh build --release",
+            // @fb-only
+            "command": "cargo build --release", // @oss-only
             "group": {
                 "kind": "build",
                 "is_default": true,
@@ -32,7 +34,8 @@
         {
             "label": "ELP: build (release-thin)",
             "type": "shell",
-            "command": "/data/sandcastle/boxes/fbsource/fbcode/whatsapp/elp/meta/cargo.sh build --profile release-thin --bins",
+            // @fb-only
+            "command": "cargo build --profile release-thin --bins", // @oss-only
             "group": {
                 "kind": "build",
                 "is_default": true,
@@ -46,7 +49,8 @@
         {
             "label": "ELP: run clippy on workspace",
             "type": "shell",
-            "command": "/data/sandcastle/boxes/fbsource/fbcode/whatsapp/elp/meta/clippy.sh --workspace --tests",
+            // @fb-only
+            "command": "cargo clippy --workspace --tests", // @oss-only
             "group": {
                 "kind": "build",
                 "is_default": true,
@@ -60,7 +64,8 @@
         {
             "label": "ELP: run clippy on workspace, apply fixes",
             "type": "shell",
-            "command": "/data/sandcastle/boxes/fbsource/fbcode/whatsapp/elp/meta/clippy.sh --workspace --tests --fix",
+            // @fb-only
+            "command": "cargo clippy --workspace --tests --fix", // @oss-only
             "group": {
                 "kind": "build",
                 "is_default": true,
@@ -74,7 +79,8 @@
         {
             "label": "ELP: run tests on workspace",
             "type": "shell",
-            "command": "/data/sandcastle/boxes/fbsource/fbcode/whatsapp/elp/meta/cargo.sh test --workspace",
+            // @fb-only
+            "command": "cargo test --workspace", // @oss-only
             "group": {
                 "kind": "build",
                 "is_default": true,

From 0f39e522aff987f3964462c93fa2a98c22c6ffa3 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 15 Sep 2025 07:57:01 -0700
Subject: [PATCH 107/394] Convert no_forgets_api linter to use the Linter trait

Summary: Convert the `no_forgets_api` linter to the new trait. To enable the migration, ensure the `file_id` is available in the `is_match_valid` function.

Reviewed By: jcpetruzza

Differential Revision: D81593935

fbshipit-source-id: c00d5c7f5078ba04fb22c13238367ff1ebc91398
---
 crates/ide/src/diagnostics.rs                    | 3 ++-
 crates/ide/src/diagnostics/atoms_exhaustion.rs   | 1 +
 crates/ide/src/diagnostics/debugging_function.rs | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 22d8f7e133..d57e048b96 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -595,6 +595,7 @@ pub(crate) trait FunctionCallLinter: Linter {
         &self,
         _check_call_context: &CheckCallCtx<'_, ()>,
         _sema: &Semantic,
+        _file_id: FileId,
     ) -> Option<Self::Context> {
         Some(Self::Context::default())
     }
@@ -643,7 +644,7 @@ impl<T: FunctionCallLinter> FunctionCallDiagnostics for T {
                     sema,
                     def,
                     &mfas,
-                    &move |ctx| self.is_match_valid(&ctx, sema),
+                    &move |ctx| self.is_match_valid(&ctx, sema, file_id),
                     &move |ctx @ MatchCtx { sema, def_fb, .. }| {
                         let range = ctx.range(&UseRange::NameOnly);
                         if range.file_id == def.file.file_id {
diff --git a/crates/ide/src/diagnostics/atoms_exhaustion.rs b/crates/ide/src/diagnostics/atoms_exhaustion.rs
index 334bf86853..8977a67a29 100644
--- a/crates/ide/src/diagnostics/atoms_exhaustion.rs
+++ b/crates/ide/src/diagnostics/atoms_exhaustion.rs
@@ -63,6 +63,7 @@ impl FunctionCallLinter for AtomsExhaustionLinter {
         &self,
         context: &CheckCallCtx<'_, ()>,
         sema: &Semantic,
+        _file_id: FileId,
     ) -> Option<Self::Context> {
         #[rustfmt::skip]
         // @fb-only
diff --git a/crates/ide/src/diagnostics/debugging_function.rs b/crates/ide/src/diagnostics/debugging_function.rs
index 2e8607ccb7..08acc426b8 100644
--- a/crates/ide/src/diagnostics/debugging_function.rs
+++ b/crates/ide/src/diagnostics/debugging_function.rs
@@ -61,6 +61,7 @@ impl FunctionCallLinter for NoDebuggingFunctionLinter {
         &self,
         context: &CheckCallCtx<'_, ()>,
         _sema: &Semantic,
+        _file_id: FileId,
     ) -> Option<Self::Context> {
         let call_expr_id = context.parents.last().cloned();
         Some(call_expr_id)

From 2e30b64679b0035beac00d12cfab7840a4be2d26 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 15 Sep 2025 07:57:01 -0700
Subject: [PATCH 108/394] Rename is_match_valid into check_match

Summary: Avoid the `is_*` pattern, given the function does not return a boolean (or optional boolean).

Reviewed By: alanz

Differential Revision: D82433078

fbshipit-source-id: d418c7c5e0c5f18d7de8403864d4b27f021c367d
---
 crates/ide/src/diagnostics.rs                    | 4 ++--
 crates/ide/src/diagnostics/atoms_exhaustion.rs   | 2 +-
 crates/ide/src/diagnostics/debugging_function.rs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index d57e048b96..df794e240f 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -591,7 +591,7 @@ pub(crate) trait FunctionCallLinter: Linter {
     // Custom check for the function call. Returning None for a given call skips processing.
     // By default all calls are included.
     // The callback returns a function that can be used in subsequent callbacks.
-    fn is_match_valid(
+    fn check_match(
         &self,
         _check_call_context: &CheckCallCtx<'_, ()>,
         _sema: &Semantic,
@@ -644,7 +644,7 @@ impl<T: FunctionCallLinter> FunctionCallDiagnostics for T {
                     sema,
                     def,
                     &mfas,
-                    &move |ctx| self.is_match_valid(&ctx, sema, file_id),
+                    &move |ctx| self.check_match(&ctx, sema, file_id),
                     &move |ctx @ MatchCtx { sema, def_fb, .. }| {
                         let range = ctx.range(&UseRange::NameOnly);
                         if range.file_id == def.file.file_id {
diff --git a/crates/ide/src/diagnostics/atoms_exhaustion.rs b/crates/ide/src/diagnostics/atoms_exhaustion.rs
index 8977a67a29..831666314f 100644
--- a/crates/ide/src/diagnostics/atoms_exhaustion.rs
+++ b/crates/ide/src/diagnostics/atoms_exhaustion.rs
@@ -59,7 +59,7 @@ impl FunctionCallLinter for AtomsExhaustionLinter {
         ]
     }
 
-    fn is_match_valid(
+    fn check_match(
         &self,
         context: &CheckCallCtx<'_, ()>,
         sema: &Semantic,
diff --git a/crates/ide/src/diagnostics/debugging_function.rs b/crates/ide/src/diagnostics/debugging_function.rs
index 08acc426b8..7bba9c9af3 100644
--- a/crates/ide/src/diagnostics/debugging_function.rs
+++ b/crates/ide/src/diagnostics/debugging_function.rs
@@ -57,7 +57,7 @@ impl FunctionCallLinter for NoDebuggingFunctionLinter {
         ]
     }
 
-    fn is_match_valid(
+    fn check_match(
         &self,
         context: &CheckCallCtx<'_, ()>,
         _sema: &Semantic,

From 39da1592811596b3b48ec3aa5d2153586169db51 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 15 Sep 2025 07:57:01 -0700
Subject: [PATCH 109/394] Avoid passing sema and file_id since they are already
 part of the context

Summary: As per title.

Reviewed By: jcpetruzza, TheGeorge

Differential Revision: D82433557

fbshipit-source-id: 03c299fdfc73ca3c46816b4eba659b4f5f3ededa
---
 crates/ide/src/diagnostics.rs                    | 9 ++-------
 crates/ide/src/diagnostics/atoms_exhaustion.rs   | 8 ++------
 crates/ide/src/diagnostics/debugging_function.rs | 7 +------
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index df794e240f..e4d1583743 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -591,12 +591,7 @@ pub(crate) trait FunctionCallLinter: Linter {
     // Custom check for the function call. Returning None for a given call skips processing.
     // By default all calls are included.
     // The callback returns a function that can be used in subsequent callbacks.
-    fn check_match(
-        &self,
-        _check_call_context: &CheckCallCtx<'_, ()>,
-        _sema: &Semantic,
-        _file_id: FileId,
-    ) -> Option<Self::Context> {
+    fn check_match(&self, _check_call_context: &CheckCallCtx<'_, ()>) -> Option<Self::Context> {
         Some(Self::Context::default())
     }
 
@@ -644,7 +639,7 @@ impl<T: FunctionCallLinter> FunctionCallDiagnostics for T {
                     sema,
                     def,
                     &mfas,
-                    &move |ctx| self.check_match(&ctx, sema, file_id),
+                    &move |ctx| self.check_match(&ctx),
                     &move |ctx @ MatchCtx { sema, def_fb, .. }| {
                         let range = ctx.range(&UseRange::NameOnly);
                         if range.file_id == def.file.file_id {
diff --git a/crates/ide/src/diagnostics/atoms_exhaustion.rs b/crates/ide/src/diagnostics/atoms_exhaustion.rs
index 831666314f..e2743087af 100644
--- a/crates/ide/src/diagnostics/atoms_exhaustion.rs
+++ b/crates/ide/src/diagnostics/atoms_exhaustion.rs
@@ -59,13 +59,9 @@ impl FunctionCallLinter for AtomsExhaustionLinter {
         ]
     }
 
-    fn check_match(
-        &self,
-        context: &CheckCallCtx<'_, ()>,
-        sema: &Semantic,
-        _file_id: FileId,
-    ) -> Option<Self::Context> {
+    fn check_match(&self, context: &CheckCallCtx<'_, ()>) -> Option<Self::Context> {
         #[rustfmt::skip]
+        // @fb-only
         // @fb-only
             // @fb-only
         let is_safe = false; // @oss-only
diff --git a/crates/ide/src/diagnostics/debugging_function.rs b/crates/ide/src/diagnostics/debugging_function.rs
index 7bba9c9af3..3a4bbe4959 100644
--- a/crates/ide/src/diagnostics/debugging_function.rs
+++ b/crates/ide/src/diagnostics/debugging_function.rs
@@ -57,12 +57,7 @@ impl FunctionCallLinter for NoDebuggingFunctionLinter {
         ]
     }
 
-    fn check_match(
-        &self,
-        context: &CheckCallCtx<'_, ()>,
-        _sema: &Semantic,
-        _file_id: FileId,
-    ) -> Option<Self::Context> {
+    fn check_match(&self, context: &CheckCallCtx<'_, ()>) -> Option<Self::Context> {
         let call_expr_id = context.parents.last().cloned();
         Some(call_expr_id)
     }

From 679ed1fb70c08ac585c38746d7f19334647c605c Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 15 Sep 2025 07:57:01 -0700
Subject: [PATCH 110/394] Return a &'static str for descriptions

Summary: Avoid some unnecessary allocations.

Reviewed By: TheGeorge

Differential Revision: D82434334

fbshipit-source-id: b67baf4fa52d8f641e172d0bc5cdd4d9d7560cb1
---
 crates/ide/src/diagnostics.rs                     |  4 ++--
 crates/ide/src/diagnostics/atoms_exhaustion.rs    |  4 ++--
 .../ide/src/diagnostics/binary_string_to_sigil.rs |  4 ++--
 .../src/diagnostics/could_be_a_string_literal.rs  | 12 ++++++------
 crates/ide/src/diagnostics/debugging_function.rs  |  4 ++--
 crates/ide/src/diagnostics/no_error_logger.rs     |  4 ++--
 crates/ide/src/diagnostics/no_garbage_collect.rs  |  4 ++--
 crates/ide/src/diagnostics/no_size.rs             |  4 ++--
 crates/ide/src/diagnostics/sets_version_2.rs      |  4 ++--
 .../diagnostics/unnecessary_fold_to_build_map.rs  | 15 +++++++--------
 .../unnecessary_map_to_list_in_comprehension.rs   |  4 ++--
 11 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index e4d1583743..5756f62908 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -499,7 +499,7 @@ pub(crate) trait Linter {
     fn id(&self) -> DiagnosticCode;
 
     // A plain-text description for the linter. Displayed to the end user.
-    fn description(&self) -> String;
+    fn description(&self) -> &'static str;
 
     // The severity for the lint issue. It defaults to `Warning`.
     fn severity(&self) -> Severity {
@@ -674,7 +674,7 @@ pub(crate) trait SsrPatternsLinter: Linter {
 
     /// Customize the description based on each matched pattern.
     /// If implemented, it overrides the value of the `description()`.
-    fn pattern_description(&self, _context: &Self::Context) -> String {
+    fn pattern_description(&self, _context: &Self::Context) -> &'static str {
         self.description()
     }
 
diff --git a/crates/ide/src/diagnostics/atoms_exhaustion.rs b/crates/ide/src/diagnostics/atoms_exhaustion.rs
index e2743087af..e576bab2f2 100644
--- a/crates/ide/src/diagnostics/atoms_exhaustion.rs
+++ b/crates/ide/src/diagnostics/atoms_exhaustion.rs
@@ -25,8 +25,8 @@ impl Linter for AtomsExhaustionLinter {
     fn id(&self) -> DiagnosticCode {
         DiagnosticCode::AtomsExhaustion
     }
-    fn description(&self) -> String {
-        "Risk of atoms exhaustion.".to_string()
+    fn description(&self) -> &'static str {
+        "Risk of atoms exhaustion."
     }
     fn should_process_generated_files(&self) -> bool {
         true
diff --git a/crates/ide/src/diagnostics/binary_string_to_sigil.rs b/crates/ide/src/diagnostics/binary_string_to_sigil.rs
index d3b6581b05..d87d206583 100644
--- a/crates/ide/src/diagnostics/binary_string_to_sigil.rs
+++ b/crates/ide/src/diagnostics/binary_string_to_sigil.rs
@@ -34,8 +34,8 @@ impl Linter for BinaryStringToSigilLinter {
         DiagnosticCode::BinaryStringToSigil
     }
 
-    fn description(&self) -> String {
-        "Binary string can be written using sigil syntax.".to_string()
+    fn description(&self) -> &'static str {
+        "Binary string can be written using sigil syntax."
     }
 
     fn severity(&self) -> Severity {
diff --git a/crates/ide/src/diagnostics/could_be_a_string_literal.rs b/crates/ide/src/diagnostics/could_be_a_string_literal.rs
index 0091f559f5..73b596e0c9 100644
--- a/crates/ide/src/diagnostics/could_be_a_string_literal.rs
+++ b/crates/ide/src/diagnostics/could_be_a_string_literal.rs
@@ -35,8 +35,8 @@ impl Linter for CouldBeAStringLiteralLinter {
         DiagnosticCode::CouldBeAStringLiteral
     }
 
-    fn description(&self) -> String {
-        "Could be rewritten as a literal.".to_string()
+    fn description(&self) -> &'static str {
+        "Could be rewritten as a literal."
     }
 
     fn severity(&self) -> Severity {
@@ -95,11 +95,11 @@ impl SsrPatternsLinter for CouldBeAStringLiteralLinter {
         ]
     }
 
-    fn pattern_description(&self, context: &Self::Context) -> String {
+    fn pattern_description(&self, context: &Self::Context) -> &'static str {
         match context.to {
-            StringKind::List => "Could be rewritten as a string literal.".to_string(),
-            StringKind::Binary => "Could be rewritten as a binary string literal.".to_string(),
-            StringKind::Atom => "Could be rewritten as an atom literal.".to_string(),
+            StringKind::List => "Could be rewritten as a string literal.",
+            StringKind::Binary => "Could be rewritten as a binary string literal.",
+            StringKind::Atom => "Could be rewritten as an atom literal.",
         }
     }
 
diff --git a/crates/ide/src/diagnostics/debugging_function.rs b/crates/ide/src/diagnostics/debugging_function.rs
index 3a4bbe4959..cdeb147754 100644
--- a/crates/ide/src/diagnostics/debugging_function.rs
+++ b/crates/ide/src/diagnostics/debugging_function.rs
@@ -31,8 +31,8 @@ impl Linter for NoDebuggingFunctionLinter {
     fn id(&self) -> DiagnosticCode {
         DiagnosticCode::DebuggingFunction
     }
-    fn description(&self) -> String {
-        "Debugging functions should only be used during local debugging and usages should not be checked in.".to_string()
+    fn description(&self) -> &'static str {
+        "Debugging functions should only be used during local debugging and usages should not be checked in."
     }
     fn severity(&self) -> Severity {
         Severity::WeakWarning
diff --git a/crates/ide/src/diagnostics/no_error_logger.rs b/crates/ide/src/diagnostics/no_error_logger.rs
index d1a0da221a..b48ccf115c 100644
--- a/crates/ide/src/diagnostics/no_error_logger.rs
+++ b/crates/ide/src/diagnostics/no_error_logger.rs
@@ -20,8 +20,8 @@ impl Linter for NoErrorLoggerLinter {
     fn id(&self) -> DiagnosticCode {
         DiagnosticCode::NoErrorLogger
     }
-    fn description(&self) -> String {
-        "The `error_logger` module is deprecated.".to_string()
+    fn description(&self) -> &'static str {
+        "The `error_logger` module is deprecated."
     }
     fn severity(&self) -> Severity {
         Severity::Error
diff --git a/crates/ide/src/diagnostics/no_garbage_collect.rs b/crates/ide/src/diagnostics/no_garbage_collect.rs
index af2d74e3ee..e24ef7c9a9 100644
--- a/crates/ide/src/diagnostics/no_garbage_collect.rs
+++ b/crates/ide/src/diagnostics/no_garbage_collect.rs
@@ -20,8 +20,8 @@ impl Linter for NoGarbageCollectLinter {
     fn id(&self) -> DiagnosticCode {
         DiagnosticCode::NoGarbageCollect
     }
-    fn description(&self) -> String {
-        "Avoid forcing garbage collection.".to_string()
+    fn description(&self) -> &'static str {
+        "Avoid forcing garbage collection."
     }
     fn should_process_test_files(&self) -> bool {
         false
diff --git a/crates/ide/src/diagnostics/no_size.rs b/crates/ide/src/diagnostics/no_size.rs
index 5524a3655f..d298b49cfa 100644
--- a/crates/ide/src/diagnostics/no_size.rs
+++ b/crates/ide/src/diagnostics/no_size.rs
@@ -20,8 +20,8 @@ impl Linter for NoSizeLinter {
     fn id(&self) -> DiagnosticCode {
         DiagnosticCode::NoSize
     }
-    fn description(&self) -> String {
-        "Avoid using the `size/1` BIF.".to_string()
+    fn description(&self) -> &'static str {
+        "Avoid using the `size/1` BIF."
     }
     fn should_process_test_files(&self) -> bool {
         false
diff --git a/crates/ide/src/diagnostics/sets_version_2.rs b/crates/ide/src/diagnostics/sets_version_2.rs
index 44a228d717..dcd4c41a9f 100644
--- a/crates/ide/src/diagnostics/sets_version_2.rs
+++ b/crates/ide/src/diagnostics/sets_version_2.rs
@@ -20,8 +20,8 @@ impl Linter for SetsVersion2Linter {
     fn id(&self) -> DiagnosticCode {
         DiagnosticCode::SetsVersion2
     }
-    fn description(&self) -> String {
-        "Prefer `[{version, 2}]` when constructing a set.".to_string()
+    fn description(&self) -> &'static str {
+        "Prefer `[{version, 2}]` when constructing a set."
     }
     fn should_process_test_files(&self) -> bool {
         false
diff --git a/crates/ide/src/diagnostics/unnecessary_fold_to_build_map.rs b/crates/ide/src/diagnostics/unnecessary_fold_to_build_map.rs
index b9ab3654e5..9fabb2f21d 100644
--- a/crates/ide/src/diagnostics/unnecessary_fold_to_build_map.rs
+++ b/crates/ide/src/diagnostics/unnecessary_fold_to_build_map.rs
@@ -45,8 +45,8 @@ impl Linter for UnnecessaryFoldToBuildMapLinter {
         DiagnosticCode::UnnecessaryFoldToBuildMapFromList
     }
 
-    fn description(&self) -> String {
-        "Unnecessary explicit fold to construct map.".to_string()
+    fn description(&self) -> &'static str {
+        "Unnecessary explicit fold to construct map."
     }
 
     fn severity(&self) -> Severity {
@@ -80,12 +80,11 @@ impl SsrPatternsLinter for UnnecessaryFoldToBuildMapLinter {
         ]
     }
 
-    fn pattern_description(&self, context: &Self::Context) -> String {
-        let origin = match context {
-            PatternKind::FromList => "list".to_string(),
-            PatternKind::FromKeys => "keys".to_string(),
-        };
-        format!("Unnecessary explicit fold to construct map from {origin}.")
+    fn pattern_description(&self, context: &Self::Context) -> &'static str {
+        match context {
+            PatternKind::FromList => "Unnecessary explicit fold to construct map from list.",
+            PatternKind::FromKeys => "Unnecessary explicit fold to construct map from keys.",
+        }
     }
 
     fn is_match_valid(
diff --git a/crates/ide/src/diagnostics/unnecessary_map_to_list_in_comprehension.rs b/crates/ide/src/diagnostics/unnecessary_map_to_list_in_comprehension.rs
index 70dd8c4b77..99859c225d 100644
--- a/crates/ide/src/diagnostics/unnecessary_map_to_list_in_comprehension.rs
+++ b/crates/ide/src/diagnostics/unnecessary_map_to_list_in_comprehension.rs
@@ -29,8 +29,8 @@ impl Linter for UnnecessaryMapToListInComprehensionLinter {
         DiagnosticCode::UnnecessaryMapToListInComprehension
     }
 
-    fn description(&self) -> String {
-        "Unnecessary intermediate list allocated.".to_string()
+    fn description(&self) -> &'static str {
+        "Unnecessary intermediate list allocated."
     }
 
     fn severity(&self) -> Severity {

From 545452cc6d3a1588f5b94865d5f145d750f84348 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 15 Sep 2025 10:49:47 -0700
Subject: [PATCH 111/394] Provide an example of a poor translation from catch
 to try ... catch

Reviewed By: acw224

Differential Revision: D82297776

fbshipit-source-id: 02aa5da78182369656c3343cee63d8a7faa7d97a
---
 website/docs/erlang-error-index/w/W0052.md | 73 ++++++++++++++++++++--
 1 file changed, 68 insertions(+), 5 deletions(-)

diff --git a/website/docs/erlang-error-index/w/W0052.md b/website/docs/erlang-error-index/w/W0052.md
index 344f943137..a6e7b7837c 100644
--- a/website/docs/erlang-error-index/w/W0052.md
+++ b/website/docs/erlang-error-index/w/W0052.md
@@ -50,12 +50,12 @@ end.
 
 First notice that this always returns `other` if `api()` calls `throw(...)`
 because `foo = (catch throw(foo))`. We only get something interesting if `api()`
-calls `exit(...)`. So, if your goal was to do something special when there is an
-exception, `case catch` is definitely not what you want.
+calls `exit(...)` or `error(...)`. So, if your goal was to do something special
+when there is an exception, `case catch` is definitely not what you want.
 
-If you only want to catch exits, it might work, unless the API legitimately
-returns a tuple with first element being `'EXIT'`. So, this pattern is brittle
-and does not generalize. Here is a bette way:
+If you only want to catch exits and errors, it might work, unless the API
+legitimately returns a tuple with first element being `'EXIT'`. So, this pattern
+is brittle and does not generalize. Here is a better way:
 
 ```erlang
 try api() of
@@ -97,6 +97,69 @@ end.
 
 It is more verbose but makes the interface and control flow clear.
 
+## Preserving the old behaviour
+
+When converting a `catch` into a `try ... catch ... end`, keep in mind that we
+may rely on the result of the `catch` expression itself.
+
+As an example, it would be ok to replace:
+
+```erlang
+sum(X, Y) ->
+  catch could_crash(X),
+  X + Y.
+```
+
+With:
+
+```erlang
+sum(X, Y) ->
+  try could_crash(X)
+  catch
+    _:_ ->
+      ok
+  end,
+  X + Y.
+```
+
+This is because the code inside the `catch` (then converted into a
+`try ... catch ... end`) is only used for its _side effects_, and the result of
+the `could_crash/1` function is ignored.
+
+Things are different in the following example:
+
+```erlang
+main(X) ->
+  catch could_crash(X).
+
+could_crash(42) ->
+  throw(crash);
+could_crash(_X) ->
+  ok.
+```
+
+One could mechanically convert the `catch` into a `try ... catch`:
+
+```erlang
+main(X) ->
+  try could_crash(X)
+  catch _:_ ->
+    ok
+  end.
+
+could_crash(42) ->
+  throw(crash);
+could_crash(_X) ->
+  ok.
+```
+
+This conversion could be potentially dangerous and should be rethinked, since
+the old behaviour is not preserved. In fact, when calling `my_function(42)`, the
+old code returns `crash`, while the new code returns `ok`.
+
+By examining the surrounding code you should be able to assess whether a
+potentially backward incompatible behaviour is acceptable or not.
+
 ## See also
 
 - [Errors and Error Handling](https://www.erlang.org/doc/system/errors.html)

From a42d11847585832e8430d7263123deaed30bfdbc Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 15 Sep 2025 23:41:12 -0700
Subject: [PATCH 112/394] Convert undefined_function linter to use trait

Summary:
The previous version of the linter was conflating two distinct diagnostic codes into one. While this was more efficient in the sense that we would iterate once, the logic was quite hairy.

This diff splits the old linter into two, making the logic and the intent more clear.

Reviewed By: TD5

Differential Revision: D82443533

fbshipit-source-id: d4684c49fecbedace31e0a00b83b87da6aabf7fc
---
 ...e_elp_no_lint_specified_json_output.stdout |   2 +-
 .../parse_elp_no_lint_specified_output.stdout |   2 +-
 crates/ide/src/diagnostics.rs                 |  28 +-
 .../ide/src/diagnostics/undefined_function.rs | 333 +++---------------
 .../src/diagnostics/unexported_function.rs    | 250 +++++++++++++
 5 files changed, 329 insertions(+), 286 deletions(-)
 create mode 100644 crates/ide/src/diagnostics/unexported_function.rs

diff --git a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
index a9e712e825..5c002e54de 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
@@ -1,9 +1,9 @@
 {"path":"app_a/src/app_a.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0011 (application_get_env)","original":null,"replacement":null,"description":"module `app_a` belongs to app `app_a`, but reads env for `misc`\n\nFor more information see: /erlang-error-index/w/W0011"}
 {"path":"app_a/src/app_a.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012"}
-{"path":"app_a/src/app_a.erl","line":13,"char":5,"code":"ELP","severity":"warning","name":"W0026 (unexported_function)","original":null,"replacement":null,"description":"Function 'app_a:baz/2' is not exported.\n\nFor more information see: /erlang-error-index/w/W0026"}
 {"path":"app_a/src/app_a.erl","line":9,"char":1,"code":"ELP","severity":"error","name":"P1700 (head_mismatch)","original":null,"replacement":null,"description":"head mismatch 'fooX' vs 'food'\n\nFor more information see: /erlang-error-index/p/P1700"}
 {"path":"app_a/src/app_a.erl","line":8,"char":7,"code":"ELP","severity":"warning","name":"W0018 (unexpected_semi_or_dot)","original":null,"replacement":null,"description":"Unexpected ';'\n\nFor more information see: /erlang-error-index/w/W0018"}
 {"path":"app_a/src/app_a.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046"}
+{"path":"app_a/src/app_a.erl","line":13,"char":5,"code":"ELP","severity":"warning","name":"W0026 (unexported_function)","original":null,"replacement":null,"description":"Function 'app_a:baz/2' is not exported.\n\nFor more information see: /erlang-error-index/w/W0026"}
 {"path":"app_a/src/app_a.erl","line":12,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function bar/0 is unused\n\nFor more information see: /erlang-error-index/l/L1230"}
 {"path":"app_a/src/app_a.erl","line":16,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function baz/2 is unused\n\nFor more information see: /erlang-error-index/l/L1230"}
 {"path":"app_a/src/app_a_edoc.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012"}
diff --git a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
index 714cc6bcd7..5099c34a65 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
@@ -3,10 +3,10 @@ Diagnostics reported in 7 modules:
   app_a: 8
       4:4-4:34::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
       0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
-      12:4-12:13::[Warning] [W0026] Function 'app_a:baz/2' is not exported.
       8:0-8:4::[Error] [P1700] head mismatch 'fooX' vs 'food'
       7:6-7:7::[Warning] [W0018] Unexpected ';'
       0:8-0:13::[WeakWarning] [W0046] The module is not documented.
+      12:4-12:13::[Warning] [W0026] Function 'app_a:baz/2' is not exported.
       11:0-11:3::[Warning] [L1230] function bar/0 is unused
       15:0-15:3::[Warning] [L1230] function baz/2 is unused
   app_a_edoc: 2
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 5756f62908..52a14c58aa 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -8,6 +8,7 @@
  * above-listed licenses.
  */
 
+use std::borrow::Cow;
 use std::collections::BTreeSet;
 use std::fmt;
 use std::sync::Arc;
@@ -133,6 +134,7 @@ mod undefined_function;
 mod undefined_macro;
 mod undocumented_function;
 mod undocumented_module;
+mod unexported_function;
 mod unnecessary_fold_to_build_map;
 mod unnecessary_map_from_list_around_comprehension;
 mod unnecessary_map_to_list_in_comprehension;
@@ -583,6 +585,12 @@ pub(crate) trait FunctionCallLinter: Linter {
     /// Associated type - each linter defines its own
     type Context: Clone + fmt::Debug + PartialEq + Default;
 
+    /// Customize the description based on each match.
+    /// If implemented, it overrides the value of the `description()`.
+    fn match_description(&self, _context: &Self::Context) -> Cow<'_, str> {
+        Cow::Borrowed(self.description())
+    }
+
     // Specify the list of functions the linter should emit issues for
     fn matches_functions(&self) -> Vec<FunctionMatch> {
         vec![]
@@ -640,15 +648,20 @@ impl<T: FunctionCallLinter> FunctionCallDiagnostics for T {
                     def,
                     &mfas,
                     &move |ctx| self.check_match(&ctx),
-                    &move |ctx @ MatchCtx { sema, def_fb, .. }| {
+                    &move |ctx @ MatchCtx {
+                               sema,
+                               def_fb,
+                               extra,
+                               ..
+                           }| {
                         let range = ctx.range(&UseRange::NameOnly);
                         if range.file_id == def.file.file_id {
                             let fixes = self.fixes(&ctx, sema, file_id);
-                            let mut diag =
-                                Diagnostic::new(self.id(), self.description(), range.range)
-                                    .with_fixes(fixes)
-                                    .with_severity(severity)
-                                    .with_cli_severity(cli_severity);
+                            let description = self.match_description(extra);
+                            let mut diag = Diagnostic::new(self.id(), description, range.range)
+                                .with_fixes(fixes)
+                                .with_severity(severity)
+                                .with_cli_severity(cli_severity);
                             if self.can_be_suppressed() {
                                 diag = diag.with_ignore_fix(sema, def_fb.file_id());
                             };
@@ -1266,7 +1279,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &missing_compile_warn_missing_spec::DESCRIPTOR,
         &dependent_header::DESCRIPTOR,
         &deprecated_function::DESCRIPTOR,
-        &undefined_function::DESCRIPTOR,
         &head_mismatch::DESCRIPTOR_SEMANTIC,
         &missing_separator::DESCRIPTOR,
         &cross_node_eval::DESCRIPTOR,
@@ -1339,6 +1351,8 @@ const FUNCTION_CALL_LINTERS: &[&dyn FunctionCallDiagnostics] = &[
     &no_error_logger::LINTER,
     &debugging_function::LINTER,
     &atoms_exhaustion::LINTER,
+    &undefined_function::LINTER,
+    &unexported_function::LINTER,
 ];
 
 /// SSR pattern linters that use structural search and replace patterns
diff --git a/crates/ide/src/diagnostics/undefined_function.rs b/crates/ide/src/diagnostics/undefined_function.rs
index 9ae17f53a2..b22196d5a5 100644
--- a/crates/ide/src/diagnostics/undefined_function.rs
+++ b/crates/ide/src/diagnostics/undefined_function.rs
@@ -16,122 +16,79 @@
 // Only fully qualified calls are reported by this diagnostic (e.g. `foo:bar/2`), since
 // calls to undefined local functions are already reported by the Erlang linter itself (L1227).
 
-use elp_ide_assists::helpers;
-use elp_ide_assists::helpers::ExportForm;
-use elp_ide_db::elp_base_db::FileId;
-use elp_ide_db::elp_base_db::FileRange;
-use elp_ide_db::source_change::SourceChangeBuilder;
+use std::borrow::Cow;
+
+use elp_syntax::SmolStr;
 use hir::Expr;
-use hir::FunctionDef;
 use hir::Module;
-use hir::NameArity;
 use hir::Semantic;
 use hir::known;
 
-use super::Diagnostic;
 use super::DiagnosticCode;
-use super::DiagnosticConditions;
-use super::DiagnosticDescriptor;
-use super::Severity;
 use crate::FunctionMatch;
 use crate::codemod_helpers::CheckCallCtx;
-use crate::codemod_helpers::MatchCtx;
-use crate::codemod_helpers::find_call_in_function;
-// @fb-only
-use crate::fix;
+use crate::diagnostics::FunctionCallLinter;
+use crate::diagnostics::Linter;
+use crate::lazy_function_matches;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: true,
-        include_tests: true,
-        default_disabled: false,
-    },
-    checker: &|diags, sema, file_id, _ext| {
-        undefined_function(diags, sema, file_id);
-    },
-};
+pub(crate) struct UndefinedFunctionLinter;
 
-fn undefined_function(diagnostics: &mut Vec<Diagnostic>, sema: &Semantic, file_id: FileId) {
-    let check_for_unexported = true; // @oss-only
-    // @fb-only
-    sema.def_map_local(file_id)
-        .get_functions()
-        .for_each(|(_arity, def)| check_function(diagnostics, sema, def, check_for_unexported));
+impl Linter for UndefinedFunctionLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::UndefinedFunction
+    }
+    fn description(&self) -> &'static str {
+        "Function is undefined."
+    }
+    fn should_process_generated_files(&self) -> bool {
+        true
+    }
 }
 
-fn check_function(
-    diags: &mut Vec<Diagnostic>,
-    sema: &Semantic,
-    def: &FunctionDef,
-    check_for_unexported: bool,
-) {
-    let matcher = FunctionMatch::any();
-    find_call_in_function(
-        diags,
-        sema,
-        def,
-        &[(&matcher, ())],
-        &move |CheckCallCtx {
-                   target,
-                   args,
-                   in_clause: def_fb,
-                   ..
-               }: CheckCallCtx<'_, ()>| {
-            let arity = args.arity();
-            match target {
-                hir::CallTarget::Remote { module, name, .. } => {
-                    let module = &def_fb[*module];
-                    let name = &def_fb[*name];
-                    if in_exclusion_list(sema, module, name, arity)
-                        || sema
-                            .resolve_module_expr(def_fb.file_id(), module)
-                            .is_some_and(|module| is_automatically_added(sema, module, name, arity))
-                    {
-                        None
-                    } else {
-                        let maybe_function_def =
-                            target.resolve_call(arity, sema, def_fb.file_id(), &def_fb.body());
-                        let function_exists = maybe_function_def.is_some();
-                        let is_exported = maybe_function_def.clone().is_some_and(|fun_def| {
-                            is_exported_function(fun_def.file.file_id, sema, &fun_def.name)
-                        });
+impl FunctionCallLinter for UndefinedFunctionLinter {
+    type Context = Option<SmolStr>;
 
-                        if function_exists && (is_exported) {
-                            None
-                        } else {
-                            target.label(arity, sema, &def_fb.body()).map(|label| {
-                                (
-                                    label.to_string(),
-                                    "".to_string(),
-                                    function_exists && !is_exported,
-                                    maybe_function_def,
-                                )
-                            })
-                        }
-                    }
+    fn matches_functions(&self) -> Vec<FunctionMatch> {
+        lazy_function_matches![vec![FunctionMatch::any()]]
+    }
+
+    fn match_description(&self, context: &Self::Context) -> Cow<'_, str> {
+        match context {
+            None => Cow::Borrowed(self.description()),
+            Some(function_name) => Cow::Owned(format!("Function '{function_name}' is undefined.")),
+        }
+    }
+
+    fn check_match(&self, context: &CheckCallCtx<'_, ()>) -> Option<Self::Context> {
+        match context.target {
+            hir::CallTarget::Remote { module, name, .. } => {
+                let sema = context.in_clause.sema;
+                let def_fb = context.in_clause;
+                let arity = context.args.arity();
+                let module = &def_fb[*module];
+                let name = &def_fb[*name];
+                if in_exclusion_list(sema, module, name, arity)
+                    || sema
+                        .resolve_module_expr(def_fb.file_id(), module)
+                        .is_some_and(|module| is_automatically_added(sema, module, name, arity))
+                {
+                    return None;
+                }
+                match context
+                    .target
+                    .resolve_call(arity, sema, def_fb.file_id(), &def_fb.body())
+                {
+                    Some(_) => None,
+                    None => Some(context.target.label(arity, sema, &def_fb.body())),
                 }
-                // Diagnostic L1227 already covers the case for local calls, so avoid double-reporting
-                hir::CallTarget::Local { .. } => None,
             }
-        },
-        &move |ctx @ MatchCtx { sema, extra, .. }| {
-            make_diagnostic(
-                sema,
-                def.file.file_id,
-                ctx.range_mf_or_macro(),
-                &extra.0,
-                extra.2,
-                extra.3.clone(),
-                check_for_unexported,
-            )
-        },
-    );
+            // Diagnostic L1227 already covers the case for local calls, so avoid double-reporting
+            hir::CallTarget::Local { .. } => None,
+        }
+    }
 }
 
-fn is_exported_function(file_id: FileId, sema: &Semantic, name: &NameArity) -> bool {
-    sema.def_map(file_id).is_function_exported(name)
-}
+pub static LINTER: UndefinedFunctionLinter = UndefinedFunctionLinter;
 
 fn is_automatically_added(sema: &Semantic, module: Module, function: &Expr, arity: u32) -> bool {
     // If the module defines callbacks, {behaviour,behavior}_info are automatically defined
@@ -158,69 +115,6 @@ fn in_exclusion_list(sema: &Semantic, module: &Expr, function: &Expr, arity: u32
         || sema.is_atom_named(module, &known::thrift_parser)
 }
 
-fn make_diagnostic(
-    sema: &Semantic,
-    file_id: FileId,
-    range: FileRange,
-    function_name: &str,
-    is_private: bool,
-    maybe_function_def: Option<FunctionDef>,
-    check_for_unexported: bool,
-) -> Option<Diagnostic> {
-    let range = if range.file_id == file_id {
-        Some(range.range)
-    } else {
-        None
-    }?;
-    if is_private {
-        if check_for_unexported {
-            let maybe_fix = maybe_function_def.map(|function_def| {
-                let mut builder = SourceChangeBuilder::new(function_def.file.file_id);
-                helpers::ExportBuilder::new(
-                    sema,
-                    function_def.file.file_id,
-                    ExportForm::Functions,
-                    &[function_def.name],
-                    &mut builder,
-                )
-                .finish();
-
-                fix(
-                    "export_function",
-                    format!("Export the function `{function_name}`").as_str(),
-                    builder.finish(),
-                    range,
-                )
-            });
-            let mut diagnostic = Diagnostic::new(
-                DiagnosticCode::UnexportedFunction,
-                format!("Function '{function_name}' is not exported."),
-                range,
-            )
-            .with_severity(Severity::Warning)
-            .with_ignore_fix(sema, file_id);
-
-            maybe_fix.inspect(|fix| {
-                diagnostic.add_fix(fix.clone());
-            });
-
-            Some(diagnostic)
-        } else {
-            None
-        }
-    } else {
-        Some(
-            Diagnostic::new(
-                DiagnosticCode::UndefinedFunction,
-                format!("Function '{function_name}' is undefined."),
-                range,
-            )
-            .with_severity(Severity::Warning)
-            .with_ignore_fix(sema, file_id),
-        )
-    }
-}
-
 #[cfg(test)]
 mod tests {
 
@@ -229,7 +123,6 @@ mod tests {
     use crate::DiagnosticsConfig;
     use crate::tests::check_diagnostics_with_config;
     use crate::tests::check_fix;
-    use crate::tests::check_nth_fix;
 
     pub(crate) fn check_diagnostics(fixture: &str) {
         let config = DiagnosticsConfig::default().disable(elp_ide_db::DiagnosticCode::NoSize);
@@ -338,60 +231,6 @@ mod tests {
         )
     }
 
-    #[test]
-    fn test_private() {
-        check_diagnostics(
-            r#"
-//- /src/main.erl
-  -module(main).
-  main() ->
-    dependency:exists(),
-    dependency:private().
-%%  ^^^^^^^^^^^^^^^^^^ 💡 warning: Function 'dependency:private/0' is not exported.
-  exists() -> ok.
-//- /src/dependency.erl
-  -module(dependency).
-  -export([exists/0]).
-  exists() -> ok.
-  private() -> ok.
-            "#,
-        )
-    }
-
-    #[test]
-    fn test_private_same_module() {
-        check_diagnostics(
-            r#"
-//- /src/main.erl
-  -module(main).
-  main() ->
-    ?MODULE:private(),
-%%  ^^^^^^^^^^^^^^^ 💡 warning: Function 'main:private/0' is not exported.
-    main:private().
-%%  ^^^^^^^^^^^^ 💡 warning: Function 'main:private/0' is not exported.
-
-  private() -> ok.
-            "#,
-        )
-    }
-
-    #[test]
-    fn remote_call_to_header() {
-        check_diagnostics(
-            r#"
-//- /src/main.erl
--module(main).
--include("header.hrl").
-
-foo() -> main:bar().
-%%       ^^^^^^^^ 💡 warning: Function 'main:bar/0' is not exported.
-
-//- /src/header.hrl
-  bar() -> ok.
-"#,
-        );
-    }
-
     #[test]
     fn test_exclude_module_info() {
         check_diagnostics(
@@ -515,66 +354,6 @@ exists() -> ok.
         )
     }
 
-    #[test]
-    fn test_export_fix_ignore() {
-        check_fix(
-            r#"
-//- /src/main.erl
--module(main).
-
-main() ->
-  dep:exists(),
-  dep:pr~ivate().
-
-//- /src/dep.erl
--module(dep).
--export([exists/0]).
-exists() -> ok.
-private() -> ok.
-"#,
-            expect![[r#"
--module(main).
-
-main() ->
-  dep:exists(),
-  % elp:ignore W0026 (unexported_function)
-  dep:private().
-
-"#]],
-        )
-    }
-
-    #[test]
-    fn test_export_fix() {
-        check_nth_fix(
-            1,
-            r#"
-//- /src/main.erl
--module(main).
-
-main() ->
-  dep:exists(),
-  dep:pr~ivate().
-
-exists() -> ok.
-//- /src/dep.erl
--module(dep).
--export([exists/0]).
-exists() -> ok.
-private() -> ok.
-"#,
-            expect![[r#"
--module(dep).
--export([exists/0, private/0]).
-exists() -> ok.
-private() -> ok.
-"#]],
-            DiagnosticsConfig::default().set_experimental(true),
-            &vec![],
-            crate::tests::IncludeCodeActionAssists::Yes,
-        )
-    }
-
     #[test]
     fn test_capture_fun() {
         check_diagnostics(
diff --git a/crates/ide/src/diagnostics/unexported_function.rs b/crates/ide/src/diagnostics/unexported_function.rs
new file mode 100644
index 0000000000..3d295b6c53
--- /dev/null
+++ b/crates/ide/src/diagnostics/unexported_function.rs
@@ -0,0 +1,250 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is dual-licensed under either the MIT license found in the
+ * LICENSE-MIT file in the root directory of this source tree or the Apache
+ * License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+ * of this source tree. You may select, at your option, one of the
+ * above-listed licenses.
+ */
+
+// Diagnostic: unexported-function
+
+use std::borrow::Cow;
+
+use elp_ide_assists::Assist;
+use elp_ide_assists::helpers;
+use elp_ide_assists::helpers::ExportForm;
+use elp_ide_db::elp_base_db::FileId;
+use elp_ide_db::source_change::SourceChangeBuilder;
+use elp_syntax::SmolStr;
+use hir::FunctionDef;
+use hir::Semantic;
+
+use super::DiagnosticCode;
+use crate::FunctionMatch;
+use crate::codemod_helpers::CheckCallCtx;
+use crate::codemod_helpers::MatchCtx;
+use crate::diagnostics::FunctionCallLinter;
+use crate::diagnostics::Linter;
+// @fb-only
+use crate::fix;
+use crate::lazy_function_matches;
+
+pub(crate) struct UnexportedFunctionLinter;
+
+impl Linter for UnexportedFunctionLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::UnexportedFunction
+    }
+    fn description(&self) -> &'static str {
+        "Function is not exported."
+    }
+    fn should_process_generated_files(&self) -> bool {
+        true
+    }
+    fn should_process_file_id(&self, sema: &Semantic, file_id: FileId) -> bool {
+        true // @oss-only
+        // @fb-only
+    }
+}
+
+impl FunctionCallLinter for UnexportedFunctionLinter {
+    type Context = Option<(SmolStr, FunctionDef)>;
+
+    fn matches_functions(&self) -> Vec<FunctionMatch> {
+        lazy_function_matches![vec![FunctionMatch::any()]]
+    }
+
+    fn check_match(&self, context: &CheckCallCtx<'_, ()>) -> Option<Self::Context> {
+        match context.target {
+            hir::CallTarget::Remote { .. } => {
+                let def_fb = context.in_clause;
+                let arity = context.args.arity();
+                let sema = context.in_clause.sema;
+                if let Some(fun_def) =
+                    context
+                        .target
+                        .resolve_call(arity, sema, def_fb.file_id(), &def_fb.body())
+                    && !sema
+                        .def_map(fun_def.file.file_id)
+                        .is_function_exported(&fun_def.name)
+                {
+                    let label = context.target.label(arity, sema, &def_fb.body())?;
+                    return Some(Some((label, fun_def)));
+                }
+            }
+            hir::CallTarget::Local { .. } => (),
+        }
+        None
+    }
+
+    fn match_description(&self, context: &Self::Context) -> Cow<'_, str> {
+        match context {
+            None => Cow::Borrowed(self.description()),
+            Some((label, _target_def)) => {
+                Cow::Owned(format!("Function '{label}' is not exported."))
+            }
+        }
+    }
+
+    fn fixes(
+        &self,
+        match_context: &MatchCtx<Self::Context>,
+        sema: &Semantic,
+        _file_id: FileId,
+    ) -> Option<Vec<Assist>> {
+        let (_label, target_def) = match_context.extra.as_ref()?;
+        let target_file_id = target_def.file.file_id;
+        let mut builder = SourceChangeBuilder::new(target_file_id);
+        helpers::ExportBuilder::new(
+            sema,
+            target_file_id,
+            ExportForm::Functions,
+            std::slice::from_ref(&target_def.name),
+            &mut builder,
+        )
+        .finish();
+        let function_name = &target_def.name;
+        Some(vec![fix(
+            "export_function",
+            format!("Export the function `{function_name}`").as_str(),
+            builder.finish(),
+            match_context.range.range,
+        )])
+    }
+}
+pub static LINTER: UnexportedFunctionLinter = UnexportedFunctionLinter;
+
+#[cfg(test)]
+mod tests {
+
+    use expect_test::expect;
+
+    use crate::DiagnosticsConfig;
+    use crate::tests::check_diagnostics_with_config;
+    use crate::tests::check_nth_fix;
+
+    pub(crate) fn check_diagnostics(fixture: &str) {
+        let config = DiagnosticsConfig::default().disable(elp_ide_db::DiagnosticCode::NoSize);
+        check_diagnostics_with_config(config, fixture)
+    }
+
+    #[test]
+    fn test_private() {
+        check_diagnostics(
+            r#"
+//- /src/main.erl
+  -module(main).
+  main() ->
+    dependency:exists(),
+    dependency:private().
+%%  ^^^^^^^^^^^^^^^^^^ 💡 warning: Function 'dependency:private/0' is not exported.
+  exists() -> ok.
+//- /src/dependency.erl
+  -module(dependency).
+  -export([exists/0]).
+  exists() -> ok.
+  private() -> ok.
+            "#,
+        )
+    }
+
+    #[test]
+    fn test_private_same_module() {
+        check_diagnostics(
+            r#"
+//- /src/main.erl
+  -module(main).
+  main() ->
+    ?MODULE:private(),
+%%  ^^^^^^^^^^^^^^^ 💡 warning: Function 'main:private/0' is not exported.
+    main:private().
+%%  ^^^^^^^^^^^^ 💡 warning: Function 'main:private/0' is not exported.
+
+  private() -> ok.
+            "#,
+        )
+    }
+
+    #[test]
+    fn remote_call_to_header() {
+        check_diagnostics(
+            r#"
+//- /src/main.erl
+-module(main).
+-include("header.hrl").
+
+foo() -> main:bar().
+%%       ^^^^^^^^ 💡 warning: Function 'main:bar/0' is not exported.
+
+//- /src/header.hrl
+  bar() -> ok.
+"#,
+        );
+    }
+
+    #[test]
+    fn test_export_fix_ignore() {
+        check_nth_fix(
+            1,
+            r#"
+//- /src/main.erl
+-module(main).
+
+main() ->
+  dep:exists(),
+  dep:pr~ivate().
+
+//- /src/dep.erl
+-module(dep).
+-export([exists/0]).
+exists() -> ok.
+private() -> ok.
+"#,
+            expect![[r#"
+-module(main).
+
+main() ->
+  dep:exists(),
+  % elp:ignore W0026 (unexported_function)
+  dep:private().
+
+"#]],
+            DiagnosticsConfig::default().set_experimental(true),
+            &vec![],
+            crate::tests::IncludeCodeActionAssists::Yes,
+        )
+    }
+
+    #[test]
+    fn test_export_fix() {
+        check_nth_fix(
+            0,
+            r#"
+//- /src/main.erl
+-module(main).
+
+main() ->
+  dep:exists(),
+  dep:pr~ivate().
+
+exists() -> ok.
+//- /src/dep.erl
+-module(dep).
+-export([exists/0]).
+exists() -> ok.
+private() -> ok.
+"#,
+            expect![[r#"
+-module(dep).
+-export([exists/0, private/0]).
+exists() -> ok.
+private() -> ok.
+"#]],
+            DiagnosticsConfig::default().set_experimental(true),
+            &vec![],
+            crate::tests::IncludeCodeActionAssists::Yes,
+        )
+    }
+}

From 8d82b307edae42160f69554e6834b17885f626de Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 16 Sep 2025 05:36:26 -0700
Subject: [PATCH 113/394] Allow function call linters to specify a list of
 matches to exclude from processing

Summary:
Expand the `find_call_in_function` capabilities to allow excluding specific functions by using a vector of *FunctionMatch*.
Then, add an optional `excludes_functions` method to the `FunctionCallLinter` trait.
Use the new method to simplify the code in `undefined_function` to specify the exclusion list at a higher level.
This is in preparation of making the list of exclusions configurable via the TOML file, which will happen next.

Reviewed By: TD5

Differential Revision: D82526373

fbshipit-source-id: 1f07c8495655103d479dc76b6837b3968edb7dba
---
 crates/ide/src/codemod_helpers.rs             | 11 ++++++++-
 crates/ide/src/diagnostics.rs                 |  9 ++++++++
 crates/ide/src/diagnostics/application_env.rs |  1 +
 crates/ide/src/diagnostics/cross_node_eval.rs |  1 +
 crates/ide/src/diagnostics/meck.rs            |  1 +
 crates/ide/src/diagnostics/replace_call.rs    |  1 +
 .../ide/src/diagnostics/undefined_function.rs | 23 ++++++++++---------
 7 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/crates/ide/src/codemod_helpers.rs b/crates/ide/src/codemod_helpers.rs
index ea11b664ae..dc0b57b97e 100644
--- a/crates/ide/src/codemod_helpers.rs
+++ b/crates/ide/src/codemod_helpers.rs
@@ -522,11 +522,13 @@ pub(crate) fn find_call_in_function<CallCtx, MakeCtx, Res>(
     sema: &Semantic,
     def: &FunctionDef,
     mfas: &[(&FunctionMatch, CallCtx)],
+    excluded_mfas: &[(&FunctionMatch, CallCtx)],
     check_call: CheckCall<CallCtx, MakeCtx>,
     make: Make<MakeCtx, Res>,
 ) -> Option<()> {
     let def_fb = def.in_function_body(sema, def);
     let matcher = FunctionMatcher::new(mfas);
+    let excluded_matcher = FunctionMatcher::new(excluded_mfas);
     def_fb.clone().fold_function(
         Strategy {
             macros: MacroStrategy::ExpandButIncludeMacroCall,
@@ -544,7 +546,13 @@ pub(crate) fn find_call_in_function<CallCtx, MakeCtx, Res>(
                 },
                 AnyExpr::Expr(Expr::Call { target, args }) => Some((target, Args::Args(args))),
                 _ => None,
-            } && let Some((mfa, t)) = matcher.get_match(
+            } && let None = excluded_matcher.get_match(
+                &target,
+                args.arity(),
+                Some(&args.as_vec()),
+                sema,
+                &def_fb.body(clause_id),
+            ) && let Some((mfa, t)) = matcher.get_match(
                 &target,
                 args.arity(),
                 Some(&args.as_vec()),
@@ -664,6 +672,7 @@ mod tests {
             sema,
             def,
             &mfas,
+            &[],
             &move |_ctx| Some("Diagnostic Message"),
             &move |ctx @ MatchCtx {
                        sema,
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 52a14c58aa..1ec248e358 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -596,6 +596,11 @@ pub(crate) trait FunctionCallLinter: Linter {
         vec![]
     }
 
+    // Specify a list of functions the linter should exclude from the check.
+    fn excludes_functions(&self) -> Vec<FunctionMatch> {
+        vec![]
+    }
+
     // Custom check for the function call. Returning None for a given call skips processing.
     // By default all calls are included.
     // The callback returns a function that can be used in subsequent callbacks.
@@ -638,7 +643,10 @@ impl<T: FunctionCallLinter> FunctionCallDiagnostics for T {
     ) -> Vec<Diagnostic> {
         let mut diagnostics = Vec::new();
         let matches = self.matches_functions();
+        let excluded_matches = self.excludes_functions();
         let mfas: Vec<(&FunctionMatch, ())> = matches.iter().map(|m| (m, ())).collect();
+        let excluded_mfas: Vec<(&FunctionMatch, ())> =
+            excluded_matches.iter().map(|m| (m, ())).collect();
         sema.def_map_local(file_id)
             .get_functions()
             .for_each(|(_, def)| {
@@ -647,6 +655,7 @@ impl<T: FunctionCallLinter> FunctionCallDiagnostics for T {
                     sema,
                     def,
                     &mfas,
+                    &excluded_mfas,
                     &move |ctx| self.check_match(&ctx),
                     &move |ctx @ MatchCtx {
                                sema,
diff --git a/crates/ide/src/diagnostics/application_env.rs b/crates/ide/src/diagnostics/application_env.rs
index fd12b7af89..dac88b260c 100644
--- a/crates/ide/src/diagnostics/application_env.rs
+++ b/crates/ide/src/diagnostics/application_env.rs
@@ -135,6 +135,7 @@ fn process_badmatches(
         sema,
         def,
         mfas,
+        &[],
         &move |CheckCallCtx {
                    t, args, in_clause, ..
                }: CheckCallCtx<'_, &BadEnvCallAction>| match t {
diff --git a/crates/ide/src/diagnostics/cross_node_eval.rs b/crates/ide/src/diagnostics/cross_node_eval.rs
index 413f520652..36ae2cb383 100644
--- a/crates/ide/src/diagnostics/cross_node_eval.rs
+++ b/crates/ide/src/diagnostics/cross_node_eval.rs
@@ -83,6 +83,7 @@ fn process_badmatches(
         sema,
         def,
         bad,
+        &[],
         &move |ctx| match ctx.t {
             Some(m) => Some(*m),
             None => Some(r#"Production code must not use cross node eval (e.g. `rpc:call()`)"#),
diff --git a/crates/ide/src/diagnostics/meck.rs b/crates/ide/src/diagnostics/meck.rs
index 73bc3a2180..fb79f39b57 100644
--- a/crates/ide/src/diagnostics/meck.rs
+++ b/crates/ide/src/diagnostics/meck.rs
@@ -65,6 +65,7 @@ pub(crate) fn check_function(diags: &mut Vec<Diagnostic>, sema: &Semantic, def:
         sema,
         def,
         &[(&FunctionMatch::mf("meck", "new"), ())],
+        &[],
         &move |CheckCallCtx {
                    args,
                    in_clause: def_fb,
diff --git a/crates/ide/src/diagnostics/replace_call.rs b/crates/ide/src/diagnostics/replace_call.rs
index 80c0ec3e97..e27592dd3a 100644
--- a/crates/ide/src/diagnostics/replace_call.rs
+++ b/crates/ide/src/diagnostics/replace_call.rs
@@ -82,6 +82,7 @@ pub fn replace_call_site_if_args_match(
             sema,
             def,
             &[(fm, ())],
+            &[],
             &args_match,
             &move |MatchCtx {
                        sema,
diff --git a/crates/ide/src/diagnostics/undefined_function.rs b/crates/ide/src/diagnostics/undefined_function.rs
index b22196d5a5..a7dca42236 100644
--- a/crates/ide/src/diagnostics/undefined_function.rs
+++ b/crates/ide/src/diagnostics/undefined_function.rs
@@ -52,6 +52,17 @@ impl FunctionCallLinter for UndefinedFunctionLinter {
         lazy_function_matches![vec![FunctionMatch::any()]]
     }
 
+    // T237551085: Once linters can take a custom configuration via the TOML files, move this to a config
+    fn excludes_functions(&self) -> Vec<FunctionMatch> {
+        lazy_function_matches![vec![
+            FunctionMatch::m("lager"),
+            FunctionMatch::m("graphql_scanner"),
+            FunctionMatch::m("graphql_parser"),
+            FunctionMatch::m("thrift_scanner"),
+            FunctionMatch::m("thrift_parser"),
+        ]]
+    }
+
     fn match_description(&self, context: &Self::Context) -> Cow<'_, str> {
         match context {
             None => Cow::Borrowed(self.description()),
@@ -67,7 +78,7 @@ impl FunctionCallLinter for UndefinedFunctionLinter {
                 let arity = context.args.arity();
                 let module = &def_fb[*module];
                 let name = &def_fb[*name];
-                if in_exclusion_list(sema, module, name, arity)
+                if sema.is_atom_named(name, &known::module_info) && (arity == 0 || arity == 1)
                     || sema
                         .resolve_module_expr(def_fb.file_id(), module)
                         .is_some_and(|module| is_automatically_added(sema, module, name, arity))
@@ -105,16 +116,6 @@ fn is_automatically_added(sema: &Semantic, module: Module, function: &Expr, arit
     function_name_is_behaviour_info && arity == 1 && module_has_callbacks_defined
 }
 
-// T237551085: Once linters can take a custom configuration via the TOML files, move this to a config
-fn in_exclusion_list(sema: &Semantic, module: &Expr, function: &Expr, arity: u32) -> bool {
-    sema.is_atom_named(function, &known::module_info) && (arity == 0 || arity == 1)
-        || sema.is_atom_named(module, &known::lager)
-        || sema.is_atom_named(module, &known::graphql_scanner)
-        || sema.is_atom_named(module, &known::graphql_parser)
-        || sema.is_atom_named(module, &known::thrift_scanner)
-        || sema.is_atom_named(module, &known::thrift_parser)
-}
-
 #[cfg(test)]
 mod tests {
 

From 314dbd68ca5a4604eb636a3117b15880f91d1b02 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 16 Sep 2025 10:00:51 -0700
Subject: [PATCH 114/394] Allow excluding function call matches via config

Summary:
Add an `exclude` config option for linters implementing the `FunctionCallLinter` trait, allowing to exclude matches via config.
Since the implementation uses `lazy_static` behind the scenes, this is only applied after a server restart.

This will later be used to avoid hard-coding the exclusion list for the `undefined_functions` linter.

For the time being, I'm using the default deserialization, so that one can write:

```
[linters.undefined_function]
exclude = [
  {type = "MFA", mfa = "my:function/2"}
]
```

This can be later refined not to require the boilerplate from users, but auto-detect the M, F or MFA.

Reviewed By: alanz

Differential Revision: D82535853

fbshipit-source-id: fe7bd54c0f1e6c803a6bca16b8951e27ac4dcc58
---
 crates/ide/src/diagnostics.rs | 87 ++++++++++++++++++++++++++++++++---
 1 file changed, 80 insertions(+), 7 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 1ec248e358..c7dfcbab2f 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -630,6 +630,7 @@ pub(crate) trait FunctionCallDiagnostics: Linter {
         file_id: FileId,
         severity: Severity,
         cli_severity: Severity,
+        config: &FunctionCallLinterConfig,
     ) -> Vec<Diagnostic>;
 }
 
@@ -640,13 +641,18 @@ impl<T: FunctionCallLinter> FunctionCallDiagnostics for T {
         file_id: FileId,
         severity: Severity,
         cli_severity: Severity,
+        config: &FunctionCallLinterConfig,
     ) -> Vec<Diagnostic> {
         let mut diagnostics = Vec::new();
         let matches = self.matches_functions();
         let excluded_matches = self.excludes_functions();
+        let excluded_matches_from_config = &config.exclude.clone().unwrap_or_default();
         let mfas: Vec<(&FunctionMatch, ())> = matches.iter().map(|m| (m, ())).collect();
-        let excluded_mfas: Vec<(&FunctionMatch, ())> =
-            excluded_matches.iter().map(|m| (m, ())).collect();
+        let excluded_mfas: Vec<(&FunctionMatch, ())> = excluded_matches
+            .iter()
+            .chain(excluded_matches_from_config)
+            .map(|m| (m, ()))
+            .collect();
         sema.def_map_local(file_id)
             .get_functions()
             .for_each(|(_, def)| {
@@ -749,6 +755,7 @@ pub(crate) trait SsrPatternsDiagnostics: Linter {
         file_id: FileId,
         severity: Severity,
         cli_severity: Severity,
+        linter_config: &SsrPatternsLinterConfig,
     ) -> Vec<Diagnostic>;
 }
 
@@ -759,6 +766,7 @@ impl<T: SsrPatternsLinter> SsrPatternsDiagnostics for T {
         file_id: FileId,
         severity: Severity,
         cli_severity: Severity,
+        _linter_config: &SsrPatternsLinterConfig,
     ) -> Vec<Diagnostic> {
         let mut res = Vec::new();
         for (pattern, context) in self.patterns() {
@@ -1025,6 +1033,26 @@ impl LintConfig {
     pub fn get_experimental_override(&self, diagnostic_code: &DiagnosticCode) -> Option<bool> {
         self.linters.get(diagnostic_code)?.experimental
     }
+
+    pub fn get_function_call_linter_config(
+        &self,
+        diagnostic_code: &DiagnosticCode,
+    ) -> Option<FunctionCallLinterConfig> {
+        match self.linters.get(diagnostic_code)?.config.clone()? {
+            LinterTraitConfig::FunctionCallLinterConfig(config) => Some(config),
+            _ => None,
+        }
+    }
+
+    pub fn get_ssr_patterns_linter_config(
+        &self,
+        diagnostic_code: &DiagnosticCode,
+    ) -> Option<SsrPatternsLinterConfig> {
+        match self.linters.get(diagnostic_code)?.config.clone()? {
+            LinterTraitConfig::SsrPatternsLinterConfig(config) => Some(config),
+            _ => None,
+        }
+    }
 }
 
 // ---------------------------------------------------------------------
@@ -1043,14 +1071,30 @@ pub struct LintConfig {
     pub linters: FxHashMap<DiagnosticCode, LinterConfig>,
 }
 
-/// Configuration for a specific linter that allows overriding default settings
+#[derive(Deserialize, Serialize, Default, Debug, Clone)]
+pub struct FunctionCallLinterConfig {
+    exclude: Option<Vec<FunctionMatch>>,
+}
+
+#[derive(Deserialize, Serialize, Default, Debug, Clone)]
+pub struct SsrPatternsLinterConfig {}
+
 #[derive(Deserialize, Serialize, Debug, Clone)]
-#[derive(Default)]
+#[serde(untagged)]
+pub enum LinterTraitConfig {
+    FunctionCallLinterConfig(FunctionCallLinterConfig),
+    SsrPatternsLinterConfig(SsrPatternsLinterConfig),
+}
+
+/// Configuration for a specific linter that allows overriding default settings
+#[derive(Deserialize, Serialize, Debug, Clone, Default)]
 pub struct LinterConfig {
     pub severity: Option<Severity>,
     pub include_tests: Option<bool>,
     pub include_generated: Option<bool>,
     pub experimental: Option<bool>,
+    #[serde(flatten)]
+    pub config: Option<LinterTraitConfig>,
 }
 
 impl<'de> Deserialize<'de> for Severity {
@@ -1430,12 +1474,37 @@ fn diagnostics_from_linters(
             };
             match l {
                 DiagnosticLinter::FunctionCall(function_linter) => {
-                    let diagnostics =
-                        function_linter.diagnostics(sema, file_id, severity, cli_severity);
+                    let linter_config = if let Some(lint_config) = config.lint_config.as_ref() {
+                        lint_config
+                            .get_function_call_linter_config(&linter.id())
+                            .unwrap_or_else(FunctionCallLinterConfig::default)
+                    } else {
+                        FunctionCallLinterConfig::default()
+                    };
+                    let diagnostics = function_linter.diagnostics(
+                        sema,
+                        file_id,
+                        severity,
+                        cli_severity,
+                        &linter_config,
+                    );
                     res.extend(diagnostics);
                 }
                 DiagnosticLinter::SsrPatterns(ssr_linter) => {
-                    let diagnostics = ssr_linter.diagnostics(sema, file_id, severity, cli_severity);
+                    let linter_config = if let Some(lint_config) = config.lint_config.as_ref() {
+                        lint_config
+                            .get_ssr_patterns_linter_config(&linter.id())
+                            .unwrap_or_else(SsrPatternsLinterConfig::default)
+                    } else {
+                        SsrPatternsLinterConfig::default()
+                    };
+                    let diagnostics = ssr_linter.diagnostics(
+                        sema,
+                        file_id,
+                        severity,
+                        cli_severity,
+                        &linter_config,
+                    );
                     res.extend(diagnostics);
                 }
             }
@@ -3279,6 +3348,7 @@ baz(1)->4.
                 include_tests: None,
                 include_generated: None,
                 experimental: None,
+                config: None,
             },
         );
 
@@ -3319,6 +3389,7 @@ baz(1)->4.
                 include_tests: Some(true),
                 include_generated: None,
                 experimental: None,
+                config: None,
             },
         );
 
@@ -3358,6 +3429,7 @@ baz(1)->4.
                 include_tests: None,
                 include_generated: Some(true),
                 experimental: None,
+                config: None,
             },
         );
 
@@ -3398,6 +3470,7 @@ baz(1)->4.
                 include_tests: None,
                 include_generated: None,
                 experimental: Some(true),
+                config: None,
             },
         );
 

From 1185d992f0df7004a4bd9837a8d2d24870936f62 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 16 Sep 2025 10:00:51 -0700
Subject: [PATCH 115/394] Specify exclusion list for undefined_function linter
 via config

Reviewed By: alanz

Differential Revision: D82543237

fbshipit-source-id: efd7b272aef7386f0615272922090bdb5306535a
---
 crates/ide/src/diagnostics/undefined_function.rs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/crates/ide/src/diagnostics/undefined_function.rs b/crates/ide/src/diagnostics/undefined_function.rs
index a7dca42236..2584e95896 100644
--- a/crates/ide/src/diagnostics/undefined_function.rs
+++ b/crates/ide/src/diagnostics/undefined_function.rs
@@ -52,14 +52,9 @@ impl FunctionCallLinter for UndefinedFunctionLinter {
         lazy_function_matches![vec![FunctionMatch::any()]]
     }
 
-    // T237551085: Once linters can take a custom configuration via the TOML files, move this to a config
     fn excludes_functions(&self) -> Vec<FunctionMatch> {
         lazy_function_matches![vec![
-            FunctionMatch::m("lager"),
-            FunctionMatch::m("graphql_scanner"),
-            FunctionMatch::m("graphql_parser"),
-            FunctionMatch::m("thrift_scanner"),
-            FunctionMatch::m("thrift_parser"),
+            FunctionMatch::m("lager"), // Lager functions are produced by parse transforms
         ]]
     }
 

From ee888495e52e2080df105e9a330b1da3acf2c530 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 17 Sep 2025 01:38:03 -0700
Subject: [PATCH 116/394] Only show hover link to docs if the function has docs

Summary: There is no point in showing a link if we know the pointed module/function has no docs.

Reviewed By: alanz

Differential Revision: D82544032

fbshipit-source-id: 27f5bf58c18afb44d57b6a1628e3a6383f77483e
---
 crates/hir/src/module_data.rs                       | 13 +++++++++++++
 crates/ide/src/diagnostics/undocumented_function.rs |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/crates/hir/src/module_data.rs b/crates/hir/src/module_data.rs
index b24aa5df73..477637b775 100644
--- a/crates/hir/src/module_data.rs
+++ b/crates/hir/src/module_data.rs
@@ -113,6 +113,11 @@ impl Module {
     pub fn is_in_otp(&self, db: &dyn DefDatabase) -> bool {
         is_in_otp(self.file.file_id, db)
     }
+
+    pub fn has_moduledoc(&self, db: &dyn DefDatabase) -> bool {
+        let forms = db.file_form_list(self.file.file_id);
+        forms.moduledoc_attributes().next().is_some()
+    }
 }
 
 #[derive(Clone, PartialEq, Eq, Debug)]
@@ -351,6 +356,14 @@ impl FunctionDef {
     pub fn code_complexity(&self, sema: &Semantic, score_cap: Option<usize>) -> CodeComplexity {
         code_complexity::compute(sema, self, score_cap)
     }
+
+    pub fn has_doc_attribute(&self) -> bool {
+        self.doc_id.is_some()
+    }
+
+    pub fn has_doc_attribute_metadata(&self) -> bool {
+        self.doc_metadata_id.is_some()
+    }
 }
 
 fn doc_metadata_params(map: &MapExpr) -> Option<Expr> {
diff --git a/crates/ide/src/diagnostics/undocumented_function.rs b/crates/ide/src/diagnostics/undocumented_function.rs
index 8e67dae85f..353e79fee3 100644
--- a/crates/ide/src/diagnostics/undocumented_function.rs
+++ b/crates/ide/src/diagnostics/undocumented_function.rs
@@ -93,8 +93,8 @@ fn check_function(
     callbacks: &FxHashSet<NameArity>,
 ) {
     if function_should_be_checked(sema, def, callbacks)
-        && def.doc_id.is_none()
-        && def.doc_metadata_id.is_none()
+        && !def.has_doc_attribute()
+        && !def.has_doc_attribute_metadata()
         && def.edoc_comments(sema.db).is_none()
         && let Some(name_range) = def.name_range(sema.db)
     {

From cedda2811a9b0737108502d7d3d1d12139d03640 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 17 Sep 2025 02:51:58 -0700
Subject: [PATCH 117/394] buck2: do not provide deps_targets to elp.bxl

Summary:
The `--deps_targets` CLI argument is no longer used in [`elp.bxl`](https://fburl.com/code/8fbkds7w).

We remove it in ELP, so it can later be removed from `elp.bxl`

Reviewed By: TD5

Differential Revision: D82547631

fbshipit-source-id: c59400bd8ff126871031729bf9a59fcd4854dd3e
---
 crates/project_model/src/buck.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 5d4d68265a..445bc61496 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -729,10 +729,6 @@ pub fn query_buck_targets_bxl(
         targets.push("--included_targets");
         targets.push(target);
     }
-    for deps_target in &buck_config.deps_targets {
-        targets.push("--deps_targets");
-        targets.push(deps_target);
-    }
     let build_args = if build == &BuckQueryConfig::BuildGeneratedCode {
         vec!["--build_generated_code", "true"]
     } else {

From a849eaf3cda9290f696540199dfeded30963a8cb Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 17 Sep 2025 02:51:58 -0700
Subject: [PATCH 118/394] buck2: Remove BuckTargetOrigin::Prelude

Summary: [elp.bxl](https://fburl.com/code/euy3qis2) no longer reports an origin of type "prelude", so remove it with ELP.

Reviewed By: TD5

Differential Revision: D82548892

fbshipit-source-id: 5d69942503faefd530d34d0c4b3591a671f10e56
---
 crates/project_model/src/buck.rs | 37 +++++++-------------------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 445bc61496..d328a8669e 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -369,7 +369,6 @@ enum BuckTargetOrigin {
     #[default]
     App,
     Dep,
-    Prelude,
 }
 
 // Serde serialization via String
@@ -378,7 +377,6 @@ impl From<BuckTargetOrigin> for String {
         match val {
             BuckTargetOrigin::App => "app".to_string(),
             BuckTargetOrigin::Dep => "dep".to_string(),
-            BuckTargetOrigin::Prelude => "prelude".to_string(),
         }
     }
 }
@@ -398,7 +396,6 @@ impl TryFrom<&str> for BuckTargetOrigin {
         match value {
             "app" => Ok(BuckTargetOrigin::App),
             "dep" => Ok(BuckTargetOrigin::Dep),
-            "prelude" => Ok(BuckTargetOrigin::Prelude),
             _ => Err(format!(
                 "bad origin value '{value}', expected 'app', 'dep', or 'prelude'."
             )),
@@ -533,16 +530,14 @@ fn load_buck_targets_bxl(
     let mut used_deps = FxHashSet::default();
 
     for (name, buck_target) in &buck_targets {
-        if buck_target.origin != BuckTargetOrigin::Prelude
-            && let Ok(target) = make_buck_target(
-                root,
-                name,
-                buck_target,
-                buck_config.build_deps,
-                &mut dep_path,
-                &mut target_info,
-            )
-        {
+        if let Ok(target) = make_buck_target(
+            root,
+            name,
+            buck_target,
+            buck_config.build_deps,
+            &mut dep_path,
+            &mut target_info,
+        ) {
             for target_name in &target.apps {
                 used_deps.insert(target_name.clone());
             }
@@ -552,22 +547,6 @@ fn load_buck_targets_bxl(
             target_info.targets.insert(name.clone(), target);
         }
     }
-    // Insert used prelude values too
-    for name in &used_deps {
-        if let Some(buck_target) = &buck_targets.get(name)
-            && buck_target.origin == BuckTargetOrigin::Prelude
-            && let Ok(target) = make_buck_target(
-                root,
-                name,
-                buck_target,
-                buck_config.build_deps,
-                &mut dep_path,
-                &mut target_info,
-            )
-        {
-            target_info.targets.insert(name.clone(), target);
-        }
-    }
     Ok(target_info)
 }
 

From 686d42f782b39322d47cf751c471ebf47191f355 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 17 Sep 2025 07:49:31 -0700
Subject: [PATCH 119/394] Add new option to mark Erlang Service warnings as
 errors

Summary:
An Erlang project can be compiled with the [`warnings_as_errors`](https://www.erlang.org/doc/apps/compiler/compile.html#file/2) option, which causes warnings to be treated as errors.

ELP does not respect this option when it comes to diagnostics produced by the Erlang Service (the Erlang sidecar running next to ELP), which can create confusion in the user: if `warnings_as_errors` is specified, ELP would only raise a warning (both in the IDE and in the CLI), but the project would fail compilation.

Here we add a new configuration section for the `[erlang_service]`, where the option can be explicitly passed. Later on, we could automatically expand this mechanism to auto-extract the option from either a rebar3 or a buck2 project. For now, that's considered out of scope.

Since the Erlang Service validates Erlang modules using a fork of the [`erl_lint`](https://github.com/erlang/otp/blob/master/lib/stdlib/src/erl_lint.erl) linter, which does not respect the `warnings_as_errors` option, we tweak the result on ELP side.

We also document the new config section.

Reviewed By: alanz

Differential Revision: D82628908

fbshipit-source-id: f3ced1cf333b463657cbc13113129bb15533a9d6
---
 crates/elp/src/bin/lint_cli.rs                | 10 ++++++
 crates/elp/src/bin/main.rs                    | 15 ++++++++
 crates/elp/src/lib.rs                         |  5 +++
 .../test/linter/warnings_as_errors.stdout     | 34 +++++++++++++++++++
 crates/ide/src/diagnostics.rs                 | 21 +++++++++++-
 .../linter/elp_lint_warnings_as_errors.toml   |  2 ++
 .../configure-project/elp-lint-toml.md        | 23 ++++++++++---
 7 files changed, 105 insertions(+), 5 deletions(-)
 create mode 100644 crates/elp/src/resources/test/linter/warnings_as_errors.stdout
 create mode 100644 test_projects/linter/elp_lint_warnings_as_errors.toml

diff --git a/crates/elp/src/bin/lint_cli.rs b/crates/elp/src/bin/lint_cli.rs
index 8bfd352a74..9c7ab42e05 100644
--- a/crates/elp/src/bin/lint_cli.rs
+++ b/crates/elp/src/bin/lint_cli.rs
@@ -935,6 +935,7 @@ mod tests {
     use elp::cli::Fake;
     use elp_ide::FunctionMatch;
     use elp_ide::diagnostics::DiagnosticCode;
+    use elp_ide::diagnostics::ErlangServiceConfig;
     use elp_ide::diagnostics::Lint;
     use elp_ide::diagnostics::LintsFromConfig;
     use elp_ide::diagnostics::ReplaceCall;
@@ -968,12 +969,18 @@ mod tests {
             enabled_lints: vec![DiagnosticCode::HeadMismatch],
             disabled_lints: vec![],
             linters: FxHashMap::default(),
+            erlang_service: ErlangServiceConfig {
+                warnings_as_errors: true,
+            },
         })
         .unwrap();
 
         expect![[r#"
             enabled_lints = ["P1700"]
             disabled_lints = []
+            
+            [erlang_service]
+            warnings_as_errors = true
             [[ad_hoc_lints.lints]]
             type = "ReplaceCall"
 
@@ -1007,6 +1014,9 @@ mod tests {
                     TrivialMatch,
                 ],
                 disabled_lints: [],
+                erlang_service: ErlangServiceConfig {
+                    warnings_as_errors: false,
+                },
                 ad_hoc_lints: LintsFromConfig {
                     lints: [],
                 },
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 142b4f952e..8ecbb520be 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -1863,6 +1863,21 @@ mod tests {
         }
     }
 
+    #[test]
+    fn lint_warnings_as_errors() {
+        simple_snapshot_expect_error(
+            args_vec![
+                "lint",
+                "--config-file",
+                "../../test_projects/linter/elp_lint_warnings_as_errors.toml"
+            ],
+            "linter",
+            expect_file!("../resources/test/linter/warnings_as_errors.stdout"),
+            true,
+            None,
+        )
+    }
+
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
     fn eqwalizer_tests_check(buck: bool) {
diff --git a/crates/elp/src/lib.rs b/crates/elp/src/lib.rs
index a75db798c2..2ed7fece37 100644
--- a/crates/elp/src/lib.rs
+++ b/crates/elp/src/lib.rs
@@ -159,6 +159,7 @@ pub fn read_lint_config_file(project: &Path, config_file: &Option<String>) -> Re
 mod tests {
     use elp_ide::FunctionMatch;
     use elp_ide::diagnostics::DiagnosticCode;
+    use elp_ide::diagnostics::ErlangServiceConfig;
     use elp_ide::diagnostics::Lint;
     use elp_ide::diagnostics::LintsFromConfig;
     use elp_ide::diagnostics::ReplaceCall;
@@ -190,10 +191,14 @@ mod tests {
                 ],
             },
             linters: FxHashMap::default(),
+            erlang_service: ErlangServiceConfig::default(),
         };
         expect![[r#"
             enabled_lints = ["W0011"]
             disabled_lints = []
+
+            [erlang_service]
+            warnings_as_errors = false
             [[ad_hoc_lints.lints]]
             type = "ReplaceCall"
 
diff --git a/crates/elp/src/resources/test/linter/warnings_as_errors.stdout b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
new file mode 100644
index 0000000000..d0bd9289b4
--- /dev/null
+++ b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
@@ -0,0 +1,34 @@
+Reporting all diagnostics codes
+Diagnostics reported in 7 modules:
+  app_a: 8
+      4:4-4:34::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
+      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+      8:0-8:4::[Error] [P1700] head mismatch 'fooX' vs 'food'
+      7:6-7:7::[Warning] [W0018] Unexpected ';'
+      0:8-0:13::[WeakWarning] [W0046] The module is not documented.
+      12:4-12:13::[Warning] [W0026] Function 'app_a:baz/2' is not exported.
+      11:0-11:3::[Error] [L1230] function bar/0 is unused
+      15:0-15:3::[Error] [L1230] function baz/2 is unused
+  app_a_edoc: 2
+      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+      0:8-0:18::[WeakWarning] [W0046] The module is not documented.
+  app_a_unused_param: 3
+      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+      0:8-0:26::[WeakWarning] [W0046] The module is not documented.
+      4:4-4:5::[Error] [L1268] variable 'X' is unused
+  app_b: 3
+      4:4-4:34::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
+      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+      0:8-0:13::[WeakWarning] [W0046] The module is not documented.
+  app_b_unused_param: 3
+      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+      0:8-0:26::[WeakWarning] [W0046] The module is not documented.
+      4:4-4:5::[Error] [L1268] variable 'X' is unused
+  expression_updates_literal: 3
+      1:8-1:34::[WeakWarning] [W0046] The module is not documented.
+      6:0-6:5::[Error] [L1309] missing specification for function a_fun/0
+      7:6-8:15::[Error] [L1318] expression updates a literal
+  spelling: 3
+      1:1-1:9::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
+      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+      0:8-0:16::[WeakWarning] [W0046] The module is not documented.
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index c7dfcbab2f..7cc5adb5e9 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1011,6 +1011,15 @@ impl DiagnosticsConfig {
                 _ => false,
             })
     }
+
+    fn erlang_service_warning_severity(&self) -> Severity {
+        if let Some(lint_config) = &self.lint_config
+            && lint_config.erlang_service.warnings_as_errors
+        {
+            return Severity::Error;
+        }
+        Severity::Warning
+    }
 }
 
 impl LintConfig {
@@ -1066,11 +1075,19 @@ pub struct LintConfig {
     #[serde(default)]
     pub disabled_lints: Vec<DiagnosticCode>,
     #[serde(default)]
+    pub erlang_service: ErlangServiceConfig,
+    #[serde(default)]
     pub ad_hoc_lints: LintsFromConfig,
     #[serde(default)]
     pub linters: FxHashMap<DiagnosticCode, LinterConfig>,
 }
 
+#[derive(Deserialize, Serialize, Default, Debug, Clone)]
+pub struct ErlangServiceConfig {
+    #[serde(default)]
+    pub warnings_as_errors: bool,
+}
+
 #[derive(Deserialize, Serialize, Default, Debug, Clone)]
 pub struct FunctionCallLinterConfig {
     exclude: Option<Vec<FunctionMatch>>,
@@ -1774,6 +1791,8 @@ pub fn erlang_service_diagnostics(
                 warning_info.insert(val);
             });
 
+        let warning_severity = config.erlang_service_warning_severity();
+
         let diags: Vec<(FileId, Diagnostic)> = error_info
             .into_iter()
             .map(|(file_id, start, end, code, msg)| {
@@ -1801,7 +1820,7 @@ pub fn erlang_service_diagnostics(
                                     msg,
                                     TextRange::new(start, end),
                                 )
-                                .with_severity(Severity::Warning),
+                                .with_severity(warning_severity),
                             ),
                         )
                     }),
diff --git a/test_projects/linter/elp_lint_warnings_as_errors.toml b/test_projects/linter/elp_lint_warnings_as_errors.toml
new file mode 100644
index 0000000000..2fe076a5b4
--- /dev/null
+++ b/test_projects/linter/elp_lint_warnings_as_errors.toml
@@ -0,0 +1,2 @@
+[erlang_service]
+warnings_as_errors = true
diff --git a/website/docs/get-started/configure-project/elp-lint-toml.md b/website/docs/get-started/configure-project/elp-lint-toml.md
index 46d0f3f2c9..0fa618d4a0 100644
--- a/website/docs/get-started/configure-project/elp-lint-toml.md
+++ b/website/docs/get-started/configure-project/elp-lint-toml.md
@@ -5,7 +5,7 @@ sidebar_position: 6
 # The `.elp_lint.toml` Configuration File
 
 A `.elp_lint.toml` configuration file can be added to a project's root directory to
-customize the list of diagnostics (aka linters) enabled.
+customize the list of diagnostics (aka linters) enabled and other behaviours.
 
 ## A Sample `.elp_lint.toml` Configuration File
 
@@ -16,11 +16,26 @@ disabled_lints = [
     'W0011', # Accessing different app's application env
     'W0014' # Cross node eval
 ]
+[erlang_service]
+warnings_as_errors = true
 ```
 
-Where you can use:
+## enabled_lints
 
-* `enabled_lints`: To enable a diagnostic that would otherwise be disabled by default
-* `disabled_lints`: To disable a diagnostic that would otherwise be enabled by default
+You can use this option to enable diagnostics that would otherwise be disabled by default
 
 Please refer to the [Erlang Error Index](../../erlang-error-index/erlang-error-index.mdx) for a reference of supported diagnostic codes.
+
+## disabled_lints
+
+You can use this option to disable a diagnostic that would otherwise be enabled by default
+
+Please refer to the [Erlang Error Index](../../erlang-error-index/erlang-error-index.mdx) for a reference of supported diagnostic codes.
+
+## [erlang_service]
+
+Through the `erlang_service` section, you can configure the behaviour of the Erlang Service (the Erlang sidecar next to ELP).
+
+### warnings_as_errors
+
+If set to `true`, warnings producing by the Erlang Service will be treated as errors.

From ea45ecfdd198a73353ce99f904c83729b1e8dc04 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Thu, 18 Sep 2025 05:43:32 -0700
Subject: [PATCH 120/394] BE: always check stderr in elp lint fix tests

Summary:
The apply lint process can error. Make sure we check in our tests that it does not.

This makes it easier to catch regressions.

Reviewed By: TD5

Differential Revision: D82713866

fbshipit-source-id: dac9e83f392d5e47a46aa4ffb81d8f2ddd5c79f7
---
 crates/elp/src/bin/main.rs | 44 ++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 8ecbb520be..4aa7bfa869 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -1330,7 +1330,7 @@ mod tests {
     fn lint_config_file_used(buck: bool) {
         let tmp_dir = make_tmp_dir();
         let tmp_path = tmp_dir.path();
-        check_lint_fix(
+        check_lint_fix_stderr(
             args_vec![
                 "lint",
                 "--diagnostic-filter",
@@ -1347,6 +1347,9 @@ mod tests {
             Path::new("../resources/test/lint/lint_recursive"),
             &[],
             false,
+            Some(expect![[r#"
+                Errors found
+            "#]]),
         )
         .expect("bad test");
     }
@@ -1537,7 +1540,7 @@ mod tests {
     fn lint_explicit_enable_diagnostic(buck: bool) {
         let tmp_dir = make_tmp_dir();
         let tmp_path = tmp_dir.path();
-        check_lint_fix(
+        check_lint_fix_stderr(
             args_vec![
                 "lint",
                 "--config-file",
@@ -1552,6 +1555,9 @@ mod tests {
             Path::new("../resources/test/lint/lint_recursive"),
             &[],
             false,
+            Some(expect![[r#"
+                Errors found
+            "#]]),
         )
         .expect("bad test");
     }
@@ -1561,7 +1567,7 @@ mod tests {
     fn lint_json_output(buck: bool) {
         let tmp_dir = make_tmp_dir();
         let tmp_path = tmp_dir.path();
-        check_lint_fix(
+        check_lint_fix_stderr(
             args_vec![
                 "lint",
                 "--diagnostic-filter",
@@ -1579,6 +1585,9 @@ mod tests {
             Path::new("../resources/test/lint/lint_recursive"),
             &[],
             false,
+            Some(expect![[r#"
+                Errors found
+            "#]]),
         )
         .expect("bad test");
     }
@@ -1588,7 +1597,7 @@ mod tests {
     fn lint_json_output_prefix(buck: bool) {
         let tmp_dir = make_tmp_dir();
         let tmp_path = tmp_dir.path();
-        check_lint_fix(
+        check_lint_fix_stderr(
             args_vec![
                 "lint",
                 "--diagnostic-filter",
@@ -1608,6 +1617,9 @@ mod tests {
             Path::new("../resources/test/lint/lint_recursive"),
             &[],
             false,
+            Some(expect![[r#"
+                Errors found
+            "#]]),
         )
         .expect("bad test");
     }
@@ -1617,7 +1629,7 @@ mod tests {
     fn lint_applies_fix_using_to_dir(buck: bool) {
         let tmp_dir = make_tmp_dir();
         let tmp_path = tmp_dir.path();
-        check_lint_fix(
+        check_lint_fix_stderr(
             args_vec![
                 "lint",
                 "--module",
@@ -1626,7 +1638,7 @@ mod tests {
                 "P1700",
                 "--to",
                 tmp_path,
-                "--apply-fix"
+                "--apply-fix",
             ],
             "diagnostics",
             expect_file!("../resources/test/diagnostics/parse_elp_lint_fix.stdout"),
@@ -1637,6 +1649,9 @@ mod tests {
             Path::new("../resources/test/lint/head_mismatch"),
             &[("app_a/src/lints.erl", "lints.erl")],
             false,
+            Some(expect![[r#"
+                Errors found
+            "#]]),
         )
         .expect("Bad test");
     }
@@ -1646,7 +1661,7 @@ mod tests {
     fn lint_applies_fix_using_to_dir_json_output(buck: bool) {
         let tmp_dir = make_tmp_dir();
         let tmp_path = tmp_dir.path();
-        check_lint_fix(
+        check_lint_fix_stderr(
             args_vec![
                 "lint",
                 "--module",
@@ -1668,6 +1683,9 @@ mod tests {
             Path::new("../resources/test/lint/head_mismatch"),
             &[("app_a/src/lints.erl", "lints.erl")],
             false,
+            Some(expect![[r#"
+                Errors found
+            "#]]),
         )
         .expect("Bad test");
     }
@@ -1688,7 +1706,7 @@ mod tests {
 
     fn do_lint_applies_fix_in_place(buck: bool) {
         let project = "in_place_tests";
-        check_lint_fix(
+        check_lint_fix_stderr(
             args_vec![
                 "lint",
                 "--module",
@@ -1707,6 +1725,9 @@ mod tests {
             Path::new("../resources/test/lint/head_mismatch"),
             &[("app_a/src/lints.erl", "app_a/src/lints.erl")],
             true,
+            Some(expect![[r#"
+                Errors found
+            "#]]),
         )
         .expect("Bad test");
     }
@@ -1746,7 +1767,7 @@ mod tests {
     fn lint_applies_code_action_fixme_if_requested(buck: bool) {
         let tmp_dir = make_tmp_dir();
         let tmp_path = tmp_dir.path();
-        check_lint_fix(
+        check_lint_fix_stderr(
             args_vec![
                 "lint",
                 "--module",
@@ -1767,6 +1788,9 @@ mod tests {
             Path::new("../resources/test/lint/ignore_app_env"),
             &[("app_a/src/spelling.erl", "spelling.erl")],
             false,
+            Some(expect![[r#"
+                Errors found
+            "#]]),
         )
         .expect("Bad test");
     }
@@ -2400,6 +2424,8 @@ mod tests {
             );
             if let Some(expected_stderr) = expected_stderr {
                 expected_stderr.assert_eq(&stderr);
+            } else {
+                expect![[""]].assert_eq(&stderr);
             }
             assert_normalised_file(expected, &stdout, path, false);
             for (expected_file, file) in files {

From b32bd857fddae4fc5b54d7849589fd1f505477ae Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 19 Sep 2025 03:32:39 -0700
Subject: [PATCH 121/394] Convert cross_node_eval linter to use trait

Summary: Convert the `cross_node_eval` linter to use the `FunctionCallLinter` trait.

Reviewed By: alanz

Differential Revision: D82633601

fbshipit-source-id: 131c5cfb09b5747813ee0e551bf20c4324b4d79b
---
 crates/elp/src/bin/main.rs                    |  17 +++
 .../linter/custom_function_matches.stdout     |   5 +
 ...e_elp_no_lint_specified_json_output.stdout |   3 +
 .../parse_elp_no_lint_specified_output.stdout |   6 +-
 .../test/linter/warnings_as_errors.stdout     |   6 +-
 crates/ide/src/diagnostics.rs                 |  10 +-
 crates/ide/src/diagnostics/cross_node_eval.rs | 126 ++++++------------
 .../app_a/src/custom_function_matches.erl     |  16 +++
 .../elp_lint_custom_function_matches.toml     |  10 ++
 .../w/{W0014.md => W0014.mdx}                 |   4 +
 10 files changed, 113 insertions(+), 90 deletions(-)
 create mode 100644 crates/elp/src/resources/test/linter/custom_function_matches.stdout
 create mode 100644 test_projects/linter/app_a/src/custom_function_matches.erl
 create mode 100644 test_projects/linter/elp_lint_custom_function_matches.toml
 rename website/docs/erlang-error-index/w/{W0014.md => W0014.mdx} (82%)

diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 4aa7bfa869..d87fb89a8f 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -1902,6 +1902,23 @@ mod tests {
         )
     }
 
+    #[test]
+    fn lint_custom_function_matches() {
+        simple_snapshot(
+            args_vec![
+                "lint",
+                "--config-file",
+                "../../test_projects/linter/elp_lint_custom_function_matches.toml",
+                "--module",
+                "custom_function_matches"
+            ],
+            "linter",
+            expect_file!("../resources/test/linter/custom_function_matches.stdout"),
+            true,
+            None,
+        )
+    }
+
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
     fn eqwalizer_tests_check(buck: bool) {
diff --git a/crates/elp/src/resources/test/linter/custom_function_matches.stdout b/crates/elp/src/resources/test/linter/custom_function_matches.stdout
new file mode 100644
index 0000000000..08c0321771
--- /dev/null
+++ b/crates/elp/src/resources/test/linter/custom_function_matches.stdout
@@ -0,0 +1,5 @@
+Reporting all diagnostics codes
+module specified: custom_function_matches
+Diagnostics reported in 1 modules:
+  custom_function_matches: 1
+      13:4-13:25::[Warning] [W0017] Function 'not_excluded:function/0' is undefined.
diff --git a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
index 5c002e54de..c1475aa449 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
@@ -17,6 +17,9 @@
 {"path":"app_b/src/app_b_unused_param.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012"}
 {"path":"app_b/src/app_b_unused_param.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046"}
 {"path":"app_b/src/app_b_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"L1268 (L1268)","original":null,"replacement":null,"description":"variable 'X' is unused\n\nFor more information see: /erlang-error-index/l/L1268"}
+{"path":"app_a/src/custom_function_matches.erl","line":13,"char":5,"code":"ELP","severity":"warning","name":"W0017 (undefined_function)","original":null,"replacement":null,"description":"Function 'excluded:function/0' is undefined.\n\nFor more information see: /erlang-error-index/w/W0017"}
+{"path":"app_a/src/custom_function_matches.erl","line":14,"char":5,"code":"ELP","severity":"warning","name":"W0017 (undefined_function)","original":null,"replacement":null,"description":"Function 'not_excluded:function/0' is undefined.\n\nFor more information see: /erlang-error-index/w/W0017"}
+{"path":"app_a/src/custom_function_matches.erl","line":15,"char":5,"code":"ELP","severity":"warning","name":"W0017 (undefined_function)","original":null,"replacement":null,"description":"Function 'cross:call/0' is undefined.\n\nFor more information see: /erlang-error-index/w/W0017"}
 {"path":"app_a/src/expression_updates_literal.erl","line":2,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046"}
 {"path":"app_a/src/expression_updates_literal.erl","line":7,"char":1,"code":"ELP","severity":"warning","name":"L1309 (L1309)","original":null,"replacement":null,"description":"missing specification for function a_fun/0\n\nFor more information see: /erlang-error-index/l/L1309"}
 {"path":"app_a/src/expression_updates_literal.erl","line":8,"char":7,"code":"ELP","severity":"warning","name":"L1318 (L1318)","original":null,"replacement":null,"description":"expression updates a literal\n\nFor more information see: /erlang-error-index/l/L1318"}
diff --git a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
index 5099c34a65..01ac36d828 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
@@ -1,5 +1,5 @@
 Reporting all diagnostics codes
-Diagnostics reported in 7 modules:
+Diagnostics reported in 8 modules:
   app_a: 8
       4:4-4:34::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
       0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
@@ -24,6 +24,10 @@ Diagnostics reported in 7 modules:
       0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
       0:8-0:26::[WeakWarning] [W0046] The module is not documented.
       4:4-4:5::[Warning] [L1268] variable 'X' is unused
+  custom_function_matches: 3
+      12:4-12:21::[Warning] [W0017] Function 'excluded:function/0' is undefined.
+      13:4-13:25::[Warning] [W0017] Function 'not_excluded:function/0' is undefined.
+      14:4-14:14::[Warning] [W0017] Function 'cross:call/0' is undefined.
   expression_updates_literal: 3
       1:8-1:34::[WeakWarning] [W0046] The module is not documented.
       6:0-6:5::[Warning] [L1309] missing specification for function a_fun/0
diff --git a/crates/elp/src/resources/test/linter/warnings_as_errors.stdout b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
index d0bd9289b4..8ffe5b1201 100644
--- a/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
+++ b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
@@ -1,5 +1,5 @@
 Reporting all diagnostics codes
-Diagnostics reported in 7 modules:
+Diagnostics reported in 8 modules:
   app_a: 8
       4:4-4:34::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
       0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
@@ -24,6 +24,10 @@ Diagnostics reported in 7 modules:
       0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
       0:8-0:26::[WeakWarning] [W0046] The module is not documented.
       4:4-4:5::[Error] [L1268] variable 'X' is unused
+  custom_function_matches: 3
+      12:4-12:21::[Warning] [W0017] Function 'excluded:function/0' is undefined.
+      13:4-13:25::[Warning] [W0017] Function 'not_excluded:function/0' is undefined.
+      14:4-14:14::[Warning] [W0017] Function 'cross:call/0' is undefined.
   expression_updates_literal: 3
       1:8-1:34::[WeakWarning] [W0046] The module is not documented.
       6:0-6:5::[Error] [L1309] missing specification for function a_fun/0
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 7cc5adb5e9..2f80f5cf89 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -645,9 +645,14 @@ impl<T: FunctionCallLinter> FunctionCallDiagnostics for T {
     ) -> Vec<Diagnostic> {
         let mut diagnostics = Vec::new();
         let matches = self.matches_functions();
+        let included_matches_from_config = &config.include.clone().unwrap_or_default();
         let excluded_matches = self.excludes_functions();
         let excluded_matches_from_config = &config.exclude.clone().unwrap_or_default();
-        let mfas: Vec<(&FunctionMatch, ())> = matches.iter().map(|m| (m, ())).collect();
+        let mfas: Vec<(&FunctionMatch, ())> = matches
+            .iter()
+            .chain(included_matches_from_config)
+            .map(|m| (m, ()))
+            .collect();
         let excluded_mfas: Vec<(&FunctionMatch, ())> = excluded_matches
             .iter()
             .chain(excluded_matches_from_config)
@@ -1090,6 +1095,7 @@ pub struct ErlangServiceConfig {
 
 #[derive(Deserialize, Serialize, Default, Debug, Clone)]
 pub struct FunctionCallLinterConfig {
+    include: Option<Vec<FunctionMatch>>,
     exclude: Option<Vec<FunctionMatch>>,
 }
 
@@ -1351,7 +1357,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &deprecated_function::DESCRIPTOR,
         &head_mismatch::DESCRIPTOR_SEMANTIC,
         &missing_separator::DESCRIPTOR,
-        &cross_node_eval::DESCRIPTOR,
         &boolean_precedence::DESCRIPTOR,
         &record_tuple_match::DESCRIPTOR,
         &unspecific_include::DESCRIPTOR,
@@ -1423,6 +1428,7 @@ const FUNCTION_CALL_LINTERS: &[&dyn FunctionCallDiagnostics] = &[
     &atoms_exhaustion::LINTER,
     &undefined_function::LINTER,
     &unexported_function::LINTER,
+    &cross_node_eval::LINTER,
 ];
 
 /// SSR pattern linters that use structural search and replace patterns
diff --git a/crates/ide/src/diagnostics/cross_node_eval.rs b/crates/ide/src/diagnostics/cross_node_eval.rs
index 36ae2cb383..a61c058a40 100644
--- a/crates/ide/src/diagnostics/cross_node_eval.rs
+++ b/crates/ide/src/diagnostics/cross_node_eval.rs
@@ -12,102 +12,56 @@
 //!
 //! Return a diagnostic for rpc calls to remote nodes.
 
-use elp_ide_db::elp_base_db::FileId;
-use hir::FunctionDef;
-use hir::Semantic;
-use lazy_static::lazy_static;
-
-use super::Diagnostic;
-use super::DiagnosticConditions;
-use super::DiagnosticDescriptor;
 use crate::codemod_helpers::FunctionMatch;
-use crate::codemod_helpers::MatchCtx;
-use crate::codemod_helpers::find_call_in_function;
-// @fb-only
 use crate::diagnostics::DiagnosticCode;
+use crate::diagnostics::FunctionCallLinter;
+use crate::diagnostics::Linter;
 use crate::diagnostics::Severity;
+use crate::lazy_function_matches;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: false,
-        include_tests: false,
-        default_disabled: false,
-    },
-    checker: &|diags, sema, file_id, _ext| {
-        cross_node_eval(diags, sema, file_id);
-    },
-};
+pub(crate) struct CrossNodeEvalLinter;
 
-fn cross_node_eval(diags: &mut Vec<Diagnostic>, sema: &Semantic, file_id: FileId) {
-    sema.def_map(file_id)
-        .get_functions()
-        .for_each(|(_, def)| check_function(diags, sema, def));
-}
-
-fn check_function(diags: &mut Vec<Diagnostic>, sema: &Semantic, def: &FunctionDef) {
-    lazy_static! {
-        static ref BAD_MATCHES: Vec<(FunctionMatch, Option<&'static str>)> = vec![
-            vec![(FunctionMatch::m("rpc"), None)],
-            vec![(FunctionMatch::mf(
-                "erts_internal_dist",
-                "dist_spawn_request",
-            ), None)],
-            vec![(FunctionMatch::mf("sys", "install"), None)],
-            FunctionMatch::mfas("erlang", "spawn", vec![2, 4]).into_iter().map(|fm| (fm,None)).collect(),
-            FunctionMatch::mfas("erlang", "spawn_link", vec![2, 4]).into_iter().map(|fm| (fm,None)).collect(),
-            FunctionMatch::mfas("erlang", "spawn_monitor", vec![2, 4]).into_iter().map(|fm| (fm,None)).collect(),
-            FunctionMatch::mfas("erlang", "spawn_opt", vec![3, 5]).into_iter().map(|fm| (fm,None)).collect(),
-            FunctionMatch::mfas("sys", "install", vec![2, 3]).into_iter().map(|fm| (fm,None)).collect(),
-            // @fb-only
-        ]
-        .into_iter()
-        .flatten()
-        .collect::<Vec<_>>();
-
-        static ref BAD_MATCHES_MFAS: Vec<(&'static FunctionMatch, &'static Option<&'static str>)>
-            = BAD_MATCHES.iter().map(|(b, m)| (b, m)).collect::<Vec<_>>();
+impl Linter for CrossNodeEvalLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::CrossNodeEval
+    }
+    fn description(&self) -> &'static str {
+        "Production code must not use cross node eval (e.g. `rpc:call()`)"
+    }
+    fn severity(&self) -> Severity {
+        Severity::Error
+    }
+    fn should_process_test_files(&self) -> bool {
+        false
     }
-
-    process_badmatches(diags, sema, def, &BAD_MATCHES_MFAS);
 }
 
-fn process_badmatches(
-    diags: &mut Vec<Diagnostic>,
-    sema: &Semantic,
-    def: &FunctionDef,
-    bad: &[(&FunctionMatch, &Option<&str>)],
-) {
-    find_call_in_function(
-        diags,
-        sema,
-        def,
-        bad,
-        &[],
-        &move |ctx| match ctx.t {
-            Some(m) => Some(*m),
-            None => Some(r#"Production code must not use cross node eval (e.g. `rpc:call()`)"#),
-        },
-        &move |ctx @ MatchCtx {
-                   sema,
-                   def_fb,
-                   extra,
-                   ..
-               }: MatchCtx<'_, &str>| {
-            let range = ctx.range_mf_or_macro();
-            if def.file.file_id == range.file_id {
-                let diag = Diagnostic::new(DiagnosticCode::CrossNodeEval, *extra, range.range)
-                    .with_severity(Severity::Error)
-                    .with_ignore_fix(sema, def_fb.file_id());
-                Some(diag)
-            } else {
-                None
-            }
-        },
-    );
+impl FunctionCallLinter for CrossNodeEvalLinter {
+    type Context = ();
+
+    fn matches_functions(&self) -> Vec<FunctionMatch> {
+        lazy_function_matches![
+            vec![
+                vec![FunctionMatch::m("rpc")],
+                vec![FunctionMatch::mf(
+                    "erts_internal_dist",
+                    "dist_spawn_request"
+                )],
+                vec![FunctionMatch::mf("sys", "install")],
+                FunctionMatch::mfas("erlang", "spawn", vec![2, 4]),
+                FunctionMatch::mfas("erlang", "spawn_link", vec![2, 4]),
+                FunctionMatch::mfas("erlang", "spawn_monitor", vec![2, 4]),
+                FunctionMatch::mfas("erlang", "spawn_opt", vec![3, 5]),
+                FunctionMatch::mfas("sys", "install", vec![2, 3]),
+            ]
+            .into_iter()
+            .flatten()
+            .collect::<Vec<_>>()
+        ]
+    }
 }
 
-// ---------------------------------------------------------------------
+pub static LINTER: CrossNodeEvalLinter = CrossNodeEvalLinter;
 
 #[cfg(test)]
 mod tests {
diff --git a/test_projects/linter/app_a/src/custom_function_matches.erl b/test_projects/linter/app_a/src/custom_function_matches.erl
new file mode 100644
index 0000000000..e583be0ce5
--- /dev/null
+++ b/test_projects/linter/app_a/src/custom_function_matches.erl
@@ -0,0 +1,16 @@
+-module(custom_function_matches).
+-moduledoc """
+Tests for custom function matches.
+""".
+-compile(warn_missing_spec_all).
+-export([main/0]).
+
+-spec main() -> ok.
+-doc """
+Main function.
+""".
+main() ->
+    excluded:function(),
+    not_excluded:function(),
+    cross:call(),
+    ok.
diff --git a/test_projects/linter/elp_lint_custom_function_matches.toml b/test_projects/linter/elp_lint_custom_function_matches.toml
new file mode 100644
index 0000000000..dbdc482db0
--- /dev/null
+++ b/test_projects/linter/elp_lint_custom_function_matches.toml
@@ -0,0 +1,10 @@
+[linters.undefined_function]
+exclude = [
+    {type = "MFA", mfa = "excluded:function/0"},
+    {type = "M", module = "cross"}
+]
+
+[linters.cross_node_eval]
+include = [
+    {type = "M", module = "cross_node"}
+]
diff --git a/website/docs/erlang-error-index/w/W0014.md b/website/docs/erlang-error-index/w/W0014.mdx
similarity index 82%
rename from website/docs/erlang-error-index/w/W0014.md
rename to website/docs/erlang-error-index/w/W0014.mdx
index 75811d847d..ea1d455370 100644
--- a/website/docs/erlang-error-index/w/W0014.md
+++ b/website/docs/erlang-error-index/w/W0014.mdx
@@ -2,6 +2,8 @@
 sidebar_position: 14
 ---
 
+import MetaOnlyW0014 from '../../../fb/components/_META_ONLY_W0014.md';
+
 # W0014 - Cross Node Evaluation Not Allowed
 
 ## Error
@@ -17,3 +19,5 @@ sidebar_position: 14
 The error is indicating that remote execution is happening between two nodes, in an environment where this is not allowed.
 
 To fix the error either remove the invocation or ignore the problem via [the standard `elp:ignore` mechanism](../erlang-error-index.mdx#ignoring-diagnostics).
+
+<FBInternalOnly><MetaOnlyW0014 /></FBInternalOnly>

From f7e9bf9c4e3081bb86aaccd449788956bd7f3293 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 19 Sep 2025 03:32:39 -0700
Subject: [PATCH 122/394] Use local def_map in unused_macro linter

Summary: By using the local def_map, we avoid external file ids altogether.

Reviewed By: alanz

Differential Revision: D82636531

fbshipit-source-id: d0015a6002b14c237b2be5722deffa194543a5a1
---
 crates/ide/src/diagnostics/unused_macro.rs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/crates/ide/src/diagnostics/unused_macro.rs b/crates/ide/src/diagnostics/unused_macro.rs
index 516a9176a9..60bb43e077 100644
--- a/crates/ide/src/diagnostics/unused_macro.rs
+++ b/crates/ide/src/diagnostics/unused_macro.rs
@@ -48,14 +48,11 @@ fn unused_macro(
     file_kind: FileKind,
 ) -> Option<()> {
     if file_kind.is_module() {
-        let def_map = sema.def_map(file_id);
+        let def_map = sema.def_map_local(file_id);
         for (name, def) in def_map.get_macros() {
-            // Only run the check for macros defined in the local module,
-            // not in the included files.
-            if def.file.file_id == file_id
-                && !SymbolDefinition::Define(def.clone())
-                    .usages(sema)
-                    .at_least_one()
+            if !SymbolDefinition::Define(def.clone())
+                .usages(sema)
+                .at_least_one()
             {
                 let source = def.source(sema.db.upcast());
                 let macro_range = extend_range(source.syntax());

From 7f67904387a08b5458d1074d38d2f65665b2ab09 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 22 Sep 2025 06:24:09 -0700
Subject: [PATCH 123/394] BE: Use a vec for load telemetry

Summary:
We currently send a summary telemetry message when a progress bar ends, with each of the steps included in it.
This is currently stored in rust as a `FxHashMap` of segment title and time taken. This does not keep the relative ordering of the segments, so detailed knowledge of the originating code is needed to understand the order.

Simplify this by using a `Vec<(name,time)>` instead.

Reviewed By: robertoaloi

Differential Revision: D82953458

fbshipit-source-id: 8f37e3135d5781505c60c3f30556273859eec7f9
---
 crates/elp/src/server/telemetry_manager.rs | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/crates/elp/src/server/telemetry_manager.rs b/crates/elp/src/server/telemetry_manager.rs
index e8a54309a4..8cb1f2f104 100644
--- a/crates/elp/src/server/telemetry_manager.rs
+++ b/crates/elp/src/server/telemetry_manager.rs
@@ -115,7 +115,7 @@ pub(crate) struct ReporterTelemetry {
     segment_start_time: SystemTime,
     #[serde(skip_serializing)]
     segment_message: String,
-    segments: FxHashMap<String, u32>,
+    segments: Vec<(String, u32)>,
 }
 
 impl ReporterTelemetryManager {
@@ -130,7 +130,7 @@ impl ReporterTelemetryManager {
             title: title.clone(),
             segment_start_time: time,
             segment_message: title,
-            segments: FxHashMap::default(),
+            segments: Vec::new(),
         };
         self.active.insert(token, val.clone());
         val
@@ -151,10 +151,10 @@ impl ReporterTelemetryManager {
 impl ReporterTelemetry {
     fn update(&mut self, message: Option<String>) {
         // First capture the prior segment timing
-        self.segments.insert(
+        self.segments.push((
             self.segment_message.clone(),
             self.segment_duration().as_millis() as u32,
-        );
+        ));
         // Then do the update
         if let Some(message) = message {
             let time = SystemTime::now();
@@ -231,10 +231,16 @@ mod test {
             // We sometimes run on a rollover boundary
             let expected = expected.replace("1", "0");
             expect![[r#"
-                {
-                    "Start message": 0,
-                    "update message": 0,
-                }
+                [
+                    (
+                        "Start message",
+                        0,
+                    ),
+                    (
+                        "update message",
+                        0,
+                    ),
+                ]
             "#]]
             .assert_eq(&expected);
         }

From 91b432fae9677bcd597ed383fe77867e1548ecad Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 22 Sep 2025 06:58:20 -0700
Subject: [PATCH 124/394] BE: Provide explicit state change telemetry

Summary:
There is chronicle logging of the state change notification we send, but this is marked against the time-stamp when it is received in SCUBA, and this is often inaccurate.

Provide an explicit telemetry item for it, including the current time as seen by ELP

Reviewed By: robertoaloi

Differential Revision: D82954038

fbshipit-source-id: e048b8ace05d5169f7333f17961a0b9112cbf7d4
---
 crates/elp/src/server.rs        | 31 +++++++++++++++++++++++++++++++
 crates/elp_log/src/telemetry.rs | 14 +++++++++++---
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index 634854bf24..2c0ebbeb3b 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -90,6 +90,7 @@ use lsp_types::request::Request as _;
 use parking_lot::Mutex;
 use parking_lot::RwLock;
 use parking_lot::RwLockWriteGuard;
+use serde::Serialize;
 use telemetry_manager::TelemetryManager;
 use vfs::Change;
 use vfs::loader::LoadingProgress;
@@ -201,6 +202,17 @@ pub enum Status {
     ShuttingDown,
 }
 
+impl std::fmt::Display for Status {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Status::Initialising => write!(f, "Initialising"),
+            Status::Loading(_progress_bar) => write!(f, "Loading"),
+            Status::Running => write!(f, "Running"),
+            Status::ShuttingDown => write!(f, "ShuttingDown"),
+        }
+    }
+}
+
 /// For buck projects we cannot rely on source roots, so if a new file
 /// is added we need to query the project model for where it fits in.
 /// But we must distinguish between the initial load, where every file
@@ -1495,6 +1507,7 @@ impl Server {
     fn transition(&mut self, status: Status) {
         if self.status != status {
             log::info!("transitioning from {:?} to {:?}", self.status, status);
+            self.send_state_change_telemetry(&status);
             self.status = status;
             if self.config.server_status_notification() {
                 self.send_notification::<lsp_ext::StatusNotification>(lsp_ext::StatusParams {
@@ -1504,6 +1517,24 @@ impl Server {
         }
     }
 
+    fn send_state_change_telemetry(&mut self, status: &Status) {
+        #[derive(Serialize)]
+        struct ServertState {
+            title: String,
+            old_state: String,
+            new_state: String,
+        }
+        let data = ServertState {
+            title: "ELP changing state".to_string(),
+            old_state: self.status.to_string(),
+            new_state: status.to_string(),
+        };
+        let data = serde_json::to_value(data).unwrap_or_else(|err| {
+            serde_json::Value::String(format!("JSON serialization failed: {err}"))
+        });
+        telemetry::send("elp_reporter_telemetry".to_string(), data);
+    }
+
     fn show_message(&mut self, params: ShowMessageParams) {
         self.send_notification::<lsp_types::notification::ShowMessage>(params)
     }
diff --git a/crates/elp_log/src/telemetry.rs b/crates/elp_log/src/telemetry.rs
index 68354b564a..cbfa40d1fd 100644
--- a/crates/elp_log/src/telemetry.rs
+++ b/crates/elp_log/src/telemetry.rs
@@ -79,7 +79,7 @@ fn do_send(
 }
 
 pub fn send(typ: String, data: serde_json::Value) {
-    do_send(typ, data, None, None);
+    do_send(typ, data, None, Some(SystemTime::now()));
 }
 
 pub fn send_with_duration(
@@ -93,6 +93,8 @@ pub fn send_with_duration(
 
 #[cfg(test)]
 mod tests {
+    use std::time::SystemTime;
+
     use expect_test::expect;
 
     #[test]
@@ -101,12 +103,18 @@ mod tests {
         let data = serde_json::to_value("Hello telemetry!").unwrap();
         super::send(typ, data);
 
-        let msg = super::receiver().try_recv().unwrap();
+        let mut msg = super::receiver().try_recv().unwrap();
+        msg.start_time = msg.start_time.map(|_st| SystemTime::UNIX_EPOCH);
         expect![[r#"
             TelemetryMessage {
                 typ: "telemetry",
                 duration_ms: None,
-                start_time: None,
+                start_time: Some(
+                    SystemTime {
+                        tv_sec: 0,
+                        tv_nsec: 0,
+                    },
+                ),
                 data: String("Hello telemetry!"),
             }
         "#]]

From 63a28043af45e8523732a5fa824959c003671251 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 22 Sep 2025 06:58:20 -0700
Subject: [PATCH 125/394] BE: Include a formatted start and end time stamp in
 telemetry

Summary:
The ELP telemetry currently includes a start time, as a struct having seconds since the Unix epoch and nanoseconds.

This gives us an accurate start time, as we cannot rely on the SCUBA logged time, as it is the time the message is received, which is after many unpredictable events through the middleware.

It also includes a duration in milliseconds.

It is hard to work with these in SCUBA, especially for casual comparisons.

This diff introduces a string representation of the start time as a time stamp to millisecond resolution, as well as an end time stamp, computed from the start time and duration.

Reviewed By: robertoaloi

Differential Revision: D82956324

fbshipit-source-id: 8201875d320cca23358bd1c6d780d4c536e1c557
---
 crates/elp_log/src/telemetry.rs | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/crates/elp_log/src/telemetry.rs b/crates/elp_log/src/telemetry.rs
index cbfa40d1fd..4132de6102 100644
--- a/crates/elp_log/src/telemetry.rs
+++ b/crates/elp_log/src/telemetry.rs
@@ -20,6 +20,7 @@
 
 use std::time::SystemTime;
 
+use humantime::format_rfc3339_millis;
 use lazy_static::lazy_static;
 use serde::Deserialize;
 use serde::Serialize;
@@ -32,6 +33,8 @@ pub struct TelemetryMessage {
     pub typ: String,
     pub duration_ms: Option<Duration>,
     pub start_time: Option<SystemTime>,
+    pub start_time_string: Option<String>,
+    pub end_time_string: Option<String>,
     pub data: TelemetryData,
 }
 
@@ -56,6 +59,14 @@ fn build_message(
     duration_ms: Option<Duration>,
     start_time: Option<SystemTime>,
 ) -> TelemetryMessage {
+    let start_time_string = start_time.map(|time| format_rfc3339_millis(time).to_string());
+    let end_time_string = start_time.map(|time| match duration_ms {
+        Some(d) => {
+            format_rfc3339_millis(time + std::time::Duration::from_millis(d as u64)).to_string()
+        }
+        None => format_rfc3339_millis(time).to_string(),
+    });
+
     TelemetryMessage {
         // Note: the "type" field is required, otherwise the telemetry
         // mapper in the vscode extension will not route the message
@@ -64,6 +75,8 @@ fn build_message(
         typ,
         duration_ms,
         start_time,
+        start_time_string,
+        end_time_string,
         data,
     }
 }
@@ -105,6 +118,12 @@ mod tests {
 
         let mut msg = super::receiver().try_recv().unwrap();
         msg.start_time = msg.start_time.map(|_st| SystemTime::UNIX_EPOCH);
+        msg.start_time_string = msg
+            .start_time_string
+            .map(|_| "2025-09-22T11:38:41.274Z".to_string());
+        msg.end_time_string = msg
+            .end_time_string
+            .map(|_| "2025-09-22T11:38:41.321".to_string());
         expect![[r#"
             TelemetryMessage {
                 typ: "telemetry",
@@ -115,6 +134,12 @@ mod tests {
                         tv_nsec: 0,
                     },
                 ),
+                start_time_string: Some(
+                    "2025-09-22T11:38:41.274Z",
+                ),
+                end_time_string: Some(
+                    "2025-09-22T11:38:41.321",
+                ),
                 data: String("Hello telemetry!"),
             }
         "#]]

From 03c28b446ceb3bd972fd362b932436e6e011b4f2 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 22 Sep 2025 10:06:04 -0700
Subject: [PATCH 126/394] Convert unused_macro linter to use new GenericLinter
 trait

Summary:
Define a new `GenericLinter` trait for linters which do not use either the `find_call_in_function` helper or SSR patterns.
As an example, convert the `unused_macro` linter to the new trait.

Apart from simplifying the way linters are written, the big advantage is that linters using the trait can leverage common infrastructure (e.g. including an ignore fix) and they can now be configured / enabled via config.

Note: the `None` variant for the `DiagnosticTag` was eliminated in favour of the standard `Option` type, which allowed some code simplifications.

Reviewed By: alanz

Differential Revision: D82638562

fbshipit-source-id: 25c63591f4ae60ea4e89cbbd79e91e9b95d404ed
---
 crates/elp/src/convert.rs                  |   9 +-
 crates/ide/src/diagnostics.rs              | 131 ++++++++++++++++++---
 crates/ide/src/diagnostics/unused_macro.rs | 103 +++++++++-------
 3 files changed, 179 insertions(+), 64 deletions(-)

diff --git a/crates/elp/src/convert.rs b/crates/elp/src/convert.rs
index 1f42e6f454..4c8d316509 100644
--- a/crates/elp/src/convert.rs
+++ b/crates/elp/src/convert.rs
@@ -91,16 +91,15 @@ pub fn ide_to_lsp_diagnostic(
         source,
         message: d.message.clone(),
         related_information: from_related(line_index, url, &d.related_info),
-        tags: lsp_diagnostic_tags(&d.tag),
+        tags: d.tag.as_ref().map(lsp_diagnostic_tags),
         data: None,
     }
 }
 
-fn lsp_diagnostic_tags(d: &DiagnosticTag) -> Option<Vec<lsp_types::DiagnosticTag>> {
+fn lsp_diagnostic_tags(d: &DiagnosticTag) -> Vec<lsp_types::DiagnosticTag> {
     match d {
-        DiagnosticTag::None => None,
-        DiagnosticTag::Unused => Some(vec![lsp_types::DiagnosticTag::UNNECESSARY]),
-        DiagnosticTag::Deprecated => Some(vec![lsp_types::DiagnosticTag::DEPRECATED]),
+        DiagnosticTag::Unused => vec![lsp_types::DiagnosticTag::UNNECESSARY],
+        DiagnosticTag::Deprecated => vec![lsp_types::DiagnosticTag::DEPRECATED],
     }
 }
 
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 2f80f5cf89..5285c188d7 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -178,24 +178,17 @@ pub const DIAGNOSTIC_WHOLE_FILE_RANGE: TextRange = TextRange::empty(TextSize::ne
 /// strikethough for Deprecated
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum DiagnosticTag {
-    None,
     Unused,
     Deprecated,
 }
 
-impl Default for DiagnosticTag {
-    fn default() -> Self {
-        Self::None
-    }
-}
-
 #[derive(Debug, Clone, Default)]
 pub struct Diagnostic {
     pub message: String,
     pub range: TextRange,
     pub severity: Severity,
     pub cli_severity: Option<Severity>,
-    pub tag: DiagnosticTag,
+    pub tag: Option<DiagnosticTag>,
     pub categories: FxHashSet<Category>,
     pub fixes: Option<Vec<Assist>>,
     pub related_info: Option<Vec<RelatedInformation>>,
@@ -212,7 +205,7 @@ impl Diagnostic {
             range,
             severity: Severity::Error,
             cli_severity: None,
-            tag: DiagnosticTag::None,
+            tag: None,
             categories: FxHashSet::default(),
             fixes: None,
             related_info: None,
@@ -253,13 +246,18 @@ impl Diagnostic {
         self
     }
 
+    pub(crate) fn with_tag(mut self, tag: Option<DiagnosticTag>) -> Diagnostic {
+        self.tag = tag;
+        self
+    }
+
     pub(crate) fn unused(mut self) -> Diagnostic {
-        self.tag = DiagnosticTag::Unused;
+        self.tag = Some(DiagnosticTag::Unused);
         self
     }
 
     pub(crate) fn deprecated(mut self) -> Diagnostic {
-        self.tag = DiagnosticTag::Deprecated;
+        self.tag = Some(DiagnosticTag::Deprecated);
         self
     }
 
@@ -798,6 +796,89 @@ impl<T: SsrPatternsLinter> SsrPatternsDiagnostics for T {
     }
 }
 
+pub(crate) struct GenericLinterMatchContext<Context> {
+    range: TextRange,
+    context: Context,
+}
+
+// A trait that simplifies writing generic linters
+pub(crate) trait GenericLinter: Linter {
+    /// Associated type - each linter defines its own
+    type Context: Clone + fmt::Debug + PartialEq + Default;
+
+    /// Return a list of matches for the linter
+    fn matches(
+        &self,
+        _sema: &Semantic,
+        _file_id: FileId,
+    ) -> Option<Vec<GenericLinterMatchContext<Self::Context>>> {
+        None
+    }
+
+    /// Customize the description based on each match.
+    /// If implemented, it overrides the value of the `description()`.
+    fn match_description(&self, _context: &Self::Context) -> Cow<'_, str> {
+        Cow::Borrowed(self.description())
+    }
+
+    fn tag(&self, _context: &Self::Context) -> Option<DiagnosticTag> {
+        None
+    }
+
+    /// Return an optional vector of quick-fixes
+    fn fixes(
+        &self,
+        _context: &Self::Context,
+        _sema: &Semantic,
+        _file_id: FileId,
+    ) -> Option<Vec<Assist>> {
+        None
+    }
+}
+
+// Instances of the GenericLinter trait can specify a custom `Context` type,
+// which is passed around in callbacks.
+// To be able to keep a registry of all linters we define a blanket implementation for all the methods using the `Context`,
+// to keep the code generic while allowing individual linters to specify their own context type.
+pub(crate) trait GenericDiagnostics: Linter {
+    fn diagnostics(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+        severity: Severity,
+        cli_severity: Severity,
+    ) -> Vec<Diagnostic>;
+}
+
+impl<T: GenericLinter> GenericDiagnostics for T {
+    fn diagnostics(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+        severity: Severity,
+        cli_severity: Severity,
+    ) -> Vec<Diagnostic> {
+        let mut res = Vec::new();
+        if let Some(matches) = self.matches(sema, file_id) {
+            for matched in matches {
+                let message = self.match_description(&matched.context);
+                let fixes = self.fixes(&matched.context, sema, file_id);
+                let tag = self.tag(&matched.context);
+                let mut d = Diagnostic::new(self.id(), message, matched.range)
+                    .with_fixes(fixes)
+                    .with_tag(tag)
+                    .with_severity(severity)
+                    .with_cli_severity(cli_severity);
+                if self.can_be_suppressed() {
+                    d = d.with_ignore_fix(sema, file_id);
+                }
+                res.push(d);
+            }
+        }
+        res
+    }
+}
+
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct DiagnosticConditions {
     pub experimental: bool,
@@ -1235,7 +1316,7 @@ pub fn eqwalizer_to_diagnostic(
         range,
         severity,
         cli_severity: None,
-        tag: DiagnosticTag::None,
+        tag: None,
         code: DiagnosticCode::Eqwalizer(d.code.clone()),
         message,
         categories: FxHashSet::default(),
@@ -1337,7 +1418,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &unused_function_args::DESCRIPTOR,
         &trivial_match::DESCRIPTOR,
         &redundant_assignment::DESCRIPTOR,
-        &unused_macro::DESCRIPTOR,
         &unused_record_field::DESCRIPTOR,
         &mutable_variable::DESCRIPTOR,
         &effect_free_statement::DESCRIPTOR,
@@ -1407,6 +1487,7 @@ pub fn diagnostics_from_descriptors(
 pub(crate) enum DiagnosticLinter {
     FunctionCall(&'static dyn FunctionCallDiagnostics),
     SsrPatterns(&'static dyn SsrPatternsDiagnostics),
+    Generic(&'static dyn GenericDiagnostics),
 }
 
 impl DiagnosticLinter {
@@ -1414,6 +1495,7 @@ impl DiagnosticLinter {
         match self {
             DiagnosticLinter::FunctionCall(linter) => *linter,
             DiagnosticLinter::SsrPatterns(linter) => *linter,
+            DiagnosticLinter::Generic(linter) => *linter,
         }
     }
 }
@@ -1439,6 +1521,9 @@ const SSR_PATTERN_LINTERS: &[&dyn SsrPatternsDiagnostics] = &[
     &could_be_a_string_literal::LINTER,
 ];
 
+/// Generic linters
+const GENERIC_LINTERS: &[&dyn GenericDiagnostics] = &[&unused_macro::LINTER];
+
 /// Unified registry for all types of linters
 pub(crate) fn linters() -> Vec<DiagnosticLinter> {
     let mut all_linters = Vec::new();
@@ -1457,6 +1542,13 @@ pub(crate) fn linters() -> Vec<DiagnosticLinter> {
             .map(|linter| DiagnosticLinter::SsrPatterns(*linter)),
     );
 
+    // Add generic linters
+    all_linters.extend(
+        GENERIC_LINTERS
+            .iter()
+            .map(|linter| DiagnosticLinter::Generic(*linter)),
+    );
+
     // Add meta-only linters
     // @fb-only
 
@@ -1530,6 +1622,11 @@ fn diagnostics_from_linters(
                     );
                     res.extend(diagnostics);
                 }
+                DiagnosticLinter::Generic(generic_linter) => {
+                    let diagnostics =
+                        generic_linter.diagnostics(sema, file_id, severity, cli_severity);
+                    res.extend(diagnostics);
+                }
             }
         }
     }
@@ -2905,7 +3002,7 @@ baz(1)->4.
                     range: TextRange::new(21.into(), 43.into()),
                     severity: Severity::Error,
                     cli_severity: None,
-                    tag: DiagnosticTag::None,
+                    tag: None,
                     categories: FxHashSet::default(),
                     fixes: None,
                     related_info: None,
@@ -2917,7 +3014,7 @@ baz(1)->4.
                     range: TextRange::new(74.into(), 79.into()),
                     severity: Severity::Error,
                     cli_severity: None,
-                    tag: DiagnosticTag::None,
+                    tag: None,
                     categories: FxHashSet::default(),
                     fixes: None,
                     related_info: None,
@@ -2929,7 +3026,7 @@ baz(1)->4.
                     range: TextRange::new(82.into(), 99.into()),
                     severity: Severity::Error,
                     cli_severity: None,
-                    tag: DiagnosticTag::None,
+                    tag: None,
                     categories: FxHashSet::default(),
                     fixes: None,
                     related_info: None,
@@ -2945,7 +3042,7 @@ baz(1)->4.
                 range: TextRange::new(106.into(), 108.into()),
                 severity: Severity::Error,
                 cli_severity: None,
-                tag: DiagnosticTag::None,
+                tag: None,
                 categories: FxHashSet::default(),
                 fixes: None,
                 related_info: None,
diff --git a/crates/ide/src/diagnostics/unused_macro.rs b/crates/ide/src/diagnostics/unused_macro.rs
index 60bb43e077..99af05370d 100644
--- a/crates/ide/src/diagnostics/unused_macro.rs
+++ b/crates/ide/src/diagnostics/unused_macro.rs
@@ -12,73 +12,92 @@
 //
 // Return a warning if a macro defined in an .erl file has no references to it
 
+use std::borrow::Cow;
+
 use elp_ide_assists::Assist;
 use elp_ide_assists::helpers::extend_range;
 use elp_ide_db::SymbolDefinition;
 use elp_ide_db::elp_base_db::FileId;
-use elp_ide_db::elp_base_db::FileKind;
 use elp_ide_db::source_change::SourceChange;
 use elp_syntax::AstNode;
 use elp_syntax::TextRange;
 use elp_text_edit::TextEdit;
 use hir::Semantic;
 
-use super::DiagnosticConditions;
-use super::DiagnosticDescriptor;
-use crate::Diagnostic;
 use crate::diagnostics::DiagnosticCode;
+use crate::diagnostics::DiagnosticTag;
+use crate::diagnostics::GenericLinter;
+use crate::diagnostics::GenericLinterMatchContext;
+use crate::diagnostics::Linter;
 use crate::fix;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: true,
-        include_tests: true,
-        default_disabled: false,
-    },
-    checker: &|diags, sema, file_id, file_kind| {
-        unused_macro(diags, sema, file_id, file_kind);
-    },
-};
+pub(crate) struct UnusedMacroLinter;
 
-fn unused_macro(
-    acc: &mut Vec<Diagnostic>,
-    sema: &Semantic,
-    file_id: FileId,
-    file_kind: FileKind,
-) -> Option<()> {
-    if file_kind.is_module() {
+impl Linter for UnusedMacroLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::UnusedMacro
+    }
+    fn description(&self) -> &'static str {
+        "Unused macro."
+    }
+    fn should_process_generated_files(&self) -> bool {
+        true
+    }
+    fn should_process_file_id(&self, sema: &Semantic, file_id: FileId) -> bool {
+        sema.db.file_kind(file_id).is_module()
+    }
+}
+
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
+pub struct Context {
+    delete_range: TextRange,
+    name: String,
+}
+
+impl GenericLinter for UnusedMacroLinter {
+    type Context = Context;
+
+    fn matches(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<GenericLinterMatchContext<Context>>> {
+        let mut res = Vec::new();
         let def_map = sema.def_map_local(file_id);
         for (name, def) in def_map.get_macros() {
             if !SymbolDefinition::Define(def.clone())
                 .usages(sema)
                 .at_least_one()
+                && let Some(range) = def.name_range(sema.db)
             {
-                let source = def.source(sema.db.upcast());
-                let macro_range = extend_range(source.syntax());
-                let name_range = source.name()?.syntax().text_range();
-                let d = make_diagnostic(file_id, macro_range, name_range, &name.to_string());
-                acc.push(d);
+                let context = Context {
+                    delete_range: extend_range(def.source(sema.db).syntax()),
+                    name: name.to_string(),
+                };
+                res.push(GenericLinterMatchContext { range, context });
             }
         }
+        Some(res)
+    }
+
+    fn match_description(&self, context: &Self::Context) -> Cow<'_, str> {
+        Cow::Owned(format!("Unused macro ({})", context.name))
+    }
+
+    fn tag(&self, _context: &Self::Context) -> Option<super::DiagnosticTag> {
+        Some(DiagnosticTag::Unused)
+    }
+
+    fn fixes(&self, context: &Context, _sema: &Semantic, file_id: FileId) -> Option<Vec<Assist>> {
+        Some(vec![delete_unused_macro(
+            file_id,
+            context.delete_range,
+            &context.name,
+        )])
     }
-    Some(())
 }
 
-fn make_diagnostic(
-    file_id: FileId,
-    macro_range: TextRange,
-    name_range: TextRange,
-    name: &str,
-) -> Diagnostic {
-    Diagnostic::warning(
-        DiagnosticCode::UnusedMacro,
-        name_range,
-        format!("Unused macro ({name})"),
-    )
-    .unused()
-    .with_fixes(Some(vec![delete_unused_macro(file_id, macro_range, name)]))
-}
+pub static LINTER: UnusedMacroLinter = UnusedMacroLinter;
 
 fn delete_unused_macro(file_id: FileId, range: TextRange, name: &str) -> Assist {
     let mut builder = TextEdit::builder();

From e6b0c600336c1baeebf991dbbefeec3a523d02f3 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 22 Sep 2025 10:06:04 -0700
Subject: [PATCH 127/394] Track destination in telemetry for go-to-definition

Reviewed By: alanz

Differential Revision: D82815837

fbshipit-source-id: c78e5d85ba5660fd6017004e3e7ccc7c9056bf76
---
 crates/elp/src/handlers.rs | 7 +++++++
 crates/ide_db/src/lib.rs   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/crates/elp/src/handlers.rs b/crates/elp/src/handlers.rs
index 8fa9ef7665..cd8f110850 100644
--- a/crates/elp/src/handlers.rs
+++ b/crates/elp/src/handlers.rs
@@ -32,6 +32,7 @@ use elp_ide::elp_ide_db::elp_base_db::FilePosition;
 use elp_ide::elp_ide_db::elp_base_db::FileRange;
 use elp_ide::elp_ide_db::elp_base_db::ProjectId;
 use elp_log::telemetry;
+use elp_syntax::SmolStr;
 use itertools::Itertools;
 use lsp_server::ErrorCode;
 use lsp_types::CallHierarchyIncomingCall;
@@ -339,16 +340,22 @@ fn goto_definition_telemetry(snap: &Snapshot, targets: &[NavigationTarget], star
         .iter()
         .map(|tgt| snap.file_id_to_url(tgt.file_id))
         .collect();
+    let target_names: Vec<_> = targets.iter().map(|tgt| tgt.name.clone()).collect();
+    let target_kinds: Vec<_> = targets.iter().map(|tgt| tgt.kind).collect();
 
     #[derive(serde::Serialize)]
     struct Data {
         targets_include_generated: bool,
         target_urls: Vec<Url>,
+        target_names: Vec<SmolStr>,
+        target_kinds: Vec<SymbolKind>,
     }
 
     let detail = Data {
         targets_include_generated,
         target_urls,
+        target_names,
+        target_kinds,
     };
     let duration = start.elapsed().map(|e| e.as_millis()).unwrap_or(0) as u32;
     let data = serde_json::to_value(detail).unwrap_or_else(|err| {
diff --git a/crates/ide_db/src/lib.rs b/crates/ide_db/src/lib.rs
index d9c1f1d8d7..0240d8498d 100644
--- a/crates/ide_db/src/lib.rs
+++ b/crates/ide_db/src/lib.rs
@@ -335,7 +335,7 @@ impl Includes {
 
 // ---------------------------------------------------------------------
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize)]
 pub enum SymbolKind {
     File,
     Module,

From d9f02ee599e7fadd1a97a2bb8137d731536d9eb6 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 22 Sep 2025 10:06:04 -0700
Subject: [PATCH 128/394] Split token identification and documentation
 extraction

Summary:
The API to extract documentation currently takes a *position* as the input and returns an `Option<Doc>`. This is not ideal, since it collapses two cases into one: `None` can be returned if no meaningful token is identified or if no documentation is available for it.

As a first step towards introducing telemetry for hover operations, have a clearer distinction between the two cases.

Here we:

* Split token extraction and fetching documentation
* Introduce a `DocResult` struct which stores additional information about the input token
* Introduce basic telemetry for the *hover* operation

This will expanded in a subsequent diff to include more information about the actual documentation.

Reviewed By: alanz

Differential Revision: D82948615

fbshipit-source-id: c0dbc2bb99519ef5522288ed5bc910f34105bc54
---
 crates/elp/src/handlers.rs          | 34 +++++++++++++++++++++++++----
 crates/ide/src/handlers/get_docs.rs | 24 +++++++-------------
 crates/ide/src/lib.rs               | 32 ++++++++++++++++++++++-----
 crates/ide/src/signature_help.rs    |  5 +++--
 4 files changed, 68 insertions(+), 27 deletions(-)

diff --git a/crates/elp/src/handlers.rs b/crates/elp/src/handlers.rs
index cd8f110850..c853888d69 100644
--- a/crates/elp/src/handlers.rs
+++ b/crates/elp/src/handlers.rs
@@ -17,6 +17,7 @@ use std::time::SystemTime;
 use anyhow::Result;
 use anyhow::bail;
 use elp_ide::Cancellable;
+use elp_ide::DocResult;
 use elp_ide::HighlightedRange;
 use elp_ide::NavigationTarget;
 use elp_ide::RangeInfo;
@@ -364,6 +365,24 @@ fn goto_definition_telemetry(snap: &Snapshot, targets: &[NavigationTarget], star
     telemetry::send_with_duration("goto_definition".to_string(), data, duration, start);
 }
 
+fn send_hover_telemetry(doc_result: &DocResult) {
+    #[derive(serde::Serialize)]
+    struct Data {
+        docs_found: bool,
+        text: String,
+        kind: String,
+    }
+    let detail = Data {
+        docs_found: doc_result.doc.is_some(),
+        text: doc_result.token_text.clone(),
+        kind: format!("{:?}", doc_result.token_kind),
+    };
+    let data = serde_json::to_value(detail).unwrap_or_else(|err| {
+        serde_json::Value::String(format!("JSON serialization failed: {err}"))
+    });
+    telemetry::send("hover".to_string(), data);
+}
+
 pub(crate) fn handle_goto_type_definition(
     snap: Snapshot,
     params: lsp_types::GotoDefinitionParams,
@@ -456,8 +475,10 @@ pub(crate) fn handle_completion_resolve(
             position.offset = snap
                 .analysis
                 .clamp_offset(position.file_id, position.offset)?;
-            if let Ok(Some(res)) = snap.analysis.get_docs_at_position(position) {
-                let docs = res.0.markdown_text().to_string();
+            if let Ok(Some(doc_result)) = snap.analysis.get_docs_at_position(position)
+                && let Some(doc) = doc_result.doc
+            {
+                let docs = doc.markdown_text().to_string();
                 let documentation =
                     lsp_types::Documentation::MarkupContent(lsp_types::MarkupContent {
                         kind: lsp_types::MarkupKind::Markdown,
@@ -582,8 +603,13 @@ pub(crate) fn handle_hover(snap: Snapshot, params: HoverParams) -> Result<Option
         }
     }
 
-    if let Some(hover) = snap.analysis.get_docs_at_position(position)? {
-        docs.push(hover);
+    if let Some(doc_result) = snap.analysis.get_docs_at_position(position)? {
+        send_hover_telemetry(&doc_result);
+        let doc = doc_result.doc;
+        if let Some(doc) = doc {
+            let range = doc_result.token_range;
+            docs.push((doc, Some(range)));
+        }
     }
 
     if let Some(macro_expansion) = snap.analysis.expand_macro(position)? {
diff --git a/crates/ide/src/handlers/get_docs.rs b/crates/ide/src/handlers/get_docs.rs
index 30901033d7..7fdd979e92 100644
--- a/crates/ide/src/handlers/get_docs.rs
+++ b/crates/ide/src/handlers/get_docs.rs
@@ -10,23 +10,15 @@
 
 use elp_ide_db::RootDatabase;
 use elp_ide_db::docs::Doc;
-use elp_ide_db::elp_base_db::FilePosition;
-use elp_ide_db::elp_base_db::FileRange;
-use elp_ide_db::find_best_token;
+use elp_syntax::SyntaxToken;
+use hir::InFile;
 use hir::Semantic;
 
-pub(crate) fn get_doc_at_position(
+pub(crate) fn get_doc_for_token(
     db: &RootDatabase,
-    position: FilePosition,
-) -> Option<(Doc, Option<FileRange>)> {
-    let sema = Semantic::new(db);
-    let docs = elp_ide_db::docs::Documentation::new(db, &sema);
-    let token = find_best_token(&sema, position)?;
-
-    let range = FileRange {
-        file_id: token.file_id,
-        range: token.value.text_range(),
-    };
-    let doc = Doc::from_reference(&docs, &token);
-    doc.map(|d| (d, Some(range)))
+    sema: &Semantic,
+    token: &InFile<SyntaxToken>,
+) -> Option<Doc> {
+    let docs = elp_ide_db::docs::Documentation::new(db, sema);
+    Doc::from_reference(&docs, token)
 }
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index 5b55b0c77b..efd048554c 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -54,12 +54,14 @@ use elp_ide_db::elp_base_db::salsa;
 use elp_ide_db::elp_base_db::salsa::ParallelDatabase;
 use elp_ide_db::eqwalizer::type_references;
 use elp_ide_db::erlang_service::ParseResult;
+use elp_ide_db::find_best_token;
 use elp_ide_db::rename::RenameError;
 use elp_ide_db::source_change::SourceChange;
 use elp_project_model::AppName;
 use elp_project_model::AppType;
 use elp_syntax::AstNode;
 use elp_syntax::SmolStr;
+use elp_syntax::SyntaxKind;
 use elp_syntax::algo::ancestors_at_offset;
 use elp_syntax::ast;
 use elp_syntax::label::Label;
@@ -168,6 +170,13 @@ pub struct AnalysisHost {
     db: RootDatabase,
 }
 
+pub struct DocResult {
+    pub doc: Option<Doc>,
+    pub token_kind: SyntaxKind,
+    pub token_text: String,
+    pub token_range: FileRange,
+}
+
 impl AnalysisHost {
     /// Returns a snapshot of the current state, which you can query for
     /// semantic information.
@@ -609,11 +618,24 @@ impl Analysis {
     }
 
     /// Returns the docs for the symbol at the given position
-    pub fn get_docs_at_position(
-        &self,
-        position: FilePosition,
-    ) -> Cancellable<Option<(Doc, Option<FileRange>)>> {
-        self.with_db(|db| get_docs::get_doc_at_position(db, position))
+    pub fn get_docs_at_position(&self, position: FilePosition) -> Cancellable<Option<DocResult>> {
+        self.with_db(|db| {
+            let sema = hir::Semantic::new(db);
+            let token = find_best_token(&sema, position)?;
+            let doc = get_docs::get_doc_for_token(db, &sema, &token);
+            let range = FileRange {
+                file_id: token.file_id,
+                range: token.value.text_range(),
+            };
+            let text = token.value.text().to_string();
+            let kind = token.value.kind();
+            Some(DocResult {
+                doc,
+                token_range: range,
+                token_text: text,
+                token_kind: kind,
+            })
+        })
     }
 
     /// Returns available hover actions (rendered as buttons)
diff --git a/crates/ide/src/signature_help.rs b/crates/ide/src/signature_help.rs
index 70f00d9503..fba6d12d73 100644
--- a/crates/ide/src/signature_help.rs
+++ b/crates/ide/src/signature_help.rs
@@ -29,7 +29,7 @@ use hir::Semantic;
 use itertools::Itertools;
 use stdx::format_to;
 
-use crate::handlers::get_docs::get_doc_at_position;
+use crate::handlers::get_docs::get_doc_for_token;
 
 /// Contains information about an item signature as seen from a use site.
 ///
@@ -245,7 +245,8 @@ fn get_function_doc(
             .text_range()
             .start(),
     };
-    let (doc, _file_range) = get_doc_at_position(db, position)?;
+    let token = find_best_token(sema, position)?;
+    let doc = get_doc_for_token(db, sema, &token)?;
     Some(doc.markdown_text().to_string())
 }
 

From 932323035a9d2e7b6c05deb996716340e76a32b1 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 23 Sep 2025 07:17:35 -0700
Subject: [PATCH 129/394] Add telemetry for textDocument/reference timing

Summary: Track the file, position and duration of processing a references request

Reviewed By: michalmuskala

Differential Revision: D83053371

fbshipit-source-id: 84261b4c8a9d13c89458c33a76aa8e13b54d4d71
---
 crates/elp/src/handlers.rs |  9 +++++++++
 crates/elp/src/snapshot.rs | 38 +++++++++++++++++++++++++++++++-------
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/crates/elp/src/handlers.rs b/crates/elp/src/handlers.rs
index c853888d69..d4f4cb4e96 100644
--- a/crates/elp/src/handlers.rs
+++ b/crates/elp/src/handlers.rs
@@ -33,6 +33,7 @@ use elp_ide::elp_ide_db::elp_base_db::FilePosition;
 use elp_ide::elp_ide_db::elp_base_db::FileRange;
 use elp_ide::elp_ide_db::elp_base_db::ProjectId;
 use elp_log::telemetry;
+use elp_log::timeit_with_telemetry;
 use elp_syntax::SmolStr;
 use itertools::Itertools;
 use lsp_server::ErrorCode;
@@ -66,6 +67,7 @@ use crate::convert::lsp_to_assist_context_diagnostic;
 use crate::from_proto;
 use crate::lsp_ext;
 use crate::snapshot::Snapshot;
+use crate::snapshot::TelemetryData;
 use crate::to_proto;
 
 pub(crate) fn handle_code_action(
@@ -412,10 +414,16 @@ pub(crate) fn handle_references(
     params: lsp_types::ReferenceParams,
 ) -> Result<Option<Vec<lsp_types::Location>>> {
     let _p = tracing::info_span!("handle_references").entered();
+    let _timer = timeit_with_telemetry!(TelemetryData::References {
+        file_url: params.text_document_position.text_document.uri.clone(),
+        position: params.text_document_position.position
+    });
+
     let mut position = from_proto::file_position(&snap, params.text_document_position)?;
     position.offset = snap
         .analysis
         .clamp_offset(position.file_id, position.offset)?;
+
     let refs = match snap.analysis.find_all_refs(position)? {
         None => return Ok(None),
         Some(it) => it,
@@ -439,6 +447,7 @@ pub(crate) fn handle_references(
                 .chain(decl)
         })
         .collect();
+
     Ok(Some(locations))
 }
 
diff --git a/crates/elp/src/snapshot.rs b/crates/elp/src/snapshot.rs
index d1fba2859a..e79251f73a 100644
--- a/crates/elp/src/snapshot.rs
+++ b/crates/elp/src/snapshot.rs
@@ -47,14 +47,32 @@ use crate::server::file_id_to_url;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub enum TelemetryData {
-    NativeDiagnostics { file_url: Url },
-    EqwalizerDiagnostics { file_url: Url },
-    EqwalizerProjectDiagnostics { project_name: String },
-    ParseServerDiagnostics { file_url: Url },
-    EdocDiagnostics { file_url: Url },
-    MetaDiagnostics { file_url: Url },
-    CommonTestDiagnostics { file_url: Url },
+    NativeDiagnostics {
+        file_url: Url,
+    },
+    EqwalizerDiagnostics {
+        file_url: Url,
+    },
+    EqwalizerProjectDiagnostics {
+        project_name: String,
+    },
+    ParseServerDiagnostics {
+        file_url: Url,
+    },
+    EdocDiagnostics {
+        file_url: Url,
+    },
+    MetaDiagnostics {
+        file_url: Url,
+    },
+    CommonTestDiagnostics {
+        file_url: Url,
+    },
     Initialize,
+    References {
+        file_url: Url,
+        position: lsp_types::Position,
+    },
 }
 
 impl fmt::Display for TelemetryData {
@@ -87,6 +105,12 @@ impl fmt::Display for TelemetryData {
             TelemetryData::Initialize => {
                 write!(f, "Initialize")
             }
+            TelemetryData::References {
+                file_url,
+                position: _,
+            } => {
+                write!(f, "Find References file_url: {file_url}")
+            }
         }
     }
 }

From 853d37f3f431de09d1618579ef8a17ea9fddc84a Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 24 Sep 2025 01:26:00 -0700
Subject: [PATCH 130/394] Do not attempt to import MetaOnly resources in OSS
 build

Reviewed By: alanz

Differential Revision: D83049782

fbshipit-source-id: 6031e13458fb7b27d9691f8f114f8299e15e38cd
---
 website/docs/erlang-error-index/w/W0014.mdx  |  3 +-
 website/docusaurus.config.js                 |  7 ++++
 website/src/remark/strip-meta-only-import.js | 40 ++++++++++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 website/src/remark/strip-meta-only-import.js

diff --git a/website/docs/erlang-error-index/w/W0014.mdx b/website/docs/erlang-error-index/w/W0014.mdx
index ea1d455370..090eac6131 100644
--- a/website/docs/erlang-error-index/w/W0014.mdx
+++ b/website/docs/erlang-error-index/w/W0014.mdx
@@ -2,7 +2,8 @@
 sidebar_position: 14
 ---
 
-import MetaOnlyW0014 from '../../../fb/components/_META_ONLY_W0014.md';
+import { FbInternalOnly } from 'docusaurus-plugin-internaldocs-fb/internal';
+import MetaOnlyW0014 from '../../../fb/components/_W0014.md';
 
 # W0014 - Cross Node Evaluation Not Allowed
 
diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index 19b0e11472..2fa0b86c23 100644
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -9,6 +9,9 @@
  */
 
 import {themes as prismThemes} from 'prism-react-renderer';
+import stripMetaOnlyImport from './src/remark/strip-meta-only-import';
+
+const {fbContent} = require('docusaurus-plugin-internaldocs-fb/internal');
 
 // With JSDoc @type annotations, IDEs can provide config autocompletion
 /** @type {import('@docusaurus/types').DocusaurusConfig} */
@@ -31,6 +34,10 @@ import {themes as prismThemes} from 'prism-react-renderer';
       ({
         docs: {
           sidebarPath: require.resolve('./sidebars.js'),
+          remarkPlugins: fbContent({
+            internal: [],
+            external: [stripMetaOnlyImport]
+          }),
         },
         theme: {
           customCss: require.resolve('./src/css/custom.css'),
diff --git a/website/src/remark/strip-meta-only-import.js b/website/src/remark/strip-meta-only-import.js
new file mode 100644
index 0000000000..986443b09f
--- /dev/null
+++ b/website/src/remark/strip-meta-only-import.js
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is dual-licensed under either the MIT license found in the
+ * LICENSE-MIT file in the root directory of this source tree or the Apache
+ * License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+ * of this source tree. You may select, at your option, one of the
+ * above-listed licenses.
+ */
+
+// With Docusaurus 3, the build fails if we import a file that doesn't exist.
+// Hence, we use a remark plugin to strip meta-only import statements.
+// The plugin is enabled for external builds in the docusaurus.config.js file.
+// For reference on how these plugins work, see:
+// https://docusaurus.io/docs/markdown-features/plugins
+// https://unifiedjs.com/learn/recipe/remove-node/
+
+import {SKIP, visit} from 'unist-util-visit';
+
+const plugin = (options) => {
+  const transformer = async (ast) => {
+    // Match on import statements
+    visit(ast, 'mdxjsEsm', (node, index, parent) => {
+        // Multiple imports can be part of the same node (one per line)
+        if (node.value && node.value.includes('/fb/')) {
+            const lines = node.value.split('\n');
+            const nonFbLines = lines.filter(line => !line.includes('/fb/'));
+            if (nonFbLines.length === 0) {
+                // Remove the entire node if it only contains fb imports
+               return [SKIP, index]
+            }
+            // Replace the node with the non-fb imports
+            node.value = nonFbLines.join('\n');
+        }
+    });
+  };
+  return transformer;
+};
+
+export default plugin;

From 3bff3407e3ba6649853c7e3019f2a2f629faf39d Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 24 Sep 2025 09:42:42 -0700
Subject: [PATCH 131/394] Convert wid_tuple linter to use trait

Summary: To do so, we need to extend the SsrLinter trait to support two more optional callbacks: `scope` and `range`.

Reviewed By: alanz

Differential Revision: D83152114

fbshipit-source-id: 5e950d47e0787721360f90c5cb14248944822514
---
 crates/ide/src/diagnostics.rs | 26 +++++++++++++++++++++++---
 crates/ide_ssr/src/lib.rs     | 35 +++++++++++++++++++++--------------
 2 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 5285c188d7..22edc1205e 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -44,7 +44,9 @@ use elp_ide_db::metadata::Kind;
 use elp_ide_db::metadata::Metadata;
 use elp_ide_db::metadata::Source;
 use elp_ide_db::source_change::SourceChange;
-use elp_ide_ssr::match_pattern_in_file_functions;
+use elp_ide_ssr::Match;
+use elp_ide_ssr::SsrSearchScope;
+use elp_ide_ssr::match_pattern;
 use elp_syntax::NodeOrToken;
 use elp_syntax::Parse;
 use elp_syntax::SourceFile;
@@ -745,6 +747,19 @@ pub(crate) trait SsrPatternsLinter: Linter {
             parens: ParenStrategy::InvisibleParens,
         }
     }
+
+    /// Specify the search scope: the entire file or function definitions only
+    fn scope(&self, file_id: FileId) -> SsrSearchScope {
+        SsrSearchScope::FunctionsOnly(file_id)
+    }
+
+    /// Customize the range of the diagnostic. Default to the range of the entire
+    /// matched element.
+    fn range(&self, _sema: &Semantic, _matched: &Match) -> Option<TextRange> {
+        // Notice we don't default here to the matched range directly,
+        // since we want to specify a meaningful in case the user override returns None.
+        None
+    }
 }
 
 // Instances of the SsrPatternsLinter trait can specify a custom `Context` type,
@@ -774,13 +789,18 @@ impl<T: SsrPatternsLinter> SsrPatternsDiagnostics for T {
         let mut res = Vec::new();
         for (pattern, context) in self.patterns() {
             let strategy = self.strategy();
-            let matches = match_pattern_in_file_functions(sema, strategy, file_id, &pattern);
+            let scope = self.scope(file_id);
+            let matches = match_pattern(sema, strategy, &pattern, scope);
             for matched in &matches.matches {
                 if Some(true) == self.is_match_valid(&context, matched, sema, file_id) {
                     let message = self.pattern_description(&context);
                     let fixes = self.fixes(&context, matched, sema, file_id);
                     let categories = self.add_categories(&context);
-                    let mut d = Diagnostic::new(self.id(), message, matched.range.range)
+                    let range = match self.range(sema, matched) {
+                        None => matched.range.range,
+                        Some(range) => range,
+                    };
+                    let mut d = Diagnostic::new(self.id(), message, range)
                         .with_fixes(fixes)
                         .add_categories(categories)
                         .with_severity(severity)
diff --git a/crates/ide_ssr/src/lib.rs b/crates/ide_ssr/src/lib.rs
index 826bec641f..c2167591aa 100644
--- a/crates/ide_ssr/src/lib.rs
+++ b/crates/ide_ssr/src/lib.rs
@@ -142,19 +142,27 @@ impl SsrSearchScope {
     }
 }
 
+pub fn match_pattern(
+    sema: &Semantic,
+    strategy: Strategy,
+    pattern: &str,
+    scope: SsrSearchScope,
+) -> SsrMatches {
+    let pattern = SsrRule::parse_str(sema.db, pattern).expect("could not parse SSR pattern");
+    let mut match_finder = MatchFinder::in_context(sema, strategy, scope);
+    match_finder.debug_print = false;
+    match_finder.add_search_pattern(pattern);
+    let matches: SsrMatches = match_finder.matches().flattened();
+    matches
+}
+
 pub fn match_pattern_in_file(
     sema: &Semantic,
     strategy: Strategy,
     file_id: FileId,
     pattern: &str,
 ) -> SsrMatches {
-    let pattern = SsrRule::parse_str(sema.db, pattern).expect("could not parse SSR pattern");
-    let mut match_finder =
-        MatchFinder::in_context(sema, strategy, SsrSearchScope::WholeFile(file_id));
-    match_finder.debug_print = false;
-    match_finder.add_search_pattern(pattern);
-    let matches: SsrMatches = match_finder.matches().flattened();
-    matches
+    match_pattern(sema, strategy, pattern, SsrSearchScope::WholeFile(file_id))
 }
 
 pub fn match_pattern_in_file_functions(
@@ -163,13 +171,12 @@ pub fn match_pattern_in_file_functions(
     file_id: FileId,
     pattern: &str,
 ) -> SsrMatches {
-    let pattern = SsrRule::parse_str(sema.db, pattern).expect("could not parse SSR pattern");
-    let mut match_finder =
-        MatchFinder::in_context(sema, strategy, SsrSearchScope::FunctionsOnly(file_id));
-    match_finder.debug_print = false;
-    match_finder.add_search_pattern(pattern);
-    let matches: SsrMatches = match_finder.matches().flattened();
-    matches
+    match_pattern(
+        sema,
+        strategy,
+        pattern,
+        SsrSearchScope::FunctionsOnly(file_id),
+    )
 }
 
 pub fn is_placeholder_a_var_from_body(body: &Body, m: &PlaceholderMatch) -> bool {

From 14ae7af91e7dc4b06724c3b55dbd27262b675a8b Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 25 Sep 2025 05:31:06 -0700
Subject: [PATCH 132/394] Add --report-system-stats to parse-elp command

Summary: In D83100279 we noticed a massive memory usage provoked by the `elp parse-elp` command. To ease this type of investigations, add a `--report-memory-stats` flag to the command, that can be used to dump memory usage.

Reviewed By: TD5

Differential Revision: D83167289

fbshipit-source-id: a6b059ea45e2db19d674dd4107bafc437fee3dd4
---
 crates/elp/src/bin/args.rs                    |  3 ++
 crates/elp/src/bin/elp_parse_cli.rs           | 15 +++++++++
 .../src/resources/test/parse_elp_help.stdout  | 31 ++++++++++---------
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index ecb0e2504f..68fb4a4e49 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -63,6 +63,9 @@ pub struct ParseAllElp {
         guard(format_guard, "Please use json")
     )]
     pub format: Option<String>,
+    /// Report system memory usage and other statistics
+    #[bpaf(long("report-system-stats"))]
+    pub report_system_stats: bool,
 }
 
 #[derive(Clone, Debug, Bpaf)]
diff --git a/crates/elp/src/bin/elp_parse_cli.rs b/crates/elp/src/bin/elp_parse_cli.rs
index 6d29ba38e5..4234f511d7 100644
--- a/crates/elp/src/bin/elp_parse_cli.rs
+++ b/crates/elp/src/bin/elp_parse_cli.rs
@@ -21,6 +21,7 @@ use elp::build::load;
 use elp::build::types::LoadResult;
 use elp::cli::Cli;
 use elp::convert;
+use elp::memory_usage::MemoryUsage;
 use elp::otp_file_to_ignore;
 use elp::server::file_id_to_url;
 use elp_eqwalizer::Mode;
@@ -68,6 +69,9 @@ pub fn parse_all(
 ) -> Result<()> {
     log::info!("Loading project at: {:?}", args.project);
 
+    // Track memory usage at the start
+    let memory_start = MemoryUsage::now();
+
     let config = DiscoverConfig::new(args.rebar, &args.profile);
     let loaded = load::load_project_at(
         cli,
@@ -140,10 +144,16 @@ pub fn parse_all(
     // printing, but do not print it out. So just create a dummy value
     let url = lsp_types::Url::parse("file:///unused_url").ok().unwrap();
 
+    let memory_end = MemoryUsage::now();
+    let memory_used = memory_end - memory_start;
+
     if res.is_empty() {
         if args.is_format_normal() {
             writeln!(cli, "No errors reported")?;
         }
+        if args.is_format_normal() && args.report_system_stats {
+            writeln!(cli, "{}", memory_used)?;
+        }
         Ok(())
     } else {
         if args.is_format_normal() {
@@ -185,6 +195,11 @@ pub fn parse_all(
                 }
             }
         }
+
+        if args.is_format_normal() && args.report_system_stats {
+            writeln!(cli, "{}", memory_used)?;
+        }
+
         if err_in_diag {
             bail!("Parse failures found")
         } else {
diff --git a/crates/elp/src/resources/test/parse_elp_help.stdout b/crates/elp/src/resources/test/parse_elp_help.stdout
index cfd7eedb8e..1457aed5c5 100644
--- a/crates/elp/src/resources/test/parse_elp_help.stdout
+++ b/crates/elp/src/resources/test/parse_elp_help.stdout
@@ -1,17 +1,18 @@
-Usage: [--project PROJECT] [--module MODULE] [--file ARG] [--to TO] [--no-diags] [--experimental] [--as PROFILE] [--dump-includes] [--rebar] [--include-generated] [--serial] [--use-cli-severity] [[--format FORMAT]]
+Usage: [--project PROJECT] [--module MODULE] [--file ARG] [--to TO] [--no-diags] [--experimental] [--as PROFILE] [--dump-includes] [--rebar] [--include-generated] [--serial] [--use-cli-severity] [[--format FORMAT]] [--report-system-stats]
 
 Available options:
-        --project <PROJECT>  Path to directory with project, or to a JSON file (defaults to `.`)
-        --module <MODULE>    Parse a single module from the project, not the entire project
-        --file <ARG>         Parse a single file from the project, not the entire project. \nThis can be an include file or escript, etc.
-        --to <TO>            Path to a directory where to dump result files
-        --no-diags           Do not print the full diagnostics for a file, just the count
-        --experimental       Report experimental diagnostics too, if diagnostics are enabled
-        --as <PROFILE>       Rebar3 profile to pickup (default is test)
-        --dump-includes      Report the resolution of include directives for comparison with OTP ones
-        --rebar              Run with rebar
-        --include-generated  Also process generated modules
-        --serial             Parse the files serially, not in parallel
-        --use-cli-severity   If specified, use the provided CLI severity mapping instead of the default one
-        --format <FORMAT>    Show diagnostics in JSON format
-    -h, --help               Prints help information
+        --project <PROJECT>    Path to directory with project, or to a JSON file (defaults to `.`)
+        --module <MODULE>      Parse a single module from the project, not the entire project
+        --file <ARG>           Parse a single file from the project, not the entire project. \nThis can be an include file or escript, etc.
+        --to <TO>              Path to a directory where to dump result files
+        --no-diags             Do not print the full diagnostics for a file, just the count
+        --experimental         Report experimental diagnostics too, if diagnostics are enabled
+        --as <PROFILE>         Rebar3 profile to pickup (default is test)
+        --dump-includes        Report the resolution of include directives for comparison with OTP ones
+        --rebar                Run with rebar
+        --include-generated    Also process generated modules
+        --serial               Parse the files serially, not in parallel
+        --use-cli-severity     If specified, use the provided CLI severity mapping instead of the default one
+        --format <FORMAT>      Show diagnostics in JSON format
+        --report-system-stats  Report system memory usage and other statistics
+    -h, --help                 Prints help information

From e27ffab6a501d284fb909bf875c4630b72b73319 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Thu, 25 Sep 2025 07:52:58 -0700
Subject: [PATCH 133/394] Use buck2 cell info to resolve target directories

Summary:
## Context

We have been assuming that the buck2 targets we care about are  all in the same buck2 cell, corresponding to the buck root.

This is not always the case, and we are starting to use targets from diverse locations.

## This diff

Update the target to absolute directory processing to use the buck2 target cell information for the given project.

Reviewed By: TheGeorge

Differential Revision: D83245484

fbshipit-source-id: 8410ba36992d6369dccf09a85ffc780d40e33500
---
 crates/project_model/src/buck.rs | 137 ++++++++++++++++++++++++++++---
 1 file changed, 125 insertions(+), 12 deletions(-)

diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index d328a8669e..af8f0a7789 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -13,6 +13,7 @@ use std::borrow::Cow;
 use std::convert::TryFrom;
 use std::fmt;
 use std::path::PathBuf;
+use std::process;
 use std::process::Command;
 use std::sync::Arc;
 
@@ -337,6 +338,7 @@ impl BuckProject {
         anyhow::Error,
     > {
         let _timer = timeit_with_telemetry!("BuckProject::load_from_config");
+        let _ = set_cell_info(buck_conf)?;
         let target_info = load_buck_targets_bxl(buck_conf, query_config, report_progress)?;
         report_progress("Making project app data");
         let (project_app_data, mut include_mapping) =
@@ -721,6 +723,85 @@ pub fn query_buck_targets_bxl(
         .arg("--")
         .args(build_args)
         .args(targets);
+    let output = run_buck_command(command)?;
+    let string = String::from_utf8(output.stdout)?;
+    let result: FxHashMap<TargetFullName, BuckTarget> = serde_json::from_str(&string)?;
+    Ok(result)
+}
+
+// ---------------------------------------------------------------------
+
+#[derive(Debug, Clone)]
+struct BuckCellInfo {
+    cells: FxHashMap<String, String>,
+}
+
+impl BuckCellInfo {
+    fn make_absolute(&self, target: &str) -> String {
+        self.make_absolute_maybe(target)
+            .unwrap_or(target.to_string())
+    }
+
+    fn make_absolute_maybe(&self, target: &str) -> Option<String> {
+        let parts: Vec<_> = target.split("//").collect();
+        let cell = *parts.first()?;
+        let path = *parts.get(1)?;
+        let base = self.cells.get(cell)?;
+        Some(format!("{base}/{path}"))
+    }
+}
+
+lazy_static! {
+    /// Mapping from cell name to absolute path.
+    static ref BUCK_CELL_INFO: Mutex<Option<(BuckCellInfo, Option<AbsPathBuf>)>> = Mutex::new(None);
+}
+
+fn set_cell_info(buck_config: &BuckConfig) -> Result<BuckCellInfo> {
+    let cell_info = BUCK_CELL_INFO.lock();
+    if let Some(ref cached_cell_info) = *cell_info {
+        if cached_cell_info.1 == buck_config.buck_root {
+            return Ok(cached_cell_info.0.clone());
+        } else {
+            log::warn!(
+                "buck::set_cell_info:different buck root used: [{:?}] vs [{:?}]",
+                buck_config.buck_root,
+                cached_cell_info.1
+            )
+        }
+    };
+    drop(cell_info); // Release the lock before the second lock attempt
+    let mut cell_info = BUCK_CELL_INFO.lock();
+    let info = query_buck_cell_info(buck_config)?;
+    *cell_info = Some((info.clone(), buck_config.buck_root.clone()));
+    Ok(info)
+}
+
+fn buck_cell_info() -> Result<BuckCellInfo> {
+    let cell_info = BUCK_CELL_INFO.lock();
+    if let Some(ref cached_cell_info) = *cell_info {
+        Ok(cached_cell_info.0.clone())
+    } else {
+        Err(anyhow::anyhow!("BUCK_CELL_INFO not set yet"))
+    }
+}
+
+fn query_buck_cell_info(buck_config: &BuckConfig) -> Result<BuckCellInfo> {
+    let mut command = buck_config.buck_command();
+    command.arg("audit").arg("cell").arg("--json");
+    let output = run_buck_command(command)?;
+    let string = String::from_utf8(output.stdout)?;
+    let mut cells: FxHashMap<String, String> = serde_json::from_str(&string)?;
+    if let Some(path) = &buck_config.buck_root {
+        // Set the default cell to the buck root
+        cells.insert("".to_string(), path.as_str().to_string());
+    }
+
+    Ok(BuckCellInfo { cells })
+}
+
+// ---------------------------------------------------------------------
+
+fn run_buck_command(mut command: CommandProxy<'_>) -> Result<process::Output> {
     let output = command.output()?;
     if !output.status.success() {
         let reason = match output.status.code() {
@@ -733,9 +814,7 @@ pub fn query_buck_targets_bxl(
         };
         bail!(error);
     }
-    let string = String::from_utf8(output.stdout)?;
-    let result: FxHashMap<TargetFullName, BuckTarget> = serde_json::from_str(&string)?;
-    Ok(result)
+    Ok(output)
 }
 
 #[derive(Error, Debug)]
@@ -816,16 +895,9 @@ fn build_third_party_targets(
 
 /// Convert cell//path/to/project_file.erl to /Users/$USER/buckroot/path/to/project_file.erl
 fn buck_path_to_abs_path(root: &AbsPath, target: &str) -> Result<AbsPathBuf> {
-    // TODO: remove this function once the BXL query is used instead.
-    //       It is an approximation, targets may be in different cells.
-    //       T188371274
     if target.contains("//") {
-        let mut split = target.split("//");
-        let _ = split.next(); // "cell" or empty in case of //...
-        match split.next() {
-            None => bail!("couldn't find a path for target {:?}", target),
-            Some(path) => Ok(root.join(path)),
-        }
+        let cell_info = buck_cell_info()?;
+        Ok(AbsPathBuf::assert(cell_info.make_absolute(target).into()))
     } else {
         Ok(root.join(target))
     }
@@ -1150,6 +1222,10 @@ mod tests {
         let dir = FixtureWithProjectMeta::gen_project(spec);
         let root = AbsPath::assert(Utf8Path::from_path(dir.path()).unwrap());
         let target_name = "cell//app_a:app_a".to_string();
+        set_test_cell_info(vec![(
+            "cell".to_string(),
+            dir.path().to_string_lossy().into_owned(),
+        )]);
         let target = BuckTarget {
             name: "app_a".to_string(),
             app_name: None,
@@ -1181,6 +1257,10 @@ mod tests {
         "#;
         let dir = FixtureWithProjectMeta::gen_project(spec);
         let root = AbsPath::assert(Utf8Path::from_path(dir.path()).unwrap());
+        set_test_cell_info(vec![(
+            "cell".to_string(),
+            dir.path().to_string_lossy().into_owned(),
+        )]);
         let target_name = "cell//app_a:app_a".to_string();
         let target = BuckTarget {
             name: "app_a".to_string(),
@@ -1615,8 +1695,20 @@ mod tests {
         }
     }
 
+    fn set_test_cell_info(cells: Vec<(String, String)>) {
+        let mut cell_info = BUCK_CELL_INFO.lock();
+        let info = BuckCellInfo {
+            cells: FxHashMap::from_iter(cells),
+        };
+        *cell_info = Some((info, None))
+    }
+
     #[test]
     fn test_buck_path_to_abs_path() {
+        set_test_cell_info(vec![
+            ("".to_string(), "/blah".to_string()),
+            ("cell".to_string(), "/blah".to_string()),
+        ]);
         let root = AbsPath::assert(Utf8Path::new("/blah"));
         expect![[r#"
             Ok(
@@ -1664,4 +1756,25 @@ mod tests {
             "Buck UI: https://a.b.com/buck2/ref-hash\nblah".to_string(),
         ));
     }
+
+    #[test]
+    fn cell_to_absolute() {
+        let cells = BuckCellInfo {
+            cells: FxHashMap::from_iter(vec![
+                ("cell1".to_string(), "/a/path".to_string()),
+                ("cell2".to_string(), "/another/path".to_string()),
+            ]),
+        };
+
+        expect![[r#"
+            Some(
+                "/a/path/a/b/c.erl",
+            )
+        "#]]
+        .assert_debug_eq(&cells.make_absolute_maybe("cell1//a/b/c.erl"));
+        expect![[r#"
+            "/another/path/a/b/c.erl"
+        "#]]
+        .assert_debug_eq(&cells.make_absolute("cell2//a/b/c.erl"));
+    }
 }

From 6afb92eaed89d86d0c198e648b45dc158cc2de84 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 29 Sep 2025 05:10:28 -0700
Subject: [PATCH 134/394] 1/n: Add field to track generation source file inputs
 for buck2 generated targets

Summary:
## Context

Our generated targets have output in the `buck-out` directory, which is isolated from the normal buck2 build because we use an isolation directory when we run `elp.bxl`. This means we cannot watch these files for changes when doing a buck2 build, and must monitor the inputs from the targets instead.

D83155666 extends `elp.bxl` to provide this information.

## This diff

Capture this information in the buck project model when running `elp.bxl`.  This sets the stage for using it higher up in the stack.

Reviewed By: robertoaloi

Differential Revision: D83255606

fbshipit-source-id: 9cf4cbee34a1f5ec0a0a5da7ace5d95de0de8adf
---
 crates/project_model/src/buck.rs              | 24 +++++++++++++++++++
 crates/project_model/src/eqwalizer_support.rs |  1 +
 crates/project_model/src/json.rs              |  1 +
 crates/project_model/src/lib.rs               |  5 ++++
 crates/project_model/src/no_manifest.rs       |  1 +
 crates/project_model/src/rebar.rs             |  1 +
 crates/project_model/src/test_fixture.rs      |  1 +
 7 files changed, 34 insertions(+)

diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index af8f0a7789..6e548aa4f1 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -418,6 +418,16 @@ pub struct BuckTarget {
     srcs: Vec<String>,
     #[serde(default)]
     includes: Vec<String>,
+    /// The set of input files used in a target that was generated.
+    /// These are used to set file watchers on them, so the target can
+    /// be re-run if any input changes.
+    ///
+    /// NOTE: the generation happens on a call to elp.bxl, which runs
+    /// in a buck2 isolation directory for lsp usage. This means the
+    /// output will not be updated unless elp.bxl is called again for it.
+    /// Hence watching the inputs.
+    #[serde(default)]
+    gen_srcs: Vec<String>,
     #[serde(default)]
     labels: FxHashSet<String>,
     #[serde(default)]
@@ -460,6 +470,7 @@ pub struct Target {
     pub dir: AbsPathBuf,
     pub src_files: Vec<AbsPathBuf>,
     pub include_files: Vec<AbsPathBuf>,
+    pub gen_src_files: Vec<AbsPathBuf>,
     pub deps: Vec<TargetFullName>,
     pub apps: Vec<TargetFullName>,
     pub included_apps: Vec<TargetFullName>,
@@ -605,12 +616,18 @@ fn make_buck_target(
             };
             (src_files, include_files, target_type, private_header, ebin)
         };
+    let gen_src_files = target
+        .gen_srcs
+        .iter()
+        .flat_map(|f| buck_path_to_abs_path(root, f).ok())
+        .collect();
     Ok(Target {
         name: name.clone(),
         app_name: target.name(),
         dir,
         src_files,
         include_files,
+        gen_src_files,
         deps: target.deps.clone(),
         apps: target.apps.clone(),
         included_apps: target.included_apps.clone(),
@@ -1050,6 +1067,7 @@ fn targets_to_project_data_bxl(
             parse_transforms: vec![],
             app_type: target.app_type(),
             include_path: vec![],
+            gen_src_files: Some(FxHashSet::from_iter(target.gen_src_files.clone())),
             applicable_files: Some(FxHashSet::from_iter(target.src_files.clone())),
             is_test_target: Some(target.target_type == TargetType::ErlangTest),
         };
@@ -1143,6 +1161,7 @@ mod tests {
             suite: None,
             srcs: vec![as_absolute_string(&dir, "app_a/src/app.erl")],
             includes: vec![],
+            gen_srcs: vec![],
             labels: FxHashSet::default(),
             deps: vec![],
             apps: vec![],
@@ -1171,6 +1190,7 @@ mod tests {
             suite: None,
             srcs: vec![],
             includes: vec![as_absolute_string(&dir, "app_a/include/app.hrl")],
+            gen_srcs: vec![],
             labels: FxHashSet::default(),
             deps: vec![],
             apps: vec![],
@@ -1199,6 +1219,7 @@ mod tests {
             suite: Some(as_absolute_string(&dir, "app_a/test/app_SUITE.erl")),
             srcs: vec![],
             includes: vec![],
+            gen_srcs: vec![],
             labels: FxHashSet::default(),
             deps: vec![],
             apps: vec![],
@@ -1235,6 +1256,7 @@ mod tests {
                 "cell//app_a/src/app.erl".to_string(),
             ],
             includes: vec![],
+            gen_srcs: vec![],
             labels: FxHashSet::default(),
             deps: vec![],
             apps: vec![],
@@ -1268,6 +1290,7 @@ mod tests {
             suite: None,
             srcs: vec!["cell//app_a/app.erl".to_string()],
             includes: vec!["cell//app_a/app.hrl".to_string()],
+            gen_srcs: vec![],
             labels: FxHashSet::default(),
             deps: vec![],
             apps: vec![],
@@ -1297,6 +1320,7 @@ mod tests {
             suite: None,
             srcs: vec![as_absolute_string(&dir, "app_a/sub/app.erl")],
             includes: vec![as_absolute_string(&dir, "app_a/sub/app.hrl")],
+            gen_srcs: vec![],
             labels: FxHashSet::default(),
             deps: vec![],
             apps: vec![],
diff --git a/crates/project_model/src/eqwalizer_support.rs b/crates/project_model/src/eqwalizer_support.rs
index 9a341a38ec..672b7c174d 100644
--- a/crates/project_model/src/eqwalizer_support.rs
+++ b/crates/project_model/src/eqwalizer_support.rs
@@ -46,6 +46,7 @@ pub(crate) fn eqwalizer_suppport_data(otp_root: &AbsPath) -> ProjectAppData {
         macros: vec![],
         parse_transforms: vec![],
         include_path: vec![otp_root.to_path_buf()],
+        gen_src_files: None,
         applicable_files: None,
         is_test_target: None,
     }
diff --git a/crates/project_model/src/json.rs b/crates/project_model/src/json.rs
index 3adf353e13..12b822ac39 100644
--- a/crates/project_model/src/json.rs
+++ b/crates/project_model/src/json.rs
@@ -102,6 +102,7 @@ impl JsonProjectAppData {
             parse_transforms: vec![],
             app_type,
             include_path: vec![],
+            gen_src_files: None,
             applicable_files: None,
             is_test_target: None,
         })
diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs
index 4172e26f77..473fb27035 100644
--- a/crates/project_model/src/lib.rs
+++ b/crates/project_model/src/lib.rs
@@ -870,6 +870,9 @@ pub struct ProjectAppData {
     //list of directories required by module to compile
     //usually includes all dependencies include paths and otp
     pub include_path: Vec<AbsPathBuf>,
+    // Originating from buck2 model, the set of specific input files
+    // this data was generated from.
+    pub gen_src_files: Option<ApplicableFiles>,
     // Originating from buck2 model, the set of specific files this
     // data applies to.
     pub applicable_files: Option<ApplicableFiles>,
@@ -898,6 +901,7 @@ impl ProjectAppData {
             app_type: AppType::App,
             include_path: vec![],
             abs_src_dirs: src_dirs,
+            gen_src_files: None,
             applicable_files: None,
             is_test_target: None,
         }
@@ -924,6 +928,7 @@ impl ProjectAppData {
             app_type: AppType::Otp,
             include_path: vec![include, src, parent],
             abs_src_dirs: vec![abs_src_dir],
+            gen_src_files: None,
             applicable_files: None,
             is_test_target: None,
         }
diff --git a/crates/project_model/src/no_manifest.rs b/crates/project_model/src/no_manifest.rs
index 402d27d9c5..a1de933260 100644
--- a/crates/project_model/src/no_manifest.rs
+++ b/crates/project_model/src/no_manifest.rs
@@ -68,6 +68,7 @@ impl NoManifestConfig {
             macros: vec![],
             parse_transforms: vec![],
             include_path: vec![otp_root.to_path_buf()],
+            gen_src_files: None,
             applicable_files: None,
             is_test_target: None,
         };
diff --git a/crates/project_model/src/rebar.rs b/crates/project_model/src/rebar.rs
index b55cbc1552..64686c26a6 100644
--- a/crates/project_model/src/rebar.rs
+++ b/crates/project_model/src/rebar.rs
@@ -237,6 +237,7 @@ impl RebarProject {
                 app_type: is_dep,
                 include_path: vec![],
                 abs_src_dirs,
+                gen_src_files: None,
                 applicable_files: None,
                 is_test_target: None,
             })
diff --git a/crates/project_model/src/test_fixture.rs b/crates/project_model/src/test_fixture.rs
index 0354e5509c..152595251b 100644
--- a/crates/project_model/src/test_fixture.rs
+++ b/crates/project_model/src/test_fixture.rs
@@ -963,6 +963,7 @@ bar() -> ok.
                 parse_transforms: [],
                 app_type: App,
                 include_path: [],
+                gen_src_files: None,
                 applicable_files: None,
                 is_test_target: None,
             }"#]]

From f8c8cc5b41f49178e5cab4c020cf2962ec89d1ed Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 29 Sep 2025 05:10:28 -0700
Subject: [PATCH 135/394] 2/n: Include watches for buck2 generated inputs

Summary:
We now have the inputs in our project model, add them to the file watching spec.

Note that we add the specific files, rather than using a glob spec based on the parent directory.  The upstream target landscape is too complex to try and track more than this.

Reviewed By: robertoaloi

Differential Revision: D83256350

fbshipit-source-id: 608a1e71aff3afa130d2b7132a515aaf39689d2e
---
 crates/elp/src/reload.rs        | 19 +++++++++++--------
 crates/project_model/src/lib.rs |  9 ++++++---
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/crates/elp/src/reload.rs b/crates/elp/src/reload.rs
index aa87c27404..d351324cfc 100644
--- a/crates/elp/src/reload.rs
+++ b/crates/elp/src/reload.rs
@@ -9,7 +9,6 @@
  */
 
 use std::cmp;
-use std::iter;
 
 use elp_ide::elp_ide_db::elp_base_db::FileSetConfig;
 use elp_ide::elp_ide_db::elp_base_db::ProjectApps;
@@ -52,14 +51,18 @@ impl ProjectFolders {
             .all_apps
             .iter()
             .flat_map(|(project_id, app)| {
-                iter::repeat(project_id).zip(app.all_source_and_include_dirs())
-            })
-            .filter_map(|(project_id, root)| {
-                if Some(*project_id) != project_apps.otp_project_id {
-                    Some(format!("{root}/**/*.{{e,h}}rl"))
-                } else {
-                    None
+                let mut paths = Vec::new();
+                // Add all_dirs_to_watch() with project_id check and glob
+                for root in app.all_dirs_to_watch() {
+                    if Some(*project_id) != project_apps.otp_project_id {
+                        paths.push(format!("{root}/**/*.{{e,h}}rl"));
+                    }
                 }
+                // Add all_files_to_watch() directly, no project_id check or glob
+                for file in app.all_files_to_watch() {
+                    paths.push(file.to_string());
+                }
+                paths
             })
             .collect();
 
diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs
index 473fb27035..9fe1bcccda 100644
--- a/crates/project_model/src/lib.rs
+++ b/crates/project_model/src/lib.rs
@@ -942,9 +942,7 @@ impl ProjectAppData {
             .collect()
     }
 
-    /// Source directories for the application including the extra
-    /// sources and includes
-    pub fn all_source_and_include_dirs(&self) -> FxHashSet<AbsPathBuf> {
+    pub fn all_dirs_to_watch(&self) -> FxHashSet<AbsPathBuf> {
         self.extra_src_dirs
             .iter()
             .map(|src_dir| self.dir.join(src_dir))
@@ -953,6 +951,11 @@ impl ProjectAppData {
             .chain(self.include_path.iter().cloned())
             .collect()
     }
+
+    pub fn all_files_to_watch(&self) -> FxHashSet<AbsPathBuf> {
+        self.gen_src_files.clone().unwrap_or_default()
+    }
+
     /// Source directories for the application
     pub fn all_source_dirs(&self) -> FxHashSet<AbsPathBuf> {
         self.extra_src_dirs

From ec9795953467126f2edfce90140207d9d61cc8b8 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 29 Sep 2025 05:10:28 -0700
Subject: [PATCH 136/394] 3/n: Reload project if a buck2 generated input
 changes

Summary:
## Context

We are now watching for changes to the inputs of targets that are generated by buck2.

But our existing logic to detect if a project needs reloading is based on hierarchical containment of the changed file inside the project somewhere.

For generated targets this is not always the case, so we need some additional logic.

# This diff

We now keep a map for each generated target input to the application and this project it belongs to, via an `AppDataId`.

This allows us to replace the watched path with one inside a project, and use the normal project reload determination logic.

Reviewed By: TheGeorge

Differential Revision: D83257306

fbshipit-source-id: 1e251d594e37c8c7edc08859722614b66a7f5ba3
---
 crates/base_db/src/fixture.rs    | 54 ++++++++++++++++-------------
 crates/base_db/src/input.rs      | 59 +++++++++++++++++++++++++-------
 crates/elp/src/project_loader.rs | 19 ++++++----
 crates/elp/src/server.rs         | 40 ++++++++++++++++++++--
 crates/project_model/src/lib.rs  |  6 ++--
 5 files changed, 129 insertions(+), 49 deletions(-)

diff --git a/crates/base_db/src/fixture.rs b/crates/base_db/src/fixture.rs
index 574e56e036..e94e180032 100644
--- a/crates/base_db/src/fixture.rs
+++ b/crates/base_db/src/fixture.rs
@@ -484,8 +484,8 @@ bar() -> ?FOO.
                     app_map: {
                         SourceRootId(
                             0,
-                        ): (
-                            Some(
+                        ): AppMapData {
+                            app_data: Some(
                                 AppData {
                                     project_id: ProjectId(
                                         0,
@@ -519,12 +519,13 @@ bar() -> ?FOO.
                                     is_test_target: None,
                                 },
                             ),
-                            None,
-                        ),
+                            applicable_files: None,
+                            gen_src_files: None,
+                        },
                         SourceRootId(
                             2,
-                        ): (
-                            Some(
+                        ): AppMapData {
+                            app_data: Some(
                                 AppData {
                                     project_id: ProjectId(
                                         1,
@@ -569,12 +570,13 @@ bar() -> ?FOO.
                                     is_test_target: None,
                                 },
                             ),
-                            None,
-                        ),
+                            applicable_files: None,
+                            gen_src_files: None,
+                        },
                         SourceRootId(
                             1,
-                        ): (
-                            Some(
+                        ): AppMapData {
+                            app_data: Some(
                                 AppData {
                                     project_id: ProjectId(
                                         0,
@@ -608,14 +610,16 @@ bar() -> ?FOO.
                                     is_test_target: None,
                                 },
                             ),
-                            None,
-                        ),
+                            applicable_files: None,
+                            gen_src_files: None,
+                        },
                         SourceRootId(
                             3,
-                        ): (
-                            None,
-                            None,
-                        ),
+                        ): AppMapData {
+                            app_data: None,
+                            applicable_files: None,
+                            gen_src_files: None,
+                        },
                     },
                     project_map: {
                         ProjectId(
@@ -741,8 +745,8 @@ foo() -> ?BAR.
                     app_map: {
                         SourceRootId(
                             0,
-                        ): (
-                            Some(
+                        ): AppMapData {
+                            app_data: Some(
                                 AppData {
                                     project_id: ProjectId(
                                         0,
@@ -792,14 +796,16 @@ foo() -> ?BAR.
                                     is_test_target: None,
                                 },
                             ),
-                            None,
-                        ),
+                            applicable_files: None,
+                            gen_src_files: None,
+                        },
                         SourceRootId(
                             1,
-                        ): (
-                            None,
-                            None,
-                        ),
+                        ): AppMapData {
+                            app_data: None,
+                            applicable_files: None,
+                            gen_src_files: None,
+                        },
                     },
                     project_map: {
                         ProjectId(
diff --git a/crates/base_db/src/input.rs b/crates/base_db/src/input.rs
index 29da6ed0c5..eb914e2a7d 100644
--- a/crates/base_db/src/input.rs
+++ b/crates/base_db/src/input.rs
@@ -15,13 +15,13 @@ use std::sync::Arc;
 
 use elp_project_model::AppName;
 use elp_project_model::AppType;
-use elp_project_model::ApplicableFiles;
 use elp_project_model::EqwalizerConfig;
 use elp_project_model::Project;
 use elp_project_model::ProjectAppData;
 use elp_project_model::buck::IncludeMapping;
 use elp_project_model::buck::TargetFullName;
 use fxhash::FxHashMap;
+use fxhash::FxHashSet;
 use paths::RelPath;
 use paths::Utf8Path;
 use vfs::AbsPathBuf;
@@ -179,11 +179,23 @@ impl AppData {
 /// Note that `AppStructure` is build-system agnostic
 #[derive(Debug, Clone, Default /* Serialize, Deserialize */)]
 pub struct AppStructure {
-    pub(crate) app_map: FxHashMap<SourceRootId, (Option<AppData>, Option<ApplicableFiles>)>,
+    pub(crate) app_map: FxHashMap<SourceRootId, AppMapData>,
     pub(crate) project_map: FxHashMap<ProjectId, ProjectData>,
     pub(crate) catch_all_source_root: SourceRootId,
 }
 
+#[derive(Debug, Clone, Default)]
+pub struct AppMapData {
+    app_data: Option<AppData>, // TODO: should this be Arc?
+    applicable_files: Option<FxHashSet<AbsPathBuf>>,
+    gen_src_files: Option<FxHashSet<AbsPathBuf>>,
+}
+
+pub struct ApplyOutput {
+    pub unresolved_app_id_paths: FxHashMap<AbsPathBuf, AppDataId>,
+    pub gen_src_inputs: FxHashMap<AbsPathBuf, AppDataId>,
+}
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord, Default)]
 pub struct AppDataId(pub u32);
 
@@ -192,13 +204,20 @@ impl AppStructure {
         &mut self,
         source_root_id: SourceRootId,
         app_data: Option<AppData>,
-        applicable_files: Option<ApplicableFiles>,
+        applicable_files: Option<FxHashSet<AbsPathBuf>>,
+        gen_src_files: Option<FxHashSet<AbsPathBuf>>,
     ) {
-        let prev = self
-            .app_map
-            .insert(source_root_id, (app_data, applicable_files));
+        let prev = self.app_map.insert(
+            source_root_id,
+            AppMapData {
+                app_data,
+                applicable_files,
+                gen_src_files,
+            },
+        );
         assert!(prev.is_none());
     }
+
     pub fn add_project_data(&mut self, project_id: ProjectId, project_data: ProjectData) {
         let prev = self.project_map.insert(project_id, project_data);
         assert!(prev.is_none());
@@ -209,15 +228,16 @@ impl AppStructure {
         self,
         db: &mut dyn SourceDatabaseExt,
         resolve_file_id: &impl Fn(&AbsPathBuf) -> Option<FileId>,
-    ) -> FxHashMap<AbsPathBuf, AppDataId> {
+    ) -> ApplyOutput {
         let mut app_index = AppDataIndex::default();
         let mut app_data_id = AppDataId(0);
         let mut unresolved_paths = FxHashMap::default();
-        for (source_root_id, (data, applicable_files)) in self.app_map {
-            let arc_data = data.map(Arc::new);
+        let mut gen_src_inputs = FxHashMap::default();
+        for (source_root_id, app_map_data) in self.app_map {
+            let arc_data = app_map_data.app_data.map(Arc::new);
             db.set_app_data_by_id(app_data_id, arc_data);
             db.set_app_data_id(source_root_id, app_data_id);
-            if let Some(files) = applicable_files {
+            if let Some(files) = app_map_data.applicable_files {
                 files.iter().for_each(|path| {
                     if let Some(file_id) = resolve_file_id(path) {
                         app_index.map.insert(file_id, app_data_id);
@@ -226,6 +246,11 @@ impl AppStructure {
                     }
                 })
             }
+            if let Some(files) = app_map_data.gen_src_files {
+                for file in files {
+                    gen_src_inputs.insert(file.clone(), app_data_id);
+                }
+            }
             app_data_id = AppDataId(app_data_id.0 + 1);
         }
         for (project_id, project_data) in self.project_map {
@@ -234,7 +259,10 @@ impl AppStructure {
         db.set_app_index(Arc::new(app_index));
         db.set_catch_all_source_root(self.catch_all_source_root);
 
-        unresolved_paths
+        ApplyOutput {
+            unresolved_app_id_paths: unresolved_paths,
+            gen_src_inputs,
+        }
     }
 }
 
@@ -380,7 +408,12 @@ impl<'a> ProjectApps<'a> {
                     ebin_path: app.ebin.clone(),
                     is_test_target: app.is_test_target,
                 };
-                app_structure.add_app_data(root_id, Some(input_data), app.applicable_files.clone());
+                app_structure.add_app_data(
+                    root_id,
+                    Some(input_data),
+                    app.applicable_files.clone(),
+                    app.gen_src_files.clone(),
+                );
             }
 
             let mut app_roots = project_root_map.remove(&project_id).unwrap_or_default();
@@ -403,7 +436,7 @@ impl<'a> ProjectApps<'a> {
 
         // Final SourceRoot for out-of-project files
         log::info!("Final source root: {:?}", SourceRootId(app_idx));
-        app_structure.add_app_data(SourceRootId(app_idx), None, None);
+        app_structure.add_app_data(SourceRootId(app_idx), None, None, None);
         app_structure.catch_all_source_root = SourceRootId(app_idx);
         app_structure
     }
diff --git a/crates/elp/src/project_loader.rs b/crates/elp/src/project_loader.rs
index 752dba0fbc..f092e26242 100644
--- a/crates/elp/src/project_loader.rs
+++ b/crates/elp/src/project_loader.rs
@@ -49,12 +49,15 @@ impl ProjectLoader {
         let mut result = false;
         for path in paths {
             let mut path_it: &AbsPath = path.as_ref();
-            while let Some(path) = path_it.parent() {
-                if self.project_roots.remove(path).is_some() {
+            loop {
+                if self.project_roots.remove(path_it).is_some() {
                     result = true;
                     break;
                 }
-                path_it = path;
+                match path_it.parent() {
+                    Some(parent) => path_it = parent,
+                    None => break,
+                }
             }
         }
         result
@@ -95,12 +98,16 @@ impl ProjectLoader {
         path: &AbsPath,
     ) -> Option<(ElpConfig, Result<ProjectManifest>, ProjectManifest)> {
         let mut path_it = path;
-        while let Some(path) = path_it.parent() {
-            if self.project_roots.contains_key(path) {
+        loop {
+            if self.project_roots.contains_key(path_it) {
                 return None;
             }
-            path_it = path;
+            match path_it.parent() {
+                Some(parent) => path_it = parent,
+                None => break,
+            }
         }
+
         Some(self.load_manifest(path))
     }
 
diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index 2c0ebbeb3b..72791e54ef 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -283,6 +283,7 @@ pub struct Server {
     initial_load_status: InitialLoading,
     reload_manager: Arc<Mutex<ReloadManager>>,
     unresolved_app_id_paths: Arc<FxHashMap<AbsPathBuf, AppDataId>>,
+    generated_app_inputs: Arc<FxHashMap<AbsPathBuf, AppDataId>>,
     update_app_data_ids: bool,
     reset_source_roots: bool,
     native_diagnostics_requested: bool,
@@ -350,6 +351,7 @@ impl Server {
             initial_load_status: InitialLoading::Initial,
             reload_manager: Arc::new(Mutex::new(ReloadManager::new())),
             unresolved_app_id_paths: Arc::new(FxHashMap::default()),
+            generated_app_inputs: Arc::new(FxHashMap::default()),
             update_app_data_ids: false,
             reset_source_roots: false,
             native_diagnostics_requested: false,
@@ -905,6 +907,9 @@ impl Server {
     }
 
     fn should_reload_project_for_path(&self, path: &AbsPath, change: &FileEvent) -> bool {
+        if self.generated_app_inputs.contains_key(path) {
+            return true;
+        }
         let path_ref: &Path = path.as_ref();
         let file_name = path.file_stem();
         let ext = path.extension();
@@ -1389,10 +1394,11 @@ impl Server {
         let project_apps = ProjectApps::new(&projects, IncludeOtp::Yes);
         spinner.report("Gathering file paths".to_string());
         let folders = ProjectFolders::new(&project_apps);
+        let apply_data = project_apps.app_structure().apply(raw_db, &|_path| None);
         // We will set the FileId -> AppDataIndex structure when the file
         // loads
-        self.unresolved_app_id_paths =
-            Arc::new(project_apps.app_structure().apply(raw_db, &|_path| None));
+        self.unresolved_app_id_paths = Arc::new(apply_data.unresolved_app_id_paths);
+        self.generated_app_inputs = Arc::new(apply_data.gen_src_inputs);
 
         self.file_set_config = folders.file_set_config;
 
@@ -1630,6 +1636,7 @@ impl Server {
         if !paths.is_empty() {
             let loader = self.project_loader.clone();
             let query_config = self.config.buck_query();
+            let paths = self.resolve_generated_project_paths(paths);
             let spinner = self
                 .progress
                 .begin_spinner_with_telemetry("ELP reloading project config".to_string());
@@ -1663,6 +1670,35 @@ impl Server {
         }
     }
 
+    fn resolve_generated_project_paths(
+        &mut self,
+        paths: FxHashSet<AbsPathBuf>,
+    ) -> FxHashSet<AbsPathBuf> {
+        let paths: FxHashSet<AbsPathBuf> = paths
+            .into_iter()
+            .map(|path| {
+                if let Some(app_data_id) = self.generated_app_inputs.get(&path) {
+                    if let Some(app_data) = self
+                        .analysis_host
+                        .raw_database()
+                        .app_data_by_id(*app_data_id)
+                    {
+                        let project = self
+                            .analysis_host
+                            .raw_database()
+                            .project_data(app_data.project_id);
+                        project.root_dir.clone()
+                    } else {
+                        path
+                    }
+                } else {
+                    path
+                }
+            })
+            .collect();
+        paths
+    }
+
     fn load_project_or_fallback(
         path: &AbsPath,
         elp_config: ElpConfig,
diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs
index 9fe1bcccda..73a46e7e6e 100644
--- a/crates/project_model/src/lib.rs
+++ b/crates/project_model/src/lib.rs
@@ -872,15 +872,13 @@ pub struct ProjectAppData {
     pub include_path: Vec<AbsPathBuf>,
     // Originating from buck2 model, the set of specific input files
     // this data was generated from.
-    pub gen_src_files: Option<ApplicableFiles>,
+    pub gen_src_files: Option<FxHashSet<AbsPathBuf>>,
     // Originating from buck2 model, the set of specific files this
     // data applies to.
-    pub applicable_files: Option<ApplicableFiles>,
+    pub applicable_files: Option<FxHashSet<AbsPathBuf>>,
     pub is_test_target: Option<bool>,
 }
 
-pub type ApplicableFiles = FxHashSet<AbsPathBuf>;
-
 impl ProjectAppData {
     pub fn fixture_app_data(
         name: AppName,

From b4e24a8415d65340b8ac4c6b1b0f96af7f5eb9fb Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 29 Sep 2025 07:35:52 -0700
Subject: [PATCH 137/394] Avoid compilation warning

Reviewed By: alanz

Differential Revision: D83471730

fbshipit-source-id: ad475cbc5552c019439f43671d069c7250ffe9b9
---
 website/docusaurus.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js
index 2fa0b86c23..72ea652755 100644
--- a/website/docusaurus.config.js
+++ b/website/docusaurus.config.js
@@ -9,7 +9,7 @@
  */
 
 import {themes as prismThemes} from 'prism-react-renderer';
-import stripMetaOnlyImport from './src/remark/strip-meta-only-import';
+import stripMetaOnlyImport from './src/remark/strip-meta-only-import.js';
 
 const {fbContent} = require('docusaurus-plugin-internaldocs-fb/internal');
 

From 06fc13bcaadfa608b80c4a2cbd7b43fd11f00fa9 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 29 Sep 2025 07:35:52 -0700
Subject: [PATCH 138/394] Add build-oss script

Reviewed By: TheGeorge

Differential Revision: D83472522

fbshipit-source-id: 8bf19926e65d945e2f8b0024dbe2d0a411471f6f
---
 .github/workflows/build-website.yml  |  2 +-
 .github/workflows/deploy-website.yml |  2 +-
 website/oss-stubs.sh                 | 76 ++++++++++++++++++++++++++++
 website/package.json                 |  1 +
 4 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100755 website/oss-stubs.sh

diff --git a/.github/workflows/build-website.yml b/.github/workflows/build-website.yml
index 62072bac4f..54d9750971 100644
--- a/.github/workflows/build-website.yml
+++ b/.github/workflows/build-website.yml
@@ -24,4 +24,4 @@ jobs:
       - name: Install dependencies
         run: yarn install --frozen-lockfile
       - name: Build website
-        run: yarn build
+        run: yarn build-oss
diff --git a/.github/workflows/deploy-website.yml b/.github/workflows/deploy-website.yml
index 679cd80c89..97d9454702 100644
--- a/.github/workflows/deploy-website.yml
+++ b/.github/workflows/deploy-website.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Install dependencies
         run: yarn install --frozen-lockfile
       - name: Build website
-        run: yarn build
+        run: yarn build-oss
 
       # Popular action to deploy to GitHub Pages:
       # Docs: https://github.com/peaceiris/actions-gh-pages#%EF%B8%8F-docusaurus
diff --git a/website/oss-stubs.sh b/website/oss-stubs.sh
new file mode 100755
index 0000000000..4f5faf57c9
--- /dev/null
+++ b/website/oss-stubs.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is dual-licensed under either the MIT license found in the
+# LICENSE-MIT file in the root directory of this source tree or the Apache
+# License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+# of this source tree. You may select, at your option, one of the
+# above-listed licenses.
+
+set -euo pipefail
+
+# Directory for stub files
+STUB_DIR="fb/components"
+
+# List of files to touch for OSS build
+FILES_TO_TOUCH=(
+    "_W0014.md"
+)
+
+# Function to display usage
+usage() {
+    echo "Usage: $0 {generate|cleanup}"
+    echo "  generate - Create stub files and run docusaurus build"
+    echo "  cleanup  - Remove stub files"
+    exit 1
+}
+
+# Function to generate stub files
+generate_stubs() {
+    echo "Generating OSS stub files..."
+    # Create stub directory if it doesn't exist
+    if [[ ! -d "$STUB_DIR" ]]; then
+        echo "Creating stub directory: $STUB_DIR"
+        mkdir -p "$STUB_DIR"
+    fi
+
+    for file in "${FILES_TO_TOUCH[@]}"; do
+        echo "Creating stub: $STUB_DIR/$file"
+        touch "$STUB_DIR/$file"
+    done
+}
+
+# Function to cleanup stub files
+cleanup_stubs() {
+    echo "Cleaning up stub files..."
+    for file in "${FILES_TO_TOUCH[@]}"; do
+        if [[ -f "$STUB_DIR/$file" ]]; then
+            echo "Removing stub: $STUB_DIR/$file"
+            rm -f "$STUB_DIR/$file"
+        fi
+    done
+
+    # Remove stub directory if it exists and is empty
+    if [[ -d "$STUB_DIR" ]]; then
+        if [[ -z "$(ls -A "$STUB_DIR" 2>/dev/null)" ]]; then
+            echo "Removing empty stub directory: $STUB_DIR"
+            rmdir "$STUB_DIR"
+        else
+            echo "Stub directory $STUB_DIR is not empty, leaving it in place"
+        fi
+    fi
+    echo "Cleanup complete!"
+}
+
+# Main logic
+case "${1:-}" in
+    generate)
+        generate_stubs
+        ;;
+    cleanup)
+        cleanup_stubs
+        ;;
+    *)
+        usage
+        ;;
+esac
diff --git a/website/package.json b/website/package.json
index 96873894ce..4053a7477f 100644
--- a/website/package.json
+++ b/website/package.json
@@ -6,6 +6,7 @@
     "docusaurus": "docusaurus",
     "start": "docusaurus start",
     "build": "docusaurus build",
+    "build-oss": "./oss-stubs.sh generate && docusaurus build && ./oss-stubs.sh cleanup",
     "swizzle": "docusaurus swizzle",
     "deploy": "docusaurus deploy",
     "clear": "docusaurus clear",

From 7bb16e4986423a665f45e9c4c092049d8b7d2312 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 29 Sep 2025 10:00:24 -0700
Subject: [PATCH 139/394] Fix flaky tests using buck cell info

Summary:
We now have buck2 cell information, which is cached in a mutex variable as it should not change for the life of a project.

But in tests we set it to fixed values, and check the result.  When tests are run in parallel, this can cause flakiness as values from one test are seen in another.

Add a global mutex around the test setup to prevent this.

Reviewed By: robertoaloi

Differential Revision: D83479480

fbshipit-source-id: efdeaf3c1f7f2c7b3cee6ec5f0ac0e4e90edcece
---
 crates/project_model/src/buck.rs | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 6e548aa4f1..8289482442 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -1135,9 +1135,22 @@ mod tests {
 
     use expect_test::Expect;
     use expect_test::expect;
+    use fxhash::FxHashMap;
+    use fxhash::FxHashSet;
+    use parking_lot::Mutex;
+    use parking_lot::MutexGuard;
+    use paths::AbsPath;
     use paths::Utf8Path;
 
-    use super::*;
+    use super::BUCK_CELL_INFO;
+    use super::BuckCellInfo;
+    use crate::buck::BuckConfig;
+    use crate::buck::BuckQueryError;
+    use crate::buck::BuckTarget;
+    use crate::buck::BuckTargetOrigin;
+    use crate::buck::buck_path_to_abs_path;
+    use crate::buck::find_app_root_bxl;
+    use crate::buck::get_prelude_cell;
     use crate::temp_dir::TempDir;
     use crate::test_fixture::FixtureWithProjectMeta;
     use crate::to_abs_path_buf;
@@ -1243,7 +1256,7 @@ mod tests {
         let dir = FixtureWithProjectMeta::gen_project(spec);
         let root = AbsPath::assert(Utf8Path::from_path(dir.path()).unwrap());
         let target_name = "cell//app_a:app_a".to_string();
-        set_test_cell_info(vec![(
+        let _guard = set_test_cell_info(vec![(
             "cell".to_string(),
             dir.path().to_string_lossy().into_owned(),
         )]);
@@ -1279,7 +1292,7 @@ mod tests {
         "#;
         let dir = FixtureWithProjectMeta::gen_project(spec);
         let root = AbsPath::assert(Utf8Path::from_path(dir.path()).unwrap());
-        set_test_cell_info(vec![(
+        let _guard = set_test_cell_info(vec![(
             "cell".to_string(),
             dir.path().to_string_lossy().into_owned(),
         )]);
@@ -1719,17 +1732,23 @@ mod tests {
         }
     }
 
-    fn set_test_cell_info(cells: Vec<(String, String)>) {
+    fn set_test_cell_info<'a>(cells: Vec<(String, String)>) -> MutexGuard<'a, ()> {
+        /// Lock to be taken in a test using the BUCK_CELL_INFO, so it
+        /// is not updated by a test running in parallel
+        static BUCK_CELL_INFO_TEST_ACTIVE: Mutex<()> = Mutex::new(());
+
+        let _guard = BUCK_CELL_INFO_TEST_ACTIVE.lock();
         let mut cell_info = BUCK_CELL_INFO.lock();
         let info = BuckCellInfo {
             cells: FxHashMap::from_iter(cells),
         };
-        *cell_info = Some((info, None))
+        *cell_info = Some((info, None));
+        _guard
     }
 
     #[test]
     fn test_buck_path_to_abs_path() {
-        set_test_cell_info(vec![
+        let _guard = set_test_cell_info(vec![
             ("".to_string(), "/blah".to_string()),
             ("cell".to_string(), "/blah".to_string()),
         ]);

From 06fa2d01eaa59fca5e1bff7dc4939d4824d6e1de Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 30 Sep 2025 03:31:18 -0700
Subject: [PATCH 140/394] Explicitly include rustfmt during setup

Summary: The ELP OSS CI started to fail on certain platform due to a missing `erlfmt` component. Unsure what changed, but explicitly setting the components during the setup process ensures the formatter can be run all problematic platforms.

Reviewed By: jcpetruzza

Differential Revision: D83474194

fbshipit-source-id: d205361d61f9219b584844b4722e417af7b204c8
---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8d9d952c4f..1418d016ed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -95,6 +95,7 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
         with:
           target: ${{ matrix.target }}
+          components: rustfmt
       - name: Set up cross-compiler
         if: matrix.platform-arch == 'ubuntu-22.04-arm'
         run: |

From dac0ab0eef9b2f58aa547e060eaf11b3589325b6 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 30 Sep 2025 04:24:23 -0700
Subject: [PATCH 141/394] Fix broken VSCodeErlangOpenDocs E2E test

Summary:
In D82544032 ELP was modified to only return doc links for functions containing an actual documentation.
While there may be other issues affecting the VSCodeErlangOpenDocs E2E test, this is a requirement for the test to pass.

Reviewed By: TheGeorge

Differential Revision: D83559010

fbshipit-source-id: 2cda6051d38a486ef9854a992877e7113bbe6370
---
 test_projects/end_to_end/docs/src/docs.erl | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test_projects/end_to_end/docs/src/docs.erl b/test_projects/end_to_end/docs/src/docs.erl
index 7c39e3b238..91e6aa612f 100644
--- a/test_projects/end_to_end/docs/src/docs.erl
+++ b/test_projects/end_to_end/docs/src/docs.erl
@@ -2,6 +2,9 @@
 -compile(nowarn_missing_spec).
 -export([my_function/0, my_other_function/0]).
 
+-doc """
+This is the doc for my_function
+""".
 my_function() -> ok.
 
 my_other_function() -> my_function().

From 57f67880221e579c990f1ac8d2dbd6e0fe330a29 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 30 Sep 2025 07:31:36 -0700
Subject: [PATCH 142/394] Pin 2022 version for Windows

Summary:
Starting in September 2025, GitHub moved the `latest` Windows label from 2022 to 2025. See the [announcement](https://github.com/actions/runner-images/issues/12677). This is the most likely cause behind the error:

```
Error: Tried to map a target OS from env. variable 'ImageOS' (got win25), but failed. If you're using a self-hosted runner, you should set 'env': 'ImageOS': ... to one of the following: ['ubuntu22', 'ubuntu24', 'win19', 'win22', 'macos13', 'macos14', 'macos15']
```

While this could be, in turn, caused by an issue with the `erlef/setup-beam` action, for the time being pin the version to 2022.

Reviewed By: jcpetruzza

Differential Revision: D83565904

fbshipit-source-id: 3bf7b8d6839c320fd017faa1f4597525009d747e
---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1418d016ed..56b6434474 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform-arch: [ubuntu-22.04-x64, ubuntu-22.04-arm, macos-13-x64, macos-latest-arm, windows-latest-x64]
+        platform-arch: [ubuntu-22.04-x64, ubuntu-22.04-arm, macos-13-x64, macos-latest-arm, windows-2022-x64]
         otp-version: [26.2, 27.3, 28.0]
         include:
           - otp-version: 26.2
@@ -65,8 +65,8 @@ jobs:
             os: macos
             target: aarch64-apple-darwin
             vscode-target: darwin-arm64
-          - platform-arch: windows-latest-x64
-            platform: windows-latest
+          - platform-arch: windows-2022-x64
+            platform: windows-2022
             os: windows
             target: x86_64-pc-windows-msvc
             vscode-target: win32-x64

From 1eb41cc29269b889cd2847c72cfab7d40f5ce842 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 2 Oct 2025 06:03:07 -0700
Subject: [PATCH 143/394] Add support for docPath

Reviewed By: alanz

Differential Revision: D82713207

fbshipit-source-id: 25373ae95968db30f1797d3e5aa96b7cb29e49d9
---
 crates/elp/src/arc_types.rs                   |  5 ++
 crates/elp/src/bin/reporting.rs               |  2 +
 crates/elp/src/convert.rs                     |  3 +
 .../parse_all_diagnostics_json.stdout         | 12 ++--
 .../parse_elp_lint_fix_json.stdout            |  2 +-
 .../linter/parse_elp_lint_json_output.stdout  |  6 +-
 .../parse_elp_lint_json_output_prefix.stdout  |  6 +-
 ...e_elp_no_lint_specified_json_output.stdout | 56 +++++++--------
 .../standard/eqwalize_all_diagnostics.jsonl   | 40 +++++------
 .../eqwalize_all_diagnostics_gen.jsonl        | 40 +++++------
 .../test/standard/eqwalize_app_a.jsonl        | 14 ++--
 crates/ide_db/src/diagnostic_code.rs          | 68 +++++++++++++++++++
 website/docs/erlang-error-index/w/W0018.md    | 48 +++++++++++++
 website/docs/erlang-error-index/w/W0019.md    | 47 +++++++++++++
 14 files changed, 261 insertions(+), 88 deletions(-)
 create mode 100644 website/docs/erlang-error-index/w/W0018.md
 create mode 100644 website/docs/erlang-error-index/w/W0019.md

diff --git a/crates/elp/src/arc_types.rs b/crates/elp/src/arc_types.rs
index a1b40a5b25..f170f9fc75 100644
--- a/crates/elp/src/arc_types.rs
+++ b/crates/elp/src/arc_types.rs
@@ -15,6 +15,7 @@ use std::path::Path;
 use serde::Serialize;
 
 #[derive(Debug, Serialize, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
 pub struct Diagnostic {
     // Filepath
     path: String,
@@ -29,6 +30,7 @@ pub struct Diagnostic {
     original: Option<String>,
     replacement: Option<String>,
     description: Option<String>,
+    doc_path: Option<String>,
 }
 
 #[derive(Debug, Serialize, PartialEq, Eq)]
@@ -42,6 +44,7 @@ pub enum Severity {
 }
 
 impl Diagnostic {
+    #[allow(clippy::too_many_arguments)]
     pub fn new(
         path: &Path,
         line: u32,
@@ -50,6 +53,7 @@ impl Diagnostic {
         name: String,
         description: String,
         original: Option<String>,
+        doc_path: Option<String>,
     ) -> Self {
         Diagnostic {
             path: path.display().to_string(), // lossy on Windows for unicode paths
@@ -61,6 +65,7 @@ impl Diagnostic {
             original,
             replacement: None,
             description: Some(description),
+            doc_path,
         }
     }
 }
diff --git a/crates/elp/src/bin/reporting.rs b/crates/elp/src/bin/reporting.rs
index 64fe8168c2..3eba62c23e 100644
--- a/crates/elp/src/bin/reporting.rs
+++ b/crates/elp/src/bin/reporting.rs
@@ -258,6 +258,7 @@ impl Reporter for JsonReporter<'_> {
                 "ELP".to_string(),
                 diagnostic.msg.clone(),
                 None,
+                None,
             );
             let diagnostic = serde_json::to_string(&diagnostic)?;
             writeln!(self.cli, "{diagnostic}")?;
@@ -281,6 +282,7 @@ impl Reporter for JsonReporter<'_> {
             "ELP".to_string(),
             description,
             None,
+            None,
         );
         let diagnostic = serde_json::to_string(&diagnostic)?;
         writeln!(self.cli, "{diagnostic}")?;
diff --git a/crates/elp/src/convert.rs b/crates/elp/src/convert.rs
index 4c8d316509..0c439c73f9 100644
--- a/crates/elp/src/convert.rs
+++ b/crates/elp/src/convert.rs
@@ -162,6 +162,7 @@ pub fn eqwalizer_to_arc_diagnostic(
         name,
         message,
         d.expression.clone(),
+        None,
     )
 }
 
@@ -250,6 +251,7 @@ pub fn ide_to_arc_diagnostic(
         None => message,
     };
     let severity = diagnostic.severity(use_cli_severity);
+    let doc_path = diagnostic.code.as_doc_path();
     arc_types::Diagnostic::new(
         path,
         line_num,
@@ -258,5 +260,6 @@ pub fn ide_to_arc_diagnostic(
         diagnostic.code.as_labeled_code(),
         description,
         None,
+        doc_path,
     )
 }
diff --git a/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics_json.stdout b/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics_json.stdout
index 4d63c01a6e..0c3e5ae9a3 100644
--- a/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics_json.stdout
+++ b/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics_json.stdout
@@ -1,6 +1,6 @@
-{"path":"app_a/src/diagnostics.erl","line":3,"char":10,"code":"ELP","severity":"disabled","name":"W0037 (unspecific_include)","original":null,"replacement":null,"description":"Unspecific include.\n\nFor more information see: /erlang-error-index/w/W0037"}
-{"path":"app_a/src/diagnostics.erl","line":4,"char":1,"code":"ELP","severity":"error","name":"L0000 (L0000)","original":null,"replacement":null,"description":"Issue in included file\n\nFor more information see: /erlang-error-index/l/L0000"}
-{"path":"app_a/src/diagnostics.erl","line":4,"char":10,"code":"ELP","severity":"disabled","name":"W0037 (unspecific_include)","original":null,"replacement":null,"description":"Unspecific include.\n\nFor more information see: /erlang-error-index/w/W0037"}
-{"path":"app_a/src/diagnostics.erl","line":6,"char":31,"code":"ELP","severity":"error","name":"L1295 (L1295)","original":null,"replacement":null,"description":"type undefined_type/0 undefined\n\nFor more information see: /erlang-error-index/l/L1295"}
-{"path":"app_a/src/diagnostics.erl","line":7,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function main/1 is unused\n\nFor more information see: /erlang-error-index/l/L1230"}
-{"path":"app_a/src/diagnostics.erl","line":10,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function foo/0 is unused\n\nFor more information see: /erlang-error-index/l/L1230"}
+{"path":"app_a/src/diagnostics.erl","line":3,"char":10,"code":"ELP","severity":"disabled","name":"W0037 (unspecific_include)","original":null,"replacement":null,"description":"Unspecific include.\n\nFor more information see: /erlang-error-index/w/W0037","docPath":"website/docs/erlang-error-index/w/W0037.md"}
+{"path":"app_a/src/diagnostics.erl","line":4,"char":1,"code":"ELP","severity":"error","name":"L0000 (L0000)","original":null,"replacement":null,"description":"Issue in included file\n\nFor more information see: /erlang-error-index/l/L0000","docPath":null}
+{"path":"app_a/src/diagnostics.erl","line":4,"char":10,"code":"ELP","severity":"disabled","name":"W0037 (unspecific_include)","original":null,"replacement":null,"description":"Unspecific include.\n\nFor more information see: /erlang-error-index/w/W0037","docPath":"website/docs/erlang-error-index/w/W0037.md"}
+{"path":"app_a/src/diagnostics.erl","line":6,"char":31,"code":"ELP","severity":"error","name":"L1295 (L1295)","original":null,"replacement":null,"description":"type undefined_type/0 undefined\n\nFor more information see: /erlang-error-index/l/L1295","docPath":null}
+{"path":"app_a/src/diagnostics.erl","line":7,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function main/1 is unused\n\nFor more information see: /erlang-error-index/l/L1230","docPath":null}
+{"path":"app_a/src/diagnostics.erl","line":10,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function foo/0 is unused\n\nFor more information see: /erlang-error-index/l/L1230","docPath":null}
diff --git a/crates/elp/src/resources/test/diagnostics/parse_elp_lint_fix_json.stdout b/crates/elp/src/resources/test/diagnostics/parse_elp_lint_fix_json.stdout
index c11fe19289..3cbee90658 100644
--- a/crates/elp/src/resources/test/diagnostics/parse_elp_lint_fix_json.stdout
+++ b/crates/elp/src/resources/test/diagnostics/parse_elp_lint_fix_json.stdout
@@ -1 +1 @@
-{"path":"app_a/src/lints.erl","line":5,"char":1,"code":"ELP","severity":"error","name":"P1700 (head_mismatch)","original":null,"replacement":null,"description":"head mismatch 'head_mismatcX' vs 'head_mismatch'\n\nFor more information see: /erlang-error-index/p/P1700"}
+{"path":"app_a/src/lints.erl","line":5,"char":1,"code":"ELP","severity":"error","name":"P1700 (head_mismatch)","original":null,"replacement":null,"description":"head mismatch 'head_mismatcX' vs 'head_mismatch'\n\nFor more information see: /erlang-error-index/p/P1700","docPath":null}
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_json_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_json_output.stdout
index 55d23afde0..4fb3478926 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_json_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_json_output.stdout
@@ -1,3 +1,3 @@
-{"path":"app_a/src/app_a.erl","line":9,"char":6,"code":"ELP","severity":"warning","name":"W0010 (unused_function_arg)","original":null,"replacement":null,"description":"this variable is unused\n\nFor more information see: /erlang-error-index/w/W0010"}
-{"path":"app_a/src/app_a_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0010 (unused_function_arg)","original":null,"replacement":null,"description":"this variable is unused\n\nFor more information see: /erlang-error-index/w/W0010"}
-{"path":"app_b/src/app_b_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0010 (unused_function_arg)","original":null,"replacement":null,"description":"this variable is unused\n\nFor more information see: /erlang-error-index/w/W0010"}
+{"path":"app_a/src/app_a.erl","line":9,"char":6,"code":"ELP","severity":"warning","name":"W0010 (unused_function_arg)","original":null,"replacement":null,"description":"this variable is unused\n\nFor more information see: /erlang-error-index/w/W0010","docPath":"website/docs/erlang-error-index/w/W0010.md"}
+{"path":"app_a/src/app_a_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0010 (unused_function_arg)","original":null,"replacement":null,"description":"this variable is unused\n\nFor more information see: /erlang-error-index/w/W0010","docPath":"website/docs/erlang-error-index/w/W0010.md"}
+{"path":"app_b/src/app_b_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0010 (unused_function_arg)","original":null,"replacement":null,"description":"this variable is unused\n\nFor more information see: /erlang-error-index/w/W0010","docPath":"website/docs/erlang-error-index/w/W0010.md"}
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_json_output_prefix.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_json_output_prefix.stdout
index e3ddc45bef..7389cc926a 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_json_output_prefix.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_json_output_prefix.stdout
@@ -1,3 +1,3 @@
-{"path":"my/prefix/app_a/src/app_a.erl","line":9,"char":6,"code":"ELP","severity":"warning","name":"W0010 (unused_function_arg)","original":null,"replacement":null,"description":"this variable is unused\n\nFor more information see: /erlang-error-index/w/W0010"}
-{"path":"my/prefix/app_a/src/app_a_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0010 (unused_function_arg)","original":null,"replacement":null,"description":"this variable is unused\n\nFor more information see: /erlang-error-index/w/W0010"}
-{"path":"my/prefix/app_b/src/app_b_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0010 (unused_function_arg)","original":null,"replacement":null,"description":"this variable is unused\n\nFor more information see: /erlang-error-index/w/W0010"}
+{"path":"my/prefix/app_a/src/app_a.erl","line":9,"char":6,"code":"ELP","severity":"warning","name":"W0010 (unused_function_arg)","original":null,"replacement":null,"description":"this variable is unused\n\nFor more information see: /erlang-error-index/w/W0010","docPath":"website/docs/erlang-error-index/w/W0010.md"}
+{"path":"my/prefix/app_a/src/app_a_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0010 (unused_function_arg)","original":null,"replacement":null,"description":"this variable is unused\n\nFor more information see: /erlang-error-index/w/W0010","docPath":"website/docs/erlang-error-index/w/W0010.md"}
+{"path":"my/prefix/app_b/src/app_b_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0010 (unused_function_arg)","original":null,"replacement":null,"description":"this variable is unused\n\nFor more information see: /erlang-error-index/w/W0010","docPath":"website/docs/erlang-error-index/w/W0010.md"}
diff --git a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
index c1475aa449..008b2b5469 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
@@ -1,28 +1,28 @@
-{"path":"app_a/src/app_a.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0011 (application_get_env)","original":null,"replacement":null,"description":"module `app_a` belongs to app `app_a`, but reads env for `misc`\n\nFor more information see: /erlang-error-index/w/W0011"}
-{"path":"app_a/src/app_a.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012"}
-{"path":"app_a/src/app_a.erl","line":9,"char":1,"code":"ELP","severity":"error","name":"P1700 (head_mismatch)","original":null,"replacement":null,"description":"head mismatch 'fooX' vs 'food'\n\nFor more information see: /erlang-error-index/p/P1700"}
-{"path":"app_a/src/app_a.erl","line":8,"char":7,"code":"ELP","severity":"warning","name":"W0018 (unexpected_semi_or_dot)","original":null,"replacement":null,"description":"Unexpected ';'\n\nFor more information see: /erlang-error-index/w/W0018"}
-{"path":"app_a/src/app_a.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046"}
-{"path":"app_a/src/app_a.erl","line":13,"char":5,"code":"ELP","severity":"warning","name":"W0026 (unexported_function)","original":null,"replacement":null,"description":"Function 'app_a:baz/2' is not exported.\n\nFor more information see: /erlang-error-index/w/W0026"}
-{"path":"app_a/src/app_a.erl","line":12,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function bar/0 is unused\n\nFor more information see: /erlang-error-index/l/L1230"}
-{"path":"app_a/src/app_a.erl","line":16,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function baz/2 is unused\n\nFor more information see: /erlang-error-index/l/L1230"}
-{"path":"app_a/src/app_a_edoc.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012"}
-{"path":"app_a/src/app_a_edoc.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046"}
-{"path":"app_a/src/app_a_unused_param.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012"}
-{"path":"app_a/src/app_a_unused_param.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046"}
-{"path":"app_a/src/app_a_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"L1268 (L1268)","original":null,"replacement":null,"description":"variable 'X' is unused\n\nFor more information see: /erlang-error-index/l/L1268"}
-{"path":"app_b/src/app_b.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0011 (application_get_env)","original":null,"replacement":null,"description":"module `app_b` belongs to app `app_b`, but reads env for `misc`\n\nFor more information see: /erlang-error-index/w/W0011"}
-{"path":"app_b/src/app_b.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012"}
-{"path":"app_b/src/app_b.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046"}
-{"path":"app_b/src/app_b_unused_param.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012"}
-{"path":"app_b/src/app_b_unused_param.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046"}
-{"path":"app_b/src/app_b_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"L1268 (L1268)","original":null,"replacement":null,"description":"variable 'X' is unused\n\nFor more information see: /erlang-error-index/l/L1268"}
-{"path":"app_a/src/custom_function_matches.erl","line":13,"char":5,"code":"ELP","severity":"warning","name":"W0017 (undefined_function)","original":null,"replacement":null,"description":"Function 'excluded:function/0' is undefined.\n\nFor more information see: /erlang-error-index/w/W0017"}
-{"path":"app_a/src/custom_function_matches.erl","line":14,"char":5,"code":"ELP","severity":"warning","name":"W0017 (undefined_function)","original":null,"replacement":null,"description":"Function 'not_excluded:function/0' is undefined.\n\nFor more information see: /erlang-error-index/w/W0017"}
-{"path":"app_a/src/custom_function_matches.erl","line":15,"char":5,"code":"ELP","severity":"warning","name":"W0017 (undefined_function)","original":null,"replacement":null,"description":"Function 'cross:call/0' is undefined.\n\nFor more information see: /erlang-error-index/w/W0017"}
-{"path":"app_a/src/expression_updates_literal.erl","line":2,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046"}
-{"path":"app_a/src/expression_updates_literal.erl","line":7,"char":1,"code":"ELP","severity":"warning","name":"L1309 (L1309)","original":null,"replacement":null,"description":"missing specification for function a_fun/0\n\nFor more information see: /erlang-error-index/l/L1309"}
-{"path":"app_a/src/expression_updates_literal.erl","line":8,"char":7,"code":"ELP","severity":"warning","name":"L1318 (L1318)","original":null,"replacement":null,"description":"expression updates a literal\n\nFor more information see: /erlang-error-index/l/L1318"}
-{"path":"app_a/src/spelling.erl","line":2,"char":2,"code":"ELP","severity":"error","name":"W0013 (misspelled_attribute)","original":null,"replacement":null,"description":"misspelled attribute, saw 'dyalizer' but expected 'dialyzer'\n\nFor more information see: /erlang-error-index/w/W0013"}
-{"path":"app_a/src/spelling.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012"}
-{"path":"app_a/src/spelling.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046"}
+{"path":"app_a/src/app_a.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0011 (application_get_env)","original":null,"replacement":null,"description":"module `app_a` belongs to app `app_a`, but reads env for `misc`\n\nFor more information see: /erlang-error-index/w/W0011","docPath":"website/docs/erlang-error-index/w/W0011.md"}
+{"path":"app_a/src/app_a.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012","docPath":"website/docs/erlang-error-index/w/W0012.md"}
+{"path":"app_a/src/app_a.erl","line":9,"char":1,"code":"ELP","severity":"error","name":"P1700 (head_mismatch)","original":null,"replacement":null,"description":"head mismatch 'fooX' vs 'food'\n\nFor more information see: /erlang-error-index/p/P1700","docPath":null}
+{"path":"app_a/src/app_a.erl","line":8,"char":7,"code":"ELP","severity":"warning","name":"W0018 (unexpected_semi_or_dot)","original":null,"replacement":null,"description":"Unexpected ';'\n\nFor more information see: /erlang-error-index/w/W0018","docPath":"website/docs/erlang-error-index/w/W0018.md"}
+{"path":"app_a/src/app_a.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
+{"path":"app_a/src/app_a.erl","line":13,"char":5,"code":"ELP","severity":"warning","name":"W0026 (unexported_function)","original":null,"replacement":null,"description":"Function 'app_a:baz/2' is not exported.\n\nFor more information see: /erlang-error-index/w/W0026","docPath":"website/docs/erlang-error-index/w/W0026.md"}
+{"path":"app_a/src/app_a.erl","line":12,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function bar/0 is unused\n\nFor more information see: /erlang-error-index/l/L1230","docPath":null}
+{"path":"app_a/src/app_a.erl","line":16,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function baz/2 is unused\n\nFor more information see: /erlang-error-index/l/L1230","docPath":null}
+{"path":"app_a/src/app_a_edoc.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012","docPath":"website/docs/erlang-error-index/w/W0012.md"}
+{"path":"app_a/src/app_a_edoc.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
+{"path":"app_a/src/app_a_unused_param.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012","docPath":"website/docs/erlang-error-index/w/W0012.md"}
+{"path":"app_a/src/app_a_unused_param.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
+{"path":"app_a/src/app_a_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"L1268 (L1268)","original":null,"replacement":null,"description":"variable 'X' is unused\n\nFor more information see: /erlang-error-index/l/L1268","docPath":null}
+{"path":"app_b/src/app_b.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0011 (application_get_env)","original":null,"replacement":null,"description":"module `app_b` belongs to app `app_b`, but reads env for `misc`\n\nFor more information see: /erlang-error-index/w/W0011","docPath":"website/docs/erlang-error-index/w/W0011.md"}
+{"path":"app_b/src/app_b.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012","docPath":"website/docs/erlang-error-index/w/W0012.md"}
+{"path":"app_b/src/app_b.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
+{"path":"app_b/src/app_b_unused_param.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012","docPath":"website/docs/erlang-error-index/w/W0012.md"}
+{"path":"app_b/src/app_b_unused_param.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
+{"path":"app_b/src/app_b_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"L1268 (L1268)","original":null,"replacement":null,"description":"variable 'X' is unused\n\nFor more information see: /erlang-error-index/l/L1268","docPath":null}
+{"path":"app_a/src/custom_function_matches.erl","line":13,"char":5,"code":"ELP","severity":"warning","name":"W0017 (undefined_function)","original":null,"replacement":null,"description":"Function 'excluded:function/0' is undefined.\n\nFor more information see: /erlang-error-index/w/W0017","docPath":"website/docs/erlang-error-index/w/W0017.md"}
+{"path":"app_a/src/custom_function_matches.erl","line":14,"char":5,"code":"ELP","severity":"warning","name":"W0017 (undefined_function)","original":null,"replacement":null,"description":"Function 'not_excluded:function/0' is undefined.\n\nFor more information see: /erlang-error-index/w/W0017","docPath":"website/docs/erlang-error-index/w/W0017.md"}
+{"path":"app_a/src/custom_function_matches.erl","line":15,"char":5,"code":"ELP","severity":"warning","name":"W0017 (undefined_function)","original":null,"replacement":null,"description":"Function 'cross:call/0' is undefined.\n\nFor more information see: /erlang-error-index/w/W0017","docPath":"website/docs/erlang-error-index/w/W0017.md"}
+{"path":"app_a/src/expression_updates_literal.erl","line":2,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
+{"path":"app_a/src/expression_updates_literal.erl","line":7,"char":1,"code":"ELP","severity":"warning","name":"L1309 (L1309)","original":null,"replacement":null,"description":"missing specification for function a_fun/0\n\nFor more information see: /erlang-error-index/l/L1309","docPath":null}
+{"path":"app_a/src/expression_updates_literal.erl","line":8,"char":7,"code":"ELP","severity":"warning","name":"L1318 (L1318)","original":null,"replacement":null,"description":"expression updates a literal\n\nFor more information see: /erlang-error-index/l/L1318","docPath":null}
+{"path":"app_a/src/spelling.erl","line":2,"char":2,"code":"ELP","severity":"error","name":"W0013 (misspelled_attribute)","original":null,"replacement":null,"description":"misspelled attribute, saw 'dyalizer' but expected 'dialyzer'\n\nFor more information see: /erlang-error-index/w/W0013","docPath":"website/docs/erlang-error-index/w/W0013.md"}
+{"path":"app_a/src/spelling.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012","docPath":"website/docs/erlang-error-index/w/W0012.md"}
+{"path":"app_a/src/spelling.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
diff --git a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.jsonl b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.jsonl
index 242981cf70..89db77919f 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.jsonl
+++ b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.jsonl
@@ -1,20 +1,20 @@
-{"path":"app_a/src/app_a.erl","line":10,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":14,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":18,"char":13,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":56,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: redundant_fixme","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nredundant fixme\n```\n\n> [docs on `redundant_fixme`](https://fb.me/eqwalizer_errors#redundant_fixme)"}
-{"path":"app_a/src/app_a.erl","line":78,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}\nContext expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}\n```\n```\nBecause in the expression's type:\n  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}\n  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}\n  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.\n\n------------------------------ Detailed message ------------------------------\n\nkeys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":102,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d => atom()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      Here the type is:     #{d => ..., ...}\n      Context expects type: #{d := ..., e := ..., ...}\n      The type of the expression is missing the following required keys: d, e.\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":125,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      #{ d =>\n        Here the type is:     pid()\n        Context expects type: atom()\n      , ... }\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/test/app_a_SUITE.erl","line":18,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"app_a_test_helpers:fail()","replacement":null,"description":"```lang=error,counterexample\n`app_a_test_helpers:fail()`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a_errors_generated.erl","line":8,"char":10,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'wrong_ret'","replacement":null,"description":"```lang=error,counterexample\n`'wrong_ret'`.\n\nExpression has type:   'wrong_ret'\nContext expected type: 'foo'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a_lists.erl","line":576,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"flatmap(thing_to_list/1, List)","replacement":null,"description":"```lang=error,counterexample\n`flatmap(thing_to_list/1, List)`.\n\nExpression has type:   [term()]\nContext expected type: string()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a_lists.erl","line":588,"char":29,"code":"ELP","severity":"error","name":"eqWAlizer: recursive_constraint","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nRecursive constraint: DeepList\n```\n\n> [docs on `recursive_constraint`](https://fb.me/eqwalizer_errors#recursive_constraint)"}
-{"path":"app_a/src/app_a_lists.erl","line":595,"char":29,"code":"ELP","severity":"error","name":"eqWAlizer: recursive_constraint","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nRecursive constraint: DeepList\n```\n\n> [docs on `recursive_constraint`](https://fb.me/eqwalizer_errors#recursive_constraint)"}
-{"path":"app_a/src/app_a_lists.erl","line":613,"char":29,"code":"ELP","severity":"error","name":"eqWAlizer: recursive_constraint","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nRecursive constraint: DeepList\n```\n\n> [docs on `recursive_constraint`](https://fb.me/eqwalizer_errors#recursive_constraint)"}
-{"path":"app_a/src/app_a_lists.erl","line":1114,"char":36,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"H3","replacement":null,"description":"```lang=error,counterexample\n`H3`.\n\nExpression has type:   term()\nContext expected type: [term()]\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a_lists.erl","line":1305,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"filtermap(F, L)","replacement":null,"description":"```lang=error,counterexample\n`filtermap(F, L)`.\n\nExpression has type:   [term()]\nContext expected type: [T | X]\n```\n```\nBecause in the expression's type:\n  [\n    Here the type is:     term()\n    Context expects type: T | X\n    No candidate matches in the expected union.\n  ]\n\n------------------------------ Detailed message ------------------------------\n\n  [term()] is not compatible with [T | X]\n  because\n  term() is not compatible with T | X\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a_lists.erl","line":1305,"char":15,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"F","replacement":null,"description":"```lang=error,counterexample\n`F`.\n\nExpression has type:   fun((T) -> boolean() | {'true', X})\nContext expected type: fun((term()) -> boolean() | {'true', term()})\n```\n```\nBecause in the expression's type:\n  fun((\n    Here the type is:     term()\n    Context expects type: T\n  ) -> boolean() | {'true', X})\n\n------------------------------ Detailed message ------------------------------\n\n  fun((T) -> boolean() | {'true', X}) is not compatible with fun((term()) -> boolean() | {'true', term()})\n  because\n  term() is not compatible with T\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a_mod2.erl","line":22,"char":1,"code":"ELP","severity":"error","name":"eqWAlizer: type_alias_is_non_productive","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nrecursive type invalid/0 is not productive\n```\n\n> [docs on `type_alias_is_non_productive`](https://fb.me/eqwalizer_errors#type_alias_is_non_productive)"}
-{"path":"app_a/src/app_a_mod2.erl","line":31,"char":9,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/test/app_a_test_helpers.erl","line":6,"char":11,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'wrong_ret'","replacement":null,"description":"```lang=error,counterexample\n`'wrong_ret'`.\n\nExpression has type:   'wrong_ret'\nContext expected type: 'error'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_b/src/app_b.erl","line":16,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"L","replacement":null,"description":"```lang=error,counterexample\n`L`.\n\nExpression has type:   [T]\nContext expected type: T\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
+{"path":"app_a/src/app_a.erl","line":10,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":14,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":18,"char":13,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":56,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: redundant_fixme","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nredundant fixme\n```\n\n> [docs on `redundant_fixme`](https://fb.me/eqwalizer_errors#redundant_fixme)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":78,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}\nContext expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}\n```\n```\nBecause in the expression's type:\n  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}\n  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}\n  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.\n\n------------------------------ Detailed message ------------------------------\n\nkeys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":102,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d => atom()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      Here the type is:     #{d => ..., ...}\n      Context expects type: #{d := ..., e := ..., ...}\n      The type of the expression is missing the following required keys: d, e.\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":125,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      #{ d =>\n        Here the type is:     pid()\n        Context expects type: atom()\n      , ... }\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/test/app_a_SUITE.erl","line":18,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"app_a_test_helpers:fail()","replacement":null,"description":"```lang=error,counterexample\n`app_a_test_helpers:fail()`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a_errors_generated.erl","line":8,"char":10,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'wrong_ret'","replacement":null,"description":"```lang=error,counterexample\n`'wrong_ret'`.\n\nExpression has type:   'wrong_ret'\nContext expected type: 'foo'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a_lists.erl","line":576,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"flatmap(thing_to_list/1, List)","replacement":null,"description":"```lang=error,counterexample\n`flatmap(thing_to_list/1, List)`.\n\nExpression has type:   [term()]\nContext expected type: string()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a_lists.erl","line":588,"char":29,"code":"ELP","severity":"error","name":"eqWAlizer: recursive_constraint","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nRecursive constraint: DeepList\n```\n\n> [docs on `recursive_constraint`](https://fb.me/eqwalizer_errors#recursive_constraint)","docPath":null}
+{"path":"app_a/src/app_a_lists.erl","line":595,"char":29,"code":"ELP","severity":"error","name":"eqWAlizer: recursive_constraint","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nRecursive constraint: DeepList\n```\n\n> [docs on `recursive_constraint`](https://fb.me/eqwalizer_errors#recursive_constraint)","docPath":null}
+{"path":"app_a/src/app_a_lists.erl","line":613,"char":29,"code":"ELP","severity":"error","name":"eqWAlizer: recursive_constraint","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nRecursive constraint: DeepList\n```\n\n> [docs on `recursive_constraint`](https://fb.me/eqwalizer_errors#recursive_constraint)","docPath":null}
+{"path":"app_a/src/app_a_lists.erl","line":1114,"char":36,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"H3","replacement":null,"description":"```lang=error,counterexample\n`H3`.\n\nExpression has type:   term()\nContext expected type: [term()]\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a_lists.erl","line":1305,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"filtermap(F, L)","replacement":null,"description":"```lang=error,counterexample\n`filtermap(F, L)`.\n\nExpression has type:   [term()]\nContext expected type: [T | X]\n```\n```\nBecause in the expression's type:\n  [\n    Here the type is:     term()\n    Context expects type: T | X\n    No candidate matches in the expected union.\n  ]\n\n------------------------------ Detailed message ------------------------------\n\n  [term()] is not compatible with [T | X]\n  because\n  term() is not compatible with T | X\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a_lists.erl","line":1305,"char":15,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"F","replacement":null,"description":"```lang=error,counterexample\n`F`.\n\nExpression has type:   fun((T) -> boolean() | {'true', X})\nContext expected type: fun((term()) -> boolean() | {'true', term()})\n```\n```\nBecause in the expression's type:\n  fun((\n    Here the type is:     term()\n    Context expects type: T\n  ) -> boolean() | {'true', X})\n\n------------------------------ Detailed message ------------------------------\n\n  fun((T) -> boolean() | {'true', X}) is not compatible with fun((term()) -> boolean() | {'true', term()})\n  because\n  term() is not compatible with T\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a_mod2.erl","line":22,"char":1,"code":"ELP","severity":"error","name":"eqWAlizer: type_alias_is_non_productive","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nrecursive type invalid/0 is not productive\n```\n\n> [docs on `type_alias_is_non_productive`](https://fb.me/eqwalizer_errors#type_alias_is_non_productive)","docPath":null}
+{"path":"app_a/src/app_a_mod2.erl","line":31,"char":9,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/test/app_a_test_helpers.erl","line":6,"char":11,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'wrong_ret'","replacement":null,"description":"```lang=error,counterexample\n`'wrong_ret'`.\n\nExpression has type:   'wrong_ret'\nContext expected type: 'error'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_b/src/app_b.erl","line":16,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"L","replacement":null,"description":"```lang=error,counterexample\n`L`.\n\nExpression has type:   [T]\nContext expected type: T\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
diff --git a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics_gen.jsonl b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics_gen.jsonl
index 242981cf70..89db77919f 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics_gen.jsonl
+++ b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics_gen.jsonl
@@ -1,20 +1,20 @@
-{"path":"app_a/src/app_a.erl","line":10,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":14,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":18,"char":13,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":56,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: redundant_fixme","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nredundant fixme\n```\n\n> [docs on `redundant_fixme`](https://fb.me/eqwalizer_errors#redundant_fixme)"}
-{"path":"app_a/src/app_a.erl","line":78,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}\nContext expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}\n```\n```\nBecause in the expression's type:\n  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}\n  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}\n  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.\n\n------------------------------ Detailed message ------------------------------\n\nkeys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":102,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d => atom()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      Here the type is:     #{d => ..., ...}\n      Context expects type: #{d := ..., e := ..., ...}\n      The type of the expression is missing the following required keys: d, e.\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":125,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      #{ d =>\n        Here the type is:     pid()\n        Context expects type: atom()\n      , ... }\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/test/app_a_SUITE.erl","line":18,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"app_a_test_helpers:fail()","replacement":null,"description":"```lang=error,counterexample\n`app_a_test_helpers:fail()`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a_errors_generated.erl","line":8,"char":10,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'wrong_ret'","replacement":null,"description":"```lang=error,counterexample\n`'wrong_ret'`.\n\nExpression has type:   'wrong_ret'\nContext expected type: 'foo'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a_lists.erl","line":576,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"flatmap(thing_to_list/1, List)","replacement":null,"description":"```lang=error,counterexample\n`flatmap(thing_to_list/1, List)`.\n\nExpression has type:   [term()]\nContext expected type: string()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a_lists.erl","line":588,"char":29,"code":"ELP","severity":"error","name":"eqWAlizer: recursive_constraint","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nRecursive constraint: DeepList\n```\n\n> [docs on `recursive_constraint`](https://fb.me/eqwalizer_errors#recursive_constraint)"}
-{"path":"app_a/src/app_a_lists.erl","line":595,"char":29,"code":"ELP","severity":"error","name":"eqWAlizer: recursive_constraint","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nRecursive constraint: DeepList\n```\n\n> [docs on `recursive_constraint`](https://fb.me/eqwalizer_errors#recursive_constraint)"}
-{"path":"app_a/src/app_a_lists.erl","line":613,"char":29,"code":"ELP","severity":"error","name":"eqWAlizer: recursive_constraint","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nRecursive constraint: DeepList\n```\n\n> [docs on `recursive_constraint`](https://fb.me/eqwalizer_errors#recursive_constraint)"}
-{"path":"app_a/src/app_a_lists.erl","line":1114,"char":36,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"H3","replacement":null,"description":"```lang=error,counterexample\n`H3`.\n\nExpression has type:   term()\nContext expected type: [term()]\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a_lists.erl","line":1305,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"filtermap(F, L)","replacement":null,"description":"```lang=error,counterexample\n`filtermap(F, L)`.\n\nExpression has type:   [term()]\nContext expected type: [T | X]\n```\n```\nBecause in the expression's type:\n  [\n    Here the type is:     term()\n    Context expects type: T | X\n    No candidate matches in the expected union.\n  ]\n\n------------------------------ Detailed message ------------------------------\n\n  [term()] is not compatible with [T | X]\n  because\n  term() is not compatible with T | X\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a_lists.erl","line":1305,"char":15,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"F","replacement":null,"description":"```lang=error,counterexample\n`F`.\n\nExpression has type:   fun((T) -> boolean() | {'true', X})\nContext expected type: fun((term()) -> boolean() | {'true', term()})\n```\n```\nBecause in the expression's type:\n  fun((\n    Here the type is:     term()\n    Context expects type: T\n  ) -> boolean() | {'true', X})\n\n------------------------------ Detailed message ------------------------------\n\n  fun((T) -> boolean() | {'true', X}) is not compatible with fun((term()) -> boolean() | {'true', term()})\n  because\n  term() is not compatible with T\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a_mod2.erl","line":22,"char":1,"code":"ELP","severity":"error","name":"eqWAlizer: type_alias_is_non_productive","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nrecursive type invalid/0 is not productive\n```\n\n> [docs on `type_alias_is_non_productive`](https://fb.me/eqwalizer_errors#type_alias_is_non_productive)"}
-{"path":"app_a/src/app_a_mod2.erl","line":31,"char":9,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/test/app_a_test_helpers.erl","line":6,"char":11,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'wrong_ret'","replacement":null,"description":"```lang=error,counterexample\n`'wrong_ret'`.\n\nExpression has type:   'wrong_ret'\nContext expected type: 'error'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_b/src/app_b.erl","line":16,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"L","replacement":null,"description":"```lang=error,counterexample\n`L`.\n\nExpression has type:   [T]\nContext expected type: T\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
+{"path":"app_a/src/app_a.erl","line":10,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":14,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":18,"char":13,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":56,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: redundant_fixme","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nredundant fixme\n```\n\n> [docs on `redundant_fixme`](https://fb.me/eqwalizer_errors#redundant_fixme)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":78,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}\nContext expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}\n```\n```\nBecause in the expression's type:\n  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}\n  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}\n  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.\n\n------------------------------ Detailed message ------------------------------\n\nkeys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":102,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d => atom()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      Here the type is:     #{d => ..., ...}\n      Context expects type: #{d := ..., e := ..., ...}\n      The type of the expression is missing the following required keys: d, e.\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":125,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      #{ d =>\n        Here the type is:     pid()\n        Context expects type: atom()\n      , ... }\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/test/app_a_SUITE.erl","line":18,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"app_a_test_helpers:fail()","replacement":null,"description":"```lang=error,counterexample\n`app_a_test_helpers:fail()`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a_errors_generated.erl","line":8,"char":10,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'wrong_ret'","replacement":null,"description":"```lang=error,counterexample\n`'wrong_ret'`.\n\nExpression has type:   'wrong_ret'\nContext expected type: 'foo'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a_lists.erl","line":576,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"flatmap(thing_to_list/1, List)","replacement":null,"description":"```lang=error,counterexample\n`flatmap(thing_to_list/1, List)`.\n\nExpression has type:   [term()]\nContext expected type: string()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a_lists.erl","line":588,"char":29,"code":"ELP","severity":"error","name":"eqWAlizer: recursive_constraint","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nRecursive constraint: DeepList\n```\n\n> [docs on `recursive_constraint`](https://fb.me/eqwalizer_errors#recursive_constraint)","docPath":null}
+{"path":"app_a/src/app_a_lists.erl","line":595,"char":29,"code":"ELP","severity":"error","name":"eqWAlizer: recursive_constraint","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nRecursive constraint: DeepList\n```\n\n> [docs on `recursive_constraint`](https://fb.me/eqwalizer_errors#recursive_constraint)","docPath":null}
+{"path":"app_a/src/app_a_lists.erl","line":613,"char":29,"code":"ELP","severity":"error","name":"eqWAlizer: recursive_constraint","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nRecursive constraint: DeepList\n```\n\n> [docs on `recursive_constraint`](https://fb.me/eqwalizer_errors#recursive_constraint)","docPath":null}
+{"path":"app_a/src/app_a_lists.erl","line":1114,"char":36,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"H3","replacement":null,"description":"```lang=error,counterexample\n`H3`.\n\nExpression has type:   term()\nContext expected type: [term()]\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a_lists.erl","line":1305,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"filtermap(F, L)","replacement":null,"description":"```lang=error,counterexample\n`filtermap(F, L)`.\n\nExpression has type:   [term()]\nContext expected type: [T | X]\n```\n```\nBecause in the expression's type:\n  [\n    Here the type is:     term()\n    Context expects type: T | X\n    No candidate matches in the expected union.\n  ]\n\n------------------------------ Detailed message ------------------------------\n\n  [term()] is not compatible with [T | X]\n  because\n  term() is not compatible with T | X\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a_lists.erl","line":1305,"char":15,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"F","replacement":null,"description":"```lang=error,counterexample\n`F`.\n\nExpression has type:   fun((T) -> boolean() | {'true', X})\nContext expected type: fun((term()) -> boolean() | {'true', term()})\n```\n```\nBecause in the expression's type:\n  fun((\n    Here the type is:     term()\n    Context expects type: T\n  ) -> boolean() | {'true', X})\n\n------------------------------ Detailed message ------------------------------\n\n  fun((T) -> boolean() | {'true', X}) is not compatible with fun((term()) -> boolean() | {'true', term()})\n  because\n  term() is not compatible with T\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a_mod2.erl","line":22,"char":1,"code":"ELP","severity":"error","name":"eqWAlizer: type_alias_is_non_productive","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nrecursive type invalid/0 is not productive\n```\n\n> [docs on `type_alias_is_non_productive`](https://fb.me/eqwalizer_errors#type_alias_is_non_productive)","docPath":null}
+{"path":"app_a/src/app_a_mod2.erl","line":31,"char":9,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/test/app_a_test_helpers.erl","line":6,"char":11,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'wrong_ret'","replacement":null,"description":"```lang=error,counterexample\n`'wrong_ret'`.\n\nExpression has type:   'wrong_ret'\nContext expected type: 'error'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_b/src/app_b.erl","line":16,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"L","replacement":null,"description":"```lang=error,counterexample\n`L`.\n\nExpression has type:   [T]\nContext expected type: T\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
diff --git a/crates/elp/src/resources/test/standard/eqwalize_app_a.jsonl b/crates/elp/src/resources/test/standard/eqwalize_app_a.jsonl
index 6e5f79207d..f56ea404dc 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_app_a.jsonl
+++ b/crates/elp/src/resources/test/standard/eqwalize_app_a.jsonl
@@ -1,7 +1,7 @@
-{"path":"app_a/src/app_a.erl","line":10,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":14,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":18,"char":13,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":56,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: redundant_fixme","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nredundant fixme\n```\n\n> [docs on `redundant_fixme`](https://fb.me/eqwalizer_errors#redundant_fixme)"}
-{"path":"app_a/src/app_a.erl","line":78,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}\nContext expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}\n```\n```\nBecause in the expression's type:\n  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}\n  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}\n  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.\n\n------------------------------ Detailed message ------------------------------\n\nkeys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":102,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d => atom()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      Here the type is:     #{d => ..., ...}\n      Context expects type: #{d := ..., e := ..., ...}\n      The type of the expression is missing the following required keys: d, e.\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
-{"path":"app_a/src/app_a.erl","line":125,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      #{ d =>\n        Here the type is:     pid()\n        Context expects type: atom()\n      , ... }\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)"}
+{"path":"app_a/src/app_a.erl","line":10,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":14,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":18,"char":13,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":56,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: redundant_fixme","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nredundant fixme\n```\n\n> [docs on `redundant_fixme`](https://fb.me/eqwalizer_errors#redundant_fixme)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":78,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}\nContext expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}\n```\n```\nBecause in the expression's type:\n  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}\n  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}\n  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.\n\n------------------------------ Detailed message ------------------------------\n\nkeys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":102,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d => atom()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      Here the type is:     #{d => ..., ...}\n      Context expects type: #{d := ..., e := ..., ...}\n      The type of the expression is missing the following required keys: d, e.\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":125,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      #{ d =>\n        Here the type is:     pid()\n        Context expects type: atom()\n      , ... }\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
diff --git a/crates/ide_db/src/diagnostic_code.rs b/crates/ide_db/src/diagnostic_code.rs
index 9bda306e96..d3e73636bd 100644
--- a/crates/ide_db/src/diagnostic_code.rs
+++ b/crates/ide_db/src/diagnostic_code.rs
@@ -156,6 +156,16 @@ impl FromStr for Namespace {
     }
 }
 
+impl Namespace {
+    pub fn supports_doc_path(&self) -> bool {
+        match self {
+            Namespace::WhatsApp => true,
+            // @fb-only
+            _ => false,
+        }
+    }
+}
+
 impl<'de> Deserialize<'de> for DiagnosticCode {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
@@ -372,6 +382,37 @@ impl DiagnosticCode {
         }
     }
 
+    pub fn supports_doc_path(&self) -> bool {
+        match self {
+            DiagnosticCode::DefaultCodeForEnumIter => false,
+            // @fb-only
+            _ => true,
+        }
+    }
+
+    pub fn as_doc_path_extension(&self) -> &str {
+        match self {
+            DiagnosticCode::CrossNodeEval => "mdx",
+            _ => "md",
+        }
+    }
+
+    // Return the path to the documentation for this diagnostic code, relative to the ELP repo root.
+    pub fn as_doc_path(&self) -> Option<String> {
+        if !self.supports_doc_path() {
+            return None;
+        };
+        let namespace = self.as_namespace()?;
+        if namespace.supports_doc_path() {
+            let code = self.as_code();
+            let ext = self.as_doc_path_extension();
+            return Some(format!(
+                "website/docs/erlang-error-index/{namespace}/{code}.{ext}"
+            ));
+        }
+        None
+    }
+
     pub fn as_uri(&self) -> Option<String> {
         let namespace = self.as_namespace()?;
         let code = self.as_code();
@@ -532,8 +573,11 @@ impl fmt::Display for DiagnosticCode {
 
 #[cfg(test)]
 mod tests {
+    use std::path::Path;
+
     use expect_test::expect;
     use serde::Deserialize;
+    use strum::IntoEnumIterator;
 
     use super::DiagnosticCode;
 
@@ -664,4 +708,28 @@ mod tests {
         "#]]
         .assert_debug_eq(&config);
     }
+
+    #[test]
+    fn all_diagnostic_codes_have_documentation() {
+        let mut missing_docs = Vec::new();
+
+        for code in DiagnosticCode::iter() {
+            if let Some(doc_path) = code.as_doc_path() {
+                let manifest_dir = env!("CARGO_MANIFEST_DIR");
+                let elp_root = Path::new(manifest_dir).parent().unwrap().parent().unwrap();
+                let absolute_path = elp_root.join(doc_path);
+
+                if !absolute_path.exists() {
+                    missing_docs.push(format!("{}: {}", code.as_code(), absolute_path.display()));
+                }
+            }
+        }
+
+        if !missing_docs.is_empty() {
+            panic!(
+                "The following diagnostic codes are missing their documentation files:\n{}",
+                missing_docs.join("\n")
+            );
+        }
+    }
 }
diff --git a/website/docs/erlang-error-index/w/W0018.md b/website/docs/erlang-error-index/w/W0018.md
new file mode 100644
index 0000000000..1e411dfdd3
--- /dev/null
+++ b/website/docs/erlang-error-index/w/W0018.md
@@ -0,0 +1,48 @@
+---
+sidebar_position: 18
+---
+
+# W0018 - Unexpected semicolon or dot
+
+## Warning
+
+```erlang
+-module(main).
+foo(1)->2;
+foo(2)->3.
+      %% ^ warning: Unexpected '.'
+foo(3)->4.
+```
+
+```erlang
+-module(main).
+foo(1)->2;
+foo(2)->3;
+      %% ^ warning: Unexpected ';'
+```
+
+## Explanation
+
+The warning message indicates that there is an unexpected separator in a
+function clause sequence. This diagnostic is generated when:
+
+1. **Unexpected dot (`.`)** - A dot appears where a semicolon is expected
+   between function clauses
+2. **Unexpected semicolon (`;`)** - A semicolon appears where a dot is expected
+   at the end of a function definition
+
+In Erlang, function clauses within the same function must be separated by
+semicolons (`;`), and the final clause of a function must end with a dot (`.`).
+
+### Correct Pattern:
+
+```erlang
+function_name(Pattern1) -> Expression1;
+function_name(Pattern2) -> Expression2;
+function_name(Pattern3) -> Expression3.
+```
+
+To fix this error, replace the incorrect separator with the appropriate one:
+
+- Use semicolons (`;`) between function clauses of the same function
+- Use a dot (`.`) only after the final clause of a function
diff --git a/website/docs/erlang-error-index/w/W0019.md b/website/docs/erlang-error-index/w/W0019.md
new file mode 100644
index 0000000000..b8ba83a245
--- /dev/null
+++ b/website/docs/erlang-error-index/w/W0019.md
@@ -0,0 +1,47 @@
+---
+sidebar_position: 19
+---
+
+# W0019 - Expression can be simplified
+
+## Warning
+
+```erlang
+-module(main).
+foo(X) ->
+  bar([] ++ [1]).
+%% ^^^^^^^^^ 💡 warning: Can be simplified to `[1]`.
+```
+
+## Explanation
+
+The warning indicates that an expression can be trivially simplified to a more
+concise form without changing its behavior. This diagnostic helps improve code
+readability and can be especially useful during code refactoring and
+optimization.
+
+## Supported Simplifications
+
+### List Operations
+
+- **Append with empty list**: `[] ++ X` → `X` and `X ++ []` → `X`
+- **Subtract with empty list**: `[] -- X` → `[]` and `X -- []` → `X`
+
+### Arithmetic Operations
+
+- **Addition with zero**: `0 + X` → `X` and `X + 0` → `X`
+- **Subtraction with zero**: `0 - X` → `-X` and `X - 0` → `X`
+- **Multiplication by one**: `1 * X` → `X` and `X * 1` → `X`
+- **Division by one**: `X div 1` → `X`
+- **Remainder by one**: `X rem 1` → `0`
+
+### Boolean Operations
+
+- **Short-circuit evaluation**: `true andalso X` → `X` and `false orelse X` →
+  `X`
+- **Negation of literals**: `not true` → `false` and `not false` → `true`
+
+### Note on Macros
+
+This diagnostic does not apply to expressions that involve macro expansions, as
+simplifying them might change the intended behavior or readability of the code.

From 8805345e782d64a93cef8ab4e2879ba4d85b776c Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 3 Oct 2025 01:15:51 -0700
Subject: [PATCH 144/394] BE: Add oncalls metadata to elp_development LLMs
 rules

Summary: As title.

Reviewed By: acw224

Differential Revision: D83758431

fbshipit-source-id: 63ee552d84e12829a1b9cef369ca9a1e4e9bee1d
---
 .llms/rules/elp_development.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.llms/rules/elp_development.md b/.llms/rules/elp_development.md
index 0f7e215021..d6462ed7e3 100644
--- a/.llms/rules/elp_development.md
+++ b/.llms/rules/elp_development.md
@@ -1,10 +1,12 @@
 ---
 llms-gk: 'devmate_elp_development_md'
 apply_to_regex: '^(.*\.rs|.*\.md)$'
+oncalls: ['vscode_erlang']
 ---
 
 # ELP Development Rules for LLMs
 
+
 ## Project Overview
 
 ELP (Erlang Language Platform) is a language server and development tools suite for Erlang, built in Rust. This project provides IDE features, diagnostics, and code analysis for Erlang codebases.

From bb49a578c68d9e658dc4850deb8721ca6ab5dda8 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 3 Oct 2025 10:58:55 -0700
Subject: [PATCH 145/394] Generalize lookup for dynamic calls

Summary:
In addition to `erlang:apply/2,3` we want to include other dynamic calls via the find-references / go-to-definition / rename mechanism.

This diff prepares the territory by generalizing the matching, which will then be extended with additional calls.

Reviewed By: jcpetruzza

Differential Revision: D83746070

fbshipit-source-id: 06bd2eb47362be6d1a14084adf53442741487d9c
---
 crates/hir/src/sema/to_def.rs | 158 +++++++++++++++++++++++++++-------
 1 file changed, 126 insertions(+), 32 deletions(-)

diff --git a/crates/hir/src/sema/to_def.rs b/crates/hir/src/sema/to_def.rs
index 6bbef6c687..f12f6ac14c 100644
--- a/crates/hir/src/sema/to_def.rs
+++ b/crates/hir/src/sema/to_def.rs
@@ -38,7 +38,6 @@ use crate::TypeAliasDef;
 use crate::TypeExpr;
 use crate::TypeExprId;
 use crate::VarDef;
-use crate::known;
 use crate::macro_exp;
 use crate::macro_exp::BuiltInMacro;
 use crate::macro_exp::MacroExpCtx;
@@ -760,8 +759,8 @@ impl ToDef for ast::Callback {
 impl ToDef for ast::ExprArgs {
     type Def = CallDef;
 
-    /// Looking specifically to pull out a function definition from an
-    /// `apply/2` or `apply/3` call.
+    /// Looking specifically to pull out a function definition from a dynamic call,
+    /// e.g. apply(Fun, Args) or rpc:call(Node, Module, Function, Args).
     fn to_def(sema: &Semantic<'_>, ast: InFile<&Self>) -> Option<Self::Def> {
         let (body, body_map) = sema.find_body_and_map(ast.file_id, ast.value.syntax())?;
         let call = ast::Expr::cast(ast.value.syntax().parent()?.clone())?;
@@ -770,10 +769,10 @@ impl ToDef for ast::ExprArgs {
         let def = match &body[expr_id] {
             Expr::Call { target, args } => match target {
                 CallTarget::Local { name } => {
-                    look_for_apply_call(sema, ast.file_id, None, *name, args, &body)
+                    look_for_dynamic_call(sema, ast.file_id, None, *name, args, &body)
                 }
                 CallTarget::Remote { module, name, .. } => {
-                    look_for_apply_call(sema, ast.file_id, Some(*module), *name, args, &body)
+                    look_for_dynamic_call(sema, ast.file_id, Some(*module), *name, args, &body)
                 }
             },
             _ => None,
@@ -782,7 +781,63 @@ impl ToDef for ast::ExprArgs {
     }
 }
 
-fn look_for_apply_call(
+/// Pattern for matching dynamic call expressions (apply, rpc calls, etc.)
+#[derive(Debug)]
+struct DynamicCallPattern {
+    /// Expected module name (None means no explicit module prefix, i.e., implicit erlang module)
+    module: Option<&'static str>,
+    /// Expected function name
+    function: &'static str,
+    /// Expected arity for this pattern
+    arity: usize,
+    /// Index of the target module argument (None when target function is in same module)
+    module_arg_index: Option<usize>,
+    /// Index of the target function argument
+    function_arg_index: usize,
+    /// Index of the arguments list
+    args_list_index: usize,
+}
+
+static DYNAMIC_CALL_PATTERNS: &[DynamicCallPattern] = &[
+    // apply/2 (implicit erlang:apply/2) - apply(Fun, Args)
+    DynamicCallPattern {
+        module: None,
+        function: "apply",
+        arity: 2,
+        module_arg_index: None,
+        function_arg_index: 0,
+        args_list_index: 1,
+    },
+    // apply/3 (implicit erlang:apply/3) - apply(Module, Function, Args)
+    DynamicCallPattern {
+        module: None,
+        function: "apply",
+        arity: 3,
+        module_arg_index: Some(0),
+        function_arg_index: 1,
+        args_list_index: 2,
+    },
+    // erlang:apply/2 (explicit) - erlang:apply(Fun, Args)
+    DynamicCallPattern {
+        module: Some("erlang"),
+        function: "apply",
+        arity: 2,
+        module_arg_index: None,
+        function_arg_index: 0,
+        args_list_index: 1,
+    },
+    // erlang:apply/3 (explicit) - erlang:apply(Module, Function, Args)
+    DynamicCallPattern {
+        module: Some("erlang"),
+        function: "apply",
+        arity: 3,
+        module_arg_index: Some(0),
+        function_arg_index: 1,
+        args_list_index: 2,
+    },
+];
+
+fn look_for_dynamic_call(
     sema: &Semantic,
     file_id: FileId,
     module: Option<ExprId>,
@@ -790,36 +845,75 @@ fn look_for_apply_call(
     args: &[ExprId],
     body: &Body,
 ) -> Option<CallDef> {
-    if let Some(module) = module {
+    let module_name = if let Some(module) = module {
         let atom = body[module].as_atom()?;
-        if sema.db.lookup_atom(atom) != known::erlang {
-            return None;
-        }
-    };
-    let atom = body[fun].as_atom()?;
-    if sema.db.lookup_atom(atom) == known::apply {
-        if args.len() == 2 {
-            // apply/2
-            let arity = arity_from_apply_args(args[1], body)?;
-            let apply_target = CallTarget::Local { name: args[0] };
-            resolve_call_target(sema, &apply_target, Some(arity), file_id, body)
-                .map(CallDef::Function)
-        } else if args.len() == 3 {
-            // apply/3
-            let arity = arity_from_apply_args(args[2], body)?;
-            let apply_target = CallTarget::Remote {
-                module: args[0],
-                name: args[1],
-                parens: false,
-            };
-            resolve_call_target(sema, &apply_target, Some(arity), file_id, body)
-                .map(CallDef::Function)
-        } else {
-            None
-        }
+        Some(sema.db.lookup_atom(atom))
     } else {
         None
+    };
+
+    let function_atom = body[fun].as_atom()?;
+    let function_name = sema.db.lookup_atom(function_atom);
+
+    for pattern in DYNAMIC_CALL_PATTERNS {
+        if matches_pattern(pattern, module_name.as_ref(), &function_name, args.len()) {
+            return resolve_dynamic_call(sema, file_id, pattern, args, body);
+        }
     }
+
+    None
+}
+
+fn matches_pattern(
+    pattern: &DynamicCallPattern,
+    module_name: Option<&Name>,
+    function_name: &Name,
+    arity: usize,
+) -> bool {
+    // Check arity
+    if pattern.arity != arity {
+        return false;
+    }
+
+    // Check function name
+    if function_name.as_str() != pattern.function {
+        return false;
+    }
+
+    // Check module name
+    match (pattern.module, module_name) {
+        (None, None) => true, // No explicit module prefix expected and found
+        (Some(expected), Some(actual)) => expected == actual.as_str(),
+        _ => false, // Mismatch between expected and actual module presence
+    }
+}
+
+fn resolve_dynamic_call(
+    sema: &Semantic,
+    file_id: FileId,
+    pattern: &DynamicCallPattern,
+    args: &[ExprId],
+    body: &Body,
+) -> Option<CallDef> {
+    // Extract arity from the arguments list
+    let arity = arity_from_apply_args(args[pattern.args_list_index], body)?;
+
+    // Build the call target
+    let call_target = if let Some(module_idx) = pattern.module_arg_index {
+        // Remote call
+        CallTarget::Remote {
+            module: args[module_idx],
+            name: args[pattern.function_arg_index],
+            parens: false,
+        }
+    } else {
+        // Local call
+        CallTarget::Local {
+            name: args[pattern.function_arg_index],
+        }
+    };
+
+    resolve_call_target(sema, &call_target, Some(arity), file_id, body).map(CallDef::Function)
 }
 
 /// The apply call has a last parameter being a list of arguments.

From 31773371235d81081122fab1fa47513fcecbbfd3 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 3 Oct 2025 10:58:55 -0700
Subject: [PATCH 146/394] Find references for rpc dynamic calls

Summary:
Extend detection for dynamic calls to the most common ones from the `rpc` module.

Later in the stack we will use a more performant data structure and a macro to reduce verbosity.

Reviewed By: jcpetruzza

Differential Revision: D83840542

fbshipit-source-id: 165c400c9a5c9cd092957460fca06a99d2ff6846
---
 crates/hir/src/sema/to_def.rs |  63 ++++++++++++++
 crates/ide/src/rename.rs      | 154 ++++++++++++++++++++++++++++++++++
 2 files changed, 217 insertions(+)

diff --git a/crates/hir/src/sema/to_def.rs b/crates/hir/src/sema/to_def.rs
index f12f6ac14c..1bfa97c47d 100644
--- a/crates/hir/src/sema/to_def.rs
+++ b/crates/hir/src/sema/to_def.rs
@@ -835,6 +835,69 @@ static DYNAMIC_CALL_PATTERNS: &[DynamicCallPattern] = &[
         function_arg_index: 1,
         args_list_index: 2,
     },
+    // rpc:call/4 - rpc:call(Node, Module, Function, Args)
+    DynamicCallPattern {
+        module: Some("rpc"),
+        function: "call",
+        arity: 4,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+    },
+    // rpc:call/5 - rpc:call(Node, Module, Function, Args, Timeout)
+    DynamicCallPattern {
+        module: Some("rpc"),
+        function: "call",
+        arity: 5,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+    },
+    // rpc:async_call/4 - rpc:async_call(Node, Module, Function, Args)
+    DynamicCallPattern {
+        module: Some("rpc"),
+        function: "async_call",
+        arity: 4,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+    },
+    // rpc:cast/4 - rpc:cast(Node, Module, Function, Args)
+    DynamicCallPattern {
+        module: Some("rpc"),
+        function: "cast",
+        arity: 4,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+    },
+    // rpc:multicall/3 - rpc:multicall(Module, Function, Args)
+    DynamicCallPattern {
+        module: Some("rpc"),
+        function: "multicall",
+        arity: 3,
+        module_arg_index: Some(0),
+        function_arg_index: 1,
+        args_list_index: 2,
+    },
+    // rpc:multicall/4 - rpc:multicall(Module, Function, Args, Timeout)
+    DynamicCallPattern {
+        module: Some("rpc"),
+        function: "multicall",
+        arity: 4,
+        module_arg_index: Some(0),
+        function_arg_index: 1,
+        args_list_index: 2,
+    },
+    // rpc:multicall/5 - rpc:multicall(Nodes, Module, Function, Args, Timeout)
+    DynamicCallPattern {
+        module: Some("rpc"),
+        function: "multicall",
+        arity: 5,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+    },
 ];
 
 fn look_for_dynamic_call(
diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index 71586961cf..3a7f0d859b 100644
--- a/crates/ide/src/rename.rs
+++ b/crates/ide/src/rename.rs
@@ -1182,4 +1182,158 @@ mod tests {
              "#,
         );
     }
+
+    #[test]
+    fn test_rename_in_rpc_call_4() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   rpc:call(node, ?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   rpc:call(node, ?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_rpc_call_5() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   rpc:call(node, ?MODULE, bar, [], timeout).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   rpc:call(node, ?MODULE, new_name, [], timeout).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_rpc_async_call() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   rpc:async_call(node, ?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   rpc:async_call(node, ?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_rpc_cast() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   rpc:cast(node, ?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   rpc:cast(node, ?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_rpc_multicall_3() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   rpc:multicall(?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   rpc:multicall(?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_rpc_multicall_4() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   rpc:multicall(?MODULE, bar, [], timeout).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   rpc:multicall(?MODULE, new_name, [], timeout).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_rpc_multicall_5() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   rpc:multicall([node1, node2], ?MODULE, bar, [], timeout).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   rpc:multicall([node1, node2], ?MODULE, new_name, [], timeout).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
 }

From 95dfeb4ea480e93027378335ff22a4bbc9c0a80c Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 3 Oct 2025 10:58:55 -0700
Subject: [PATCH 147/394] Include some of the 'erlang' functions when searching
 for dynamic calls

Summary:
Extend detection for dynamic calls to the most common ones from the `erlang` module. Given that some of these calls refer to functions by arity, extend the original mechanism to support both variants.

Later in the stack we will use a more performant data structure and a macro to reduce verbosity.

Reviewed By: jcpetruzza

Differential Revision: D83840802

fbshipit-source-id: 1fc91f1b368cda4fb3b12ee5fb934871ee672cad
---
 crates/hir/src/sema/to_def.rs | 274 +++++++++++++++++-
 crates/ide/src/rename.rs      | 528 ++++++++++++++++++++++++++++++++++
 2 files changed, 799 insertions(+), 3 deletions(-)

diff --git a/crates/hir/src/sema/to_def.rs b/crates/hir/src/sema/to_def.rs
index 1bfa97c47d..fc79cd0242 100644
--- a/crates/hir/src/sema/to_def.rs
+++ b/crates/hir/src/sema/to_def.rs
@@ -794,8 +794,10 @@ struct DynamicCallPattern {
     module_arg_index: Option<usize>,
     /// Index of the target function argument
     function_arg_index: usize,
-    /// Index of the arguments list
+    /// Index of the arguments list or arity argument
     args_list_index: usize,
+    /// Whether to extract arity directly from an integer argument (true) or from list length (false)
+    direct_arity: bool,
 }
 
 static DYNAMIC_CALL_PATTERNS: &[DynamicCallPattern] = &[
@@ -807,6 +809,7 @@ static DYNAMIC_CALL_PATTERNS: &[DynamicCallPattern] = &[
         module_arg_index: None,
         function_arg_index: 0,
         args_list_index: 1,
+        direct_arity: false,
     },
     // apply/3 (implicit erlang:apply/3) - apply(Module, Function, Args)
     DynamicCallPattern {
@@ -816,6 +819,7 @@ static DYNAMIC_CALL_PATTERNS: &[DynamicCallPattern] = &[
         module_arg_index: Some(0),
         function_arg_index: 1,
         args_list_index: 2,
+        direct_arity: false,
     },
     // erlang:apply/2 (explicit) - erlang:apply(Fun, Args)
     DynamicCallPattern {
@@ -825,6 +829,7 @@ static DYNAMIC_CALL_PATTERNS: &[DynamicCallPattern] = &[
         module_arg_index: None,
         function_arg_index: 0,
         args_list_index: 1,
+        direct_arity: false,
     },
     // erlang:apply/3 (explicit) - erlang:apply(Module, Function, Args)
     DynamicCallPattern {
@@ -834,6 +839,7 @@ static DYNAMIC_CALL_PATTERNS: &[DynamicCallPattern] = &[
         module_arg_index: Some(0),
         function_arg_index: 1,
         args_list_index: 2,
+        direct_arity: false,
     },
     // rpc:call/4 - rpc:call(Node, Module, Function, Args)
     DynamicCallPattern {
@@ -843,6 +849,7 @@ static DYNAMIC_CALL_PATTERNS: &[DynamicCallPattern] = &[
         module_arg_index: Some(1),
         function_arg_index: 2,
         args_list_index: 3,
+        direct_arity: false,
     },
     // rpc:call/5 - rpc:call(Node, Module, Function, Args, Timeout)
     DynamicCallPattern {
@@ -852,6 +859,7 @@ static DYNAMIC_CALL_PATTERNS: &[DynamicCallPattern] = &[
         module_arg_index: Some(1),
         function_arg_index: 2,
         args_list_index: 3,
+        direct_arity: false,
     },
     // rpc:async_call/4 - rpc:async_call(Node, Module, Function, Args)
     DynamicCallPattern {
@@ -861,6 +869,7 @@ static DYNAMIC_CALL_PATTERNS: &[DynamicCallPattern] = &[
         module_arg_index: Some(1),
         function_arg_index: 2,
         args_list_index: 3,
+        direct_arity: false,
     },
     // rpc:cast/4 - rpc:cast(Node, Module, Function, Args)
     DynamicCallPattern {
@@ -870,6 +879,7 @@ static DYNAMIC_CALL_PATTERNS: &[DynamicCallPattern] = &[
         module_arg_index: Some(1),
         function_arg_index: 2,
         args_list_index: 3,
+        direct_arity: false,
     },
     // rpc:multicall/3 - rpc:multicall(Module, Function, Args)
     DynamicCallPattern {
@@ -879,6 +889,7 @@ static DYNAMIC_CALL_PATTERNS: &[DynamicCallPattern] = &[
         module_arg_index: Some(0),
         function_arg_index: 1,
         args_list_index: 2,
+        direct_arity: false,
     },
     // rpc:multicall/4 - rpc:multicall(Module, Function, Args, Timeout)
     DynamicCallPattern {
@@ -888,6 +899,7 @@ static DYNAMIC_CALL_PATTERNS: &[DynamicCallPattern] = &[
         module_arg_index: Some(0),
         function_arg_index: 1,
         args_list_index: 2,
+        direct_arity: false,
     },
     // rpc:multicall/5 - rpc:multicall(Nodes, Module, Function, Args, Timeout)
     DynamicCallPattern {
@@ -897,6 +909,247 @@ static DYNAMIC_CALL_PATTERNS: &[DynamicCallPattern] = &[
         module_arg_index: Some(1),
         function_arg_index: 2,
         args_list_index: 3,
+        direct_arity: false,
+    },
+    // function_exported/3 (implicit erlang:function_exported/3) - function_exported(Module, Function, Arity)
+    DynamicCallPattern {
+        module: None,
+        function: "function_exported",
+        arity: 3,
+        module_arg_index: Some(0),
+        function_arg_index: 1,
+        args_list_index: 2,
+        direct_arity: true,
+    },
+    // erlang:function_exported/3 (explicit) - erlang:function_exported(Module, Function, Arity)
+    DynamicCallPattern {
+        module: Some("erlang"),
+        function: "function_exported",
+        arity: 3,
+        module_arg_index: Some(0),
+        function_arg_index: 1,
+        args_list_index: 2,
+        direct_arity: true,
+    },
+    // is_builtin/3 (implicit erlang:is_builtin/3) - is_builtin(Module, Function, Arity)
+    DynamicCallPattern {
+        module: None,
+        function: "is_builtin",
+        arity: 3,
+        module_arg_index: Some(0),
+        function_arg_index: 1,
+        args_list_index: 2,
+        direct_arity: true,
+    },
+    // erlang:is_builtin/3 (explicit) - erlang:is_builtin(Module, Function, Arity)
+    DynamicCallPattern {
+        module: Some("erlang"),
+        function: "is_builtin",
+        arity: 3,
+        module_arg_index: Some(0),
+        function_arg_index: 1,
+        args_list_index: 2,
+        direct_arity: true,
+    },
+    // hibernate/3 (implicit erlang:hibernate/3) - hibernate(Module, Function, Args)
+    DynamicCallPattern {
+        module: None,
+        function: "hibernate",
+        arity: 3,
+        module_arg_index: Some(0),
+        function_arg_index: 1,
+        args_list_index: 2,
+        direct_arity: false,
+    },
+    // erlang:hibernate/3 (explicit) - erlang:hibernate(Module, Function, Args)
+    DynamicCallPattern {
+        module: Some("erlang"),
+        function: "hibernate",
+        arity: 3,
+        module_arg_index: Some(0),
+        function_arg_index: 1,
+        args_list_index: 2,
+        direct_arity: false,
+    },
+    // spawn/3 (implicit erlang:spawn/3) - spawn(Module, Function, Args)
+    DynamicCallPattern {
+        module: None,
+        function: "spawn",
+        arity: 3,
+        module_arg_index: Some(0),
+        function_arg_index: 1,
+        args_list_index: 2,
+        direct_arity: false,
+    },
+    // erlang:spawn/3 (explicit) - erlang:spawn(Module, Function, Args)
+    DynamicCallPattern {
+        module: Some("erlang"),
+        function: "spawn",
+        arity: 3,
+        module_arg_index: Some(0),
+        function_arg_index: 1,
+        args_list_index: 2,
+        direct_arity: false,
+    },
+    // spawn/4 (implicit erlang:spawn/4) - spawn(Node, Module, Function, Args)
+    DynamicCallPattern {
+        module: None,
+        function: "spawn",
+        arity: 4,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+        direct_arity: false,
+    },
+    // erlang:spawn/4 (explicit) - erlang:spawn(Node, Module, Function, Args)
+    DynamicCallPattern {
+        module: Some("erlang"),
+        function: "spawn",
+        arity: 4,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+        direct_arity: false,
+    },
+    // spawn_link/3 (implicit erlang:spawn_link/3) - spawn_link(Module, Function, Args)
+    DynamicCallPattern {
+        module: None,
+        function: "spawn_link",
+        arity: 3,
+        module_arg_index: Some(0),
+        function_arg_index: 1,
+        args_list_index: 2,
+        direct_arity: false,
+    },
+    // erlang:spawn_link/3 (explicit) - erlang:spawn_link(Module, Function, Args)
+    DynamicCallPattern {
+        module: Some("erlang"),
+        function: "spawn_link",
+        arity: 3,
+        module_arg_index: Some(0),
+        function_arg_index: 1,
+        args_list_index: 2,
+        direct_arity: false,
+    },
+    // spawn_link/4 (implicit erlang:spawn_link/4) - spawn_link(Node, Module, Function, Args)
+    DynamicCallPattern {
+        module: None,
+        function: "spawn_link",
+        arity: 4,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+        direct_arity: false,
+    },
+    // erlang:spawn_link/4 (explicit) - erlang:spawn_link(Node, Module, Function, Args)
+    DynamicCallPattern {
+        module: Some("erlang"),
+        function: "spawn_link",
+        arity: 4,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+        direct_arity: false,
+    },
+    // spawn_monitor/3 (implicit erlang:spawn_monitor/3) - spawn_monitor(Module, Function, Args)
+    DynamicCallPattern {
+        module: None,
+        function: "spawn_monitor",
+        arity: 3,
+        module_arg_index: Some(0),
+        function_arg_index: 1,
+        args_list_index: 2,
+        direct_arity: false,
+    },
+    // erlang:spawn_monitor/3 (explicit) - erlang:spawn_monitor(Module, Function, Args)
+    DynamicCallPattern {
+        module: Some("erlang"),
+        function: "spawn_monitor",
+        arity: 3,
+        module_arg_index: Some(0),
+        function_arg_index: 1,
+        args_list_index: 2,
+        direct_arity: false,
+    },
+    // spawn_monitor/4 (implicit erlang:spawn_monitor/4) - spawn_monitor(Node, Module, Function, Args)
+    DynamicCallPattern {
+        module: None,
+        function: "spawn_monitor",
+        arity: 4,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+        direct_arity: false,
+    },
+    // erlang:spawn_monitor/4 (explicit) - erlang:spawn_monitor(Node, Module, Function, Args)
+    DynamicCallPattern {
+        module: Some("erlang"),
+        function: "spawn_monitor",
+        arity: 4,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+        direct_arity: false,
+    },
+    // spawn_opt/4 (implicit erlang:spawn_opt/4) - spawn_opt(Module, Function, Args, Options)
+    DynamicCallPattern {
+        module: None,
+        function: "spawn_opt",
+        arity: 4,
+        module_arg_index: Some(0),
+        function_arg_index: 1,
+        args_list_index: 2,
+        direct_arity: false,
+    },
+    // erlang:spawn_opt/4 (explicit) - erlang:spawn_opt(Module, Function, Args, Options)
+    DynamicCallPattern {
+        module: Some("erlang"),
+        function: "spawn_opt",
+        arity: 4,
+        module_arg_index: Some(0),
+        function_arg_index: 1,
+        args_list_index: 2,
+        direct_arity: false,
+    },
+    // spawn_opt/5 (implicit erlang:spawn_opt/5) - spawn_opt(Node, Module, Function, Args, Options)
+    DynamicCallPattern {
+        module: None,
+        function: "spawn_opt",
+        arity: 5,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+        direct_arity: false,
+    },
+    // erlang:spawn_opt/5 (explicit) - erlang:spawn_opt(Node, Module, Function, Args, Options)
+    DynamicCallPattern {
+        module: Some("erlang"),
+        function: "spawn_opt",
+        arity: 5,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+        direct_arity: false,
+    },
+    // spawn_request/5 (implicit erlang:spawn_request/5) - spawn_request(Node, Module, Function, Args, Options)
+    DynamicCallPattern {
+        module: None,
+        function: "spawn_request",
+        arity: 5,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+        direct_arity: false,
+    },
+    // erlang:spawn_request/5 (explicit) - erlang:spawn_request(Node, Module, Function, Args, Options)
+    DynamicCallPattern {
+        module: Some("erlang"),
+        function: "spawn_request",
+        arity: 5,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+        direct_arity: false,
     },
 ];
 
@@ -958,8 +1211,14 @@ fn resolve_dynamic_call(
     args: &[ExprId],
     body: &Body,
 ) -> Option<CallDef> {
-    // Extract arity from the arguments list
-    let arity = arity_from_apply_args(args[pattern.args_list_index], body)?;
+    // Extract arity based on pattern type
+    let arity = if pattern.direct_arity {
+        // Extract arity directly from an integer argument
+        arity_from_integer_arg(args[pattern.args_list_index], body)?
+    } else {
+        // Extract arity from list length
+        arity_from_apply_args(args[pattern.args_list_index], body)?
+    };
 
     // Build the call target
     let call_target = if let Some(module_idx) = pattern.module_arg_index {
@@ -986,3 +1245,12 @@ fn arity_from_apply_args(args: ExprId, body: &Body) -> Option<u32> {
     // Deal with a simple list only.
     body[args].list_length().map(|l| l as u32)
 }
+
+/// Extract arity directly from an integer argument.
+/// Given the `ExprId` of an integer parameter, return its value as arity.
+fn arity_from_integer_arg(arity_arg: ExprId, body: &Body) -> Option<u32> {
+    match &body[arity_arg] {
+        Expr::Literal(Literal::Integer(int)) => int.value.try_into().ok(),
+        _ => None,
+    }
+}
diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index 3a7f0d859b..9ad411b404 100644
--- a/crates/ide/src/rename.rs
+++ b/crates/ide/src/rename.rs
@@ -1336,4 +1336,532 @@ mod tests {
                     ok."#,
         );
     }
+
+    #[test]
+    fn test_rename_in_function_exported() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   function_exported(?MODULE, bar, 0).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   function_exported(?MODULE, new_name, 0).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_erlang_function_exported() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   erlang:function_exported(?MODULE, bar, 0).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   erlang:function_exported(?MODULE, new_name, 0).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_is_builtin() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   is_builtin(?MODULE, bar, 0).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   is_builtin(?MODULE, new_name, 0).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_erlang_is_builtin() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   erlang:is_builtin(?MODULE, bar, 0).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   erlang:is_builtin(?MODULE, new_name, 0).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_hibernate() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   hibernate(?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   hibernate(?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_erlang_hibernate() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   erlang:hibernate(?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   erlang:hibernate(?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_spawn() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   spawn(?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   spawn(?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_erlang_spawn() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   erlang:spawn(?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   erlang:spawn(?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_spawn_4() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   spawn(node, ?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   spawn(node, ?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_erlang_spawn_4() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   erlang:spawn(node, ?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   erlang:spawn(node, ?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_spawn_link() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   spawn_link(?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   spawn_link(?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_erlang_spawn_link() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   erlang:spawn_link(?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   erlang:spawn_link(?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_spawn_link_4() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   spawn_link(node, ?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   spawn_link(node, ?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_erlang_spawn_link_4() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   erlang:spawn_link(node, ?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   erlang:spawn_link(node, ?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_spawn_monitor() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   spawn_monitor(?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   spawn_monitor(?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_erlang_spawn_monitor() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   erlang:spawn_monitor(?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   erlang:spawn_monitor(?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_spawn_monitor_4() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   spawn_monitor(node, ?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   spawn_monitor(node, ?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_erlang_spawn_monitor_4() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   erlang:spawn_monitor(node, ?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   erlang:spawn_monitor(node, ?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_spawn_opt() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   spawn_opt(?MODULE, bar, [], []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   spawn_opt(?MODULE, new_name, [], []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_erlang_spawn_opt() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   erlang:spawn_opt(?MODULE, bar, [], []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   erlang:spawn_opt(?MODULE, new_name, [], []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_spawn_opt_5() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   spawn_opt(node, ?MODULE, bar, [], []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   spawn_opt(node, ?MODULE, new_name, [], []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_erlang_spawn_opt_5() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   erlang:spawn_opt(node, ?MODULE, bar, [], []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   erlang:spawn_opt(node, ?MODULE, new_name, [], []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_spawn_request() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   spawn_request(node, ?MODULE, bar, [], []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   spawn_request(node, ?MODULE, new_name, [], []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_erlang_spawn_request() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   erlang:spawn_request(node, ?MODULE, bar, [], []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   erlang:spawn_request(node, ?MODULE, new_name, [], []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
 }

From 64fb3fb3d33b6e38cea8b8ae5c9d3b944b30850b Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 3 Oct 2025 10:58:55 -0700
Subject: [PATCH 148/394] Include the most common 'erpc' functions when
 searching for dynamic calls

Summary:
Extend detection for dynamic calls to the most common ones from the `erpc` module.

Later in the stack we will use a more performant data structure and a macro to reduce verbosity.

Reviewed By: jcpetruzza

Differential Revision: D83843587

fbshipit-source-id: 0c0172266e1c6dc382b46ada20faca84c0022b3a
---
 crates/hir/src/sema/to_def.rs |  70 ++++++++++++++++
 crates/ide/src/rename.rs      | 154 ++++++++++++++++++++++++++++++++++
 2 files changed, 224 insertions(+)

diff --git a/crates/hir/src/sema/to_def.rs b/crates/hir/src/sema/to_def.rs
index fc79cd0242..ebc29d6d5d 100644
--- a/crates/hir/src/sema/to_def.rs
+++ b/crates/hir/src/sema/to_def.rs
@@ -1151,6 +1151,76 @@ static DYNAMIC_CALL_PATTERNS: &[DynamicCallPattern] = &[
         args_list_index: 3,
         direct_arity: false,
     },
+    // erpc:call/4 - erpc:call(Node, Module, Function, Args)
+    DynamicCallPattern {
+        module: Some("erpc"),
+        function: "call",
+        arity: 4,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+        direct_arity: false,
+    },
+    // erpc:call/5 - erpc:call(Node, Module, Function, Args, TimeoutOrOptions)
+    DynamicCallPattern {
+        module: Some("erpc"),
+        function: "call",
+        arity: 5,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+        direct_arity: false,
+    },
+    // erpc:cast/4 - erpc:cast(Node, Module, Function, Args)
+    DynamicCallPattern {
+        module: Some("erpc"),
+        function: "cast",
+        arity: 4,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+        direct_arity: false,
+    },
+    // erpc:multicall/4 - erpc:multicall(Nodes, Module, Function, Args)
+    DynamicCallPattern {
+        module: Some("erpc"),
+        function: "multicall",
+        arity: 4,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+        direct_arity: false,
+    },
+    // erpc:multicall/5 - erpc:multicall(Nodes, Module, Function, Args, TimeoutOrOptions)
+    DynamicCallPattern {
+        module: Some("erpc"),
+        function: "multicall",
+        arity: 5,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+        direct_arity: false,
+    },
+    // erpc:multicast/4 - erpc:multicast(Nodes, Module, Function, Args)
+    DynamicCallPattern {
+        module: Some("erpc"),
+        function: "multicast",
+        arity: 4,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+        direct_arity: false,
+    },
+    // erpc:send_request/6 - erpc:send_request(Node, Module, Function, Args, Label, RequestIdCollection)
+    DynamicCallPattern {
+        module: Some("erpc"),
+        function: "send_request",
+        arity: 6,
+        module_arg_index: Some(1),
+        function_arg_index: 2,
+        args_list_index: 3,
+        direct_arity: false,
+    },
 ];
 
 fn look_for_dynamic_call(
diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index 9ad411b404..23e9ceca89 100644
--- a/crates/ide/src/rename.rs
+++ b/crates/ide/src/rename.rs
@@ -1864,4 +1864,158 @@ mod tests {
                     ok."#,
         );
     }
+
+    #[test]
+    fn test_rename_in_erpc_call_4() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   erpc:call(node, ?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   erpc:call(node, ?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_erpc_call_5() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   erpc:call(node, ?MODULE, bar, [], timeout).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   erpc:call(node, ?MODULE, new_name, [], timeout).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_erpc_cast() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   erpc:cast(node, ?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   erpc:cast(node, ?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_erpc_multicall_4() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   erpc:multicall(nodes, ?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   erpc:multicall(nodes, ?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_erpc_multicall_5() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   erpc:multicall(nodes, ?MODULE, bar, [], timeout).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   erpc:multicall(nodes, ?MODULE, new_name, [], timeout).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_erpc_multicast() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   erpc:multicast(nodes, ?MODULE, bar, []).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   erpc:multicast(nodes, ?MODULE, new_name, []).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
+
+    #[test]
+    fn test_rename_in_erpc_send_request() {
+        check(
+            "new_name",
+            r#"
+               //- /src/baz.erl
+               -module(baz).
+               foo() ->
+                   erpc:send_request(node, ?MODULE, bar, [], label, collection).
+
+               b~ar() ->
+                    ok."#,
+            r#"
+               -module(baz).
+               foo() ->
+                   erpc:send_request(node, ?MODULE, new_name, [], label, collection).
+
+               new_name() ->
+                    ok."#,
+        );
+    }
 }

From cb9f719878709475c15b77408f2ba3447bab2f74 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 3 Oct 2025 10:58:55 -0700
Subject: [PATCH 149/394] Use a FxHashMap to store the patterns of interest for
 dynamic calls and a macro to reduce verbosity

Summary:
Now that the list of patterns has a certain size, use a hash-map, combined with `lazy_static`.

Also, introduce a macro to make the definitions less verbose.

Reviewed By: jcpetruzza

Differential Revision: D83843586

fbshipit-source-id: 2a9b0f7ace4e285c7d08737400859618404938fb
---
 crates/hir/src/sema/to_def.rs | 568 +++++++---------------------------
 1 file changed, 111 insertions(+), 457 deletions(-)

diff --git a/crates/hir/src/sema/to_def.rs b/crates/hir/src/sema/to_def.rs
index ebc29d6d5d..fcefa17929 100644
--- a/crates/hir/src/sema/to_def.rs
+++ b/crates/hir/src/sema/to_def.rs
@@ -781,15 +781,12 @@ impl ToDef for ast::ExprArgs {
     }
 }
 
+use fxhash::FxHashMap;
+use lazy_static::lazy_static;
+
 /// Pattern for matching dynamic call expressions (apply, rpc calls, etc.)
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 struct DynamicCallPattern {
-    /// Expected module name (None means no explicit module prefix, i.e., implicit erlang module)
-    module: Option<&'static str>,
-    /// Expected function name
-    function: &'static str,
-    /// Expected arity for this pattern
-    arity: usize,
     /// Index of the target module argument (None when target function is in same module)
     module_arg_index: Option<usize>,
     /// Index of the target function argument
@@ -800,428 +797,106 @@ struct DynamicCallPattern {
     direct_arity: bool,
 }
 
-static DYNAMIC_CALL_PATTERNS: &[DynamicCallPattern] = &[
-    // apply/2 (implicit erlang:apply/2) - apply(Fun, Args)
-    DynamicCallPattern {
-        module: None,
-        function: "apply",
-        arity: 2,
-        module_arg_index: None,
-        function_arg_index: 0,
-        args_list_index: 1,
-        direct_arity: false,
-    },
-    // apply/3 (implicit erlang:apply/3) - apply(Module, Function, Args)
-    DynamicCallPattern {
-        module: None,
-        function: "apply",
-        arity: 3,
-        module_arg_index: Some(0),
-        function_arg_index: 1,
-        args_list_index: 2,
-        direct_arity: false,
-    },
-    // erlang:apply/2 (explicit) - erlang:apply(Fun, Args)
-    DynamicCallPattern {
-        module: Some("erlang"),
-        function: "apply",
-        arity: 2,
-        module_arg_index: None,
-        function_arg_index: 0,
-        args_list_index: 1,
-        direct_arity: false,
-    },
-    // erlang:apply/3 (explicit) - erlang:apply(Module, Function, Args)
-    DynamicCallPattern {
-        module: Some("erlang"),
-        function: "apply",
-        arity: 3,
-        module_arg_index: Some(0),
-        function_arg_index: 1,
-        args_list_index: 2,
-        direct_arity: false,
-    },
-    // rpc:call/4 - rpc:call(Node, Module, Function, Args)
-    DynamicCallPattern {
-        module: Some("rpc"),
-        function: "call",
-        arity: 4,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-    // rpc:call/5 - rpc:call(Node, Module, Function, Args, Timeout)
-    DynamicCallPattern {
-        module: Some("rpc"),
-        function: "call",
-        arity: 5,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-    // rpc:async_call/4 - rpc:async_call(Node, Module, Function, Args)
-    DynamicCallPattern {
-        module: Some("rpc"),
-        function: "async_call",
-        arity: 4,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-    // rpc:cast/4 - rpc:cast(Node, Module, Function, Args)
-    DynamicCallPattern {
-        module: Some("rpc"),
-        function: "cast",
-        arity: 4,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-    // rpc:multicall/3 - rpc:multicall(Module, Function, Args)
-    DynamicCallPattern {
-        module: Some("rpc"),
-        function: "multicall",
-        arity: 3,
-        module_arg_index: Some(0),
-        function_arg_index: 1,
-        args_list_index: 2,
-        direct_arity: false,
-    },
-    // rpc:multicall/4 - rpc:multicall(Module, Function, Args, Timeout)
-    DynamicCallPattern {
-        module: Some("rpc"),
-        function: "multicall",
-        arity: 4,
-        module_arg_index: Some(0),
-        function_arg_index: 1,
-        args_list_index: 2,
-        direct_arity: false,
-    },
-    // rpc:multicall/5 - rpc:multicall(Nodes, Module, Function, Args, Timeout)
-    DynamicCallPattern {
-        module: Some("rpc"),
-        function: "multicall",
-        arity: 5,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-    // function_exported/3 (implicit erlang:function_exported/3) - function_exported(Module, Function, Arity)
-    DynamicCallPattern {
-        module: None,
-        function: "function_exported",
-        arity: 3,
-        module_arg_index: Some(0),
-        function_arg_index: 1,
-        args_list_index: 2,
-        direct_arity: true,
-    },
-    // erlang:function_exported/3 (explicit) - erlang:function_exported(Module, Function, Arity)
-    DynamicCallPattern {
-        module: Some("erlang"),
-        function: "function_exported",
-        arity: 3,
-        module_arg_index: Some(0),
-        function_arg_index: 1,
-        args_list_index: 2,
-        direct_arity: true,
-    },
-    // is_builtin/3 (implicit erlang:is_builtin/3) - is_builtin(Module, Function, Arity)
-    DynamicCallPattern {
-        module: None,
-        function: "is_builtin",
-        arity: 3,
-        module_arg_index: Some(0),
-        function_arg_index: 1,
-        args_list_index: 2,
-        direct_arity: true,
-    },
-    // erlang:is_builtin/3 (explicit) - erlang:is_builtin(Module, Function, Arity)
-    DynamicCallPattern {
-        module: Some("erlang"),
-        function: "is_builtin",
-        arity: 3,
-        module_arg_index: Some(0),
-        function_arg_index: 1,
-        args_list_index: 2,
-        direct_arity: true,
-    },
-    // hibernate/3 (implicit erlang:hibernate/3) - hibernate(Module, Function, Args)
-    DynamicCallPattern {
-        module: None,
-        function: "hibernate",
-        arity: 3,
-        module_arg_index: Some(0),
-        function_arg_index: 1,
-        args_list_index: 2,
-        direct_arity: false,
-    },
-    // erlang:hibernate/3 (explicit) - erlang:hibernate(Module, Function, Args)
-    DynamicCallPattern {
-        module: Some("erlang"),
-        function: "hibernate",
-        arity: 3,
-        module_arg_index: Some(0),
-        function_arg_index: 1,
-        args_list_index: 2,
-        direct_arity: false,
-    },
-    // spawn/3 (implicit erlang:spawn/3) - spawn(Module, Function, Args)
-    DynamicCallPattern {
-        module: None,
-        function: "spawn",
-        arity: 3,
-        module_arg_index: Some(0),
-        function_arg_index: 1,
-        args_list_index: 2,
-        direct_arity: false,
-    },
-    // erlang:spawn/3 (explicit) - erlang:spawn(Module, Function, Args)
-    DynamicCallPattern {
-        module: Some("erlang"),
-        function: "spawn",
-        arity: 3,
-        module_arg_index: Some(0),
-        function_arg_index: 1,
-        args_list_index: 2,
-        direct_arity: false,
-    },
-    // spawn/4 (implicit erlang:spawn/4) - spawn(Node, Module, Function, Args)
-    DynamicCallPattern {
-        module: None,
-        function: "spawn",
-        arity: 4,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-    // erlang:spawn/4 (explicit) - erlang:spawn(Node, Module, Function, Args)
-    DynamicCallPattern {
-        module: Some("erlang"),
-        function: "spawn",
-        arity: 4,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-    // spawn_link/3 (implicit erlang:spawn_link/3) - spawn_link(Module, Function, Args)
-    DynamicCallPattern {
-        module: None,
-        function: "spawn_link",
-        arity: 3,
-        module_arg_index: Some(0),
-        function_arg_index: 1,
-        args_list_index: 2,
-        direct_arity: false,
-    },
-    // erlang:spawn_link/3 (explicit) - erlang:spawn_link(Module, Function, Args)
-    DynamicCallPattern {
-        module: Some("erlang"),
-        function: "spawn_link",
-        arity: 3,
-        module_arg_index: Some(0),
-        function_arg_index: 1,
-        args_list_index: 2,
-        direct_arity: false,
-    },
-    // spawn_link/4 (implicit erlang:spawn_link/4) - spawn_link(Node, Module, Function, Args)
-    DynamicCallPattern {
-        module: None,
-        function: "spawn_link",
-        arity: 4,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-    // erlang:spawn_link/4 (explicit) - erlang:spawn_link(Node, Module, Function, Args)
-    DynamicCallPattern {
-        module: Some("erlang"),
-        function: "spawn_link",
-        arity: 4,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-    // spawn_monitor/3 (implicit erlang:spawn_monitor/3) - spawn_monitor(Module, Function, Args)
-    DynamicCallPattern {
-        module: None,
-        function: "spawn_monitor",
-        arity: 3,
-        module_arg_index: Some(0),
-        function_arg_index: 1,
-        args_list_index: 2,
-        direct_arity: false,
-    },
-    // erlang:spawn_monitor/3 (explicit) - erlang:spawn_monitor(Module, Function, Args)
-    DynamicCallPattern {
-        module: Some("erlang"),
-        function: "spawn_monitor",
-        arity: 3,
-        module_arg_index: Some(0),
-        function_arg_index: 1,
-        args_list_index: 2,
-        direct_arity: false,
-    },
-    // spawn_monitor/4 (implicit erlang:spawn_monitor/4) - spawn_monitor(Node, Module, Function, Args)
-    DynamicCallPattern {
-        module: None,
-        function: "spawn_monitor",
-        arity: 4,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-    // erlang:spawn_monitor/4 (explicit) - erlang:spawn_monitor(Node, Module, Function, Args)
-    DynamicCallPattern {
-        module: Some("erlang"),
-        function: "spawn_monitor",
-        arity: 4,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-    // spawn_opt/4 (implicit erlang:spawn_opt/4) - spawn_opt(Module, Function, Args, Options)
-    DynamicCallPattern {
-        module: None,
-        function: "spawn_opt",
-        arity: 4,
-        module_arg_index: Some(0),
-        function_arg_index: 1,
-        args_list_index: 2,
-        direct_arity: false,
-    },
-    // erlang:spawn_opt/4 (explicit) - erlang:spawn_opt(Module, Function, Args, Options)
-    DynamicCallPattern {
-        module: Some("erlang"),
-        function: "spawn_opt",
-        arity: 4,
-        module_arg_index: Some(0),
-        function_arg_index: 1,
-        args_list_index: 2,
-        direct_arity: false,
-    },
-    // spawn_opt/5 (implicit erlang:spawn_opt/5) - spawn_opt(Node, Module, Function, Args, Options)
-    DynamicCallPattern {
-        module: None,
-        function: "spawn_opt",
-        arity: 5,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-    // erlang:spawn_opt/5 (explicit) - erlang:spawn_opt(Node, Module, Function, Args, Options)
-    DynamicCallPattern {
-        module: Some("erlang"),
-        function: "spawn_opt",
-        arity: 5,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-    // spawn_request/5 (implicit erlang:spawn_request/5) - spawn_request(Node, Module, Function, Args, Options)
-    DynamicCallPattern {
-        module: None,
-        function: "spawn_request",
-        arity: 5,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-    // erlang:spawn_request/5 (explicit) - erlang:spawn_request(Node, Module, Function, Args, Options)
-    DynamicCallPattern {
-        module: Some("erlang"),
-        function: "spawn_request",
-        arity: 5,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-    // erpc:call/4 - erpc:call(Node, Module, Function, Args)
-    DynamicCallPattern {
-        module: Some("erpc"),
-        function: "call",
-        arity: 4,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-    // erpc:call/5 - erpc:call(Node, Module, Function, Args, TimeoutOrOptions)
-    DynamicCallPattern {
-        module: Some("erpc"),
-        function: "call",
-        arity: 5,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-    // erpc:cast/4 - erpc:cast(Node, Module, Function, Args)
-    DynamicCallPattern {
-        module: Some("erpc"),
-        function: "cast",
-        arity: 4,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-    // erpc:multicall/4 - erpc:multicall(Nodes, Module, Function, Args)
-    DynamicCallPattern {
-        module: Some("erpc"),
-        function: "multicall",
-        arity: 4,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-    // erpc:multicall/5 - erpc:multicall(Nodes, Module, Function, Args, TimeoutOrOptions)
-    DynamicCallPattern {
-        module: Some("erpc"),
-        function: "multicall",
-        arity: 5,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-    // erpc:multicast/4 - erpc:multicast(Nodes, Module, Function, Args)
-    DynamicCallPattern {
-        module: Some("erpc"),
-        function: "multicast",
-        arity: 4,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-    // erpc:send_request/6 - erpc:send_request(Node, Module, Function, Args, Label, RequestIdCollection)
-    DynamicCallPattern {
-        module: Some("erpc"),
-        function: "send_request",
-        arity: 6,
-        module_arg_index: Some(1),
-        function_arg_index: 2,
-        args_list_index: 3,
-        direct_arity: false,
-    },
-];
+type PatternKey = (Option<&'static str>, &'static str, usize);
+
+macro_rules! add_patterns {
+    ($patterns:ident, [$(($module:expr, $func:literal, $arity:literal, $module_idx:expr, $func_idx:literal, $args_idx:literal, $direct:expr)),* $(,)?]) => {
+        $(
+            $patterns.insert(
+                ($module, $func, $arity),
+                DynamicCallPattern {
+                    module_arg_index: $module_idx,
+                    function_arg_index: $func_idx,
+                    args_list_index: $args_idx,
+                    direct_arity: $direct,
+                },
+            );
+        )*
+    };
+}
+
+fn create_dynamic_call_patterns() -> FxHashMap<PatternKey, DynamicCallPattern> {
+    let mut patterns = FxHashMap::default();
+
+    // Each entry follows the format:
+    //
+    // (module, function, arity, module_arg_index, function_arg_index, args_list_index, direct_arity)
+    //
+    // Where:
+    //
+    // module:             Module name (Some("erlang"), Some("rpc"), etc.) or None for implicit erlang functions
+    // function:           Function name as string literal (e.g., "apply", "call", "spawn")
+    // arity:              Number of arguments this function pattern expects
+    // module_arg_index:   Which argument position contains the target module name
+    // function_arg_index: Which argument position contains the target function name
+    // args_list_index:    Which argument position contains the arguments list or arity value
+    // direct_arity:       true if the argument contains the arity value, false if the argument contains a list of arguments
+    //
+    // All indexes are 0-based.
+    add_patterns!(
+        patterns,
+        [
+            // erlang module (implicit)
+            (None, "apply", 2, None, 0, 1, false),
+            (None, "apply", 3, Some(0), 1, 2, false),
+            (None, "function_exported", 3, Some(0), 1, 2, true),
+            (None, "hibernate", 3, Some(0), 1, 2, false),
+            (None, "is_builtin", 3, Some(0), 1, 2, true),
+            (None, "spawn_link", 3, Some(0), 1, 2, false),
+            (None, "spawn_link", 4, Some(1), 2, 3, false),
+            (None, "spawn_monitor", 3, Some(0), 1, 2, false),
+            (None, "spawn_monitor", 4, Some(1), 2, 3, false),
+            (None, "spawn_opt", 4, Some(0), 1, 2, false),
+            (None, "spawn_opt", 5, Some(1), 2, 3, false),
+            (None, "spawn_request", 5, Some(1), 2, 3, false),
+            (None, "spawn", 3, Some(0), 1, 2, false),
+            (None, "spawn", 4, Some(1), 2, 3, false),
+            // erlang module (explicit)
+            (Some("erlang"), "apply", 2, None, 0, 1, false),
+            (Some("erlang"), "apply", 3, Some(0), 1, 2, false),
+            (Some("erlang"), "function_exported", 3, Some(0), 1, 2, true),
+            (Some("erlang"), "hibernate", 3, Some(0), 1, 2, false),
+            (Some("erlang"), "is_builtin", 3, Some(0), 1, 2, true),
+            (Some("erlang"), "spawn_link", 3, Some(0), 1, 2, false),
+            (Some("erlang"), "spawn_link", 4, Some(1), 2, 3, false),
+            (Some("erlang"), "spawn_monitor", 3, Some(0), 1, 2, false),
+            (Some("erlang"), "spawn_monitor", 4, Some(1), 2, 3, false),
+            (Some("erlang"), "spawn_opt", 4, Some(0), 1, 2, false),
+            (Some("erlang"), "spawn_opt", 5, Some(1), 2, 3, false),
+            (Some("erlang"), "spawn_request", 5, Some(1), 2, 3, false),
+            (Some("erlang"), "spawn", 3, Some(0), 1, 2, false),
+            (Some("erlang"), "spawn", 4, Some(1), 2, 3, false),
+            // rpc
+            (Some("rpc"), "call", 4, Some(1), 2, 3, false),
+            (Some("rpc"), "call", 5, Some(1), 2, 3, false),
+            (Some("rpc"), "async_call", 4, Some(1), 2, 3, false),
+            (Some("rpc"), "cast", 4, Some(1), 2, 3, false),
+            (Some("rpc"), "multicall", 3, Some(0), 1, 2, false),
+            (Some("rpc"), "multicall", 4, Some(0), 1, 2, false),
+            (Some("rpc"), "multicall", 5, Some(1), 2, 3, false),
+            // erpc
+            (Some("erpc"), "call", 4, Some(1), 2, 3, false),
+            (Some("erpc"), "call", 5, Some(1), 2, 3, false),
+            (Some("erpc"), "cast", 4, Some(1), 2, 3, false),
+            (Some("erpc"), "multicall", 4, Some(1), 2, 3, false),
+            (Some("erpc"), "multicall", 5, Some(1), 2, 3, false),
+            (Some("erpc"), "multicast", 4, Some(1), 2, 3, false),
+            (Some("erpc"), "send_request", 6, Some(1), 2, 3, false),
+        ]
+    );
+
+    patterns
+}
+
+// Lazy static initialization for the patterns map
+lazy_static! {
+    static ref DYNAMIC_CALL_PATTERNS: FxHashMap<PatternKey, DynamicCallPattern> =
+        create_dynamic_call_patterns();
+}
+
+fn get_dynamic_call_patterns() -> &'static FxHashMap<PatternKey, DynamicCallPattern> {
+    &DYNAMIC_CALL_PATTERNS
+}
 
 fn look_for_dynamic_call(
     sema: &Semantic,
@@ -1241,39 +916,18 @@ fn look_for_dynamic_call(
     let function_atom = body[fun].as_atom()?;
     let function_name = sema.db.lookup_atom(function_atom);
 
-    for pattern in DYNAMIC_CALL_PATTERNS {
-        if matches_pattern(pattern, module_name.as_ref(), &function_name, args.len()) {
-            return resolve_dynamic_call(sema, file_id, pattern, args, body);
-        }
+    // Create pattern key and look up in HashMap for O(1) lookup
+    let module_str = module_name.as_ref().map(|name| name.as_str());
+    let pattern_key = (module_str, function_name.as_str(), args.len());
+
+    let patterns_map = get_dynamic_call_patterns();
+    if let Some(pattern) = patterns_map.get(&pattern_key) {
+        return resolve_dynamic_call(sema, file_id, pattern, args, body);
     }
 
     None
 }
 
-fn matches_pattern(
-    pattern: &DynamicCallPattern,
-    module_name: Option<&Name>,
-    function_name: &Name,
-    arity: usize,
-) -> bool {
-    // Check arity
-    if pattern.arity != arity {
-        return false;
-    }
-
-    // Check function name
-    if function_name.as_str() != pattern.function {
-        return false;
-    }
-
-    // Check module name
-    match (pattern.module, module_name) {
-        (None, None) => true, // No explicit module prefix expected and found
-        (Some(expected), Some(actual)) => expected == actual.as_str(),
-        _ => false, // Mismatch between expected and actual module presence
-    }
-}
-
 fn resolve_dynamic_call(
     sema: &Semantic,
     file_id: FileId,

From 84ee71d963be28f8d7cff84f1ec55a8dbac87239 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 6 Oct 2025 05:42:16 -0700
Subject: [PATCH 150/394] Include dynamic calls when finding references

Summary:
In D41220041 (Nov 2022), we started reporting only direct references for the "find references" functionality. The idea was to filter out references such as the entry in the export list, which were adding noise in the UI, making it harder to find actual references.

Dynamic calls were incorrectly classified as "other", causing dynamic calls not be returned as references (but still working in rename operations, since they applied to *all* references).

Reviewed By: alanz

Differential Revision: D83967812

fbshipit-source-id: bd89c247e89f5823f542c8598b7a28d05b87c9b5
---
 crates/ide/src/handlers/references.rs | 21 +++++++++++++++++++++
 crates/ide_db/src/defs.rs             |  6 +++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/crates/ide/src/handlers/references.rs b/crates/ide/src/handlers/references.rs
index 6f5804f9a1..f9c7d78a41 100644
--- a/crates/ide/src/handlers/references.rs
+++ b/crates/ide/src/handlers/references.rs
@@ -485,6 +485,27 @@ should_not_match() -> #foo{a = 1}.
         );
     }
 
+    #[test]
+    fn test_functions_dynamic_call() {
+        check(
+            r#"
+        //- /src/main.erl
+
+        -export([foo/0]).
+          foo~() -> ok.
+        %%^^^def
+
+        bar() -> apply(main, foo, []).
+        %%                   ^^^
+        baz() -> foo(1).
+
+        //- /src/another.erl
+
+        -import(main, [foo/0]).
+        "#,
+        );
+    }
+
     #[test]
     fn test_functions_import_1() {
         check(
diff --git a/crates/ide_db/src/defs.rs b/crates/ide_db/src/defs.rs
index f857f0cf86..b9d457ddff 100644
--- a/crates/ide_db/src/defs.rs
+++ b/crates/ide_db/src/defs.rs
@@ -234,7 +234,7 @@ impl SymbolClass {
                     reference_direct(sema.to_def(token.with_value(&include)))
                 },
                 ast::ExprArgs(args) => {
-                    from_apply(sema, &token, args.syntax())
+                    from_dynamic_call(sema, &token, args.syntax())
                     .or_else(|| from_is_record(sema, &token, args.syntax()))
                         .or_else(|| from_wrapper(sema, &token, wrapper))
                 },
@@ -452,7 +452,7 @@ fn reference_other<Def: Into<SymbolDefinition>>(def: Option<Def>) -> Option<Symb
     })
 }
 
-pub fn from_apply(
+pub fn from_dynamic_call(
     sema: &Semantic,
     token: &InFile<SyntaxToken>,
     syntax: &SyntaxNode,
@@ -463,7 +463,7 @@ pub fn from_apply(
         SymbolClass::Reference {
             refs: ReferenceClass::Definition(def),
             typ: _,
-        } => reference_other(Some(def)),
+        } => reference_direct(Some(def)),
         _ => None,
     }
 }

From 3e25ccb49b9dfd653c19640443b37f320754a7cf Mon Sep 17 00:00:00 2001
From: Yongchao Lyu <yongchao@meta.com>
Date: Mon, 6 Oct 2025 07:20:24 -0700
Subject: [PATCH 151/394] Add a fact about the module info

Summary:
This diff aims to add a module fact to Glean, including -

- Name of the module
- Oncall, e.g., `-oncall("my_oncall").`
- Behavior, e.g., `-behaviour(my_behaviour).`
- Exported functions, e.g., `-export([start/2, stop/1]).`
- Moduledoc, e.g., `-moduledoc """ ... """`
- File path

Reviewed By: phlalx, robertoaloi

Differential Revision: D83240181

fbshipit-source-id: 7d9b2b32bf960c4983254b87a2e39a7685d0a65b
---
 crates/elp/src/bin/glean.rs                   | 314 +++++++++++++++++-
 .../test/glean/serialization_test.out         |   2 +-
 crates/hir/src/sema.rs                        |  10 +
 3 files changed, 317 insertions(+), 9 deletions(-)

diff --git a/crates/elp/src/bin/glean.rs b/crates/elp/src/bin/glean.rs
index f9bf740eac..23cf36c438 100644
--- a/crates/elp/src/bin/glean.rs
+++ b/crates/elp/src/bin/glean.rs
@@ -25,6 +25,7 @@ use elp_ide::elp_ide_db::EqwalizerDatabase;
 use elp_ide::elp_ide_db::LineIndexDatabase;
 use elp_ide::elp_ide_db::RootDatabase;
 use elp_ide::elp_ide_db::docs::DocDatabase;
+use elp_ide::elp_ide_db::docs::Documentation;
 use elp_ide::elp_ide_db::elp_base_db::FileId;
 use elp_ide::elp_ide_db::elp_base_db::IncludeOtp;
 use elp_ide::elp_ide_db::elp_base_db::ModuleName;
@@ -52,9 +53,11 @@ use hir::DefineId;
 use hir::Expr;
 use hir::ExprId;
 use hir::ExprSource;
+use hir::File;
 use hir::InFile;
 use hir::Literal;
 use hir::MacroName;
+use hir::Module;
 use hir::Name;
 use hir::NameArity;
 use hir::PPDirective;
@@ -144,6 +147,45 @@ impl FileLinesFact {
     }
 }
 
+#[derive(Serialize, Debug)]
+pub(crate) struct ModuleFact {
+    #[serde(rename = "file")]
+    file_id: GleanFileId,
+    name: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    oncall: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    exports: Option<Vec<String>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    behaviours: Option<Vec<String>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    module_doc: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    exdoc_link: Option<String>,
+}
+
+impl ModuleFact {
+    fn new(
+        file_id: FileId,
+        name: String,
+        oncall: Option<String>,
+        exports: Option<Vec<String>>,
+        behaviours: Option<Vec<String>>,
+        module_doc: Option<String>,
+        exdoc_link: Option<String>,
+    ) -> Self {
+        Self {
+            file_id: file_id.into(),
+            name,
+            oncall,
+            exports,
+            behaviours,
+            module_doc,
+            exdoc_link,
+        }
+    }
+}
+
 #[derive(Serialize, Debug)]
 pub(crate) struct FunctionDeclarationFact {
     #[serde(rename = "file")]
@@ -238,6 +280,8 @@ pub(crate) enum Fact {
     XRef { facts: Vec<Key<XRefFact>> },
     #[serde(rename = "erlang.DeclarationComment")]
     DeclarationComment { facts: Vec<Key<CommentFact>> },
+    #[serde(rename = "erlang.Module")]
+    Module { facts: Vec<Key<ModuleFact>> },
 }
 
 #[derive(Serialize, Debug)]
@@ -441,6 +485,7 @@ struct IndexedFacts {
     file_line_facts: Vec<FileLinesFact>,
     declaration_facts: Vec<FunctionDeclarationFact>,
     xref_facts: Vec<XRefFact>,
+    module_facts: Vec<ModuleFact>,
     //v2 facts
     file_declarations: Vec<FileDeclaration>,
     xref_v2: Vec<XRefFile>,
@@ -453,6 +498,7 @@ impl IndexedFacts {
         decl: FileDeclaration,
         xref: XRefFile,
         facts_v1: Option<(Vec<FunctionDeclarationFact>, XRefFact)>,
+        module_fact: Option<ModuleFact>,
     ) -> Self {
         let mut facts = Self::default();
         facts.file_facts.push(file_fact);
@@ -463,6 +509,9 @@ impl IndexedFacts {
             facts.declaration_facts.extend(decl);
             facts.xref_facts.push(xref);
         }
+        if let Some(module_fact) = module_fact {
+            facts.module_facts.push(module_fact);
+        }
         facts
     }
 
@@ -473,6 +522,7 @@ impl IndexedFacts {
         decl: FileDeclaration,
         xref: XRefFile,
         facts: Option<(Vec<FunctionDeclarationFact>, XRefFact)>,
+        module_fact: Option<ModuleFact>,
     ) {
         self.file_facts.push(file_fact);
         self.file_line_facts.push(line_fact);
@@ -482,6 +532,9 @@ impl IndexedFacts {
             self.declaration_facts.extend(decl);
             self.xref_facts.push(xref);
         }
+        if let Some(module_fact) = module_fact {
+            self.module_facts.push(module_fact);
+        }
     }
 
     fn into_v1_facts(mut self) -> Vec<Fact> {
@@ -687,6 +740,8 @@ impl IndexedFacts {
             });
         }
         let xref_fact = xrefs.into_iter().map_into().collect();
+        let module_facts = mem::take(&mut self.module_facts);
+        let module_facts = module_facts.into_iter().map_into().collect();
         vec![
             Fact::File {
                 facts: mem::take(&mut self.file_facts),
@@ -699,6 +754,9 @@ impl IndexedFacts {
             },
             Fact::XRef { facts: xref_fact },
             Fact::DeclarationComment { facts: comments },
+            Fact::Module {
+                facts: module_facts,
+            },
         ]
     }
 }
@@ -811,11 +869,11 @@ impl GleanIndexer {
                     &module_index,
                     config.prefix.as_ref(),
                 ) {
-                    Some((file, line, decl, xref, facts)) => {
+                    Some((file, line, decl, xref, facts, module_fact)) => {
                         let mut result = FxHashMap::default();
                         result.insert(
                             FACTS_FILE.to_string(),
-                            IndexedFacts::new(file, line, decl, xref, facts),
+                            IndexedFacts::new(file, line, decl, xref, facts, module_fact),
                         );
                         result
                     }
@@ -839,8 +897,8 @@ impl GleanIndexer {
                     .flatten()
                     .flatten();
                 if config.multi {
-                    iter.map(|(file, line, decl, xref, facts)| {
-                        IndexedFacts::new(file, line, decl, xref, facts)
+                    iter.map(|(file, line, decl, xref, facts, module_fact)| {
+                        IndexedFacts::new(file, line, decl, xref, facts, module_fact)
                     })
                     .collect::<Vec<_>>()
                     .into_iter()
@@ -851,8 +909,8 @@ impl GleanIndexer {
                     let mut result = FxHashMap::default();
                     let facts = iter.collect::<Vec<_>>().into_iter().fold(
                         IndexedFacts::default(),
-                        |mut acc, (file_fact, line_fact, decl, xref, facts)| {
-                            acc.add(file_fact, line_fact, decl, xref, facts);
+                        |mut acc, (file_fact, line_fact, decl, xref, facts, module_fact)| {
+                            acc.add(file_fact, line_fact, decl, xref, facts, module_fact);
                             acc
                         },
                     );
@@ -897,6 +955,7 @@ impl GleanIndexer {
         FileDeclaration,
         XRefFile,
         Option<(Vec<FunctionDeclarationFact>, XRefFact)>,
+        Option<ModuleFact>,
     )> {
         let file_fact = Self::file_fact(db, file_id, path, project_id, prefix)?;
         let line_fact = Self::line_fact(db, file_id);
@@ -908,9 +967,68 @@ impl GleanIndexer {
         if let Some(module) = elp_module_index.module_for_file(file_id) {
             let decl = Self::declarations_v1(db, file_id, module);
             let xref = Self::xrefs(db, file_id, module_index);
-            return Some((file_fact, line_fact, file_decl, xref_v2, Some((decl, xref))));
+            let module_fact = Self::module_fact(db, file_id, module);
+            return Some((
+                file_fact,
+                line_fact,
+                file_decl,
+                xref_v2,
+                Some((decl, xref)),
+                Some(module_fact),
+            ));
         }
-        Some((file_fact, line_fact, file_decl, xref_v2, None))
+        Some((file_fact, line_fact, file_decl, xref_v2, None, None))
+    }
+
+    fn module_fact(db: &RootDatabase, file_id: FileId, module_name: &ModuleName) -> ModuleFact {
+        let module = Module {
+            file: File { file_id },
+        };
+        let name = module_name.to_string();
+
+        // Extract exported functions from def_map
+        let def_map = db.def_map_local(file_id);
+
+        let mut exports = vec![];
+        for (fun, def) in def_map.get_functions() {
+            if def.exported {
+                exports.push(format!("{}/{}", fun.name(), fun.arity()));
+            }
+        }
+
+        // Extract oncall, behaviour, and moduledoc using form_list API
+        let sema = Semantic::new(db);
+        let form_list = sema.form_list(file_id);
+
+        let oncall = sema.attribute_value_as_string(file_id, hir::known::oncall);
+
+        let behaviours: Vec<String> = form_list
+            .behaviour_attributes()
+            .map(|(_, behaviour)| behaviour.name.to_string())
+            .collect();
+
+        let module_doc = sema.module_attribute(file_id).and_then(|module_attribute| {
+            let docs = Documentation::new(db, &sema);
+            docs.to_doc(InFile::new(file_id, &module_attribute))
+                .map(|doc| doc.markdown_text().to_string())
+                .filter(|text| !text.is_empty())
+        });
+
+        // @fb-only
+        let exdoc_link = (!module.is_in_otp(sema.db) && module.has_moduledoc(sema.db)).then(|| {
+            // @fb-only
+            // @fb-only
+        });
+
+        ModuleFact::new(
+            file_id,
+            name,
+            oncall,
+            (!exports.is_empty()).then_some(exports),
+            (!behaviours.is_empty()).then_some(behaviours),
+            module_doc,
+            exdoc_link,
+        )
     }
 
     fn add_xref_based_declarations(
@@ -1924,6 +2042,7 @@ mod tests {
             file_line_facts,
             declaration_facts: vec![],
             xref_facts: vec![],
+            module_facts: vec![],
             file_declarations: vec![decl],
             xref_v2: vec![xref],
         };
@@ -2649,6 +2768,185 @@ mod tests {
         xref_v2_check(spec);
     }
 
+    #[test]
+    fn module_fact_test() {
+        let spec = r#"
+        //- /src/sample_worker.erl
+        %%% This is a module documentation
+        %%% It explains what this module does
+        -module(sample_worker).
+        -oncall("platform_team").
+        -behaviour(gen_server).
+        -export([init/1, handle_task/2]).
+
+        init(Args) -> {ok, Args}.
+        handle_task(Task, State) -> {reply, ok, State}.
+        internal_helper(X) -> X + 1.
+        "#;
+        let (facts, _, _, _, _) = facts_with_annotations(spec);
+        assert_eq!(facts.module_facts.len(), 1);
+        let module_fact = &facts.module_facts[0];
+        assert_eq!(module_fact.name, "sample_worker");
+        assert_eq!(module_fact.oncall, Some("platform_team".to_string()));
+        assert_eq!(module_fact.behaviours, Some(vec!["gen_server".to_string()]));
+        assert_eq!(module_fact.exports.as_ref().map(|v| v.len()), Some(2));
+        for expected in ["handle_task/2", "init/1"] {
+            assert!(
+                module_fact
+                    .exports
+                    .as_ref()
+                    .unwrap()
+                    .contains(&expected.to_string())
+            );
+        }
+        assert!(module_fact.module_doc.is_none());
+    }
+
+    #[test]
+    fn module_fact_multiple_behaviours_test() {
+        let spec = r#"
+        //- /src/factory_service.erl
+        -module(factory_service).
+        -oncall("manufacturing_team").
+        -behaviour(supervisor).
+        -behaviour(gen_factory).
+        -behaviour(gen_industry).
+
+        start_supervision() -> supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+        create_product(Type, Config) -> gen_factory:produce(Type, Config).
+        manage_assembly(Parts) -> gen_industry:assemble(Parts).
+        "#;
+        let (facts, _, _, _, _) = facts_with_annotations(spec);
+        assert_eq!(facts.module_facts.len(), 1);
+        let module_fact = &facts.module_facts[0];
+        assert_eq!(module_fact.name, "factory_service");
+        assert_eq!(module_fact.oncall, Some("manufacturing_team".to_string()));
+        assert_eq!(module_fact.behaviours.as_ref().map(|v| v.len()), Some(3));
+        for expected in ["gen_factory", "gen_industry", "supervisor"] {
+            assert!(
+                module_fact
+                    .behaviours
+                    .as_ref()
+                    .unwrap()
+                    .contains(&expected.to_string())
+            );
+        }
+        assert!(module_fact.exports.is_none());
+        assert!(module_fact.module_doc.is_none());
+    }
+
+    #[test]
+    fn module_fact_moduledoc_multiple_line_test() {
+        let spec = r#"
+        //- /src/data_processor.erl
+        -module(data_processor).
+        -oncall("data_team").
+        -moduledoc """
+        Data processing module for batch operations
+        Handles various data transformation tasks
+        For more information see:
+        https://www.example.com/data/processing
+        """.
+        -behaviour(gen_statem).
+        -export([
+            start_link/0,
+            process_batch/1,
+            get_status/0
+        ]).
+
+        start_link() -> gen_statem:start_link(?MODULE, [], []).
+        process_batch(Data) -> gen_statem:call(?SERVER, {process, Data}).
+        get_status() -> gen_statem:call(?SERVER, status).
+        "#;
+        let (facts, _, _, _, _) = facts_with_annotations(spec);
+        assert_eq!(facts.module_facts.len(), 1);
+        let module_fact = &facts.module_facts[0];
+        assert_eq!(module_fact.name, "data_processor");
+        assert_eq!(module_fact.oncall, Some("data_team".to_string()));
+        assert_eq!(module_fact.behaviours, Some(vec!["gen_statem".to_string()]));
+        assert_eq!(module_fact.exports.as_ref().map(|v| v.len()), Some(3));
+        for expected in ["get_status/0", "process_batch/1", "start_link/0"] {
+            assert!(
+                module_fact
+                    .exports
+                    .as_ref()
+                    .unwrap()
+                    .contains(&expected.to_string())
+            );
+        }
+        assert!(module_fact.module_doc.is_some());
+        let doc = module_fact.module_doc.as_ref().unwrap();
+        assert!(doc.contains("Data processing module for batch operations"));
+        assert!(doc.contains("https://www.example.com/data/processing"));
+    }
+
+    #[test]
+    fn module_fact_moduledoc_single_line_test() {
+        let spec = r#"
+        //- /src/config_manager.erl
+        -module(config_manager).
+        -oncall("infra_team").
+        -moduledoc "Configuration management module for system settings".
+        -behaviour(application).
+        -export([load_config/1, save_config/2]).
+
+        load_config(File) -> {ok, config}.
+        save_config(File, Config) -> ok.
+        "#;
+        let (facts, _, _, _, _) = facts_with_annotations(spec);
+        assert_eq!(facts.module_facts.len(), 1);
+        let module_fact = &facts.module_facts[0];
+        assert_eq!(module_fact.name, "config_manager");
+        assert_eq!(module_fact.oncall, Some("infra_team".to_string()));
+        assert_eq!(
+            module_fact.behaviours,
+            Some(vec!["application".to_string()])
+        );
+        assert_eq!(module_fact.exports.as_ref().map(|v| v.len()), Some(2));
+        for expected in ["load_config/1", "save_config/2"] {
+            assert!(
+                module_fact
+                    .exports
+                    .as_ref()
+                    .unwrap()
+                    .contains(&expected.to_string())
+            );
+        }
+        assert!(module_fact.module_doc.is_some());
+        let doc = module_fact.module_doc.as_ref().unwrap();
+        assert_eq!(doc, "Configuration management module for system settings");
+    }
+
+    #[test]
+    fn module_fact_no_oncall_test() {
+        let spec = r#"
+        //- /src/utility_helper.erl
+        -module(utility_helper).
+        -behaviour(supervisor).
+        -export([start_link/0, add_child/2]).
+
+        start_link() -> supervisor:start_link({local, ?MODULE}, ?MODULE, []).
+        add_child(ChildSpec, Opts) -> supervisor:start_child(?MODULE, {ChildSpec, Opts}).
+        "#;
+        let (facts, _, _, _, _) = facts_with_annotations(spec);
+        assert_eq!(facts.module_facts.len(), 1);
+        let module_fact = &facts.module_facts[0];
+        assert_eq!(module_fact.name, "utility_helper");
+        assert_eq!(module_fact.oncall, None);
+        assert_eq!(module_fact.behaviours, Some(vec!["supervisor".to_string()]));
+        assert_eq!(module_fact.exports.as_ref().map(|v| v.len()), Some(2));
+        for expected in ["add_child/2", "start_link/0"] {
+            assert!(
+                module_fact
+                    .exports
+                    .as_ref()
+                    .unwrap()
+                    .contains(&expected.to_string())
+            );
+        }
+        assert!(module_fact.module_doc.is_none());
+    }
+
     #[allow(clippy::type_complexity)]
     fn facts_with_annotations(
         spec: &str,
diff --git a/crates/elp/src/resources/test/glean/serialization_test.out b/crates/elp/src/resources/test/glean/serialization_test.out
index da7d9f4145..43d41030fa 100644
--- a/crates/elp/src/resources/test/glean/serialization_test.out
+++ b/crates/elp/src/resources/test/glean/serialization_test.out
@@ -1 +1 @@
-[{"predicate":"src.File","facts":[{"id":10072,"key":"/local/whatsapp/server/erl/groupd_service/test/p13n/grpd_p13n_new_create_group_SUITE.erl"}]},{"predicate":"src.FileLines","facts":[{"key":{"file":10072,"lengths":[71,42],"endsInNewline":true,"hasUnicodeOrTabs":true}}]},{"predicate":"erlang.FunctionDeclaration","facts":[{"key":{"file":10072,"fqn":{"module":"smax_product_catalog","name":"product_visibility_update_request_iq","arity":0},"span":{"start":0,"length":10}}}]},{"predicate":"erlang.XRefsViaFqnByFile","facts":[{"key":{"file":10072,"xrefs":[{"source":{"start":0,"length":10},"target":{"module":"smax_product_catalog","name":"product_visibility_update_request_iq","arity":0}}]}}]},{"predicate":"erlang.DeclarationComment","facts":[]}]
\ No newline at end of file
+[{"predicate":"src.File","facts":[{"id":10072,"key":"/local/whatsapp/server/erl/groupd_service/test/p13n/grpd_p13n_new_create_group_SUITE.erl"}]},{"predicate":"src.FileLines","facts":[{"key":{"file":10072,"lengths":[71,42],"endsInNewline":true,"hasUnicodeOrTabs":true}}]},{"predicate":"erlang.FunctionDeclaration","facts":[{"key":{"file":10072,"fqn":{"module":"smax_product_catalog","name":"product_visibility_update_request_iq","arity":0},"span":{"start":0,"length":10}}}]},{"predicate":"erlang.XRefsViaFqnByFile","facts":[{"key":{"file":10072,"xrefs":[{"source":{"start":0,"length":10},"target":{"module":"smax_product_catalog","name":"product_visibility_update_request_iq","arity":0}}]}}]},{"predicate":"erlang.DeclarationComment","facts":[]},{"predicate":"erlang.Module","facts":[]}]
\ No newline at end of file
diff --git a/crates/hir/src/sema.rs b/crates/hir/src/sema.rs
index cf88e0cf3d..78a7db7c3c 100644
--- a/crates/hir/src/sema.rs
+++ b/crates/hir/src/sema.rs
@@ -823,6 +823,16 @@ impl Semantic<'_> {
         }
     }
 
+    pub fn attribute_value_as_string(&self, file_id: FileId, name: Name) -> Option<String> {
+        let attr = self.attribute(file_id, name)?;
+        match &attr.body[attr.value] {
+            Term::Literal(Literal::String(string_literal)) => {
+                Some(string_literal.chars().collect())
+            }
+            _ => None,
+        }
+    }
+
     /// Find all other variables within the function clause that resolve
     /// to the one given.
     pub fn find_local_usages(

From 8ddb16f879cf79571c4c9b65c97fe0fbae0b459f Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 6 Oct 2025 08:49:11 -0700
Subject: [PATCH 152/394] Add testcase showcasing the issue with dynamic calls
 from macros

Summary: Add a testcase that showcases an existing bug in ELP.

Reviewed By: alanz

Differential Revision: D83968438

fbshipit-source-id: 6fdb5d98fb0634b9c5de16c8f35c0489cecb3915
---
 crates/ide/src/handlers/references.rs | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/crates/ide/src/handlers/references.rs b/crates/ide/src/handlers/references.rs
index f9c7d78a41..9a7198df55 100644
--- a/crates/ide/src/handlers/references.rs
+++ b/crates/ide/src/handlers/references.rs
@@ -506,6 +506,30 @@ should_not_match() -> #foo{a = 1}.
         );
     }
 
+    // T135584204: Dynamic call from macro not recognized
+    #[test]
+    #[should_panic]
+    fn test_functions_dynamic_call_from_macro() {
+        check(
+            r#"
+        //- /src/main.erl
+
+        -export([foo/0]).
+          foo~() -> ok.
+        %%^^^def
+
+        -define(APPLY, apply).
+
+        bar() ->
+          ?APPLY(main, foo, []),
+        %%             ^^^
+          apply(main, foo, []).
+        %%            ^^^
+        baz() -> foo(1).
+        "#,
+        );
+    }
+
     #[test]
     fn test_functions_import_1() {
         check(

From 31e798f36910aea5fc60084dca8beff6af5cfc1c Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 7 Oct 2025 01:12:55 -0700
Subject: [PATCH 153/394] send explicit telemetry to track the time from the
 server starting to operational

Summary:
We want to clearly track the time from ELP starting up to when it can be used.

To this end we introduce a new telemetry item, with a title of "ELP operational".  This is currently defined as the first point when the status changes to `Running`.

Reviewed By: robertoaloi

Differential Revision: D83977797

fbshipit-source-id: eb95a6d7b3c6ef7b1ea7ddae99e4ebe6e5bb318c
---
 crates/elp/src/server.rs                   |  1 +
 crates/elp/src/server/telemetry_manager.rs | 32 ++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index 72791e54ef..0c76ce38bf 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -970,6 +970,7 @@ impl Server {
                     self.show_message(params);
                 }
                 self.transition(Status::Running);
+                self.telemetry_manager.operational();
                 self.initial_load_status = InitialLoading::DoneButVfsChanges;
                 self.schedule_compile_deps();
                 self.schedule_cache();
diff --git a/crates/elp/src/server/telemetry_manager.rs b/crates/elp/src/server/telemetry_manager.rs
index 8cb1f2f104..b1cb2d3ac9 100644
--- a/crates/elp/src/server/telemetry_manager.rs
+++ b/crates/elp/src/server/telemetry_manager.rs
@@ -28,11 +28,15 @@ const PERIODIC_INTERVAL_MS: Duration = Duration::from_millis(60_000);
 
 pub(crate) struct TelemetryManager {
     last_periodic_processed: Instant,
+    server_started_at: SystemTime,
+    already_operational: bool,
 }
 impl TelemetryManager {
     pub(crate) fn new() -> Self {
         Self {
             last_periodic_processed: Instant::now(),
+            server_started_at: SystemTime::now(),
+            already_operational: false,
         }
     }
 
@@ -65,6 +69,34 @@ impl TelemetryManager {
             };
         }
     }
+
+    pub(crate) fn operational(&mut self) {
+        if !self.already_operational {
+            let duration = self
+                .server_started_at
+                .elapsed()
+                .map(|e| e.as_millis())
+                .unwrap_or(0) as u32;
+
+            #[derive(Serialize)]
+            struct Operational {
+                title: String,
+            }
+            let data = Operational {
+                title: "ELP operational".to_string(),
+            };
+            let data = serde_json::to_value(data).unwrap_or_else(|err| {
+                serde_json::Value::String(format!("JSON serialization failed: {err}"))
+            });
+            telemetry::send_with_duration(
+                String::from("telemetry"),
+                data,
+                duration,
+                self.server_started_at,
+            );
+            self.already_operational = true;
+        }
+    }
 }
 
 // ---------------------------------------------------------------------

From 742281abcfb43877eb09a89edf936d887372e8a8 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 7 Oct 2025 07:05:12 -0700
Subject: [PATCH 154/394] Bump tree-sitter-erlang version to 0.15

Summary: As title

Reviewed By: VLanvin

Differential Revision: D84054291

fbshipit-source-id: c3843ca1e86b73a4a6bdd2843aba943e2322be6a
---
 Cargo.lock | 2 +-
 Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a03c78f3cc..ce4109d3c1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2534,7 +2534,7 @@ dependencies = [
 
 [[package]]
 name = "tree-sitter-erlang"
-version = "0.14.0"
+version = "0.15.0"
 dependencies = [
  "cc",
  "tree-sitter",
diff --git a/Cargo.toml b/Cargo.toml
index 7ec49a5f83..6823c94afd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -113,7 +113,7 @@ timeout-readwrite = "0.3.3"
 toml = "0.5"
 tree-sitter = "0.23.2"
 # @fb-only
-tree-sitter-erlang = "0.14.0" # @oss-only
+tree-sitter-erlang = "0.15.0" # @oss-only
 url = "2.5.4"
 ustr = { version = "1.1.0", features = ["serde"] }
 vfs = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-04" }

From 1bbfa6c6420b8f912170321afcb592cf47789e2c Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 8 Oct 2025 02:31:40 -0700
Subject: [PATCH 155/394] Improve linters documentation

Summary:
* Restructure the linter tutorial into multiple pages to improve readability
* Add docs for the other types of linters
* Show line numbers and highlight affected lines in code snippets

Reviewed By: alanz

Differential Revision: D83986965

fbshipit-source-id: db7b31c23a8f86961895ee154b15321280ec984b
---
 website/docs/contributing/linters.mdx         | 284 -------------
 .../contributing/linters/linter-traits.md     | 376 ++++++++++++++++++
 .../linters/linters-step-1-diagnostic-code.md |  75 ++++
 .../linters/linters-step-2-module.md          |  87 ++++
 .../linters/linters-step-3-tests.md           |  70 ++++
 .../linters/linters-step-4-documentation.md   |  49 +++
 website/docs/contributing/linters/linters.md  |  29 ++
 website/src/css/custom.css                    |   6 +-
 8 files changed, 691 insertions(+), 285 deletions(-)
 delete mode 100644 website/docs/contributing/linters.mdx
 create mode 100644 website/docs/contributing/linters/linter-traits.md
 create mode 100644 website/docs/contributing/linters/linters-step-1-diagnostic-code.md
 create mode 100644 website/docs/contributing/linters/linters-step-2-module.md
 create mode 100644 website/docs/contributing/linters/linters-step-3-tests.md
 create mode 100644 website/docs/contributing/linters/linters-step-4-documentation.md
 create mode 100644 website/docs/contributing/linters/linters.md

diff --git a/website/docs/contributing/linters.mdx b/website/docs/contributing/linters.mdx
deleted file mode 100644
index d09e50b716..0000000000
--- a/website/docs/contributing/linters.mdx
+++ /dev/null
@@ -1,284 +0,0 @@
----
-sidebar_position: 1
-title: "Linters"
----
-
-# Adding a new linter
-
-ELP provides a flexible framework for adding custom linters (diagnostics) to
-detect issues in Erlang code. This guide walks you through the process of
-creating a new linter.
-
-## Overview
-
-Linters in ELP are implemented as diagnostics that analyze Erlang code and
-report issues.
-Today ELP counts over [50 linters](https://github.com/WhatsApp/erlang-language-platform/tree/main/crates/ide/src/diagnostics),
-and the number is growing. It is usually a good idea to look at existing linters to ensure a similar functionality is not already provided and to get inspiration for a new linter.
-
-At high level, each linter consists of:
-
-1. A **DiagnosticCode** - A unique identifier for the diagnostic
-2. A linter **module** - A file where the linter is implemented
-3. **Tests** - A number of test cases for the diagnostic
-4. **Documentation** - A user-facing explanation of the diagnostic
-
-## Example: Detecting unsafe function calls
-
-Let's create a linter that warns about calls to a hypothetical
-`unsafe:operation/1` API that should be avoided in production code.
-
-### Step 1: Add the Diagnostic Code
-
-First, add a new variant to the `DiagnosticCode` enum in
-[`crates/ide_db/src/diagnostic_code.rs`](https://github.com/WhatsApp/erlang-language-platform/blob/main/crates/ide_db/src/diagnostic_code.rs):
-
-```rust
-pub enum DiagnosticCode {
-    // ... existing codes ...
-    UnsafeFunctionCall, // This is the new code
-
-    // Wrapper for erlang service diagnostic codes
-    ErlangService(String),
-    // Wrapper for EqWAlizer diagnostic codes
-    Eqwalizer(String),
-    // Used for ad-hoc diagnostics via lints/codemods
-    AdHoc(String),
-}
-```
-
-Ensure the code name is unique and descriptive.
-Then add a clause for each of the required methods:
-
-```rust
-impl DiagnosticCode {
-    // The `as_code` method returns a string representation of the code.
-    // This is used to identify the diagnostic in the UI and in the CLI.
-    // Each code emitted by ELP starts with a `W` prefix, followed by a 4-digit number.
-    // The number is assigned by the linter author and should be unique within the linter.
-    // Use the next available number in the sequence for your new linter.
-    pub fn as_code(&self) -> &'static str {
-        match self {
-            // ... existing cases ...
-            DiagnosticCode::UnsafeFunctionCall => "W0055", // Use next available number here
-
-            DiagnosticCode::ErlangService(c) => c.to_string(),
-            DiagnosticCode::Eqwalizer(c) => format!("eqwalizer: {c}"),
-            DiagnosticCode::AdHoc(c) => format!("ad-hoc: {c}"),
-        }
-    }
-
-    // The `as_label` method returns a human-readable label for the diagnostic.
-    // This is used to identify the diagnostic in the UI and in the CLI.
-    // The label should be unique and descriptive.
-    pub fn as_label(&self) -> &'static str {
-        match self {
-            // ... existing cases ...
-            DiagnosticCode::UnsafeFunctionCall => "unsafe_function_call", // Use snake_case here
-
-            DiagnosticCode::ErlangService(c) => c.to_string(),
-            DiagnosticCode::Eqwalizer(c) => c.to_string(),
-            DiagnosticCode::AdHoc(c) => format!("ad-hoc: {c}"),
-        }
-    }
-
-    // The `allows_fixme_comment` method determines if it should be possible to temporarily
-    // suppress the diagnostic by a `% elp:fixme` annotation.
-    pub fn allows_fixme_comment(&self) -> bool {
-        match self {
-            // ... existing cases ...
-            DiagnosticCode::UnsafeFunctionCall => false,
-
-            DiagnosticCode::ErlangService(_) => false,
-            DiagnosticCode::Eqwalizer(_) => false,
-            DiagnosticCode::AdHoc(_) => false,
-        }
-    }
-
-}
-```
-
-### Step 2: Create the linter module
-
-Create a new file `elp/crates/ide/src/diagnostics/unsafe_function_call.rs`, with the following content.
-The code has comments to explain each part.
-
-```rust
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is dual-licensed under either the MIT license found in the
- * LICENSE-MIT file in the root directory of this source tree or the Apache
- * License, Version 2.0 found in the LICENSE-APACHE file in the root directory
- * of this source tree. You may select, at your option, one of the
- * above-listed licenses.
- */
-
-use elp_ide_db::DiagnosticCode;
-
-use crate::diagnostics::Linter;
-use crate::diagnostics::SsrPatternsLinter;
-
-// We define a new linter, named `UnsafeFunctionCallLinter`
-pub(crate) struct UnsafeFunctionCallLinter;
-
-// We implement the `Linter` trait. This is common to all kinds of ELP linters.
-impl Linter for UnsafeFunctionCallLinter {
-    // A unique identifier for the linter. This is the `DiagnosticCode` we just added.
-    fn id(&self) -> DiagnosticCode {
-        DiagnosticCode::UnsafeFunctionCall
-    }
-    // A human-readable description for the linter, which will be displayed in the IDE
-    fn description(&self) -> String {
-        "Do not use unsafe:operation/1 in production code.".to_string()
-    }
-    // By default test files (i.e. test suites and helpers) are processed by linters.
-    // Since we only care about "unsafe calls" from production code,
-    // here we override the default behaviour by skipping test files.
-    fn should_process_test_files(&self) -> bool {
-        false
-    }
-}
-
-// We will write our linter using the so-called "SSR" syntax.
-// SSR is a convenient way to match on parts of the Erlang AST.
-// Because of this, we decide to implement the additional `SsrPatternsLinter` trait.
-impl SsrPatternsLinter for UnsafeFunctionCallLinter {
-    // Linters can specify a custom context type. For now, we ignore it.
-    type Context = ();
-
-    // Here we specify which patterns we want to match.
-    // The function returns a vector of tuples, each one containing
-    // a SSR pattern and a context.
-    // For the time being, let's ignore the context.
-    // For SSR syntax, please refer to the `ide_ssr` crate.
-    // Here, we are matching on calls to the fully-qualified `unsafe:operation/1`
-    // function, ignoring its only argument.
-    fn patterns(&self) -> Vec<(String, Self::Context)> {
-        // We use the SSR mechanism to match calls to `unsafe:operation/1`.
-        vec![("ssr: unsafe:operation(_@).".to_string(), ())]
-    }
-}
-```
-
-### Step 3: Register the diagnostic
-
-Add your diagnostic module to [`elp/crates/ide/src/diagnostics.rs`](https://github.com/WhatsApp/erlang-language-platform/blob/main/crates/ide/src/diagnostics.rs):
-
-```rust
-// Add the module declaration
-mod unsafe_function_call;
-
-// Register the linter in the `ssr_linters` function
-pub(crate) fn ssr_linters() -> Vec<&'static dyn FunctionCallLinter> {
-    vec![
-        // ... existing linters ...
-        &unsafe_function_call::LINTER, // We add the linter here
-    ]
-}
-```
-
-### Step 4: Add tests
-
-At the bottom of the `unsafe_function_call.rs` file, add the following:
-
-```rust
-#[cfg(test)]
-mod tests {
-    use crate::tests::check_diagnostics;
-
-    #[test]
-    fn test_unsafe_function_call() {
-        check_diagnostics(
-            r#"
-            //- /src/main.erl
-            -module(main).
-            -export([warn/0]).
-            warn() ->
-                unsafe:operation(data),
-            %%  ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Do not use unsafe:operation/1 in production code.
-                safe:operation(data).
-            //- /src/unsafe.erl
-            -module(unsafe).
-            -export([operation/1]).
-            operation(_) -> ok.
-            //- /src/safe.erl
-            -module(safe).
-            -export([operation/1]).
-            operation(_) -> ok.
-            "#,
-        );
-    }
-}
-```
-
-ELP uses convenient snapshot tests for checking diagnostics. The test above
-checks that the diagnostic is correctly reported when calling `unsafe:operation/1`.
-It also checks that the diagnostic is not reported when calling `safe:operation/1`.
-
-Always include comprehensive tests in your diagnostic module:
-
-1. **Positive cases** - Code that should trigger the diagnostic
-2. **Negative cases** - Similar code that should NOT trigger the diagnostic
-3. **Edge cases** - Boundary conditions and unusual syntax
-
-You can run the tests with the following command:
-
-```
-cargo test --package elp_ide --lib -- diagnostics::unsafe_function_call::tests::test_unsafe_function_call --exact --show-output
-```
-
-### Step 5: Create documentation
-
-Each new linter must be accompanied by a documentation file in Markdown format.
-Create the documentation file corresponding to your linter in:
-`elp/website/docs/erlang-error-index/w/W0055.md` (where `W0055` is the code we introduced):
-
-````markdown
----
-sidebar_position: 55
----
-
-# W0055 - Unsage Function Call
-
-This diagnostic warns about calls to `unsafe:operation/1`, which should be
-avoided in production code due to potential security or stability risks.
-`safe:operation/1` is a safer alternative that should be used instead.
-
-## Example
-
-```erlang
--module(example).
--export([do/1]).
-
-do(Data) ->
-    unsafe:operation(Data).
-%%  ^^^^^^^^^^^^^^^^^^^^^^ warning: Do not use unsafe:operation/1 in production code.
-```
-
-## Recommended fix
-
-Replace calls to `unsafe:operation/1` with a safer alternative, such as `safe:operation/1`.
-
-```erlang
--module(example).
--export([do/1]).
-
-do(Data) ->
-    safe:operation(Data).
-```
-````
-
-### Step 6: Try the new linter from the CLI
-
-After building ELP, you can try the new linter against a hypothetical `my_module` Erlang module:
-
-```
-cargo run --bin elp -- lint --project /path/to/your/project --module my_module --diagnostic-filter unsafe_function_call
-```
-
-```
-Diagnostics reported in 1 modules:
-  my_module: 1
-      29:4-29:25::[Warning] [W0055] Do not use unsafe:operation/1 in production code.
-```
diff --git a/website/docs/contributing/linters/linter-traits.md b/website/docs/contributing/linters/linter-traits.md
new file mode 100644
index 0000000000..4f772aea57
--- /dev/null
+++ b/website/docs/contributing/linters/linter-traits.md
@@ -0,0 +1,376 @@
+---
+sidebar_position: 6
+title: 'Linter Traits'
+---
+
+Linters are implemented using Rust
+[traits](https://doc.rust-lang.org/book/ch10-02-traits.html) (think interfaces,
+or Erlang behaviours). This allows linter authors to minimize the amount of
+boilerplate code they need to write, and makes it easier to write and maintain
+linters.
+
+## The `Linter` trait
+
+Each linter must implement the `Linter` trait, which has the following mandatory
+methods:
+
+```rust
+// A unique identifier for the linter.
+fn id(&self) -> DiagnosticCode;
+
+// A plain-text description for the linter. Displayed to the end user.
+fn description(&self) -> &'static str;
+```
+
+The `Linter` trait also has a few optional methods that can be used to customize
+the linter's behavior, if needed:
+
+```rust
+
+// The severity for the lint issue. It defaults to `Warning`.
+fn severity(&self) -> Severity {
+    Severity::Warning
+}
+
+// For CLI, when using the --use-cli-severity flag. It defaults to `severity()`
+fn cli_severity(&self) -> Severity {
+    self.severity()
+}
+
+// Specify if the linter issues can be suppressed via a `% elp:ignore` comment.
+fn can_be_suppressed(&self) -> bool {
+    true
+}
+
+// Specify if the linter should only run when the `--experimental` flag is specified.
+fn is_experimental(&self) -> bool {
+    false
+}
+
+// Specify if the linter is enabled by default.
+fn is_enabled(&self) -> bool {
+    true
+}
+
+// Specify if the linter should process generated files.
+fn should_process_generated_files(&self) -> bool {
+    false
+}
+
+// Specify if the linter should process generated test files (including test helpers)
+fn should_process_test_files(&self) -> bool {
+    true
+}
+
+// Specify if the linter should process the given file id.
+fn should_process_file_id(&self, _sema: &Semantic, _file_id: FileId) -> bool {
+    true
+}
+```
+
+## Additional linter traits
+
+In addition to the `Linter` trait, ELP provides a few additional traits, each
+suitable for a specific type of linter. These traits are:
+
+- `FunctionCallLinter`
+- `SsrPatternsLinter`
+- `GenericLinter`
+
+Let's look at each of these traits in more detail.
+
+### FunctionCallLinter
+
+The `FunctionCallLinter` trait provides an efficient way to match against
+function calls by name, module, and arity. This is the most common type of
+linter in ELP.
+
+#### Trait Methods
+
+The trait provides the following methods:
+
+```rust showLineNumbers
+/// Associated type - each linter defines its own context for passing data between callbacks
+type Context: Clone + fmt::Debug + PartialEq + Default;
+
+/// Specify which functions to match against
+fn matches_functions(&self) -> Vec<FunctionMatch>;
+
+/// Specify functions to exclude from matching (optional)
+fn excludes_functions(&self) -> Vec<FunctionMatch>;
+
+/// Custom validation logic for each matched call (optional)
+fn check_match(&self, _check_call_context: &CheckCallCtx<'_, ()>) -> Option<Self::Context>;
+
+/// Provide quick-fixes for matched calls (optional)
+fn fixes(&self, _match_context: &MatchCtx<Self::Context>, _sema: &Semantic, _file_id: FileId) -> Option<Vec<Assist>>;
+
+/// Customize the diagnostic message per match (optional)
+fn match_description(&self, _context: &Self::Context) -> Cow<'_, str>;
+```
+
+#### Example Usage
+
+Here's how you might implement a linter that flags calls to
+`erlang:garbage_collect/0`:
+
+```rust showLineNumbers
+use crate::lazy_function_matches;
+
+pub(crate) struct NoGarbageCollectLinter;
+
+impl Linter for NoGarbageCollectLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::NoGarbageCollect
+    }
+
+    fn description(&self) -> &'static str {
+        "Avoid forcing garbage collection."
+    }
+}
+
+impl FunctionCallLinter for NoGarbageCollectLinter {
+    type Context = ();
+
+    fn matches_functions(&self) -> Vec<FunctionMatch> {
+        lazy_function_matches![
+            FunctionMatch::mfa("erlang", "garbage_collect", 0),
+        ]
+    }
+}
+```
+
+### SsrPatternsLinter
+
+The `SsrPatternsLinter` trait uses Structural Search and Replace (SSR) patterns
+to match complex code structures, that go beyond simple function calls. SSR
+provides a powerful way to express patterns in Erlang syntax, but it can be
+slower than other approaches.
+
+Ssr patterns can also be used to match function calls, but they require a
+pattern for each function arity. So, if you need to match on multiple function
+arities, you should consider the `FunctionCallLinter` trait instead.
+
+The `SsrPatternsLinter` trait is ideal for:
+
+- Complex pattern matching beyond simple function calls
+- Matching code structures like specific usage patterns
+- Finding and replacing complex expressions
+- Matching code patterns with placeholders and variables
+
+#### Trait Methods
+
+```rust showLineNumbers
+/// Associated type for the pattern context - each linter defines its own
+type Context: Clone + fmt::Debug + PartialEq;
+
+/// Specify the SSR patterns to match. Each pattern is paired with a context
+/// for distinguishing between different patterns.
+fn patterns(&self) -> Vec<(String, Self::Context)>;
+
+/// Customize the diagnostic message for each pattern (optional)
+fn pattern_description(&self, _context: &Self::Context) -> &'static str;
+
+/// Validate that a match is legitimate (optional)
+fn is_match_valid(&self, _context: &Self::Context, _matched: &Match, _sema: &Semantic, _file_id: FileId) -> Option<bool>;
+
+/// Provide quick-fixes for matched patterns (optional)
+fn fixes(&self, _context: &Self::Context, _matched: &Match, _sema: &Semantic, _file_id: FileId) -> Option<Vec<Assist>>;
+
+/// Specify additional diagnostic categories (optional)
+fn add_categories(&self, _context: &Self::Context) -> Vec<Category>;
+
+/// Configure how macros and parentheses are handled (optional)
+fn strategy(&self) -> Strategy;
+
+/// Define the search scope - entire file or functions only (optional)
+fn scope(&self, file_id: FileId) -> SsrSearchScope;
+
+/// Customize the diagnostic range (optional)
+fn range(&self, _sema: &Semantic, _matched: &Match) -> Option<TextRange>;
+```
+
+#### SSR Pattern Syntax
+
+SSR patterns use a special syntax where:
+
+- `$var` represents a placeholder that matches any expression
+- `_@` represents a wildcard that matches anything
+- You can use regular Erlang syntax for the rest of the pattern
+
+#### Example Usage
+
+Here's how you might implement a linter that detects inefficient map-to-list
+conversions in comprehensions:
+
+```rust showLineNumbers
+#[derive(Debug, Clone, PartialEq)]
+enum MapToListPattern {
+    MapToList,
+}
+
+pub(crate) struct UnnecessaryMapToListLinter;
+
+impl Linter for UnnecessaryMapToListLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::UnnecessaryMapToListInComprehension
+    }
+
+    fn description(&self) -> &'static str {
+        "Avoid maps:to_list/1 in list comprehensions"
+    }
+}
+
+impl SsrPatternsLinter for UnnecessaryMapToListLinter {
+    type Context = MapToListPattern;
+
+    fn patterns(&self) -> Vec<(String, Self::Context)> {
+        vec![
+            (
+                "ssr: [V || {_@, V} <- maps:to_list($M)]".to_string(),
+                MapToListPattern::MapToList,
+            ),
+        ]
+    }
+
+    fn pattern_description(&self, _context: &Self::Context) -> &'static str {
+        "Use maps:values/1 instead of list comprehension with maps:to_list/1"
+    }
+}
+```
+
+### GenericLinter
+
+The `GenericLinter` trait provides the most flexibility, allowing you to
+implement completely custom matching logic. You should use this trait only when
+the other two options don't fit your use case.
+
+The `GenericLinter` trait is ideal for:
+
+- Custom traversal and analysis of the AST
+- Complex cross-function or cross-module analysis
+- Linters that need fine-grained control over the matching process
+- Situations where neither function call matching nor SSR patterns are
+  sufficient
+
+#### Trait Methods
+
+```rust showLineNumbers
+/// Associated type for passing context between the matching and diagnostic phases
+type Context: Clone + fmt::Debug + PartialEq + Default;
+
+/// Return a list of matches found in the file
+/// This is where you implement your custom matching logic
+fn matches(&self, _sema: &Semantic, _file_id: FileId) -> Option<Vec<GenericLinterMatchContext<Self::Context>>>;
+
+/// Customize the diagnostic message for each match (optional)
+fn match_description(&self, _context: &Self::Context) -> Cow<'_, str>;
+
+/// Add diagnostic tags like Unused or Deprecated (optional)
+fn tag(&self, _context: &Self::Context) -> Option<DiagnosticTag>;
+
+/// Provide quick-fixes for each match (optional)
+fn fixes(&self, _context: &Self::Context, _sema: &Semantic, _file_id: FileId) -> Option<Vec<Assist>>;
+```
+
+#### GenericLinterMatchContext
+
+When returning matches from the `matches()` method, you need to wrap your
+context in a `GenericLinterMatchContext`:
+
+```rust showLineNumbers
+GenericLinterMatchContext {
+    range: TextRange,    // The text range where the diagnostic should appear
+    context: Context,    // Your custom context data
+}
+```
+
+#### Example Usage
+
+Here's how you might implement a linter that detects unused macros:
+
+```rust showLineNumbers
+#[derive(Debug, Clone, PartialEq, Default)]
+struct UnusedMacroContext {
+    macro_name: String,
+}
+
+pub(crate) struct UnusedMacroLinter;
+
+impl Linter for UnusedMacroLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::UnusedMacro
+    }
+
+    fn description(&self) -> &'static str {
+        "This macro is never used"
+    }
+}
+
+impl GenericLinter for UnusedMacroLinter {
+    type Context = UnusedMacroContext;
+
+    fn matches(&self, sema: &Semantic, file_id: FileId) -> Option<Vec<GenericLinterMatchContext<Self::Context>>> {
+        let mut matches = Vec::new();
+
+        // Custom logic to find unused macros
+        let source_file = sema.parse(file_id);
+        let form_list = sema.form_list(file_id);
+
+        // Collect all macro definitions
+        let defined_macros = collect_defined_macros(&form_list, &source_file.value);
+
+        // Collect all macro usages
+        let used_macros = collect_used_macros(&source_file.value);
+
+        // Find unused macros
+        for (name, range) in defined_macros {
+            if !used_macros.contains(&name) {
+                matches.push(GenericLinterMatchContext {
+                    range,
+                    context: UnusedMacroContext { macro_name: name },
+                });
+            }
+        }
+
+        if matches.is_empty() {
+            None
+        } else {
+            Some(matches)
+        }
+    }
+
+    fn match_description(&self, context: &Self::Context) -> Cow<'_, str> {
+        Cow::Owned(format!("Macro '{}' is never used", context.macro_name))
+    }
+
+    fn tag(&self, _context: &Self::Context) -> Option<DiagnosticTag> {
+        Some(DiagnosticTag::Unused)
+    }
+}
+
+// Helper functions would be implemented here
+fn collect_defined_macros(form_list: &FormList, source_file: &SourceFile) -> Vec<(String, TextRange)> {
+    // Implementation details...
+    vec![]
+}
+
+fn collect_used_macros(source_file: &SourceFile) -> HashSet<String> {
+    // Implementation details...
+    HashSet::new()
+}
+```
+
+## Choosing the Right Trait
+
+When deciding which trait to use for your linter:
+
+1. **Use `FunctionCallLinter`** if you need to match specific function calls by
+   module, name, and arity
+2. **Use `SsrPatternsLinter`** if you need to match complex code patterns that
+   go beyond simple function calls
+3. **Use `GenericLinter`** if you need complete control over the matching logic
+   or need to perform complex analysis
+
+Most linters in ELP use the `FunctionCallLinter` trait since it covers the
+common case efficiently.
diff --git a/website/docs/contributing/linters/linters-step-1-diagnostic-code.md b/website/docs/contributing/linters/linters-step-1-diagnostic-code.md
new file mode 100644
index 0000000000..90c411e282
--- /dev/null
+++ b/website/docs/contributing/linters/linters-step-1-diagnostic-code.md
@@ -0,0 +1,75 @@
+---
+sidebar_position: 1
+title: 'Add a Diagnostic Code'
+---
+
+We will create a new linter, which warns about calls to a hypothetical
+`unsafe:operation/1` API that should be avoided in production code.
+
+Start by adding a new variant to the `DiagnosticCode` enum in
+[`crates/ide_db/src/diagnostic_code.rs`](https://github.com/WhatsApp/erlang-language-platform/blob/main/crates/ide_db/src/diagnostic_code.rs):
+
+```rust {3} showLineNumbers
+pub enum DiagnosticCode {
+    // ... existing codes ...
+    NoUnsafeOperation, // This is the new code
+
+    // Wrapper for erlang service diagnostic codes
+    ErlangService(String),
+    // Wrapper for EqWAlizer diagnostic codes
+    Eqwalizer(String),
+    // Used for ad-hoc diagnostics via lints/codemods
+    AdHoc(String),
+}
+```
+
+Ensure the code name is unique and descriptive. We will call it the _"No Unsafe
+Operation"_ linter. Then add a clause for each of the required methods:
+
+```rust {10,24,37} showLineNumbers
+impl DiagnosticCode {
+    // The `as_code` method returns a string representation of the code.
+    // This is used to identify the diagnostic in the UI and in the CLI.
+    // Each code emitted by ELP starts with a `W` prefix, followed by a 4-digit number.
+    // The number is assigned by the linter author and should be unique within the linter.
+    // Use the next available number in the sequence for your new linter.
+    pub fn as_code(&self) -> &'static str {
+        match self {
+            // ... existing cases ...
+            DiagnosticCode::NoUnsafeOperation => "W0055", // Use next available number here
+
+            DiagnosticCode::ErlangService(c) => c.to_string(),
+            DiagnosticCode::Eqwalizer(c) => format!("eqwalizer: {c}"),
+            DiagnosticCode::AdHoc(c) => format!("ad-hoc: {c}"),
+        }
+    }
+
+    // The `as_label` method returns a human-readable label for the diagnostic.
+    // This is used to identify the diagnostic in the UI and in the CLI.
+    // The label should be unique and descriptive.
+    pub fn as_label(&self) -> &'static str {
+        match self {
+            // ... existing cases ...
+            DiagnosticCode::NoUnsafeOperation => "no_unsafe_operation", // Use snake_case here
+
+            DiagnosticCode::ErlangService(c) => c.to_string(),
+            DiagnosticCode::Eqwalizer(c) => c.to_string(),
+            DiagnosticCode::AdHoc(c) => format!("ad-hoc: {c}"),
+        }
+    }
+
+    // The `allows_fixme_comment` method determines if it should be possible to temporarily
+    // suppress the diagnostic by a `% elp:fixme` annotation.
+    pub fn allows_fixme_comment(&self) -> bool {
+        match self {
+            // ... existing cases ...
+            DiagnosticCode::NoUnsafeOperationLinter => false,
+
+            DiagnosticCode::ErlangService(_) => false,
+            DiagnosticCode::Eqwalizer(_) => false,
+            DiagnosticCode::AdHoc(_) => false,
+        }
+    }
+
+}
+```
diff --git a/website/docs/contributing/linters/linters-step-2-module.md b/website/docs/contributing/linters/linters-step-2-module.md
new file mode 100644
index 0000000000..c4126b271f
--- /dev/null
+++ b/website/docs/contributing/linters/linters-step-2-module.md
@@ -0,0 +1,87 @@
+---
+sidebar_position: 2
+title: 'Create the linter module'
+---
+
+Create a new file `elp/crates/ide/src/diagnostics/no_unsafe_operation.rs`, with
+the following content. The code has comments to explain each part.
+
+```rust showLineNumbers
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is dual-licensed under either the MIT license found in the
+ * LICENSE-MIT file in the root directory of this source tree or the Apache
+ * License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+ * of this source tree. You may select, at your option, one of the
+ * above-listed licenses.
+ */
+
+use elp_ide_db::DiagnosticCode;
+
+use crate::diagnostics::Linter;
+use crate::diagnostics::SsrPatternsLinter;
+
+// We define a new linter, named `NoUnsafeOperationLinter`
+pub(crate) struct NoUnsafeOperationLinter;
+
+// We implement the `Linter` trait. This is common to all kinds of ELP linters.
+impl Linter for NoUnsafeOperationLinter {
+    // A unique identifier for the linter. This is the `DiagnosticCode` we just added.
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::NoUnsafeOperationLinter
+    }
+    // A human-readable description for the linter, which will be displayed in the IDE
+    fn description(&self) -> String {
+        "Do not use unsafe:operation/1 in production code.".to_string()
+    }
+    // By default test files (i.e. test suites and helpers) are processed by linters.
+    // Since we only care about "unsafe calls" from production code,
+    // here we override the default behaviour by skipping test files.
+    fn should_process_test_files(&self) -> bool {
+        false
+    }
+}
+
+// We will write our linter using the so-called "SSR" syntax.
+// SSR is a convenient way to match on parts of the Erlang AST.
+// Because of this, we decide to implement the additional `SsrPatternsLinter` trait.
+impl SsrPatternsLinter for NoUnsafeOperationLinter {
+    // Linters can specify a custom context type. For now, we ignore it.
+    type Context = ();
+
+    // Here we specify which patterns we want to match.
+    // The function returns a vector of tuples, each one containing
+    // a SSR pattern and a context.
+    // For the time being, let's ignore the context.
+    // For SSR syntax, please refer to the `ide_ssr` crate.
+    // Here, we are matching on calls to the fully-qualified `unsafe:operation/1`
+    // function, ignoring its only argument.
+    fn patterns(&self) -> Vec<(String, Self::Context)> {
+        // We use the SSR mechanism to match calls to `unsafe:operation/1`.
+        vec![("ssr: unsafe:operation(_@).".to_string(), ())]
+    }
+}
+```
+
+The only thing left to do is to register the linter in the
+[`elp/crates/ide/src/diagnostics.rs`](https://github.com/WhatsApp/erlang-language-platform/blob/main/crates/ide/src/diagnostics.rs)
+file:
+
+```rust {8} showLineNumbers
+// Add the module declaration
+mod no_unsafe_operation;
+
+// Register the linter in the `ssr_linters` function
+pub(crate) fn ssr_linters() -> Vec<&'static dyn FunctionCallLinter> {
+    vec![
+        // ... existing linters ...
+        &no_unsafe_operation::LINTER, // We add the linter here
+    ]
+}
+```
+
+In this case we have been using the `SsrPatternsLinter` trait, which is a
+convenient way to match on parts of the Erlang AST. You can learn more about the
+`SsrPatternsLinter` and other available linter traits in the
+[linter traits](/docs/contributing/linters/linter-traits) section.
diff --git a/website/docs/contributing/linters/linters-step-3-tests.md b/website/docs/contributing/linters/linters-step-3-tests.md
new file mode 100644
index 0000000000..39388a2a5d
--- /dev/null
+++ b/website/docs/contributing/linters/linters-step-3-tests.md
@@ -0,0 +1,70 @@
+---
+sidebar_position: 3
+title: 'Test your linter'
+---
+
+### Add a snapshot test
+
+At the bottom of the `no_unsafe_operation.rs` file, add the following:
+
+```rust showLineNumbers
+#[cfg(test)]
+mod tests {
+    use crate::tests::check_diagnostics;
+
+    #[test]
+    fn test_no_unsafe_operation() {
+        check_diagnostics(
+            r#"
+            //- /src/main.erl
+            -module(main).
+            -export([warn/0]).
+            warn() ->
+                unsafe:operation(data),
+            %%  ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Do not use unsafe:operation/1 in production code.
+                safe:operation(data).
+            //- /src/unsafe.erl
+            -module(unsafe).
+            -export([operation/1]).
+            operation(_) -> ok.
+            //- /src/safe.erl
+            -module(safe).
+            -export([operation/1]).
+            operation(_) -> ok.
+            "#,
+        );
+    }
+}
+```
+
+ELP uses convenient snapshot tests for checking diagnostics. The test above
+checks that the diagnostic is correctly reported when calling
+`unsafe:operation/1`. It also checks that the diagnostic is not reported when
+calling `safe:operation/1`.
+
+Always include comprehensive tests in your diagnostic module:
+
+1. **Positive cases** - Code that should trigger the diagnostic
+2. **Negative cases** - Similar code that should NOT trigger the diagnostic
+3. **Edge cases** - Boundary conditions and unusual syntax
+
+You can run the tests with the following command:
+
+```
+cargo test --package elp_ide --lib -- diagnostics::no_unsafe_operation::tests::test_no_unsafe_operation --exact --show-output
+```
+
+### Try the new linter from the CLI
+
+You can also try the new linter against a hypothetical `my_module` Erlang
+module:
+
+```
+cargo run --bin elp -- lint --project /path/to/your/project --module my_module --diagnostic-filter no_unsafe_operation
+```
+
+```
+Diagnostics reported in 1 modules:
+  my_module: 1
+      29:4-29:25::[Warning] [W0055] Do not use unsafe:operation/1 in production code.
+```
diff --git a/website/docs/contributing/linters/linters-step-4-documentation.md b/website/docs/contributing/linters/linters-step-4-documentation.md
new file mode 100644
index 0000000000..66f286d35c
--- /dev/null
+++ b/website/docs/contributing/linters/linters-step-4-documentation.md
@@ -0,0 +1,49 @@
+---
+sidebar_position: 4
+title: 'Document your linter'
+---
+
+Each new linter must be accompanied by a documentation file in Markdown format.
+Create the documentation file corresponding to your linter in:
+`elp/website/docs/erlang-error-index/w/W0055.md` (where `W0055` is the code we
+introduced):
+
+````markdown
+---
+sidebar_position: 55
+---
+
+# W0055 - Unsafe operation
+
+This diagnostic warns about calls to `unsafe:operation/1`, which should be
+avoided in production code due to potential security or stability risks.
+`safe:operation/1` is a safer alternative that should be used instead.
+
+## Example
+
+```erlang showLineNumbers
+-module(example).
+-export([do/1]).
+
+do(Data) ->
+    unsafe:operation(Data).
+%%  ^^^^^^^^^^^^^^^^^^^^^^ warning: Do not use unsafe:operation/1 in production code.
+```
+
+## Recommended fix
+
+Replace calls to `unsafe:operation/1` with a safer alternative, such as
+`safe:operation/1`.
+
+```erlang
+-module(example).
+-export([do/1]).
+
+do(Data) ->
+    safe:operation(Data).
+```
+````
+
+The documentation will be presented to the user in the IDE and will also be
+included in the
+[Erlang Error Index](https://whatsapp.github.io/erlang-language-platform/docs/erlang-error-index/).
diff --git a/website/docs/contributing/linters/linters.md b/website/docs/contributing/linters/linters.md
new file mode 100644
index 0000000000..6dad77f7f9
--- /dev/null
+++ b/website/docs/contributing/linters/linters.md
@@ -0,0 +1,29 @@
+---
+sidebar_position: 1
+title: 'Linters'
+---
+
+# Linters
+
+ELP provides a flexible framework for adding custom linters (diagnostics) to
+detect issues in Erlang code. This guide walks you through the process of
+creating a new linter.
+
+## Overview
+
+Linters in ELP are implemented as diagnostics that analyze Erlang code and
+report issues. Today ELP counts over
+[50 linters](https://github.com/WhatsApp/erlang-language-platform/tree/main/crates/ide/src/diagnostics),
+and the number is growing. It is usually a good idea to look at existing linters
+to ensure a similar functionality is not already provided and to get inspiration
+for a new linter.
+
+At high level, each linter consists of:
+
+1. A **DiagnosticCode** - A unique identifier for the diagnostic
+2. A linter **module** - A file where the linter is implemented
+3. **Documentation** - A user-facing explanation of the diagnostic
+4. **Tests** - A number of test cases for the diagnostic
+
+In the following sections, we will walk through each of these steps in detail,
+learning how to create a new linter.
diff --git a/website/src/css/custom.css b/website/src/css/custom.css
index 1c166ddc6d..ca47906d0e 100644
--- a/website/src/css/custom.css
+++ b/website/src/css/custom.css
@@ -34,10 +34,14 @@
   padding: 0 var(--ifm-pre-padding);
 }
 
-html[data-theme='dark'] .docusaurus-highlight-code-line {
+html[data-theme='dark'] .theme-code-block-highlighted-line {
   background-color: rgba(0, 0, 0, 0.3);
 }
 
+html[data-theme='light'] .theme-code-block-highlighted-line {
+  background-color: var(--ifm-menu-color-background-active);
+}
+
 .button {
   margin: 0px 10px;
 }

From 47e775924a0f19a9ade35f104e4c39ac4d972dd7 Mon Sep 17 00:00:00 2001
From: Yongchao Lyu <yongchao@meta.com>
Date: Wed, 8 Oct 2025 06:04:47 -0700
Subject: [PATCH 156/394] Fix some issues in WhatsApp ELP Glean

Summary:
Fix some issues in WhatsApp ELP Glean:
- Set exdoc_link to None on GitHub to avoid breaking CI tests.
- Replaced the actual file path with a fake one in serialization_test.out.
- Replaced the actual module behaviours with fake ones in unit tests.
- Enhanced serialization_test_v1 to cover the module fact.

Reviewed By: robertoaloi

Differential Revision: D84062457

fbshipit-source-id: 4b369b9eb9164af2463639eec80f41ff19b49e5e
---
 crates/elp/src/bin/glean.rs                   | 75 ++++++++++++-------
 .../test/glean/serialization_test.out         |  2 +-
 2 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/crates/elp/src/bin/glean.rs b/crates/elp/src/bin/glean.rs
index 23cf36c438..3dd6c70596 100644
--- a/crates/elp/src/bin/glean.rs
+++ b/crates/elp/src/bin/glean.rs
@@ -1015,10 +1015,11 @@ impl GleanIndexer {
         });
 
         // @fb-only
-        let exdoc_link = (!module.is_in_otp(sema.db) && module.has_moduledoc(sema.db)).then(|| {
+        // @fb-only
+        // @fb-only
+        // @fb-only
             // @fb-only
-            // @fb-only
-        });
+        let exdoc_link: Option<String> = None; // @oss-only
 
         ModuleFact::new(
             file_id,
@@ -1998,22 +1999,22 @@ mod tests {
             start: 0,
             length: 10,
         };
-        let module = "smax_product_catalog";
-        let name = "product_visibility_update_request_iq";
+        let module_name = "test_module";
+        let func_name = "test_function";
         let arity = 0;
 
-        let file_facts = vec![
-            FileFact::new(
-                file_id,
-                "/local/whatsapp/server/erl/groupd_service/test/p13n/grpd_p13n_new_create_group_SUITE.erl".into(),
-            )
-        ];
+        let file_facts = vec![FileFact::new(
+            file_id,
+            "/test/app/src/test_module.erl".into(),
+        )];
+
         let file_line_facts = vec![FileLinesFact::new(file_id, vec![71, 42], true)];
+
         let decl = FileDeclaration {
             file_id: file_id.into(),
             declarations: vec![Declaration::FunctionDeclaration(
                 FuncDecl {
-                    name: name.to_string(),
+                    name: func_name.to_string(),
                     arity,
                     span: location.clone(),
                     exported: false,
@@ -2022,6 +2023,7 @@ mod tests {
                 .into(),
             )],
         };
+
         let xref = XRefFile {
             file_id: file_id.into(),
             xrefs: vec![XRef {
@@ -2029,7 +2031,7 @@ mod tests {
                 target: XRefTarget::Function(
                     FunctionTarget {
                         file_id: file_id.into(),
-                        name: name.to_string(),
+                        name: func_name.to_string(),
                         arity,
                     }
                     .into(),
@@ -2037,12 +2039,22 @@ mod tests {
             }],
         };
 
+        let module = ModuleFact {
+            file_id: file_id.into(),
+            name: module_name.to_string(),
+            oncall: Some("test_team".to_string()),
+            exports: Some(vec![format!("{func_name}/{arity}")]),
+            behaviours: Some(vec!["test_behaviour".to_string()]),
+            module_doc: Some("Test module documentation".to_string()),
+            exdoc_link: Some("https://example.com/docs/test_module.html".to_string()),
+        };
+
         let facts = IndexedFacts {
             file_facts,
             file_line_facts,
             declaration_facts: vec![],
             xref_facts: vec![],
-            module_facts: vec![],
+            module_facts: vec![module],
             file_declarations: vec![decl],
             xref_v2: vec![xref],
         };
@@ -2058,13 +2070,12 @@ mod tests {
             prefix: None,
         };
         let mut module_index = FxHashMap::default();
-        module_index.insert(file_id.into(), module.to_string());
+        module_index.insert(file_id.into(), module_name.to_string());
 
         write_results(map, module_index, &mut cli, &args).expect("success");
-
         let (out, err) = cli.to_strings();
         let expected = expect_file!["../resources/test/glean/serialization_test.out"];
-        expected.assert_eq(&out);
+        assert_eq!(expected.data().trim(), &out);
         assert_eq!(err, "")
     }
 
@@ -2776,7 +2787,7 @@ mod tests {
         %%% It explains what this module does
         -module(sample_worker).
         -oncall("platform_team").
-        -behaviour(gen_server).
+        -behaviour(test_behaviour).
         -export([init/1, handle_task/2]).
 
         init(Args) -> {ok, Args}.
@@ -2788,7 +2799,10 @@ mod tests {
         let module_fact = &facts.module_facts[0];
         assert_eq!(module_fact.name, "sample_worker");
         assert_eq!(module_fact.oncall, Some("platform_team".to_string()));
-        assert_eq!(module_fact.behaviours, Some(vec!["gen_server".to_string()]));
+        assert_eq!(
+            module_fact.behaviours,
+            Some(vec!["test_behaviour".to_string()])
+        );
         assert_eq!(module_fact.exports.as_ref().map(|v| v.len()), Some(2));
         for expected in ["handle_task/2", "init/1"] {
             assert!(
@@ -2809,12 +2823,12 @@ mod tests {
         -module(factory_service).
         -oncall("manufacturing_team").
         -behaviour(supervisor).
-        -behaviour(gen_factory).
-        -behaviour(gen_industry).
+        -behaviour(test_behaviour1).
+        -behaviour(test_behaviour2).
 
         start_supervision() -> supervisor:start_link({local, ?MODULE}, ?MODULE, []).
-        create_product(Type, Config) -> gen_factory:produce(Type, Config).
-        manage_assembly(Parts) -> gen_industry:assemble(Parts).
+        create_product(Type, Config) -> test_behaviour1:produce(Type, Config).
+        manage_assembly(Parts) -> test_behaviour2:assemble(Parts).
         "#;
         let (facts, _, _, _, _) = facts_with_annotations(spec);
         assert_eq!(facts.module_facts.len(), 1);
@@ -2822,7 +2836,7 @@ mod tests {
         assert_eq!(module_fact.name, "factory_service");
         assert_eq!(module_fact.oncall, Some("manufacturing_team".to_string()));
         assert_eq!(module_fact.behaviours.as_ref().map(|v| v.len()), Some(3));
-        for expected in ["gen_factory", "gen_industry", "supervisor"] {
+        for expected in ["test_behaviour1", "test_behaviour2", "supervisor"] {
             assert!(
                 module_fact
                     .behaviours
@@ -2847,23 +2861,26 @@ mod tests {
         For more information see:
         https://www.example.com/data/processing
         """.
-        -behaviour(gen_statem).
+        -behaviour(test_behaviour).
         -export([
             start_link/0,
             process_batch/1,
             get_status/0
         ]).
 
-        start_link() -> gen_statem:start_link(?MODULE, [], []).
-        process_batch(Data) -> gen_statem:call(?SERVER, {process, Data}).
-        get_status() -> gen_statem:call(?SERVER, status).
+        start_link() -> test_behaviour:start_link(?MODULE, [], []).
+        process_batch(Data) -> test_behaviour:call(?SERVER, {process, Data}).
+        get_status() -> test_behaviour:call(?SERVER, status).
         "#;
         let (facts, _, _, _, _) = facts_with_annotations(spec);
         assert_eq!(facts.module_facts.len(), 1);
         let module_fact = &facts.module_facts[0];
         assert_eq!(module_fact.name, "data_processor");
         assert_eq!(module_fact.oncall, Some("data_team".to_string()));
-        assert_eq!(module_fact.behaviours, Some(vec!["gen_statem".to_string()]));
+        assert_eq!(
+            module_fact.behaviours,
+            Some(vec!["test_behaviour".to_string()])
+        );
         assert_eq!(module_fact.exports.as_ref().map(|v| v.len()), Some(3));
         for expected in ["get_status/0", "process_batch/1", "start_link/0"] {
             assert!(
diff --git a/crates/elp/src/resources/test/glean/serialization_test.out b/crates/elp/src/resources/test/glean/serialization_test.out
index 43d41030fa..ede8ec269d 100644
--- a/crates/elp/src/resources/test/glean/serialization_test.out
+++ b/crates/elp/src/resources/test/glean/serialization_test.out
@@ -1 +1 @@
-[{"predicate":"src.File","facts":[{"id":10072,"key":"/local/whatsapp/server/erl/groupd_service/test/p13n/grpd_p13n_new_create_group_SUITE.erl"}]},{"predicate":"src.FileLines","facts":[{"key":{"file":10072,"lengths":[71,42],"endsInNewline":true,"hasUnicodeOrTabs":true}}]},{"predicate":"erlang.FunctionDeclaration","facts":[{"key":{"file":10072,"fqn":{"module":"smax_product_catalog","name":"product_visibility_update_request_iq","arity":0},"span":{"start":0,"length":10}}}]},{"predicate":"erlang.XRefsViaFqnByFile","facts":[{"key":{"file":10072,"xrefs":[{"source":{"start":0,"length":10},"target":{"module":"smax_product_catalog","name":"product_visibility_update_request_iq","arity":0}}]}}]},{"predicate":"erlang.DeclarationComment","facts":[]},{"predicate":"erlang.Module","facts":[]}]
\ No newline at end of file
+[{"predicate":"src.File","facts":[{"id":10072,"key":"/test/app/src/test_module.erl"}]},{"predicate":"src.FileLines","facts":[{"key":{"file":10072,"lengths":[71,42],"endsInNewline":true,"hasUnicodeOrTabs":true}}]},{"predicate":"erlang.FunctionDeclaration","facts":[{"key":{"file":10072,"fqn":{"module":"test_module","name":"test_function","arity":0},"span":{"start":0,"length":10}}}]},{"predicate":"erlang.XRefsViaFqnByFile","facts":[{"key":{"file":10072,"xrefs":[{"source":{"start":0,"length":10},"target":{"module":"test_module","name":"test_function","arity":0}}]}}]},{"predicate":"erlang.DeclarationComment","facts":[]},{"predicate":"erlang.Module","facts":[{"key":{"file":10072,"name":"test_module","oncall":"test_team","exports":["test_function/0"],"behaviours":["test_behaviour"],"module_doc":"Test module documentation","exdoc_link":"https://example.com/docs/test_module.html"}}]}]

From 5e1154dbc15197df8a2b061b011cb1571379d7fb Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 8 Oct 2025 06:43:43 -0700
Subject: [PATCH 157/394] Cleanup references

Reviewed By: michalmuskala

Differential Revision: D84063145

fbshipit-source-id: a4b3537290347fa48dd38290b92cbecc2953e46e
---
 crates/elp/src/arc_types.rs |  4 ++--
 elisp/dotemacs.el           | 17 +----------------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/crates/elp/src/arc_types.rs b/crates/elp/src/arc_types.rs
index f170f9fc75..c113311661 100644
--- a/crates/elp/src/arc_types.rs
+++ b/crates/elp/src/arc_types.rs
@@ -8,8 +8,8 @@
  * above-listed licenses.
  */
 
-/// Types as defined in https://www.internalfb.com/intern/wiki/Linting/adding-linters/#flow-type
-/// and https://www.internalfb.com/code/fbsource/[1238f73dac0efd4009443fee6a345a680dc9401b]/whatsapp/server/erl/tools/lint/arcanist.py?lines=17 /
+// @fb-only
+// @fb-only
 use std::path::Path;
 
 use serde::Serialize;
diff --git a/elisp/dotemacs.el b/elisp/dotemacs.el
index 07a4d25193..fa80723a91 100644
--- a/elisp/dotemacs.el
+++ b/elisp/dotemacs.el
@@ -7,13 +7,6 @@
 ;;
 ;;  emacs -q --load dotemacs.el
 ;;
-;; Note:
-;; 1. The first time you open a new WASERVER repo, use the "choose
-;;    server root ineractively" option to choose
-;;    "~/local/whatsapp/server/erl" (or devserver equivalent) as the root.
-;; 2. When you first start up the server, emacs becomes unresponsive
-;;    for about a minute.  This is not an officially supported platform, sorry.
-
 
 ;; ---------------------------------------------------------------------
 
@@ -57,20 +50,12 @@
   :link '(url-link "https://github.com/WhatsApp/erlang-language-platform"))
 
 (defcustom lsp-erlang-elp-server-path
-  "~/local/whatsapp/server/erl/tools/elp"
+  "/usr/local/bin/elp"
   "Path to the ELP binary."
   :group 'lsp-erlang-elp
   :risky t
   :type 'file)
 
-(defcustom lsp-erlang-elp-erlang-ls-path
-  "~/fbsource/xplat/vscode/vscode-extensions/erlang/bin/erlang_ls"
-  "Path to the Erlang Language Server (erlang_ls) binary."
-  :group 'lsp-erlang-elp
-  :risky t
-  :type 'file)
-
-
 (defun lsp-erlang-elp-server-connection ()
   (lsp-stdio-connection
    `(,lsp-erlang-elp-server-path

From 312319b2daf450eba02667852833268196884a74 Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Wed, 8 Oct 2025 13:49:48 -0700
Subject: [PATCH 158/394] Remove old arc diagnostics logic

Summary:
The logic to filter and output diagnostics only for opted-in modules is now redundant since we only eqWAlize opted-in modules. This is an artifact left from when we advised to opt-in errorless modules.

Remove it since it conflicts with reporting errors in tests with arc lint.

Reviewed By: RobinMorisset

Differential Revision: D84170122

fbshipit-source-id: caa84b4cabd9edc75482d826acd2bcc5aed723e8
---
 crates/elp/src/bin/reporting.rs | 10 ++--------
 crates/elp/src/convert.rs       | 10 +---------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/crates/elp/src/bin/reporting.rs b/crates/elp/src/bin/reporting.rs
index 3eba62c23e..311f272507 100644
--- a/crates/elp/src/bin/reporting.rs
+++ b/crates/elp/src/bin/reporting.rs
@@ -225,8 +225,6 @@ impl Reporter for JsonReporter<'_> {
         diagnostics: &[EqwalizerDiagnostic],
     ) -> Result<()> {
         let line_index = self.analysis.line_index(file_id)?;
-        // Pass include_Tests = false so that errors for tests files that are not opted-in are tagged as arc_types::Severity::Disabled
-        let eqwalizer_enabled = self.analysis.is_eqwalizer_enabled(file_id, false).unwrap();
         let file_path = &self.loaded.vfs.file_path(file_id);
         let root_path = &self
             .analysis
@@ -235,12 +233,8 @@ impl Reporter for JsonReporter<'_> {
             .root_dir;
         let relative_path = get_relative_path(root_path, file_path);
         for diagnostic in diagnostics {
-            let diagnostic = convert::eqwalizer_to_arc_diagnostic(
-                diagnostic,
-                &line_index,
-                relative_path,
-                eqwalizer_enabled,
-            );
+            let diagnostic =
+                convert::eqwalizer_to_arc_diagnostic(diagnostic, &line_index, relative_path);
             let diagnostic = serde_json::to_string(&diagnostic)?;
             writeln!(self.cli, "{diagnostic}")?;
         }
diff --git a/crates/elp/src/convert.rs b/crates/elp/src/convert.rs
index 0c439c73f9..323a56bdf3 100644
--- a/crates/elp/src/convert.rs
+++ b/crates/elp/src/convert.rs
@@ -122,19 +122,11 @@ pub fn eqwalizer_to_arc_diagnostic(
     d: &EqwalizerDiagnostic,
     line_index: &LineIndex,
     relative_path: &Path,
-    eqwalizer_enabled: bool,
 ) -> arc_types::Diagnostic {
     let pos = position(line_index, d.range.start());
     let line_num = pos.line + 1;
     let character = Some(pos.character + 1);
-    let severity = if eqwalizer_enabled {
-        arc_types::Severity::Error
-    } else {
-        // We use Severity::Disabled so that we have the ability in our arc linter to choose
-        // to display lints for *new* files with errors that are not opted in (T118466310).
-        // See comment at the top of eqwalizer_cli.rs for more information.
-        arc_types::Severity::Disabled
-    };
+    let severity = arc_types::Severity::Error;
     // formatting: https://fburl.com/max_wiki_link_to_phabricator_rich_text
     let explanation = match &d.explanation {
         Some(s) => format!("```\n{s}\n```"),

From 98bba7ab44606f19fcc580fdd497017a28ead347 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 9 Oct 2025 01:22:43 -0700
Subject: [PATCH 159/394] Fixed name of EQWALIZER_DIR variable

Reviewed By: alanz

Differential Revision: D84165374

fbshipit-source-id: e63c3ea96e548d78bdd284d329acbf5a7f556151
---
 website/docs/get-started/install.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/docs/get-started/install.md b/website/docs/get-started/install.md
index a8fbddc03a..84f903cd64 100644
--- a/website/docs/get-started/install.md
+++ b/website/docs/get-started/install.md
@@ -89,7 +89,7 @@ repositories from the same starting directory, so they are
 `../eqwalizer/eqwalizer_support`.  If you are unable to do this, set
 
 ```
-export EQWALIZER_SUPPORT_DIR=</path/to/eqwalizer_repo>/eqwalizer_support
+export EQWALIZER_DIR=</path/to/eqwalizer_repo>/eqwalizer_support
 ```
 
 ### Compile ELP

From 293a2aca0db8b8844eed247f326e68413208e075 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Thu, 9 Oct 2025 02:03:52 -0700
Subject: [PATCH 160/394] Update loader progress on percent change only

Summary:
A project can have thousands of files. We report loader progress as the VFS loader loads these, presented on the VS Code status bar as a percentage figure.

This means that we send multiple duplicate messages while loading, as the percentage number changes relatively slowly compared to the number of files loaded.

This onslaught of messages can however overload the LSP client, resulting in a status bar that does not accurately reflect the current ELP loading state as it updates from the backlog in a received queue of messages.

## This diff

This diff reduces the number of messages sent, without losing any information, by keeping track of the current percentage value, and only sending a progress message when it changes.

Reviewed By: TheGeorge

Differential Revision: D84140378

fbshipit-source-id: 13fd4e39b87010c70b692abd7aeb15beddef2dbd
---
 crates/elp/src/server.rs          |  4 ++--
 crates/elp/src/server/progress.rs | 25 +++++++++++++++----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index 0c76ce38bf..7daf3bd363 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -957,7 +957,7 @@ impl Server {
                 self.transition(Status::Loading(pb));
             }
             LoadingProgress::Progress(n_done) => {
-                if let Status::Loading(pb) = &self.status {
+                if let Status::Loading(pb) = &mut self.status {
                     pb.report(n_done, n_total);
                 }
             }
@@ -1988,7 +1988,7 @@ impl Server {
 
     fn update_eqwalize_all(
         &mut self,
-        bar: ProgressBar,
+        mut bar: ProgressBar,
         project_id: ProjectId,
         project_name: String,
         mut files: Vec<FileId>,
diff --git a/crates/elp/src/server/progress.rs b/crates/elp/src/server/progress.rs
index 3fe2e96d3b..8a3756018d 100644
--- a/crates/elp/src/server/progress.rs
+++ b/crates/elp/src/server/progress.rs
@@ -172,6 +172,7 @@ pub struct ProgressBar {
     /// The message sent when sending the final end report.
     /// It is used in e2e tests to check for a specific task being done.
     end_message: String,
+    current_percent: u32,
 }
 
 impl ProgressBar {
@@ -196,21 +197,25 @@ impl ProgressBar {
             token,
             sender,
             end_message: title,
+            current_percent: 0,
         }
     }
 
-    pub fn report(&self, done: usize, total: usize) {
+    pub fn report(&mut self, done: usize, total: usize) {
         let percent_f = done as f64 / total.max(1) as f64;
         let percent = (percent_f * 100.0) as u32;
-        let message = format!("{percent}%");
-        let msg = WorkDoneProgress::Report(WorkDoneProgressReport {
-            cancellable: None,
-            message: Some(message),
-            percentage: Some(percent),
-        });
-        // We do not update any associated telemetry here, it will
-        // report on the whole bar at the end in the drop.
-        send_progress(&self.sender, self.token.clone(), msg);
+        if percent != self.current_percent {
+            self.current_percent = percent;
+            let message = format!("{percent}%");
+            let msg = WorkDoneProgress::Report(WorkDoneProgressReport {
+                cancellable: None,
+                message: Some(message),
+                percentage: Some(percent),
+            });
+            // We do not update any associated telemetry here, it will
+            // report on the whole bar at the end in the drop.
+            send_progress(&self.sender, self.token.clone(), msg);
+        }
     }
 
     pub fn end(self) {

From 66612ad8217e6ae97945ffc21a9b11e2c6e86cf1 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 9 Oct 2025 02:20:45 -0700
Subject: [PATCH 161/394] Remove obsolete Haskell E2E tests for the Erlang
 extension

Reviewed By: TheGeorge, alanz

Differential Revision: D84231176

fbshipit-source-id: e01b3c92c54064bd9c87bc836ba782e8bbf3dbb7
---
 test_projects/README.md                          | 2 --
 test_projects/end_to_end/definitions/README.md   | 7 -------
 test_projects/end_to_end/hover/README.md         | 7 -------
 test_projects/end_to_end/single_errors/README.md | 1 -
 4 files changed, 17 deletions(-)

diff --git a/test_projects/README.md b/test_projects/README.md
index 33e713dab2..e3d0a7e160 100644
--- a/test_projects/README.md
+++ b/test_projects/README.md
@@ -11,5 +11,3 @@ From this directory, you can manually test:
 ```
 
 Automated tests live in crates/elp/bin/main.rs
-
-See also //whatsapp/elp_test/README.md for additonal end-to-end LSP tests.
diff --git a/test_projects/end_to_end/definitions/README.md b/test_projects/end_to_end/definitions/README.md
index 4b4cf2729c..dcc9b91c56 100644
--- a/test_projects/end_to_end/definitions/README.md
+++ b/test_projects/end_to_end/definitions/README.md
@@ -1,8 +1 @@
 Dummy modules to exercise "goto definition".
-
-Tests themselves live in `//whatsapp/elp_test/` repo.
-To run them against local elp changes, you can do:
-```
-% ./meta/cargo.sh build --release --target-dir ~/elp-out/
-% buck test @mode/dev //whatsapp/elp_test/test:test -- definition --env ELP_PATH_FOR_LSP_TEST=$HOME/elp-out/release/elp
-```
diff --git a/test_projects/end_to_end/hover/README.md b/test_projects/end_to_end/hover/README.md
index 0007f0be6f..cf32c8c07f 100644
--- a/test_projects/end_to_end/hover/README.md
+++ b/test_projects/end_to_end/hover/README.md
@@ -1,8 +1 @@
 Dummy modules to exercise "documentation tooltip (edoc) on hover".
-
-Tests themselves live in `//whatsapp/elp_test/` repo.
-To run them against local elp changes, you can do:
-```
-% ./meta/cargo.sh build --release --target-dir ~/elp-out/
-% buck test @mode/dev //whatsapp/elp_test/test:test -- hover --env ELP_PATH_FOR_LSP_TEST=$HOME/elp-out/release/elp
-```
diff --git a/test_projects/end_to_end/single_errors/README.md b/test_projects/end_to_end/single_errors/README.md
index 88da003476..ae06a9a3f5 100644
--- a/test_projects/end_to_end/single_errors/README.md
+++ b/test_projects/end_to_end/single_errors/README.md
@@ -1,2 +1 @@
 One error per module for simple and robust diagnostic tests.
-Some of those modules are checked in //whatsapp/elp_test.

From 4b44e209319b643ca30c47fd4b3e096f9dc78166 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Thu, 9 Oct 2025 07:12:42 -0700
Subject: [PATCH 162/394] Allow extract variable inside a macro call

Summary:
Do not cut off check for extract variable anchor just because it is inside a macro call.

Also add a companion test to extract function, and rename its `FunctionBody` to `FunctionBodyToExtract`, as we now have another `FunctionBody` in `sema`, and it is confusing.

Reviewed By: TheGeorge

Differential Revision: D84165349

fbshipit-source-id: e771e2aec74d02e18d8679ace2ebc1e59ee9cf66
---
 .../src/handlers/extract_function.rs          | 88 +++++++++++++------
 .../src/handlers/extract_variable.rs          | 41 ++++++---
 2 files changed, 90 insertions(+), 39 deletions(-)

diff --git a/crates/ide_assists/src/handlers/extract_function.rs b/crates/ide_assists/src/handlers/extract_function.rs
index 4c3c773cac..8afa31327d 100644
--- a/crates/ide_assists/src/handlers/extract_function.rs
+++ b/crates/ide_assists/src/handlers/extract_function.rs
@@ -164,12 +164,12 @@ fn extraction_target(
     ctx: &AssistContext,
     node: &SyntaxNode,
     selection_range: TextRange,
-) -> Option<FunctionBody> {
+) -> Option<FunctionBodyToExtract> {
     // Covering element returned the parent block of one or multiple
     // expressions that have been selected
     if let Some(expr_list) = ast::ClauseBody::cast(node.clone()) {
         // Extract the full expressions.
-        return Some(FunctionBody::from_range_clause_body(
+        return Some(FunctionBodyToExtract::from_range_clause_body(
             expr_list,
             selection_range,
         ));
@@ -180,7 +180,10 @@ fn extraction_target(
         if let Some(clause) = fun_decl.clauses().next() {
             match clause {
                 ast::FunctionOrMacroClause::FunctionClause(_fun_clause) => {
-                    return Some(FunctionBody::from_range_fun_decl(fun_decl, selection_range));
+                    return Some(FunctionBodyToExtract::from_range_fun_decl(
+                        fun_decl,
+                        selection_range,
+                    ));
                 }
                 ast::FunctionOrMacroClause::MacroCallExpr(_) => {}
             };
@@ -190,19 +193,19 @@ fn extraction_target(
     let expr = ast::Expr::cast(node.clone())?;
     // A node got selected fully
     if node.text_range() == selection_range {
-        return FunctionBody::from_expr(ctx, expr);
+        return FunctionBodyToExtract::from_expr(ctx, expr);
     }
 
     node.ancestors()
         .find_map(ast::Expr::cast)
-        .and_then(|expr| FunctionBody::from_expr(ctx, expr))
+        .and_then(|expr| FunctionBodyToExtract::from_expr(ctx, expr))
 }
 
 #[derive(Debug)]
 struct Function {
     name: String,
     params: Vec<Param>,
-    body: FunctionBody,
+    body: FunctionBodyToExtract,
     outliving_locals: Vec<Var>,
 }
 
@@ -212,7 +215,7 @@ struct Param {
 }
 
 #[derive(Debug)]
-enum FunctionBody {
+enum FunctionBodyToExtract {
     Expr(ast::Expr),
     Span {
         parent: SpanParent,
@@ -245,7 +248,7 @@ impl SpanParent {
     }
 }
 
-impl FunctionBody {
+impl FunctionBodyToExtract {
     fn from_expr(ctx: &AssistContext, expr: ast::Expr) -> Option<Self> {
         if !valid_extraction(expr.syntax()) {
             return None;
@@ -255,7 +258,10 @@ impl FunctionBody {
             .map(|_| Self::Expr(expr))
     }
 
-    fn from_range_clause_body(parent: ast::ClauseBody, selected: TextRange) -> FunctionBody {
+    fn from_range_clause_body(
+        parent: ast::ClauseBody,
+        selected: TextRange,
+    ) -> FunctionBodyToExtract {
         let full_body = parent.syntax().children_with_tokens();
 
         let text_range = full_body
@@ -271,9 +277,9 @@ impl FunctionBody {
         }
     }
 
-    fn from_range_fun_decl(parent: ast::FunDecl, selected: TextRange) -> FunctionBody {
+    fn from_range_fun_decl(parent: ast::FunDecl, selected: TextRange) -> FunctionBodyToExtract {
         let parent = SpanParent::FunDecl(parent);
-        let text_range = FunctionBody::nodes_in_span_parent(&parent, &selected)
+        let text_range = FunctionBodyToExtract::nodes_in_span_parent(&parent, &selected)
             .iter()
             // Harvest commonality
             .map(|element| element.text_range())
@@ -321,18 +327,19 @@ impl FunctionBody {
 
     fn node(&self) -> &SyntaxNode {
         match self {
-            FunctionBody::Expr(e) => e.syntax(),
-            FunctionBody::Span { parent, .. } => parent.syntax(),
+            FunctionBodyToExtract::Expr(e) => e.syntax(),
+            FunctionBodyToExtract::Span { parent, .. } => parent.syntax(),
         }
     }
 
     fn indent_level(&self) -> IndentLevel {
         match &self {
-            FunctionBody::Expr(expr) => IndentLevel::from_node(expr.syntax()),
-            FunctionBody::Span { parent, text_range } => {
-                if let Some(element) = FunctionBody::nodes_in_span_parent(parent, text_range)
-                    .iter()
-                    .find(|it| text_range.contains_range(it.text_range()))
+            FunctionBodyToExtract::Expr(expr) => IndentLevel::from_node(expr.syntax()),
+            FunctionBodyToExtract::Span { parent, text_range } => {
+                if let Some(element) =
+                    FunctionBodyToExtract::nodes_in_span_parent(parent, text_range)
+                        .iter()
+                        .find(|it| text_range.contains_range(it.text_range()))
                 {
                     IndentLevel::from_element(element)
                 } else {
@@ -344,10 +351,10 @@ impl FunctionBody {
 
     fn walk_expr(&self, ctx: &AssistContext, analyzer: &mut ScopeAnalysis) {
         match self {
-            FunctionBody::Expr(expr) => {
+            FunctionBodyToExtract::Expr(expr) => {
                 analyzer.walk_ast_expr(&ctx.sema, ctx.file_id(), expr.clone())
             }
-            FunctionBody::Span { parent, text_range } => {
+            FunctionBodyToExtract::Span { parent, text_range } => {
                 if let Some(exprs) = parent.exprs() {
                     exprs
                         .filter(|expr| text_range.contains_range(expr.syntax().text_range()))
@@ -361,8 +368,8 @@ impl FunctionBody {
 
     fn text_range(&self) -> TextRange {
         match self {
-            FunctionBody::Expr(expr) => expr.syntax().text_range(),
-            &FunctionBody::Span { text_range, .. } => text_range,
+            FunctionBodyToExtract::Expr(expr) => expr.syntax().text_range(),
+            &FunctionBodyToExtract::Span { text_range, .. } => text_range,
         }
     }
 
@@ -381,7 +388,7 @@ impl FunctionBody {
         locals_bound_in_body: &'a FxHashSet<Resolution>,
     ) -> Vec<Var> {
         match &self {
-            FunctionBody::Expr(expr) => {
+            FunctionBodyToExtract::Expr(expr) => {
                 let parent = expr
                     .syntax()
                     .ancestors()
@@ -398,7 +405,7 @@ impl FunctionBody {
                     vec![]
                 }
             }
-            FunctionBody::Span { parent, text_range } => {
+            FunctionBodyToExtract::Span { parent, text_range } => {
                 calculate_ret_values(parent, text_range, ctx, locals_bound_in_body)
             }
         }
@@ -464,7 +471,7 @@ fn overlaps(range_a: &TextRange, range_b: &TextRange) -> bool {
 /// find where to put extracted function definition
 ///
 /// Function should be put right after returned node
-fn node_to_insert_after(body: &FunctionBody) -> Option<SyntaxNode> {
+fn node_to_insert_after(body: &FunctionBodyToExtract) -> Option<SyntaxNode> {
     let node = body.node();
     let mut last_ancestor = None;
     for next_ancestor in node.ancestors().peekable() {
@@ -588,10 +595,10 @@ impl Function {
 
         let mut last_tok = None;
         let block = match &self.body {
-            FunctionBody::Expr(expr) => {
+            FunctionBodyToExtract::Expr(expr) => {
                 change_indent(DEFAULT_INDENT_STEP, format!("\n{}", expr.syntax()))
             }
-            FunctionBody::Span { parent, text_range } => {
+            FunctionBodyToExtract::Span { parent, text_range } => {
                 let mut parts = " ".repeat(old_indent.0 as usize);
                 parts = "\n".to_owned() + &parts;
 
@@ -1292,4 +1299,31 @@ foo() ->
             "#]],
         );
     }
+
+    #[test]
+    fn check_extract_in_macro() {
+        check_assist(
+            extract_function,
+            "Extract into function",
+            r#"
+             -define(assertEqual(Expect, Expr),
+                     begin
+                     ((fun () ->
+                         X__X = (Expect)
+                       end)())
+                     end).
+             foo(X) -> ?assertEqual({x,1}, ~{y,2}~)."#,
+            expect![[r#"
+                -define(assertEqual(Expect, Expr),
+                        begin
+                        ((fun () ->
+                            X__X = (Expect)
+                          end)())
+                        end).
+                foo(X) -> ?assertEqual({x,1}, fun_name_edited()).
+
+                $0fun_name_edited() ->
+                    {y,2}."#]],
+        );
+    }
 }
diff --git a/crates/ide_assists/src/handlers/extract_variable.rs b/crates/ide_assists/src/handlers/extract_variable.rs
index fa17eb1da7..bc0ff0eb95 100644
--- a/crates/ide_assists/src/handlers/extract_variable.rs
+++ b/crates/ide_assists/src/handlers/extract_variable.rs
@@ -13,7 +13,6 @@ use elp_ide_db::assists::AssistKind;
 use elp_ide_db::assists::AssistUserInput;
 use elp_ide_db::assists::AssistUserInputType;
 use elp_syntax::AstNode;
-use elp_syntax::NodeOrToken;
 use elp_syntax::SyntaxKind;
 use elp_syntax::SyntaxNode;
 use elp_syntax::ast;
@@ -45,13 +44,11 @@ pub(crate) fn extract_variable(acc: &mut Assists, ctx: &AssistContext) -> Option
         return None;
     }
 
-    let node = match ctx.covering_element() {
-        NodeOrToken::Node(it) => it,
-        NodeOrToken::Token(it) if it.kind() == SyntaxKind::COMMENT => {
-            return None;
-        }
-        NodeOrToken::Token(it) => it.parent()?,
-    };
+    let node = ctx.covering_element();
+    if node.kind() == SyntaxKind::COMMENT {
+        return None;
+    }
+
     let node = node
         .ancestors()
         .take_while(|anc| anc.text_range() == node.text_range())
@@ -145,10 +142,6 @@ impl Anchor {
                 !ast::ClauseBody::can_cast(it.kind()) || ast::MacroCallExpr::can_cast(it.kind())
             })
             .find_map(|node| {
-                if ast::MacroCallExpr::can_cast(node.kind()) {
-                    return None;
-                }
-
                 if let Some(_expr) = node.parent().and_then(ast::ClauseBody::cast) {
                     return Some(Anchor(node));
                 }
@@ -339,4 +332,28 @@ foo(X) ->
             "#]],
         );
     }
+
+    #[test]
+    fn check_extract_in_macro() {
+        check_assist(
+            extract_variable,
+            "Extract into variable",
+            r#"
+             -define(assertEqual(Expect, Expr),
+                     begin
+                     ((fun () ->
+                         X__X = (Expect)
+                       end)())
+                     end).
+             foo(X) -> ?assertEqual({x,1}, ~{y,2}~)."#,
+            expect![[r#"
+                -define(assertEqual(Expect, Expr),
+                        begin
+                        ((fun () ->
+                            X__X = (Expect)
+                          end)())
+                        end).
+                foo(X) -> $0VarNameEdited = {y,2}, ?assertEqual({x,1}, VarNameEdited)."#]],
+        );
+    }
 }

From aabdad4b1b5d9d8cd8d510134dd4191597e255eb Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 10 Oct 2025 01:53:26 -0700
Subject: [PATCH 163/394] Remove warnings due to ShipIt

Summary: Remove some compilation noise from unused variables.

Reviewed By: alanz

Differential Revision: D84250963

fbshipit-source-id: 429d2f149246522b0d7cd49bcbfee8fd800b43a2
---
 crates/ide/src/annotations.rs                  | 7 +++++--
 crates/ide/src/diagnostics/atoms_exhaustion.rs | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/crates/ide/src/annotations.rs b/crates/ide/src/annotations.rs
index 7565b8783b..6cbdd3469c 100644
--- a/crates/ide/src/annotations.rs
+++ b/crates/ide/src/annotations.rs
@@ -56,8 +56,11 @@ pub struct Link {
     pub text: String,
 }
 
-pub(crate) fn annotations(db: &RootDatabase, file_id: FileId) -> Vec<Annotation> {
-    let mut annotations = Vec::default();
+#[rustfmt::skip]
+// @fb-only
+pub(crate) fn annotations(_db: &RootDatabase, _file_id: FileId) -> Vec<Annotation> { // @oss-only
+    // @fb-only
+    let annotations = Vec::default(); // @oss-only
     // @fb-only
     annotations
 }
diff --git a/crates/ide/src/diagnostics/atoms_exhaustion.rs b/crates/ide/src/diagnostics/atoms_exhaustion.rs
index e576bab2f2..bb15bebc2c 100644
--- a/crates/ide/src/diagnostics/atoms_exhaustion.rs
+++ b/crates/ide/src/diagnostics/atoms_exhaustion.rs
@@ -34,7 +34,9 @@ impl Linter for AtomsExhaustionLinter {
     fn should_process_test_files(&self) -> bool {
         false
     }
-    fn should_process_file_id(&self, sema: &Semantic, file_id: FileId) -> bool {
+    #[rustfmt::skip]
+    // @fb-only
+    fn should_process_file_id(&self, _sema: &Semantic, _file_id: FileId) -> bool { // @oss-only
         // @fb-only
         true // @oss-only
     }

From e9c2cd40c9ec3c5aa9ad10ddb3cb45a7e21a0637 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 10 Oct 2025 01:53:26 -0700
Subject: [PATCH 164/394] Refactor extraction of exdoc links

Reviewed By: alanz

Differential Revision: D84252436

fbshipit-source-id: 42016266ed3ccdd42939a6da852407d84a07cc43
---
 crates/elp/src/bin/glean.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/crates/elp/src/bin/glean.rs b/crates/elp/src/bin/glean.rs
index 3dd6c70596..b62c5a127a 100644
--- a/crates/elp/src/bin/glean.rs
+++ b/crates/elp/src/bin/glean.rs
@@ -1015,10 +1015,6 @@ impl GleanIndexer {
         });
 
         // @fb-only
-        // @fb-only
-        // @fb-only
-        // @fb-only
-            // @fb-only
         let exdoc_link: Option<String> = None; // @oss-only
 
         ModuleFact::new(

From bde2492376bd2aa2c37bb40c9bc23af62ff13b4a Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 10 Oct 2025 02:39:02 -0700
Subject: [PATCH 165/394] server: only register dynamic capabilities once

Summary:
When running in LSP mode, we do not immediately advertise all the ELP cababilities to client, holding back outline support.

This is because while we are doing our initial loading we do not process request messages from the client, and the VS Code one only asks for the outline once, when a file is first opened.

So we register dynamic capabilities once, when ELP switches to `Running` state after completing the initial file loading.

The current implementation registers the dynamic capabilities when loading is complete, which means that if the project model changes and we reload it will register again. This results in a fresh outline request, and the VS Code client then presents two outlines for the same file.

## This diff

So in this diff we add a flag in the server state and only register the dynamic capabilities once.

Reviewed By: robertoaloi

Differential Revision: D84244032

fbshipit-source-id: b1b9b2a5ddd935a58659ff13b92407a265cee34a
---
 crates/elp/src/server.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index 7daf3bd363..43406fd200 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -282,6 +282,7 @@ pub struct Server {
     project_loader: Arc<Mutex<ProjectLoader>>,
     initial_load_status: InitialLoading,
     reload_manager: Arc<Mutex<ReloadManager>>,
+    dynamic_registrations_done: bool,
     unresolved_app_id_paths: Arc<FxHashMap<AbsPathBuf, AppDataId>>,
     generated_app_inputs: Arc<FxHashMap<AbsPathBuf, AppDataId>>,
     update_app_data_ids: bool,
@@ -350,6 +351,7 @@ impl Server {
             project_loader: Arc::new(Mutex::new(ProjectLoader::new())),
             initial_load_status: InitialLoading::Initial,
             reload_manager: Arc::new(Mutex::new(ReloadManager::new())),
+            dynamic_registrations_done: false,
             unresolved_app_id_paths: Arc::new(FxHashMap::default()),
             generated_app_inputs: Arc::new(FxHashMap::default()),
             update_app_data_ids: false,
@@ -1829,7 +1831,10 @@ impl Server {
             self.show_message(params);
         }
 
-        self.register_dynamic_now_operational();
+        if !self.dynamic_registrations_done {
+            self.register_dynamic_now_operational();
+            self.dynamic_registrations_done = true;
+        }
         Ok(())
     }
 

From 5471c712e75d551789d41d9eb2ba505c97295ad8 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 10 Oct 2025 04:33:06 -0700
Subject: [PATCH 166/394] Include per-query memory info when using
 --report-system-stats

Summary:
Inspired by the [Rust Analyzer version of it](https://github.com/rust-lang/rust-analyzer/blob/90d2e1ce4dfe7dc49250a8b88a0f08ffdb9cb23f/crates/ide-db/src/apply_change.rs#L47), include per-query memory stats when asking for `--report-system-stats`.

For now the logic is limited to `parse-elp` (since the argument was added there), but it should be easily generalizable for the other ELP commands. That will be done as a follow-up.

Reviewed By: alanz

Differential Revision: D83324535

fbshipit-source-id: a076c2001da4e05649816d05729658515757c323
---
 crates/elp/src/bin/elp_parse_cli.rs | 24 +++++++
 crates/elp/src/bin/main.rs          | 40 ++++++++++++
 crates/ide/src/lib.rs               |  5 ++
 crates/ide_db/src/apply_change.rs   | 97 +++++++++++++++++++++++++++++
 4 files changed, 166 insertions(+)

diff --git a/crates/elp/src/bin/elp_parse_cli.rs b/crates/elp/src/bin/elp_parse_cli.rs
index 4234f511d7..89ee579678 100644
--- a/crates/elp/src/bin/elp_parse_cli.rs
+++ b/crates/elp/src/bin/elp_parse_cli.rs
@@ -26,6 +26,7 @@ use elp::otp_file_to_ignore;
 use elp::server::file_id_to_url;
 use elp_eqwalizer::Mode;
 use elp_ide::Analysis;
+use elp_ide::AnalysisHost;
 use elp_ide::diagnostics;
 use elp_ide::diagnostics::DiagnosticsConfig;
 use elp_ide::diagnostics::LabeledDiagnostics;
@@ -62,6 +63,27 @@ struct ParseResult {
     diagnostics: DiagnosticCollection,
 }
 
+fn print_memory_usage(mut host: AnalysisHost, vfs: Vfs, cli: &mut dyn Cli) -> Result<()> {
+    let mem = host.per_query_memory_usage();
+
+    let before = profile::memory_usage();
+    drop(vfs);
+    let vfs = before.allocated - profile::memory_usage().allocated;
+
+    let before = profile::memory_usage();
+    drop(host);
+    let unaccounted = before.allocated - profile::memory_usage().allocated;
+    let remaining = profile::memory_usage().allocated;
+
+    for (name, bytes, entries) in mem {
+        writeln!(cli, "{bytes:>8} {entries:>6} {name}")?;
+    }
+    writeln!(cli, "{vfs:>8}        VFS")?;
+    writeln!(cli, "{unaccounted:>8}        Unaccounted")?;
+    writeln!(cli, "{remaining:>8}        Remaining")?;
+    Ok(())
+}
+
 pub fn parse_all(
     args: &ParseAllElp,
     cli: &mut dyn Cli,
@@ -152,6 +174,7 @@ pub fn parse_all(
             writeln!(cli, "No errors reported")?;
         }
         if args.is_format_normal() && args.report_system_stats {
+            print_memory_usage(loaded.analysis_host, loaded.vfs, cli)?;
             writeln!(cli, "{}", memory_used)?;
         }
         Ok(())
@@ -197,6 +220,7 @@ pub fn parse_all(
         }
 
         if args.is_format_normal() && args.report_system_stats {
+            print_memory_usage(loaded.analysis_host, loaded.vfs, cli)?;
             writeln!(cli, "{}", memory_used)?;
         }
 
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index d87fb89a8f..7a4a38c196 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -815,6 +815,46 @@ mod tests {
         );
     }
 
+    #[test]
+    fn parse_elp_report_system_stats() {
+        let (args, _path) = add_project(
+            args_vec!["parse-elp", "--report-system-stats", "--module", "app_a"],
+            "standard",
+            None,
+            None,
+        );
+        let (stdout, stderr, code) = elp(args);
+
+        // Should succeed with no errors
+        assert_eq!(
+            code, 0,
+            "Expected success, got code {code}\nstdout:\n{stdout}\nstderr:\n{stderr}"
+        );
+        assert!(stderr.is_empty(), "Expected empty stderr, got:\n{stderr}");
+
+        // Should contain memory usage information in stdout
+        assert!(
+            stdout.contains("Memory usage:"),
+            "Expected memory usage output in stdout:\n{stdout}"
+        );
+        assert!(
+            stdout.contains("allocated:"),
+            "Expected allocated memory info in stdout:\n{stdout}"
+        );
+        assert!(
+            stdout.contains("active:"),
+            "Expected active memory info in stdout:\n{stdout}"
+        );
+        assert!(
+            stdout.contains("resident:"),
+            "Expected resident memory info in stdout:\n{stdout}"
+        );
+        assert!(
+            stdout.contains("FileTextQuery"),
+            "Expected FileTextQuery info in stdout:\n{stdout}"
+        );
+    }
+
     #[test]
     fn build_info_json_not_buck() {
         let tmp_dir = make_tmp_dir();
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index efd048554c..449a99de4a 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -208,6 +208,11 @@ impl AnalysisHost {
         self.db.apply_change(change, resolve_file_id)
     }
 
+    /// NB: this clears the database
+    pub fn per_query_memory_usage(&mut self) -> Vec<(String, profile::Bytes, usize)> {
+        self.db.per_query_memory_usage()
+    }
+
     pub fn new(db: RootDatabase) -> AnalysisHost {
         AnalysisHost { db }
     }
diff --git a/crates/ide_db/src/apply_change.rs b/crates/ide_db/src/apply_change.rs
index 24d0b03597..a9a00c80ae 100644
--- a/crates/ide_db/src/apply_change.rs
+++ b/crates/ide_db/src/apply_change.rs
@@ -12,9 +12,18 @@
 
 use elp_base_db::Change;
 use elp_base_db::FileId;
+use elp_base_db::salsa::Query;
+use elp_base_db::salsa::QueryTable;
+use elp_base_db::salsa::debug::DebugQueryTable;
+use elp_base_db::salsa::debug::TableEntry;
 use paths::AbsPathBuf;
+use profile::Bytes;
+use profile::memory_usage;
 
 use crate::RootDatabase;
+use crate::common_test;
+use crate::docs;
+use crate::erl_ast;
 
 impl RootDatabase {
     pub fn apply_change(
@@ -27,4 +36,92 @@ impl RootDatabase {
         log::info!("apply_change {change:?}");
         change.apply(self, resolve_file_id);
     }
+
+    pub fn per_query_memory_usage(&mut self) -> Vec<(String, Bytes, usize)> {
+        let mut acc: Vec<(String, Bytes, usize)> = vec![];
+
+        fn collect_query_count<'q, Q>(table: &QueryTable<'q, Q>) -> usize
+        where
+            QueryTable<'q, Q>: DebugQueryTable,
+            Q: Query,
+            <Q as Query>::Storage: 'q,
+        {
+            struct EntryCounter(usize);
+            impl<K, V> FromIterator<TableEntry<K, V>> for EntryCounter {
+                fn from_iter<T>(iter: T) -> EntryCounter
+                where
+                    T: IntoIterator<Item = TableEntry<K, V>>,
+                {
+                    EntryCounter(iter.into_iter().count())
+                }
+            }
+            table.entries::<EntryCounter>().0
+        }
+
+        macro_rules! purge_each_query {
+            ($($q:path)*) => {$(
+                let before = memory_usage().allocated;
+                let table = $q.in_db(self);
+                let count = collect_query_count(&table);
+                table.purge();
+                let after = memory_usage().allocated;
+                let q: $q = Default::default();
+                let name = format!("{:?}", q);
+                acc.push((name, before - after, count));
+            )*}
+        }
+        // Grep for salsa::query_group in the codebase to find relevant queries
+        // Simply convert the function name to camel case and add Query to the end
+        purge_each_query![
+            // SourceDatabase
+            elp_base_db::ParseQuery
+            elp_base_db::ModuleIndexQuery
+            elp_base_db::IncludeFileIndexQuery
+            elp_base_db::MappedIncludeFileQuery
+            elp_base_db::FileAppDataQuery
+            elp_base_db::AppDataQuery
+            elp_base_db::AppIndexQuery
+
+            // SourceDatabaseExt
+            elp_base_db::FileTextQuery
+
+            // DefDatabase
+            hir::db::FileFormListQuery
+            hir::db::DefMapQuery
+            hir::db::DefMapLocalQuery
+            hir::db::DefineBodyWithSourceQuery
+            hir::db::CompileBodyWithSourceQuery
+            hir::db::AttributeBodyWithSourceQuery
+            hir::db::TypeBodyWithSourceQuery
+            hir::db::CallbackBodyWithSourceQuery
+            hir::db::SpecBodyWithSourceQuery
+            hir::db::RecordBodyWithSourceQuery
+            hir::db::FunctionBodyWithSourceQuery
+            hir::db::FunctionClauseBodyWithSourceQuery
+            hir::db::SsrBodyWithSourceQuery
+            hir::db::LocalResolveMacroQuery
+            hir::db::ResolveMacroQuery
+            hir::db::FileEdocCommentsQuery
+            hir::db::ResolveIncludeQuery
+            hir::db::FunctionScopesQuery
+            hir::db::FunctionClauseScopesQuery
+
+            // CommonTest
+            common_test::CtInfoQuery
+
+            // Doc
+            docs::FileDocQuery
+            docs::FileSpecsQuery
+
+            // ErlAST
+            erl_ast::ModuleAstQuery
+            erl_ast::ElpMetadataQuery
+
+            // Eqwalizer
+            elp_eqwalizer::db::ModuleDiagnosticsQuery
+        ];
+
+        acc.sort_by_key(|it| std::cmp::Reverse(it.1));
+        acc
+    }
 }

From bba151232fcec3c454eee192322c718c3e5b34b2 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 10 Oct 2025 05:08:28 -0700
Subject: [PATCH 167/394] Point Cargo.toml to tree-sitter-erlang crate

Summary:
The conditional in `Cargo.toml` is problematic, since it produces a different lock file if compilation happens on GitHub via Cargo. Apart from polluting the workspace with a change, it also makes it hard to use the `--locked` option when building (e.g. part of the standard cargo options in Homebrew).

Simply point to crate and leave a comment explaining how to modify the `Cargo.toml` locally for easier development.

Reviewed By: alanz

Differential Revision: D84346947

fbshipit-source-id: 25fe550e0feec7c2a2567debfaecf8318a0c523a
---
 Cargo.lock | 3 ++-
 Cargo.toml | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ce4109d3c1..03f23763eb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2535,9 +2535,10 @@ dependencies = [
 [[package]]
 name = "tree-sitter-erlang"
 version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2091cce4eda19c03d77928c608ac6617445a6a25691dde1e93ac0102467a6be"
 dependencies = [
  "cc",
- "tree-sitter",
  "tree-sitter-language",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 6823c94afd..5814517745 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -112,8 +112,9 @@ threadpool = "1.8.1"
 timeout-readwrite = "0.3.3"
 toml = "0.5"
 tree-sitter = "0.23.2"
-# @fb-only
-tree-sitter-erlang = "0.15.0" # @oss-only
+# When developing the grammar, you may want to point to a local version
+# tree-sitter-erlang = { path = "./tree-sitter-erlang" }
+tree-sitter-erlang = "0.15.0"
 url = "2.5.4"
 ustr = { version = "1.1.0", features = ["serde"] }
 vfs = { git = "https://github.com/rust-lang/rust-analyzer", rev = "2025-03-04" }

From 747af175c2e968c442127aea50acfda776f824d9 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 10 Oct 2025 07:14:35 -0700
Subject: [PATCH 168/394] Bump OSS VS Code extension for release (0.41.0 ->
 0.42.0)

Summary: As per release instructions.

Reviewed By: alanz

Differential Revision: D84351530

fbshipit-source-id: 73fa5ce1922dd5e3baa930823fe75cc05c3711ad
---
 editors/code/package-lock.json | 4 ++--
 editors/code/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 98c19db4c7..6e00a55203 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "erlang-language-platform",
-  "version": "0.41.0",
+  "version": "0.42.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "erlang-language-platform",
-      "version": "0.41.0",
+      "version": "0.42.0",
       "hasInstallScript": true,
       "license": "Apache2",
       "devDependencies": {
diff --git a/editors/code/package.json b/editors/code/package.json
index 840dc20ae3..0695e9e215 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -3,7 +3,7 @@
   "description": "Erlang language server",
   "author": "Meta Platforms, Inc",
   "license": "Apache2",
-  "version": "0.41.0",
+  "version": "0.42.0",
   "icon": "images/elp-logo-color.png",
   "homepage": "https://whatsapp.github.io/erlang-language-platform/",
   "repository": {

From 2b658e2600ac82872d6ecf0cd2f15ffeea65dc66 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 10 Oct 2025 09:12:00 -0700
Subject: [PATCH 169/394] Extend memory analysis to lint command

Summary:
Move the `print_memory_usage` function to the `reporting` module and use it from the `lint` command.

This represents the first step towards a generic argument that can be used by various commands and will be merged with similar options existing for other commands.

Reviewed By: alanz

Differential Revision: D84347271

fbshipit-source-id: 3c19b87e3c48bc8e790e1a96eb40014deddd87ac
---
 crates/elp/src/bin/args.rs                    |  4 +++
 crates/elp/src/bin/elp_parse_cli.rs           | 23 +---------------
 crates/elp/src/bin/lint_cli.rs                | 17 +++++++++++-
 crates/elp/src/bin/reporting.rs               | 27 +++++++++++++++++++
 .../elp/src/resources/test/lint_help.stdout   |  3 ++-
 5 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index 68fb4a4e49..961d3216f7 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -323,6 +323,10 @@ pub struct Lint {
     /// than one at a time.
     pub one_shot: bool,
 
+    /// Report system memory usage and other statistics
+    #[bpaf(long("report-system-stats"))]
+    pub report_system_stats: bool,
+
     /// Rest of args are space separated list of apps to ignore
     #[bpaf(positional("IGNORED_APPS"))]
     pub ignore_apps: Vec<String>,
diff --git a/crates/elp/src/bin/elp_parse_cli.rs b/crates/elp/src/bin/elp_parse_cli.rs
index 89ee579678..c826c0a927 100644
--- a/crates/elp/src/bin/elp_parse_cli.rs
+++ b/crates/elp/src/bin/elp_parse_cli.rs
@@ -26,7 +26,6 @@ use elp::otp_file_to_ignore;
 use elp::server::file_id_to_url;
 use elp_eqwalizer::Mode;
 use elp_ide::Analysis;
-use elp_ide::AnalysisHost;
 use elp_ide::diagnostics;
 use elp_ide::diagnostics::DiagnosticsConfig;
 use elp_ide::diagnostics::LabeledDiagnostics;
@@ -55,6 +54,7 @@ use vfs::AbsPath;
 
 use crate::args::ParseAllElp;
 use crate::reporting;
+use crate::reporting::print_memory_usage;
 
 #[derive(Debug)]
 struct ParseResult {
@@ -63,27 +63,6 @@ struct ParseResult {
     diagnostics: DiagnosticCollection,
 }
 
-fn print_memory_usage(mut host: AnalysisHost, vfs: Vfs, cli: &mut dyn Cli) -> Result<()> {
-    let mem = host.per_query_memory_usage();
-
-    let before = profile::memory_usage();
-    drop(vfs);
-    let vfs = before.allocated - profile::memory_usage().allocated;
-
-    let before = profile::memory_usage();
-    drop(host);
-    let unaccounted = before.allocated - profile::memory_usage().allocated;
-    let remaining = profile::memory_usage().allocated;
-
-    for (name, bytes, entries) in mem {
-        writeln!(cli, "{bytes:>8} {entries:>6} {name}")?;
-    }
-    writeln!(cli, "{vfs:>8}        VFS")?;
-    writeln!(cli, "{unaccounted:>8}        Unaccounted")?;
-    writeln!(cli, "{remaining:>8}        Remaining")?;
-    Ok(())
-}
-
 pub fn parse_all(
     args: &ParseAllElp,
     cli: &mut dyn Cli,
diff --git a/crates/elp/src/bin/lint_cli.rs b/crates/elp/src/bin/lint_cli.rs
index 9c7ab42e05..aeb6fe4871 100644
--- a/crates/elp/src/bin/lint_cli.rs
+++ b/crates/elp/src/bin/lint_cli.rs
@@ -23,6 +23,7 @@ use elp::build::load;
 use elp::build::types::LoadResult;
 use elp::cli::Cli;
 use elp::convert;
+use elp::memory_usage::MemoryUsage;
 use elp::otp_file_to_ignore;
 use elp::read_lint_config_file;
 use elp_eqwalizer::Mode;
@@ -67,12 +68,15 @@ use rayon::prelude::ParallelIterator;
 
 use crate::args::Lint;
 use crate::reporting;
+use crate::reporting::print_memory_usage;
 
 pub fn run_lint_command(
     args: &Lint,
     cli: &mut dyn Cli,
     query_config: &BuckQueryConfig,
 ) -> Result<()> {
+    let memory_start = MemoryUsage::now();
+
     if let Some(to) = &args.to {
         fs::create_dir_all(to)?
     };
@@ -83,7 +87,18 @@ pub fn run_lint_command(
     // errors. No point wasting time if the config is wrong.
     let mut loaded = load_project(args, cli, query_config)?;
 
-    do_codemod(cli, &mut loaded, &diagnostics_config, args)
+    let result = do_codemod(cli, &mut loaded, &diagnostics_config, args);
+
+    let memory_end = MemoryUsage::now();
+    let memory_used = memory_end - memory_start;
+
+    // Print memory usage at the end if requested and format is normal
+    if args.is_format_normal() && args.report_system_stats {
+        print_memory_usage(loaded.analysis_host, loaded.vfs, cli)?;
+        writeln!(cli, "{}", memory_used)?;
+    }
+
+    result
 }
 
 fn get_and_report_diagnostics_config(args: &Lint, cli: &mut dyn Cli) -> Result<DiagnosticsConfig> {
diff --git a/crates/elp/src/bin/reporting.rs b/crates/elp/src/bin/reporting.rs
index 311f272507..7ab10459fe 100644
--- a/crates/elp/src/bin/reporting.rs
+++ b/crates/elp/src/bin/reporting.rs
@@ -29,6 +29,7 @@ use elp::cli::Cli;
 use elp::convert;
 use elp::memory_usage::MemoryUsage;
 use elp_ide::Analysis;
+use elp_ide::AnalysisHost;
 use elp_ide::TextRange;
 use elp_ide::elp_ide_db::EqwalizerDiagnostic;
 use elp_ide::elp_ide_db::elp_base_db::AbsPath;
@@ -38,6 +39,7 @@ use indicatif::ProgressBar;
 use itertools::Itertools;
 use lazy_static::lazy_static;
 use parking_lot::Mutex;
+use vfs::Vfs;
 
 pub trait Reporter {
     fn write_eqwalizer_diagnostics(
@@ -372,3 +374,28 @@ pub(crate) fn add_stat(stat: String) {
     let mut stats = STATS.lock();
     stats.push(stat);
 }
+
+pub(crate) fn print_memory_usage(
+    mut host: AnalysisHost,
+    vfs: Vfs,
+    cli: &mut dyn Cli,
+) -> Result<()> {
+    let mem = host.per_query_memory_usage();
+
+    let before = profile::memory_usage();
+    drop(vfs);
+    let vfs = before.allocated - profile::memory_usage().allocated;
+
+    let before = profile::memory_usage();
+    drop(host);
+    let unaccounted = before.allocated - profile::memory_usage().allocated;
+    let remaining = profile::memory_usage().allocated;
+
+    for (name, bytes, entries) in mem {
+        writeln!(cli, "{bytes:>8} {entries:>6} {name}")?;
+    }
+    writeln!(cli, "{vfs:>8}        VFS")?;
+    writeln!(cli, "{unaccounted:>8}        Unaccounted")?;
+    writeln!(cli, "{remaining:>8}        Remaining")?;
+    Ok(())
+}
diff --git a/crates/elp/src/resources/test/lint_help.stdout b/crates/elp/src/resources/test/lint_help.stdout
index 3842adde9c..8d03db6ee3 100644
--- a/crates/elp/src/resources/test/lint_help.stdout
+++ b/crates/elp/src/resources/test/lint_help.stdout
@@ -1,4 +1,4 @@
-Usage: [--project PROJECT] [--module MODULE] [--app APP] [--file FILE] [--rebar] [--as PROFILE] [--include-generated] [--include-tests] [--no-diags] [[--format FORMAT]] [--prefix ARG] [--include-erlc-diagnostics] [--include-ct-diagnostics] [--include-edoc-diagnostics] [--include-eqwalizer-diagnostics] [--include-suppressed] [--use-cli-severity] [--diagnostic-ignore CODE] [--diagnostic-filter CODE] [--experimental] [--read-config] [--config-file CONFIG_FILE] [--apply-fix] [--ignore-fix-only] [--in-place] [--to TO] [--recursive] [--with-check] [--check-eqwalize-all] [--one-shot] <IGNORED_APPS>...
+Usage: [--project PROJECT] [--module MODULE] [--app APP] [--file FILE] [--rebar] [--as PROFILE] [--include-generated] [--include-tests] [--no-diags] [[--format FORMAT]] [--prefix ARG] [--include-erlc-diagnostics] [--include-ct-diagnostics] [--include-edoc-diagnostics] [--include-eqwalizer-diagnostics] [--include-suppressed] [--use-cli-severity] [--diagnostic-ignore CODE] [--diagnostic-filter CODE] [--experimental] [--read-config] [--config-file CONFIG_FILE] [--apply-fix] [--ignore-fix-only] [--in-place] [--to TO] [--recursive] [--with-check] [--check-eqwalize-all] [--one-shot] [--report-system-stats] <IGNORED_APPS>...
 
 Available positional items:
     <IGNORED_APPS>  Rest of args are space separated list of apps to ignore
@@ -37,4 +37,5 @@ Available options:
         --check-eqwalize-all             After applying a fix step, check that all eqwalizer project diagnostics are clear, else roll back
         --one-shot                       Apply to all matching diagnostic occurrences at once, rather
                                          than one at a time.
+        --report-system-stats            Report system memory usage and other statistics
     -h, --help                           Prints help information

From 55a4aa6d3d18de6eb35aa2d16f1c41c3fe91d676 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 13 Oct 2025 02:24:38 -0700
Subject: [PATCH 170/394] Fix OSS compilation warnings

Summary: Avoid unused variable warnings in OSS version.

Reviewed By: alanz

Differential Revision: D84486791

fbshipit-source-id: 5fde1b02a5a27ed892df220ded3a533302abe73b
---
 crates/elp/src/bin/glean.rs                   | 144 +-----------------
 .../src/diagnostics/unexported_function.rs    |   4 +-
 2 files changed, 5 insertions(+), 143 deletions(-)

diff --git a/crates/elp/src/bin/glean.rs b/crates/elp/src/bin/glean.rs
index b62c5a127a..dad833e0c1 100644
--- a/crates/elp/src/bin/glean.rs
+++ b/crates/elp/src/bin/glean.rs
@@ -2657,22 +2657,6 @@ mod tests {
         xref_v2_check(spec);
     }
 
-    #[test]
-    fn xref_wam_record_v2_test() {
-        let spec = r#"
-        //- /src/record.erl
-            -module(record).
-            -record(wam_event_chatd_c2s_logout, {data, reason}).
-
-            baz(Data) ->
-                Event = #wam_event_chatd_c2s_logout{data = Data},
-            %%          ^^^^^^^^^^^^^^^^^^^^^^^^^^^ record.erl/rec/wam_event_chatd_c2s_logout/has_wam
-                Event.
-
-        "#;
-        // @fb-only
-    }
-
     #[test]
     fn xref_macro_v2_test() {
         let spec = r#"
@@ -2694,45 +2678,6 @@ mod tests {
         xref_v2_check(spec);
     }
 
-    #[test]
-    fn xref_macro_ods_v2_test() {
-        let spec = r#"
-        //- /src/macro.erl
-            -module(macro).
-            -define(COUNT_INFRA(X), wa_stats_counter:count(X)).
-            baz(atom) -> ?COUNT_INFRA(atom),
-        %%                ^^^^^^^^^^^ macro.erl/macro/COUNT_INFRA/94/has_ods/wa_stats_counter:count( atom )
-
-        "#;
-        // @fb-only
-    }
-
-    #[test]
-    fn xref_macro_logview_v2_test() {
-        let spec = r#"
-        //- /src/macro.erl
-            -module(macro).
-            -define(LOG_E(X), (fun() -> wa_log:send_if(X) end)()).
-            baz(atom) -> ?LOG_E("test"),
-        %%                ^^^^^ macro.erl/macro/LOG_E/97/has_logview/fun () -> wa_log:send_if( "test" ) end()
-
-        "#;
-        // @fb-only
-    }
-
-    #[test]
-    fn xref_macro_scuba_v2_test() {
-        let spec = r#"
-        //- /src/macro.erl
-            -module(macro).
-            -define(LOG_SCUBA(X), wa_scuba:log_tablename(pii, X)).
-            baz(atom) -> ?LOG_SCUBA(test_event),
-        %%                ^^^^^^^^^ macro.erl/macro/LOG_SCUBA/97/has_scuba/wa_scuba:log_tablename( pii, test_event )
-
-        "#;
-        // @fb-only
-    }
-
     #[test]
     fn xref_macro_in_pat_v2_test() {
         let spec = r#"
@@ -2845,91 +2790,6 @@ mod tests {
         assert!(module_fact.module_doc.is_none());
     }
 
-    #[test]
-    fn module_fact_moduledoc_multiple_line_test() {
-        let spec = r#"
-        //- /src/data_processor.erl
-        -module(data_processor).
-        -oncall("data_team").
-        -moduledoc """
-        Data processing module for batch operations
-        Handles various data transformation tasks
-        For more information see:
-        https://www.example.com/data/processing
-        """.
-        -behaviour(test_behaviour).
-        -export([
-            start_link/0,
-            process_batch/1,
-            get_status/0
-        ]).
-
-        start_link() -> test_behaviour:start_link(?MODULE, [], []).
-        process_batch(Data) -> test_behaviour:call(?SERVER, {process, Data}).
-        get_status() -> test_behaviour:call(?SERVER, status).
-        "#;
-        let (facts, _, _, _, _) = facts_with_annotations(spec);
-        assert_eq!(facts.module_facts.len(), 1);
-        let module_fact = &facts.module_facts[0];
-        assert_eq!(module_fact.name, "data_processor");
-        assert_eq!(module_fact.oncall, Some("data_team".to_string()));
-        assert_eq!(
-            module_fact.behaviours,
-            Some(vec!["test_behaviour".to_string()])
-        );
-        assert_eq!(module_fact.exports.as_ref().map(|v| v.len()), Some(3));
-        for expected in ["get_status/0", "process_batch/1", "start_link/0"] {
-            assert!(
-                module_fact
-                    .exports
-                    .as_ref()
-                    .unwrap()
-                    .contains(&expected.to_string())
-            );
-        }
-        assert!(module_fact.module_doc.is_some());
-        let doc = module_fact.module_doc.as_ref().unwrap();
-        assert!(doc.contains("Data processing module for batch operations"));
-        assert!(doc.contains("https://www.example.com/data/processing"));
-    }
-
-    #[test]
-    fn module_fact_moduledoc_single_line_test() {
-        let spec = r#"
-        //- /src/config_manager.erl
-        -module(config_manager).
-        -oncall("infra_team").
-        -moduledoc "Configuration management module for system settings".
-        -behaviour(application).
-        -export([load_config/1, save_config/2]).
-
-        load_config(File) -> {ok, config}.
-        save_config(File, Config) -> ok.
-        "#;
-        let (facts, _, _, _, _) = facts_with_annotations(spec);
-        assert_eq!(facts.module_facts.len(), 1);
-        let module_fact = &facts.module_facts[0];
-        assert_eq!(module_fact.name, "config_manager");
-        assert_eq!(module_fact.oncall, Some("infra_team".to_string()));
-        assert_eq!(
-            module_fact.behaviours,
-            Some(vec!["application".to_string()])
-        );
-        assert_eq!(module_fact.exports.as_ref().map(|v| v.len()), Some(2));
-        for expected in ["load_config/1", "save_config/2"] {
-            assert!(
-                module_fact
-                    .exports
-                    .as_ref()
-                    .unwrap()
-                    .contains(&expected.to_string())
-            );
-        }
-        assert!(module_fact.module_doc.is_some());
-        let doc = module_fact.module_doc.as_ref().unwrap();
-        assert_eq!(doc, "Configuration management module for system settings");
-    }
-
     #[test]
     fn module_fact_no_oncall_test() {
         let spec = r#"
@@ -2961,7 +2821,7 @@ mod tests {
     }
 
     #[allow(clippy::type_complexity)]
-    fn facts_with_annotations(
+    pub(crate) fn facts_with_annotations(
         spec: &str,
     ) -> (
         IndexedFacts,
@@ -3055,7 +2915,7 @@ mod tests {
     }
 
     #[track_caller]
-    fn xref_v2_check(spec: &str) {
+    pub(crate) fn xref_v2_check(spec: &str) {
         let (facts, mut expected_by_file, file_names, _d, _) = facts_with_annotations(spec);
         for xref_fact in facts.xref_v2 {
             let file_id = xref_fact.file_id;
diff --git a/crates/ide/src/diagnostics/unexported_function.rs b/crates/ide/src/diagnostics/unexported_function.rs
index 3d295b6c53..4985b3c4e3 100644
--- a/crates/ide/src/diagnostics/unexported_function.rs
+++ b/crates/ide/src/diagnostics/unexported_function.rs
@@ -43,7 +43,9 @@ impl Linter for UnexportedFunctionLinter {
     fn should_process_generated_files(&self) -> bool {
         true
     }
-    fn should_process_file_id(&self, sema: &Semantic, file_id: FileId) -> bool {
+    #[rustfmt::skip]
+    fn should_process_file_id(&self, _sema: &Semantic, _file_id: FileId) -> bool { // @oss-only
+    // @fb-only
         true // @oss-only
         // @fb-only
     }

From 0a1f82c441302238eec2824bff329e3607e08ccc Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 13 Oct 2025 05:02:35 -0700
Subject: [PATCH 171/394] Introduce simple_snapshot_output_contains helper, fix
 failing testcase

Summary:
The testcase was not using the `simple_*` helpers, causing it to run with a buck2 config on GitHub. Buck2 is not yet configured there, causing the test to fail.

Introduce a new helper that a testcase to match on the output, rather than having a completely deterministic output (memory can vary). By using the helper, apply the same filtering on the buck feature as in the other tests.

Reviewed By: alanz

Differential Revision: D84498544

fbshipit-source-id: 6cd58f05914cfa218496280c0e4331c2f162980a
---
 crates/elp/src/bin/main.rs | 82 ++++++++++++++++++++++----------------
 1 file changed, 48 insertions(+), 34 deletions(-)

diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 7a4a38c196..e40d3b5b05 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -815,43 +815,22 @@ mod tests {
         );
     }
 
-    #[test]
-    fn parse_elp_report_system_stats() {
-        let (args, _path) = add_project(
+    #[test_case(false ; "rebar")]
+    #[test_case(true  ; "buck")]
+    fn parse_elp_report_system_stats(buck: bool) {
+        simple_snapshot_output_contains(
             args_vec!["parse-elp", "--report-system-stats", "--module", "app_a"],
             "standard",
+            &[
+                "Memory usage:",
+                "allocated:",
+                "active:",
+                "resident:",
+                "FileTextQuery",
+            ],
+            buck,
             None,
-            None,
-        );
-        let (stdout, stderr, code) = elp(args);
-
-        // Should succeed with no errors
-        assert_eq!(
-            code, 0,
-            "Expected success, got code {code}\nstdout:\n{stdout}\nstderr:\n{stderr}"
-        );
-        assert!(stderr.is_empty(), "Expected empty stderr, got:\n{stderr}");
-
-        // Should contain memory usage information in stdout
-        assert!(
-            stdout.contains("Memory usage:"),
-            "Expected memory usage output in stdout:\n{stdout}"
-        );
-        assert!(
-            stdout.contains("allocated:"),
-            "Expected allocated memory info in stdout:\n{stdout}"
-        );
-        assert!(
-            stdout.contains("active:"),
-            "Expected active memory info in stdout:\n{stdout}"
-        );
-        assert!(
-            stdout.contains("resident:"),
-            "Expected resident memory info in stdout:\n{stdout}"
-        );
-        assert!(
-            stdout.contains("FileTextQuery"),
-            "Expected FileTextQuery info in stdout:\n{stdout}"
+            0,
         );
     }
 
@@ -2420,6 +2399,41 @@ mod tests {
         }
     }
 
+    #[track_caller]
+    fn simple_snapshot_output_contains(
+        args: Vec<OsString>,
+        project: &str,
+        expected_patterns: &[&str],
+        buck: bool,
+        file: Option<&str>,
+        expected_code: i32,
+    ) {
+        if !buck || cfg!(feature = "buck") {
+            let (mut args, _path) = add_project(args, project, file, None);
+            if !buck {
+                args.push("--rebar".into());
+            }
+            let (stdout, stderr, code) = elp(args);
+            assert_eq!(
+                code, expected_code,
+                "Expected exit code {expected_code}, got: {code}\nstdout:\n{stdout}\nstderr:\n{stderr}"
+            );
+
+            if expected_code == 0 {
+                assert!(stderr.is_empty(), "Expected empty stderr, got:\n{stderr}");
+            }
+
+            for pattern in expected_patterns {
+                assert!(
+                    stdout.contains(pattern),
+                    "Expected stdout to contain '{}', but got:\n{}",
+                    pattern,
+                    stdout
+                );
+            }
+        }
+    }
+
     #[allow(clippy::too_many_arguments)]
     fn check_lint_fix(
         args: Vec<OsString>,

From 5937388a4e5ef6efff855216ff99f57f10657204 Mon Sep 17 00:00:00 2001
From: Tristan Sloughter <tristan@sloughter.dev>
Date: Mon, 13 Oct 2025 06:11:06 -0700
Subject: [PATCH 172/394] fix: including based on an application path requires
 include_lib (#118)

Summary:
`include` will only treat the given string as a path while `include_lib` parses out `app_a` and looks in the library directory of that application

Pull Request resolved: https://github.com/whatsapp/erlang-language-platform/pull/118

Reviewed By: alanz

Differential Revision: D84483303

Pulled By: robertoaloi

fbshipit-source-id: eeb6a7956045ea6ef15398672bffee80a845694c
---
 website/docs/erlang-error-index/w/W0037.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/docs/erlang-error-index/w/W0037.md b/website/docs/erlang-error-index/w/W0037.md
index 22908c1388..8577e84126 100644
--- a/website/docs/erlang-error-index/w/W0037.md
+++ b/website/docs/erlang-error-index/w/W0037.md
@@ -14,7 +14,7 @@ sidebar_position: 37
 becomes
 
 ```erlang
--include("app_a/include/some_header_from_app_a.hrl").
+-include_lib("app_a/include/some_header_from_app_a.hrl").
 ```
 
 ## Explanation

From a89365692b06cdf8589ece282469c645fbb1c25e Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 14 Oct 2025 09:04:53 -0700
Subject: [PATCH 173/394] BE:prioritise extract variable over extract function
 in UI

Summary:
Users prefer to be able to more quicly select the extract variable than extract function in the VS Code UI.

Change the order these are presented to enable this.

Reviewed By: michalmuskala

Differential Revision: D84612436

fbshipit-source-id: 8a0f7c21568248137f07337ec0256d4ed8d811ea
---
 crates/ide_assists/src/lib.rs | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/crates/ide_assists/src/lib.rs b/crates/ide_assists/src/lib.rs
index 12f4b837b7..7f03139e6f 100644
--- a/crates/ide_assists/src/lib.rs
+++ b/crates/ide_assists/src/lib.rs
@@ -86,7 +86,7 @@ mod handlers {
 
     pub(crate) fn all() -> &'static [Handler] {
         &[
-            // These are alphabetic for the foolish consistency
+            // These affect the order of display in the UI
             add_doc::add_doc,
             add_fixme::add_fixme,
             add_format::add_format,
@@ -97,22 +97,15 @@ mod handlers {
             delete_function::delete_function,
             export_function::export_function,
             export_type::export_type,
-            extract_function::extract_function,
+            // Put extract variable before extract function, so it is
+            // easier to access, as it is used more frequently
             extract_variable::extract_variable,
+            extract_function::extract_function,
             flip_sep::flip_sep,
             ignore_variable::ignore_variable,
             implement_behaviour::implement_behaviour,
             inline_function::inline_function,
             inline_local_variable::inline_local_variable,
-            // These are manually sorted for better priorities. By default,
-            // priority is determined by the size of the target range (smaller
-            // target wins). If the ranges are equal, position in this list is
-            // used as a tie-breaker.
-            // add_missing_impl_members::add_missing_impl_members,
-            // add_missing_impl_members::add_missing_default_members,
-
-            // Are you sure you want to add new assist here, and not to the
-            // sorted list above?
         ]
     }
 }

From 80cbfe7f83cc2722a2022abbca8bce6233dd4284 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 15 Oct 2025 02:28:45 -0700
Subject: [PATCH 174/394] Enable documentation for types

Summary:
Since OTP 27, [it's possible to use `-doc` attributes for user defined types](https://www.erlang.org/doc/system/documentation.html).

This diff enables extraction of type documentation for both local and remote types, ensuring documentation is visible on hover.

Since no test cases were covering documentation extraction, I also added a couple of them for functions.

Reviewed By: alanz

Differential Revision: D84680999

fbshipit-source-id: 120dbfab0e046e34363563c7139369cb36de202b
---
 crates/ide/src/handlers/get_docs.rs | 97 +++++++++++++++++++++++++++++
 crates/ide/src/lib.rs               |  1 +
 crates/ide_db/src/docs.rs           |  8 ++-
 3 files changed, 104 insertions(+), 2 deletions(-)

diff --git a/crates/ide/src/handlers/get_docs.rs b/crates/ide/src/handlers/get_docs.rs
index 7fdd979e92..0efc7ef452 100644
--- a/crates/ide/src/handlers/get_docs.rs
+++ b/crates/ide/src/handlers/get_docs.rs
@@ -22,3 +22,100 @@ pub(crate) fn get_doc_for_token(
     let docs = elp_ide_db::docs::Documentation::new(db, sema);
     Doc::from_reference(&docs, token)
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::fixture;
+
+    #[track_caller]
+    fn check(fixture: &str, expected: &str) {
+        let (analysis, fixture) = fixture::with_fixture(fixture);
+        let docs = analysis
+            .get_docs_at_position(fixture.position())
+            .unwrap()
+            .unwrap();
+        let doc = docs.doc.unwrap();
+        assert_eq!(doc.markdown_text(), expected);
+    }
+
+    #[test]
+    fn local_type() {
+        check(
+            r#"
+-module(main).
+-export([main/0]).
+-doc """
+My integer
+""".
+-type my_integer() :: integer().
+
+-spec main() -> my_in~teger().
+main() -> 42.
+"#,
+            "\
+```erlang
+-type my_integer() :: integer().
+```
+
+-----
+
+My integer",
+        );
+    }
+
+    #[test]
+    fn remote_type() {
+        check(
+            r#"
+//- /src/main.erl
+-module(main).
+-export([main/0]).
+-spec main() -> other:my_in~teger().
+main() -> 42.
+
+//- /src/other.erl
+-module(other).
+-doc """
+My integer
+""".
+-export_type([my_integer/0]).
+-type my_integer() :: integer().
+"#,
+            "\
+```erlang
+-type my_integer() :: integer().
+```
+
+-----
+
+My integer",
+        );
+    }
+
+    #[test]
+    fn local_function() {
+        check(
+            r#"
+-module(main).
+-export([main/0]).
+
+-doc """
+My function
+""".
+-spec main() -> ok.
+main() -> ok.
+
+-spec caller() -> ok.
+caller() -> ma~in().
+"#,
+            "\
+```erlang
+-spec main() -> ok.
+```
+
+-----
+
+My function",
+        );
+    }
+}
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index 449a99de4a..1facbcaedb 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -170,6 +170,7 @@ pub struct AnalysisHost {
     db: RootDatabase,
 }
 
+#[derive(Debug)]
 pub struct DocResult {
     pub doc: Option<Doc>,
     pub token_kind: SyntaxKind,
diff --git a/crates/ide_db/src/docs.rs b/crates/ide_db/src/docs.rs
index 655a784cab..f7a96225b0 100644
--- a/crates/ide_db/src/docs.rs
+++ b/crates/ide_db/src/docs.rs
@@ -137,7 +137,9 @@ impl ToDoc for InFile<&ast::Remote> {
                     let name_arity = fun_def.name;
                     docs.function_doc(file_id, name_arity)
                 }
-                CallDef::Type(_) | CallDef::FuzzyType(_) => None,
+                CallDef::Type(type_def) | CallDef::FuzzyType(type_def) => {
+                    docs.type_doc(type_def.file.file_id, type_def.name().clone())
+                }
             }
         } else {
             None
@@ -152,7 +154,9 @@ impl ToDoc for InFile<&ast::Call> {
                 CallDef::Function(fun_def) | CallDef::FuzzyFunction(fun_def) => {
                     docs.function_doc(fun_def.file.file_id, fun_def.name)
                 }
-                CallDef::Type(_) | CallDef::FuzzyType(_) => None,
+                CallDef::Type(type_def) | CallDef::FuzzyType(type_def) => {
+                    docs.type_doc(type_def.file.file_id, type_def.name().clone())
+                }
             }
         } else {
             None

From 29877042a6477d63c6e1d93c1d612511ad8f592f Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 17 Oct 2025 01:54:50 -0700
Subject: [PATCH 175/394] Do not report an undefined function warning if the
 module name is a variable

Summary: If the module is a variable, we can't determine at compile time whether the function is defined or not, so don't report it.

Reviewed By: alanz

Differential Revision: D84827250

fbshipit-source-id: ec0c5c4238e8e4952b5fdf8a871326461ade7e25
---
 .../ide/src/diagnostics/undefined_function.rs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/crates/ide/src/diagnostics/undefined_function.rs b/crates/ide/src/diagnostics/undefined_function.rs
index 2584e95896..43edc3e3b6 100644
--- a/crates/ide/src/diagnostics/undefined_function.rs
+++ b/crates/ide/src/diagnostics/undefined_function.rs
@@ -73,6 +73,13 @@ impl FunctionCallLinter for UndefinedFunctionLinter {
                 let arity = context.args.arity();
                 let module = &def_fb[*module];
                 let name = &def_fb[*name];
+
+                // If the module is a variable, we can't determine at compile time
+                // whether the function is defined or not, so don't report it
+                if module.as_var().is_some() {
+                    return None;
+                }
+
                 if sema.is_atom_named(name, &known::module_info) && (arity == 0 || arity == 1)
                     || sema
                         .resolve_module_expr(def_fb.file_id(), module)
@@ -382,4 +389,16 @@ exists() -> ok.
             "#,
         )
     }
+
+    #[test]
+    fn test_module_name_variable() {
+        check_diagnostics(
+            r#"
+    //- /src/main.erl
+    -module(main).
+    main(Callback) ->
+      Callback:main().
+            "#,
+        )
+    }
 }

From 7172056397aa292ca21c99063bac11ab32f4d3d0 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 17 Oct 2025 01:54:50 -0700
Subject: [PATCH 176/394] Only cover the function name in the
 deprecation_function linter

Summary:
The `deprecated_function` linter reports diagnostics covering the whole range of the function call, including arguments. This makes the code really hard to read. Only cover the function name.

This will be simplified once the linter is converted to use a trait.

Reviewed By: alanz

Differential Revision: D84829846

fbshipit-source-id: a8d0b5a0e52e222bce6464209063cc79b3bda74a
---
 .../ide/src/diagnostics/deprecated_function.rs  | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/crates/ide/src/diagnostics/deprecated_function.rs b/crates/ide/src/diagnostics/deprecated_function.rs
index 3162a95954..cd5a981256 100644
--- a/crates/ide/src/diagnostics/deprecated_function.rs
+++ b/crates/ide/src/diagnostics/deprecated_function.rs
@@ -142,6 +142,13 @@ fn check_function(
                         if let Some(range) = def_fb.range_for_any(clause_id, expr_id)
                             && def.file.file_id == range.file_id
                         {
+                            let range_mf = if ctx.in_macro.is_none() {
+                                let in_clause = &def_fb.in_clause(clause_id);
+                                target.range(in_clause)
+                            } else {
+                                None
+                            };
+                            let range = range_mf.unwrap_or(range);
                             let d = make_diagnostic(range.range, &target_def, details)
                                 .with_fixes(Some(vec![fix_xref_ignore(
                                     sema,
@@ -256,7 +263,7 @@ mod tests {
     ok.
   main() ->
     not_ok_to_use().
-%%  ^^^^^^^^^^^^^^^ 💡 warning: Function 'not_ok_to_use/0' is deprecated.
+%%  ^^^^^^^^^^^^^ 💡 warning: Function 'not_ok_to_use/0' is deprecated.
             "#,
         )
     }
@@ -276,7 +283,7 @@ mod tests {
 
   main() ->
     b:not_ok_to_use().
-%%  ^^^^^^^^^^^^^^^^^ 💡 warning: Function 'not_ok_to_use/0' is deprecated.
+%%  ^^^^^^^^^^^^^^^ 💡 warning: Function 'not_ok_to_use/0' is deprecated.
             "#,
         )
     }
@@ -290,7 +297,7 @@ mod tests {
   -deprecated({do, 0}).
   main() ->
     do(),
-%%  ^^^^ 💡 warning: Function 'do/0' is deprecated.
+%%  ^^ 💡 warning: Function 'do/0' is deprecated.
     ?LAZY(do()).
 %%  ^^^^^^^^^^^ 💡 warning: Function 'do/0' is deprecated.
   do() ->
@@ -314,8 +321,8 @@ mod tests {
 
   main() ->
     b:not_ok_to_use().
-%%  ^^^^^^^^^^^^^^^^^ 💡 warning: Function 'not_ok_to_use/0' is deprecated.
-%%                  | Cause I said so.
+%%  ^^^^^^^^^^^^^^^ 💡 warning: Function 'not_ok_to_use/0' is deprecated.
+%%                | Cause I said so.
             "#,
         )
     }

From 7cf2eafc9b911628a61d5db9b4f52974e5a2e1a6 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 17 Oct 2025 01:54:50 -0700
Subject: [PATCH 177/394] Do not mark deprecated functions diagnostics as
 experimental

Summary: Even if the `deprecated_functions` linter is not experimental, the produced diagnostics were incorrectly tagged as experimental. This caused them not to be seen.

Reviewed By: alanz

Differential Revision: D84829863

fbshipit-source-id: 374389a764cb13dd792ea5dbee37dd3b79b2e9e8
---
 crates/ide/src/diagnostics/deprecated_function.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crates/ide/src/diagnostics/deprecated_function.rs b/crates/ide/src/diagnostics/deprecated_function.rs
index cd5a981256..65b06006dc 100644
--- a/crates/ide/src/diagnostics/deprecated_function.rs
+++ b/crates/ide/src/diagnostics/deprecated_function.rs
@@ -199,7 +199,6 @@ fn make_diagnostic(
         .with_severity(severity)
         .deprecated()
         .with_uri(uri)
-        .experimental()
 }
 
 fn strip_quotes(s: &str) -> &str {

From bca196c2899fb19a245c523227dc72bc2c3010d0 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 17 Oct 2025 02:30:18 -0700
Subject: [PATCH 178/394] Do not report an undefined function warning if the
 function name is a variable

Summary: Counterpart of the previous fix. Do not report potentially false positives in case a function is a variable.

Reviewed By: alanz

Differential Revision: D84832054

fbshipit-source-id: 4a0b2fde715da4bfcab83f802d95da1a31a797ff
---
 crates/ide/src/diagnostics/undefined_function.rs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/crates/ide/src/diagnostics/undefined_function.rs b/crates/ide/src/diagnostics/undefined_function.rs
index 43edc3e3b6..5d898417d3 100644
--- a/crates/ide/src/diagnostics/undefined_function.rs
+++ b/crates/ide/src/diagnostics/undefined_function.rs
@@ -76,7 +76,7 @@ impl FunctionCallLinter for UndefinedFunctionLinter {
 
                 // If the module is a variable, we can't determine at compile time
                 // whether the function is defined or not, so don't report it
-                if module.as_var().is_some() {
+                if module.as_var().is_some() || name.as_var().is_some() {
                     return None;
                 }
 
@@ -401,4 +401,16 @@ exists() -> ok.
             "#,
         )
     }
+
+    #[test]
+    fn test_function_name_variable() {
+        check_diagnostics(
+            r#"
+    //- /src/main.erl
+    -module(main).
+    main(Callback) ->
+      main:Callback().
+            "#,
+        )
+    }
 }

From 07fe4f7876eda538ba5976eb3a14dcdde519caa7 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 17 Oct 2025 03:45:31 -0700
Subject: [PATCH 179/394] Define is_in_otp as a File method

Summary:
Small follow-up from D44162698.

Define the `is_in_otp` helper as part of `File`, to make it more discoverable.

Reviewed By: jcpetruzza

Differential Revision: D84890853

fbshipit-source-id: 7e57f58c75a6db506196318f9e93afdefc03fd1d
---
 crates/hir/src/module_data.rs | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/crates/hir/src/module_data.rs b/crates/hir/src/module_data.rs
index 477637b775..b081cbd539 100644
--- a/crates/hir/src/module_data.rs
+++ b/crates/hir/src/module_data.rs
@@ -91,6 +91,19 @@ impl File {
     pub fn def_map(&self, db: &dyn DefDatabase) -> Arc<DefMap> {
         db.def_map(self.file_id)
     }
+
+    pub fn is_in_otp(&self, db: &dyn DefDatabase) -> bool {
+        let file_id = self.file_id;
+        // Context for T171541590
+        let _ = stdx::panic_context::enter(format!("\nis_in_otp:2: {file_id:?}"));
+        match db.file_app_data(file_id) {
+            Some(app_data) => {
+                let project_id = app_data.project_id;
+                db.project_data(project_id).otp_project_id == Some(project_id)
+            }
+            None => false,
+        }
+    }
 }
 
 /// Represents a module definition
@@ -111,7 +124,7 @@ impl Module {
     }
 
     pub fn is_in_otp(&self, db: &dyn DefDatabase) -> bool {
-        is_in_otp(self.file.file_id, db)
+        self.file.is_in_otp(db)
     }
 
     pub fn has_moduledoc(&self, db: &dyn DefDatabase) -> bool {
@@ -270,7 +283,7 @@ impl FunctionDef {
     }
 
     pub fn is_in_otp(&self, db: &dyn DefDatabase) -> bool {
-        is_in_otp(self.file.file_id, db)
+        self.file.is_in_otp(db)
     }
 
     pub fn edoc_comments(&self, db: &dyn DefDatabase) -> Option<EdocHeader> {
@@ -697,15 +710,3 @@ impl VarDef {
         db.lookup_var(self.hir_var).clone()
     }
 }
-
-fn is_in_otp(file_id: FileId, db: &dyn DefDatabase) -> bool {
-    // Context for T171541590
-    let _ = stdx::panic_context::enter(format!("\nis_in_otp:2: {file_id:?}"));
-    match db.file_app_data(file_id) {
-        Some(app_data) => {
-            let project_id = app_data.project_id;
-            db.project_data(project_id).otp_project_id == Some(project_id)
-        }
-        None => false,
-    }
-}

From 562d30ee1be564b333232f908daabb681ec2c6f8 Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Fri, 17 Oct 2025 04:19:28 -0700
Subject: [PATCH 180/394] Snapshots Pat = Var = Expr

Summary: Snapshot tests for exprs of the form `Pat = Var = Expr`.

Reviewed By: michalmuskala

Differential Revision: D84819136

fbshipit-source-id: a229e453ea48d2bb6b0b45ad430d362b765f58ee
---
 .../eqwalizer_tests/check/pats-OTP-26.pretty  | 45 +++++++++++++++++++
 .../eqwalizer_tests/check/pats-OTP-27.pretty  | 45 +++++++++++++++++++
 .../eqwalizer_tests/check/pats-OTP-28.pretty  | 45 +++++++++++++++++++
 .../eqwalizer_tests/check/src/pats.erl        | 31 +++++++++++++
 4 files changed, 166 insertions(+)
 create mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-26.pretty
 create mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-27.pretty
 create mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-28.pretty
 create mode 100644 test_projects/eqwalizer_tests/check/src/pats.erl

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-26.pretty
new file mode 100644
index 0000000000..42b95cc031
--- /dev/null
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-26.pretty
@@ -0,0 +1,45 @@
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/pats.erl:21:17
+   │
+21 │     maps:get(a, M).
+   │                 ^
+   │                 │
+   │                 M.
+Expression has type:   #{a => 'ok'} | 'error'
+Context expected type: #{term() => term()}
+   │                 
+
+Because in the expression's type:
+  Here the type is a union type with some valid candidates: #{a => 'ok'}
+  However the following candidate: 'error'
+  Differs from the expected type:  #{term() => term()}
+
+------------------------------ Detailed message ------------------------------
+
+  #{a => 'ok'} | 'error' is not compatible with #{term() => term()}
+  because
+  'error' is not compatible with #{term() => term()}
+
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/pats.erl:26:17
+   │
+26 │     maps:get(a, M).
+   │                 ^
+   │                 │
+   │                 M.
+Expression has type:   #{a => 'ok'} | 'error'
+Context expected type: #{term() => term()}
+   │                 
+
+Because in the expression's type:
+  Here the type is a union type with some valid candidates: #{a => 'ok'}
+  However the following candidate: 'error'
+  Differs from the expected type:  #{term() => term()}
+
+------------------------------ Detailed message ------------------------------
+
+  #{a => 'ok'} | 'error' is not compatible with #{term() => term()}
+  because
+  'error' is not compatible with #{term() => term()}
+
+2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-27.pretty
new file mode 100644
index 0000000000..42b95cc031
--- /dev/null
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-27.pretty
@@ -0,0 +1,45 @@
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/pats.erl:21:17
+   │
+21 │     maps:get(a, M).
+   │                 ^
+   │                 │
+   │                 M.
+Expression has type:   #{a => 'ok'} | 'error'
+Context expected type: #{term() => term()}
+   │                 
+
+Because in the expression's type:
+  Here the type is a union type with some valid candidates: #{a => 'ok'}
+  However the following candidate: 'error'
+  Differs from the expected type:  #{term() => term()}
+
+------------------------------ Detailed message ------------------------------
+
+  #{a => 'ok'} | 'error' is not compatible with #{term() => term()}
+  because
+  'error' is not compatible with #{term() => term()}
+
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/pats.erl:26:17
+   │
+26 │     maps:get(a, M).
+   │                 ^
+   │                 │
+   │                 M.
+Expression has type:   #{a => 'ok'} | 'error'
+Context expected type: #{term() => term()}
+   │                 
+
+Because in the expression's type:
+  Here the type is a union type with some valid candidates: #{a => 'ok'}
+  However the following candidate: 'error'
+  Differs from the expected type:  #{term() => term()}
+
+------------------------------ Detailed message ------------------------------
+
+  #{a => 'ok'} | 'error' is not compatible with #{term() => term()}
+  because
+  'error' is not compatible with #{term() => term()}
+
+2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-28.pretty
new file mode 100644
index 0000000000..42b95cc031
--- /dev/null
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-28.pretty
@@ -0,0 +1,45 @@
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/pats.erl:21:17
+   │
+21 │     maps:get(a, M).
+   │                 ^
+   │                 │
+   │                 M.
+Expression has type:   #{a => 'ok'} | 'error'
+Context expected type: #{term() => term()}
+   │                 
+
+Because in the expression's type:
+  Here the type is a union type with some valid candidates: #{a => 'ok'}
+  However the following candidate: 'error'
+  Differs from the expected type:  #{term() => term()}
+
+------------------------------ Detailed message ------------------------------
+
+  #{a => 'ok'} | 'error' is not compatible with #{term() => term()}
+  because
+  'error' is not compatible with #{term() => term()}
+
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/pats.erl:26:17
+   │
+26 │     maps:get(a, M).
+   │                 ^
+   │                 │
+   │                 M.
+Expression has type:   #{a => 'ok'} | 'error'
+Context expected type: #{term() => term()}
+   │                 
+
+Because in the expression's type:
+  Here the type is a union type with some valid candidates: #{a => 'ok'}
+  However the following candidate: 'error'
+  Differs from the expected type:  #{term() => term()}
+
+------------------------------ Detailed message ------------------------------
+
+  #{a => 'ok'} | 'error' is not compatible with #{term() => term()}
+  because
+  'error' is not compatible with #{term() => term()}
+
+2 ERRORS
diff --git a/test_projects/eqwalizer_tests/check/src/pats.erl b/test_projects/eqwalizer_tests/check/src/pats.erl
new file mode 100644
index 0000000000..6e8e7f1185
--- /dev/null
+++ b/test_projects/eqwalizer_tests/check/src/pats.erl
@@ -0,0 +1,31 @@
+%%% Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved.
+%%%
+%%% This source code is licensed under the Apache 2.0 license found in
+%%% the LICENSE file in the root directory of this source tree.
+
+-module(pats).
+
+-compile([export_all, nowarn_export_all]).
+
+-spec return_map() -> #{a => ok} | error.
+return_map() -> #{a => ok}.
+
+-spec patmatch1() -> ok.
+patmatch1() ->
+    #{a := V} = _M = return_map(),
+    V.
+
+-spec patmatch2() -> ok.
+patmatch2() ->
+    #{a := _V} = M = return_map(),
+    maps:get(a, M).
+
+-spec patmatch3_neg() -> ok.
+patmatch3_neg() ->
+    _V = M = return_map(),
+    maps:get(a, M).
+
+-spec patmatch4() -> ok.
+patmatch4() ->
+    M = #{a := _V} = return_map(),
+    maps:get(a, M).

From c882b959683ad458c05e6c42e5392cb6731ff379 Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Fri, 17 Oct 2025 04:19:28 -0700
Subject: [PATCH 181/394] Improve typing of Pat = Var = Expr

Summary: Support typing of `Pat = Var = Expr` following a simple commutativity rule (since `=` is right-associative).

Reviewed By: ilya-klyuchnikov

Differential Revision: D78550714

fbshipit-source-id: 97dda4ea82f15eafc5cad3a094da5835729f0b01
---
 .../eqwalizer_tests/check/pats-OTP-26.pretty  | 26 ++-----------------
 .../eqwalizer_tests/check/pats-OTP-27.pretty  | 24 +----------------
 .../eqwalizer_tests/check/pats-OTP-28.pretty  | 26 ++-----------------
 3 files changed, 5 insertions(+), 71 deletions(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-26.pretty
index 42b95cc031..695eb59297 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-26.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-26.pretty
@@ -1,25 +1,3 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/pats.erl:21:17
-   │
-21 │     maps:get(a, M).
-   │                 ^
-   │                 │
-   │                 M.
-Expression has type:   #{a => 'ok'} | 'error'
-Context expected type: #{term() => term()}
-   │                 
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #{a => 'ok'}
-  However the following candidate: 'error'
-  Differs from the expected type:  #{term() => term()}
-
------------------------------- Detailed message ------------------------------
-
-  #{a => 'ok'} | 'error' is not compatible with #{term() => term()}
-  because
-  'error' is not compatible with #{term() => term()}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/pats.erl:26:17
    │
@@ -29,7 +7,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    │                 M.
 Expression has type:   #{a => 'ok'} | 'error'
 Context expected type: #{term() => term()}
-   │                 
+   │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: #{a => 'ok'}
@@ -42,4 +20,4 @@ Because in the expression's type:
   because
   'error' is not compatible with #{term() => term()}
 
-2 ERRORS
+1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-27.pretty
index 42b95cc031..d0d4f19c1a 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-27.pretty
@@ -1,25 +1,3 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/pats.erl:21:17
-   │
-21 │     maps:get(a, M).
-   │                 ^
-   │                 │
-   │                 M.
-Expression has type:   #{a => 'ok'} | 'error'
-Context expected type: #{term() => term()}
-   │                 
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #{a => 'ok'}
-  However the following candidate: 'error'
-  Differs from the expected type:  #{term() => term()}
-
------------------------------- Detailed message ------------------------------
-
-  #{a => 'ok'} | 'error' is not compatible with #{term() => term()}
-  because
-  'error' is not compatible with #{term() => term()}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/pats.erl:26:17
    │
@@ -42,4 +20,4 @@ Because in the expression's type:
   because
   'error' is not compatible with #{term() => term()}
 
-2 ERRORS
+1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-28.pretty
index 42b95cc031..695eb59297 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-28.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-28.pretty
@@ -1,25 +1,3 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/pats.erl:21:17
-   │
-21 │     maps:get(a, M).
-   │                 ^
-   │                 │
-   │                 M.
-Expression has type:   #{a => 'ok'} | 'error'
-Context expected type: #{term() => term()}
-   │                 
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #{a => 'ok'}
-  However the following candidate: 'error'
-  Differs from the expected type:  #{term() => term()}
-
------------------------------- Detailed message ------------------------------
-
-  #{a => 'ok'} | 'error' is not compatible with #{term() => term()}
-  because
-  'error' is not compatible with #{term() => term()}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/pats.erl:26:17
    │
@@ -29,7 +7,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    │                 M.
 Expression has type:   #{a => 'ok'} | 'error'
 Context expected type: #{term() => term()}
-   │                 
+   │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: #{a => 'ok'}
@@ -42,4 +20,4 @@ Because in the expression's type:
   because
   'error' is not compatible with #{term() => term()}
 
-2 ERRORS
+1 ERROR

From 4bde32775fbc0da996f16c23fc01f970a750a34e Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Fri, 17 Oct 2025 05:45:31 -0700
Subject: [PATCH 182/394] Fix CI for OTP 26,28

Summary: As title. Re-add automatically trimmed whitespaces

Reviewed By: ilya-klyuchnikov, alanz, jcpetruzza

Differential Revision: D84914077

fbshipit-source-id: 7bbe76edd33745342d95ee3bda3071c991e755c3
---
 .../src/resources/test/eqwalizer_tests/check/pats-OTP-26.pretty | 2 +-
 .../src/resources/test/eqwalizer_tests/check/pats-OTP-28.pretty | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-26.pretty
index 695eb59297..d0d4f19c1a 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-26.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-26.pretty
@@ -7,7 +7,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    │                 M.
 Expression has type:   #{a => 'ok'} | 'error'
 Context expected type: #{term() => term()}
-   │
+   │                 
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: #{a => 'ok'}
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-28.pretty
index 695eb59297..d0d4f19c1a 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-28.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-28.pretty
@@ -7,7 +7,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    │                 M.
 Expression has type:   #{a => 'ok'} | 'error'
 Context expected type: #{term() => term()}
-   │
+   │                 
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: #{a => 'ok'}

From dab22ffa0309a53a435858670b8777c1d4f1b881 Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Fri, 17 Oct 2025 08:08:19 -0700
Subject: [PATCH 183/394] Re-add logic to report diagnostics as
 Severity::Disabled

Summary:
Basically a revert of D84170122, clarified in comments.

When using `--include-tests`, diagnostics for non-opted-in test suites will be output as `Severity::Disabled`, so as to be registered in contlint but to not appear in CI.

Reviewed By: michalmuskala, jcpetruzza

Differential Revision: D84914421

fbshipit-source-id: e428de9b0e55c8dda2040f4e030cac32a3201fcd
---
 crates/elp/src/bin/reporting.rs | 11 +++++++++--
 crates/elp/src/convert.rs       |  9 ++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/crates/elp/src/bin/reporting.rs b/crates/elp/src/bin/reporting.rs
index 7ab10459fe..fe38287629 100644
--- a/crates/elp/src/bin/reporting.rs
+++ b/crates/elp/src/bin/reporting.rs
@@ -227,6 +227,9 @@ impl Reporter for JsonReporter<'_> {
         diagnostics: &[EqwalizerDiagnostic],
     ) -> Result<()> {
         let line_index = self.analysis.line_index(file_id)?;
+        // Pass include_Tests = false so that errors for tests files that are not opted-in are tagged as
+        // arc_types::Severity::Disabled and don't break CI.
+        let eqwalizer_enabled = self.analysis.is_eqwalizer_enabled(file_id, false).unwrap();
         let file_path = &self.loaded.vfs.file_path(file_id);
         let root_path = &self
             .analysis
@@ -235,8 +238,12 @@ impl Reporter for JsonReporter<'_> {
             .root_dir;
         let relative_path = get_relative_path(root_path, file_path);
         for diagnostic in diagnostics {
-            let diagnostic =
-                convert::eqwalizer_to_arc_diagnostic(diagnostic, &line_index, relative_path);
+            let diagnostic = convert::eqwalizer_to_arc_diagnostic(
+                diagnostic,
+                &line_index,
+                relative_path,
+                eqwalizer_enabled,
+            );
             let diagnostic = serde_json::to_string(&diagnostic)?;
             writeln!(self.cli, "{diagnostic}")?;
         }
diff --git a/crates/elp/src/convert.rs b/crates/elp/src/convert.rs
index 323a56bdf3..3f68488f7d 100644
--- a/crates/elp/src/convert.rs
+++ b/crates/elp/src/convert.rs
@@ -122,11 +122,18 @@ pub fn eqwalizer_to_arc_diagnostic(
     d: &EqwalizerDiagnostic,
     line_index: &LineIndex,
     relative_path: &Path,
+    eqwalizer_enabled: bool,
 ) -> arc_types::Diagnostic {
     let pos = position(line_index, d.range.start());
     let line_num = pos.line + 1;
     let character = Some(pos.character + 1);
-    let severity = arc_types::Severity::Error;
+    let severity = if eqwalizer_enabled {
+        arc_types::Severity::Error
+    } else {
+        // We use Severity::Disabled so that diagnostics are reported in cont lint
+        // but not in CI.
+        arc_types::Severity::Disabled
+    };
     // formatting: https://fburl.com/max_wiki_link_to_phabricator_rich_text
     let explanation = match &d.explanation {
         Some(s) => format!("```\n{s}\n```"),

From 541262572f6a9bdc3b3f9d66451a47d7b47071a0 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 20 Oct 2025 12:47:58 -0700
Subject: [PATCH 184/394] Allow overriding is_enabled property via config for
 trait linters

Summary:
# Context

For linters based on [traits](https://whatsapp.github.io/erlang-language-platform/docs/contributing/linters/linter-traits/) we can customize their behaviour via config. Here we extend the configuration mechanism we already use for `severity` and other properties to the `is_enabled` flag. This mechanism will eventually supersede the `enabled_lints` and `disabled_lints` [configuration properties](https://whatsapp.github.io/erlang-language-platform/docs/get-started/configure-project/elp-lint-toml/#enabled_lints).

# Why having a new way to enable and disable linters?

Currently, the `.elp_lint.toml` allows users to specify which linters are enabled or disabled. But the configuration file works in a very counter-intuitive way: say a linter is "disabled by default". To enable it, a user cannot simply add it to the `enabled_list`, since that would cause **only that linter** to run. A user would need to add all available linters to the config, which is clearly not a maintainable solution.

By supporting an override mechanism, it will be possible to - for example - have the following configuration:

```
[linters.my_linter]
enabled = true
```

Which would keep the *enabled* status for all other linters to their default value, ensuring `my_linter` is enabled.

# This diff

This diff introduces the new overriding mechanism. We still keep it undocumented, until all linters are migrated to use a trait.

Reviewed By: TheGeorge

Differential Revision: D85055745

fbshipit-source-id: f84d203c380a45dcbafae5d09dc9141d42a12e91
---
 crates/ide/src/diagnostics.rs | 62 +++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 22edc1205e..c4c90ae527 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -550,6 +550,17 @@ fn should_run(
     is_generated: bool,
     is_test: bool,
 ) -> bool {
+    let is_enabled = if let Some(lint_config) = config.lint_config.as_ref() {
+        lint_config
+            .get_is_enabled_override(&linter.id())
+            .unwrap_or_else(|| linter.is_enabled())
+    } else {
+        linter.is_enabled()
+    };
+    if !is_enabled {
+        return false;
+    }
+
     let include_tests = if let Some(lint_config) = config.lint_config.as_ref() {
         lint_config
             .get_include_tests_override(&linter.id())
@@ -1129,6 +1140,11 @@ impl DiagnosticsConfig {
 }
 
 impl LintConfig {
+    /// Get the is_enabled override for a linter based on its diagnostic code
+    pub fn get_is_enabled_override(&self, diagnostic_code: &DiagnosticCode) -> Option<bool> {
+        self.linters.get(diagnostic_code)?.is_enabled
+    }
+
     /// Get the severity override for a linter based on its diagnostic code
     pub fn get_severity_override(&self, diagnostic_code: &DiagnosticCode) -> Option<Severity> {
         self.linters.get(diagnostic_code)?.severity
@@ -1213,6 +1229,8 @@ pub enum LinterTraitConfig {
 /// Configuration for a specific linter that allows overriding default settings
 #[derive(Deserialize, Serialize, Debug, Clone, Default)]
 pub struct LinterConfig {
+    #[serde(rename = "enabled")]
+    pub is_enabled: Option<bool>,
     pub severity: Option<Severity>,
     pub include_tests: Option<bool>,
     pub include_generated: Option<bool>,
@@ -3486,6 +3504,7 @@ baz(1)->4.
         lint_config.linters.insert(
             DiagnosticCode::NoGarbageCollect,
             LinterConfig {
+                is_enabled: None,
                 severity: Some(Severity::Error),
                 include_tests: None,
                 include_generated: None,
@@ -3527,6 +3546,7 @@ baz(1)->4.
         lint_config.linters.insert(
             DiagnosticCode::NoGarbageCollect,
             LinterConfig {
+                is_enabled: None,
                 severity: None,
                 include_tests: Some(true),
                 include_generated: None,
@@ -3567,6 +3587,7 @@ baz(1)->4.
         lint_config.linters.insert(
             DiagnosticCode::NoGarbageCollect,
             LinterConfig {
+                is_enabled: None,
                 severity: None,
                 include_tests: None,
                 include_generated: Some(true),
@@ -3608,6 +3629,7 @@ baz(1)->4.
         lint_config.linters.insert(
             DiagnosticCode::NoGarbageCollect,
             LinterConfig {
+                is_enabled: None,
                 severity: None,
                 include_tests: None,
                 include_generated: None,
@@ -3644,4 +3666,44 @@ baz(1)->4.
             ),
         );
     }
+
+    #[test]
+    fn test_linter_is_enabled_override() {
+        let mut lint_config = LintConfig::default();
+        lint_config.linters.insert(
+            DiagnosticCode::NoGarbageCollect,
+            LinterConfig {
+                is_enabled: Some(false),
+                severity: None,
+                include_tests: None,
+                include_generated: None,
+                experimental: None,
+                config: None,
+            },
+        );
+
+        let config = DiagnosticsConfig::default()
+            .configure_diagnostics(
+                &lint_config,
+                &Some("no_garbage_collect".to_string()),
+                &None,
+                FallBackToAll::No,
+            )
+            .unwrap();
+        check_diagnostics_with_config(
+            config,
+            r#"
+            //- /src/main.erl
+            -module(main).
+            -export([warning/0]).
+
+            warning() ->
+                erlang:garbage_collect().
+            //- /opt/lib/stdlib-3.17/src/erlang.erl otp_app:/opt/lib/stdlib-3.17
+            -module(erlang).
+            -export([garbage_collect/0]).
+            garbage_collect() -> ok.
+            "#,
+        );
+    }
 }

From cfb0cc7d6d9012add3d29c0b2d103c7cb64ef593 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 20 Oct 2025 12:49:52 -0700
Subject: [PATCH 185/394] Skip -doc related tests in OTP 26

Summary:
These tests are [failing](https://github.com/WhatsApp/erlang-language-platform/actions/runs/18524392477/job/52791633535?fbclid=IwY2xjawNjXYZleHRuA2FlbQIxMQABHswY-qu3EAMNTujyjsBQGdWnD7vuTcYj-SYMLLY7UHYWSTWYYnZPD4P5Bma6_aem_7LD-IIvZSkeMmZrTaOw7sA) on GitHub pipelines using OTP 26.

The tests only make sense for OTP 27+, so do not run them on older versions.

Reviewed By: TheGeorge

Differential Revision: D85071954

fbshipit-source-id: fa8c665cc11e191ae7c4e073f844a8eb0c60c66b
---
 crates/ide/src/handlers/get_docs.rs | 32 ++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/crates/ide/src/handlers/get_docs.rs b/crates/ide/src/handlers/get_docs.rs
index 0efc7ef452..f4476bd12c 100644
--- a/crates/ide/src/handlers/get_docs.rs
+++ b/crates/ide/src/handlers/get_docs.rs
@@ -25,6 +25,8 @@ pub(crate) fn get_doc_for_token(
 
 #[cfg(test)]
 mod tests {
+    use elp_project_model::otp::supports_eep59_doc_attributes;
+
     use crate::fixture;
 
     #[track_caller]
@@ -40,8 +42,9 @@ mod tests {
 
     #[test]
     fn local_type() {
-        check(
-            r#"
+        if supports_eep59_doc_attributes() {
+            check(
+                r#"
 -module(main).
 -export([main/0]).
 -doc """
@@ -52,7 +55,7 @@ My integer
 -spec main() -> my_in~teger().
 main() -> 42.
 "#,
-            "\
+                "\
 ```erlang
 -type my_integer() :: integer().
 ```
@@ -60,13 +63,15 @@ main() -> 42.
 -----
 
 My integer",
-        );
+            );
+        }
     }
 
     #[test]
     fn remote_type() {
-        check(
-            r#"
+        if supports_eep59_doc_attributes() {
+            check(
+                r#"
 //- /src/main.erl
 -module(main).
 -export([main/0]).
@@ -81,7 +86,7 @@ My integer
 -export_type([my_integer/0]).
 -type my_integer() :: integer().
 "#,
-            "\
+                "\
 ```erlang
 -type my_integer() :: integer().
 ```
@@ -89,13 +94,15 @@ My integer
 -----
 
 My integer",
-        );
+            );
+        }
     }
 
     #[test]
     fn local_function() {
-        check(
-            r#"
+        if supports_eep59_doc_attributes() {
+            check(
+                r#"
 -module(main).
 -export([main/0]).
 
@@ -108,7 +115,7 @@ main() -> ok.
 -spec caller() -> ok.
 caller() -> ma~in().
 "#,
-            "\
+                "\
 ```erlang
 -spec main() -> ok.
 ```
@@ -116,6 +123,7 @@ caller() -> ma~in().
 -----
 
 My function",
-        );
+            );
+        }
     }
 }

From 6bef355a52b24d1b1b424079c93bfc6c639c0554 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 21 Oct 2025 02:39:44 -0700
Subject: [PATCH 186/394] Introduce method to extract module name range from a
 call expression

Summary: Introduce a method to simplify the extraction of the module name range from a call target (MFA).

Reviewed By: alanz

Differential Revision: D85046064

fbshipit-source-id: 06eacdd4911169e8ea1821d2ad30f1e7ea8f9f2a
---
 crates/hir/src/expr.rs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/crates/hir/src/expr.rs b/crates/hir/src/expr.rs
index eed60a47a2..9defb2b071 100644
--- a/crates/hir/src/expr.rs
+++ b/crates/hir/src/expr.rs
@@ -657,6 +657,16 @@ impl CallTarget<ExprId> {
             }
         }
     }
+
+    pub fn module_range(
+        &self,
+        in_clause: &InFunctionClauseBody<&FunctionDef>,
+    ) -> Option<FileRange> {
+        match self {
+            CallTarget::Local { .. } => None,
+            CallTarget::Remote { module, .. } => in_clause.range_for_expr(*module),
+        }
+    }
 }
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]

From ff9791ff698699ba891d11d8b6ea4603392a8a02 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 21 Oct 2025 02:39:44 -0700
Subject: [PATCH 187/394] Introduce helper to rename module from a call target

Summary: Introduce a helper to create a "rename" fix, that can be used when implementing linters.

Reviewed By: alanz

Differential Revision: D85067389

fbshipit-source-id: 887f393f32003996254a2a374fb671a496de2c55
---
 crates/ide/src/codemod_helpers.rs | 37 +++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/crates/ide/src/codemod_helpers.rs b/crates/ide/src/codemod_helpers.rs
index dc0b57b97e..bb226b092e 100644
--- a/crates/ide/src/codemod_helpers.rs
+++ b/crates/ide/src/codemod_helpers.rs
@@ -602,6 +602,43 @@ pub(crate) fn find_call_in_function<CallCtx, MakeCtx, Res>(
     Some(())
 }
 
+/// Helper function to create a fix that replaces the module name in a remote call.
+/// This is useful for linters that need to rename module references (e.g., replacing
+/// `old_module:function()` with `new_module:function()`).
+///
+/// # Arguments
+/// * `match_context` - The match context from the FunctionCallLinter
+/// * `file_id` - The file being analyzed
+/// * `new_module_name` - The new module name to replace with
+/// * `fix_id` - A unique identifier for this fix (e.g., "rename_module_to_new_name")
+/// * `fix_label` - A human-readable label for the fix (e.g., "Rename to new_module")
+///
+/// # Returns
+/// An `Assist` that replaces just the module name, or `None` if the target is not a
+/// remote call or if the module range is in a different file.
+#[allow(dead_code)]
+pub fn make_module_rename_fix<T>(
+    match_context: &MatchCtx<T>,
+    file_id: FileId,
+    new_module_name: &str,
+    fix_id: &'static str,
+    fix_label: &str,
+) -> Option<elp_ide_assists::Assist> {
+    use elp_ide_db::source_change::SourceChangeBuilder;
+
+    let module_range = match_context.target.module_range(match_context.def_fb)?;
+
+    let mut builder = SourceChangeBuilder::new(file_id);
+    builder.replace(module_range.range, new_module_name.to_string());
+
+    Some(crate::fix(
+        fix_id,
+        fix_label,
+        builder.finish(),
+        module_range.range,
+    ))
+}
+
 // ---------------------------------------------------------------------
 
 #[cfg(test)]

From 621a3fdb8b268bd92c869e0f5e1e185f459318fc Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 21 Oct 2025 02:39:44 -0700
Subject: [PATCH 188/394] Introduce no_persistent_term linter

Differential Revision: D85067388

fbshipit-source-id: bf52063b5eba5886e58638834cd5d625bd648f86
---
 crates/ide/src/codemod_helpers.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crates/ide/src/codemod_helpers.rs b/crates/ide/src/codemod_helpers.rs
index bb226b092e..d964a58420 100644
--- a/crates/ide/src/codemod_helpers.rs
+++ b/crates/ide/src/codemod_helpers.rs
@@ -616,7 +616,6 @@ pub(crate) fn find_call_in_function<CallCtx, MakeCtx, Res>(
 /// # Returns
 /// An `Assist` that replaces just the module name, or `None` if the target is not a
 /// remote call or if the module range is in a different file.
-#[allow(dead_code)]
 pub fn make_module_rename_fix<T>(
     match_context: &MatchCtx<T>,
     file_id: FileId,

From d811a4fa5556aa82b002cf32696761e72aed8eb9 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 21 Oct 2025 03:20:03 -0700
Subject: [PATCH 189/394] Add eqwalizer as submodule (#120)

Summary:
Instead of fetching eqwalizer during CI via a GitHub action, include it as a submodule.
This allows us to have reproducible builds.

Pull Request resolved: https://github.com/whatsapp/erlang-language-platform/pull/120

Reviewed By: jcpetruzza

Differential Revision: D85077705

Pulled By: robertoaloi

fbshipit-source-id: f771f604978db69dc5afcad955315a7eb59912d3
---
 .github/workflows/ci.yml | 6 +-----
 .gitmodules              | 3 +++
 eqwalizer                | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 eqwalizer

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 56b6434474..471b9d2418 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -75,12 +75,8 @@ jobs:
     steps:
       - name: Checkout erlang-language-platform
         uses: "actions/checkout@v3"
-      - name: Checkout eqwalizer
-        uses: "actions/checkout@v3"
         with:
-          repository: WhatsApp/eqwalizer
-          path: eqwalizer
-          ref: main
+          submodules: true
       - name: Set up GraalVM
         uses: graalvm/setup-graalvm@v1
         with:
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000..1445b3a80b
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "eqwalizer"]
+	path = eqwalizer
+	url = https://github.com/WhatsApp/eqwalizer
diff --git a/eqwalizer b/eqwalizer
new file mode 160000
index 0000000000..060f43d17b
--- /dev/null
+++ b/eqwalizer
@@ -0,0 +1 @@
+Subproject commit 060f43d17b7d161601bb58bd341a8dc7381c0e7c

From d6f2636f015069ed32137a42f99b9b2ecbaa35a9 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 21 Oct 2025 10:36:56 -0700
Subject: [PATCH 190/394] Bump OSS VS Code extension version to 0.43.0

Summary: In preparation for OSS release.

Reviewed By: jcpetruzza

Differential Revision: D85158896

fbshipit-source-id: 71464b4a04b29955c97680b5d51445481f6a7387
---
 editors/code/package-lock.json | 4 ++--
 editors/code/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 6e00a55203..74ee51b3f6 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "erlang-language-platform",
-  "version": "0.42.0",
+  "version": "0.43.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "erlang-language-platform",
-      "version": "0.42.0",
+      "version": "0.43.0",
       "hasInstallScript": true,
       "license": "Apache2",
       "devDependencies": {
diff --git a/editors/code/package.json b/editors/code/package.json
index 0695e9e215..ab784449ee 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -3,7 +3,7 @@
   "description": "Erlang language server",
   "author": "Meta Platforms, Inc",
   "license": "Apache2",
-  "version": "0.42.0",
+  "version": "0.43.0",
   "icon": "images/elp-logo-color.png",
   "homepage": "https://whatsapp.github.io/erlang-language-platform/",
   "repository": {

From 86d61bd779a33626b736e320e2e00e8222040318 Mon Sep 17 00:00:00 2001
From: Cj Longoria <cjlongoria@meta.com>
Date: Tue, 21 Oct 2025 15:05:55 -0700
Subject: [PATCH 191/394] update rustfmt.toml for projects

Summary:
At the moment these rustfmt.toml files are ignored. Our formatting tool has an explicit rustfmt.toml passed to it that overrides anything set by the code owners.

This diff updates the project's rustfmt.toml to match the one we explicitly set.

This diff also copies our explicit config in `tools/rust/ossconfigs/rustfmt.toml` to `fbsource/.rustfmt.toml`.

Reviewed By: dtolnay

Differential Revision: D84118394

fbshipit-source-id: bbc931ffd89798d5b519a1b600f11a977ac55fc8
---
 rustfmt.toml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/rustfmt.toml b/rustfmt.toml
index 8f75064140..0762474bce 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,3 +1,9 @@
-edition = "2018"
+# Get help on options with `rustfmt --help=config`
+# Please keep these in alphabetical order.
+edition = "2021"
+format_code_in_doc_comments = true
+group_imports = "StdExternalCrate"
+imports_granularity = "Item"
 merge_derives = false
+style_edition = "2024"
 use_field_init_shorthand = true

From fdbb4bf401c3803471e7b6ac51847ff5014f6205 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 22 Oct 2025 02:46:27 -0700
Subject: [PATCH 192/394] Allow filtering of OTP apps in indexing

Summary:
Many applications are included in the Erlang/OTP release, but they are not used by a project. Processing them leads to unnecessary work and memory consumption. This diff adds a new `otp` configuration section to the `.elp.toml` file, allowing users to customize a list of OTP applications to exclude from the analysis.

* Add new `OTP` section to ELP Config
* Pass reference to the whole ELP configuration to the project loading function
* Forward OTP config section to OTP discovery function
* Perform filtering
* Add documentation on how to use the new feature

Reviewed By: TheGeorge

Differential Revision: D83974071

fbshipit-source-id: eae11cd06eca9380d00ca5f7a3a70bb659d6ab71
---
 crates/base_db/src/fixture.rs                 |   2 +-
 crates/elp/src/bin/build_info_cli.rs          |   9 +-
 crates/elp/src/build/load.rs                  |   7 +-
 crates/elp/src/server.rs                      |  16 +-
 crates/elp/tests/slow-tests/buck_tests.rs     |   9 +-
 crates/project_model/src/buck.rs              |   3 +-
 crates/project_model/src/lib.rs               | 160 +++++++++++++++++-
 crates/project_model/src/otp.rs               |  81 ++++++++-
 .../get-started/configure-project/elp-toml.md |  22 +++
 9 files changed, 270 insertions(+), 39 deletions(-)

diff --git a/crates/base_db/src/fixture.rs b/crates/base_db/src/fixture.rs
index e94e180032..d6d2205ce9 100644
--- a/crates/base_db/src/fixture.rs
+++ b/crates/base_db/src/fixture.rs
@@ -295,7 +295,7 @@ impl ChangeFixture {
                 ProjectManifest::discover(&AbsPathBuf::assert(json_config_file.into())).unwrap();
             let loaded_project = Project::load(
                 &manifest,
-                elp_config.eqwalizer,
+                &elp_config,
                 &BuckQueryConfig::BuildGeneratedCode,
                 &|_| {},
             )
diff --git a/crates/elp/src/bin/build_info_cli.rs b/crates/elp/src/bin/build_info_cli.rs
index d091fc8e90..cdeb5bf74c 100644
--- a/crates/elp/src/bin/build_info_cli.rs
+++ b/crates/elp/src/bin/build_info_cli.rs
@@ -16,7 +16,6 @@ use anyhow::Result;
 use elp_ide::elp_ide_db::elp_base_db::AbsPath;
 use elp_ide::elp_ide_db::elp_base_db::AbsPathBuf;
 use elp_project_model::ElpConfig;
-use elp_project_model::EqwalizerConfig;
 use elp_project_model::IncludeParentDirs;
 use elp_project_model::Project;
 use elp_project_model::ProjectBuildData;
@@ -31,8 +30,8 @@ use crate::args::ProjectInfo;
 pub(crate) fn save_build_info(args: BuildInfo, query_config: &BuckQueryConfig) -> Result<()> {
     let root = fs::canonicalize(&args.project)?;
     let root = AbsPathBuf::assert_utf8(root);
-    let (_elp_config, manifest) = ProjectManifest::discover(&root)?;
-    let project = Project::load(&manifest, EqwalizerConfig::default(), query_config, &|_| {})?;
+    let (elp_config, manifest) = ProjectManifest::discover(&root)?;
+    let project = Project::load(&manifest, &elp_config, query_config, &|_| {})?;
     let mut writer = File::create(&args.to)?;
     let json_str = serde_json::to_string_pretty::<JsonConfig>(&project.as_json(root))?;
     writer.write_all(json_str.as_bytes())?;
@@ -84,7 +83,7 @@ fn load_project(
     query_config: &BuckQueryConfig,
 ) -> Result<(ProjectManifest, Project)> {
     let (elp_config, manifest) = ProjectManifest::discover(root)?;
-    let project = Project::load(&manifest, elp_config.eqwalizer, query_config, &|_| {})?;
+    let project = Project::load(&manifest, &elp_config, query_config, &|_| {})?;
     Ok((manifest, project))
 }
 
@@ -94,6 +93,6 @@ fn load_fallback(
 ) -> Result<(ProjectManifest, Project)> {
     let manifest = ProjectManifest::discover_no_manifest(root, IncludeParentDirs::Yes);
     let elp_config = ElpConfig::default();
-    let project = Project::load(&manifest, elp_config.eqwalizer, query_config, &|_| {})?;
+    let project = Project::load(&manifest, &elp_config, query_config, &|_| {})?;
     Ok((manifest, project))
 }
diff --git a/crates/elp/src/build/load.rs b/crates/elp/src/build/load.rs
index cb9cb6570f..67457e049f 100644
--- a/crates/elp/src/build/load.rs
+++ b/crates/elp/src/build/load.rs
@@ -80,12 +80,7 @@ pub fn load_project_at(
 
     log::info!("Discovered project: {manifest:?}");
     let pb = cli.spinner("Loading build info");
-    let project = Project::load(
-        &manifest,
-        elp_config.eqwalizer.clone(),
-        query_config,
-        &|_progress| {},
-    )?;
+    let project = Project::load(&manifest, &elp_config, query_config, &|_progress| {})?;
     pb.finish();
 
     load_project(cli, project, include_otp, eqwalizer_mode)
diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index 43406fd200..34b5c66656 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -1724,12 +1724,9 @@ impl Server {
         };
 
         spinner.report("Loading project".to_string());
-        let mut project = Project::load(
-            &manifest,
-            elp_config.eqwalizer.clone(),
-            query_config,
-            &|message| spinner.report(message.to_string()),
-        );
+        let mut project = Project::load(&manifest, &elp_config, query_config, &|message| {
+            spinner.report(message.to_string())
+        });
         if let Err(err) = &project {
             log::error!("Failed to load project for manifest {manifest:?}, error: {err:?}");
             match err.downcast_ref::<BuckQueryError>() {
@@ -1745,10 +1742,9 @@ impl Server {
                 }
             }
             if !fallback_used {
-                project =
-                    Project::load(&fallback, elp_config.eqwalizer, query_config, &|message| {
-                        spinner.report(message.to_string())
-                    });
+                project = Project::load(&fallback, &elp_config, query_config, &|message| {
+                    spinner.report(message.to_string())
+                });
                 if let Err(err) = &project {
                     log::error!(
                         "Failed to load project for fallback manifest {manifest:?}, error: {err:?}"
diff --git a/crates/elp/tests/slow-tests/buck_tests.rs b/crates/elp/tests/slow-tests/buck_tests.rs
index 45b24c99f6..e76fdb8bad 100644
--- a/crates/elp/tests/slow-tests/buck_tests.rs
+++ b/crates/elp/tests/slow-tests/buck_tests.rs
@@ -82,13 +82,8 @@ mod tests {
         let (elp_config, buck_config) =
             ProjectManifest::discover(&to_abs_path_buf(&path).unwrap()).unwrap();
 
-        let project = Project::load(
-            &buck_config,
-            elp_config.eqwalizer,
-            &BUCK_QUERY_CONFIG,
-            &|_| {},
-        )
-        .unwrap();
+        let project =
+            Project::load(&buck_config, &elp_config, &BUCK_QUERY_CONFIG, &|_| {}).unwrap();
 
         let project_data: Vec<ProjectAppData> = project
             .non_otp_apps()
diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 8289482442..414455dc55 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -326,6 +326,7 @@ impl IncludeMapping {
 impl BuckProject {
     pub fn load_from_config(
         buck_conf: &BuckConfig,
+        elp_config: &ElpConfig,
         query_config: &BuckQueryConfig,
         report_progress: &impl Fn(&str),
     ) -> Result<
@@ -349,7 +350,7 @@ impl BuckProject {
         };
         let otp_root = Otp::find_otp()?;
         // TODO: we now get these twice. Perhaps they should be cached?
-        let (_otp, otp_project_apps) = Otp::discover(otp_root.clone());
+        let (_otp, otp_project_apps) = Otp::discover(otp_root.clone(), &elp_config.otp);
         include_mapping.add_otp(&otp_project_apps);
         Ok((
             project,
diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs
index 73a46e7e6e..75a9266ec8 100644
--- a/crates/project_model/src/lib.rs
+++ b/crates/project_model/src/lib.rs
@@ -385,6 +385,8 @@ pub struct ElpConfig {
     pub eqwalizer: EqwalizerConfig,
     #[serde(default)]
     pub rebar: ElpRebarConfig,
+    #[serde(default)]
+    pub otp: OtpConfig,
 }
 
 #[derive(
@@ -501,6 +503,22 @@ impl Default for ElpRebarConfig {
     }
 }
 
+#[derive(
+    Debug,
+    Default,
+    Clone,
+    PartialEq,
+    Eq,
+    Hash,
+    Ord,
+    PartialOrd,
+    Deserialize,
+    Serialize
+)]
+pub struct OtpConfig {
+    pub exclude_apps: Vec<String>,
+}
+
 impl ElpConfig {
     pub fn new(
         config_path: AbsPathBuf,
@@ -515,6 +533,7 @@ impl ElpConfig {
             build_info,
             eqwalizer,
             rebar,
+            otp: OtpConfig::default(),
         }
     }
     pub fn try_parse(path: &AbsPath) -> Result<ElpConfig> {
@@ -998,7 +1017,7 @@ impl Project {
 
     pub fn load(
         manifest: &ProjectManifest,
-        eqwalizer_config: EqwalizerConfig,
+        elp_config: &ElpConfig,
         query_config: &BuckQueryConfig,
         report_progress: &impl Fn(&str),
     ) -> Result<Project> {
@@ -1032,7 +1051,7 @@ impl Project {
             ProjectManifest::TomlBuck(buck) => {
                 // We only select this manifest if buck is actually enabled
                 let (project, apps, otp_root, include_mapping) =
-                    BuckProject::load_from_config(buck, query_config, report_progress)?;
+                    BuckProject::load_from_config(buck, elp_config, query_config, report_progress)?;
                 (
                     ProjectBuildData::Buck(project),
                     apps,
@@ -1061,14 +1080,14 @@ impl Project {
             }
         };
 
-        let (otp, otp_project_apps) = Otp::discover(otp_root);
+        let (otp, otp_project_apps) = Otp::discover(otp_root, &elp_config.otp);
         project_apps.extend(otp_project_apps);
         report_progress("Project info loaded");
         Ok(Project {
             otp,
             project_build_data: project_build_info,
             project_apps,
-            eqwalizer_config,
+            eqwalizer_config: elp_config.eqwalizer.clone(),
             include_mapping,
         })
     }
@@ -1172,6 +1191,9 @@ mod tests {
                         rebar: ElpRebarConfig {
                             profile: "test",
                         },
+                        otp: OtpConfig {
+                            exclude_apps: [],
+                        },
                     },
                     Rebar(
                         RebarConfig {
@@ -1237,6 +1259,9 @@ mod tests {
                         rebar: ElpRebarConfig {
                             profile: "test",
                         },
+                        otp: OtpConfig {
+                            exclude_apps: [],
+                        },
                     },
                     Json(
                         JsonConfig {
@@ -1347,6 +1372,9 @@ mod tests {
                         rebar: ElpRebarConfig {
                             profile: "test",
                         },
+                        otp: OtpConfig {
+                            exclude_apps: [],
+                        },
                     },
                     JsonConfig {
                         apps: [
@@ -1502,6 +1530,9 @@ mod tests {
                         rebar: ElpRebarConfig {
                             profile: "test",
                         },
+                        otp: OtpConfig {
+                            exclude_apps: [],
+                        },
                     },
                     NoManifest(
                         NoManifestConfig {
@@ -1571,6 +1602,9 @@ mod tests {
                             rebar: ElpRebarConfig {
                                 profile: "test",
                             },
+                            otp: OtpConfig {
+                                exclude_apps: [],
+                            },
                         },
                         NoManifest(
                             NoManifestConfig {
@@ -1764,6 +1798,9 @@ mod tests {
                     rebar: ElpRebarConfig {
                         profile: "other",
                     },
+                    otp: OtpConfig {
+                        exclude_apps: [],
+                    },
                 }
             "#]]
             .assert_eq(&debug_normalise_temp_dir(dir, &elp_config));
@@ -1807,6 +1844,7 @@ mod tests {
             rebar: ElpRebarConfig {
                 profile: "my_profile".to_string(),
             },
+            otp: OtpConfig::default(),
         })
         .unwrap();
         expect![[r#"
@@ -1829,6 +1867,9 @@ mod tests {
 
             [rebar]
             profile = "my_profile"
+
+            [otp]
+            exclude_apps = []
         "#]]
         .assert_eq(&result);
     }
@@ -1902,6 +1943,9 @@ mod tests {
                 rebar: ElpRebarConfig {
                     profile: "my_profile",
                 },
+                otp: OtpConfig {
+                    exclude_apps: [],
+                },
             }
         "#]]
         .assert_debug_eq(&lints);
@@ -2017,4 +2061,112 @@ mod tests {
             }
         }
     }
+
+    #[test]
+    fn test_toml_otp_exclude_apps() {
+        let spec = r#"
+        //- /.elp.toml
+        [otp]
+        exclude_apps = ["megaco", "eunit"]
+        //- /app_a/src/app.erl
+        -module(app).
+        "#;
+        let dir = FixtureWithProjectMeta::gen_project(spec);
+        if let Ok((elp_config, ProjectManifest::NoManifest(_))) = ProjectManifest::discover(
+            &to_abs_path_buf(&dir.path().join("app_a/src/app.erl")).unwrap(),
+        ) {
+            expect![[r#"
+                ElpConfig {
+                    config_path: Some(
+                        AbsPathBuf(
+                            "TMPDIR/.elp.toml",
+                        ),
+                    ),
+                    build_info: None,
+                    buck: None,
+                    eqwalizer: EqwalizerConfig {
+                        enable_all: true,
+                        max_tasks: 4,
+                        ignore_modules: [],
+                        ignore_modules_compiled_patterns: [],
+                    },
+                    rebar: ElpRebarConfig {
+                        profile: "test",
+                    },
+                    otp: OtpConfig {
+                        exclude_apps: [
+                            "megaco",
+                            "eunit",
+                        ],
+                    },
+                }
+            "#]]
+            .assert_eq(&debug_normalise_temp_dir(dir, &elp_config));
+        } else {
+            panic!()
+        }
+    }
+
+    #[test]
+    fn serde_serialize_elp_toml_with_otp() {
+        let result = toml::to_string::<ElpConfig>(&ElpConfig {
+            config_path: None,
+            build_info: None,
+            buck: None,
+            eqwalizer: EqwalizerConfig::default(),
+            rebar: ElpRebarConfig::default(),
+            otp: OtpConfig {
+                exclude_apps: vec!["megaco".to_string(), "eunit".to_string()],
+            },
+        })
+        .unwrap();
+        expect![[r#"
+            [eqwalizer]
+            enable_all = true
+            max_tasks = 4
+            ignore_modules = []
+
+            [rebar]
+            profile = "test"
+
+            [otp]
+            exclude_apps = ["megaco", "eunit"]
+        "#]]
+        .assert_eq(&result);
+    }
+
+    #[test]
+    fn serde_deserialize_elp_toml_with_otp() {
+        let config: ElpConfig = toml::from_str(
+            r#"
+            [otp]
+            exclude_apps = ["megaco", "eunit"]
+             "#,
+        )
+        .unwrap();
+
+        expect![[r#"
+            ElpConfig {
+                config_path: None,
+                build_info: None,
+                buck: None,
+                eqwalizer: EqwalizerConfig {
+                    enable_all: true,
+                    max_tasks: 4,
+                    ignore_modules: [],
+                    ignore_modules_compiled_patterns: [],
+                },
+                rebar: ElpRebarConfig {
+                    profile: "test",
+                },
+                otp: OtpConfig {
+                    exclude_apps: [
+                        "megaco",
+                        "eunit",
+                    ],
+                },
+            }
+        "#]]
+        .assert_debug_eq(&config);
+    }
 }
diff --git a/crates/project_model/src/otp.rs b/crates/project_model/src/otp.rs
index 3d561177d8..d2cb3be6a2 100644
--- a/crates/project_model/src/otp.rs
+++ b/crates/project_model/src/otp.rs
@@ -22,6 +22,7 @@ use paths::Utf8Path;
 use paths::Utf8PathBuf;
 
 use crate::AppName;
+use crate::OtpConfig;
 use crate::ProjectAppData;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -70,7 +71,7 @@ pub fn supports_eep66_sigils() -> bool {
 }
 
 fn get_erts_dir() -> AbsPathBuf {
-    let (_otp, apps) = Otp::discover(OTP_ROOT.to_path_buf());
+    let (_otp, apps) = Otp::discover(OTP_ROOT.to_path_buf(), &OtpConfig::default());
     for app in apps {
         if app.name == AppName("erts".to_string()) {
             return app.dir;
@@ -157,8 +158,8 @@ impl Otp {
         Ok(val)
     }
 
-    pub fn discover(path: Utf8PathBuf) -> (Otp, Vec<ProjectAppData>) {
-        let apps = Self::discover_otp_apps(&path);
+    pub fn discover(path: Utf8PathBuf, otp_config: &OtpConfig) -> (Otp, Vec<ProjectAppData>) {
+        let apps = Self::discover_otp_apps(&path, otp_config);
         (
             Otp {
                 lib_dir: AbsPathBuf::assert(path),
@@ -167,7 +168,8 @@ impl Otp {
         )
     }
 
-    fn discover_otp_apps(path: &Utf8Path) -> Vec<ProjectAppData> {
+    fn discover_otp_apps(path: &Utf8Path, otp_config: &OtpConfig) -> Vec<ProjectAppData> {
+        let exclude_apps = &otp_config.exclude_apps;
         log::info!("Loading OTP apps from {path:?}");
         if let Ok(entries) = fs::read_dir(path) {
             entries
@@ -175,11 +177,24 @@ impl Otp {
                 .filter_map(|entry| {
                     let entry = entry.ok()?;
                     let name = entry.file_name();
+                    let name_str = name.to_str()?;
+
+                    // Extract app name from versioned directory name (e.g., "megaco-4.5" -> "megaco")
+                    let app_name = name_str
+                        .split_once('-')
+                        .map_or(name_str, |(base, _version)| base);
+
+                    // Skip excluded applications
+                    if exclude_apps.contains(&app_name.to_string()) {
+                        log::info!("Excluding OTP app: {}", app_name);
+                        return None;
+                    }
+
                     let path = fs::canonicalize(entry.path()).expect("Could not canonicalize path");
                     let dir = AbsPathBuf::assert(
                         Utf8PathBuf::from_path_buf(path).expect("Could not convert to Utf8PathBuf"),
                     );
-                    Some(ProjectAppData::otp_app_data(name.to_str()?, &dir))
+                    Some(ProjectAppData::otp_app_data(name_str, &dir))
                 })
                 .collect()
         } else {
@@ -187,3 +202,59 @@ impl Otp {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_discover_with_excluded_apps() {
+        // Create a mock OTP directory structure
+        let temp_dir = tempfile::tempdir().unwrap();
+        let otp_lib_dir = temp_dir.path().join("lib");
+        std::fs::create_dir_all(&otp_lib_dir).unwrap();
+
+        // Create mock OTP app directories
+        let apps = vec![
+            "kernel-9.2",
+            "stdlib-5.2",
+            "megaco-4.5",
+            "eunit-2.8.2",
+            "common_test-1.25.1",
+        ];
+
+        for app in &apps {
+            let app_dir = otp_lib_dir.join(app);
+            std::fs::create_dir_all(app_dir.join("src")).unwrap();
+            std::fs::create_dir_all(app_dir.join("include")).unwrap();
+            std::fs::create_dir_all(app_dir.join("ebin")).unwrap();
+        }
+
+        let otp_path = Utf8PathBuf::from_path_buf(otp_lib_dir).unwrap();
+
+        // Test without exclusions
+        let (_otp, all_apps) = Otp::discover(otp_path.clone(), &OtpConfig::default());
+        let app_names: Vec<&str> = all_apps.iter().map(|app| app.name.as_str()).collect();
+        assert!(app_names.contains(&"kernel"));
+        assert!(app_names.contains(&"stdlib"));
+        assert!(app_names.contains(&"megaco"));
+        assert!(app_names.contains(&"eunit"));
+        assert!(app_names.contains(&"common_test"));
+
+        // Test with exclusions
+        let otp_config = OtpConfig {
+            exclude_apps: vec!["megaco".to_string(), "eunit".to_string()],
+        };
+        let (_otp, filtered_apps) = Otp::discover(otp_path, &otp_config);
+        let filtered_names: Vec<&str> = filtered_apps.iter().map(|app| app.name.as_str()).collect();
+        assert!(filtered_names.contains(&"kernel"));
+        assert!(filtered_names.contains(&"stdlib"));
+        assert!(filtered_names.contains(&"common_test"));
+        assert!(!filtered_names.contains(&"megaco"));
+        assert!(!filtered_names.contains(&"eunit"));
+
+        // Verify the filtered list is smaller
+        assert!(filtered_apps.len() < all_apps.len());
+        assert_eq!(filtered_apps.len(), all_apps.len() - 2);
+    }
+}
diff --git a/website/docs/get-started/configure-project/elp-toml.md b/website/docs/get-started/configure-project/elp-toml.md
index 557027a138..931d207989 100644
--- a/website/docs/get-started/configure-project/elp-toml.md
+++ b/website/docs/get-started/configure-project/elp-toml.md
@@ -32,6 +32,9 @@ enabled = false
 
 [rebar]
 profile = "test"
+
+[otp]
+exclude_apps = ["megaco", "eunit"]
 ```
 
 ## Configuration Sections
@@ -126,3 +129,22 @@ Configure ELP for [rebar3](https://rebar3.org/)-based projects.
 | Key     | Type   | Description                                                                                                                                | Default |
 | ------- | ------ | ------------------------------------------------------------------------------------------------------------------------------------------ | ------- |
 | profile | String | The `rebar3` profile to use for project discovery. Only used if the `file` property is specified in the [build_info](#build-info) section. | test    |
+
+### \[otp\] {#otp}
+
+Configure ELP's interaction with OTP (Open Telecom Platform) applications.
+
+| Key          | Type              | Description                                                                                                        | Default |
+| ------------ | ----------------- | ------------------------------------------------------------------------------------------------------------------ | ------- |
+| exclude_apps | Array of Strings  | List of OTP application names to exclude from indexing. This can help improve performance by not loading rarely used OTP apps. | []      |
+
+The `exclude_apps` setting allows you to specify OTP applications that should not be indexed by ELP. This can be useful for:
+
+- Improving performance by excluding rarely used OTP applications like `megaco`
+- Reducing memory usage when working on projects that don't need certain OTP libraries
+
+Example usage:
+```toml
+[otp]
+exclude_apps = ["diameter", "megaco"]
+```

From f417b8afd98840b886e142fd6b10d94a8278f4ef Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 22 Oct 2025 03:03:59 -0700
Subject: [PATCH 193/394] Tweak devmate rules to give a crate name to directory
 mapping

Summary:
Often when devmate wants to run a test if first uses the directory name, then looks up the crate name and uses that.

Hopefully this helps

Reviewed By: TheGeorge

Differential Revision: D85059984

fbshipit-source-id: f560f4f920545611a9a2738140688db3c6f58551
---
 .llms/rules/elp_development.md | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/.llms/rules/elp_development.md b/.llms/rules/elp_development.md
index d6462ed7e3..459a89ee4f 100644
--- a/.llms/rules/elp_development.md
+++ b/.llms/rules/elp_development.md
@@ -124,6 +124,38 @@ Every diagnostic must have a corresponding `DiagnosticDescriptor` that defines w
 - Use realistic Erlang code examples in tests
 - Test both positive and negative cases
 
+### Running Tests for Specific Crates
+
+When running tests for a specific crate, you need to specify the crate name, not the directory name. The mapping is:
+
+| Crate Name | Directory Name |
+|------------|----------------|
+| `elp_base_db` | `crates/base_db` |
+| `elp_eqwalizer` | `crates/eqwalizer` |
+| `elp_erlang_service` | `crates/erlang_service` |
+| `elp_ide` | `crates/ide` |
+| `elp_ide_assists` | `crates/ide_assists` |
+| `elp_ide_completion` | `crates/ide_completion` |
+| `elp_ide_db` | `crates/ide_db` |
+| `elp_ide_ssr` | `crates/ide_ssr` |
+| `elp_log` | `crates/elp_log` |
+| `elp_project_model` | `crates/project_model` |
+| `elp_syntax` | `crates/syntax` |
+| `elp_text_edit` | `crates/text_edit` |
+| `elp_types_db` | `crates/types_db` |
+| `hir` | `crates/hir` |
+| `erl_ast` | `crates/erl_ast` |
+
+Example: To run tests for the `elp_ide` crate:
+```bash
+./meta/cargo.sh test -p elp_ide
+```
+
+Or to run tests in a specific directory:
+```bash
+./meta/cargo.sh test --manifest-path crates/ide/Cargo.toml
+```
+
 ### Existing tests
 
 - Do not change existing tests without asking

From 6d8c16078a3695b1ff77c78cb19b62d1010ad444 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 22 Oct 2025 03:35:15 -0700
Subject: [PATCH 194/394] check if a file is in a project when it opens

Summary:
ELP has an assumption that all the files belonging to a given project have some common root directory, and when using buck this is marked by an `.elp.toml` file.

Now that we are using buck to generate some files as part of the build process, this assumption is no longer valid, as the generated files end up in the `buck out` directory, which is outside the normal project.

Further, ELP can handle more than one project at a time. So when a new file is opened in the client, we check if it belongs to one of the existing projects, and if not we configure a new project for it.

This leads to a situation where if we open one of the generated files, ELP will try to make a new project for it.  This causes the ELP project-wide information to become invalid, as it is now spread over more than one. In particular this shows up as generated include files no longer being resolved.

## This diff

This diff addresses the issue by making use of the fact that every file in a buck project is explicitly enumerated, precisely because there it no simple directory enclosure mechanism to determine project owner.

So when a new file is opened, provided ELP is already in `Running` state and thus the internal database is valid, we check if the file is already known. If so we do not check for a possible new project.

Reviewed By: robertoaloi

Differential Revision: D85234832

fbshipit-source-id: 4858bbfa2d51d1e3f030f666f706a2ffb155e0f1
---
 crates/elp/src/server.rs | 43 +++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index 34b5c66656..dab023b673 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -724,13 +724,12 @@ impl Server {
                 this.ct_diagnostics_requested = true;
                 this.native_diagnostics_requested = true;
                 if let Ok(path) = convert::abs_path(&params.text_document.uri) {
-                    this.fetch_projects_if_needed(&path);
-                    let path = VfsPath::from(path);
+                    let vfs_path = VfsPath::from(path.clone());
                     let already_exists = this
                         .mem_docs
                         .write()
                         .insert(
-                            path.clone(),
+                            vfs_path.clone(),
                             DocumentData::new(
                                 params.text_document.version,
                                 params.text_document.text.clone().into_bytes(),
@@ -738,24 +737,32 @@ impl Server {
                         )
                         .is_err();
                     if already_exists {
-                        tracing::error!("duplicate DidOpenTextDocument: {}", path);
-                        log::error!("duplicate DidOpenTextDocument: {path}");
+                        tracing::error!("duplicate DidOpenTextDocument: {}", &vfs_path);
+                        log::error!("duplicate DidOpenTextDocument: {vfs_path}");
                     }
 
-                    let mut vfs = this.vfs.write();
-                    let bytes = params.text_document.text.into_bytes();
-                    vfs.set_file_contents(path.clone(), Some(bytes.clone()));
+                    let file_id = {
+                        let mut vfs = this.vfs.write();
+                        let bytes = params.text_document.text.into_bytes();
+                        vfs.set_file_contents(vfs_path.clone(), Some(bytes.clone()));
 
-                    // Until we bring over the full rust-analyzer
-                    // style change processing, make a list of files
-                    // that are freshly opened so diagnostics are
-                    // generated for them, despite no changes being
-                    // registered in vfs.
-                    let (file_id, _) = vfs.file_id(&path).unwrap();
-                    this.newly_opened_documents.push(ChangedFile {
-                        file_id,
-                        change: Change::Modify(bytes, params.text_document.version as u64),
-                    });
+                        // Until we bring over the full rust-analyzer
+                        // style change processing, make a list of files
+                        // that are freshly opened so diagnostics are
+                        // generated for them, despite no changes being
+                        // registered in vfs.
+                        let (file_id, _) = vfs.file_id(&vfs_path).unwrap();
+                        this.newly_opened_documents.push(ChangedFile {
+                            file_id,
+                            change: Change::Modify(bytes, params.text_document.version as u64),
+                        });
+                        file_id
+                    };
+
+                    if this.status != Status::Running || this.analysis_host.raw_database().file_app_data(file_id).is_none() {
+                        // We do not have a project associated with this file
+                        this.fetch_projects_if_needed(&path);
+                    }
                 } else {
                     log::error!(
                         "DidOpenTextDocument: could not get vfs path for {}",

From 5fe7e93fd667feaf32ac8d5555a112f8693cb243 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 22 Oct 2025 03:52:56 -0700
Subject: [PATCH 195/394] Update docs to take into account eqwalizer as a
 submodule

Summary: Simpler installation since the user does not have to clone a separate repository.

Reviewed By: jcpetruzza, alanz

Differential Revision: D85143542

fbshipit-source-id: 1302240a59c3c84b309cbfd2db00a52356160b10
---
 website/docs/get-started/install.md | 40 +++++++----------------------
 1 file changed, 9 insertions(+), 31 deletions(-)

diff --git a/website/docs/get-started/install.md b/website/docs/get-started/install.md
index 84f903cd64..e6fabf165e 100644
--- a/website/docs/get-started/install.md
+++ b/website/docs/get-started/install.md
@@ -51,18 +51,14 @@ correctly installed.
 
 ## From Source
 
-### Prerequisites
-
-To be able to compile ELP from source, you need a copy of the
-[eqWAlizer](https://github.com/WhatsApp/eqwalizer) typechecker for Erlang.
-
-Clone the eqWAlizer repository:
+Clone the ELP repository, including submodules:
 
 ```
-git clone https://github.com/WhatsApp/eqwalizer.git
+git clone --recurse-submodules https://github.com/WhatsApp/erlang-language-platform.git
+cd erlang-language-platform
 ```
 
-Enter the `eqwalizer` repository and build it. Notice the double `eqwalizer` in
+Enter the `eqwalizer` submodule and build it. Notice the double `eqwalizer` in
 the `pushd` command.
 
 ```
@@ -71,39 +67,21 @@ sbt assembly
 popd
 ```
 
-Get the path of the produced `eqwalizer.jar` file:
+Point the `ELP_EQWALIZER_PATH` environment variable to the path of the produced `eqwalizer.jar` file:
 
 ```
-find . -name eqwalizer.jar | readlink -f
+export ELP_EQWALIZER_PATH=$(find "$(pwd)" -name eqwalizer.jar)
 ```
 
-Point the `ELP_EQWALIZER_PATH` environment variable to the path returned above:
+Point the `EQWALIZER_DIR` environment variable to the path of the `eqwalizer_support` directory:
 
 ```
-export ELP_EQWALIZER_PATH=/path/to/eqwalizer.jar
+export EQWALIZER_DIR=$(find "$(pwd)" -name eqwalizer_support)
 ```
 
-Note: The ELP build assumes that you clone the eqwalizer and ELP
-repositories from the same starting directory, so they are
-"siblings". This is because there is a cross-reference within ELP to
-`../eqwalizer/eqwalizer_support`.  If you are unable to do this, set
+Now we can compile ELP:
 
 ```
-export EQWALIZER_DIR=</path/to/eqwalizer_repo>/eqwalizer_support
-```
-
-### Compile ELP
-
-Clone the ELP repository:
-
-```
-git clone https://github.com/WhatsApp/erlang-language-platform.git
-```
-
-Enter the ELP repo and compile it:
-
-```
-cd erlang-language-platform
 cargo build --release
 ```
 

From f2a95d73e0ad9329b740ab7a4376ddda7bf46f63 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 22 Oct 2025 05:20:38 -0700
Subject: [PATCH 196/394] Recommend release-thin profile for development

Summary: Add tip for ELP developers, to avoid slow compilation times during develoment.

Reviewed By: jcpetruzza

Differential Revision: D85240198

fbshipit-source-id: 93db3cc8646ff3d954fb2fe7af33963755727274
---
 website/docs/get-started/install.md | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/website/docs/get-started/install.md b/website/docs/get-started/install.md
index e6fabf165e..4c8adb7bb1 100644
--- a/website/docs/get-started/install.md
+++ b/website/docs/get-started/install.md
@@ -67,13 +67,15 @@ sbt assembly
 popd
 ```
 
-Point the `ELP_EQWALIZER_PATH` environment variable to the path of the produced `eqwalizer.jar` file:
+Point the `ELP_EQWALIZER_PATH` environment variable to the path of the produced
+`eqwalizer.jar` file:
 
 ```
 export ELP_EQWALIZER_PATH=$(find "$(pwd)" -name eqwalizer.jar)
 ```
 
-Point the `EQWALIZER_DIR` environment variable to the path of the `eqwalizer_support` directory:
+Point the `EQWALIZER_DIR` environment variable to the path of the
+`eqwalizer_support` directory:
 
 ```
 export EQWALIZER_DIR=$(find "$(pwd)" -name eqwalizer_support)
@@ -81,11 +83,22 @@ export EQWALIZER_DIR=$(find "$(pwd)" -name eqwalizer_support)
 
 Now we can compile ELP:
 
+:::tip
+
+The commands below will produce a release build, which has the best runtime
+performance, at the price of a slower compilation time. If you are developing
+ELP, consider using `cargo build --profile release-thin`, as it provides a much
+faster development loop while still producing a performant binary. You will find
+the corresponding binary in `target/release-thin/elp`.
+
+:::
+
 ```
 cargo build --release
 ```
 
-The produced executable will be available in: `target/release/elp`, so ensure it is included in your `PATH`. E.g.:
+The produced executable will be available in: `target/release/elp`, so ensure it
+is included in your `PATH`. E.g.:
 
 ```
 mkdir -p ~/bin

From 0c723ff3f5ea11db828e7ec9c03fe156f88295bc Mon Sep 17 00:00:00 2001
From: Cj Longoria <cjlongoria@meta.com>
Date: Wed, 22 Oct 2025 15:17:54 -0700
Subject: [PATCH 197/394] rustfmt update

Summary:
X-link: https://github.com/meta-pytorch/monarch/pull/1646

update rustfmt to match 1.90.0 cut.

Fixed formatting issues by updating project's rustfmt.toml or updating code.

Reviewed By: dtolnay

Differential Revision: D84213462

fbshipit-source-id: 3df02141c6eec83e6193d9e32675f81d475a784c
---
 rustfmt.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rustfmt.toml b/rustfmt.toml
index 0762474bce..06998754bd 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,6 +1,6 @@
 # Get help on options with `rustfmt --help=config`
 # Please keep these in alphabetical order.
-edition = "2021"
+edition = "2024"
 format_code_in_doc_comments = true
 group_imports = "StdExternalCrate"
 imports_granularity = "Item"

From e8bd4fdfc35bde07c4898c4ea4f8c73d0722676b Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Thu, 23 Oct 2025 03:45:49 -0700
Subject: [PATCH 198/394] Fix failing test

Summary: We have a currently failing buck test, fix it.

Reviewed By: jcpetruzza

Differential Revision: D85331710

fbshipit-source-id: a4e50354ec3553643d4283c58f4a283c3320ff2c
---
 .../test/buck_tests_2/resolves_generated_includes.stdout  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
index 7c9890aa86..7787c17575 100644
--- a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
+++ b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
@@ -12,7 +12,7 @@ Diagnostics reported in 4 modules:
   wa_buck2_module_search: 6
       19:0-19:18::[WeakWarning] [W0040] The function is non-trivial, exported, but not documented.
       2:8-2:30::[WeakWarning] [W0046] The module is not documented.
-      49:18-49:31::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
-      51:18-51:28::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
-      51:38-51:51::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
-      55:30-55:40::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
+      54:18-54:31::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
+      56:18-56:28::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
+      56:38-56:51::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
+      60:30-60:40::[WeakWarning] [W0051] Binary string can be written using sigil syntax.

From 379bfd61eef06a796bfef5f01cd9c40d6c75294b Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Thu, 23 Oct 2025 07:18:25 -0700
Subject: [PATCH 199/394] Occurrence with is_function/2 -- snapshot tests

Summary: Tests showing `is_function/2` is not properly refined negatively

Reviewed By: michalmuskala

Differential Revision: D85336037

fbshipit-source-id: a8b5d841b8e55559d95de30581df621e329e1c77
---
 .../eqwater/eqwater-OTP-27.pretty             | 54 ++++++++++++++++++-
 .../eqwalizer_tests/eqwater/src/eqwater.erl   |  8 +++
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-27.pretty
index 05fbf33987..bfe6a1cf8a 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-27.pretty
@@ -680,4 +680,56 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
 Expression has type:   number()
 Context expected type: 'ok'
 
-38 ERRORS
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+     ┌─ eqwater/src/eqwater.erl:1306:18
+     │
+1306 │ negate_fun(F) -> F.
+     │                  ^
+     │                  │
+     │                  F.
+Expression has type:   fun((number(), number()) -> term()) | 'ok'
+Context expected type: 'ok'
+     │                  
+
+Because in the expression's type:
+  Here the type is a union type with some valid candidates: 'ok'
+  However the following candidate: fun((number(), number()) -> term())
+  Differs from the expected type:  'ok'
+
+------------------------------ Detailed message ------------------------------
+
+  fun((number(), number()) -> term()) | 'ok' is not compatible with 'ok'
+  because
+  fun((number(), number()) -> term()) is not compatible with 'ok'
+
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+     ┌─ eqwater/src/eqwater.erl:1309:45
+     │
+1309 │ negate_fun_neg(F) when is_function(F, 2) -> F;
+     │                                             ^ F.
+Expression has type:   fun((term(), term()) -> term())
+Context expected type: 'ok'
+
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+     ┌─ eqwater/src/eqwater.erl:1310:22
+     │
+1310 │ negate_fun_neg(F) -> F.
+     │                      ^
+     │                      │
+     │                      F.
+Expression has type:   fun((number(), number()) -> term()) | 'ok'
+Context expected type: 'ok'
+     │                      
+
+Because in the expression's type:
+  Here the type is a union type with some valid candidates: 'ok'
+  However the following candidate: fun((number(), number()) -> term())
+  Differs from the expected type:  'ok'
+
+------------------------------ Detailed message ------------------------------
+
+  fun((number(), number()) -> term()) | 'ok' is not compatible with 'ok'
+  because
+  fun((number(), number()) -> term()) is not compatible with 'ok'
+
+41 ERRORS
diff --git a/test_projects/eqwalizer_tests/eqwater/src/eqwater.erl b/test_projects/eqwalizer_tests/eqwater/src/eqwater.erl
index f63202453a..839cc3d8c5 100644
--- a/test_projects/eqwalizer_tests/eqwater/src/eqwater.erl
+++ b/test_projects/eqwalizer_tests/eqwater/src/eqwater.erl
@@ -1300,3 +1300,11 @@ negate_number(N) -> N.
   (dynamic(), ok | err) -> ok.
 refine_dynamic(D, A) when is_atom(D) andalso A == err -> ok;
 refine_dynamic(D, A) when is_atom(D) -> A.
+
+-spec negate_fun(F :: fun((number(), number()) -> term()) | ok) -> ok.
+negate_fun(F) when is_function(F, 2) -> ok;
+negate_fun(F) -> F.
+
+-spec negate_fun_neg(F :: fun((number(), number()) -> term()) | ok) -> ok.
+negate_fun_neg(F) when is_function(F, 2) -> F;
+negate_fun_neg(F) -> F.

From 0b0dfa546963ec2833bc5ab3ce0cdfc8075eeaf5 Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Thu, 23 Oct 2025 07:18:25 -0700
Subject: [PATCH 200/394] Fix occurrence typing for is_function/2

Summary:
The actual top type for a function of arity `n` is `FunType(Nil, List.fill(n)(NoneType), AnyType)`, not `FunType(Nil, List.fill(n)(AnyType), AnyType)`, which means the negation of the predicate is not properly computed.

However, due to how intersection is computed (and particularly when it involves dynamic types), using this as a top type for the positive refinement leads to confusing signal, producing `none()` as domain. So this diff only uses it for the negative part.

Reviewed By: michalmuskala

Differential Revision: D85336038

fbshipit-source-id: 663393fe5919274c945435e764132faa4b0e7221
---
 .../eqwater/eqwater-OTP-27.pretty             | 46 +------------------
 1 file changed, 1 insertion(+), 45 deletions(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-27.pretty
index bfe6a1cf8a..bbcdb47b23 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-27.pretty
@@ -680,28 +680,6 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
 Expression has type:   number()
 Context expected type: 'ok'
 
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1306:18
-     │
-1306 │ negate_fun(F) -> F.
-     │                  ^
-     │                  │
-     │                  F.
-Expression has type:   fun((number(), number()) -> term()) | 'ok'
-Context expected type: 'ok'
-     │                  
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'ok'
-  However the following candidate: fun((number(), number()) -> term())
-  Differs from the expected type:  'ok'
-
------------------------------- Detailed message ------------------------------
-
-  fun((number(), number()) -> term()) | 'ok' is not compatible with 'ok'
-  because
-  fun((number(), number()) -> term()) is not compatible with 'ok'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ eqwater/src/eqwater.erl:1309:45
      │
@@ -710,26 +688,4 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
 Expression has type:   fun((term(), term()) -> term())
 Context expected type: 'ok'
 
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1310:22
-     │
-1310 │ negate_fun_neg(F) -> F.
-     │                      ^
-     │                      │
-     │                      F.
-Expression has type:   fun((number(), number()) -> term()) | 'ok'
-Context expected type: 'ok'
-     │                      
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'ok'
-  However the following candidate: fun((number(), number()) -> term())
-  Differs from the expected type:  'ok'
-
------------------------------- Detailed message ------------------------------
-
-  fun((number(), number()) -> term()) | 'ok' is not compatible with 'ok'
-  because
-  fun((number(), number()) -> term()) is not compatible with 'ok'
-
-41 ERRORS
+39 ERRORS

From ea25281dc53dda3406396e5dbd7197b6aef55b17 Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Fri, 24 Oct 2025 02:38:13 -0700
Subject: [PATCH 201/394] Fix OTP 26/28 fixtures

Summary: As title. Copy from OTP 27.

Reviewed By: michalmuskala, alanz

Differential Revision: D85421561

fbshipit-source-id: e29aa0141f0c905a5a3aedfae26272bfd45d7819
---
 .../eqwater/eqwater-OTP-26.pretty             | 74 ++++++++++---------
 .../eqwater/eqwater-OTP-28.pretty             | 74 ++++++++++---------
 2 files changed, 82 insertions(+), 66 deletions(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-26.pretty
index 05fbf33987..c41f784a80 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-26.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-26.pretty
@@ -7,7 +7,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │       B.
 Expression has type:   none() | number() | binary()
 Context expected type: binary()
-    │       
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -29,7 +29,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                      B.
 Expression has type:   none() | number() | binary()
 Context expected type: binary()
-    │                      
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -51,7 +51,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │       A.
 Expression has type:   none() | number() | binary()
 Context expected type: binary()
-    │       
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -79,7 +79,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │             A.
 Expression has type:   #ab_rec{} | atom()
 Context expected type: atom()
-    │             
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: atom()
@@ -101,7 +101,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                A.
 Expression has type:   #ab_rec{} | atom()
 Context expected type: atom()
-    │                
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: atom()
@@ -124,14 +124,14 @@ Context expected type: number()
 
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ eqwater/src/eqwater.erl:408:1
-    │  
+    │
 408 │ ╭ get_int5({A, A})
 409 │ │   when is_atom(A) -> A.
     │ ╰──────────────────────^ Clause is not covered by spec
 
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ eqwater/src/eqwater.erl:413:1
-    │  
+    │
 413 │ ╭ get_int6({A1, A2})
 414 │ │   when is_atom(A1) and is_atom(A2) -> 1;
     │ ╰───────────────────────────────────────^ Clause is not covered by spec
@@ -145,7 +145,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                     I.
 Expression has type:   number() | atom()
 Context expected type: number()
-    │                     
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -160,7 +160,7 @@ Because in the expression's type:
 
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ eqwater/src/eqwater.erl:419:1
-    │  
+    │
 419 │ ╭ get_int7_neg({A, A})
 420 │ │   % A is none()
 421 │ │   when is_atom(A) -> 0;
@@ -175,7 +175,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                         I.
 Expression has type:   number() | atom()
 Context expected type: number()
-    │                         
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -197,7 +197,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                         I.
 Expression has type:   number() | atom()
 Context expected type: number()
-    │                         
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -219,7 +219,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │   A.
 Expression has type:   atom() | none()
 Context expected type: binary()
-    │   
+    │
 
 Because in the expression's type:
   Here the type is:     atom()
@@ -234,10 +234,10 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                      R.
 Expression has type:   #union_field{}
 Context expected type: {'union_field', atom()}
-    │                      
+    │
 
 Because in the expression's type:
-  { 'union_field', 
+  { 'union_field',
     Here the type is:     binary()
     Context expects type: atom()
   }
@@ -258,7 +258,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                                                  A.
 Expression has type:   number() | 'ok'
 Context expected type: number()
-    │                                                  
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -280,7 +280,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │        B.
 Expression has type:   none() | #b{} | #c{}
 Context expected type: #b{}
-    │        
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: #b{}
@@ -302,7 +302,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                           B.
 Expression has type:   A | B
 Context expected type: B
-    │                           
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: B
@@ -324,7 +324,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                 T.
 Expression has type:   fun() | {term()}
 Context expected type: {term()}
-    │                 
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: {term()}
@@ -346,7 +346,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                 A.
 Expression has type:   tuple() | atom()
 Context expected type: atom()
-    │                 
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: atom()
@@ -368,7 +368,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                  X.
 Expression has type:   #one_field{} | #two_fields1{}
 Context expected type: #one_field{}
-    │                  
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: #one_field{}
@@ -390,7 +390,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                           Y.
 Expression has type:   number() | atom()
 Context expected type: number()
-    │                           
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -434,7 +434,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │                    I.
 Expression has type:   number() | 'undefined'
 Context expected type: number()
-     │                    
+     │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -456,7 +456,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │              [A].
 Expression has type:   [[atom()]] | [atom()]
 Context expected type: [atom()]
-     │              
+     │
 
 Because in the expression's type:
   The type is a union type with some valid candidates: [atom()]
@@ -483,7 +483,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │               [A2].
 Expression has type:   [[atom()]] | [atom()]
 Context expected type: [atom()]
-     │               
+     │
 
 Because in the expression's type:
   The type is a union type with some valid candidates: [atom()]
@@ -510,7 +510,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │       X.
 Expression has type:   binary() | string()
 Context expected type: binary()
-     │       
+     │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -532,7 +532,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │       Y.
 Expression has type:   binary() | atom()
 Context expected type: binary()
-     │       
+     │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -554,7 +554,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │                                                            V.
 Expression has type:   'ok' | binary()
 Context expected type: binary()
-     │                                                            
+     │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -576,7 +576,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │                              V.
 Expression has type:   binary() | 'ok'
 Context expected type: 'ok'
-     │                              
+     │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: 'ok'
@@ -598,7 +598,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │              Args.
 Expression has type:   {term(), my_list()} | none() | number()
 Context expected type: number()
-     │              
+     │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -628,7 +628,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │                             B.
 Expression has type:   'a' | 'b'
 Context expected type: 'b'
-     │                             
+     │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: 'b'
@@ -650,7 +650,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │     V.
 Expression has type:   'a' | none()
 Context expected type: 'b'
-     │     
+     │
 
 Because in the expression's type:
   Here the type is:     'a'
@@ -665,7 +665,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │                                                            A.
 Expression has type:   none() | 'c'
 Context expected type: 'a' | 'b'
-     │                                                            
+     │
 
 Because in the expression's type:
   Here the type is:     'c'
@@ -680,4 +680,12 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
 Expression has type:   number()
 Context expected type: 'ok'
 
-38 ERRORS
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+     ┌─ eqwater/src/eqwater.erl:1309:45
+     │
+1309 │ negate_fun_neg(F) when is_function(F, 2) -> F;
+     │                                             ^ F.
+Expression has type:   fun((term(), term()) -> term())
+Context expected type: 'ok'
+
+39 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-28.pretty
index 05fbf33987..c41f784a80 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-28.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-28.pretty
@@ -7,7 +7,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │       B.
 Expression has type:   none() | number() | binary()
 Context expected type: binary()
-    │       
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -29,7 +29,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                      B.
 Expression has type:   none() | number() | binary()
 Context expected type: binary()
-    │                      
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -51,7 +51,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │       A.
 Expression has type:   none() | number() | binary()
 Context expected type: binary()
-    │       
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -79,7 +79,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │             A.
 Expression has type:   #ab_rec{} | atom()
 Context expected type: atom()
-    │             
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: atom()
@@ -101,7 +101,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                A.
 Expression has type:   #ab_rec{} | atom()
 Context expected type: atom()
-    │                
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: atom()
@@ -124,14 +124,14 @@ Context expected type: number()
 
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ eqwater/src/eqwater.erl:408:1
-    │  
+    │
 408 │ ╭ get_int5({A, A})
 409 │ │   when is_atom(A) -> A.
     │ ╰──────────────────────^ Clause is not covered by spec
 
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ eqwater/src/eqwater.erl:413:1
-    │  
+    │
 413 │ ╭ get_int6({A1, A2})
 414 │ │   when is_atom(A1) and is_atom(A2) -> 1;
     │ ╰───────────────────────────────────────^ Clause is not covered by spec
@@ -145,7 +145,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                     I.
 Expression has type:   number() | atom()
 Context expected type: number()
-    │                     
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -160,7 +160,7 @@ Because in the expression's type:
 
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ eqwater/src/eqwater.erl:419:1
-    │  
+    │
 419 │ ╭ get_int7_neg({A, A})
 420 │ │   % A is none()
 421 │ │   when is_atom(A) -> 0;
@@ -175,7 +175,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                         I.
 Expression has type:   number() | atom()
 Context expected type: number()
-    │                         
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -197,7 +197,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                         I.
 Expression has type:   number() | atom()
 Context expected type: number()
-    │                         
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -219,7 +219,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │   A.
 Expression has type:   atom() | none()
 Context expected type: binary()
-    │   
+    │
 
 Because in the expression's type:
   Here the type is:     atom()
@@ -234,10 +234,10 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                      R.
 Expression has type:   #union_field{}
 Context expected type: {'union_field', atom()}
-    │                      
+    │
 
 Because in the expression's type:
-  { 'union_field', 
+  { 'union_field',
     Here the type is:     binary()
     Context expects type: atom()
   }
@@ -258,7 +258,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                                                  A.
 Expression has type:   number() | 'ok'
 Context expected type: number()
-    │                                                  
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -280,7 +280,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │        B.
 Expression has type:   none() | #b{} | #c{}
 Context expected type: #b{}
-    │        
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: #b{}
@@ -302,7 +302,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                           B.
 Expression has type:   A | B
 Context expected type: B
-    │                           
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: B
@@ -324,7 +324,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                 T.
 Expression has type:   fun() | {term()}
 Context expected type: {term()}
-    │                 
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: {term()}
@@ -346,7 +346,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                 A.
 Expression has type:   tuple() | atom()
 Context expected type: atom()
-    │                 
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: atom()
@@ -368,7 +368,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                  X.
 Expression has type:   #one_field{} | #two_fields1{}
 Context expected type: #one_field{}
-    │                  
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: #one_field{}
@@ -390,7 +390,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                           Y.
 Expression has type:   number() | atom()
 Context expected type: number()
-    │                           
+    │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -434,7 +434,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │                    I.
 Expression has type:   number() | 'undefined'
 Context expected type: number()
-     │                    
+     │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -456,7 +456,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │              [A].
 Expression has type:   [[atom()]] | [atom()]
 Context expected type: [atom()]
-     │              
+     │
 
 Because in the expression's type:
   The type is a union type with some valid candidates: [atom()]
@@ -483,7 +483,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │               [A2].
 Expression has type:   [[atom()]] | [atom()]
 Context expected type: [atom()]
-     │               
+     │
 
 Because in the expression's type:
   The type is a union type with some valid candidates: [atom()]
@@ -510,7 +510,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │       X.
 Expression has type:   binary() | string()
 Context expected type: binary()
-     │       
+     │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -532,7 +532,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │       Y.
 Expression has type:   binary() | atom()
 Context expected type: binary()
-     │       
+     │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -554,7 +554,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │                                                            V.
 Expression has type:   'ok' | binary()
 Context expected type: binary()
-     │                                                            
+     │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -576,7 +576,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │                              V.
 Expression has type:   binary() | 'ok'
 Context expected type: 'ok'
-     │                              
+     │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: 'ok'
@@ -598,7 +598,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │              Args.
 Expression has type:   {term(), my_list()} | none() | number()
 Context expected type: number()
-     │              
+     │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -628,7 +628,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │                             B.
 Expression has type:   'a' | 'b'
 Context expected type: 'b'
-     │                             
+     │
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: 'b'
@@ -650,7 +650,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │     V.
 Expression has type:   'a' | none()
 Context expected type: 'b'
-     │     
+     │
 
 Because in the expression's type:
   Here the type is:     'a'
@@ -665,7 +665,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │                                                            A.
 Expression has type:   none() | 'c'
 Context expected type: 'a' | 'b'
-     │                                                            
+     │
 
 Because in the expression's type:
   Here the type is:     'c'
@@ -680,4 +680,12 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
 Expression has type:   number()
 Context expected type: 'ok'
 
-38 ERRORS
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+     ┌─ eqwater/src/eqwater.erl:1309:45
+     │
+1309 │ negate_fun_neg(F) when is_function(F, 2) -> F;
+     │                                             ^ F.
+Expression has type:   fun((term(), term()) -> term())
+Context expected type: 'ok'
+
+39 ERRORS

From dd36ea17eb72dd9c955ff2a2f0f584f2c1de6c00 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 24 Oct 2025 04:33:31 -0700
Subject: [PATCH 202/394] Fix incorrect project load on go to def in thrift
 file

Summary:
For a buck project having code generation, the `elp.bxl` script returns the various generated source paths in the `buck-out` directory. But the paths it returns include symlinks.

VS Code resolves symlinks when a file is opened, and all the communication with ELP as an LSP server is done using the canonical (no-symlinks) path.

When we go to a definition, we provide a path that may have a symlink.

We recently landed a diff titled `[ELP] check if a file is in a project when it opens` which checks if a file outside the project root in fact belongs to a project, via the list of `applicable_files` for a buck project.

For a symlinked file opened in VS Code and returned as canonical, this lookup fails.  The failure also shows up another bug, in that the check to see if the file belongs to a project uses function `file_app_data` which falls back to checking for a `SourceRoot`, and panics for a file outside the root.

## This diff

This diff fixes both problems.
- It canonicalizes (without symlinks) the `applicable_files` for buck projects
- It rather uses `app_data_id_by_file` which does a simple loookup to check if the file belongs to a known project.

Reviewed By: jcpetruzza

Differential Revision: D85429234

fbshipit-source-id: e1f4867f8c66e69e219defd3ea742f431b994a21
---
 crates/elp/src/server.rs         | 3 +--
 crates/project_model/src/buck.rs | 5 +++--
 crates/project_model/src/json.rs | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index dab023b673..acdc62585b 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -758,8 +758,7 @@ impl Server {
                         });
                         file_id
                     };
-
-                    if this.status != Status::Running || this.analysis_host.raw_database().file_app_data(file_id).is_none() {
+                    if this.status != Status::Running || this.analysis_host.raw_database().app_data_id_by_file(file_id).is_none() {
                         // We do not have a project associated with this file
                         this.fetch_projects_if_needed(&path);
                     }
diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 414455dc55..bc843d31d9 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -43,6 +43,7 @@ use crate::CommandProxy;
 use crate::ElpConfig;
 use crate::ProjectAppData;
 use crate::ProjectModelError;
+use crate::json;
 use crate::otp::Otp;
 
 pub type TargetFullName = String;
@@ -576,7 +577,7 @@ fn make_buck_target(
 
     let (src_files, include_files, target_type, private_header, ebin) =
         if let Some(ref suite) = target.suite {
-            let src_file = buck_path_to_abs_path(root, suite)?;
+            let src_file = json::canonicalize(buck_path_to_abs_path(root, suite)?)?;
             let src = vec![src_file.clone()];
             target_info
                 .path_to_target_name
@@ -593,7 +594,7 @@ fn make_buck_target(
             let target_type = compute_target_type(name, target);
             let mut src_files = vec![];
             for src in &target.srcs {
-                let src = buck_path_to_abs_path(root, src).unwrap();
+                let src = json::canonicalize(buck_path_to_abs_path(root, src).unwrap())?;
                 if Some("hrl") == src.extension() {
                     private_header = true;
                 }
diff --git a/crates/project_model/src/json.rs b/crates/project_model/src/json.rs
index 12b822ac39..b910c91319 100644
--- a/crates/project_model/src/json.rs
+++ b/crates/project_model/src/json.rs
@@ -229,7 +229,7 @@ pub(crate) fn gen_app_data(
     (apps, deps)
 }
 
-fn canonicalize(path: impl AsRef<Utf8Path>) -> Result<AbsPathBuf> {
+pub fn canonicalize(path: impl AsRef<Utf8Path>) -> Result<AbsPathBuf> {
     let abs = fs::canonicalize(path.as_ref())?;
     Ok(AbsPathBuf::assert(
         Utf8PathBuf::from_path_buf(abs).expect("Could not convert to UTF8"),

From 41b9e1a21e4c89e9840b346e38e663362be1e5f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Muska=C5=82a?= <micmus@meta.com>
Date: Fri, 24 Oct 2025 08:50:08 -0700
Subject: [PATCH 203/394] Clean up unions with none()

Summary:
This is an eyesore when looking at type hints. We can get rid of them by a smart `apply` on `UnionType` that just removes `NoneType` - they're not meaningful.
This also removes single-element unions - they were also causing some poor error messages with superfluous explanations stating same facts twice.

There's no measurable change in time when running across the whole codebase.

Reviewed By: TheGeorge, ilya-klyuchnikov

Differential Revision: D85340363

fbshipit-source-id: 84759dcac6368c83624c7bd7f377273bb8151c37
---
 .../check/case_predicates-OTP-26.pretty       |  34 ++----
 .../check/case_predicates-OTP-27.pretty       |  34 ++----
 .../check/case_predicates-OTP-28.pretty       |  34 ++----
 .../check/custom-OTP-26.pretty                |  39 ++----
 .../check/custom-OTP-27.pretty                |  39 ++----
 .../check/custom-OTP-28.pretty                |  39 ++----
 .../check/dynamic_refine-OTP-26.pretty        |   4 +-
 .../check/dynamic_refine-OTP-27.pretty        |   4 +-
 .../check/dynamic_refine-OTP-28.pretty        |   4 +-
 .../check/gradual_misc-OTP-26.pretty          |   7 +-
 .../check/gradual_misc-OTP-27.pretty          |   7 +-
 .../check/gradual_misc-OTP-28.pretty          |   7 +-
 .../eqwalizer_tests/check/hints-OTP-26.pretty |   4 +-
 .../eqwalizer_tests/check/hints-OTP-27.pretty |   4 +-
 .../eqwalizer_tests/check/hints-OTP-28.pretty |   4 +-
 .../eqwalizer_tests/check/other-OTP-26.pretty |   8 +-
 .../eqwalizer_tests/check/other-OTP-27.pretty |   8 +-
 .../eqwalizer_tests/check/other-OTP-28.pretty |   8 +-
 .../check/records-OTP-26.pretty               |  33 +----
 .../check/records-OTP-27.pretty               |  33 +----
 .../check/records-OTP-28.pretty               |  33 +----
 .../eqwater/eqwater-OTP-26.pretty             | 115 ++++++++----------
 .../eqwater/eqwater-OTP-27.pretty             |  55 +++------
 .../eqwater/eqwater-OTP-28.pretty             | 115 ++++++++----------
 .../eqwater/eqwater_lists-OTP-26.pretty       |   8 +-
 .../eqwater/eqwater_lists-OTP-27.pretty       |   8 +-
 .../eqwater/eqwater_lists-OTP-28.pretty       |   8 +-
 .../eqwater/eqwater_maps-OTP-26.pretty        |   6 +-
 .../eqwater/eqwater_maps-OTP-27.pretty        |   6 +-
 .../eqwater/eqwater_maps-OTP-28.pretty        |   6 +-
 .../fault_tolerance-OTP-26.pretty             |  22 +---
 .../fault_tolerance-OTP-27.pretty             |  22 +---
 .../fault_tolerance-OTP-28.pretty             |  22 +---
 .../eqwalize_all_bail_on_error_failure.pretty |   2 +
 .../standard/eqwalize_all_diagnostics.jsonl   |   2 +-
 .../standard/eqwalize_all_diagnostics.pretty  |   2 +
 .../eqwalize_all_diagnostics_gen.jsonl        |   2 +-
 .../standard/eqwalize_app_a_lists_fast.pretty |   2 +
 .../standard/eqwalize_app_diagnostics.pretty  |   2 +
 .../eqwalize_app_diagnostics_gen.pretty       |   2 +
 .../eqwalize_app_diagnostics_gen_rebar.pretty |   2 +
 .../eqwalize_app_diagnostics_rebar.pretty     |   2 +
 .../eqwalize_target_diagnostics.pretty        |   2 +
 crates/eqwalizer/src/ast/convert_types.rs     |  12 +-
 .../eqwalizer_tests/check/src/other.erl       |   6 +
 45 files changed, 306 insertions(+), 512 deletions(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-26.pretty
index 30ef1a7f38..9aff530657 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-26.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-26.pretty
@@ -61,7 +61,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │              ^^^^^^
     │              │
     │              {'p', X}.
-Expression has type:   {'p', none() | pid() | reference()}
+Expression has type:   {'p', pid() | reference()}
 Context expected type: {'a', atom()} | {'p', pid()}
     │              
 
@@ -74,12 +74,12 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  {'p', none() | pid() | reference()} is not compatible with {'a', atom()} | {'p', pid()}
+  {'p', pid() | reference()} is not compatible with {'a', atom()} | {'p', pid()}
   because
   at tuple index 2:
-  {'p', none() | pid() | reference()} is not compatible with {'p', pid()}
+  {'p', pid() | reference()} is not compatible with {'p', pid()}
   because
-  none() | pid() | reference() is not compatible with pid()
+  pid() | reference() is not compatible with pid()
   because
   reference() is not compatible with pid()
 
@@ -90,7 +90,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │          ^
     │          │
     │          X.
-Expression has type:   'undefined' | none() | 'restarting'
+Expression has type:   'undefined' | 'restarting'
 Context expected type: {'p', pid()} | 'undefined'
     │          
 
@@ -101,7 +101,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  'undefined' | none() | 'restarting' is not compatible with {'p', pid()} | 'undefined'
+  'undefined' | 'restarting' is not compatible with {'p', pid()} | 'undefined'
   because
   'restarting' is not compatible with {'p', pid()} | 'undefined'
   because
@@ -111,30 +111,16 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     ┌─ check/src/case_predicates.erl:174:16
     │
 174 │   lists:nth(1, L).
-    │                ^
-    │                │
-    │                L.
-Expression has type:   #{dynamic() => dynamic()} | none()
+    │                ^ L.
+Expression has type:   #{dynamic() => dynamic()}
 Context expected type: [T]
-    │                
-
-Because in the expression's type:
-  Here the type is:     #{dynamic() => dynamic()}
-  Context expects type: [T]
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/case_predicates.erl:174:16
     │
 174 │   lists:nth(1, L).
-    │                ^
-    │                │
-    │                L.
-Expression has type:   #{dynamic() => dynamic()} | none()
+    │                ^ L.
+Expression has type:   #{dynamic() => dynamic()}
 Context expected type: [dynamic()]
-    │                
-
-Because in the expression's type:
-  Here the type is:     #{dynamic() => dynamic()}
-  Context expects type: [dynamic()]
 
 11 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-27.pretty
index 30ef1a7f38..9aff530657 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-27.pretty
@@ -61,7 +61,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │              ^^^^^^
     │              │
     │              {'p', X}.
-Expression has type:   {'p', none() | pid() | reference()}
+Expression has type:   {'p', pid() | reference()}
 Context expected type: {'a', atom()} | {'p', pid()}
     │              
 
@@ -74,12 +74,12 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  {'p', none() | pid() | reference()} is not compatible with {'a', atom()} | {'p', pid()}
+  {'p', pid() | reference()} is not compatible with {'a', atom()} | {'p', pid()}
   because
   at tuple index 2:
-  {'p', none() | pid() | reference()} is not compatible with {'p', pid()}
+  {'p', pid() | reference()} is not compatible with {'p', pid()}
   because
-  none() | pid() | reference() is not compatible with pid()
+  pid() | reference() is not compatible with pid()
   because
   reference() is not compatible with pid()
 
@@ -90,7 +90,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │          ^
     │          │
     │          X.
-Expression has type:   'undefined' | none() | 'restarting'
+Expression has type:   'undefined' | 'restarting'
 Context expected type: {'p', pid()} | 'undefined'
     │          
 
@@ -101,7 +101,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  'undefined' | none() | 'restarting' is not compatible with {'p', pid()} | 'undefined'
+  'undefined' | 'restarting' is not compatible with {'p', pid()} | 'undefined'
   because
   'restarting' is not compatible with {'p', pid()} | 'undefined'
   because
@@ -111,30 +111,16 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     ┌─ check/src/case_predicates.erl:174:16
     │
 174 │   lists:nth(1, L).
-    │                ^
-    │                │
-    │                L.
-Expression has type:   #{dynamic() => dynamic()} | none()
+    │                ^ L.
+Expression has type:   #{dynamic() => dynamic()}
 Context expected type: [T]
-    │                
-
-Because in the expression's type:
-  Here the type is:     #{dynamic() => dynamic()}
-  Context expects type: [T]
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/case_predicates.erl:174:16
     │
 174 │   lists:nth(1, L).
-    │                ^
-    │                │
-    │                L.
-Expression has type:   #{dynamic() => dynamic()} | none()
+    │                ^ L.
+Expression has type:   #{dynamic() => dynamic()}
 Context expected type: [dynamic()]
-    │                
-
-Because in the expression's type:
-  Here the type is:     #{dynamic() => dynamic()}
-  Context expects type: [dynamic()]
 
 11 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-28.pretty
index 30ef1a7f38..9aff530657 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-28.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-28.pretty
@@ -61,7 +61,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │              ^^^^^^
     │              │
     │              {'p', X}.
-Expression has type:   {'p', none() | pid() | reference()}
+Expression has type:   {'p', pid() | reference()}
 Context expected type: {'a', atom()} | {'p', pid()}
     │              
 
@@ -74,12 +74,12 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  {'p', none() | pid() | reference()} is not compatible with {'a', atom()} | {'p', pid()}
+  {'p', pid() | reference()} is not compatible with {'a', atom()} | {'p', pid()}
   because
   at tuple index 2:
-  {'p', none() | pid() | reference()} is not compatible with {'p', pid()}
+  {'p', pid() | reference()} is not compatible with {'p', pid()}
   because
-  none() | pid() | reference() is not compatible with pid()
+  pid() | reference() is not compatible with pid()
   because
   reference() is not compatible with pid()
 
@@ -90,7 +90,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │          ^
     │          │
     │          X.
-Expression has type:   'undefined' | none() | 'restarting'
+Expression has type:   'undefined' | 'restarting'
 Context expected type: {'p', pid()} | 'undefined'
     │          
 
@@ -101,7 +101,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  'undefined' | none() | 'restarting' is not compatible with {'p', pid()} | 'undefined'
+  'undefined' | 'restarting' is not compatible with {'p', pid()} | 'undefined'
   because
   'restarting' is not compatible with {'p', pid()} | 'undefined'
   because
@@ -111,30 +111,16 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     ┌─ check/src/case_predicates.erl:174:16
     │
 174 │   lists:nth(1, L).
-    │                ^
-    │                │
-    │                L.
-Expression has type:   #{dynamic() => dynamic()} | none()
+    │                ^ L.
+Expression has type:   #{dynamic() => dynamic()}
 Context expected type: [T]
-    │                
-
-Because in the expression's type:
-  Here the type is:     #{dynamic() => dynamic()}
-  Context expects type: [T]
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/case_predicates.erl:174:16
     │
 174 │   lists:nth(1, L).
-    │                ^
-    │                │
-    │                L.
-Expression has type:   #{dynamic() => dynamic()} | none()
+    │                ^ L.
+Expression has type:   #{dynamic() => dynamic()}
 Context expected type: [dynamic()]
-    │                
-
-Because in the expression's type:
-  Here the type is:     #{dynamic() => dynamic()}
-  Context expects type: [dynamic()]
 
 11 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-26.pretty
index 92e20b1f1a..dff8969ef8 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-26.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-26.pretty
@@ -3041,7 +3041,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
      │     │
      │     lists:partition(fun, L).
-Expression has type:   {[number()], [atom() | none()]}
+Expression has type:   {[number()], [atom()]}
 Context expected type: {[atom()], [number()]}
      │     
 
@@ -3051,12 +3051,12 @@ Because in the expression's type:
       Here the type is:     number()
       Context expects type: atom()
     ]
-  , [atom() | none()]}
+  , [atom()]}
 
 ------------------------------ Detailed message ------------------------------
 
   at tuple index 1:
-  {[number()], [atom() | none()]} is not compatible with {[atom()], [number()]}
+  {[number()], [atom()]} is not compatible with {[atom()], [number()]}
   because
   [number()] is not compatible with [atom()]
   because
@@ -3069,7 +3069,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
      │     │
      │     lists:partition(fun, L).
-Expression has type:   {[{term(), number()}], [{term(), atom() | none()}]}
+Expression has type:   {[{term(), number()}], [{term(), atom()}]}
 Context expected type: {[{term(), atom()}], [{term(), number()}]}
      │     
 
@@ -3081,12 +3081,12 @@ Because in the expression's type:
         Context expects type: atom()
       }
     ]
-  , [{term(), atom() | none()}]}
+  , [{term(), atom()}]}
 
 ------------------------------ Detailed message ------------------------------
 
   at tuple index 1:
-  {[{term(), number()}], [{term(), atom() | none()}]} is not compatible with {[{term(), atom()}], [{term(), number()}]}
+  {[{term(), number()}], [{term(), atom()}]} is not compatible with {[{term(), atom()}], [{term(), number()}]}
   because
   [{term(), number()}] is not compatible with [{term(), atom()}]
   because
@@ -3198,45 +3198,24 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      ┌─ check/src/custom.erl:2709:40
      │
 2709 │             (foo, A) -> binary_to_atom(A);
-     │                                        ^
-     │                                        │
-     │                                        A.
+     │                                        ^ A.
 Expression has type:   atom()
 Context expected type: binary()
-     │                                        
-
-Because in the expression's type:
-  Here the type is:     atom()
-  Context expects type: binary()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2710:40
      │
 2710 │             (bar, B) -> atom_to_binary(B);
-     │                                        ^
-     │                                        │
-     │                                        B.
+     │                                        ^ B.
 Expression has type:   binary()
 Context expected type: atom()
-     │                                        
-
-Because in the expression's type:
-  Here the type is:     binary()
-  Context expects type: atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2711:50
      │
 2711 │             ({foo, bar}, I) -> binary_to_integer(I);
-     │                                                  ^
-     │                                                  │
-     │                                                  I.
+     │                                                  ^ I.
 Expression has type:   number()
 Context expected type: binary()
-     │                                                  
-
-Because in the expression's type:
-  Here the type is:     number()
-  Context expects type: binary()
 
 202 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty
index 92e20b1f1a..dff8969ef8 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty
@@ -3041,7 +3041,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
      │     │
      │     lists:partition(fun, L).
-Expression has type:   {[number()], [atom() | none()]}
+Expression has type:   {[number()], [atom()]}
 Context expected type: {[atom()], [number()]}
      │     
 
@@ -3051,12 +3051,12 @@ Because in the expression's type:
       Here the type is:     number()
       Context expects type: atom()
     ]
-  , [atom() | none()]}
+  , [atom()]}
 
 ------------------------------ Detailed message ------------------------------
 
   at tuple index 1:
-  {[number()], [atom() | none()]} is not compatible with {[atom()], [number()]}
+  {[number()], [atom()]} is not compatible with {[atom()], [number()]}
   because
   [number()] is not compatible with [atom()]
   because
@@ -3069,7 +3069,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
      │     │
      │     lists:partition(fun, L).
-Expression has type:   {[{term(), number()}], [{term(), atom() | none()}]}
+Expression has type:   {[{term(), number()}], [{term(), atom()}]}
 Context expected type: {[{term(), atom()}], [{term(), number()}]}
      │     
 
@@ -3081,12 +3081,12 @@ Because in the expression's type:
         Context expects type: atom()
       }
     ]
-  , [{term(), atom() | none()}]}
+  , [{term(), atom()}]}
 
 ------------------------------ Detailed message ------------------------------
 
   at tuple index 1:
-  {[{term(), number()}], [{term(), atom() | none()}]} is not compatible with {[{term(), atom()}], [{term(), number()}]}
+  {[{term(), number()}], [{term(), atom()}]} is not compatible with {[{term(), atom()}], [{term(), number()}]}
   because
   [{term(), number()}] is not compatible with [{term(), atom()}]
   because
@@ -3198,45 +3198,24 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      ┌─ check/src/custom.erl:2709:40
      │
 2709 │             (foo, A) -> binary_to_atom(A);
-     │                                        ^
-     │                                        │
-     │                                        A.
+     │                                        ^ A.
 Expression has type:   atom()
 Context expected type: binary()
-     │                                        
-
-Because in the expression's type:
-  Here the type is:     atom()
-  Context expects type: binary()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2710:40
      │
 2710 │             (bar, B) -> atom_to_binary(B);
-     │                                        ^
-     │                                        │
-     │                                        B.
+     │                                        ^ B.
 Expression has type:   binary()
 Context expected type: atom()
-     │                                        
-
-Because in the expression's type:
-  Here the type is:     binary()
-  Context expects type: atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2711:50
      │
 2711 │             ({foo, bar}, I) -> binary_to_integer(I);
-     │                                                  ^
-     │                                                  │
-     │                                                  I.
+     │                                                  ^ I.
 Expression has type:   number()
 Context expected type: binary()
-     │                                                  
-
-Because in the expression's type:
-  Here the type is:     number()
-  Context expects type: binary()
 
 202 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-28.pretty
index 6eb40f681a..3b4bf4867a 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-28.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-28.pretty
@@ -3041,7 +3041,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
      │     │
      │     lists:partition(fun, L).
-Expression has type:   {[number()], [atom() | none()]}
+Expression has type:   {[number()], [atom()]}
 Context expected type: {[atom()], [number()]}
      │     
 
@@ -3051,12 +3051,12 @@ Because in the expression's type:
       Here the type is:     number()
       Context expects type: atom()
     ]
-  , [atom() | none()]}
+  , [atom()]}
 
 ------------------------------ Detailed message ------------------------------
 
   at tuple index 1:
-  {[number()], [atom() | none()]} is not compatible with {[atom()], [number()]}
+  {[number()], [atom()]} is not compatible with {[atom()], [number()]}
   because
   [number()] is not compatible with [atom()]
   because
@@ -3069,7 +3069,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
      │     │
      │     lists:partition(fun, L).
-Expression has type:   {[{term(), number()}], [{term(), atom() | none()}]}
+Expression has type:   {[{term(), number()}], [{term(), atom()}]}
 Context expected type: {[{term(), atom()}], [{term(), number()}]}
      │     
 
@@ -3081,12 +3081,12 @@ Because in the expression's type:
         Context expects type: atom()
       }
     ]
-  , [{term(), atom() | none()}]}
+  , [{term(), atom()}]}
 
 ------------------------------ Detailed message ------------------------------
 
   at tuple index 1:
-  {[{term(), number()}], [{term(), atom() | none()}]} is not compatible with {[{term(), atom()}], [{term(), number()}]}
+  {[{term(), number()}], [{term(), atom()}]} is not compatible with {[{term(), atom()}], [{term(), number()}]}
   because
   [{term(), number()}] is not compatible with [{term(), atom()}]
   because
@@ -3198,45 +3198,24 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      ┌─ check/src/custom.erl:2709:40
      │
 2709 │             (foo, A) -> binary_to_atom(A);
-     │                                        ^
-     │                                        │
-     │                                        A.
+     │                                        ^ A.
 Expression has type:   atom()
 Context expected type: binary()
-     │                                        
-
-Because in the expression's type:
-  Here the type is:     atom()
-  Context expects type: binary()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2710:40
      │
 2710 │             (bar, B) -> atom_to_binary(B);
-     │                                        ^
-     │                                        │
-     │                                        B.
+     │                                        ^ B.
 Expression has type:   binary()
 Context expected type: atom()
-     │                                        
-
-Because in the expression's type:
-  Here the type is:     binary()
-  Context expects type: atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2711:50
      │
 2711 │             ({foo, bar}, I) -> binary_to_integer(I);
-     │                                                  ^
-     │                                                  │
-     │                                                  I.
+     │                                                  ^ I.
 Expression has type:   number()
 Context expected type: binary()
-     │                                                  
-
-Because in the expression's type:
-  Here the type is:     number()
-  Context expects type: binary()
 
 202 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-26.pretty
index 16ed8f0a82..9d7187f610 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-26.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-26.pretty
@@ -91,7 +91,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                            ^
     │                            │
     │                            D.
-Expression has type:   dynamic() | 'error' | none()
+Expression has type:   dynamic() | 'error'
 Context expected type: 'ok'
     │                            
 
@@ -102,7 +102,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  dynamic() | 'error' | none() is not compatible with 'ok'
+  dynamic() | 'error' is not compatible with 'ok'
   because
   'error' is not compatible with 'ok'
 
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-27.pretty
index 16ed8f0a82..9d7187f610 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-27.pretty
@@ -91,7 +91,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                            ^
     │                            │
     │                            D.
-Expression has type:   dynamic() | 'error' | none()
+Expression has type:   dynamic() | 'error'
 Context expected type: 'ok'
     │                            
 
@@ -102,7 +102,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  dynamic() | 'error' | none() is not compatible with 'ok'
+  dynamic() | 'error' is not compatible with 'ok'
   because
   'error' is not compatible with 'ok'
 
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-28.pretty
index 16ed8f0a82..9d7187f610 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-28.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-28.pretty
@@ -91,7 +91,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                            ^
     │                            │
     │                            D.
-Expression has type:   dynamic() | 'error' | none()
+Expression has type:   dynamic() | 'error'
 Context expected type: 'ok'
     │                            
 
@@ -102,7 +102,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  dynamic() | 'error' | none() is not compatible with 'ok'
+  dynamic() | 'error' is not compatible with 'ok'
   because
   'error' is not compatible with 'ok'
 
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-26.pretty
index 33b6c1bf38..107e1b6e30 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-26.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-26.pretty
@@ -48,13 +48,10 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    │                                         ^
    │                                         │
    │                                         T.
-Expression has type:   none() | {'b', 'c'}
+Expression has type:   {'b', 'c'}
 Context expected type: 'a' | {none()}
    │                                         
 
-Because in the expression's type:
-  Here the type is:     {'b', 'c'}
-  Context expects type: 'a' | {none()}
-  No candidate matches in the expected union.
+expected union does not contain any tuple type of size 2
 
 4 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-27.pretty
index 33b6c1bf38..107e1b6e30 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-27.pretty
@@ -48,13 +48,10 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    │                                         ^
    │                                         │
    │                                         T.
-Expression has type:   none() | {'b', 'c'}
+Expression has type:   {'b', 'c'}
 Context expected type: 'a' | {none()}
    │                                         
 
-Because in the expression's type:
-  Here the type is:     {'b', 'c'}
-  Context expects type: 'a' | {none()}
-  No candidate matches in the expected union.
+expected union does not contain any tuple type of size 2
 
 4 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-28.pretty
index 33b6c1bf38..107e1b6e30 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-28.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-28.pretty
@@ -48,13 +48,10 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    │                                         ^
    │                                         │
    │                                         T.
-Expression has type:   none() | {'b', 'c'}
+Expression has type:   {'b', 'c'}
 Context expected type: 'a' | {none()}
    │                                         
 
-Because in the expression's type:
-  Here the type is:     {'b', 'c'}
-  Context expects type: 'a' | {none()}
-  No candidate matches in the expected union.
+expected union does not contain any tuple type of size 2
 
 4 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-26.pretty
index c1dae73601..2e9f03966d 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-26.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-26.pretty
@@ -14,13 +14,13 @@ error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
    ┌─ check/src/hints.erl:32:27
    │
 32 │     eqwalizer:reveal_type(B),
-   │                           ^ none() | binary()
+   │                           ^ binary()
 
 error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
    ┌─ check/src/hints.erl:41:27
    │
 41 │     eqwalizer:reveal_type(BT),
-   │                           ^^ none() | binary() | tuple()
+   │                           ^^ binary() | tuple()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/hints.erl:47:5
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-27.pretty
index c1dae73601..2e9f03966d 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-27.pretty
@@ -14,13 +14,13 @@ error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
    ┌─ check/src/hints.erl:32:27
    │
 32 │     eqwalizer:reveal_type(B),
-   │                           ^ none() | binary()
+   │                           ^ binary()
 
 error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
    ┌─ check/src/hints.erl:41:27
    │
 41 │     eqwalizer:reveal_type(BT),
-   │                           ^^ none() | binary() | tuple()
+   │                           ^^ binary() | tuple()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/hints.erl:47:5
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-28.pretty
index c1dae73601..2e9f03966d 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-28.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-28.pretty
@@ -14,13 +14,13 @@ error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
    ┌─ check/src/hints.erl:32:27
    │
 32 │     eqwalizer:reveal_type(B),
-   │                           ^ none() | binary()
+   │                           ^ binary()
 
 error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
    ┌─ check/src/hints.erl:41:27
    │
 41 │     eqwalizer:reveal_type(BT),
-   │                           ^^ none() | binary() | tuple()
+   │                           ^^ binary() | tuple()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/hints.erl:47:5
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-26.pretty
index 20764acf15..b75aabcf84 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-26.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-26.pretty
@@ -19,4 +19,10 @@ Because in the expression's type:
   because
   term() is not compatible with #{domain => [atom()], file => file:filename(), gl => pid(), line => number(), mfa => {atom(), atom(), number()}, pid => pid(), report_cb => logger:report_cb(), time => logger:timestamp(), atom() => term()}
 
-1 ERROR
+error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
+   ┌─ check/src/other.erl:59:27
+   │
+59 │     eqwalizer:reveal_type(X),
+   │                           ^ number()
+
+2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-27.pretty
index 20764acf15..b75aabcf84 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-27.pretty
@@ -19,4 +19,10 @@ Because in the expression's type:
   because
   term() is not compatible with #{domain => [atom()], file => file:filename(), gl => pid(), line => number(), mfa => {atom(), atom(), number()}, pid => pid(), report_cb => logger:report_cb(), time => logger:timestamp(), atom() => term()}
 
-1 ERROR
+error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
+   ┌─ check/src/other.erl:59:27
+   │
+59 │     eqwalizer:reveal_type(X),
+   │                           ^ number()
+
+2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-28.pretty
index 20764acf15..b75aabcf84 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-28.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-28.pretty
@@ -19,4 +19,10 @@ Because in the expression's type:
   because
   term() is not compatible with #{domain => [atom()], file => file:filename(), gl => pid(), line => number(), mfa => {atom(), atom(), number()}, pid => pid(), report_cb => logger:report_cb(), time => logger:timestamp(), atom() => term()}
 
-1 ERROR
+error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
+   ┌─ check/src/other.erl:59:27
+   │
+59 │     eqwalizer:reveal_type(X),
+   │                           ^ number()
+
+2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-26.pretty
index 77bb4cc37d..ee4761b7d0 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-26.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-26.pretty
@@ -597,46 +597,25 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     ┌─ check/src/records.erl:536:5
     │
 536 │     Id.
-    │     ^^
-    │     │
-    │     Id.
-Expression has type:   number() | none()
+    │     ^^ Id.
+Expression has type:   number()
 Context expected type: atom()
-    │     
-
-Because in the expression's type:
-  Here the type is:     number()
-  Context expects type: atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:545:5
     │
 545 │     Rec#two_ref.a.
-    │     ^^^^^^^^^^^^^
-    │     │
-    │     ...#two_ref.a.
-Expression has type:   term() | none()
+    │     ^^^^^^^^^^^^^ ...#two_ref.a.
+Expression has type:   term()
 Context expected type: atom()
-    │     
-
-Because in the expression's type:
-  Here the type is:     term()
-  Context expects type: atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:551:5
     │
 551 │     A.
-    │     ^
-    │     │
-    │     A.
-Expression has type:   term() | none()
+    │     ^ A.
+Expression has type:   term()
 Context expected type: atom()
-    │     
-
-Because in the expression's type:
-  Here the type is:     term()
-  Context expects type: atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:557:5
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-27.pretty
index 77bb4cc37d..ee4761b7d0 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-27.pretty
@@ -597,46 +597,25 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     ┌─ check/src/records.erl:536:5
     │
 536 │     Id.
-    │     ^^
-    │     │
-    │     Id.
-Expression has type:   number() | none()
+    │     ^^ Id.
+Expression has type:   number()
 Context expected type: atom()
-    │     
-
-Because in the expression's type:
-  Here the type is:     number()
-  Context expects type: atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:545:5
     │
 545 │     Rec#two_ref.a.
-    │     ^^^^^^^^^^^^^
-    │     │
-    │     ...#two_ref.a.
-Expression has type:   term() | none()
+    │     ^^^^^^^^^^^^^ ...#two_ref.a.
+Expression has type:   term()
 Context expected type: atom()
-    │     
-
-Because in the expression's type:
-  Here the type is:     term()
-  Context expects type: atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:551:5
     │
 551 │     A.
-    │     ^
-    │     │
-    │     A.
-Expression has type:   term() | none()
+    │     ^ A.
+Expression has type:   term()
 Context expected type: atom()
-    │     
-
-Because in the expression's type:
-  Here the type is:     term()
-  Context expects type: atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:557:5
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-28.pretty
index 77bb4cc37d..ee4761b7d0 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-28.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-28.pretty
@@ -597,46 +597,25 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     ┌─ check/src/records.erl:536:5
     │
 536 │     Id.
-    │     ^^
-    │     │
-    │     Id.
-Expression has type:   number() | none()
+    │     ^^ Id.
+Expression has type:   number()
 Context expected type: atom()
-    │     
-
-Because in the expression's type:
-  Here the type is:     number()
-  Context expects type: atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:545:5
     │
 545 │     Rec#two_ref.a.
-    │     ^^^^^^^^^^^^^
-    │     │
-    │     ...#two_ref.a.
-Expression has type:   term() | none()
+    │     ^^^^^^^^^^^^^ ...#two_ref.a.
+Expression has type:   term()
 Context expected type: atom()
-    │     
-
-Because in the expression's type:
-  Here the type is:     term()
-  Context expects type: atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:551:5
     │
 551 │     A.
-    │     ^
-    │     │
-    │     A.
-Expression has type:   term() | none()
+    │     ^ A.
+Expression has type:   term()
 Context expected type: atom()
-    │     
-
-Because in the expression's type:
-  Here the type is:     term()
-  Context expects type: atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:557:5
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-26.pretty
index c41f784a80..d705840326 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-26.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-26.pretty
@@ -5,9 +5,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │       ^
     │       │
     │       B.
-Expression has type:   none() | number() | binary()
+Expression has type:   number() | binary()
 Context expected type: binary()
-    │
+    │       
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -16,7 +16,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  none() | number() | binary() is not compatible with binary()
+  number() | binary() is not compatible with binary()
   because
   number() is not compatible with binary()
 
@@ -27,9 +27,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                      ^
     │                      │
     │                      B.
-Expression has type:   none() | number() | binary()
+Expression has type:   number() | binary()
 Context expected type: binary()
-    │
+    │                      
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -38,7 +38,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  none() | number() | binary() is not compatible with binary()
+  number() | binary() is not compatible with binary()
   because
   number() is not compatible with binary()
 
@@ -49,9 +49,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │       ^
     │       │
     │       A.
-Expression has type:   none() | number() | binary()
+Expression has type:   number() | binary()
 Context expected type: binary()
-    │
+    │       
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -60,7 +60,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  none() | number() | binary() is not compatible with binary()
+  number() | binary() is not compatible with binary()
   because
   number() is not compatible with binary()
 
@@ -79,7 +79,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │             A.
 Expression has type:   #ab_rec{} | atom()
 Context expected type: atom()
-    │
+    │             
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: atom()
@@ -101,7 +101,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                A.
 Expression has type:   #ab_rec{} | atom()
 Context expected type: atom()
-    │
+    │                
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: atom()
@@ -124,14 +124,14 @@ Context expected type: number()
 
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ eqwater/src/eqwater.erl:408:1
-    │
+    │  
 408 │ ╭ get_int5({A, A})
 409 │ │   when is_atom(A) -> A.
     │ ╰──────────────────────^ Clause is not covered by spec
 
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ eqwater/src/eqwater.erl:413:1
-    │
+    │  
 413 │ ╭ get_int6({A1, A2})
 414 │ │   when is_atom(A1) and is_atom(A2) -> 1;
     │ ╰───────────────────────────────────────^ Clause is not covered by spec
@@ -145,7 +145,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                     I.
 Expression has type:   number() | atom()
 Context expected type: number()
-    │
+    │                     
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -160,7 +160,7 @@ Because in the expression's type:
 
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ eqwater/src/eqwater.erl:419:1
-    │
+    │  
 419 │ ╭ get_int7_neg({A, A})
 420 │ │   % A is none()
 421 │ │   when is_atom(A) -> 0;
@@ -175,7 +175,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                         I.
 Expression has type:   number() | atom()
 Context expected type: number()
-    │
+    │                         
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -197,7 +197,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                         I.
 Expression has type:   number() | atom()
 Context expected type: number()
-    │
+    │                         
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -214,16 +214,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     ┌─ eqwater/src/eqwater.erl:496:3
     │
 496 │   A.
-    │   ^
-    │   │
-    │   A.
-Expression has type:   atom() | none()
+    │   ^ A.
+Expression has type:   atom()
 Context expected type: binary()
-    │
-
-Because in the expression's type:
-  Here the type is:     atom()
-  Context expects type: binary()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ eqwater/src/eqwater.erl:521:22
@@ -234,10 +227,10 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                      R.
 Expression has type:   #union_field{}
 Context expected type: {'union_field', atom()}
-    │
+    │                      
 
 Because in the expression's type:
-  { 'union_field',
+  { 'union_field', 
     Here the type is:     binary()
     Context expects type: atom()
   }
@@ -245,9 +238,9 @@ Because in the expression's type:
 ------------------------------ Detailed message ------------------------------
 
   at tuple index 2:
-  {'union_field', none() | binary()} is not compatible with {'union_field', atom()}
+  {'union_field', binary()} is not compatible with {'union_field', atom()}
   because
-  none() | binary() is not compatible with atom()
+  binary() is not compatible with atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ eqwater/src/eqwater.erl:559:50
@@ -258,7 +251,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                                                  A.
 Expression has type:   number() | 'ok'
 Context expected type: number()
-    │
+    │                                                  
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -278,9 +271,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │        ^
     │        │
     │        B.
-Expression has type:   none() | #b{} | #c{}
+Expression has type:   #b{} | #c{}
 Context expected type: #b{}
-    │
+    │        
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: #b{}
@@ -289,7 +282,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  none() | #b{} | #c{} is not compatible with #b{}
+  #b{} | #c{} is not compatible with #b{}
   because
   #c{} is not compatible with #b{}
 
@@ -302,7 +295,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                           B.
 Expression has type:   A | B
 Context expected type: B
-    │
+    │                           
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: B
@@ -324,7 +317,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                 T.
 Expression has type:   fun() | {term()}
 Context expected type: {term()}
-    │
+    │                 
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: {term()}
@@ -346,7 +339,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                 A.
 Expression has type:   tuple() | atom()
 Context expected type: atom()
-    │
+    │                 
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: atom()
@@ -368,7 +361,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                  X.
 Expression has type:   #one_field{} | #two_fields1{}
 Context expected type: #one_field{}
-    │
+    │                  
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: #one_field{}
@@ -390,7 +383,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                           Y.
 Expression has type:   number() | atom()
 Context expected type: number()
-    │
+    │                           
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -434,7 +427,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │                    I.
 Expression has type:   number() | 'undefined'
 Context expected type: number()
-     │
+     │                    
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -456,7 +449,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │              [A].
 Expression has type:   [[atom()]] | [atom()]
 Context expected type: [atom()]
-     │
+     │              
 
 Because in the expression's type:
   The type is a union type with some valid candidates: [atom()]
@@ -483,7 +476,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │               [A2].
 Expression has type:   [[atom()]] | [atom()]
 Context expected type: [atom()]
-     │
+     │               
 
 Because in the expression's type:
   The type is a union type with some valid candidates: [atom()]
@@ -510,7 +503,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │       X.
 Expression has type:   binary() | string()
 Context expected type: binary()
-     │
+     │       
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -532,7 +525,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │       Y.
 Expression has type:   binary() | atom()
 Context expected type: binary()
-     │
+     │       
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -554,7 +547,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │                                                            V.
 Expression has type:   'ok' | binary()
 Context expected type: binary()
-     │
+     │                                                            
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -576,7 +569,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │                              V.
 Expression has type:   binary() | 'ok'
 Context expected type: 'ok'
-     │
+     │                              
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: 'ok'
@@ -596,9 +589,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │              ^^^^
      │              │
      │              Args.
-Expression has type:   {term(), my_list()} | none() | number()
+Expression has type:   {term(), my_list()} | number()
 Context expected type: number()
-     │
+     │              
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -607,7 +600,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  {term(), my_list()} | none() | number() is not compatible with number()
+  {term(), my_list()} | number() is not compatible with number()
   because
   {term(), my_list()} is not compatible with number()
 
@@ -628,7 +621,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │                             B.
 Expression has type:   'a' | 'b'
 Context expected type: 'b'
-     │
+     │                             
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: 'b'
@@ -645,16 +638,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      ┌─ eqwater/src/eqwater.erl:1269:5
      │
 1269 │     V.
-     │     ^
-     │     │
-     │     V.
-Expression has type:   'a' | none()
+     │     ^ V.
+Expression has type:   'a'
 Context expected type: 'b'
-     │
-
-Because in the expression's type:
-  Here the type is:     'a'
-  Context expects type: 'b'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ eqwater/src/eqwater.erl:1286:60
@@ -663,14 +649,13 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │                                                            ^
      │                                                            │
      │                                                            A.
-Expression has type:   none() | 'c'
+Expression has type:   'c'
 Context expected type: 'a' | 'b'
-     │
+     │                                                            
 
-Because in the expression's type:
-  Here the type is:     'c'
-  Context expects type: 'a' | 'b'
-  No candidate matches in the expected union.
+  'c' is not compatible with 'a' | 'b'
+  because
+  'c' is not compatible with 'a'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ eqwater/src/eqwater.erl:1291:43
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-27.pretty
index bbcdb47b23..d705840326 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-27.pretty
@@ -5,7 +5,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │       ^
     │       │
     │       B.
-Expression has type:   none() | number() | binary()
+Expression has type:   number() | binary()
 Context expected type: binary()
     │       
 
@@ -16,7 +16,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  none() | number() | binary() is not compatible with binary()
+  number() | binary() is not compatible with binary()
   because
   number() is not compatible with binary()
 
@@ -27,7 +27,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                      ^
     │                      │
     │                      B.
-Expression has type:   none() | number() | binary()
+Expression has type:   number() | binary()
 Context expected type: binary()
     │                      
 
@@ -38,7 +38,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  none() | number() | binary() is not compatible with binary()
+  number() | binary() is not compatible with binary()
   because
   number() is not compatible with binary()
 
@@ -49,7 +49,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │       ^
     │       │
     │       A.
-Expression has type:   none() | number() | binary()
+Expression has type:   number() | binary()
 Context expected type: binary()
     │       
 
@@ -60,7 +60,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  none() | number() | binary() is not compatible with binary()
+  number() | binary() is not compatible with binary()
   because
   number() is not compatible with binary()
 
@@ -214,16 +214,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     ┌─ eqwater/src/eqwater.erl:496:3
     │
 496 │   A.
-    │   ^
-    │   │
-    │   A.
-Expression has type:   atom() | none()
+    │   ^ A.
+Expression has type:   atom()
 Context expected type: binary()
-    │   
-
-Because in the expression's type:
-  Here the type is:     atom()
-  Context expects type: binary()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ eqwater/src/eqwater.erl:521:22
@@ -245,9 +238,9 @@ Because in the expression's type:
 ------------------------------ Detailed message ------------------------------
 
   at tuple index 2:
-  {'union_field', none() | binary()} is not compatible with {'union_field', atom()}
+  {'union_field', binary()} is not compatible with {'union_field', atom()}
   because
-  none() | binary() is not compatible with atom()
+  binary() is not compatible with atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ eqwater/src/eqwater.erl:559:50
@@ -278,7 +271,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │        ^
     │        │
     │        B.
-Expression has type:   none() | #b{} | #c{}
+Expression has type:   #b{} | #c{}
 Context expected type: #b{}
     │        
 
@@ -289,7 +282,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  none() | #b{} | #c{} is not compatible with #b{}
+  #b{} | #c{} is not compatible with #b{}
   because
   #c{} is not compatible with #b{}
 
@@ -596,7 +589,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │              ^^^^
      │              │
      │              Args.
-Expression has type:   {term(), my_list()} | none() | number()
+Expression has type:   {term(), my_list()} | number()
 Context expected type: number()
      │              
 
@@ -607,7 +600,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  {term(), my_list()} | none() | number() is not compatible with number()
+  {term(), my_list()} | number() is not compatible with number()
   because
   {term(), my_list()} is not compatible with number()
 
@@ -645,16 +638,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      ┌─ eqwater/src/eqwater.erl:1269:5
      │
 1269 │     V.
-     │     ^
-     │     │
-     │     V.
-Expression has type:   'a' | none()
+     │     ^ V.
+Expression has type:   'a'
 Context expected type: 'b'
-     │     
-
-Because in the expression's type:
-  Here the type is:     'a'
-  Context expects type: 'b'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ eqwater/src/eqwater.erl:1286:60
@@ -663,14 +649,13 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │                                                            ^
      │                                                            │
      │                                                            A.
-Expression has type:   none() | 'c'
+Expression has type:   'c'
 Context expected type: 'a' | 'b'
      │                                                            
 
-Because in the expression's type:
-  Here the type is:     'c'
-  Context expects type: 'a' | 'b'
-  No candidate matches in the expected union.
+  'c' is not compatible with 'a' | 'b'
+  because
+  'c' is not compatible with 'a'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ eqwater/src/eqwater.erl:1291:43
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-28.pretty
index c41f784a80..d705840326 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-28.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-28.pretty
@@ -5,9 +5,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │       ^
     │       │
     │       B.
-Expression has type:   none() | number() | binary()
+Expression has type:   number() | binary()
 Context expected type: binary()
-    │
+    │       
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -16,7 +16,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  none() | number() | binary() is not compatible with binary()
+  number() | binary() is not compatible with binary()
   because
   number() is not compatible with binary()
 
@@ -27,9 +27,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                      ^
     │                      │
     │                      B.
-Expression has type:   none() | number() | binary()
+Expression has type:   number() | binary()
 Context expected type: binary()
-    │
+    │                      
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -38,7 +38,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  none() | number() | binary() is not compatible with binary()
+  number() | binary() is not compatible with binary()
   because
   number() is not compatible with binary()
 
@@ -49,9 +49,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │       ^
     │       │
     │       A.
-Expression has type:   none() | number() | binary()
+Expression has type:   number() | binary()
 Context expected type: binary()
-    │
+    │       
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -60,7 +60,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  none() | number() | binary() is not compatible with binary()
+  number() | binary() is not compatible with binary()
   because
   number() is not compatible with binary()
 
@@ -79,7 +79,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │             A.
 Expression has type:   #ab_rec{} | atom()
 Context expected type: atom()
-    │
+    │             
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: atom()
@@ -101,7 +101,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                A.
 Expression has type:   #ab_rec{} | atom()
 Context expected type: atom()
-    │
+    │                
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: atom()
@@ -124,14 +124,14 @@ Context expected type: number()
 
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ eqwater/src/eqwater.erl:408:1
-    │
+    │  
 408 │ ╭ get_int5({A, A})
 409 │ │   when is_atom(A) -> A.
     │ ╰──────────────────────^ Clause is not covered by spec
 
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ eqwater/src/eqwater.erl:413:1
-    │
+    │  
 413 │ ╭ get_int6({A1, A2})
 414 │ │   when is_atom(A1) and is_atom(A2) -> 1;
     │ ╰───────────────────────────────────────^ Clause is not covered by spec
@@ -145,7 +145,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                     I.
 Expression has type:   number() | atom()
 Context expected type: number()
-    │
+    │                     
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -160,7 +160,7 @@ Because in the expression's type:
 
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ eqwater/src/eqwater.erl:419:1
-    │
+    │  
 419 │ ╭ get_int7_neg({A, A})
 420 │ │   % A is none()
 421 │ │   when is_atom(A) -> 0;
@@ -175,7 +175,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                         I.
 Expression has type:   number() | atom()
 Context expected type: number()
-    │
+    │                         
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -197,7 +197,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                         I.
 Expression has type:   number() | atom()
 Context expected type: number()
-    │
+    │                         
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -214,16 +214,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     ┌─ eqwater/src/eqwater.erl:496:3
     │
 496 │   A.
-    │   ^
-    │   │
-    │   A.
-Expression has type:   atom() | none()
+    │   ^ A.
+Expression has type:   atom()
 Context expected type: binary()
-    │
-
-Because in the expression's type:
-  Here the type is:     atom()
-  Context expects type: binary()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ eqwater/src/eqwater.erl:521:22
@@ -234,10 +227,10 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                      R.
 Expression has type:   #union_field{}
 Context expected type: {'union_field', atom()}
-    │
+    │                      
 
 Because in the expression's type:
-  { 'union_field',
+  { 'union_field', 
     Here the type is:     binary()
     Context expects type: atom()
   }
@@ -245,9 +238,9 @@ Because in the expression's type:
 ------------------------------ Detailed message ------------------------------
 
   at tuple index 2:
-  {'union_field', none() | binary()} is not compatible with {'union_field', atom()}
+  {'union_field', binary()} is not compatible with {'union_field', atom()}
   because
-  none() | binary() is not compatible with atom()
+  binary() is not compatible with atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ eqwater/src/eqwater.erl:559:50
@@ -258,7 +251,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                                                  A.
 Expression has type:   number() | 'ok'
 Context expected type: number()
-    │
+    │                                                  
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -278,9 +271,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │        ^
     │        │
     │        B.
-Expression has type:   none() | #b{} | #c{}
+Expression has type:   #b{} | #c{}
 Context expected type: #b{}
-    │
+    │        
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: #b{}
@@ -289,7 +282,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  none() | #b{} | #c{} is not compatible with #b{}
+  #b{} | #c{} is not compatible with #b{}
   because
   #c{} is not compatible with #b{}
 
@@ -302,7 +295,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                           B.
 Expression has type:   A | B
 Context expected type: B
-    │
+    │                           
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: B
@@ -324,7 +317,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                 T.
 Expression has type:   fun() | {term()}
 Context expected type: {term()}
-    │
+    │                 
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: {term()}
@@ -346,7 +339,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                 A.
 Expression has type:   tuple() | atom()
 Context expected type: atom()
-    │
+    │                 
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: atom()
@@ -368,7 +361,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                  X.
 Expression has type:   #one_field{} | #two_fields1{}
 Context expected type: #one_field{}
-    │
+    │                  
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: #one_field{}
@@ -390,7 +383,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                           Y.
 Expression has type:   number() | atom()
 Context expected type: number()
-    │
+    │                           
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -434,7 +427,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │                    I.
 Expression has type:   number() | 'undefined'
 Context expected type: number()
-     │
+     │                    
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -456,7 +449,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │              [A].
 Expression has type:   [[atom()]] | [atom()]
 Context expected type: [atom()]
-     │
+     │              
 
 Because in the expression's type:
   The type is a union type with some valid candidates: [atom()]
@@ -483,7 +476,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │               [A2].
 Expression has type:   [[atom()]] | [atom()]
 Context expected type: [atom()]
-     │
+     │               
 
 Because in the expression's type:
   The type is a union type with some valid candidates: [atom()]
@@ -510,7 +503,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │       X.
 Expression has type:   binary() | string()
 Context expected type: binary()
-     │
+     │       
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -532,7 +525,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │       Y.
 Expression has type:   binary() | atom()
 Context expected type: binary()
-     │
+     │       
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -554,7 +547,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │                                                            V.
 Expression has type:   'ok' | binary()
 Context expected type: binary()
-     │
+     │                                                            
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: binary()
@@ -576,7 +569,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │                              V.
 Expression has type:   binary() | 'ok'
 Context expected type: 'ok'
-     │
+     │                              
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: 'ok'
@@ -596,9 +589,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │              ^^^^
      │              │
      │              Args.
-Expression has type:   {term(), my_list()} | none() | number()
+Expression has type:   {term(), my_list()} | number()
 Context expected type: number()
-     │
+     │              
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: number()
@@ -607,7 +600,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  {term(), my_list()} | none() | number() is not compatible with number()
+  {term(), my_list()} | number() is not compatible with number()
   because
   {term(), my_list()} is not compatible with number()
 
@@ -628,7 +621,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │                             B.
 Expression has type:   'a' | 'b'
 Context expected type: 'b'
-     │
+     │                             
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: 'b'
@@ -645,16 +638,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      ┌─ eqwater/src/eqwater.erl:1269:5
      │
 1269 │     V.
-     │     ^
-     │     │
-     │     V.
-Expression has type:   'a' | none()
+     │     ^ V.
+Expression has type:   'a'
 Context expected type: 'b'
-     │
-
-Because in the expression's type:
-  Here the type is:     'a'
-  Context expects type: 'b'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ eqwater/src/eqwater.erl:1286:60
@@ -663,14 +649,13 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      │                                                            ^
      │                                                            │
      │                                                            A.
-Expression has type:   none() | 'c'
+Expression has type:   'c'
 Context expected type: 'a' | 'b'
-     │
+     │                                                            
 
-Because in the expression's type:
-  Here the type is:     'c'
-  Context expects type: 'a' | 'b'
-  No candidate matches in the expected union.
+  'c' is not compatible with 'a' | 'b'
+  because
+  'c' is not compatible with 'a'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ eqwater/src/eqwater.erl:1291:43
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-26.pretty
index b505f94dee..c5cd5a3b25 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-26.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-26.pretty
@@ -48,7 +48,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    │                       ^
    │                       │
    │                       A.
-Expression has type:   none() | atom() | []
+Expression has type:   atom() | []
 Context expected type: atom()
    │                       
 
@@ -59,7 +59,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  none() | atom() | [] is not compatible with atom()
+  atom() | [] is not compatible with atom()
   because
   [] is not compatible with atom()
 
@@ -70,7 +70,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    │                   ^
    │                   │
    │                   A.
-Expression has type:   none() | atom() | []
+Expression has type:   atom() | []
 Context expected type: atom()
    │                   
 
@@ -81,7 +81,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  none() | atom() | [] is not compatible with atom()
+  atom() | [] is not compatible with atom()
   because
   [] is not compatible with atom()
 
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-27.pretty
index b505f94dee..c5cd5a3b25 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-27.pretty
@@ -48,7 +48,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    │                       ^
    │                       │
    │                       A.
-Expression has type:   none() | atom() | []
+Expression has type:   atom() | []
 Context expected type: atom()
    │                       
 
@@ -59,7 +59,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  none() | atom() | [] is not compatible with atom()
+  atom() | [] is not compatible with atom()
   because
   [] is not compatible with atom()
 
@@ -70,7 +70,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    │                   ^
    │                   │
    │                   A.
-Expression has type:   none() | atom() | []
+Expression has type:   atom() | []
 Context expected type: atom()
    │                   
 
@@ -81,7 +81,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  none() | atom() | [] is not compatible with atom()
+  atom() | [] is not compatible with atom()
   because
   [] is not compatible with atom()
 
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-28.pretty
index b505f94dee..c5cd5a3b25 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-28.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-28.pretty
@@ -48,7 +48,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    │                       ^
    │                       │
    │                       A.
-Expression has type:   none() | atom() | []
+Expression has type:   atom() | []
 Context expected type: atom()
    │                       
 
@@ -59,7 +59,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  none() | atom() | [] is not compatible with atom()
+  atom() | [] is not compatible with atom()
   because
   [] is not compatible with atom()
 
@@ -70,7 +70,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    │                   ^
    │                   │
    │                   A.
-Expression has type:   none() | atom() | []
+Expression has type:   atom() | []
 Context expected type: atom()
    │                   
 
@@ -81,7 +81,7 @@ Because in the expression's type:
 
 ------------------------------ Detailed message ------------------------------
 
-  none() | atom() | [] is not compatible with atom()
+  atom() | [] is not compatible with atom()
   because
   [] is not compatible with atom()
 
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-26.pretty
index 0b5e330414..847411f766 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-26.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-26.pretty
@@ -67,7 +67,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    │                      ^
    │                      │
    │                      M.
-Expression has type:   none() | #{c := number()}
+Expression has type:   #{c := number()}
 Context expected type: #{b := number()}
    │                      
 
@@ -76,6 +76,10 @@ Because in the expression's type:
   Context expects type: #{b := ..., ...}
   The type of the expression is missing the following required keys: b.
 
+------------------------------ Detailed message ------------------------------
+
+key `b` is declared as required in the latter but not in the former
+
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ eqwater/src/eqwater_maps.erl:55:34
    │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-27.pretty
index 0b5e330414..847411f766 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-27.pretty
@@ -67,7 +67,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    │                      ^
    │                      │
    │                      M.
-Expression has type:   none() | #{c := number()}
+Expression has type:   #{c := number()}
 Context expected type: #{b := number()}
    │                      
 
@@ -76,6 +76,10 @@ Because in the expression's type:
   Context expects type: #{b := ..., ...}
   The type of the expression is missing the following required keys: b.
 
+------------------------------ Detailed message ------------------------------
+
+key `b` is declared as required in the latter but not in the former
+
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ eqwater/src/eqwater_maps.erl:55:34
    │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-28.pretty
index 0b5e330414..847411f766 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-28.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-28.pretty
@@ -67,7 +67,7 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    │                      ^
    │                      │
    │                      M.
-Expression has type:   none() | #{c := number()}
+Expression has type:   #{c := number()}
 Context expected type: #{b := number()}
    │                      
 
@@ -76,6 +76,10 @@ Because in the expression's type:
   Context expects type: #{b := ..., ...}
   The type of the expression is missing the following required keys: b.
 
+------------------------------ Detailed message ------------------------------
+
+key `b` is declared as required in the latter but not in the former
+
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ eqwater/src/eqwater_maps.erl:55:34
    │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-26.pretty
index 7e7da4fad6..803ac23f35 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-26.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-26.pretty
@@ -18,16 +18,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    ┌─ fault_tolerance/src/fault_tolerance.erl:32:3
    │
 32 │   A.
-   │   ^
-   │   │
-   │   A.
-Expression has type:   'false' | none()
+   │   ^ A.
+Expression has type:   'false'
 Context expected type: number()
-   │   
-
-Because in the expression's type:
-  Here the type is:     'false'
-  Context expects type: number()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ fault_tolerance/src/fault_tolerance.erl:37:3
@@ -41,16 +34,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    ┌─ fault_tolerance/src/fault_tolerance.erl:39:3
    │
 39 │   A.
-   │   ^
-   │   │
-   │   A.
-Expression has type:   'false' | none()
+   │   ^ A.
+Expression has type:   'false'
 Context expected type: number()
-   │   
-
-Because in the expression's type:
-  Here the type is:     'false'
-  Context expects type: number()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ fault_tolerance/src/fault_tolerance.erl:44:3
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-27.pretty
index 7e7da4fad6..803ac23f35 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-27.pretty
@@ -18,16 +18,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    ┌─ fault_tolerance/src/fault_tolerance.erl:32:3
    │
 32 │   A.
-   │   ^
-   │   │
-   │   A.
-Expression has type:   'false' | none()
+   │   ^ A.
+Expression has type:   'false'
 Context expected type: number()
-   │   
-
-Because in the expression's type:
-  Here the type is:     'false'
-  Context expects type: number()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ fault_tolerance/src/fault_tolerance.erl:37:3
@@ -41,16 +34,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    ┌─ fault_tolerance/src/fault_tolerance.erl:39:3
    │
 39 │   A.
-   │   ^
-   │   │
-   │   A.
-Expression has type:   'false' | none()
+   │   ^ A.
+Expression has type:   'false'
 Context expected type: number()
-   │   
-
-Because in the expression's type:
-  Here the type is:     'false'
-  Context expects type: number()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ fault_tolerance/src/fault_tolerance.erl:44:3
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-28.pretty
index 7e7da4fad6..803ac23f35 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-28.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-28.pretty
@@ -18,16 +18,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    ┌─ fault_tolerance/src/fault_tolerance.erl:32:3
    │
 32 │   A.
-   │   ^
-   │   │
-   │   A.
-Expression has type:   'false' | none()
+   │   ^ A.
+Expression has type:   'false'
 Context expected type: number()
-   │   
-
-Because in the expression's type:
-  Here the type is:     'false'
-  Context expects type: number()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ fault_tolerance/src/fault_tolerance.erl:37:3
@@ -41,16 +34,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    ┌─ fault_tolerance/src/fault_tolerance.erl:39:3
    │
 39 │   A.
-   │   ^
-   │   │
-   │   A.
-Expression has type:   'false' | none()
+   │   ^ A.
+Expression has type:   'false'
 Context expected type: number()
-   │   
-
-Because in the expression's type:
-  Here the type is:     'false'
-  Context expects type: number()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ fault_tolerance/src/fault_tolerance.erl:44:3
diff --git a/crates/elp/src/resources/test/standard/eqwalize_all_bail_on_error_failure.pretty b/crates/elp/src/resources/test/standard/eqwalize_all_bail_on_error_failure.pretty
index fc5bc27296..08361b2a89 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_all_bail_on_error_failure.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_all_bail_on_error_failure.pretty
@@ -184,6 +184,8 @@ Because in the expression's type:
   [term()] is not compatible with [T | X]
   because
   term() is not compatible with T | X
+  because
+  term() is not compatible with T
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ app_a/src/app_a_lists.erl:1305:15
diff --git a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.jsonl b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.jsonl
index 89db77919f..536452ef3a 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.jsonl
+++ b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.jsonl
@@ -12,7 +12,7 @@
 {"path":"app_a/src/app_a_lists.erl","line":595,"char":29,"code":"ELP","severity":"error","name":"eqWAlizer: recursive_constraint","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nRecursive constraint: DeepList\n```\n\n> [docs on `recursive_constraint`](https://fb.me/eqwalizer_errors#recursive_constraint)","docPath":null}
 {"path":"app_a/src/app_a_lists.erl","line":613,"char":29,"code":"ELP","severity":"error","name":"eqWAlizer: recursive_constraint","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nRecursive constraint: DeepList\n```\n\n> [docs on `recursive_constraint`](https://fb.me/eqwalizer_errors#recursive_constraint)","docPath":null}
 {"path":"app_a/src/app_a_lists.erl","line":1114,"char":36,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"H3","replacement":null,"description":"```lang=error,counterexample\n`H3`.\n\nExpression has type:   term()\nContext expected type: [term()]\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
-{"path":"app_a/src/app_a_lists.erl","line":1305,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"filtermap(F, L)","replacement":null,"description":"```lang=error,counterexample\n`filtermap(F, L)`.\n\nExpression has type:   [term()]\nContext expected type: [T | X]\n```\n```\nBecause in the expression's type:\n  [\n    Here the type is:     term()\n    Context expects type: T | X\n    No candidate matches in the expected union.\n  ]\n\n------------------------------ Detailed message ------------------------------\n\n  [term()] is not compatible with [T | X]\n  because\n  term() is not compatible with T | X\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a_lists.erl","line":1305,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"filtermap(F, L)","replacement":null,"description":"```lang=error,counterexample\n`filtermap(F, L)`.\n\nExpression has type:   [term()]\nContext expected type: [T | X]\n```\n```\nBecause in the expression's type:\n  [\n    Here the type is:     term()\n    Context expects type: T | X\n    No candidate matches in the expected union.\n  ]\n\n------------------------------ Detailed message ------------------------------\n\n  [term()] is not compatible with [T | X]\n  because\n  term() is not compatible with T | X\n  because\n  term() is not compatible with T\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/src/app_a_lists.erl","line":1305,"char":15,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"F","replacement":null,"description":"```lang=error,counterexample\n`F`.\n\nExpression has type:   fun((T) -> boolean() | {'true', X})\nContext expected type: fun((term()) -> boolean() | {'true', term()})\n```\n```\nBecause in the expression's type:\n  fun((\n    Here the type is:     term()\n    Context expects type: T\n  ) -> boolean() | {'true', X})\n\n------------------------------ Detailed message ------------------------------\n\n  fun((T) -> boolean() | {'true', X}) is not compatible with fun((term()) -> boolean() | {'true', term()})\n  because\n  term() is not compatible with T\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/src/app_a_mod2.erl","line":22,"char":1,"code":"ELP","severity":"error","name":"eqWAlizer: type_alias_is_non_productive","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nrecursive type invalid/0 is not productive\n```\n\n> [docs on `type_alias_is_non_productive`](https://fb.me/eqwalizer_errors#type_alias_is_non_productive)","docPath":null}
 {"path":"app_a/src/app_a_mod2.erl","line":31,"char":9,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
diff --git a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.pretty b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.pretty
index fc5bc27296..08361b2a89 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.pretty
@@ -184,6 +184,8 @@ Because in the expression's type:
   [term()] is not compatible with [T | X]
   because
   term() is not compatible with T | X
+  because
+  term() is not compatible with T
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ app_a/src/app_a_lists.erl:1305:15
diff --git a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics_gen.jsonl b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics_gen.jsonl
index 89db77919f..536452ef3a 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics_gen.jsonl
+++ b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics_gen.jsonl
@@ -12,7 +12,7 @@
 {"path":"app_a/src/app_a_lists.erl","line":595,"char":29,"code":"ELP","severity":"error","name":"eqWAlizer: recursive_constraint","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nRecursive constraint: DeepList\n```\n\n> [docs on `recursive_constraint`](https://fb.me/eqwalizer_errors#recursive_constraint)","docPath":null}
 {"path":"app_a/src/app_a_lists.erl","line":613,"char":29,"code":"ELP","severity":"error","name":"eqWAlizer: recursive_constraint","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nRecursive constraint: DeepList\n```\n\n> [docs on `recursive_constraint`](https://fb.me/eqwalizer_errors#recursive_constraint)","docPath":null}
 {"path":"app_a/src/app_a_lists.erl","line":1114,"char":36,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"H3","replacement":null,"description":"```lang=error,counterexample\n`H3`.\n\nExpression has type:   term()\nContext expected type: [term()]\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
-{"path":"app_a/src/app_a_lists.erl","line":1305,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"filtermap(F, L)","replacement":null,"description":"```lang=error,counterexample\n`filtermap(F, L)`.\n\nExpression has type:   [term()]\nContext expected type: [T | X]\n```\n```\nBecause in the expression's type:\n  [\n    Here the type is:     term()\n    Context expects type: T | X\n    No candidate matches in the expected union.\n  ]\n\n------------------------------ Detailed message ------------------------------\n\n  [term()] is not compatible with [T | X]\n  because\n  term() is not compatible with T | X\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a_lists.erl","line":1305,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"filtermap(F, L)","replacement":null,"description":"```lang=error,counterexample\n`filtermap(F, L)`.\n\nExpression has type:   [term()]\nContext expected type: [T | X]\n```\n```\nBecause in the expression's type:\n  [\n    Here the type is:     term()\n    Context expects type: T | X\n    No candidate matches in the expected union.\n  ]\n\n------------------------------ Detailed message ------------------------------\n\n  [term()] is not compatible with [T | X]\n  because\n  term() is not compatible with T | X\n  because\n  term() is not compatible with T\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/src/app_a_lists.erl","line":1305,"char":15,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"F","replacement":null,"description":"```lang=error,counterexample\n`F`.\n\nExpression has type:   fun((T) -> boolean() | {'true', X})\nContext expected type: fun((term()) -> boolean() | {'true', term()})\n```\n```\nBecause in the expression's type:\n  fun((\n    Here the type is:     term()\n    Context expects type: T\n  ) -> boolean() | {'true', X})\n\n------------------------------ Detailed message ------------------------------\n\n  fun((T) -> boolean() | {'true', X}) is not compatible with fun((term()) -> boolean() | {'true', term()})\n  because\n  term() is not compatible with T\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/src/app_a_mod2.erl","line":22,"char":1,"code":"ELP","severity":"error","name":"eqWAlizer: type_alias_is_non_productive","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nrecursive type invalid/0 is not productive\n```\n\n> [docs on `type_alias_is_non_productive`](https://fb.me/eqwalizer_errors#type_alias_is_non_productive)","docPath":null}
 {"path":"app_a/src/app_a_mod2.erl","line":31,"char":9,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
diff --git a/crates/elp/src/resources/test/standard/eqwalize_app_a_lists_fast.pretty b/crates/elp/src/resources/test/standard/eqwalize_app_a_lists_fast.pretty
index 6bb5a7421b..f61a47edfe 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_app_a_lists_fast.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_app_a_lists_fast.pretty
@@ -55,6 +55,8 @@ Because in the expression's type:
   [term()] is not compatible with [T | X]
   because
   term() is not compatible with T | X
+  because
+  term() is not compatible with T
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ app_a/src/app_a_lists.erl:1305:15
diff --git a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics.pretty b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics.pretty
index 5aba82bc71..472665ffe8 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics.pretty
@@ -176,6 +176,8 @@ Because in the expression's type:
   [term()] is not compatible with [T | X]
   because
   term() is not compatible with T | X
+  because
+  term() is not compatible with T
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ app_a/src/app_a_lists.erl:1305:15
diff --git a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen.pretty b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen.pretty
index 5aba82bc71..472665ffe8 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen.pretty
@@ -176,6 +176,8 @@ Because in the expression's type:
   [term()] is not compatible with [T | X]
   because
   term() is not compatible with T | X
+  because
+  term() is not compatible with T
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ app_a/src/app_a_lists.erl:1305:15
diff --git a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen_rebar.pretty b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen_rebar.pretty
index b72b8d1178..6782313a4a 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen_rebar.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen_rebar.pretty
@@ -184,6 +184,8 @@ Because in the expression's type:
   [term()] is not compatible with [T | X]
   because
   term() is not compatible with T | X
+  because
+  term() is not compatible with T
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ app_a/src/app_a_lists.erl:1305:15
diff --git a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_rebar.pretty b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_rebar.pretty
index b72b8d1178..6782313a4a 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_rebar.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_rebar.pretty
@@ -184,6 +184,8 @@ Because in the expression's type:
   [term()] is not compatible with [T | X]
   because
   term() is not compatible with T | X
+  because
+  term() is not compatible with T
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ app_a/src/app_a_lists.erl:1305:15
diff --git a/crates/elp/src/resources/test/standard/eqwalize_target_diagnostics.pretty b/crates/elp/src/resources/test/standard/eqwalize_target_diagnostics.pretty
index 5aba82bc71..472665ffe8 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_target_diagnostics.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_target_diagnostics.pretty
@@ -176,6 +176,8 @@ Because in the expression's type:
   [term()] is not compatible with [T | X]
   because
   term() is not compatible with T | X
+  because
+  term() is not compatible with T
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ app_a/src/app_a_lists.erl:1305:15
diff --git a/crates/eqwalizer/src/ast/convert_types.rs b/crates/eqwalizer/src/ast/convert_types.rs
index e097e1a028..ccfc635cdc 100644
--- a/crates/eqwalizer/src/ast/convert_types.rs
+++ b/crates/eqwalizer/src/ast/convert_types.rs
@@ -258,9 +258,15 @@ impl TypeConverter {
             ExtType::ListExtType(ty) => Ok(self
                 .convert_type(sub, *ty.t)?
                 .map(|t| Type::ListType(ListType { t: Box::new(t) }))),
-            ExtType::UnionExtType(tys) => Ok(self
-                .convert_types(sub, tys.tys)?
-                .map(|tys| Type::UnionType(UnionType { tys }))),
+            // unions with NoneType are meaningless, we can remove them early
+            ExtType::UnionExtType(tys) => Ok(self.convert_types(sub, tys.tys)?.map(|mut tys| {
+                tys.retain(|ty| *ty != Type::NoneType);
+                match tys.len() {
+                    0 => Type::NoneType,
+                    1 => tys.into_iter().next().unwrap(),
+                    _ => Type::UnionType(UnionType { tys }),
+                }
+            })),
             ExtType::RemoteExtType(ty)
                 if ty.id.module == "eqwalizer"
                     && ty.id.name == "refinable"
diff --git a/test_projects/eqwalizer_tests/check/src/other.erl b/test_projects/eqwalizer_tests/check/src/other.erl
index edb0c04186..7ac109e673 100644
--- a/test_projects/eqwalizer_tests/check/src/other.erl
+++ b/test_projects/eqwalizer_tests/check/src/other.erl
@@ -52,3 +52,9 @@ elab_var_scope(_) ->
 
 -spec map_with_dup_keys(#{ak => av1, bk => bv1, ak => av2}) -> #{ak => av1, bk => bv1}.
 map_with_dup_keys(M) -> M.
+
+% none() unions are simplified from literals too
+-spec with_none(integer() | none()) -> ok.
+with_none(X) ->
+    eqwalizer:reveal_type(X),
+    ok.

From 61af236b7fa884a267ae2dba2a00034d77693357 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 27 Oct 2025 06:18:14 -0700
Subject: [PATCH 204/394] Have the create_dynamic_call_patterns function take
 patterns as an input

Summary: Take the patterns as a (mutable) input.

Reviewed By: alanz

Differential Revision: D85553374

fbshipit-source-id: a3185c3d0ffabc5af042fe88324cec6f79860462
---
 crates/hir/src/sema/to_def.rs | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/crates/hir/src/sema/to_def.rs b/crates/hir/src/sema/to_def.rs
index fcefa17929..7e8859ac00 100644
--- a/crates/hir/src/sema/to_def.rs
+++ b/crates/hir/src/sema/to_def.rs
@@ -815,9 +815,7 @@ macro_rules! add_patterns {
     };
 }
 
-fn create_dynamic_call_patterns() -> FxHashMap<PatternKey, DynamicCallPattern> {
-    let mut patterns = FxHashMap::default();
-
+fn add_dynamic_call_patterns(patterns: &mut FxHashMap<PatternKey, DynamicCallPattern>) {
     // Each entry follows the format:
     //
     // (module, function, arity, module_arg_index, function_arg_index, args_list_index, direct_arity)
@@ -884,14 +882,15 @@ fn create_dynamic_call_patterns() -> FxHashMap<PatternKey, DynamicCallPattern> {
             (Some("erpc"), "send_request", 6, Some(1), 2, 3, false),
         ]
     );
-
-    patterns
 }
 
 // Lazy static initialization for the patterns map
 lazy_static! {
-    static ref DYNAMIC_CALL_PATTERNS: FxHashMap<PatternKey, DynamicCallPattern> =
-        create_dynamic_call_patterns();
+    static ref DYNAMIC_CALL_PATTERNS: FxHashMap<PatternKey, DynamicCallPattern> = {
+        let mut patterns = FxHashMap::default();
+        add_dynamic_call_patterns(&mut patterns);
+        patterns
+    };
 }
 
 fn get_dynamic_call_patterns() -> &'static FxHashMap<PatternKey, DynamicCallPattern> {

From b39d8f0486eb5a73dc3e66102fcccb27b72a8082 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 27 Oct 2025 06:18:14 -0700
Subject: [PATCH 205/394] Allow meta-only dynamic call patterns

Reviewed By: alanz

Differential Revision: D85553363

fbshipit-source-id: 8349945a9f8a5732fb8a2ea2a930bc2c1a2ada18
---
 crates/hir/src/sema/to_def.rs |  14 +--
 crates/ide/src/rename.rs      | 184 +++++++++++++++++-----------------
 2 files changed, 100 insertions(+), 98 deletions(-)

diff --git a/crates/hir/src/sema/to_def.rs b/crates/hir/src/sema/to_def.rs
index 7e8859ac00..5918054fc5 100644
--- a/crates/hir/src/sema/to_def.rs
+++ b/crates/hir/src/sema/to_def.rs
@@ -786,19 +786,20 @@ use lazy_static::lazy_static;
 
 /// Pattern for matching dynamic call expressions (apply, rpc calls, etc.)
 #[derive(Debug, Clone)]
-struct DynamicCallPattern {
+pub(crate) struct DynamicCallPattern {
     /// Index of the target module argument (None when target function is in same module)
-    module_arg_index: Option<usize>,
+    pub(crate) module_arg_index: Option<usize>,
     /// Index of the target function argument
-    function_arg_index: usize,
+    pub(crate) function_arg_index: usize,
     /// Index of the arguments list or arity argument
-    args_list_index: usize,
+    pub(crate) args_list_index: usize,
     /// Whether to extract arity directly from an integer argument (true) or from list length (false)
-    direct_arity: bool,
+    pub(crate) direct_arity: bool,
 }
 
-type PatternKey = (Option<&'static str>, &'static str, usize);
+pub(crate) type PatternKey = (Option<&'static str>, &'static str, usize);
 
+#[macro_export]
 macro_rules! add_patterns {
     ($patterns:ident, [$(($module:expr, $func:literal, $arity:literal, $module_idx:expr, $func_idx:literal, $args_idx:literal, $direct:expr)),* $(,)?]) => {
         $(
@@ -889,6 +890,7 @@ lazy_static! {
     static ref DYNAMIC_CALL_PATTERNS: FxHashMap<PatternKey, DynamicCallPattern> = {
         let mut patterns = FxHashMap::default();
         add_dynamic_call_patterns(&mut patterns);
+        // @fb-only
         patterns
     };
 }
diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index 23e9ceca89..2642aed015 100644
--- a/crates/ide/src/rename.rs
+++ b/crates/ide/src/rename.rs
@@ -171,7 +171,7 @@ pub fn rename_var(
 }
 
 #[cfg(test)]
-mod tests {
+pub(crate) mod tests {
     use elp_ide_db::RootDatabase;
     use elp_ide_db::elp_base_db::assert_eq_text;
     use elp_ide_db::elp_base_db::fixture::WithFixture as _;
@@ -188,7 +188,7 @@ mod tests {
     use crate::fixture;
 
     #[track_caller]
-    fn check(new_name: &str, fixture_before: &str, fixture_after_str: &str) {
+    pub(crate) fn check_rename(new_name: &str, fixture_before: &str, fixture_after_str: &str) {
         let fixture_after_str = &trim_indent(fixture_after_str);
         let analysis_after = fixture::multi_file(fixture_after_str);
 
@@ -227,12 +227,12 @@ mod tests {
 
     #[test]
     fn test_rename_var_1() {
-        check("Y", r#"main() -> I~ = 1."#, r#"main() -> Y = 1."#);
+        check_rename("Y", r#"main() -> I~ = 1."#, r#"main() -> Y = 1."#);
     }
 
     #[test]
     fn test_rename_var_2() {
-        check(
+        check_rename(
             "Y",
             r#"main() ->
                    I~ = 1,
@@ -245,7 +245,7 @@ mod tests {
 
     #[test]
     fn test_rename_var_3() {
-        check(
+        check_rename(
             "Y",
             r#"main(X) ->
                    case X of
@@ -264,7 +264,7 @@ mod tests {
 
     #[test]
     fn test_rename_var_4() {
-        check(
+        check_rename(
             "Y",
             r#"testz() ->
                    case rand:uniform(2) of
@@ -291,7 +291,7 @@ mod tests {
 
     #[test]
     fn test_rename_var_5() {
-        check(
+        check_rename(
             "YY",
             r#"main(_) ->
                    Y = 5,
@@ -316,7 +316,7 @@ mod tests {
 
     #[test]
     fn test_rename_var_6() {
-        check(
+        check_rename(
             "ZZ",
             r#"main(_) ->
                    Z = 2,
@@ -333,7 +333,7 @@ mod tests {
 
     #[test]
     fn test_rename_var_7() {
-        check(
+        check_rename(
             "Y",
             r#"main() ->
                    I = 1,
@@ -346,7 +346,7 @@ mod tests {
 
     #[test]
     fn test_rename_var_name_clash_1() {
-        check(
+        check_rename(
             "Y",
             r#"main(Y) ->
                    I~ = 1,
@@ -357,7 +357,7 @@ mod tests {
 
     #[test]
     fn test_rename_var_but_not_shadowed() {
-        check(
+        check_rename(
             "Z",
             r#"triples( Self, X, Y, none )->
                    [ Result || Result = { X~, Y, _} <- Self ]."#,
@@ -370,7 +370,7 @@ mod tests {
 
     #[test]
     fn test_rename_local_function_no_calls() {
-        check(
+        check_rename(
             "new_fun",
             r#"trip~les( Self, X, Y, none )->
                    [ Result || Result = { X, Y, _} <- Self ]."#,
@@ -381,7 +381,7 @@ mod tests {
 
     #[test]
     fn test_rename_local_function_with_calls_1() {
-        check(
+        check_rename(
             "new_fun",
             r#"fo~o() -> ok.
                bar() -> foo()."#,
@@ -392,7 +392,7 @@ mod tests {
 
     #[test]
     fn test_rename_local_function_with_calls_2() {
-        check(
+        check_rename(
             "new_fun",
             r#"fo~o() -> ok.
                bar() -> baz(),foo()."#,
@@ -403,7 +403,7 @@ mod tests {
 
     #[test]
     fn test_rename_local_function_with_calls_3() {
-        check(
+        check_rename(
             "new_fun",
             r#"fo~o(0) -> 0;
                foo(X) -> foo(X - 1).
@@ -416,7 +416,7 @@ mod tests {
 
     #[test]
     fn test_rename_local_function_with_calls_4() {
-        check(
+        check_rename(
             "new_fun",
             r#"test1() ->
                    ok.
@@ -429,7 +429,7 @@ mod tests {
 
     #[test]
     fn test_rename_local_function_fails_name_clash_1() {
-        check(
+        check_rename(
             "new_fun",
             r#"fo~o() -> ok.
                new_fun() -> ok."#,
@@ -439,7 +439,7 @@ mod tests {
 
     #[test]
     fn test_rename_local_function_fails_name_clash_2() {
-        check(
+        check_rename(
             "foo",
             r#"foo() -> ok.
                b~ar() -> ok."#,
@@ -449,7 +449,7 @@ mod tests {
 
     #[test]
     fn test_rename_local_function_fails_name_clash_checks_arity() {
-        check(
+        check_rename(
             "new_fun",
             r#"fo~o() -> ok.
                new_fun(X) -> ok."#,
@@ -460,7 +460,7 @@ mod tests {
 
     #[test]
     fn test_rename_local_function_fails_name_clash_imported_function() {
-        check(
+        check_rename(
             "new_fun",
             r#"-import(bar, [new_fun/0]).
                fo~o() -> ok."#,
@@ -470,7 +470,7 @@ mod tests {
 
     #[test]
     fn test_rename_local_function_fails_name_clash_erlang_function() {
-        check(
+        check_rename(
             "alias",
             r#"fo~o() -> ok."#,
             r#"error: Function 'alias/0' already in scope"#,
@@ -479,7 +479,7 @@ mod tests {
 
     #[test]
     fn test_rename_local_function_also_name_in_macro() {
-        check(
+        check_rename(
             "new",
             r#"-define(FOO, foo).
                fo~o() -> ok.
@@ -492,17 +492,17 @@ mod tests {
 
     #[test]
     fn test_rename_local_var_trims_surrounding_spaces() {
-        check("  Aaa  ", r#"foo() -> V~ar = 3."#, r#"foo() -> Aaa = 3."#);
+        check_rename("  Aaa  ", r#"foo() -> V~ar = 3."#, r#"foo() -> Aaa = 3."#);
     }
 
     #[test]
     fn test_rename_local_function_trims_surrounding_spaces() {
-        check("  aaa  ", r#"fo~o() -> Var = 3."#, r#"aaa() -> Var = 3."#);
+        check_rename("  aaa  ", r#"fo~o() -> Var = 3."#, r#"aaa() -> Var = 3."#);
     }
 
     #[test]
     fn test_rename_local_var_fails_invalid_var_name() {
-        check(
+        check_rename(
             "aaa",
             r#"foo() -> V~ar = 3."#,
             r#"error: Invalid new variable name: 'aaa'"#,
@@ -511,7 +511,7 @@ mod tests {
 
     #[test]
     fn test_rename_local_function_fails_invalid_function_name_1() {
-        check(
+        check_rename(
             "Foo",
             r#"fo~o() -> ok."#,
             r#"error: Invalid new function name: 'Foo'"#,
@@ -520,7 +520,7 @@ mod tests {
 
     #[test]
     fn test_rename_local_function_fails_invalid_function_name_2() {
-        check(
+        check_rename(
             "TT TTT",
             r#"fo~o() -> ok."#,
             r#"error: Invalid new function name: 'TT TTT'"#,
@@ -529,7 +529,7 @@ mod tests {
 
     #[test]
     fn test_rename_local_function_fails_invalid_function_name_3() {
-        check(
+        check_rename(
             "TTT",
             r#"fo~o() -> ok."#,
             r#"error: Invalid new function name: 'TTT'"#,
@@ -538,7 +538,7 @@ mod tests {
 
     #[test]
     fn test_rename_var_d39578003_case_5() {
-        check(
+        check_rename(
             "_G",
             r#"main(_) ->
                   fun F() ->
@@ -561,7 +561,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_spawn_1() {
-        check(
+        check_rename(
             "new_name",
             r#"foo() ->
                  Pid = erlang:spawn(fun noop_~group_leader/0),
@@ -578,7 +578,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_spawn_2() {
-        check(
+        check_rename(
             "new_name",
             r#"foo() ->
                  Pid = erlang:spawn(fun noop_group_leader/0),
@@ -595,7 +595,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_apply_1() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -617,7 +617,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_apply_2() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -637,7 +637,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_apply_args_1() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -661,7 +661,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_apply_args_2() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -678,7 +678,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_apply_3() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -700,7 +700,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_apply_4() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -722,7 +722,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_apply_5() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -737,7 +737,7 @@ mod tests {
 
     #[test]
     fn test_rename_function_with_spec_1() {
-        check(
+        check_rename(
             "new_name",
             r#"
                -spec foo() -> ok.
@@ -752,7 +752,7 @@ mod tests {
 
     #[test]
     fn test_rename_function_with_spec_2() {
-        check(
+        check_rename(
             "new_name",
             r#"
                -spec f~oo() -> ok.
@@ -767,7 +767,7 @@ mod tests {
 
     #[test]
     fn test_rename_function_with_spec_3() {
-        check(
+        check_rename(
             "new_name",
             r#"
                -spec f~oo(any()) -> ok.
@@ -782,7 +782,7 @@ mod tests {
 
     #[test]
     fn test_rename_underscore_1() {
-        check(
+        check_rename(
             "NewName",
             r#"
                foo() ->
@@ -794,7 +794,7 @@ mod tests {
 
     #[test]
     fn test_rename_underscore_2() {
-        check(
+        check_rename(
             "NewName",
             r#"
                foo(X) ->
@@ -807,7 +807,7 @@ mod tests {
 
     #[test]
     fn test_rename_case_1() {
-        check(
+        check_rename(
             "XX",
             r#"
                foo(X) ->
@@ -828,7 +828,7 @@ mod tests {
 
     #[test]
     fn test_rename_case_2() {
-        check(
+        check_rename(
             "XX",
             r#"
               foo() ->
@@ -845,7 +845,7 @@ mod tests {
 
     #[test]
     fn test_rename_case_3() {
-        check(
+        check_rename(
             "XX",
             r#"
               foo() ->
@@ -860,7 +860,7 @@ mod tests {
 
     #[test]
     fn rename_export_function() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -893,7 +893,7 @@ mod tests {
 
     #[test]
     fn rename_export_function_2() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -928,7 +928,7 @@ mod tests {
 
     #[test]
     fn rename_export_function_fails() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -951,7 +951,7 @@ mod tests {
 
     #[test]
     fn rename_export_function_ok_no_local_import() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -988,7 +988,7 @@ mod tests {
     fn rename_function_in_include() {
         // We do not have functions defined in our header files, but
         // confirm it does the right thing anyway
-        check(
+        check_rename(
             "new_name",
             r#"
              //- /src/main.hrl
@@ -1041,7 +1041,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_macro_rhs_1() {
-        check(
+        check_rename(
             "new_name",
             r#"
                -define(BAR(X), foo(X)).
@@ -1058,7 +1058,7 @@ mod tests {
 
     #[test]
     fn rename_with_macro() {
-        check(
+        check_rename(
             "NewName",
             r#"
              //- /src/main.hrl
@@ -1094,7 +1094,7 @@ mod tests {
     // See T157498333
     #[test]
     fn rename_function_with_macro_type() {
-        check(
+        check_rename(
             "newFoo",
             r#"
             -module(main).
@@ -1185,7 +1185,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_rpc_call_4() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1207,7 +1207,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_rpc_call_5() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1229,7 +1229,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_rpc_async_call() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1251,7 +1251,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_rpc_cast() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1273,7 +1273,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_rpc_multicall_3() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1295,7 +1295,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_rpc_multicall_4() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1317,7 +1317,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_rpc_multicall_5() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1339,7 +1339,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_function_exported() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1361,7 +1361,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_erlang_function_exported() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1383,7 +1383,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_is_builtin() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1405,7 +1405,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_erlang_is_builtin() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1427,7 +1427,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_hibernate() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1449,7 +1449,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_erlang_hibernate() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1471,7 +1471,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_spawn() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1493,7 +1493,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_erlang_spawn() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1515,7 +1515,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_spawn_4() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1537,7 +1537,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_erlang_spawn_4() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1559,7 +1559,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_spawn_link() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1581,7 +1581,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_erlang_spawn_link() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1603,7 +1603,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_spawn_link_4() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1625,7 +1625,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_erlang_spawn_link_4() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1647,7 +1647,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_spawn_monitor() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1669,7 +1669,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_erlang_spawn_monitor() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1691,7 +1691,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_spawn_monitor_4() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1713,7 +1713,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_erlang_spawn_monitor_4() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1735,7 +1735,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_spawn_opt() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1757,7 +1757,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_erlang_spawn_opt() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1779,7 +1779,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_spawn_opt_5() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1801,7 +1801,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_erlang_spawn_opt_5() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1823,7 +1823,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_spawn_request() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1845,7 +1845,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_erlang_spawn_request() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1867,7 +1867,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_erpc_call_4() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1889,7 +1889,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_erpc_call_5() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1911,7 +1911,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_erpc_cast() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1933,7 +1933,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_erpc_multicall_4() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1955,7 +1955,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_erpc_multicall_5() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1977,7 +1977,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_erpc_multicast() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl
@@ -1999,7 +1999,7 @@ mod tests {
 
     #[test]
     fn test_rename_in_erpc_send_request() {
-        check(
+        check_rename(
             "new_name",
             r#"
                //- /src/baz.erl

From 90281d717729a1c2288f8335a8bffcb1e260a505 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 27 Oct 2025 10:16:56 -0700
Subject: [PATCH 206/394] Specify SSR match as Ad-Hoc diagnostic

Summary:
Structured Search (and not yet Replace) SSR is a way of specifying a "semantic grep", which searches by comparing the AST rather than text. We use it as a building block for diagnostics.

But often we want to just do a quick search for a pattern in a file or code base.

This diff allows us to do this, by specifying it in a config file.

Reviewed By: TD5

Differential Revision: D85340131

fbshipit-source-id: f1e4ce515a535cc6032483dc39297eab4e6eecd5
---
 crates/elp/src/bin/lint_cli.rs                |   2 +-
 crates/elp/src/bin/main.rs                    |  31 ++++
 crates/elp/src/lib.rs                         |   9 ++
 .../resources/test/linter/ssr_ad_hoc.stdout   |   3 +
 .../test/linter/ssr_ad_hoc_parse_fail.stdout  |   1 +
 crates/ide/src/diagnostics.rs                 |   1 +
 crates/ide/src/diagnostics/from_config.rs     | 134 ++++++++++++++++++
 test_projects/linter/elp_lint_ssr_adhoc.toml  |   5 +
 .../linter/elp_lint_ssr_adhoc_parse_fail.toml |   5 +
 9 files changed, 190 insertions(+), 1 deletion(-)
 create mode 100644 crates/elp/src/resources/test/linter/ssr_ad_hoc.stdout
 create mode 100644 crates/elp/src/resources/test/linter/ssr_ad_hoc_parse_fail.stdout
 create mode 100644 test_projects/linter/elp_lint_ssr_adhoc.toml
 create mode 100644 test_projects/linter/elp_lint_ssr_adhoc_parse_fail.toml

diff --git a/crates/elp/src/bin/lint_cli.rs b/crates/elp/src/bin/lint_cli.rs
index aeb6fe4871..dd896b1780 100644
--- a/crates/elp/src/bin/lint_cli.rs
+++ b/crates/elp/src/bin/lint_cli.rs
@@ -993,7 +993,7 @@ mod tests {
         expect![[r#"
             enabled_lints = ["P1700"]
             disabled_lints = []
-            
+
             [erlang_service]
             warnings_as_errors = true
             [[ad_hoc_lints.lints]]
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index e40d3b5b05..d786b73821 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -1938,6 +1938,37 @@ mod tests {
         )
     }
 
+    #[test]
+    fn lint_ssr_from_config() {
+        simple_snapshot(
+            args_vec![
+                "lint",
+                "--config-file",
+                "../../test_projects/linter/elp_lint_ssr_adhoc.toml",
+            ],
+            "linter",
+            expect_file!("../resources/test/linter/ssr_ad_hoc.stdout"),
+            true,
+            None,
+        )
+    }
+
+    #[test]
+    fn lint_ssr_from_bad_config() {
+        simple_snapshot_expect_stderror(
+            args_vec![
+                "lint",
+                "--config-file",
+                "../../test_projects/linter/elp_lint_ssr_adhoc_parse_fail.toml",
+            ],
+            "linter",
+            expect_file!("../resources/test/linter/ssr_ad_hoc_parse_fail.stdout"),
+            true,
+            None,
+            false,
+        )
+    }
+
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
     fn eqwalizer_tests_check(buck: bool) {
diff --git a/crates/elp/src/lib.rs b/crates/elp/src/lib.rs
index 2ed7fece37..d9aefc9d2f 100644
--- a/crates/elp/src/lib.rs
+++ b/crates/elp/src/lib.rs
@@ -162,6 +162,7 @@ mod tests {
     use elp_ide::diagnostics::ErlangServiceConfig;
     use elp_ide::diagnostics::Lint;
     use elp_ide::diagnostics::LintsFromConfig;
+    use elp_ide::diagnostics::MatchSsr;
     use elp_ide::diagnostics::ReplaceCall;
     use elp_ide::diagnostics::ReplaceCallAction;
     use elp_ide::diagnostics::Replacement;
@@ -188,6 +189,10 @@ mod tests {
                             perm: vec![1, 2],
                         }),
                     }),
+                    Lint::LintMatchSsr(MatchSsr {
+                        ssr_pattern: "ssr: _@A = 10.".to_string(),
+                        message: None,
+                    }),
                 ],
             },
             linters: FxHashMap::default(),
@@ -223,6 +228,10 @@ mod tests {
             type = "ArgsPermutation"
             perm = [1, 2]
 
+            [[ad_hoc_lints.lints]]
+            type = "LintMatchSsr"
+            ssr_pattern = "ssr: _@A = 10."
+
             [linters]
         "#]]
         .assert_eq(&toml::to_string::<LintConfig>(&lint_config).unwrap());
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc.stdout
new file mode 100644
index 0000000000..55650830ba
--- /dev/null
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc.stdout
@@ -0,0 +1,3 @@
+Diagnostics reported in 1 modules:
+  app_a: 1
+      15:12-15:17::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_parse_fail.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_parse_fail.stdout
new file mode 100644
index 0000000000..4957343496
--- /dev/null
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_parse_fail.stdout
@@ -0,0 +1 @@
+errors parsing "{project_path}/elp_lint_ssr_adhoc_parse_fail.toml": invalid SSR pattern 'ssr: {_@A, = 10}.': Parse error: Could not lower rule for key `ad_hoc_lints.lints` at line 3 column 1
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index c4c90ae527..f51a0714b2 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -149,6 +149,7 @@ mod unused_record_field;
 pub use elp_ide_db::DiagnosticCode;
 pub use from_config::Lint;
 pub use from_config::LintsFromConfig;
+pub use from_config::MatchSsr;
 pub use from_config::ReplaceCall;
 pub use from_config::ReplaceCallAction;
 pub use replace_call::Replacement;
diff --git a/crates/ide/src/diagnostics/from_config.rs b/crates/ide/src/diagnostics/from_config.rs
index f40a8e769e..e3830b0372 100644
--- a/crates/ide/src/diagnostics/from_config.rs
+++ b/crates/ide/src/diagnostics/from_config.rs
@@ -10,12 +10,21 @@
 
 //! Read a section of the config file and generate diagnostics from it.
 
+use elp_ide_db::DiagnosticCode;
+use elp_ide_db::RootDatabase;
 use elp_ide_db::elp_base_db::FileId;
+use elp_ide_ssr::SsrRule;
+use elp_ide_ssr::SsrSearchScope;
+use elp_ide_ssr::match_pattern;
 use hir::Semantic;
+use hir::Strategy;
+use hir::fold::MacroStrategy;
+use hir::fold::ParenStrategy;
 use serde::Deserialize;
 use serde::Serialize;
 
 use super::Diagnostic;
+use super::Severity;
 use super::TypeReplacement;
 use super::replace_call;
 use super::replace_call::Replacement;
@@ -41,6 +50,7 @@ impl LintsFromConfig {
 pub enum Lint {
     ReplaceCall(ReplaceCall),
     ReplaceInSpec(ReplaceInSpec),
+    LintMatchSsr(MatchSsr),
 }
 
 impl Lint {
@@ -48,6 +58,7 @@ impl Lint {
         match self {
             Lint::ReplaceCall(l) => l.get_diagnostics(acc, sema, file_id),
             Lint::ReplaceInSpec(l) => l.get_diagnostics(acc, sema, file_id),
+            Lint::LintMatchSsr(l) => l.get_diagnostics(acc, sema, file_id),
         }
     }
 }
@@ -115,12 +126,82 @@ impl ReplaceInSpec {
 
 // ---------------------------------------------------------------------
 
+#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
+pub struct MatchSsr {
+    pub ssr_pattern: String,
+    #[serde(default)]
+    pub message: Option<String>,
+}
+
+impl<'de> Deserialize<'de> for MatchSsr {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        use serde::de::Error;
+
+        #[derive(Deserialize)]
+        struct MatchSsrHelper {
+            ssr_pattern: String,
+            #[serde(default)]
+            message: Option<String>,
+        }
+
+        let helper = MatchSsrHelper::deserialize(deserializer)?;
+
+        // Validate the SSR pattern by trying to parse it
+        // Use a minimal database for validation
+        let db = RootDatabase::default();
+        SsrRule::parse_str(&db, &helper.ssr_pattern).map_err(|e| {
+            D::Error::custom(format!(
+                "invalid SSR pattern '{}': {}",
+                helper.ssr_pattern, e
+            ))
+        })?;
+
+        Ok(MatchSsr {
+            ssr_pattern: helper.ssr_pattern,
+            message: helper.message,
+        })
+    }
+}
+
+impl MatchSsr {
+    pub fn get_diagnostics(&self, acc: &mut Vec<Diagnostic>, sema: &Semantic, file_id: FileId) {
+        let strategy = Strategy {
+            macros: MacroStrategy::Expand,
+            parens: ParenStrategy::InvisibleParens,
+        };
+
+        let scope = SsrSearchScope::WholeFile(file_id);
+        let matches = match_pattern(sema, strategy, &self.ssr_pattern, scope);
+
+        for matched in matches.matches {
+            let message = self
+                .message
+                .clone()
+                .unwrap_or_else(|| format!("SSR pattern matched: {}", self.ssr_pattern));
+
+            let diag = Diagnostic::new(
+                DiagnosticCode::AdHoc("ssr-match".to_string()),
+                message,
+                matched.range.range,
+            )
+            .with_severity(Severity::WeakWarning);
+            acc.push(diag);
+        }
+    }
+}
+
+// ---------------------------------------------------------------------
+
 #[cfg(test)]
 mod tests {
     use expect_test::expect;
 
     use super::Lint;
     use super::LintsFromConfig;
+    use super::MatchSsr;
     use super::ReplaceCall;
     use super::ReplaceCallAction;
     use super::ReplaceInSpec;
@@ -492,4 +573,57 @@ mod tests {
         "#]]
         .assert_eq(&result);
     }
+
+    #[test]
+    fn serde_serialize_match_ssr() {
+        let result = toml::to_string::<MatchSsr>(&MatchSsr {
+            ssr_pattern: "ssr: _@A = 10.".to_string(),
+            message: Some("Found pattern".to_string()),
+        })
+        .unwrap();
+        expect![[r#"
+            ssr_pattern = "ssr: _@A = 10."
+            message = "Found pattern"
+        "#]]
+        .assert_eq(&result);
+    }
+
+    #[test]
+    fn serde_deserialize_match_ssr() {
+        let match_ssr: MatchSsr = toml::from_str(
+            r#"
+              ssr_pattern = "ssr: _@A = 10."
+              message = "Found pattern"
+             "#,
+        )
+        .unwrap();
+
+        expect![[r#"
+            MatchSsr {
+                ssr_pattern: "ssr: _@A = 10.",
+                message: Some(
+                    "Found pattern",
+                ),
+            }
+        "#]]
+        .assert_debug_eq(&match_ssr);
+    }
+
+    #[test]
+    fn serde_serialize_lint_match_ssr() {
+        let result = toml::to_string::<LintsFromConfig>(&LintsFromConfig {
+            lints: vec![Lint::LintMatchSsr(MatchSsr {
+                ssr_pattern: "ssr: _@A = 10.".to_string(),
+                message: Some("Found pattern".to_string()),
+            })],
+        })
+        .unwrap();
+        expect![[r#"
+            [[lints]]
+            type = "LintMatchSsr"
+            ssr_pattern = "ssr: _@A = 10."
+            message = "Found pattern"
+        "#]]
+        .assert_eq(&result);
+    }
 }
diff --git a/test_projects/linter/elp_lint_ssr_adhoc.toml b/test_projects/linter/elp_lint_ssr_adhoc.toml
new file mode 100644
index 0000000000..2aa4491ab2
--- /dev/null
+++ b/test_projects/linter/elp_lint_ssr_adhoc.toml
@@ -0,0 +1,5 @@
+enabled_lints = ["ad-hoc: ssr-match"]
+
+[[ad_hoc_lints.lints]]
+type = "LintMatchSsr"
+ssr_pattern = "ssr: {_@A, _@B}."
diff --git a/test_projects/linter/elp_lint_ssr_adhoc_parse_fail.toml b/test_projects/linter/elp_lint_ssr_adhoc_parse_fail.toml
new file mode 100644
index 0000000000..c4bee7057f
--- /dev/null
+++ b/test_projects/linter/elp_lint_ssr_adhoc_parse_fail.toml
@@ -0,0 +1,5 @@
+enabled_lints = ["ad-hoc: ssr-match"]
+
+[[ad_hoc_lints.lints]]
+type = "LintMatchSsr"
+ssr_pattern = "ssr: {_@A, = 10}."

From 719f5e2a467a378382175da7e9faac689ee652e3 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 27 Oct 2025 10:56:25 -0700
Subject: [PATCH 207/394] CLI: log timing, meta-only

Summary: Meta internal, add telemetry for command line operation

Reviewed By: robertoaloi

Differential Revision: D84925105

fbshipit-source-id: c2788d05f92d1d4b44a1f95885563362dbf1217d
---
 crates/elp/src/bin/elp_parse_cli.rs      |  7 ++++++
 crates/elp/src/bin/eqwalizer_cli.rs      | 28 +++++++++++++++++++-----
 crates/elp/src/bin/erlang_service_cli.rs |  8 +++++++
 crates/elp/src/bin/main.rs               | 14 ++++++++++++
 crates/elp/src/bin/shell.rs              |  5 +++++
 crates/elp_log/src/telemetry.rs          | 18 ++++++++++-----
 6 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/crates/elp/src/bin/elp_parse_cli.rs b/crates/elp/src/bin/elp_parse_cli.rs
index c826c0a927..fcc8652ec2 100644
--- a/crates/elp/src/bin/elp_parse_cli.rs
+++ b/crates/elp/src/bin/elp_parse_cli.rs
@@ -14,6 +14,7 @@ use std::io::Write;
 use std::path::Path;
 use std::path::PathBuf;
 use std::str;
+use std::time::SystemTime;
 
 use anyhow::Result;
 use anyhow::bail;
@@ -40,6 +41,7 @@ use elp_ide::elp_ide_db::elp_base_db::IncludeOtp;
 use elp_ide::elp_ide_db::elp_base_db::ModuleName;
 use elp_ide::elp_ide_db::elp_base_db::Vfs;
 use elp_ide::elp_ide_db::elp_base_db::VfsPath;
+use elp_log::telemetry;
 use elp_project_model::AppType;
 use elp_project_model::DiscoverConfig;
 use elp_project_model::buck::BuckQueryConfig;
@@ -70,6 +72,7 @@ pub fn parse_all(
 ) -> Result<()> {
     log::info!("Loading project at: {:?}", args.project);
 
+    let start_time = SystemTime::now();
     // Track memory usage at the start
     let memory_start = MemoryUsage::now();
 
@@ -145,6 +148,8 @@ pub fn parse_all(
     // printing, but do not print it out. So just create a dummy value
     let url = lsp_types::Url::parse("file:///unused_url").ok().unwrap();
 
+    telemetry::report_elapsed_time("parse-elp operational", start_time);
+
     let memory_end = MemoryUsage::now();
     let memory_used = memory_end - memory_start;
 
@@ -198,6 +203,8 @@ pub fn parse_all(
             }
         }
 
+        telemetry::report_elapsed_time("parse-elp done", start_time);
+
         if args.is_format_normal() && args.report_system_stats {
             print_memory_usage(loaded.analysis_host, loaded.vfs, cli)?;
             writeln!(cli, "{}", memory_used)?;
diff --git a/crates/elp/src/bin/eqwalizer_cli.rs b/crates/elp/src/bin/eqwalizer_cli.rs
index e9159372be..c946babe42 100644
--- a/crates/elp/src/bin/eqwalizer_cli.rs
+++ b/crates/elp/src/bin/eqwalizer_cli.rs
@@ -10,6 +10,7 @@
 
 use std::path::Path;
 use std::sync::Arc;
+use std::time::SystemTime;
 
 use anyhow::Context;
 use anyhow::Result;
@@ -38,6 +39,7 @@ use elp_ide::elp_ide_db::elp_base_db::FileId;
 use elp_ide::elp_ide_db::elp_base_db::IncludeOtp;
 use elp_ide::elp_ide_db::elp_base_db::ModuleName;
 use elp_ide::elp_ide_db::elp_base_db::VfsPath;
+use elp_log::telemetry;
 use elp_project_model::AppName;
 use elp_project_model::DiscoverConfig;
 use elp_project_model::ProjectBuildData;
@@ -76,6 +78,7 @@ pub fn eqwalize_module(
     cli: &mut dyn Cli,
     query_config: &BuckQueryConfig,
 ) -> Result<()> {
+    let start_time = SystemTime::now();
     let config = DiscoverConfig::new(args.rebar, &args.profile);
     let mut loaded = load::load_project_at(
         cli,
@@ -86,7 +89,10 @@ pub fn eqwalize_module(
         query_config,
     )?;
     build::compile_deps(&loaded, cli)?;
-    do_eqwalize_module(args, &mut loaded, cli)
+    telemetry::report_elapsed_time("eqwalize operational", start_time);
+    let r = do_eqwalize_module(args, &mut loaded, cli);
+    telemetry::report_elapsed_time("eqwalize done", start_time);
+    r
 }
 
 pub fn do_eqwalize_module(
@@ -143,6 +149,7 @@ pub fn eqwalize_all(
     cli: &mut dyn Cli,
     query_config: &BuckQueryConfig,
 ) -> Result<()> {
+    let start_time = SystemTime::now();
     // Hack to avoid hint appearing in tests
     cli.spinner(SHELL_HINT).finish();
     let config = DiscoverConfig::new(args.rebar, &args.profile);
@@ -155,7 +162,10 @@ pub fn eqwalize_all(
         query_config,
     )?;
     build::compile_deps(&loaded, cli)?;
-    do_eqwalize_all(args, &mut loaded, cli)
+    telemetry::report_elapsed_time("eqwalize-all operational", start_time);
+    let r = do_eqwalize_all(args, &mut loaded, cli);
+    telemetry::report_elapsed_time("eqwalize-all done", start_time);
+    r
 }
 
 pub fn do_eqwalize_all(
@@ -226,6 +236,7 @@ pub fn eqwalize_app(
     cli: &mut dyn Cli,
     query_config: &BuckQueryConfig,
 ) -> Result<()> {
+    let start_time = SystemTime::now();
     let config = DiscoverConfig::new(args.rebar, &args.profile);
     let mut loaded = load::load_project_at(
         cli,
@@ -236,7 +247,10 @@ pub fn eqwalize_app(
         query_config,
     )?;
     build::compile_deps(&loaded, cli)?;
-    do_eqwalize_app(args, &mut loaded, cli)
+    telemetry::report_elapsed_time("eqwalize-app operational", start_time);
+    let r = do_eqwalize_app(args, &mut loaded, cli);
+    telemetry::report_elapsed_time("eqwalize-app done", start_time);
+    r
 }
 
 pub fn do_eqwalize_app(
@@ -283,6 +297,7 @@ pub fn eqwalize_target(
     cli: &mut dyn Cli,
     query_config: &BuckQueryConfig,
 ) -> Result<()> {
+    let start_time = SystemTime::now();
     let config = DiscoverConfig::buck();
     let mut loaded = load::load_project_at(
         cli,
@@ -294,6 +309,7 @@ pub fn eqwalize_target(
     )?;
 
     set_eqwalizer_config(&mut loaded);
+    telemetry::report_elapsed_time("eqwalize-target operational", start_time);
 
     let buck = match &loaded.project.project_build_data {
         ProjectBuildData::Buck(buck) => buck,
@@ -353,13 +369,15 @@ elp eqwalize-target erl/chatd #same as //erl/chatd/... but enables shell complet
     let mut reporter = reporting::PrettyReporter::new(analysis, &loaded, cli);
     let bail_on_error = args.bail_on_error;
 
-    eqwalize(EqwalizerInternalArgs {
+    let r = eqwalize(EqwalizerInternalArgs {
         analysis,
         loaded: &loaded,
         file_ids,
         reporter: &mut reporter,
         bail_on_error,
-    })
+    });
+    telemetry::report_elapsed_time("eqwalize-target done", start_time);
+    r
 }
 
 pub fn eqwalize_stats(
diff --git a/crates/elp/src/bin/erlang_service_cli.rs b/crates/elp/src/bin/erlang_service_cli.rs
index 0c1946b329..6611bdffae 100644
--- a/crates/elp/src/bin/erlang_service_cli.rs
+++ b/crates/elp/src/bin/erlang_service_cli.rs
@@ -11,6 +11,7 @@
 use std::fs;
 use std::path::Path;
 use std::str;
+use std::time::SystemTime;
 
 use anyhow::Context;
 use anyhow::Error;
@@ -26,6 +27,7 @@ use elp_ide::Analysis;
 use elp_ide::elp_ide_db::elp_base_db::FileId;
 use elp_ide::elp_ide_db::elp_base_db::IncludeOtp;
 use elp_ide::erlang_service::DiagnosticLocation;
+use elp_log::telemetry;
 use elp_log::timeit;
 use elp_project_model::AppType;
 use elp_project_model::DiscoverConfig;
@@ -40,6 +42,7 @@ use crate::reporting::add_stat;
 use crate::reporting::dump_stats;
 
 pub fn parse_all(args: &ParseAll, cli: &mut dyn Cli, query_config: &BuckQueryConfig) -> Result<()> {
+    let start_time = SystemTime::now();
     let config = DiscoverConfig::new(!args.buck, &args.profile);
     let loaded = load::load_project_at(
         cli,
@@ -52,10 +55,15 @@ pub fn parse_all(args: &ParseAll, cli: &mut dyn Cli, query_config: &BuckQueryCon
     build::compile_deps(&loaded, cli)?;
     fs::create_dir_all(&args.to)?;
 
+    telemetry::report_elapsed_time("parse-all operational", start_time);
+
     let parse_diagnostics = do_parse_all(cli, &loaded, &args.to, &args.module, args.buck)?;
     if args.stats {
         dump_stats(cli, args.list_modules);
     }
+
+    telemetry::report_elapsed_time("parse-all done", start_time);
+
     if !parse_diagnostics.is_empty() {
         writeln!(
             cli,
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index d786b73821..e56057c740 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -40,6 +40,7 @@ mod erlang_service_cli;
 mod explain_cli;
 mod glean;
 mod lint_cli;
+// @fb-only
 mod reporting;
 mod shell;
 
@@ -96,8 +97,21 @@ fn setup_static(args: &Args) {
     }
 }
 
+fn setup_cli_telemetry(args: &Args) {
+    match &args.command {
+        args::Command::RunServer(_) => {
+            // Do nothing, we have server telemetry
+        }
+        _ => {
+            // Initialize CLI telemetry, if used
+            // @fb-only
+        }
+    }
+}
+
 fn try_main(cli: &mut dyn Cli, args: Args) -> Result<()> {
     let logger = setup_logging(&args.log_file, args.no_log_buffering)?;
+    setup_cli_telemetry(&args);
 
     INIT.call_once(|| {
         setup_static(&args);
diff --git a/crates/elp/src/bin/shell.rs b/crates/elp/src/bin/shell.rs
index 490c852893..84ab218710 100644
--- a/crates/elp/src/bin/shell.rs
+++ b/crates/elp/src/bin/shell.rs
@@ -15,6 +15,7 @@ use std::path::Path;
 use std::path::PathBuf;
 use std::process::Command;
 use std::sync::Arc;
+use std::time::SystemTime;
 
 use anyhow::Result;
 use elp::build::load;
@@ -29,6 +30,7 @@ use elp_ide::elp_ide_db::elp_base_db::SourceDatabaseExt;
 use elp_ide::elp_ide_db::elp_base_db::SourceRoot;
 use elp_ide::elp_ide_db::elp_base_db::SourceRootId;
 use elp_ide::elp_ide_db::elp_base_db::VfsPath;
+use elp_log::telemetry;
 use elp_project_model::DiscoverConfig;
 use elp_project_model::buck::BuckQueryConfig;
 use paths::Utf8PathBuf;
@@ -331,6 +333,7 @@ fn update_changes(
 }
 
 pub fn run_shell(shell: &Shell, cli: &mut dyn Cli, query_config: &BuckQueryConfig) -> Result<()> {
+    let start_time = SystemTime::now();
     let mut cmd = Command::new("watchman");
     let _ = cmd.arg("--version").output().map_err(|_| {
             anyhow::Error::msg("`watchman` command not found. install it from https://facebook.github.io/watchman/ to use `elp shell`.")
@@ -349,6 +352,7 @@ pub fn run_shell(shell: &Shell, cli: &mut dyn Cli, query_config: &BuckQueryConfi
         Mode::Shell,
         query_config,
     )?;
+    telemetry::report_elapsed_time("shell operational", start_time);
     let mut rl = rustyline::DefaultEditor::new()?;
     let mut last_read = watchman.get_clock()?;
     write!(cli, "{WELCOME}")?;
@@ -403,5 +407,6 @@ pub fn run_shell(shell: &Shell, cli: &mut dyn Cli, query_config: &BuckQueryConfi
             }
         }
     }
+    telemetry::report_elapsed_time("shell done", start_time);
     Ok(())
 }
diff --git a/crates/elp_log/src/telemetry.rs b/crates/elp_log/src/telemetry.rs
index 4132de6102..86da912528 100644
--- a/crates/elp_log/src/telemetry.rs
+++ b/crates/elp_log/src/telemetry.rs
@@ -20,18 +20,18 @@
 
 use std::time::SystemTime;
 
-use humantime::format_rfc3339_millis;
+pub use humantime::format_rfc3339_millis;
 use lazy_static::lazy_static;
 use serde::Deserialize;
 use serde::Serialize;
 
 pub type TelemetryData = serde_json::Value;
-pub type Duration = u32;
+pub type DurationMs = u32;
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct TelemetryMessage {
     #[serde(rename = "type")]
     pub typ: String,
-    pub duration_ms: Option<Duration>,
+    pub duration_ms: Option<DurationMs>,
     pub start_time: Option<SystemTime>,
     pub start_time_string: Option<String>,
     pub end_time_string: Option<String>,
@@ -56,7 +56,7 @@ pub fn receiver() -> &'static TelemetryReceiver {
 fn build_message(
     typ: String,
     data: TelemetryData,
-    duration_ms: Option<Duration>,
+    duration_ms: Option<DurationMs>,
     start_time: Option<SystemTime>,
 ) -> TelemetryMessage {
     let start_time_string = start_time.map(|time| format_rfc3339_millis(time).to_string());
@@ -84,7 +84,7 @@ fn build_message(
 fn do_send(
     typ: String,
     data: serde_json::Value,
-    duration: Option<Duration>,
+    duration: Option<DurationMs>,
     start_time: Option<SystemTime>,
 ) {
     let message = build_message(typ, data, duration, start_time);
@@ -98,12 +98,18 @@ pub fn send(typ: String, data: serde_json::Value) {
 pub fn send_with_duration(
     typ: String,
     data: serde_json::Value,
-    duration: Duration,
+    duration: DurationMs,
     start_time: SystemTime,
 ) {
     do_send(typ, data, Some(duration), Some(start_time));
 }
 
+pub fn report_elapsed_time(what: &str, start_time: SystemTime) {
+    let data = serde_json::Value::String(what.to_string());
+    let duration = start_time.elapsed().map(|e| e.as_millis()).unwrap_or(0) as u32;
+    send_with_duration("telemetry".to_string(), data, duration, start_time);
+}
+
 #[cfg(test)]
 mod tests {
     use std::time::SystemTime;

From 4aa19d388c04419633fc306e03a877e7fe45f6dd Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Mon, 27 Oct 2025 15:05:56 -0700
Subject: [PATCH 208/394] Add @OTPVersionDependent tag support for tests

Summary:
**The core change is in `main.rs`**

There is no need for most snapshots to be generated for 3 different OTP versions. Only `custom.erl` needs it.
Add support for tag `OTPVersionDependent`, similarly to `generated`, to toggle this behaviour.

Add tag to `custom.erl` (on an existing line so as to not change the lines of error messages).

Reviewed By: michalmuskala

Differential Revision: D85602616

fbshipit-source-id: 4c85ecb3e2337d60cf83d13b7449e1b20246d9ed
---
 crates/elp/src/bin/main.rs                    |   31 +-
 .../check/any_fun_type-OTP-27.pretty          |  116 --
 .../check/any_fun_type-OTP-28.pretty          |  116 --
 ...type-OTP-26.pretty => any_fun_type.pretty} |    0
 .../check/apply_none-OTP-27.pretty            |   24 -
 .../check/apply_none-OTP-28.pretty            |   24 -
 ...y_none-OTP-26.pretty => apply_none.pretty} |    0
 .../check/approx-OTP-27.pretty                |  105 --
 .../check/approx-OTP-28.pretty                |  105 --
 .../{approx-OTP-26.pretty => approx.pretty}   |    0
 .../check/as_pat-OTP-27.pretty                |   17 -
 .../check/as_pat-OTP-28.pretty                |   17 -
 .../{as_pat-OTP-26.pretty => as_pat.pretty}   |    0
 .../check/auto_imports-OTP-27.pretty          |   16 -
 .../check/auto_imports-OTP-28.pretty          |   16 -
 ...orts-OTP-26.pretty => auto_imports.pretty} |    0
 .../check/behave-OTP-27.pretty                |   13 -
 .../check/behave-OTP-28.pretty                |   13 -
 .../{behave-OTP-26.pretty => behave.pretty}   |    0
 .../check/binaries-OTP-27.pretty              |   65 -
 .../check/binaries-OTP-28.pretty              |   65 -
 ...binaries-OTP-26.pretty => binaries.pretty} |    0
 .../check/booleans-OTP-27.pretty              |   31 -
 .../check/booleans-OTP-28.pretty              |   31 -
 ...booleans-OTP-26.pretty => booleans.pretty} |    0
 ...os-OTP-26.pretty => callbacks1_pos.pretty} |    0
 .../check/callbacks3_neg-OTP-27.pretty        |   14 -
 .../check/callbacks3_neg-OTP-28.pretty        |   14 -
 ...eg-OTP-26.pretty => callbacks3_neg.pretty} |    0
 .../check/callbacks4_neg-OTP-27.pretty        |    7 -
 .../check/callbacks4_neg-OTP-28.pretty        |    7 -
 ...eg-OTP-26.pretty => callbacks4_neg.pretty} |    0
 .../check/callbacks5_neg-OTP-27.pretty        |    7 -
 .../check/callbacks5_neg-OTP-28.pretty        |    7 -
 ...eg-OTP-26.pretty => callbacks5_neg.pretty} |    0
 .../check/callbacks6_neg-OTP-27.pretty        |   13 -
 .../check/callbacks6_neg-OTP-28.pretty        |   13 -
 ...eg-OTP-26.pretty => callbacks6_neg.pretty} |    0
 ....pretty => callbacks7_overload_pos.pretty} |    0
 .../check/case_predicates-OTP-27.pretty       |  126 --
 .../check/case_predicates-OTP-28.pretty       |  126 --
 ...s-OTP-26.pretty => case_predicates.pretty} |    0
 .../check/check_SUITE-OTP-27.pretty           |    9 -
 .../check/check_SUITE-OTP-28.pretty           |    9 -
 ...SUITE-OTP-26.pretty => check_SUITE.pretty} |    0
 ...os-OTP-28.pretty => compiler_macro.pretty} |    0
 .../check/complex_maps-OTP-27.pretty          |  300 ----
 .../check/complex_maps-OTP-28.pretty          |  300 ----
 ...maps-OTP-26.pretty => complex_maps.pretty} |    0
 .../check/comprehensions-OTP-27.pretty        |  382 -----
 .../check/comprehensions-OTP-28.pretty        |  382 -----
 ...ns-OTP-26.pretty => comprehensions.pretty} |    0
 .../check/contravariant-OTP-27.pretty         |   29 -
 .../check/contravariant-OTP-28.pretty         |   29 -
 ...ant-OTP-26.pretty => contravariant.pretty} |    0
 ...s-OTP-26.pretty => detached_specs1.pretty} |    0
 ...s-OTP-27.pretty => detached_specs2.pretty} |    0
 .../check/dyn_calls-OTP-27.pretty             |    8 -
 .../check/dyn_calls-OTP-28.pretty             |    8 -
 ...n_calls-OTP-26.pretty => dyn_calls.pretty} |    0
 .../check/dyn_remote_funs-OTP-27.pretty       |   41 -
 .../check/dyn_remote_funs-OTP-28.pretty       |   41 -
 ...s-OTP-26.pretty => dyn_remote_funs.pretty} |    0
 ...P-28.pretty => dynamic_callbacks_1.pretty} |    0
 ...P-26.pretty => dynamic_callbacks_2.pretty} |    0
 .../check/dynamic_calls-OTP-27.pretty         |  217 ---
 .../check/dynamic_calls-OTP-28.pretty         |  217 ---
 ...lls-OTP-26.pretty => dynamic_calls.pretty} |    0
 .../check/dynamic_catch-OTP-27.pretty         |   23 -
 .../check/dynamic_catch-OTP-28.pretty         |   23 -
 ...tch-OTP-26.pretty => dynamic_catch.pretty} |    0
 .../check/dynamic_fun-OTP-27.pretty           |  181 ---
 .../check/dynamic_fun-OTP-28.pretty           |  181 ---
 ...c_fun-OTP-26.pretty => dynamic_fun.pretty} |    0
 .../check/dynamic_generics-OTP-27.pretty      |  181 ---
 .../check/dynamic_generics-OTP-28.pretty      |  181 ---
 ...-OTP-26.pretty => dynamic_generics.pretty} |    0
 .../check/dynamic_local_funs-OTP-27.pretty    |   47 -
 .../check/dynamic_local_funs-OTP-28.pretty    |   47 -
 ...TP-26.pretty => dynamic_local_funs.pretty} |    0
 ...o-OTP-27.pretty => dynamic_receive.pretty} |    0
 .../check/dynamic_refine-OTP-27.pretty        |  176 ---
 .../check/dynamic_refine-OTP-28.pretty        |  176 ---
 ...ne-OTP-26.pretty => dynamic_refine.pretty} |    0
 ...OTP-28.pretty => dynamic_try_catch.pretty} |    0
 .../check/elab_clause-OTP-27.pretty           |   85 --
 .../check/elab_clause-OTP-28.pretty           |   85 --
 ...lause-OTP-26.pretty => elab_clause.pretty} |    0
 .../check/error_messages-OTP-27.pretty        |  128 --
 .../check/error_messages-OTP-28.pretty        |  128 --
 ...es-OTP-26.pretty => error_messages.pretty} |    0
 ...s1-OTP-26.pretty => fancy_generics.pretty} |    0
 .../check/format-OTP-27.pretty                |   22 -
 .../check/format-OTP-28.pretty                |   22 -
 .../{format-OTP-26.pretty => format.pretty}   |    0
 .../check/fun_stats-OTP-27.pretty             |   41 -
 .../check/fun_stats-OTP-28.pretty             |   41 -
 ...n_stats-OTP-26.pretty => fun_stats.pretty} |    0
 .../check/fun_stats2-OTP-27.pretty            |   25 -
 .../check/fun_stats2-OTP-28.pretty            |   25 -
 ...stats2-OTP-26.pretty => fun_stats2.pretty} |    0
 .../eqwalizer_tests/check/funs-OTP-27.pretty  |  373 -----
 .../eqwalizer_tests/check/funs-OTP-28.pretty  |  373 -----
 .../check/{funs-OTP-26.pretty => funs.pretty} |    0
 .../eqwalizer_tests/check/funs2-OTP-27.pretty |  135 --
 .../eqwalizer_tests/check/funs2-OTP-28.pretty |  135 --
 .../{funs2-OTP-26.pretty => funs2.pretty}     |    0
 .../check/funs_uncommon-OTP-27.pretty         |    9 -
 .../check/funs_uncommon-OTP-28.pretty         |    9 -
 ...mon-OTP-26.pretty => funs_uncommon.pretty} |    0
 .../generic_fun_application-OTP-27.pretty     | 1232 -----------------
 .../generic_fun_application-OTP-28.pretty     | 1232 -----------------
 ....pretty => generic_fun_application.pretty} |    0
 .../check/generics_with_unions-OTP-27.pretty  |  249 ----
 .../check/generics_with_unions-OTP-28.pretty  |  249 ----
 ...-26.pretty => generics_with_unions.pretty} |    0
 .../check/gradual_bounded-OTP-27.pretty       |  116 --
 .../check/gradual_bounded-OTP-28.pretty       |  116 --
 ...d-OTP-26.pretty => gradual_bounded.pretty} |    0
 .../check/gradual_complex_types-OTP-27.pretty |  120 --
 .../check/gradual_complex_types-OTP-28.pretty |  120 --
 ...26.pretty => gradual_complex_types.pretty} |    0
 .../check/gradual_custom-OTP-27.pretty        |  457 ------
 .../check/gradual_custom-OTP-28.pretty        |  457 ------
 ...om-OTP-26.pretty => gradual_custom.pretty} |    0
 .../check/gradual_lambdas-OTP-27.pretty       |   33 -
 .../check/gradual_lambdas-OTP-28.pretty       |   33 -
 ...s-OTP-26.pretty => gradual_lambdas.pretty} |    0
 .../check/gradual_maybe-OTP-27.pretty         |   93 --
 .../check/gradual_maybe-OTP-28.pretty         |   93 --
 ...ybe-OTP-26.pretty => gradual_maybe.pretty} |    0
 .../check/gradual_misc-OTP-27.pretty          |   57 -
 .../check/gradual_misc-OTP-28.pretty          |   57 -
 ...misc-OTP-26.pretty => gradual_misc.pretty} |    0
 .../check/gradual_overloaded-OTP-27.pretty    |   77 --
 .../check/gradual_overloaded-OTP-28.pretty    |   77 --
 ...TP-26.pretty => gradual_overloaded.pretty} |    0
 ...27.pretty => gradual_regression_01.pretty} |    0
 .../check/gradual_untyped-OTP-27.pretty       |   25 -
 .../check/gradual_untyped-OTP-28.pretty       |   25 -
 ...d-OTP-26.pretty => gradual_untyped.pretty} |    0
 .../check/guard_b_connections-OTP-27.pretty   |  121 --
 .../check/guard_b_connections-OTP-28.pretty   |  121 --
 ...P-26.pretty => guard_b_connections.pretty} |    0
 .../check/guards-OTP-27.pretty                |   37 -
 .../check/guards-OTP-28.pretty                |   37 -
 .../{guards-OTP-26.pretty => guards.pretty}   |    0
 .../check/guards_logic-OTP-27.pretty          |   73 -
 .../check/guards_logic-OTP-28.pretty          |   73 -
 ...ogic-OTP-26.pretty => guards_logic.pretty} |    0
 .../check/guards_simple-OTP-27.pretty         |   97 --
 .../check/guards_simple-OTP-28.pretty         |   97 --
 ...ple-OTP-26.pretty => guards_simple.pretty} |    0
 .../eqwalizer_tests/check/hints-OTP-27.pretty |   83 --
 .../eqwalizer_tests/check/hints-OTP-28.pretty |   83 --
 .../{hints-OTP-26.pretty => hints.pretty}     |    0
 .../check/index1-OTP-27.pretty                |   23 -
 .../check/index1-OTP-28.pretty                |   23 -
 .../{index1-OTP-26.pretty => index1.pretty}   |    0
 .../check/index2-OTP-27.pretty                |    9 -
 .../check/index2-OTP-28.pretty                |    9 -
 .../{index2-OTP-26.pretty => index2.pretty}   |    0
 .../check/iolists-OTP-27.pretty               |   85 --
 .../check/iolists-OTP-28.pretty               |   85 --
 .../{iolists-OTP-26.pretty => iolists.pretty} |    0
 ...ched_specs1-OTP-28.pretty => kp_01.pretty} |    0
 .../eqwalizer_tests/check/kp_02-OTP-27.pretty |   33 -
 .../eqwalizer_tests/check/kp_02-OTP-28.pretty |   33 -
 .../{kp_02-OTP-26.pretty => kp_02.pretty}     |    0
 .../check/lists_tests-OTP-27.pretty           |   57 -
 .../check/lists_tests-OTP-28.pretty           |   57 -
 ...tests-OTP-26.pretty => lists_tests.pretty} |    0
 .../eqwalizer_tests/check/misc-OTP-27.pretty  | 1011 --------------
 .../eqwalizer_tests/check/misc-OTP-28.pretty  | 1011 --------------
 .../check/{misc-OTP-26.pretty => misc.pretty} |    0
 ...d_specs2-OTP-26.pretty => misc_lib.pretty} |    0
 .../check/misc_nested1-OTP-28.pretty          |    1 -
 ...ecs2-OTP-27.pretty => misc_nested1.pretty} |    0
 .../check/misc_nested2-OTP-26.pretty          |    1 -
 .../check/misc_nested2-OTP-27.pretty          |    1 -
 .../check/misc_nested2-OTP-28.pretty          |    1 -
 ...ecs2-OTP-28.pretty => misc_nested2.pretty} |    0
 .../check/my_behaviour-OTP-26.pretty          |    1 -
 .../check/my_behaviour-OTP-27.pretty          |    1 -
 .../check/my_behaviour-OTP-28.pretty          |    1 -
 ...ks_1-OTP-26.pretty => my_behaviour.pretty} |    0
 .../check/my_gradual_behaviour-OTP-26.pretty  |    1 -
 .../check/my_gradual_behaviour-OTP-27.pretty  |    1 -
 .../check/my_gradual_behaviour-OTP-28.pretty  |    1 -
 ...-27.pretty => my_gradual_behaviour.pretty} |    0
 .../check/my_header-OTP-26.pretty             |    1 -
 .../check/my_header-OTP-27.pretty             |    1 -
 .../check/my_header-OTP-28.pretty             |    1 -
 ...backs_1-OTP-28.pretty => my_header.pretty} |    0
 .../eqwalizer_tests/check/neg-OTP-27.pretty   |   73 -
 .../eqwalizer_tests/check/neg-OTP-28.pretty   |   73 -
 .../check/{neg-OTP-26.pretty => neg.pretty}   |    0
 .../check/nowarn-OTP-27.pretty                |   21 -
 .../check/nowarn-OTP-28.pretty                |   21 -
 .../{nowarn-OTP-26.pretty => nowarn.pretty}   |    0
 .../check/number_comparisons-OTP-27.pretty    |   17 -
 .../check/number_comparisons-OTP-28.pretty    |   17 -
 ...TP-26.pretty => number_comparisons.pretty} |    0
 .../check/numbers-OTP-27.pretty               |  318 -----
 .../check/numbers-OTP-28.pretty               |  318 -----
 .../{numbers-OTP-26.pretty => numbers.pretty} |    0
 .../check/opaque-OTP-27.pretty                |  179 ---
 .../check/opaque-OTP-28.pretty                |  179 ---
 .../{opaque-OTP-26.pretty => opaque.pretty}   |    0
 .../eqwalizer_tests/check/other-OTP-27.pretty |   28 -
 .../eqwalizer_tests/check/other-OTP-28.pretty |   28 -
 .../{other-OTP-26.pretty => other.pretty}     |    0
 .../eqwalizer_tests/check/otp28-OTP-27.pretty |  159 ---
 .../eqwalizer_tests/check/otp28-OTP-28.pretty |  159 ---
 .../{otp28-OTP-26.pretty => otp28.pretty}     |    0
 .../check/otp_opaques-OTP-27.pretty           |  126 --
 .../check/otp_opaques-OTP-28.pretty           |  126 --
 ...aques-OTP-26.pretty => otp_opaques.pretty} |    0
 .../check/overloaded-OTP-27.pretty            |  160 ---
 .../check/overloaded-OTP-28.pretty            |  160 ---
 ...loaded-OTP-26.pretty => overloaded.pretty} |    0
 .../overloaded_specs_union-OTP-27.pretty      |   47 -
 .../overloaded_specs_union-OTP-28.pretty      |   47 -
 ...6.pretty => overloaded_specs_union.pretty} |    0
 .../check/parametricity-OTP-27.pretty         |   57 -
 .../check/parametricity-OTP-28.pretty         |   57 -
 ...ity-OTP-26.pretty => parametricity.pretty} |    0
 .../eqwalizer_tests/check/pats-OTP-27.pretty  |   23 -
 .../eqwalizer_tests/check/pats-OTP-28.pretty  |   23 -
 .../check/{pats-OTP-26.pretty => pats.pretty} |    0
 .../check/pinned-OTP-26.pretty                |    1 -
 .../check/pinned-OTP-27.pretty                |    1 -
 .../check/pinned-OTP-28.pretty                |    1 -
 ...allbacks_2-OTP-26.pretty => pinned.pretty} |    0
 .../eqwalizer_tests/check/pos-OTP-27.pretty   |    8 -
 .../eqwalizer_tests/check/pos-OTP-28.pretty   |    8 -
 .../check/{pos-OTP-26.pretty => pos.pretty}   |    0
 .../check/records-OTP-27.pretty               |  628 ---------
 .../check/records-OTP-28.pretty               |  628 ---------
 .../{records-OTP-26.pretty => records.pretty} |    0
 .../check/recursive_aliases-OTP-27.pretty     |  441 ------
 .../check/recursive_aliases-OTP-28.pretty     |  441 ------
 ...OTP-26.pretty => recursive_aliases.pretty} |    0
 .../check/refine-OTP-27.pretty                |  623 ---------
 .../check/refine-OTP-28.pretty                |  623 ---------
 .../{refine-OTP-26.pretty => refine.pretty}   |    0
 .../check/scoping-OTP-26.pretty               |    1 -
 .../check/scoping-OTP-27.pretty               |    1 -
 .../check/scoping-OTP-28.pretty               |    1 -
 ...llbacks_2-OTP-27.pretty => scoping.pretty} |    0
 .../eqwalizer_tests/check/skip-OTP-26.pretty  |    1 -
 .../eqwalizer_tests/check/skip-OTP-27.pretty  |    1 -
 .../eqwalizer_tests/check/skip-OTP-28.pretty  |    1 -
 ..._callbacks_2-OTP-28.pretty => skip.pretty} |    0
 .../check/static_maybe-OTP-27.pretty          |   17 -
 .../check/static_maybe-OTP-28.pretty          |   17 -
 ...aybe-OTP-26.pretty => static_maybe.pretty} |    0
 .../check/strict_complex_types-OTP-27.pretty  |   76 -
 .../check/strict_complex_types-OTP-28.pretty  |   76 -
 ...-26.pretty => strict_complex_types.pretty} |    0
 .../check/strict_fun-OTP-26.pretty            |    1 -
 .../check/strict_fun-OTP-27.pretty            |    1 -
 .../check/strict_fun-OTP-28.pretty            |    1 -
 ...eceive-OTP-26.pretty => strict_fun.pretty} |    0
 .../check/strict_receive-OTP-27.pretty        |    9 -
 .../check/strict_receive-OTP-28.pretty        |    9 -
 ...ve-OTP-26.pretty => strict_receive.pretty} |    0
 .../check/subtype_neg-OTP-27.pretty           |  391 ------
 .../check/subtype_neg-OTP-28.pretty           |  391 ------
 ...e_neg-OTP-26.pretty => subtype_neg.pretty} |    0
 .../check/subtype_pos-OTP-27.pretty           |   13 -
 .../check/subtype_pos-OTP-28.pretty           |   13 -
 ...e_pos-OTP-26.pretty => subtype_pos.pretty} |    0
 .../check/t_maps-OTP-27.pretty                |  915 ------------
 .../check/t_maps-OTP-28.pretty                |  915 ------------
 .../{t_maps-OTP-26.pretty => t_maps.pretty}   |    0
 .../check/tagged_tuples-OTP-26.pretty         |    1 -
 .../check/tagged_tuples-OTP-27.pretty         |    1 -
 .../check/tagged_tuples-OTP-28.pretty         |    1 -
 ...ive-OTP-27.pretty => tagged_tuples.pretty} |    0
 .../eqwalizer_tests/check/test-OTP-26.pretty  |    1 -
 .../eqwalizer_tests/check/test-OTP-27.pretty  |    1 -
 .../eqwalizer_tests/check/test-OTP-28.pretty  |    1 -
 ...amic_receive-OTP-28.pretty => test.pretty} |    0
 .../eqwalizer_tests/check/tries-OTP-27.pretty |   79 --
 .../eqwalizer_tests/check/tries-OTP-28.pretty |   79 --
 .../{tries-OTP-26.pretty => tries.pretty}     |    0
 .../check/tuple_union-OTP-27.pretty           |   60 -
 .../check/tuple_union-OTP-28.pretty           |   60 -
 ...union-OTP-26.pretty => tuple_union.pretty} |    0
 .../check/type_aliases-OTP-27.pretty          |  157 ---
 .../check/type_aliases-OTP-28.pretty          |  157 ---
 ...ases-OTP-26.pretty => type_aliases.pretty} |    0
 .../check/type_asserts-OTP-27.pretty          |  256 ----
 .../check/type_asserts-OTP-28.pretty          |  256 ----
 ...erts-OTP-26.pretty => type_asserts.pretty} |    0
 .../check/type_predicates-OTP-27.pretty       |   25 -
 .../check/type_predicates-OTP-28.pretty       |   25 -
 ...s-OTP-26.pretty => type_predicates.pretty} |    0
 .../check/united_fun-OTP-26.pretty            |    1 -
 .../check/united_fun-OTP-27.pretty            |    1 -
 .../check/united_fun-OTP-28.pretty            |    1 -
 ..._catch-OTP-26.pretty => united_fun.pretty} |    0
 .../check/unspecced-OTP-27.pretty             |   63 -
 .../check/unspecced-OTP-28.pretty             |   63 -
 ...specced-OTP-26.pretty => unspecced.pretty} |    0
 .../check/use_dynamic_gradual-OTP-27.pretty   |   25 -
 .../check/use_dynamic_gradual-OTP-28.pretty   |   25 -
 ...P-26.pretty => use_dynamic_gradual.pretty} |    0
 .../check/use_dynamic_strict-OTP-27.pretty    |   25 -
 .../check/use_dynamic_strict-OTP-28.pretty    |   25 -
 ...TP-26.pretty => use_dynamic_strict.pretty} |    0
 .../eqwalizer_tests/check/vars1-OTP-26.pretty |    1 -
 .../eqwalizer_tests/check/vars1-OTP-27.pretty |    1 -
 .../eqwalizer_tests/check/vars1-OTP-28.pretty |    1 -
 ...c_try_catch-OTP-27.pretty => vars1.pretty} |    0
 .../eqwalizer_tests/check/vars2-OTP-26.pretty |    1 -
 .../eqwalizer_tests/check/vars2-OTP-27.pretty |    1 -
 .../eqwalizer_tests/check/vars2-OTP-28.pretty |    1 -
 ...c_try_catch-OTP-28.pretty => vars2.pretty} |    0
 .../debug/attributes-OTP-26.pretty            |    1 -
 .../debug/attributes-OTP-27.pretty            |    1 -
 .../debug/attributes-OTP-28.pretty            |    1 -
 .../attributes.pretty}                        |    0
 .../debug/debug_header-OTP-27.pretty          |    7 -
 .../debug/debug_header-OTP-28.pretty          |    7 -
 ...ader-OTP-26.pretty => debug_header.pretty} |    0
 .../debug/expand-OTP-27.pretty                |   98 --
 .../debug/expand-OTP-28.pretty                |   98 --
 .../{expand-OTP-26.pretty => expand.pretty}   |    0
 .../eqwalizer_tests/debug/expr1-OTP-27.pretty |   17 -
 .../eqwalizer_tests/debug/expr1-OTP-28.pretty |   17 -
 .../{expr1-OTP-26.pretty => expr1.pretty}     |    0
 .../eqwalizer_tests/debug/expr2-OTP-26.pretty |    1 -
 .../eqwalizer_tests/debug/expr2-OTP-27.pretty |    1 -
 .../eqwalizer_tests/debug/expr2-OTP-28.pretty |    1 -
 .../expr2.pretty}                             |    0
 .../debug/records_wip-OTP-27.pretty           |   46 -
 .../debug/records_wip-OTP-28.pretty           |   46 -
 ...s_wip-OTP-26.pretty => records_wip.pretty} |    0
 .../debug/types1-OTP-27.pretty                |   15 -
 .../debug/types1-OTP-28.pretty                |   15 -
 .../{types1-OTP-26.pretty => types1.pretty}   |    0
 .../debug/types2-OTP-27.pretty                |   19 -
 .../debug/types2-OTP-28.pretty                |   19 -
 .../{types2-OTP-26.pretty => types2.pretty}   |    0
 .../debug/wip_maps-OTP-26.pretty              |    1 -
 .../debug/wip_maps-OTP-27.pretty              |    1 -
 .../debug/wip_maps-OTP-28.pretty              |    1 -
 .../wip_maps.pretty}                          |    0
 .../elm_core/basics-OTP-26.pretty             |    1 -
 .../elm_core/basics-OTP-27.pretty             |    1 -
 .../elm_core/basics-OTP-28.pretty             |    1 -
 .../basics.pretty}                            |    0
 .../elm_core/list-OTP-26.pretty               |    1 -
 .../elm_core/list-OTP-27.pretty               |    1 -
 .../elm_core/list-OTP-28.pretty               |    1 -
 .../list.pretty}                              |    0
 .../elm_core/map-OTP-26.pretty                |    1 -
 .../elm_core/map-OTP-27.pretty                |    1 -
 .../elm_core/map-OTP-28.pretty                |    1 -
 .../map.pretty}                               |    0
 .../elm_core/map_ffi-OTP-26.pretty            |    1 -
 .../elm_core/map_ffi-OTP-27.pretty            |    1 -
 .../elm_core/map_ffi-OTP-28.pretty            |    1 -
 .../map_ffi.pretty}                           |    0
 .../elm_core/maybe-OTP-26.pretty              |    1 -
 .../elm_core/maybe-OTP-27.pretty              |    1 -
 .../elm_core/maybe-OTP-28.pretty              |    1 -
 .../maybe.pretty}                             |    0
 .../elm_core/result-OTP-26.pretty             |    1 -
 .../elm_core/result-OTP-27.pretty             |    1 -
 .../elm_core/result-OTP-28.pretty             |    1 -
 .../result.pretty}                            |    0
 .../elm_core/tuple-OTP-26.pretty              |    1 -
 .../elm_core/tuple-OTP-27.pretty              |    1 -
 .../elm_core/tuple-OTP-28.pretty              |    1 -
 .../tuple.pretty}                             |    0
 .../eqwater/deep_tuples-OTP-27.pretty         |   33 -
 .../eqwater/deep_tuples-OTP-28.pretty         |   33 -
 ...uples-OTP-26.pretty => deep_tuples.pretty} |    0
 .../eqwater/eqwater-OTP-27.pretty             |  676 ---------
 .../eqwater/eqwater-OTP-28.pretty             |  676 ---------
 .../{eqwater-OTP-26.pretty => eqwater.pretty} |    0
 .../eqwater/eqwater_aliases-OTP-26.pretty     |    1 -
 .../eqwater/eqwater_aliases-OTP-27.pretty     |    1 -
 .../eqwater/eqwater_aliases-OTP-28.pretty     |    1 -
 .../eqwater_aliases.pretty}                   |    0
 .../eqwater/eqwater_generics-OTP-26.pretty    |    1 -
 .../eqwater/eqwater_generics-OTP-27.pretty    |    1 -
 .../eqwater/eqwater_generics-OTP-28.pretty    |    1 -
 .../eqwater_generics.pretty}                  |    0
 .../eqwater/eqwater_lists-OTP-27.pretty       |  168 ---
 .../eqwater/eqwater_lists-OTP-28.pretty       |  168 ---
 ...sts-OTP-26.pretty => eqwater_lists.pretty} |    0
 .../eqwater/eqwater_maps-OTP-27.pretty        |   91 --
 .../eqwater/eqwater_maps-OTP-28.pretty        |   91 --
 ...maps-OTP-26.pretty => eqwater_maps.pretty} |    0
 .../eqwater/eqwater_records-OTP-27.pretty     |  136 --
 .../eqwater/eqwater_records-OTP-28.pretty     |  136 --
 ...s-OTP-26.pretty => eqwater_records.pretty} |    0
 .../eqwater/eqwater_sound-OTP-27.pretty       |   73 -
 .../eqwater/eqwater_sound-OTP-28.pretty       |   73 -
 ...und-OTP-26.pretty => eqwater_sound.pretty} |    0
 .../unlimited_refinement-OTP-27.pretty        |   31 -
 .../unlimited_refinement-OTP-28.pretty        |   31 -
 ...-26.pretty => unlimited_refinement.pretty} |    0
 .../fault_tolerance-OTP-27.pretty             |  929 -------------
 .../fault_tolerance-OTP-28.pretty             |  929 -------------
 ...e-OTP-26.pretty => fault_tolerance.pretty} |    0
 .../options/bad_maps-OTP-27.pretty            |   15 -
 .../options/bad_maps-OTP-28.pretty            |   15 -
 ...bad_maps-OTP-26.pretty => bad_maps.pretty} |    0
 .../options/dynamic_lambdas-OTP-27.pretty     |   37 -
 .../options/dynamic_lambdas-OTP-28.pretty     |   37 -
 ...s-OTP-26.pretty => dynamic_lambdas.pretty} |    0
 ...rloaded_specs_dynamic_result-OTP-26.pretty |    1 -
 ...rloaded_specs_dynamic_result-OTP-27.pretty |    1 -
 ...rloaded_specs_dynamic_result-OTP-28.pretty |    1 -
 .../overloaded_specs_dynamic_result.pretty}   |    0
 .../options/redundant_guards-OTP-26.pretty    |    1 -
 .../options/redundant_guards-OTP-27.pretty    |    1 -
 .../options/redundant_guards-OTP-28.pretty    |    1 -
 .../redundant_guards.pretty}                  |    0
 .../options/uncovered_clauses-OTP-27.pretty   |   43 -
 .../options/uncovered_clauses-OTP-28.pretty   |   43 -
 ...OTP-26.pretty => uncovered_clauses.pretty} |    0
 .../eqwalizer_tests/check/src/custom.erl      |    2 +-
 428 files changed, 25 insertions(+), 29104 deletions(-)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/any_fun_type-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/any_fun_type-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{any_fun_type-OTP-26.pretty => any_fun_type.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/apply_none-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/apply_none-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{apply_none-OTP-26.pretty => apply_none.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/approx-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/approx-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{approx-OTP-26.pretty => approx.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/as_pat-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/as_pat-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{as_pat-OTP-26.pretty => as_pat.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/auto_imports-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/auto_imports-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{auto_imports-OTP-26.pretty => auto_imports.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/behave-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/behave-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{behave-OTP-26.pretty => behave.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/binaries-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/binaries-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{binaries-OTP-26.pretty => binaries.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/booleans-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/booleans-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{booleans-OTP-26.pretty => booleans.pretty} (100%)
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{callbacks1_pos-OTP-26.pretty => callbacks1_pos.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{callbacks3_neg-OTP-26.pretty => callbacks3_neg.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/callbacks4_neg-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/callbacks4_neg-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{callbacks4_neg-OTP-26.pretty => callbacks4_neg.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/callbacks5_neg-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/callbacks5_neg-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{callbacks5_neg-OTP-26.pretty => callbacks5_neg.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/callbacks6_neg-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/callbacks6_neg-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{callbacks6_neg-OTP-26.pretty => callbacks6_neg.pretty} (100%)
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{callbacks1_pos-OTP-27.pretty => callbacks7_overload_pos.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{case_predicates-OTP-26.pretty => case_predicates.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/check_SUITE-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/check_SUITE-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{check_SUITE-OTP-26.pretty => check_SUITE.pretty} (100%)
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{callbacks1_pos-OTP-28.pretty => compiler_macro.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/complex_maps-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/complex_maps-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{complex_maps-OTP-26.pretty => complex_maps.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/comprehensions-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/comprehensions-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{comprehensions-OTP-26.pretty => comprehensions.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/contravariant-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/contravariant-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{contravariant-OTP-26.pretty => contravariant.pretty} (100%)
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{callbacks7_overload_pos-OTP-26.pretty => detached_specs1.pretty} (100%)
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{callbacks7_overload_pos-OTP-27.pretty => detached_specs2.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/dyn_calls-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/dyn_calls-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{dyn_calls-OTP-26.pretty => dyn_calls.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/dyn_remote_funs-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/dyn_remote_funs-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{dyn_remote_funs-OTP-26.pretty => dyn_remote_funs.pretty} (100%)
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{callbacks7_overload_pos-OTP-28.pretty => dynamic_callbacks_1.pretty} (100%)
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{compiler_macro-OTP-26.pretty => dynamic_callbacks_2.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_calls-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_calls-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{dynamic_calls-OTP-26.pretty => dynamic_calls.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_catch-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_catch-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{dynamic_catch-OTP-26.pretty => dynamic_catch.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_fun-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_fun-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{dynamic_fun-OTP-26.pretty => dynamic_fun.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_generics-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_generics-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{dynamic_generics-OTP-26.pretty => dynamic_generics.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_local_funs-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_local_funs-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{dynamic_local_funs-OTP-26.pretty => dynamic_local_funs.pretty} (100%)
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{compiler_macro-OTP-27.pretty => dynamic_receive.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{dynamic_refine-OTP-26.pretty => dynamic_refine.pretty} (100%)
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{compiler_macro-OTP-28.pretty => dynamic_try_catch.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/elab_clause-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/elab_clause-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{elab_clause-OTP-26.pretty => elab_clause.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{error_messages-OTP-26.pretty => error_messages.pretty} (100%)
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{detached_specs1-OTP-26.pretty => fancy_generics.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/format-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/format-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{format-OTP-26.pretty => format.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{fun_stats-OTP-26.pretty => fun_stats.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats2-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats2-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{fun_stats2-OTP-26.pretty => fun_stats2.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/funs-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/funs-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{funs-OTP-26.pretty => funs.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/funs2-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/funs2-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{funs2-OTP-26.pretty => funs2.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/funs_uncommon-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/funs_uncommon-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{funs_uncommon-OTP-26.pretty => funs_uncommon.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/generic_fun_application-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/generic_fun_application-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{generic_fun_application-OTP-26.pretty => generic_fun_application.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/generics_with_unions-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/generics_with_unions-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{generics_with_unions-OTP-26.pretty => generics_with_unions.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/gradual_bounded-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/gradual_bounded-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{gradual_bounded-OTP-26.pretty => gradual_bounded.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/gradual_complex_types-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/gradual_complex_types-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{gradual_complex_types-OTP-26.pretty => gradual_complex_types.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/gradual_custom-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/gradual_custom-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{gradual_custom-OTP-26.pretty => gradual_custom.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/gradual_lambdas-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/gradual_lambdas-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{gradual_lambdas-OTP-26.pretty => gradual_lambdas.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/gradual_maybe-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/gradual_maybe-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{gradual_maybe-OTP-26.pretty => gradual_maybe.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{gradual_misc-OTP-26.pretty => gradual_misc.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/gradual_overloaded-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/gradual_overloaded-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{gradual_overloaded-OTP-26.pretty => gradual_overloaded.pretty} (100%)
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{detached_specs1-OTP-27.pretty => gradual_regression_01.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/gradual_untyped-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/gradual_untyped-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{gradual_untyped-OTP-26.pretty => gradual_untyped.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/guard_b_connections-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/guard_b_connections-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{guard_b_connections-OTP-26.pretty => guard_b_connections.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/guards-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/guards-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{guards-OTP-26.pretty => guards.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/guards_logic-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/guards_logic-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{guards_logic-OTP-26.pretty => guards_logic.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/guards_simple-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/guards_simple-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{guards_simple-OTP-26.pretty => guards_simple.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{hints-OTP-26.pretty => hints.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/index1-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/index1-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{index1-OTP-26.pretty => index1.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/index2-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/index2-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{index2-OTP-26.pretty => index2.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/iolists-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/iolists-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{iolists-OTP-26.pretty => iolists.pretty} (100%)
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{detached_specs1-OTP-28.pretty => kp_01.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/kp_02-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/kp_02-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{kp_02-OTP-26.pretty => kp_02.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{lists_tests-OTP-26.pretty => lists_tests.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/misc-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/misc-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{misc-OTP-26.pretty => misc.pretty} (100%)
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{detached_specs2-OTP-26.pretty => misc_lib.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested1-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{detached_specs2-OTP-27.pretty => misc_nested1.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested2-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested2-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested2-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{detached_specs2-OTP-28.pretty => misc_nested2.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/my_behaviour-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/my_behaviour-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/my_behaviour-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{dynamic_callbacks_1-OTP-26.pretty => my_behaviour.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/my_gradual_behaviour-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/my_gradual_behaviour-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/my_gradual_behaviour-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{dynamic_callbacks_1-OTP-27.pretty => my_gradual_behaviour.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/my_header-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/my_header-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/my_header-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{dynamic_callbacks_1-OTP-28.pretty => my_header.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/neg-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/neg-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{neg-OTP-26.pretty => neg.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/nowarn-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/nowarn-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{nowarn-OTP-26.pretty => nowarn.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/number_comparisons-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/number_comparisons-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{number_comparisons-OTP-26.pretty => number_comparisons.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/numbers-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/numbers-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{numbers-OTP-26.pretty => numbers.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/opaque-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/opaque-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{opaque-OTP-26.pretty => opaque.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{other-OTP-26.pretty => other.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/otp28-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/otp28-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{otp28-OTP-26.pretty => otp28.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/otp_opaques-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/otp_opaques-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{otp_opaques-OTP-26.pretty => otp_opaques.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/overloaded-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/overloaded-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{overloaded-OTP-26.pretty => overloaded.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/overloaded_specs_union-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/overloaded_specs_union-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{overloaded_specs_union-OTP-26.pretty => overloaded_specs_union.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/parametricity-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/parametricity-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{parametricity-OTP-26.pretty => parametricity.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{pats-OTP-26.pretty => pats.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/pinned-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/pinned-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/pinned-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{dynamic_callbacks_2-OTP-26.pretty => pinned.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/pos-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/pos-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{pos-OTP-26.pretty => pos.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{records-OTP-26.pretty => records.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/recursive_aliases-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/recursive_aliases-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{recursive_aliases-OTP-26.pretty => recursive_aliases.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/refine-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/refine-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{refine-OTP-26.pretty => refine.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/scoping-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/scoping-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/scoping-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{dynamic_callbacks_2-OTP-27.pretty => scoping.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/skip-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/skip-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/skip-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{dynamic_callbacks_2-OTP-28.pretty => skip.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/static_maybe-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/static_maybe-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{static_maybe-OTP-26.pretty => static_maybe.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/strict_complex_types-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/strict_complex_types-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{strict_complex_types-OTP-26.pretty => strict_complex_types.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/strict_fun-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/strict_fun-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/strict_fun-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{dynamic_receive-OTP-26.pretty => strict_fun.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/strict_receive-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/strict_receive-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{strict_receive-OTP-26.pretty => strict_receive.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/subtype_neg-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/subtype_neg-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{subtype_neg-OTP-26.pretty => subtype_neg.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/subtype_pos-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/subtype_pos-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{subtype_pos-OTP-26.pretty => subtype_pos.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/t_maps-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/t_maps-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{t_maps-OTP-26.pretty => t_maps.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/tagged_tuples-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/tagged_tuples-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/tagged_tuples-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{dynamic_receive-OTP-27.pretty => tagged_tuples.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/test-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/test-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/test-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{dynamic_receive-OTP-28.pretty => test.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/tries-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/tries-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{tries-OTP-26.pretty => tries.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/tuple_union-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/tuple_union-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{tuple_union-OTP-26.pretty => tuple_union.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/type_aliases-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/type_aliases-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{type_aliases-OTP-26.pretty => type_aliases.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/type_asserts-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/type_asserts-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{type_asserts-OTP-26.pretty => type_asserts.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/type_predicates-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/type_predicates-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{type_predicates-OTP-26.pretty => type_predicates.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/united_fun-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/united_fun-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/united_fun-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{dynamic_try_catch-OTP-26.pretty => united_fun.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/unspecced-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/unspecced-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{unspecced-OTP-26.pretty => unspecced.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_gradual-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_gradual-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{use_dynamic_gradual-OTP-26.pretty => use_dynamic_gradual.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_strict-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_strict-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{use_dynamic_strict-OTP-26.pretty => use_dynamic_strict.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/vars1-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/vars1-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/vars1-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{dynamic_try_catch-OTP-27.pretty => vars1.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/vars2-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/vars2-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/vars2-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{dynamic_try_catch-OTP-28.pretty => vars2.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/debug/attributes-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/debug/attributes-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/debug/attributes-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/{check/fancy_generics-OTP-26.pretty => debug/attributes.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/debug/debug_header-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/debug/debug_header-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/debug/{debug_header-OTP-26.pretty => debug_header.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/debug/expand-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/debug/expand-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/debug/{expand-OTP-26.pretty => expand.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/debug/expr1-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/debug/expr1-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/debug/{expr1-OTP-26.pretty => expr1.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/debug/expr2-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/debug/expr2-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/debug/expr2-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/{check/fancy_generics-OTP-27.pretty => debug/expr2.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/debug/records_wip-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/debug/records_wip-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/debug/{records_wip-OTP-26.pretty => records_wip.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/debug/types1-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/debug/types1-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/debug/{types1-OTP-26.pretty => types1.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/debug/types2-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/debug/types2-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/debug/{types2-OTP-26.pretty => types2.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/debug/wip_maps-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/debug/wip_maps-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/debug/wip_maps-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/{check/fancy_generics-OTP-28.pretty => debug/wip_maps.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/elm_core/basics-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/elm_core/basics-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/elm_core/basics-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/{check/gradual_regression_01-OTP-26.pretty => elm_core/basics.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/elm_core/list-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/elm_core/list-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/elm_core/list-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/{check/gradual_regression_01-OTP-27.pretty => elm_core/list.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/elm_core/map-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/elm_core/map-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/elm_core/map-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/{check/gradual_regression_01-OTP-28.pretty => elm_core/map.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/elm_core/map_ffi-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/elm_core/map_ffi-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/elm_core/map_ffi-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/{check/kp_01-OTP-26.pretty => elm_core/map_ffi.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/elm_core/maybe-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/elm_core/maybe-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/elm_core/maybe-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/{check/kp_01-OTP-27.pretty => elm_core/maybe.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/elm_core/result-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/elm_core/result-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/elm_core/result-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/{check/kp_01-OTP-28.pretty => elm_core/result.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/elm_core/tuple-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/elm_core/tuple-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/elm_core/tuple-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/{check/misc_lib-OTP-26.pretty => elm_core/tuple.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/eqwater/deep_tuples-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/eqwater/deep_tuples-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/eqwater/{deep_tuples-OTP-26.pretty => deep_tuples.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/eqwater/{eqwater-OTP-26.pretty => eqwater.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_aliases-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_aliases-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_aliases-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/{check/misc_lib-OTP-27.pretty => eqwater/eqwater_aliases.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_generics-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_generics-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_generics-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/{check/misc_lib-OTP-28.pretty => eqwater/eqwater_generics.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/eqwater/{eqwater_lists-OTP-26.pretty => eqwater_lists.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/eqwater/{eqwater_maps-OTP-26.pretty => eqwater_maps.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_records-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_records-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/eqwater/{eqwater_records-OTP-26.pretty => eqwater_records.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_sound-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_sound-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/eqwater/{eqwater_sound-OTP-26.pretty => eqwater_sound.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/eqwater/unlimited_refinement-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/eqwater/unlimited_refinement-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/eqwater/{unlimited_refinement-OTP-26.pretty => unlimited_refinement.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/{fault_tolerance-OTP-26.pretty => fault_tolerance.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/options/bad_maps-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/options/bad_maps-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/options/{bad_maps-OTP-26.pretty => bad_maps.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/options/dynamic_lambdas-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/options/dynamic_lambdas-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/options/{dynamic_lambdas-OTP-26.pretty => dynamic_lambdas.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/options/overloaded_specs_dynamic_result-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/options/overloaded_specs_dynamic_result-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/options/overloaded_specs_dynamic_result-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/{check/misc_nested1-OTP-26.pretty => options/overloaded_specs_dynamic_result.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/options/redundant_guards-OTP-26.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/options/redundant_guards-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/options/redundant_guards-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/{check/misc_nested1-OTP-27.pretty => options/redundant_guards.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/options/uncovered_clauses-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/options/uncovered_clauses-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/options/{uncovered_clauses-OTP-26.pretty => uncovered_clauses.pretty} (100%)

diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index e56057c740..2e34447609 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -434,13 +434,30 @@ mod tests {
                             .unwrap();
 
                         let otp_version = OTP_VERSION.as_ref().expect("MISSING OTP VERSION");
-                        let exp_path = expect_file!(format!(
-                            "../resources/test/{}/{}/{}-OTP-{}.pretty",
-                            project,
-                            app,
-                            module.as_str(),
-                            otp_version,
-                        ));
+                        let otp_version_regex =
+                            regex::bytes::Regex::new(&format!("{}OTPVersionDependent", "@"))
+                                .unwrap();
+                        let contents = analysis.file_text(file_id).unwrap();
+                        let otp_version_dependent = otp_version_regex
+                            .is_match(&contents.as_bytes()[0..(2001.min(contents.len()))]);
+                        let exp_path = {
+                            if otp_version_dependent {
+                                expect_file!(format!(
+                                    "../resources/test/{}/{}/{}-OTP-{}.pretty",
+                                    project,
+                                    app,
+                                    module.as_str(),
+                                    otp_version,
+                                ))
+                            } else {
+                                expect_file!(format!(
+                                    "../resources/test/{}/{}/{}.pretty",
+                                    project,
+                                    app,
+                                    module.as_str(),
+                                ))
+                            }
+                        };
                         let (stdout, _) = cli.to_strings();
                         assert_normalised_file(exp_path, &stdout, project_path.into(), false);
                     }
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/any_fun_type-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/any_fun_type-OTP-27.pretty
deleted file mode 100644
index c2a5c42406..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/any_fun_type-OTP-27.pretty
+++ /dev/null
@@ -1,116 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/any_fun_type.erl:46:21
-   │
-46 │ to_f_any_neg2(F) -> F.
-   │                     ^
-   │                     │
-   │                     F.
-Expression has type:   'f0' | fun((atom()) -> pid()) | 'f1'
-Context expected type: fun()
-   │                     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: fun((atom()) -> pid())
-  However the following candidate: 'f0'
-  Differs from the expected type:  fun()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/any_fun_type.erl:49:23
-   │
-49 │ f_any_to_f0_neg(F) -> F.
-   │                       ^ F.
-Expression has type:   fun()
-Context expected type: 'f0'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/any_fun_type.erl:61:31
-   │
-61 │     when is_function(F, 1) -> F.
-   │                               ^
-   │                               │
-   │                               F.
-Expression has type:   fun((term()) -> term())
-Context expected type: f2()
-   │                               
-
-Because in the expression's type:
-  Here the type is:     fun((term()) -> term())
-  Context expects type: fun((term(), term()) -> term())
-
------------------------------- Detailed message ------------------------------
-
-  fun((term()) -> term()) is not compatible with f2()
-  because
-  fun((term()) -> term()) is not compatible with fun((term(), term()) -> term())
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/any_fun_type.erl:64:1
-   │
-64 │ a_to_a(a) -> a.
-   │ ^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/any_fun_type.erl:92:24
-   │
-92 │ f5_to_f4_cov_neg(F) -> F.
-   │                        ^
-   │                        │
-   │                        F.
-Expression has type:   f5('a' | 'b')
-Context expected type: f4('a')
-   │                        
-
-Because in the expression's type:
-  fun((term()) ->
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  )
-
------------------------------- Detailed message ------------------------------
-
-  f5('a' | 'b') is not compatible with f4('a')
-  because
-  fun((term()) -> 'a' | 'b') is not compatible with f4('a')
-  because
-  fun((term()) -> 'a' | 'b') is not compatible with fun((...) -> 'a')
-  because
-  'a' | 'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/any_fun_type.erl:98:20
-   │
-98 │ apply_f4_neg(F) -> F(a).
-   │                    ^^^^ F('a').
-Expression has type:   number()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/any_fun_type.erl:113:22
-    │
-113 │ fun3_to_f4_neg(F) -> F.
-    │                      ^
-    │                      │
-    │                      F.
-Expression has type:   fun((term()) -> 'a' | 'b')
-Context expected type: f4('a')
-    │                      
-
-Because in the expression's type:
-  fun((term()) ->
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun((term()) -> 'a' | 'b') is not compatible with f4('a')
-  because
-  fun((term()) -> 'a' | 'b') is not compatible with fun((...) -> 'a')
-  because
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
-7 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/any_fun_type-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/any_fun_type-OTP-28.pretty
deleted file mode 100644
index c2a5c42406..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/any_fun_type-OTP-28.pretty
+++ /dev/null
@@ -1,116 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/any_fun_type.erl:46:21
-   │
-46 │ to_f_any_neg2(F) -> F.
-   │                     ^
-   │                     │
-   │                     F.
-Expression has type:   'f0' | fun((atom()) -> pid()) | 'f1'
-Context expected type: fun()
-   │                     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: fun((atom()) -> pid())
-  However the following candidate: 'f0'
-  Differs from the expected type:  fun()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/any_fun_type.erl:49:23
-   │
-49 │ f_any_to_f0_neg(F) -> F.
-   │                       ^ F.
-Expression has type:   fun()
-Context expected type: 'f0'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/any_fun_type.erl:61:31
-   │
-61 │     when is_function(F, 1) -> F.
-   │                               ^
-   │                               │
-   │                               F.
-Expression has type:   fun((term()) -> term())
-Context expected type: f2()
-   │                               
-
-Because in the expression's type:
-  Here the type is:     fun((term()) -> term())
-  Context expects type: fun((term(), term()) -> term())
-
------------------------------- Detailed message ------------------------------
-
-  fun((term()) -> term()) is not compatible with f2()
-  because
-  fun((term()) -> term()) is not compatible with fun((term(), term()) -> term())
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/any_fun_type.erl:64:1
-   │
-64 │ a_to_a(a) -> a.
-   │ ^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/any_fun_type.erl:92:24
-   │
-92 │ f5_to_f4_cov_neg(F) -> F.
-   │                        ^
-   │                        │
-   │                        F.
-Expression has type:   f5('a' | 'b')
-Context expected type: f4('a')
-   │                        
-
-Because in the expression's type:
-  fun((term()) ->
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  )
-
------------------------------- Detailed message ------------------------------
-
-  f5('a' | 'b') is not compatible with f4('a')
-  because
-  fun((term()) -> 'a' | 'b') is not compatible with f4('a')
-  because
-  fun((term()) -> 'a' | 'b') is not compatible with fun((...) -> 'a')
-  because
-  'a' | 'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/any_fun_type.erl:98:20
-   │
-98 │ apply_f4_neg(F) -> F(a).
-   │                    ^^^^ F('a').
-Expression has type:   number()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/any_fun_type.erl:113:22
-    │
-113 │ fun3_to_f4_neg(F) -> F.
-    │                      ^
-    │                      │
-    │                      F.
-Expression has type:   fun((term()) -> 'a' | 'b')
-Context expected type: f4('a')
-    │                      
-
-Because in the expression's type:
-  fun((term()) ->
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun((term()) -> 'a' | 'b') is not compatible with f4('a')
-  because
-  fun((term()) -> 'a' | 'b') is not compatible with fun((...) -> 'a')
-  because
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
-7 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/any_fun_type-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/any_fun_type.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/any_fun_type-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/any_fun_type.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/apply_none-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/apply_none-OTP-27.pretty
deleted file mode 100644
index 60ad8dc0ca..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/apply_none-OTP-27.pretty
+++ /dev/null
@@ -1,24 +0,0 @@
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/apply_none.erl:26:1
-   │  
-26 │ ╭ apply_none1(F)
-27 │ │     when is_function(F, 1),
-28 │ │     is_function(F, 2) ->
-29 │ │     F(a).
-   │ ╰────────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/apply_none.erl:32:1
-   │
-32 │ apply_none2(F) -> F(ok).
-   │ ^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/apply_none.erl:35:1
-   │  
-35 │ ╭ apply_none3(F) ->
-36 │ │     Res = F(ok),
-37 │ │     Res.
-   │ ╰───────^ Clause is not covered by spec
-
-3 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/apply_none-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/apply_none-OTP-28.pretty
deleted file mode 100644
index 60ad8dc0ca..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/apply_none-OTP-28.pretty
+++ /dev/null
@@ -1,24 +0,0 @@
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/apply_none.erl:26:1
-   │  
-26 │ ╭ apply_none1(F)
-27 │ │     when is_function(F, 1),
-28 │ │     is_function(F, 2) ->
-29 │ │     F(a).
-   │ ╰────────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/apply_none.erl:32:1
-   │
-32 │ apply_none2(F) -> F(ok).
-   │ ^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/apply_none.erl:35:1
-   │  
-35 │ ╭ apply_none3(F) ->
-36 │ │     Res = F(ok),
-37 │ │     Res.
-   │ ╰───────^ Clause is not covered by spec
-
-3 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/apply_none-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/apply_none.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/apply_none-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/apply_none.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/approx-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/approx-OTP-27.pretty
deleted file mode 100644
index 0fe7555553..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/approx-OTP-27.pretty
+++ /dev/null
@@ -1,105 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/approx.erl:36:5
-   │
-36 │     {X, X}.
-   │     ^^^^^^ {X, X}.
-Expression has type:   {dynamic(), dynamic()}
-Context expected type: 'ok'
-
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-   ┌─ check/src/approx.erl:39:1
-   │
-39 │ generics_with_unions:type_var_from_nowhere().
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Unknown id: generics_with_unions:type_var_from_nowhere/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/approx.erl:41:1
-   │  
-41 │ ╭ -spec test_trans_invalid1_neg(
-42 │ │     trans_invalid()
-43 │ │ ) -> nok.
-   │ ╰────────^ test_trans_invalid1_neg/1 references type with invalid definition: trans_invalid/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/approx.erl:47:1
-   │  
-47 │ ╭ -spec test_trans_invalid2_neg(
-48 │ │     trans_invalid()
-49 │ │ ) -> nok.
-   │ ╰────────^ test_trans_invalid2_neg/1 references type with invalid definition: trans_invalid/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/approx.erl:53:1
-   │  
-53 │ ╭ -spec test_trans_invalid3_neg(
-54 │ │     trans_invalid()
-55 │ │ ) -> nok.
-   │ ╰────────^ test_trans_invalid3_neg/1 references type with invalid definition: trans_invalid/0
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-   ┌─ check/src/approx.erl:62:30
-   │
-62 │ test_opaque_as_fun_neg(X) -> X(ok).
-   │                              ^ X.
-Expected fun type with arity 1
-Got: misc:o() | fun((term()) -> none())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/approx.erl:69:3
-   │
-69 │   Dyn2.
-   │   ^^^^
-   │   │
-   │   Dyn2.
-Expression has type:   string() | dynamic()
-Context expected type: 'anything'
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dynamic()
-  However the following candidate: string()
-  Differs from the expected type:  'anything'
-
------------------------------- Detailed message ------------------------------
-
-  string() | dynamic() is not compatible with 'anything'
-  because
-  string() is not compatible with 'anything'
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/approx.erl:74:1
-   │  
-74 │ ╭ dyn_union_1(N, D) ->
-75 │ │   Res = case D of
-76 │ │           1 -> N;
-77 │ │           2 -> D
-78 │ │         end,
-79 │ │   eqwalizer:reveal_type(Res),
-80 │ │   Res.
-   │ ╰─────^ Clause is not covered by spec
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/approx.erl:79:25
-   │
-79 │   eqwalizer:reveal_type(Res),
-   │                         ^^^ dynamic(number())
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/approx.erl:85:1
-   │  
-85 │ ╭ dyn_union_2(N, D) ->
-86 │ │   Res = case D of
-87 │ │           2 -> D;
-88 │ │           1 -> N
-89 │ │         end,
-90 │ │   eqwalizer:reveal_type(Res),
-91 │ │   Res.
-   │ ╰─────^ Clause is not covered by spec
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/approx.erl:90:25
-   │
-90 │   eqwalizer:reveal_type(Res),
-   │                         ^^^ dynamic(number())
-
-11 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/approx-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/approx-OTP-28.pretty
deleted file mode 100644
index 0fe7555553..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/approx-OTP-28.pretty
+++ /dev/null
@@ -1,105 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/approx.erl:36:5
-   │
-36 │     {X, X}.
-   │     ^^^^^^ {X, X}.
-Expression has type:   {dynamic(), dynamic()}
-Context expected type: 'ok'
-
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-   ┌─ check/src/approx.erl:39:1
-   │
-39 │ generics_with_unions:type_var_from_nowhere().
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Unknown id: generics_with_unions:type_var_from_nowhere/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/approx.erl:41:1
-   │  
-41 │ ╭ -spec test_trans_invalid1_neg(
-42 │ │     trans_invalid()
-43 │ │ ) -> nok.
-   │ ╰────────^ test_trans_invalid1_neg/1 references type with invalid definition: trans_invalid/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/approx.erl:47:1
-   │  
-47 │ ╭ -spec test_trans_invalid2_neg(
-48 │ │     trans_invalid()
-49 │ │ ) -> nok.
-   │ ╰────────^ test_trans_invalid2_neg/1 references type with invalid definition: trans_invalid/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/approx.erl:53:1
-   │  
-53 │ ╭ -spec test_trans_invalid3_neg(
-54 │ │     trans_invalid()
-55 │ │ ) -> nok.
-   │ ╰────────^ test_trans_invalid3_neg/1 references type with invalid definition: trans_invalid/0
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-   ┌─ check/src/approx.erl:62:30
-   │
-62 │ test_opaque_as_fun_neg(X) -> X(ok).
-   │                              ^ X.
-Expected fun type with arity 1
-Got: misc:o() | fun((term()) -> none())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/approx.erl:69:3
-   │
-69 │   Dyn2.
-   │   ^^^^
-   │   │
-   │   Dyn2.
-Expression has type:   string() | dynamic()
-Context expected type: 'anything'
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dynamic()
-  However the following candidate: string()
-  Differs from the expected type:  'anything'
-
------------------------------- Detailed message ------------------------------
-
-  string() | dynamic() is not compatible with 'anything'
-  because
-  string() is not compatible with 'anything'
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/approx.erl:74:1
-   │  
-74 │ ╭ dyn_union_1(N, D) ->
-75 │ │   Res = case D of
-76 │ │           1 -> N;
-77 │ │           2 -> D
-78 │ │         end,
-79 │ │   eqwalizer:reveal_type(Res),
-80 │ │   Res.
-   │ ╰─────^ Clause is not covered by spec
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/approx.erl:79:25
-   │
-79 │   eqwalizer:reveal_type(Res),
-   │                         ^^^ dynamic(number())
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/approx.erl:85:1
-   │  
-85 │ ╭ dyn_union_2(N, D) ->
-86 │ │   Res = case D of
-87 │ │           2 -> D;
-88 │ │           1 -> N
-89 │ │         end,
-90 │ │   eqwalizer:reveal_type(Res),
-91 │ │   Res.
-   │ ╰─────^ Clause is not covered by spec
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/approx.erl:90:25
-   │
-90 │   eqwalizer:reveal_type(Res),
-   │                         ^^^ dynamic(number())
-
-11 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/approx-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/approx.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/approx-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/approx.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/as_pat-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/as_pat-OTP-27.pretty
deleted file mode 100644
index da41873f62..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/as_pat-OTP-27.pretty
+++ /dev/null
@@ -1,17 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/as_pat.erl:51:38
-   │
-51 │ unboxL_neg(BN = #box_n{}) -> unbox_a(BN).
-   │                                      ^^ BN.
-Expression has type:   #box_n{}
-Context expected type: #box_a{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/as_pat.erl:61:38
-   │
-61 │ unboxR_neg(#box_n{} = BN) -> unbox_b(BN).
-   │                                      ^^ BN.
-Expression has type:   #box_n{}
-Context expected type: #box_b{}
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/as_pat-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/as_pat-OTP-28.pretty
deleted file mode 100644
index da41873f62..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/as_pat-OTP-28.pretty
+++ /dev/null
@@ -1,17 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/as_pat.erl:51:38
-   │
-51 │ unboxL_neg(BN = #box_n{}) -> unbox_a(BN).
-   │                                      ^^ BN.
-Expression has type:   #box_n{}
-Context expected type: #box_a{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/as_pat.erl:61:38
-   │
-61 │ unboxR_neg(#box_n{} = BN) -> unbox_b(BN).
-   │                                      ^^ BN.
-Expression has type:   #box_n{}
-Context expected type: #box_b{}
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/as_pat-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/as_pat.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/as_pat-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/as_pat.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/auto_imports-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/auto_imports-OTP-27.pretty
deleted file mode 100644
index f1d2ca6927..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/auto_imports-OTP-27.pretty
+++ /dev/null
@@ -1,16 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/auto_imports.erl:22:20
-   │
-22 │   erlang:error(ok, ok).
-   │                    ^^
-   │                    │
-   │                    'ok'.
-Expression has type:   'ok'
-Context expected type: [term()] | 'none'
-   │                    
-
-  'ok' is not compatible with [term()] | 'none'
-  because
-  'ok' is not compatible with [term()]
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/auto_imports-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/auto_imports-OTP-28.pretty
deleted file mode 100644
index f1d2ca6927..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/auto_imports-OTP-28.pretty
+++ /dev/null
@@ -1,16 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/auto_imports.erl:22:20
-   │
-22 │   erlang:error(ok, ok).
-   │                    ^^
-   │                    │
-   │                    'ok'.
-Expression has type:   'ok'
-Context expected type: [term()] | 'none'
-   │                    
-
-  'ok' is not compatible with [term()] | 'none'
-  because
-  'ok' is not compatible with [term()]
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/auto_imports-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/auto_imports.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/auto_imports-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/auto_imports.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/behave-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/behave-OTP-27.pretty
deleted file mode 100644
index df46470af5..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/behave-OTP-27.pretty
+++ /dev/null
@@ -1,13 +0,0 @@
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-  ┌─ check/src/behave.erl:8:20
-  │
-8 │ -callback foo() -> behave1:test().
-  │                    ^^^^^^^^^^^^^^ Unknown id: behave1:test/0
-
-error: unbound_type_var (See https://fb.me/eqwalizer_errors#unbound_type_var)
-   ┌─ check/src/behave.erl:10:1
-   │
-10 │ -type invalid() :: _T.
-   │ ^^^^^^^^^^^^^^^^^^^^^ _T: Type variable is unbound.
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/behave-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/behave-OTP-28.pretty
deleted file mode 100644
index df46470af5..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/behave-OTP-28.pretty
+++ /dev/null
@@ -1,13 +0,0 @@
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-  ┌─ check/src/behave.erl:8:20
-  │
-8 │ -callback foo() -> behave1:test().
-  │                    ^^^^^^^^^^^^^^ Unknown id: behave1:test/0
-
-error: unbound_type_var (See https://fb.me/eqwalizer_errors#unbound_type_var)
-   ┌─ check/src/behave.erl:10:1
-   │
-10 │ -type invalid() :: _T.
-   │ ^^^^^^^^^^^^^^^^^^^^^ _T: Type variable is unbound.
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/behave-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/behave.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/behave-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/behave.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/binaries-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/binaries-OTP-27.pretty
deleted file mode 100644
index 123c9c69cc..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/binaries-OTP-27.pretty
+++ /dev/null
@@ -1,65 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/binaries.erl:24:17
-   │
-24 │ test04_neg() -> <<>>.
-   │                 ^^^^ <<..>>.
-Expression has type:   binary()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/binaries.erl:32:20
-   │
-32 │ test05_neg(A) -> <<A/signed>>.
-   │                    ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/binaries.erl:35:23
-   │
-35 │ test06_neg(A, S) -> <<A:S>>.
-   │                       ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/binaries.erl:38:18
-   │
-38 │ test07_neg(A) -> [A].
-   │                  ^^^ [A].
-Expression has type:   [atom()]
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/binaries.erl:55:7
-   │
-55 │     <<"binary"/binary>>.
-   │       ^^^^^^^^ string_lit.
-Expression has type:   string()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/binaries.erl:74:9
-   │
-74 │     <<X:A>> = Bits,
-   │         ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/binaries.erl:80:9
-   │
-80 │     <<X:(self())>> = Bits,
-   │         ^^^^^^^^ erlang:self().
-Expression has type:   pid()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/binaries.erl:89:7
-   │
-89 │     <<[]>>.
-   │       ^^ [].
-Expression has type:   []
-Context expected type: number()
-
-8 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/binaries-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/binaries-OTP-28.pretty
deleted file mode 100644
index 123c9c69cc..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/binaries-OTP-28.pretty
+++ /dev/null
@@ -1,65 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/binaries.erl:24:17
-   │
-24 │ test04_neg() -> <<>>.
-   │                 ^^^^ <<..>>.
-Expression has type:   binary()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/binaries.erl:32:20
-   │
-32 │ test05_neg(A) -> <<A/signed>>.
-   │                    ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/binaries.erl:35:23
-   │
-35 │ test06_neg(A, S) -> <<A:S>>.
-   │                       ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/binaries.erl:38:18
-   │
-38 │ test07_neg(A) -> [A].
-   │                  ^^^ [A].
-Expression has type:   [atom()]
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/binaries.erl:55:7
-   │
-55 │     <<"binary"/binary>>.
-   │       ^^^^^^^^ string_lit.
-Expression has type:   string()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/binaries.erl:74:9
-   │
-74 │     <<X:A>> = Bits,
-   │         ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/binaries.erl:80:9
-   │
-80 │     <<X:(self())>> = Bits,
-   │         ^^^^^^^^ erlang:self().
-Expression has type:   pid()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/binaries.erl:89:7
-   │
-89 │     <<[]>>.
-   │       ^^ [].
-Expression has type:   []
-Context expected type: number()
-
-8 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/binaries-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/binaries.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/binaries-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/binaries.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/booleans-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/booleans-OTP-27.pretty
deleted file mode 100644
index 4407c43d42..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/booleans-OTP-27.pretty
+++ /dev/null
@@ -1,31 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/booleans.erl:47:3
-   │
-47 │   1 andalso b().
-   │   ^ 1.
-Expression has type:   number()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/booleans.erl:59:3
-   │
-59 │   dyn() andalso only_true().
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^^
-   │   │
-   │   _ andalso _.
-Expression has type:   'false' | 'true'
-Context expected type: 'true'
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'true'
-  However the following candidate: 'false'
-  Differs from the expected type:  'true'
-
------------------------------- Detailed message ------------------------------
-
-  'false' | 'true' is not compatible with 'true'
-  because
-  'false' is not compatible with 'true'
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/booleans-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/booleans-OTP-28.pretty
deleted file mode 100644
index 4407c43d42..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/booleans-OTP-28.pretty
+++ /dev/null
@@ -1,31 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/booleans.erl:47:3
-   │
-47 │   1 andalso b().
-   │   ^ 1.
-Expression has type:   number()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/booleans.erl:59:3
-   │
-59 │   dyn() andalso only_true().
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^^
-   │   │
-   │   _ andalso _.
-Expression has type:   'false' | 'true'
-Context expected type: 'true'
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'true'
-  However the following candidate: 'false'
-  Differs from the expected type:  'true'
-
------------------------------- Detailed message ------------------------------
-
-  'false' | 'true' is not compatible with 'true'
-  because
-  'false' is not compatible with 'true'
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/booleans-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/booleans.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/booleans-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/booleans.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks1_pos-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks1_pos.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/callbacks1_pos-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/callbacks1_pos.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-27.pretty
deleted file mode 100644
index 63be36e638..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-27.pretty
+++ /dev/null
@@ -1,14 +0,0 @@
-error: incorrect_return_type_in_cb_implementation (See https://fb.me/eqwalizer_errors#incorrect_return_type_in_cb_implementation)
-   ┌─ check/src/callbacks3_neg.erl:12:1
-   │
-12 │ -behavior(gen_server).
-   │ ^^^^^^^^^^^^^^^^^^^^^
-   │ │
-   │ Incorrect return type for implementation of gen_server:handle_cast/2. Expected: {'noreply', term()} | {'noreply', term(), timeout() | 'hibernate' | {'continue', term()}} | {'stop', term(), term()}, Got: 'wrong_ret'.
-   │ 
-
-  'wrong_ret' is not compatible with {'noreply', term()} | {'noreply', term(), timeout() | 'hibernate' | {'continue', term()}} | {'stop', term(), term()}
-  because
-  'wrong_ret' is not compatible with {'noreply', term()}
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-28.pretty
deleted file mode 100644
index a24c7a6a48..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-28.pretty
+++ /dev/null
@@ -1,14 +0,0 @@
-error: incorrect_return_type_in_cb_implementation (See https://fb.me/eqwalizer_errors#incorrect_return_type_in_cb_implementation)
-   ┌─ check/src/callbacks3_neg.erl:12:1
-   │
-12 │ -behavior(gen_server).
-   │ ^^^^^^^^^^^^^^^^^^^^^
-   │ │
-   │ Incorrect return type for implementation of gen_server:handle_cast/2. Expected: {'noreply', term()} | {'noreply', term(), gen_server:action()} | {'stop', term(), term()}, Got: 'wrong_ret'.
-   │ 
-
-  'wrong_ret' is not compatible with {'noreply', term()} | {'noreply', term(), gen_server:action()} | {'stop', term(), term()}
-  because
-  'wrong_ret' is not compatible with {'noreply', term()}
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks4_neg-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks4_neg-OTP-27.pretty
deleted file mode 100644
index b25bd83371..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks4_neg-OTP-27.pretty
+++ /dev/null
@@ -1,7 +0,0 @@
-error: behaviour_does_not_exist (See https://fb.me/eqwalizer_errors#behaviour_does_not_exist)
-  ┌─ check/src/callbacks4_neg.erl:9:1
-  │
-9 │ -behaviour(nonexistent).
-  │ ^^^^^^^^^^^^^^^^^^^^^^^ Behaviour does not exist: nonexistent
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks4_neg-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks4_neg-OTP-28.pretty
deleted file mode 100644
index b25bd83371..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks4_neg-OTP-28.pretty
+++ /dev/null
@@ -1,7 +0,0 @@
-error: behaviour_does_not_exist (See https://fb.me/eqwalizer_errors#behaviour_does_not_exist)
-  ┌─ check/src/callbacks4_neg.erl:9:1
-  │
-9 │ -behaviour(nonexistent).
-  │ ^^^^^^^^^^^^^^^^^^^^^^^ Behaviour does not exist: nonexistent
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks4_neg-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks4_neg.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/callbacks4_neg-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/callbacks4_neg.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks5_neg-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks5_neg-OTP-27.pretty
deleted file mode 100644
index 82ba8217dd..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks5_neg-OTP-27.pretty
+++ /dev/null
@@ -1,7 +0,0 @@
-error: incorrect_param_type_in_cb_implementation (See https://fb.me/eqwalizer_errors#incorrect_param_type_in_cb_implementation)
-   ┌─ check/src/callbacks5_neg.erl:13:1
-   │
-13 │ -behavior(gen_server).
-   │ ^^^^^^^^^^^^^^^^^^^^^ Parameter 1 in implementation of gen_server:format_status/2 has no overlap with expected parameter type. Expected: 'normal' | 'terminate', Got: 'bad'.
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks5_neg-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks5_neg-OTP-28.pretty
deleted file mode 100644
index 82ba8217dd..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks5_neg-OTP-28.pretty
+++ /dev/null
@@ -1,7 +0,0 @@
-error: incorrect_param_type_in_cb_implementation (See https://fb.me/eqwalizer_errors#incorrect_param_type_in_cb_implementation)
-   ┌─ check/src/callbacks5_neg.erl:13:1
-   │
-13 │ -behavior(gen_server).
-   │ ^^^^^^^^^^^^^^^^^^^^^ Parameter 1 in implementation of gen_server:format_status/2 has no overlap with expected parameter type. Expected: 'normal' | 'terminate', Got: 'bad'.
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks5_neg-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks5_neg.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/callbacks5_neg-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/callbacks5_neg.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks6_neg-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks6_neg-OTP-27.pretty
deleted file mode 100644
index a3c0bd398b..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks6_neg-OTP-27.pretty
+++ /dev/null
@@ -1,13 +0,0 @@
-error: missing_cb_implementation (See https://fb.me/eqwalizer_errors#missing_cb_implementation)
-  ┌─ check/src/callbacks6_neg.erl:8:1
-  │
-8 │ -behavior(behave).
-  │ ^^^^^^^^^^^^^^^^^ Missing implementation for behave callback use_invalid/0
-
-error: missing_cb_implementation (See https://fb.me/eqwalizer_errors#missing_cb_implementation)
-  ┌─ check/src/callbacks6_neg.erl:8:1
-  │
-8 │ -behavior(behave).
-  │ ^^^^^^^^^^^^^^^^^ Missing implementation for behave callback use_invalid2/0
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks6_neg-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks6_neg-OTP-28.pretty
deleted file mode 100644
index a3c0bd398b..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks6_neg-OTP-28.pretty
+++ /dev/null
@@ -1,13 +0,0 @@
-error: missing_cb_implementation (See https://fb.me/eqwalizer_errors#missing_cb_implementation)
-  ┌─ check/src/callbacks6_neg.erl:8:1
-  │
-8 │ -behavior(behave).
-  │ ^^^^^^^^^^^^^^^^^ Missing implementation for behave callback use_invalid/0
-
-error: missing_cb_implementation (See https://fb.me/eqwalizer_errors#missing_cb_implementation)
-  ┌─ check/src/callbacks6_neg.erl:8:1
-  │
-8 │ -behavior(behave).
-  │ ^^^^^^^^^^^^^^^^^ Missing implementation for behave callback use_invalid2/0
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks6_neg-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks6_neg.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/callbacks6_neg-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/callbacks6_neg.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks1_pos-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks7_overload_pos.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/callbacks1_pos-OTP-27.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/callbacks7_overload_pos.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-27.pretty
deleted file mode 100644
index 9aff530657..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-27.pretty
+++ /dev/null
@@ -1,126 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/case_predicates.erl:13:24
-   │
-13 │     {true, true} -> aa(X, Y);
-   │                        ^ X.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/case_predicates.erl:13:27
-   │
-13 │     {true, true} -> aa(X, Y);
-   │                           ^ Y.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/case_predicates.erl:14:20
-   │
-14 │     {true, _} -> a(X);
-   │                    ^ X.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/case_predicates.erl:15:20
-   │
-15 │     {_, true} -> a(Y);
-   │                    ^ Y.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/case_predicates.erl:16:10
-   │
-16 │     _ -> not-ok
-   │          ^^^^^^ not _.
-Expression has type:   boolean()
-Context expected type: 'ok' | 'not_ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/case_predicates.erl:16:13
-   │
-16 │     _ -> not-ok
-   │             ^^^ - _.
-Expression has type:   number()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/case_predicates.erl:16:14
-   │
-16 │     _ -> not-ok
-   │              ^^ 'ok'.
-Expression has type:   'ok'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/case_predicates.erl:124:14
-    │
-124 │     false -> {p, X}
-    │              ^^^^^^
-    │              │
-    │              {'p', X}.
-Expression has type:   {'p', pid() | reference()}
-Context expected type: {'a', atom()} | {'p', pid()}
-    │              
-
-Because in the expression's type:
-  { 'p', 
-    Here the type is a union type with some valid candidates: pid()
-    However the following candidate: reference()
-    Differs from the expected type:  pid()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  {'p', pid() | reference()} is not compatible with {'a', atom()} | {'p', pid()}
-  because
-  at tuple index 2:
-  {'p', pid() | reference()} is not compatible with {'p', pid()}
-  because
-  pid() | reference() is not compatible with pid()
-  because
-  reference() is not compatible with pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/case_predicates.erl:144:10
-    │
-144 │     _ -> X
-    │          ^
-    │          │
-    │          X.
-Expression has type:   'undefined' | 'restarting'
-Context expected type: {'p', pid()} | 'undefined'
-    │          
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'undefined'
-  However the following candidate: 'restarting'
-  Differs from the expected type:  {'p', pid()} | 'undefined'
-
------------------------------- Detailed message ------------------------------
-
-  'undefined' | 'restarting' is not compatible with {'p', pid()} | 'undefined'
-  because
-  'restarting' is not compatible with {'p', pid()} | 'undefined'
-  because
-  'restarting' is not compatible with {'p', pid()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/case_predicates.erl:174:16
-    │
-174 │   lists:nth(1, L).
-    │                ^ L.
-Expression has type:   #{dynamic() => dynamic()}
-Context expected type: [T]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/case_predicates.erl:174:16
-    │
-174 │   lists:nth(1, L).
-    │                ^ L.
-Expression has type:   #{dynamic() => dynamic()}
-Context expected type: [dynamic()]
-
-11 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-28.pretty
deleted file mode 100644
index 9aff530657..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-28.pretty
+++ /dev/null
@@ -1,126 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/case_predicates.erl:13:24
-   │
-13 │     {true, true} -> aa(X, Y);
-   │                        ^ X.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/case_predicates.erl:13:27
-   │
-13 │     {true, true} -> aa(X, Y);
-   │                           ^ Y.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/case_predicates.erl:14:20
-   │
-14 │     {true, _} -> a(X);
-   │                    ^ X.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/case_predicates.erl:15:20
-   │
-15 │     {_, true} -> a(Y);
-   │                    ^ Y.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/case_predicates.erl:16:10
-   │
-16 │     _ -> not-ok
-   │          ^^^^^^ not _.
-Expression has type:   boolean()
-Context expected type: 'ok' | 'not_ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/case_predicates.erl:16:13
-   │
-16 │     _ -> not-ok
-   │             ^^^ - _.
-Expression has type:   number()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/case_predicates.erl:16:14
-   │
-16 │     _ -> not-ok
-   │              ^^ 'ok'.
-Expression has type:   'ok'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/case_predicates.erl:124:14
-    │
-124 │     false -> {p, X}
-    │              ^^^^^^
-    │              │
-    │              {'p', X}.
-Expression has type:   {'p', pid() | reference()}
-Context expected type: {'a', atom()} | {'p', pid()}
-    │              
-
-Because in the expression's type:
-  { 'p', 
-    Here the type is a union type with some valid candidates: pid()
-    However the following candidate: reference()
-    Differs from the expected type:  pid()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  {'p', pid() | reference()} is not compatible with {'a', atom()} | {'p', pid()}
-  because
-  at tuple index 2:
-  {'p', pid() | reference()} is not compatible with {'p', pid()}
-  because
-  pid() | reference() is not compatible with pid()
-  because
-  reference() is not compatible with pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/case_predicates.erl:144:10
-    │
-144 │     _ -> X
-    │          ^
-    │          │
-    │          X.
-Expression has type:   'undefined' | 'restarting'
-Context expected type: {'p', pid()} | 'undefined'
-    │          
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'undefined'
-  However the following candidate: 'restarting'
-  Differs from the expected type:  {'p', pid()} | 'undefined'
-
------------------------------- Detailed message ------------------------------
-
-  'undefined' | 'restarting' is not compatible with {'p', pid()} | 'undefined'
-  because
-  'restarting' is not compatible with {'p', pid()} | 'undefined'
-  because
-  'restarting' is not compatible with {'p', pid()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/case_predicates.erl:174:16
-    │
-174 │   lists:nth(1, L).
-    │                ^ L.
-Expression has type:   #{dynamic() => dynamic()}
-Context expected type: [T]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/case_predicates.erl:174:16
-    │
-174 │   lists:nth(1, L).
-    │                ^ L.
-Expression has type:   #{dynamic() => dynamic()}
-Context expected type: [dynamic()]
-
-11 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/check_SUITE-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/check_SUITE-OTP-27.pretty
deleted file mode 100644
index 9e9f88bb38..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/check_SUITE-OTP-27.pretty
+++ /dev/null
@@ -1,9 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/test/check_SUITE.erl:13:11
-   │
-13 │ fail() -> wrong_ret.
-   │           ^^^^^^^^^ 'wrong_ret'.
-Expression has type:   'wrong_ret'
-Context expected type: pid()
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/check_SUITE-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/check_SUITE-OTP-28.pretty
deleted file mode 100644
index 9e9f88bb38..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/check_SUITE-OTP-28.pretty
+++ /dev/null
@@ -1,9 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/test/check_SUITE.erl:13:11
-   │
-13 │ fail() -> wrong_ret.
-   │           ^^^^^^^^^ 'wrong_ret'.
-Expression has type:   'wrong_ret'
-Context expected type: pid()
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/check_SUITE-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/check_SUITE.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/check_SUITE-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/check_SUITE.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks1_pos-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/compiler_macro.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/callbacks1_pos-OTP-28.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/compiler_macro.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/complex_maps-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/complex_maps-OTP-27.pretty
deleted file mode 100644
index 3143803509..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/complex_maps-OTP-27.pretty
+++ /dev/null
@@ -1,300 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:11:21
-   │
-11 │ downcast_neg1(X) -> X.
-   │                     ^
-   │                     │
-   │                     X.
-Expression has type:   #{a => 'b', c => 'd'}
-Context expected type: #{a => 'b'}
-   │                     
-
-Because in the expression's type:
-  Here the type is:     #{c => ...}
-  Context expects type: #{...}
-  The expected map has no corresponding key for: c.
-
------------------------------- Detailed message ------------------------------
-
-key `c` is declared in the former but not in the latter and the latter map has no default association
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:17:21
-   │
-17 │ downcast_neg2(X) -> X.
-   │                     ^
-   │                     │
-   │                     X.
-Expression has type:   #{a => 'b', c => 'd'}
-Context expected type: #{a => 'b', atom() => number()}
-   │                     
-
-Because in the expression's type:
-  #{ c =>
-    Here the type is:     'd'
-    Context expects type: number()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a => 'b', c => 'd'} is not compatible with #{a => 'b', atom() => number()}
-  because
-  #{a => 'b', c => 'd'} is not compatible with #{a => 'b', atom() => number()}
-  key `c` is declared in the former but not in the latter and key `c` isn't compatible with the default association of the latter map
-  because
-  'd' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:20:19
-   │
-20 │ upcast_neg1(X) -> X.
-   │                   ^
-   │                   │
-   │                   X.
-Expression has type:   #{a => 'b', atom() => atom()}
-Context expected type: #{a => 'b', c => 'd'}
-   │                   
-
-Because in the expression's type:
-  Here the type is:     #{atom() => atom()}
-  Context expects type: #{...} (no default association)
-  The expected map has no default association while the type of the expression has one.
-
------------------------------- Detailed message ------------------------------
-
-  #{a => 'b', atom() => atom()} is not compatible with #{a => 'b', c => 'd'}
-  key c is not present in the former map but is incompatible with its default association
-  because
-  atom() is not compatible with 'd'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:23:19
-   │
-23 │ upcast_neg2(X) -> X.
-   │                   ^
-   │                   │
-   │                   X.
-Expression has type:   #{a => 'b', atom() => number()}
-Context expected type: #{a => 'b', c => 'd', atom() => number()}
-   │                   
-
-Because in the expression's type:
-  #{ atom() =>
-    Here the type is:     number()
-    Context expects type: 'd'
-  , ... }
-  The context introduces a new association c => 'd' which is incompatible with the expression's default association.
-
------------------------------- Detailed message ------------------------------
-
-  #{a => 'b', atom() => number()} is not compatible with #{a => 'b', c => 'd', atom() => number()}
-  key c is not present in the former map but is incompatible with its default association
-  because
-  number() is not compatible with 'd'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:38:21
-   │
-38 │ downcast_neg3(X) -> X.
-   │                     ^
-   │                     │
-   │                     X.
-Expression has type:   #{a => 'b', atom() => atom()}
-Context expected type: #{a => 'b'}
-   │                     
-
-Because in the expression's type:
-  Here the type is:     #{atom() => atom()}
-  Context expects type: #{...} (no default association)
-  The expected map has no default association while the type of the expression has one.
-
------------------------------- Detailed message ------------------------------
-
-  #{a => 'b', atom() => atom()} is not compatible with #{a => 'b'}
-  because
-  #{a => 'b', atom() => atom()} is not compatible with #{a => 'b'}
-  the latter map has no default association while the first map has one
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:44:26
-   │
-44 │ downcast_dyn_neg_1(X) -> X.
-   │                          ^
-   │                          │
-   │                          X.
-Expression has type:   #{a => 'b', dynamic(atom()) => atom()}
-Context expected type: #{a => 'b'}
-   │                          
-
-Because in the expression's type:
-  Here the type is:     #{dynamic(atom()) => atom()}
-  Context expects type: #{...} (no default association)
-  The expected map has no default association while the type of the expression has one.
-
------------------------------- Detailed message ------------------------------
-
-  #{a => 'b', dynamic(atom()) => atom()} is not compatible with #{a => 'b'}
-  because
-  #{a => 'b', dynamic(atom()) => atom()} is not compatible with #{a => 'b'}
-  the latter map has no default association while the first map has one
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:47:26
-   │
-47 │ downcast_dyn_neg_2(X) -> X.
-   │                          ^
-   │                          │
-   │                          X.
-Expression has type:   #{a => 'b', atom() => dynamic(atom())}
-Context expected type: #{a => 'b'}
-   │                          
-
-Because in the expression's type:
-  Here the type is:     #{atom() => dynamic(atom())}
-  Context expects type: #{...} (no default association)
-  The expected map has no default association while the type of the expression has one.
-
------------------------------- Detailed message ------------------------------
-
-  #{a => 'b', atom() => dynamic(atom())} is not compatible with #{a => 'b'}
-  because
-  #{a => 'b', atom() => dynamic(atom())} is not compatible with #{a => 'b'}
-  the latter map has no default association while the first map has one
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:56:44
-   │
-56 │ tuple_key_get_neg(#{{ok, {a, b}} := V}) -> V.
-   │                                            ^ V.
-Expression has type:   'v'
-Context expected type: 'err'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:62:30
-   │
-62 │ tuple_key_maps_get_neg(M) -> maps:get({ok, {a, b}}, M).
-   │                              ^^^^^^^^^^^^^^^^^^^^^^^^^ maps:get({'ok', {'a', 'b'}}, M).
-Expression has type:   'v'
-Context expected type: 'err'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:71:32
-   │
-71 │ get_default_neg1(#{a := V}) -> V.
-   │                                ^ V.
-Expression has type:   'b'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:74:34
-   │
-74 │ get_default_neg2(#{def := V}) -> V.
-   │                                  ^ V.
-Expression has type:   number()
-Context expected type: 'b'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:77:41
-   │
-77 │ match_required_1_neg(#{b := _V} = M) -> M.
-   │                                         ^ M.
-Expression has type:   #{a := number(), b := dynamic(), atom() => dynamic()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:80:28
-   │
-80 │ compat_default_1_neg(X) -> X.
-   │                            ^
-   │                            │
-   │                            X.
-Expression has type:   #{atom() => binary()}
-Context expected type: #{a => binary(), atom() => atom()}
-   │                            
-
-Because in the expression's type:
-  #{ atom() =>
-    Here the type is:     binary()
-    Context expects type: atom()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{atom() => binary()} is not compatible with #{a => binary(), atom() => atom()}
-  the default associations are not compatible
-  because
-  binary() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:83:28
-   │
-83 │ compat_default_2_neg(X) -> X.
-   │                            ^
-   │                            │
-   │                            X.
-Expression has type:   #{a := 'b', atom() => binary()}
-Context expected type: #{a => 'b', {c, d} => atom() | binary(), term() => atom()}
-   │                            
-
-Because in the expression's type:
-  #{ atom() =>
-    Here the type is:     binary()
-    Context expects type: atom()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a := 'b', atom() => binary()} is not compatible with #{a => 'b', {c, d} => atom() | binary(), term() => atom()}
-  the default associations are not compatible
-  because
-  binary() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:86:28
-   │
-86 │ compat_default_3_neg(X) -> X.
-   │                            ^
-   │                            │
-   │                            X.
-Expression has type:   #{a := 'b', atom() => binary()}
-Context expected type: #{a => 'b', {c, d} => atom() | binary(), atom() => atom()}
-   │                            
-
-Because in the expression's type:
-  #{ atom() =>
-    Here the type is:     binary()
-    Context expects type: atom()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a := 'b', atom() => binary()} is not compatible with #{a => 'b', {c, d} => atom() | binary(), atom() => atom()}
-  the default associations are not compatible
-  because
-  binary() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:89:29
-   │
-89 │ dyn_domain_coerce_neg(X) -> X.
-   │                             ^
-   │                             │
-   │                             X.
-Expression has type:   #{dynamic() => atom()}
-Context expected type: #{dynamic() => binary()}
-   │                             
-
-Because in the expression's type:
-  #{ dynamic() =>
-    Here the type is:     atom()
-    Context expects type: binary()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{dynamic() => atom()} is not compatible with #{dynamic() => binary()}
-  the default associations are not compatible
-  because
-  atom() is not compatible with binary()
-
-16 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/complex_maps-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/complex_maps-OTP-28.pretty
deleted file mode 100644
index 3143803509..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/complex_maps-OTP-28.pretty
+++ /dev/null
@@ -1,300 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:11:21
-   │
-11 │ downcast_neg1(X) -> X.
-   │                     ^
-   │                     │
-   │                     X.
-Expression has type:   #{a => 'b', c => 'd'}
-Context expected type: #{a => 'b'}
-   │                     
-
-Because in the expression's type:
-  Here the type is:     #{c => ...}
-  Context expects type: #{...}
-  The expected map has no corresponding key for: c.
-
------------------------------- Detailed message ------------------------------
-
-key `c` is declared in the former but not in the latter and the latter map has no default association
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:17:21
-   │
-17 │ downcast_neg2(X) -> X.
-   │                     ^
-   │                     │
-   │                     X.
-Expression has type:   #{a => 'b', c => 'd'}
-Context expected type: #{a => 'b', atom() => number()}
-   │                     
-
-Because in the expression's type:
-  #{ c =>
-    Here the type is:     'd'
-    Context expects type: number()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a => 'b', c => 'd'} is not compatible with #{a => 'b', atom() => number()}
-  because
-  #{a => 'b', c => 'd'} is not compatible with #{a => 'b', atom() => number()}
-  key `c` is declared in the former but not in the latter and key `c` isn't compatible with the default association of the latter map
-  because
-  'd' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:20:19
-   │
-20 │ upcast_neg1(X) -> X.
-   │                   ^
-   │                   │
-   │                   X.
-Expression has type:   #{a => 'b', atom() => atom()}
-Context expected type: #{a => 'b', c => 'd'}
-   │                   
-
-Because in the expression's type:
-  Here the type is:     #{atom() => atom()}
-  Context expects type: #{...} (no default association)
-  The expected map has no default association while the type of the expression has one.
-
------------------------------- Detailed message ------------------------------
-
-  #{a => 'b', atom() => atom()} is not compatible with #{a => 'b', c => 'd'}
-  key c is not present in the former map but is incompatible with its default association
-  because
-  atom() is not compatible with 'd'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:23:19
-   │
-23 │ upcast_neg2(X) -> X.
-   │                   ^
-   │                   │
-   │                   X.
-Expression has type:   #{a => 'b', atom() => number()}
-Context expected type: #{a => 'b', c => 'd', atom() => number()}
-   │                   
-
-Because in the expression's type:
-  #{ atom() =>
-    Here the type is:     number()
-    Context expects type: 'd'
-  , ... }
-  The context introduces a new association c => 'd' which is incompatible with the expression's default association.
-
------------------------------- Detailed message ------------------------------
-
-  #{a => 'b', atom() => number()} is not compatible with #{a => 'b', c => 'd', atom() => number()}
-  key c is not present in the former map but is incompatible with its default association
-  because
-  number() is not compatible with 'd'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:38:21
-   │
-38 │ downcast_neg3(X) -> X.
-   │                     ^
-   │                     │
-   │                     X.
-Expression has type:   #{a => 'b', atom() => atom()}
-Context expected type: #{a => 'b'}
-   │                     
-
-Because in the expression's type:
-  Here the type is:     #{atom() => atom()}
-  Context expects type: #{...} (no default association)
-  The expected map has no default association while the type of the expression has one.
-
------------------------------- Detailed message ------------------------------
-
-  #{a => 'b', atom() => atom()} is not compatible with #{a => 'b'}
-  because
-  #{a => 'b', atom() => atom()} is not compatible with #{a => 'b'}
-  the latter map has no default association while the first map has one
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:44:26
-   │
-44 │ downcast_dyn_neg_1(X) -> X.
-   │                          ^
-   │                          │
-   │                          X.
-Expression has type:   #{a => 'b', dynamic(atom()) => atom()}
-Context expected type: #{a => 'b'}
-   │                          
-
-Because in the expression's type:
-  Here the type is:     #{dynamic(atom()) => atom()}
-  Context expects type: #{...} (no default association)
-  The expected map has no default association while the type of the expression has one.
-
------------------------------- Detailed message ------------------------------
-
-  #{a => 'b', dynamic(atom()) => atom()} is not compatible with #{a => 'b'}
-  because
-  #{a => 'b', dynamic(atom()) => atom()} is not compatible with #{a => 'b'}
-  the latter map has no default association while the first map has one
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:47:26
-   │
-47 │ downcast_dyn_neg_2(X) -> X.
-   │                          ^
-   │                          │
-   │                          X.
-Expression has type:   #{a => 'b', atom() => dynamic(atom())}
-Context expected type: #{a => 'b'}
-   │                          
-
-Because in the expression's type:
-  Here the type is:     #{atom() => dynamic(atom())}
-  Context expects type: #{...} (no default association)
-  The expected map has no default association while the type of the expression has one.
-
------------------------------- Detailed message ------------------------------
-
-  #{a => 'b', atom() => dynamic(atom())} is not compatible with #{a => 'b'}
-  because
-  #{a => 'b', atom() => dynamic(atom())} is not compatible with #{a => 'b'}
-  the latter map has no default association while the first map has one
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:56:44
-   │
-56 │ tuple_key_get_neg(#{{ok, {a, b}} := V}) -> V.
-   │                                            ^ V.
-Expression has type:   'v'
-Context expected type: 'err'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:62:30
-   │
-62 │ tuple_key_maps_get_neg(M) -> maps:get({ok, {a, b}}, M).
-   │                              ^^^^^^^^^^^^^^^^^^^^^^^^^ maps:get({'ok', {'a', 'b'}}, M).
-Expression has type:   'v'
-Context expected type: 'err'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:71:32
-   │
-71 │ get_default_neg1(#{a := V}) -> V.
-   │                                ^ V.
-Expression has type:   'b'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:74:34
-   │
-74 │ get_default_neg2(#{def := V}) -> V.
-   │                                  ^ V.
-Expression has type:   number()
-Context expected type: 'b'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:77:41
-   │
-77 │ match_required_1_neg(#{b := _V} = M) -> M.
-   │                                         ^ M.
-Expression has type:   #{a := number(), b := dynamic(), atom() => dynamic()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:80:28
-   │
-80 │ compat_default_1_neg(X) -> X.
-   │                            ^
-   │                            │
-   │                            X.
-Expression has type:   #{atom() => binary()}
-Context expected type: #{a => binary(), atom() => atom()}
-   │                            
-
-Because in the expression's type:
-  #{ atom() =>
-    Here the type is:     binary()
-    Context expects type: atom()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{atom() => binary()} is not compatible with #{a => binary(), atom() => atom()}
-  the default associations are not compatible
-  because
-  binary() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:83:28
-   │
-83 │ compat_default_2_neg(X) -> X.
-   │                            ^
-   │                            │
-   │                            X.
-Expression has type:   #{a := 'b', atom() => binary()}
-Context expected type: #{a => 'b', {c, d} => atom() | binary(), term() => atom()}
-   │                            
-
-Because in the expression's type:
-  #{ atom() =>
-    Here the type is:     binary()
-    Context expects type: atom()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a := 'b', atom() => binary()} is not compatible with #{a => 'b', {c, d} => atom() | binary(), term() => atom()}
-  the default associations are not compatible
-  because
-  binary() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:86:28
-   │
-86 │ compat_default_3_neg(X) -> X.
-   │                            ^
-   │                            │
-   │                            X.
-Expression has type:   #{a := 'b', atom() => binary()}
-Context expected type: #{a => 'b', {c, d} => atom() | binary(), atom() => atom()}
-   │                            
-
-Because in the expression's type:
-  #{ atom() =>
-    Here the type is:     binary()
-    Context expects type: atom()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a := 'b', atom() => binary()} is not compatible with #{a => 'b', {c, d} => atom() | binary(), atom() => atom()}
-  the default associations are not compatible
-  because
-  binary() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/complex_maps.erl:89:29
-   │
-89 │ dyn_domain_coerce_neg(X) -> X.
-   │                             ^
-   │                             │
-   │                             X.
-Expression has type:   #{dynamic() => atom()}
-Context expected type: #{dynamic() => binary()}
-   │                             
-
-Because in the expression's type:
-  #{ dynamic() =>
-    Here the type is:     atom()
-    Context expects type: binary()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{dynamic() => atom()} is not compatible with #{dynamic() => binary()}
-  the default associations are not compatible
-  because
-  atom() is not compatible with binary()
-
-16 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/complex_maps-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/complex_maps.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/complex_maps-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/complex_maps.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/comprehensions-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/comprehensions-OTP-27.pretty
deleted file mode 100644
index 396ce7fc52..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/comprehensions-OTP-27.pretty
+++ /dev/null
@@ -1,382 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:28:5
-   │
-28 │     [N || {_, N} <- L].
-   │     ^^^^^^^^^^^^^^^^^^
-   │     │
-   │     [ || ].
-Expression has type:   [number()]
-Context expected type: [atom()]
-   │     
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:40:16
-   │
-40 │     [X || X <- L].
-   │                ^ L.
-Expression has type:   term()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:48:5
-   │
-48 │     << Y || <<Y>> <= B >>.
-   │     ^^^^^^^^^^^^^^^^^^^^^ << || >>.
-Expression has type:   binary()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:48:8
-   │
-48 │     << Y || <<Y>> <= B >>.
-   │        ^ Y.
-Expression has type:   number()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:56:18
-   │
-56 │     << Y || Y <- B >>.
-   │                  ^ B.
-Expression has type:   binary()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:60:8
-   │
-60 │     << Y || <<Y>> <= LB >>.
-   │        ^ Y.
-Expression has type:   number()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:60:22
-   │
-60 │     << Y || <<Y>> <= LB >>.
-   │                      ^^ LB.
-Expression has type:   [binary()]
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:68:5
-   │
-68 │     [ Y || <<Y>> <= LB ].
-   │     ^^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     [ || ].
-Expression has type:   [number()]
-Context expected type: [binary()]
-   │     
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: binary()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [binary()]
-  because
-  number() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:72:5
-   │
-72 │     << Y || <<Y>> <= LB >>.
-   │     ^^^^^^^^^^^^^^^^^^^^^^ << || >>.
-Expression has type:   binary()
-Context expected type: [binary()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:72:8
-   │
-72 │     << Y || <<Y>> <= LB >>.
-   │        ^ Y.
-Expression has type:   number()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:76:8
-   │
-76 │     << Y || <<Y>> <= LB >>.
-   │        ^ Y.
-Expression has type:   number()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:90:22
-   │
-90 │     Res = [X || X <- L],
-   │                      ^ L.
-Expression has type:   term()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:100:22
-    │
-100 │     Res = [X || X <- L, X],
-    │                      ^ L.
-Expression has type:   boolean()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:116:14
-    │
-116 │     Res = << Y || <<Y>> <= LB >>,
-    │              ^ Y.
-Expression has type:   number()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:116:28
-    │
-116 │     Res = << Y || <<Y>> <= LB >>,
-    │                            ^^ LB.
-Expression has type:   [binary()]
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:121:24
-    │
-121 │     Res = << Y || Y <- B >>,
-    │                        ^ B.
-Expression has type:   binary()
-Context expected type: [term()]
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/comprehensions.erl:147:1
-    │
-147 │ test26(X) -> [Y || Y <- X].
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/comprehensions.erl:150:1
-    │  
-150 │ ╭ test27(X) ->
-151 │ │     Res = [Y || Y <- X],
-152 │ │     Res.
-    │ ╰───────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/comprehensions.erl:155:1
-    │  
-155 │ ╭ test28(X) ->
-156 │ │     << Y ||
-157 │ │         <<Y>> <= X >>.
-    │ ╰─────────────────────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:156:5
-    │  
-156 │ ╭     << Y ||
-157 │ │         <<Y>> <= X >>.
-    │ ╰─────────────────────^ << || >>.
-Expression has type:   binary()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:156:8
-    │
-156 │     << Y ||
-    │        ^ Y.
-Expression has type:   number()
-Context expected type: binary()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/comprehensions.erl:160:1
-    │  
-160 │ ╭ test29(X) ->
-161 │ │     Res = << Y ||
-162 │ │         <<Y>> <= X >>,
-163 │ │     Res.
-    │ ╰───────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:161:14
-    │
-161 │     Res = << Y ||
-    │              ^ Y.
-Expression has type:   number()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:163:5
-    │
-163 │     Res.
-    │     ^^^ Res.
-Expression has type:   binary()
-Context expected type: number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/comprehensions.erl:166:1
-    │  
-166 │ ╭ test30(X) ->
-167 │ │     << Y ||
-168 │ │         <<Y>> <= X >>.
-    │ ╰─────────────────────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:167:8
-    │
-167 │     << Y ||
-    │        ^ Y.
-Expression has type:   number()
-Context expected type: binary()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/comprehensions.erl:171:1
-    │  
-171 │ ╭ test31(X) ->
-172 │ │     Res = << Y ||
-173 │ │         <<Y>> <= X >>,
-174 │ │     Res.
-    │ ╰───────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:172:14
-    │
-172 │     Res = << Y ||
-    │              ^ Y.
-Expression has type:   number()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:184:5
-    │
-184 │     Res.
-    │     ^^^
-    │     │
-    │     Res.
-Expression has type:   [atom()]
-Context expected type: [binary()]
-    │     
-
-Because in the expression's type:
-  [
-    Here the type is:     atom()
-    Context expects type: binary()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [atom()] is not compatible with [binary()]
-  because
-  atom() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:226:5
-    │
-226 │     [X || X <- L, X].
-    │     ^^^^^^^^^^^^^^^^
-    │     │
-    │     [ || ].
-Expression has type:   ['true']
-Context expected type: ['false']
-    │     
-
-Because in the expression's type:
-  [
-    Here the type is:     'true'
-    Context expects type: 'false'
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  ['true'] is not compatible with ['false']
-  because
-  'true' is not compatible with 'false'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:231:5
-    │
-231 │     Res.
-    │     ^^^
-    │     │
-    │     Res.
-Expression has type:   ['true']
-Context expected type: ['false']
-    │     
-
-Because in the expression's type:
-  [
-    Here the type is:     'true'
-    Context expects type: 'false'
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  ['true'] is not compatible with ['false']
-  because
-  'true' is not compatible with 'false'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:239:5
-    │
-239 │     [Y || <<Y>> <= B, is_integer(Y) ].
-    │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    │     │
-    │     [ || ].
-Expression has type:   [number()]
-Context expected type: [atom()]
-    │     
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:267:5
-    │
-267 │     Res.
-    │     ^^^
-    │     │
-    │     Res.
-Expression has type:   [binary() | 'undefined']
-Context expected type: [binary()]
-    │     
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: binary()
-    However the following candidate: 'undefined'
-    Differs from the expected type:  binary()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [binary() | 'undefined'] is not compatible with [binary()]
-  because
-  binary() | 'undefined' is not compatible with binary()
-  because
-  'undefined' is not compatible with binary()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ check/src/comprehensions.erl:386:9
-    │
-386 │         F() || F <- Fs,
-    │         ^ F.
-Expected fun type with arity 0
-Got: fun(() -> atom()) | fun((number()) -> atom())
-
-34 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/comprehensions-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/comprehensions-OTP-28.pretty
deleted file mode 100644
index 396ce7fc52..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/comprehensions-OTP-28.pretty
+++ /dev/null
@@ -1,382 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:28:5
-   │
-28 │     [N || {_, N} <- L].
-   │     ^^^^^^^^^^^^^^^^^^
-   │     │
-   │     [ || ].
-Expression has type:   [number()]
-Context expected type: [atom()]
-   │     
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:40:16
-   │
-40 │     [X || X <- L].
-   │                ^ L.
-Expression has type:   term()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:48:5
-   │
-48 │     << Y || <<Y>> <= B >>.
-   │     ^^^^^^^^^^^^^^^^^^^^^ << || >>.
-Expression has type:   binary()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:48:8
-   │
-48 │     << Y || <<Y>> <= B >>.
-   │        ^ Y.
-Expression has type:   number()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:56:18
-   │
-56 │     << Y || Y <- B >>.
-   │                  ^ B.
-Expression has type:   binary()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:60:8
-   │
-60 │     << Y || <<Y>> <= LB >>.
-   │        ^ Y.
-Expression has type:   number()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:60:22
-   │
-60 │     << Y || <<Y>> <= LB >>.
-   │                      ^^ LB.
-Expression has type:   [binary()]
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:68:5
-   │
-68 │     [ Y || <<Y>> <= LB ].
-   │     ^^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     [ || ].
-Expression has type:   [number()]
-Context expected type: [binary()]
-   │     
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: binary()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [binary()]
-  because
-  number() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:72:5
-   │
-72 │     << Y || <<Y>> <= LB >>.
-   │     ^^^^^^^^^^^^^^^^^^^^^^ << || >>.
-Expression has type:   binary()
-Context expected type: [binary()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:72:8
-   │
-72 │     << Y || <<Y>> <= LB >>.
-   │        ^ Y.
-Expression has type:   number()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:76:8
-   │
-76 │     << Y || <<Y>> <= LB >>.
-   │        ^ Y.
-Expression has type:   number()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/comprehensions.erl:90:22
-   │
-90 │     Res = [X || X <- L],
-   │                      ^ L.
-Expression has type:   term()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:100:22
-    │
-100 │     Res = [X || X <- L, X],
-    │                      ^ L.
-Expression has type:   boolean()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:116:14
-    │
-116 │     Res = << Y || <<Y>> <= LB >>,
-    │              ^ Y.
-Expression has type:   number()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:116:28
-    │
-116 │     Res = << Y || <<Y>> <= LB >>,
-    │                            ^^ LB.
-Expression has type:   [binary()]
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:121:24
-    │
-121 │     Res = << Y || Y <- B >>,
-    │                        ^ B.
-Expression has type:   binary()
-Context expected type: [term()]
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/comprehensions.erl:147:1
-    │
-147 │ test26(X) -> [Y || Y <- X].
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/comprehensions.erl:150:1
-    │  
-150 │ ╭ test27(X) ->
-151 │ │     Res = [Y || Y <- X],
-152 │ │     Res.
-    │ ╰───────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/comprehensions.erl:155:1
-    │  
-155 │ ╭ test28(X) ->
-156 │ │     << Y ||
-157 │ │         <<Y>> <= X >>.
-    │ ╰─────────────────────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:156:5
-    │  
-156 │ ╭     << Y ||
-157 │ │         <<Y>> <= X >>.
-    │ ╰─────────────────────^ << || >>.
-Expression has type:   binary()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:156:8
-    │
-156 │     << Y ||
-    │        ^ Y.
-Expression has type:   number()
-Context expected type: binary()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/comprehensions.erl:160:1
-    │  
-160 │ ╭ test29(X) ->
-161 │ │     Res = << Y ||
-162 │ │         <<Y>> <= X >>,
-163 │ │     Res.
-    │ ╰───────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:161:14
-    │
-161 │     Res = << Y ||
-    │              ^ Y.
-Expression has type:   number()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:163:5
-    │
-163 │     Res.
-    │     ^^^ Res.
-Expression has type:   binary()
-Context expected type: number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/comprehensions.erl:166:1
-    │  
-166 │ ╭ test30(X) ->
-167 │ │     << Y ||
-168 │ │         <<Y>> <= X >>.
-    │ ╰─────────────────────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:167:8
-    │
-167 │     << Y ||
-    │        ^ Y.
-Expression has type:   number()
-Context expected type: binary()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/comprehensions.erl:171:1
-    │  
-171 │ ╭ test31(X) ->
-172 │ │     Res = << Y ||
-173 │ │         <<Y>> <= X >>,
-174 │ │     Res.
-    │ ╰───────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:172:14
-    │
-172 │     Res = << Y ||
-    │              ^ Y.
-Expression has type:   number()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:184:5
-    │
-184 │     Res.
-    │     ^^^
-    │     │
-    │     Res.
-Expression has type:   [atom()]
-Context expected type: [binary()]
-    │     
-
-Because in the expression's type:
-  [
-    Here the type is:     atom()
-    Context expects type: binary()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [atom()] is not compatible with [binary()]
-  because
-  atom() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:226:5
-    │
-226 │     [X || X <- L, X].
-    │     ^^^^^^^^^^^^^^^^
-    │     │
-    │     [ || ].
-Expression has type:   ['true']
-Context expected type: ['false']
-    │     
-
-Because in the expression's type:
-  [
-    Here the type is:     'true'
-    Context expects type: 'false'
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  ['true'] is not compatible with ['false']
-  because
-  'true' is not compatible with 'false'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:231:5
-    │
-231 │     Res.
-    │     ^^^
-    │     │
-    │     Res.
-Expression has type:   ['true']
-Context expected type: ['false']
-    │     
-
-Because in the expression's type:
-  [
-    Here the type is:     'true'
-    Context expects type: 'false'
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  ['true'] is not compatible with ['false']
-  because
-  'true' is not compatible with 'false'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:239:5
-    │
-239 │     [Y || <<Y>> <= B, is_integer(Y) ].
-    │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    │     │
-    │     [ || ].
-Expression has type:   [number()]
-Context expected type: [atom()]
-    │     
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/comprehensions.erl:267:5
-    │
-267 │     Res.
-    │     ^^^
-    │     │
-    │     Res.
-Expression has type:   [binary() | 'undefined']
-Context expected type: [binary()]
-    │     
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: binary()
-    However the following candidate: 'undefined'
-    Differs from the expected type:  binary()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [binary() | 'undefined'] is not compatible with [binary()]
-  because
-  binary() | 'undefined' is not compatible with binary()
-  because
-  'undefined' is not compatible with binary()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ check/src/comprehensions.erl:386:9
-    │
-386 │         F() || F <- Fs,
-    │         ^ F.
-Expected fun type with arity 0
-Got: fun(() -> atom()) | fun((number()) -> atom())
-
-34 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/comprehensions-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/comprehensions.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/comprehensions-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/comprehensions.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/contravariant-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/contravariant-OTP-27.pretty
deleted file mode 100644
index 69c58c0e77..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/contravariant-OTP-27.pretty
+++ /dev/null
@@ -1,29 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/contravariant.erl:54:33
-   │
-54 │ contravariant_subtype_neg(F) -> F.
-   │                                 ^
-   │                                 │
-   │                                 F.
-Expression has type:   ref_contravariant('a')
-Context expected type: ref_contravariant_ab()
-   │                                 
-
-Because in the expression's type:
-  fun((
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  ) -> 'ok')
-
------------------------------- Detailed message ------------------------------
-
-  ref_contravariant('a') is not compatible with ref_contravariant_ab()
-  because
-  contravariant('a') is not compatible with ref_contravariant_ab()
-  because
-  fun(('a') -> 'ok') is not compatible with ref_contravariant_ab()
-  because
-  fun(('a') -> 'ok') is not compatible with ref_contravariant('a' | 'b')
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/contravariant-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/contravariant-OTP-28.pretty
deleted file mode 100644
index 69c58c0e77..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/contravariant-OTP-28.pretty
+++ /dev/null
@@ -1,29 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/contravariant.erl:54:33
-   │
-54 │ contravariant_subtype_neg(F) -> F.
-   │                                 ^
-   │                                 │
-   │                                 F.
-Expression has type:   ref_contravariant('a')
-Context expected type: ref_contravariant_ab()
-   │                                 
-
-Because in the expression's type:
-  fun((
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  ) -> 'ok')
-
------------------------------- Detailed message ------------------------------
-
-  ref_contravariant('a') is not compatible with ref_contravariant_ab()
-  because
-  contravariant('a') is not compatible with ref_contravariant_ab()
-  because
-  fun(('a') -> 'ok') is not compatible with ref_contravariant_ab()
-  because
-  fun(('a') -> 'ok') is not compatible with ref_contravariant('a' | 'b')
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/contravariant-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/contravariant.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/contravariant-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/contravariant.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks7_overload_pos-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/detached_specs1.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/callbacks7_overload_pos-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/detached_specs1.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks7_overload_pos-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/detached_specs2.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/callbacks7_overload_pos-OTP-27.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/detached_specs2.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dyn_calls-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dyn_calls-OTP-27.pretty
deleted file mode 100644
index 4871b7bbeb..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dyn_calls-OTP-27.pretty
+++ /dev/null
@@ -1,8 +0,0 @@
-error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
-   ┌─ check/src/dyn_calls.erl:49:3
-   │
-49 │   (fun() -> res end)(arg),
-   │   ^^^^^^^^^^^^^^^^^^ fun.
-fun with arity 0 used as fun with 1 arguments
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dyn_calls-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dyn_calls-OTP-28.pretty
deleted file mode 100644
index 4871b7bbeb..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dyn_calls-OTP-28.pretty
+++ /dev/null
@@ -1,8 +0,0 @@
-error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
-   ┌─ check/src/dyn_calls.erl:49:3
-   │
-49 │   (fun() -> res end)(arg),
-   │   ^^^^^^^^^^^^^^^^^^ fun.
-fun with arity 0 used as fun with 1 arguments
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dyn_calls-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dyn_calls.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/dyn_calls-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/dyn_calls.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dyn_remote_funs-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dyn_remote_funs-OTP-27.pretty
deleted file mode 100644
index 9c82c19829..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dyn_remote_funs-OTP-27.pretty
+++ /dev/null
@@ -1,41 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dyn_remote_funs.erl:69:12
-   │
-69 │         -> Res;
-   │            ^^^ Res.
-Expression has type:   fun((term(), term()) -> term())
-Context expected type: fun((none()) -> term())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dyn_remote_funs.erl:80:5
-   │
-80 │     fun M:F/2.
-   │     ^^^^^^^^^ M:F/2.
-Expression has type:   fun((dynamic(), dynamic()) -> dynamic())
-Context expected type: 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dyn_remote_funs.erl:85:9
-   │
-85 │ fun M:F/A.
-   │         ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dyn_remote_funs.erl:90:1
-   │
-90 │ fun M:F/A.
-   │ ^^^^^^^^^ M:F/A.
-Expression has type:   fun()
-Context expected type: 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dyn_remote_funs.erl:90:9
-   │
-90 │ fun M:F/A.
-   │         ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-5 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dyn_remote_funs-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dyn_remote_funs-OTP-28.pretty
deleted file mode 100644
index 9c82c19829..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dyn_remote_funs-OTP-28.pretty
+++ /dev/null
@@ -1,41 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dyn_remote_funs.erl:69:12
-   │
-69 │         -> Res;
-   │            ^^^ Res.
-Expression has type:   fun((term(), term()) -> term())
-Context expected type: fun((none()) -> term())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dyn_remote_funs.erl:80:5
-   │
-80 │     fun M:F/2.
-   │     ^^^^^^^^^ M:F/2.
-Expression has type:   fun((dynamic(), dynamic()) -> dynamic())
-Context expected type: 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dyn_remote_funs.erl:85:9
-   │
-85 │ fun M:F/A.
-   │         ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dyn_remote_funs.erl:90:1
-   │
-90 │ fun M:F/A.
-   │ ^^^^^^^^^ M:F/A.
-Expression has type:   fun()
-Context expected type: 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dyn_remote_funs.erl:90:9
-   │
-90 │ fun M:F/A.
-   │         ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-5 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dyn_remote_funs-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dyn_remote_funs.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/dyn_remote_funs-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/dyn_remote_funs.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks7_overload_pos-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_callbacks_1.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/callbacks7_overload_pos-OTP-28.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_callbacks_1.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/compiler_macro-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_callbacks_2.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/compiler_macro-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_callbacks_2.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_calls-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_calls-OTP-27.pretty
deleted file mode 100644
index a8dc692a9b..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_calls-OTP-27.pretty
+++ /dev/null
@@ -1,217 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:22:5
-   │
-22 │     F(X).
-   │     ^^^^ F(X).
-Expression has type:   'b'
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:38:5
-   │
-38 │     (Rec#rec.method)(atom).
-   │     ^^^^^^^^^^^^^^^^^^^^^^ (...#rec.method)('atom').
-Expression has type:   pid()
-Context expected type: number()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-   ┌─ check/src/dynamic_calls.erl:47:19
-   │
-47 │ test_06_neg(F) -> F(1, 2).
-   │                   ^ F.
-Expected fun type with arity 2
-Got: fun(('a') -> 'b')
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:57:5
-   │
-57 │     F().
-   │     ^^^ F().
-Expression has type:   'ok'
-Context expected type: pid()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-   ┌─ check/src/dynamic_calls.erl:62:5
-   │
-62 │     F(1).
-   │     ^ F.
-Expected fun type with arity 1
-Got: fun(() -> 'ok')
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-   ┌─ check/src/dynamic_calls.erl:71:5
-   │
-71 │     (fun ret_ok/0)(1, 2).
-   │     ^^^^^^^^^^^^^^ ret_ok/0.
-Expected fun type with arity 2
-Got: fun(() -> 'ok')
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:78:5
-   │
-78 │     (FUnion)(false).
-   │     ^^^^^^^^^^^^^^^ FUnion('false').
-Expression has type:   'r1' | 'r2'
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:78:5
-   │
-78 │     (FUnion)(false).
-   │     ^^^^^^^^^^^^^^^ FUnion('false').
-Expression has type:   'r2' | 'r3'
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:78:14
-   │
-78 │     (FUnion)(false).
-   │              ^^^^^
-   │              │
-   │              'false'.
-Expression has type:   'false'
-Context expected type: 'a1' | 'a2'
-   │              
-
-  'false' is not compatible with 'a1' | 'a2'
-  because
-  'false' is not compatible with 'a1'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:78:14
-   │
-78 │     (FUnion)(false).
-   │              ^^^^^
-   │              │
-   │              'false'.
-Expression has type:   'false'
-Context expected type: 'a2' | 'a3'
-   │              
-
-  'false' is not compatible with 'a2' | 'a3'
-  because
-  'false' is not compatible with 'a2'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:86:20
-   │
-86 │     Res = (FUnion)(false),
-   │                    ^^^^^
-   │                    │
-   │                    'false'.
-Expression has type:   'false'
-Context expected type: 'a1' | 'a2'
-   │                    
-
-  'false' is not compatible with 'a1' | 'a2'
-  because
-  'false' is not compatible with 'a1'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:86:20
-   │
-86 │     Res = (FUnion)(false),
-   │                    ^^^^^
-   │                    │
-   │                    'false'.
-Expression has type:   'false'
-Context expected type: 'a2' | 'a3'
-   │                    
-
-  'false' is not compatible with 'a2' | 'a3'
-  because
-  'false' is not compatible with 'a2'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:87:5
-   │
-87 │     Res.
-   │     ^^^ Res.
-Expression has type:   'r1' | 'r2' | 'r3'
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:94:5
-   │
-94 │     (FUnion)(a2).
-   │     ^^^^^^^^^^^^
-   │     │
-   │     FUnion('a2').
-Expression has type:   'r1' | 'r2'
-Context expected type: 'r1'
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'r1'
-  However the following candidate: 'r2'
-  Differs from the expected type:  'r1'
-
------------------------------- Detailed message ------------------------------
-
-  'r1' | 'r2' is not compatible with 'r1'
-  because
-  'r2' is not compatible with 'r1'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:94:5
-   │
-94 │     (FUnion)(a2).
-   │     ^^^^^^^^^^^^ FUnion('a2').
-Expression has type:   'r2' | 'r3'
-Context expected type: 'r1'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_calls.erl:102:5
-    │
-102 │     Res.
-    │     ^^^
-    │     │
-    │     Res.
-Expression has type:   'r1' | 'r2' | 'r3'
-Context expected type: 'r1'
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'r1'
-  However the following candidate: 'r2'
-  Differs from the expected type:  'r1'
-
------------------------------- Detailed message ------------------------------
-
-  'r1' | 'r2' | 'r3' is not compatible with 'r1'
-  because
-  'r2' is not compatible with 'r1'
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ check/src/dynamic_calls.erl:108:5
-    │
-108 │     (F)(a).
-    │     ^^^ F.
-Expected fun type with arity 1
-Got: fun(('a') -> 'b') | 'z'
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ check/src/dynamic_calls.erl:114:11
-    │
-114 │     Res = (F)(a),
-    │           ^^^ F.
-Expected fun type with arity 1
-Got: fun(('a') -> 'b') | 'z'
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ check/src/dynamic_calls.erl:138:5
-    │
-138 │     (F)(a).
-    │     ^^^ F.
-Expected fun type with arity 1
-Got: fun(('a') -> 'b') | fun(() -> 'b')
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ check/src/dynamic_calls.erl:144:11
-    │
-144 │     Res = (F)(a),
-    │           ^^^ F.
-Expected fun type with arity 1
-Got: fun(('a') -> 'b') | fun(() -> 'b')
-
-20 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_calls-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_calls-OTP-28.pretty
deleted file mode 100644
index a8dc692a9b..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_calls-OTP-28.pretty
+++ /dev/null
@@ -1,217 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:22:5
-   │
-22 │     F(X).
-   │     ^^^^ F(X).
-Expression has type:   'b'
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:38:5
-   │
-38 │     (Rec#rec.method)(atom).
-   │     ^^^^^^^^^^^^^^^^^^^^^^ (...#rec.method)('atom').
-Expression has type:   pid()
-Context expected type: number()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-   ┌─ check/src/dynamic_calls.erl:47:19
-   │
-47 │ test_06_neg(F) -> F(1, 2).
-   │                   ^ F.
-Expected fun type with arity 2
-Got: fun(('a') -> 'b')
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:57:5
-   │
-57 │     F().
-   │     ^^^ F().
-Expression has type:   'ok'
-Context expected type: pid()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-   ┌─ check/src/dynamic_calls.erl:62:5
-   │
-62 │     F(1).
-   │     ^ F.
-Expected fun type with arity 1
-Got: fun(() -> 'ok')
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-   ┌─ check/src/dynamic_calls.erl:71:5
-   │
-71 │     (fun ret_ok/0)(1, 2).
-   │     ^^^^^^^^^^^^^^ ret_ok/0.
-Expected fun type with arity 2
-Got: fun(() -> 'ok')
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:78:5
-   │
-78 │     (FUnion)(false).
-   │     ^^^^^^^^^^^^^^^ FUnion('false').
-Expression has type:   'r1' | 'r2'
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:78:5
-   │
-78 │     (FUnion)(false).
-   │     ^^^^^^^^^^^^^^^ FUnion('false').
-Expression has type:   'r2' | 'r3'
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:78:14
-   │
-78 │     (FUnion)(false).
-   │              ^^^^^
-   │              │
-   │              'false'.
-Expression has type:   'false'
-Context expected type: 'a1' | 'a2'
-   │              
-
-  'false' is not compatible with 'a1' | 'a2'
-  because
-  'false' is not compatible with 'a1'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:78:14
-   │
-78 │     (FUnion)(false).
-   │              ^^^^^
-   │              │
-   │              'false'.
-Expression has type:   'false'
-Context expected type: 'a2' | 'a3'
-   │              
-
-  'false' is not compatible with 'a2' | 'a3'
-  because
-  'false' is not compatible with 'a2'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:86:20
-   │
-86 │     Res = (FUnion)(false),
-   │                    ^^^^^
-   │                    │
-   │                    'false'.
-Expression has type:   'false'
-Context expected type: 'a1' | 'a2'
-   │                    
-
-  'false' is not compatible with 'a1' | 'a2'
-  because
-  'false' is not compatible with 'a1'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:86:20
-   │
-86 │     Res = (FUnion)(false),
-   │                    ^^^^^
-   │                    │
-   │                    'false'.
-Expression has type:   'false'
-Context expected type: 'a2' | 'a3'
-   │                    
-
-  'false' is not compatible with 'a2' | 'a3'
-  because
-  'false' is not compatible with 'a2'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:87:5
-   │
-87 │     Res.
-   │     ^^^ Res.
-Expression has type:   'r1' | 'r2' | 'r3'
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:94:5
-   │
-94 │     (FUnion)(a2).
-   │     ^^^^^^^^^^^^
-   │     │
-   │     FUnion('a2').
-Expression has type:   'r1' | 'r2'
-Context expected type: 'r1'
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'r1'
-  However the following candidate: 'r2'
-  Differs from the expected type:  'r1'
-
------------------------------- Detailed message ------------------------------
-
-  'r1' | 'r2' is not compatible with 'r1'
-  because
-  'r2' is not compatible with 'r1'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_calls.erl:94:5
-   │
-94 │     (FUnion)(a2).
-   │     ^^^^^^^^^^^^ FUnion('a2').
-Expression has type:   'r2' | 'r3'
-Context expected type: 'r1'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_calls.erl:102:5
-    │
-102 │     Res.
-    │     ^^^
-    │     │
-    │     Res.
-Expression has type:   'r1' | 'r2' | 'r3'
-Context expected type: 'r1'
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'r1'
-  However the following candidate: 'r2'
-  Differs from the expected type:  'r1'
-
------------------------------- Detailed message ------------------------------
-
-  'r1' | 'r2' | 'r3' is not compatible with 'r1'
-  because
-  'r2' is not compatible with 'r1'
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ check/src/dynamic_calls.erl:108:5
-    │
-108 │     (F)(a).
-    │     ^^^ F.
-Expected fun type with arity 1
-Got: fun(('a') -> 'b') | 'z'
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ check/src/dynamic_calls.erl:114:11
-    │
-114 │     Res = (F)(a),
-    │           ^^^ F.
-Expected fun type with arity 1
-Got: fun(('a') -> 'b') | 'z'
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ check/src/dynamic_calls.erl:138:5
-    │
-138 │     (F)(a).
-    │     ^^^ F.
-Expected fun type with arity 1
-Got: fun(('a') -> 'b') | fun(() -> 'b')
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ check/src/dynamic_calls.erl:144:11
-    │
-144 │     Res = (F)(a),
-    │           ^^^ F.
-Expected fun type with arity 1
-Got: fun(('a') -> 'b') | fun(() -> 'b')
-
-20 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_calls-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_calls.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_calls-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_calls.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_catch-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_catch-OTP-27.pretty
deleted file mode 100644
index a8135429d1..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_catch-OTP-27.pretty
+++ /dev/null
@@ -1,23 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_catch.erl:22:16
-   │
-22 │     {ok, A} -> A;
-   │                ^
-   │                │
-   │                A.
-Expression has type:   atom() | dynamic()
-Context expected type: binary()
-   │                
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dynamic()
-  However the following candidate: atom()
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  atom() | dynamic() is not compatible with binary()
-  because
-  atom() is not compatible with binary()
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_catch-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_catch-OTP-28.pretty
deleted file mode 100644
index a8135429d1..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_catch-OTP-28.pretty
+++ /dev/null
@@ -1,23 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_catch.erl:22:16
-   │
-22 │     {ok, A} -> A;
-   │                ^
-   │                │
-   │                A.
-Expression has type:   atom() | dynamic()
-Context expected type: binary()
-   │                
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dynamic()
-  However the following candidate: atom()
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  atom() | dynamic() is not compatible with binary()
-  because
-  atom() is not compatible with binary()
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_catch-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_catch.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_catch-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_catch.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_fun-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_fun-OTP-27.pretty
deleted file mode 100644
index 1f55b0f88a..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_fun-OTP-27.pretty
+++ /dev/null
@@ -1,181 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_fun.erl:65:3
-   │
-65 │   fun M:id/1.
-   │   ^^^^^^^^^^ M:'id'/1.
-Expression has type:   fun((dynamic()) -> dynamic())
-Context expected type: fun(() -> pid())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_fun.erl:71:3
-   │
-71 │   Res.
-   │   ^^^ Res.
-Expression has type:   fun((dynamic()) -> dynamic())
-Context expected type: fun(() -> pid())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_fun.erl:87:3
-   │
-87 │   fun M:F/2.
-   │   ^^^^^^^^^ M:F/2.
-Expression has type:   fun((dynamic(), dynamic()) -> dynamic())
-Context expected type: fun((pid()) -> pid())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_fun.erl:93:3
-   │
-93 │   Res.
-   │   ^^^ Res.
-Expression has type:   fun((dynamic(), dynamic()) -> dynamic())
-Context expected type: fun((pid()) -> pid())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_fun.erl:98:7
-   │
-98 │   fun M:F/1.
-   │       ^ M.
-Expression has type:   {atom()}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_fun.erl:103:9
-    │
-103 │   fun M:F/1.
-    │         ^ F.
-Expression has type:   {atom()}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_fun.erl:109:11
-    │
-109 │   fun M:F/A.
-    │           ^ A.
-Expression has type:   pid()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_fun.erl:146:24
-    │
-146 │ f5_to_f4_cov_neg(F) -> F.
-    │                        ^
-    │                        │
-    │                        F.
-Expression has type:   f5('a' | 'b')
-Context expected type: f4('a')
-    │                        
-
-Because in the expression's type:
-  fun((term()) ->
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  )
-
------------------------------- Detailed message ------------------------------
-
-  f5('a' | 'b') is not compatible with f4('a')
-  because
-  fun((term()) -> 'a' | 'b') is not compatible with f4('a')
-  because
-  fun((term()) -> 'a' | 'b') is not compatible with fun((...) -> 'a')
-  because
-  'a' | 'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_fun.erl:155:20
-    │
-155 │ apply_f4_neg(F) -> F(a).
-    │                    ^^^^ F('a').
-Expression has type:   number()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_fun.erl:170:22
-    │
-170 │ fun3_to_f4_neg(F) -> F.
-    │                      ^
-    │                      │
-    │                      F.
-Expression has type:   fun((term()) -> 'a' | 'b')
-Context expected type: f4('a')
-    │                      
-
-Because in the expression's type:
-  fun((term()) ->
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun((term()) -> 'a' | 'b') is not compatible with f4('a')
-  because
-  fun((term()) -> 'a' | 'b') is not compatible with fun((...) -> 'a')
-  because
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_fun.erl:176:21
-    │
-176 │ f4_to_fun_neg(F) -> F.
-    │                     ^
-    │                     │
-    │                     F.
-Expression has type:   f4('a' | 'b')
-Context expected type: fun((term()) -> 'a')
-    │                     
-
-Because in the expression's type:
-  fun((term()) ->
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  )
-
------------------------------- Detailed message ------------------------------
-
-  f4('a' | 'b') is not compatible with fun((term()) -> 'a')
-  because
-  fun((...) -> 'a' | 'b') is not compatible with fun((term()) -> 'a')
-  because
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_fun.erl:208:34
-    │
-208 │ apply_by_name_neg1(Mod, Name) -> Mod:Name().
-    │                                  ^^^ Mod.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_fun.erl:208:38
-    │
-208 │ apply_by_name_neg1(Mod, Name) -> Mod:Name().
-    │                                      ^^^^ Name.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_fun.erl:212:9
-    │
-212 │   Res = Mod:Name(),
-    │         ^^^ Mod.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_fun.erl:212:13
-    │
-212 │   Res = Mod:Name(),
-    │             ^^^^ Name.
-Expression has type:   term()
-Context expected type: atom()
-
-15 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_fun-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_fun-OTP-28.pretty
deleted file mode 100644
index 1f55b0f88a..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_fun-OTP-28.pretty
+++ /dev/null
@@ -1,181 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_fun.erl:65:3
-   │
-65 │   fun M:id/1.
-   │   ^^^^^^^^^^ M:'id'/1.
-Expression has type:   fun((dynamic()) -> dynamic())
-Context expected type: fun(() -> pid())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_fun.erl:71:3
-   │
-71 │   Res.
-   │   ^^^ Res.
-Expression has type:   fun((dynamic()) -> dynamic())
-Context expected type: fun(() -> pid())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_fun.erl:87:3
-   │
-87 │   fun M:F/2.
-   │   ^^^^^^^^^ M:F/2.
-Expression has type:   fun((dynamic(), dynamic()) -> dynamic())
-Context expected type: fun((pid()) -> pid())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_fun.erl:93:3
-   │
-93 │   Res.
-   │   ^^^ Res.
-Expression has type:   fun((dynamic(), dynamic()) -> dynamic())
-Context expected type: fun((pid()) -> pid())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_fun.erl:98:7
-   │
-98 │   fun M:F/1.
-   │       ^ M.
-Expression has type:   {atom()}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_fun.erl:103:9
-    │
-103 │   fun M:F/1.
-    │         ^ F.
-Expression has type:   {atom()}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_fun.erl:109:11
-    │
-109 │   fun M:F/A.
-    │           ^ A.
-Expression has type:   pid()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_fun.erl:146:24
-    │
-146 │ f5_to_f4_cov_neg(F) -> F.
-    │                        ^
-    │                        │
-    │                        F.
-Expression has type:   f5('a' | 'b')
-Context expected type: f4('a')
-    │                        
-
-Because in the expression's type:
-  fun((term()) ->
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  )
-
------------------------------- Detailed message ------------------------------
-
-  f5('a' | 'b') is not compatible with f4('a')
-  because
-  fun((term()) -> 'a' | 'b') is not compatible with f4('a')
-  because
-  fun((term()) -> 'a' | 'b') is not compatible with fun((...) -> 'a')
-  because
-  'a' | 'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_fun.erl:155:20
-    │
-155 │ apply_f4_neg(F) -> F(a).
-    │                    ^^^^ F('a').
-Expression has type:   number()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_fun.erl:170:22
-    │
-170 │ fun3_to_f4_neg(F) -> F.
-    │                      ^
-    │                      │
-    │                      F.
-Expression has type:   fun((term()) -> 'a' | 'b')
-Context expected type: f4('a')
-    │                      
-
-Because in the expression's type:
-  fun((term()) ->
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun((term()) -> 'a' | 'b') is not compatible with f4('a')
-  because
-  fun((term()) -> 'a' | 'b') is not compatible with fun((...) -> 'a')
-  because
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_fun.erl:176:21
-    │
-176 │ f4_to_fun_neg(F) -> F.
-    │                     ^
-    │                     │
-    │                     F.
-Expression has type:   f4('a' | 'b')
-Context expected type: fun((term()) -> 'a')
-    │                     
-
-Because in the expression's type:
-  fun((term()) ->
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  )
-
------------------------------- Detailed message ------------------------------
-
-  f4('a' | 'b') is not compatible with fun((term()) -> 'a')
-  because
-  fun((...) -> 'a' | 'b') is not compatible with fun((term()) -> 'a')
-  because
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_fun.erl:208:34
-    │
-208 │ apply_by_name_neg1(Mod, Name) -> Mod:Name().
-    │                                  ^^^ Mod.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_fun.erl:208:38
-    │
-208 │ apply_by_name_neg1(Mod, Name) -> Mod:Name().
-    │                                      ^^^^ Name.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_fun.erl:212:9
-    │
-212 │   Res = Mod:Name(),
-    │         ^^^ Mod.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_fun.erl:212:13
-    │
-212 │   Res = Mod:Name(),
-    │             ^^^^ Name.
-Expression has type:   term()
-Context expected type: atom()
-
-15 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_fun-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_fun.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_fun-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_fun.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_generics-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_generics-OTP-27.pretty
deleted file mode 100644
index cd54f2d176..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_generics-OTP-27.pretty
+++ /dev/null
@@ -1,181 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_generics.erl:33:3
-   │
-33 │   lists:map(fun inc/1, Ns).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^ lists:map(inc/1, Ns).
-Expression has type:   [number()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_generics.erl:43:3
-   │
-43 │   lists:map(fun dyn_fun/1, Ns).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lists:map(dyn_fun/1, Ns).
-Expression has type:   [dynamic()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_generics.erl:53:3
-   │
-53 │   lists:foldl(fun add/2, 0, Ns).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lists:foldl(add/2, 0, Ns).
-Expression has type:   number()
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_generics.erl:65:3
-   │
-65 │   lists:foldl(fun add/2, Acc, Ns).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   │   │
-   │   lists:foldl(add/2, Acc, Ns).
-Expression has type:   number() | dynamic()
-Context expected type: none()
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dynamic()
-  However the following candidate: number()
-  Differs from the expected type:  none()
-
------------------------------- Detailed message ------------------------------
-
-  number() | dynamic() is not compatible with none()
-  because
-  number() is not compatible with none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_generics.erl:72:3
-   │
-72 │   {Res}.
-   │   ^^^^^ {Res}.
-Expression has type:   {number() | dynamic()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_generics.erl:78:3
-   │
-78 │   lists:foldl(fun dyn_fun/2, Acc, Ns).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   │   │
-   │   lists:foldl(dyn_fun/2, Acc, Ns).
-Expression has type:   dynamic() | string()
-Context expected type: 'ok'
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dynamic()
-  However the following candidate: string()
-  Differs from the expected type:  'ok'
-
------------------------------- Detailed message ------------------------------
-
-  dynamic() | string() is not compatible with 'ok'
-  because
-  string() is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_generics.erl:87:3
-   │
-87 │   fapply(fun inc/1, dyn_val()).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ fapply(inc/1, dyn_val()).
-Expression has type:   number()
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_generics.erl:92:3
-   │
-92 │   {Res}.
-   │   ^^^^^ {Res}.
-Expression has type:   {dynamic()}
-Context expected type: X
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_generics.erl:108:3
-    │    
-108 │ ╭ ╭   lists:map(
-109 │ │ │     fun
-110 │ │ │       Fib(N) when N < 2
-111 │ │ │         -> 1;
-    · │ │
-117 │ │ │     [1, 2, 3]
-118 │ │ │   ).
-    │ ╰─│───^ lists:map(fun, [1, 2, 3]).
-Expression has type:   [number() | 'three']
-Context expected type: [number()]
-    │   ╰───' 
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: number()
-    However the following candidate: 'three'
-    Differs from the expected type:  number()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number() | 'three'] is not compatible with [number()]
-  because
-  number() | 'three' is not compatible with number()
-  because
-  'three' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_generics.erl:115:9
-    │
-115 │         Fib(N - 2) + Fib(N - 1)
-    │         ^^^^^^^^^^
-    │         │
-    │         Fib(_ - _).
-Expression has type:   number() | 'three'
-Context expected type: number()
-    │         
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: 'three'
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | 'three' is not compatible with number()
-  because
-  'three' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_generics.erl:115:22
-    │
-115 │         Fib(N - 2) + Fib(N - 1)
-    │                      ^^^^^^^^^^
-    │                      │
-    │                      Fib(_ - _).
-Expression has type:   number() | 'three'
-Context expected type: number()
-    │                      
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: 'three'
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | 'three' is not compatible with number()
-  because
-  'three' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_generics.erl:127:13
-    │
-127 │         Fib(undefined) + Fib(N - 1)
-    │             ^^^^^^^^^ 'undefined'.
-Expression has type:   'undefined'
-Context expected type: number()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-    ┌─ check/src/dynamic_generics.erl:171:47
-    │
-171 │ unify_dyn_atom(D, A) -> eqwalizer:reveal_type(either(D, A)).
-    │                                               ^^^^^^^^^^^^ dynamic() | 'undef'
-
-13 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_generics-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_generics-OTP-28.pretty
deleted file mode 100644
index cd54f2d176..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_generics-OTP-28.pretty
+++ /dev/null
@@ -1,181 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_generics.erl:33:3
-   │
-33 │   lists:map(fun inc/1, Ns).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^ lists:map(inc/1, Ns).
-Expression has type:   [number()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_generics.erl:43:3
-   │
-43 │   lists:map(fun dyn_fun/1, Ns).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lists:map(dyn_fun/1, Ns).
-Expression has type:   [dynamic()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_generics.erl:53:3
-   │
-53 │   lists:foldl(fun add/2, 0, Ns).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lists:foldl(add/2, 0, Ns).
-Expression has type:   number()
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_generics.erl:65:3
-   │
-65 │   lists:foldl(fun add/2, Acc, Ns).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   │   │
-   │   lists:foldl(add/2, Acc, Ns).
-Expression has type:   number() | dynamic()
-Context expected type: none()
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dynamic()
-  However the following candidate: number()
-  Differs from the expected type:  none()
-
------------------------------- Detailed message ------------------------------
-
-  number() | dynamic() is not compatible with none()
-  because
-  number() is not compatible with none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_generics.erl:72:3
-   │
-72 │   {Res}.
-   │   ^^^^^ {Res}.
-Expression has type:   {number() | dynamic()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_generics.erl:78:3
-   │
-78 │   lists:foldl(fun dyn_fun/2, Acc, Ns).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   │   │
-   │   lists:foldl(dyn_fun/2, Acc, Ns).
-Expression has type:   dynamic() | string()
-Context expected type: 'ok'
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dynamic()
-  However the following candidate: string()
-  Differs from the expected type:  'ok'
-
------------------------------- Detailed message ------------------------------
-
-  dynamic() | string() is not compatible with 'ok'
-  because
-  string() is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_generics.erl:87:3
-   │
-87 │   fapply(fun inc/1, dyn_val()).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ fapply(inc/1, dyn_val()).
-Expression has type:   number()
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_generics.erl:92:3
-   │
-92 │   {Res}.
-   │   ^^^^^ {Res}.
-Expression has type:   {dynamic()}
-Context expected type: X
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_generics.erl:108:3
-    │    
-108 │ ╭ ╭   lists:map(
-109 │ │ │     fun
-110 │ │ │       Fib(N) when N < 2
-111 │ │ │         -> 1;
-    · │ │
-117 │ │ │     [1, 2, 3]
-118 │ │ │   ).
-    │ ╰─│───^ lists:map(fun, [1, 2, 3]).
-Expression has type:   [number() | 'three']
-Context expected type: [number()]
-    │   ╰───' 
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: number()
-    However the following candidate: 'three'
-    Differs from the expected type:  number()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number() | 'three'] is not compatible with [number()]
-  because
-  number() | 'three' is not compatible with number()
-  because
-  'three' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_generics.erl:115:9
-    │
-115 │         Fib(N - 2) + Fib(N - 1)
-    │         ^^^^^^^^^^
-    │         │
-    │         Fib(_ - _).
-Expression has type:   number() | 'three'
-Context expected type: number()
-    │         
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: 'three'
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | 'three' is not compatible with number()
-  because
-  'three' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_generics.erl:115:22
-    │
-115 │         Fib(N - 2) + Fib(N - 1)
-    │                      ^^^^^^^^^^
-    │                      │
-    │                      Fib(_ - _).
-Expression has type:   number() | 'three'
-Context expected type: number()
-    │                      
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: 'three'
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | 'three' is not compatible with number()
-  because
-  'three' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_generics.erl:127:13
-    │
-127 │         Fib(undefined) + Fib(N - 1)
-    │             ^^^^^^^^^ 'undefined'.
-Expression has type:   'undefined'
-Context expected type: number()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-    ┌─ check/src/dynamic_generics.erl:171:47
-    │
-171 │ unify_dyn_atom(D, A) -> eqwalizer:reveal_type(either(D, A)).
-    │                                               ^^^^^^^^^^^^ dynamic() | 'undef'
-
-13 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_generics-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_generics.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_generics-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_generics.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_local_funs-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_local_funs-OTP-27.pretty
deleted file mode 100644
index 3ca5a136e6..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_local_funs-OTP-27.pretty
+++ /dev/null
@@ -1,47 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_local_funs.erl:30:3
-   │
-30 │   lists:foldl(F, 0, L).
-   │   ^^^^^^^^^^^^^^^^^^^^
-   │   │
-   │   lists:foldl(F, 0, L).
-Expression has type:   dynamic() | number()
-Context expected type: atom()
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dynamic()
-  However the following candidate: number()
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  dynamic() | number() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_local_funs.erl:36:15
-   │
-36 │     N1 + N2 + binary_to_atom(Acc)
-   │               ^^^^^^^^^^^^^^^^^^^ erlang:binary_to_atom(Acc).
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_local_funs.erl:48:3
-   │
-48 │   X.
-   │   ^ X.
-Expression has type:   fun((dynamic(), dynamic()) -> dynamic())
-Context expected type: fun(('a') -> 'b')
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_local_funs.erl:111:3
-    │
-111 │   ok.
-    │   ^^ 'ok'.
-Expression has type:   'ok'
-Context expected type: pid()
-
-4 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_local_funs-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_local_funs-OTP-28.pretty
deleted file mode 100644
index 3ca5a136e6..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_local_funs-OTP-28.pretty
+++ /dev/null
@@ -1,47 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_local_funs.erl:30:3
-   │
-30 │   lists:foldl(F, 0, L).
-   │   ^^^^^^^^^^^^^^^^^^^^
-   │   │
-   │   lists:foldl(F, 0, L).
-Expression has type:   dynamic() | number()
-Context expected type: atom()
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dynamic()
-  However the following candidate: number()
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  dynamic() | number() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_local_funs.erl:36:15
-   │
-36 │     N1 + N2 + binary_to_atom(Acc)
-   │               ^^^^^^^^^^^^^^^^^^^ erlang:binary_to_atom(Acc).
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_local_funs.erl:48:3
-   │
-48 │   X.
-   │   ^ X.
-Expression has type:   fun((dynamic(), dynamic()) -> dynamic())
-Context expected type: fun(('a') -> 'b')
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_local_funs.erl:111:3
-    │
-111 │   ok.
-    │   ^^ 'ok'.
-Expression has type:   'ok'
-Context expected type: pid()
-
-4 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_local_funs-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_local_funs.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_local_funs-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_local_funs.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/compiler_macro-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_receive.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/compiler_macro-OTP-27.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_receive.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-27.pretty
deleted file mode 100644
index 9d7187f610..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-27.pretty
+++ /dev/null
@@ -1,176 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_refine.erl:86:21
-   │
-86 │     is_list(Arg) -> {Arg}
-   │                     ^^^^^ {Arg}.
-Expression has type:   {[term()]}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_refine.erl:95:21
-   │
-95 │     is_list(Dyn) -> {Dyn}
-   │                     ^^^^^ {Dyn}.
-Expression has type:   {dynamic([term()])}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:102:23
-    │
-102 │     is_binary(Arg) -> {Arg}
-    │                       ^^^^^ {Arg}.
-Expression has type:   {binary()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:111:23
-    │
-111 │     is_binary(Dyn) -> {Dyn};
-    │                       ^^^^^ {Dyn}.
-Expression has type:   {dynamic(binary())}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:123:3
-    │
-123 │   {Mixed}.
-    │   ^^^^^^^ {Mixed}.
-Expression has type:   {term()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:133:3
-    │
-133 │   {Mixed}.
-    │   ^^^^^^^ {Mixed}.
-Expression has type:   {term()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:143:3
-    │
-143 │   {Mixed}.
-    │   ^^^^^^^ {Mixed}.
-Expression has type:   {boolean() | dynamic()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:153:3
-    │
-153 │   {Mixed}.
-    │   ^^^^^^^ {Mixed}.
-Expression has type:   {dynamic() | binary()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:168:3
-    │
-168 │   {Mixed2}.
-    │   ^^^^^^^^ {Mixed2}.
-Expression has type:   {binary() | atom() | dynamic()}
-Context expected type: 'ok'
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-    ┌─ check/src/dynamic_refine.erl:180:25
-    │
-180 │   eqwalizer:reveal_type(Name),
-    │                         ^^^^ atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:181:3
-    │
-181 │   Name.
-    │   ^^^^ Name.
-Expression has type:   atom()
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:221:28
-    │
-221 │ dyn_refine_union_neg(D) -> D.
-    │                            ^
-    │                            │
-    │                            D.
-Expression has type:   dynamic() | 'error'
-Context expected type: 'ok'
-    │                            
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dynamic()
-  However the following candidate: 'error'
-  Differs from the expected type:  'ok'
-
------------------------------- Detailed message ------------------------------
-
-  dynamic() | 'error' is not compatible with 'ok'
-  because
-  'error' is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:236:3
-    │
-236 │   atom_to_binary(Id).
-    │   ^^^^^^^^^^^^^^^^^^ erlang:atom_to_binary(Id).
-Expression has type:   binary()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:236:18
-    │
-236 │   atom_to_binary(Id).
-    │                  ^^ Id.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:247:32
-    │
-247 │ refine_union_alias_neg({X}) -> X.
-    │                                ^
-    │                                │
-    │                                X.
-Expression has type:   dyn_alias() | 'err'
-Context expected type: 'ok'
-    │                                
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dyn_alias()
-  However the following candidate: 'err'
-  Differs from the expected type:  'ok'
-
------------------------------- Detailed message ------------------------------
-
-  dyn_alias() | 'err' is not compatible with 'ok'
-  because
-  'err' is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:260:27
-    │
-260 │ refine_in_tuple_neg(T) -> T.
-    │                           ^
-    │                           │
-    │                           T.
-Expression has type:   union()
-Context expected type: {'ok'}
-    │                           
-
-Because in the expression's type:
-  { 
-    Here the type is a union type with some valid candidates: dyn_alias()
-    However the following candidate: 'err'
-    Differs from the expected type:  'ok'
-  }
-
------------------------------- Detailed message ------------------------------
-
-  union() is not compatible with {'ok'}
-  because
-  at tuple index 1:
-  {dyn_alias() | 'err'} is not compatible with {'ok'}
-  because
-  dyn_alias() | 'err' is not compatible with 'ok'
-  because
-  'err' is not compatible with 'ok'
-
-16 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-28.pretty
deleted file mode 100644
index 9d7187f610..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-28.pretty
+++ /dev/null
@@ -1,176 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_refine.erl:86:21
-   │
-86 │     is_list(Arg) -> {Arg}
-   │                     ^^^^^ {Arg}.
-Expression has type:   {[term()]}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/dynamic_refine.erl:95:21
-   │
-95 │     is_list(Dyn) -> {Dyn}
-   │                     ^^^^^ {Dyn}.
-Expression has type:   {dynamic([term()])}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:102:23
-    │
-102 │     is_binary(Arg) -> {Arg}
-    │                       ^^^^^ {Arg}.
-Expression has type:   {binary()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:111:23
-    │
-111 │     is_binary(Dyn) -> {Dyn};
-    │                       ^^^^^ {Dyn}.
-Expression has type:   {dynamic(binary())}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:123:3
-    │
-123 │   {Mixed}.
-    │   ^^^^^^^ {Mixed}.
-Expression has type:   {term()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:133:3
-    │
-133 │   {Mixed}.
-    │   ^^^^^^^ {Mixed}.
-Expression has type:   {term()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:143:3
-    │
-143 │   {Mixed}.
-    │   ^^^^^^^ {Mixed}.
-Expression has type:   {boolean() | dynamic()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:153:3
-    │
-153 │   {Mixed}.
-    │   ^^^^^^^ {Mixed}.
-Expression has type:   {dynamic() | binary()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:168:3
-    │
-168 │   {Mixed2}.
-    │   ^^^^^^^^ {Mixed2}.
-Expression has type:   {binary() | atom() | dynamic()}
-Context expected type: 'ok'
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-    ┌─ check/src/dynamic_refine.erl:180:25
-    │
-180 │   eqwalizer:reveal_type(Name),
-    │                         ^^^^ atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:181:3
-    │
-181 │   Name.
-    │   ^^^^ Name.
-Expression has type:   atom()
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:221:28
-    │
-221 │ dyn_refine_union_neg(D) -> D.
-    │                            ^
-    │                            │
-    │                            D.
-Expression has type:   dynamic() | 'error'
-Context expected type: 'ok'
-    │                            
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dynamic()
-  However the following candidate: 'error'
-  Differs from the expected type:  'ok'
-
------------------------------- Detailed message ------------------------------
-
-  dynamic() | 'error' is not compatible with 'ok'
-  because
-  'error' is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:236:3
-    │
-236 │   atom_to_binary(Id).
-    │   ^^^^^^^^^^^^^^^^^^ erlang:atom_to_binary(Id).
-Expression has type:   binary()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:236:18
-    │
-236 │   atom_to_binary(Id).
-    │                  ^^ Id.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:247:32
-    │
-247 │ refine_union_alias_neg({X}) -> X.
-    │                                ^
-    │                                │
-    │                                X.
-Expression has type:   dyn_alias() | 'err'
-Context expected type: 'ok'
-    │                                
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dyn_alias()
-  However the following candidate: 'err'
-  Differs from the expected type:  'ok'
-
------------------------------- Detailed message ------------------------------
-
-  dyn_alias() | 'err' is not compatible with 'ok'
-  because
-  'err' is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/dynamic_refine.erl:260:27
-    │
-260 │ refine_in_tuple_neg(T) -> T.
-    │                           ^
-    │                           │
-    │                           T.
-Expression has type:   union()
-Context expected type: {'ok'}
-    │                           
-
-Because in the expression's type:
-  { 
-    Here the type is a union type with some valid candidates: dyn_alias()
-    However the following candidate: 'err'
-    Differs from the expected type:  'ok'
-  }
-
------------------------------- Detailed message ------------------------------
-
-  union() is not compatible with {'ok'}
-  because
-  at tuple index 1:
-  {dyn_alias() | 'err'} is not compatible with {'ok'}
-  because
-  dyn_alias() | 'err' is not compatible with 'ok'
-  because
-  'err' is not compatible with 'ok'
-
-16 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/compiler_macro-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_try_catch.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/compiler_macro-OTP-28.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_try_catch.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/elab_clause-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/elab_clause-OTP-27.pretty
deleted file mode 100644
index b9fdc2fbce..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/elab_clause-OTP-27.pretty
+++ /dev/null
@@ -1,85 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/elab_clause.erl:30:5
-   │
-30 │     Res.
-   │     ^^^ Res.
-Expression has type:   atom()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/elab_clause.erl:48:5
-   │
-48 │     Res.
-   │     ^^^
-   │     │
-   │     Res.
-Expression has type:   atom() | {number()}
-Context expected type: {atom()} | number()
-   │     
-
-Because in the expression's type:
-  Here the type is:     atom()
-  Context expects type: {atom()} | number()
-  No candidate matches in the expected union.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/elab_clause.erl:76:5
-   │
-76 │     Res.
-   │     ^^^
-   │     │
-   │     Res.
-Expression has type:   'error' | 'exit' | 'throw' | number()
-Context expected type: number()
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: 'error'
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  'error' | 'exit' | 'throw' | number() is not compatible with number()
-  because
-  'error' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/elab_clause.erl:86:5
-   │
-86 │     Res.
-   │     ^^^
-   │     │
-   │     Res.
-Expression has type:   number() | [dynamic()]
-Context expected type: number()
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: [dynamic()]
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | [dynamic()] is not compatible with number()
-  because
-  [dynamic()] is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/elab_clause.erl:93:17
-   │
-93 │         A:_  -> A
-   │                 ^ A.
-Expression has type:   'error' | 'exit' | 'throw'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/elab_clause.erl:101:27
-    │
-101 │         Class:_:Stack  -> {Class, Stack}
-    │                           ^^^^^^^^^^^^^^ {Class, Stack}.
-Expression has type:   {'error' | 'exit' | 'throw', [dynamic()]}
-Context expected type: number()
-
-6 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/elab_clause-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/elab_clause-OTP-28.pretty
deleted file mode 100644
index b9fdc2fbce..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/elab_clause-OTP-28.pretty
+++ /dev/null
@@ -1,85 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/elab_clause.erl:30:5
-   │
-30 │     Res.
-   │     ^^^ Res.
-Expression has type:   atom()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/elab_clause.erl:48:5
-   │
-48 │     Res.
-   │     ^^^
-   │     │
-   │     Res.
-Expression has type:   atom() | {number()}
-Context expected type: {atom()} | number()
-   │     
-
-Because in the expression's type:
-  Here the type is:     atom()
-  Context expects type: {atom()} | number()
-  No candidate matches in the expected union.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/elab_clause.erl:76:5
-   │
-76 │     Res.
-   │     ^^^
-   │     │
-   │     Res.
-Expression has type:   'error' | 'exit' | 'throw' | number()
-Context expected type: number()
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: 'error'
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  'error' | 'exit' | 'throw' | number() is not compatible with number()
-  because
-  'error' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/elab_clause.erl:86:5
-   │
-86 │     Res.
-   │     ^^^
-   │     │
-   │     Res.
-Expression has type:   number() | [dynamic()]
-Context expected type: number()
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: [dynamic()]
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | [dynamic()] is not compatible with number()
-  because
-  [dynamic()] is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/elab_clause.erl:93:17
-   │
-93 │         A:_  -> A
-   │                 ^ A.
-Expression has type:   'error' | 'exit' | 'throw'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/elab_clause.erl:101:27
-    │
-101 │         Class:_:Stack  -> {Class, Stack}
-    │                           ^^^^^^^^^^^^^^ {Class, Stack}.
-Expression has type:   {'error' | 'exit' | 'throw', [dynamic()]}
-Context expected type: number()
-
-6 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/elab_clause-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/elab_clause.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/elab_clause-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/elab_clause.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-27.pretty
deleted file mode 100644
index ee63204870..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-27.pretty
+++ /dev/null
@@ -1,128 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/error_messages.erl:16:22
-   │
-16 │ map_candidates(M) -> M.
-   │                      ^
-   │                      │
-   │                      M.
-Expression has type:   #{bar := atom(), baz := atom()}
-Context expected type: foo_map() | #{foo => atom()}
-   │                      
-
-Because in the expression's type:
-  #{ baz =>
-    Here the type is:     atom()
-    Context expects type: number()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{bar := atom(), baz := atom()} is not compatible with foo_map() | #{foo => atom()}
-  because
-  #{bar := atom(), baz := atom()} is not compatible with foo_map()
-  because
-  #{bar := atom(), baz := atom()} is not compatible with #{bar => atom(), baz => number(), other => atom(), other2 => atom(), other3 => atom(), other4 => atom(), other5 => atom()}
-  because
-  at key `baz`:
-  #{bar := atom(), baz := atom()} is not compatible with #{bar => atom(), baz => number(), other => atom(), other2 => atom(), other3 => atom(), other4 => atom(), other5 => atom()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/error_messages.erl:19:24
-   │
-19 │ map_candidates_2(M) -> M.
-   │                        ^
-   │                        │
-   │                        M.
-Expression has type:   [#{bar => 'a' | 'b'} | #{baz => 'a' | 'b'}]
-Context expected type: [#{bar => 'a'}]
-   │                        
-
-Because in the expression's type:
-  [
-    Here the type is:     #{baz => ...}
-    Context expects type: #{...}
-    The expected map has no corresponding key for: baz.
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [#{bar => 'a' | 'b'} | #{baz => 'a' | 'b'}] is not compatible with [#{bar => 'a'}]
-  because
-  #{bar => 'a' | 'b'} | #{baz => 'a' | 'b'} is not compatible with #{bar => 'a'}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/error_messages.erl:22:22
-   │
-22 │ no_map_rewrite(M) -> M.
-   │                      ^
-   │                      │
-   │                      M.
-Expression has type:   #{'undefined' | binary() => atom()}
-Context expected type: #{binary() => atom()}
-   │                      
-
-Because in the expression's type:
-  #{ map domains are incompatible:
-    Here the type is a union type with some valid candidates: binary()
-    However the following candidate: 'undefined'
-    Differs from the expected type:  binary()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{'undefined' | binary() => atom()} is not compatible with #{binary() => atom()}
-  the default associations are not compatible
-  because
-  'undefined' | binary() is not compatible with binary()
-  because
-  'undefined' is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/error_messages.erl:27:32
-   │
-27 │ no_record_conversion_1(Foo) -> Foo.
-   │                                ^^^ Foo.
-Expression has type:   #foo{}
-Context expected type: {'foobar', atom()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/error_messages.erl:30:32
-   │
-30 │ no_record_conversion_2(Foo) -> Foo.
-   │                                ^^^
-   │                                │
-   │                                Foo.
-Expression has type:   #foo{}
-Context expected type: {binary(), atom(), atom()}
-   │                                
-
-  at tuple index 1:
-  {'foo', atom(), atom()} is not compatible with {binary(), atom(), atom()}
-  because
-  'foo' is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/error_messages.erl:33:27
-   │
-33 │ record_conversion(Foo) -> Foo.
-   │                           ^^^
-   │                           │
-   │                           Foo.
-Expression has type:   #foo{}
-Context expected type: {'foo', binary(), atom()}
-   │                           
-
-Because in the expression's type:
-  { 'foo', 
-    Here the type is:     atom()
-    Context expects type: binary()
-  , atom()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'foo', atom(), atom()} is not compatible with {'foo', binary(), atom()}
-  because
-  atom() is not compatible with binary()
-
-6 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-28.pretty
deleted file mode 100644
index ee63204870..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-28.pretty
+++ /dev/null
@@ -1,128 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/error_messages.erl:16:22
-   │
-16 │ map_candidates(M) -> M.
-   │                      ^
-   │                      │
-   │                      M.
-Expression has type:   #{bar := atom(), baz := atom()}
-Context expected type: foo_map() | #{foo => atom()}
-   │                      
-
-Because in the expression's type:
-  #{ baz =>
-    Here the type is:     atom()
-    Context expects type: number()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{bar := atom(), baz := atom()} is not compatible with foo_map() | #{foo => atom()}
-  because
-  #{bar := atom(), baz := atom()} is not compatible with foo_map()
-  because
-  #{bar := atom(), baz := atom()} is not compatible with #{bar => atom(), baz => number(), other => atom(), other2 => atom(), other3 => atom(), other4 => atom(), other5 => atom()}
-  because
-  at key `baz`:
-  #{bar := atom(), baz := atom()} is not compatible with #{bar => atom(), baz => number(), other => atom(), other2 => atom(), other3 => atom(), other4 => atom(), other5 => atom()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/error_messages.erl:19:24
-   │
-19 │ map_candidates_2(M) -> M.
-   │                        ^
-   │                        │
-   │                        M.
-Expression has type:   [#{bar => 'a' | 'b'} | #{baz => 'a' | 'b'}]
-Context expected type: [#{bar => 'a'}]
-   │                        
-
-Because in the expression's type:
-  [
-    Here the type is:     #{baz => ...}
-    Context expects type: #{...}
-    The expected map has no corresponding key for: baz.
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [#{bar => 'a' | 'b'} | #{baz => 'a' | 'b'}] is not compatible with [#{bar => 'a'}]
-  because
-  #{bar => 'a' | 'b'} | #{baz => 'a' | 'b'} is not compatible with #{bar => 'a'}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/error_messages.erl:22:22
-   │
-22 │ no_map_rewrite(M) -> M.
-   │                      ^
-   │                      │
-   │                      M.
-Expression has type:   #{'undefined' | binary() => atom()}
-Context expected type: #{binary() => atom()}
-   │                      
-
-Because in the expression's type:
-  #{ map domains are incompatible:
-    Here the type is a union type with some valid candidates: binary()
-    However the following candidate: 'undefined'
-    Differs from the expected type:  binary()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{'undefined' | binary() => atom()} is not compatible with #{binary() => atom()}
-  the default associations are not compatible
-  because
-  'undefined' | binary() is not compatible with binary()
-  because
-  'undefined' is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/error_messages.erl:27:32
-   │
-27 │ no_record_conversion_1(Foo) -> Foo.
-   │                                ^^^ Foo.
-Expression has type:   #foo{}
-Context expected type: {'foobar', atom()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/error_messages.erl:30:32
-   │
-30 │ no_record_conversion_2(Foo) -> Foo.
-   │                                ^^^
-   │                                │
-   │                                Foo.
-Expression has type:   #foo{}
-Context expected type: {binary(), atom(), atom()}
-   │                                
-
-  at tuple index 1:
-  {'foo', atom(), atom()} is not compatible with {binary(), atom(), atom()}
-  because
-  'foo' is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/error_messages.erl:33:27
-   │
-33 │ record_conversion(Foo) -> Foo.
-   │                           ^^^
-   │                           │
-   │                           Foo.
-Expression has type:   #foo{}
-Context expected type: {'foo', binary(), atom()}
-   │                           
-
-Because in the expression's type:
-  { 'foo', 
-    Here the type is:     atom()
-    Context expects type: binary()
-  , atom()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'foo', atom(), atom()} is not compatible with {'foo', binary(), atom()}
-  because
-  atom() is not compatible with binary()
-
-6 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/error_messages-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/error_messages.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/detached_specs1-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/fancy_generics.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/detached_specs1-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/fancy_generics.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/format-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/format-OTP-27.pretty
deleted file mode 100644
index f6d7701c2e..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/format-OTP-27.pretty
+++ /dev/null
@@ -1,22 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/format.erl:13:3
-   │
-13 │   io_lib:format("~p", [X]).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^
-   │   │
-   │   io_lib:format(string_lit, [X]).
-Expression has type:   io_lib:chars()
-Context expected type: string()
-   │   
-
-Because in the expression's type:
-  Here the type is:     [number() | io_lib:chars()]
-  Context expects type: string()
-
------------------------------- Detailed message ------------------------------
-
-  io_lib:chars() is not compatible with string()
-  because
-  [number() | io_lib:chars()] is not compatible with string()
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/format-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/format-OTP-28.pretty
deleted file mode 100644
index f6d7701c2e..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/format-OTP-28.pretty
+++ /dev/null
@@ -1,22 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/format.erl:13:3
-   │
-13 │   io_lib:format("~p", [X]).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^
-   │   │
-   │   io_lib:format(string_lit, [X]).
-Expression has type:   io_lib:chars()
-Context expected type: string()
-   │   
-
-Because in the expression's type:
-  Here the type is:     [number() | io_lib:chars()]
-  Context expects type: string()
-
------------------------------- Detailed message ------------------------------
-
-  io_lib:chars() is not compatible with string()
-  because
-  [number() | io_lib:chars()] is not compatible with string()
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/format-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/format.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/format-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/format.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats-OTP-27.pretty
deleted file mode 100644
index a8ac75c742..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats-OTP-27.pretty
+++ /dev/null
@@ -1,41 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/fun_stats.erl:36:3
-   │
-36 │   wn_ey_sy() + 3.
-   │   ^^^^^^^^^^ wn_ey_sy().
-Expression has type:   'ok'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/fun_stats.erl:36:3
-   │
-36 │   wn_ey_sy() + 3.
-   │   ^^^^^^^^^^^^^^ _ + _.
-Expression has type:   number()
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/fun_stats.erl:43:3
-   │
-43 │   wy_ey_sy() + 3.
-   │   ^^^^^^^^^^ wy_ey_sy().
-Expression has type:   'ok'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/fun_stats.erl:46:3
-   │
-46 │   wy_ey_sy() + 3.
-   │   ^^^^^^^^^^ wy_ey_sy().
-Expression has type:   'ok'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/fun_stats.erl:55:3
-   │
-55 │   wy_ey_sy() + 3.
-   │   ^^^^^^^^^^ wy_ey_sy().
-Expression has type:   'ok'
-Context expected type: number()
-
-5 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats-OTP-28.pretty
deleted file mode 100644
index a8ac75c742..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats-OTP-28.pretty
+++ /dev/null
@@ -1,41 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/fun_stats.erl:36:3
-   │
-36 │   wn_ey_sy() + 3.
-   │   ^^^^^^^^^^ wn_ey_sy().
-Expression has type:   'ok'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/fun_stats.erl:36:3
-   │
-36 │   wn_ey_sy() + 3.
-   │   ^^^^^^^^^^^^^^ _ + _.
-Expression has type:   number()
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/fun_stats.erl:43:3
-   │
-43 │   wy_ey_sy() + 3.
-   │   ^^^^^^^^^^ wy_ey_sy().
-Expression has type:   'ok'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/fun_stats.erl:46:3
-   │
-46 │   wy_ey_sy() + 3.
-   │   ^^^^^^^^^^ wy_ey_sy().
-Expression has type:   'ok'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/fun_stats.erl:55:3
-   │
-55 │   wy_ey_sy() + 3.
-   │   ^^^^^^^^^^ wy_ey_sy().
-Expression has type:   'ok'
-Context expected type: number()
-
-5 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats2-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats2-OTP-27.pretty
deleted file mode 100644
index 0fdf42f94d..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats2-OTP-27.pretty
+++ /dev/null
@@ -1,25 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/fun_stats2.erl:15:11
-   │
-15 │   _ = 1 + Atom,
-   │           ^^^^ Atom.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/fun_stats2.erl:16:22
-   │
-16 │   _ = binary_to_atom(Atom),
-   │                      ^^^^ Atom.
-Expression has type:   atom()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/fun_stats2.erl:17:13
-   │
-17 │   _ = "" ++ Atom,
-   │             ^^^^ Atom.
-Expression has type:   atom()
-Context expected type: [term()]
-
-3 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats2-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats2-OTP-28.pretty
deleted file mode 100644
index 0fdf42f94d..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats2-OTP-28.pretty
+++ /dev/null
@@ -1,25 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/fun_stats2.erl:15:11
-   │
-15 │   _ = 1 + Atom,
-   │           ^^^^ Atom.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/fun_stats2.erl:16:22
-   │
-16 │   _ = binary_to_atom(Atom),
-   │                      ^^^^ Atom.
-Expression has type:   atom()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/fun_stats2.erl:17:13
-   │
-17 │   _ = "" ++ Atom,
-   │             ^^^^ Atom.
-Expression has type:   atom()
-Context expected type: [term()]
-
-3 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats2-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats2.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats2-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/fun_stats2.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/funs-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/funs-OTP-27.pretty
deleted file mode 100644
index 589448836f..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/funs-OTP-27.pretty
+++ /dev/null
@@ -1,373 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:23:20
-   │
-23 │ check_fun_neg() -> fun() -> ok end.
-   │                    ^^^^^^^^^^^^^^^ fun.
-Expression has type:   fun(() -> 'ok')
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:28:27
-   │
-28 │     fun() -> list_to_atom(Tup) end.
-   │                           ^^^ Tup.
-Expression has type:   {}
-Context expected type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:63:9
-   │
-63 │         X ++ [] end,
-   │         ^
-   │         │
-   │         X.
-Expression has type:   n()
-Context expected type: [term()]
-   │         
-
-Because in the expression's type:
-  Here the type is:     number()
-  Context expects type: [term()]
-
------------------------------- Detailed message ------------------------------
-
-  n() is not compatible with [term()]
-  because
-  number() is not compatible with [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:63:9
-   │
-63 │         X ++ [] end,
-   │         ^^^^^^^
-   │         │
-   │         _ ++ _.
-Expression has type:   [dynamic()]
-Context expected type: n()
-   │         
-
-Because in the expression's type:
-  Here the type is:     [dynamic()]
-  Context expects type: number()
-
------------------------------- Detailed message ------------------------------
-
-  [dynamic()] is not compatible with n()
-  because
-  [dynamic()] is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:70:13
-   │
-70 │             erlang:atom_to_binary(X)
-   │             ^^^^^^^^^^^^^^^^^^^^^^^^
-   │             │
-   │             erlang:atom_to_binary(X).
-Expression has type:   binary()
-Context expected type: n()
-   │             
-
-Because in the expression's type:
-  Here the type is:     binary()
-  Context expects type: number()
-
------------------------------- Detailed message ------------------------------
-
-  binary() is not compatible with n()
-  because
-  binary() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:70:35
-   │
-70 │             erlang:atom_to_binary(X)
-   │                                   ^
-   │                                   │
-   │                                   X.
-Expression has type:   n()
-Context expected type: atom()
-   │                                   
-
-Because in the expression's type:
-  Here the type is:     number()
-  Context expects type: atom()
-
------------------------------- Detailed message ------------------------------
-
-  n() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:77:5
-   │    
-77 │ ╭ ╭     lmap_n_to_n(
-78 │ │ │         fun(X) -> X end,
-79 │ │ │         [1,2,3]
-80 │ │ │     ).
-   │ ╰─│─────^ lmap_n_to_n(fun, [1, 2, 3]).
-Expression has type:   [n()]
-Context expected type: ['a']
-   │   ╰─────' 
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: 'a'
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [n()] is not compatible with ['a']
-  because
-  n() is not compatible with 'a'
-  because
-  number() is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:90:18
-   │
-90 │     fun(X, Y) -> X ++ Y end.
-   │                  ^
-   │                  │
-   │                  X.
-Expression has type:   n()
-Context expected type: [term()]
-   │                  
-
-Because in the expression's type:
-  Here the type is:     number()
-  Context expects type: [term()]
-
------------------------------- Detailed message ------------------------------
-
-  n() is not compatible with [term()]
-  because
-  number() is not compatible with [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:90:18
-   │
-90 │     fun(X, Y) -> X ++ Y end.
-   │                  ^^^^^^
-   │                  │
-   │                  _ ++ _.
-Expression has type:   [dynamic()]
-Context expected type: n()
-   │                  
-
-Because in the expression's type:
-  Here the type is:     [dynamic()]
-  Context expects type: number()
-
------------------------------- Detailed message ------------------------------
-
-  [dynamic()] is not compatible with n()
-  because
-  [dynamic()] is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:90:23
-   │
-90 │     fun(X, Y) -> X ++ Y end.
-   │                       ^
-   │                       │
-   │                       Y.
-Expression has type:   n()
-Context expected type: [term()]
-   │                       
-
-Because in the expression's type:
-  Here the type is:     number()
-  Context expects type: [term()]
-
------------------------------- Detailed message ------------------------------
-
-  n() is not compatible with [term()]
-  because
-  number() is not compatible with [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:96:31
-   │
-96 │         erlang:atom_to_binary(X),
-   │                               ^
-   │                               │
-   │                               X.
-Expression has type:   n()
-Context expected type: atom()
-   │                               
-
-Because in the expression's type:
-  Here the type is:     number()
-  Context expects type: atom()
-
------------------------------- Detailed message ------------------------------
-
-  n() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:97:9
-   │
-97 │         X ++ Y
-   │         ^
-   │         │
-   │         X.
-Expression has type:   n()
-Context expected type: [term()]
-   │         
-
-Because in the expression's type:
-  Here the type is:     number()
-  Context expects type: [term()]
-
------------------------------- Detailed message ------------------------------
-
-  n() is not compatible with [term()]
-  because
-  number() is not compatible with [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:97:9
-   │
-97 │         X ++ Y
-   │         ^^^^^^
-   │         │
-   │         _ ++ _.
-Expression has type:   [dynamic()]
-Context expected type: n()
-   │         
-
-Because in the expression's type:
-  Here the type is:     [dynamic()]
-  Context expects type: number()
-
------------------------------- Detailed message ------------------------------
-
-  [dynamic()] is not compatible with n()
-  because
-  [dynamic()] is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:97:14
-   │
-97 │         X ++ Y
-   │              ^
-   │              │
-   │              Y.
-Expression has type:   n()
-Context expected type: [term()]
-   │              
-
-Because in the expression's type:
-  Here the type is:     number()
-  Context expects type: [term()]
-
------------------------------- Detailed message ------------------------------
-
-  n() is not compatible with [term()]
-  because
-  number() is not compatible with [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs.erl:104:7
-    │
-104 │       erlang:is_number(X)
-    │       ^^^^^^^^^^^^^^^^^^^ erlang:is_number(X).
-Expression has type:   boolean()
-Context expected type: n()
-
-error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
-    ┌─ check/src/funs.erl:127:9
-    │
-127 │         fun (X, _) -> X end,
-    │         ^^^^^^^^^^^^^^^^^^^ fun.
-fun with arity 2 used as fun with 1 arguments
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs.erl:134:24
-    │
-134 │         fun (Y) -> Y + N end,
-    │                        ^ N.
-Expression has type:   atom()
-Context expected type: number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/funs.erl:155:1
-    │  
-155 │ ╭ x6(L, B) ->
-156 │ │     xmap(fun (_) -> B end, L).
-    │ ╰─────────────────────────────^ Clause is not covered by spec
-
-error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
-    ┌─ check/src/funs.erl:195:5
-    │
-195 │     (fun () -> ok end)(1, 2, 3).
-    │     ^^^^^^^^^^^^^^^^^^ fun.
-fun with arity 0 used as fun with 3 arguments
-
-error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
-    ┌─ check/src/funs.erl:199:5
-    │
-199 │     (fun (_X) -> ok end)(1, 2, 3).
-    │     ^^^^^^^^^^^^^^^^^^^^ fun.
-fun with arity 1 used as fun with 3 arguments
-
-error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
-    ┌─ check/src/funs.erl:203:5
-    │
-203 │     (fun (_X) -> ok end)().
-    │     ^^^^^^^^^^^^^^^^^^^^ fun.
-fun with arity 1 used as fun with 0 arguments
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs.erl:224:16
-    │
-224 │     fun F() -> F end.
-    │                ^ F.
-Expression has type:   fun(() -> 'a')
-Context expected type: 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs.erl:329:9
-    │
-329 │         F(A)
-    │         ^^^^ F(A).
-Expression has type:   term()
-Context expected type: 'other'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs.erl:336:11
-    │
-336 │         F(A)
-    │           ^ A.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs.erl:363:5
-    │
-363 │     Fun().
-    │     ^^^^^ Fun().
-Expression has type:   'no_ok'
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs.erl:368:5
-    │
-368 │     Fun().
-    │     ^^^^^ Fun().
-Expression has type:   'no_ok'
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs.erl:374:54
-    │
-374 │ use_callback_test_neg() -> callback_test(fun (_T) -> ok end).
-    │                                                      ^^ 'ok'.
-Expression has type:   'ok'
-Context expected type: none()
-
-27 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/funs-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/funs-OTP-28.pretty
deleted file mode 100644
index 589448836f..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/funs-OTP-28.pretty
+++ /dev/null
@@ -1,373 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:23:20
-   │
-23 │ check_fun_neg() -> fun() -> ok end.
-   │                    ^^^^^^^^^^^^^^^ fun.
-Expression has type:   fun(() -> 'ok')
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:28:27
-   │
-28 │     fun() -> list_to_atom(Tup) end.
-   │                           ^^^ Tup.
-Expression has type:   {}
-Context expected type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:63:9
-   │
-63 │         X ++ [] end,
-   │         ^
-   │         │
-   │         X.
-Expression has type:   n()
-Context expected type: [term()]
-   │         
-
-Because in the expression's type:
-  Here the type is:     number()
-  Context expects type: [term()]
-
------------------------------- Detailed message ------------------------------
-
-  n() is not compatible with [term()]
-  because
-  number() is not compatible with [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:63:9
-   │
-63 │         X ++ [] end,
-   │         ^^^^^^^
-   │         │
-   │         _ ++ _.
-Expression has type:   [dynamic()]
-Context expected type: n()
-   │         
-
-Because in the expression's type:
-  Here the type is:     [dynamic()]
-  Context expects type: number()
-
------------------------------- Detailed message ------------------------------
-
-  [dynamic()] is not compatible with n()
-  because
-  [dynamic()] is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:70:13
-   │
-70 │             erlang:atom_to_binary(X)
-   │             ^^^^^^^^^^^^^^^^^^^^^^^^
-   │             │
-   │             erlang:atom_to_binary(X).
-Expression has type:   binary()
-Context expected type: n()
-   │             
-
-Because in the expression's type:
-  Here the type is:     binary()
-  Context expects type: number()
-
------------------------------- Detailed message ------------------------------
-
-  binary() is not compatible with n()
-  because
-  binary() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:70:35
-   │
-70 │             erlang:atom_to_binary(X)
-   │                                   ^
-   │                                   │
-   │                                   X.
-Expression has type:   n()
-Context expected type: atom()
-   │                                   
-
-Because in the expression's type:
-  Here the type is:     number()
-  Context expects type: atom()
-
------------------------------- Detailed message ------------------------------
-
-  n() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:77:5
-   │    
-77 │ ╭ ╭     lmap_n_to_n(
-78 │ │ │         fun(X) -> X end,
-79 │ │ │         [1,2,3]
-80 │ │ │     ).
-   │ ╰─│─────^ lmap_n_to_n(fun, [1, 2, 3]).
-Expression has type:   [n()]
-Context expected type: ['a']
-   │   ╰─────' 
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: 'a'
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [n()] is not compatible with ['a']
-  because
-  n() is not compatible with 'a'
-  because
-  number() is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:90:18
-   │
-90 │     fun(X, Y) -> X ++ Y end.
-   │                  ^
-   │                  │
-   │                  X.
-Expression has type:   n()
-Context expected type: [term()]
-   │                  
-
-Because in the expression's type:
-  Here the type is:     number()
-  Context expects type: [term()]
-
------------------------------- Detailed message ------------------------------
-
-  n() is not compatible with [term()]
-  because
-  number() is not compatible with [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:90:18
-   │
-90 │     fun(X, Y) -> X ++ Y end.
-   │                  ^^^^^^
-   │                  │
-   │                  _ ++ _.
-Expression has type:   [dynamic()]
-Context expected type: n()
-   │                  
-
-Because in the expression's type:
-  Here the type is:     [dynamic()]
-  Context expects type: number()
-
------------------------------- Detailed message ------------------------------
-
-  [dynamic()] is not compatible with n()
-  because
-  [dynamic()] is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:90:23
-   │
-90 │     fun(X, Y) -> X ++ Y end.
-   │                       ^
-   │                       │
-   │                       Y.
-Expression has type:   n()
-Context expected type: [term()]
-   │                       
-
-Because in the expression's type:
-  Here the type is:     number()
-  Context expects type: [term()]
-
------------------------------- Detailed message ------------------------------
-
-  n() is not compatible with [term()]
-  because
-  number() is not compatible with [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:96:31
-   │
-96 │         erlang:atom_to_binary(X),
-   │                               ^
-   │                               │
-   │                               X.
-Expression has type:   n()
-Context expected type: atom()
-   │                               
-
-Because in the expression's type:
-  Here the type is:     number()
-  Context expects type: atom()
-
------------------------------- Detailed message ------------------------------
-
-  n() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:97:9
-   │
-97 │         X ++ Y
-   │         ^
-   │         │
-   │         X.
-Expression has type:   n()
-Context expected type: [term()]
-   │         
-
-Because in the expression's type:
-  Here the type is:     number()
-  Context expects type: [term()]
-
------------------------------- Detailed message ------------------------------
-
-  n() is not compatible with [term()]
-  because
-  number() is not compatible with [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:97:9
-   │
-97 │         X ++ Y
-   │         ^^^^^^
-   │         │
-   │         _ ++ _.
-Expression has type:   [dynamic()]
-Context expected type: n()
-   │         
-
-Because in the expression's type:
-  Here the type is:     [dynamic()]
-  Context expects type: number()
-
------------------------------- Detailed message ------------------------------
-
-  [dynamic()] is not compatible with n()
-  because
-  [dynamic()] is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs.erl:97:14
-   │
-97 │         X ++ Y
-   │              ^
-   │              │
-   │              Y.
-Expression has type:   n()
-Context expected type: [term()]
-   │              
-
-Because in the expression's type:
-  Here the type is:     number()
-  Context expects type: [term()]
-
------------------------------- Detailed message ------------------------------
-
-  n() is not compatible with [term()]
-  because
-  number() is not compatible with [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs.erl:104:7
-    │
-104 │       erlang:is_number(X)
-    │       ^^^^^^^^^^^^^^^^^^^ erlang:is_number(X).
-Expression has type:   boolean()
-Context expected type: n()
-
-error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
-    ┌─ check/src/funs.erl:127:9
-    │
-127 │         fun (X, _) -> X end,
-    │         ^^^^^^^^^^^^^^^^^^^ fun.
-fun with arity 2 used as fun with 1 arguments
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs.erl:134:24
-    │
-134 │         fun (Y) -> Y + N end,
-    │                        ^ N.
-Expression has type:   atom()
-Context expected type: number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/funs.erl:155:1
-    │  
-155 │ ╭ x6(L, B) ->
-156 │ │     xmap(fun (_) -> B end, L).
-    │ ╰─────────────────────────────^ Clause is not covered by spec
-
-error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
-    ┌─ check/src/funs.erl:195:5
-    │
-195 │     (fun () -> ok end)(1, 2, 3).
-    │     ^^^^^^^^^^^^^^^^^^ fun.
-fun with arity 0 used as fun with 3 arguments
-
-error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
-    ┌─ check/src/funs.erl:199:5
-    │
-199 │     (fun (_X) -> ok end)(1, 2, 3).
-    │     ^^^^^^^^^^^^^^^^^^^^ fun.
-fun with arity 1 used as fun with 3 arguments
-
-error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
-    ┌─ check/src/funs.erl:203:5
-    │
-203 │     (fun (_X) -> ok end)().
-    │     ^^^^^^^^^^^^^^^^^^^^ fun.
-fun with arity 1 used as fun with 0 arguments
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs.erl:224:16
-    │
-224 │     fun F() -> F end.
-    │                ^ F.
-Expression has type:   fun(() -> 'a')
-Context expected type: 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs.erl:329:9
-    │
-329 │         F(A)
-    │         ^^^^ F(A).
-Expression has type:   term()
-Context expected type: 'other'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs.erl:336:11
-    │
-336 │         F(A)
-    │           ^ A.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs.erl:363:5
-    │
-363 │     Fun().
-    │     ^^^^^ Fun().
-Expression has type:   'no_ok'
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs.erl:368:5
-    │
-368 │     Fun().
-    │     ^^^^^ Fun().
-Expression has type:   'no_ok'
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs.erl:374:54
-    │
-374 │ use_callback_test_neg() -> callback_test(fun (_T) -> ok end).
-    │                                                      ^^ 'ok'.
-Expression has type:   'ok'
-Context expected type: none()
-
-27 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/funs-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/funs.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/funs-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/funs.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/funs2-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/funs2-OTP-27.pretty
deleted file mode 100644
index 7b20cba52c..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/funs2-OTP-27.pretty
+++ /dev/null
@@ -1,135 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs2.erl:32:20
-   │
-32 │     fun(_, Acc) -> [Acc] end,
-   │                    ^^^^^
-   │                    │
-   │                    [Acc].
-Expression has type:   [[[[]]]]
-Context expected type: [[[]]]
-   │                    
-
-Because in the expression's type:
-  [
-    [
-      [
-        Here the type is:     []
-        Context expects type: none()
-      ]
-    ]
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [[[[]]]] is not compatible with [[[]]]
-  because
-  [[[]]] is not compatible with [[]]
-  because
-  [[]] is not compatible with []
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs2.erl:54:5
-   │
-54 │     X.
-   │     ^ X.
-Expression has type:   [dynamic()]
-Context expected type: number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/funs2.erl:95:1
-   │
-95 │ generic({}, {}, {}) -> nok.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs2.erl:95:24
-   │
-95 │ generic({}, {}, {}) -> nok.
-   │                        ^^^ 'nok'.
-Expression has type:   'nok'
-Context expected type: T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs2.erl:101:9
-    │
-101 │         fun erlang:atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((atom()) -> atom())
-    │         
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     string()
-    Context expects type: atom()
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((atom()) -> atom())
-  because
-  string() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs2.erl:101:9
-    │
-101 │         fun erlang:atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((dynamic() | fun((string()) -> atom())) -> dynamic() | fun((string()) -> atom()))
-    │         
-
-Because in the expression's type:
-  fun((
-    Here the type is a union type with some valid candidates: dynamic()
-    However the following candidate: fun((string()) -> atom())
-    Differs from the expected type:  atom()
-  ) -> string())
-
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((dynamic() | fun((string()) -> atom())) -> dynamic() | fun((string()) -> atom()))
-  because
-  dynamic() | fun((string()) -> atom()) is not compatible with atom()
-  because
-  fun((string()) -> atom()) is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs2.erl:101:9
-    │
-101 │         fun erlang:atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((dynamic() | string() | fun((string()) -> atom())) -> dynamic() | string() | fun((string()) -> atom()))
-    │         
-
-Because in the expression's type:
-  fun((
-    Here the type is a union type with some valid candidates: dynamic()
-    However the following candidate: string()
-    Differs from the expected type:  atom()
-  ) -> string())
-
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((dynamic() | string() | fun((string()) -> atom())) -> dynamic() | string() | fun((string()) -> atom()))
-  because
-  dynamic() | string() | fun((string()) -> atom()) is not compatible with atom()
-  because
-  string() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs2.erl:152:27
-    │
-152 │             (X, X) -> X + A
-    │                           ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-8 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/funs2-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/funs2-OTP-28.pretty
deleted file mode 100644
index 7b20cba52c..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/funs2-OTP-28.pretty
+++ /dev/null
@@ -1,135 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs2.erl:32:20
-   │
-32 │     fun(_, Acc) -> [Acc] end,
-   │                    ^^^^^
-   │                    │
-   │                    [Acc].
-Expression has type:   [[[[]]]]
-Context expected type: [[[]]]
-   │                    
-
-Because in the expression's type:
-  [
-    [
-      [
-        Here the type is:     []
-        Context expects type: none()
-      ]
-    ]
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [[[[]]]] is not compatible with [[[]]]
-  because
-  [[[]]] is not compatible with [[]]
-  because
-  [[]] is not compatible with []
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs2.erl:54:5
-   │
-54 │     X.
-   │     ^ X.
-Expression has type:   [dynamic()]
-Context expected type: number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/funs2.erl:95:1
-   │
-95 │ generic({}, {}, {}) -> nok.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs2.erl:95:24
-   │
-95 │ generic({}, {}, {}) -> nok.
-   │                        ^^^ 'nok'.
-Expression has type:   'nok'
-Context expected type: T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs2.erl:101:9
-    │
-101 │         fun erlang:atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((atom()) -> atom())
-    │         
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     string()
-    Context expects type: atom()
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((atom()) -> atom())
-  because
-  string() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs2.erl:101:9
-    │
-101 │         fun erlang:atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((dynamic() | fun((string()) -> atom())) -> dynamic() | fun((string()) -> atom()))
-    │         
-
-Because in the expression's type:
-  fun((
-    Here the type is a union type with some valid candidates: dynamic()
-    However the following candidate: fun((string()) -> atom())
-    Differs from the expected type:  atom()
-  ) -> string())
-
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((dynamic() | fun((string()) -> atom())) -> dynamic() | fun((string()) -> atom()))
-  because
-  dynamic() | fun((string()) -> atom()) is not compatible with atom()
-  because
-  fun((string()) -> atom()) is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs2.erl:101:9
-    │
-101 │         fun erlang:atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((dynamic() | string() | fun((string()) -> atom())) -> dynamic() | string() | fun((string()) -> atom()))
-    │         
-
-Because in the expression's type:
-  fun((
-    Here the type is a union type with some valid candidates: dynamic()
-    However the following candidate: string()
-    Differs from the expected type:  atom()
-  ) -> string())
-
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((dynamic() | string() | fun((string()) -> atom())) -> dynamic() | string() | fun((string()) -> atom()))
-  because
-  dynamic() | string() | fun((string()) -> atom()) is not compatible with atom()
-  because
-  string() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/funs2.erl:152:27
-    │
-152 │             (X, X) -> X + A
-    │                           ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-8 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/funs2-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/funs2.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/funs2-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/funs2.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/funs_uncommon-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/funs_uncommon-OTP-27.pretty
deleted file mode 100644
index 269917ecb4..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/funs_uncommon-OTP-27.pretty
+++ /dev/null
@@ -1,9 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs_uncommon.erl:38:13
-   │
-38 │     field = {fun(X) -> X end, an_atom}
-   │             ^^^^^^^^^^^^^^^^^^^^^^^^^^ {fun, 'an_atom'}.
-Expression has type:   {fun((dynamic()) -> dynamic()), 'an_atom'}
-Context expected type: fun(('a') -> 'a')
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/funs_uncommon-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/funs_uncommon-OTP-28.pretty
deleted file mode 100644
index 269917ecb4..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/funs_uncommon-OTP-28.pretty
+++ /dev/null
@@ -1,9 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/funs_uncommon.erl:38:13
-   │
-38 │     field = {fun(X) -> X end, an_atom}
-   │             ^^^^^^^^^^^^^^^^^^^^^^^^^^ {fun, 'an_atom'}.
-Expression has type:   {fun((dynamic()) -> dynamic()), 'an_atom'}
-Context expected type: fun(('a') -> 'a')
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/funs_uncommon-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/funs_uncommon.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/funs_uncommon-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/funs_uncommon.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/generic_fun_application-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/generic_fun_application-OTP-27.pretty
deleted file mode 100644
index c10af08c9d..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/generic_fun_application-OTP-27.pretty
+++ /dev/null
@@ -1,1232 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:27:18
-   │
-27 │ test01_neg(X) -> fapply(fun id/1, X).
-   │                  ^^^^^^^^^^^^^^^^^^^ fapply(id/1, X).
-Expression has type:   atom()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:38:5
-   │
-38 │     lmap(fun atom_to_pid/1, [2, 4]).
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lmap(atom_to_pid/1, [2, 4]).
-Expression has type:   [pid()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:38:29
-   │
-38 │     lmap(fun atom_to_pid/1, [2, 4]).
-   │                             ^^^^^^
-   │                             │
-   │                             [2, 4].
-Expression has type:   [number()]
-Context expected type: [atom()]
-   │                             
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:38:29
-   │
-38 │     lmap(fun atom_to_pid/1, [2, 4]).
-   │                             ^^^^^^
-   │                             │
-   │                             [2, 4].
-Expression has type:   [number()]
-Context expected type: [dynamic(atom())]
-   │                             
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [dynamic(atom())]
-  because
-  number() is not compatible with dynamic(atom())
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:43:5
-   │
-43 │     mapl([2, 4], fun atom_to_pid/1).
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ mapl([2, 4], atom_to_pid/1).
-Expression has type:   [pid()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:43:18
-   │
-43 │     mapl([2, 4], fun atom_to_pid/1).
-   │                  ^^^^^^^^^^^^^^^^^
-   │                  │
-   │                  atom_to_pid/1.
-Expression has type:   fun((atom()) -> pid())
-Context expected type: fun((number()) -> B)
-   │                  
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     pid()
-    Context expects type: B
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> pid()) is not compatible with fun((number()) -> B)
-  because
-  pid() is not compatible with B
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:43:18
-   │
-43 │     mapl([2, 4], fun atom_to_pid/1).
-   │                  ^^^^^^^^^^^^^^^^^
-   │                  │
-   │                  atom_to_pid/1.
-Expression has type:   fun((atom()) -> pid())
-Context expected type: fun((dynamic() | number()) -> pid())
-   │                  
-
-Because in the expression's type:
-  fun((
-    Here the type is a union type with some valid candidates: dynamic()
-    However the following candidate: number()
-    Differs from the expected type:  atom()
-  ) -> pid())
-
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> pid()) is not compatible with fun((dynamic() | number()) -> pid())
-  because
-  dynamic() | number() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:47:33
-   │
-47 │     X = lmap(fun atom_to_pid/1, [2, 4]),
-   │                                 ^^^^^^
-   │                                 │
-   │                                 [2, 4].
-Expression has type:   [number()]
-Context expected type: [atom()]
-   │                                 
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:47:33
-   │
-47 │     X = lmap(fun atom_to_pid/1, [2, 4]),
-   │                                 ^^^^^^
-   │                                 │
-   │                                 [2, 4].
-Expression has type:   [number()]
-Context expected type: [dynamic(atom())]
-   │                                 
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [dynamic(atom())]
-  because
-  number() is not compatible with dynamic(atom())
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:48:5
-   │
-48 │     X.
-   │     ^ X.
-Expression has type:   [pid()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:52:22
-   │
-52 │     X = mapl([2, 4], fun atom_to_pid/1),
-   │                      ^^^^^^^^^^^^^^^^^
-   │                      │
-   │                      atom_to_pid/1.
-Expression has type:   fun((atom()) -> pid())
-Context expected type: fun((number()) -> B)
-   │                      
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     pid()
-    Context expects type: B
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> pid()) is not compatible with fun((number()) -> B)
-  because
-  pid() is not compatible with B
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:52:22
-   │
-52 │     X = mapl([2, 4], fun atom_to_pid/1),
-   │                      ^^^^^^^^^^^^^^^^^
-   │                      │
-   │                      atom_to_pid/1.
-Expression has type:   fun((atom()) -> pid())
-Context expected type: fun((dynamic() | number()) -> pid())
-   │                      
-
-Because in the expression's type:
-  fun((
-    Here the type is a union type with some valid candidates: dynamic()
-    However the following candidate: number()
-    Differs from the expected type:  atom()
-  ) -> pid())
-
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> pid()) is not compatible with fun((dynamic() | number()) -> pid())
-  because
-  dynamic() | number() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:53:5
-   │
-53 │     X.
-   │     ^ X.
-Expression has type:   [pid()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:67:23
-   │
-67 │ test08_neg() -> lhead(h).
-   │                       ^ 'h'.
-Expression has type:   'h'
-Context expected type: [LH]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:67:23
-   │
-67 │ test08_neg() -> lhead(h).
-   │                       ^ 'h'.
-Expression has type:   'h'
-Context expected type: [dynamic()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:80:18
-   │
-80 │ test09_neg(M) -> maptt(M).
-   │                  ^^^^^^^^ maptt(M).
-Expression has type:   number()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:95:13
-   │
-95 │     map_att(M).
-   │             ^
-   │             │
-   │             M.
-Expression has type:   #{true => pid()}
-Context expected type: #{a => dynamic()}
-   │             
-
-Because in the expression's type:
-  Here the type is:     #{true => ...}
-  Context expects type: #{...}
-  The expected map has no corresponding key for: true.
-
------------------------------- Detailed message ------------------------------
-
-key `true` is declared in the former but not in the latter and the latter map has no default association
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:99:13
-   │
-99 │     map_att(3).
-   │             ^ 3.
-Expression has type:   number()
-Context expected type: #{a => T}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:99:13
-   │
-99 │     map_att(3).
-   │             ^ 3.
-Expression has type:   number()
-Context expected type: #{a => dynamic()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:102:17
-    │
-102 │ test13_neg() -> lmap({}, [2, 4]).
-    │                 ^^^^^^^^^^^^^^^^ lmap({}, [2, 4]).
-Expression has type:   [dynamic()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:102:22
-    │
-102 │ test13_neg() -> lmap({}, [2, 4]).
-    │                      ^^ {}.
-Expression has type:   {}
-Context expected type: fun((A) -> B)
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:102:22
-    │
-102 │ test13_neg() -> lmap({}, [2, 4]).
-    │                      ^^ {}.
-Expression has type:   {}
-Context expected type: fun((number()) -> dynamic())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:105:18
-    │
-105 │ test13b_neg() -> mapl([2, 4], {}).
-    │                  ^^^^^^^^^^^^^^^^ mapl([2, 4], {}).
-Expression has type:   [dynamic()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:105:31
-    │
-105 │ test13b_neg() -> mapl([2, 4], {}).
-    │                               ^^ {}.
-Expression has type:   {}
-Context expected type: fun((number()) -> B)
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:105:31
-    │
-105 │ test13b_neg() -> mapl([2, 4], {}).
-    │                               ^^ {}.
-Expression has type:   {}
-Context expected type: fun((number()) -> dynamic())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:119:5
-    │
-119 │     F(Shape).
-    │     ^^^^^^^^ F(Shape).
-Expression has type:   T
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:119:7
-    │
-119 │     F(Shape).
-    │       ^^^^^
-    │       │
-    │       Shape.
-Expression has type:   #{a => number()}
-Context expected type: #{atom() => T}
-    │       
-
-Because in the expression's type:
-  #{ a =>
-    Here the type is:     number()
-    Context expects type: T
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a => number()} is not compatible with #{atom() => T}
-  because
-  #{a => number()} is not compatible with #{atom() => T}
-  key `a` is declared in the former but not in the latter and key `a` isn't compatible with the default association of the latter map
-  because
-  number() is not compatible with T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:126:5
-    │
-126 │     F(Tuple).
-    │     ^^^^^^^^ F(Tuple).
-Expression has type:   X
-Context expected type: 'false'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:130:5
-    │
-130 │     lmap(F, [2, 4]).
-    │     ^^^^^^^^^^^^^^^ lmap(F, [2, 4]).
-Expression has type:   [dynamic()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:134:5
-    │
-134 │     mapl([2, 4], F).
-    │     ^^^^^^^^^^^^^^^ mapl([2, 4], F).
-Expression has type:   [dynamic()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:144:5
-    │
-144 │     ttt(AB, a).
-    │     ^^^^^^^^^^
-    │     │
-    │     ttt(AB, 'a').
-Expression has type:   'a' | 'b'
-Context expected type: 'a'
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'a'
-  However the following candidate: 'b'
-  Differs from the expected type:  'a'
-
------------------------------- Detailed message ------------------------------
-
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:157:5
-    │
-157 │     ttt(a, b).
-    │     ^^^^^^^^^ ttt('a', 'b').
-Expression has type:   'a' | 'b'
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:167:5
-    │
-167 │     ttt(a, b).
-    │     ^^^^^^^^^
-    │     │
-    │     ttt('a', 'b').
-Expression has type:   'a' | 'b'
-Context expected type: 'a'
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'a'
-  However the following candidate: 'b'
-  Differs from the expected type:  'a'
-
------------------------------- Detailed message ------------------------------
-
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:172:5
-    │
-172 │     ttt(a, b).
-    │     ^^^^^^^^^
-    │     │
-    │     ttt('a', 'b').
-Expression has type:   'a' | 'b'
-Context expected type: 'b'
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'b'
-  However the following candidate: 'a'
-  Differs from the expected type:  'b'
-
------------------------------- Detailed message ------------------------------
-
-  'a' | 'b' is not compatible with 'b'
-  because
-  'a' is not compatible with 'b'
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/generic_fun_application.erl:226:1
-    │  
-226 │ ╭ test31_pos(Any, None) ->
-227 │ │     X = ttt(Any, None),
-228 │ │     X.
-    │ ╰─────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/generic_fun_application.erl:242:1
-    │  
-242 │ ╭ test33_pos(None, Pid) ->
-243 │ │     X = ttt(None, Pid),
-244 │ │     X.
-    │ ╰─────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/generic_fun_application.erl:249:1
-    │  
-249 │ ╭ test34_pos(None) ->
-250 │ │     X=lmap(fun atom_to_pid/1, [None, a]),
-251 │ │     X.
-    │ ╰─────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:258:23
-    │
-258 │ test36_neg(F, X) -> F(X).
-    │                       ^ X.
-Expression has type:   T
-Context expected type: {T}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:270:5
-    │
-270 │     fun0_id(F).
-    │     ^^^^^^^^^^
-    │     │
-    │     fun0_id(F).
-Expression has type:   fun(() -> A)
-Context expected type: fun(() -> X)
-    │     
-
-Because in the expression's type:
-  fun(() ->
-    Here the type is:     A
-    Context expects type: X
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun(() -> A) is not compatible with fun(() -> X)
-  because
-  A is not compatible with X
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:276:5
-    │
-276 │     fun0_id(F).
-    │     ^^^^^^^^^^ fun0_id(F).
-Expression has type:   fun(() -> dynamic())
-Context expected type: fun((X) -> Y)
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:276:13
-    │
-276 │     fun0_id(F).
-    │             ^ F.
-Expression has type:   fun((A) -> B)
-Context expected type: fun(() -> X)
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:276:13
-    │
-276 │     fun0_id(F).
-    │             ^ F.
-Expression has type:   fun((A) -> B)
-Context expected type: fun(() -> dynamic())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:288:5
-    │
-288 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   'first' | Last
-Context expected type: 'first'
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'first'
-  However the following candidate: Last
-  Differs from the expected type:  'first'
-
------------------------------- Detailed message ------------------------------
-
-  'first' | Last is not compatible with 'first'
-  because
-  Last is not compatible with 'first'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:296:5
-    │
-296 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   atom() | T
-Context expected type: atom()
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: T
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  atom() | T is not compatible with atom()
-  because
-  T is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:322:5
-    │    
-322 │ ╭ ╭     expect_shape(
-323 │ │ │         #{t => 1, u => Pid}
-324 │ │ │     ).
-    │ ╰─│─────^ expect_shape(#{..}).
-Expression has type:   {number(), pid()}
-Context expected type: {pid(), number()}
-    │   ╰─────' 
-
-Because in the expression's type:
-  { 
-    Here the type is:     number()
-    Context expects type: pid()
-  , pid()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {number(), pid()} is not compatible with {pid(), number()}
-  because
-  number() is not compatible with pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:330:5
-    │
-330 │     F(A).
-    │     ^^^^ F(A).
-Expression has type:   B
-Context expected type: C
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:346:9
-    │
-346 │         fun fun1_id_pos_a/1),
-    │         ^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         Arg 1 of 'fun1_id_pos_a/1'.
-Expression has type:   fun((Z) -> Z) with 1 type parameter
-Context expected type: fun((A) -> A) with 0 type parameters
-    │         
-
-Because in the expression's type:
-  Here the type is:     fun((Z) -> Z) with 1 type parameter
-  Context expects type: fun((A) -> A) with 0 type parameters
-  The number of type parameters doesn't match.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:346:9
-    │
-346 │         fun fun1_id_pos_a/1),
-    │         ^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         Arg 1 of 'fun1_id_pos_a/1'.
-Expression has type:   fun((Z) -> Z) with 1 type parameter
-Context expected type: fun((dynamic()) -> dynamic()) with 0 type parameters
-    │         
-
-Because in the expression's type:
-  Here the type is:     fun((Z) -> Z) with 1 type parameter
-  Context expects type: fun((dynamic()) -> dynamic()) with 0 type parameters
-  The number of type parameters doesn't match.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:346:9
-    │
-346 │         fun fun1_id_pos_a/1),
-    │         ^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         Arg 1 of 'fun1_id_pos_a/1'.
-Expression has type:   fun((Z) -> Z) | fun((dynamic()) -> dynamic())
-Context expected type: fun((A) -> A)
-    │         
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: fun((dynamic()) -> dynamic())
-  However, the following candidate doesn't match:
-  Here the type is:     fun((Z) -> Z) with 1 type parameter
-  Context expects type: fun((A) -> A) with 0 type parameters
-  The number of type parameters doesn't match.
-
------------------------------- Detailed message ------------------------------
-
-  fun((Z) -> Z) | fun((dynamic()) -> dynamic()) is not compatible with fun((A) -> A)
-  because
-  fun((Z) -> Z) with 1 type parameter is not compatible with fun((A) -> A) with 0 type parameters
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:346:9
-    │
-346 │         fun fun1_id_pos_a/1),
-    │         ^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         Arg 1 of 'fun1_id_pos_a/1'.
-Expression has type:   fun((Z) -> Z) | fun((dynamic()) -> dynamic())
-Context expected type: fun((dynamic()) -> dynamic())
-    │         
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: fun((dynamic()) -> dynamic())
-  However, the following candidate doesn't match:
-  Here the type is:     fun((Z) -> Z) with 1 type parameter
-  Context expects type: fun((dynamic()) -> dynamic()) with 0 type parameters
-  The number of type parameters doesn't match.
-
------------------------------- Detailed message ------------------------------
-
-  fun((Z) -> Z) | fun((dynamic()) -> dynamic()) is not compatible with fun((dynamic()) -> dynamic())
-  because
-  fun((Z) -> Z) with 1 type parameter is not compatible with fun((dynamic()) -> dynamic()) with 0 type parameters
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:346:9
-    │
-346 │         fun fun1_id_pos_a/1),
-    │         ^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         Arg 1 of 'fun1_id_pos_a/1'.
-Expression has type:   fun((Z) -> Z) | fun((dynamic()) -> dynamic())
-Context expected type: fun((A) -> A)
-    │         
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: fun((dynamic()) -> dynamic())
-  However, the following candidate doesn't match:
-  Here the type is:     fun((Z) -> Z) with 1 type parameter
-  Context expects type: fun((A) -> A) with 0 type parameters
-  The number of type parameters doesn't match.
-
------------------------------- Detailed message ------------------------------
-
-  fun((Z) -> Z) | fun((dynamic()) -> dynamic()) is not compatible with fun((A) -> A)
-  because
-  fun((Z) -> Z) with 1 type parameter is not compatible with fun((A) -> A) with 0 type parameters
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:358:9
-    │
-358 │         fun fun1_id_pos_z/1),
-    │         ^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         Arg 1 of 'fun1_id_pos_z/1'.
-Expression has type:   fun((Z) -> Z) with 1 type parameter
-Context expected type: fun((Z) -> Z) with 0 type parameters
-    │         
-
-Because in the expression's type:
-  Here the type is:     fun((Z) -> Z) with 1 type parameter
-  Context expects type: fun((Z) -> Z) with 0 type parameters
-  The number of type parameters doesn't match.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:358:9
-    │
-358 │         fun fun1_id_pos_z/1),
-    │         ^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         Arg 1 of 'fun1_id_pos_z/1'.
-Expression has type:   fun((Z) -> Z) with 1 type parameter
-Context expected type: fun((dynamic()) -> dynamic()) with 0 type parameters
-    │         
-
-Because in the expression's type:
-  Here the type is:     fun((Z) -> Z) with 1 type parameter
-  Context expects type: fun((dynamic()) -> dynamic()) with 0 type parameters
-  The number of type parameters doesn't match.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:358:9
-    │
-358 │         fun fun1_id_pos_z/1),
-    │         ^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         Arg 1 of 'fun1_id_pos_z/1'.
-Expression has type:   fun((Z) -> Z) | fun((dynamic()) -> dynamic())
-Context expected type: fun((Z) -> Z)
-    │         
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: fun((dynamic()) -> dynamic())
-  However, the following candidate doesn't match:
-  Here the type is:     fun((Z) -> Z) with 1 type parameter
-  Context expects type: fun((Z) -> Z) with 0 type parameters
-  The number of type parameters doesn't match.
-
------------------------------- Detailed message ------------------------------
-
-  fun((Z) -> Z) | fun((dynamic()) -> dynamic()) is not compatible with fun((Z) -> Z)
-  because
-  fun((Z) -> Z) with 1 type parameter is not compatible with fun((Z) -> Z) with 0 type parameters
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:358:9
-    │
-358 │         fun fun1_id_pos_z/1),
-    │         ^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         Arg 1 of 'fun1_id_pos_z/1'.
-Expression has type:   fun((Z) -> Z) | fun((dynamic()) -> dynamic())
-Context expected type: fun((dynamic()) -> dynamic())
-    │         
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: fun((dynamic()) -> dynamic())
-  However, the following candidate doesn't match:
-  Here the type is:     fun((Z) -> Z) with 1 type parameter
-  Context expects type: fun((dynamic()) -> dynamic()) with 0 type parameters
-  The number of type parameters doesn't match.
-
------------------------------- Detailed message ------------------------------
-
-  fun((Z) -> Z) | fun((dynamic()) -> dynamic()) is not compatible with fun((dynamic()) -> dynamic())
-  because
-  fun((Z) -> Z) with 1 type parameter is not compatible with fun((dynamic()) -> dynamic()) with 0 type parameters
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:358:9
-    │
-358 │         fun fun1_id_pos_z/1),
-    │         ^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         Arg 1 of 'fun1_id_pos_z/1'.
-Expression has type:   fun((Z) -> Z) | fun((dynamic()) -> dynamic())
-Context expected type: fun((Z) -> Z)
-    │         
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: fun((dynamic()) -> dynamic())
-  However, the following candidate doesn't match:
-  Here the type is:     fun((Z) -> Z) with 1 type parameter
-  Context expects type: fun((Z) -> Z) with 0 type parameters
-  The number of type parameters doesn't match.
-
------------------------------- Detailed message ------------------------------
-
-  fun((Z) -> Z) | fun((dynamic()) -> dynamic()) is not compatible with fun((Z) -> Z)
-  because
-  fun((Z) -> Z) with 1 type parameter is not compatible with fun((Z) -> Z) with 0 type parameters
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:432:18
-    │
-432 │ test_dict1(D) -> num_and_t(D, D).
-    │                  ^^^^^^^^^^^^^^^ num_and_t(D, D).
-Expression has type:   #{atom() => pid()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:432:28
-    │
-432 │ test_dict1(D) -> num_and_t(D, D).
-    │                            ^ D.
-Expression has type:   #{atom() => pid()}
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:441:5
-    │
-441 │     shape_vars(#{T => 3}, 3).
-    │     ^^^^^^^^^^^^^^^^^^^^^^^^ shape_vars(#{..}, 3).
-Expression has type:   'ok'
-Context expected type: T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:441:16
-    │
-441 │     shape_vars(#{T => 3}, 3).
-    │                ^^^^^^^^^
-    │                │
-    │                #{..}.
-Expression has type:   #{T => number()}
-Context expected type: #{a := T}
-    │                
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{a := ..., ...}
-  The type of the expression is missing the following required keys: a.
-
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:441:16
-    │
-441 │     shape_vars(#{T => 3}, 3).
-    │                ^^^^^^^^^
-    │                │
-    │                #{..}.
-Expression has type:   #{T => number()}
-Context expected type: #{a := term()}
-    │                
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{a := ..., ...}
-  The type of the expression is missing the following required keys: a.
-
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:446:15
-    │
-446 │     dict_vars(F, N).
-    │               ^
-    │               │
-    │               F.
-Expression has type:   fun((#{a => number()}) -> number())
-Context expected type: fun((#{{T} => T}) -> T)
-    │               
-
-Because in the expression's type:
-  fun((#{a => number()}) ->
-    Here the type is:     number()
-    Context expects type: T
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun((#{a => number()}) -> number()) is not compatible with fun((#{{T} => T}) -> T)
-  because
-  number() is not compatible with T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:446:15
-    │
-446 │     dict_vars(F, N).
-    │               ^
-    │               │
-    │               F.
-Expression has type:   fun((#{a => number()}) -> number())
-Context expected type: fun((#{{number()} => number()}) -> number())
-    │               
-
-Because in the expression's type:
-  fun((
-    Here the type is:     #{{number()} => number()}
-    Context expects type: #{...} (no default association)
-    The expected map has no default association while the type of the expression has one.
-  ) -> number())
-
------------------------------- Detailed message ------------------------------
-
-  fun((#{a => number()}) -> number()) is not compatible with fun((#{{number()} => number()}) -> number())
-  because
-  #{{number()} => number()} is not compatible with #{a => number()}
-  because
-  #{{number()} => number()} is not compatible with #{a => number()}
-  the latter map has no default association while the first map has one
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:471:24
-    │
-471 │ test_aliases_neg(F) -> F.
-    │                        ^
-    │                        │
-    │                        F.
-Expression has type:   fun(('a') -> 'b')
-Context expected type: fun(('a') -> 'c')
-    │                        
-
-Because in the expression's type:
-  fun(('a') ->
-    Here the type is:     'b'
-    Context expects type: 'c'
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun(('a') -> 'b') is not compatible with fun(('a') -> 'c')
-  because
-  'b' is not compatible with 'c'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:478:17
-    │
-478 │     takesShape1(#{}).
-    │                 ^^^
-    │                 │
-    │                 #{..}.
-Expression has type:   #{}
-Context expected type: #{a := T}
-    │                 
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{a := ..., ...}
-  The type of the expression is missing the following required keys: a.
-
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:478:17
-    │
-478 │     takesShape1(#{}).
-    │                 ^^^
-    │                 │
-    │                 #{..}.
-Expression has type:   #{}
-Context expected type: #{a := dynamic()}
-    │                 
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{a := ..., ...}
-  The type of the expression is missing the following required keys: a.
-
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:500:36
-    │
-500 │ test_quanitifer_scope_neg(F, X) -> F(X).
-    │                                    ^^^^ F(X).
-Expression has type:   T
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:500:38
-    │
-500 │ test_quanitifer_scope_neg(F, X) -> F(X).
-    │                                      ^ X.
-Expression has type:   number()
-Context expected type: T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:551:5
-    │
-551 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   contravar(contravar('a' | 'b'))
-Context expected type: contravar(contravar('a'))
-    │     
-
-Because in the expression's type:
-  fun((
-    fun((
-      Here the type is a union type with some valid candidates: 'a'
-      However the following candidate: 'b'
-      Differs from the expected type:  'a'
-    ) -> 'ok')
-  ) -> 'ok')
-
------------------------------- Detailed message ------------------------------
-
-  contravar(contravar('a' | 'b')) is not compatible with contravar(contravar('a'))
-  because
-  fun((contravar('a' | 'b')) -> 'ok') is not compatible with contravar(contravar('a'))
-  because
-  fun((contravar('a' | 'b')) -> 'ok') is not compatible with fun((contravar('a')) -> 'ok')
-  because
-  contravar('a') is not compatible with contravar('a' | 'b')
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:563:5
-    │
-563 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   invar('a')
-Context expected type: fun((atom()) -> atom())
-    │     
-
-Because in the expression's type:
-  fun((
-    Here the type is:     atom()
-    Context expects type: 'a'
-  ) -> 'a')
-
------------------------------- Detailed message ------------------------------
-
-  invar('a') is not compatible with fun((atom()) -> atom())
-  because
-  fun(('a') -> 'a') is not compatible with fun((atom()) -> atom())
-  because
-  atom() is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:569:5
-    │
-569 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   invar('a')
-Context expected type: invar(atom())
-    │     
-
-Because in the expression's type:
-  fun((
-    Here the type is:     atom()
-    Context expects type: 'a'
-  ) -> 'a')
-
------------------------------- Detailed message ------------------------------
-
-  invar('a') is not compatible with invar(atom())
-  because
-  fun(('a') -> 'a') is not compatible with invar(atom())
-  because
-  fun(('a') -> 'a') is not compatible with fun((atom()) -> atom())
-  because
-  atom() is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:585:5
-    │
-585 │     a.
-    │     ^
-    │     │
-    │     'a'.
-Expression has type:   'a'
-Context expected type: invar('a')
-    │     
-
-Because in the expression's type:
-  Here the type is:     'a'
-  Context expects type: fun(('a') -> 'a')
-
------------------------------- Detailed message ------------------------------
-
-  'a' is not compatible with invar('a')
-  because
-  'a' is not compatible with fun(('a') -> 'a')
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/generic_fun_application.erl:625:1
-    │
-625 │ stuff_1(0) -> erlang:self().
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/generic_fun_application.erl:633:1
-    │
-633 │ stuff_2(0) -> erlang:self().
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ check/src/generic_fun_application.erl:645:5
-    │
-645 │     F(1, 2),
-    │     ^ F.
-Expected fun type with arity 2
-Got: fun((Z) -> Z)
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ check/src/generic_fun_application.erl:651:5
-    │
-651 │     F(1, 2).
-    │     ^ F.
-Expected fun type with arity 2
-Got: fun((Z) -> Z)
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:684:9
-    │
-684 │         #{u => 1, t => Pid, extra => 3}
-    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         #{..}.
-Expression has type:   #{extra := number(), t := pid(), u := number()}
-Context expected type: #{t := pid(), u := number()}
-    │         
-
-Because in the expression's type:
-  Here the type is:     #{extra := ...}
-  Context expects type: #{...}
-  The expected map has no corresponding key for: extra.
-
------------------------------- Detailed message ------------------------------
-
-key `extra` is declared in the former but not in the latter and the latter map has no default association
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:721:25
-    │
-721 │ test_apply2() -> apply2(fun tat/2, 1, 1).
-    │                         ^^^^^^^^^ Arg 2 of 'tat/2'.
-Expression has type:   number()
-Context expected type: 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:739:5
-    │
-739 │     invar(a, a).
-    │     ^^^^^^^^^^^
-    │     │
-    │     invar('a', 'a').
-Expression has type:   fun(('a') -> 'a')
-Context expected type: fun(('a' | 'b') -> 'a' | 'b')
-    │     
-
-Because in the expression's type:
-  fun((
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  ) -> 'a')
-
------------------------------- Detailed message ------------------------------
-
-  fun(('a') -> 'a') is not compatible with fun(('a' | 'b') -> 'a' | 'b')
-  because
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:752:32
-    │
-752 │     _ = fun_with_tuple({a, b}, {}),
-    │                                ^^ {}.
-Expression has type:   {}
-Context expected type: [A]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:752:32
-    │
-752 │     _ = fun_with_tuple({a, b}, {}),
-    │                                ^^ {}.
-Expression has type:   {}
-Context expected type: [dynamic()]
-
-81 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/generic_fun_application-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/generic_fun_application-OTP-28.pretty
deleted file mode 100644
index c10af08c9d..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/generic_fun_application-OTP-28.pretty
+++ /dev/null
@@ -1,1232 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:27:18
-   │
-27 │ test01_neg(X) -> fapply(fun id/1, X).
-   │                  ^^^^^^^^^^^^^^^^^^^ fapply(id/1, X).
-Expression has type:   atom()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:38:5
-   │
-38 │     lmap(fun atom_to_pid/1, [2, 4]).
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lmap(atom_to_pid/1, [2, 4]).
-Expression has type:   [pid()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:38:29
-   │
-38 │     lmap(fun atom_to_pid/1, [2, 4]).
-   │                             ^^^^^^
-   │                             │
-   │                             [2, 4].
-Expression has type:   [number()]
-Context expected type: [atom()]
-   │                             
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:38:29
-   │
-38 │     lmap(fun atom_to_pid/1, [2, 4]).
-   │                             ^^^^^^
-   │                             │
-   │                             [2, 4].
-Expression has type:   [number()]
-Context expected type: [dynamic(atom())]
-   │                             
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [dynamic(atom())]
-  because
-  number() is not compatible with dynamic(atom())
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:43:5
-   │
-43 │     mapl([2, 4], fun atom_to_pid/1).
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ mapl([2, 4], atom_to_pid/1).
-Expression has type:   [pid()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:43:18
-   │
-43 │     mapl([2, 4], fun atom_to_pid/1).
-   │                  ^^^^^^^^^^^^^^^^^
-   │                  │
-   │                  atom_to_pid/1.
-Expression has type:   fun((atom()) -> pid())
-Context expected type: fun((number()) -> B)
-   │                  
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     pid()
-    Context expects type: B
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> pid()) is not compatible with fun((number()) -> B)
-  because
-  pid() is not compatible with B
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:43:18
-   │
-43 │     mapl([2, 4], fun atom_to_pid/1).
-   │                  ^^^^^^^^^^^^^^^^^
-   │                  │
-   │                  atom_to_pid/1.
-Expression has type:   fun((atom()) -> pid())
-Context expected type: fun((dynamic() | number()) -> pid())
-   │                  
-
-Because in the expression's type:
-  fun((
-    Here the type is a union type with some valid candidates: dynamic()
-    However the following candidate: number()
-    Differs from the expected type:  atom()
-  ) -> pid())
-
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> pid()) is not compatible with fun((dynamic() | number()) -> pid())
-  because
-  dynamic() | number() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:47:33
-   │
-47 │     X = lmap(fun atom_to_pid/1, [2, 4]),
-   │                                 ^^^^^^
-   │                                 │
-   │                                 [2, 4].
-Expression has type:   [number()]
-Context expected type: [atom()]
-   │                                 
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:47:33
-   │
-47 │     X = lmap(fun atom_to_pid/1, [2, 4]),
-   │                                 ^^^^^^
-   │                                 │
-   │                                 [2, 4].
-Expression has type:   [number()]
-Context expected type: [dynamic(atom())]
-   │                                 
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [dynamic(atom())]
-  because
-  number() is not compatible with dynamic(atom())
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:48:5
-   │
-48 │     X.
-   │     ^ X.
-Expression has type:   [pid()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:52:22
-   │
-52 │     X = mapl([2, 4], fun atom_to_pid/1),
-   │                      ^^^^^^^^^^^^^^^^^
-   │                      │
-   │                      atom_to_pid/1.
-Expression has type:   fun((atom()) -> pid())
-Context expected type: fun((number()) -> B)
-   │                      
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     pid()
-    Context expects type: B
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> pid()) is not compatible with fun((number()) -> B)
-  because
-  pid() is not compatible with B
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:52:22
-   │
-52 │     X = mapl([2, 4], fun atom_to_pid/1),
-   │                      ^^^^^^^^^^^^^^^^^
-   │                      │
-   │                      atom_to_pid/1.
-Expression has type:   fun((atom()) -> pid())
-Context expected type: fun((dynamic() | number()) -> pid())
-   │                      
-
-Because in the expression's type:
-  fun((
-    Here the type is a union type with some valid candidates: dynamic()
-    However the following candidate: number()
-    Differs from the expected type:  atom()
-  ) -> pid())
-
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> pid()) is not compatible with fun((dynamic() | number()) -> pid())
-  because
-  dynamic() | number() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:53:5
-   │
-53 │     X.
-   │     ^ X.
-Expression has type:   [pid()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:67:23
-   │
-67 │ test08_neg() -> lhead(h).
-   │                       ^ 'h'.
-Expression has type:   'h'
-Context expected type: [LH]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:67:23
-   │
-67 │ test08_neg() -> lhead(h).
-   │                       ^ 'h'.
-Expression has type:   'h'
-Context expected type: [dynamic()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:80:18
-   │
-80 │ test09_neg(M) -> maptt(M).
-   │                  ^^^^^^^^ maptt(M).
-Expression has type:   number()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:95:13
-   │
-95 │     map_att(M).
-   │             ^
-   │             │
-   │             M.
-Expression has type:   #{true => pid()}
-Context expected type: #{a => dynamic()}
-   │             
-
-Because in the expression's type:
-  Here the type is:     #{true => ...}
-  Context expects type: #{...}
-  The expected map has no corresponding key for: true.
-
------------------------------- Detailed message ------------------------------
-
-key `true` is declared in the former but not in the latter and the latter map has no default association
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:99:13
-   │
-99 │     map_att(3).
-   │             ^ 3.
-Expression has type:   number()
-Context expected type: #{a => T}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generic_fun_application.erl:99:13
-   │
-99 │     map_att(3).
-   │             ^ 3.
-Expression has type:   number()
-Context expected type: #{a => dynamic()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:102:17
-    │
-102 │ test13_neg() -> lmap({}, [2, 4]).
-    │                 ^^^^^^^^^^^^^^^^ lmap({}, [2, 4]).
-Expression has type:   [dynamic()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:102:22
-    │
-102 │ test13_neg() -> lmap({}, [2, 4]).
-    │                      ^^ {}.
-Expression has type:   {}
-Context expected type: fun((A) -> B)
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:102:22
-    │
-102 │ test13_neg() -> lmap({}, [2, 4]).
-    │                      ^^ {}.
-Expression has type:   {}
-Context expected type: fun((number()) -> dynamic())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:105:18
-    │
-105 │ test13b_neg() -> mapl([2, 4], {}).
-    │                  ^^^^^^^^^^^^^^^^ mapl([2, 4], {}).
-Expression has type:   [dynamic()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:105:31
-    │
-105 │ test13b_neg() -> mapl([2, 4], {}).
-    │                               ^^ {}.
-Expression has type:   {}
-Context expected type: fun((number()) -> B)
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:105:31
-    │
-105 │ test13b_neg() -> mapl([2, 4], {}).
-    │                               ^^ {}.
-Expression has type:   {}
-Context expected type: fun((number()) -> dynamic())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:119:5
-    │
-119 │     F(Shape).
-    │     ^^^^^^^^ F(Shape).
-Expression has type:   T
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:119:7
-    │
-119 │     F(Shape).
-    │       ^^^^^
-    │       │
-    │       Shape.
-Expression has type:   #{a => number()}
-Context expected type: #{atom() => T}
-    │       
-
-Because in the expression's type:
-  #{ a =>
-    Here the type is:     number()
-    Context expects type: T
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a => number()} is not compatible with #{atom() => T}
-  because
-  #{a => number()} is not compatible with #{atom() => T}
-  key `a` is declared in the former but not in the latter and key `a` isn't compatible with the default association of the latter map
-  because
-  number() is not compatible with T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:126:5
-    │
-126 │     F(Tuple).
-    │     ^^^^^^^^ F(Tuple).
-Expression has type:   X
-Context expected type: 'false'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:130:5
-    │
-130 │     lmap(F, [2, 4]).
-    │     ^^^^^^^^^^^^^^^ lmap(F, [2, 4]).
-Expression has type:   [dynamic()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:134:5
-    │
-134 │     mapl([2, 4], F).
-    │     ^^^^^^^^^^^^^^^ mapl([2, 4], F).
-Expression has type:   [dynamic()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:144:5
-    │
-144 │     ttt(AB, a).
-    │     ^^^^^^^^^^
-    │     │
-    │     ttt(AB, 'a').
-Expression has type:   'a' | 'b'
-Context expected type: 'a'
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'a'
-  However the following candidate: 'b'
-  Differs from the expected type:  'a'
-
------------------------------- Detailed message ------------------------------
-
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:157:5
-    │
-157 │     ttt(a, b).
-    │     ^^^^^^^^^ ttt('a', 'b').
-Expression has type:   'a' | 'b'
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:167:5
-    │
-167 │     ttt(a, b).
-    │     ^^^^^^^^^
-    │     │
-    │     ttt('a', 'b').
-Expression has type:   'a' | 'b'
-Context expected type: 'a'
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'a'
-  However the following candidate: 'b'
-  Differs from the expected type:  'a'
-
------------------------------- Detailed message ------------------------------
-
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:172:5
-    │
-172 │     ttt(a, b).
-    │     ^^^^^^^^^
-    │     │
-    │     ttt('a', 'b').
-Expression has type:   'a' | 'b'
-Context expected type: 'b'
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'b'
-  However the following candidate: 'a'
-  Differs from the expected type:  'b'
-
------------------------------- Detailed message ------------------------------
-
-  'a' | 'b' is not compatible with 'b'
-  because
-  'a' is not compatible with 'b'
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/generic_fun_application.erl:226:1
-    │  
-226 │ ╭ test31_pos(Any, None) ->
-227 │ │     X = ttt(Any, None),
-228 │ │     X.
-    │ ╰─────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/generic_fun_application.erl:242:1
-    │  
-242 │ ╭ test33_pos(None, Pid) ->
-243 │ │     X = ttt(None, Pid),
-244 │ │     X.
-    │ ╰─────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/generic_fun_application.erl:249:1
-    │  
-249 │ ╭ test34_pos(None) ->
-250 │ │     X=lmap(fun atom_to_pid/1, [None, a]),
-251 │ │     X.
-    │ ╰─────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:258:23
-    │
-258 │ test36_neg(F, X) -> F(X).
-    │                       ^ X.
-Expression has type:   T
-Context expected type: {T}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:270:5
-    │
-270 │     fun0_id(F).
-    │     ^^^^^^^^^^
-    │     │
-    │     fun0_id(F).
-Expression has type:   fun(() -> A)
-Context expected type: fun(() -> X)
-    │     
-
-Because in the expression's type:
-  fun(() ->
-    Here the type is:     A
-    Context expects type: X
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun(() -> A) is not compatible with fun(() -> X)
-  because
-  A is not compatible with X
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:276:5
-    │
-276 │     fun0_id(F).
-    │     ^^^^^^^^^^ fun0_id(F).
-Expression has type:   fun(() -> dynamic())
-Context expected type: fun((X) -> Y)
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:276:13
-    │
-276 │     fun0_id(F).
-    │             ^ F.
-Expression has type:   fun((A) -> B)
-Context expected type: fun(() -> X)
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:276:13
-    │
-276 │     fun0_id(F).
-    │             ^ F.
-Expression has type:   fun((A) -> B)
-Context expected type: fun(() -> dynamic())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:288:5
-    │
-288 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   'first' | Last
-Context expected type: 'first'
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'first'
-  However the following candidate: Last
-  Differs from the expected type:  'first'
-
------------------------------- Detailed message ------------------------------
-
-  'first' | Last is not compatible with 'first'
-  because
-  Last is not compatible with 'first'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:296:5
-    │
-296 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   atom() | T
-Context expected type: atom()
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: T
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  atom() | T is not compatible with atom()
-  because
-  T is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:322:5
-    │    
-322 │ ╭ ╭     expect_shape(
-323 │ │ │         #{t => 1, u => Pid}
-324 │ │ │     ).
-    │ ╰─│─────^ expect_shape(#{..}).
-Expression has type:   {number(), pid()}
-Context expected type: {pid(), number()}
-    │   ╰─────' 
-
-Because in the expression's type:
-  { 
-    Here the type is:     number()
-    Context expects type: pid()
-  , pid()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {number(), pid()} is not compatible with {pid(), number()}
-  because
-  number() is not compatible with pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:330:5
-    │
-330 │     F(A).
-    │     ^^^^ F(A).
-Expression has type:   B
-Context expected type: C
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:346:9
-    │
-346 │         fun fun1_id_pos_a/1),
-    │         ^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         Arg 1 of 'fun1_id_pos_a/1'.
-Expression has type:   fun((Z) -> Z) with 1 type parameter
-Context expected type: fun((A) -> A) with 0 type parameters
-    │         
-
-Because in the expression's type:
-  Here the type is:     fun((Z) -> Z) with 1 type parameter
-  Context expects type: fun((A) -> A) with 0 type parameters
-  The number of type parameters doesn't match.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:346:9
-    │
-346 │         fun fun1_id_pos_a/1),
-    │         ^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         Arg 1 of 'fun1_id_pos_a/1'.
-Expression has type:   fun((Z) -> Z) with 1 type parameter
-Context expected type: fun((dynamic()) -> dynamic()) with 0 type parameters
-    │         
-
-Because in the expression's type:
-  Here the type is:     fun((Z) -> Z) with 1 type parameter
-  Context expects type: fun((dynamic()) -> dynamic()) with 0 type parameters
-  The number of type parameters doesn't match.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:346:9
-    │
-346 │         fun fun1_id_pos_a/1),
-    │         ^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         Arg 1 of 'fun1_id_pos_a/1'.
-Expression has type:   fun((Z) -> Z) | fun((dynamic()) -> dynamic())
-Context expected type: fun((A) -> A)
-    │         
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: fun((dynamic()) -> dynamic())
-  However, the following candidate doesn't match:
-  Here the type is:     fun((Z) -> Z) with 1 type parameter
-  Context expects type: fun((A) -> A) with 0 type parameters
-  The number of type parameters doesn't match.
-
------------------------------- Detailed message ------------------------------
-
-  fun((Z) -> Z) | fun((dynamic()) -> dynamic()) is not compatible with fun((A) -> A)
-  because
-  fun((Z) -> Z) with 1 type parameter is not compatible with fun((A) -> A) with 0 type parameters
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:346:9
-    │
-346 │         fun fun1_id_pos_a/1),
-    │         ^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         Arg 1 of 'fun1_id_pos_a/1'.
-Expression has type:   fun((Z) -> Z) | fun((dynamic()) -> dynamic())
-Context expected type: fun((dynamic()) -> dynamic())
-    │         
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: fun((dynamic()) -> dynamic())
-  However, the following candidate doesn't match:
-  Here the type is:     fun((Z) -> Z) with 1 type parameter
-  Context expects type: fun((dynamic()) -> dynamic()) with 0 type parameters
-  The number of type parameters doesn't match.
-
------------------------------- Detailed message ------------------------------
-
-  fun((Z) -> Z) | fun((dynamic()) -> dynamic()) is not compatible with fun((dynamic()) -> dynamic())
-  because
-  fun((Z) -> Z) with 1 type parameter is not compatible with fun((dynamic()) -> dynamic()) with 0 type parameters
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:346:9
-    │
-346 │         fun fun1_id_pos_a/1),
-    │         ^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         Arg 1 of 'fun1_id_pos_a/1'.
-Expression has type:   fun((Z) -> Z) | fun((dynamic()) -> dynamic())
-Context expected type: fun((A) -> A)
-    │         
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: fun((dynamic()) -> dynamic())
-  However, the following candidate doesn't match:
-  Here the type is:     fun((Z) -> Z) with 1 type parameter
-  Context expects type: fun((A) -> A) with 0 type parameters
-  The number of type parameters doesn't match.
-
------------------------------- Detailed message ------------------------------
-
-  fun((Z) -> Z) | fun((dynamic()) -> dynamic()) is not compatible with fun((A) -> A)
-  because
-  fun((Z) -> Z) with 1 type parameter is not compatible with fun((A) -> A) with 0 type parameters
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:358:9
-    │
-358 │         fun fun1_id_pos_z/1),
-    │         ^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         Arg 1 of 'fun1_id_pos_z/1'.
-Expression has type:   fun((Z) -> Z) with 1 type parameter
-Context expected type: fun((Z) -> Z) with 0 type parameters
-    │         
-
-Because in the expression's type:
-  Here the type is:     fun((Z) -> Z) with 1 type parameter
-  Context expects type: fun((Z) -> Z) with 0 type parameters
-  The number of type parameters doesn't match.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:358:9
-    │
-358 │         fun fun1_id_pos_z/1),
-    │         ^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         Arg 1 of 'fun1_id_pos_z/1'.
-Expression has type:   fun((Z) -> Z) with 1 type parameter
-Context expected type: fun((dynamic()) -> dynamic()) with 0 type parameters
-    │         
-
-Because in the expression's type:
-  Here the type is:     fun((Z) -> Z) with 1 type parameter
-  Context expects type: fun((dynamic()) -> dynamic()) with 0 type parameters
-  The number of type parameters doesn't match.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:358:9
-    │
-358 │         fun fun1_id_pos_z/1),
-    │         ^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         Arg 1 of 'fun1_id_pos_z/1'.
-Expression has type:   fun((Z) -> Z) | fun((dynamic()) -> dynamic())
-Context expected type: fun((Z) -> Z)
-    │         
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: fun((dynamic()) -> dynamic())
-  However, the following candidate doesn't match:
-  Here the type is:     fun((Z) -> Z) with 1 type parameter
-  Context expects type: fun((Z) -> Z) with 0 type parameters
-  The number of type parameters doesn't match.
-
------------------------------- Detailed message ------------------------------
-
-  fun((Z) -> Z) | fun((dynamic()) -> dynamic()) is not compatible with fun((Z) -> Z)
-  because
-  fun((Z) -> Z) with 1 type parameter is not compatible with fun((Z) -> Z) with 0 type parameters
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:358:9
-    │
-358 │         fun fun1_id_pos_z/1),
-    │         ^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         Arg 1 of 'fun1_id_pos_z/1'.
-Expression has type:   fun((Z) -> Z) | fun((dynamic()) -> dynamic())
-Context expected type: fun((dynamic()) -> dynamic())
-    │         
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: fun((dynamic()) -> dynamic())
-  However, the following candidate doesn't match:
-  Here the type is:     fun((Z) -> Z) with 1 type parameter
-  Context expects type: fun((dynamic()) -> dynamic()) with 0 type parameters
-  The number of type parameters doesn't match.
-
------------------------------- Detailed message ------------------------------
-
-  fun((Z) -> Z) | fun((dynamic()) -> dynamic()) is not compatible with fun((dynamic()) -> dynamic())
-  because
-  fun((Z) -> Z) with 1 type parameter is not compatible with fun((dynamic()) -> dynamic()) with 0 type parameters
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:358:9
-    │
-358 │         fun fun1_id_pos_z/1),
-    │         ^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         Arg 1 of 'fun1_id_pos_z/1'.
-Expression has type:   fun((Z) -> Z) | fun((dynamic()) -> dynamic())
-Context expected type: fun((Z) -> Z)
-    │         
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: fun((dynamic()) -> dynamic())
-  However, the following candidate doesn't match:
-  Here the type is:     fun((Z) -> Z) with 1 type parameter
-  Context expects type: fun((Z) -> Z) with 0 type parameters
-  The number of type parameters doesn't match.
-
------------------------------- Detailed message ------------------------------
-
-  fun((Z) -> Z) | fun((dynamic()) -> dynamic()) is not compatible with fun((Z) -> Z)
-  because
-  fun((Z) -> Z) with 1 type parameter is not compatible with fun((Z) -> Z) with 0 type parameters
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:432:18
-    │
-432 │ test_dict1(D) -> num_and_t(D, D).
-    │                  ^^^^^^^^^^^^^^^ num_and_t(D, D).
-Expression has type:   #{atom() => pid()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:432:28
-    │
-432 │ test_dict1(D) -> num_and_t(D, D).
-    │                            ^ D.
-Expression has type:   #{atom() => pid()}
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:441:5
-    │
-441 │     shape_vars(#{T => 3}, 3).
-    │     ^^^^^^^^^^^^^^^^^^^^^^^^ shape_vars(#{..}, 3).
-Expression has type:   'ok'
-Context expected type: T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:441:16
-    │
-441 │     shape_vars(#{T => 3}, 3).
-    │                ^^^^^^^^^
-    │                │
-    │                #{..}.
-Expression has type:   #{T => number()}
-Context expected type: #{a := T}
-    │                
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{a := ..., ...}
-  The type of the expression is missing the following required keys: a.
-
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:441:16
-    │
-441 │     shape_vars(#{T => 3}, 3).
-    │                ^^^^^^^^^
-    │                │
-    │                #{..}.
-Expression has type:   #{T => number()}
-Context expected type: #{a := term()}
-    │                
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{a := ..., ...}
-  The type of the expression is missing the following required keys: a.
-
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:446:15
-    │
-446 │     dict_vars(F, N).
-    │               ^
-    │               │
-    │               F.
-Expression has type:   fun((#{a => number()}) -> number())
-Context expected type: fun((#{{T} => T}) -> T)
-    │               
-
-Because in the expression's type:
-  fun((#{a => number()}) ->
-    Here the type is:     number()
-    Context expects type: T
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun((#{a => number()}) -> number()) is not compatible with fun((#{{T} => T}) -> T)
-  because
-  number() is not compatible with T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:446:15
-    │
-446 │     dict_vars(F, N).
-    │               ^
-    │               │
-    │               F.
-Expression has type:   fun((#{a => number()}) -> number())
-Context expected type: fun((#{{number()} => number()}) -> number())
-    │               
-
-Because in the expression's type:
-  fun((
-    Here the type is:     #{{number()} => number()}
-    Context expects type: #{...} (no default association)
-    The expected map has no default association while the type of the expression has one.
-  ) -> number())
-
------------------------------- Detailed message ------------------------------
-
-  fun((#{a => number()}) -> number()) is not compatible with fun((#{{number()} => number()}) -> number())
-  because
-  #{{number()} => number()} is not compatible with #{a => number()}
-  because
-  #{{number()} => number()} is not compatible with #{a => number()}
-  the latter map has no default association while the first map has one
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:471:24
-    │
-471 │ test_aliases_neg(F) -> F.
-    │                        ^
-    │                        │
-    │                        F.
-Expression has type:   fun(('a') -> 'b')
-Context expected type: fun(('a') -> 'c')
-    │                        
-
-Because in the expression's type:
-  fun(('a') ->
-    Here the type is:     'b'
-    Context expects type: 'c'
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun(('a') -> 'b') is not compatible with fun(('a') -> 'c')
-  because
-  'b' is not compatible with 'c'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:478:17
-    │
-478 │     takesShape1(#{}).
-    │                 ^^^
-    │                 │
-    │                 #{..}.
-Expression has type:   #{}
-Context expected type: #{a := T}
-    │                 
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{a := ..., ...}
-  The type of the expression is missing the following required keys: a.
-
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:478:17
-    │
-478 │     takesShape1(#{}).
-    │                 ^^^
-    │                 │
-    │                 #{..}.
-Expression has type:   #{}
-Context expected type: #{a := dynamic()}
-    │                 
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{a := ..., ...}
-  The type of the expression is missing the following required keys: a.
-
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:500:36
-    │
-500 │ test_quanitifer_scope_neg(F, X) -> F(X).
-    │                                    ^^^^ F(X).
-Expression has type:   T
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:500:38
-    │
-500 │ test_quanitifer_scope_neg(F, X) -> F(X).
-    │                                      ^ X.
-Expression has type:   number()
-Context expected type: T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:551:5
-    │
-551 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   contravar(contravar('a' | 'b'))
-Context expected type: contravar(contravar('a'))
-    │     
-
-Because in the expression's type:
-  fun((
-    fun((
-      Here the type is a union type with some valid candidates: 'a'
-      However the following candidate: 'b'
-      Differs from the expected type:  'a'
-    ) -> 'ok')
-  ) -> 'ok')
-
------------------------------- Detailed message ------------------------------
-
-  contravar(contravar('a' | 'b')) is not compatible with contravar(contravar('a'))
-  because
-  fun((contravar('a' | 'b')) -> 'ok') is not compatible with contravar(contravar('a'))
-  because
-  fun((contravar('a' | 'b')) -> 'ok') is not compatible with fun((contravar('a')) -> 'ok')
-  because
-  contravar('a') is not compatible with contravar('a' | 'b')
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:563:5
-    │
-563 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   invar('a')
-Context expected type: fun((atom()) -> atom())
-    │     
-
-Because in the expression's type:
-  fun((
-    Here the type is:     atom()
-    Context expects type: 'a'
-  ) -> 'a')
-
------------------------------- Detailed message ------------------------------
-
-  invar('a') is not compatible with fun((atom()) -> atom())
-  because
-  fun(('a') -> 'a') is not compatible with fun((atom()) -> atom())
-  because
-  atom() is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:569:5
-    │
-569 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   invar('a')
-Context expected type: invar(atom())
-    │     
-
-Because in the expression's type:
-  fun((
-    Here the type is:     atom()
-    Context expects type: 'a'
-  ) -> 'a')
-
------------------------------- Detailed message ------------------------------
-
-  invar('a') is not compatible with invar(atom())
-  because
-  fun(('a') -> 'a') is not compatible with invar(atom())
-  because
-  fun(('a') -> 'a') is not compatible with fun((atom()) -> atom())
-  because
-  atom() is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:585:5
-    │
-585 │     a.
-    │     ^
-    │     │
-    │     'a'.
-Expression has type:   'a'
-Context expected type: invar('a')
-    │     
-
-Because in the expression's type:
-  Here the type is:     'a'
-  Context expects type: fun(('a') -> 'a')
-
------------------------------- Detailed message ------------------------------
-
-  'a' is not compatible with invar('a')
-  because
-  'a' is not compatible with fun(('a') -> 'a')
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/generic_fun_application.erl:625:1
-    │
-625 │ stuff_1(0) -> erlang:self().
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/generic_fun_application.erl:633:1
-    │
-633 │ stuff_2(0) -> erlang:self().
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ check/src/generic_fun_application.erl:645:5
-    │
-645 │     F(1, 2),
-    │     ^ F.
-Expected fun type with arity 2
-Got: fun((Z) -> Z)
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ check/src/generic_fun_application.erl:651:5
-    │
-651 │     F(1, 2).
-    │     ^ F.
-Expected fun type with arity 2
-Got: fun((Z) -> Z)
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:684:9
-    │
-684 │         #{u => 1, t => Pid, extra => 3}
-    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         #{..}.
-Expression has type:   #{extra := number(), t := pid(), u := number()}
-Context expected type: #{t := pid(), u := number()}
-    │         
-
-Because in the expression's type:
-  Here the type is:     #{extra := ...}
-  Context expects type: #{...}
-  The expected map has no corresponding key for: extra.
-
------------------------------- Detailed message ------------------------------
-
-key `extra` is declared in the former but not in the latter and the latter map has no default association
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:721:25
-    │
-721 │ test_apply2() -> apply2(fun tat/2, 1, 1).
-    │                         ^^^^^^^^^ Arg 2 of 'tat/2'.
-Expression has type:   number()
-Context expected type: 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:739:5
-    │
-739 │     invar(a, a).
-    │     ^^^^^^^^^^^
-    │     │
-    │     invar('a', 'a').
-Expression has type:   fun(('a') -> 'a')
-Context expected type: fun(('a' | 'b') -> 'a' | 'b')
-    │     
-
-Because in the expression's type:
-  fun((
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  ) -> 'a')
-
------------------------------- Detailed message ------------------------------
-
-  fun(('a') -> 'a') is not compatible with fun(('a' | 'b') -> 'a' | 'b')
-  because
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:752:32
-    │
-752 │     _ = fun_with_tuple({a, b}, {}),
-    │                                ^^ {}.
-Expression has type:   {}
-Context expected type: [A]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generic_fun_application.erl:752:32
-    │
-752 │     _ = fun_with_tuple({a, b}, {}),
-    │                                ^^ {}.
-Expression has type:   {}
-Context expected type: [dynamic()]
-
-81 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/generic_fun_application-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/generic_fun_application.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/generic_fun_application-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/generic_fun_application.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/generics_with_unions-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/generics_with_unions-OTP-27.pretty
deleted file mode 100644
index 53cd1350ec..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/generics_with_unions-OTP-27.pretty
+++ /dev/null
@@ -1,249 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generics_with_unions.erl:17:18
-   │
-17 │ test02_neg(X) -> {X, X}.
-   │                  ^^^^^^
-   │                  │
-   │                  {X, X}.
-Expression has type:   {T | U, T | U}
-Context expected type: {T, U}
-   │                  
-
-Because in the expression's type:
-  { 
-    Here the type is a union type with some valid candidates: T
-    However the following candidate: U
-    Differs from the expected type:  T
-  , T | U}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {T | U, T | U} is not compatible with {T, U}
-  because
-  T | U is not compatible with T
-  because
-  U is not compatible with T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generics_with_unions.erl:70:19
-   │
-70 │ test_ret_neg() -> union(a, b).
-   │                   ^^^^^^^^^^^ union('a', 'b').
-Expression has type:   'a' | 'b'
-Context expected type: 'ok'
-
-error: unbound_type_var (See https://fb.me/eqwalizer_errors#unbound_type_var)
-   ┌─ check/src/generics_with_unions.erl:72:1
-   │
-72 │ -type ty_var_from_nowhere() :: _T.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ _T: Type variable is unbound.
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/generics_with_unions.erl:74:1
-   │  
-74 │ ╭ -spec test_uses_ty_var_from_nowhere
-75 │ │     (pid() | ty_var_from_nowhere())
-76 │ │     -> nok.
-   │ ╰──────────^ test_uses_ty_var_from_nowhere/1 references type with invalid definition: ty_var_from_nowhere/0
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:132:5
-    │
-132 │     set_list([{a, 5}], [{a, 5}]).
-    │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    │     │
-    │     set_list([{'a', 5}], [{'a', 5}]).
-Expression has type:   props('a', number())
-Context expected type: 'wrong_ret'
-    │     
-
-Because in the expression's type:
-  Here the type is:     [prop('a', number())]
-  Context expects type: 'wrong_ret'
-
------------------------------- Detailed message ------------------------------
-
-  props('a', number()) is not compatible with 'wrong_ret'
-  because
-  [prop('a', number())] is not compatible with 'wrong_ret'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:217:19
-    │
-217 │ overlap_1([T]) -> T;
-    │                   ^ T.
-Expression has type:   term()
-Context expected type: T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:218:17
-    │
-218 │ overlap_1(T) -> T.
-    │                 ^
-    │                 │
-    │                 T.
-Expression has type:   [T] | T
-Context expected type: T
-    │                 
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: T
-  However the following candidate: [T]
-  Differs from the expected type:  T
-
------------------------------- Detailed message ------------------------------
-
-  [T] | T is not compatible with T
-  because
-  [T] is not compatible with T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:221:17
-    │
-221 │ overlap_2(T) -> T;
-    │                 ^
-    │                 │
-    │                 T.
-Expression has type:   T | [T]
-Context expected type: T
-    │                 
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: T
-  However the following candidate: [T]
-  Differs from the expected type:  T
-
------------------------------- Detailed message ------------------------------
-
-  T | [T] is not compatible with T
-  because
-  [T] is not compatible with T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:222:19
-    │
-222 │ overlap_2([T]) -> T.
-    │                   ^ T.
-Expression has type:   term()
-Context expected type: T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:230:5
-    │
-230 │     overlap_2([ok]).
-    │     ^^^^^^^^^^^^^^^ overlap_2(['ok']).
-Expression has type:   'ok'
-Context expected type: ['ok']
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:233:18
-    │
-233 │ trick(_, {B}) -> B.
-    │                  ^ B.
-Expression has type:   term()
-Context expected type: B
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:256:5
-    │
-256 │     Default;
-    │     ^^^^^^^ Default.
-Expression has type:   term()
-Context expected type: Value
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:328:29
-    │
-328 │ overlapping_union_neg(X) -> X.
-    │                             ^
-    │                             │
-    │                             X.
-Expression has type:   [K] | [[K]]
-Context expected type: [K]
-    │                             
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: [K]
-  However, the following candidate doesn't match:
-  [
-    Here the type is:     [K]
-    Context expects type: K
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [K] | [[K]] is not compatible with [K]
-  because
-  [[K]] is not compatible with [K]
-  because
-  [K] is not compatible with K
-
-error: ambiguous_union (See https://fb.me/eqwalizer_errors#ambiguous_union)
-    ┌─ check/src/generics_with_unions.erl:332:31
-    │
-332 │     _ = overlapping_union_neg([]),
-    │                               ^^ [].
-Expression has type [] which matches multiple generic types in [K] | [[K]]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:379:28
-    │
-379 │     Q2 = where1({i, atom}, Q),
-    │                            ^
-    │                            │
-    │                            Q.
-Expression has type:   query()
-Context expected type: fun(({'i', 'atom'}) -> 'ok')
-    │                            
-
-Because in the expression's type:
-  fun((
-    { 'i', 
-      Here the type is:     'atom'
-      Context expects type: number()
-    }
-  ) -> 'ok')
-
------------------------------- Detailed message ------------------------------
-
-  query() is not compatible with fun(({'i', 'atom'}) -> 'ok')
-  because
-  fun(({'a', atom()} | {'b', binary()} | {'i', number()}) -> 'ok') is not compatible with fun(({'i', 'atom'}) -> 'ok')
-  because
-  {'i', 'atom'} is not compatible with {'a', atom()} | {'b', binary()} | {'i', number()}
-  because
-  at tuple index 2:
-  {'i', 'atom'} is not compatible with {'i', number()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:392:17
-    │
-392 │     Q2 = where2(Q, {a, 123}),
-    │                 ^
-    │                 │
-    │                 Q.
-Expression has type:   query()
-Context expected type: fun(({'a', number()}) -> 'ok')
-    │                 
-
-Because in the expression's type:
-  fun((
-    { 'a', 
-      Here the type is:     number()
-      Context expects type: atom()
-    }
-  ) -> 'ok')
-
------------------------------- Detailed message ------------------------------
-
-  query() is not compatible with fun(({'a', number()}) -> 'ok')
-  because
-  fun(({'a', atom()} | {'b', binary()} | {'i', number()}) -> 'ok') is not compatible with fun(({'a', number()}) -> 'ok')
-  because
-  {'a', number()} is not compatible with {'a', atom()} | {'b', binary()} | {'i', number()}
-  because
-  at tuple index 2:
-  {'a', number()} is not compatible with {'a', atom()}
-
-16 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/generics_with_unions-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/generics_with_unions-OTP-28.pretty
deleted file mode 100644
index 53cd1350ec..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/generics_with_unions-OTP-28.pretty
+++ /dev/null
@@ -1,249 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generics_with_unions.erl:17:18
-   │
-17 │ test02_neg(X) -> {X, X}.
-   │                  ^^^^^^
-   │                  │
-   │                  {X, X}.
-Expression has type:   {T | U, T | U}
-Context expected type: {T, U}
-   │                  
-
-Because in the expression's type:
-  { 
-    Here the type is a union type with some valid candidates: T
-    However the following candidate: U
-    Differs from the expected type:  T
-  , T | U}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {T | U, T | U} is not compatible with {T, U}
-  because
-  T | U is not compatible with T
-  because
-  U is not compatible with T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/generics_with_unions.erl:70:19
-   │
-70 │ test_ret_neg() -> union(a, b).
-   │                   ^^^^^^^^^^^ union('a', 'b').
-Expression has type:   'a' | 'b'
-Context expected type: 'ok'
-
-error: unbound_type_var (See https://fb.me/eqwalizer_errors#unbound_type_var)
-   ┌─ check/src/generics_with_unions.erl:72:1
-   │
-72 │ -type ty_var_from_nowhere() :: _T.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ _T: Type variable is unbound.
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/generics_with_unions.erl:74:1
-   │  
-74 │ ╭ -spec test_uses_ty_var_from_nowhere
-75 │ │     (pid() | ty_var_from_nowhere())
-76 │ │     -> nok.
-   │ ╰──────────^ test_uses_ty_var_from_nowhere/1 references type with invalid definition: ty_var_from_nowhere/0
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:132:5
-    │
-132 │     set_list([{a, 5}], [{a, 5}]).
-    │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    │     │
-    │     set_list([{'a', 5}], [{'a', 5}]).
-Expression has type:   props('a', number())
-Context expected type: 'wrong_ret'
-    │     
-
-Because in the expression's type:
-  Here the type is:     [prop('a', number())]
-  Context expects type: 'wrong_ret'
-
------------------------------- Detailed message ------------------------------
-
-  props('a', number()) is not compatible with 'wrong_ret'
-  because
-  [prop('a', number())] is not compatible with 'wrong_ret'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:217:19
-    │
-217 │ overlap_1([T]) -> T;
-    │                   ^ T.
-Expression has type:   term()
-Context expected type: T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:218:17
-    │
-218 │ overlap_1(T) -> T.
-    │                 ^
-    │                 │
-    │                 T.
-Expression has type:   [T] | T
-Context expected type: T
-    │                 
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: T
-  However the following candidate: [T]
-  Differs from the expected type:  T
-
------------------------------- Detailed message ------------------------------
-
-  [T] | T is not compatible with T
-  because
-  [T] is not compatible with T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:221:17
-    │
-221 │ overlap_2(T) -> T;
-    │                 ^
-    │                 │
-    │                 T.
-Expression has type:   T | [T]
-Context expected type: T
-    │                 
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: T
-  However the following candidate: [T]
-  Differs from the expected type:  T
-
------------------------------- Detailed message ------------------------------
-
-  T | [T] is not compatible with T
-  because
-  [T] is not compatible with T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:222:19
-    │
-222 │ overlap_2([T]) -> T.
-    │                   ^ T.
-Expression has type:   term()
-Context expected type: T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:230:5
-    │
-230 │     overlap_2([ok]).
-    │     ^^^^^^^^^^^^^^^ overlap_2(['ok']).
-Expression has type:   'ok'
-Context expected type: ['ok']
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:233:18
-    │
-233 │ trick(_, {B}) -> B.
-    │                  ^ B.
-Expression has type:   term()
-Context expected type: B
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:256:5
-    │
-256 │     Default;
-    │     ^^^^^^^ Default.
-Expression has type:   term()
-Context expected type: Value
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:328:29
-    │
-328 │ overlapping_union_neg(X) -> X.
-    │                             ^
-    │                             │
-    │                             X.
-Expression has type:   [K] | [[K]]
-Context expected type: [K]
-    │                             
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: [K]
-  However, the following candidate doesn't match:
-  [
-    Here the type is:     [K]
-    Context expects type: K
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [K] | [[K]] is not compatible with [K]
-  because
-  [[K]] is not compatible with [K]
-  because
-  [K] is not compatible with K
-
-error: ambiguous_union (See https://fb.me/eqwalizer_errors#ambiguous_union)
-    ┌─ check/src/generics_with_unions.erl:332:31
-    │
-332 │     _ = overlapping_union_neg([]),
-    │                               ^^ [].
-Expression has type [] which matches multiple generic types in [K] | [[K]]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:379:28
-    │
-379 │     Q2 = where1({i, atom}, Q),
-    │                            ^
-    │                            │
-    │                            Q.
-Expression has type:   query()
-Context expected type: fun(({'i', 'atom'}) -> 'ok')
-    │                            
-
-Because in the expression's type:
-  fun((
-    { 'i', 
-      Here the type is:     'atom'
-      Context expects type: number()
-    }
-  ) -> 'ok')
-
------------------------------- Detailed message ------------------------------
-
-  query() is not compatible with fun(({'i', 'atom'}) -> 'ok')
-  because
-  fun(({'a', atom()} | {'b', binary()} | {'i', number()}) -> 'ok') is not compatible with fun(({'i', 'atom'}) -> 'ok')
-  because
-  {'i', 'atom'} is not compatible with {'a', atom()} | {'b', binary()} | {'i', number()}
-  because
-  at tuple index 2:
-  {'i', 'atom'} is not compatible with {'i', number()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/generics_with_unions.erl:392:17
-    │
-392 │     Q2 = where2(Q, {a, 123}),
-    │                 ^
-    │                 │
-    │                 Q.
-Expression has type:   query()
-Context expected type: fun(({'a', number()}) -> 'ok')
-    │                 
-
-Because in the expression's type:
-  fun((
-    { 'a', 
-      Here the type is:     number()
-      Context expects type: atom()
-    }
-  ) -> 'ok')
-
------------------------------- Detailed message ------------------------------
-
-  query() is not compatible with fun(({'a', number()}) -> 'ok')
-  because
-  fun(({'a', atom()} | {'b', binary()} | {'i', number()}) -> 'ok') is not compatible with fun(({'a', number()}) -> 'ok')
-  because
-  {'a', number()} is not compatible with {'a', atom()} | {'b', binary()} | {'i', number()}
-  because
-  at tuple index 2:
-  {'a', number()} is not compatible with {'a', atom()}
-
-16 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/generics_with_unions-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/generics_with_unions.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/generics_with_unions-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/generics_with_unions.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_bounded-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_bounded-OTP-27.pretty
deleted file mode 100644
index bbd9109d68..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_bounded-OTP-27.pretty
+++ /dev/null
@@ -1,116 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_bounded.erl:16:21
-   │
-16 │ bd_unsafe_neg(V) -> V.
-   │                     ^
-   │                     │
-   │                     V.
-Expression has type:   dyn('a') | 'b'
-Context expected type: 'c'
-   │                     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dyn('a')
-  However the following candidate: 'b'
-  Differs from the expected type:  'c'
-
------------------------------- Detailed message ------------------------------
-
-  dyn('a') | 'b' is not compatible with 'c'
-  because
-  'b' is not compatible with 'c'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_bounded.erl:25:26
-   │
-25 │ bd_coerce_safe_neg(V) -> V.
-   │                          ^
-   │                          │
-   │                          V.
-Expression has type:   'a'
-Context expected type: dyn('b')
-   │                          
-
-Because in the expression's type:
-  Here the type is:     'a'
-  Context expects type: 'b'
-
------------------------------- Detailed message ------------------------------
-
-  'a' is not compatible with dyn('b')
-  because
-  'a' is not compatible with dynamic('b')
-  because
-  'a' is not compatible with dynamic('b')
-  because
-  'a' is not compatible with 'b'
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_bounded.erl:44:27
-   │
-44 │     eqwalizer:reveal_type(V).
-   │                           ^ #{b => dynamic('c'), number() => 'a'}
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_bounded.erl:51:27
-   │
-51 │     eqwalizer:reveal_type(V).
-   │                           ^ #{a := 'b', b => dynamic('c')}
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/gradual_bounded.erl:62:1
-   │
-62 │ bd_tuple_02({V, _}) -> V.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_bounded.erl:66:51
-   │
-66 │ bd_distrib_print({a, V}) -> eqwalizer:reveal_type(V).
-   │                                                   ^ dynamic('b')
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_bounded.erl:79:5
-   │
-79 │     bd_generic_fun(test, 42).
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     bd_generic_fun('test', 42).
-Expression has type:   'test' | number()
-Context expected type: number()
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: 'test'
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  'test' | number() is not compatible with number()
-  because
-  'test' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_bounded.erl:89:5
-   │
-89 │     bd_generic_fun(test, N).
-   │     ^^^^^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     bd_generic_fun('test', N).
-Expression has type:   'test' | dyn(number())
-Context expected type: number()
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dyn(number())
-  However the following candidate: 'test'
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  'test' | dyn(number()) is not compatible with number()
-  because
-  'test' is not compatible with number()
-
-8 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_bounded-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_bounded-OTP-28.pretty
deleted file mode 100644
index bbd9109d68..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_bounded-OTP-28.pretty
+++ /dev/null
@@ -1,116 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_bounded.erl:16:21
-   │
-16 │ bd_unsafe_neg(V) -> V.
-   │                     ^
-   │                     │
-   │                     V.
-Expression has type:   dyn('a') | 'b'
-Context expected type: 'c'
-   │                     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dyn('a')
-  However the following candidate: 'b'
-  Differs from the expected type:  'c'
-
------------------------------- Detailed message ------------------------------
-
-  dyn('a') | 'b' is not compatible with 'c'
-  because
-  'b' is not compatible with 'c'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_bounded.erl:25:26
-   │
-25 │ bd_coerce_safe_neg(V) -> V.
-   │                          ^
-   │                          │
-   │                          V.
-Expression has type:   'a'
-Context expected type: dyn('b')
-   │                          
-
-Because in the expression's type:
-  Here the type is:     'a'
-  Context expects type: 'b'
-
------------------------------- Detailed message ------------------------------
-
-  'a' is not compatible with dyn('b')
-  because
-  'a' is not compatible with dynamic('b')
-  because
-  'a' is not compatible with dynamic('b')
-  because
-  'a' is not compatible with 'b'
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_bounded.erl:44:27
-   │
-44 │     eqwalizer:reveal_type(V).
-   │                           ^ #{b => dynamic('c'), number() => 'a'}
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_bounded.erl:51:27
-   │
-51 │     eqwalizer:reveal_type(V).
-   │                           ^ #{a := 'b', b => dynamic('c')}
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/gradual_bounded.erl:62:1
-   │
-62 │ bd_tuple_02({V, _}) -> V.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_bounded.erl:66:51
-   │
-66 │ bd_distrib_print({a, V}) -> eqwalizer:reveal_type(V).
-   │                                                   ^ dynamic('b')
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_bounded.erl:79:5
-   │
-79 │     bd_generic_fun(test, 42).
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     bd_generic_fun('test', 42).
-Expression has type:   'test' | number()
-Context expected type: number()
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: 'test'
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  'test' | number() is not compatible with number()
-  because
-  'test' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_bounded.erl:89:5
-   │
-89 │     bd_generic_fun(test, N).
-   │     ^^^^^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     bd_generic_fun('test', N).
-Expression has type:   'test' | dyn(number())
-Context expected type: number()
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dyn(number())
-  However the following candidate: 'test'
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  'test' | dyn(number()) is not compatible with number()
-  because
-  'test' is not compatible with number()
-
-8 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_bounded-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_bounded.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/gradual_bounded-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/gradual_bounded.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_complex_types-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_complex_types-OTP-27.pretty
deleted file mode 100644
index b7111f9239..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_complex_types-OTP-27.pretty
+++ /dev/null
@@ -1,120 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_complex_types.erl:24:3
-   │
-24 │   undefined.
-   │   ^^^^^^^^^
-   │   │
-   │   'undefined'.
-Expression has type:   'undefined'
-Context expected type: complex_map()
-   │   
-
-Because in the expression's type:
-  Here the type is:     'undefined'
-  Context expects type: #{...}
-
------------------------------- Detailed message ------------------------------
-
-  'undefined' is not compatible with complex_map()
-  because
-  'undefined' is not compatible with #{id := number(), {secret, id} => number(), atom() => term()}
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_complex_types.erl:29:25
-   │
-29 │   eqwalizer:reveal_type(Map),
-   │                         ^^^ complex_map()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_complex_types.erl:35:25
-   │
-35 │   eqwalizer:reveal_type(List),
-   │                         ^^^^ [complex_map()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_complex_types.erl:48:16
-   │
-48 │   lists:nth(7, Map).
-   │                ^^^
-   │                │
-   │                Map.
-Expression has type:   complex_map()
-Context expected type: [T]
-   │                
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: [T]
-
------------------------------- Detailed message ------------------------------
-
-  complex_map() is not compatible with [T]
-  because
-  #{id := number(), {secret, id} => number(), atom() => term()} is not compatible with [T]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_complex_types.erl:48:16
-   │
-48 │   lists:nth(7, Map).
-   │                ^^^
-   │                │
-   │                Map.
-Expression has type:   complex_map()
-Context expected type: [dynamic()]
-   │                
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: [dynamic()]
-
------------------------------- Detailed message ------------------------------
-
-  complex_map() is not compatible with [dynamic()]
-  because
-  #{id := number(), {secret, id} => number(), atom() => term()} is not compatible with [dynamic()]
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_complex_types.erl:55:25
-   │
-55 │   eqwalizer:reveal_type(M1),
-   │                         ^^ #{a := number(), dynamic() => dynamic()}
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_complex_types.erl:63:25
-   │
-63 │   eqwalizer:reveal_type(M1),
-   │                         ^^ #{a := number(), dynamic() => dynamic()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_complex_types.erl:110:3
-    │
-110 │   generic(DM, S).
-    │   ^^^^^^^^^^^^^^ generic(DM, S).
-Expression has type:   dyn_map() | #{a => atom()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_complex_types.erl:115:3
-    │
-115 │   {DM, ok}.
-    │   ^^^^^^^^
-    │   │
-    │   {DM, 'ok'}.
-Expression has type:   {dyn_map(), 'ok'}
-Context expected type: {#{a => 'atom'}, number()}
-    │   
-
-Because in the expression's type:
-  { dyn_map(), 
-    Here the type is:     'ok'
-    Context expects type: number()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {dyn_map(), 'ok'} is not compatible with {#{a => 'atom'}, number()}
-  because
-  'ok' is not compatible with number()
-
-9 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_complex_types-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_complex_types-OTP-28.pretty
deleted file mode 100644
index b7111f9239..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_complex_types-OTP-28.pretty
+++ /dev/null
@@ -1,120 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_complex_types.erl:24:3
-   │
-24 │   undefined.
-   │   ^^^^^^^^^
-   │   │
-   │   'undefined'.
-Expression has type:   'undefined'
-Context expected type: complex_map()
-   │   
-
-Because in the expression's type:
-  Here the type is:     'undefined'
-  Context expects type: #{...}
-
------------------------------- Detailed message ------------------------------
-
-  'undefined' is not compatible with complex_map()
-  because
-  'undefined' is not compatible with #{id := number(), {secret, id} => number(), atom() => term()}
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_complex_types.erl:29:25
-   │
-29 │   eqwalizer:reveal_type(Map),
-   │                         ^^^ complex_map()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_complex_types.erl:35:25
-   │
-35 │   eqwalizer:reveal_type(List),
-   │                         ^^^^ [complex_map()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_complex_types.erl:48:16
-   │
-48 │   lists:nth(7, Map).
-   │                ^^^
-   │                │
-   │                Map.
-Expression has type:   complex_map()
-Context expected type: [T]
-   │                
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: [T]
-
------------------------------- Detailed message ------------------------------
-
-  complex_map() is not compatible with [T]
-  because
-  #{id := number(), {secret, id} => number(), atom() => term()} is not compatible with [T]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_complex_types.erl:48:16
-   │
-48 │   lists:nth(7, Map).
-   │                ^^^
-   │                │
-   │                Map.
-Expression has type:   complex_map()
-Context expected type: [dynamic()]
-   │                
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: [dynamic()]
-
------------------------------- Detailed message ------------------------------
-
-  complex_map() is not compatible with [dynamic()]
-  because
-  #{id := number(), {secret, id} => number(), atom() => term()} is not compatible with [dynamic()]
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_complex_types.erl:55:25
-   │
-55 │   eqwalizer:reveal_type(M1),
-   │                         ^^ #{a := number(), dynamic() => dynamic()}
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_complex_types.erl:63:25
-   │
-63 │   eqwalizer:reveal_type(M1),
-   │                         ^^ #{a := number(), dynamic() => dynamic()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_complex_types.erl:110:3
-    │
-110 │   generic(DM, S).
-    │   ^^^^^^^^^^^^^^ generic(DM, S).
-Expression has type:   dyn_map() | #{a => atom()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_complex_types.erl:115:3
-    │
-115 │   {DM, ok}.
-    │   ^^^^^^^^
-    │   │
-    │   {DM, 'ok'}.
-Expression has type:   {dyn_map(), 'ok'}
-Context expected type: {#{a => 'atom'}, number()}
-    │   
-
-Because in the expression's type:
-  { dyn_map(), 
-    Here the type is:     'ok'
-    Context expects type: number()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {dyn_map(), 'ok'} is not compatible with {#{a => 'atom'}, number()}
-  because
-  'ok' is not compatible with number()
-
-9 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_complex_types-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_complex_types.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/gradual_complex_types-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/gradual_complex_types.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_custom-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_custom-OTP-27.pretty
deleted file mode 100644
index 34e16f1479..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_custom-OTP-27.pretty
+++ /dev/null
@@ -1,457 +0,0 @@
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_custom.erl:14:27
-   │
-14 │     eqwalizer:reveal_type(element(42, Tup)).
-   │                           ^^^^^^^^^^^^^^^^ dynamic()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_custom.erl:18:27
-   │
-18 │     eqwalizer:reveal_type(element(2, Tup)).
-   │                           ^^^^^^^^^^^^^^^ dynamic(atom())
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_custom.erl:22:27
-   │
-22 │     eqwalizer:reveal_type(element(1, Tup)).
-   │                           ^^^^^^^^^^^^^^^ dynamic(number())
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_custom.erl:26:27
-   │
-26 │     eqwalizer:reveal_type(element(1, Tup)).
-   │                           ^^^^^^^^^^^^^^^ dynamic(none())
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_custom.erl:30:27
-   │
-30 │     eqwalizer:reveal_type(element(N, Tup)).
-   │                           ^^^^^^^^^^^^^^^ dynamic(number() | atom())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_custom.erl:43:3
-   │
-43 │   application:get_env(app1).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^^ application:get_env('app1').
-Expression has type:   'undefined' | {'ok', dynamic()}
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_custom.erl:56:3
-   │
-56 │   application:get_env(app1, key1).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ application:get_env('app1', 'key1').
-Expression has type:   'undefined' | {'ok', dynamic()}
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_custom.erl:73:3
-   │
-73 │   lists:flatten(In).
-   │   ^^^^^^^^^^^^^^^^^ lists:flatten(In).
-Expression has type:   ['b' | 'c' | 'a']
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_custom.erl:85:3
-   │
-85 │   lists:flatten(In, Tail).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^ lists:flatten(In, Tail).
-Expression has type:   ['b' | 'a' | 'y' | 'z' | 'c' | 'x']
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_custom.erl:94:3
-   │
-94 │   file:consult(some_file).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^ file:consult('some_file').
-Expression has type:   {'ok', [dynamic()]} | {'error', {number(), atom(), term()} | 'terminated' | 'badarg' | file:posix() | 'system_limit'}
-Context expected type: 'nok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_custom.erl:99:3
-   │
-99 │   abs(dynamic()).
-   │   ^^^^^^^^^^^^^^ erlang:abs(dynamic()).
-Expression has type:   number()
-Context expected type: 'anything'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:108:3
-    │
-108 │   abs(N).
-    │   ^^^^^^ erlang:abs(N).
-Expression has type:   number()
-Context expected type: 'anything'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:108:7
-    │
-108 │   abs(N).
-    │       ^
-    │       │
-    │       N.
-Expression has type:   dynamic() | 'a'
-Context expected type: number()
-    │       
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dynamic()
-  However the following candidate: 'a'
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  dynamic() | 'a' is not compatible with number()
-  because
-  'a' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:120:3
-    │
-120 │   ets:lookup(tab, Any).
-    │   ^^^^^^^^^^^^^^^^^^^^ ets:lookup('tab', Any).
-Expression has type:   [dynamic()]
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:124:3
-    │
-124 │   ets:lookup("not atom", Any).
-    │   ^^^^^^^^^^^^^^^^^^^^^^^^^^^ ets:lookup(string_lit, Any).
-Expression has type:   [dynamic()]
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:124:14
-    │
-124 │   ets:lookup("not atom", Any).
-    │              ^^^^^^^^^^ string_lit.
-Expression has type:   string()
-Context expected type: ets:tab()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:143:16
-    │
-143 │   ets:tab2list("not atom").
-    │                ^^^^^^^^^^ string_lit.
-Expression has type:   string()
-Context expected type: ets:tab()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:158:3
-    │  
-158 │ ╭   maps:without(
-159 │ │     [a],
-160 │ │     Dyn
-161 │ │   ).
-    │ ╰───^ maps:without(['a'], Dyn).
-Expression has type:   #{dynamic() => dynamic()}
-Context expected type: 'wrong_ret'
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/gradual_custom.erl:166:1
-    │  
-166 │ ╭ maps_without_3_neg(None) ->
-167 │ │   maps:without(
-168 │ │     [a, b],
-169 │ │     None
-170 │ │   ).
-    │ ╰───^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:185:3
-    │  
-185 │ ╭   maps:with(
-186 │ │     [a],
-187 │ │     Dyn
-188 │ │   ).
-    │ ╰───^ maps:with(['a'], Dyn).
-Expression has type:   #{a := dynamic()}
-Context expected type: 'wrong_ret'
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/gradual_custom.erl:193:1
-    │  
-193 │ ╭ maps_with_3(None) ->
-194 │ │   maps:with(
-195 │ │     [a, b],
-196 │ │     None
-197 │ │   ).
-    │ ╰───^ Clause is not covered by spec
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-    ┌─ check/src/gradual_custom.erl:203:25
-    │
-203 │   eqwalizer:reveal_type(Res),
-    │                         ^^^ file:filename_all()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:204:3
-    │
-204 │   Res.
-    │   ^^^
-    │   │
-    │   Res.
-Expression has type:   file:filename_all()
-Context expected type: 'ok'
-    │   
-
-Because in the expression's type:
-  Here the type is:     string() | binary()
-  Context expects type: 'ok'
-  No candidate of the expression's type matches the expected type.
-
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with 'ok'
-  because
-  string() | binary() is not compatible with 'ok'
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-    ┌─ check/src/gradual_custom.erl:210:25
-    │
-210 │   eqwalizer:reveal_type(Res),
-    │                         ^^^ file:filename_all()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:211:3
-    │
-211 │   Res.
-    │   ^^^
-    │   │
-    │   Res.
-Expression has type:   file:filename_all()
-Context expected type: 'ok'
-    │   
-
-Because in the expression's type:
-  Here the type is:     string() | binary()
-  Context expects type: 'ok'
-  No candidate of the expression's type matches the expected type.
-
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with 'ok'
-  because
-  string() | binary() is not compatible with 'ok'
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-    ┌─ check/src/gradual_custom.erl:217:25
-    │
-217 │   eqwalizer:reveal_type(Res),
-    │                         ^^^ file:filename_all()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:218:3
-    │
-218 │   Res.
-    │   ^^^
-    │   │
-    │   Res.
-Expression has type:   file:filename_all()
-Context expected type: 'ok'
-    │   
-
-Because in the expression's type:
-  Here the type is:     string() | binary()
-  Context expects type: 'ok'
-  No candidate of the expression's type matches the expected type.
-
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with 'ok'
-  because
-  string() | binary() is not compatible with 'ok'
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-    ┌─ check/src/gradual_custom.erl:224:25
-    │
-224 │   eqwalizer:reveal_type(Res),
-    │                         ^^^ file:filename_all()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:225:3
-    │
-225 │   Res.
-    │   ^^^
-    │   │
-    │   Res.
-Expression has type:   file:filename_all()
-Context expected type: 'ok'
-    │   
-
-Because in the expression's type:
-  Here the type is:     string() | binary()
-  Context expects type: 'ok'
-  No candidate of the expression's type matches the expected type.
-
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with 'ok'
-  because
-  string() | binary() is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:245:19
-    │
-245 │ min3_neg(X, Y) -> min(X, Y).
-    │                   ^^^^^^^^^
-    │                   │
-    │                   erlang:min(X, Y).
-Expression has type:   number() | 'undefined'
-Context expected type: number()
-    │                   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: 'undefined'
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | 'undefined' is not compatible with number()
-  because
-  'undefined' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:257:19
-    │
-257 │ min5_neg(X, Y) -> min(X, Y).
-    │                   ^^^^^^^^^
-    │                   │
-    │                   erlang:min(X, Y).
-Expression has type:   number() | atom() | binary()
-Context expected type: number()
-    │                   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: atom()
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | atom() | binary() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:263:19
-    │
-263 │ min6_neg(X, Y) -> min(X, Y).
-    │                   ^^^^^^^^^
-    │                   │
-    │                   erlang:min(X, Y).
-Expression has type:   number() | dynamic() | number() | atom() | dynamic()
-Context expected type: number()
-    │                   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number() | dynamic()
-  However the following candidate: atom()
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | dynamic() | number() | atom() | dynamic() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:269:19
-    │
-269 │ min7_neg(X, Y) -> min(X, Y).
-    │                   ^^^^^^^^^
-    │                   │
-    │                   erlang:min(X, Y).
-Expression has type:   number() | dynamic() | atom() | dynamic()
-Context expected type: number()
-    │                   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number() | dynamic()
-  However the following candidate: atom()
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | dynamic() | atom() | dynamic() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-    ┌─ check/src/gradual_custom.erl:277:25
-    │
-277 │   eqwalizer:reveal_type(Y),
-    │                         ^ dynamic() | {none()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:278:3
-    │
-278 │   Y.
-    │   ^
-    │   │
-    │   Y.
-Expression has type:   dynamic() | {none()}
-Context expected type: number()
-    │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dynamic()
-  However the following candidate: {none()}
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  dynamic() | {none()} is not compatible with number()
-  because
-  {none()} is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:325:13
-    │
-325 │     true -> Atom;
-    │             ^^^^
-    │             │
-    │             Atom.
-Expression has type:   'bar' | 'undefined' | 'foo'
-Context expected type: 'foo' | 'bar' | binary()
-    │             
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'bar' | 'foo'
-  However the following candidate: 'undefined'
-  Differs from the expected type:  'foo' | 'bar' | binary()
-
------------------------------- Detailed message ------------------------------
-
-  'bar' | 'undefined' | 'foo' is not compatible with 'foo' | 'bar' | binary()
-  because
-  'undefined' is not compatible with 'foo' | 'bar' | binary()
-  because
-  'undefined' is not compatible with 'foo'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:343:3
-    │
-343 │   parse_atom(Bin, [foo, bar]).
-    │   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    │   │
-    │   parse_atom(Bin, ['foo', 'bar']).
-Expression has type:   'foo' | 'bar'
-Context expected type: 'foo'
-    │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'foo'
-  However the following candidate: 'bar'
-  Differs from the expected type:  'foo'
-
------------------------------- Detailed message ------------------------------
-
-  'foo' | 'bar' is not compatible with 'foo'
-  because
-  'bar' is not compatible with 'foo'
-
-37 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_custom-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_custom-OTP-28.pretty
deleted file mode 100644
index 34e16f1479..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_custom-OTP-28.pretty
+++ /dev/null
@@ -1,457 +0,0 @@
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_custom.erl:14:27
-   │
-14 │     eqwalizer:reveal_type(element(42, Tup)).
-   │                           ^^^^^^^^^^^^^^^^ dynamic()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_custom.erl:18:27
-   │
-18 │     eqwalizer:reveal_type(element(2, Tup)).
-   │                           ^^^^^^^^^^^^^^^ dynamic(atom())
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_custom.erl:22:27
-   │
-22 │     eqwalizer:reveal_type(element(1, Tup)).
-   │                           ^^^^^^^^^^^^^^^ dynamic(number())
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_custom.erl:26:27
-   │
-26 │     eqwalizer:reveal_type(element(1, Tup)).
-   │                           ^^^^^^^^^^^^^^^ dynamic(none())
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_custom.erl:30:27
-   │
-30 │     eqwalizer:reveal_type(element(N, Tup)).
-   │                           ^^^^^^^^^^^^^^^ dynamic(number() | atom())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_custom.erl:43:3
-   │
-43 │   application:get_env(app1).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^^ application:get_env('app1').
-Expression has type:   'undefined' | {'ok', dynamic()}
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_custom.erl:56:3
-   │
-56 │   application:get_env(app1, key1).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ application:get_env('app1', 'key1').
-Expression has type:   'undefined' | {'ok', dynamic()}
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_custom.erl:73:3
-   │
-73 │   lists:flatten(In).
-   │   ^^^^^^^^^^^^^^^^^ lists:flatten(In).
-Expression has type:   ['b' | 'c' | 'a']
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_custom.erl:85:3
-   │
-85 │   lists:flatten(In, Tail).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^ lists:flatten(In, Tail).
-Expression has type:   ['b' | 'a' | 'y' | 'z' | 'c' | 'x']
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_custom.erl:94:3
-   │
-94 │   file:consult(some_file).
-   │   ^^^^^^^^^^^^^^^^^^^^^^^ file:consult('some_file').
-Expression has type:   {'ok', [dynamic()]} | {'error', {number(), atom(), term()} | 'terminated' | 'badarg' | file:posix() | 'system_limit'}
-Context expected type: 'nok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_custom.erl:99:3
-   │
-99 │   abs(dynamic()).
-   │   ^^^^^^^^^^^^^^ erlang:abs(dynamic()).
-Expression has type:   number()
-Context expected type: 'anything'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:108:3
-    │
-108 │   abs(N).
-    │   ^^^^^^ erlang:abs(N).
-Expression has type:   number()
-Context expected type: 'anything'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:108:7
-    │
-108 │   abs(N).
-    │       ^
-    │       │
-    │       N.
-Expression has type:   dynamic() | 'a'
-Context expected type: number()
-    │       
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dynamic()
-  However the following candidate: 'a'
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  dynamic() | 'a' is not compatible with number()
-  because
-  'a' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:120:3
-    │
-120 │   ets:lookup(tab, Any).
-    │   ^^^^^^^^^^^^^^^^^^^^ ets:lookup('tab', Any).
-Expression has type:   [dynamic()]
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:124:3
-    │
-124 │   ets:lookup("not atom", Any).
-    │   ^^^^^^^^^^^^^^^^^^^^^^^^^^^ ets:lookup(string_lit, Any).
-Expression has type:   [dynamic()]
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:124:14
-    │
-124 │   ets:lookup("not atom", Any).
-    │              ^^^^^^^^^^ string_lit.
-Expression has type:   string()
-Context expected type: ets:tab()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:143:16
-    │
-143 │   ets:tab2list("not atom").
-    │                ^^^^^^^^^^ string_lit.
-Expression has type:   string()
-Context expected type: ets:tab()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:158:3
-    │  
-158 │ ╭   maps:without(
-159 │ │     [a],
-160 │ │     Dyn
-161 │ │   ).
-    │ ╰───^ maps:without(['a'], Dyn).
-Expression has type:   #{dynamic() => dynamic()}
-Context expected type: 'wrong_ret'
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/gradual_custom.erl:166:1
-    │  
-166 │ ╭ maps_without_3_neg(None) ->
-167 │ │   maps:without(
-168 │ │     [a, b],
-169 │ │     None
-170 │ │   ).
-    │ ╰───^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:185:3
-    │  
-185 │ ╭   maps:with(
-186 │ │     [a],
-187 │ │     Dyn
-188 │ │   ).
-    │ ╰───^ maps:with(['a'], Dyn).
-Expression has type:   #{a := dynamic()}
-Context expected type: 'wrong_ret'
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/gradual_custom.erl:193:1
-    │  
-193 │ ╭ maps_with_3(None) ->
-194 │ │   maps:with(
-195 │ │     [a, b],
-196 │ │     None
-197 │ │   ).
-    │ ╰───^ Clause is not covered by spec
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-    ┌─ check/src/gradual_custom.erl:203:25
-    │
-203 │   eqwalizer:reveal_type(Res),
-    │                         ^^^ file:filename_all()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:204:3
-    │
-204 │   Res.
-    │   ^^^
-    │   │
-    │   Res.
-Expression has type:   file:filename_all()
-Context expected type: 'ok'
-    │   
-
-Because in the expression's type:
-  Here the type is:     string() | binary()
-  Context expects type: 'ok'
-  No candidate of the expression's type matches the expected type.
-
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with 'ok'
-  because
-  string() | binary() is not compatible with 'ok'
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-    ┌─ check/src/gradual_custom.erl:210:25
-    │
-210 │   eqwalizer:reveal_type(Res),
-    │                         ^^^ file:filename_all()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:211:3
-    │
-211 │   Res.
-    │   ^^^
-    │   │
-    │   Res.
-Expression has type:   file:filename_all()
-Context expected type: 'ok'
-    │   
-
-Because in the expression's type:
-  Here the type is:     string() | binary()
-  Context expects type: 'ok'
-  No candidate of the expression's type matches the expected type.
-
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with 'ok'
-  because
-  string() | binary() is not compatible with 'ok'
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-    ┌─ check/src/gradual_custom.erl:217:25
-    │
-217 │   eqwalizer:reveal_type(Res),
-    │                         ^^^ file:filename_all()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:218:3
-    │
-218 │   Res.
-    │   ^^^
-    │   │
-    │   Res.
-Expression has type:   file:filename_all()
-Context expected type: 'ok'
-    │   
-
-Because in the expression's type:
-  Here the type is:     string() | binary()
-  Context expects type: 'ok'
-  No candidate of the expression's type matches the expected type.
-
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with 'ok'
-  because
-  string() | binary() is not compatible with 'ok'
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-    ┌─ check/src/gradual_custom.erl:224:25
-    │
-224 │   eqwalizer:reveal_type(Res),
-    │                         ^^^ file:filename_all()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:225:3
-    │
-225 │   Res.
-    │   ^^^
-    │   │
-    │   Res.
-Expression has type:   file:filename_all()
-Context expected type: 'ok'
-    │   
-
-Because in the expression's type:
-  Here the type is:     string() | binary()
-  Context expects type: 'ok'
-  No candidate of the expression's type matches the expected type.
-
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with 'ok'
-  because
-  string() | binary() is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:245:19
-    │
-245 │ min3_neg(X, Y) -> min(X, Y).
-    │                   ^^^^^^^^^
-    │                   │
-    │                   erlang:min(X, Y).
-Expression has type:   number() | 'undefined'
-Context expected type: number()
-    │                   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: 'undefined'
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | 'undefined' is not compatible with number()
-  because
-  'undefined' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:257:19
-    │
-257 │ min5_neg(X, Y) -> min(X, Y).
-    │                   ^^^^^^^^^
-    │                   │
-    │                   erlang:min(X, Y).
-Expression has type:   number() | atom() | binary()
-Context expected type: number()
-    │                   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: atom()
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | atom() | binary() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:263:19
-    │
-263 │ min6_neg(X, Y) -> min(X, Y).
-    │                   ^^^^^^^^^
-    │                   │
-    │                   erlang:min(X, Y).
-Expression has type:   number() | dynamic() | number() | atom() | dynamic()
-Context expected type: number()
-    │                   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number() | dynamic()
-  However the following candidate: atom()
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | dynamic() | number() | atom() | dynamic() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:269:19
-    │
-269 │ min7_neg(X, Y) -> min(X, Y).
-    │                   ^^^^^^^^^
-    │                   │
-    │                   erlang:min(X, Y).
-Expression has type:   number() | dynamic() | atom() | dynamic()
-Context expected type: number()
-    │                   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number() | dynamic()
-  However the following candidate: atom()
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | dynamic() | atom() | dynamic() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-    ┌─ check/src/gradual_custom.erl:277:25
-    │
-277 │   eqwalizer:reveal_type(Y),
-    │                         ^ dynamic() | {none()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:278:3
-    │
-278 │   Y.
-    │   ^
-    │   │
-    │   Y.
-Expression has type:   dynamic() | {none()}
-Context expected type: number()
-    │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dynamic()
-  However the following candidate: {none()}
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  dynamic() | {none()} is not compatible with number()
-  because
-  {none()} is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:325:13
-    │
-325 │     true -> Atom;
-    │             ^^^^
-    │             │
-    │             Atom.
-Expression has type:   'bar' | 'undefined' | 'foo'
-Context expected type: 'foo' | 'bar' | binary()
-    │             
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'bar' | 'foo'
-  However the following candidate: 'undefined'
-  Differs from the expected type:  'foo' | 'bar' | binary()
-
------------------------------- Detailed message ------------------------------
-
-  'bar' | 'undefined' | 'foo' is not compatible with 'foo' | 'bar' | binary()
-  because
-  'undefined' is not compatible with 'foo' | 'bar' | binary()
-  because
-  'undefined' is not compatible with 'foo'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_custom.erl:343:3
-    │
-343 │   parse_atom(Bin, [foo, bar]).
-    │   ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    │   │
-    │   parse_atom(Bin, ['foo', 'bar']).
-Expression has type:   'foo' | 'bar'
-Context expected type: 'foo'
-    │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'foo'
-  However the following candidate: 'bar'
-  Differs from the expected type:  'foo'
-
------------------------------- Detailed message ------------------------------
-
-  'foo' | 'bar' is not compatible with 'foo'
-  because
-  'bar' is not compatible with 'foo'
-
-37 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_custom-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_custom.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/gradual_custom-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/gradual_custom.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_lambdas-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_lambdas-OTP-27.pretty
deleted file mode 100644
index 60301786c5..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_lambdas-OTP-27.pretty
+++ /dev/null
@@ -1,33 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_lambdas.erl:39:17
-   │
-39 │         true -> A + 1;
-   │                 ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-   ┌─ check/src/gradual_lambdas.erl:55:3
-   │
-55 │   DoWork().
-   │   ^^^^^^ DoWork.
-Expected fun type with arity 0
-Got: fun((dynamic()) -> dynamic())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_lambdas.erl:70:13
-   │
-70 │   fun(X) -> X + 1 end.
-   │             ^ X.
-Expression has type:   string()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_lambdas.erl:70:13
-   │
-70 │   fun(X) -> X + 1 end.
-   │             ^^^^^ _ + _.
-Expression has type:   number()
-Context expected type: string()
-
-4 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_lambdas-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_lambdas-OTP-28.pretty
deleted file mode 100644
index 60301786c5..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_lambdas-OTP-28.pretty
+++ /dev/null
@@ -1,33 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_lambdas.erl:39:17
-   │
-39 │         true -> A + 1;
-   │                 ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-   ┌─ check/src/gradual_lambdas.erl:55:3
-   │
-55 │   DoWork().
-   │   ^^^^^^ DoWork.
-Expected fun type with arity 0
-Got: fun((dynamic()) -> dynamic())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_lambdas.erl:70:13
-   │
-70 │   fun(X) -> X + 1 end.
-   │             ^ X.
-Expression has type:   string()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_lambdas.erl:70:13
-   │
-70 │   fun(X) -> X + 1 end.
-   │             ^^^^^ _ + _.
-Expression has type:   number()
-Context expected type: string()
-
-4 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_lambdas-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_lambdas.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/gradual_lambdas-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/gradual_lambdas.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_maybe-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_maybe-OTP-27.pretty
deleted file mode 100644
index 5587da0d7e..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_maybe-OTP-27.pretty
+++ /dev/null
@@ -1,93 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_maybe.erl:26:9
-   │
-26 │         A
-   │         ^ A.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_maybe.erl:50:14
-   │
-50 │         _ -> 3
-   │              ^ 3.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_maybe.erl:58:21
-   │
-58 │         {err, A} ?= T,
-   │                     ^ T.
-Expression has type:   {'ok', atom()} | {'err', term()}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_maybe.erl:67:20
-   │
-67 │         {ok, A} ?= T,
-   │                    ^ T.
-Expression has type:   {'ok', atom()} | {'err', term()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_maybe.erl:91:9
-   │
-91 │         B
-   │         ^ B.
-Expression has type:   'ok'
-Context expected type: 'err'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_maybe.erl:93:14
-   │
-93 │         _ -> ok
-   │              ^^ 'ok'.
-Expression has type:   'ok'
-Context expected type: 'err'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_maybe.erl:123:18
-    │
-123 │         a = A ?= T,
-    │                  ^
-    │                  │
-    │                  T.
-Expression has type:   'a' | 'b' | 'c'
-Context expected type: 'b' | 'c'
-    │                  
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'b' | 'c'
-  However the following candidate: 'a'
-  Differs from the expected type:  'b' | 'c'
-
------------------------------- Detailed message ------------------------------
-
-  'a' | 'b' | 'c' is not compatible with 'b' | 'c'
-  because
-  'a' is not compatible with 'b' | 'c'
-  because
-  'a' is not compatible with 'b'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_maybe.erl:147:14
-    │
-147 │         c -> err
-    │              ^^^ 'err'.
-Expression has type:   'err'
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_maybe.erl:156:13
-    │  
-156 │ ╭             maybe
-157 │ │                 B ?= {a, T},
-158 │ │                 V = {b, B},
-159 │ │                 C ?= V
-160 │ │             end
-    │ ╰───────────────^ maybe ...
-Expression has type:   {'a', term()} | {'b', {'a', term()}}
-Context expected type: 'err'
-
-9 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_maybe-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_maybe-OTP-28.pretty
deleted file mode 100644
index 5587da0d7e..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_maybe-OTP-28.pretty
+++ /dev/null
@@ -1,93 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_maybe.erl:26:9
-   │
-26 │         A
-   │         ^ A.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_maybe.erl:50:14
-   │
-50 │         _ -> 3
-   │              ^ 3.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_maybe.erl:58:21
-   │
-58 │         {err, A} ?= T,
-   │                     ^ T.
-Expression has type:   {'ok', atom()} | {'err', term()}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_maybe.erl:67:20
-   │
-67 │         {ok, A} ?= T,
-   │                    ^ T.
-Expression has type:   {'ok', atom()} | {'err', term()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_maybe.erl:91:9
-   │
-91 │         B
-   │         ^ B.
-Expression has type:   'ok'
-Context expected type: 'err'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_maybe.erl:93:14
-   │
-93 │         _ -> ok
-   │              ^^ 'ok'.
-Expression has type:   'ok'
-Context expected type: 'err'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_maybe.erl:123:18
-    │
-123 │         a = A ?= T,
-    │                  ^
-    │                  │
-    │                  T.
-Expression has type:   'a' | 'b' | 'c'
-Context expected type: 'b' | 'c'
-    │                  
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'b' | 'c'
-  However the following candidate: 'a'
-  Differs from the expected type:  'b' | 'c'
-
------------------------------- Detailed message ------------------------------
-
-  'a' | 'b' | 'c' is not compatible with 'b' | 'c'
-  because
-  'a' is not compatible with 'b' | 'c'
-  because
-  'a' is not compatible with 'b'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_maybe.erl:147:14
-    │
-147 │         c -> err
-    │              ^^^ 'err'.
-Expression has type:   'err'
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_maybe.erl:156:13
-    │  
-156 │ ╭             maybe
-157 │ │                 B ?= {a, T},
-158 │ │                 V = {b, B},
-159 │ │                 C ?= V
-160 │ │             end
-    │ ╰───────────────^ maybe ...
-Expression has type:   {'a', term()} | {'b', {'a', term()}}
-Context expected type: 'err'
-
-9 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_maybe-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_maybe.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/gradual_maybe-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/gradual_maybe.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-27.pretty
deleted file mode 100644
index 107e1b6e30..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-27.pretty
+++ /dev/null
@@ -1,57 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_misc.erl:15:3
-   │
-15 │   X.
-   │   ^
-   │   │
-   │   X.
-Expression has type:   opaque:contravariant('a')
-Context expected type: opaque:contravariant('a' | 'b')
-   │   
-
-Because in the expression's type:
-  fun((
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  ) -> 'ok')
-
------------------------------- Detailed message ------------------------------
-
-  opaque:contravariant('a') is not compatible with opaque:contravariant('a' | 'b')
-  because
-  fun(('a') -> 'ok') is not compatible with opaque:contravariant('a' | 'b')
-  because
-  fun(('a') -> 'ok') is not compatible with fun(('a' | 'b') -> 'ok')
-  because
-  'a' | 'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_misc.erl:38:5
-   │
-38 │     <<X || X <- [], (X ++ X) >>.
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ << || >>.
-Expression has type:   binary()
-Context expected type: 'ok'
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/gradual_misc.erl:41:1
-   │  
-41 │ ╭ fuzz03([_ | {}]) -> 
-42 │ │     ok.
-   │ ╰──────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_misc.erl:46:41
-   │
-46 │ refine_tuple_neg(T) when is_tuple(T) -> T;
-   │                                         ^
-   │                                         │
-   │                                         T.
-Expression has type:   {'b', 'c'}
-Context expected type: 'a' | {none()}
-   │                                         
-
-expected union does not contain any tuple type of size 2
-
-4 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-28.pretty
deleted file mode 100644
index 107e1b6e30..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-28.pretty
+++ /dev/null
@@ -1,57 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_misc.erl:15:3
-   │
-15 │   X.
-   │   ^
-   │   │
-   │   X.
-Expression has type:   opaque:contravariant('a')
-Context expected type: opaque:contravariant('a' | 'b')
-   │   
-
-Because in the expression's type:
-  fun((
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  ) -> 'ok')
-
------------------------------- Detailed message ------------------------------
-
-  opaque:contravariant('a') is not compatible with opaque:contravariant('a' | 'b')
-  because
-  fun(('a') -> 'ok') is not compatible with opaque:contravariant('a' | 'b')
-  because
-  fun(('a') -> 'ok') is not compatible with fun(('a' | 'b') -> 'ok')
-  because
-  'a' | 'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_misc.erl:38:5
-   │
-38 │     <<X || X <- [], (X ++ X) >>.
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ << || >>.
-Expression has type:   binary()
-Context expected type: 'ok'
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/gradual_misc.erl:41:1
-   │  
-41 │ ╭ fuzz03([_ | {}]) -> 
-42 │ │     ok.
-   │ ╰──────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_misc.erl:46:41
-   │
-46 │ refine_tuple_neg(T) when is_tuple(T) -> T;
-   │                                         ^
-   │                                         │
-   │                                         T.
-Expression has type:   {'b', 'c'}
-Context expected type: 'a' | {none()}
-   │                                         
-
-expected union does not contain any tuple type of size 2
-
-4 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_overloaded-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_overloaded-OTP-27.pretty
deleted file mode 100644
index 957e329439..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_overloaded-OTP-27.pretty
+++ /dev/null
@@ -1,77 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_overloaded.erl:38:20
-   │
-38 │     binary_to_atom(Y).
-   │                    ^ Y.
-Expression has type:   pid()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_overloaded.erl:61:5
-   │
-61 │     {Y}.
-   │     ^^^ {Y}.
-Expression has type:   {dynamic()}
-Context expected type: number()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_overloaded.erl:90:27
-   │
-90 │     eqwalizer:reveal_type(Res),
-   │                           ^^^ dynamic()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_overloaded.erl:112:5
-    │  
-112 │ ╭     rec_each(
-113 │ │         fun(R) -> R#r{count = 0} end,
-114 │ │         Rec
-115 │ │     ).
-    │ ╰─────^ rec_each(fun, Rec).
-Expression has type:   #r{}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_overloaded.erl:119:5
-    │  
-119 │ ╭     rec_each(
-120 │ │         fun(I) -> I + 1 end,
-121 │ │         Rec
-122 │ │     ).
-    │ ╰─────^ rec_each(fun, Rec).
-Expression has type:   #r{}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_overloaded.erl:120:19
-    │
-120 │         fun(I) -> I + 1 end,
-    │                   ^ I.
-Expression has type:   #r{}
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_overloaded.erl:120:19
-    │
-120 │         fun(I) -> I + 1 end,
-    │                   ^^^^^ _ + _.
-Expression has type:   number()
-Context expected type: #r{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_overloaded.erl:128:19
-    │
-128 │         fun(I) -> I + 1 end,
-    │                   ^ I.
-Expression has type:   #r{}
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_overloaded.erl:128:19
-    │
-128 │         fun(I) -> I + 1 end,
-    │                   ^^^^^ _ + _.
-Expression has type:   number()
-Context expected type: #r{}
-
-9 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_overloaded-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_overloaded-OTP-28.pretty
deleted file mode 100644
index 957e329439..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_overloaded-OTP-28.pretty
+++ /dev/null
@@ -1,77 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_overloaded.erl:38:20
-   │
-38 │     binary_to_atom(Y).
-   │                    ^ Y.
-Expression has type:   pid()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/gradual_overloaded.erl:61:5
-   │
-61 │     {Y}.
-   │     ^^^ {Y}.
-Expression has type:   {dynamic()}
-Context expected type: number()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_overloaded.erl:90:27
-   │
-90 │     eqwalizer:reveal_type(Res),
-   │                           ^^^ dynamic()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_overloaded.erl:112:5
-    │  
-112 │ ╭     rec_each(
-113 │ │         fun(R) -> R#r{count = 0} end,
-114 │ │         Rec
-115 │ │     ).
-    │ ╰─────^ rec_each(fun, Rec).
-Expression has type:   #r{}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_overloaded.erl:119:5
-    │  
-119 │ ╭     rec_each(
-120 │ │         fun(I) -> I + 1 end,
-121 │ │         Rec
-122 │ │     ).
-    │ ╰─────^ rec_each(fun, Rec).
-Expression has type:   #r{}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_overloaded.erl:120:19
-    │
-120 │         fun(I) -> I + 1 end,
-    │                   ^ I.
-Expression has type:   #r{}
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_overloaded.erl:120:19
-    │
-120 │         fun(I) -> I + 1 end,
-    │                   ^^^^^ _ + _.
-Expression has type:   number()
-Context expected type: #r{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_overloaded.erl:128:19
-    │
-128 │         fun(I) -> I + 1 end,
-    │                   ^ I.
-Expression has type:   #r{}
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/gradual_overloaded.erl:128:19
-    │
-128 │         fun(I) -> I + 1 end,
-    │                   ^^^^^ _ + _.
-Expression has type:   number()
-Context expected type: #r{}
-
-9 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_overloaded-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_overloaded.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/gradual_overloaded-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/gradual_overloaded.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/detached_specs1-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_regression_01.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/detached_specs1-OTP-27.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/gradual_regression_01.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_untyped-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_untyped-OTP-27.pretty
deleted file mode 100644
index e82d8ee3f2..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_untyped-OTP-27.pretty
+++ /dev/null
@@ -1,25 +0,0 @@
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_untyped.erl:11:25
-   │
-11 │   eqwalizer:reveal_type(_L),
-   │                         ^^ [dynamic()]
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_untyped.erl:23:25
-   │
-23 │   eqwalizer:reveal_type(Field2),
-   │                         ^^^^^^ dynamic()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_untyped.erl:28:25
-   │
-28 │   eqwalizer:reveal_type(A),
-   │                         ^ dynamic()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_untyped.erl:33:25
-   │
-33 │   eqwalizer:reveal_type(B),
-   │                         ^ dynamic()
-
-4 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_untyped-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_untyped-OTP-28.pretty
deleted file mode 100644
index e82d8ee3f2..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_untyped-OTP-28.pretty
+++ /dev/null
@@ -1,25 +0,0 @@
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_untyped.erl:11:25
-   │
-11 │   eqwalizer:reveal_type(_L),
-   │                         ^^ [dynamic()]
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_untyped.erl:23:25
-   │
-23 │   eqwalizer:reveal_type(Field2),
-   │                         ^^^^^^ dynamic()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_untyped.erl:28:25
-   │
-28 │   eqwalizer:reveal_type(A),
-   │                         ^ dynamic()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/gradual_untyped.erl:33:25
-   │
-33 │   eqwalizer:reveal_type(B),
-   │                         ^ dynamic()
-
-4 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_untyped-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_untyped.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/gradual_untyped-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/gradual_untyped.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/guard_b_connections-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/guard_b_connections-OTP-27.pretty
deleted file mode 100644
index 88bcfb1267..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/guard_b_connections-OTP-27.pretty
+++ /dev/null
@@ -1,121 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guard_b_connections.erl:22:3
-   │
-22 │   R.
-   │   ^
-   │   │
-   │   R.
-Expression has type:   #r1{} | #r2{}
-Context expected type: r1()
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #r1{}
-  However the following candidate: #r2{}
-  Differs from the expected type:  #r1{}
-
------------------------------- Detailed message ------------------------------
-
-  #r1{} | #r2{} is not compatible with r1()
-  because
-  #r1{} | #r2{} is not compatible with #r1{}
-  because
-  #r2{} is not compatible with #r1{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guard_b_connections.erl:27:3
-   │
-27 │   R.
-   │   ^
-   │   │
-   │   R.
-Expression has type:   #r1{} | #r2{}
-Context expected type: r1()
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #r1{}
-  However the following candidate: #r2{}
-  Differs from the expected type:  #r1{}
-
------------------------------- Detailed message ------------------------------
-
-  #r1{} | #r2{} is not compatible with r1()
-  because
-  #r1{} | #r2{} is not compatible with #r1{}
-  because
-  #r2{} is not compatible with #r1{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guard_b_connections.erl:32:3
-   │
-32 │   R.
-   │   ^
-   │   │
-   │   R.
-Expression has type:   #r1{} | #r2{}
-Context expected type: r1()
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #r1{}
-  However the following candidate: #r2{}
-  Differs from the expected type:  #r1{}
-
------------------------------- Detailed message ------------------------------
-
-  #r1{} | #r2{} is not compatible with r1()
-  because
-  #r1{} | #r2{} is not compatible with #r1{}
-  because
-  #r2{} is not compatible with #r1{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guard_b_connections.erl:38:3
-   │
-38 │   R.
-   │   ^
-   │   │
-   │   R.
-Expression has type:   #r1{} | #r2{}
-Context expected type: r1()
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #r1{}
-  However the following candidate: #r2{}
-  Differs from the expected type:  #r1{}
-
------------------------------- Detailed message ------------------------------
-
-  #r1{} | #r2{} is not compatible with r1()
-  because
-  #r1{} | #r2{} is not compatible with #r1{}
-  because
-  #r2{} is not compatible with #r1{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guard_b_connections.erl:44:3
-   │
-44 │   R.
-   │   ^
-   │   │
-   │   R.
-Expression has type:   #r1{} | #r2{}
-Context expected type: r1()
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #r1{}
-  However the following candidate: #r2{}
-  Differs from the expected type:  #r1{}
-
------------------------------- Detailed message ------------------------------
-
-  #r1{} | #r2{} is not compatible with r1()
-  because
-  #r1{} | #r2{} is not compatible with #r1{}
-  because
-  #r2{} is not compatible with #r1{}
-
-5 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/guard_b_connections-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/guard_b_connections-OTP-28.pretty
deleted file mode 100644
index 88bcfb1267..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/guard_b_connections-OTP-28.pretty
+++ /dev/null
@@ -1,121 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guard_b_connections.erl:22:3
-   │
-22 │   R.
-   │   ^
-   │   │
-   │   R.
-Expression has type:   #r1{} | #r2{}
-Context expected type: r1()
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #r1{}
-  However the following candidate: #r2{}
-  Differs from the expected type:  #r1{}
-
------------------------------- Detailed message ------------------------------
-
-  #r1{} | #r2{} is not compatible with r1()
-  because
-  #r1{} | #r2{} is not compatible with #r1{}
-  because
-  #r2{} is not compatible with #r1{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guard_b_connections.erl:27:3
-   │
-27 │   R.
-   │   ^
-   │   │
-   │   R.
-Expression has type:   #r1{} | #r2{}
-Context expected type: r1()
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #r1{}
-  However the following candidate: #r2{}
-  Differs from the expected type:  #r1{}
-
------------------------------- Detailed message ------------------------------
-
-  #r1{} | #r2{} is not compatible with r1()
-  because
-  #r1{} | #r2{} is not compatible with #r1{}
-  because
-  #r2{} is not compatible with #r1{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guard_b_connections.erl:32:3
-   │
-32 │   R.
-   │   ^
-   │   │
-   │   R.
-Expression has type:   #r1{} | #r2{}
-Context expected type: r1()
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #r1{}
-  However the following candidate: #r2{}
-  Differs from the expected type:  #r1{}
-
------------------------------- Detailed message ------------------------------
-
-  #r1{} | #r2{} is not compatible with r1()
-  because
-  #r1{} | #r2{} is not compatible with #r1{}
-  because
-  #r2{} is not compatible with #r1{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guard_b_connections.erl:38:3
-   │
-38 │   R.
-   │   ^
-   │   │
-   │   R.
-Expression has type:   #r1{} | #r2{}
-Context expected type: r1()
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #r1{}
-  However the following candidate: #r2{}
-  Differs from the expected type:  #r1{}
-
------------------------------- Detailed message ------------------------------
-
-  #r1{} | #r2{} is not compatible with r1()
-  because
-  #r1{} | #r2{} is not compatible with #r1{}
-  because
-  #r2{} is not compatible with #r1{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guard_b_connections.erl:44:3
-   │
-44 │   R.
-   │   ^
-   │   │
-   │   R.
-Expression has type:   #r1{} | #r2{}
-Context expected type: r1()
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #r1{}
-  However the following candidate: #r2{}
-  Differs from the expected type:  #r1{}
-
------------------------------- Detailed message ------------------------------
-
-  #r1{} | #r2{} is not compatible with r1()
-  because
-  #r1{} | #r2{} is not compatible with #r1{}
-  because
-  #r2{} is not compatible with #r1{}
-
-5 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/guard_b_connections-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/guard_b_connections.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/guard_b_connections-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/guard_b_connections.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/guards-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/guards-OTP-27.pretty
deleted file mode 100644
index c17a7e6267..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/guards-OTP-27.pretty
+++ /dev/null
@@ -1,37 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards.erl:51:5
-   │
-51 │     X.
-   │     ^ X.
-Expression has type:   term()
-Context expected type: #{number() => number()}
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-   ┌─ check/src/guards.erl:53:1
-   │
-53 │ -type loop() :: loop().
-   │ ^^^^^^^^^^^^^^^^^^^^ recursive type loop/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/guards.erl:54:1
-   │
-54 │ -record(invalid, {field :: loop()}).
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid references type with invalid definition: loop/0
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards.erl:89:25
-   │
-89 │ guard_element_neg(T) -> T + 1.
-   │                         ^ T.
-Expression has type:   tuple()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards.erl:89:25
-   │
-89 │ guard_element_neg(T) -> T + 1.
-   │                         ^^^^^ _ + _.
-Expression has type:   number()
-Context expected type: tuple()
-
-5 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/guards-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/guards-OTP-28.pretty
deleted file mode 100644
index c17a7e6267..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/guards-OTP-28.pretty
+++ /dev/null
@@ -1,37 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards.erl:51:5
-   │
-51 │     X.
-   │     ^ X.
-Expression has type:   term()
-Context expected type: #{number() => number()}
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-   ┌─ check/src/guards.erl:53:1
-   │
-53 │ -type loop() :: loop().
-   │ ^^^^^^^^^^^^^^^^^^^^ recursive type loop/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/guards.erl:54:1
-   │
-54 │ -record(invalid, {field :: loop()}).
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid references type with invalid definition: loop/0
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards.erl:89:25
-   │
-89 │ guard_element_neg(T) -> T + 1.
-   │                         ^ T.
-Expression has type:   tuple()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards.erl:89:25
-   │
-89 │ guard_element_neg(T) -> T + 1.
-   │                         ^^^^^ _ + _.
-Expression has type:   number()
-Context expected type: tuple()
-
-5 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/guards-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/guards.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/guards-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/guards.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/guards_logic-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/guards_logic-OTP-27.pretty
deleted file mode 100644
index c287958c68..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/guards_logic-OTP-27.pretty
+++ /dev/null
@@ -1,73 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_logic.erl:32:38
-   │
-32 │ test07_neg(X, Y) when X andalso Y -> Y.
-   │                                      ^ Y.
-Expression has type:   'true'
-Context expected type: 'false'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_logic.erl:35:40
-   │
-35 │ test08_neg(X) when not is_number(X) -> X.
-   │                                        ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_logic.erl:57:20
-   │
-57 │        is_pid(X)-> X.
-   │                    ^
-   │                    │
-   │                    X.
-Expression has type:   number() | atom() | pid()
-Context expected type: number() | atom()
-   │                    
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number() | atom()
-  However the following candidate: pid()
-  Differs from the expected type:  number() | atom()
-
------------------------------- Detailed message ------------------------------
-
-  number() | atom() | pid() is not compatible with number() | atom()
-  because
-  pid() is not compatible with number() | atom()
-  because
-  pid() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_logic.erl:73:5
-   │
-73 │     {X, Y}.
-   │     ^^^^^^
-   │     │
-   │     {X, Y}.
-Expression has type:   {term(), term()}
-Context expected type: {number(), number()}
-   │     
-
-Because in the expression's type:
-  { 
-    Here the type is:     term()
-    Context expects type: number()
-  , term()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {term(), term()} is not compatible with {number(), number()}
-  because
-  term() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/guards_logic.erl:101:46
-    │
-101 │ test21_neg(X) when (X =:= a) or (X =:= b) -> X.
-    │                                              ^ X.
-Expression has type:   'a' | 'b'
-Context expected type: 'c'
-
-5 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/guards_logic-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/guards_logic-OTP-28.pretty
deleted file mode 100644
index c287958c68..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/guards_logic-OTP-28.pretty
+++ /dev/null
@@ -1,73 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_logic.erl:32:38
-   │
-32 │ test07_neg(X, Y) when X andalso Y -> Y.
-   │                                      ^ Y.
-Expression has type:   'true'
-Context expected type: 'false'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_logic.erl:35:40
-   │
-35 │ test08_neg(X) when not is_number(X) -> X.
-   │                                        ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_logic.erl:57:20
-   │
-57 │        is_pid(X)-> X.
-   │                    ^
-   │                    │
-   │                    X.
-Expression has type:   number() | atom() | pid()
-Context expected type: number() | atom()
-   │                    
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number() | atom()
-  However the following candidate: pid()
-  Differs from the expected type:  number() | atom()
-
------------------------------- Detailed message ------------------------------
-
-  number() | atom() | pid() is not compatible with number() | atom()
-  because
-  pid() is not compatible with number() | atom()
-  because
-  pid() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_logic.erl:73:5
-   │
-73 │     {X, Y}.
-   │     ^^^^^^
-   │     │
-   │     {X, Y}.
-Expression has type:   {term(), term()}
-Context expected type: {number(), number()}
-   │     
-
-Because in the expression's type:
-  { 
-    Here the type is:     term()
-    Context expects type: number()
-  , term()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {term(), term()} is not compatible with {number(), number()}
-  because
-  term() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/guards_logic.erl:101:46
-    │
-101 │ test21_neg(X) when (X =:= a) or (X =:= b) -> X.
-    │                                              ^ X.
-Expression has type:   'a' | 'b'
-Context expected type: 'c'
-
-5 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/guards_logic-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/guards_logic.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/guards_logic-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/guards_logic.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/guards_simple-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/guards_simple-OTP-27.pretty
deleted file mode 100644
index 7bc05b8ab1..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/guards_simple-OTP-27.pretty
+++ /dev/null
@@ -1,97 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:26:36
-   │
-26 │ atom_neg_1(X) when is_number(X) -> X.
-   │                                    ^ X.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:31:23
-   │
-31 │         is_list(X) -> X
-   │                       ^ X.
-Expression has type:   [term()]
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:37:31
-   │
-37 │         Y when is_tuple(Y) -> Y
-   │                               ^ Y.
-Expression has type:   tuple()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:56:37
-   │
-56 │ boolean_neg_1(X) when is_atom(X) -> X.
-   │                                     ^ X.
-Expression has type:   atom()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:61:23
-   │
-61 │         is_atom(X) -> X
-   │                       ^ X.
-Expression has type:   atom()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:67:30
-   │
-67 │         Y when is_atom(Y) -> Y
-   │                              ^ Y.
-Expression has type:   atom()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:74:36
-   │
-74 │ float_neg(X) when is_boolean(X) -> X.
-   │                                    ^ X.
-Expression has type:   'false' | 'true'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:80:38
-   │
-80 │ integer_neg(X) when is_boolean(X) -> X.
-   │                                      ^ X.
-Expression has type:   'false' | 'true'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:86:33
-   │
-86 │ pid_neg(X) when is_number(X) -> X.
-   │                                 ^ X.
-Expression has type:   number()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:92:37
-   │
-92 │ port_neg(X) when is_reference(X) -> X.
-   │                                     ^ X.
-Expression has type:   reference()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:95:42
-   │
-95 │ reference_pos(X) when is_reference(X) -> X.
-   │                                          ^ X.
-Expression has type:   reference()
-Context expected type: port()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:98:37
-   │
-98 │ reference_neg(X) when is_port(X) -> X.
-   │                                     ^ X.
-Expression has type:   port()
-Context expected type: pid()
-
-12 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/guards_simple-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/guards_simple-OTP-28.pretty
deleted file mode 100644
index 7bc05b8ab1..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/guards_simple-OTP-28.pretty
+++ /dev/null
@@ -1,97 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:26:36
-   │
-26 │ atom_neg_1(X) when is_number(X) -> X.
-   │                                    ^ X.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:31:23
-   │
-31 │         is_list(X) -> X
-   │                       ^ X.
-Expression has type:   [term()]
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:37:31
-   │
-37 │         Y when is_tuple(Y) -> Y
-   │                               ^ Y.
-Expression has type:   tuple()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:56:37
-   │
-56 │ boolean_neg_1(X) when is_atom(X) -> X.
-   │                                     ^ X.
-Expression has type:   atom()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:61:23
-   │
-61 │         is_atom(X) -> X
-   │                       ^ X.
-Expression has type:   atom()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:67:30
-   │
-67 │         Y when is_atom(Y) -> Y
-   │                              ^ Y.
-Expression has type:   atom()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:74:36
-   │
-74 │ float_neg(X) when is_boolean(X) -> X.
-   │                                    ^ X.
-Expression has type:   'false' | 'true'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:80:38
-   │
-80 │ integer_neg(X) when is_boolean(X) -> X.
-   │                                      ^ X.
-Expression has type:   'false' | 'true'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:86:33
-   │
-86 │ pid_neg(X) when is_number(X) -> X.
-   │                                 ^ X.
-Expression has type:   number()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:92:37
-   │
-92 │ port_neg(X) when is_reference(X) -> X.
-   │                                     ^ X.
-Expression has type:   reference()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:95:42
-   │
-95 │ reference_pos(X) when is_reference(X) -> X.
-   │                                          ^ X.
-Expression has type:   reference()
-Context expected type: port()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/guards_simple.erl:98:37
-   │
-98 │ reference_neg(X) when is_port(X) -> X.
-   │                                     ^ X.
-Expression has type:   port()
-Context expected type: pid()
-
-12 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/guards_simple-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/guards_simple.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/guards_simple-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/guards_simple.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-27.pretty
deleted file mode 100644
index 2e9f03966d..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-27.pretty
+++ /dev/null
@@ -1,83 +0,0 @@
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/hints.erl:13:27
-   │
-13 │     eqwalizer:reveal_type(A),
-   │                           ^ atom()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/hints.erl:24:27
-   │
-24 │     eqwalizer:reveal_type(_A),
-   │                           ^^ atom() | binary()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/hints.erl:32:27
-   │
-32 │     eqwalizer:reveal_type(B),
-   │                           ^ binary()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/hints.erl:41:27
-   │
-41 │     eqwalizer:reveal_type(BT),
-   │                           ^^ binary() | tuple()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/hints.erl:47:5
-   │
-47 │     Key.
-   │     ^^^
-   │     │
-   │     Key.
-Expression has type:   term() | 'undefined'
-Context expected type: atom()
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'undefined'
-  However the following candidate: term()
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  term() | 'undefined' is not compatible with atom()
-  because
-  term() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/hints.erl:52:5
-   │
-52 │     Key.
-   │     ^^^
-   │     │
-   │     Key.
-Expression has type:   term() | 'undefined'
-Context expected type: atom()
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'undefined'
-  However the following candidate: term()
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  term() | 'undefined' is not compatible with atom()
-  because
-  term() is not compatible with atom()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/hints.erl:55:1
-   │  
-55 │ ╭ reveal_none(X) ->
-56 │ │     eqwalizer:reveal_type(X),
-57 │ │     error(none).
-   │ ╰───────────────^ Clause is not covered by spec
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/hints.erl:56:27
-   │
-56 │     eqwalizer:reveal_type(X),
-   │                           ^ none()
-
-8 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-28.pretty
deleted file mode 100644
index 2e9f03966d..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-28.pretty
+++ /dev/null
@@ -1,83 +0,0 @@
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/hints.erl:13:27
-   │
-13 │     eqwalizer:reveal_type(A),
-   │                           ^ atom()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/hints.erl:24:27
-   │
-24 │     eqwalizer:reveal_type(_A),
-   │                           ^^ atom() | binary()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/hints.erl:32:27
-   │
-32 │     eqwalizer:reveal_type(B),
-   │                           ^ binary()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/hints.erl:41:27
-   │
-41 │     eqwalizer:reveal_type(BT),
-   │                           ^^ binary() | tuple()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/hints.erl:47:5
-   │
-47 │     Key.
-   │     ^^^
-   │     │
-   │     Key.
-Expression has type:   term() | 'undefined'
-Context expected type: atom()
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'undefined'
-  However the following candidate: term()
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  term() | 'undefined' is not compatible with atom()
-  because
-  term() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/hints.erl:52:5
-   │
-52 │     Key.
-   │     ^^^
-   │     │
-   │     Key.
-Expression has type:   term() | 'undefined'
-Context expected type: atom()
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'undefined'
-  However the following candidate: term()
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  term() | 'undefined' is not compatible with atom()
-  because
-  term() is not compatible with atom()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/hints.erl:55:1
-   │  
-55 │ ╭ reveal_none(X) ->
-56 │ │     eqwalizer:reveal_type(X),
-57 │ │     error(none).
-   │ ╰───────────────^ Clause is not covered by spec
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/hints.erl:56:27
-   │
-56 │     eqwalizer:reveal_type(X),
-   │                           ^ none()
-
-8 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/hints.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/hints-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/hints.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/index1-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/index1-OTP-27.pretty
deleted file mode 100644
index 53b66665b2..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/index1-OTP-27.pretty
+++ /dev/null
@@ -1,23 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/index1.erl:31:21
-   │
-31 │   _ = X#rec{field = 3},
-   │                     ^ 3.
-Expression has type:   number()
-Context expected type: [number()]
-
-error: undefined_field (See https://fb.me/eqwalizer_errors#undefined_field)
-   ┌─ check/src/index1.erl:32:7
-   │
-32 │   _ = #rec{},
-   │       ^^^^^^ #rec{...}: field is 'undefined'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/index1.erl:39:5
-   │
-39 │   _ = fun index2:foo/1.
-   │     ^^^^^^^^^^^^^^^^^^ match_expr.
-Expression has type:   fun((#rec{}) -> {index2:ty_a(), ty_a(), rec()})
-Context expected type: {ty_a(), ty_b(), ty_a(), ty_b(), index2:ty_a(), #rec{}, rec()}
-
-3 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/index1-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/index1-OTP-28.pretty
deleted file mode 100644
index 53b66665b2..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/index1-OTP-28.pretty
+++ /dev/null
@@ -1,23 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/index1.erl:31:21
-   │
-31 │   _ = X#rec{field = 3},
-   │                     ^ 3.
-Expression has type:   number()
-Context expected type: [number()]
-
-error: undefined_field (See https://fb.me/eqwalizer_errors#undefined_field)
-   ┌─ check/src/index1.erl:32:7
-   │
-32 │   _ = #rec{},
-   │       ^^^^^^ #rec{...}: field is 'undefined'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/index1.erl:39:5
-   │
-39 │   _ = fun index2:foo/1.
-   │     ^^^^^^^^^^^^^^^^^^ match_expr.
-Expression has type:   fun((#rec{}) -> {index2:ty_a(), ty_a(), rec()})
-Context expected type: {ty_a(), ty_b(), ty_a(), ty_b(), index2:ty_a(), #rec{}, rec()}
-
-3 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/index1-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/index1.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/index1-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/index1.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/index2-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/index2-OTP-27.pretty
deleted file mode 100644
index cf62c97c82..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/index2-OTP-27.pretty
+++ /dev/null
@@ -1,9 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/index2.erl:21:3
-   │
-21 │   X#rec.field.
-   │   ^^^^^^^^^^^ ...#rec.field.
-Expression has type:   [atom()]
-Context expected type: {ty_a(), index1:ty_a(), index1:rec()}
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/index2-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/index2-OTP-28.pretty
deleted file mode 100644
index cf62c97c82..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/index2-OTP-28.pretty
+++ /dev/null
@@ -1,9 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/index2.erl:21:3
-   │
-21 │   X#rec.field.
-   │   ^^^^^^^^^^^ ...#rec.field.
-Expression has type:   [atom()]
-Context expected type: {ty_a(), index1:ty_a(), index1:rec()}
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/index2-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/index2.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/index2-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/index2.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/iolists-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/iolists-OTP-27.pretty
deleted file mode 100644
index bf9d6e219b..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/iolists-OTP-27.pretty
+++ /dev/null
@@ -1,85 +0,0 @@
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/iolists.erl:18:1
-   │  
-18 │ ╭ first(IoList)
-19 │ │     when is_binary(IoList) -> IoList;
-   │ ╰────────────────────────────────────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/iolists.erl:50:18
-   │
-50 │ refine5(X, X) -> X.
-   │                  ^
-   │                  │
-   │                  X.
-Expression has type:   [atom() | binary()]
-Context expected type: [binary()]
-   │                  
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: binary()
-    However the following candidate: atom()
-    Differs from the expected type:  binary()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [atom() | binary()] is not compatible with [binary()]
-  because
-  atom() | binary() is not compatible with binary()
-  because
-  atom() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/iolists.erl:55:22
-   │
-55 │ refine6_neg(X, X) -> X.
-   │                      ^
-   │                      │
-   │                      X.
-Expression has type:   [atom() | binary()]
-Context expected type: [atom()]
-   │                      
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: atom()
-    However the following candidate: binary()
-    Differs from the expected type:  atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [atom() | binary()] is not compatible with [atom()]
-  because
-  atom() | binary() is not compatible with atom()
-  because
-  binary() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/iolists.erl:60:27
-   │
-60 │ refine_to_empty1(X, X) -> X.
-   │                           ^
-   │                           │
-   │                           X.
-Expression has type:   [atom()]
-Context expected type: []
-   │                           
-
-Because in the expression's type:
-  [
-    Here the type is:     atom()
-    Context expects type: none()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/iolists.erl:83:17
-   │
-83 │ test2_neg(X) -> X.
-   │                 ^ X.
-Expression has type:   iolist()
-Context expected type: 'wrong_ret'
-
-5 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/iolists-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/iolists-OTP-28.pretty
deleted file mode 100644
index bf9d6e219b..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/iolists-OTP-28.pretty
+++ /dev/null
@@ -1,85 +0,0 @@
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/iolists.erl:18:1
-   │  
-18 │ ╭ first(IoList)
-19 │ │     when is_binary(IoList) -> IoList;
-   │ ╰────────────────────────────────────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/iolists.erl:50:18
-   │
-50 │ refine5(X, X) -> X.
-   │                  ^
-   │                  │
-   │                  X.
-Expression has type:   [atom() | binary()]
-Context expected type: [binary()]
-   │                  
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: binary()
-    However the following candidate: atom()
-    Differs from the expected type:  binary()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [atom() | binary()] is not compatible with [binary()]
-  because
-  atom() | binary() is not compatible with binary()
-  because
-  atom() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/iolists.erl:55:22
-   │
-55 │ refine6_neg(X, X) -> X.
-   │                      ^
-   │                      │
-   │                      X.
-Expression has type:   [atom() | binary()]
-Context expected type: [atom()]
-   │                      
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: atom()
-    However the following candidate: binary()
-    Differs from the expected type:  atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [atom() | binary()] is not compatible with [atom()]
-  because
-  atom() | binary() is not compatible with atom()
-  because
-  binary() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/iolists.erl:60:27
-   │
-60 │ refine_to_empty1(X, X) -> X.
-   │                           ^
-   │                           │
-   │                           X.
-Expression has type:   [atom()]
-Context expected type: []
-   │                           
-
-Because in the expression's type:
-  [
-    Here the type is:     atom()
-    Context expects type: none()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/iolists.erl:83:17
-   │
-83 │ test2_neg(X) -> X.
-   │                 ^ X.
-Expression has type:   iolist()
-Context expected type: 'wrong_ret'
-
-5 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/iolists-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/iolists.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/iolists-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/iolists.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/detached_specs1-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/kp_01.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/detached_specs1-OTP-28.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/kp_01.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/kp_02-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/kp_02-OTP-27.pretty
deleted file mode 100644
index 5613ac7817..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/kp_02-OTP-27.pretty
+++ /dev/null
@@ -1,33 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/kp_02.erl:24:21
-   │
-24 │     Res = transform(pure_fun(fun id/1), A),
-   │                     ^^^^^^^^^^^^^^^^^^
-   │                     │
-   │                     pure_fun(id/1).
-Expression has type:   fun((X) -> X) with 1 type parameter
-Context expected type: fun((T1) -> Ret) with 0 type parameters
-   │                     
-
-Because in the expression's type:
-  Here the type is:     fun((X) -> X) with 1 type parameter
-  Context expects type: fun((T1) -> Ret) with 0 type parameters
-  The number of type parameters doesn't match.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/kp_02.erl:24:21
-   │
-24 │     Res = transform(pure_fun(fun id/1), A),
-   │                     ^^^^^^^^^^^^^^^^^^
-   │                     │
-   │                     pure_fun(id/1).
-Expression has type:   fun((X) -> X) with 1 type parameter
-Context expected type: fun((number()) -> dynamic()) with 0 type parameters
-   │                     
-
-Because in the expression's type:
-  Here the type is:     fun((X) -> X) with 1 type parameter
-  Context expects type: fun((number()) -> dynamic()) with 0 type parameters
-  The number of type parameters doesn't match.
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/kp_02-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/kp_02-OTP-28.pretty
deleted file mode 100644
index 5613ac7817..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/kp_02-OTP-28.pretty
+++ /dev/null
@@ -1,33 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/kp_02.erl:24:21
-   │
-24 │     Res = transform(pure_fun(fun id/1), A),
-   │                     ^^^^^^^^^^^^^^^^^^
-   │                     │
-   │                     pure_fun(id/1).
-Expression has type:   fun((X) -> X) with 1 type parameter
-Context expected type: fun((T1) -> Ret) with 0 type parameters
-   │                     
-
-Because in the expression's type:
-  Here the type is:     fun((X) -> X) with 1 type parameter
-  Context expects type: fun((T1) -> Ret) with 0 type parameters
-  The number of type parameters doesn't match.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/kp_02.erl:24:21
-   │
-24 │     Res = transform(pure_fun(fun id/1), A),
-   │                     ^^^^^^^^^^^^^^^^^^
-   │                     │
-   │                     pure_fun(id/1).
-Expression has type:   fun((X) -> X) with 1 type parameter
-Context expected type: fun((number()) -> dynamic()) with 0 type parameters
-   │                     
-
-Because in the expression's type:
-  Here the type is:     fun((X) -> X) with 1 type parameter
-  Context expects type: fun((number()) -> dynamic()) with 0 type parameters
-  The number of type parameters doesn't match.
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/kp_02-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/kp_02.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/kp_02-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/kp_02.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests-OTP-27.pretty
deleted file mode 100644
index d0768e5669..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests-OTP-27.pretty
+++ /dev/null
@@ -1,57 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/lists_tests.erl:12:28
-   │
-12 │ lists_union_neg(V1, V2) -> [V1, V2].
-   │                            ^^^^^^^^
-   │                            │
-   │                            [V1, V2].
-Expression has type:   [atom() | binary()]
-Context expected type: [atom()] | [binary()]
-   │                            
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: atom()
-    However the following candidate: binary()
-    Differs from the expected type:  atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [atom() | binary()] is not compatible with [atom()] | [binary()]
-  because
-  [atom() | binary()] is not compatible with [atom()]
-  because
-  atom() | binary() is not compatible with atom()
-  because
-  binary() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/lists_tests.erl:16:28
-   │
-16 │ lists_union_2_neg(V, L) -> [V | L].
-   │                            ^^^^^^^
-   │                            │
-   │                            [V | L].
-Expression has type:   [atom() | binary()]
-Context expected type: [atom()] | [binary()]
-   │                            
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: atom()
-    However the following candidate: binary()
-    Differs from the expected type:  atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [atom() | binary()] is not compatible with [atom()] | [binary()]
-  because
-  [atom() | binary()] is not compatible with [atom()]
-  because
-  atom() | binary() is not compatible with atom()
-  because
-  binary() is not compatible with atom()
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests-OTP-28.pretty
deleted file mode 100644
index d0768e5669..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests-OTP-28.pretty
+++ /dev/null
@@ -1,57 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/lists_tests.erl:12:28
-   │
-12 │ lists_union_neg(V1, V2) -> [V1, V2].
-   │                            ^^^^^^^^
-   │                            │
-   │                            [V1, V2].
-Expression has type:   [atom() | binary()]
-Context expected type: [atom()] | [binary()]
-   │                            
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: atom()
-    However the following candidate: binary()
-    Differs from the expected type:  atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [atom() | binary()] is not compatible with [atom()] | [binary()]
-  because
-  [atom() | binary()] is not compatible with [atom()]
-  because
-  atom() | binary() is not compatible with atom()
-  because
-  binary() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/lists_tests.erl:16:28
-   │
-16 │ lists_union_2_neg(V, L) -> [V | L].
-   │                            ^^^^^^^
-   │                            │
-   │                            [V | L].
-Expression has type:   [atom() | binary()]
-Context expected type: [atom()] | [binary()]
-   │                            
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: atom()
-    However the following candidate: binary()
-    Differs from the expected type:  atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [atom() | binary()] is not compatible with [atom()] | [binary()]
-  because
-  [atom() | binary()] is not compatible with [atom()]
-  because
-  atom() | binary() is not compatible with atom()
-  because
-  binary() is not compatible with atom()
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/misc-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/misc-OTP-27.pretty
deleted file mode 100644
index 22e373f816..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/misc-OTP-27.pretty
+++ /dev/null
@@ -1,1011 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:46:23
-   │
-46 │ test03_neg(-4 = X) -> X.
-   │                       ^ X.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:49:26
-   │
-49 │ test04_neg(6 / 3 = Y) -> Y.
-   │                          ^ Y.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:52:20
-   │
-52 │ test05_neg(X) -> + X.
-   │                    ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:55:36
-   │
-55 │ test06_neg(X) when is_number(X) -> + X.
-   │                                    ^^^ + _.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:63:5
-   │
-63 │     not X.
-   │     ^^^^^ not _.
-Expression has type:   boolean()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:73:25
-   │
-73 │     is_number(X) -> X + Y.
-   │                         ^ Y.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:77:21
-   │
-77 │ test11_neg(X, Y) -> X + Y.
-   │                     ^^^^^ _ + _.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:81:19
-   │
-81 │ test12_neg(X) -> -X.
-   │                   ^ X.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:85:21
-   │
-85 │ test13_neg(X, Y) -> X or Y.
-   │                     ^ X.
-Expression has type:   term()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:85:26
-   │
-85 │ test13_neg(X, Y) -> X or Y.
-   │                          ^ Y.
-Expression has type:   term()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:97:21
-   │
-97 │ test16_neg(X, Y) -> X or Y.
-   │                     ^^^^^^ _ or _.
-Expression has type:   boolean()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:101:26
-    │
-101 │ test17_neg(X, Y) -> X or Y.
-    │                          ^ Y.
-Expression has type:   atom()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:105:21
-    │
-105 │ test18_neg(X, Y) -> X orelse Y.
-    │                     ^^^^^^^^^^ _ orelse _.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:109:21
-    │
-109 │ test19_neg(X, Y) -> X andalso Y.
-    │                     ^^^^^^^^^^^ _ andalso _.
-Expression has type:   'false' | number()
-Context expected type: {number()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:112:18
-    │
-112 │ test20_neg(X) -> [- X].
-    │                  ^^^^^
-    │                  │
-    │                  [- _].
-Expression has type:   [number()]
-Context expected type: [atom()]
-    │                  
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:116:21
-    │
-116 │ test21_neg(X, Y) -> [X / Y].
-    │                     ^^^^^^^
-    │                     │
-    │                     [_ / _].
-Expression has type:   [number()]
-Context expected type: [atom()]
-    │                     
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:120:18
-    │
-120 │ test22_neg(X) -> [not X].
-    │                  ^^^^^^^
-    │                  │
-    │                  [not _].
-Expression has type:   [boolean()]
-Context expected type: [number()]
-    │                  
-
-Because in the expression's type:
-  [
-    Here the type is:     boolean()
-    Context expects type: number()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [boolean()] is not compatible with [number()]
-  because
-  boolean() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:124:21
-    │
-124 │ test23_neg(X, Y) -> [X or Y].
-    │                     ^^^^^^^^
-    │                     │
-    │                     [_ or _].
-Expression has type:   [boolean()]
-Context expected type: [number()]
-    │                     
-
-Because in the expression's type:
-  [
-    Here the type is:     boolean()
-    Context expects type: number()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [boolean()] is not compatible with [number()]
-  because
-  boolean() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:128:21
-    │
-128 │ test24_neg(X, Y) -> [X orelse Y].
-    │                     ^^^^^^^^^^^^
-    │                     │
-    │                     [_ orelse _].
-Expression has type:   [atom()]
-Context expected type: [number()]
-    │                     
-
-Because in the expression's type:
-  [
-    Here the type is:     atom()
-    Context expects type: number()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [atom()] is not compatible with [number()]
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:143:29
-    │
-143 │ test28_neg(B) -> boolean_id(B).
-    │                             ^ B.
-Expression has type:   atom()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:146:17
-    │
-146 │ test29_neg() -> [true, false].
-    │                 ^^^^^^^^^^^^^
-    │                 │
-    │                 ['true', 'false'].
-Expression has type:   ['true' | 'false']
-Context expected type: []
-    │                 
-
-Because in the expression's type:
-  [
-    Here the type is:     'true' | 'false'
-    Context expects type: none()
-    No candidate of the expression's type matches the expected type.
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:149:17
-    │
-149 │ test30_neg() -> 1.
-    │                 ^ 1.
-Expression has type:   number()
-Context expected type: 'atom'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:152:17
-    │
-152 │ test31_neg() -> fun test30_neg/0.
-    │                 ^^^^^^^^^^^^^^^^ test30_neg/0.
-Expression has type:   fun(() -> 'atom')
-Context expected type: 'atom'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:155:17
-    │
-155 │ test32_neg() -> fun misc_lib:boolean_id/1.
-    │                 ^^^^^^^^^^^^^^^^^^^^^^^^^ misc_lib:boolean_id/1.
-Expression has type:   fun((boolean()) -> boolean())
-Context expected type: 'atom'
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/misc.erl:192:1
-    │
-192 │ test40_pos({X, Y}) -> {X, Y}.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/misc.erl:196:1
-    │
-196 │ test41_pos([X | Y]) -> {X, Y}.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/misc.erl:204:1
-    │
-204 │ test43_pos([_ | Y]) when Y + 1 > 0 -> Y.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:221:17
-    │
-221 │ test46_neg() -> false.
-    │                 ^^^^^ 'false'.
-Expression has type:   'false'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:224:17
-    │
-224 │ test47_neg() -> [].
-    │                 ^^ [].
-Expression has type:   []
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:227:17
-    │
-227 │ test48_neg() -> test47_neg().
-    │                 ^^^^^^^^^^^^ test47_neg().
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:230:17
-    │
-230 │ test49_neg() -> misc:test47_neg().
-    │                 ^^^^^^^^^^^^^^^^^ misc:test47_neg().
-Expression has type:   number()
-Context expected type: atom()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/misc.erl:337:1
-    │
-337 │ test68_pos({E, _}) -> E.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:352:22
-    │
-352 │     catch test69_pos(atom).
-    │                      ^^^^
-    │                      │
-    │                      'atom'.
-Expression has type:   'atom'
-Context expected type: [atom()] | [number()]
-    │                      
-
-  'atom' is not compatible with [atom()] | [number()]
-  because
-  'atom' is not compatible with [atom()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:357:22
-    │
-357 │     catch test69_pos(atom).
-    │                      ^^^^
-    │                      │
-    │                      'atom'.
-Expression has type:   'atom'
-Context expected type: [atom()] | [number()]
-    │                      
-
-  'atom' is not compatible with [atom()] | [number()]
-  because
-  'atom' is not compatible with [atom()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:404:11
-    │
-404 │     after Timeout ->
-    │           ^^^^^^^ Timeout.
-Expression has type:   term()
-Context expected type: timeout()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:412:11
-    │
-412 │     after Timeout ->
-    │           ^^^^^^^ Timeout.
-Expression has type:   term()
-Context expected type: timeout()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:424:5
-    │
-424 │     {Msg}.
-    │     ^^^^^ {Msg}.
-Expression has type:   {'default' | dynamic('atom')}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:453:5
-    │
-453 │     {[H1|T1], [H2|T2]}.
-    │     ^^^^^^^^^^^^^^^^^^
-    │     │
-    │     {[H1 | T1], [H2 | T2]}.
-Expression has type:   {[number() | atom()], [atom() | number()]}
-Context expected type: {[atom()], [number()]}
-    │     
-
-Because in the expression's type:
-  { 
-    [
-      Here the type is a union type with some valid candidates: atom()
-      However the following candidate: number()
-      Differs from the expected type:  atom()
-    ]
-  , [atom() | number()]}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {[number() | atom()], [atom() | number()]} is not compatible with {[atom()], [number()]}
-  because
-  [number() | atom()] is not compatible with [atom()]
-  because
-  number() | atom() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:461:5
-    │
-461 │     {[H1|T1], [H2|T2]}.
-    │     ^^^^^^^^^^^^^^^^^^
-    │     │
-    │     {[H1 | T1], [H2 | T2]}.
-Expression has type:   {[atom() | number()], [atom() | number()]}
-Context expected type: {[atom()] | [number()], [atom()] | [number()]}
-    │     
-
-Because in the expression's type:
-  { 
-    [
-      Here the type is a union type with some valid candidates: atom()
-      However the following candidate: number()
-      Differs from the expected type:  atom()
-    ]
-  , [atom() | number()]}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {[atom() | number()], [atom() | number()]} is not compatible with {[atom()] | [number()], [atom()] | [number()]}
-  because
-  [atom() | number()] is not compatible with [atom()] | [number()]
-  because
-  [atom() | number()] is not compatible with [atom()]
-  because
-  atom() | number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:465:12
-    │
-465 │     X = [1 | 2],
-    │            ^^^^ 2.
-Expression has type:   number()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:472:21
-    │
-472 │ comp01_neg(X, Y) -> X < Y.
-    │                     ^^^^^ _ < _.
-Expression has type:   boolean()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:482:5
-    │
-482 │     Res.
-    │     ^^^ Res.
-Expression has type:   boolean()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:497:5
-    │
-497 │     Where ! What.
-    │     ^^^^^^^^^^^^ _ ! _.
-Expression has type:   term()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:507:20
-    │
-507 │     #str_box{str = Str}.
-    │                    ^^^ Str.
-Expression has type:   atom()
-Context expected type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:513:17
-    │
-513 │ string_neg() -> "str".
-    │                 ^^^^^ string_lit.
-Expression has type:   string()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:538:5
-    │
-538 │     Atom.
-    │     ^^^^ Atom.
-Expression has type:   string()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:555:5
-    │
-555 │     Atoms ++ Numbers.
-    │     ^^^^^^^^^^^^^^^^
-    │     │
-    │     _ ++ _.
-Expression has type:   [atom() | binary()]
-Context expected type: [atom() | number()]
-    │     
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: atom()
-    However the following candidate: binary()
-    Differs from the expected type:  atom() | number()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [atom() | binary()] is not compatible with [atom() | number()]
-  because
-  atom() | binary() is not compatible with atom() | number()
-  because
-  binary() is not compatible with atom() | number()
-  because
-  binary() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:575:14
-    │
-575 │     Atoms -- Anys.
-    │              ^^^^ Anys.
-Expression has type:   term()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:581:5
-    │
-581 │     Anys ++ Atoms.
-    │     ^^^^ Anys.
-Expression has type:   term()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:599:23
-    │
-599 │ start_neg([] ++ X) -> X.
-    │                       ^
-    │                       │
-    │                       X.
-Expression has type:   [A]
-Context expected type: [[A]]
-    │                       
-
-Because in the expression's type:
-  [
-    Here the type is:     A
-    Context expects type: [A]
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [A] is not compatible with [[A]]
-  because
-  A is not compatible with [A]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:611:21
-    │
-611 │ ss2_neg("" ++ S) -> S.
-    │                     ^ S.
-Expression has type:   [atom() | number()]
-Context expected type: string()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/misc.erl:615:1
-    │
-615 │ ss3("b" ++ S) -> S.
-    │ ^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:632:5
-    │
-632 │     X.
-    │     ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: bad_map_key (See https://fb.me/eqwalizer_errors#bad_map_key)
-    ┌─ check/src/misc.erl:641:5
-    │
-641 │     atom() := atom(),
-    │     ^^^^^^^^^^^^^^ Map type will be approximated to #{dynamic() => dynamic()}, suppressing potential errors.
-Use => instead of := here. Required map key should always be composed of statically defined atoms or tuples.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:644:15
-    │
-644 │ badspec(_) -> ok.
-    │               ^^ 'ok'.
-Expression has type:   'ok'
-Context expected type: #{dynamic() => dynamic()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:648:21
-    │
-648 │     catch lists:map({}, {}).
-    │                     ^^ {}.
-Expression has type:   {}
-Context expected type: fun((A) -> B)
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:648:21
-    │
-648 │     catch lists:map({}, {}).
-    │                     ^^ {}.
-Expression has type:   {}
-Context expected type: fun((dynamic()) -> dynamic())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:648:25
-    │
-648 │     catch lists:map({}, {}).
-    │                         ^^ {}.
-Expression has type:   {}
-Context expected type: [A]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:648:25
-    │
-648 │     catch lists:map({}, {}).
-    │                         ^^ {}.
-Expression has type:   {}
-Context expected type: [dynamic()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:652:26
-    │
-652 │     X = (catch lists:map({}, {})),
-    │                          ^^ {}.
-Expression has type:   {}
-Context expected type: fun((A) -> B)
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:652:26
-    │
-652 │     X = (catch lists:map({}, {})),
-    │                          ^^ {}.
-Expression has type:   {}
-Context expected type: fun((dynamic()) -> dynamic())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:652:30
-    │
-652 │     X = (catch lists:map({}, {})),
-    │                              ^^ {}.
-Expression has type:   {}
-Context expected type: [A]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:652:30
-    │
-652 │     X = (catch lists:map({}, {})),
-    │                              ^^ {}.
-Expression has type:   {}
-Context expected type: [dynamic()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:671:5
-    │
-671 │     [X, 1, 2, 3 | Y].
-    │     ^^^^^^^^^^^^^^^^ [X, 1, 2, 3 | Y].
-Expression has type:   [number() | dynamic()]
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:671:17
-    │
-671 │     [X, 1, 2, 3 | Y].
-    │                 ^^^^ Y.
-Expression has type:   number()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:676:5
-    │
-676 │     [X, 1, 2, 3 | an_atom].
-    │     ^^^^^^^^^^^^^^^^^^^^^^ [X, 1, 2, 3 | 'an_atom'].
-Expression has type:   [number() | dynamic()]
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:676:17
-    │
-676 │     [X, 1, 2, 3 | an_atom].
-    │                 ^^^^^^^^^^ 'an_atom'.
-Expression has type:   'an_atom'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:681:23
-    │
-681 │     Res = [X, 1, 2, 3 | an_atom],
-    │                       ^^^^^^^^^^ 'an_atom'.
-Expression has type:   'an_atom'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:682:5
-    │
-682 │     Res.
-    │     ^^^ Res.
-Expression has type:   [number() | dynamic()]
-Context expected type: pid()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/misc.erl:685:1
-    │
-685 │ not_list1_neg("atom" ++ A) -> A.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/misc.erl:689:1
-    │  
-689 │ ╭ not_list2_neg
-690 │ │     (A, [_ | A]) -> A.
-    │ ╰─────────────────────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/misc.erl:694:1
-    │  
-694 │ ╭ not_list3_neg
-695 │ │     (A, "atom" ++ A) -> A.
-    │ ╰─────────────────────────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/misc.erl:728:1
-    │  
-728 │ ╭ test91_neg(None) ->
-729 │ │     Res = {None, err},
-730 │ │     Res.
-    │ ╰───────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:730:5
-    │
-730 │     Res.
-    │     ^^^
-    │     │
-    │     Res.
-Expression has type:   {none(), 'err'}
-Context expected type: {'ok', 'ok'}
-    │     
-
-Because in the expression's type:
-  { none(), 
-    Here the type is:     'err'
-    Context expects type: 'ok'
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {none(), 'err'} is not compatible with {'ok', 'ok'}
-  because
-  'err' is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:741:5
-    │
-741 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   v2_op()
-Context expected type: v1_op()
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: v1_op()
-  However the following candidate: 'v2_op'
-  Differs from the expected type:  'v1_op1' | 'v1_op2' | stuff() | v0_op()
-
------------------------------- Detailed message ------------------------------
-
-  v2_op() is not compatible with v1_op()
-  because
-  'v2_op' | v1_op() is not compatible with v1_op()
-  because
-  'v2_op' | v1_op() is not compatible with 'v1_op1' | 'v1_op2' | stuff() | v0_op()
-  because
-  'v2_op' is not compatible with 'v1_op1' | 'v1_op2' | stuff() | v0_op()
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/misc.erl:760:1
-    │
-760 │ -opaque o_cycle() :: opaque:o_cycle().
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type o_cycle/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/misc.erl:762:1
-    │  
-762 │ ╭ -spec use_o_cycle1(misc:o_cycle()) ->
-763 │ │     opaque:o_cycle().
-    │ ╰────────────────────^ use_o_cycle1/1 references types with invalid definitions: o_cycle/0, opaque:o_cycle/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/misc.erl:766:1
-    │  
-766 │ ╭ -spec use_o_cycle2(opaque:o_cycle()) ->
-767 │ │     misc:o_cycle().
-    │ ╰──────────────────^ use_o_cycle2/1 references types with invalid definitions: o_cycle/0, opaque:o_cycle/0
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/misc.erl:783:1
-    │  
-783 │ ╭ -type x_cycle() ::
-784 │ │     recursive_aliases:x_cycle().
-    │ ╰───────────────────────────────^ recursive type x_cycle/0 is not productive
-
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-    ┌─ check/src/misc.erl:790:21
-    │
-790 │     opaque:opair(a, x:y())) ->
-    │                     ^^^^^ Unknown id: x:y/0
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:797:13
-    │
-797 │ names(X) -> X.
-    │             ^
-    │             │
-    │             X.
-Expression has type:   misc:set()
-Context expected type: sets:set()
-    │             
-
-Because in the expression's type:
-  Here the type is:     []
-  Context expects type: #set{} | #{term() => []}
-  No candidate matches in the expected union.
-
------------------------------- Detailed message ------------------------------
-
-  misc:set() is not compatible with sets:set()
-  because
-  [] is not compatible with sets:set()
-  because
-  [] is not compatible with sets:set(term())
-  because
-  [] is not compatible with #set{} | #{term() => []}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:850:5
-    │
-850 │     {ok, lists, 1.0}.
-    │     ^^^^^^^^^^^^^^^^
-    │     │
-    │     {'ok', 'lists', float_lit}.
-Expression has type:   {'ok', 'lists', number()}
-Context expected type: {'ok', atom(), pid()}
-    │     
-
-Because in the expression's type:
-  { 'ok', 'lists', 
-    Here the type is:     number()
-    Context expects type: pid()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 3:
-  {'ok', 'lists', number()} is not compatible with {'ok', atom(), pid()}
-  because
-  number() is not compatible with pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:860:5
-    │
-860 │     Mod.
-    │     ^^^ Mod.
-Expression has type:   atom()
-Context expected type: 'wrong_ret'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:875:5
-    │
-875 │     Arity.
-    │     ^^^^^ Arity.
-Expression has type:   number()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:887:5
-    │
-887 │     Node.
-    │     ^^^^ Node.
-Expression has type:   atom()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:929:16
-    │
-929 │ iovec_neg() -> {<<>>}.
-    │                ^^^^^^
-    │                │
-    │                {<<..>>}.
-Expression has type:   {binary()}
-Context expected type: erlang:iovec()
-    │                
-
-Because in the expression's type:
-  Here the type is:     {binary()}
-  Context expects type: [binary()]
-
------------------------------- Detailed message ------------------------------
-
-  {binary()} is not compatible with erlang:iovec()
-  because
-  {binary()} is not compatible with [binary()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:949:15
-    │
-949 │ n_a_neg(N) -> N.
-    │               ^ N.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:965:5
-    │
-965 │     MyPriorities.
-    │     ^^^^^^^^^^^^
-    │     │
-    │     MyPriorities.
-Expression has type:   ['MM' | 'MS' | 'EE' | 'MA' | 'GE']
-Context expected type: [erlang:priority_level()]
-    │     
-
-Because in the expression's type:
-  [
-    Here the type is:     'MM' | 'MS' | 'EE' | 'MA' | 'GE'
-    Context expects type: 'low' | 'normal' | 'high' | 'max'
-    No candidate of the expression's type matches the expected type.
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  ['MM' | 'MS' | 'EE' | 'MA' | 'GE'] is not compatible with [erlang:priority_level()]
-  because
-  'MM' | 'MS' | 'EE' | 'MA' | 'GE' is not compatible with erlang:priority_level()
-  because
-  'MM' | 'MS' | 'EE' | 'MA' | 'GE' is not compatible with 'low' | 'normal' | 'high' | 'max'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:971:5
-    │
-971 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   erlang:timestamp()
-Context expected type: atom()
-    │     
-
-Because in the expression's type:
-  Here the type is:     {number(), number(), number()}
-  Context expects type: atom()
-
------------------------------- Detailed message ------------------------------
-
-  erlang:timestamp() is not compatible with atom()
-  because
-  {number(), number(), number()} is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:987:12
-    │
-987 │     Res = (Flag orelse Pid),
-    │            ^^^^ Flag.
-Expression has type:   atom()
-Context expected type: boolean()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-     ┌─ check/src/misc.erl:1005:20
-     │
-1005 │             orelse Validator(),
-     │                    ^^^^^^^^^ Validator.
-Expected fun type with arity 0
-Got: 'undefined'
-
-error: non_exported_id (See https://fb.me/eqwalizer_errors#non_exported_id)
-     ┌─ check/src/misc.erl:1008:23
-     │
-1008 │ -spec non_exported_id(any_fun_type:f1()) -> any_fun_type:f1().
-     │                       ^^^^^^^^^^^^^^^^^ Type exists but is not exported: any_fun_type:f1/0
-
-error: non_exported_id (See https://fb.me/eqwalizer_errors#non_exported_id)
-     ┌─ check/src/misc.erl:1011:30
-     │
-1011 │ -type non_exported_id_t() :: any_fun_type:f1().
-     │                              ^^^^^^^^^^^^^^^^^ Type exists but is not exported: any_fun_type:f1/0
-
-93 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/misc-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/misc-OTP-28.pretty
deleted file mode 100644
index 22e373f816..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/misc-OTP-28.pretty
+++ /dev/null
@@ -1,1011 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:46:23
-   │
-46 │ test03_neg(-4 = X) -> X.
-   │                       ^ X.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:49:26
-   │
-49 │ test04_neg(6 / 3 = Y) -> Y.
-   │                          ^ Y.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:52:20
-   │
-52 │ test05_neg(X) -> + X.
-   │                    ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:55:36
-   │
-55 │ test06_neg(X) when is_number(X) -> + X.
-   │                                    ^^^ + _.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:63:5
-   │
-63 │     not X.
-   │     ^^^^^ not _.
-Expression has type:   boolean()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:73:25
-   │
-73 │     is_number(X) -> X + Y.
-   │                         ^ Y.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:77:21
-   │
-77 │ test11_neg(X, Y) -> X + Y.
-   │                     ^^^^^ _ + _.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:81:19
-   │
-81 │ test12_neg(X) -> -X.
-   │                   ^ X.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:85:21
-   │
-85 │ test13_neg(X, Y) -> X or Y.
-   │                     ^ X.
-Expression has type:   term()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:85:26
-   │
-85 │ test13_neg(X, Y) -> X or Y.
-   │                          ^ Y.
-Expression has type:   term()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/misc.erl:97:21
-   │
-97 │ test16_neg(X, Y) -> X or Y.
-   │                     ^^^^^^ _ or _.
-Expression has type:   boolean()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:101:26
-    │
-101 │ test17_neg(X, Y) -> X or Y.
-    │                          ^ Y.
-Expression has type:   atom()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:105:21
-    │
-105 │ test18_neg(X, Y) -> X orelse Y.
-    │                     ^^^^^^^^^^ _ orelse _.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:109:21
-    │
-109 │ test19_neg(X, Y) -> X andalso Y.
-    │                     ^^^^^^^^^^^ _ andalso _.
-Expression has type:   'false' | number()
-Context expected type: {number()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:112:18
-    │
-112 │ test20_neg(X) -> [- X].
-    │                  ^^^^^
-    │                  │
-    │                  [- _].
-Expression has type:   [number()]
-Context expected type: [atom()]
-    │                  
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:116:21
-    │
-116 │ test21_neg(X, Y) -> [X / Y].
-    │                     ^^^^^^^
-    │                     │
-    │                     [_ / _].
-Expression has type:   [number()]
-Context expected type: [atom()]
-    │                     
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:120:18
-    │
-120 │ test22_neg(X) -> [not X].
-    │                  ^^^^^^^
-    │                  │
-    │                  [not _].
-Expression has type:   [boolean()]
-Context expected type: [number()]
-    │                  
-
-Because in the expression's type:
-  [
-    Here the type is:     boolean()
-    Context expects type: number()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [boolean()] is not compatible with [number()]
-  because
-  boolean() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:124:21
-    │
-124 │ test23_neg(X, Y) -> [X or Y].
-    │                     ^^^^^^^^
-    │                     │
-    │                     [_ or _].
-Expression has type:   [boolean()]
-Context expected type: [number()]
-    │                     
-
-Because in the expression's type:
-  [
-    Here the type is:     boolean()
-    Context expects type: number()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [boolean()] is not compatible with [number()]
-  because
-  boolean() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:128:21
-    │
-128 │ test24_neg(X, Y) -> [X orelse Y].
-    │                     ^^^^^^^^^^^^
-    │                     │
-    │                     [_ orelse _].
-Expression has type:   [atom()]
-Context expected type: [number()]
-    │                     
-
-Because in the expression's type:
-  [
-    Here the type is:     atom()
-    Context expects type: number()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [atom()] is not compatible with [number()]
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:143:29
-    │
-143 │ test28_neg(B) -> boolean_id(B).
-    │                             ^ B.
-Expression has type:   atom()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:146:17
-    │
-146 │ test29_neg() -> [true, false].
-    │                 ^^^^^^^^^^^^^
-    │                 │
-    │                 ['true', 'false'].
-Expression has type:   ['true' | 'false']
-Context expected type: []
-    │                 
-
-Because in the expression's type:
-  [
-    Here the type is:     'true' | 'false'
-    Context expects type: none()
-    No candidate of the expression's type matches the expected type.
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:149:17
-    │
-149 │ test30_neg() -> 1.
-    │                 ^ 1.
-Expression has type:   number()
-Context expected type: 'atom'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:152:17
-    │
-152 │ test31_neg() -> fun test30_neg/0.
-    │                 ^^^^^^^^^^^^^^^^ test30_neg/0.
-Expression has type:   fun(() -> 'atom')
-Context expected type: 'atom'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:155:17
-    │
-155 │ test32_neg() -> fun misc_lib:boolean_id/1.
-    │                 ^^^^^^^^^^^^^^^^^^^^^^^^^ misc_lib:boolean_id/1.
-Expression has type:   fun((boolean()) -> boolean())
-Context expected type: 'atom'
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/misc.erl:192:1
-    │
-192 │ test40_pos({X, Y}) -> {X, Y}.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/misc.erl:196:1
-    │
-196 │ test41_pos([X | Y]) -> {X, Y}.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/misc.erl:204:1
-    │
-204 │ test43_pos([_ | Y]) when Y + 1 > 0 -> Y.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:221:17
-    │
-221 │ test46_neg() -> false.
-    │                 ^^^^^ 'false'.
-Expression has type:   'false'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:224:17
-    │
-224 │ test47_neg() -> [].
-    │                 ^^ [].
-Expression has type:   []
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:227:17
-    │
-227 │ test48_neg() -> test47_neg().
-    │                 ^^^^^^^^^^^^ test47_neg().
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:230:17
-    │
-230 │ test49_neg() -> misc:test47_neg().
-    │                 ^^^^^^^^^^^^^^^^^ misc:test47_neg().
-Expression has type:   number()
-Context expected type: atom()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/misc.erl:337:1
-    │
-337 │ test68_pos({E, _}) -> E.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:352:22
-    │
-352 │     catch test69_pos(atom).
-    │                      ^^^^
-    │                      │
-    │                      'atom'.
-Expression has type:   'atom'
-Context expected type: [atom()] | [number()]
-    │                      
-
-  'atom' is not compatible with [atom()] | [number()]
-  because
-  'atom' is not compatible with [atom()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:357:22
-    │
-357 │     catch test69_pos(atom).
-    │                      ^^^^
-    │                      │
-    │                      'atom'.
-Expression has type:   'atom'
-Context expected type: [atom()] | [number()]
-    │                      
-
-  'atom' is not compatible with [atom()] | [number()]
-  because
-  'atom' is not compatible with [atom()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:404:11
-    │
-404 │     after Timeout ->
-    │           ^^^^^^^ Timeout.
-Expression has type:   term()
-Context expected type: timeout()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:412:11
-    │
-412 │     after Timeout ->
-    │           ^^^^^^^ Timeout.
-Expression has type:   term()
-Context expected type: timeout()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:424:5
-    │
-424 │     {Msg}.
-    │     ^^^^^ {Msg}.
-Expression has type:   {'default' | dynamic('atom')}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:453:5
-    │
-453 │     {[H1|T1], [H2|T2]}.
-    │     ^^^^^^^^^^^^^^^^^^
-    │     │
-    │     {[H1 | T1], [H2 | T2]}.
-Expression has type:   {[number() | atom()], [atom() | number()]}
-Context expected type: {[atom()], [number()]}
-    │     
-
-Because in the expression's type:
-  { 
-    [
-      Here the type is a union type with some valid candidates: atom()
-      However the following candidate: number()
-      Differs from the expected type:  atom()
-    ]
-  , [atom() | number()]}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {[number() | atom()], [atom() | number()]} is not compatible with {[atom()], [number()]}
-  because
-  [number() | atom()] is not compatible with [atom()]
-  because
-  number() | atom() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:461:5
-    │
-461 │     {[H1|T1], [H2|T2]}.
-    │     ^^^^^^^^^^^^^^^^^^
-    │     │
-    │     {[H1 | T1], [H2 | T2]}.
-Expression has type:   {[atom() | number()], [atom() | number()]}
-Context expected type: {[atom()] | [number()], [atom()] | [number()]}
-    │     
-
-Because in the expression's type:
-  { 
-    [
-      Here the type is a union type with some valid candidates: atom()
-      However the following candidate: number()
-      Differs from the expected type:  atom()
-    ]
-  , [atom() | number()]}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {[atom() | number()], [atom() | number()]} is not compatible with {[atom()] | [number()], [atom()] | [number()]}
-  because
-  [atom() | number()] is not compatible with [atom()] | [number()]
-  because
-  [atom() | number()] is not compatible with [atom()]
-  because
-  atom() | number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:465:12
-    │
-465 │     X = [1 | 2],
-    │            ^^^^ 2.
-Expression has type:   number()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:472:21
-    │
-472 │ comp01_neg(X, Y) -> X < Y.
-    │                     ^^^^^ _ < _.
-Expression has type:   boolean()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:482:5
-    │
-482 │     Res.
-    │     ^^^ Res.
-Expression has type:   boolean()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:497:5
-    │
-497 │     Where ! What.
-    │     ^^^^^^^^^^^^ _ ! _.
-Expression has type:   term()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:507:20
-    │
-507 │     #str_box{str = Str}.
-    │                    ^^^ Str.
-Expression has type:   atom()
-Context expected type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:513:17
-    │
-513 │ string_neg() -> "str".
-    │                 ^^^^^ string_lit.
-Expression has type:   string()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:538:5
-    │
-538 │     Atom.
-    │     ^^^^ Atom.
-Expression has type:   string()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:555:5
-    │
-555 │     Atoms ++ Numbers.
-    │     ^^^^^^^^^^^^^^^^
-    │     │
-    │     _ ++ _.
-Expression has type:   [atom() | binary()]
-Context expected type: [atom() | number()]
-    │     
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: atom()
-    However the following candidate: binary()
-    Differs from the expected type:  atom() | number()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [atom() | binary()] is not compatible with [atom() | number()]
-  because
-  atom() | binary() is not compatible with atom() | number()
-  because
-  binary() is not compatible with atom() | number()
-  because
-  binary() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:575:14
-    │
-575 │     Atoms -- Anys.
-    │              ^^^^ Anys.
-Expression has type:   term()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:581:5
-    │
-581 │     Anys ++ Atoms.
-    │     ^^^^ Anys.
-Expression has type:   term()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:599:23
-    │
-599 │ start_neg([] ++ X) -> X.
-    │                       ^
-    │                       │
-    │                       X.
-Expression has type:   [A]
-Context expected type: [[A]]
-    │                       
-
-Because in the expression's type:
-  [
-    Here the type is:     A
-    Context expects type: [A]
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [A] is not compatible with [[A]]
-  because
-  A is not compatible with [A]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:611:21
-    │
-611 │ ss2_neg("" ++ S) -> S.
-    │                     ^ S.
-Expression has type:   [atom() | number()]
-Context expected type: string()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/misc.erl:615:1
-    │
-615 │ ss3("b" ++ S) -> S.
-    │ ^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:632:5
-    │
-632 │     X.
-    │     ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: bad_map_key (See https://fb.me/eqwalizer_errors#bad_map_key)
-    ┌─ check/src/misc.erl:641:5
-    │
-641 │     atom() := atom(),
-    │     ^^^^^^^^^^^^^^ Map type will be approximated to #{dynamic() => dynamic()}, suppressing potential errors.
-Use => instead of := here. Required map key should always be composed of statically defined atoms or tuples.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:644:15
-    │
-644 │ badspec(_) -> ok.
-    │               ^^ 'ok'.
-Expression has type:   'ok'
-Context expected type: #{dynamic() => dynamic()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:648:21
-    │
-648 │     catch lists:map({}, {}).
-    │                     ^^ {}.
-Expression has type:   {}
-Context expected type: fun((A) -> B)
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:648:21
-    │
-648 │     catch lists:map({}, {}).
-    │                     ^^ {}.
-Expression has type:   {}
-Context expected type: fun((dynamic()) -> dynamic())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:648:25
-    │
-648 │     catch lists:map({}, {}).
-    │                         ^^ {}.
-Expression has type:   {}
-Context expected type: [A]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:648:25
-    │
-648 │     catch lists:map({}, {}).
-    │                         ^^ {}.
-Expression has type:   {}
-Context expected type: [dynamic()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:652:26
-    │
-652 │     X = (catch lists:map({}, {})),
-    │                          ^^ {}.
-Expression has type:   {}
-Context expected type: fun((A) -> B)
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:652:26
-    │
-652 │     X = (catch lists:map({}, {})),
-    │                          ^^ {}.
-Expression has type:   {}
-Context expected type: fun((dynamic()) -> dynamic())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:652:30
-    │
-652 │     X = (catch lists:map({}, {})),
-    │                              ^^ {}.
-Expression has type:   {}
-Context expected type: [A]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:652:30
-    │
-652 │     X = (catch lists:map({}, {})),
-    │                              ^^ {}.
-Expression has type:   {}
-Context expected type: [dynamic()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:671:5
-    │
-671 │     [X, 1, 2, 3 | Y].
-    │     ^^^^^^^^^^^^^^^^ [X, 1, 2, 3 | Y].
-Expression has type:   [number() | dynamic()]
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:671:17
-    │
-671 │     [X, 1, 2, 3 | Y].
-    │                 ^^^^ Y.
-Expression has type:   number()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:676:5
-    │
-676 │     [X, 1, 2, 3 | an_atom].
-    │     ^^^^^^^^^^^^^^^^^^^^^^ [X, 1, 2, 3 | 'an_atom'].
-Expression has type:   [number() | dynamic()]
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:676:17
-    │
-676 │     [X, 1, 2, 3 | an_atom].
-    │                 ^^^^^^^^^^ 'an_atom'.
-Expression has type:   'an_atom'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:681:23
-    │
-681 │     Res = [X, 1, 2, 3 | an_atom],
-    │                       ^^^^^^^^^^ 'an_atom'.
-Expression has type:   'an_atom'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:682:5
-    │
-682 │     Res.
-    │     ^^^ Res.
-Expression has type:   [number() | dynamic()]
-Context expected type: pid()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/misc.erl:685:1
-    │
-685 │ not_list1_neg("atom" ++ A) -> A.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/misc.erl:689:1
-    │  
-689 │ ╭ not_list2_neg
-690 │ │     (A, [_ | A]) -> A.
-    │ ╰─────────────────────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/misc.erl:694:1
-    │  
-694 │ ╭ not_list3_neg
-695 │ │     (A, "atom" ++ A) -> A.
-    │ ╰─────────────────────────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/misc.erl:728:1
-    │  
-728 │ ╭ test91_neg(None) ->
-729 │ │     Res = {None, err},
-730 │ │     Res.
-    │ ╰───────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:730:5
-    │
-730 │     Res.
-    │     ^^^
-    │     │
-    │     Res.
-Expression has type:   {none(), 'err'}
-Context expected type: {'ok', 'ok'}
-    │     
-
-Because in the expression's type:
-  { none(), 
-    Here the type is:     'err'
-    Context expects type: 'ok'
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {none(), 'err'} is not compatible with {'ok', 'ok'}
-  because
-  'err' is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:741:5
-    │
-741 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   v2_op()
-Context expected type: v1_op()
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: v1_op()
-  However the following candidate: 'v2_op'
-  Differs from the expected type:  'v1_op1' | 'v1_op2' | stuff() | v0_op()
-
------------------------------- Detailed message ------------------------------
-
-  v2_op() is not compatible with v1_op()
-  because
-  'v2_op' | v1_op() is not compatible with v1_op()
-  because
-  'v2_op' | v1_op() is not compatible with 'v1_op1' | 'v1_op2' | stuff() | v0_op()
-  because
-  'v2_op' is not compatible with 'v1_op1' | 'v1_op2' | stuff() | v0_op()
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/misc.erl:760:1
-    │
-760 │ -opaque o_cycle() :: opaque:o_cycle().
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type o_cycle/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/misc.erl:762:1
-    │  
-762 │ ╭ -spec use_o_cycle1(misc:o_cycle()) ->
-763 │ │     opaque:o_cycle().
-    │ ╰────────────────────^ use_o_cycle1/1 references types with invalid definitions: o_cycle/0, opaque:o_cycle/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/misc.erl:766:1
-    │  
-766 │ ╭ -spec use_o_cycle2(opaque:o_cycle()) ->
-767 │ │     misc:o_cycle().
-    │ ╰──────────────────^ use_o_cycle2/1 references types with invalid definitions: o_cycle/0, opaque:o_cycle/0
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/misc.erl:783:1
-    │  
-783 │ ╭ -type x_cycle() ::
-784 │ │     recursive_aliases:x_cycle().
-    │ ╰───────────────────────────────^ recursive type x_cycle/0 is not productive
-
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-    ┌─ check/src/misc.erl:790:21
-    │
-790 │     opaque:opair(a, x:y())) ->
-    │                     ^^^^^ Unknown id: x:y/0
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:797:13
-    │
-797 │ names(X) -> X.
-    │             ^
-    │             │
-    │             X.
-Expression has type:   misc:set()
-Context expected type: sets:set()
-    │             
-
-Because in the expression's type:
-  Here the type is:     []
-  Context expects type: #set{} | #{term() => []}
-  No candidate matches in the expected union.
-
------------------------------- Detailed message ------------------------------
-
-  misc:set() is not compatible with sets:set()
-  because
-  [] is not compatible with sets:set()
-  because
-  [] is not compatible with sets:set(term())
-  because
-  [] is not compatible with #set{} | #{term() => []}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:850:5
-    │
-850 │     {ok, lists, 1.0}.
-    │     ^^^^^^^^^^^^^^^^
-    │     │
-    │     {'ok', 'lists', float_lit}.
-Expression has type:   {'ok', 'lists', number()}
-Context expected type: {'ok', atom(), pid()}
-    │     
-
-Because in the expression's type:
-  { 'ok', 'lists', 
-    Here the type is:     number()
-    Context expects type: pid()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 3:
-  {'ok', 'lists', number()} is not compatible with {'ok', atom(), pid()}
-  because
-  number() is not compatible with pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:860:5
-    │
-860 │     Mod.
-    │     ^^^ Mod.
-Expression has type:   atom()
-Context expected type: 'wrong_ret'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:875:5
-    │
-875 │     Arity.
-    │     ^^^^^ Arity.
-Expression has type:   number()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:887:5
-    │
-887 │     Node.
-    │     ^^^^ Node.
-Expression has type:   atom()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:929:16
-    │
-929 │ iovec_neg() -> {<<>>}.
-    │                ^^^^^^
-    │                │
-    │                {<<..>>}.
-Expression has type:   {binary()}
-Context expected type: erlang:iovec()
-    │                
-
-Because in the expression's type:
-  Here the type is:     {binary()}
-  Context expects type: [binary()]
-
------------------------------- Detailed message ------------------------------
-
-  {binary()} is not compatible with erlang:iovec()
-  because
-  {binary()} is not compatible with [binary()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:949:15
-    │
-949 │ n_a_neg(N) -> N.
-    │               ^ N.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:965:5
-    │
-965 │     MyPriorities.
-    │     ^^^^^^^^^^^^
-    │     │
-    │     MyPriorities.
-Expression has type:   ['MM' | 'MS' | 'EE' | 'MA' | 'GE']
-Context expected type: [erlang:priority_level()]
-    │     
-
-Because in the expression's type:
-  [
-    Here the type is:     'MM' | 'MS' | 'EE' | 'MA' | 'GE'
-    Context expects type: 'low' | 'normal' | 'high' | 'max'
-    No candidate of the expression's type matches the expected type.
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  ['MM' | 'MS' | 'EE' | 'MA' | 'GE'] is not compatible with [erlang:priority_level()]
-  because
-  'MM' | 'MS' | 'EE' | 'MA' | 'GE' is not compatible with erlang:priority_level()
-  because
-  'MM' | 'MS' | 'EE' | 'MA' | 'GE' is not compatible with 'low' | 'normal' | 'high' | 'max'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:971:5
-    │
-971 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   erlang:timestamp()
-Context expected type: atom()
-    │     
-
-Because in the expression's type:
-  Here the type is:     {number(), number(), number()}
-  Context expects type: atom()
-
------------------------------- Detailed message ------------------------------
-
-  erlang:timestamp() is not compatible with atom()
-  because
-  {number(), number(), number()} is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/misc.erl:987:12
-    │
-987 │     Res = (Flag orelse Pid),
-    │            ^^^^ Flag.
-Expression has type:   atom()
-Context expected type: boolean()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-     ┌─ check/src/misc.erl:1005:20
-     │
-1005 │             orelse Validator(),
-     │                    ^^^^^^^^^ Validator.
-Expected fun type with arity 0
-Got: 'undefined'
-
-error: non_exported_id (See https://fb.me/eqwalizer_errors#non_exported_id)
-     ┌─ check/src/misc.erl:1008:23
-     │
-1008 │ -spec non_exported_id(any_fun_type:f1()) -> any_fun_type:f1().
-     │                       ^^^^^^^^^^^^^^^^^ Type exists but is not exported: any_fun_type:f1/0
-
-error: non_exported_id (See https://fb.me/eqwalizer_errors#non_exported_id)
-     ┌─ check/src/misc.erl:1011:30
-     │
-1011 │ -type non_exported_id_t() :: any_fun_type:f1().
-     │                              ^^^^^^^^^^^^^^^^^ Type exists but is not exported: any_fun_type:f1/0
-
-93 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/misc-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/misc.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/misc-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/misc.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/detached_specs2-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/misc_lib.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/detached_specs2-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/misc_lib.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested1-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested1-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested1-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/detached_specs2-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested1.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/detached_specs2-OTP-27.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested1.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested2-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested2-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested2-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested2-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested2-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested2-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested2-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested2-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested2-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/detached_specs2-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested2.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/detached_specs2-OTP-28.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested2.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/my_behaviour-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/my_behaviour-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/my_behaviour-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/my_behaviour-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/my_behaviour-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/my_behaviour-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/my_behaviour-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/my_behaviour-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/my_behaviour-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_callbacks_1-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/my_behaviour.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_callbacks_1-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/my_behaviour.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/my_gradual_behaviour-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/my_gradual_behaviour-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/my_gradual_behaviour-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/my_gradual_behaviour-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/my_gradual_behaviour-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/my_gradual_behaviour-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/my_gradual_behaviour-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/my_gradual_behaviour-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/my_gradual_behaviour-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_callbacks_1-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/my_gradual_behaviour.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_callbacks_1-OTP-27.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/my_gradual_behaviour.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/my_header-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/my_header-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/my_header-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/my_header-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/my_header-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/my_header-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/my_header-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/my_header-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/my_header-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_callbacks_1-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/my_header.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_callbacks_1-OTP-28.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/my_header.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/neg-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/neg-OTP-27.pretty
deleted file mode 100644
index 55ce8bf6f5..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/neg-OTP-27.pretty
+++ /dev/null
@@ -1,73 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/neg.erl:13:11
-   │
-13 │ foo(X) -> {X, X}.
-   │           ^^^^^^ {X, X}.
-Expression has type:   {A, A}
-Context expected type: A
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/neg.erl:17:5
-   │
-17 │     X.
-   │     ^ X.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/neg.erl:20:14
-   │
-20 │ foo(X, _) -> X.
-   │              ^ X.
-Expression has type:   term()
-Context expected type: A
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/neg.erl:24:13
-   │
-24 │     {ok, _} = X.
-   │             ^^^
-   │             │
-   │             match_expr.
-Expression has type:   {'ok', term()}
-Context expected type: {atom(), atom()}
-   │             
-
-Because in the expression's type:
-  { 'ok', 
-    Here the type is:     term()
-    Context expects type: atom()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'ok', term()} is not compatible with {atom(), atom()}
-  because
-  term() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/neg.erl:27:21
-   │
-27 │ concat1() -> [1] ++ 1.
-   │                     ^ 1.
-Expression has type:   number()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/neg.erl:30:25
-   │
-30 │ concat2(X, X) -> [1] ++ X.
-   │                         ^ X.
-Expression has type:   X
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/neg.erl:33:25
-   │
-33 │ concat3(X, X) -> [1] ++ X.
-   │                         ^ X.
-Expression has type:   X
-Context expected type: [term()]
-
-7 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/neg-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/neg-OTP-28.pretty
deleted file mode 100644
index 55ce8bf6f5..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/neg-OTP-28.pretty
+++ /dev/null
@@ -1,73 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/neg.erl:13:11
-   │
-13 │ foo(X) -> {X, X}.
-   │           ^^^^^^ {X, X}.
-Expression has type:   {A, A}
-Context expected type: A
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/neg.erl:17:5
-   │
-17 │     X.
-   │     ^ X.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/neg.erl:20:14
-   │
-20 │ foo(X, _) -> X.
-   │              ^ X.
-Expression has type:   term()
-Context expected type: A
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/neg.erl:24:13
-   │
-24 │     {ok, _} = X.
-   │             ^^^
-   │             │
-   │             match_expr.
-Expression has type:   {'ok', term()}
-Context expected type: {atom(), atom()}
-   │             
-
-Because in the expression's type:
-  { 'ok', 
-    Here the type is:     term()
-    Context expects type: atom()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'ok', term()} is not compatible with {atom(), atom()}
-  because
-  term() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/neg.erl:27:21
-   │
-27 │ concat1() -> [1] ++ 1.
-   │                     ^ 1.
-Expression has type:   number()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/neg.erl:30:25
-   │
-30 │ concat2(X, X) -> [1] ++ X.
-   │                         ^ X.
-Expression has type:   X
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/neg.erl:33:25
-   │
-33 │ concat3(X, X) -> [1] ++ X.
-   │                         ^ X.
-Expression has type:   X
-Context expected type: [term()]
-
-7 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/neg-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/neg.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/neg-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/neg.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/nowarn-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/nowarn-OTP-27.pretty
deleted file mode 100644
index 141f9e28db..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/nowarn-OTP-27.pretty
+++ /dev/null
@@ -1,21 +0,0 @@
-error: redundant_nowarn_function (See https://fb.me/eqwalizer_errors#redundant_nowarn_function)
-   ┌─ check/src/nowarn.erl:10:1
-   │
-10 │ -eqwalizer({nowarn_function, nowarn_redundant/0}).
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ redundant nowarn_function
-
-error: redundant_nowarn_function (See https://fb.me/eqwalizer_errors#redundant_nowarn_function)
-   ┌─ check/src/nowarn.erl:11:1
-   │
-11 │ -eqwalizer({nowarn_function, nowarn_nonexist/0}).
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ redundant nowarn_function
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/nowarn.erl:21:3
-   │
-21 │   ok.
-   │   ^^ 'ok'.
-Expression has type:   'ok'
-Context expected type: number()
-
-3 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/nowarn-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/nowarn-OTP-28.pretty
deleted file mode 100644
index 141f9e28db..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/nowarn-OTP-28.pretty
+++ /dev/null
@@ -1,21 +0,0 @@
-error: redundant_nowarn_function (See https://fb.me/eqwalizer_errors#redundant_nowarn_function)
-   ┌─ check/src/nowarn.erl:10:1
-   │
-10 │ -eqwalizer({nowarn_function, nowarn_redundant/0}).
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ redundant nowarn_function
-
-error: redundant_nowarn_function (See https://fb.me/eqwalizer_errors#redundant_nowarn_function)
-   ┌─ check/src/nowarn.erl:11:1
-   │
-11 │ -eqwalizer({nowarn_function, nowarn_nonexist/0}).
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ redundant nowarn_function
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/nowarn.erl:21:3
-   │
-21 │   ok.
-   │   ^^ 'ok'.
-Expression has type:   'ok'
-Context expected type: number()
-
-3 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/nowarn-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/nowarn.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/nowarn-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/nowarn.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/number_comparisons-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/number_comparisons-OTP-27.pretty
deleted file mode 100644
index cec080fa3e..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/number_comparisons-OTP-27.pretty
+++ /dev/null
@@ -1,17 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/number_comparisons.erl:11:30
-   │
-11 │ test_1_neg(X) when X >= 1 -> X.
-   │                              ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/number_comparisons.erl:253:3
-    │
-253 │   X.
-    │   ^ X.
-Expression has type:   number()
-Context expected type: none()
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/number_comparisons-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/number_comparisons-OTP-28.pretty
deleted file mode 100644
index cec080fa3e..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/number_comparisons-OTP-28.pretty
+++ /dev/null
@@ -1,17 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/number_comparisons.erl:11:30
-   │
-11 │ test_1_neg(X) when X >= 1 -> X.
-   │                              ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/number_comparisons.erl:253:3
-    │
-253 │   X.
-    │   ^ X.
-Expression has type:   number()
-Context expected type: none()
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/number_comparisons-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/number_comparisons.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/number_comparisons-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/number_comparisons.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/numbers-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/numbers-OTP-27.pretty
deleted file mode 100644
index 8760657fa4..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/numbers-OTP-27.pretty
+++ /dev/null
@@ -1,318 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:121:3
-    │
-121 │   A / 2.
-    │   ^ A.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:125:7
-    │
-125 │   2 / A.
-    │       ^ A.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:129:7
-    │
-129 │   2 * A.
-    │       ^ A.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:133:3
-    │
-133 │   A * 2.
-    │   ^ A.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:137:7
-    │
-137 │   X = A * 2,
-    │       ^ A.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:142:9
-    │
-142 │   2 div A.
-    │         ^ A.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:146:14
-    │
-146 │   X = (2 div A),
-    │              ^ A.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:151:3
-    │
-151 │   A div 2.
-    │   ^ A.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:155:7
-    │
-155 │   X = A div 2,
-    │       ^ A.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:160:3
-    │
-160 │   1 div 2.
-    │   ^^^^^^^ _ div _.
-Expression has type:   number()
-Context expected type: 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:182:3
-    │
-182 │   bnot 0.
-    │   ^^^^^^ bnot _.
-Expression has type:   number()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:350:5
-    │
-350 │   (+X).
-    │     ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:354:9
-    │
-354 │   _ = (+X),
-    │         ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:359:9
-    │
-359 │   _ = (-X),
-    │         ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:364:9
-    │
-364 │   _ = (-X),
-    │         ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:428:8
-    │
-428 │   bnot X.
-    │        ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:433:12
-    │
-433 │   _ = bnot X,
-    │            ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:491:3
-    │
-491 │   U * N.
-    │   ^
-    │   │
-    │   U.
-Expression has type:   'a' | number()
-Context expected type: number()
-    │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: 'a'
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  'a' | number() is not compatible with number()
-  because
-  'a' is not compatible with number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/numbers.erl:538:1
-    │  
-538 │ ╭ test_85(X) ->
-539 │ │   X div X.
-    │ ╰─────────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/numbers.erl:544:1
-    │  
-544 │ ╭ test_86(X) ->
-545 │ │   X * X.
-    │ ╰───────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:552:3
-    │
-552 │   U1 div U2 / (U2 bsl U1).
-    │   ^^ U1.
-Expression has type:   'a' | 'b'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:552:10
-    │
-552 │   U1 div U2 / (U2 bsl U1).
-    │          ^^ U2.
-Expression has type:   'c' | 'd'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:552:16
-    │
-552 │   U1 div U2 / (U2 bsl U1).
-    │                ^^ U2.
-Expression has type:   'c' | 'd'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:552:23
-    │
-552 │   U1 div U2 / (U2 bsl U1).
-    │                       ^^ U1.
-Expression has type:   'a' | 'b'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:559:3
-    │
-559 │   U1 * U2 / (U2 + U1).
-    │   ^^ U1.
-Expression has type:   'a' | 'b'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:559:8
-    │
-559 │   U1 * U2 / (U2 + U1).
-    │        ^^ U2.
-Expression has type:   'c' | 'd'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:559:14
-    │
-559 │   U1 * U2 / (U2 + U1).
-    │              ^^ U2.
-Expression has type:   'c' | 'd'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:559:19
-    │
-559 │   U1 * U2 / (U2 + U1).
-    │                   ^^ U1.
-Expression has type:   'a' | 'b'
-Context expected type: number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/numbers.erl:576:1
-    │  
-576 │ ╭ test_91_neg(X) ->
-577 │ │   -X.
-    │ ╰────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:577:3
-    │
-577 │   -X.
-    │   ^^ - _.
-Expression has type:   number()
-Context expected type: none()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/numbers.erl:582:1
-    │  
-582 │ ╭ test_92_neg(X) ->
-583 │ │   bnot X.
-    │ ╰────────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:583:3
-    │
-583 │   bnot X.
-    │   ^^^^^^ bnot _.
-Expression has type:   number()
-Context expected type: none()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/numbers.erl:588:1
-    │  
-588 │ ╭ test_93_neg(X) ->
-589 │ │   5 * X.
-    │ ╰───────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:589:3
-    │
-589 │   5 * X.
-    │   ^^^^^ _ * _.
-Expression has type:   number()
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:644:3
-    │    
-644 │ ╭ ╭   {
-645 │ │ │     1,
-646 │ │ │     0,
-647 │ │ │     -1,
-648 │ │ │     Int,
-649 │ │ │     error
-650 │ │ │   }.
-    │ ╰─│───^ {1, 0, - _, Int, 'error'}.
-Expression has type:   {number(), number(), number(), number(), 'error'}
-Context expected type: {number(), number(), number(), number(), 'ok'}
-    │   ╰───' 
-
-Because in the expression's type:
-  { number(), number(), number(), number(), 
-    Here the type is:     'error'
-    Context expects type: 'ok'
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 5:
-  {number(), number(), number(), number(), 'error'} is not compatible with {number(), number(), number(), number(), 'ok'}
-  because
-  'error' is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:658:3
-    │
-658 │   1.0.
-    │   ^^^ float_lit.
-Expression has type:   number()
-Context expected type: pid()
-
-36 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/numbers-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/numbers-OTP-28.pretty
deleted file mode 100644
index 8760657fa4..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/numbers-OTP-28.pretty
+++ /dev/null
@@ -1,318 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:121:3
-    │
-121 │   A / 2.
-    │   ^ A.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:125:7
-    │
-125 │   2 / A.
-    │       ^ A.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:129:7
-    │
-129 │   2 * A.
-    │       ^ A.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:133:3
-    │
-133 │   A * 2.
-    │   ^ A.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:137:7
-    │
-137 │   X = A * 2,
-    │       ^ A.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:142:9
-    │
-142 │   2 div A.
-    │         ^ A.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:146:14
-    │
-146 │   X = (2 div A),
-    │              ^ A.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:151:3
-    │
-151 │   A div 2.
-    │   ^ A.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:155:7
-    │
-155 │   X = A div 2,
-    │       ^ A.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:160:3
-    │
-160 │   1 div 2.
-    │   ^^^^^^^ _ div _.
-Expression has type:   number()
-Context expected type: 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:182:3
-    │
-182 │   bnot 0.
-    │   ^^^^^^ bnot _.
-Expression has type:   number()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:350:5
-    │
-350 │   (+X).
-    │     ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:354:9
-    │
-354 │   _ = (+X),
-    │         ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:359:9
-    │
-359 │   _ = (-X),
-    │         ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:364:9
-    │
-364 │   _ = (-X),
-    │         ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:428:8
-    │
-428 │   bnot X.
-    │        ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:433:12
-    │
-433 │   _ = bnot X,
-    │            ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:491:3
-    │
-491 │   U * N.
-    │   ^
-    │   │
-    │   U.
-Expression has type:   'a' | number()
-Context expected type: number()
-    │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: 'a'
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  'a' | number() is not compatible with number()
-  because
-  'a' is not compatible with number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/numbers.erl:538:1
-    │  
-538 │ ╭ test_85(X) ->
-539 │ │   X div X.
-    │ ╰─────────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/numbers.erl:544:1
-    │  
-544 │ ╭ test_86(X) ->
-545 │ │   X * X.
-    │ ╰───────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:552:3
-    │
-552 │   U1 div U2 / (U2 bsl U1).
-    │   ^^ U1.
-Expression has type:   'a' | 'b'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:552:10
-    │
-552 │   U1 div U2 / (U2 bsl U1).
-    │          ^^ U2.
-Expression has type:   'c' | 'd'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:552:16
-    │
-552 │   U1 div U2 / (U2 bsl U1).
-    │                ^^ U2.
-Expression has type:   'c' | 'd'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:552:23
-    │
-552 │   U1 div U2 / (U2 bsl U1).
-    │                       ^^ U1.
-Expression has type:   'a' | 'b'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:559:3
-    │
-559 │   U1 * U2 / (U2 + U1).
-    │   ^^ U1.
-Expression has type:   'a' | 'b'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:559:8
-    │
-559 │   U1 * U2 / (U2 + U1).
-    │        ^^ U2.
-Expression has type:   'c' | 'd'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:559:14
-    │
-559 │   U1 * U2 / (U2 + U1).
-    │              ^^ U2.
-Expression has type:   'c' | 'd'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:559:19
-    │
-559 │   U1 * U2 / (U2 + U1).
-    │                   ^^ U1.
-Expression has type:   'a' | 'b'
-Context expected type: number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/numbers.erl:576:1
-    │  
-576 │ ╭ test_91_neg(X) ->
-577 │ │   -X.
-    │ ╰────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:577:3
-    │
-577 │   -X.
-    │   ^^ - _.
-Expression has type:   number()
-Context expected type: none()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/numbers.erl:582:1
-    │  
-582 │ ╭ test_92_neg(X) ->
-583 │ │   bnot X.
-    │ ╰────────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:583:3
-    │
-583 │   bnot X.
-    │   ^^^^^^ bnot _.
-Expression has type:   number()
-Context expected type: none()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/numbers.erl:588:1
-    │  
-588 │ ╭ test_93_neg(X) ->
-589 │ │   5 * X.
-    │ ╰───────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:589:3
-    │
-589 │   5 * X.
-    │   ^^^^^ _ * _.
-Expression has type:   number()
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:644:3
-    │    
-644 │ ╭ ╭   {
-645 │ │ │     1,
-646 │ │ │     0,
-647 │ │ │     -1,
-648 │ │ │     Int,
-649 │ │ │     error
-650 │ │ │   }.
-    │ ╰─│───^ {1, 0, - _, Int, 'error'}.
-Expression has type:   {number(), number(), number(), number(), 'error'}
-Context expected type: {number(), number(), number(), number(), 'ok'}
-    │   ╰───' 
-
-Because in the expression's type:
-  { number(), number(), number(), number(), 
-    Here the type is:     'error'
-    Context expects type: 'ok'
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 5:
-  {number(), number(), number(), number(), 'error'} is not compatible with {number(), number(), number(), number(), 'ok'}
-  because
-  'error' is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/numbers.erl:658:3
-    │
-658 │   1.0.
-    │   ^^^ float_lit.
-Expression has type:   number()
-Context expected type: pid()
-
-36 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/numbers-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/numbers.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/numbers-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/numbers.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/opaque-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/opaque-OTP-27.pretty
deleted file mode 100644
index eea53f78f7..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/opaque-OTP-27.pretty
+++ /dev/null
@@ -1,179 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/opaque.erl:23:3
-   │
-23 │   X.
-   │   ^
-   │   │
-   │   X.
-Expression has type:   sets:set({'ok', 'error'})
-Context expected type: sets:set({'ok', 'ok'})
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #set{}
-  However the following candidate: #{{ok, error} => []}
-  Differs from the expected type:  #set{} | #{{ok, ok} => []}
-
------------------------------- Detailed message ------------------------------
-
-  sets:set({'ok', 'error'}) is not compatible with sets:set({'ok', 'ok'})
-  because
-  #set{} | #{{ok, error} => []} is not compatible with sets:set({'ok', 'ok'})
-  because
-  #set{} | #{{ok, error} => []} is not compatible with #set{} | #{{ok, ok} => []}
-  because
-  #{{ok, error} => []} is not compatible with #set{} | #{{ok, ok} => []}
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/opaque.erl:29:1
-   │
-29 │ test2_neg(X=#{a := b}) -> X.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/opaque.erl:57:11
-   │
-57 │           X2
-   │           ^^
-   │           │
-   │           X2.
-Expression has type:   misc:o()
-Context expected type: none()
-   │           
-
-Because in the expression's type:
-  Here the type is:     {'ok'}
-  Context expects type: none()
-
------------------------------- Detailed message ------------------------------
-
-  misc:o() is not compatible with none()
-  because
-  {'ok'} is not compatible with none()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/opaque.erl:86:1
-   │  
-86 │ ╭ test10({rec_w_opaque_field,
-87 │ │   {_, _}}
-88 │ │ ) -> ok.
-   │ ╰───────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/opaque.erl:95:6
-   │
-95 │ ) -> X.
-   │      ^ X.
-Expression has type:   'ok'
-Context expected type: {'ok'}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/opaque.erl:107:18
-    │
-107 │ test14_neg(X) -> X =:= {ok}.
-    │                  ^^^^^^^^^^ _ =:= _.
-Expression has type:   boolean()
-Context expected type: 'true'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/opaque.erl:125:18
-    │
-125 │ test18_neg(X) -> X.
-    │                  ^
-    │                  │
-    │                  X.
-Expression has type:   misc:o() | 'a'
-Context expected type: misc:o()
-    │                  
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: misc:o()
-  However the following candidate: 'a'
-  Differs from the expected type:  {'ok'}
-
------------------------------- Detailed message ------------------------------
-
-  misc:o() | 'a' is not compatible with misc:o()
-  because
-  misc:o() | 'a' is not compatible with {'ok'}
-  because
-  'a' is not compatible with {'ok'}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/opaque.erl:135:18
-    │
-135 │ test20_neg(X) -> X.
-    │                  ^
-    │                  │
-    │                  X.
-Expression has type:   misc:o() | 'a'
-Context expected type: misc:o()
-    │                  
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: misc:o()
-  However the following candidate: 'a'
-  Differs from the expected type:  {'ok'}
-
------------------------------- Detailed message ------------------------------
-
-  misc:o() | 'a' is not compatible with misc:o()
-  because
-  misc:o() | 'a' is not compatible with {'ok'}
-  because
-  'a' is not compatible with {'ok'}
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/opaque.erl:150:1
-    │
-150 │ -opaque o_cycle() :: misc:o_cycle().
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type o_cycle/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/opaque.erl:152:1
-    │  
-152 │ ╭ -spec use_o_cycle1(misc:o_cycle()) ->
-153 │ │   opaque:o_cycle().
-    │ ╰──────────────────^ use_o_cycle1/1 references types with invalid definitions: misc:o_cycle/0, o_cycle/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/opaque.erl:156:1
-    │  
-156 │ ╭ -spec use_o_cycle2(opaque:o_cycle()) ->
-157 │ │   misc:o_cycle().
-    │ ╰────────────────^ use_o_cycle2/1 references types with invalid definitions: misc:o_cycle/0, o_cycle/0
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/opaque.erl:236:1
-    │  
-236 │ ╭ test29_neg(X) when X =:= {1.0} ->
-237 │ │   ok.
-    │ ╰────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/opaque.erl:240:1
-    │  
-240 │ ╭ test30_neg(X) when X =:= "" ->
-241 │ │   ok.
-    │ ╰────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/opaque.erl:256:1
-    │  
-256 │ ╭ test34_neg(X) when X =:= <<>> ->
-257 │ │   ok.
-    │ ╰────^ Clause is not covered by spec
-
-error: unbound_type_var (See https://fb.me/eqwalizer_errors#unbound_type_var)
-    ┌─ check/src/opaque.erl:288:1
-    │
-288 │ -type invalid() :: _T.
-    │ ^^^^^^^^^^^^^^^^^^^^^ _T: Type variable is unbound.
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/opaque.erl:290:1
-    │
-290 │ -opaque o_trans_invalid() :: invalid().
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ o_trans_invalid/0 references type with invalid definition: invalid/0
-
-16 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/opaque-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/opaque-OTP-28.pretty
deleted file mode 100644
index eea53f78f7..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/opaque-OTP-28.pretty
+++ /dev/null
@@ -1,179 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/opaque.erl:23:3
-   │
-23 │   X.
-   │   ^
-   │   │
-   │   X.
-Expression has type:   sets:set({'ok', 'error'})
-Context expected type: sets:set({'ok', 'ok'})
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #set{}
-  However the following candidate: #{{ok, error} => []}
-  Differs from the expected type:  #set{} | #{{ok, ok} => []}
-
------------------------------- Detailed message ------------------------------
-
-  sets:set({'ok', 'error'}) is not compatible with sets:set({'ok', 'ok'})
-  because
-  #set{} | #{{ok, error} => []} is not compatible with sets:set({'ok', 'ok'})
-  because
-  #set{} | #{{ok, error} => []} is not compatible with #set{} | #{{ok, ok} => []}
-  because
-  #{{ok, error} => []} is not compatible with #set{} | #{{ok, ok} => []}
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/opaque.erl:29:1
-   │
-29 │ test2_neg(X=#{a := b}) -> X.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/opaque.erl:57:11
-   │
-57 │           X2
-   │           ^^
-   │           │
-   │           X2.
-Expression has type:   misc:o()
-Context expected type: none()
-   │           
-
-Because in the expression's type:
-  Here the type is:     {'ok'}
-  Context expects type: none()
-
------------------------------- Detailed message ------------------------------
-
-  misc:o() is not compatible with none()
-  because
-  {'ok'} is not compatible with none()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/opaque.erl:86:1
-   │  
-86 │ ╭ test10({rec_w_opaque_field,
-87 │ │   {_, _}}
-88 │ │ ) -> ok.
-   │ ╰───────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/opaque.erl:95:6
-   │
-95 │ ) -> X.
-   │      ^ X.
-Expression has type:   'ok'
-Context expected type: {'ok'}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/opaque.erl:107:18
-    │
-107 │ test14_neg(X) -> X =:= {ok}.
-    │                  ^^^^^^^^^^ _ =:= _.
-Expression has type:   boolean()
-Context expected type: 'true'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/opaque.erl:125:18
-    │
-125 │ test18_neg(X) -> X.
-    │                  ^
-    │                  │
-    │                  X.
-Expression has type:   misc:o() | 'a'
-Context expected type: misc:o()
-    │                  
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: misc:o()
-  However the following candidate: 'a'
-  Differs from the expected type:  {'ok'}
-
------------------------------- Detailed message ------------------------------
-
-  misc:o() | 'a' is not compatible with misc:o()
-  because
-  misc:o() | 'a' is not compatible with {'ok'}
-  because
-  'a' is not compatible with {'ok'}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/opaque.erl:135:18
-    │
-135 │ test20_neg(X) -> X.
-    │                  ^
-    │                  │
-    │                  X.
-Expression has type:   misc:o() | 'a'
-Context expected type: misc:o()
-    │                  
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: misc:o()
-  However the following candidate: 'a'
-  Differs from the expected type:  {'ok'}
-
------------------------------- Detailed message ------------------------------
-
-  misc:o() | 'a' is not compatible with misc:o()
-  because
-  misc:o() | 'a' is not compatible with {'ok'}
-  because
-  'a' is not compatible with {'ok'}
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/opaque.erl:150:1
-    │
-150 │ -opaque o_cycle() :: misc:o_cycle().
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type o_cycle/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/opaque.erl:152:1
-    │  
-152 │ ╭ -spec use_o_cycle1(misc:o_cycle()) ->
-153 │ │   opaque:o_cycle().
-    │ ╰──────────────────^ use_o_cycle1/1 references types with invalid definitions: misc:o_cycle/0, o_cycle/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/opaque.erl:156:1
-    │  
-156 │ ╭ -spec use_o_cycle2(opaque:o_cycle()) ->
-157 │ │   misc:o_cycle().
-    │ ╰────────────────^ use_o_cycle2/1 references types with invalid definitions: misc:o_cycle/0, o_cycle/0
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/opaque.erl:236:1
-    │  
-236 │ ╭ test29_neg(X) when X =:= {1.0} ->
-237 │ │   ok.
-    │ ╰────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/opaque.erl:240:1
-    │  
-240 │ ╭ test30_neg(X) when X =:= "" ->
-241 │ │   ok.
-    │ ╰────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/opaque.erl:256:1
-    │  
-256 │ ╭ test34_neg(X) when X =:= <<>> ->
-257 │ │   ok.
-    │ ╰────^ Clause is not covered by spec
-
-error: unbound_type_var (See https://fb.me/eqwalizer_errors#unbound_type_var)
-    ┌─ check/src/opaque.erl:288:1
-    │
-288 │ -type invalid() :: _T.
-    │ ^^^^^^^^^^^^^^^^^^^^^ _T: Type variable is unbound.
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/opaque.erl:290:1
-    │
-290 │ -opaque o_trans_invalid() :: invalid().
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ o_trans_invalid/0 references type with invalid definition: invalid/0
-
-16 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/opaque-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/opaque.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/opaque-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/opaque.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-27.pretty
deleted file mode 100644
index b75aabcf84..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-27.pretty
+++ /dev/null
@@ -1,28 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/other.erl:46:27
-   │
-46 │ any_as_metadata_neg(M) -> M.
-   │                           ^
-   │                           │
-   │                           M.
-Expression has type:   term()
-Context expected type: logger:metadata()
-   │                           
-
-Because in the expression's type:
-  Here the type is:     term()
-  Context expects type: #{...}
-
------------------------------- Detailed message ------------------------------
-
-  term() is not compatible with logger:metadata()
-  because
-  term() is not compatible with #{domain => [atom()], file => file:filename(), gl => pid(), line => number(), mfa => {atom(), atom(), number()}, pid => pid(), report_cb => logger:report_cb(), time => logger:timestamp(), atom() => term()}
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/other.erl:59:27
-   │
-59 │     eqwalizer:reveal_type(X),
-   │                           ^ number()
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-28.pretty
deleted file mode 100644
index b75aabcf84..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-28.pretty
+++ /dev/null
@@ -1,28 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/other.erl:46:27
-   │
-46 │ any_as_metadata_neg(M) -> M.
-   │                           ^
-   │                           │
-   │                           M.
-Expression has type:   term()
-Context expected type: logger:metadata()
-   │                           
-
-Because in the expression's type:
-  Here the type is:     term()
-  Context expects type: #{...}
-
------------------------------- Detailed message ------------------------------
-
-  term() is not compatible with logger:metadata()
-  because
-  term() is not compatible with #{domain => [atom()], file => file:filename(), gl => pid(), line => number(), mfa => {atom(), atom(), number()}, pid => pid(), report_cb => logger:report_cb(), time => logger:timestamp(), atom() => term()}
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/other.erl:59:27
-   │
-59 │     eqwalizer:reveal_type(X),
-   │                           ^ number()
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/other.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/other-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/other.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/otp28-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/otp28-OTP-27.pretty
deleted file mode 100644
index 026d55c435..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/otp28-OTP-27.pretty
+++ /dev/null
@@ -1,159 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/otp28.erl:16:21
-   │
-16 │ mk_nominal_neg() -> warning.
-   │                     ^^^^^^^
-   │                     │
-   │                     'warning'.
-Expression has type:   'warning'
-Context expected type: foo()
-   │                     
-
-Because in the expression's type:
-  Here the type is:     'warning'
-  Context expects type: 'ok' | 'error'
-  No candidate matches in the expected union.
-
------------------------------- Detailed message ------------------------------
-
-  'warning' is not compatible with foo()
-  because
-  'warning' is not compatible with 'ok' | 'error'
-  because
-  'warning' is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/otp28.erl:28:5
-   │
-28 │     [N || {_, N} <:- L].
-   │     ^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     [ || ].
-Expression has type:   [number()]
-Context expected type: [atom()]
-   │     
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/otp28.erl:40:5
-   │
-40 │     [Bin || _ := {error, Bin} <:- L].
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     [ || ].
-Expression has type:   [binary()]
-Context expected type: [pid()]
-   │     
-
-Because in the expression's type:
-  [
-    Here the type is:     binary()
-    Context expects type: pid()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [binary()] is not compatible with [pid()]
-  because
-  binary() is not compatible with pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/otp28.erl:52:5
-   │
-52 │     #{K => Bin || {K, {ok, Bin}} <:- L}.
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ #{ || }.
-Expression has type:   #{atom() => binary()}
-Context expected type: [#{atom() => pid()}]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/otp28.erl:60:5
-   │
-60 │     [{A, B} || A <- As && B <- Bs].
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     [ || ].
-Expression has type:   [{atom(), binary()}]
-Context expected type: [{atom(), atom()}]
-   │     
-
-Because in the expression's type:
-  [
-    { atom(), 
-      Here the type is:     binary()
-      Context expects type: atom()
-    }
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [{atom(), binary()}] is not compatible with [{atom(), atom()}]
-  because
-  at tuple index 2:
-  {atom(), binary()} is not compatible with {atom(), atom()}
-  because
-  binary() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/otp28.erl:68:5
-   │
-68 │     #{A => B || A <- As && B <- Bs}.
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     #{ || }.
-Expression has type:   #{atom() => binary()}
-Context expected type: #{atom() => atom()}
-   │     
-
-Because in the expression's type:
-  #{ atom() =>
-    Here the type is:     binary()
-    Context expects type: atom()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{atom() => binary()} is not compatible with #{atom() => atom()}
-  the default associations are not compatible
-  because
-  binary() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/otp28.erl:76:5
-   │
-76 │     [{A, B, V, K} || A <- As && B <- Bs && K := V <- M].
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     [ || ].
-Expression has type:   [{atom(), binary(), binary(), atom()}]
-Context expected type: [{atom(), binary(), atom(), binary()}]
-   │     
-
-Because in the expression's type:
-  [
-    { atom(), binary(), 
-      Here the type is:     binary()
-      Context expects type: atom()
-    , atom()}
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [{atom(), binary(), binary(), atom()}] is not compatible with [{atom(), binary(), atom(), binary()}]
-  because
-  at tuple index 3:
-  {atom(), binary(), binary(), atom()} is not compatible with {atom(), binary(), atom(), binary()}
-  because
-  binary() is not compatible with atom()
-
-7 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/otp28-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/otp28-OTP-28.pretty
deleted file mode 100644
index 026d55c435..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/otp28-OTP-28.pretty
+++ /dev/null
@@ -1,159 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/otp28.erl:16:21
-   │
-16 │ mk_nominal_neg() -> warning.
-   │                     ^^^^^^^
-   │                     │
-   │                     'warning'.
-Expression has type:   'warning'
-Context expected type: foo()
-   │                     
-
-Because in the expression's type:
-  Here the type is:     'warning'
-  Context expects type: 'ok' | 'error'
-  No candidate matches in the expected union.
-
------------------------------- Detailed message ------------------------------
-
-  'warning' is not compatible with foo()
-  because
-  'warning' is not compatible with 'ok' | 'error'
-  because
-  'warning' is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/otp28.erl:28:5
-   │
-28 │     [N || {_, N} <:- L].
-   │     ^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     [ || ].
-Expression has type:   [number()]
-Context expected type: [atom()]
-   │     
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/otp28.erl:40:5
-   │
-40 │     [Bin || _ := {error, Bin} <:- L].
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     [ || ].
-Expression has type:   [binary()]
-Context expected type: [pid()]
-   │     
-
-Because in the expression's type:
-  [
-    Here the type is:     binary()
-    Context expects type: pid()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [binary()] is not compatible with [pid()]
-  because
-  binary() is not compatible with pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/otp28.erl:52:5
-   │
-52 │     #{K => Bin || {K, {ok, Bin}} <:- L}.
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ #{ || }.
-Expression has type:   #{atom() => binary()}
-Context expected type: [#{atom() => pid()}]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/otp28.erl:60:5
-   │
-60 │     [{A, B} || A <- As && B <- Bs].
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     [ || ].
-Expression has type:   [{atom(), binary()}]
-Context expected type: [{atom(), atom()}]
-   │     
-
-Because in the expression's type:
-  [
-    { atom(), 
-      Here the type is:     binary()
-      Context expects type: atom()
-    }
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [{atom(), binary()}] is not compatible with [{atom(), atom()}]
-  because
-  at tuple index 2:
-  {atom(), binary()} is not compatible with {atom(), atom()}
-  because
-  binary() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/otp28.erl:68:5
-   │
-68 │     #{A => B || A <- As && B <- Bs}.
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     #{ || }.
-Expression has type:   #{atom() => binary()}
-Context expected type: #{atom() => atom()}
-   │     
-
-Because in the expression's type:
-  #{ atom() =>
-    Here the type is:     binary()
-    Context expects type: atom()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{atom() => binary()} is not compatible with #{atom() => atom()}
-  the default associations are not compatible
-  because
-  binary() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/otp28.erl:76:5
-   │
-76 │     [{A, B, V, K} || A <- As && B <- Bs && K := V <- M].
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     [ || ].
-Expression has type:   [{atom(), binary(), binary(), atom()}]
-Context expected type: [{atom(), binary(), atom(), binary()}]
-   │     
-
-Because in the expression's type:
-  [
-    { atom(), binary(), 
-      Here the type is:     binary()
-      Context expects type: atom()
-    , atom()}
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [{atom(), binary(), binary(), atom()}] is not compatible with [{atom(), binary(), atom(), binary()}]
-  because
-  at tuple index 3:
-  {atom(), binary(), binary(), atom()} is not compatible with {atom(), binary(), atom(), binary()}
-  because
-  binary() is not compatible with atom()
-
-7 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/otp28-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/otp28.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/otp28-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/otp28.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/otp_opaques-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/otp_opaques-OTP-27.pretty
deleted file mode 100644
index b41039f95b..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/otp_opaques-OTP-27.pretty
+++ /dev/null
@@ -1,126 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/otp_opaques.erl:18:5
-   │
-18 │     gb_sets:from_list(Atoms).
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     gb_sets:from_list(Atoms).
-Expression has type:   gb_sets:set(atom())
-Context expected type: gb_sets:set(number())
-   │     
-
-Because in the expression's type:
-  { number(), 
-    { 
-      Here the type is:     atom()
-      Context expects type: number()
-    , term(), term()}
-  }
-
------------------------------- Detailed message ------------------------------
-
-  gb_sets:set(atom()) is not compatible with gb_sets:set(number())
-  because
-  {number(), gb_sets:gb_set_node(atom())} is not compatible with gb_sets:set(number())
-  because
-  at tuple index 2:
-  {number(), gb_sets:gb_set_node(atom())} is not compatible with {number(), gb_sets:gb_set_node(number())}
-  because
-  gb_sets:gb_set_node(atom()) is not compatible with gb_sets:gb_set_node(number())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/otp_opaques.erl:42:5
-   │
-42 │     List.
-   │     ^^^^
-   │     │
-   │     List.
-Expression has type:   [[A]]
-Context expected type: [A]
-   │     
-
-Because in the expression's type:
-  [
-    Here the type is:     [A]
-    Context expects type: A
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [[A]] is not compatible with [A]
-  because
-  [A] is not compatible with A
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/otp_opaques.erl:99:17
-   │
-99 │ test3_neg(X) -> X.
-   │                 ^
-   │                 │
-   │                 X.
-Expression has type:   maps:iterator('k', 'v')
-Context expected type: sets:set('a')
-   │                 
-
-Because in the expression's type:
-  Here the type is:     tuple()/3 | 'none' | [...] | [...]
-  Context expects type: #set{} | #{a => []}
-  No candidate of the expression's type matches the expected type.
-
------------------------------- Detailed message ------------------------------
-
-  maps:iterator('k', 'v') is not compatible with sets:set('a')
-  because
-  {'k', 'v', maps:iterator('k', 'v')} | 'none' | [number()] | [['k']] is not compatible with sets:set('a')
-  because
-  {'k', 'v', maps:iterator('k', 'v')} | 'none' | [number()] | [['k']] is not compatible with #set{} | #{a => []}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/otp_opaques.erl:102:13
-    │
-102 │ ts(X, X) -> X.
-    │             ^ X.
-Expression has type:   #set{} | #{a => []}
-Context expected type: T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/otp_opaques.erl:107:11
-    │
-107 │     ts(X, X),
-    │           ^
-    │           │
-    │           X.
-Expression has type:   maps:iterator('k', 'v')
-Context expected type: sets:set('a')
-    │           
-
-Because in the expression's type:
-  Here the type is:     tuple()/3 | 'none' | [...] | [...]
-  Context expects type: #set{} | #{a => []}
-  No candidate of the expression's type matches the expected type.
-
------------------------------- Detailed message ------------------------------
-
-  maps:iterator('k', 'v') is not compatible with sets:set('a')
-  because
-  {'k', 'v', maps:iterator('k', 'v')} | 'none' | [number()] | [['k']] is not compatible with sets:set('a')
-  because
-  {'k', 'v', maps:iterator('k', 'v')} | 'none' | [number()] | [['k']] is not compatible with #set{} | #{a => []}
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ check/src/otp_opaques.erl:124:5
-    │
-124 │     X().
-    │     ^ X.
-Expected fun type with arity 0
-Got: maps:iterator('k', 'v') | sets:set('a')
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ check/src/otp_opaques.erl:130:5
-    │
-130 │     X().
-    │     ^ X.
-Expected fun type with arity 0
-Got: sets:set('a')
-
-7 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/otp_opaques-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/otp_opaques-OTP-28.pretty
deleted file mode 100644
index b41039f95b..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/otp_opaques-OTP-28.pretty
+++ /dev/null
@@ -1,126 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/otp_opaques.erl:18:5
-   │
-18 │     gb_sets:from_list(Atoms).
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     gb_sets:from_list(Atoms).
-Expression has type:   gb_sets:set(atom())
-Context expected type: gb_sets:set(number())
-   │     
-
-Because in the expression's type:
-  { number(), 
-    { 
-      Here the type is:     atom()
-      Context expects type: number()
-    , term(), term()}
-  }
-
------------------------------- Detailed message ------------------------------
-
-  gb_sets:set(atom()) is not compatible with gb_sets:set(number())
-  because
-  {number(), gb_sets:gb_set_node(atom())} is not compatible with gb_sets:set(number())
-  because
-  at tuple index 2:
-  {number(), gb_sets:gb_set_node(atom())} is not compatible with {number(), gb_sets:gb_set_node(number())}
-  because
-  gb_sets:gb_set_node(atom()) is not compatible with gb_sets:gb_set_node(number())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/otp_opaques.erl:42:5
-   │
-42 │     List.
-   │     ^^^^
-   │     │
-   │     List.
-Expression has type:   [[A]]
-Context expected type: [A]
-   │     
-
-Because in the expression's type:
-  [
-    Here the type is:     [A]
-    Context expects type: A
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [[A]] is not compatible with [A]
-  because
-  [A] is not compatible with A
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/otp_opaques.erl:99:17
-   │
-99 │ test3_neg(X) -> X.
-   │                 ^
-   │                 │
-   │                 X.
-Expression has type:   maps:iterator('k', 'v')
-Context expected type: sets:set('a')
-   │                 
-
-Because in the expression's type:
-  Here the type is:     tuple()/3 | 'none' | [...] | [...]
-  Context expects type: #set{} | #{a => []}
-  No candidate of the expression's type matches the expected type.
-
------------------------------- Detailed message ------------------------------
-
-  maps:iterator('k', 'v') is not compatible with sets:set('a')
-  because
-  {'k', 'v', maps:iterator('k', 'v')} | 'none' | [number()] | [['k']] is not compatible with sets:set('a')
-  because
-  {'k', 'v', maps:iterator('k', 'v')} | 'none' | [number()] | [['k']] is not compatible with #set{} | #{a => []}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/otp_opaques.erl:102:13
-    │
-102 │ ts(X, X) -> X.
-    │             ^ X.
-Expression has type:   #set{} | #{a => []}
-Context expected type: T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/otp_opaques.erl:107:11
-    │
-107 │     ts(X, X),
-    │           ^
-    │           │
-    │           X.
-Expression has type:   maps:iterator('k', 'v')
-Context expected type: sets:set('a')
-    │           
-
-Because in the expression's type:
-  Here the type is:     tuple()/3 | 'none' | [...] | [...]
-  Context expects type: #set{} | #{a => []}
-  No candidate of the expression's type matches the expected type.
-
------------------------------- Detailed message ------------------------------
-
-  maps:iterator('k', 'v') is not compatible with sets:set('a')
-  because
-  {'k', 'v', maps:iterator('k', 'v')} | 'none' | [number()] | [['k']] is not compatible with sets:set('a')
-  because
-  {'k', 'v', maps:iterator('k', 'v')} | 'none' | [number()] | [['k']] is not compatible with #set{} | #{a => []}
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ check/src/otp_opaques.erl:124:5
-    │
-124 │     X().
-    │     ^ X.
-Expected fun type with arity 0
-Got: maps:iterator('k', 'v') | sets:set('a')
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ check/src/otp_opaques.erl:130:5
-    │
-130 │     X().
-    │     ^ X.
-Expected fun type with arity 0
-Got: sets:set('a')
-
-7 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/otp_opaques-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/otp_opaques.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/otp_opaques-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/otp_opaques.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded-OTP-27.pretty
deleted file mode 100644
index 117ed8b349..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded-OTP-27.pretty
+++ /dev/null
@@ -1,160 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/overloaded.erl:29:5
-   │
-29 │     B.
-   │     ^ B.
-Expression has type:   binary()
-Context expected type: atom()
-
-error: ambiguous_lambda (See https://fb.me/eqwalizer_errors#ambiguous_lambda)
-    ┌─ check/src/overloaded.erl:102:15
-    │
-102 │     Res = bar(fun(a) -> a end),
-    │               ^^^^^^^^^^^^^^^ fun.
-Functional expression can match multiple types in fun(('a') -> 'b') | fun(('a') -> 'c')
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:117:15
-    │
-117 │     Res = bar(F),
-    │               ^
-    │               │
-    │               F.
-Expression has type:   fun(('a') -> 'z')
-Context expected type: fun(('a') -> 'b') | fun(('a') -> 'c')
-    │               
-
-Because in the expression's type:
-  fun(('a') ->
-    Here the type is:     'z'
-    Context expects type: 'b'
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun(('a') -> 'z') is not compatible with fun(('a') -> 'b') | fun(('a') -> 'c')
-  because
-  fun(('a') -> 'z') is not compatible with fun(('a') -> 'b')
-  because
-  'z' is not compatible with 'b'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:126:15
-    │
-126 │     Res = bar({fun(a) -> a end}),
-    │               ^^^^^^^^^^^^^^^^^
-    │               │
-    │               {fun}.
-Expression has type:   {fun((dynamic()) -> dynamic())}
-Context expected type: fun(('a') -> 'b') | fun(('a') -> 'c')
-    │               
-
-expected union does not contain any tuple type of size 1
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:198:37
-    │
-198 │ overlap_neg_1(X) when is_atom(X) -> 1;
-    │                                     ^ 1.
-Expression has type:   number()
-Context expected type: {T}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:203:37
-    │
-203 │ overlap_neg_2(X) when is_atom(X) -> 1;
-    │                                     ^ 1.
-Expression has type:   number()
-Context expected type: {T}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:204:22
-    │
-204 │ overlap_neg_2(_X) -> 1.
-    │                      ^ 1.
-Expression has type:   number()
-Context expected type: {T}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:246:23
-    │
-246 │ take_ok_or_any(ok) -> ok;
-    │                       ^^ 'ok'.
-Expression has type:   'ok'
-Context expected type: 'error'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:247:22
-    │
-247 │ take_ok_or_any(_) -> error.
-    │                      ^^^^^ 'error'.
-Expression has type:   'error'
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:259:21
-    │
-259 │ use_over(X) -> over(X).
-    │                     ^
-    │                     │
-    │                     X.
-Expression has type:   number() | {}
-Context expected type: number()
-    │                     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: {}
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | {} is not compatible with number()
-  because
-  {} is not compatible with number()
-
-error: unbound_type_var (See https://fb.me/eqwalizer_errors#unbound_type_var)
-    ┌─ check/src/overloaded.erl:261:1
-    │
-261 │ -type invalid() :: _T.
-    │ ^^^^^^^^^^^^^^^^^^^^^ _T: Type variable is unbound.
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/overloaded.erl:263:1
-    │  
-263 │ ╭ -spec use_invalid_neg(a) -> a;
-264 │ │                  (err) -> invalid().
-    │ ╰─────────────────────────────────^ use_invalid_neg/1 references type with invalid definition: invalid/0
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:269:14
-    │
-269 │     _ = swap(""),
-    │              ^^
-    │              │
-    │              string_lit.
-Expression has type:   []
-Context expected type: atom() | binary()
-    │              
-
-  [] is not compatible with atom() | binary()
-  because
-  [] is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:290:5
-    │
-290 │     swap(ok).
-    │     ^^^^^^^^ swap('ok').
-Expression has type:   binary()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:308:19
-    │
-308 │ reachable_3(_) -> b.
-    │                   ^ 'b'.
-Expression has type:   'b'
-Context expected type: 'a'
-
-15 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded-OTP-28.pretty
deleted file mode 100644
index 117ed8b349..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded-OTP-28.pretty
+++ /dev/null
@@ -1,160 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/overloaded.erl:29:5
-   │
-29 │     B.
-   │     ^ B.
-Expression has type:   binary()
-Context expected type: atom()
-
-error: ambiguous_lambda (See https://fb.me/eqwalizer_errors#ambiguous_lambda)
-    ┌─ check/src/overloaded.erl:102:15
-    │
-102 │     Res = bar(fun(a) -> a end),
-    │               ^^^^^^^^^^^^^^^ fun.
-Functional expression can match multiple types in fun(('a') -> 'b') | fun(('a') -> 'c')
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:117:15
-    │
-117 │     Res = bar(F),
-    │               ^
-    │               │
-    │               F.
-Expression has type:   fun(('a') -> 'z')
-Context expected type: fun(('a') -> 'b') | fun(('a') -> 'c')
-    │               
-
-Because in the expression's type:
-  fun(('a') ->
-    Here the type is:     'z'
-    Context expects type: 'b'
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun(('a') -> 'z') is not compatible with fun(('a') -> 'b') | fun(('a') -> 'c')
-  because
-  fun(('a') -> 'z') is not compatible with fun(('a') -> 'b')
-  because
-  'z' is not compatible with 'b'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:126:15
-    │
-126 │     Res = bar({fun(a) -> a end}),
-    │               ^^^^^^^^^^^^^^^^^
-    │               │
-    │               {fun}.
-Expression has type:   {fun((dynamic()) -> dynamic())}
-Context expected type: fun(('a') -> 'b') | fun(('a') -> 'c')
-    │               
-
-expected union does not contain any tuple type of size 1
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:198:37
-    │
-198 │ overlap_neg_1(X) when is_atom(X) -> 1;
-    │                                     ^ 1.
-Expression has type:   number()
-Context expected type: {T}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:203:37
-    │
-203 │ overlap_neg_2(X) when is_atom(X) -> 1;
-    │                                     ^ 1.
-Expression has type:   number()
-Context expected type: {T}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:204:22
-    │
-204 │ overlap_neg_2(_X) -> 1.
-    │                      ^ 1.
-Expression has type:   number()
-Context expected type: {T}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:246:23
-    │
-246 │ take_ok_or_any(ok) -> ok;
-    │                       ^^ 'ok'.
-Expression has type:   'ok'
-Context expected type: 'error'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:247:22
-    │
-247 │ take_ok_or_any(_) -> error.
-    │                      ^^^^^ 'error'.
-Expression has type:   'error'
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:259:21
-    │
-259 │ use_over(X) -> over(X).
-    │                     ^
-    │                     │
-    │                     X.
-Expression has type:   number() | {}
-Context expected type: number()
-    │                     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: {}
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | {} is not compatible with number()
-  because
-  {} is not compatible with number()
-
-error: unbound_type_var (See https://fb.me/eqwalizer_errors#unbound_type_var)
-    ┌─ check/src/overloaded.erl:261:1
-    │
-261 │ -type invalid() :: _T.
-    │ ^^^^^^^^^^^^^^^^^^^^^ _T: Type variable is unbound.
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/overloaded.erl:263:1
-    │  
-263 │ ╭ -spec use_invalid_neg(a) -> a;
-264 │ │                  (err) -> invalid().
-    │ ╰─────────────────────────────────^ use_invalid_neg/1 references type with invalid definition: invalid/0
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:269:14
-    │
-269 │     _ = swap(""),
-    │              ^^
-    │              │
-    │              string_lit.
-Expression has type:   []
-Context expected type: atom() | binary()
-    │              
-
-  [] is not compatible with atom() | binary()
-  because
-  [] is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:290:5
-    │
-290 │     swap(ok).
-    │     ^^^^^^^^ swap('ok').
-Expression has type:   binary()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/overloaded.erl:308:19
-    │
-308 │ reachable_3(_) -> b.
-    │                   ^ 'b'.
-Expression has type:   'b'
-Context expected type: 'a'
-
-15 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/overloaded-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/overloaded.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded_specs_union-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded_specs_union-OTP-27.pretty
deleted file mode 100644
index 3483635724..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded_specs_union-OTP-27.pretty
+++ /dev/null
@@ -1,47 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/overloaded_specs_union.erl:16:29
-   │
-16 │ use_over_neg_1(Arg) -> over(Arg).
-   │                             ^^^
-   │                             │
-   │                             Arg.
-Expression has type:   atom() | pid()
-Context expected type: atom()
-   │                             
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: pid()
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  atom() | pid() is not compatible with atom()
-  because
-  pid() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/overloaded_specs_union.erl:19:29
-   │
-19 │ use_over_neg_2(Arg) -> over(Arg).
-   │                             ^^^
-   │                             │
-   │                             Arg.
-Expression has type:   atom() | binary() | pid()
-Context expected type: atom() | binary()
-   │                             
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom() | binary()
-  However the following candidate: pid()
-  Differs from the expected type:  atom() | binary()
-
------------------------------- Detailed message ------------------------------
-
-  atom() | binary() | pid() is not compatible with atom() | binary()
-  because
-  pid() is not compatible with atom() | binary()
-  because
-  pid() is not compatible with atom()
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded_specs_union-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded_specs_union-OTP-28.pretty
deleted file mode 100644
index 3483635724..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded_specs_union-OTP-28.pretty
+++ /dev/null
@@ -1,47 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/overloaded_specs_union.erl:16:29
-   │
-16 │ use_over_neg_1(Arg) -> over(Arg).
-   │                             ^^^
-   │                             │
-   │                             Arg.
-Expression has type:   atom() | pid()
-Context expected type: atom()
-   │                             
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: pid()
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  atom() | pid() is not compatible with atom()
-  because
-  pid() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/overloaded_specs_union.erl:19:29
-   │
-19 │ use_over_neg_2(Arg) -> over(Arg).
-   │                             ^^^
-   │                             │
-   │                             Arg.
-Expression has type:   atom() | binary() | pid()
-Context expected type: atom() | binary()
-   │                             
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom() | binary()
-  However the following candidate: pid()
-  Differs from the expected type:  atom() | binary()
-
------------------------------- Detailed message ------------------------------
-
-  atom() | binary() | pid() is not compatible with atom() | binary()
-  because
-  pid() is not compatible with atom() | binary()
-  because
-  pid() is not compatible with atom()
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded_specs_union-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded_specs_union.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/overloaded_specs_union-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/overloaded_specs_union.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/parametricity-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/parametricity-OTP-27.pretty
deleted file mode 100644
index 371fb3af3c..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/parametricity-OTP-27.pretty
+++ /dev/null
@@ -1,57 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/parametricity.erl:178:19
-    │
-178 │ refine01(X, X) -> X.
-    │                   ^ X.
-Expression has type:   _B
-Context expected type: A
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/parametricity.erl:186:22
-    │
-186 │     [Elem || Elem <- X].
-    │                      ^ X.
-Expression has type:   B
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/parametricity.erl:218:3
-    │
-218 │   select(T, <<>>, 0).
-    │   ^^^^^^^^^^^^^^^^^^ select(T, <<..>>, 0).
-Expression has type:   binary()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/parametricity.erl:218:3
-    │
-218 │   select(T, <<>>, 0).
-    │   ^^^^^^^^^^^^^^^^^^ select(T, <<..>>, 0).
-Expression has type:   number()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/parametricity.erl:224:3
-    │
-224 │   select(T, 0, 0).
-    │   ^^^^^^^^^^^^^^^ select(T, 0, 0).
-Expression has type:   number()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/parametricity.erl:229:31
-    │
-229 │ unwrap(undefined, Default) -> Default;
-    │                               ^^^^^^^ Default.
-Expression has type:   term()
-Context expected type: Value
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/parametricity.erl:241:22
-    │
-241 │             (A) -> F(A)
-    │                      ^ A.
-Expression has type:   term()
-Context expected type: A
-
-7 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/parametricity-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/parametricity-OTP-28.pretty
deleted file mode 100644
index 371fb3af3c..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/parametricity-OTP-28.pretty
+++ /dev/null
@@ -1,57 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/parametricity.erl:178:19
-    │
-178 │ refine01(X, X) -> X.
-    │                   ^ X.
-Expression has type:   _B
-Context expected type: A
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/parametricity.erl:186:22
-    │
-186 │     [Elem || Elem <- X].
-    │                      ^ X.
-Expression has type:   B
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/parametricity.erl:218:3
-    │
-218 │   select(T, <<>>, 0).
-    │   ^^^^^^^^^^^^^^^^^^ select(T, <<..>>, 0).
-Expression has type:   binary()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/parametricity.erl:218:3
-    │
-218 │   select(T, <<>>, 0).
-    │   ^^^^^^^^^^^^^^^^^^ select(T, <<..>>, 0).
-Expression has type:   number()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/parametricity.erl:224:3
-    │
-224 │   select(T, 0, 0).
-    │   ^^^^^^^^^^^^^^^ select(T, 0, 0).
-Expression has type:   number()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/parametricity.erl:229:31
-    │
-229 │ unwrap(undefined, Default) -> Default;
-    │                               ^^^^^^^ Default.
-Expression has type:   term()
-Context expected type: Value
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/parametricity.erl:241:22
-    │
-241 │             (A) -> F(A)
-    │                      ^ A.
-Expression has type:   term()
-Context expected type: A
-
-7 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/parametricity-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/parametricity.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/parametricity-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/parametricity.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-27.pretty
deleted file mode 100644
index d0d4f19c1a..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-27.pretty
+++ /dev/null
@@ -1,23 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/pats.erl:26:17
-   │
-26 │     maps:get(a, M).
-   │                 ^
-   │                 │
-   │                 M.
-Expression has type:   #{a => 'ok'} | 'error'
-Context expected type: #{term() => term()}
-   │                 
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #{a => 'ok'}
-  However the following candidate: 'error'
-  Differs from the expected type:  #{term() => term()}
-
------------------------------- Detailed message ------------------------------
-
-  #{a => 'ok'} | 'error' is not compatible with #{term() => term()}
-  because
-  'error' is not compatible with #{term() => term()}
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-28.pretty
deleted file mode 100644
index d0d4f19c1a..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-28.pretty
+++ /dev/null
@@ -1,23 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/pats.erl:26:17
-   │
-26 │     maps:get(a, M).
-   │                 ^
-   │                 │
-   │                 M.
-Expression has type:   #{a => 'ok'} | 'error'
-Context expected type: #{term() => term()}
-   │                 
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #{a => 'ok'}
-  However the following candidate: 'error'
-  Differs from the expected type:  #{term() => term()}
-
------------------------------- Detailed message ------------------------------
-
-  #{a => 'ok'} | 'error' is not compatible with #{term() => term()}
-  because
-  'error' is not compatible with #{term() => term()}
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/pats.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/pats-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/pats.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/pinned-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/pinned-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/pinned-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/pinned-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/pinned-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/pinned-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/pinned-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/pinned-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/pinned-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_callbacks_2-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/pinned.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_callbacks_2-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/pinned.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/pos-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/pos-OTP-27.pretty
deleted file mode 100644
index 4b7dcf8b26..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/pos-OTP-27.pretty
+++ /dev/null
@@ -1,8 +0,0 @@
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/pos.erl:15:1
-   │  
-15 │ ╭ atom_pat(1) ->
-16 │ │     ok.
-   │ ╰──────^ Clause is not covered by spec
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/pos-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/pos-OTP-28.pretty
deleted file mode 100644
index 4b7dcf8b26..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/pos-OTP-28.pretty
+++ /dev/null
@@ -1,8 +0,0 @@
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/pos.erl:15:1
-   │  
-15 │ ╭ atom_pat(1) ->
-16 │ │     ok.
-   │ ╰──────^ Clause is not covered by spec
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/pos-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/pos.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/pos-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/pos.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-27.pretty
deleted file mode 100644
index ee4761b7d0..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-27.pretty
+++ /dev/null
@@ -1,628 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/records.erl:30:18
-   │
-30 │ mk_rec1_neg() -> #rec2{}.
-   │                  ^^^^^^^ #rec2{...}.
-Expression has type:   #rec2{}
-Context expected type: #rec1{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/records.erl:40:5
-   │
-40 │     R.
-   │     ^ R.
-Expression has type:   #rec2{}
-Context expected type: #rec1{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/records.erl:50:21
-   │
-50 │ mk_rec_neg(rec2) -> #rec2{}.
-   │                     ^^^^^^^
-   │                     │
-   │                     #rec2{...}.
-Expression has type:   #rec2{}
-Context expected type: #rec1{} | #rec3{}
-   │                     
-
-  #rec2{} is not compatible with #rec1{} | #rec3{}
-  because
-  #rec2{} is not compatible with #rec1{}
-
-error: undefined_field (See https://fb.me/eqwalizer_errors#undefined_field)
-   ┌─ check/src/records.erl:59:11
-   │
-59 │     Foo = #foo{name = bar},
-   │           ^^^^^^^^^^^^^^^^ #foo{...}: id is 'undefined'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/records.erl:73:5
-   │
-73 │     Foo#foo_def{name = default, id = 0}.
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ...#foo_def{...}.
-Expression has type:   #foo_def{}
-Context expected type: #foo{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/records.erl:73:5
-   │
-73 │     Foo#foo_def{name = default, id = 0}.
-   │     ^^^ Foo.
-Expression has type:   #foo{}
-Context expected type: #foo_def{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/records.erl:86:5
-   │
-86 │     #foo.name.
-   │     ^^^^^^^^^ #foo.name.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/records.erl:91:5
-   │
-91 │     Index.
-   │     ^^^^^ Index.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:104:5
-    │
-104 │     Foo#foo.name.
-    │     ^^^^^^^^^^^^ ...#foo.name.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:109:5
-    │
-109 │     Id.
-    │     ^^ Id.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:117:35
-    │
-117 │ rec_index_pat_neg(#foo.id = I) -> I.
-    │                                   ^ I.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:127:5
-    │
-127 │     {N, I}.
-    │     ^^^^^^
-    │     │
-    │     {N, I}.
-Expression has type:   {atom(), number()}
-Context expected type: {number(), atom()}
-    │     
-
-Because in the expression's type:
-  { 
-    Here the type is:     atom()
-    Context expects type: number()
-  , number()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {atom(), number()} is not compatible with {number(), atom()}
-  because
-  atom() is not compatible with number()
-
-error: undefined_field (See https://fb.me/eqwalizer_errors#undefined_field)
-    ┌─ check/src/records.erl:144:17
-    │
-144 │     when Foo == #foo{} -> ok.
-    │                 ^^^^^^ #foo{...}: id is 'undefined'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:154:37
-    │
-154 │     when Foo == #foo_def{id = X} -> X.
-    │                                     ^ X.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:167:5
-    │
-167 │     (X#rec_b.field)#rec_a.field.
-    │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ ...#rec_a.field.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:174:23
-    │
-174 │     #iodata_box{iod = 's'}.
-    │                       ^^^ 's'.
-Expression has type:   's'
-Context expected type: iodata()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:189:35
-    │
-189 │     #mrec{id1 = 1, name1 = n, _ = ok}.
-    │                                   ^^ 'ok'.
-Expression has type:   'ok'
-Context expected type: number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/records.erl:200:1
-    │  
-200 │ ╭ field_gen_pat_neg(
-201 │ │     #mrec{id1 = 1, name1 = n, _ = A}
-202 │ │ ) ->
-203 │ │     % is both id2 (integer)
-204 │ │     % and name2 (atom)
-205 │ │     A.
-    │ ╰─────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:217:5
-    │
-217 │     #any_box{inner = ok}.
-    │     ^^^^^^^^^^^^^^^^^^^^
-    │     │
-    │     #any_box{...}.
-Expression has type:   #any_box{inner :: 'ok'}
-Context expected type: int_box()
-    │     
-
-Because in the expression's type:
-  #any_box{inner ::
-    Here the type is:     'ok'
-    Context expects type: number()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  #any_box{inner :: 'ok'} is not compatible with int_box()
-  because
-  #any_box{inner :: 'ok'} is not compatible with #any_box{inner :: number()}
-  because
-  'ok' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:222:5
-    │
-222 │     #any_box{inner = ok}.
-    │     ^^^^^^^^^^^^^^^^^^^^
-    │     │
-    │     #any_box{...}.
-Expression has type:   #any_box{inner :: 'ok'}
-Context expected type: #any_box{inner :: number()}
-    │     
-
-Because in the expression's type:
-  #any_box{inner ::
-    Here the type is:     'ok'
-    Context expects type: number()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  #any_box{inner :: 'ok'} is not compatible with #any_box{inner :: number()}
-  because
-  'ok' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:282:27
-    │
-282 │     #int_bool_box{inner = a}.
-    │                           ^
-    │                           │
-    │                           'a'.
-Expression has type:   'a'
-Context expected type: number() | boolean()
-    │                           
-
-  'a' is not compatible with number() | boolean()
-  because
-  'a' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:287:23
-    │
-287 │     #int_bool_box{_ = a}.
-    │                       ^
-    │                       │
-    │                       'a'.
-Expression has type:   'a'
-Context expected type: number() | boolean()
-    │                       
-
-  'a' is not compatible with number() | boolean()
-  because
-  'a' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:292:5
-    │
-292 │     #int_bool_box{}.
-    │     ^^^^^^^^^^^^^^^
-    │     │
-    │     #int_bool_box{...}.
-Expression has type:   #int_bool_box{inner :: 'true'}
-Context expected type: only_int_box()
-    │     
-
-Because in the expression's type:
-  #int_bool_box{inner ::
-    Here the type is:     'true'
-    Context expects type: number()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  #int_bool_box{inner :: 'true'} is not compatible with only_int_box()
-  because
-  #int_bool_box{inner :: 'true'} is not compatible with #int_bool_box{inner :: number()}
-  because
-  'true' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:308:28
-    │
-308 │     B#int_bool_box{inner = a}.
-    │                            ^
-    │                            │
-    │                            'a'.
-Expression has type:   'a'
-Context expected type: number() | boolean()
-    │                            
-
-  'a' is not compatible with number() | boolean()
-  because
-  'a' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:314:5
-    │
-314 │     B#int_bool_box{inner = 4}.
-    │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-    │     │
-    │     ...#int_bool_box{...}.
-Expression has type:   #int_bool_box{inner :: number()}
-Context expected type: only_bool_box()
-    │     
-
-Because in the expression's type:
-  #int_bool_box{inner ::
-    Here the type is:     number()
-    Context expects type: boolean()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  #int_bool_box{inner :: number()} is not compatible with only_bool_box()
-  because
-  #int_bool_box{inner :: number()} is not compatible with #int_bool_box{inner :: boolean()}
-  because
-  number() is not compatible with boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:319:5
-    │
-319 │     R#any_box.inner.
-    │     ^
-    │     │
-    │     R.
-Expression has type:   only_int_box()
-Context expected type: #any_box{}
-    │     
-
-Because in the expression's type:
-  Here the type is:     #int_bool_box{inner :: number()}
-  Context expects type: #any_box{}
-
------------------------------- Detailed message ------------------------------
-
-  only_int_box() is not compatible with #any_box{}
-  because
-  #int_bool_box{inner :: number()} is not compatible with #any_box{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:319:5
-    │
-319 │     R#any_box.inner.
-    │     ^^^^^^^^^^^^^^^ ...#any_box.inner.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:324:5
-    │
-324 │     R#int_bool_box.inner.
-    │     ^^^^^^^^^^^^^^^^^^^^ ...#int_bool_box.inner.
-Expression has type:   number()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:329:5
-    │
-329 │     {int_bool_box, a}.
-    │     ^^^^^^^^^^^^^^^^^
-    │     │
-    │     {'int_bool_box', 'a'}.
-Expression has type:   {'int_bool_box', 'a'}
-Context expected type: #int_bool_box{}
-    │     
-
-Because in the expression's type:
-  { 'int_bool_box', 
-    Here the type is:     'a'
-    Context expects type: number() | boolean()
-    No candidate matches in the expected union.
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'int_bool_box', 'a'} is not compatible with {'int_bool_box', number() | boolean()}
-  because
-  'a' is not compatible with number() | boolean()
-  because
-  'a' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:334:5
-    │
-334 │     {int_bool_box, a}.
-    │     ^^^^^^^^^^^^^^^^^
-    │     │
-    │     {'int_bool_box', 'a'}.
-Expression has type:   {'int_bool_box', 'a'}
-Context expected type: only_int_box()
-    │     
-
-Because in the expression's type:
-  { 'int_bool_box', 
-    Here the type is:     'a'
-    Context expects type: number()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  {'int_bool_box', 'a'} is not compatible with only_int_box()
-  because
-  at tuple index 2:
-  {'int_bool_box', 'a'} is not compatible with {'int_bool_box', number()}
-  because
-  'a' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:352:5
-    │
-352 │     R#int_bool_box.inner.
-    │     ^^^^^^^^^^^^^^^^^^^^
-    │     │
-    │     ...#int_bool_box.inner.
-Expression has type:   boolean() | 'true'
-Context expected type: 'true'
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'true'
-  However the following candidate: boolean()
-  Differs from the expected type:  'true'
-
------------------------------- Detailed message ------------------------------
-
-  boolean() | 'true' is not compatible with 'true'
-  because
-  boolean() is not compatible with 'true'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:355:13
-    │
-355 │     inner = true :: integer()
-    │             ^^^^ 'true'.
-Expression has type:   'true'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:366:5
-    │
-366 │     #bad_default{inner = 42}.
-    │     ^^^^^^^^^^^^^^^^^^^^^^^^
-    │     │
-    │     #bad_default{...}.
-Expression has type:   #bad_default{}
-Context expected type: only_int_box()
-    │     
-
-Because in the expression's type:
-  Here the type is:     #bad_default{}
-  Context expects type: #int_bool_box{inner :: number()}
-
------------------------------- Detailed message ------------------------------
-
-  #bad_default{} is not compatible with only_int_box()
-  because
-  #bad_default{} is not compatible with #int_bool_box{inner :: number()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:372:5
-    │
-372 │     R#bad_default.inner.
-    │     ^
-    │     │
-    │     R.
-Expression has type:   {'int_bool_box', number()}
-Context expected type: #bad_default{}
-    │     
-
-Because in the expression's type:
-  { 
-    Here the type is:     'int_bool_box'
-    Context expects type: 'bad_default'
-  , number()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {'int_bool_box', number()} is not compatible with {'bad_default', number()}
-  because
-  'int_bool_box' is not compatible with 'bad_default'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:388:31
-    │
-388 │ test_subtype_refine_neg(R) -> R.
-    │                               ^
-    │                               │
-    │                               R.
-Expression has type:   #refined_two_fields{}
-Context expected type: #refined_two_fields{inner :: number()}
-    │                               
-
-Because in the expression's type:
-  #refined_two_fields{inner ::
-    Here the type is:     term()
-    Context expects type: number()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  #refined_two_fields{} is not compatible with #refined_two_fields{inner :: number()}
-  because
-  term() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:402:5
-    │
-402 │     lists:nth(1, L) * 3.
-    │     ^^^^^^^^^^^^^^^ lists:nth(1, L).
-Expression has type:   atom()
-Context expected type: number()
-
-error: type_var_in_record_field (See https://fb.me/eqwalizer_errors#type_var_in_record_field)
-    ┌─ check/src/records.erl:412:14
-    │
-412 │     field :: _T
-    │              ^^ _T: Type variables are meaningless in record fields. Did you mean to use an alias?
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/records.erl:415:1
-    │  
-415 │ ╭ -spec test_recurd2_neg(#recurd2{}) ->
-416 │ │     #recurd2{}.
-    │ ╰──────────────^ test_recurd2_neg/1 references type with invalid definition: #recurd2{}
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/records.erl:420:1
-    │
-420 │ -type loop() :: loop().
-    │ ^^^^^^^^^^^^^^^^^^^^ recursive type loop/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/records.erl:421:1
-    │
-421 │ -record(invalid, {field :: loop()}).
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid references type with invalid definition: loop/0
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:425:5
-    │
-425 │     X#invalid.field.
-    │     ^ X.
-Expression has type:   term()
-Context expected type: #invalid{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:429:9
-    │
-429 │     _ = X#invalid.field,
-    │         ^ X.
-Expression has type:   term()
-Context expected type: #invalid{}
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/records.erl:433:1
-    │  
-433 │ ╭ unbound_update_neg(X) ->
-434 │ │     X#invalid{field = 2}.
-    │ ╰────────────────────────^ Clause is not covered by spec
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-    ┌─ check/src/records.erl:445:27
-    │
-445 │     eqwalizer:reveal_type(Field2),
-    │                           ^^^^^^ dynamic()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:473:20
-    │
-473 │     binary_to_atom(B);
-    │                    ^
-    │                    │
-    │                    B.
-Expression has type:   'my_record' | binary()
-Context expected type: binary()
-    │                    
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: 'my_record'
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  'my_record' | binary() is not compatible with binary()
-  because
-  'my_record' is not compatible with binary()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/records.erl:517:1
-    │
-517 │ narrow3({X, X}) -> X.
-    │ ^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:523:24
-    │
-523 │ narrow5_neg({X, X}) -> X.
-    │                        ^ X.
-Expression has type:   #two_ref{b :: boolean(), a :: atom()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:536:5
-    │
-536 │     Id.
-    │     ^^ Id.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:545:5
-    │
-545 │     Rec#two_ref.a.
-    │     ^^^^^^^^^^^^^ ...#two_ref.a.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:551:5
-    │
-551 │     A.
-    │     ^ A.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:557:5
-    │
-557 │     I#{a => b}.
-    │     ^^^^^^^^^^ ..#{..}.
-Expression has type:   #{a := 'b', dynamic() => dynamic()}
-Context expected type: 'ok'
-
-51 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-28.pretty
deleted file mode 100644
index ee4761b7d0..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-28.pretty
+++ /dev/null
@@ -1,628 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/records.erl:30:18
-   │
-30 │ mk_rec1_neg() -> #rec2{}.
-   │                  ^^^^^^^ #rec2{...}.
-Expression has type:   #rec2{}
-Context expected type: #rec1{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/records.erl:40:5
-   │
-40 │     R.
-   │     ^ R.
-Expression has type:   #rec2{}
-Context expected type: #rec1{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/records.erl:50:21
-   │
-50 │ mk_rec_neg(rec2) -> #rec2{}.
-   │                     ^^^^^^^
-   │                     │
-   │                     #rec2{...}.
-Expression has type:   #rec2{}
-Context expected type: #rec1{} | #rec3{}
-   │                     
-
-  #rec2{} is not compatible with #rec1{} | #rec3{}
-  because
-  #rec2{} is not compatible with #rec1{}
-
-error: undefined_field (See https://fb.me/eqwalizer_errors#undefined_field)
-   ┌─ check/src/records.erl:59:11
-   │
-59 │     Foo = #foo{name = bar},
-   │           ^^^^^^^^^^^^^^^^ #foo{...}: id is 'undefined'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/records.erl:73:5
-   │
-73 │     Foo#foo_def{name = default, id = 0}.
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ...#foo_def{...}.
-Expression has type:   #foo_def{}
-Context expected type: #foo{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/records.erl:73:5
-   │
-73 │     Foo#foo_def{name = default, id = 0}.
-   │     ^^^ Foo.
-Expression has type:   #foo{}
-Context expected type: #foo_def{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/records.erl:86:5
-   │
-86 │     #foo.name.
-   │     ^^^^^^^^^ #foo.name.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/records.erl:91:5
-   │
-91 │     Index.
-   │     ^^^^^ Index.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:104:5
-    │
-104 │     Foo#foo.name.
-    │     ^^^^^^^^^^^^ ...#foo.name.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:109:5
-    │
-109 │     Id.
-    │     ^^ Id.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:117:35
-    │
-117 │ rec_index_pat_neg(#foo.id = I) -> I.
-    │                                   ^ I.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:127:5
-    │
-127 │     {N, I}.
-    │     ^^^^^^
-    │     │
-    │     {N, I}.
-Expression has type:   {atom(), number()}
-Context expected type: {number(), atom()}
-    │     
-
-Because in the expression's type:
-  { 
-    Here the type is:     atom()
-    Context expects type: number()
-  , number()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {atom(), number()} is not compatible with {number(), atom()}
-  because
-  atom() is not compatible with number()
-
-error: undefined_field (See https://fb.me/eqwalizer_errors#undefined_field)
-    ┌─ check/src/records.erl:144:17
-    │
-144 │     when Foo == #foo{} -> ok.
-    │                 ^^^^^^ #foo{...}: id is 'undefined'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:154:37
-    │
-154 │     when Foo == #foo_def{id = X} -> X.
-    │                                     ^ X.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:167:5
-    │
-167 │     (X#rec_b.field)#rec_a.field.
-    │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ ...#rec_a.field.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:174:23
-    │
-174 │     #iodata_box{iod = 's'}.
-    │                       ^^^ 's'.
-Expression has type:   's'
-Context expected type: iodata()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:189:35
-    │
-189 │     #mrec{id1 = 1, name1 = n, _ = ok}.
-    │                                   ^^ 'ok'.
-Expression has type:   'ok'
-Context expected type: number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/records.erl:200:1
-    │  
-200 │ ╭ field_gen_pat_neg(
-201 │ │     #mrec{id1 = 1, name1 = n, _ = A}
-202 │ │ ) ->
-203 │ │     % is both id2 (integer)
-204 │ │     % and name2 (atom)
-205 │ │     A.
-    │ ╰─────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:217:5
-    │
-217 │     #any_box{inner = ok}.
-    │     ^^^^^^^^^^^^^^^^^^^^
-    │     │
-    │     #any_box{...}.
-Expression has type:   #any_box{inner :: 'ok'}
-Context expected type: int_box()
-    │     
-
-Because in the expression's type:
-  #any_box{inner ::
-    Here the type is:     'ok'
-    Context expects type: number()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  #any_box{inner :: 'ok'} is not compatible with int_box()
-  because
-  #any_box{inner :: 'ok'} is not compatible with #any_box{inner :: number()}
-  because
-  'ok' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:222:5
-    │
-222 │     #any_box{inner = ok}.
-    │     ^^^^^^^^^^^^^^^^^^^^
-    │     │
-    │     #any_box{...}.
-Expression has type:   #any_box{inner :: 'ok'}
-Context expected type: #any_box{inner :: number()}
-    │     
-
-Because in the expression's type:
-  #any_box{inner ::
-    Here the type is:     'ok'
-    Context expects type: number()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  #any_box{inner :: 'ok'} is not compatible with #any_box{inner :: number()}
-  because
-  'ok' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:282:27
-    │
-282 │     #int_bool_box{inner = a}.
-    │                           ^
-    │                           │
-    │                           'a'.
-Expression has type:   'a'
-Context expected type: number() | boolean()
-    │                           
-
-  'a' is not compatible with number() | boolean()
-  because
-  'a' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:287:23
-    │
-287 │     #int_bool_box{_ = a}.
-    │                       ^
-    │                       │
-    │                       'a'.
-Expression has type:   'a'
-Context expected type: number() | boolean()
-    │                       
-
-  'a' is not compatible with number() | boolean()
-  because
-  'a' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:292:5
-    │
-292 │     #int_bool_box{}.
-    │     ^^^^^^^^^^^^^^^
-    │     │
-    │     #int_bool_box{...}.
-Expression has type:   #int_bool_box{inner :: 'true'}
-Context expected type: only_int_box()
-    │     
-
-Because in the expression's type:
-  #int_bool_box{inner ::
-    Here the type is:     'true'
-    Context expects type: number()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  #int_bool_box{inner :: 'true'} is not compatible with only_int_box()
-  because
-  #int_bool_box{inner :: 'true'} is not compatible with #int_bool_box{inner :: number()}
-  because
-  'true' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:308:28
-    │
-308 │     B#int_bool_box{inner = a}.
-    │                            ^
-    │                            │
-    │                            'a'.
-Expression has type:   'a'
-Context expected type: number() | boolean()
-    │                            
-
-  'a' is not compatible with number() | boolean()
-  because
-  'a' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:314:5
-    │
-314 │     B#int_bool_box{inner = 4}.
-    │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-    │     │
-    │     ...#int_bool_box{...}.
-Expression has type:   #int_bool_box{inner :: number()}
-Context expected type: only_bool_box()
-    │     
-
-Because in the expression's type:
-  #int_bool_box{inner ::
-    Here the type is:     number()
-    Context expects type: boolean()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  #int_bool_box{inner :: number()} is not compatible with only_bool_box()
-  because
-  #int_bool_box{inner :: number()} is not compatible with #int_bool_box{inner :: boolean()}
-  because
-  number() is not compatible with boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:319:5
-    │
-319 │     R#any_box.inner.
-    │     ^
-    │     │
-    │     R.
-Expression has type:   only_int_box()
-Context expected type: #any_box{}
-    │     
-
-Because in the expression's type:
-  Here the type is:     #int_bool_box{inner :: number()}
-  Context expects type: #any_box{}
-
------------------------------- Detailed message ------------------------------
-
-  only_int_box() is not compatible with #any_box{}
-  because
-  #int_bool_box{inner :: number()} is not compatible with #any_box{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:319:5
-    │
-319 │     R#any_box.inner.
-    │     ^^^^^^^^^^^^^^^ ...#any_box.inner.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:324:5
-    │
-324 │     R#int_bool_box.inner.
-    │     ^^^^^^^^^^^^^^^^^^^^ ...#int_bool_box.inner.
-Expression has type:   number()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:329:5
-    │
-329 │     {int_bool_box, a}.
-    │     ^^^^^^^^^^^^^^^^^
-    │     │
-    │     {'int_bool_box', 'a'}.
-Expression has type:   {'int_bool_box', 'a'}
-Context expected type: #int_bool_box{}
-    │     
-
-Because in the expression's type:
-  { 'int_bool_box', 
-    Here the type is:     'a'
-    Context expects type: number() | boolean()
-    No candidate matches in the expected union.
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'int_bool_box', 'a'} is not compatible with {'int_bool_box', number() | boolean()}
-  because
-  'a' is not compatible with number() | boolean()
-  because
-  'a' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:334:5
-    │
-334 │     {int_bool_box, a}.
-    │     ^^^^^^^^^^^^^^^^^
-    │     │
-    │     {'int_bool_box', 'a'}.
-Expression has type:   {'int_bool_box', 'a'}
-Context expected type: only_int_box()
-    │     
-
-Because in the expression's type:
-  { 'int_bool_box', 
-    Here the type is:     'a'
-    Context expects type: number()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  {'int_bool_box', 'a'} is not compatible with only_int_box()
-  because
-  at tuple index 2:
-  {'int_bool_box', 'a'} is not compatible with {'int_bool_box', number()}
-  because
-  'a' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:352:5
-    │
-352 │     R#int_bool_box.inner.
-    │     ^^^^^^^^^^^^^^^^^^^^
-    │     │
-    │     ...#int_bool_box.inner.
-Expression has type:   boolean() | 'true'
-Context expected type: 'true'
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'true'
-  However the following candidate: boolean()
-  Differs from the expected type:  'true'
-
------------------------------- Detailed message ------------------------------
-
-  boolean() | 'true' is not compatible with 'true'
-  because
-  boolean() is not compatible with 'true'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:355:13
-    │
-355 │     inner = true :: integer()
-    │             ^^^^ 'true'.
-Expression has type:   'true'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:366:5
-    │
-366 │     #bad_default{inner = 42}.
-    │     ^^^^^^^^^^^^^^^^^^^^^^^^
-    │     │
-    │     #bad_default{...}.
-Expression has type:   #bad_default{}
-Context expected type: only_int_box()
-    │     
-
-Because in the expression's type:
-  Here the type is:     #bad_default{}
-  Context expects type: #int_bool_box{inner :: number()}
-
------------------------------- Detailed message ------------------------------
-
-  #bad_default{} is not compatible with only_int_box()
-  because
-  #bad_default{} is not compatible with #int_bool_box{inner :: number()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:372:5
-    │
-372 │     R#bad_default.inner.
-    │     ^
-    │     │
-    │     R.
-Expression has type:   {'int_bool_box', number()}
-Context expected type: #bad_default{}
-    │     
-
-Because in the expression's type:
-  { 
-    Here the type is:     'int_bool_box'
-    Context expects type: 'bad_default'
-  , number()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {'int_bool_box', number()} is not compatible with {'bad_default', number()}
-  because
-  'int_bool_box' is not compatible with 'bad_default'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:388:31
-    │
-388 │ test_subtype_refine_neg(R) -> R.
-    │                               ^
-    │                               │
-    │                               R.
-Expression has type:   #refined_two_fields{}
-Context expected type: #refined_two_fields{inner :: number()}
-    │                               
-
-Because in the expression's type:
-  #refined_two_fields{inner ::
-    Here the type is:     term()
-    Context expects type: number()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  #refined_two_fields{} is not compatible with #refined_two_fields{inner :: number()}
-  because
-  term() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:402:5
-    │
-402 │     lists:nth(1, L) * 3.
-    │     ^^^^^^^^^^^^^^^ lists:nth(1, L).
-Expression has type:   atom()
-Context expected type: number()
-
-error: type_var_in_record_field (See https://fb.me/eqwalizer_errors#type_var_in_record_field)
-    ┌─ check/src/records.erl:412:14
-    │
-412 │     field :: _T
-    │              ^^ _T: Type variables are meaningless in record fields. Did you mean to use an alias?
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/records.erl:415:1
-    │  
-415 │ ╭ -spec test_recurd2_neg(#recurd2{}) ->
-416 │ │     #recurd2{}.
-    │ ╰──────────────^ test_recurd2_neg/1 references type with invalid definition: #recurd2{}
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/records.erl:420:1
-    │
-420 │ -type loop() :: loop().
-    │ ^^^^^^^^^^^^^^^^^^^^ recursive type loop/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/records.erl:421:1
-    │
-421 │ -record(invalid, {field :: loop()}).
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid references type with invalid definition: loop/0
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:425:5
-    │
-425 │     X#invalid.field.
-    │     ^ X.
-Expression has type:   term()
-Context expected type: #invalid{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:429:9
-    │
-429 │     _ = X#invalid.field,
-    │         ^ X.
-Expression has type:   term()
-Context expected type: #invalid{}
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/records.erl:433:1
-    │  
-433 │ ╭ unbound_update_neg(X) ->
-434 │ │     X#invalid{field = 2}.
-    │ ╰────────────────────────^ Clause is not covered by spec
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-    ┌─ check/src/records.erl:445:27
-    │
-445 │     eqwalizer:reveal_type(Field2),
-    │                           ^^^^^^ dynamic()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:473:20
-    │
-473 │     binary_to_atom(B);
-    │                    ^
-    │                    │
-    │                    B.
-Expression has type:   'my_record' | binary()
-Context expected type: binary()
-    │                    
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: 'my_record'
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  'my_record' | binary() is not compatible with binary()
-  because
-  'my_record' is not compatible with binary()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/records.erl:517:1
-    │
-517 │ narrow3({X, X}) -> X.
-    │ ^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:523:24
-    │
-523 │ narrow5_neg({X, X}) -> X.
-    │                        ^ X.
-Expression has type:   #two_ref{b :: boolean(), a :: atom()}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:536:5
-    │
-536 │     Id.
-    │     ^^ Id.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:545:5
-    │
-545 │     Rec#two_ref.a.
-    │     ^^^^^^^^^^^^^ ...#two_ref.a.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:551:5
-    │
-551 │     A.
-    │     ^ A.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/records.erl:557:5
-    │
-557 │     I#{a => b}.
-    │     ^^^^^^^^^^ ..#{..}.
-Expression has type:   #{a := 'b', dynamic() => dynamic()}
-Context expected type: 'ok'
-
-51 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/records.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/records-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/records.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/recursive_aliases-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/recursive_aliases-OTP-27.pretty
deleted file mode 100644
index 87d235e56c..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/recursive_aliases-OTP-27.pretty
+++ /dev/null
@@ -1,441 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/recursive_aliases.erl:59:20
-   │
-59 │ subtype3_neg(C) -> C.
-   │                    ^
-   │                    │
-   │                    C.
-Expression has type:   chainA()
-Context expected type: chainB()
-   │                    
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: 'nil'
-  However, the following candidate doesn't match:
-  { 
-    Here the type is:     'a'
-    Context expects type: 'b'
-  , chainA()}
-
------------------------------- Detailed message ------------------------------
-
-  chainA() is not compatible with chainB()
-  because
-  'nil' | {'a', chainA()} is not compatible with chainB()
-  because
-  'nil' | {'a', chainA()} is not compatible with 'nil' | {'b', chainB()}
-  because
-  {'a', chainA()} is not compatible with 'nil' | {'b', chainB()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/recursive_aliases.erl:62:20
-   │
-62 │ subtype4_neg(C) -> C.
-   │                    ^
-   │                    │
-   │                    C.
-Expression has type:   chainB()
-Context expected type: chainA()
-   │                    
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: 'nil'
-  However, the following candidate doesn't match:
-  { 
-    Here the type is:     'b'
-    Context expects type: 'a'
-  , chainB()}
-
------------------------------- Detailed message ------------------------------
-
-  chainB() is not compatible with chainA()
-  because
-  'nil' | {'b', chainB()} is not compatible with chainA()
-  because
-  'nil' | {'b', chainB()} is not compatible with 'nil' | {'a', chainA()}
-  because
-  {'b', chainB()} is not compatible with 'nil' | {'a', chainA()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/recursive_aliases.erl:65:20
-   │
-65 │ subtype5_neg(C) -> C.
-   │                    ^
-   │                    │
-   │                    C.
-Expression has type:   chainAB()
-Context expected type: chainA()
-   │                    
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: 'nil' | {'a', chainAB()}
-  However, the following candidate doesn't match:
-  { 
-    Here the type is:     'b'
-    Context expects type: 'a'
-  , chainAB()}
-
------------------------------- Detailed message ------------------------------
-
-  chainAB() is not compatible with chainA()
-  because
-  'nil' | {'a', chainAB()} | {'b', chainAB()} is not compatible with chainA()
-  because
-  'nil' | {'a', chainAB()} | {'b', chainAB()} is not compatible with 'nil' | {'a', chainA()}
-  because
-  {'b', chainAB()} is not compatible with 'nil' | {'a', chainA()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/recursive_aliases.erl:68:20
-   │
-68 │ subtype6_neg(C) -> C.
-   │                    ^
-   │                    │
-   │                    C.
-Expression has type:   chainAB()
-Context expected type: chainB()
-   │                    
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: 'nil' | {'b', chainAB()}
-  However, the following candidate doesn't match:
-  { 
-    Here the type is:     'a'
-    Context expects type: 'b'
-  , chainAB()}
-
------------------------------- Detailed message ------------------------------
-
-  chainAB() is not compatible with chainB()
-  because
-  'nil' | {'a', chainAB()} | {'b', chainAB()} is not compatible with chainB()
-  because
-  'nil' | {'a', chainAB()} | {'b', chainAB()} is not compatible with 'nil' | {'b', chainB()}
-  because
-  {'a', chainAB()} is not compatible with 'nil' | {'b', chainB()}
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-   ┌─ check/src/recursive_aliases.erl:70:1
-   │
-70 │ -type non_prod() :: non_prod().
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type non_prod/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/recursive_aliases.erl:72:1
-   │  
-72 │ ╭ -spec non_prod_id(non_prod()) ->
-73 │ │     non_prod() | number().
-   │ ╰───────────────────────^ non_prod_id/1 references type with invalid definition: non_prod/0
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/recursive_aliases.erl:81:22
-   │
-81 │ subtype_p1_neg(C) -> C.
-   │                      ^
-   │                      │
-   │                      C.
-Expression has type:   pchainA(atom())
-Context expected type: pchainAB(atom())
-   │                      
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'nil'
-  However the following candidate: {'a', atom(), pchainA(atom())}
-  Differs from the expected type:  'nil' | {'a', pchainAB(atom())} | {'b', pchainAB(atom())}
-
------------------------------- Detailed message ------------------------------
-
-  pchainA(atom()) is not compatible with pchainAB(atom())
-  because
-  'nil' | {'a', atom(), pchainA(atom())} is not compatible with pchainAB(atom())
-  because
-  'nil' | {'a', atom(), pchainA(atom())} is not compatible with 'nil' | {'a', pchainAB(atom())} | {'b', pchainAB(atom())}
-  because
-  {'a', atom(), pchainA(atom())} is not compatible with 'nil' | {'a', pchainAB(atom())} | {'b', pchainAB(atom())}
-  expected union does not contain any tuple type of size 3
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/recursive_aliases.erl:113:23
-    │
-113 │     1 + m_chainA_size(Chain).
-    │                       ^^^^^
-    │                       │
-    │                       Chain.
-Expression has type:   mChainB()
-Context expected type: mChainA()
-    │                       
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'nil'
-  However the following candidate: #{b := mChainB()}
-  Differs from the expected type:  'nil' | #{a := mChainA()}
-
------------------------------- Detailed message ------------------------------
-
-  mChainB() is not compatible with mChainA()
-  because
-  'nil' | #{b := mChainB()} is not compatible with mChainA()
-  because
-  'nil' | #{b := mChainB()} is not compatible with 'nil' | #{a := mChainA()}
-  because
-  #{b := mChainB()} is not compatible with 'nil' | #{a := mChainA()}
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ check/src/recursive_aliases.erl:138:15
-    │
-138 │ fun_fan(F) -> F().
-    │               ^ F.
-Expected fun type with arity 0
-Got: fan()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/recursive_aliases.erl:187:21
-    │
-187 │ subtype_6_neg(C) -> C.
-    │                     ^
-    │                     │
-    │                     C.
-Expression has type:   pchainA('a')
-Context expected type: pchainA('b' | 'c')
-    │                     
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: 'nil'
-  However, the following candidate doesn't match:
-  { 'a', 
-    Here the type is:     'a'
-    Context expects type: 'b' | 'c'
-    No candidate matches in the expected union.
-  , pchainA('a')}
-
------------------------------- Detailed message ------------------------------
-
-  pchainA('a') is not compatible with pchainA('b' | 'c')
-  because
-  'nil' | {'a', 'a', pchainA('a')} is not compatible with pchainA('b' | 'c')
-  because
-  'nil' | {'a', 'a', pchainA('a')} is not compatible with 'nil' | {'a', 'b' | 'c', pchainA('b' | 'c')}
-  because
-  {'a', 'a', pchainA('a')} is not compatible with 'nil' | {'a', 'b' | 'c', pchainA('b' | 'c')}
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:202:1
-    │
-202 │ -type mu_bad() :: mu_bad() | {a}.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type mu_bad/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:204:1
-    │  
-204 │ ╭ -spec to_mu_bad_neg() ->
-205 │ │   mu_bad().
-    │ ╰────────^ to_mu_bad_neg/0 references type with invalid definition: mu_bad/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:208:1
-    │  
-208 │ ╭ -spec test_mu_bad_neg(mu_bad()) ->
-209 │ │   pid().
-    │ ╰─────^ test_mu_bad_neg/1 references type with invalid definition: mu_bad/0
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:212:1
-    │
-212 │ -type mu(A) :: {mu, mu(mu(A))}.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type mu/1 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:214:1
-    │
-214 │ -spec test2_neg(mu(A)) -> mu(mu(A)).
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ test2_neg/1 references type with invalid definition: mu/1
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/recursive_aliases.erl:223:23
-    │
-223 │ test4_neg({mu, M}) -> M.
-    │                       ^ M.
-Expression has type:   atom() | mu2()
-Context expected type: pid()
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:296:1
-    │
-296 │ -type mu_bad2() :: id(mu_bad2()).
-    │ ^^^^^^^^^^^^^^^^^^^^^ recursive type mu_bad2/0 is not productive
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:297:1
-    │
-297 │ -type mu_bad2b() :: id(mu_bad2()).
-    │ ^^^^^^^^^^^^^^^^^^^^^^ recursive type mu_bad2b/0 is not productive
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:299:1
-    │
-299 │ -type mu_bad3() :: id(mu_bad3()).
-    │ ^^^^^^^^^^^^^^^^^^^^^ recursive type mu_bad3/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:301:1
-    │  
-301 │ ╭ -spec to_mu_bad3_neg(mu_bad2()) ->
-302 │ │     mu_bad3().
-    │ ╰───────────^ to_mu_bad3_neg/1 references types with invalid definitions: mu_bad2/0, mu_bad3/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:305:1
-    │  
-305 │ ╭ -spec to_mu_bad2b_neg(mu_bad2()) ->
-306 │ │   mu_bad2b().
-    │ ╰──────────^ to_mu_bad2b_neg/1 references types with invalid definitions: mu_bad2/0, mu_bad2b/0
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:309:1
-    │
-309 │ -type indirect2() :: mutual2().
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type indirect2/0 is not productive
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:310:1
-    │
-310 │ -type indirect1() :: mutual1().
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type indirect1/0 is not productive
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:312:1
-    │  
-312 │ ╭ -type mutual1() :: indirect1()
-313 │ │   | indirect2().
-    │ ╰─────────────^ recursive type mutual1/0 is not productive
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:314:1
-    │  
-314 │ ╭ -type mutual2() :: indirect1()
-315 │ │   | indirect2().
-    │ ╰─────────────^ recursive type mutual2/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:317:1
-    │  
-317 │ ╭ -spec test_mutual_neg(mutual1()) ->
-318 │ │     mutual2().
-    │ ╰───────────^ test_mutual_neg/1 references types with invalid definitions: mutual1/0, mutual2/0
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:342:1
-    │
-342 │ -type mu_bad5() :: opaque_id(mu_bad5()).
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type mu_bad5/0 is not productive
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:343:1
-    │
-343 │ -type mu_bad5b() :: opaque_id(mu_bad5()).
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type mu_bad5b/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:345:1
-    │  
-345 │ ╭ -spec test_mu_bad5(
-346 │ │     mu_bad5()
-347 │ │ ) -> mu_bad5b().
-    │ ╰─────────────^ test_mu_bad5/1 references types with invalid definitions: mu_bad5/0, mu_bad5b/0
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:392:1
-    │
-392 │ -type recur() :: foo(recur()) | a.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type recur/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:395:1
-    │
-395 │ -spec un_recur_neg(recur()) -> ok.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ un_recur_neg/1 references type with invalid definition: recur/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:399:1
-    │  
-399 │ ╭ -spec term_to_recur_neg(term()) ->
-400 │ │   recur().
-    │ ╰───────^ term_to_recur_neg/1 references type with invalid definition: recur/0
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:409:1
-    │  
-409 │ ╭ -type foo7_neg(T) ::
-410 │ │   {unit, foo7_neg(foo7_neg(T))}.
-    │ ╰───────────────────────────────^ recursive type foo7_neg/1 is not productive
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:441:1
-    │
-441 │ -type x_cycle() :: misc:x_cycle().
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type x_cycle/0 is not productive
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/recursive_aliases.erl:460:1
-    │
-460 │ trick_me(X, X) -> X.
-    │ ^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:477:1
-    │  
-477 │ ╭ -type t_tree2(Z) ::
-478 │ │   {leaf, Z} |
-479 │ │   {node, t_tree2(simple_id(Z))}.
-    │ ╰───────────────────────────────^ recursive type t_tree2/1 is not productive
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:481:1
-    │  
-481 │ ╭ -type t_tree3(Z) ::
-482 │ │   {leaf, Z} |
-483 │ │   {node, t_tree3(t_tree3(Z))}.
-    │ ╰─────────────────────────────^ recursive type t_tree3/1 is not productive
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:493:1
-    │  
-493 │ ╭ -type stream2(Z) ::
-494 │ │   {chunk, stream2(simple_id(Z))}.
-    │ ╰────────────────────────────────^ recursive type stream2/1 is not productive
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:505:1
-    │  
-505 │ ╭ -type d_stream(Z) ::
-506 │ │   {chunk, d_stream([Z])}.
-    │ ╰────────────────────────^ recursive type d_stream/1 is not productive
-
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-    ┌─ check/src/recursive_aliases.erl:508:23
-    │
-508 │ -type invalid_ty() :: non_exist:invalid().
-    │                       ^^^^^^^^^^^^^^^^^^^ Unknown id: non_exist:invalid/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:510:1
-    │  
-510 │ ╭ -type invalid_rec() ::
-511 │ │   invalid_ty() | invalid_transitive().
-    │ ╰───────────────────────────────────^ invalid_rec/0 references type with invalid definition: invalid_ty/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:513:1
-    │  
-513 │ ╭ -type invalid_transitive() ::
-514 │ │   {a, invalid_rec()}.
-    │ ╰────────────────────^ invalid_transitive/0 references type with invalid definition: invalid_rec/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:516:1
-    │  
-516 │ ╭ -spec use_invalid
-517 │ │   (invalid_transitive()) -> a.
-    │ ╰─────────────────────────────^ use_invalid/1 references type with invalid definition: invalid_transitive/0
-
-43 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/recursive_aliases-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/recursive_aliases-OTP-28.pretty
deleted file mode 100644
index 87d235e56c..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/recursive_aliases-OTP-28.pretty
+++ /dev/null
@@ -1,441 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/recursive_aliases.erl:59:20
-   │
-59 │ subtype3_neg(C) -> C.
-   │                    ^
-   │                    │
-   │                    C.
-Expression has type:   chainA()
-Context expected type: chainB()
-   │                    
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: 'nil'
-  However, the following candidate doesn't match:
-  { 
-    Here the type is:     'a'
-    Context expects type: 'b'
-  , chainA()}
-
------------------------------- Detailed message ------------------------------
-
-  chainA() is not compatible with chainB()
-  because
-  'nil' | {'a', chainA()} is not compatible with chainB()
-  because
-  'nil' | {'a', chainA()} is not compatible with 'nil' | {'b', chainB()}
-  because
-  {'a', chainA()} is not compatible with 'nil' | {'b', chainB()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/recursive_aliases.erl:62:20
-   │
-62 │ subtype4_neg(C) -> C.
-   │                    ^
-   │                    │
-   │                    C.
-Expression has type:   chainB()
-Context expected type: chainA()
-   │                    
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: 'nil'
-  However, the following candidate doesn't match:
-  { 
-    Here the type is:     'b'
-    Context expects type: 'a'
-  , chainB()}
-
------------------------------- Detailed message ------------------------------
-
-  chainB() is not compatible with chainA()
-  because
-  'nil' | {'b', chainB()} is not compatible with chainA()
-  because
-  'nil' | {'b', chainB()} is not compatible with 'nil' | {'a', chainA()}
-  because
-  {'b', chainB()} is not compatible with 'nil' | {'a', chainA()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/recursive_aliases.erl:65:20
-   │
-65 │ subtype5_neg(C) -> C.
-   │                    ^
-   │                    │
-   │                    C.
-Expression has type:   chainAB()
-Context expected type: chainA()
-   │                    
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: 'nil' | {'a', chainAB()}
-  However, the following candidate doesn't match:
-  { 
-    Here the type is:     'b'
-    Context expects type: 'a'
-  , chainAB()}
-
------------------------------- Detailed message ------------------------------
-
-  chainAB() is not compatible with chainA()
-  because
-  'nil' | {'a', chainAB()} | {'b', chainAB()} is not compatible with chainA()
-  because
-  'nil' | {'a', chainAB()} | {'b', chainAB()} is not compatible with 'nil' | {'a', chainA()}
-  because
-  {'b', chainAB()} is not compatible with 'nil' | {'a', chainA()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/recursive_aliases.erl:68:20
-   │
-68 │ subtype6_neg(C) -> C.
-   │                    ^
-   │                    │
-   │                    C.
-Expression has type:   chainAB()
-Context expected type: chainB()
-   │                    
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: 'nil' | {'b', chainAB()}
-  However, the following candidate doesn't match:
-  { 
-    Here the type is:     'a'
-    Context expects type: 'b'
-  , chainAB()}
-
------------------------------- Detailed message ------------------------------
-
-  chainAB() is not compatible with chainB()
-  because
-  'nil' | {'a', chainAB()} | {'b', chainAB()} is not compatible with chainB()
-  because
-  'nil' | {'a', chainAB()} | {'b', chainAB()} is not compatible with 'nil' | {'b', chainB()}
-  because
-  {'a', chainAB()} is not compatible with 'nil' | {'b', chainB()}
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-   ┌─ check/src/recursive_aliases.erl:70:1
-   │
-70 │ -type non_prod() :: non_prod().
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type non_prod/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/recursive_aliases.erl:72:1
-   │  
-72 │ ╭ -spec non_prod_id(non_prod()) ->
-73 │ │     non_prod() | number().
-   │ ╰───────────────────────^ non_prod_id/1 references type with invalid definition: non_prod/0
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/recursive_aliases.erl:81:22
-   │
-81 │ subtype_p1_neg(C) -> C.
-   │                      ^
-   │                      │
-   │                      C.
-Expression has type:   pchainA(atom())
-Context expected type: pchainAB(atom())
-   │                      
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'nil'
-  However the following candidate: {'a', atom(), pchainA(atom())}
-  Differs from the expected type:  'nil' | {'a', pchainAB(atom())} | {'b', pchainAB(atom())}
-
------------------------------- Detailed message ------------------------------
-
-  pchainA(atom()) is not compatible with pchainAB(atom())
-  because
-  'nil' | {'a', atom(), pchainA(atom())} is not compatible with pchainAB(atom())
-  because
-  'nil' | {'a', atom(), pchainA(atom())} is not compatible with 'nil' | {'a', pchainAB(atom())} | {'b', pchainAB(atom())}
-  because
-  {'a', atom(), pchainA(atom())} is not compatible with 'nil' | {'a', pchainAB(atom())} | {'b', pchainAB(atom())}
-  expected union does not contain any tuple type of size 3
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/recursive_aliases.erl:113:23
-    │
-113 │     1 + m_chainA_size(Chain).
-    │                       ^^^^^
-    │                       │
-    │                       Chain.
-Expression has type:   mChainB()
-Context expected type: mChainA()
-    │                       
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'nil'
-  However the following candidate: #{b := mChainB()}
-  Differs from the expected type:  'nil' | #{a := mChainA()}
-
------------------------------- Detailed message ------------------------------
-
-  mChainB() is not compatible with mChainA()
-  because
-  'nil' | #{b := mChainB()} is not compatible with mChainA()
-  because
-  'nil' | #{b := mChainB()} is not compatible with 'nil' | #{a := mChainA()}
-  because
-  #{b := mChainB()} is not compatible with 'nil' | #{a := mChainA()}
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ check/src/recursive_aliases.erl:138:15
-    │
-138 │ fun_fan(F) -> F().
-    │               ^ F.
-Expected fun type with arity 0
-Got: fan()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/recursive_aliases.erl:187:21
-    │
-187 │ subtype_6_neg(C) -> C.
-    │                     ^
-    │                     │
-    │                     C.
-Expression has type:   pchainA('a')
-Context expected type: pchainA('b' | 'c')
-    │                     
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: 'nil'
-  However, the following candidate doesn't match:
-  { 'a', 
-    Here the type is:     'a'
-    Context expects type: 'b' | 'c'
-    No candidate matches in the expected union.
-  , pchainA('a')}
-
------------------------------- Detailed message ------------------------------
-
-  pchainA('a') is not compatible with pchainA('b' | 'c')
-  because
-  'nil' | {'a', 'a', pchainA('a')} is not compatible with pchainA('b' | 'c')
-  because
-  'nil' | {'a', 'a', pchainA('a')} is not compatible with 'nil' | {'a', 'b' | 'c', pchainA('b' | 'c')}
-  because
-  {'a', 'a', pchainA('a')} is not compatible with 'nil' | {'a', 'b' | 'c', pchainA('b' | 'c')}
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:202:1
-    │
-202 │ -type mu_bad() :: mu_bad() | {a}.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type mu_bad/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:204:1
-    │  
-204 │ ╭ -spec to_mu_bad_neg() ->
-205 │ │   mu_bad().
-    │ ╰────────^ to_mu_bad_neg/0 references type with invalid definition: mu_bad/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:208:1
-    │  
-208 │ ╭ -spec test_mu_bad_neg(mu_bad()) ->
-209 │ │   pid().
-    │ ╰─────^ test_mu_bad_neg/1 references type with invalid definition: mu_bad/0
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:212:1
-    │
-212 │ -type mu(A) :: {mu, mu(mu(A))}.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type mu/1 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:214:1
-    │
-214 │ -spec test2_neg(mu(A)) -> mu(mu(A)).
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ test2_neg/1 references type with invalid definition: mu/1
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/recursive_aliases.erl:223:23
-    │
-223 │ test4_neg({mu, M}) -> M.
-    │                       ^ M.
-Expression has type:   atom() | mu2()
-Context expected type: pid()
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:296:1
-    │
-296 │ -type mu_bad2() :: id(mu_bad2()).
-    │ ^^^^^^^^^^^^^^^^^^^^^ recursive type mu_bad2/0 is not productive
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:297:1
-    │
-297 │ -type mu_bad2b() :: id(mu_bad2()).
-    │ ^^^^^^^^^^^^^^^^^^^^^^ recursive type mu_bad2b/0 is not productive
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:299:1
-    │
-299 │ -type mu_bad3() :: id(mu_bad3()).
-    │ ^^^^^^^^^^^^^^^^^^^^^ recursive type mu_bad3/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:301:1
-    │  
-301 │ ╭ -spec to_mu_bad3_neg(mu_bad2()) ->
-302 │ │     mu_bad3().
-    │ ╰───────────^ to_mu_bad3_neg/1 references types with invalid definitions: mu_bad2/0, mu_bad3/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:305:1
-    │  
-305 │ ╭ -spec to_mu_bad2b_neg(mu_bad2()) ->
-306 │ │   mu_bad2b().
-    │ ╰──────────^ to_mu_bad2b_neg/1 references types with invalid definitions: mu_bad2/0, mu_bad2b/0
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:309:1
-    │
-309 │ -type indirect2() :: mutual2().
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type indirect2/0 is not productive
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:310:1
-    │
-310 │ -type indirect1() :: mutual1().
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type indirect1/0 is not productive
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:312:1
-    │  
-312 │ ╭ -type mutual1() :: indirect1()
-313 │ │   | indirect2().
-    │ ╰─────────────^ recursive type mutual1/0 is not productive
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:314:1
-    │  
-314 │ ╭ -type mutual2() :: indirect1()
-315 │ │   | indirect2().
-    │ ╰─────────────^ recursive type mutual2/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:317:1
-    │  
-317 │ ╭ -spec test_mutual_neg(mutual1()) ->
-318 │ │     mutual2().
-    │ ╰───────────^ test_mutual_neg/1 references types with invalid definitions: mutual1/0, mutual2/0
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:342:1
-    │
-342 │ -type mu_bad5() :: opaque_id(mu_bad5()).
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type mu_bad5/0 is not productive
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:343:1
-    │
-343 │ -type mu_bad5b() :: opaque_id(mu_bad5()).
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type mu_bad5b/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:345:1
-    │  
-345 │ ╭ -spec test_mu_bad5(
-346 │ │     mu_bad5()
-347 │ │ ) -> mu_bad5b().
-    │ ╰─────────────^ test_mu_bad5/1 references types with invalid definitions: mu_bad5/0, mu_bad5b/0
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:392:1
-    │
-392 │ -type recur() :: foo(recur()) | a.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type recur/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:395:1
-    │
-395 │ -spec un_recur_neg(recur()) -> ok.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ un_recur_neg/1 references type with invalid definition: recur/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:399:1
-    │  
-399 │ ╭ -spec term_to_recur_neg(term()) ->
-400 │ │   recur().
-    │ ╰───────^ term_to_recur_neg/1 references type with invalid definition: recur/0
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:409:1
-    │  
-409 │ ╭ -type foo7_neg(T) ::
-410 │ │   {unit, foo7_neg(foo7_neg(T))}.
-    │ ╰───────────────────────────────^ recursive type foo7_neg/1 is not productive
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:441:1
-    │
-441 │ -type x_cycle() :: misc:x_cycle().
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type x_cycle/0 is not productive
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/recursive_aliases.erl:460:1
-    │
-460 │ trick_me(X, X) -> X.
-    │ ^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:477:1
-    │  
-477 │ ╭ -type t_tree2(Z) ::
-478 │ │   {leaf, Z} |
-479 │ │   {node, t_tree2(simple_id(Z))}.
-    │ ╰───────────────────────────────^ recursive type t_tree2/1 is not productive
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:481:1
-    │  
-481 │ ╭ -type t_tree3(Z) ::
-482 │ │   {leaf, Z} |
-483 │ │   {node, t_tree3(t_tree3(Z))}.
-    │ ╰─────────────────────────────^ recursive type t_tree3/1 is not productive
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:493:1
-    │  
-493 │ ╭ -type stream2(Z) ::
-494 │ │   {chunk, stream2(simple_id(Z))}.
-    │ ╰────────────────────────────────^ recursive type stream2/1 is not productive
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-    ┌─ check/src/recursive_aliases.erl:505:1
-    │  
-505 │ ╭ -type d_stream(Z) ::
-506 │ │   {chunk, d_stream([Z])}.
-    │ ╰────────────────────────^ recursive type d_stream/1 is not productive
-
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-    ┌─ check/src/recursive_aliases.erl:508:23
-    │
-508 │ -type invalid_ty() :: non_exist:invalid().
-    │                       ^^^^^^^^^^^^^^^^^^^ Unknown id: non_exist:invalid/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:510:1
-    │  
-510 │ ╭ -type invalid_rec() ::
-511 │ │   invalid_ty() | invalid_transitive().
-    │ ╰───────────────────────────────────^ invalid_rec/0 references type with invalid definition: invalid_ty/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:513:1
-    │  
-513 │ ╭ -type invalid_transitive() ::
-514 │ │   {a, invalid_rec()}.
-    │ ╰────────────────────^ invalid_transitive/0 references type with invalid definition: invalid_rec/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/recursive_aliases.erl:516:1
-    │  
-516 │ ╭ -spec use_invalid
-517 │ │   (invalid_transitive()) -> a.
-    │ ╰─────────────────────────────^ use_invalid/1 references type with invalid definition: invalid_transitive/0
-
-43 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/recursive_aliases-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/recursive_aliases.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/recursive_aliases-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/recursive_aliases.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/refine-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/refine-OTP-27.pretty
deleted file mode 100644
index 20a5b05732..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/refine-OTP-27.pretty
+++ /dev/null
@@ -1,623 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/refine.erl:12:17
-   │
-12 │ param1(X, X) -> X.
-   │                 ^ X.
-Expression has type:   _B
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/refine.erl:16:17
-   │
-16 │ param2(X, X) -> X.
-   │                 ^
-   │                 │
-   │                 X.
-Expression has type:   {B, A}
-Context expected type: {none(), none()}
-   │                 
-
-Because in the expression's type:
-  { 
-    Here the type is:     B
-    Context expects type: none()
-  , A}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {B, A} is not compatible with {none(), none()}
-  because
-  B is not compatible with none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/refine.erl:22:15
-   │
-22 │ maps(M, M) -> M.
-   │               ^ M.
-Expression has type:   #{a := atom()}
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/refine.erl:28:16
-   │
-28 │ funs1(F, F) -> F.
-   │                ^
-   │                │
-   │                F.
-Expression has type:   fun((B | A) -> A)
-Context expected type: fun((A | B) -> none())
-   │                
-
-Because in the expression's type:
-  fun((B | A) ->
-    Here the type is:     A
-    Context expects type: none()
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun((B | A) -> A) is not compatible with fun((A | B) -> none())
-  because
-  A is not compatible with none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/refine.erl:34:16
-   │
-34 │ funs2(F, F) -> F.
-   │                ^
-   │                │
-   │                F.
-Expression has type:   fun((atom() | A) -> A)
-Context expected type: fun((A | atom()) -> none())
-   │                
-
-Because in the expression's type:
-  fun((atom() | A) ->
-    Here the type is:     A
-    Context expects type: none()
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun((atom() | A) -> A) is not compatible with fun((A | atom()) -> none())
-  because
-  A is not compatible with none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/refine.erl:84:27
-   │
-84 │ list_trick_neg([X], _) -> X.
-   │                           ^ X.
-Expression has type:   term()
-Context expected type: U
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/refine.erl:92:28
-   │
-92 │ tuple_trick_neg({X}, _) -> X.
-   │                            ^ X.
-Expression has type:   term()
-Context expected type: U
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:101:8
-    │
-101 │     -> X.
-    │        ^ X.
-Expression has type:   _T
-Context expected type: U
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:112:24
-    │
-112 │     (#{key := Val}) -> Val.
-    │                        ^^^ Val.
-Expression has type:   term()
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:117:26
-    │
-117 │     (<<X, Y/binary>>) -> {X, Y}.
-    │                          ^^^^^^
-    │                          │
-    │                          {X, Y}.
-Expression has type:   {number(), binary()}
-Context expected type: {none(), none()}
-    │                          
-
-Because in the expression's type:
-  { 
-    Here the type is:     number()
-    Context expects type: none()
-  , binary()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {number(), binary()} is not compatible with {none(), none()}
-  because
-  number() is not compatible with none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:126:32
-    │
-126 │     (#my_rec{n = N, a = A}) -> {N, A}.
-    │                                ^^^^^^
-    │                                │
-    │                                {N, A}.
-Expression has type:   {number(), atom()}
-Context expected type: {none(), none()}
-    │                                
-
-Because in the expression's type:
-  { 
-    Here the type is:     number()
-    Context expects type: none()
-  , atom()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {number(), atom()} is not compatible with {none(), none()}
-  because
-  number() is not compatible with none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:139:28
-    │
-139 │ refine_alist1_neg(X, X) -> X.
-    │                            ^ X.
-Expression has type:   ['a' | 'b']
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:144:24
-    │
-144 │ refine_alist2(X, X) -> X.
-    │                        ^
-    │                        │
-    │                        X.
-Expression has type:   ['a' | 'b']
-Context expected type: ['a']
-    │                        
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  ['a' | 'b'] is not compatible with ['a']
-  because
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:151:28
-    │
-151 │ refine_tlist1_neg(X, X) -> X.
-    │                            ^ X.
-Expression has type:   ['a' | 'b']
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:156:24
-    │
-156 │ refine_tlist2(X, X) -> X.
-    │                        ^
-    │                        │
-    │                        X.
-Expression has type:   ['a' | 'b']
-Context expected type: ['a']
-    │                        
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  ['a' | 'b'] is not compatible with ['a']
-  because
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:166:5
-    │
-166 │     Res.
-    │     ^^^ Res.
-Expression has type:   {'cons', 'nil' | my_list()}
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:177:24
-    │
-177 │ opaque1_neg({X, _}) -> X.
-    │                        ^ X.
-Expression has type:   number()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:183:24
-    │
-183 │ opaque2_neg([X, _]) -> X.
-    │                        ^
-    │                        │
-    │                        X.
-Expression has type:   erl_anno:annotation()
-Context expected type: pid()
-    │                        
-
-Because in the expression's type:
-  Here the type is:     tuple()/2 | tuple()/2 | tuple()/2 | tuple()/2 | tuple()/2
-  Context expects type: pid()
-  No candidate of the expression's type matches the expected type.
-
------------------------------- Detailed message ------------------------------
-
-  erl_anno:annotation() is not compatible with pid()
-  because
-  {'file', erl_anno:filename()} | {'generated', erl_anno:generated()} | {'record', erl_anno:record()} | {'text', string()} | {'location', erl_anno:location()} is not compatible with pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:191:7
-    │
-191 │ }) -> X.
-    │       ^ X.
-Expression has type:   'set'
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:198:23
-    │
-198 │ opaque_4_neg(X, X) -> X.
-    │                       ^
-    │                       │
-    │                       X.
-Expression has type:   gb_sets:set(atom())
-Context expected type: pid()
-    │                       
-
-Because in the expression's type:
-  Here the type is:     {number(), gb_sets:gb_set_node(atom())}
-  Context expects type: pid()
-
------------------------------- Detailed message ------------------------------
-
-  gb_sets:set(atom()) is not compatible with pid()
-  because
-  {number(), gb_sets:gb_set_node(atom())} is not compatible with pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:202:31
-    │
-202 │ record_as_tuple1_neg(R, R) -> R.
-    │                               ^ R.
-Expression has type:   #my_rec{}
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:206:31
-    │
-206 │ record_as_tuple2_neg(R, R) -> R.
-    │                               ^ R.
-Expression has type:   #my_rec{}
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:222:28
-    │
-222 │ record_as_tuple6_neg(R) -> R.
-    │                            ^
-    │                            │
-    │                            R.
-Expression has type:   #my_rec{}
-Context expected type: {'not_my_rec', term(), term()}
-    │                            
-
-Because in the expression's type:
-  { 
-    Here the type is:     'my_rec'
-    Context expects type: 'not_my_rec'
-  , number(), atom()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {'my_rec', number(), atom()} is not compatible with {'not_my_rec', term(), term()}
-  because
-  'my_rec' is not compatible with 'not_my_rec'
-
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-    ┌─ check/src/refine.erl:226:10
-    │
-226 │     i :: unknown:unknown()
-    │          ^^^^^^^^^^^^^^^^^ Unknown id: unknown:unknown/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/refine.erl:228:1
-    │  
-228 │ ╭ -spec record_as_tuple7_neg
-229 │ │ (#bad_rec{}) -> {bad_rec, atom()}.
-    │ ╰─────────────────────────────────^ record_as_tuple7_neg/1 references type with invalid definition: #bad_rec{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:240:28
-    │
-240 │ tuple_as_record2_neg(R) -> R.
-    │                            ^
-    │                            │
-    │                            R.
-Expression has type:   {'my_rec', atom(), number()}
-Context expected type: #my_rec{}
-    │                            
-
-Because in the expression's type:
-  { 'my_rec', 
-    Here the type is:     atom()
-    Context expects type: number()
-  , number()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'my_rec', atom(), number()} is not compatible with {'my_rec', number(), atom()}
-  because
-  atom() is not compatible with number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/refine.erl:245:1
-    │  
-245 │ ╭ tup_guard_record1(X)
-246 │ │     when is_record(X, my_rec) ->
-247 │ │     X * 2.
-    │ ╰─────────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:253:5
-    │
-253 │     X * 2.
-    │     ^ X.
-Expression has type:   #my_rec{}
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:259:5
-    │
-259 │     X * 2.
-    │     ^ X.
-Expression has type:   #my_rec{}
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:262:14
-    │
-262 │ ftt(X, _) -> X.
-    │              ^ X.
-Expression has type:   fun((T) -> 'ok')
-Context expected type: T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:265:20
-    │
-265 │ my_rec_to_ok(X) -> X.
-    │                    ^ X.
-Expression has type:   #my_rec{}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:277:26
-    │
-277 │ use2_neg(F, X) -> ftt(F, X).
-    │                          ^
-    │                          │
-    │                          X.
-Expression has type:   {'my_rec', atom(), number()}
-Context expected type: #my_rec{}
-    │                          
-
-Because in the expression's type:
-  { 'my_rec', 
-    Here the type is:     atom()
-    Context expects type: number()
-  , number()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'my_rec', atom(), number()} is not compatible with {'my_rec', number(), atom()}
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:277:26
-    │
-277 │ use2_neg(F, X) -> ftt(F, X).
-    │                          ^
-    │                          │
-    │                          X.
-Expression has type:   {'my_rec', atom(), number()}
-Context expected type: dynamic(#my_rec{})
-    │                          
-
-Because in the expression's type:
-  { 'my_rec', 
-    Here the type is:     atom()
-    Context expects type: number()
-  , number()}
-
------------------------------- Detailed message ------------------------------
-
-  {'my_rec', atom(), number()} is not compatible with dynamic(#my_rec{})
-  because
-  at tuple index 2:
-  {'my_rec', atom(), number()} is not compatible with {'my_rec', number(), atom()}
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:289:26
-    │
-289 │ use4_neg(F, X) -> ftt(F, X).
-    │                          ^
-    │                          │
-    │                          X.
-Expression has type:   #my_rec{}
-Context expected type: {'my_rec', atom(), number()}
-    │                          
-
-Because in the expression's type:
-  { 'my_rec', 
-    Here the type is:     number()
-    Context expects type: atom()
-  , atom()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'my_rec', number(), atom()} is not compatible with {'my_rec', atom(), number()}
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:289:26
-    │
-289 │ use4_neg(F, X) -> ftt(F, X).
-    │                          ^
-    │                          │
-    │                          X.
-Expression has type:   #my_rec{}
-Context expected type: dynamic({'my_rec', atom(), number()})
-    │                          
-
-Because in the expression's type:
-  { 'my_rec', 
-    Here the type is:     number()
-    Context expects type: atom()
-  , atom()}
-
------------------------------- Detailed message ------------------------------
-
-  #my_rec{} is not compatible with dynamic({'my_rec', atom(), number()})
-  because
-  at tuple index 2:
-  {'my_rec', number(), atom()} is not compatible with {'my_rec', atom(), number()}
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:305:21
-    │
-305 │ use6_neg(X) -> ttt2(X, x).
-    │                     ^
-    │                     │
-    │                     X.
-Expression has type:   #my_rec{}
-Context expected type: {'my_rec', atom(), atom()}
-    │                     
-
-Because in the expression's type:
-  { 'my_rec', 
-    Here the type is:     number()
-    Context expects type: atom()
-  , atom()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'my_rec', number(), atom()} is not compatible with {'my_rec', atom(), atom()}
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:309:16
-    │
-309 │ use7_neg(X) -> ttt1(X, 1).
-    │                ^^^^^^^^^^
-    │                │
-    │                ttt1(X, 1).
-Expression has type:   atom() | number()
-Context expected type: number()
-    │                
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: atom()
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  atom() | number() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:313:13
-    │
-313 │ deets(X) -> X.
-    │             ^
-    │             │
-    │             X.
-Expression has type:   #my_rec{} | 'a'
-Context expected type: {'my_rec', term(), term()}
-    │             
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #my_rec{}
-  However the following candidate: 'a'
-  Differs from the expected type:  {'my_rec', term(), term()}
-
------------------------------- Detailed message ------------------------------
-
-  #my_rec{} | 'a' is not compatible with {'my_rec', term(), term()}
-  because
-  'a' is not compatible with {'my_rec', term(), term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:323:5
-    │
-323 │     B.
-    │     ^
-    │     │
-    │     B.
-Expression has type:   'undefined' | binary()
-Context expected type: binary()
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: 'undefined'
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  'undefined' | binary() is not compatible with binary()
-  because
-  'undefined' is not compatible with binary()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-    ┌─ check/src/refine.erl:405:27
-    │
-405 │     eqwalizer:reveal_type(Name),
-    │                           ^^^^ atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:406:5
-    │
-406 │     Name.
-    │     ^^^^ Name.
-Expression has type:   atom()
-Context expected type: 'ok'
-
-41 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/refine-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/refine-OTP-28.pretty
deleted file mode 100644
index ded381093a..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/refine-OTP-28.pretty
+++ /dev/null
@@ -1,623 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/refine.erl:12:17
-   │
-12 │ param1(X, X) -> X.
-   │                 ^ X.
-Expression has type:   _B
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/refine.erl:16:17
-   │
-16 │ param2(X, X) -> X.
-   │                 ^
-   │                 │
-   │                 X.
-Expression has type:   {B, A}
-Context expected type: {none(), none()}
-   │                 
-
-Because in the expression's type:
-  { 
-    Here the type is:     B
-    Context expects type: none()
-  , A}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {B, A} is not compatible with {none(), none()}
-  because
-  B is not compatible with none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/refine.erl:22:15
-   │
-22 │ maps(M, M) -> M.
-   │               ^ M.
-Expression has type:   #{a := atom()}
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/refine.erl:28:16
-   │
-28 │ funs1(F, F) -> F.
-   │                ^
-   │                │
-   │                F.
-Expression has type:   fun((B | A) -> A)
-Context expected type: fun((A | B) -> none())
-   │                
-
-Because in the expression's type:
-  fun((B | A) ->
-    Here the type is:     A
-    Context expects type: none()
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun((B | A) -> A) is not compatible with fun((A | B) -> none())
-  because
-  A is not compatible with none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/refine.erl:34:16
-   │
-34 │ funs2(F, F) -> F.
-   │                ^
-   │                │
-   │                F.
-Expression has type:   fun((atom() | A) -> A)
-Context expected type: fun((A | atom()) -> none())
-   │                
-
-Because in the expression's type:
-  fun((atom() | A) ->
-    Here the type is:     A
-    Context expects type: none()
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun((atom() | A) -> A) is not compatible with fun((A | atom()) -> none())
-  because
-  A is not compatible with none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/refine.erl:84:27
-   │
-84 │ list_trick_neg([X], _) -> X.
-   │                           ^ X.
-Expression has type:   term()
-Context expected type: U
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/refine.erl:92:28
-   │
-92 │ tuple_trick_neg({X}, _) -> X.
-   │                            ^ X.
-Expression has type:   term()
-Context expected type: U
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:101:8
-    │
-101 │     -> X.
-    │        ^ X.
-Expression has type:   _T
-Context expected type: U
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:112:24
-    │
-112 │     (#{key := Val}) -> Val.
-    │                        ^^^ Val.
-Expression has type:   term()
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:117:26
-    │
-117 │     (<<X, Y/binary>>) -> {X, Y}.
-    │                          ^^^^^^
-    │                          │
-    │                          {X, Y}.
-Expression has type:   {number(), binary()}
-Context expected type: {none(), none()}
-    │                          
-
-Because in the expression's type:
-  { 
-    Here the type is:     number()
-    Context expects type: none()
-  , binary()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {number(), binary()} is not compatible with {none(), none()}
-  because
-  number() is not compatible with none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:126:32
-    │
-126 │     (#my_rec{n = N, a = A}) -> {N, A}.
-    │                                ^^^^^^
-    │                                │
-    │                                {N, A}.
-Expression has type:   {number(), atom()}
-Context expected type: {none(), none()}
-    │                                
-
-Because in the expression's type:
-  { 
-    Here the type is:     number()
-    Context expects type: none()
-  , atom()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {number(), atom()} is not compatible with {none(), none()}
-  because
-  number() is not compatible with none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:139:28
-    │
-139 │ refine_alist1_neg(X, X) -> X.
-    │                            ^ X.
-Expression has type:   ['a' | 'b']
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:144:24
-    │
-144 │ refine_alist2(X, X) -> X.
-    │                        ^
-    │                        │
-    │                        X.
-Expression has type:   ['a' | 'b']
-Context expected type: ['a']
-    │                        
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  ['a' | 'b'] is not compatible with ['a']
-  because
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:151:28
-    │
-151 │ refine_tlist1_neg(X, X) -> X.
-    │                            ^ X.
-Expression has type:   ['a' | 'b']
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:156:24
-    │
-156 │ refine_tlist2(X, X) -> X.
-    │                        ^
-    │                        │
-    │                        X.
-Expression has type:   ['a' | 'b']
-Context expected type: ['a']
-    │                        
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  ['a' | 'b'] is not compatible with ['a']
-  because
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:166:5
-    │
-166 │     Res.
-    │     ^^^ Res.
-Expression has type:   {'cons', 'nil' | my_list()}
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:177:24
-    │
-177 │ opaque1_neg({X, _}) -> X.
-    │                        ^ X.
-Expression has type:   number()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:183:24
-    │
-183 │ opaque2_neg([X, _]) -> X.
-    │                        ^
-    │                        │
-    │                        X.
-Expression has type:   erl_anno:annotation()
-Context expected type: pid()
-    │                        
-
-Because in the expression's type:
-  Here the type is:     tuple()/2 | tuple()/2 | tuple()/2 | tuple()/2 | tuple()/2 | ...
-  Context expects type: pid()
-  No candidate of the expression's type matches the expected type.
-
------------------------------- Detailed message ------------------------------
-
-  erl_anno:annotation() is not compatible with pid()
-  because
-  {'file', erl_anno:filename()} | {'end_location', erl_anno:location()} | {'generated', erl_anno:generated()} | {'record', erl_anno:record()} | {'text', string()} | {'location', erl_anno:location()} is not compatible with pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:191:7
-    │
-191 │ }) -> X.
-    │       ^ X.
-Expression has type:   'set'
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:198:23
-    │
-198 │ opaque_4_neg(X, X) -> X.
-    │                       ^
-    │                       │
-    │                       X.
-Expression has type:   gb_sets:set(atom())
-Context expected type: pid()
-    │                       
-
-Because in the expression's type:
-  Here the type is:     {number(), gb_sets:gb_set_node(atom())}
-  Context expects type: pid()
-
------------------------------- Detailed message ------------------------------
-
-  gb_sets:set(atom()) is not compatible with pid()
-  because
-  {number(), gb_sets:gb_set_node(atom())} is not compatible with pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:202:31
-    │
-202 │ record_as_tuple1_neg(R, R) -> R.
-    │                               ^ R.
-Expression has type:   #my_rec{}
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:206:31
-    │
-206 │ record_as_tuple2_neg(R, R) -> R.
-    │                               ^ R.
-Expression has type:   #my_rec{}
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:222:28
-    │
-222 │ record_as_tuple6_neg(R) -> R.
-    │                            ^
-    │                            │
-    │                            R.
-Expression has type:   #my_rec{}
-Context expected type: {'not_my_rec', term(), term()}
-    │                            
-
-Because in the expression's type:
-  { 
-    Here the type is:     'my_rec'
-    Context expects type: 'not_my_rec'
-  , number(), atom()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {'my_rec', number(), atom()} is not compatible with {'not_my_rec', term(), term()}
-  because
-  'my_rec' is not compatible with 'not_my_rec'
-
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-    ┌─ check/src/refine.erl:226:10
-    │
-226 │     i :: unknown:unknown()
-    │          ^^^^^^^^^^^^^^^^^ Unknown id: unknown:unknown/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/refine.erl:228:1
-    │  
-228 │ ╭ -spec record_as_tuple7_neg
-229 │ │ (#bad_rec{}) -> {bad_rec, atom()}.
-    │ ╰─────────────────────────────────^ record_as_tuple7_neg/1 references type with invalid definition: #bad_rec{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:240:28
-    │
-240 │ tuple_as_record2_neg(R) -> R.
-    │                            ^
-    │                            │
-    │                            R.
-Expression has type:   {'my_rec', atom(), number()}
-Context expected type: #my_rec{}
-    │                            
-
-Because in the expression's type:
-  { 'my_rec', 
-    Here the type is:     atom()
-    Context expects type: number()
-  , number()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'my_rec', atom(), number()} is not compatible with {'my_rec', number(), atom()}
-  because
-  atom() is not compatible with number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/refine.erl:245:1
-    │  
-245 │ ╭ tup_guard_record1(X)
-246 │ │     when is_record(X, my_rec) ->
-247 │ │     X * 2.
-    │ ╰─────────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:253:5
-    │
-253 │     X * 2.
-    │     ^ X.
-Expression has type:   #my_rec{}
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:259:5
-    │
-259 │     X * 2.
-    │     ^ X.
-Expression has type:   #my_rec{}
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:262:14
-    │
-262 │ ftt(X, _) -> X.
-    │              ^ X.
-Expression has type:   fun((T) -> 'ok')
-Context expected type: T
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:265:20
-    │
-265 │ my_rec_to_ok(X) -> X.
-    │                    ^ X.
-Expression has type:   #my_rec{}
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:277:26
-    │
-277 │ use2_neg(F, X) -> ftt(F, X).
-    │                          ^
-    │                          │
-    │                          X.
-Expression has type:   {'my_rec', atom(), number()}
-Context expected type: #my_rec{}
-    │                          
-
-Because in the expression's type:
-  { 'my_rec', 
-    Here the type is:     atom()
-    Context expects type: number()
-  , number()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'my_rec', atom(), number()} is not compatible with {'my_rec', number(), atom()}
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:277:26
-    │
-277 │ use2_neg(F, X) -> ftt(F, X).
-    │                          ^
-    │                          │
-    │                          X.
-Expression has type:   {'my_rec', atom(), number()}
-Context expected type: dynamic(#my_rec{})
-    │                          
-
-Because in the expression's type:
-  { 'my_rec', 
-    Here the type is:     atom()
-    Context expects type: number()
-  , number()}
-
------------------------------- Detailed message ------------------------------
-
-  {'my_rec', atom(), number()} is not compatible with dynamic(#my_rec{})
-  because
-  at tuple index 2:
-  {'my_rec', atom(), number()} is not compatible with {'my_rec', number(), atom()}
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:289:26
-    │
-289 │ use4_neg(F, X) -> ftt(F, X).
-    │                          ^
-    │                          │
-    │                          X.
-Expression has type:   #my_rec{}
-Context expected type: {'my_rec', atom(), number()}
-    │                          
-
-Because in the expression's type:
-  { 'my_rec', 
-    Here the type is:     number()
-    Context expects type: atom()
-  , atom()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'my_rec', number(), atom()} is not compatible with {'my_rec', atom(), number()}
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:289:26
-    │
-289 │ use4_neg(F, X) -> ftt(F, X).
-    │                          ^
-    │                          │
-    │                          X.
-Expression has type:   #my_rec{}
-Context expected type: dynamic({'my_rec', atom(), number()})
-    │                          
-
-Because in the expression's type:
-  { 'my_rec', 
-    Here the type is:     number()
-    Context expects type: atom()
-  , atom()}
-
------------------------------- Detailed message ------------------------------
-
-  #my_rec{} is not compatible with dynamic({'my_rec', atom(), number()})
-  because
-  at tuple index 2:
-  {'my_rec', number(), atom()} is not compatible with {'my_rec', atom(), number()}
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:305:21
-    │
-305 │ use6_neg(X) -> ttt2(X, x).
-    │                     ^
-    │                     │
-    │                     X.
-Expression has type:   #my_rec{}
-Context expected type: {'my_rec', atom(), atom()}
-    │                     
-
-Because in the expression's type:
-  { 'my_rec', 
-    Here the type is:     number()
-    Context expects type: atom()
-  , atom()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'my_rec', number(), atom()} is not compatible with {'my_rec', atom(), atom()}
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:309:16
-    │
-309 │ use7_neg(X) -> ttt1(X, 1).
-    │                ^^^^^^^^^^
-    │                │
-    │                ttt1(X, 1).
-Expression has type:   atom() | number()
-Context expected type: number()
-    │                
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: atom()
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  atom() | number() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:313:13
-    │
-313 │ deets(X) -> X.
-    │             ^
-    │             │
-    │             X.
-Expression has type:   #my_rec{} | 'a'
-Context expected type: {'my_rec', term(), term()}
-    │             
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #my_rec{}
-  However the following candidate: 'a'
-  Differs from the expected type:  {'my_rec', term(), term()}
-
------------------------------- Detailed message ------------------------------
-
-  #my_rec{} | 'a' is not compatible with {'my_rec', term(), term()}
-  because
-  'a' is not compatible with {'my_rec', term(), term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:323:5
-    │
-323 │     B.
-    │     ^
-    │     │
-    │     B.
-Expression has type:   'undefined' | binary()
-Context expected type: binary()
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: 'undefined'
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  'undefined' | binary() is not compatible with binary()
-  because
-  'undefined' is not compatible with binary()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-    ┌─ check/src/refine.erl:405:27
-    │
-405 │     eqwalizer:reveal_type(Name),
-    │                           ^^^^ atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:406:5
-    │
-406 │     Name.
-    │     ^^^^ Name.
-Expression has type:   atom()
-Context expected type: 'ok'
-
-41 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/refine-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/refine.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/refine-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/refine.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/scoping-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/scoping-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/scoping-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/scoping-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/scoping-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/scoping-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/scoping-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/scoping-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/scoping-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_callbacks_2-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/scoping.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_callbacks_2-OTP-27.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/scoping.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/skip-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/skip-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/skip-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/skip-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/skip-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/skip-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/skip-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/skip-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/skip-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_callbacks_2-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/skip.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_callbacks_2-OTP-28.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/skip.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/static_maybe-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/static_maybe-OTP-27.pretty
deleted file mode 100644
index 534ecac9b6..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/static_maybe-OTP-27.pretty
+++ /dev/null
@@ -1,17 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/static_maybe.erl:26:9
-   │
-26 │         A
-   │         ^ A.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/static_maybe.erl:50:14
-   │
-50 │         _ -> 3
-   │              ^ 3.
-Expression has type:   number()
-Context expected type: atom()
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/static_maybe-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/static_maybe-OTP-28.pretty
deleted file mode 100644
index 534ecac9b6..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/static_maybe-OTP-28.pretty
+++ /dev/null
@@ -1,17 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/static_maybe.erl:26:9
-   │
-26 │         A
-   │         ^ A.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/static_maybe.erl:50:14
-   │
-50 │         _ -> 3
-   │              ^ 3.
-Expression has type:   number()
-Context expected type: atom()
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/static_maybe-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/static_maybe.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/static_maybe-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/static_maybe.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/strict_complex_types-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/strict_complex_types-OTP-27.pretty
deleted file mode 100644
index cc9f9d0634..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/strict_complex_types-OTP-27.pretty
+++ /dev/null
@@ -1,76 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/strict_complex_types.erl:24:3
-   │
-24 │   undefined.
-   │   ^^^^^^^^^
-   │   │
-   │   'undefined'.
-Expression has type:   'undefined'
-Context expected type: complex_map()
-   │   
-
-Because in the expression's type:
-  Here the type is:     'undefined'
-  Context expects type: #{...}
-
------------------------------- Detailed message ------------------------------
-
-  'undefined' is not compatible with complex_map()
-  because
-  'undefined' is not compatible with #{id := number(), {secret, id} => number(), atom() => term()}
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/strict_complex_types.erl:29:25
-   │
-29 │   eqwalizer:reveal_type(Map),
-   │                         ^^^ complex_map()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/strict_complex_types.erl:35:25
-   │
-35 │   eqwalizer:reveal_type(List),
-   │                         ^^^^ [complex_map()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/strict_complex_types.erl:48:16
-   │
-48 │   lists:nth(7, Map).
-   │                ^^^
-   │                │
-   │                Map.
-Expression has type:   complex_map()
-Context expected type: [T]
-   │                
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: [T]
-
------------------------------- Detailed message ------------------------------
-
-  complex_map() is not compatible with [T]
-  because
-  #{id := number(), {secret, id} => number(), atom() => term()} is not compatible with [T]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/strict_complex_types.erl:48:16
-   │
-48 │   lists:nth(7, Map).
-   │                ^^^
-   │                │
-   │                Map.
-Expression has type:   complex_map()
-Context expected type: [dynamic()]
-   │                
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: [dynamic()]
-
------------------------------- Detailed message ------------------------------
-
-  complex_map() is not compatible with [dynamic()]
-  because
-  #{id := number(), {secret, id} => number(), atom() => term()} is not compatible with [dynamic()]
-
-5 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/strict_complex_types-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/strict_complex_types-OTP-28.pretty
deleted file mode 100644
index cc9f9d0634..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/strict_complex_types-OTP-28.pretty
+++ /dev/null
@@ -1,76 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/strict_complex_types.erl:24:3
-   │
-24 │   undefined.
-   │   ^^^^^^^^^
-   │   │
-   │   'undefined'.
-Expression has type:   'undefined'
-Context expected type: complex_map()
-   │   
-
-Because in the expression's type:
-  Here the type is:     'undefined'
-  Context expects type: #{...}
-
------------------------------- Detailed message ------------------------------
-
-  'undefined' is not compatible with complex_map()
-  because
-  'undefined' is not compatible with #{id := number(), {secret, id} => number(), atom() => term()}
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/strict_complex_types.erl:29:25
-   │
-29 │   eqwalizer:reveal_type(Map),
-   │                         ^^^ complex_map()
-
-error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-   ┌─ check/src/strict_complex_types.erl:35:25
-   │
-35 │   eqwalizer:reveal_type(List),
-   │                         ^^^^ [complex_map()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/strict_complex_types.erl:48:16
-   │
-48 │   lists:nth(7, Map).
-   │                ^^^
-   │                │
-   │                Map.
-Expression has type:   complex_map()
-Context expected type: [T]
-   │                
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: [T]
-
------------------------------- Detailed message ------------------------------
-
-  complex_map() is not compatible with [T]
-  because
-  #{id := number(), {secret, id} => number(), atom() => term()} is not compatible with [T]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/strict_complex_types.erl:48:16
-   │
-48 │   lists:nth(7, Map).
-   │                ^^^
-   │                │
-   │                Map.
-Expression has type:   complex_map()
-Context expected type: [dynamic()]
-   │                
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: [dynamic()]
-
------------------------------- Detailed message ------------------------------
-
-  complex_map() is not compatible with [dynamic()]
-  because
-  #{id := number(), {secret, id} => number(), atom() => term()} is not compatible with [dynamic()]
-
-5 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/strict_complex_types-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/strict_complex_types.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/strict_complex_types-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/strict_complex_types.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/strict_fun-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/strict_fun-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/strict_fun-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/strict_fun-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/strict_fun-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/strict_fun-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/strict_fun-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/strict_fun-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/strict_fun-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_receive-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/strict_fun.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_receive-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/strict_fun.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/strict_receive-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/strict_receive-OTP-27.pretty
deleted file mode 100644
index 9bff7ab9cc..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/strict_receive-OTP-27.pretty
+++ /dev/null
@@ -1,9 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/strict_receive.erl:71:9
-   │
-71 │   after T -> ok
-   │         ^ T.
-Expression has type:   atom()
-Context expected type: timeout()
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/strict_receive-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/strict_receive-OTP-28.pretty
deleted file mode 100644
index 9bff7ab9cc..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/strict_receive-OTP-28.pretty
+++ /dev/null
@@ -1,9 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/strict_receive.erl:71:9
-   │
-71 │   after T -> ok
-   │         ^ T.
-Expression has type:   atom()
-Context expected type: timeout()
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/strict_receive-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/strict_receive.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/strict_receive-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/strict_receive.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/subtype_neg-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/subtype_neg-OTP-27.pretty
deleted file mode 100644
index 1ee53764d2..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/subtype_neg-OTP-27.pretty
+++ /dev/null
@@ -1,391 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:17:11
-   │
-17 │ f01(X) -> X.
-   │           ^ X.
-Expression has type:   term()
-Context expected type: {A, A}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:20:11
-   │
-20 │ f02(X) -> X.
-   │           ^ X.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:24:11
-   │
-24 │ f03(F) -> F.
-   │           ^
-   │           │
-   │           F.
-Expression has type:   fun((atom()) -> term())
-Context expected type: fun((term()) -> atom())
-   │           
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     term()
-    Context expects type: atom()
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> term()) is not compatible with fun((term()) -> atom())
-  because
-  term() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:27:11
-   │
-27 │ f04(X) -> X.
-   │           ^
-   │           │
-   │           X.
-Expression has type:   'a' | 'b' | 'c'
-Context expected type: 'a' | 'b'
-   │           
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'a' | 'b'
-  However the following candidate: 'c'
-  Differs from the expected type:  'a' | 'b'
-
------------------------------- Detailed message ------------------------------
-
-  'a' | 'b' | 'c' is not compatible with 'a' | 'b'
-  because
-  'c' is not compatible with 'a' | 'b'
-  because
-  'c' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:30:11
-   │
-30 │ f05(X) -> X.
-   │           ^ X.
-Expression has type:   'a' | 'b'
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:34:11
-   │
-34 │ f06(X) -> X.
-   │           ^
-   │           │
-   │           X.
-Expression has type:   {'a' | 'b', 'a' | 'b'}
-Context expected type: {'a', 'b'} | {'b', 'a'}
-   │           
-
-Because in the expression's type:
-  { 
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  , 'a' | 'b'}
-
------------------------------- Detailed message ------------------------------
-
-  {'a' | 'b', 'a' | 'b'} is not compatible with {'a', 'b'} | {'b', 'a'}
-  because
-  at tuple index 1:
-  {'a' | 'b', 'a' | 'b'} is not compatible with {'a', 'b'}
-  because
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:38:11
-   │
-38 │ f07(X) -> X.
-   │           ^
-   │           │
-   │           X.
-Expression has type:   pair_ab()
-Context expected type: pair_diff_elems()
-   │           
-
-Because in the expression's type:
-  { 
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  , ab()}
-
------------------------------- Detailed message ------------------------------
-
-  pair_ab() is not compatible with pair_diff_elems()
-  because
-  {ab(), ab()} is not compatible with pair_diff_elems()
-  because
-  {ab(), ab()} is not compatible with {'a', 'b'} | {'b', 'a'}
-  because
-  at tuple index 1:
-  {ab(), ab()} is not compatible with {'a', 'b'}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:41:11
-   │
-41 │ f08(X) -> X.
-   │           ^ X.
-Expression has type:   {none(), none()}
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:48:13
-   │
-48 │ map02(M) -> M.
-   │             ^
-   │             │
-   │             M.
-Expression has type:   #{a => atom()}
-Context expected type: #{a := atom()}
-   │             
-
-Because in the expression's type:
-  Here the type is:     #{a => ..., ...}
-  Context expects type: #{a := ..., ...}
-  The type of the expression is missing the following required keys: a.
-
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:52:13
-   │
-52 │ map03(M) -> M.
-   │             ^
-   │             │
-   │             M.
-Expression has type:   #{a := atom(), b := atom()}
-Context expected type: #{a => atom()}
-   │             
-
-Because in the expression's type:
-  Here the type is:     #{b := ...}
-  Context expects type: #{...}
-  The expected map has no corresponding key for: b.
-
------------------------------- Detailed message ------------------------------
-
-key `b` is declared in the former but not in the latter and the latter map has no default association
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:60:13
-   │
-60 │ map05(M) -> M.
-   │             ^
-   │             │
-   │             M.
-Expression has type:   #{'a' | 'b' => 'a' | 'b' | 'c'}
-Context expected type: #{a := 'a' | 'b', b => 'a' | 'b'}
-   │             
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{a := ..., ...}
-  The type of the expression is missing the following required keys: a.
-
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:64:13
-   │
-64 │ map06(M) -> M.
-   │             ^
-   │             │
-   │             M.
-Expression has type:   #{term() => number()}
-Context expected type: #{atom() => number()}
-   │             
-
-Because in the expression's type:
-  #{ map domains are incompatible:
-    Here the type is:     term()
-    Context expects type: atom()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{term() => number()} is not compatible with #{atom() => number()}
-  the default associations are not compatible
-  because
-  term() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:68:13
-   │
-68 │ map07(M) -> M.
-   │             ^
-   │             │
-   │             M.
-Expression has type:   #{atom() => term()}
-Context expected type: #{atom() => number()}
-   │             
-
-Because in the expression's type:
-  #{ atom() =>
-    Here the type is:     term()
-    Context expects type: number()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{atom() => term()} is not compatible with #{atom() => number()}
-  the default associations are not compatible
-  because
-  term() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:72:13
-   │
-72 │ map08(M) -> M.
-   │             ^
-   │             │
-   │             M.
-Expression has type:   #{atom() => term()}
-Context expected type: #{}
-   │             
-
-Because in the expression's type:
-  Here the type is:     #{atom() => term()}
-  Context expects type: #{...} (no default association)
-  The expected map has no default association while the type of the expression has one.
-
------------------------------- Detailed message ------------------------------
-
-  #{atom() => term()} is not compatible with #{}
-  because
-  #{atom() => term()} is not compatible with #{}
-  the latter map has no default association while the first map has one
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:79:15
-   │
-79 │ any_fun(F) -> F.
-   │               ^ F.
-Expression has type:   term()
-Context expected type: fun()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:83:5
-   │
-83 │     {{}, error}.
-   │     ^^^^^^^^^^^
-   │     │
-   │     {{}, 'error'}.
-Expression has type:   {{}, 'error'}
-Context expected type: {tuple(), 'ok'}
-   │     
-
-Because in the expression's type:
-  { {}, 
-    Here the type is:     'error'
-    Context expects type: 'ok'
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {{}, 'error'} is not compatible with {tuple(), 'ok'}
-  because
-  'error' is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:87:5
-   │
-87 │     {[], error}.
-   │     ^^^^^^^^^^^
-   │     │
-   │     {[], 'error'}.
-Expression has type:   {[], 'error'}
-Context expected type: {[pid()], 'ok'}
-   │     
-
-Because in the expression's type:
-  { [], 
-    Here the type is:     'error'
-    Context expects type: 'ok'
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {[], 'error'} is not compatible with {[pid()], 'ok'}
-  because
-  'error' is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:91:5
-   │
-91 │     {[], error}.
-   │     ^^^^^^^^^^^
-   │     │
-   │     {[], 'error'}.
-Expression has type:   {[], 'error'}
-Context expected type: {iolist(), 'ok'}
-   │     
-
-Because in the expression's type:
-  { [], 
-    Here the type is:     'error'
-    Context expects type: 'ok'
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {[], 'error'} is not compatible with {iolist(), 'ok'}
-  because
-  'error' is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:94:13
-   │
-94 │ nil_1(L) -> L.
-   │             ^
-   │             │
-   │             L.
-Expression has type:   ['a']
-Context expected type: []
-   │             
-
-Because in the expression's type:
-  [
-    Here the type is:     'a'
-    Context expects type: none()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:97:13
-   │
-97 │ nil_2(L) -> L.
-   │             ^
-   │             │
-   │             L.
-Expression has type:   ['a'] | [none()]
-Context expected type: []
-   │             
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: [none()]
-  However, the following candidate doesn't match:
-  [
-    Here the type is:     'a'
-    Context expects type: none()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  ['a'] | [none()] is not compatible with []
-  because
-  ['a'] is not compatible with []
-
-20 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/subtype_neg-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/subtype_neg-OTP-28.pretty
deleted file mode 100644
index 1ee53764d2..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/subtype_neg-OTP-28.pretty
+++ /dev/null
@@ -1,391 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:17:11
-   │
-17 │ f01(X) -> X.
-   │           ^ X.
-Expression has type:   term()
-Context expected type: {A, A}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:20:11
-   │
-20 │ f02(X) -> X.
-   │           ^ X.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:24:11
-   │
-24 │ f03(F) -> F.
-   │           ^
-   │           │
-   │           F.
-Expression has type:   fun((atom()) -> term())
-Context expected type: fun((term()) -> atom())
-   │           
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     term()
-    Context expects type: atom()
-  )
-
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> term()) is not compatible with fun((term()) -> atom())
-  because
-  term() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:27:11
-   │
-27 │ f04(X) -> X.
-   │           ^
-   │           │
-   │           X.
-Expression has type:   'a' | 'b' | 'c'
-Context expected type: 'a' | 'b'
-   │           
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'a' | 'b'
-  However the following candidate: 'c'
-  Differs from the expected type:  'a' | 'b'
-
------------------------------- Detailed message ------------------------------
-
-  'a' | 'b' | 'c' is not compatible with 'a' | 'b'
-  because
-  'c' is not compatible with 'a' | 'b'
-  because
-  'c' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:30:11
-   │
-30 │ f05(X) -> X.
-   │           ^ X.
-Expression has type:   'a' | 'b'
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:34:11
-   │
-34 │ f06(X) -> X.
-   │           ^
-   │           │
-   │           X.
-Expression has type:   {'a' | 'b', 'a' | 'b'}
-Context expected type: {'a', 'b'} | {'b', 'a'}
-   │           
-
-Because in the expression's type:
-  { 
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  , 'a' | 'b'}
-
------------------------------- Detailed message ------------------------------
-
-  {'a' | 'b', 'a' | 'b'} is not compatible with {'a', 'b'} | {'b', 'a'}
-  because
-  at tuple index 1:
-  {'a' | 'b', 'a' | 'b'} is not compatible with {'a', 'b'}
-  because
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:38:11
-   │
-38 │ f07(X) -> X.
-   │           ^
-   │           │
-   │           X.
-Expression has type:   pair_ab()
-Context expected type: pair_diff_elems()
-   │           
-
-Because in the expression's type:
-  { 
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a'
-  , ab()}
-
------------------------------- Detailed message ------------------------------
-
-  pair_ab() is not compatible with pair_diff_elems()
-  because
-  {ab(), ab()} is not compatible with pair_diff_elems()
-  because
-  {ab(), ab()} is not compatible with {'a', 'b'} | {'b', 'a'}
-  because
-  at tuple index 1:
-  {ab(), ab()} is not compatible with {'a', 'b'}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:41:11
-   │
-41 │ f08(X) -> X.
-   │           ^ X.
-Expression has type:   {none(), none()}
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:48:13
-   │
-48 │ map02(M) -> M.
-   │             ^
-   │             │
-   │             M.
-Expression has type:   #{a => atom()}
-Context expected type: #{a := atom()}
-   │             
-
-Because in the expression's type:
-  Here the type is:     #{a => ..., ...}
-  Context expects type: #{a := ..., ...}
-  The type of the expression is missing the following required keys: a.
-
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:52:13
-   │
-52 │ map03(M) -> M.
-   │             ^
-   │             │
-   │             M.
-Expression has type:   #{a := atom(), b := atom()}
-Context expected type: #{a => atom()}
-   │             
-
-Because in the expression's type:
-  Here the type is:     #{b := ...}
-  Context expects type: #{...}
-  The expected map has no corresponding key for: b.
-
------------------------------- Detailed message ------------------------------
-
-key `b` is declared in the former but not in the latter and the latter map has no default association
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:60:13
-   │
-60 │ map05(M) -> M.
-   │             ^
-   │             │
-   │             M.
-Expression has type:   #{'a' | 'b' => 'a' | 'b' | 'c'}
-Context expected type: #{a := 'a' | 'b', b => 'a' | 'b'}
-   │             
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{a := ..., ...}
-  The type of the expression is missing the following required keys: a.
-
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:64:13
-   │
-64 │ map06(M) -> M.
-   │             ^
-   │             │
-   │             M.
-Expression has type:   #{term() => number()}
-Context expected type: #{atom() => number()}
-   │             
-
-Because in the expression's type:
-  #{ map domains are incompatible:
-    Here the type is:     term()
-    Context expects type: atom()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{term() => number()} is not compatible with #{atom() => number()}
-  the default associations are not compatible
-  because
-  term() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:68:13
-   │
-68 │ map07(M) -> M.
-   │             ^
-   │             │
-   │             M.
-Expression has type:   #{atom() => term()}
-Context expected type: #{atom() => number()}
-   │             
-
-Because in the expression's type:
-  #{ atom() =>
-    Here the type is:     term()
-    Context expects type: number()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{atom() => term()} is not compatible with #{atom() => number()}
-  the default associations are not compatible
-  because
-  term() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:72:13
-   │
-72 │ map08(M) -> M.
-   │             ^
-   │             │
-   │             M.
-Expression has type:   #{atom() => term()}
-Context expected type: #{}
-   │             
-
-Because in the expression's type:
-  Here the type is:     #{atom() => term()}
-  Context expects type: #{...} (no default association)
-  The expected map has no default association while the type of the expression has one.
-
------------------------------- Detailed message ------------------------------
-
-  #{atom() => term()} is not compatible with #{}
-  because
-  #{atom() => term()} is not compatible with #{}
-  the latter map has no default association while the first map has one
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:79:15
-   │
-79 │ any_fun(F) -> F.
-   │               ^ F.
-Expression has type:   term()
-Context expected type: fun()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:83:5
-   │
-83 │     {{}, error}.
-   │     ^^^^^^^^^^^
-   │     │
-   │     {{}, 'error'}.
-Expression has type:   {{}, 'error'}
-Context expected type: {tuple(), 'ok'}
-   │     
-
-Because in the expression's type:
-  { {}, 
-    Here the type is:     'error'
-    Context expects type: 'ok'
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {{}, 'error'} is not compatible with {tuple(), 'ok'}
-  because
-  'error' is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:87:5
-   │
-87 │     {[], error}.
-   │     ^^^^^^^^^^^
-   │     │
-   │     {[], 'error'}.
-Expression has type:   {[], 'error'}
-Context expected type: {[pid()], 'ok'}
-   │     
-
-Because in the expression's type:
-  { [], 
-    Here the type is:     'error'
-    Context expects type: 'ok'
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {[], 'error'} is not compatible with {[pid()], 'ok'}
-  because
-  'error' is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:91:5
-   │
-91 │     {[], error}.
-   │     ^^^^^^^^^^^
-   │     │
-   │     {[], 'error'}.
-Expression has type:   {[], 'error'}
-Context expected type: {iolist(), 'ok'}
-   │     
-
-Because in the expression's type:
-  { [], 
-    Here the type is:     'error'
-    Context expects type: 'ok'
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {[], 'error'} is not compatible with {iolist(), 'ok'}
-  because
-  'error' is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:94:13
-   │
-94 │ nil_1(L) -> L.
-   │             ^
-   │             │
-   │             L.
-Expression has type:   ['a']
-Context expected type: []
-   │             
-
-Because in the expression's type:
-  [
-    Here the type is:     'a'
-    Context expects type: none()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/subtype_neg.erl:97:13
-   │
-97 │ nil_2(L) -> L.
-   │             ^
-   │             │
-   │             L.
-Expression has type:   ['a'] | [none()]
-Context expected type: []
-   │             
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: [none()]
-  However, the following candidate doesn't match:
-  [
-    Here the type is:     'a'
-    Context expects type: none()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  ['a'] | [none()] is not compatible with []
-  because
-  ['a'] is not compatible with []
-
-20 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/subtype_neg-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/subtype_neg.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/subtype_neg-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/subtype_neg.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/subtype_pos-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/subtype_pos-OTP-27.pretty
deleted file mode 100644
index 20634a306c..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/subtype_pos-OTP-27.pretty
+++ /dev/null
@@ -1,13 +0,0 @@
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/subtype_pos.erl:30:1
-   │
-30 │ f05(X) -> X.
-   │ ^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/subtype_pos.erl:41:1
-   │
-41 │ f08(X) -> X.
-   │ ^^^^^^^^^^^ Clause is not covered by spec
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/subtype_pos-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/subtype_pos-OTP-28.pretty
deleted file mode 100644
index 20634a306c..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/subtype_pos-OTP-28.pretty
+++ /dev/null
@@ -1,13 +0,0 @@
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/subtype_pos.erl:30:1
-   │
-30 │ f05(X) -> X.
-   │ ^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/subtype_pos.erl:41:1
-   │
-41 │ f08(X) -> X.
-   │ ^^^^^^^^^^^ Clause is not covered by spec
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/subtype_pos-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/subtype_pos.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/subtype_pos-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/subtype_pos.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/t_maps-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/t_maps-OTP-27.pretty
deleted file mode 100644
index d0e08f9ac4..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/t_maps-OTP-27.pretty
+++ /dev/null
@@ -1,915 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/t_maps.erl:36:5
-   │
-36 │     #{0 => 1, 1 => 2}.
-   │     ^^^^^^^^^^^^^^^^^
-   │     │
-   │     #{..}.
-Expression has type:   #{number() => number()}
-Context expected type: #{number() => atom()}
-   │     
-
-Because in the expression's type:
-  #{ number() =>
-    Here the type is:     number()
-    Context expects type: atom()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{number() => number()} is not compatible with #{number() => atom()}
-  the default associations are not compatible
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/t_maps.erl:41:5
-   │
-41 │     #{0 => zero, 1 => 2}.
-   │     ^^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     #{..}.
-Expression has type:   #{number() => 'zero' | number()}
-Context expected type: #{number() => atom()}
-   │     
-
-Because in the expression's type:
-  #{ number() =>
-    Here the type is a union type with some valid candidates: 'zero'
-    However the following candidate: number()
-    Differs from the expected type:  atom()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{number() => 'zero' | number()} is not compatible with #{number() => atom()}
-  the default associations are not compatible
-  because
-  'zero' | number() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/t_maps.erl:56:5
-   │
-56 │     #{zero => 0, one => one}.
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     #{..}.
-Expression has type:   #{one := 'one', zero := number()}
-Context expected type: #{one => number(), zero := number()}
-   │     
-
-Because in the expression's type:
-  #{ one =>
-    Here the type is:     'one'
-    Context expects type: number()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{one := 'one', zero := number()} is not compatible with #{one => number(), zero := number()}
-  because
-  at key `one`:
-  #{one := 'one', zero := number()} is not compatible with #{one => number(), zero := number()}
-  because
-  'one' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/t_maps.erl:80:5
-   │
-80 │     M#{}.
-   │     ^ M.
-Expression has type:   term()
-Context expected type: #{term() => term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:120:5
-    │
-120 │     S#{bar := true}.
-    │     ^ S.
-Expression has type:   term()
-Context expected type: #{term() => term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:130:25
-    │
-130 │ meet_dict2_neg(D, D) -> D.
-    │                         ^
-    │                         │
-    │                         D.
-Expression has type:   #{b() => term()}
-Context expected type: #{n() => term()}
-    │                         
-
-Because in the expression's type:
-  #{ map domains are incompatible:
-    Here the type is:     boolean()
-    Context expects type: n()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{b() => term()} is not compatible with #{n() => term()}
-  the default associations are not compatible
-  because
-  b() is not compatible with n()
-  because
-  boolean() is not compatible with n()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:140:26
-    │
-140 │ meet_shape2_neg(S, S) -> S.
-    │                          ^
-    │                          │
-    │                          S.
-Expression has type:   #{a := b()}
-Context expected type: #{a := n()}
-    │                          
-
-Because in the expression's type:
-  #{ a =>
-    Here the type is:     boolean()
-    Context expects type: n()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a := b()} is not compatible with #{a := n()}
-  because
-  at key `a`:
-  #{a := b()} is not compatible with #{a := n()}
-  because
-  b() is not compatible with n()
-  because
-  boolean() is not compatible with n()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:145:26
-    │
-145 │ meet_shape3_neg(S, S) -> S.
-    │                          ^
-    │                          │
-    │                          S.
-Expression has type:   #{a := b()}
-Context expected type: #{a => n()}
-    │                          
-
-Because in the expression's type:
-  #{ a =>
-    Here the type is:     boolean()
-    Context expects type: n()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a := b()} is not compatible with #{a => n()}
-  because
-  at key `a`:
-  #{a := b()} is not compatible with #{a => n()}
-  because
-  b() is not compatible with n()
-  because
-  boolean() is not compatible with n()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:155:26
-    │
-155 │ meet_shape5_neg(S, S) -> S.
-    │                          ^
-    │                          │
-    │                          S.
-Expression has type:   #{a => b()}
-Context expected type: #{a := b()}
-    │                          
-
-Because in the expression's type:
-  Here the type is:     #{a => ..., ...}
-  Context expects type: #{a := ..., ...}
-  The type of the expression is missing the following required keys: a.
-
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/t_maps.erl:165:1
-    │
-165 │ meet_shape7(S, S) -> S.
-    │ ^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:202:5
-    │
-202 │     S#{K => V}.
-    │     ^^^^^^^^^^
-    │     │
-    │     ..#{..}.
-Expression has type:   #{a := a(), n() => a()}
-Context expected type: #{a() => a()}
-    │     
-
-Because in the expression's type:
-  #{ map domains are incompatible:
-    Here the type is:     number()
-    Context expects type: atom()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a := a(), n() => a()} is not compatible with #{a() => a()}
-  the default associations are not compatible
-  because
-  n() is not compatible with a()
-  because
-  number() is not compatible with a()
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:208:5
-    │
-208 │     S#{K => V}.
-    │     ^^^^^^^^^^
-    │     │
-    │     ..#{..}.
-Expression has type:   #{a := a(), n() => a()}
-Context expected type: #{n() => a()}
-    │     
-
-Because in the expression's type:
-  #{ incompatible map key a:
-    Here the type is:     'a'
-    Context expects type: number()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a := a(), n() => a()} is not compatible with #{n() => a()}
-  because
-  #{a := a(), n() => a()} is not compatible with #{n() => a()}
-  key `a` is declared in the former but not in the latter and key `a` isn't compatible with the default association of the latter map
-  because
-  'a' is not compatible with n()
-  because
-  'a' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:216:5
-    │
-216 │     S#{K => V}.
-    │     ^^^^^^^^^^
-    │     │
-    │     ..#{..}.
-Expression has type:   #{a := a(), n() => a()}
-Context expected type: #{n() => a()}
-    │     
-
-Because in the expression's type:
-  #{ incompatible map key a:
-    Here the type is:     'a'
-    Context expects type: number()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a := a(), n() => a()} is not compatible with #{n() => a()}
-  because
-  #{a := a(), n() => a()} is not compatible with #{n() => a()}
-  key `a` is declared in the former but not in the latter and key `a` isn't compatible with the default association of the latter map
-  because
-  'a' is not compatible with n()
-  because
-  'a' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:224:5
-    │
-224 │     S#{K => V}.
-    │     ^^^^^^^^^^
-    │     │
-    │     ..#{..}.
-Expression has type:   #{a => a(), n() => a()}
-Context expected type: #{n() => a()}
-    │     
-
-Because in the expression's type:
-  #{ incompatible map key a:
-    Here the type is:     'a'
-    Context expects type: number()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a => a(), n() => a()} is not compatible with #{n() => a()}
-  because
-  #{a => a(), n() => a()} is not compatible with #{n() => a()}
-  key `a` is declared in the former but not in the latter and key `a` isn't compatible with the default association of the latter map
-  because
-  'a' is not compatible with n()
-  because
-  'a' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:242:5
-    │
-242 │     FB#{foo := F1, bar := B1}.
-    │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-    │     │
-    │     ..#{..}.
-Expression has type:   #{bar := B1, foo := F1}
-Context expected type: foo_bar(B1, F1)
-    │     
-
-Because in the expression's type:
-  #{ bar =>
-    Here the type is:     B1
-    Context expects type: F1
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{bar := B1, foo := F1} is not compatible with foo_bar(B1, F1)
-  because
-  #{bar := B1, foo := F1} is not compatible with #{bar := F1, foo := B1}
-  because
-  at key `bar`:
-  #{bar := B1, foo := F1} is not compatible with #{bar := F1, foo := B1}
-  because
-  B1 is not compatible with F1
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:254:5
-    │
-254 │     FB#{foo => F1, bar => B1}.
-    │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-    │     │
-    │     ..#{..}.
-Expression has type:   #{bar := B1, foo := F1}
-Context expected type: foo_bar_opt(B1, F1)
-    │     
-
-Because in the expression's type:
-  #{ bar =>
-    Here the type is:     B1
-    Context expects type: F1
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{bar := B1, foo := F1} is not compatible with foo_bar_opt(B1, F1)
-  because
-  #{bar := B1, foo := F1} is not compatible with #{bar => F1, foo => B1}
-  because
-  at key `bar`:
-  #{bar := B1, foo := F1} is not compatible with #{bar => F1, foo => B1}
-  because
-  B1 is not compatible with F1
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:266:5
-    │
-266 │     Dict#{V2 => K2}.
-    │     ^^^^^^^^^^^^^^^
-    │     │
-    │     ..#{..}.
-Expression has type:   #{K1 | V2 => V1 | K2}
-Context expected type: kv(K1 | K2, V1 | V2)
-    │     
-
-Because in the expression's type:
-  #{ map domains are incompatible:
-    Here the type is a union type with some valid candidates: K1
-    However the following candidate: V2
-    Differs from the expected type:  K1 | K2
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{K1 | V2 => V1 | K2} is not compatible with kv(K1 | K2, V1 | V2)
-  because
-  #{K1 | V2 => V1 | K2} is not compatible with #{K1 | K2 => V1 | V2}
-  the default associations are not compatible
-  because
-  K1 | V2 is not compatible with K1 | K2
-  because
-  V2 is not compatible with K1 | K2
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:283:19
-    │
-283 │     needs_shape_a(X#{b => hello}).
-    │                   ^^^^^^^^^^^^^^
-    │                   │
-    │                   ..#{..}.
-Expression has type:   #{a := number(), b := 'hello'}
-Context expected type: #{a := term()}
-    │                   
-
-Because in the expression's type:
-  Here the type is:     #{b := ...}
-  Context expects type: #{...}
-  The expected map has no corresponding key for: b.
-
------------------------------- Detailed message ------------------------------
-
-key `b` is declared in the former but not in the latter and the latter map has no default association
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:307:22
-    │
-307 │         #{K := V} -> {K, V};
-    │                      ^^^^^^
-    │                      │
-    │                      {K, V}.
-Expression has type:   {a(), n()}
-Context expected type: {n(), a()}
-    │                      
-
-Because in the expression's type:
-  { 
-    Here the type is:     atom()
-    Context expects type: number()
-  , n()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {a(), n()} is not compatible with {n(), a()}
-  because
-  a() is not compatible with n()
-  because
-  atom() is not compatible with n()
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:321:5
-    │
-321 │     {A, N}.
-    │     ^^^^^^
-    │     │
-    │     {A, N}.
-Expression has type:   {a(), n()}
-Context expected type: {n(), a()}
-    │     
-
-Because in the expression's type:
-  { 
-    Here the type is:     atom()
-    Context expects type: number()
-  , n()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {a(), n()} is not compatible with {n(), a()}
-  because
-  a() is not compatible with n()
-  because
-  atom() is not compatible with n()
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:334:25
-    │
-334 │ to_map3_neg(#{} = M) -> M;
-    │                         ^
-    │                         │
-    │                         M.
-Expression has type:   #{V => K}
-Context expected type: #{K => V}
-    │                         
-
-Because in the expression's type:
-  #{ map domains are incompatible:
-    Here the type is:     V
-    Context expects type: K
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{V => K} is not compatible with #{K => V}
-  the default associations are not compatible
-  because
-  V is not compatible with K
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:351:25
-    │
-351 │ to_map5_neg(#{} = M) -> M.
-    │                         ^
-    │                         │
-    │                         M.
-Expression has type:   #{a() => n()} | #{n() => a()} | #{id => 'id' | 'no_id'}
-Context expected type: #{a() | n() => a()}
-    │                         
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: #{n() => a()} | #{id => 'id' | 'no_id'}
-  However, the following candidate doesn't match:
-  #{ a() =>
-    Here the type is:     number()
-    Context expects type: atom()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a() => n()} | #{n() => a()} | #{id => 'id' | 'no_id'} is not compatible with #{a() | n() => a()}
-  because
-  #{a() => n()} is not compatible with #{a() | n() => a()}
-  the default associations are not compatible
-  because
-  n() is not compatible with a()
-  because
-  number() is not compatible with a()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/t_maps.erl:356:1
-    │
-356 │ no_map(#{} = M) -> M.
-    │ ^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/t_maps.erl:361:1
-    │
-361 │ no_prop(#{foo := V}) -> V.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:377:22
-    │
-377 │         #{K := V} -> {K, V};
-    │                      ^^^^^^
-    │                      │
-    │                      {K, V}.
-Expression has type:   {'a' | 'b', a()}
-Context expected type: {n(), a()}
-    │                      
-
-Because in the expression's type:
-  { 
-    Here the type is:     'a' | 'b'
-    Context expects type: number()
-    No candidate of the expression's type matches the expected type.
-  , a()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {'a' | 'b', a()} is not compatible with {n(), a()}
-  because
-  'a' | 'b' is not compatible with n()
-  because
-  'a' | 'b' is not compatible with number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/t_maps.erl:429:1
-    │
-429 │ val3(#{a := V}) -> V.
-    │ ^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/t_maps.erl:434:1
-    │
-434 │ val4(#{a := V}) -> V.
-    │ ^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/t_maps.erl:451:1
-    │
-451 │ guard2(M) when is_map(M) -> M.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/t_maps.erl:493:1
-    │
-493 │ update_none1(N) -> N#{a := 1}.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/t_maps.erl:496:1
-    │
-496 │ update_none2(N) -> N#{a => 1}.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:508:17
-    │
-508 │ sub_3_neg(M) -> M.
-    │                 ^
-    │                 │
-    │                 M.
-Expression has type:   #{a := atom()}
-Context expected type: #{a => atom(), n := number()}
-    │                 
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{n := ..., ...}
-  The type of the expression is missing the following required keys: n.
-
------------------------------- Detailed message ------------------------------
-
-key `n` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:536:5
-    │
-536 │     maps:update_with(a, F, a, Map).
-    │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    │     │
-    │     maps:update_with('a', F, 'a', Map).
-Expression has type:   #{a => 'b' | 'c' | 'a'}
-Context expected type: #{a => 'b' | 'c'}
-    │     
-
-Because in the expression's type:
-  #{ a =>
-    Here the type is a union type with some valid candidates: 'b' | 'c'
-    However the following candidate: 'a'
-    Differs from the expected type:  'b' | 'c'
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a => 'b' | 'c' | 'a'} is not compatible with #{a => 'b' | 'c'}
-  because
-  at key `a`:
-  #{a => 'b' | 'c' | 'a'} is not compatible with #{a => 'b' | 'c'}
-  because
-  'b' | 'c' | 'a' is not compatible with 'b' | 'c'
-  because
-  'a' is not compatible with 'b' | 'c'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:571:5
-    │
-571 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   rec_shape()
-Context expected type: rec_shape_v2()
-    │     
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{item_v2 := ..., ...}
-  The type of the expression is missing the following required keys: item_v2.
-
------------------------------- Detailed message ------------------------------
-
-  rec_shape() is not compatible with rec_shape_v2()
-  because
-  #{item := rec_shape() | 'undefined'} is not compatible with rec_shape_v2()
-  because
-  #{item := rec_shape() | 'undefined'} is not compatible with #{item_v2 := rec_shape_v2() | 'undefined'}
-  key `item_v2` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:629:5
-    │
-629 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   gen_shape('a' | 'b')
-Context expected type: 'a' | #{item := 'a' | #{item := 'a' | gen_shape('a')}}
-    │     
-
-Because in the expression's type:
-  #{ item =>
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a' | #{item := 'a' | gen_shape('a')}
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  gen_shape('a' | 'b') is not compatible with 'a' | #{item := 'a' | #{item := 'a' | gen_shape('a')}}
-  because
-  #{item := 'a' | 'b' | gen_shape('a' | 'b')} is not compatible with 'a' | #{item := 'a' | #{item := 'a' | gen_shape('a')}}
-  because
-  #{item := 'a' | 'b' | gen_shape('a' | 'b')} is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:641:5
-    │
-641 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   gen_shape_v2('a')
-Context expected type: gen_shape('a')
-    │     
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{item := ..., ...}
-  The type of the expression is missing the following required keys: item.
-
------------------------------- Detailed message ------------------------------
-
-  gen_shape_v2('a') is not compatible with gen_shape('a')
-  because
-  #{item_v2 := 'a' | gen_shape_v2('a')} is not compatible with gen_shape('a')
-  because
-  #{item_v2 := 'a' | gen_shape_v2('a')} is not compatible with #{item := 'a' | gen_shape('a')}
-  key `item` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:648:5
-    │
-648 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   #{a => 'va', b => 'vb', c => 'vc', d => 'vd'}
-Context expected type: #{a => 'va', b => 'vb', c => 'vc'}
-    │     
-
-Because in the expression's type:
-  Here the type is:     #{d => ...}
-  Context expects type: #{...}
-  The expected map has no corresponding key for: d.
-
------------------------------- Detailed message ------------------------------
-
-key `d` is declared in the former but not in the latter and the latter map has no default association
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:661:5
-    │
-661 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   #{a => 'va', b => 'vb', c => 'vc', d => 'vd', e => 've'}
-Context expected type: #{a => 'ka', b => 'kb', c => 'kc'}
-    │     
-
-Because in the expression's type:
-  #{ a =>
-    Here the type is:     'va'
-    Context expects type: 'ka'
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a => 'va', b => 'vb', c => 'vc', d => 'vd', e => 've'} is not compatible with #{a => 'ka', b => 'kb', c => 'kc'}
-  because
-  at key `a`:
-  #{a => 'va', b => 'vb', c => 'vc', d => 'vd', e => 've'} is not compatible with #{a => 'ka', b => 'kb', c => 'kc'}
-  because
-  'va' is not compatible with 'ka'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:675:5
-    │
-675 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   #{}
-Context expected type: #{a => 'va', b => 'vb', c := 'vc'}
-    │     
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{c := ..., ...}
-  The type of the expression is missing the following required keys: c.
-
------------------------------- Detailed message ------------------------------
-
-key `c` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:682:5
-    │
-682 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   #{a => 'ka', b => 'kb', c => 'kc'}
-Context expected type: #{a => 'ka', b := 'kb', c => 'kc'}
-    │     
-
-Because in the expression's type:
-  Here the type is:     #{b => ..., ...}
-  Context expects type: #{b := ..., ...}
-  The type of the expression is missing the following required keys: b.
-
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:689:5
-    │
-689 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   #{a => 'ka', b => 'kb', c => 'kc'}
-Context expected type: #{a => 'ka', b := 'kb', c => 'kc'}
-    │     
-
-Because in the expression's type:
-  Here the type is:     #{b => ..., ...}
-  Context expects type: #{b := ..., ...}
-  The type of the expression is missing the following required keys: b.
-
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:710:5
-    │
-710 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}
-Context expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}
-    │     
-
-Because in the expression's type:
-  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}
-  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}
-  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.
-
------------------------------- Detailed message ------------------------------
-
-keys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:732:27
-    │
-732 │ dict_to_shape_neg_1(M) -> M.
-    │                           ^
-    │                           │
-    │                           M.
-Expression has type:   #{'a' | 'b' => boolean()}
-Context expected type: #{a => 'true', b => boolean()}
-    │                           
-
-Because in the expression's type:
-  Here the type is:     #{'a' | 'b' => boolean()}
-  Context expects type: #{...} (no default association)
-  The expected map has no default association while the type of the expression has one.
-
------------------------------- Detailed message ------------------------------
-
-  #{'a' | 'b' => boolean()} is not compatible with #{a => 'true', b => boolean()}
-  key a is not present in the former map but is incompatible with its default association
-  because
-  boolean() is not compatible with 'true'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:737:27
-    │
-737 │ dict_to_shape_neg_2(M) -> M.
-    │                           ^
-    │                           │
-    │                           M.
-Expression has type:   #{'a' | 'b' => boolean()}
-Context expected type: #{a => boolean(), b := term()}
-    │                           
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{b := ..., ...}
-  The type of the expression is missing the following required keys: b.
-
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:742:27
-    │
-742 │ dict_to_shape_neg_3(M) -> M.
-    │                           ^
-    │                           │
-    │                           M.
-Expression has type:   #{'a' | 'b' => boolean()}
-Context expected type: #{a => boolean()}
-    │                           
-
-Because in the expression's type:
-  Here the type is:     #{'a' | 'b' => boolean()}
-  Context expects type: #{...} (no default association)
-  The expected map has no default association while the type of the expression has one.
-
------------------------------- Detailed message ------------------------------
-
-  #{'a' | 'b' => boolean()} is not compatible with #{a => boolean()}
-  because
-  #{'a' | 'b' => boolean()} is not compatible with #{a => boolean()}
-  the latter map has no default association while the first map has one
-
-44 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/t_maps-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/t_maps-OTP-28.pretty
deleted file mode 100644
index d0e08f9ac4..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/t_maps-OTP-28.pretty
+++ /dev/null
@@ -1,915 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/t_maps.erl:36:5
-   │
-36 │     #{0 => 1, 1 => 2}.
-   │     ^^^^^^^^^^^^^^^^^
-   │     │
-   │     #{..}.
-Expression has type:   #{number() => number()}
-Context expected type: #{number() => atom()}
-   │     
-
-Because in the expression's type:
-  #{ number() =>
-    Here the type is:     number()
-    Context expects type: atom()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{number() => number()} is not compatible with #{number() => atom()}
-  the default associations are not compatible
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/t_maps.erl:41:5
-   │
-41 │     #{0 => zero, 1 => 2}.
-   │     ^^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     #{..}.
-Expression has type:   #{number() => 'zero' | number()}
-Context expected type: #{number() => atom()}
-   │     
-
-Because in the expression's type:
-  #{ number() =>
-    Here the type is a union type with some valid candidates: 'zero'
-    However the following candidate: number()
-    Differs from the expected type:  atom()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{number() => 'zero' | number()} is not compatible with #{number() => atom()}
-  the default associations are not compatible
-  because
-  'zero' | number() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/t_maps.erl:56:5
-   │
-56 │     #{zero => 0, one => one}.
-   │     ^^^^^^^^^^^^^^^^^^^^^^^^
-   │     │
-   │     #{..}.
-Expression has type:   #{one := 'one', zero := number()}
-Context expected type: #{one => number(), zero := number()}
-   │     
-
-Because in the expression's type:
-  #{ one =>
-    Here the type is:     'one'
-    Context expects type: number()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{one := 'one', zero := number()} is not compatible with #{one => number(), zero := number()}
-  because
-  at key `one`:
-  #{one := 'one', zero := number()} is not compatible with #{one => number(), zero := number()}
-  because
-  'one' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/t_maps.erl:80:5
-   │
-80 │     M#{}.
-   │     ^ M.
-Expression has type:   term()
-Context expected type: #{term() => term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:120:5
-    │
-120 │     S#{bar := true}.
-    │     ^ S.
-Expression has type:   term()
-Context expected type: #{term() => term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:130:25
-    │
-130 │ meet_dict2_neg(D, D) -> D.
-    │                         ^
-    │                         │
-    │                         D.
-Expression has type:   #{b() => term()}
-Context expected type: #{n() => term()}
-    │                         
-
-Because in the expression's type:
-  #{ map domains are incompatible:
-    Here the type is:     boolean()
-    Context expects type: n()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{b() => term()} is not compatible with #{n() => term()}
-  the default associations are not compatible
-  because
-  b() is not compatible with n()
-  because
-  boolean() is not compatible with n()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:140:26
-    │
-140 │ meet_shape2_neg(S, S) -> S.
-    │                          ^
-    │                          │
-    │                          S.
-Expression has type:   #{a := b()}
-Context expected type: #{a := n()}
-    │                          
-
-Because in the expression's type:
-  #{ a =>
-    Here the type is:     boolean()
-    Context expects type: n()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a := b()} is not compatible with #{a := n()}
-  because
-  at key `a`:
-  #{a := b()} is not compatible with #{a := n()}
-  because
-  b() is not compatible with n()
-  because
-  boolean() is not compatible with n()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:145:26
-    │
-145 │ meet_shape3_neg(S, S) -> S.
-    │                          ^
-    │                          │
-    │                          S.
-Expression has type:   #{a := b()}
-Context expected type: #{a => n()}
-    │                          
-
-Because in the expression's type:
-  #{ a =>
-    Here the type is:     boolean()
-    Context expects type: n()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a := b()} is not compatible with #{a => n()}
-  because
-  at key `a`:
-  #{a := b()} is not compatible with #{a => n()}
-  because
-  b() is not compatible with n()
-  because
-  boolean() is not compatible with n()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:155:26
-    │
-155 │ meet_shape5_neg(S, S) -> S.
-    │                          ^
-    │                          │
-    │                          S.
-Expression has type:   #{a => b()}
-Context expected type: #{a := b()}
-    │                          
-
-Because in the expression's type:
-  Here the type is:     #{a => ..., ...}
-  Context expects type: #{a := ..., ...}
-  The type of the expression is missing the following required keys: a.
-
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/t_maps.erl:165:1
-    │
-165 │ meet_shape7(S, S) -> S.
-    │ ^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:202:5
-    │
-202 │     S#{K => V}.
-    │     ^^^^^^^^^^
-    │     │
-    │     ..#{..}.
-Expression has type:   #{a := a(), n() => a()}
-Context expected type: #{a() => a()}
-    │     
-
-Because in the expression's type:
-  #{ map domains are incompatible:
-    Here the type is:     number()
-    Context expects type: atom()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a := a(), n() => a()} is not compatible with #{a() => a()}
-  the default associations are not compatible
-  because
-  n() is not compatible with a()
-  because
-  number() is not compatible with a()
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:208:5
-    │
-208 │     S#{K => V}.
-    │     ^^^^^^^^^^
-    │     │
-    │     ..#{..}.
-Expression has type:   #{a := a(), n() => a()}
-Context expected type: #{n() => a()}
-    │     
-
-Because in the expression's type:
-  #{ incompatible map key a:
-    Here the type is:     'a'
-    Context expects type: number()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a := a(), n() => a()} is not compatible with #{n() => a()}
-  because
-  #{a := a(), n() => a()} is not compatible with #{n() => a()}
-  key `a` is declared in the former but not in the latter and key `a` isn't compatible with the default association of the latter map
-  because
-  'a' is not compatible with n()
-  because
-  'a' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:216:5
-    │
-216 │     S#{K => V}.
-    │     ^^^^^^^^^^
-    │     │
-    │     ..#{..}.
-Expression has type:   #{a := a(), n() => a()}
-Context expected type: #{n() => a()}
-    │     
-
-Because in the expression's type:
-  #{ incompatible map key a:
-    Here the type is:     'a'
-    Context expects type: number()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a := a(), n() => a()} is not compatible with #{n() => a()}
-  because
-  #{a := a(), n() => a()} is not compatible with #{n() => a()}
-  key `a` is declared in the former but not in the latter and key `a` isn't compatible with the default association of the latter map
-  because
-  'a' is not compatible with n()
-  because
-  'a' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:224:5
-    │
-224 │     S#{K => V}.
-    │     ^^^^^^^^^^
-    │     │
-    │     ..#{..}.
-Expression has type:   #{a => a(), n() => a()}
-Context expected type: #{n() => a()}
-    │     
-
-Because in the expression's type:
-  #{ incompatible map key a:
-    Here the type is:     'a'
-    Context expects type: number()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a => a(), n() => a()} is not compatible with #{n() => a()}
-  because
-  #{a => a(), n() => a()} is not compatible with #{n() => a()}
-  key `a` is declared in the former but not in the latter and key `a` isn't compatible with the default association of the latter map
-  because
-  'a' is not compatible with n()
-  because
-  'a' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:242:5
-    │
-242 │     FB#{foo := F1, bar := B1}.
-    │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-    │     │
-    │     ..#{..}.
-Expression has type:   #{bar := B1, foo := F1}
-Context expected type: foo_bar(B1, F1)
-    │     
-
-Because in the expression's type:
-  #{ bar =>
-    Here the type is:     B1
-    Context expects type: F1
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{bar := B1, foo := F1} is not compatible with foo_bar(B1, F1)
-  because
-  #{bar := B1, foo := F1} is not compatible with #{bar := F1, foo := B1}
-  because
-  at key `bar`:
-  #{bar := B1, foo := F1} is not compatible with #{bar := F1, foo := B1}
-  because
-  B1 is not compatible with F1
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:254:5
-    │
-254 │     FB#{foo => F1, bar => B1}.
-    │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-    │     │
-    │     ..#{..}.
-Expression has type:   #{bar := B1, foo := F1}
-Context expected type: foo_bar_opt(B1, F1)
-    │     
-
-Because in the expression's type:
-  #{ bar =>
-    Here the type is:     B1
-    Context expects type: F1
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{bar := B1, foo := F1} is not compatible with foo_bar_opt(B1, F1)
-  because
-  #{bar := B1, foo := F1} is not compatible with #{bar => F1, foo => B1}
-  because
-  at key `bar`:
-  #{bar := B1, foo := F1} is not compatible with #{bar => F1, foo => B1}
-  because
-  B1 is not compatible with F1
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:266:5
-    │
-266 │     Dict#{V2 => K2}.
-    │     ^^^^^^^^^^^^^^^
-    │     │
-    │     ..#{..}.
-Expression has type:   #{K1 | V2 => V1 | K2}
-Context expected type: kv(K1 | K2, V1 | V2)
-    │     
-
-Because in the expression's type:
-  #{ map domains are incompatible:
-    Here the type is a union type with some valid candidates: K1
-    However the following candidate: V2
-    Differs from the expected type:  K1 | K2
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{K1 | V2 => V1 | K2} is not compatible with kv(K1 | K2, V1 | V2)
-  because
-  #{K1 | V2 => V1 | K2} is not compatible with #{K1 | K2 => V1 | V2}
-  the default associations are not compatible
-  because
-  K1 | V2 is not compatible with K1 | K2
-  because
-  V2 is not compatible with K1 | K2
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:283:19
-    │
-283 │     needs_shape_a(X#{b => hello}).
-    │                   ^^^^^^^^^^^^^^
-    │                   │
-    │                   ..#{..}.
-Expression has type:   #{a := number(), b := 'hello'}
-Context expected type: #{a := term()}
-    │                   
-
-Because in the expression's type:
-  Here the type is:     #{b := ...}
-  Context expects type: #{...}
-  The expected map has no corresponding key for: b.
-
------------------------------- Detailed message ------------------------------
-
-key `b` is declared in the former but not in the latter and the latter map has no default association
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:307:22
-    │
-307 │         #{K := V} -> {K, V};
-    │                      ^^^^^^
-    │                      │
-    │                      {K, V}.
-Expression has type:   {a(), n()}
-Context expected type: {n(), a()}
-    │                      
-
-Because in the expression's type:
-  { 
-    Here the type is:     atom()
-    Context expects type: number()
-  , n()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {a(), n()} is not compatible with {n(), a()}
-  because
-  a() is not compatible with n()
-  because
-  atom() is not compatible with n()
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:321:5
-    │
-321 │     {A, N}.
-    │     ^^^^^^
-    │     │
-    │     {A, N}.
-Expression has type:   {a(), n()}
-Context expected type: {n(), a()}
-    │     
-
-Because in the expression's type:
-  { 
-    Here the type is:     atom()
-    Context expects type: number()
-  , n()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {a(), n()} is not compatible with {n(), a()}
-  because
-  a() is not compatible with n()
-  because
-  atom() is not compatible with n()
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:334:25
-    │
-334 │ to_map3_neg(#{} = M) -> M;
-    │                         ^
-    │                         │
-    │                         M.
-Expression has type:   #{V => K}
-Context expected type: #{K => V}
-    │                         
-
-Because in the expression's type:
-  #{ map domains are incompatible:
-    Here the type is:     V
-    Context expects type: K
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{V => K} is not compatible with #{K => V}
-  the default associations are not compatible
-  because
-  V is not compatible with K
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:351:25
-    │
-351 │ to_map5_neg(#{} = M) -> M.
-    │                         ^
-    │                         │
-    │                         M.
-Expression has type:   #{a() => n()} | #{n() => a()} | #{id => 'id' | 'no_id'}
-Context expected type: #{a() | n() => a()}
-    │                         
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: #{n() => a()} | #{id => 'id' | 'no_id'}
-  However, the following candidate doesn't match:
-  #{ a() =>
-    Here the type is:     number()
-    Context expects type: atom()
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a() => n()} | #{n() => a()} | #{id => 'id' | 'no_id'} is not compatible with #{a() | n() => a()}
-  because
-  #{a() => n()} is not compatible with #{a() | n() => a()}
-  the default associations are not compatible
-  because
-  n() is not compatible with a()
-  because
-  number() is not compatible with a()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/t_maps.erl:356:1
-    │
-356 │ no_map(#{} = M) -> M.
-    │ ^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/t_maps.erl:361:1
-    │
-361 │ no_prop(#{foo := V}) -> V.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:377:22
-    │
-377 │         #{K := V} -> {K, V};
-    │                      ^^^^^^
-    │                      │
-    │                      {K, V}.
-Expression has type:   {'a' | 'b', a()}
-Context expected type: {n(), a()}
-    │                      
-
-Because in the expression's type:
-  { 
-    Here the type is:     'a' | 'b'
-    Context expects type: number()
-    No candidate of the expression's type matches the expected type.
-  , a()}
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {'a' | 'b', a()} is not compatible with {n(), a()}
-  because
-  'a' | 'b' is not compatible with n()
-  because
-  'a' | 'b' is not compatible with number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/t_maps.erl:429:1
-    │
-429 │ val3(#{a := V}) -> V.
-    │ ^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/t_maps.erl:434:1
-    │
-434 │ val4(#{a := V}) -> V.
-    │ ^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/t_maps.erl:451:1
-    │
-451 │ guard2(M) when is_map(M) -> M.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/t_maps.erl:493:1
-    │
-493 │ update_none1(N) -> N#{a := 1}.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/t_maps.erl:496:1
-    │
-496 │ update_none2(N) -> N#{a => 1}.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:508:17
-    │
-508 │ sub_3_neg(M) -> M.
-    │                 ^
-    │                 │
-    │                 M.
-Expression has type:   #{a := atom()}
-Context expected type: #{a => atom(), n := number()}
-    │                 
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{n := ..., ...}
-  The type of the expression is missing the following required keys: n.
-
------------------------------- Detailed message ------------------------------
-
-key `n` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:536:5
-    │
-536 │     maps:update_with(a, F, a, Map).
-    │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    │     │
-    │     maps:update_with('a', F, 'a', Map).
-Expression has type:   #{a => 'b' | 'c' | 'a'}
-Context expected type: #{a => 'b' | 'c'}
-    │     
-
-Because in the expression's type:
-  #{ a =>
-    Here the type is a union type with some valid candidates: 'b' | 'c'
-    However the following candidate: 'a'
-    Differs from the expected type:  'b' | 'c'
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a => 'b' | 'c' | 'a'} is not compatible with #{a => 'b' | 'c'}
-  because
-  at key `a`:
-  #{a => 'b' | 'c' | 'a'} is not compatible with #{a => 'b' | 'c'}
-  because
-  'b' | 'c' | 'a' is not compatible with 'b' | 'c'
-  because
-  'a' is not compatible with 'b' | 'c'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:571:5
-    │
-571 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   rec_shape()
-Context expected type: rec_shape_v2()
-    │     
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{item_v2 := ..., ...}
-  The type of the expression is missing the following required keys: item_v2.
-
------------------------------- Detailed message ------------------------------
-
-  rec_shape() is not compatible with rec_shape_v2()
-  because
-  #{item := rec_shape() | 'undefined'} is not compatible with rec_shape_v2()
-  because
-  #{item := rec_shape() | 'undefined'} is not compatible with #{item_v2 := rec_shape_v2() | 'undefined'}
-  key `item_v2` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:629:5
-    │
-629 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   gen_shape('a' | 'b')
-Context expected type: 'a' | #{item := 'a' | #{item := 'a' | gen_shape('a')}}
-    │     
-
-Because in the expression's type:
-  #{ item =>
-    Here the type is a union type with some valid candidates: 'a'
-    However the following candidate: 'b'
-    Differs from the expected type:  'a' | #{item := 'a' | gen_shape('a')}
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  gen_shape('a' | 'b') is not compatible with 'a' | #{item := 'a' | #{item := 'a' | gen_shape('a')}}
-  because
-  #{item := 'a' | 'b' | gen_shape('a' | 'b')} is not compatible with 'a' | #{item := 'a' | #{item := 'a' | gen_shape('a')}}
-  because
-  #{item := 'a' | 'b' | gen_shape('a' | 'b')} is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:641:5
-    │
-641 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   gen_shape_v2('a')
-Context expected type: gen_shape('a')
-    │     
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{item := ..., ...}
-  The type of the expression is missing the following required keys: item.
-
------------------------------- Detailed message ------------------------------
-
-  gen_shape_v2('a') is not compatible with gen_shape('a')
-  because
-  #{item_v2 := 'a' | gen_shape_v2('a')} is not compatible with gen_shape('a')
-  because
-  #{item_v2 := 'a' | gen_shape_v2('a')} is not compatible with #{item := 'a' | gen_shape('a')}
-  key `item` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:648:5
-    │
-648 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   #{a => 'va', b => 'vb', c => 'vc', d => 'vd'}
-Context expected type: #{a => 'va', b => 'vb', c => 'vc'}
-    │     
-
-Because in the expression's type:
-  Here the type is:     #{d => ...}
-  Context expects type: #{...}
-  The expected map has no corresponding key for: d.
-
------------------------------- Detailed message ------------------------------
-
-key `d` is declared in the former but not in the latter and the latter map has no default association
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:661:5
-    │
-661 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   #{a => 'va', b => 'vb', c => 'vc', d => 'vd', e => 've'}
-Context expected type: #{a => 'ka', b => 'kb', c => 'kc'}
-    │     
-
-Because in the expression's type:
-  #{ a =>
-    Here the type is:     'va'
-    Context expects type: 'ka'
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{a => 'va', b => 'vb', c => 'vc', d => 'vd', e => 've'} is not compatible with #{a => 'ka', b => 'kb', c => 'kc'}
-  because
-  at key `a`:
-  #{a => 'va', b => 'vb', c => 'vc', d => 'vd', e => 've'} is not compatible with #{a => 'ka', b => 'kb', c => 'kc'}
-  because
-  'va' is not compatible with 'ka'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:675:5
-    │
-675 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   #{}
-Context expected type: #{a => 'va', b => 'vb', c := 'vc'}
-    │     
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{c := ..., ...}
-  The type of the expression is missing the following required keys: c.
-
------------------------------- Detailed message ------------------------------
-
-key `c` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:682:5
-    │
-682 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   #{a => 'ka', b => 'kb', c => 'kc'}
-Context expected type: #{a => 'ka', b := 'kb', c => 'kc'}
-    │     
-
-Because in the expression's type:
-  Here the type is:     #{b => ..., ...}
-  Context expects type: #{b := ..., ...}
-  The type of the expression is missing the following required keys: b.
-
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:689:5
-    │
-689 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   #{a => 'ka', b => 'kb', c => 'kc'}
-Context expected type: #{a => 'ka', b := 'kb', c => 'kc'}
-    │     
-
-Because in the expression's type:
-  Here the type is:     #{b => ..., ...}
-  Context expects type: #{b := ..., ...}
-  The type of the expression is missing the following required keys: b.
-
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:710:5
-    │
-710 │     X.
-    │     ^
-    │     │
-    │     X.
-Expression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}
-Context expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}
-    │     
-
-Because in the expression's type:
-  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}
-  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}
-  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.
-
------------------------------- Detailed message ------------------------------
-
-keys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:732:27
-    │
-732 │ dict_to_shape_neg_1(M) -> M.
-    │                           ^
-    │                           │
-    │                           M.
-Expression has type:   #{'a' | 'b' => boolean()}
-Context expected type: #{a => 'true', b => boolean()}
-    │                           
-
-Because in the expression's type:
-  Here the type is:     #{'a' | 'b' => boolean()}
-  Context expects type: #{...} (no default association)
-  The expected map has no default association while the type of the expression has one.
-
------------------------------- Detailed message ------------------------------
-
-  #{'a' | 'b' => boolean()} is not compatible with #{a => 'true', b => boolean()}
-  key a is not present in the former map but is incompatible with its default association
-  because
-  boolean() is not compatible with 'true'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:737:27
-    │
-737 │ dict_to_shape_neg_2(M) -> M.
-    │                           ^
-    │                           │
-    │                           M.
-Expression has type:   #{'a' | 'b' => boolean()}
-Context expected type: #{a => boolean(), b := term()}
-    │                           
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{b := ..., ...}
-  The type of the expression is missing the following required keys: b.
-
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/t_maps.erl:742:27
-    │
-742 │ dict_to_shape_neg_3(M) -> M.
-    │                           ^
-    │                           │
-    │                           M.
-Expression has type:   #{'a' | 'b' => boolean()}
-Context expected type: #{a => boolean()}
-    │                           
-
-Because in the expression's type:
-  Here the type is:     #{'a' | 'b' => boolean()}
-  Context expects type: #{...} (no default association)
-  The expected map has no default association while the type of the expression has one.
-
------------------------------- Detailed message ------------------------------
-
-  #{'a' | 'b' => boolean()} is not compatible with #{a => boolean()}
-  because
-  #{'a' | 'b' => boolean()} is not compatible with #{a => boolean()}
-  the latter map has no default association while the first map has one
-
-44 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/t_maps-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/t_maps.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/t_maps-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/t_maps.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/tagged_tuples-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/tagged_tuples-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/tagged_tuples-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/tagged_tuples-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/tagged_tuples-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/tagged_tuples-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/tagged_tuples-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/tagged_tuples-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/tagged_tuples-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_receive-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/tagged_tuples.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_receive-OTP-27.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/tagged_tuples.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/test-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/test-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/test-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/test-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/test-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/test-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/test-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/test-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/test-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_receive-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/test.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_receive-OTP-28.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/test.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/tries-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/tries-OTP-27.pretty
deleted file mode 100644
index 471b5c8ebe..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/tries-OTP-27.pretty
+++ /dev/null
@@ -1,79 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/tries.erl:30:19
-   │
-30 │         {_, Y} -> Y
-   │                   ^ Y.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/tries.erl:42:5
-   │
-42 │     Res.
-   │     ^^^
-   │     │
-   │     Res.
-Expression has type:   [] | 'error'
-Context expected type: atom()
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'error'
-  However the following candidate: []
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  [] | 'error' is not compatible with atom()
-  because
-  [] is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/tries.erl:75:16
-   │
-75 │     catch _ -> error
-   │                ^^^^^ 'error'.
-Expression has type:   'error'
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/tries.erl:80:9
-   │
-80 │     try ok()
-   │         ^^^^ ok().
-Expression has type:   'ok'
-Context expected type: 'error'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/tries.erl:88:19
-   │
-88 │         only_atom(1)
-   │                   ^ 1.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/tries.erl:130:17
-    │
-130 │         true -> Y
-    │                 ^ Y.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/tries.erl:136:19
-    │
-136 │         {X, X} -> X
-    │                   ^ X.
-Expression has type:   term()
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/tries.erl:148:5
-    │
-148 │     Res.
-    │     ^^^ Res.
-Expression has type:   term()
-Context expected type: 'ok'
-
-8 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/tries-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/tries-OTP-28.pretty
deleted file mode 100644
index 471b5c8ebe..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/tries-OTP-28.pretty
+++ /dev/null
@@ -1,79 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/tries.erl:30:19
-   │
-30 │         {_, Y} -> Y
-   │                   ^ Y.
-Expression has type:   term()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/tries.erl:42:5
-   │
-42 │     Res.
-   │     ^^^
-   │     │
-   │     Res.
-Expression has type:   [] | 'error'
-Context expected type: atom()
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'error'
-  However the following candidate: []
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  [] | 'error' is not compatible with atom()
-  because
-  [] is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/tries.erl:75:16
-   │
-75 │     catch _ -> error
-   │                ^^^^^ 'error'.
-Expression has type:   'error'
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/tries.erl:80:9
-   │
-80 │     try ok()
-   │         ^^^^ ok().
-Expression has type:   'ok'
-Context expected type: 'error'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/tries.erl:88:19
-   │
-88 │         only_atom(1)
-   │                   ^ 1.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/tries.erl:130:17
-    │
-130 │         true -> Y
-    │                 ^ Y.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/tries.erl:136:19
-    │
-136 │         {X, X} -> X
-    │                   ^ X.
-Expression has type:   term()
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/tries.erl:148:5
-    │
-148 │     Res.
-    │     ^^^ Res.
-Expression has type:   term()
-Context expected type: 'ok'
-
-8 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/tries-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/tries.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/tries-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/tries.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/tuple_union-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/tuple_union-OTP-27.pretty
deleted file mode 100644
index e02af30869..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/tuple_union-OTP-27.pretty
+++ /dev/null
@@ -1,60 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/tuple_union.erl:27:19
-   │
-27 │ test_03_neg(X) -> X.
-   │                   ^
-   │                   │
-   │                   X.
-Expression has type:   t4()
-Context expected type: t5()
-   │                   
-
-Because in the expression's type:
-  { 'msg', 
-    Here the type is a union type with some valid candidates: 'ok'
-    However the following candidate: 'err'
-    Differs from the expected type:  'ok'
-  , 'arg' | 'nil'}
-
------------------------------- Detailed message ------------------------------
-
-  t4() is not compatible with t5()
-  because
-  {'msg', 'ok' | 'err', 'arg' | 'nil'} is not compatible with t5()
-  because
-  {'msg', 'ok' | 'err', 'arg' | 'nil'} is not compatible with {'msg', 'ok', 'arg'} | {'msg', 'err', 'arg'} | {'msg', 'ok', 'nil'} | {'msg', 'err', 'nil'}
-  because
-  at tuple index 2:
-  {'msg', 'ok' | 'err', 'arg' | 'nil'} is not compatible with {'msg', 'ok', 'arg'}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/tuple_union.erl:66:26
-   │
-66 │ tree3_as_tree1_neg(T) -> T.
-   │                          ^
-   │                          │
-   │                          T.
-Expression has type:   tree3()
-Context expected type: tree1()
-   │                          
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: {'leaf', atom()}
-  However, the following candidate doesn't match:
-  { 
-    Here the type is:     'b1' | 'b2' | 'b3'
-    Context expects type: 'leaf'
-    No candidate of the expression's type matches the expected type.
-  , tree2()}
-
------------------------------- Detailed message ------------------------------
-
-  tree3() is not compatible with tree1()
-  because
-  {'leaf', atom()} | {'b1' | 'b2' | 'b3', tree2()} is not compatible with tree1()
-  because
-  {'leaf', atom()} | {'b1' | 'b2' | 'b3', tree2()} is not compatible with {'leaf', atom()} | {'b1', tree1()} | {'b2', tree1()}
-  because
-  {'b1' | 'b2' | 'b3', tree2()} is not compatible with {'leaf', atom()} | {'b1', tree1()} | {'b2', tree1()}
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/tuple_union-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/tuple_union-OTP-28.pretty
deleted file mode 100644
index e02af30869..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/tuple_union-OTP-28.pretty
+++ /dev/null
@@ -1,60 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/tuple_union.erl:27:19
-   │
-27 │ test_03_neg(X) -> X.
-   │                   ^
-   │                   │
-   │                   X.
-Expression has type:   t4()
-Context expected type: t5()
-   │                   
-
-Because in the expression's type:
-  { 'msg', 
-    Here the type is a union type with some valid candidates: 'ok'
-    However the following candidate: 'err'
-    Differs from the expected type:  'ok'
-  , 'arg' | 'nil'}
-
------------------------------- Detailed message ------------------------------
-
-  t4() is not compatible with t5()
-  because
-  {'msg', 'ok' | 'err', 'arg' | 'nil'} is not compatible with t5()
-  because
-  {'msg', 'ok' | 'err', 'arg' | 'nil'} is not compatible with {'msg', 'ok', 'arg'} | {'msg', 'err', 'arg'} | {'msg', 'ok', 'nil'} | {'msg', 'err', 'nil'}
-  because
-  at tuple index 2:
-  {'msg', 'ok' | 'err', 'arg' | 'nil'} is not compatible with {'msg', 'ok', 'arg'}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/tuple_union.erl:66:26
-   │
-66 │ tree3_as_tree1_neg(T) -> T.
-   │                          ^
-   │                          │
-   │                          T.
-Expression has type:   tree3()
-Context expected type: tree1()
-   │                          
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: {'leaf', atom()}
-  However, the following candidate doesn't match:
-  { 
-    Here the type is:     'b1' | 'b2' | 'b3'
-    Context expects type: 'leaf'
-    No candidate of the expression's type matches the expected type.
-  , tree2()}
-
------------------------------- Detailed message ------------------------------
-
-  tree3() is not compatible with tree1()
-  because
-  {'leaf', atom()} | {'b1' | 'b2' | 'b3', tree2()} is not compatible with tree1()
-  because
-  {'leaf', atom()} | {'b1' | 'b2' | 'b3', tree2()} is not compatible with {'leaf', atom()} | {'b1', tree1()} | {'b2', tree1()}
-  because
-  {'b1' | 'b2' | 'b3', tree2()} is not compatible with {'leaf', atom()} | {'b1', tree1()} | {'b2', tree1()}
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/tuple_union-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/tuple_union.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/tuple_union-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/tuple_union.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/type_aliases-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/type_aliases-OTP-27.pretty
deleted file mode 100644
index 0518a9a064..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/type_aliases-OTP-27.pretty
+++ /dev/null
@@ -1,157 +0,0 @@
-error: unbound_type_var (See https://fb.me/eqwalizer_errors#unbound_type_var)
-  ┌─ check/src/type_aliases.erl:9:1
-  │
-9 │ -type w_unbound_var() :: {_A, _B}.
-  │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ _A: Type variable is unbound.
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:10:1
-   │  
-10 │ ╭ -type trans_unbound_var()
-11 │ │     :: w_unbound_var().
-   │ ╰────────────────────^ trans_unbound_var/0 references type with invalid definition: w_unbound_var/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:13:1
-   │  
-13 │ ╭ -spec uses_ty_w_unbound_var(_A, _B) ->
-14 │ │     w_unbound_var().
-   │ ╰─────────────────^ uses_ty_w_unbound_var/2 references type with invalid definition: w_unbound_var/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:17:1
-   │  
-17 │ ╭ -spec uses_trans_unbound_var(_A, _B) ->
-18 │ │     trans_unbound_var().
-   │ ╰─────────────────────^ uses_trans_unbound_var/2 references type with invalid definition: trans_unbound_var/0
-
-error: unbound_type_var (See https://fb.me/eqwalizer_errors#unbound_type_var)
-   ┌─ check/src/type_aliases.erl:21:1
-   │  
-21 │ ╭ -type w_unbound_var2()
-22 │ │     :: _A.
-   │ ╰─────────^ _A: Type variable is unbound.
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:24:1
-   │  
-24 │ ╭ -spec uses_ty_w_unbound_var2() ->
-25 │ │     w_unbound_var2().
-   │ ╰──────────────────^ uses_ty_w_unbound_var2/0 references type with invalid definition: w_unbound_var2/0
-
-error: repated_type_var_in_type_decl (See https://fb.me/eqwalizer_errors#repated_type_var_in_type_decl)
-   ┌─ check/src/type_aliases.erl:28:1
-   │
-28 │ -type repeated(T, T) :: T.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^ T. Type vars in type declarations must be distinct
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:30:1
-   │  
-30 │ ╭ -spec test_repeated1_neg(a, b) ->
-31 │ │     repeated(a, b).
-   │ ╰────────────^ test_repeated1_neg/2 references type with invalid definition: repeated/2
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:34:1
-   │  
-34 │ ╭ -spec test_repeated2_neg(a, b) ->
-35 │ │     repeated(a, b).
-   │ ╰────────────^ test_repeated2_neg/2 references type with invalid definition: repeated/2
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:39:1
-   │  
-39 │ ╭ -spec test_use_bad_type
-40 │ │ (undefined | w_unbound_var()) ->
-41 │ │     w_unbound_var() | undefined.
-   │ ╰───────────────────────────────^ test_use_bad_type/1 references type with invalid definition: w_unbound_var/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:48:1
-   │  
-48 │ ╭ -spec test_use_bad_type_gen(
-49 │ │     w_unbound_var(),
-50 │ │     undefined | w_unbound_var()) ->
-51 │ │         term().
-   │ ╰────────────^ test_use_bad_type_gen/2 references type with invalid definition: w_unbound_var/0
-
-error: unbound_type_var (See https://fb.me/eqwalizer_errors#unbound_type_var)
-   ┌─ check/src/type_aliases.erl:55:1
-   │  
-55 │ ╭ -type tup_w_unbound(T)
-56 │ │ :: {T, _A}.
-   │ ╰──────────^ _A: Type variable is unbound.
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:58:1
-   │  
-58 │ ╭ -spec unpack_tup_w_unbound(
-59 │ │     tup_w_unbound(T)
-60 │ │ ) -> T.
-   │ ╰──────^ unpack_tup_w_unbound/1 references type with invalid definition: tup_w_unbound/1
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:64:1
-   │  
-64 │ ╭ -spec test_use_unpack_tup_w_unbound(
-65 │ │     tup_w_unbound(a)) -> a.
-   │ ╰──────────────────────────^ test_use_unpack_tup_w_unbound/1 references type with invalid definition: tup_w_unbound/1
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:69:1
-   │  
-69 │ ╭ -spec test_use_tup_w_unbound_cov(
-70 │ │     tup_w_unbound(a)) ->
-71 │ │     tup_w_unbound(a | b) .
-   │ ╰─────────────────^ test_use_tup_w_unbound_cov/1 references type with invalid definition: tup_w_unbound/1
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:75:1
-   │  
-75 │ ╭ -spec test_use_tup_w_unbound_contra_neg(
-76 │ │     tup_w_unbound(a | b)) ->
-77 │ │     tup_w_unbound(a) .
-   │ ╰─────────────────^ test_use_tup_w_unbound_contra_neg/1 references type with invalid definition: tup_w_unbound/1
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:81:1
-   │  
-81 │ ╭ -spec test_use_tup_w_unbound_contra_neg2(
-82 │ │     tup_w_unbound(a | b)) ->
-83 │ │     tup_w_unbound(a) | w_unbound_var().
-   │ ╰────────────────────────────────────^ test_use_tup_w_unbound_contra_neg2/1 references types with invalid definitions: tup_w_unbound/1, w_unbound_var/0
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-   ┌─ check/src/type_aliases.erl:87:1
-   │
-87 │ -type loop() :: loop().
-   │ ^^^^^^^^^^^^^^^^^^^^ recursive type loop/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:89:1
-   │
-89 │ -record(rec1, {l :: loop() | undefined}).
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ rec1 references type with invalid definition: loop/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:90:1
-   │
-90 │ -record(rec2, {l :: undefined | loop()}).
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ rec2 references type with invalid definition: loop/0
-
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-    ┌─ check/src/type_aliases.erl:104:21
-    │
-104 │     opaque:opair(a, x:y()).
-    │                     ^^^^^ Unknown id: x:y/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/type_aliases.erl:106:1
-    │  
-106 │ ╭ -spec use_bad_inside_neg(
-107 │ │    bad_inside()
-108 │ │ ) -> bad_inside().
-    │ ╰───────────────^ use_bad_inside_neg/1 references type with invalid definition: bad_inside/0
-
-22 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/type_aliases-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/type_aliases-OTP-28.pretty
deleted file mode 100644
index 0518a9a064..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/type_aliases-OTP-28.pretty
+++ /dev/null
@@ -1,157 +0,0 @@
-error: unbound_type_var (See https://fb.me/eqwalizer_errors#unbound_type_var)
-  ┌─ check/src/type_aliases.erl:9:1
-  │
-9 │ -type w_unbound_var() :: {_A, _B}.
-  │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ _A: Type variable is unbound.
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:10:1
-   │  
-10 │ ╭ -type trans_unbound_var()
-11 │ │     :: w_unbound_var().
-   │ ╰────────────────────^ trans_unbound_var/0 references type with invalid definition: w_unbound_var/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:13:1
-   │  
-13 │ ╭ -spec uses_ty_w_unbound_var(_A, _B) ->
-14 │ │     w_unbound_var().
-   │ ╰─────────────────^ uses_ty_w_unbound_var/2 references type with invalid definition: w_unbound_var/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:17:1
-   │  
-17 │ ╭ -spec uses_trans_unbound_var(_A, _B) ->
-18 │ │     trans_unbound_var().
-   │ ╰─────────────────────^ uses_trans_unbound_var/2 references type with invalid definition: trans_unbound_var/0
-
-error: unbound_type_var (See https://fb.me/eqwalizer_errors#unbound_type_var)
-   ┌─ check/src/type_aliases.erl:21:1
-   │  
-21 │ ╭ -type w_unbound_var2()
-22 │ │     :: _A.
-   │ ╰─────────^ _A: Type variable is unbound.
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:24:1
-   │  
-24 │ ╭ -spec uses_ty_w_unbound_var2() ->
-25 │ │     w_unbound_var2().
-   │ ╰──────────────────^ uses_ty_w_unbound_var2/0 references type with invalid definition: w_unbound_var2/0
-
-error: repated_type_var_in_type_decl (See https://fb.me/eqwalizer_errors#repated_type_var_in_type_decl)
-   ┌─ check/src/type_aliases.erl:28:1
-   │
-28 │ -type repeated(T, T) :: T.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^ T. Type vars in type declarations must be distinct
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:30:1
-   │  
-30 │ ╭ -spec test_repeated1_neg(a, b) ->
-31 │ │     repeated(a, b).
-   │ ╰────────────^ test_repeated1_neg/2 references type with invalid definition: repeated/2
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:34:1
-   │  
-34 │ ╭ -spec test_repeated2_neg(a, b) ->
-35 │ │     repeated(a, b).
-   │ ╰────────────^ test_repeated2_neg/2 references type with invalid definition: repeated/2
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:39:1
-   │  
-39 │ ╭ -spec test_use_bad_type
-40 │ │ (undefined | w_unbound_var()) ->
-41 │ │     w_unbound_var() | undefined.
-   │ ╰───────────────────────────────^ test_use_bad_type/1 references type with invalid definition: w_unbound_var/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:48:1
-   │  
-48 │ ╭ -spec test_use_bad_type_gen(
-49 │ │     w_unbound_var(),
-50 │ │     undefined | w_unbound_var()) ->
-51 │ │         term().
-   │ ╰────────────^ test_use_bad_type_gen/2 references type with invalid definition: w_unbound_var/0
-
-error: unbound_type_var (See https://fb.me/eqwalizer_errors#unbound_type_var)
-   ┌─ check/src/type_aliases.erl:55:1
-   │  
-55 │ ╭ -type tup_w_unbound(T)
-56 │ │ :: {T, _A}.
-   │ ╰──────────^ _A: Type variable is unbound.
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:58:1
-   │  
-58 │ ╭ -spec unpack_tup_w_unbound(
-59 │ │     tup_w_unbound(T)
-60 │ │ ) -> T.
-   │ ╰──────^ unpack_tup_w_unbound/1 references type with invalid definition: tup_w_unbound/1
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:64:1
-   │  
-64 │ ╭ -spec test_use_unpack_tup_w_unbound(
-65 │ │     tup_w_unbound(a)) -> a.
-   │ ╰──────────────────────────^ test_use_unpack_tup_w_unbound/1 references type with invalid definition: tup_w_unbound/1
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:69:1
-   │  
-69 │ ╭ -spec test_use_tup_w_unbound_cov(
-70 │ │     tup_w_unbound(a)) ->
-71 │ │     tup_w_unbound(a | b) .
-   │ ╰─────────────────^ test_use_tup_w_unbound_cov/1 references type with invalid definition: tup_w_unbound/1
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:75:1
-   │  
-75 │ ╭ -spec test_use_tup_w_unbound_contra_neg(
-76 │ │     tup_w_unbound(a | b)) ->
-77 │ │     tup_w_unbound(a) .
-   │ ╰─────────────────^ test_use_tup_w_unbound_contra_neg/1 references type with invalid definition: tup_w_unbound/1
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:81:1
-   │  
-81 │ ╭ -spec test_use_tup_w_unbound_contra_neg2(
-82 │ │     tup_w_unbound(a | b)) ->
-83 │ │     tup_w_unbound(a) | w_unbound_var().
-   │ ╰────────────────────────────────────^ test_use_tup_w_unbound_contra_neg2/1 references types with invalid definitions: tup_w_unbound/1, w_unbound_var/0
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-   ┌─ check/src/type_aliases.erl:87:1
-   │
-87 │ -type loop() :: loop().
-   │ ^^^^^^^^^^^^^^^^^^^^ recursive type loop/0 is not productive
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:89:1
-   │
-89 │ -record(rec1, {l :: loop() | undefined}).
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ rec1 references type with invalid definition: loop/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ check/src/type_aliases.erl:90:1
-   │
-90 │ -record(rec2, {l :: undefined | loop()}).
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ rec2 references type with invalid definition: loop/0
-
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-    ┌─ check/src/type_aliases.erl:104:21
-    │
-104 │     opaque:opair(a, x:y()).
-    │                     ^^^^^ Unknown id: x:y/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/type_aliases.erl:106:1
-    │  
-106 │ ╭ -spec use_bad_inside_neg(
-107 │ │    bad_inside()
-108 │ │ ) -> bad_inside().
-    │ ╰───────────────^ use_bad_inside_neg/1 references type with invalid definition: bad_inside/0
-
-22 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/type_aliases-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/type_aliases.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/type_aliases-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/type_aliases.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/type_asserts-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/type_asserts-OTP-27.pretty
deleted file mode 100644
index c5fb63ed41..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/type_asserts-OTP-27.pretty
+++ /dev/null
@@ -1,256 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/type_asserts.erl:39:3
-   │
-39 │   Arg.
-   │   ^^^ Arg.
-Expression has type:   string()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/type_asserts.erl:48:3
-   │
-48 │   Arg.
-   │   ^^^
-   │   │
-   │   Arg.
-Expression has type:   string() | binary()
-Context expected type: binary()
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: string()
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  string() | binary() is not compatible with binary()
-  because
-  string() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/type_asserts.erl:63:26
-   │
-63 │     andalso list_to_atom(A).
-   │                          ^ A.
-Expression has type:   binary()
-Context expected type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/type_asserts.erl:70:26
-   │
-70 │     andalso list_to_atom(A).
-   │                          ^ A.
-Expression has type:   binary()
-Context expected type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/type_asserts.erl:84:3
-   │    
-84 │ ╭ ╭   is_number(N)
-85 │ │ │     andalso is_atom(A)
-86 │ │ │     andalso {N, A}.
-   │ ╰─│──────────────────^ _ andalso _.
-Expression has type:   'false' | {number(), atom()}
-Context expected type: 'false' | {atom(), number()}
-   │   ╰──────────────────' 
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: 'false'
-  However, the following candidate doesn't match:
-  { 
-    Here the type is:     number()
-    Context expects type: atom()
-  , atom()}
-
------------------------------- Detailed message ------------------------------
-
-  'false' | {number(), atom()} is not compatible with 'false' | {atom(), number()}
-  because
-  {number(), atom()} is not compatible with 'false' | {atom(), number()}
-  because
-  at tuple index 1:
-  {number(), atom()} is not compatible with {atom(), number()}
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/type_asserts.erl:92:3
-   │
-92 │   {X, A}.
-   │   ^^^^^^
-   │   │
-   │   {X, A}.
-Expression has type:   {'false' | number(), term()}
-Context expected type: {'false' | number(), number()}
-   │   
-
-Because in the expression's type:
-  { 'false' | number(), 
-    Here the type is:     term()
-    Context expects type: number()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'false' | number(), term()} is not compatible with {'false' | number(), number()}
-  because
-  term() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/type_asserts.erl:105:39
-    │
-105 │ checked_cast1_neg(A) -> ?checked_cast(A, ok).
-    │                                       ^ A.
-Expression has type:   atom()
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/type_asserts.erl:108:25
-    │
-108 │ checked_cast2_neg(A) -> ?checked_cast(A, atom()).
-    │                         ^^^^^^^^^^^^^^^^^^^^^^^^ .. :: ...
-Expression has type:   atom()
-Context expected type: 'ok'
-
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-    ┌─ check/src/type_asserts.erl:110:20
-    │
-110 │ -type invalid() :: foo:non_exist().
-    │                    ^^^^^^^^^^^^^^^ Unknown id: foo:non_exist/0
-
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-    ┌─ check/src/type_asserts.erl:113:42
-    │
-113 │ checked_cast3_neg(A) -> ?checked_cast(A, foo:non_exist()).
-    │                                          ^^^^^^^^^^^^^^^ Unknown id: foo:non_exist/0
-
-error: invalid_ref_in_type_cast (See https://fb.me/eqwalizer_errors#invalid_ref_in_type_cast)
-    ┌─ check/src/type_asserts.erl:116:42
-    │
-116 │ checked_cast4_neg(A) -> ?checked_cast(A, {ok, invalid()}).
-    │                                          ^^^^^^^^^^^^^^^ type cast references type with invalid definition: invalid/0
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/type_asserts.erl:126:9
-    │
-126 │         Acc#{K => V#{ka => va}};
-    │         ^^^^^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         ..#{..}.
-Expression has type:   #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}}
-Context expected type: #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}}
-    │         
-
-Because in the expression's type:
-  #{ dynamic() =>
-    Here the type is:     #{kb := ...}
-    Context expects type: #{...}
-    The expected map has no corresponding key for: kb.
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} is not compatible with #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}}
-  because
-  #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} is not compatible with #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}}
-  the default associations are not compatible
-  because
-  #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'} is not compatible with #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}
-  because
-  #{ka := 'va', kb := 'vb', kc := 'vc'} is not compatible with #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/type_asserts.erl:129:9
-    │
-129 │         Acc#{K => V#{kb => vb}};
-    │         ^^^^^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         ..#{..}.
-Expression has type:   #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}}
-Context expected type: #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}}
-    │         
-
-Because in the expression's type:
-  #{ dynamic() =>
-    Here the type is:     #{kb := ...}
-    Context expects type: #{...}
-    The expected map has no corresponding key for: kb.
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} is not compatible with #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}}
-  because
-  #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} is not compatible with #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}}
-  the default associations are not compatible
-  because
-  #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'} is not compatible with #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}
-  because
-  #{ka := 'va', kb := 'vb', kc := 'vc'} is not compatible with #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/type_asserts.erl:132:9
-    │
-132 │         Acc#{K => V#{kc => vc}}
-    │         ^^^^^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         ..#{..}.
-Expression has type:   #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}}
-Context expected type: #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}}
-    │         
-
-Because in the expression's type:
-  #{ dynamic() =>
-    Here the type is:     #{kb := ...}
-    Context expects type: #{...}
-    The expected map has no corresponding key for: kb.
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} is not compatible with #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}}
-  because
-  #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} is not compatible with #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}}
-  the default associations are not compatible
-  because
-  #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'} is not compatible with #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}
-  because
-  #{ka := 'va', kb := 'vb', kc := 'vc'} is not compatible with #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/type_asserts.erl:156:24
-    │
-156 │ unsafe_cast1_neg(A) -> ?unchecked_cast(A, err).
-    │                        ^^^^^^^^^^^^^^^^^^^^^^^ .. :: ...
-Expression has type:   'err'
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/type_asserts.erl:159:40
-    │
-159 │ unsafe_cast2_neg(D) -> ?unchecked_cast(a + D, ok).
-    │                                        ^ 'a'.
-Expression has type:   'a'
-Context expected type: number()
-
-error: variables_in_type_cast (See https://fb.me/eqwalizer_errors#variables_in_type_cast)
-    ┌─ check/src/type_asserts.erl:163:21
-    │
-163 │   ?checked_cast(ok, A).
-    │                     ^ type variables are not allowed in type casts, found: A
-
-error: variables_in_type_cast (See https://fb.me/eqwalizer_errors#variables_in_type_cast)
-    ┌─ check/src/type_asserts.erl:167:23
-    │
-167 │   ?unchecked_cast(ok, A | B).
-    │                       ^^^^^ type variables are not allowed in type casts, found: A, B
-
-error: refined_record_in_type_cast (See https://fb.me/eqwalizer_errors#refined_record_in_type_cast)
-    ┌─ check/src/type_asserts.erl:173:22
-    │
-173 │   ?unchecked_cast(1, #rec{bad_field :: atom()}).
-    │                      ^^^^^^^^^^^^^^^^^^^^^^^^^ refined records are not allowed in type casts, found: rec
-
-19 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/type_asserts-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/type_asserts-OTP-28.pretty
deleted file mode 100644
index c5fb63ed41..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/type_asserts-OTP-28.pretty
+++ /dev/null
@@ -1,256 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/type_asserts.erl:39:3
-   │
-39 │   Arg.
-   │   ^^^ Arg.
-Expression has type:   string()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/type_asserts.erl:48:3
-   │
-48 │   Arg.
-   │   ^^^
-   │   │
-   │   Arg.
-Expression has type:   string() | binary()
-Context expected type: binary()
-   │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: string()
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  string() | binary() is not compatible with binary()
-  because
-  string() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/type_asserts.erl:63:26
-   │
-63 │     andalso list_to_atom(A).
-   │                          ^ A.
-Expression has type:   binary()
-Context expected type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/type_asserts.erl:70:26
-   │
-70 │     andalso list_to_atom(A).
-   │                          ^ A.
-Expression has type:   binary()
-Context expected type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/type_asserts.erl:84:3
-   │    
-84 │ ╭ ╭   is_number(N)
-85 │ │ │     andalso is_atom(A)
-86 │ │ │     andalso {N, A}.
-   │ ╰─│──────────────────^ _ andalso _.
-Expression has type:   'false' | {number(), atom()}
-Context expected type: 'false' | {atom(), number()}
-   │   ╰──────────────────' 
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: 'false'
-  However, the following candidate doesn't match:
-  { 
-    Here the type is:     number()
-    Context expects type: atom()
-  , atom()}
-
------------------------------- Detailed message ------------------------------
-
-  'false' | {number(), atom()} is not compatible with 'false' | {atom(), number()}
-  because
-  {number(), atom()} is not compatible with 'false' | {atom(), number()}
-  because
-  at tuple index 1:
-  {number(), atom()} is not compatible with {atom(), number()}
-  because
-  number() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/type_asserts.erl:92:3
-   │
-92 │   {X, A}.
-   │   ^^^^^^
-   │   │
-   │   {X, A}.
-Expression has type:   {'false' | number(), term()}
-Context expected type: {'false' | number(), number()}
-   │   
-
-Because in the expression's type:
-  { 'false' | number(), 
-    Here the type is:     term()
-    Context expects type: number()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'false' | number(), term()} is not compatible with {'false' | number(), number()}
-  because
-  term() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/type_asserts.erl:105:39
-    │
-105 │ checked_cast1_neg(A) -> ?checked_cast(A, ok).
-    │                                       ^ A.
-Expression has type:   atom()
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/type_asserts.erl:108:25
-    │
-108 │ checked_cast2_neg(A) -> ?checked_cast(A, atom()).
-    │                         ^^^^^^^^^^^^^^^^^^^^^^^^ .. :: ...
-Expression has type:   atom()
-Context expected type: 'ok'
-
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-    ┌─ check/src/type_asserts.erl:110:20
-    │
-110 │ -type invalid() :: foo:non_exist().
-    │                    ^^^^^^^^^^^^^^^ Unknown id: foo:non_exist/0
-
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-    ┌─ check/src/type_asserts.erl:113:42
-    │
-113 │ checked_cast3_neg(A) -> ?checked_cast(A, foo:non_exist()).
-    │                                          ^^^^^^^^^^^^^^^ Unknown id: foo:non_exist/0
-
-error: invalid_ref_in_type_cast (See https://fb.me/eqwalizer_errors#invalid_ref_in_type_cast)
-    ┌─ check/src/type_asserts.erl:116:42
-    │
-116 │ checked_cast4_neg(A) -> ?checked_cast(A, {ok, invalid()}).
-    │                                          ^^^^^^^^^^^^^^^ type cast references type with invalid definition: invalid/0
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/type_asserts.erl:126:9
-    │
-126 │         Acc#{K => V#{ka => va}};
-    │         ^^^^^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         ..#{..}.
-Expression has type:   #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}}
-Context expected type: #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}}
-    │         
-
-Because in the expression's type:
-  #{ dynamic() =>
-    Here the type is:     #{kb := ...}
-    Context expects type: #{...}
-    The expected map has no corresponding key for: kb.
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} is not compatible with #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}}
-  because
-  #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} is not compatible with #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}}
-  the default associations are not compatible
-  because
-  #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'} is not compatible with #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}
-  because
-  #{ka := 'va', kb := 'vb', kc := 'vc'} is not compatible with #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/type_asserts.erl:129:9
-    │
-129 │         Acc#{K => V#{kb => vb}};
-    │         ^^^^^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         ..#{..}.
-Expression has type:   #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}}
-Context expected type: #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}}
-    │         
-
-Because in the expression's type:
-  #{ dynamic() =>
-    Here the type is:     #{kb := ...}
-    Context expects type: #{...}
-    The expected map has no corresponding key for: kb.
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} is not compatible with #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}}
-  because
-  #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} is not compatible with #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}}
-  the default associations are not compatible
-  because
-  #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'} is not compatible with #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}
-  because
-  #{ka := 'va', kb := 'vb', kc := 'vc'} is not compatible with #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/type_asserts.erl:132:9
-    │
-132 │         Acc#{K => V#{kc => vc}}
-    │         ^^^^^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         ..#{..}.
-Expression has type:   #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}}
-Context expected type: #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}}
-    │         
-
-Because in the expression's type:
-  #{ dynamic() =>
-    Here the type is:     #{kb := ...}
-    Context expects type: #{...}
-    The expected map has no corresponding key for: kb.
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} is not compatible with #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}}
-  because
-  #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} is not compatible with #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}}
-  the default associations are not compatible
-  because
-  #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'} is not compatible with #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}
-  because
-  #{ka := 'va', kb := 'vb', kc := 'vc'} is not compatible with #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/type_asserts.erl:156:24
-    │
-156 │ unsafe_cast1_neg(A) -> ?unchecked_cast(A, err).
-    │                        ^^^^^^^^^^^^^^^^^^^^^^^ .. :: ...
-Expression has type:   'err'
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/type_asserts.erl:159:40
-    │
-159 │ unsafe_cast2_neg(D) -> ?unchecked_cast(a + D, ok).
-    │                                        ^ 'a'.
-Expression has type:   'a'
-Context expected type: number()
-
-error: variables_in_type_cast (See https://fb.me/eqwalizer_errors#variables_in_type_cast)
-    ┌─ check/src/type_asserts.erl:163:21
-    │
-163 │   ?checked_cast(ok, A).
-    │                     ^ type variables are not allowed in type casts, found: A
-
-error: variables_in_type_cast (See https://fb.me/eqwalizer_errors#variables_in_type_cast)
-    ┌─ check/src/type_asserts.erl:167:23
-    │
-167 │   ?unchecked_cast(ok, A | B).
-    │                       ^^^^^ type variables are not allowed in type casts, found: A, B
-
-error: refined_record_in_type_cast (See https://fb.me/eqwalizer_errors#refined_record_in_type_cast)
-    ┌─ check/src/type_asserts.erl:173:22
-    │
-173 │   ?unchecked_cast(1, #rec{bad_field :: atom()}).
-    │                      ^^^^^^^^^^^^^^^^^^^^^^^^^ refined records are not allowed in type casts, found: rec
-
-19 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/type_asserts-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/type_asserts.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/type_asserts-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/type_asserts.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/type_predicates-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/type_predicates-OTP-27.pretty
deleted file mode 100644
index 2725e97755..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/type_predicates-OTP-27.pretty
+++ /dev/null
@@ -1,25 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/type_predicates.erl:102:32
-    │
-102 │     when is_record(R, rec2) -> R.
-    │                                ^ R.
-Expression has type:   #rec2{}
-Context expected type: #rec1{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/type_predicates.erl:107:35
-    │
-107 │     when is_record(R, rec2, 1) -> R.
-    │                                   ^ R.
-Expression has type:   #rec2{}
-Context expected type: #rec1{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/type_predicates.erl:149:39
-    │
-149 │     when is_function(F, 2) -> #f1{f = F}.
-    │                                       ^ F.
-Expression has type:   fun((term(), term()) -> term())
-Context expected type: fun((term()) -> term())
-
-3 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/type_predicates-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/type_predicates-OTP-28.pretty
deleted file mode 100644
index 2725e97755..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/type_predicates-OTP-28.pretty
+++ /dev/null
@@ -1,25 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/type_predicates.erl:102:32
-    │
-102 │     when is_record(R, rec2) -> R.
-    │                                ^ R.
-Expression has type:   #rec2{}
-Context expected type: #rec1{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/type_predicates.erl:107:35
-    │
-107 │     when is_record(R, rec2, 1) -> R.
-    │                                   ^ R.
-Expression has type:   #rec2{}
-Context expected type: #rec1{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/type_predicates.erl:149:39
-    │
-149 │     when is_function(F, 2) -> #f1{f = F}.
-    │                                       ^ F.
-Expression has type:   fun((term(), term()) -> term())
-Context expected type: fun((term()) -> term())
-
-3 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/type_predicates-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/type_predicates.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/type_predicates-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/type_predicates.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/united_fun-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/united_fun-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/united_fun-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/united_fun-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/united_fun-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/united_fun-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/united_fun-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/united_fun-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/united_fun-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_try_catch-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/united_fun.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_try_catch-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/united_fun.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/unspecced-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/unspecced-OTP-27.pretty
deleted file mode 100644
index b3a6323374..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/unspecced-OTP-27.pretty
+++ /dev/null
@@ -1,63 +0,0 @@
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/unspecced.erl:11:1
-   │
-11 │ expect_none(None) -> None.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/unspecced.erl:14:15
-   │
-14 │   expect_none({Id}).
-   │               ^^^^ {Id}.
-Expression has type:   {dynamic()}
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/unspecced.erl:20:15
-   │
-20 │   expect_none(Res).
-   │               ^^^ Res.
-Expression has type:   #{dynamic() => {dynamic()}}
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/unspecced.erl:24:15
-   │
-24 │   expect_none({Id}).
-   │               ^^^^ {Id}.
-Expression has type:   {dynamic()}
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/unspecced.erl:28:15
-   │
-28 │   expect_none({Res}).
-   │               ^^^^^ {Res}.
-Expression has type:   {#{id := number(), dynamic() => dynamic()}}
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/unspecced.erl:32:15
-   │
-32 │   expect_none(Res).
-   │               ^^^ Res.
-Expression has type:   {dynamic(), dynamic([term()])}
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/unspecced.erl:36:15
-   │
-36 │   expect_none(Res).
-   │               ^^^ Res.
-Expression has type:   {dynamic()}
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/unspecced.erl:41:18
-   │
-41 │   atom_to_binary(Rec#rec.id).
-   │                  ^^^^^^^^^^ ...#rec.id.
-Expression has type:   number()
-Context expected type: atom()
-
-8 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/unspecced-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/unspecced-OTP-28.pretty
deleted file mode 100644
index b3a6323374..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/unspecced-OTP-28.pretty
+++ /dev/null
@@ -1,63 +0,0 @@
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/unspecced.erl:11:1
-   │
-11 │ expect_none(None) -> None.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/unspecced.erl:14:15
-   │
-14 │   expect_none({Id}).
-   │               ^^^^ {Id}.
-Expression has type:   {dynamic()}
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/unspecced.erl:20:15
-   │
-20 │   expect_none(Res).
-   │               ^^^ Res.
-Expression has type:   #{dynamic() => {dynamic()}}
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/unspecced.erl:24:15
-   │
-24 │   expect_none({Id}).
-   │               ^^^^ {Id}.
-Expression has type:   {dynamic()}
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/unspecced.erl:28:15
-   │
-28 │   expect_none({Res}).
-   │               ^^^^^ {Res}.
-Expression has type:   {#{id := number(), dynamic() => dynamic()}}
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/unspecced.erl:32:15
-   │
-32 │   expect_none(Res).
-   │               ^^^ Res.
-Expression has type:   {dynamic(), dynamic([term()])}
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/unspecced.erl:36:15
-   │
-36 │   expect_none(Res).
-   │               ^^^ Res.
-Expression has type:   {dynamic()}
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/unspecced.erl:41:18
-   │
-41 │   atom_to_binary(Rec#rec.id).
-   │                  ^^^^^^^^^^ ...#rec.id.
-Expression has type:   number()
-Context expected type: atom()
-
-8 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/unspecced-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/unspecced.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/unspecced-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/unspecced.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_gradual-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_gradual-OTP-27.pretty
deleted file mode 100644
index d03afc8cf8..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_gradual-OTP-27.pretty
+++ /dev/null
@@ -1,25 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/use_dynamic_gradual.erl:19:3
-   │
-19 │   {erlang:atom_to_binary(Dyn)}.
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   │   │
-   │   {erlang:atom_to_binary(Dyn)}.
-Expression has type:   {binary()}
-Context expected type: {atom()}
-   │   
-
-Because in the expression's type:
-  { 
-    Here the type is:     binary()
-    Context expects type: atom()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {binary()} is not compatible with {atom()}
-  because
-  binary() is not compatible with atom()
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_gradual-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_gradual-OTP-28.pretty
deleted file mode 100644
index d03afc8cf8..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_gradual-OTP-28.pretty
+++ /dev/null
@@ -1,25 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/use_dynamic_gradual.erl:19:3
-   │
-19 │   {erlang:atom_to_binary(Dyn)}.
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   │   │
-   │   {erlang:atom_to_binary(Dyn)}.
-Expression has type:   {binary()}
-Context expected type: {atom()}
-   │   
-
-Because in the expression's type:
-  { 
-    Here the type is:     binary()
-    Context expects type: atom()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {binary()} is not compatible with {atom()}
-  because
-  binary() is not compatible with atom()
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_gradual-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_gradual.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_gradual-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_gradual.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_strict-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_strict-OTP-27.pretty
deleted file mode 100644
index 12f1d81948..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_strict-OTP-27.pretty
+++ /dev/null
@@ -1,25 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/use_dynamic_strict.erl:17:3
-   │
-17 │   {erlang:atom_to_binary(Dyn)}.
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   │   │
-   │   {erlang:atom_to_binary(Dyn)}.
-Expression has type:   {binary()}
-Context expected type: {atom()}
-   │   
-
-Because in the expression's type:
-  { 
-    Here the type is:     binary()
-    Context expects type: atom()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {binary()} is not compatible with {atom()}
-  because
-  binary() is not compatible with atom()
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_strict-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_strict-OTP-28.pretty
deleted file mode 100644
index 12f1d81948..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_strict-OTP-28.pretty
+++ /dev/null
@@ -1,25 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/use_dynamic_strict.erl:17:3
-   │
-17 │   {erlang:atom_to_binary(Dyn)}.
-   │   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   │   │
-   │   {erlang:atom_to_binary(Dyn)}.
-Expression has type:   {binary()}
-Context expected type: {atom()}
-   │   
-
-Because in the expression's type:
-  { 
-    Here the type is:     binary()
-    Context expects type: atom()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {binary()} is not compatible with {atom()}
-  because
-  binary() is not compatible with atom()
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_strict-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_strict.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_strict-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_strict.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/vars1-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/vars1-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/vars1-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/vars1-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/vars1-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/vars1-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/vars1-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/vars1-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/vars1-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_try_catch-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/vars1.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_try_catch-OTP-27.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/vars1.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/vars2-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/vars2-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/vars2-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/vars2-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/vars2-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/vars2-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/vars2-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/vars2-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/vars2-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_try_catch-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/vars2.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_try_catch-OTP-28.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/vars2.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/attributes-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/attributes-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/debug/attributes-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/attributes-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/attributes-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/debug/attributes-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/attributes-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/attributes-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/debug/attributes-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/fancy_generics-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/attributes.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/fancy_generics-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/debug/attributes.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/debug_header-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/debug_header-OTP-27.pretty
deleted file mode 100644
index 558b077666..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/debug/debug_header-OTP-27.pretty
+++ /dev/null
@@ -1,7 +0,0 @@
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/debug_header.erl:14:1
-   │
-14 │ -type t() :: has_unbound().
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^ t/0 references type with invalid definition: has_unbound/0
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/debug_header-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/debug_header-OTP-28.pretty
deleted file mode 100644
index 558b077666..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/debug/debug_header-OTP-28.pretty
+++ /dev/null
@@ -1,7 +0,0 @@
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/debug_header.erl:14:1
-   │
-14 │ -type t() :: has_unbound().
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^ t/0 references type with invalid definition: has_unbound/0
-
-1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/debug_header-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/debug_header.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/debug/debug_header-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/debug/debug_header.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/expand-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/expand-OTP-27.pretty
deleted file mode 100644
index 7082351ffd..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/debug/expand-OTP-27.pretty
+++ /dev/null
@@ -1,98 +0,0 @@
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-   ┌─ debug/src/expand.erl:27:8
-   │
-27 │     -> types1:bin_tree_typo().
-   │        ^^^^^^^^^^^^^^^^^^^^^^ Unknown id: types1:bin_tree_typo/0
-
-error: recursive_constraint (See https://fb.me/eqwalizer_errors#recursive_constraint)
-   ┌─ debug/src/expand.erl:35:27
-   │
-35 │     Rec when Rec :: {rec, Rec}.
-   │                           ^^^ Recursive constraint: Rec
-
-error: unbound_type_var (See https://fb.me/eqwalizer_errors#unbound_type_var)
-   ┌─ debug/src/expand.erl:42:1
-   │
-42 │ -type w_unbound_var() :: {_A, _B}.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ _A: Type variable is unbound.
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/expand.erl:43:1
-   │  
-43 │ ╭ -type trans_unbound_var()
-44 │ │     :: w_unbound_var().
-   │ ╰────────────────────^ trans_unbound_var/0 references type with invalid definition: w_unbound_var/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/expand.erl:46:1
-   │  
-46 │ ╭ -spec uses_ty_w_unbound_var(_A, _B) ->
-47 │ │     w_unbound_var().
-   │ ╰─────────────────^ uses_ty_w_unbound_var/2 references type with invalid definition: w_unbound_var/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/expand.erl:50:1
-   │  
-50 │ ╭ -spec uses_trans_unbound_var(_A, _B) ->
-51 │ │     trans_unbound_var().
-   │ ╰─────────────────────^ uses_trans_unbound_var/2 references type with invalid definition: trans_unbound_var/0
-
-error: unbound_type_var (See https://fb.me/eqwalizer_errors#unbound_type_var)
-   ┌─ debug/src/expand.erl:54:1
-   │  
-54 │ ╭ -type w_unbound_var2()
-55 │ │     :: _A.
-   │ ╰─────────^ _A: Type variable is unbound.
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/expand.erl:57:1
-   │  
-57 │ ╭ -spec uses_ty_w_unbound_var2() ->
-58 │ │     w_unbound_var2().
-   │ ╰──────────────────^ uses_ty_w_unbound_var2/0 references type with invalid definition: w_unbound_var2/0
-
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-   ┌─ debug/src/expand.erl:62:12
-   │
-62 │     ref :: undefined_mod:ref()
-   │            ^^^^^^^^^^^^^^^^^^^ Unknown id: undefined_mod:ref/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/expand.erl:64:1
-   │
-64 │ -type bad_ref() :: #bad_ref{}.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ bad_ref/0 references type with invalid definition: #bad_ref{}
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-   ┌─ debug/src/expand.erl:66:1
-   │
-66 │ -opaque bad_opaque() :: bad_opaque().
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type bad_opaque/0 is not productive
-
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-   ┌─ debug/src/expand.erl:68:25
-   │
-68 │ -record(bad_rec, {id :: unknown:id()}).
-   │                         ^^^^^^^^^^^^ Unknown id: unknown:id/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/expand.erl:69:1
-   │
-69 │ -spec mk_bad_rec() -> #bad_rec{}.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ mk_bad_rec/0 references type with invalid definition: #bad_rec{}
-
-error: unbound_record (See https://fb.me/eqwalizer_errors#unbound_record)
-   ┌─ debug/src/expand.erl:70:17
-   │
-70 │ mk_bad_rec() -> #bad_rec{}.
-   │                 ^^^^^^^^^^ Unbound rec: bad_rec
-
-error: ty_var_with_multiple_constraints (See https://fb.me/eqwalizer_errors#ty_var_with_multiple_constraints)
-   ┌─ debug/src/expand.erl:72:23
-   │  
-72 │   -spec double_constrain(Thing) -> Thing
-   │ ╭───────────────────────^
-73 │ │   when Thing :: pid(), Thing :: atom().
-   │ ╰────────────────────────────────────^ Type variable 'Thing' is constrained multiple times, please remove the extra constraints
-
-15 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/expand-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/expand-OTP-28.pretty
deleted file mode 100644
index 7082351ffd..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/debug/expand-OTP-28.pretty
+++ /dev/null
@@ -1,98 +0,0 @@
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-   ┌─ debug/src/expand.erl:27:8
-   │
-27 │     -> types1:bin_tree_typo().
-   │        ^^^^^^^^^^^^^^^^^^^^^^ Unknown id: types1:bin_tree_typo/0
-
-error: recursive_constraint (See https://fb.me/eqwalizer_errors#recursive_constraint)
-   ┌─ debug/src/expand.erl:35:27
-   │
-35 │     Rec when Rec :: {rec, Rec}.
-   │                           ^^^ Recursive constraint: Rec
-
-error: unbound_type_var (See https://fb.me/eqwalizer_errors#unbound_type_var)
-   ┌─ debug/src/expand.erl:42:1
-   │
-42 │ -type w_unbound_var() :: {_A, _B}.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ _A: Type variable is unbound.
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/expand.erl:43:1
-   │  
-43 │ ╭ -type trans_unbound_var()
-44 │ │     :: w_unbound_var().
-   │ ╰────────────────────^ trans_unbound_var/0 references type with invalid definition: w_unbound_var/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/expand.erl:46:1
-   │  
-46 │ ╭ -spec uses_ty_w_unbound_var(_A, _B) ->
-47 │ │     w_unbound_var().
-   │ ╰─────────────────^ uses_ty_w_unbound_var/2 references type with invalid definition: w_unbound_var/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/expand.erl:50:1
-   │  
-50 │ ╭ -spec uses_trans_unbound_var(_A, _B) ->
-51 │ │     trans_unbound_var().
-   │ ╰─────────────────────^ uses_trans_unbound_var/2 references type with invalid definition: trans_unbound_var/0
-
-error: unbound_type_var (See https://fb.me/eqwalizer_errors#unbound_type_var)
-   ┌─ debug/src/expand.erl:54:1
-   │  
-54 │ ╭ -type w_unbound_var2()
-55 │ │     :: _A.
-   │ ╰─────────^ _A: Type variable is unbound.
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/expand.erl:57:1
-   │  
-57 │ ╭ -spec uses_ty_w_unbound_var2() ->
-58 │ │     w_unbound_var2().
-   │ ╰──────────────────^ uses_ty_w_unbound_var2/0 references type with invalid definition: w_unbound_var2/0
-
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-   ┌─ debug/src/expand.erl:62:12
-   │
-62 │     ref :: undefined_mod:ref()
-   │            ^^^^^^^^^^^^^^^^^^^ Unknown id: undefined_mod:ref/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/expand.erl:64:1
-   │
-64 │ -type bad_ref() :: #bad_ref{}.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ bad_ref/0 references type with invalid definition: #bad_ref{}
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-   ┌─ debug/src/expand.erl:66:1
-   │
-66 │ -opaque bad_opaque() :: bad_opaque().
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type bad_opaque/0 is not productive
-
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-   ┌─ debug/src/expand.erl:68:25
-   │
-68 │ -record(bad_rec, {id :: unknown:id()}).
-   │                         ^^^^^^^^^^^^ Unknown id: unknown:id/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/expand.erl:69:1
-   │
-69 │ -spec mk_bad_rec() -> #bad_rec{}.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ mk_bad_rec/0 references type with invalid definition: #bad_rec{}
-
-error: unbound_record (See https://fb.me/eqwalizer_errors#unbound_record)
-   ┌─ debug/src/expand.erl:70:17
-   │
-70 │ mk_bad_rec() -> #bad_rec{}.
-   │                 ^^^^^^^^^^ Unbound rec: bad_rec
-
-error: ty_var_with_multiple_constraints (See https://fb.me/eqwalizer_errors#ty_var_with_multiple_constraints)
-   ┌─ debug/src/expand.erl:72:23
-   │  
-72 │   -spec double_constrain(Thing) -> Thing
-   │ ╭───────────────────────^
-73 │ │   when Thing :: pid(), Thing :: atom().
-   │ ╰────────────────────────────────────^ Type variable 'Thing' is constrained multiple times, please remove the extra constraints
-
-15 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/expand-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/expand.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/debug/expand-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/debug/expand.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/expr1-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/expr1-OTP-27.pretty
deleted file mode 100644
index 85e1a2782c..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/debug/expr1-OTP-27.pretty
+++ /dev/null
@@ -1,17 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ debug/src/expr1.erl:83:8
-   │
-83 │     << X || X <- [1, 2, 3] >>.
-   │        ^ X.
-Expression has type:   number()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ debug/src/expr1.erl:86:8
-   │
-86 │     << X || <<X>> <= <<1, 2, 3>> >>.
-   │        ^ X.
-Expression has type:   number()
-Context expected type: binary()
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/expr1-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/expr1-OTP-28.pretty
deleted file mode 100644
index 85e1a2782c..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/debug/expr1-OTP-28.pretty
+++ /dev/null
@@ -1,17 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ debug/src/expr1.erl:83:8
-   │
-83 │     << X || X <- [1, 2, 3] >>.
-   │        ^ X.
-Expression has type:   number()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ debug/src/expr1.erl:86:8
-   │
-86 │     << X || <<X>> <= <<1, 2, 3>> >>.
-   │        ^ X.
-Expression has type:   number()
-Context expected type: binary()
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/expr1-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/expr1.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/debug/expr1-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/debug/expr1.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/expr2-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/expr2-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/debug/expr2-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/expr2-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/expr2-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/debug/expr2-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/expr2-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/expr2-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/debug/expr2-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/fancy_generics-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/expr2.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/fancy_generics-OTP-27.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/debug/expr2.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/records_wip-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/records_wip-OTP-27.pretty
deleted file mode 100644
index 6ce3d4eb83..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/debug/records_wip-OTP-27.pretty
+++ /dev/null
@@ -1,46 +0,0 @@
-error: type_var_in_record_field (See https://fb.me/eqwalizer_errors#type_var_in_record_field)
-   ┌─ debug/src/records_wip.erl:60:14
-   │
-60 │     field :: _TyVar
-   │              ^^^^^^ _TyVar: Type variables are meaningless in record fields. Did you mean to use an alias?
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/records_wip.erl:62:1
-   │
-62 │ -type ty_var_in_field() :: #ty_var_in_field{}.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ty_var_in_field/0 references type with invalid definition: #ty_var_in_field{}
-
-error: type_var_in_record_field (See https://fb.me/eqwalizer_errors#type_var_in_record_field)
-   ┌─ debug/src/records_wip.erl:66:9
-   │
-66 │         _TyVar
-   │         ^^^^^^ _TyVar: Type variables are meaningless in record fields. Did you mean to use an alias?
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/records_wip.erl:68:1
-   │
-68 │ -type ty_var_in_field2() :: #ty_var_in_field2{}.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ty_var_in_field2/0 references type with invalid definition: #ty_var_in_field2{}
-
-error: unbound_type_var (See https://fb.me/eqwalizer_errors#unbound_type_var)
-   ┌─ debug/src/records_wip.erl:70:1
-   │
-70 │ -type var_from_nowhere() :: _T.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ _T: Type variable is unbound.
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/records_wip.erl:72:1
-   │  
-72 │ ╭ -record(ty_var_in_field3, {
-73 │ │     field ::
-74 │ │         var_from_nowhere()
-75 │ │ }).
-   │ ╰──^ ty_var_in_field3 references type with invalid definition: var_from_nowhere/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/records_wip.erl:76:1
-   │
-76 │ -type ty_var_in_field3() :: #ty_var_in_field3{}.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ty_var_in_field3/0 references type with invalid definition: #ty_var_in_field3{}
-
-7 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/records_wip-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/records_wip-OTP-28.pretty
deleted file mode 100644
index 6ce3d4eb83..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/debug/records_wip-OTP-28.pretty
+++ /dev/null
@@ -1,46 +0,0 @@
-error: type_var_in_record_field (See https://fb.me/eqwalizer_errors#type_var_in_record_field)
-   ┌─ debug/src/records_wip.erl:60:14
-   │
-60 │     field :: _TyVar
-   │              ^^^^^^ _TyVar: Type variables are meaningless in record fields. Did you mean to use an alias?
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/records_wip.erl:62:1
-   │
-62 │ -type ty_var_in_field() :: #ty_var_in_field{}.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ty_var_in_field/0 references type with invalid definition: #ty_var_in_field{}
-
-error: type_var_in_record_field (See https://fb.me/eqwalizer_errors#type_var_in_record_field)
-   ┌─ debug/src/records_wip.erl:66:9
-   │
-66 │         _TyVar
-   │         ^^^^^^ _TyVar: Type variables are meaningless in record fields. Did you mean to use an alias?
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/records_wip.erl:68:1
-   │
-68 │ -type ty_var_in_field2() :: #ty_var_in_field2{}.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ty_var_in_field2/0 references type with invalid definition: #ty_var_in_field2{}
-
-error: unbound_type_var (See https://fb.me/eqwalizer_errors#unbound_type_var)
-   ┌─ debug/src/records_wip.erl:70:1
-   │
-70 │ -type var_from_nowhere() :: _T.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ _T: Type variable is unbound.
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/records_wip.erl:72:1
-   │  
-72 │ ╭ -record(ty_var_in_field3, {
-73 │ │     field ::
-74 │ │         var_from_nowhere()
-75 │ │ }).
-   │ ╰──^ ty_var_in_field3 references type with invalid definition: var_from_nowhere/0
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-   ┌─ debug/src/records_wip.erl:76:1
-   │
-76 │ -type ty_var_in_field3() :: #ty_var_in_field3{}.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ty_var_in_field3/0 references type with invalid definition: #ty_var_in_field3{}
-
-7 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/records_wip-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/records_wip.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/debug/records_wip-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/debug/records_wip.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/types1-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/types1-OTP-27.pretty
deleted file mode 100644
index d20e8068bd..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/debug/types1-OTP-27.pretty
+++ /dev/null
@@ -1,15 +0,0 @@
-error: bad_map_key (See https://fb.me/eqwalizer_errors#bad_map_key)
-    ┌─ debug/src/types1.erl:311:5
-    │
-311 │     integer() => integer()
-    │     ^^^^^^^^^^^^^^^^^^^^ Map type will be approximated to #{dynamic() => dynamic()}, suppressing potential errors.
-Only one default association per map is allowed, all other keys should be composed of statically defined atoms or tuples.
-
-error: bad_map_key (See https://fb.me/eqwalizer_errors#bad_map_key)
-    ┌─ debug/src/types1.erl:315:5
-    │
-315 │     atom() := atom(),
-    │     ^^^^^^^^^^^^^^ Map type will be approximated to #{dynamic() => dynamic()}, suppressing potential errors.
-Use => instead of := here. Required map key should always be composed of statically defined atoms or tuples.
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/types1-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/types1-OTP-28.pretty
deleted file mode 100644
index d20e8068bd..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/debug/types1-OTP-28.pretty
+++ /dev/null
@@ -1,15 +0,0 @@
-error: bad_map_key (See https://fb.me/eqwalizer_errors#bad_map_key)
-    ┌─ debug/src/types1.erl:311:5
-    │
-311 │     integer() => integer()
-    │     ^^^^^^^^^^^^^^^^^^^^ Map type will be approximated to #{dynamic() => dynamic()}, suppressing potential errors.
-Only one default association per map is allowed, all other keys should be composed of statically defined atoms or tuples.
-
-error: bad_map_key (See https://fb.me/eqwalizer_errors#bad_map_key)
-    ┌─ debug/src/types1.erl:315:5
-    │
-315 │     atom() := atom(),
-    │     ^^^^^^^^^^^^^^ Map type will be approximated to #{dynamic() => dynamic()}, suppressing potential errors.
-Use => instead of := here. Required map key should always be composed of statically defined atoms or tuples.
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/types1-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/types1.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/debug/types1-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/debug/types1.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/types2-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/types2-OTP-27.pretty
deleted file mode 100644
index 1bab90f3a6..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/debug/types2-OTP-27.pretty
+++ /dev/null
@@ -1,19 +0,0 @@
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-   ┌─ debug/src/types2.erl:18:5
-   │
-18 │     forms1:my_number().
-   │     ^^^^^^^^^^^^^^^^^^ Unknown id: forms1:my_number/0
-
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-   ┌─ debug/src/types2.erl:21:5
-   │
-21 │     unknown:my_number().
-   │     ^^^^^^^^^^^^^^^^^^^ Unknown id: unknown:my_number/0
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-   ┌─ debug/src/types2.erl:30:1
-   │
-30 │ -type recur_invalid(X) :: o(
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type recur_invalid/1 is not productive
-
-3 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/types2-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/types2-OTP-28.pretty
deleted file mode 100644
index 1bab90f3a6..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/debug/types2-OTP-28.pretty
+++ /dev/null
@@ -1,19 +0,0 @@
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-   ┌─ debug/src/types2.erl:18:5
-   │
-18 │     forms1:my_number().
-   │     ^^^^^^^^^^^^^^^^^^ Unknown id: forms1:my_number/0
-
-error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-   ┌─ debug/src/types2.erl:21:5
-   │
-21 │     unknown:my_number().
-   │     ^^^^^^^^^^^^^^^^^^^ Unknown id: unknown:my_number/0
-
-error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
-   ┌─ debug/src/types2.erl:30:1
-   │
-30 │ -type recur_invalid(X) :: o(
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^ recursive type recur_invalid/1 is not productive
-
-3 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/types2-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/types2.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/debug/types2-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/debug/types2.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/wip_maps-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/wip_maps-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/debug/wip_maps-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/wip_maps-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/wip_maps-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/debug/wip_maps-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/debug/wip_maps-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/wip_maps-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/debug/wip_maps-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/fancy_generics-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/debug/wip_maps.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/fancy_generics-OTP-28.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/debug/wip_maps.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/basics-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/basics-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/basics-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/basics-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/basics-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/basics-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/basics-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/basics-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/basics-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_regression_01-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/basics.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/gradual_regression_01-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/elm_core/basics.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/list-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/list-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/list-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/list-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/list-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/list-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/list-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/list-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/list-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_regression_01-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/list.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/gradual_regression_01-OTP-27.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/elm_core/list.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/map-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/map-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/map-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/map-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/map-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/map-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/map-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/map-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/map-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_regression_01-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/map.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/gradual_regression_01-OTP-28.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/elm_core/map.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/map_ffi-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/map_ffi-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/map_ffi-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/map_ffi-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/map_ffi-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/map_ffi-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/map_ffi-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/map_ffi-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/map_ffi-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/kp_01-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/map_ffi.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/kp_01-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/elm_core/map_ffi.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/maybe-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/maybe-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/maybe-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/maybe-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/maybe-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/maybe-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/maybe-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/maybe-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/maybe-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/kp_01-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/maybe.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/kp_01-OTP-27.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/elm_core/maybe.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/result-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/result-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/result-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/result-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/result-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/result-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/result-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/result-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/result-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/kp_01-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/result.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/kp_01-OTP-28.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/elm_core/result.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/tuple-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/tuple-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/tuple-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/tuple-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/tuple-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/tuple-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/tuple-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/tuple-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/elm_core/tuple-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/misc_lib-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/elm_core/tuple.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/misc_lib-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/elm_core/tuple.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/deep_tuples-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/deep_tuples-OTP-27.pretty
deleted file mode 100644
index 5a3c9743cb..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/deep_tuples-OTP-27.pretty
+++ /dev/null
@@ -1,33 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/deep_tuples.erl:14:3
-   │
-14 │   Tag1.
-   │   ^^^^ Tag1.
-Expression has type:   'ok'
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/deep_tuples.erl:20:3
-   │
-20 │   Tag2.
-   │   ^^^^ Tag2.
-Expression has type:   'ok'
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/deep_tuples.erl:26:3
-   │
-26 │   Tag1.
-   │   ^^^^ Tag1.
-Expression has type:   'ok'
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/deep_tuples.erl:32:3
-   │
-32 │   Tag2.
-   │   ^^^^ Tag2.
-Expression has type:   'ok'
-Context expected type: none()
-
-4 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/deep_tuples-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/deep_tuples-OTP-28.pretty
deleted file mode 100644
index 5a3c9743cb..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/deep_tuples-OTP-28.pretty
+++ /dev/null
@@ -1,33 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/deep_tuples.erl:14:3
-   │
-14 │   Tag1.
-   │   ^^^^ Tag1.
-Expression has type:   'ok'
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/deep_tuples.erl:20:3
-   │
-20 │   Tag2.
-   │   ^^^^ Tag2.
-Expression has type:   'ok'
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/deep_tuples.erl:26:3
-   │
-26 │   Tag1.
-   │   ^^^^ Tag1.
-Expression has type:   'ok'
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/deep_tuples.erl:32:3
-   │
-32 │   Tag2.
-   │   ^^^^ Tag2.
-Expression has type:   'ok'
-Context expected type: none()
-
-4 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/deep_tuples-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/deep_tuples.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/eqwater/deep_tuples-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/eqwater/deep_tuples.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-27.pretty
deleted file mode 100644
index d705840326..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-27.pretty
+++ /dev/null
@@ -1,676 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:162:7
-    │
-162 │       B
-    │       ^
-    │       │
-    │       B.
-Expression has type:   number() | binary()
-Context expected type: binary()
-    │       
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: number()
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  number() | binary() is not compatible with binary()
-  because
-  number() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:172:22
-    │
-172 │ occ05_3_neg_cl(B) -> B.
-    │                      ^
-    │                      │
-    │                      B.
-Expression has type:   number() | binary()
-Context expected type: binary()
-    │                      
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: number()
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  number() | binary() is not compatible with binary()
-  because
-  number() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:183:7
-    │
-183 │       A
-    │       ^
-    │       │
-    │       A.
-Expression has type:   number() | binary()
-Context expected type: binary()
-    │       
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: number()
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  number() | binary() is not compatible with binary()
-  because
-  number() is not compatible with binary()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ eqwater/src/eqwater.erl:228:1
-    │
-228 │ occ08(A) when is_number(A) -> A.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:340:13
-    │
-340 │ occ11(A) -> A.
-    │             ^
-    │             │
-    │             A.
-Expression has type:   #ab_rec{} | atom()
-Context expected type: atom()
-    │             
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: #ab_rec{}
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  #ab_rec{} | atom() is not compatible with atom()
-  because
-  #ab_rec{} is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:356:16
-    │
-356 │ occ13(A, _) -> A.
-    │                ^
-    │                │
-    │                A.
-Expression has type:   #ab_rec{} | atom()
-Context expected type: atom()
-    │                
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: #ab_rec{}
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  #ab_rec{} | atom() is not compatible with atom()
-  because
-  #ab_rec{} is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:404:25
-    │
-404 │ get_int4_neg({_, I}) -> I.
-    │                         ^ I.
-Expression has type:   atom()
-Context expected type: number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ eqwater/src/eqwater.erl:408:1
-    │  
-408 │ ╭ get_int5({A, A})
-409 │ │   when is_atom(A) -> A.
-    │ ╰──────────────────────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ eqwater/src/eqwater.erl:413:1
-    │  
-413 │ ╭ get_int6({A1, A2})
-414 │ │   when is_atom(A1) and is_atom(A2) -> 1;
-    │ ╰───────────────────────────────────────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:415:21
-    │
-415 │ get_int6({_, I}) -> I.
-    │                     ^
-    │                     │
-    │                     I.
-Expression has type:   number() | atom()
-Context expected type: number()
-    │                     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: atom()
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | atom() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ eqwater/src/eqwater.erl:419:1
-    │  
-419 │ ╭ get_int7_neg({A, A})
-420 │ │   % A is none()
-421 │ │   when is_atom(A) -> 0;
-    │ ╰──────────────────────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:422:25
-    │
-422 │ get_int7_neg({_, I}) -> I.
-    │                         ^
-    │                         │
-    │                         I.
-Expression has type:   number() | atom()
-Context expected type: number()
-    │                         
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: atom()
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | atom() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:429:25
-    │
-429 │ get_int8_neg({_, I}) -> I.
-    │                         ^
-    │                         │
-    │                         I.
-Expression has type:   number() | atom()
-Context expected type: number()
-    │                         
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: atom()
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | atom() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:496:3
-    │
-496 │   A.
-    │   ^ A.
-Expression has type:   atom()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:521:22
-    │
-521 │   record_occ07_tuple(R).
-    │                      ^
-    │                      │
-    │                      R.
-Expression has type:   #union_field{}
-Context expected type: {'union_field', atom()}
-    │                      
-
-Because in the expression's type:
-  { 'union_field', 
-    Here the type is:     binary()
-    Context expects type: atom()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'union_field', binary()} is not compatible with {'union_field', atom()}
-  because
-  binary() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:559:50
-    │
-559 │ record_occ13_neg(#union_field4{x = A, y = _}) -> A.
-    │                                                  ^
-    │                                                  │
-    │                                                  A.
-Expression has type:   number() | 'ok'
-Context expected type: number()
-    │                                                  
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: 'ok'
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | 'ok' is not compatible with number()
-  because
-  'ok' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:590:8
-    │
-590 │     -> B#b.id;
-    │        ^
-    │        │
-    │        B.
-Expression has type:   #b{} | #c{}
-Context expected type: #b{}
-    │        
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #b{}
-  However the following candidate: #c{}
-  Differs from the expected type:  #b{}
-
------------------------------- Detailed message ------------------------------
-
-  #b{} | #c{} is not compatible with #b{}
-  because
-  #c{} is not compatible with #b{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:631:27
-    │
-631 │ occ23_neg({_, B}, F) -> F(B).
-    │                           ^
-    │                           │
-    │                           B.
-Expression has type:   A | B
-Context expected type: B
-    │                           
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: B
-  However the following candidate: A
-  Differs from the expected type:  B
-
------------------------------- Detailed message ------------------------------
-
-  A | B is not compatible with B
-  because
-  A is not compatible with B
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:649:17
-    │
-649 │ occ26_neg(T) -> T.
-    │                 ^
-    │                 │
-    │                 T.
-Expression has type:   fun() | {term()}
-Context expected type: {term()}
-    │                 
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: {term()}
-  However the following candidate: fun()
-  Differs from the expected type:  {term()}
-
------------------------------- Detailed message ------------------------------
-
-  fun() | {term()} is not compatible with {term()}
-  because
-  fun() is not compatible with {term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:660:17
-    │
-660 │ occ28_neg(A) -> A.
-    │                 ^
-    │                 │
-    │                 A.
-Expression has type:   tuple() | atom()
-Context expected type: atom()
-    │                 
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: tuple()
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  tuple() | atom() is not compatible with atom()
-  because
-  tuple() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:681:18
-    │
-681 │     {_N, _N1} -> X#one_field.f1
-    │                  ^
-    │                  │
-    │                  X.
-Expression has type:   #one_field{} | #two_fields1{}
-Context expected type: #one_field{}
-    │                  
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #one_field{}
-  However the following candidate: #two_fields1{}
-  Differs from the expected type:  #one_field{}
-
------------------------------- Detailed message ------------------------------
-
-  #one_field{} | #two_fields1{} is not compatible with #one_field{}
-  because
-  #two_fields1{} is not compatible with #one_field{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:839:27
-    │
-839 │ multi_param2_neg(_, Y) -> Y.
-    │                           ^
-    │                           │
-    │                           Y.
-Expression has type:   number() | atom()
-Context expected type: number()
-    │                           
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: atom()
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | atom() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:997:31
-    │
-997 │ occ42_neg({F, S} = {_, _}) -> F.
-    │                               ^ F.
-Expression has type:   string() | 'undefined'
-Context expected type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1004:31
-     │
-1004 │ occ43_neg({F, S} = {_, _}) -> F.
-     │                               ^ F.
-Expression has type:   string() | 'undefined'
-Context expected type: string()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-     ┌─ eqwater/src/eqwater.erl:1090:1
-     │
-1090 │ occ53_neg(L, undefined) when is_integer(L) -> 0;
-     │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1091:20
-     │
-1091 │ occ53_neg(_, I) -> I.
-     │                    ^
-     │                    │
-     │                    I.
-Expression has type:   number() | 'undefined'
-Context expected type: number()
-     │                    
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: 'undefined'
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | 'undefined' is not compatible with number()
-  because
-  'undefined' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1122:14
-     │
-1122 │         A -> [A]
-     │              ^^^
-     │              │
-     │              [A].
-Expression has type:   [[atom()]] | [atom()]
-Context expected type: [atom()]
-     │              
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: [atom()]
-  However, the following candidate doesn't match:
-  [
-    Here the type is:     [atom()]
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [[atom()]] | [atom()] is not compatible with [atom()]
-  because
-  [[atom()]] is not compatible with [atom()]
-  because
-  [atom()] is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1131:15
-     │
-1131 │         A2 -> [A2]
-     │               ^^^^
-     │               │
-     │               [A2].
-Expression has type:   [[atom()]] | [atom()]
-Context expected type: [atom()]
-     │               
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: [atom()]
-  However, the following candidate doesn't match:
-  [
-    Here the type is:     [atom()]
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [[atom()]] | [atom()] is not compatible with [atom()]
-  because
-  [[atom()]] is not compatible with [atom()]
-  because
-  [atom()] is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1155:7
-     │
-1155 │       X
-     │       ^
-     │       │
-     │       X.
-Expression has type:   binary() | string()
-Context expected type: binary()
-     │       
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: string()
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  binary() | string() is not compatible with binary()
-  because
-  string() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1181:7
-     │
-1181 │       Y
-     │       ^
-     │       │
-     │       Y.
-Expression has type:   binary() | atom()
-Context expected type: binary()
-     │       
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: atom()
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  binary() | atom() is not compatible with binary()
-  because
-  atom() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1189:60
-     │
-1189 │ occ_guard_binary_2_neg(V) when V =:= <<"ok">>; V =:= ok -> V;
-     │                                                            ^
-     │                                                            │
-     │                                                            V.
-Expression has type:   'ok' | binary()
-Context expected type: binary()
-     │                                                            
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: 'ok'
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  'ok' | binary() is not compatible with binary()
-  because
-  'ok' is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1194:30
-     │
-1194 │ occ_guard_binary_3_neg(V) -> V.
-     │                              ^
-     │                              │
-     │                              V.
-Expression has type:   binary() | 'ok'
-Context expected type: 'ok'
-     │                              
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'ok'
-  However the following candidate: binary()
-  Differs from the expected type:  'ok'
-
------------------------------- Detailed message ------------------------------
-
-  binary() | 'ok' is not compatible with 'ok'
-  because
-  binary() is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1225:14
-     │
-1225 │         _ -> Args
-     │              ^^^^
-     │              │
-     │              Args.
-Expression has type:   {term(), my_list()} | number()
-Context expected type: number()
-     │              
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: {term(), my_list()}
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  {term(), my_list()} | number() is not compatible with number()
-  because
-  {term(), my_list()} is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1231:31
-     │
-1231 │         _ when is_tuple(T) -> T
-     │                               ^ T.
-Expression has type:   tuple()
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1257:29
-     │
-1257 │ non_linear_neg_1({B, B}) -> B.
-     │                             ^
-     │                             │
-     │                             B.
-Expression has type:   'a' | 'b'
-Context expected type: 'b'
-     │                             
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'b'
-  However the following candidate: 'a'
-  Differs from the expected type:  'b'
-
------------------------------- Detailed message ------------------------------
-
-  'a' | 'b' is not compatible with 'b'
-  because
-  'a' is not compatible with 'b'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1269:5
-     │
-1269 │     V.
-     │     ^ V.
-Expression has type:   'a'
-Context expected type: 'b'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1286:60
-     │
-1286 │ negate_atoms_neg(A) when not ((A == a) orelse (A == b)) -> A;
-     │                                                            ^
-     │                                                            │
-     │                                                            A.
-Expression has type:   'c'
-Context expected type: 'a' | 'b'
-     │                                                            
-
-  'c' is not compatible with 'a' | 'b'
-  because
-  'c' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1291:43
-     │
-1291 │ negate_number_neg(N) when not (N == 1) -> N;
-     │                                           ^ N.
-Expression has type:   number()
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1309:45
-     │
-1309 │ negate_fun_neg(F) when is_function(F, 2) -> F;
-     │                                             ^ F.
-Expression has type:   fun((term(), term()) -> term())
-Context expected type: 'ok'
-
-39 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-28.pretty
deleted file mode 100644
index d705840326..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-28.pretty
+++ /dev/null
@@ -1,676 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:162:7
-    │
-162 │       B
-    │       ^
-    │       │
-    │       B.
-Expression has type:   number() | binary()
-Context expected type: binary()
-    │       
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: number()
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  number() | binary() is not compatible with binary()
-  because
-  number() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:172:22
-    │
-172 │ occ05_3_neg_cl(B) -> B.
-    │                      ^
-    │                      │
-    │                      B.
-Expression has type:   number() | binary()
-Context expected type: binary()
-    │                      
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: number()
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  number() | binary() is not compatible with binary()
-  because
-  number() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:183:7
-    │
-183 │       A
-    │       ^
-    │       │
-    │       A.
-Expression has type:   number() | binary()
-Context expected type: binary()
-    │       
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: number()
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  number() | binary() is not compatible with binary()
-  because
-  number() is not compatible with binary()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ eqwater/src/eqwater.erl:228:1
-    │
-228 │ occ08(A) when is_number(A) -> A.
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:340:13
-    │
-340 │ occ11(A) -> A.
-    │             ^
-    │             │
-    │             A.
-Expression has type:   #ab_rec{} | atom()
-Context expected type: atom()
-    │             
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: #ab_rec{}
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  #ab_rec{} | atom() is not compatible with atom()
-  because
-  #ab_rec{} is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:356:16
-    │
-356 │ occ13(A, _) -> A.
-    │                ^
-    │                │
-    │                A.
-Expression has type:   #ab_rec{} | atom()
-Context expected type: atom()
-    │                
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: #ab_rec{}
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  #ab_rec{} | atom() is not compatible with atom()
-  because
-  #ab_rec{} is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:404:25
-    │
-404 │ get_int4_neg({_, I}) -> I.
-    │                         ^ I.
-Expression has type:   atom()
-Context expected type: number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ eqwater/src/eqwater.erl:408:1
-    │  
-408 │ ╭ get_int5({A, A})
-409 │ │   when is_atom(A) -> A.
-    │ ╰──────────────────────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ eqwater/src/eqwater.erl:413:1
-    │  
-413 │ ╭ get_int6({A1, A2})
-414 │ │   when is_atom(A1) and is_atom(A2) -> 1;
-    │ ╰───────────────────────────────────────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:415:21
-    │
-415 │ get_int6({_, I}) -> I.
-    │                     ^
-    │                     │
-    │                     I.
-Expression has type:   number() | atom()
-Context expected type: number()
-    │                     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: atom()
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | atom() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ eqwater/src/eqwater.erl:419:1
-    │  
-419 │ ╭ get_int7_neg({A, A})
-420 │ │   % A is none()
-421 │ │   when is_atom(A) -> 0;
-    │ ╰──────────────────────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:422:25
-    │
-422 │ get_int7_neg({_, I}) -> I.
-    │                         ^
-    │                         │
-    │                         I.
-Expression has type:   number() | atom()
-Context expected type: number()
-    │                         
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: atom()
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | atom() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:429:25
-    │
-429 │ get_int8_neg({_, I}) -> I.
-    │                         ^
-    │                         │
-    │                         I.
-Expression has type:   number() | atom()
-Context expected type: number()
-    │                         
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: atom()
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | atom() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:496:3
-    │
-496 │   A.
-    │   ^ A.
-Expression has type:   atom()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:521:22
-    │
-521 │   record_occ07_tuple(R).
-    │                      ^
-    │                      │
-    │                      R.
-Expression has type:   #union_field{}
-Context expected type: {'union_field', atom()}
-    │                      
-
-Because in the expression's type:
-  { 'union_field', 
-    Here the type is:     binary()
-    Context expects type: atom()
-  }
-
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'union_field', binary()} is not compatible with {'union_field', atom()}
-  because
-  binary() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:559:50
-    │
-559 │ record_occ13_neg(#union_field4{x = A, y = _}) -> A.
-    │                                                  ^
-    │                                                  │
-    │                                                  A.
-Expression has type:   number() | 'ok'
-Context expected type: number()
-    │                                                  
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: 'ok'
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | 'ok' is not compatible with number()
-  because
-  'ok' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:590:8
-    │
-590 │     -> B#b.id;
-    │        ^
-    │        │
-    │        B.
-Expression has type:   #b{} | #c{}
-Context expected type: #b{}
-    │        
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #b{}
-  However the following candidate: #c{}
-  Differs from the expected type:  #b{}
-
------------------------------- Detailed message ------------------------------
-
-  #b{} | #c{} is not compatible with #b{}
-  because
-  #c{} is not compatible with #b{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:631:27
-    │
-631 │ occ23_neg({_, B}, F) -> F(B).
-    │                           ^
-    │                           │
-    │                           B.
-Expression has type:   A | B
-Context expected type: B
-    │                           
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: B
-  However the following candidate: A
-  Differs from the expected type:  B
-
------------------------------- Detailed message ------------------------------
-
-  A | B is not compatible with B
-  because
-  A is not compatible with B
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:649:17
-    │
-649 │ occ26_neg(T) -> T.
-    │                 ^
-    │                 │
-    │                 T.
-Expression has type:   fun() | {term()}
-Context expected type: {term()}
-    │                 
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: {term()}
-  However the following candidate: fun()
-  Differs from the expected type:  {term()}
-
------------------------------- Detailed message ------------------------------
-
-  fun() | {term()} is not compatible with {term()}
-  because
-  fun() is not compatible with {term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:660:17
-    │
-660 │ occ28_neg(A) -> A.
-    │                 ^
-    │                 │
-    │                 A.
-Expression has type:   tuple() | atom()
-Context expected type: atom()
-    │                 
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: tuple()
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  tuple() | atom() is not compatible with atom()
-  because
-  tuple() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:681:18
-    │
-681 │     {_N, _N1} -> X#one_field.f1
-    │                  ^
-    │                  │
-    │                  X.
-Expression has type:   #one_field{} | #two_fields1{}
-Context expected type: #one_field{}
-    │                  
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #one_field{}
-  However the following candidate: #two_fields1{}
-  Differs from the expected type:  #one_field{}
-
------------------------------- Detailed message ------------------------------
-
-  #one_field{} | #two_fields1{} is not compatible with #one_field{}
-  because
-  #two_fields1{} is not compatible with #one_field{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:839:27
-    │
-839 │ multi_param2_neg(_, Y) -> Y.
-    │                           ^
-    │                           │
-    │                           Y.
-Expression has type:   number() | atom()
-Context expected type: number()
-    │                           
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: atom()
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | atom() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:997:31
-    │
-997 │ occ42_neg({F, S} = {_, _}) -> F.
-    │                               ^ F.
-Expression has type:   string() | 'undefined'
-Context expected type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1004:31
-     │
-1004 │ occ43_neg({F, S} = {_, _}) -> F.
-     │                               ^ F.
-Expression has type:   string() | 'undefined'
-Context expected type: string()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-     ┌─ eqwater/src/eqwater.erl:1090:1
-     │
-1090 │ occ53_neg(L, undefined) when is_integer(L) -> 0;
-     │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1091:20
-     │
-1091 │ occ53_neg(_, I) -> I.
-     │                    ^
-     │                    │
-     │                    I.
-Expression has type:   number() | 'undefined'
-Context expected type: number()
-     │                    
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: 'undefined'
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  number() | 'undefined' is not compatible with number()
-  because
-  'undefined' is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1122:14
-     │
-1122 │         A -> [A]
-     │              ^^^
-     │              │
-     │              [A].
-Expression has type:   [[atom()]] | [atom()]
-Context expected type: [atom()]
-     │              
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: [atom()]
-  However, the following candidate doesn't match:
-  [
-    Here the type is:     [atom()]
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [[atom()]] | [atom()] is not compatible with [atom()]
-  because
-  [[atom()]] is not compatible with [atom()]
-  because
-  [atom()] is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1131:15
-     │
-1131 │         A2 -> [A2]
-     │               ^^^^
-     │               │
-     │               [A2].
-Expression has type:   [[atom()]] | [atom()]
-Context expected type: [atom()]
-     │               
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: [atom()]
-  However, the following candidate doesn't match:
-  [
-    Here the type is:     [atom()]
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [[atom()]] | [atom()] is not compatible with [atom()]
-  because
-  [[atom()]] is not compatible with [atom()]
-  because
-  [atom()] is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1155:7
-     │
-1155 │       X
-     │       ^
-     │       │
-     │       X.
-Expression has type:   binary() | string()
-Context expected type: binary()
-     │       
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: string()
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  binary() | string() is not compatible with binary()
-  because
-  string() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1181:7
-     │
-1181 │       Y
-     │       ^
-     │       │
-     │       Y.
-Expression has type:   binary() | atom()
-Context expected type: binary()
-     │       
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: atom()
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  binary() | atom() is not compatible with binary()
-  because
-  atom() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1189:60
-     │
-1189 │ occ_guard_binary_2_neg(V) when V =:= <<"ok">>; V =:= ok -> V;
-     │                                                            ^
-     │                                                            │
-     │                                                            V.
-Expression has type:   'ok' | binary()
-Context expected type: binary()
-     │                                                            
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: 'ok'
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  'ok' | binary() is not compatible with binary()
-  because
-  'ok' is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1194:30
-     │
-1194 │ occ_guard_binary_3_neg(V) -> V.
-     │                              ^
-     │                              │
-     │                              V.
-Expression has type:   binary() | 'ok'
-Context expected type: 'ok'
-     │                              
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'ok'
-  However the following candidate: binary()
-  Differs from the expected type:  'ok'
-
------------------------------- Detailed message ------------------------------
-
-  binary() | 'ok' is not compatible with 'ok'
-  because
-  binary() is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1225:14
-     │
-1225 │         _ -> Args
-     │              ^^^^
-     │              │
-     │              Args.
-Expression has type:   {term(), my_list()} | number()
-Context expected type: number()
-     │              
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: {term(), my_list()}
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  {term(), my_list()} | number() is not compatible with number()
-  because
-  {term(), my_list()} is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1231:31
-     │
-1231 │         _ when is_tuple(T) -> T
-     │                               ^ T.
-Expression has type:   tuple()
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1257:29
-     │
-1257 │ non_linear_neg_1({B, B}) -> B.
-     │                             ^
-     │                             │
-     │                             B.
-Expression has type:   'a' | 'b'
-Context expected type: 'b'
-     │                             
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'b'
-  However the following candidate: 'a'
-  Differs from the expected type:  'b'
-
------------------------------- Detailed message ------------------------------
-
-  'a' | 'b' is not compatible with 'b'
-  because
-  'a' is not compatible with 'b'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1269:5
-     │
-1269 │     V.
-     │     ^ V.
-Expression has type:   'a'
-Context expected type: 'b'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1286:60
-     │
-1286 │ negate_atoms_neg(A) when not ((A == a) orelse (A == b)) -> A;
-     │                                                            ^
-     │                                                            │
-     │                                                            A.
-Expression has type:   'c'
-Context expected type: 'a' | 'b'
-     │                                                            
-
-  'c' is not compatible with 'a' | 'b'
-  because
-  'c' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1291:43
-     │
-1291 │ negate_number_neg(N) when not (N == 1) -> N;
-     │                                           ^ N.
-Expression has type:   number()
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ eqwater/src/eqwater.erl:1309:45
-     │
-1309 │ negate_fun_neg(F) when is_function(F, 2) -> F;
-     │                                             ^ F.
-Expression has type:   fun((term(), term()) -> term())
-Context expected type: 'ok'
-
-39 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_aliases-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_aliases-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_aliases-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_aliases-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_aliases-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_aliases-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_aliases-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_aliases-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_aliases-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/misc_lib-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_aliases.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/misc_lib-OTP-27.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_aliases.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_generics-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_generics-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_generics-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_generics-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_generics-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_generics-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_generics-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_generics-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_generics-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/misc_lib-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_generics.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/misc_lib-OTP-28.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_generics.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-27.pretty
deleted file mode 100644
index c5cd5a3b25..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-27.pretty
+++ /dev/null
@@ -1,168 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_lists.erl:31:51
-   │
-31 │ occ_list_04_neg(L = [H | _]) when is_binary(H) -> L.
-   │                                                   ^
-   │                                                   │
-   │                                                   L.
-Expression has type:   [binary() | atom()]
-Context expected type: [binary()]
-   │                                                   
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: binary()
-    However the following candidate: atom()
-    Differs from the expected type:  binary()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [binary() | atom()] is not compatible with [binary()]
-  because
-  binary() | atom() is not compatible with binary()
-  because
-  atom() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_lists.erl:48:23
-   │
-48 │ occ_list_07_neg(L) -> L.
-   │                       ^
-   │                       │
-   │                       L.
-Expression has type:   [term()]
-Context expected type: []
-   │                       
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: none()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_lists.erl:54:23
-   │
-54 │ occ_list_08_neg(A) -> A.
-   │                       ^
-   │                       │
-   │                       A.
-Expression has type:   atom() | []
-Context expected type: atom()
-   │                       
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: []
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  atom() | [] is not compatible with atom()
-  because
-  [] is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_lists.erl:61:19
-   │
-61 │ occ_list_09(A) -> A.
-   │                   ^
-   │                   │
-   │                   A.
-Expression has type:   atom() | []
-Context expected type: atom()
-   │                   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: []
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  atom() | [] is not compatible with atom()
-  because
-  [] is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_lists.erl:69:19
-   │
-69 │ occ_list_10(L) -> L.
-   │                   ^
-   │                   │
-   │                   L.
-Expression has type:   [term()]
-Context expected type: []
-   │                   
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: none()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_lists.erl:76:23
-   │
-76 │ occ_list_11_neg(L) -> L.
-   │                       ^
-   │                       │
-   │                       L.
-Expression has type:   [atom()] | [binary()]
-Context expected type: [binary()]
-   │                       
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: [binary()]
-  However, the following candidate doesn't match:
-  [
-    Here the type is:     atom()
-    Context expects type: binary()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [atom()] | [binary()] is not compatible with [binary()]
-  because
-  [atom()] is not compatible with [binary()]
-  because
-  atom() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_lists.erl:97:23
-   │
-97 │ occ_list_14_neg(L) -> L.
-   │                       ^ L.
-Expression has type:   []
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater_lists.erl:130:23
-    │
-130 │ occ_list_20_neg(V) -> [ok | [V]].
-    │                       ^^^^^^^^^^
-    │                       │
-    │                       ['ok', V].
-Expression has type:   [atom() | binary()]
-Context expected type: [atom()] | [binary()]
-    │                       
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: atom()
-    However the following candidate: binary()
-    Differs from the expected type:  atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [atom() | binary()] is not compatible with [atom()] | [binary()]
-  because
-  [atom() | binary()] is not compatible with [atom()]
-  because
-  atom() | binary() is not compatible with atom()
-  because
-  binary() is not compatible with atom()
-
-8 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-28.pretty
deleted file mode 100644
index c5cd5a3b25..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-28.pretty
+++ /dev/null
@@ -1,168 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_lists.erl:31:51
-   │
-31 │ occ_list_04_neg(L = [H | _]) when is_binary(H) -> L.
-   │                                                   ^
-   │                                                   │
-   │                                                   L.
-Expression has type:   [binary() | atom()]
-Context expected type: [binary()]
-   │                                                   
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: binary()
-    However the following candidate: atom()
-    Differs from the expected type:  binary()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [binary() | atom()] is not compatible with [binary()]
-  because
-  binary() | atom() is not compatible with binary()
-  because
-  atom() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_lists.erl:48:23
-   │
-48 │ occ_list_07_neg(L) -> L.
-   │                       ^
-   │                       │
-   │                       L.
-Expression has type:   [term()]
-Context expected type: []
-   │                       
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: none()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_lists.erl:54:23
-   │
-54 │ occ_list_08_neg(A) -> A.
-   │                       ^
-   │                       │
-   │                       A.
-Expression has type:   atom() | []
-Context expected type: atom()
-   │                       
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: []
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  atom() | [] is not compatible with atom()
-  because
-  [] is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_lists.erl:61:19
-   │
-61 │ occ_list_09(A) -> A.
-   │                   ^
-   │                   │
-   │                   A.
-Expression has type:   atom() | []
-Context expected type: atom()
-   │                   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: []
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  atom() | [] is not compatible with atom()
-  because
-  [] is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_lists.erl:69:19
-   │
-69 │ occ_list_10(L) -> L.
-   │                   ^
-   │                   │
-   │                   L.
-Expression has type:   [term()]
-Context expected type: []
-   │                   
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: none()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_lists.erl:76:23
-   │
-76 │ occ_list_11_neg(L) -> L.
-   │                       ^
-   │                       │
-   │                       L.
-Expression has type:   [atom()] | [binary()]
-Context expected type: [binary()]
-   │                       
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: [binary()]
-  However, the following candidate doesn't match:
-  [
-    Here the type is:     atom()
-    Context expects type: binary()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [atom()] | [binary()] is not compatible with [binary()]
-  because
-  [atom()] is not compatible with [binary()]
-  because
-  atom() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_lists.erl:97:23
-   │
-97 │ occ_list_14_neg(L) -> L.
-   │                       ^ L.
-Expression has type:   []
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater_lists.erl:130:23
-    │
-130 │ occ_list_20_neg(V) -> [ok | [V]].
-    │                       ^^^^^^^^^^
-    │                       │
-    │                       ['ok', V].
-Expression has type:   [atom() | binary()]
-Context expected type: [atom()] | [binary()]
-    │                       
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: atom()
-    However the following candidate: binary()
-    Differs from the expected type:  atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [atom() | binary()] is not compatible with [atom()] | [binary()]
-  because
-  [atom() | binary()] is not compatible with [atom()]
-  because
-  atom() | binary() is not compatible with atom()
-  because
-  binary() is not compatible with atom()
-
-8 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-27.pretty
deleted file mode 100644
index 847411f766..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-27.pretty
+++ /dev/null
@@ -1,91 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_maps.erl:26:53
-   │
-26 │ map_occ_04_neg(M = #{a := I}) when is_integer(I) -> M;
-   │                                                     ^
-   │                                                     │
-   │                                                     M.
-Expression has type:   #{a := number(), b => number()}
-Context expected type: #{a := number(), b := number()}
-   │                                                     
-
-Because in the expression's type:
-  Here the type is:     #{b => ..., ...}
-  Context expects type: #{b := ..., ...}
-  The type of the expression is missing the following required keys: b.
-
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_maps.erl:27:22
-   │
-27 │ map_occ_04_neg(M) -> M#{a => 0}.
-   │                      ^^^^^^^^^^
-   │                      │
-   │                      ..#{..}.
-Expression has type:   #{a := number(), b => number()}
-Context expected type: #{a := number(), b := number()}
-   │                      
-
-Because in the expression's type:
-  Here the type is:     #{b => ..., ...}
-  Context expects type: #{b := ..., ...}
-  The type of the expression is missing the following required keys: b.
-
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_maps.erl:36:22
-   │
-36 │ map_occ_06_neg(V) -> V.
-   │                      ^
-   │                      │
-   │                      V.
-Expression has type:   #{} | 'ok'
-Context expected type: 'ok'
-   │                      
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'ok'
-  However the following candidate: #{}
-  Differs from the expected type:  'ok'
-
------------------------------- Detailed message ------------------------------
-
-  #{} | 'ok' is not compatible with 'ok'
-  because
-  #{} is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_maps.erl:42:22
-   │
-42 │ map_occ_07_neg(M) -> M.
-   │                      ^
-   │                      │
-   │                      M.
-Expression has type:   #{c := number()}
-Context expected type: #{b := number()}
-   │                      
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{b := ..., ...}
-  The type of the expression is missing the following required keys: b.
-
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_maps.erl:55:34
-   │
-55 │ map_occ_08_neg(#{a := _} = M) -> M;
-   │                                  ^ M.
-Expression has type:   #{a := dynamic(), dynamic() => dynamic()}
-Context expected type: 'err'
-
-5 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-28.pretty
deleted file mode 100644
index 847411f766..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-28.pretty
+++ /dev/null
@@ -1,91 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_maps.erl:26:53
-   │
-26 │ map_occ_04_neg(M = #{a := I}) when is_integer(I) -> M;
-   │                                                     ^
-   │                                                     │
-   │                                                     M.
-Expression has type:   #{a := number(), b => number()}
-Context expected type: #{a := number(), b := number()}
-   │                                                     
-
-Because in the expression's type:
-  Here the type is:     #{b => ..., ...}
-  Context expects type: #{b := ..., ...}
-  The type of the expression is missing the following required keys: b.
-
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_maps.erl:27:22
-   │
-27 │ map_occ_04_neg(M) -> M#{a => 0}.
-   │                      ^^^^^^^^^^
-   │                      │
-   │                      ..#{..}.
-Expression has type:   #{a := number(), b => number()}
-Context expected type: #{a := number(), b := number()}
-   │                      
-
-Because in the expression's type:
-  Here the type is:     #{b => ..., ...}
-  Context expects type: #{b := ..., ...}
-  The type of the expression is missing the following required keys: b.
-
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_maps.erl:36:22
-   │
-36 │ map_occ_06_neg(V) -> V.
-   │                      ^
-   │                      │
-   │                      V.
-Expression has type:   #{} | 'ok'
-Context expected type: 'ok'
-   │                      
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'ok'
-  However the following candidate: #{}
-  Differs from the expected type:  'ok'
-
------------------------------- Detailed message ------------------------------
-
-  #{} | 'ok' is not compatible with 'ok'
-  because
-  #{} is not compatible with 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_maps.erl:42:22
-   │
-42 │ map_occ_07_neg(M) -> M.
-   │                      ^
-   │                      │
-   │                      M.
-Expression has type:   #{c := number()}
-Context expected type: #{b := number()}
-   │                      
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{b := ..., ...}
-  The type of the expression is missing the following required keys: b.
-
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_maps.erl:55:34
-   │
-55 │ map_occ_08_neg(#{a := _} = M) -> M;
-   │                                  ^ M.
-Expression has type:   #{a := dynamic(), dynamic() => dynamic()}
-Context expected type: 'err'
-
-5 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_records-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_records-OTP-27.pretty
deleted file mode 100644
index 5a01001d2e..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_records-OTP-27.pretty
+++ /dev/null
@@ -1,136 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_records.erl:35:16
-   │
-35 │ id3_neg(Id) -> Id.
-   │                ^^
-   │                │
-   │                Id.
-Expression has type:   user()
-Context expected type: number()
-   │                
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: #rec1{}
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  user() is not compatible with number()
-  because
-  #rec1{} | number() is not compatible with number()
-  because
-  #rec1{} is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_records.erl:40:16
-   │
-40 │ id4_neg(Id) -> Id.
-   │                ^^
-   │                │
-   │                Id.
-Expression has type:   user()
-Context expected type: number()
-   │                
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: #rec1{}
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  user() is not compatible with number()
-  because
-  #rec1{} | number() is not compatible with number()
-  because
-  #rec1{} is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_records.erl:47:11
-   │
-47 │     Id -> Id
-   │           ^^
-   │           │
-   │           Id.
-Expression has type:   user()
-Context expected type: number()
-   │           
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: #rec1{}
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  user() is not compatible with number()
-  because
-  #rec1{} | number() is not compatible with number()
-  because
-  #rec1{} is not compatible with number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ eqwater/src/eqwater_records.erl:104:1
-    │  
-104 │ ╭ normalize_neg1({R = #rec2{}, R}) ->
-105 │ │   {R, R};
-    │ ╰────────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater_records.erl:106:25
-    │
-106 │ normalize_neg1(Pair) -> Pair.
-    │                         ^^^^
-    │                         │
-    │                         Pair.
-Expression has type:   {#rec1{}, #rec2{}} | {#rec2{}, #rec1{}}
-Context expected type: {#rec1{}, #rec2{}}
-    │                         
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: {#rec1{}, #rec2{}}
-  However, the following candidate doesn't match:
-  { 
-    Here the type is:     #rec2{}
-    Context expects type: #rec1{}
-  , #rec1{}}
-
------------------------------- Detailed message ------------------------------
-
-  {#rec1{}, #rec2{}} | {#rec2{}, #rec1{}} is not compatible with {#rec1{}, #rec2{}}
-  because
-  at tuple index 1:
-  {#rec2{}, #rec1{}} is not compatible with {#rec1{}, #rec2{}}
-  because
-  #rec2{} is not compatible with #rec1{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater_records.erl:115:25
-    │
-115 │ normalize_neg2(Pair) -> Pair.
-    │                         ^^^^
-    │                         │
-    │                         Pair.
-Expression has type:   {#rec1{}, #rec2{}} | {#rec2{}, #rec1{}}
-Context expected type: {#rec1{}, #rec2{}}
-    │                         
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: {#rec1{}, #rec2{}}
-  However, the following candidate doesn't match:
-  { 
-    Here the type is:     #rec2{}
-    Context expects type: #rec1{}
-  , #rec1{}}
-
------------------------------- Detailed message ------------------------------
-
-  {#rec1{}, #rec2{}} | {#rec2{}, #rec1{}} is not compatible with {#rec1{}, #rec2{}}
-  because
-  at tuple index 1:
-  {#rec2{}, #rec1{}} is not compatible with {#rec1{}, #rec2{}}
-  because
-  #rec2{} is not compatible with #rec1{}
-
-6 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_records-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_records-OTP-28.pretty
deleted file mode 100644
index 5a01001d2e..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_records-OTP-28.pretty
+++ /dev/null
@@ -1,136 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_records.erl:35:16
-   │
-35 │ id3_neg(Id) -> Id.
-   │                ^^
-   │                │
-   │                Id.
-Expression has type:   user()
-Context expected type: number()
-   │                
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: #rec1{}
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  user() is not compatible with number()
-  because
-  #rec1{} | number() is not compatible with number()
-  because
-  #rec1{} is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_records.erl:40:16
-   │
-40 │ id4_neg(Id) -> Id.
-   │                ^^
-   │                │
-   │                Id.
-Expression has type:   user()
-Context expected type: number()
-   │                
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: #rec1{}
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  user() is not compatible with number()
-  because
-  #rec1{} | number() is not compatible with number()
-  because
-  #rec1{} is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_records.erl:47:11
-   │
-47 │     Id -> Id
-   │           ^^
-   │           │
-   │           Id.
-Expression has type:   user()
-Context expected type: number()
-   │           
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: #rec1{}
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  user() is not compatible with number()
-  because
-  #rec1{} | number() is not compatible with number()
-  because
-  #rec1{} is not compatible with number()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ eqwater/src/eqwater_records.erl:104:1
-    │  
-104 │ ╭ normalize_neg1({R = #rec2{}, R}) ->
-105 │ │   {R, R};
-    │ ╰────────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater_records.erl:106:25
-    │
-106 │ normalize_neg1(Pair) -> Pair.
-    │                         ^^^^
-    │                         │
-    │                         Pair.
-Expression has type:   {#rec1{}, #rec2{}} | {#rec2{}, #rec1{}}
-Context expected type: {#rec1{}, #rec2{}}
-    │                         
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: {#rec1{}, #rec2{}}
-  However, the following candidate doesn't match:
-  { 
-    Here the type is:     #rec2{}
-    Context expects type: #rec1{}
-  , #rec1{}}
-
------------------------------- Detailed message ------------------------------
-
-  {#rec1{}, #rec2{}} | {#rec2{}, #rec1{}} is not compatible with {#rec1{}, #rec2{}}
-  because
-  at tuple index 1:
-  {#rec2{}, #rec1{}} is not compatible with {#rec1{}, #rec2{}}
-  because
-  #rec2{} is not compatible with #rec1{}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater_records.erl:115:25
-    │
-115 │ normalize_neg2(Pair) -> Pair.
-    │                         ^^^^
-    │                         │
-    │                         Pair.
-Expression has type:   {#rec1{}, #rec2{}} | {#rec2{}, #rec1{}}
-Context expected type: {#rec1{}, #rec2{}}
-    │                         
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: {#rec1{}, #rec2{}}
-  However, the following candidate doesn't match:
-  { 
-    Here the type is:     #rec2{}
-    Context expects type: #rec1{}
-  , #rec1{}}
-
------------------------------- Detailed message ------------------------------
-
-  {#rec1{}, #rec2{}} | {#rec2{}, #rec1{}} is not compatible with {#rec1{}, #rec2{}}
-  because
-  at tuple index 1:
-  {#rec2{}, #rec1{}} is not compatible with {#rec1{}, #rec2{}}
-  because
-  #rec2{} is not compatible with #rec1{}
-
-6 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_records-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_records.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_records-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_records.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_sound-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_sound-OTP-27.pretty
deleted file mode 100644
index 4ee35cc78d..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_sound-OTP-27.pretty
+++ /dev/null
@@ -1,73 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_sound.erl:44:26
-   │
-44 │ t02(A) -> atom_to_binary(A).
-   │                          ^
-   │                          │
-   │                          A.
-Expression has type:   ab()
-Context expected type: atom()
-   │                          
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: binary()
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  ab() is not compatible with atom()
-  because
-  atom() | binary() is not compatible with atom()
-  because
-  binary() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_sound.erl:50:14
-   │
-50 │ t03(_, B) -> B.
-   │              ^
-   │              │
-   │              B.
-Expression has type:   ab()
-Context expected type: binary()
-   │              
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: atom()
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  ab() is not compatible with binary()
-  because
-  atom() | binary() is not compatible with binary()
-  because
-  atom() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_sound.erl:53:28
-   │
-53 │ tuple_trick_neg({X}, _) -> X.
-   │                            ^ X.
-Expression has type:   term()
-Context expected type: U
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_sound.erl:57:6
-   │
-57 │   -> X.
-   │      ^ X.
-Expression has type:   _T
-Context expected type: U
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_sound.erl:60:24
-   │
-60 │ union_trick(_, {B}) -> B.
-   │                        ^ B.
-Expression has type:   term()
-Context expected type: B
-
-5 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_sound-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_sound-OTP-28.pretty
deleted file mode 100644
index 4ee35cc78d..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_sound-OTP-28.pretty
+++ /dev/null
@@ -1,73 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_sound.erl:44:26
-   │
-44 │ t02(A) -> atom_to_binary(A).
-   │                          ^
-   │                          │
-   │                          A.
-Expression has type:   ab()
-Context expected type: atom()
-   │                          
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: binary()
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  ab() is not compatible with atom()
-  because
-  atom() | binary() is not compatible with atom()
-  because
-  binary() is not compatible with atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_sound.erl:50:14
-   │
-50 │ t03(_, B) -> B.
-   │              ^
-   │              │
-   │              B.
-Expression has type:   ab()
-Context expected type: binary()
-   │              
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: atom()
-  Differs from the expected type:  binary()
-
------------------------------- Detailed message ------------------------------
-
-  ab() is not compatible with binary()
-  because
-  atom() | binary() is not compatible with binary()
-  because
-  atom() is not compatible with binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_sound.erl:53:28
-   │
-53 │ tuple_trick_neg({X}, _) -> X.
-   │                            ^ X.
-Expression has type:   term()
-Context expected type: U
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_sound.erl:57:6
-   │
-57 │   -> X.
-   │      ^ X.
-Expression has type:   _T
-Context expected type: U
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/eqwater_sound.erl:60:24
-   │
-60 │ union_trick(_, {B}) -> B.
-   │                        ^ B.
-Expression has type:   term()
-Context expected type: B
-
-5 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_sound-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_sound.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_sound-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_sound.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/unlimited_refinement-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/unlimited_refinement-OTP-27.pretty
deleted file mode 100644
index 8b70994f10..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/unlimited_refinement-OTP-27.pretty
+++ /dev/null
@@ -1,31 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/unlimited_refinement.erl:60:14
-   │
-60 │   is_special(X).
-   │              ^
-   │              │
-   │              X.
-Expression has type:   binary() | number()
-Context expected type: number()
-   │              
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: binary()
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  binary() | number() is not compatible with number()
-  because
-  binary() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/unlimited_refinement.erl:94:14
-   │
-94 │         V -> V
-   │              ^ V.
-Expression has type:   {'ok7' | 'ok2' | 'ok6' | 'ok1' | 'ok5' | 'ok8' | 'ok4' | 'ok9' | 'ok3', map3() | map5() | map2() | map9() | map1() | map7() | map6() | map8() | map4()}
-Context expected type: 'ok'
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/unlimited_refinement-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/unlimited_refinement-OTP-28.pretty
deleted file mode 100644
index 8b70994f10..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/unlimited_refinement-OTP-28.pretty
+++ /dev/null
@@ -1,31 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/unlimited_refinement.erl:60:14
-   │
-60 │   is_special(X).
-   │              ^
-   │              │
-   │              X.
-Expression has type:   binary() | number()
-Context expected type: number()
-   │              
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: number()
-  However the following candidate: binary()
-  Differs from the expected type:  number()
-
------------------------------- Detailed message ------------------------------
-
-  binary() | number() is not compatible with number()
-  because
-  binary() is not compatible with number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/unlimited_refinement.erl:94:14
-   │
-94 │         V -> V
-   │              ^ V.
-Expression has type:   {'ok7' | 'ok2' | 'ok6' | 'ok1' | 'ok5' | 'ok8' | 'ok4' | 'ok9' | 'ok3', map3() | map5() | map2() | map9() | map1() | map7() | map6() | map8() | map4()}
-Context expected type: 'ok'
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/unlimited_refinement-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/unlimited_refinement.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/eqwater/unlimited_refinement-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/eqwater/unlimited_refinement.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-27.pretty
deleted file mode 100644
index 803ac23f35..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-27.pretty
+++ /dev/null
@@ -1,929 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:23:3
-   │
-23 │   true;
-   │   ^^^^ 'true'.
-Expression has type:   'true'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:25:3
-   │
-25 │   false.
-   │   ^^^^^ 'false'.
-Expression has type:   'false'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:32:3
-   │
-32 │   A.
-   │   ^ A.
-Expression has type:   'false'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:37:3
-   │
-37 │   true;
-   │   ^^^^ 'true'.
-Expression has type:   'true'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:39:3
-   │
-39 │   A.
-   │   ^ A.
-Expression has type:   'false'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:44:3
-   │
-44 │   1;
-   │   ^ 1.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:46:3
-   │
-46 │   2;
-   │   ^ 2.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:48:3
-   │
-48 │   3;
-   │   ^ 3.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:50:3
-   │
-50 │   4.
-   │   ^ 4.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:55:3
-   │
-55 │   1;
-   │   ^ 1.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:57:3
-   │
-57 │   2;
-   │   ^ 2.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:59:3
-   │
-59 │   3;
-   │   ^ 3.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:61:3
-   │
-61 │   4;
-   │   ^ 4.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:63:3
-   │
-63 │   5;
-   │   ^ 5.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:65:3
-   │
-65 │   6;
-   │   ^ 6.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:67:3
-   │
-67 │   7;
-   │   ^ 7.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:69:3
-   │
-69 │   8;
-   │   ^ 8.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:71:3
-   │
-71 │   9;
-   │   ^ 9.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:73:3
-   │
-73 │   10.
-   │   ^^ 10.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:78:3
-   │  
-78 │ ╭   erlang:atom_to_binary(
-79 │ │     b_to_n(
-80 │ │       N
-81 │ │     )
-82 │ │   ).
-   │ ╰───^ erlang:atom_to_binary(b_to_n(N)).
-Expression has type:   binary()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:79:5
-   │  
-79 │ ╭     b_to_n(
-80 │ │       N
-81 │ │     )
-   │ ╰─────^ b_to_n(N).
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:80:7
-   │
-80 │       N
-   │       ^ N.
-Expression has type:   number()
-Context expected type: boolean()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:87:7
-   │
-87 │   X = F(),
-   │       ^ F.
-Expected fun type with arity 0
-Got: term()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:88:7
-   │
-88 │   Y = F(),
-   │       ^ F.
-Expected fun type with arity 0
-Got: term()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:89:3
-   │
-89 │   {X, Y}.
-   │   ^^^^^^ {X, Y}.
-Expression has type:   {dynamic(), dynamic()}
-Context expected type: number()
-
-error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:94:17
-   │
-94 │   X = lists:map(fun(_X, _Y) -> 1 end, Ns),
-   │                 ^^^^^^^^^^^^^^^^^^^^ fun.
-fun with arity 2 used as fun with 1 arguments
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:96:5
-   │
-96 │     X +
-   │     ^ X.
-Expression has type:   [number()]
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:97:7
-   │
-97 │       A,
-   │       ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:108:5
-    │
-108 │     M1,
-    │     ^^ M1.
-Expression has type:   #{dynamic() => dynamic()}
-Context expected type: [T]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:108:5
-    │
-108 │     M1,
-    │     ^^ M1.
-Expression has type:   #{dynamic() => dynamic()}
-Context expected type: [dynamic()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:109:5
-    │
-109 │     M2
-    │     ^^ M2.
-Expression has type:   #{dynamic() => dynamic()}
-Context expected type: [T]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:109:5
-    │
-109 │     M2
-    │     ^^ M2.
-Expression has type:   #{dynamic() => dynamic()}
-Context expected type: [dynamic()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:111:3
-    │
-111 │   Res.
-    │   ^^^ Res.
-Expression has type:   [dynamic()]
-Context expected type: #{dynamic() => dynamic()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:116:8
-    │
-116 │   M1 = M#{
-    │        ^ M.
-Expression has type:   term()
-Context expected type: #{term() => term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:118:7
-    │
-118 │       V +
-    │       ^ V.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:119:9
-    │
-119 │         V},
-    │         ^ V.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:120:3
-    │
-120 │   M1.
-    │   ^^ M1.
-Expression has type:   #{dynamic() => dynamic()}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:126:8
-    │
-126 │   M1 = M#{
-    │        ^ M.
-Expression has type:   term()
-Context expected type: #{term() => term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:128:5
-    │
-128 │     V +
-    │     ^ V.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:129:7
-    │
-129 │       V},
-    │       ^ V.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:130:3
-    │
-130 │   M1.
-    │   ^^ M1.
-Expression has type:   #{dynamic() => dynamic()}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:138:7
-    │
-138 │       L1,
-    │       ^^ L1.
-Expression has type:   term()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:139:7
-    │
-139 │       L2
-    │       ^^ L2.
-Expression has type:   term()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:141:3
-    │
-141 │   Res.
-    │   ^^^ Res.
-Expression has type:   [dynamic()]
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:150:7
-    │
-150 │       X +
-    │       ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:151:9
-    │
-151 │         Y,
-    │         ^ Y.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:152:5
-    │
-152 │     Z
-    │     ^ Z.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:159:8
-    │  
-159 │       [H |
-    │ ╭────────^
-160 │ │       T],
-    │ ╰────────^ T.
-Expression has type:   term()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:161:8
-    │  
-161 │       [T |
-    │ ╭────────^
-162 │ │       H]
-    │ ╰────────^ H.
-Expression has type:   term()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:164:3
-    │
-164 │   Res.
-    │   ^^^
-    │   │
-    │   Res.
-Expression has type:   [term()]
-Context expected type: [atom()]
-    │   
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with [atom()]
-  because
-  term() is not compatible with atom()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:169:8
-    │
-169 │   case F() of
-    │        ^ F.
-Expected fun type with arity 0
-Got: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:170:13
-    │
-170 │     true -> A + 1;
-    │             ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:171:14
-    │
-171 │     false -> A - 1
-    │              ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:178:10
-    │
-178 │     F -> A + 1;
-    │          ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:179:13
-    │
-179 │     true -> A - 1
-    │             ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:186:5
-    │
-186 │     F + 1,
-    │     ^ F.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:187:6
-    │
-187 │     -M
-    │      ^ M.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:192:3
-    │  
-192 │ ╭   [X ||
-193 │ │     X <- #{
-194 │ │       a => b,
-195 │ │       c => d + 1
-    · │
-198 │ │       {X}
-199 │ │     )].
-    │ ╰──────^ [ || ].
-Expression has type:   [dynamic()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:193:10
-    │  
-193 │       X <- #{
-    │ ╭──────────^
-194 │ │       a => b,
-195 │ │       c => d + 1
-196 │ │     },
-    │ ╰─────^ #{..}.
-Expression has type:   #{a := 'b', c := number()}
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:195:12
-    │
-195 │       c => d + 1
-    │            ^ 'd'.
-Expression has type:   'd'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:198:7
-    │
-198 │       {X}
-    │       ^^^ {X}.
-Expression has type:   {dynamic()}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:204:20
-    │
-204 │     atom_to_binary(Y) ||
-    │                    ^ Y.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:205:14
-    │
-205 │     <<Y>> <= L
-    │              ^ L.
-Expression has type:   [term()]
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:207:3
-    │
-207 │   Res.
-    │   ^^^ Res.
-Expression has type:   [binary()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:213:7
-    │
-213 │       B
-    │       ^ B.
-Expression has type:   binary()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:215:3
-    │
-215 │   Res.
-    │   ^^^ Res.
-Expression has type:   binary()
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:221:13
-    │
-221 │     #{id := a + 1},
-    │             ^ 'a'.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:223:13
-    │
-223 │     #{id := b + 2},
-    │             ^ 'b'.
-Expression has type:   'b'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:224:3
-    │
-224 │   M1 + M2.
-    │   ^^ M1.
-Expression has type:   #{id := number(), dynamic() => dynamic()}
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:224:3
-    │
-224 │   M1 + M2.
-    │   ^^^^^^^ _ + _.
-Expression has type:   number()
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:224:8
-    │
-224 │   M1 + M2.
-    │        ^^ M2.
-Expression has type:   #{id := number(), dynamic() => dynamic()}
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:229:5
-    │
-229 │     A:
-    │     ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:230:5
-    │
-230 │     S
-    │     ^ S.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:232:3
-    │
-232 │   B + 1.
-    │   ^ B.
-Expression has type:   binary()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:232:3
-    │
-232 │   B + 1.
-    │   ^^^^^ _ + _.
-Expression has type:   number()
-Context expected type: atom()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:237:11
-    │
-237 │     catch F(),
-    │           ^ F.
-Expected fun type with arity 0
-Got: atom()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:243:5
-    │
-243 │     A()
-    │     ^ A.
-Expected fun type with arity 0
-Got: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:247:9
-    │
-247 │     1 + a
-    │         ^ 'a'.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:249:3
-    │
-249 │   Res.
-    │   ^^^
-    │   │
-    │   Res.
-Expression has type:   dynamic() | []
-Context expected type: atom()
-    │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dynamic()
-  However the following candidate: []
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  dynamic() | [] is not compatible with atom()
-  because
-  [] is not compatible with atom()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:254:11
-    │
-254 │           A()
-    │           ^ A.
-Expected fun type with arity 0
-Got: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:257:13
-    │
-257 │             A + 1
-    │             ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:261:15
-    │
-261 │           1 + a
-    │               ^ 'a'.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:263:3
-    │
-263 │   Res.
-    │   ^^^ Res.
-Expression has type:   number() | []
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:273:10
-    │
-273 │     id = Pid,
-    │          ^^^ Pid.
-Expression has type:   pid()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:274:11
-    │
-274 │     pid = Id
-    │           ^^ Id.
-Expression has type:   number()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:276:3
-    │
-276 │   Res.
-    │   ^^^ Res.
-Expression has type:   #rec{}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:281:11
-    │
-281 │     pid = Id
-    │           ^^ Id.
-Expression has type:   number()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:283:3
-    │
-283 │   Res#rec.id.
-    │   ^^^^^^^^^^ ...#rec.id.
-Expression has type:   number()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:288:9
-    │
-288 │     _ = <<>>
-    │         ^^^^ <<..>>.
-Expression has type:   binary()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:288:9
-    │
-288 │     _ = <<>>
-    │         ^^^^ <<..>>.
-Expression has type:   binary()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:290:3
-    │
-290 │   Res.
-    │   ^^^ Res.
-Expression has type:   #rec{}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:297:7
-    │  
-297 │ ╭       atom_to_binary(
-298 │ │         [N]
-299 │ │           ++ a
-300 │ │       );
-    │ ╰───────^ erlang:atom_to_binary(_ ++ _).
-Expression has type:   binary()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:298:9
-    │  
-298 │ ╭         [N]
-299 │ │           ++ a
-    │ ╰──────────────^ _ ++ _.
-Expression has type:   [dynamic()]
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:299:14
-    │
-299 │           ++ a
-    │              ^ 'a'.
-Expression has type:   'a'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:302:7
-    │  
-302 │ ╭       atom_to_binary(
-303 │ │         <<N>>
-304 │ │           ++ b
-305 │ │       )
-    │ ╰───────^ erlang:atom_to_binary(_ ++ _).
-Expression has type:   binary()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:303:9
-    │
-303 │         <<N>>
-    │         ^^^^^ <<..>>.
-Expression has type:   binary()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:303:9
-    │  
-303 │ ╭         <<N>>
-304 │ │           ++ b
-    │ ╰──────────────^ _ ++ _.
-Expression has type:   [dynamic()]
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:304:14
-    │
-304 │           ++ b
-    │              ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:313:7
-    │  
-313 │ ╭       atom_to_binary(
-314 │ │         [N]
-315 │ │       );
-    │ ╰───────^ erlang:atom_to_binary([N]).
-Expression has type:   binary()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:314:9
-    │
-314 │         [N]
-    │         ^^^ [N].
-Expression has type:   [dynamic()]
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:317:7
-    │  
-317 │ ╭       atom_to_binary(
-318 │ │         <<N>>
-319 │ │       )
-    │ ╰───────^ erlang:atom_to_binary(<<..>>).
-Expression has type:   binary()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:318:9
-    │
-318 │         <<N>>
-    │         ^^^^^ <<..>>.
-Expression has type:   binary()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:321:5
-    │
-321 │     []
-    │     ^^ [].
-Expression has type:   []
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:326:3
-    │
-326 │   a + b.
-    │   ^ 'a'.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:326:7
-    │
-326 │   a + b.
-    │       ^ 'b'.
-Expression has type:   'b'
-Context expected type: number()
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:331:1
-    │
-331 │ -spec use_invalid(loop()) -> none().
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ use_invalid/1 references type with invalid definition: loop/0
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:348:3
-    │
-348 │   error.
-    │   ^^^^^ 'error'.
-Expression has type:   'error'
-Context expected type: 'ok'
-
-error: redundant_fixme (See https://fb.me/eqwalizer_errors#redundant_fixme)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:352:3
-    │
-352 │   % eqwalizer:fixme
-    │   ^^^^^^^^^^^^^^^^^ redundant fixme
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:364:17
-    │
-364 │     map_pair(L, fun make_pair/2).
-    │                 ^^^^^^^^^^^^^^^ Arg 2 of 'make_pair/2'.
-Expression has type:   term()
-Context expected type: number()
-
-109 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-28.pretty
deleted file mode 100644
index 803ac23f35..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-28.pretty
+++ /dev/null
@@ -1,929 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:23:3
-   │
-23 │   true;
-   │   ^^^^ 'true'.
-Expression has type:   'true'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:25:3
-   │
-25 │   false.
-   │   ^^^^^ 'false'.
-Expression has type:   'false'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:32:3
-   │
-32 │   A.
-   │   ^ A.
-Expression has type:   'false'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:37:3
-   │
-37 │   true;
-   │   ^^^^ 'true'.
-Expression has type:   'true'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:39:3
-   │
-39 │   A.
-   │   ^ A.
-Expression has type:   'false'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:44:3
-   │
-44 │   1;
-   │   ^ 1.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:46:3
-   │
-46 │   2;
-   │   ^ 2.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:48:3
-   │
-48 │   3;
-   │   ^ 3.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:50:3
-   │
-50 │   4.
-   │   ^ 4.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:55:3
-   │
-55 │   1;
-   │   ^ 1.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:57:3
-   │
-57 │   2;
-   │   ^ 2.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:59:3
-   │
-59 │   3;
-   │   ^ 3.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:61:3
-   │
-61 │   4;
-   │   ^ 4.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:63:3
-   │
-63 │   5;
-   │   ^ 5.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:65:3
-   │
-65 │   6;
-   │   ^ 6.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:67:3
-   │
-67 │   7;
-   │   ^ 7.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:69:3
-   │
-69 │   8;
-   │   ^ 8.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:71:3
-   │
-71 │   9;
-   │   ^ 9.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:73:3
-   │
-73 │   10.
-   │   ^^ 10.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:78:3
-   │  
-78 │ ╭   erlang:atom_to_binary(
-79 │ │     b_to_n(
-80 │ │       N
-81 │ │     )
-82 │ │   ).
-   │ ╰───^ erlang:atom_to_binary(b_to_n(N)).
-Expression has type:   binary()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:79:5
-   │  
-79 │ ╭     b_to_n(
-80 │ │       N
-81 │ │     )
-   │ ╰─────^ b_to_n(N).
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:80:7
-   │
-80 │       N
-   │       ^ N.
-Expression has type:   number()
-Context expected type: boolean()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:87:7
-   │
-87 │   X = F(),
-   │       ^ F.
-Expected fun type with arity 0
-Got: term()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:88:7
-   │
-88 │   Y = F(),
-   │       ^ F.
-Expected fun type with arity 0
-Got: term()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:89:3
-   │
-89 │   {X, Y}.
-   │   ^^^^^^ {X, Y}.
-Expression has type:   {dynamic(), dynamic()}
-Context expected type: number()
-
-error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:94:17
-   │
-94 │   X = lists:map(fun(_X, _Y) -> 1 end, Ns),
-   │                 ^^^^^^^^^^^^^^^^^^^^ fun.
-fun with arity 2 used as fun with 1 arguments
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:96:5
-   │
-96 │     X +
-   │     ^ X.
-Expression has type:   [number()]
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ fault_tolerance/src/fault_tolerance.erl:97:7
-   │
-97 │       A,
-   │       ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:108:5
-    │
-108 │     M1,
-    │     ^^ M1.
-Expression has type:   #{dynamic() => dynamic()}
-Context expected type: [T]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:108:5
-    │
-108 │     M1,
-    │     ^^ M1.
-Expression has type:   #{dynamic() => dynamic()}
-Context expected type: [dynamic()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:109:5
-    │
-109 │     M2
-    │     ^^ M2.
-Expression has type:   #{dynamic() => dynamic()}
-Context expected type: [T]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:109:5
-    │
-109 │     M2
-    │     ^^ M2.
-Expression has type:   #{dynamic() => dynamic()}
-Context expected type: [dynamic()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:111:3
-    │
-111 │   Res.
-    │   ^^^ Res.
-Expression has type:   [dynamic()]
-Context expected type: #{dynamic() => dynamic()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:116:8
-    │
-116 │   M1 = M#{
-    │        ^ M.
-Expression has type:   term()
-Context expected type: #{term() => term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:118:7
-    │
-118 │       V +
-    │       ^ V.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:119:9
-    │
-119 │         V},
-    │         ^ V.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:120:3
-    │
-120 │   M1.
-    │   ^^ M1.
-Expression has type:   #{dynamic() => dynamic()}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:126:8
-    │
-126 │   M1 = M#{
-    │        ^ M.
-Expression has type:   term()
-Context expected type: #{term() => term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:128:5
-    │
-128 │     V +
-    │     ^ V.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:129:7
-    │
-129 │       V},
-    │       ^ V.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:130:3
-    │
-130 │   M1.
-    │   ^^ M1.
-Expression has type:   #{dynamic() => dynamic()}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:138:7
-    │
-138 │       L1,
-    │       ^^ L1.
-Expression has type:   term()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:139:7
-    │
-139 │       L2
-    │       ^^ L2.
-Expression has type:   term()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:141:3
-    │
-141 │   Res.
-    │   ^^^ Res.
-Expression has type:   [dynamic()]
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:150:7
-    │
-150 │       X +
-    │       ^ X.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:151:9
-    │
-151 │         Y,
-    │         ^ Y.
-Expression has type:   term()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:152:5
-    │
-152 │     Z
-    │     ^ Z.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:159:8
-    │  
-159 │       [H |
-    │ ╭────────^
-160 │ │       T],
-    │ ╰────────^ T.
-Expression has type:   term()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:161:8
-    │  
-161 │       [T |
-    │ ╭────────^
-162 │ │       H]
-    │ ╰────────^ H.
-Expression has type:   term()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:164:3
-    │
-164 │   Res.
-    │   ^^^
-    │   │
-    │   Res.
-Expression has type:   [term()]
-Context expected type: [atom()]
-    │   
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: atom()
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with [atom()]
-  because
-  term() is not compatible with atom()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:169:8
-    │
-169 │   case F() of
-    │        ^ F.
-Expected fun type with arity 0
-Got: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:170:13
-    │
-170 │     true -> A + 1;
-    │             ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:171:14
-    │
-171 │     false -> A - 1
-    │              ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:178:10
-    │
-178 │     F -> A + 1;
-    │          ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:179:13
-    │
-179 │     true -> A - 1
-    │             ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:186:5
-    │
-186 │     F + 1,
-    │     ^ F.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:187:6
-    │
-187 │     -M
-    │      ^ M.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:192:3
-    │  
-192 │ ╭   [X ||
-193 │ │     X <- #{
-194 │ │       a => b,
-195 │ │       c => d + 1
-    · │
-198 │ │       {X}
-199 │ │     )].
-    │ ╰──────^ [ || ].
-Expression has type:   [dynamic()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:193:10
-    │  
-193 │       X <- #{
-    │ ╭──────────^
-194 │ │       a => b,
-195 │ │       c => d + 1
-196 │ │     },
-    │ ╰─────^ #{..}.
-Expression has type:   #{a := 'b', c := number()}
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:195:12
-    │
-195 │       c => d + 1
-    │            ^ 'd'.
-Expression has type:   'd'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:198:7
-    │
-198 │       {X}
-    │       ^^^ {X}.
-Expression has type:   {dynamic()}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:204:20
-    │
-204 │     atom_to_binary(Y) ||
-    │                    ^ Y.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:205:14
-    │
-205 │     <<Y>> <= L
-    │              ^ L.
-Expression has type:   [term()]
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:207:3
-    │
-207 │   Res.
-    │   ^^^ Res.
-Expression has type:   [binary()]
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:213:7
-    │
-213 │       B
-    │       ^ B.
-Expression has type:   binary()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:215:3
-    │
-215 │   Res.
-    │   ^^^ Res.
-Expression has type:   binary()
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:221:13
-    │
-221 │     #{id := a + 1},
-    │             ^ 'a'.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:223:13
-    │
-223 │     #{id := b + 2},
-    │             ^ 'b'.
-Expression has type:   'b'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:224:3
-    │
-224 │   M1 + M2.
-    │   ^^ M1.
-Expression has type:   #{id := number(), dynamic() => dynamic()}
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:224:3
-    │
-224 │   M1 + M2.
-    │   ^^^^^^^ _ + _.
-Expression has type:   number()
-Context expected type: 'ok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:224:8
-    │
-224 │   M1 + M2.
-    │        ^^ M2.
-Expression has type:   #{id := number(), dynamic() => dynamic()}
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:229:5
-    │
-229 │     A:
-    │     ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:230:5
-    │
-230 │     S
-    │     ^ S.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:232:3
-    │
-232 │   B + 1.
-    │   ^ B.
-Expression has type:   binary()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:232:3
-    │
-232 │   B + 1.
-    │   ^^^^^ _ + _.
-Expression has type:   number()
-Context expected type: atom()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:237:11
-    │
-237 │     catch F(),
-    │           ^ F.
-Expected fun type with arity 0
-Got: atom()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:243:5
-    │
-243 │     A()
-    │     ^ A.
-Expected fun type with arity 0
-Got: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:247:9
-    │
-247 │     1 + a
-    │         ^ 'a'.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:249:3
-    │
-249 │   Res.
-    │   ^^^
-    │   │
-    │   Res.
-Expression has type:   dynamic() | []
-Context expected type: atom()
-    │   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dynamic()
-  However the following candidate: []
-  Differs from the expected type:  atom()
-
------------------------------- Detailed message ------------------------------
-
-  dynamic() | [] is not compatible with atom()
-  because
-  [] is not compatible with atom()
-
-error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:254:11
-    │
-254 │           A()
-    │           ^ A.
-Expected fun type with arity 0
-Got: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:257:13
-    │
-257 │             A + 1
-    │             ^ A.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:261:15
-    │
-261 │           1 + a
-    │               ^ 'a'.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:263:3
-    │
-263 │   Res.
-    │   ^^^ Res.
-Expression has type:   number() | []
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:273:10
-    │
-273 │     id = Pid,
-    │          ^^^ Pid.
-Expression has type:   pid()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:274:11
-    │
-274 │     pid = Id
-    │           ^^ Id.
-Expression has type:   number()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:276:3
-    │
-276 │   Res.
-    │   ^^^ Res.
-Expression has type:   #rec{}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:281:11
-    │
-281 │     pid = Id
-    │           ^^ Id.
-Expression has type:   number()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:283:3
-    │
-283 │   Res#rec.id.
-    │   ^^^^^^^^^^ ...#rec.id.
-Expression has type:   number()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:288:9
-    │
-288 │     _ = <<>>
-    │         ^^^^ <<..>>.
-Expression has type:   binary()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:288:9
-    │
-288 │     _ = <<>>
-    │         ^^^^ <<..>>.
-Expression has type:   binary()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:290:3
-    │
-290 │   Res.
-    │   ^^^ Res.
-Expression has type:   #rec{}
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:297:7
-    │  
-297 │ ╭       atom_to_binary(
-298 │ │         [N]
-299 │ │           ++ a
-300 │ │       );
-    │ ╰───────^ erlang:atom_to_binary(_ ++ _).
-Expression has type:   binary()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:298:9
-    │  
-298 │ ╭         [N]
-299 │ │           ++ a
-    │ ╰──────────────^ _ ++ _.
-Expression has type:   [dynamic()]
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:299:14
-    │
-299 │           ++ a
-    │              ^ 'a'.
-Expression has type:   'a'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:302:7
-    │  
-302 │ ╭       atom_to_binary(
-303 │ │         <<N>>
-304 │ │           ++ b
-305 │ │       )
-    │ ╰───────^ erlang:atom_to_binary(_ ++ _).
-Expression has type:   binary()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:303:9
-    │
-303 │         <<N>>
-    │         ^^^^^ <<..>>.
-Expression has type:   binary()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:303:9
-    │  
-303 │ ╭         <<N>>
-304 │ │           ++ b
-    │ ╰──────────────^ _ ++ _.
-Expression has type:   [dynamic()]
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:304:14
-    │
-304 │           ++ b
-    │              ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:313:7
-    │  
-313 │ ╭       atom_to_binary(
-314 │ │         [N]
-315 │ │       );
-    │ ╰───────^ erlang:atom_to_binary([N]).
-Expression has type:   binary()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:314:9
-    │
-314 │         [N]
-    │         ^^^ [N].
-Expression has type:   [dynamic()]
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:317:7
-    │  
-317 │ ╭       atom_to_binary(
-318 │ │         <<N>>
-319 │ │       )
-    │ ╰───────^ erlang:atom_to_binary(<<..>>).
-Expression has type:   binary()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:318:9
-    │
-318 │         <<N>>
-    │         ^^^^^ <<..>>.
-Expression has type:   binary()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:321:5
-    │
-321 │     []
-    │     ^^ [].
-Expression has type:   []
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:326:3
-    │
-326 │   a + b.
-    │   ^ 'a'.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:326:7
-    │
-326 │   a + b.
-    │       ^ 'b'.
-Expression has type:   'b'
-Context expected type: number()
-
-error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:331:1
-    │
-331 │ -spec use_invalid(loop()) -> none().
-    │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ use_invalid/1 references type with invalid definition: loop/0
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:348:3
-    │
-348 │   error.
-    │   ^^^^^ 'error'.
-Expression has type:   'error'
-Context expected type: 'ok'
-
-error: redundant_fixme (See https://fb.me/eqwalizer_errors#redundant_fixme)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:352:3
-    │
-352 │   % eqwalizer:fixme
-    │   ^^^^^^^^^^^^^^^^^ redundant fixme
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ fault_tolerance/src/fault_tolerance.erl:364:17
-    │
-364 │     map_pair(L, fun make_pair/2).
-    │                 ^^^^^^^^^^^^^^^ Arg 2 of 'make_pair/2'.
-Expression has type:   term()
-Context expected type: number()
-
-109 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/options/bad_maps-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/options/bad_maps-OTP-27.pretty
deleted file mode 100644
index 6c7920b6af..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/options/bad_maps-OTP-27.pretty
+++ /dev/null
@@ -1,15 +0,0 @@
-error: bad_map_key (See https://fb.me/eqwalizer_errors#bad_map_key)
-   ┌─ options/src/bad_maps.erl:10:24
-   │
-10 │ -type bad_map_1() :: #{atom() := integer()}.
-   │                        ^^^^^^^^^^^^^^^^^ Map type will be approximated to #{dynamic() => dynamic()}, suppressing potential errors.
-Use => instead of := here. Required map key should always be composed of statically defined atoms or tuples.
-
-error: bad_map_key (See https://fb.me/eqwalizer_errors#bad_map_key)
-   ┌─ options/src/bad_maps.erl:14:32
-   │
-14 │ -type bad_map_3() :: #{a => b, atom() := integer()}.
-   │                                ^^^^^^^^^^^^^^^^^ Map type will be approximated to #{dynamic() => dynamic()}, suppressing potential errors.
-Use => instead of := here. Required map key should always be composed of statically defined atoms or tuples.
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/options/bad_maps-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/options/bad_maps-OTP-28.pretty
deleted file mode 100644
index 6c7920b6af..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/options/bad_maps-OTP-28.pretty
+++ /dev/null
@@ -1,15 +0,0 @@
-error: bad_map_key (See https://fb.me/eqwalizer_errors#bad_map_key)
-   ┌─ options/src/bad_maps.erl:10:24
-   │
-10 │ -type bad_map_1() :: #{atom() := integer()}.
-   │                        ^^^^^^^^^^^^^^^^^ Map type will be approximated to #{dynamic() => dynamic()}, suppressing potential errors.
-Use => instead of := here. Required map key should always be composed of statically defined atoms or tuples.
-
-error: bad_map_key (See https://fb.me/eqwalizer_errors#bad_map_key)
-   ┌─ options/src/bad_maps.erl:14:32
-   │
-14 │ -type bad_map_3() :: #{a => b, atom() := integer()}.
-   │                                ^^^^^^^^^^^^^^^^^ Map type will be approximated to #{dynamic() => dynamic()}, suppressing potential errors.
-Use => instead of := here. Required map key should always be composed of statically defined atoms or tuples.
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/options/bad_maps-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/options/bad_maps.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/options/bad_maps-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/options/bad_maps.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/options/dynamic_lambdas-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/options/dynamic_lambdas-OTP-27.pretty
deleted file mode 100644
index 01c204c224..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/options/dynamic_lambdas-OTP-27.pretty
+++ /dev/null
@@ -1,37 +0,0 @@
-error: dynamic_lambda (See https://fb.me/eqwalizer_errors#dynamic_lambda)
-   ┌─ options/src/dynamic_lambdas.erl:11:11
-   │
-11 │     Fun = fun(X) -> X end,
-   │           ^^^^^^^^^^^^^^^ Lambda without context: parameters are dynamic()
-
-error: dynamic_lambda (See https://fb.me/eqwalizer_errors#dynamic_lambda)
-   ┌─ options/src/dynamic_lambdas.erl:16:11
-   │
-16 │     Fun = fun(X) -> X end,
-   │           ^^^^^^^^^^^^^^^ Lambda without context: parameters are dynamic()
-
-error: dynamic_lambda (See https://fb.me/eqwalizer_errors#dynamic_lambda)
-   ┌─ options/src/dynamic_lambdas.erl:23:9
-   │
-23 │         fun(X) -> X end,
-   │         ^^^^^^^^^^^^^^^ Lambda without context: parameters are dynamic()
-
-error: dynamic_lambda (See https://fb.me/eqwalizer_errors#dynamic_lambda)
-   ┌─ options/src/dynamic_lambdas.erl:24:9
-   │
-24 │         fun(#{}=M) -> M#{a => b} end
-   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Lambda without context: parameters are dynamic()
-
-error: dynamic_lambda (See https://fb.me/eqwalizer_errors#dynamic_lambda)
-   ┌─ options/src/dynamic_lambdas.erl:31:14
-   │
-31 │         a => fun(X) -> X end,
-   │              ^^^^^^^^^^^^^^^ Lambda without context: parameters are dynamic()
-
-error: dynamic_lambda (See https://fb.me/eqwalizer_errors#dynamic_lambda)
-   ┌─ options/src/dynamic_lambdas.erl:32:14
-   │
-32 │         b => fun(#{}=M) -> M#{a => b} end
-   │              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Lambda without context: parameters are dynamic()
-
-6 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/options/dynamic_lambdas-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/options/dynamic_lambdas-OTP-28.pretty
deleted file mode 100644
index 01c204c224..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/options/dynamic_lambdas-OTP-28.pretty
+++ /dev/null
@@ -1,37 +0,0 @@
-error: dynamic_lambda (See https://fb.me/eqwalizer_errors#dynamic_lambda)
-   ┌─ options/src/dynamic_lambdas.erl:11:11
-   │
-11 │     Fun = fun(X) -> X end,
-   │           ^^^^^^^^^^^^^^^ Lambda without context: parameters are dynamic()
-
-error: dynamic_lambda (See https://fb.me/eqwalizer_errors#dynamic_lambda)
-   ┌─ options/src/dynamic_lambdas.erl:16:11
-   │
-16 │     Fun = fun(X) -> X end,
-   │           ^^^^^^^^^^^^^^^ Lambda without context: parameters are dynamic()
-
-error: dynamic_lambda (See https://fb.me/eqwalizer_errors#dynamic_lambda)
-   ┌─ options/src/dynamic_lambdas.erl:23:9
-   │
-23 │         fun(X) -> X end,
-   │         ^^^^^^^^^^^^^^^ Lambda without context: parameters are dynamic()
-
-error: dynamic_lambda (See https://fb.me/eqwalizer_errors#dynamic_lambda)
-   ┌─ options/src/dynamic_lambdas.erl:24:9
-   │
-24 │         fun(#{}=M) -> M#{a => b} end
-   │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Lambda without context: parameters are dynamic()
-
-error: dynamic_lambda (See https://fb.me/eqwalizer_errors#dynamic_lambda)
-   ┌─ options/src/dynamic_lambdas.erl:31:14
-   │
-31 │         a => fun(X) -> X end,
-   │              ^^^^^^^^^^^^^^^ Lambda without context: parameters are dynamic()
-
-error: dynamic_lambda (See https://fb.me/eqwalizer_errors#dynamic_lambda)
-   ┌─ options/src/dynamic_lambdas.erl:32:14
-   │
-32 │         b => fun(#{}=M) -> M#{a => b} end
-   │              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Lambda without context: parameters are dynamic()
-
-6 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/options/dynamic_lambdas-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/options/dynamic_lambdas.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/options/dynamic_lambdas-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/options/dynamic_lambdas.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/options/overloaded_specs_dynamic_result-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/options/overloaded_specs_dynamic_result-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/options/overloaded_specs_dynamic_result-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/options/overloaded_specs_dynamic_result-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/options/overloaded_specs_dynamic_result-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/options/overloaded_specs_dynamic_result-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/options/overloaded_specs_dynamic_result-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/options/overloaded_specs_dynamic_result-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/options/overloaded_specs_dynamic_result-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested1-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/options/overloaded_specs_dynamic_result.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested1-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/options/overloaded_specs_dynamic_result.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/options/redundant_guards-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/options/redundant_guards-OTP-26.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/options/redundant_guards-OTP-26.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/options/redundant_guards-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/options/redundant_guards-OTP-27.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/options/redundant_guards-OTP-27.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/options/redundant_guards-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/options/redundant_guards-OTP-28.pretty
deleted file mode 100644
index 89dc33db74..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/options/redundant_guards-OTP-28.pretty
+++ /dev/null
@@ -1 +0,0 @@
-NO ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested1-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/options/redundant_guards.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/misc_nested1-OTP-27.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/options/redundant_guards.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/options/uncovered_clauses-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/options/uncovered_clauses-OTP-27.pretty
deleted file mode 100644
index 0304f7976a..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/options/uncovered_clauses-OTP-27.pretty
+++ /dev/null
@@ -1,43 +0,0 @@
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ options/src/uncovered_clauses.erl:11:1
-   │
-11 │ uncovered_1(A) when A == a -> A;
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ options/src/uncovered_clauses.erl:15:1
-   │
-15 │ uncovered_2(_, {a, A}) -> A;
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ options/src/uncovered_clauses.erl:20:1
-   │
-20 │ uncovered_3({ok, A}) -> A;
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ options/src/uncovered_clauses.erl:28:1
-   │
-28 │ uncovered_5({err, _A}) -> ok;
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ options/src/uncovered_clauses.erl:32:1
-   │
-32 │ uncovered_6(#{a := V}) when is_integer(V) -> V;
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ options/src/uncovered_clauses.erl:46:1
-   │
-46 │ uncovered_single(#{a_typo := A}) -> A.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ options/src/uncovered_clauses.erl:57:1
-   │
-57 │ uncovered_last_3({err, _A}) -> ok.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-7 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/options/uncovered_clauses-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/options/uncovered_clauses-OTP-28.pretty
deleted file mode 100644
index 0304f7976a..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/options/uncovered_clauses-OTP-28.pretty
+++ /dev/null
@@ -1,43 +0,0 @@
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ options/src/uncovered_clauses.erl:11:1
-   │
-11 │ uncovered_1(A) when A == a -> A;
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ options/src/uncovered_clauses.erl:15:1
-   │
-15 │ uncovered_2(_, {a, A}) -> A;
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ options/src/uncovered_clauses.erl:20:1
-   │
-20 │ uncovered_3({ok, A}) -> A;
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ options/src/uncovered_clauses.erl:28:1
-   │
-28 │ uncovered_5({err, _A}) -> ok;
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ options/src/uncovered_clauses.erl:32:1
-   │
-32 │ uncovered_6(#{a := V}) when is_integer(V) -> V;
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ options/src/uncovered_clauses.erl:46:1
-   │
-46 │ uncovered_single(#{a_typo := A}) -> A.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ options/src/uncovered_clauses.erl:57:1
-   │
-57 │ uncovered_last_3({err, _A}) -> ok.
-   │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Clause is not covered by spec
-
-7 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/options/uncovered_clauses-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/options/uncovered_clauses.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/options/uncovered_clauses-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/options/uncovered_clauses.pretty
diff --git a/test_projects/eqwalizer_tests/check/src/custom.erl b/test_projects/eqwalizer_tests/check/src/custom.erl
index 77aef06bce..b03ddd651e 100644
--- a/test_projects/eqwalizer_tests/check/src/custom.erl
+++ b/test_projects/eqwalizer_tests/check/src/custom.erl
@@ -3,7 +3,7 @@
 %%% This source code is licensed under the Apache 2.0 license found in
 %%% the LICENSE file in the root directory of this source tree.
 
--module(custom).
+-module(custom). % @OTPVersionDependent
 
 -import(maps, [get/2, get/3]).
 -compile([export_all, nowarn_export_all]).

From efcfe7fab9c5b02d82ee12f0da259d0fa5a304b8 Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Mon, 27 Oct 2025 16:59:10 -0700
Subject: [PATCH 209/394] Update eqWAlizer submodule

Summary: As title.

Reviewed By: TD5

Differential Revision: D85614198

fbshipit-source-id: 63ddf9b997e3ff9a86c1406890efcb543bf6a3de
---
 eqwalizer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eqwalizer b/eqwalizer
index 060f43d17b..d086735756 160000
--- a/eqwalizer
+++ b/eqwalizer
@@ -1 +1 @@
-Subproject commit 060f43d17b7d161601bb58bd341a8dc7381c0e7c
+Subproject commit d0867357568016c305ff428685bfe7322566391f

From 05c8cb047c8c9c32de8a50987f44c5cf6f328c3c Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 28 Oct 2025 04:00:34 -0700
Subject: [PATCH 210/394] 1/n: buck targets; Add --buck-quick-start CLI
 argument

Summary:
## Context

ELP with buck2 via elp.bxl has a slow startup time.  This time is driven primarily by how long it takes the buck2 daemon to simply load the various BUCK files.

Given that the buck targets may generate code, which is triggered in elp.bxl, this is unavoidable for full-fidelity project loading.

There is a much quicker command, `buck2 targets`, which does not do any build steps for code generation, but does run all the buck2 macros.  This gives us an accurate project representation for that portion of the project that is not generated.

Our ELP internal project model has the same representation for the initial subset query as for the full one, so we can do the quick query followed by the slow one without having to discard the work already done.  In particular, it means simply adding source files to existing targets.

## This diff stack

This diff stack brings in this two step process, so that in IDE mode we first do a quick query and start file loading. As soon as the initial file loading is complete, we can go operational.
At the same time as we start file loading, we initiate the slower `elp.bxl` query which also triggers code generation.  When that completes, we update the internal model and load the missing files.

The result is a quicker initial operation, albeit without access to any generated files, which are loaded when ready.

## This diff

This diff makes a start, by bringing in a command line argument to select the new behaviour. This defaults to off.

Reviewed By: TheGeorge

Differential Revision: D83660182

fbshipit-source-id: 9aea01d68fbacde5fb5fc032a6adbb522207741f
---
 crates/elp/src/bin/args.rs                |  7 ++++++-
 crates/elp/src/resources/test/help.stdout |  3 ++-
 crates/project_model/src/buck.rs          | 14 ++++++++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index 961d3216f7..0053786bd0 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -418,13 +418,18 @@ pub struct Args {
     /// When using buck, do not invoke a build step for generated files.
     pub no_buck_generated: bool,
 
+    /// Use buck2 targets for first stage project loading
+    pub buck_quick_start: bool,
+
     #[bpaf(external(command))]
     pub command: Command,
 }
 
 impl Args {
     pub fn query_config(&self) -> BuckQueryConfig {
-        if self.no_buck_generated {
+        if self.buck_quick_start {
+            BuckQueryConfig::BuckTargetsOnly
+        } else if self.no_buck_generated {
             BuckQueryConfig::NoBuildGeneratedCode
         } else {
             BuckQueryConfig::BuildGeneratedCode
diff --git a/crates/elp/src/resources/test/help.stdout b/crates/elp/src/resources/test/help.stdout
index 67fa0d9498..d384a88220 100644
--- a/crates/elp/src/resources/test/help.stdout
+++ b/crates/elp/src/resources/test/help.stdout
@@ -1,4 +1,4 @@
-Usage: [--log-file LOG_FILE] [--erl ERL] [--escript ESCRIPT] [--no-log-buffering] [--no-buck-generated] [COMMAND ...]
+Usage: [--log-file LOG_FILE] [--erl ERL] [--escript ESCRIPT] [--no-log-buffering] [--no-buck-generated] [--buck-quick-start] [COMMAND ...]
 
 Available options:
         --log-file <LOG_FILE>
@@ -6,6 +6,7 @@ Available options:
         --escript <ESCRIPT>
         --no-log-buffering
         --no-buck-generated    When using buck, do not invoke a build step for generated files.
+        --buck-quick-start     Use buck2 targets for first stage project loading
     -h, --help                 Prints help information
 
 Available commands:
diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index bc843d31d9..dc1b984359 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -534,7 +534,10 @@ fn load_buck_targets_bxl(
         BuckQueryConfig::BuildGeneratedCode => {
             report_progress("Querying and generating buck targets")
         }
-        BuckQueryConfig::NoBuildGeneratedCode => report_progress("Querying buck targets"),
+        BuckQueryConfig::NoBuildGeneratedCode => {
+            report_progress("Querying buck targets without codegen")
+        }
+        BuckQueryConfig::BuckTargetsOnly => report_progress("Querying buck targets, phase 1"),
     }
 
     let buck_targets = query_buck_targets(buck_config, build)?;
@@ -692,6 +695,8 @@ fn find_root(buck_config: &BuckConfig) -> Result<AbsPathBuf> {
 pub enum BuckQueryConfig {
     BuildGeneratedCode,
     NoBuildGeneratedCode,
+    /// Instead of using elp.bxl, use `buck2 targets`.
+    BuckTargetsOnly,
 }
 
 fn query_buck_targets(
@@ -699,7 +704,12 @@ fn query_buck_targets(
     query_config: &BuckQueryConfig,
 ) -> Result<FxHashMap<TargetFullName, BuckTarget>> {
     let _timer = timeit!("load buck targets");
-    let result = query_buck_targets_bxl(buck_config, query_config)?;
+    let result = match query_config {
+        BuckQueryConfig::BuildGeneratedCode | BuckQueryConfig::NoBuildGeneratedCode => {
+            query_buck_targets_bxl(buck_config, query_config)?
+        }
+        BuckQueryConfig::BuckTargetsOnly => todo!(),
+    };
 
     let result = result
         .into_iter()

From 3bde45d2b9ce6941709bb273ad1198b21b8800a4 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 28 Oct 2025 04:00:34 -0700
Subject: [PATCH 211/394] 2/n: buck targets; initial struct for buck targets,
 and serde for it

Summary:
Create a structure for the output of the `buck2 targets` command, and deserialize it.

It is not being used yet, this will come later in the stack.

Reviewed By: robertoaloi

Differential Revision: D83660316

fbshipit-source-id: e27a4d30d2d5b36560d58912f974909a902164e4
---
 crates/elp/src/bin/build_info_cli.rs |   4 +-
 crates/project_model/src/buck.rs     | 421 ++++++++++++++++++++++++++-
 2 files changed, 411 insertions(+), 14 deletions(-)

diff --git a/crates/elp/src/bin/build_info_cli.rs b/crates/elp/src/bin/build_info_cli.rs
index cdeb5bf74c..e055ae8b43 100644
--- a/crates/elp/src/bin/build_info_cli.rs
+++ b/crates/elp/src/bin/build_info_cli.rs
@@ -21,7 +21,7 @@ use elp_project_model::Project;
 use elp_project_model::ProjectBuildData;
 use elp_project_model::ProjectManifest;
 use elp_project_model::buck::BuckQueryConfig;
-use elp_project_model::buck::query_buck_targets_bxl;
+use elp_project_model::buck::query_buck_targets;
 use elp_project_model::json::JsonConfig;
 
 use crate::args::BuildInfo;
@@ -65,7 +65,7 @@ pub(crate) fn save_project_info(args: ProjectInfo, query_config: &BuckQueryConfi
     if args.buck_query
         && let ProjectBuildData::Buck(buck) = &project.project_build_data
     {
-        let buck_targets_query = query_buck_targets_bxl(&buck.buck_conf, query_config);
+        let buck_targets_query = query_buck_targets(&buck.buck_conf, query_config);
         writer.write_all(b"================buck targets query raw================\n")?;
         writer.write_all(format!("{:#?}\n", &buck_targets_query).as_bytes())?;
     };
diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index dc1b984359..faf511a6f4 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -12,6 +12,7 @@ use core::str;
 use std::borrow::Cow;
 use std::convert::TryFrom;
 use std::fmt;
+use std::path::Path;
 use std::path::PathBuf;
 use std::process;
 use std::process::Command;
@@ -34,6 +35,7 @@ use paths::RelPathBuf;
 use paths::Utf8PathBuf;
 use regex::Regex;
 use serde::Deserialize;
+use serde::Deserializer;
 use serde::Serialize;
 use thiserror::Error;
 
@@ -464,6 +466,152 @@ impl BuckTarget {
     }
 }
 
+#[derive(Debug, PartialEq, Eq)]
+enum BuckTargetType {
+    App,
+    Test,
+    Other(String),
+}
+
+impl<'de> Deserialize<'de> for BuckTargetType {
+    fn deserialize<D>(deserializer: D) -> Result<BuckTargetType, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let s = String::deserialize(deserializer)?;
+        match s.as_str() {
+            "prelude//rules.bzl:erlang_app" => Ok(BuckTargetType::App),
+            "prelude//rules.bzl:erlang_test" => Ok(BuckTargetType::Test),
+            other => {
+                log::info!("Ignoring buck target type: {}", &other);
+                Ok(BuckTargetType::Other(other.to_string()))
+            }
+        }
+    }
+}
+
+/// The interface type used in reading the output of running `buck2 target --json`
+#[derive(Deserialize, Debug)]
+pub struct BuckTargetBare {
+    // Note that some of the fields are of type `serde_json::Value`.
+    //
+    // This is because for some target types that we are not
+    // interested in they are not simple lists of strings, so fail
+    // serialization, and there is no point having a complex rust type
+    // for a thing we don't care about.
+    //
+    // We can only make this decision after extracting the `buck_type`
+    // field and filtering for the target types we care about, so we
+    // initially deserialize the problematic fields to `Value`, and
+    // complete it when we use them.
+    //
+    // This also gives much better error messages, since `serde_json`
+    // is optimised for this, whereas deserializing from a `Value`
+    // gives no useful information.
+    name: String,
+    #[serde(default)]
+    app_name: Option<String>,
+
+    #[serde(rename = "buck.package")]
+    buck_package: String,
+
+    // Note: we are not using the following available fields
+    //   _includes_target
+    //   buck.deps
+    //   buck.inputs
+    #[serde(rename = "buck.type")]
+    buck_type: BuckTargetType,
+    #[serde(default)]
+    labels: serde_json::Value,
+
+    #[serde(default)]
+    applications: serde_json::Value,
+    #[serde(default)]
+    deps: serde_json::Value,
+    #[serde(default)]
+    extra_includes: Vec<String>,
+    #[serde(default)]
+    included_applications: Vec<String>,
+    #[serde(default)]
+    includes: Vec<String>,
+    #[serde(default)]
+    srcs: serde_json::Value,
+    #[serde(default)]
+    suite: Option<String>,
+}
+
+impl BuckTargetBare {
+    fn target_full_name(&self) -> String {
+        if let Some(name) = &self.app_name {
+            format!("{}:{}", &self.buck_package, &name)
+        } else {
+            format!("{}:{}", &self.buck_package, &self.name)
+        }
+    }
+
+    fn as_buck_target(bare: Self, cells: &BuckCellInfo) -> BuckTarget {
+        let srcs = match bare.srcs {
+            serde_json::Value::Array(values) => values
+                .iter()
+                .flat_map(|v| match v {
+                    serde_json::Value::String(s) => Some(cells.make_absolute(s)),
+                    _ => None,
+                })
+                .collect(),
+            _ => vec![],
+        };
+        let deps = Self::json_value_to_strings(&bare.deps);
+        let apps = Self::json_value_to_strings(&bare.applications);
+        let labels = Self::json_value_to_strings(&bare.labels)
+            .into_iter()
+            .collect();
+        BuckTarget {
+            name: bare.name,
+            app_name: bare.app_name,
+            suite: bare.suite.map(|tgt| cells.make_absolute(&tgt)),
+            srcs,
+            includes: includes_directories_only(&cells.make_all_absolute(&bare.includes)),
+            labels,
+            gen_srcs: vec![],
+            deps,
+            apps,
+            included_apps: bare.included_applications,
+            extra_includes: bare
+                .extra_includes
+                .iter()
+                .map(|inc| {
+                    inc.strip_suffix("_includes_only")
+                        .unwrap_or(inc)
+                        .to_string()
+                })
+                .collect::<Vec<_>>(),
+            origin: BuckTargetOrigin::App,
+        }
+    }
+
+    fn json_value_to_strings(val: &serde_json::Value) -> Vec<String> {
+        match val {
+            serde_json::Value::Array(values) => values
+                .iter()
+                .flat_map(|v| match v {
+                    serde_json::Value::String(s) => Some(s.clone()),
+                    _ => None,
+                })
+                .collect(),
+            _ => vec![],
+        }
+    }
+
+    fn skipped_target_type(&self) -> bool {
+        match self.buck_type {
+            BuckTargetType::App => false,
+            BuckTargetType::Test => false,
+
+            BuckTargetType::Other(_) => true,
+        }
+    }
+}
+
 #[derive(Debug, Eq, PartialEq, Clone)]
 pub struct Target {
     // full-name, like cell//path/to/target/...
@@ -515,6 +663,20 @@ pub enum TargetType {
     ErlangTestUtils,
 }
 
+fn includes_directories_only(includes: &[String]) -> Vec<String> {
+    let mut set = FxHashSet::default();
+    for inc in includes {
+        let full_path = Path::new(inc);
+        let path = full_path
+            .extension()
+            .and_then(|_| full_path.parent())
+            .and_then(|p| p.to_str())
+            .unwrap_or(inc);
+        set.insert(path);
+    }
+    set.iter().map(|s| s.to_string()).collect()
+}
+
 fn load_buck_targets_bxl(
     buck_config: &BuckConfig,
     build: &BuckQueryConfig,
@@ -540,7 +702,8 @@ fn load_buck_targets_bxl(
         BuckQueryConfig::BuckTargetsOnly => report_progress("Querying buck targets, phase 1"),
     }
 
-    let buck_targets = query_buck_targets(buck_config, build)?;
+    let result = query_buck_targets(buck_config, build)?;
+    let buck_targets = filter_buck_targets(buck_config, result)?;
 
     report_progress("Making target info");
     let mut target_info = TargetInfo::default();
@@ -699,18 +862,10 @@ pub enum BuckQueryConfig {
     BuckTargetsOnly,
 }
 
-fn query_buck_targets(
+fn filter_buck_targets(
     buck_config: &BuckConfig,
-    query_config: &BuckQueryConfig,
+    result: FxHashMap<String, BuckTarget>,
 ) -> Result<FxHashMap<TargetFullName, BuckTarget>> {
-    let _timer = timeit!("load buck targets");
-    let result = match query_config {
-        BuckQueryConfig::BuildGeneratedCode | BuckQueryConfig::NoBuildGeneratedCode => {
-            query_buck_targets_bxl(buck_config, query_config)?
-        }
-        BuckQueryConfig::BuckTargetsOnly => todo!(),
-    };
-
     let result = result
         .into_iter()
         .filter(|(name, _)| {
@@ -730,7 +885,21 @@ fn query_buck_targets(
     Ok(result)
 }
 
-pub fn query_buck_targets_bxl(
+pub fn query_buck_targets(
+    buck_config: &BuckConfig,
+    query_config: &BuckQueryConfig,
+) -> Result<FxHashMap<String, BuckTarget>> {
+    let _timer = timeit!("load buck targets");
+    let result = match query_config {
+        BuckQueryConfig::BuildGeneratedCode | BuckQueryConfig::NoBuildGeneratedCode => {
+            query_buck_targets_bxl(buck_config, query_config)?
+        }
+        BuckQueryConfig::BuckTargetsOnly => query_buck_targets_bare(buck_config)?,
+    };
+    Ok(result)
+}
+
+fn query_buck_targets_bxl(
     buck_config: &BuckConfig,
     build: &BuckQueryConfig,
 ) -> Result<FxHashMap<String, BuckTarget>> {
@@ -766,6 +935,12 @@ struct BuckCellInfo {
 }
 
 impl BuckCellInfo {
+    fn make_all_absolute(&self, list: &[String]) -> Vec<String> {
+        list.iter()
+            .map(|buck_path| self.make_absolute(buck_path))
+            .collect()
+    }
+
     fn make_absolute(&self, target: &str) -> String {
         self.make_absolute_maybe(target)
             .unwrap_or(target.to_string())
@@ -846,6 +1021,34 @@ fn run_buck_command(mut command: CommandProxy<'_>) -> Result<process::Output> {
     Ok(output)
 }
 
+fn query_buck_targets_bare(buck_config: &BuckConfig) -> Result<FxHashMap<String, BuckTarget>> {
+    let mut targets: Vec<&str> = Vec::default();
+    for target in &buck_config.included_targets {
+        targets.push(target);
+    }
+    for target in &buck_config.deps_targets {
+        targets.push(target);
+    }
+    let mut command = buck_config.buck_command();
+    command.arg("targets").arg("--json").args(targets);
+    let output = run_buck_command(command)?;
+    let string = String::from_utf8(output.stdout)?;
+    let bare_targets: Vec<BuckTargetBare> = serde_json::from_str(&string)?;
+
+    let cells = buck_cell_info()?;
+    let mut result = FxHashMap::default();
+    for bare in bare_targets {
+        if !bare.skipped_target_type() {
+            let target_full_name = bare.target_full_name();
+            let target: BuckTarget = BuckTargetBare::as_buck_target(bare, &cells);
+            result.insert(target_full_name, target);
+        }
+    }
+    Ok(result)
+}
+
+// ---------------------------------------------------------------------
+
 #[derive(Error, Debug)]
 pub struct BuckQueryError {
     pub command: String,
@@ -1153,12 +1356,14 @@ mod tests {
     use parking_lot::MutexGuard;
     use paths::AbsPath;
     use paths::Utf8Path;
+    use serde_json::Value;
 
     use super::BUCK_CELL_INFO;
     use super::BuckCellInfo;
     use crate::buck::BuckConfig;
     use crate::buck::BuckQueryError;
     use crate::buck::BuckTarget;
+    use crate::buck::BuckTargetBare;
     use crate::buck::BuckTargetOrigin;
     use crate::buck::buck_path_to_abs_path;
     use crate::buck::find_app_root_bxl;
@@ -1832,4 +2037,196 @@ mod tests {
         "#]]
         .assert_debug_eq(&cells.make_absolute("cell2//a/b/c.erl"));
     }
+
+    #[test]
+    fn deserialize_buck_target_bare() {
+        let string = r#"
+              [
+                {
+                  "_includes_target": "cell//linter:app_a_includes_only",
+                  "app_src": "cell//linter/app_a/src/app_a.app.src",
+                  "applications": [],
+                  "buck.deps": [
+                    "cell//linter:app_a_includes_only",
+                    "prelude//erlang/shell:buck2_shell_utils",
+                    "toolchains//:erlang-default"
+                  ],
+                  "buck.inputs": [
+                    "cell//linter/app_a/src/app_a.app.src",
+                    "cell//linter/app_a/include/app_a.hrl",
+                    "cell//linter/app_a/src/app_a.erl",
+                    "cell//linter/app_a/src/app_a_edoc.erl",
+                    "cell//linter/app_a/src/app_a_unused_param.erl",
+                    "cell//linter/app_a/src/expression_updates_literal.erl",
+                    "cell//linter/app_a/src/spelling.erl"
+                  ],
+                  "buck.oncall": "vscode_erlang",
+                  "buck.package": "cell//linter",
+                  "buck.type": "prelude//rules.bzl:erlang_app",
+                  "extra_includes": [],
+                  "included_applications": [],
+                  "includes": [
+                    "cell//linter/app_a/include/app_a.hrl"
+                  ],
+                  "labels": [
+                    "user_application"
+                  ],
+                  "name": "app_a_target",
+                  "app_name":"app_a",
+                  "srcs": [
+                    "cell//linter/app_a/src/app_a.erl",
+                    "cell//linter/app_a/src/app_a_edoc.erl",
+                    "cell//linter/app_a/src/app_a_unused_param.erl",
+                    "cell//linter/app_a/src/expression_updates_literal.erl",
+                    "cell//linter/app_a/src/spelling.erl"
+                  ],
+                  "version": "1.0.0",
+                  "visibility": [],
+                  "within_view": [
+                    "PUBLIC"
+                  ]
+                }
+              ]"#;
+        let result: Vec<BuckTargetBare> = serde_json::from_str(string).unwrap();
+        expect![[r#"
+            [
+                BuckTargetBare {
+                    name: "app_a_target",
+                    app_name: Some(
+                        "app_a",
+                    ),
+                    buck_package: "cell//linter",
+                    buck_type: App,
+                    labels: Array [
+                        String("user_application"),
+                    ],
+                    applications: Array [],
+                    deps: Null,
+                    extra_includes: [],
+                    included_applications: [],
+                    includes: [
+                        "cell//linter/app_a/include/app_a.hrl",
+                    ],
+                    srcs: Array [
+                        String("cell//linter/app_a/src/app_a.erl"),
+                        String("cell//linter/app_a/src/app_a_edoc.erl"),
+                        String("cell//linter/app_a/src/app_a_unused_param.erl"),
+                        String("cell//linter/app_a/src/expression_updates_literal.erl"),
+                        String("cell//linter/app_a/src/spelling.erl"),
+                    ],
+                    suite: None,
+                },
+            ]
+        "#]]
+        .assert_debug_eq(&result);
+
+        let full_target_names = result
+            .iter()
+            .map(|b| b.target_full_name())
+            .collect::<Vec<_>>();
+        expect![[r#"
+            [
+                "cell//linter:app_a",
+            ]
+        "#]]
+        .assert_debug_eq(&full_target_names);
+
+        let cells = BuckCellInfo {
+            cells: FxHashMap::from_iter(vec![
+                ("fbcode".to_string(), "/[fbcode]".to_string()),
+                ("prelude".to_string(), "/[prelude]".to_string()),
+            ]),
+        };
+
+        let converted: Vec<BuckTarget> = result
+            .into_iter()
+            .map(|bare| BuckTargetBare::as_buck_target(bare, &cells))
+            .collect();
+        expect![[r#"
+            [
+                BuckTarget {
+                    name: "app_a_target",
+                    app_name: Some(
+                        "app_a",
+                    ),
+                    suite: None,
+                    srcs: [
+                        "cell//linter/app_a/src/app_a.erl",
+                        "cell//linter/app_a/src/app_a_edoc.erl",
+                        "cell//linter/app_a/src/app_a_unused_param.erl",
+                        "cell//linter/app_a/src/expression_updates_literal.erl",
+                        "cell//linter/app_a/src/spelling.erl",
+                    ],
+                    includes: [
+                        "cell//linter/app_a/include",
+                    ],
+                    gen_srcs: [],
+                    labels: {
+                        "user_application",
+                    },
+                    deps: [],
+                    apps: [],
+                    included_apps: [],
+                    extra_includes: [],
+                    origin: App,
+                },
+            ]
+        "#]]
+        .assert_debug_eq(&converted);
+    }
+
+    #[test]
+    fn unusual_buck_target() {
+        let string = r#"
+              [
+
+                {
+                  "buck.type":"prelude//rules.bzl:erlang_release",
+                  "buck.deps":[
+                     "waserver//buck2/test/targets/apps:app_a",
+                     "waserver//buck2/test/targets/apps:app_e",
+                     "toolchains//:erlang-default"
+                  ],
+                  "buck.inputs":[],
+                  "buck.package":"waserver//buck2/test/targets/releases",
+                  "name":"rel4",
+                  "visibility":["PUBLIC"],
+                  "within_view":["PUBLIC"],
+                  "applications":[
+                       "waserver//buck2/test/targets/apps:app_a",
+                       ["waserver//buck2/test/targets/apps:app_e","load"]
+                   ]
+                }
+              ]"#;
+        let v: Value = serde_json::from_str(string).unwrap();
+        expect![[r#"
+            Array [
+                Object {
+                    "applications": Array [
+                        String("waserver//buck2/test/targets/apps:app_a"),
+                        Array [
+                            String("waserver//buck2/test/targets/apps:app_e"),
+                            String("load"),
+                        ],
+                    ],
+                    "buck.deps": Array [
+                        String("waserver//buck2/test/targets/apps:app_a"),
+                        String("waserver//buck2/test/targets/apps:app_e"),
+                        String("toolchains//:erlang-default"),
+                    ],
+                    "buck.inputs": Array [],
+                    "buck.package": String("waserver//buck2/test/targets/releases"),
+                    "buck.type": String("prelude//rules.bzl:erlang_release"),
+                    "name": String("rel4"),
+                    "visibility": Array [
+                        String("PUBLIC"),
+                    ],
+                    "within_view": Array [
+                        String("PUBLIC"),
+                    ],
+                },
+            ]
+        "#]]
+        .assert_debug_eq(&v);
+    }
 }

From 2036282055511f6f1933ec75b2ba45b862feba2a Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 28 Oct 2025 04:00:34 -0700
Subject: [PATCH 212/394] 3/n: buck targets; Improve CLI project-info output

Summary:
We want to be able to compare the targets generated via `buck targets` with the ones generated via `elp.bxl`.

Each of these emits the targets in their own essentially random order.

This diff tweaks the processing of the `elp project-info` command so we can more easily compare the results with and without the new `--buck-quick-start` flag.

Reviewed By: robertoaloi

Differential Revision: D83662426

fbshipit-source-id: df15ba80a397f9b7b0614d045cb1d53c2f98f66a
---
 crates/elp/src/bin/build_info_cli.rs | 33 ++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/crates/elp/src/bin/build_info_cli.rs b/crates/elp/src/bin/build_info_cli.rs
index e055ae8b43..e2c655275a 100644
--- a/crates/elp/src/bin/build_info_cli.rs
+++ b/crates/elp/src/bin/build_info_cli.rs
@@ -21,8 +21,10 @@ use elp_project_model::Project;
 use elp_project_model::ProjectBuildData;
 use elp_project_model::ProjectManifest;
 use elp_project_model::buck::BuckQueryConfig;
+use elp_project_model::buck::BuckTarget;
 use elp_project_model::buck::query_buck_targets;
 use elp_project_model::json::JsonConfig;
+use fxhash::FxHashMap;
 
 use crate::args::BuildInfo;
 use crate::args::ProjectInfo;
@@ -66,18 +68,31 @@ pub(crate) fn save_project_info(args: ProjectInfo, query_config: &BuckQueryConfi
         && let ProjectBuildData::Buck(buck) = &project.project_build_data
     {
         let buck_targets_query = query_buck_targets(&buck.buck_conf, query_config);
-        writer.write_all(b"================buck targets query raw================\n")?;
-        writer.write_all(format!("{:#?}\n", &buck_targets_query).as_bytes())?;
-    };
-    writer.write_all(b"================manifest================\n")?;
-    writer.write_all(format!("{:#?}\n", &manifest).as_bytes())?;
-    writer.write_all(b"================project_build_data================\n")?;
-    writer.write_all(format!("{:#?}\n", &project.project_build_data).as_bytes())?;
-    writer.write_all(b"================project_app_data================\n")?;
-    writer.write_all(format!("{:#?}\n", &project.project_apps).as_bytes())?;
+        if let Ok(targets) = &buck_targets_query {
+            writer.write_all(format!("{:#?}\n", sort_buck_targets(targets)).as_bytes())?;
+        } else {
+            writer.write_all(format!("{:#?}\n", &buck_targets_query).as_bytes())?;
+        }
+    } else {
+        writer.write_all(b"================manifest================\n")?;
+        writer.write_all(format!("{:#?}\n", &manifest).as_bytes())?;
+        writer.write_all(b"================project_build_data================\n")?;
+        writer.write_all(format!("{:#?}\n", &project.project_build_data).as_bytes())?;
+        writer.write_all(b"================project_app_data================\n")?;
+        writer.write_all(format!("{:#?}\n", &project.project_apps).as_bytes())?;
+    }
     Ok(())
 }
 
+fn sort_buck_targets(hash_map: &FxHashMap<String, BuckTarget>) -> Vec<(String, &BuckTarget)> {
+    let mut vec = hash_map
+        .iter()
+        .map(|(n, t)| (format!("target_name:{}", n), t))
+        .collect::<Vec<_>>();
+    vec.sort_by(|a, b| a.0.cmp(&b.0));
+    vec
+}
+
 fn load_project(
     root: &AbsPath,
     query_config: &BuckQueryConfig,

From 8e2d2556513670176f576895e183c09ce8337273 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 28 Oct 2025 04:00:34 -0700
Subject: [PATCH 213/394] 4/n: buck targets: explicitly check for the prelude
 as a target, for origin

Summary:
A buck target is classified as an `App` or a `Dep`, according to whether it is part of the project being loaded or is one of its dependencies.

The `elp.bxl` script [provides this information](https://github.com/facebook/buck2/blob/db5bf933afd23ac3306b7f3627819046b6973534/prelude/erlang/elp.bxl#L94-L96) by filtering the included targets for erlang_app/erlang_dep only, and marking these as apps.

It then generates the full configured graph from this set of targets, and the additional targets (erlang_apps only, no tests) are marked as deps.  This is the step that takes a long time, and which we are avoiding in the initial step.

To achieve the same for the first step we also do two `buck targets` queries, one for the included targets as used in `elp.bxl`, the second for the buck config `deps_targets`, which are not used in `elp.bxl` as they are computed from the dependencies in the configured graph for the included targets.

Reviewed By: robertoaloi

Differential Revision: D83758970

fbshipit-source-id: ea84c51e76a63a1418cbbdd72718bdca076f4808
---
 crates/project_model/src/buck.rs | 66 +++++++++++++++++---------------
 1 file changed, 36 insertions(+), 30 deletions(-)

diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index faf511a6f4..39e4bf3666 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -452,8 +452,6 @@ pub struct BuckTarget {
     /// to build the graph.
     #[serde(default)]
     extra_includes: Vec<TargetFullName>,
-    #[serde(default)]
-    origin: BuckTargetOrigin,
 }
 
 impl BuckTarget {
@@ -585,7 +583,6 @@ impl BuckTargetBare {
                         .to_string()
                 })
                 .collect::<Vec<_>>(),
-            origin: BuckTargetOrigin::App,
         }
     }
 
@@ -710,12 +707,17 @@ fn load_buck_targets_bxl(
 
     let mut used_deps = FxHashSet::default();
 
+    let targets_include_only_prelude = buck_config
+        .included_targets
+        .iter()
+        .all(|t| t.starts_with("prelude//"));
     for (name, buck_target) in &buck_targets {
         if let Ok(target) = make_buck_target(
             root,
             name,
             buck_target,
             buck_config.build_deps,
+            targets_include_only_prelude,
             &mut dep_path,
             &mut target_info,
         ) {
@@ -736,6 +738,7 @@ fn make_buck_target(
     name: &String,
     target: &BuckTarget,
     build_deps: bool,
+    targets_include_only_prelude: bool,
     dep_path: &mut FxHashMap<String, AbsPathBuf>,
     target_info: &mut TargetInfo,
 ) -> Result<Target> {
@@ -757,7 +760,7 @@ fn make_buck_target(
             (src, include_files, TargetType::ErlangTest, false, None)
         } else {
             let mut private_header = false;
-            let target_type = compute_target_type(name, target);
+            let target_type = compute_target_type(name, target, targets_include_only_prelude);
             let mut src_files = vec![];
             for src in &target.srcs {
                 let src = json::canonicalize(buck_path_to_abs_path(root, src).unwrap())?;
@@ -806,10 +809,14 @@ fn make_buck_target(
     })
 }
 
-fn compute_target_type(name: &TargetFullName, target: &BuckTarget) -> TargetType {
-    if target.origin != BuckTargetOrigin::App && (name.starts_with("prelude//"))
-        || name.contains("//third-party")
-    {
+fn compute_target_type(
+    name: &TargetFullName,
+    target: &BuckTarget,
+    targets_include_only_prelude: bool,
+) -> TargetType {
+    // Check if we are trying to work on the prelude itself
+    let is_prelude_dep = !targets_include_only_prelude && (name.starts_with("prelude//"));
+    if is_prelude_dep || name.contains("//third-party") {
         TargetType::ThirdParty
     } else {
         let test_utils = target.labels.contains("test_utils");
@@ -1022,31 +1029,38 @@ fn run_buck_command(mut command: CommandProxy<'_>) -> Result<process::Output> {
 }
 
 fn query_buck_targets_bare(buck_config: &BuckConfig) -> Result<FxHashMap<String, BuckTarget>> {
-    let mut targets: Vec<&str> = Vec::default();
-    for target in &buck_config.included_targets {
-        targets.push(target);
-    }
-    for target in &buck_config.deps_targets {
-        targets.push(target);
-    }
-    let mut command = buck_config.buck_command();
-    command.arg("targets").arg("--json").args(targets);
-    let output = run_buck_command(command)?;
-    let string = String::from_utf8(output.stdout)?;
-    let bare_targets: Vec<BuckTargetBare> = serde_json::from_str(&string)?;
-
     let cells = buck_cell_info()?;
+
+    let bare_targets_apps = do_buck_query_bare(buck_config, &buck_config.included_targets)?;
+    let bare_targets_deps = do_buck_query_bare(buck_config, &buck_config.deps_targets)?;
+
     let mut result = FxHashMap::default();
-    for bare in bare_targets {
+
+    let mut do_one = |bare: BuckTargetBare| {
         if !bare.skipped_target_type() {
             let target_full_name = bare.target_full_name();
             let target: BuckTarget = BuckTargetBare::as_buck_target(bare, &cells);
             result.insert(target_full_name, target);
         }
+    };
+    for bare in bare_targets_apps {
+        do_one(bare);
+    }
+    for bare in bare_targets_deps {
+        do_one(bare);
     }
     Ok(result)
 }
 
+fn do_buck_query_bare(buck_config: &BuckConfig, targets: &[String]) -> Result<Vec<BuckTargetBare>> {
+    let mut command = buck_config.buck_command();
+    command.arg("targets").arg("--json").args(targets);
+    let output = run_buck_command(command)?;
+    let string = String::from_utf8(output.stdout)?;
+    let bare_targets: Vec<BuckTargetBare> = serde_json::from_str(&string)?;
+    Ok(bare_targets)
+}
+
 // ---------------------------------------------------------------------
 
 #[derive(Error, Debug)]
@@ -1364,7 +1378,6 @@ mod tests {
     use crate::buck::BuckQueryError;
     use crate::buck::BuckTarget;
     use crate::buck::BuckTargetBare;
-    use crate::buck::BuckTargetOrigin;
     use crate::buck::buck_path_to_abs_path;
     use crate::buck::find_app_root_bxl;
     use crate::buck::get_prelude_cell;
@@ -1397,7 +1410,6 @@ mod tests {
             apps: vec![],
             included_apps: vec![],
             extra_includes: vec![],
-            origin: BuckTargetOrigin::App,
         };
 
         let actual = find_app_root_bxl(root, &target_name, &target);
@@ -1426,7 +1438,6 @@ mod tests {
             apps: vec![],
             included_apps: vec![],
             extra_includes: vec![],
-            origin: BuckTargetOrigin::App,
         };
 
         let actual = find_app_root_bxl(root, &target_name, &target);
@@ -1455,7 +1466,6 @@ mod tests {
             apps: vec![],
             included_apps: vec![],
             extra_includes: vec![],
-            origin: BuckTargetOrigin::App,
         };
 
         let actual = find_app_root_bxl(root, &target_name, &target);
@@ -1492,7 +1502,6 @@ mod tests {
             apps: vec![],
             included_apps: vec![],
             extra_includes: vec![],
-            origin: BuckTargetOrigin::App,
         };
 
         let actual = find_app_root_bxl(root, &target_name, &target);
@@ -1526,7 +1535,6 @@ mod tests {
             apps: vec![],
             included_apps: vec![],
             extra_includes: vec![],
-            origin: BuckTargetOrigin::App,
         };
 
         let actual = find_app_root_bxl(root, &target_name, &target);
@@ -1556,7 +1564,6 @@ mod tests {
             apps: vec![],
             included_apps: vec![],
             extra_includes: vec![],
-            origin: BuckTargetOrigin::App,
         };
 
         let actual = find_app_root_bxl(root, &target_name, &target);
@@ -2168,7 +2175,6 @@ mod tests {
                     apps: [],
                     included_apps: [],
                     extra_includes: [],
-                    origin: App,
                 },
             ]
         "#]]

From f99edec4caebd236957bece6ce2dcd073b9a85ca Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 28 Oct 2025 04:00:34 -0700
Subject: [PATCH 214/394] 5/n: buck targets: propagate generated label

Summary: When we load a project using buck via elp.bxl, propagate the state of the "generated" label to the `ProjectAppData`. This allows the next diff in the stack to filter these apps out when generating a list of targets processed, for comparison with the quick-start targets.

Reviewed By: robertoaloi

Differential Revision: D83827651

fbshipit-source-id: ac7e4cf99c403e2fa26a1464fb290e9f789b8564
---
 crates/project_model/src/buck.rs              | 14 +++++++++++---
 crates/project_model/src/eqwalizer_support.rs |  1 +
 crates/project_model/src/json.rs              |  1 +
 crates/project_model/src/lib.rs               |  5 +++++
 crates/project_model/src/no_manifest.rs       |  1 +
 crates/project_model/src/rebar.rs             |  1 +
 crates/project_model/src/test_fixture.rs      |  1 +
 7 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 39e4bf3666..fa3be81db2 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -462,6 +462,10 @@ impl BuckTarget {
             AppName(self.name.clone())
         }
     }
+
+    fn is_generated(&self) -> bool {
+        self.labels.contains("generated")
+    }
 }
 
 #[derive(Debug, PartialEq, Eq)]
@@ -626,6 +630,8 @@ pub struct Target {
     pub target_type: TargetType,
     /// true if there are .hrl files in the src dir
     pub private_header: bool,
+    /// true if generated via elp.bxl
+    pub buck_generated: bool,
 }
 
 impl Target {
@@ -676,7 +682,7 @@ fn includes_directories_only(includes: &[String]) -> Vec<String> {
 
 fn load_buck_targets_bxl(
     buck_config: &BuckConfig,
-    build: &BuckQueryConfig,
+    query_config: &BuckQueryConfig,
     report_progress: &impl Fn(&str),
 ) -> Result<TargetInfo> {
     let _timer = timeit!("loading info from buck");
@@ -689,7 +695,7 @@ fn load_buck_targets_bxl(
         FxHashMap::default()
     };
 
-    match build {
+    match query_config {
         BuckQueryConfig::BuildGeneratedCode => {
             report_progress("Querying and generating buck targets")
         }
@@ -699,7 +705,7 @@ fn load_buck_targets_bxl(
         BuckQueryConfig::BuckTargetsOnly => report_progress("Querying buck targets, phase 1"),
     }
 
-    let result = query_buck_targets(buck_config, build)?;
+    let result = query_buck_targets(buck_config, query_config)?;
     let buck_targets = filter_buck_targets(buck_config, result)?;
 
     report_progress("Making target info");
@@ -806,6 +812,7 @@ fn make_buck_target(
         ebin,
         target_type,
         private_header,
+        buck_generated: target.is_generated(),
     })
 }
 
@@ -1299,6 +1306,7 @@ fn targets_to_project_data_bxl(
             gen_src_files: Some(FxHashSet::from_iter(target.gen_src_files.clone())),
             applicable_files: Some(FxHashSet::from_iter(target.src_files.clone())),
             is_test_target: Some(target.target_type == TargetType::ErlangTest),
+            is_buck_generated: Some(target.buck_generated),
         };
         // Do not bother with applications that exist purely as a
         // handle on dependencies for include_path.
diff --git a/crates/project_model/src/eqwalizer_support.rs b/crates/project_model/src/eqwalizer_support.rs
index 672b7c174d..861e9af812 100644
--- a/crates/project_model/src/eqwalizer_support.rs
+++ b/crates/project_model/src/eqwalizer_support.rs
@@ -49,6 +49,7 @@ pub(crate) fn eqwalizer_suppport_data(otp_root: &AbsPath) -> ProjectAppData {
         gen_src_files: None,
         applicable_files: None,
         is_test_target: None,
+        is_buck_generated: None,
     }
 }
 
diff --git a/crates/project_model/src/json.rs b/crates/project_model/src/json.rs
index b910c91319..c98f30e726 100644
--- a/crates/project_model/src/json.rs
+++ b/crates/project_model/src/json.rs
@@ -105,6 +105,7 @@ impl JsonProjectAppData {
             gen_src_files: None,
             applicable_files: None,
             is_test_target: None,
+            is_buck_generated: None,
         })
     }
 
diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs
index 75a9266ec8..53e550d05a 100644
--- a/crates/project_model/src/lib.rs
+++ b/crates/project_model/src/lib.rs
@@ -896,6 +896,9 @@ pub struct ProjectAppData {
     // data applies to.
     pub applicable_files: Option<FxHashSet<AbsPathBuf>>,
     pub is_test_target: Option<bool>,
+    /// Generated as part of the buck build process, via elp.bxl
+    /// Specifically not related to any marker tags in files
+    pub is_buck_generated: Option<bool>,
 }
 
 impl ProjectAppData {
@@ -921,6 +924,7 @@ impl ProjectAppData {
             gen_src_files: None,
             applicable_files: None,
             is_test_target: None,
+            is_buck_generated: None,
         }
     }
 
@@ -948,6 +952,7 @@ impl ProjectAppData {
             gen_src_files: None,
             applicable_files: None,
             is_test_target: None,
+            is_buck_generated: None,
         }
     }
 
diff --git a/crates/project_model/src/no_manifest.rs b/crates/project_model/src/no_manifest.rs
index a1de933260..6a7e021342 100644
--- a/crates/project_model/src/no_manifest.rs
+++ b/crates/project_model/src/no_manifest.rs
@@ -71,6 +71,7 @@ impl NoManifestConfig {
             gen_src_files: None,
             applicable_files: None,
             is_test_target: None,
+            is_buck_generated: None,
         };
         data.include_path.extend(data.include_dirs());
         if let Some(path) = self.root_path.parent() {
diff --git a/crates/project_model/src/rebar.rs b/crates/project_model/src/rebar.rs
index 64686c26a6..bd675ffc2e 100644
--- a/crates/project_model/src/rebar.rs
+++ b/crates/project_model/src/rebar.rs
@@ -240,6 +240,7 @@ impl RebarProject {
                 gen_src_files: None,
                 applicable_files: None,
                 is_test_target: None,
+                is_buck_generated: None,
             })
         }
     }
diff --git a/crates/project_model/src/test_fixture.rs b/crates/project_model/src/test_fixture.rs
index 152595251b..b2b02ed343 100644
--- a/crates/project_model/src/test_fixture.rs
+++ b/crates/project_model/src/test_fixture.rs
@@ -966,6 +966,7 @@ bar() -> ok.
                 gen_src_files: None,
                 applicable_files: None,
                 is_test_target: None,
+                is_buck_generated: None,
             }"#]]
         .assert_eq(format!("{:#?}", meta0.app_data).as_str());
     }

From 1f3885feca292579b6cd6179eb0d7c1bac0a6287 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 28 Oct 2025 04:00:34 -0700
Subject: [PATCH 215/394] 6/n: buck targets: dump target list for comparison

Summary:
Add a test facility to `elp project-info` to be able to compare the target set arising from the `buck2 targets` call vs using `elp.bxl`.

This explicitly excludes any targets marked as generated by `elp.bxl`, as these will not appear in the bare `buck targets`.

It sorts the output according to whether it is an `App` or `Dep`, the app name and then the original buck target name, for investigation and confirmation.

Reviewed By: TheGeorge

Differential Revision: D83829236

fbshipit-source-id: be27273fdaf6d095b59eccda0cf74165510fe0b2
---
 crates/elp/src/bin/args.rs                    |  2 ++
 crates/elp/src/bin/build_info_cli.rs          | 32 +++++++++++++++++++
 .../resources/test/project_info_help.stdout   |  3 +-
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index 0053786bd0..7ea99c0da6 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -356,6 +356,8 @@ pub struct ProjectInfo {
     pub to: Option<PathBuf>,
     /// Include the buck uquery results in the output
     pub buck_query: bool,
+    /// Dump a list of targets and their types
+    pub target_types: bool,
 }
 
 #[derive(Clone, Debug, Bpaf)]
diff --git a/crates/elp/src/bin/build_info_cli.rs b/crates/elp/src/bin/build_info_cli.rs
index e2c655275a..2308acb2a7 100644
--- a/crates/elp/src/bin/build_info_cli.rs
+++ b/crates/elp/src/bin/build_info_cli.rs
@@ -15,9 +15,11 @@ use std::io::Write;
 use anyhow::Result;
 use elp_ide::elp_ide_db::elp_base_db::AbsPath;
 use elp_ide::elp_ide_db::elp_base_db::AbsPathBuf;
+use elp_project_model::AppType;
 use elp_project_model::ElpConfig;
 use elp_project_model::IncludeParentDirs;
 use elp_project_model::Project;
+use elp_project_model::ProjectAppData;
 use elp_project_model::ProjectBuildData;
 use elp_project_model::ProjectManifest;
 use elp_project_model::buck::BuckQueryConfig;
@@ -73,6 +75,11 @@ pub(crate) fn save_project_info(args: ProjectInfo, query_config: &BuckQueryConfi
         } else {
             writer.write_all(format!("{:#?}\n", &buck_targets_query).as_bytes())?;
         }
+    } else if args.target_types {
+        writer.write_all(b"================target types================\n")?;
+        for line in buck_targets_and_types(&project.project_apps) {
+            writer.write_all(format!("{}\n", line).as_bytes())?;
+        }
     } else {
         writer.write_all(b"================manifest================\n")?;
         writer.write_all(format!("{:#?}\n", &manifest).as_bytes())?;
@@ -93,6 +100,31 @@ fn sort_buck_targets(hash_map: &FxHashMap<String, BuckTarget>) -> Vec<(String, &
     vec
 }
 
+fn buck_targets_and_types(apps: &[ProjectAppData]) -> Vec<String> {
+    let tn = |tn| -> String {
+        if let Some(tn) = tn {
+            tn
+        } else {
+            "".to_string()
+        }
+    };
+    let mut vec = apps
+        .iter()
+        .filter(|app| app.app_type != AppType::Otp)
+        .filter(|app| app.is_buck_generated != Some(true))
+        .map(|app| {
+            format!(
+                "{:?} {:<30} {}",
+                app.app_type,
+                app.name,
+                tn(app.buck_target_name.clone())
+            )
+        })
+        .collect::<Vec<_>>();
+    vec.sort();
+    vec
+}
+
 fn load_project(
     root: &AbsPath,
     query_config: &BuckQueryConfig,
diff --git a/crates/elp/src/resources/test/project_info_help.stdout b/crates/elp/src/resources/test/project_info_help.stdout
index 637b221d66..2f761a19fa 100644
--- a/crates/elp/src/resources/test/project_info_help.stdout
+++ b/crates/elp/src/resources/test/project_info_help.stdout
@@ -1,7 +1,8 @@
-Usage: [--project PROJECT] [--to TO] [--buck-query]
+Usage: [--project PROJECT] [--to TO] [--buck-query] [--target-types]
 
 Available options:
         --project <PROJECT>  Path to directory with project, or to a JSON file (defaults to `.`)
         --to <TO>            Path to a directory where to dump wa.build_info
         --buck-query         Include the buck uquery results in the output
+        --target-types       Dump a list of targets and their types
     -h, --help               Prints help information

From de65b598b841c07adb3d25fa4466929486abf072 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 28 Oct 2025 04:00:34 -0700
Subject: [PATCH 216/394] 7/n: buck targets: Add buck quick query to config
 options

Summary:
Add an item to the config to enable/disable the buck quick query.

It is not used yet, that happens later in the stack

Reviewed By: robertoaloi

Differential Revision: D83662866

fbshipit-source-id: f2a04e9b73b47ae23f02edcb063d31a4a01d3974
---
 crates/elp/src/config.rs                           | 13 ++++++++++++-
 crates/elp/src/resources/test/config_stanza.stdout |  5 +++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/crates/elp/src/config.rs b/crates/elp/src/config.rs
index 432382a0c0..848fcd5959 100644
--- a/crates/elp/src/config.rs
+++ b/crates/elp/src/config.rs
@@ -42,6 +42,8 @@ use crate::from_json;
 // `new_name | `old_name` so that we keep parsing the old name.
 config_data! {
   struct ConfigData {
+      /// Whether to use the expermintal `buck2 targets` quick start process.
+      buck_quickStart: bool = json! { false },
       /// Whether to show experimental ELP diagnostics that might
       /// have more false positives than usual.
       diagnostics_enableExperimental: bool = json! { false },
@@ -379,6 +381,10 @@ impl Config {
         try_or!(self.caps.window.as_ref()?.work_done_progress?, false)
     }
 
+    pub fn set_buck_quick_start(&mut self, value: bool) {
+        self.data.buck_quickStart = value;
+    }
+
     pub fn buck_query(&self) -> BuckQueryConfig {
         BuckQueryConfig::BuildGeneratedCode
     }
@@ -604,10 +610,15 @@ mod tests {
 
         let s = remove_ws(&schema);
 
-        expect![[r#""elp.diagnostics.disabled":{"default":[],"items":{"type":"string"},"markdownDescription":"ListofELPdiagnosticstodisable.","type":"array","uniqueItems":true},"elp.diagnostics.enableExperimental":{"default":false,"markdownDescription":"WhethertoshowexperimentalELPdiagnosticsthatmight\nhavemorefalsepositivesthanusual.","type":"boolean"},"elp.diagnostics.enableOtp":{"default":false,"markdownDescription":"WhethertoreportdiagnosticsforOTPfiles.","type":"boolean"},"elp.diagnostics.onSave.enable":{"default":false,"markdownDescription":"Updatenativediagnosticsonlywhenthefileissaved.","type":"boolean"},"elp.edoc.enable":{"default":false,"markdownDescription":"WhethertoreportEDocdiagnostics.","type":"boolean"},"elp.eqwalizer.all":{"default":false,"markdownDescription":"WhethertoreportEqwalizerdiagnosticsforthewholeprojectandnotonlyforopenedfiles.","type":"boolean"},"elp.eqwalizer.chunkSize":{"default":100,"markdownDescription":"Chunksizetouseforproject-wideeqwalization.","minimum":0,"type":"integer"},"elp.eqwalizer.maxTasks":{"default":32,"markdownDescription":"Maximumnumberoftaskstoruninparallelforproject-wideeqwalization.","minimum":0,"type":"integer"},"elp.highlightDynamic.enable":{"default":false,"markdownDescription":"Ifenabled,highlightvariableswithtype`dynamic()`whenEqwalizerresultsareavailable.","type":"boolean"},"elp.hoverActions.docLinks.enable":{"default":false,"markdownDescription":"WhethertoshowHoverActionsoftype`docs`.Onlyapplieswhen\n`#elp.hoverActions.enable#`isset.","type":"boolean"},"elp.hoverActions.enable":{"default":false,"markdownDescription":"WhethertoshowHoverActions.","type":"boolean"},"elp.inlayHints.parameterHints.enable":{"default":true,"markdownDescription":"Whethertoshowfunctionparameternameinlayhintsatthecall\nsite.","type":"boolean"},"elp.lens.buck2.mode":{"default":null,"markdownDescription":"Thebuck2modetouseforrunningtestsviathecodelenses.","type":["null","string"]},"elp.lens.debug.enable":{"default":false,"markdownDescription":"Whethertoshowthe`Debug`lenses.Onlyapplieswhen\n`#elp.lens.enable#`isset.","type":"boolean"},"elp.lens.enable":{"default":false,"markdownDescription":"WhethertoshowCodeLensesinErlangfiles.","type":"boolean"},"elp.lens.links.enable":{"default":false,"markdownDescription":"Whethertoshowthe`Link`lenses.Onlyapplieswhen\n`#elp.lens.enable#`isset.","type":"boolean"},"elp.lens.logview.links":{"default":false,"markdownDescription":"WhethertoenableLogViewlenslinks.","type":"boolean"},"elp.lens.run.coverage.enable":{"default":true,"markdownDescription":"Displaycodecoverageinformationwhenrunningtestsviathe\nCodeLenses.Onlyapplieswhen`#elp.lens.enabled`and\n`#elp.lens.run.enable#`areset.","type":"boolean"},"elp.lens.run.enable":{"default":false,"markdownDescription":"Whethertoshowthe`Run`lenses.Onlyapplieswhen\n`#elp.lens.enable#`isset.","type":"boolean"},"elp.lens.run.interactive.enable":{"default":false,"markdownDescription":"Whethertoshowthe`RunInteractive`lenses.Onlyapplieswhen\n`#elp.lens.enable#`isset.","type":"boolean"},"elp.lens.scuba.links":{"default":false,"markdownDescription":"WhethertoenableScubalenslinks.","type":"boolean"},"elp.lens.wam.links":{"default":false,"markdownDescription":"WhethertoenableWAMlenslinks.","type":"boolean"},"elp.log":{"default":"error","markdownDescription":"ConfigureLSP-basedloggingusingenv_loggersyntax.","type":"string"},"elp.signatureHelp.enable":{"default":true,"markdownDescription":"WhethertoshowSignatureHelp.","type":"boolean"},"elp.typesOnHover.enable":{"default":false,"markdownDescription":"Displaytypeswhenhoveringoverexpressions.","type":"boolean"},"#]]
+        expect![[r#""elp.buck.quickStart":{"default":false,"markdownDescription":"Whethertousetheexpermintal`buck2targets`quickstartprocess.","type":"boolean"},"elp.diagnostics.disabled":{"default":[],"items":{"type":"string"},"markdownDescription":"ListofELPdiagnosticstodisable.","type":"array","uniqueItems":true},"elp.diagnostics.enableExperimental":{"default":false,"markdownDescription":"WhethertoshowexperimentalELPdiagnosticsthatmight\nhavemorefalsepositivesthanusual.","type":"boolean"},"elp.diagnostics.enableOtp":{"default":false,"markdownDescription":"WhethertoreportdiagnosticsforOTPfiles.","type":"boolean"},"elp.diagnostics.onSave.enable":{"default":false,"markdownDescription":"Updatenativediagnosticsonlywhenthefileissaved.","type":"boolean"},"elp.edoc.enable":{"default":false,"markdownDescription":"WhethertoreportEDocdiagnostics.","type":"boolean"},"elp.eqwalizer.all":{"default":false,"markdownDescription":"WhethertoreportEqwalizerdiagnosticsforthewholeprojectandnotonlyforopenedfiles.","type":"boolean"},"elp.eqwalizer.chunkSize":{"default":100,"markdownDescription":"Chunksizetouseforproject-wideeqwalization.","minimum":0,"type":"integer"},"elp.eqwalizer.maxTasks":{"default":32,"markdownDescription":"Maximumnumberoftaskstoruninparallelforproject-wideeqwalization.","minimum":0,"type":"integer"},"elp.highlightDynamic.enable":{"default":false,"markdownDescription":"Ifenabled,highlightvariableswithtype`dynamic()`whenEqwalizerresultsareavailable.","type":"boolean"},"elp.hoverActions.docLinks.enable":{"default":false,"markdownDescription":"WhethertoshowHoverActionsoftype`docs`.Onlyapplieswhen\n`#elp.hoverActions.enable#`isset.","type":"boolean"},"elp.hoverActions.enable":{"default":false,"markdownDescription":"WhethertoshowHoverActions.","type":"boolean"},"elp.inlayHints.parameterHints.enable":{"default":true,"markdownDescription":"Whethertoshowfunctionparameternameinlayhintsatthecall\nsite.","type":"boolean"},"elp.lens.buck2.mode":{"default":null,"markdownDescription":"Thebuck2modetouseforrunningtestsviathecodelenses.","type":["null","string"]},"elp.lens.debug.enable":{"default":false,"markdownDescription":"Whethertoshowthe`Debug`lenses.Onlyapplieswhen\n`#elp.lens.enable#`isset.","type":"boolean"},"elp.lens.enable":{"default":false,"markdownDescription":"WhethertoshowCodeLensesinErlangfiles.","type":"boolean"},"elp.lens.links.enable":{"default":false,"markdownDescription":"Whethertoshowthe`Link`lenses.Onlyapplieswhen\n`#elp.lens.enable#`isset.","type":"boolean"},"elp.lens.logview.links":{"default":false,"markdownDescription":"WhethertoenableLogViewlenslinks.","type":"boolean"},"elp.lens.run.coverage.enable":{"default":true,"markdownDescription":"Displaycodecoverageinformationwhenrunningtestsviathe\nCodeLenses.Onlyapplieswhen`#elp.lens.enabled`and\n`#elp.lens.run.enable#`areset.","type":"boolean"},"elp.lens.run.enable":{"default":false,"markdownDescription":"Whethertoshowthe`Run`lenses.Onlyapplieswhen\n`#elp.lens.enable#`isset.","type":"boolean"},"elp.lens.run.interactive.enable":{"default":false,"markdownDescription":"Whethertoshowthe`RunInteractive`lenses.Onlyapplieswhen\n`#elp.lens.enable#`isset.","type":"boolean"},"elp.lens.scuba.links":{"default":false,"markdownDescription":"WhethertoenableScubalenslinks.","type":"boolean"},"elp.lens.wam.links":{"default":false,"markdownDescription":"WhethertoenableWAMlenslinks.","type":"boolean"},"elp.log":{"default":"error","markdownDescription":"ConfigureLSP-basedloggingusingenv_loggersyntax.","type":"string"},"elp.signatureHelp.enable":{"default":true,"markdownDescription":"WhethertoshowSignatureHelp.","type":"boolean"},"elp.typesOnHover.enable":{"default":false,"markdownDescription":"Displaytypeswhenhoveringoverexpressions.","type":"boolean"},"#]]
         .assert_eq(s.as_str());
 
         expect![[r#"
+            "elp.buck.quickStart": {
+              "default": false,
+              "markdownDescription": "Whether to use the expermintal `buck2 targets` quick start process.",
+              "type": "boolean"
+            },
             "elp.diagnostics.disabled": {
               "default": [],
               "items": {
diff --git a/crates/elp/src/resources/test/config_stanza.stdout b/crates/elp/src/resources/test/config_stanza.stdout
index bdd5c8b487..02e3da475a 100644
--- a/crates/elp/src/resources/test/config_stanza.stdout
+++ b/crates/elp/src/resources/test/config_stanza.stdout
@@ -1,4 +1,9 @@
 {
+  "elp.buck.quickStart": {
+    "default": false,
+    "markdownDescription": "Whether to use the expermintal `buck2 targets` quick start process.",
+    "type": "boolean"
+  },
   "elp.diagnostics.disabled": {
     "default": [],
     "items": {

From 93317ca5db5f9fbfb93c46f73e83bc2591237e16 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 28 Oct 2025 04:00:34 -0700
Subject: [PATCH 217/394] 8/n: buck targets: Integrate into server mode

Summary:
This diff stack is about improving the initial IDE start experience when using a buck project that uses buck rules to generate some files, and for which that step takes a long time.

It does so by initially using a much faster buck command that does not do any code generation, but does expand all buck macros, `buck targets`.  Based on this result, configures the ELP project model and goes operational with the given project file set.

While loading these files, it also does the normal full `elp.bxl` query to generate the additional required files.  Once this is done, the project and its files are reloaded. This is basically a no-op except for adding in the newly generated files.

## This diff

This diff makes the changes to ELP in server mode to enact the process outlined above.

Reviewed By: robertoaloi

Differential Revision: D84343272

fbshipit-source-id: 8944767241f6f2ecb6c076e8c11a1a8c80057570
---
 crates/elp/src/config.rs         | 10 +++-
 crates/elp/src/project_loader.rs | 88 ++++++++++++++++++++++++++++++--
 crates/elp/src/server.rs         | 75 +++++++++++++++++++++------
 3 files changed, 151 insertions(+), 22 deletions(-)

diff --git a/crates/elp/src/config.rs b/crates/elp/src/config.rs
index 848fcd5959..2637eae5a2 100644
--- a/crates/elp/src/config.rs
+++ b/crates/elp/src/config.rs
@@ -385,8 +385,16 @@ impl Config {
         self.data.buck_quickStart = value;
     }
 
+    pub fn buck_quick_start(&self) -> bool {
+        self.data.buck_quickStart
+    }
+
     pub fn buck_query(&self) -> BuckQueryConfig {
-        BuckQueryConfig::BuildGeneratedCode
+        if self.buck_quick_start() {
+            BuckQueryConfig::BuckTargetsOnly
+        } else {
+            BuckQueryConfig::BuildGeneratedCode
+        }
     }
 
     pub fn set_eqwalizer_all(&mut self, value: bool) {
diff --git a/crates/elp/src/project_loader.rs b/crates/elp/src/project_loader.rs
index f092e26242..d2c76cd270 100644
--- a/crates/elp/src/project_loader.rs
+++ b/crates/elp/src/project_loader.rs
@@ -18,6 +18,7 @@ use elp_log::telemetry;
 use elp_project_model::ElpConfig;
 use elp_project_model::IncludeParentDirs;
 use elp_project_model::ProjectManifest;
+use elp_project_model::buck::BuckQueryConfig;
 use elp_project_model::otp::Otp;
 use fxhash::FxHashMap;
 use fxhash::FxHashSet;
@@ -121,12 +122,33 @@ impl ProjectLoader {
     }
 }
 
+/// If using buck quick start, it happens in two stages, first to
+/// get the basic project config, then to invoke the generation of
+/// any artifacts that will become part of the project.
+#[derive(Debug, PartialEq, Eq)]
+pub enum BuckGenerated {
+    /// Initial value
+    NoLoadDone,
+    /// After first load (buck targets)
+    NoGenerated,
+    /// After second load (elp.bxl)
+    Generated,
+}
+
 pub struct ReloadManager {
+    /// Files that have changed since the last reload.
     changed_files: FxHashSet<AbsPathBuf>,
+    /// This field is updated when a `changed_files` file is added.
+    /// It allows us to wait until the last file has been added
+    /// when a branch switch is done to avoid doing a reload for each.
+    /// We wait until RELOAD_QUIESCENT_WAIT_TIME has elapsed before doing
+    /// the reload.
     last_change: SystemTime,
     /// ReloadManager clients should ensure this is set when a reload
     /// task is active, reset when done.
     reload_in_progress: bool,
+    buck_generated: BuckGenerated,
+    buck_quick_start: bool,
 }
 
 /// How long to wait after the last changed file was added before
@@ -134,24 +156,76 @@ pub struct ReloadManager {
 const RELOAD_QUIESCENT_WAIT_TIME: Duration = Duration::from_millis(500);
 
 impl ReloadManager {
-    pub fn new() -> ReloadManager {
+    pub fn new(buck_quick_start: bool) -> ReloadManager {
         ReloadManager {
             changed_files: FxHashSet::default(),
             last_change: SystemTime::now(),
             reload_in_progress: false,
+            buck_generated: BuckGenerated::NoLoadDone,
+            buck_quick_start,
         }
     }
 
     /// Used to check if any files are queued, and if so cancel an
     /// existing reload
-    pub fn has_changed_files(&self) -> bool {
-        !self.changed_files.is_empty()
+    pub fn ok_to_switch_workspace(&self) -> bool {
+        if self.buck_quick_start {
+            // `BuckGenerated::NoLoadDone` or `BuckGenerated::NoGenerated`.
+
+            if self.buck_generated == BuckGenerated::NoLoadDone {
+                // We are doing a 2-stage load, and have just completed the `buck targets` step.
+                // So time to activate the Project, this is the whole point of the two stage process
+                true
+            } else {
+                self.changed_files.is_empty()
+            }
+        } else {
+            // Do not switch if there are files which will trigger a reload.
+            // This lets us start that process sooner without wasted effort
+            // switching when it is going to change anyway.
+            self.changed_files.is_empty()
+        }
     }
 
-    pub fn set_reload_active(&mut self) {
+    pub fn set_reload_active(&mut self) -> BuckQueryConfig {
         self.reload_in_progress = true;
+        self.get_query_config()
     }
-    pub fn set_reload_done(&mut self) {
+
+    fn get_query_config(&self) -> BuckQueryConfig {
+        if self.buck_quick_start {
+            match self.buck_generated {
+                BuckGenerated::NoLoadDone => BuckQueryConfig::BuckTargetsOnly,
+                BuckGenerated::NoGenerated => BuckQueryConfig::BuildGeneratedCode,
+                BuckGenerated::Generated => BuckQueryConfig::BuildGeneratedCode,
+            }
+        } else {
+            BuckQueryConfig::BuildGeneratedCode
+        }
+    }
+
+    /// This is called when the `Task::FetchProject` is done in `server.rs`,
+    /// but only after `switch_workspace_ok` has returned true.
+    pub fn set_reload_done(&mut self, a_file_per_project: FxHashSet<AbsPathBuf>) {
+        if self.buck_quick_start {
+            match &self.buck_generated {
+                BuckGenerated::NoLoadDone => {
+                    if self.changed_files.is_empty() && !a_file_per_project.is_empty() {
+                        // We have done the initial "buck targets" query on at least one Project,
+                        // move on to doing `elp.bxl`
+                        self.buck_generated = BuckGenerated::NoGenerated;
+                        self.changed_files = a_file_per_project;
+                    } else {
+                        // We already have changed files from another source, so
+                        // need to repeat this step. Do not change state.
+                    }
+                }
+                BuckGenerated::NoGenerated => {
+                    self.buck_generated = BuckGenerated::Generated;
+                }
+                BuckGenerated::Generated => {}
+            };
+        }
         self.reload_in_progress = false;
     }
 
@@ -181,4 +255,8 @@ impl ReloadManager {
             self.last_change = SystemTime::now();
         }
     }
+
+    pub fn set_buck_quickstart(&mut self, buck_quick_start: bool) {
+        self.buck_quick_start = buck_quick_start;
+    }
 }
diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index acdc62585b..13b7255f13 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -62,6 +62,7 @@ use elp_log::timeit;
 use elp_log::timeit_exceeds;
 use elp_project_model::ElpConfig;
 use elp_project_model::Project;
+use elp_project_model::ProjectBuildData;
 use elp_project_model::ProjectManifest;
 use elp_project_model::buck::BuckQueryConfig;
 use elp_project_model::buck::BuckQueryError;
@@ -350,7 +351,7 @@ impl Server {
             projects: Arc::new(vec![]),
             project_loader: Arc::new(Mutex::new(ProjectLoader::new())),
             initial_load_status: InitialLoading::Initial,
-            reload_manager: Arc::new(Mutex::new(ReloadManager::new())),
+            reload_manager: Arc::new(Mutex::new(ReloadManager::new(config.buck_quick_start()))),
             dynamic_registrations_done: false,
             unresolved_app_id_paths: Arc::new(FxHashMap::default()),
             generated_app_inputs: Arc::new(FxHashMap::default()),
@@ -499,9 +500,16 @@ impl Server {
             Event::Task(task) => match task {
                 Task::Response(response) => self.send_response(response),
                 Task::FetchProject(spinner, projects) => {
-                    self.fetch_project_completed(&spinner, projects)?;
+                    let mut a_file_per_project = extract_dirs_for_buck_projects(&projects);
+                    if !self.fetch_project_completed(&spinner, projects)? {
+                        // We already have changed files, will restart loading.
+                        // So no point heading to generate targets yet
+                        a_file_per_project = FxHashSet::default();
+                    }
                     spinner.end();
-                    self.reload_manager.lock().set_reload_done();
+                    self.reload_manager
+                        .lock()
+                        .set_reload_done(a_file_per_project);
                 }
                 Task::NativeDiagnostics(diags) => self.native_diagnostics_completed(diags),
                 Task::EqwalizerDiagnostics(spinner, diags_types) => {
@@ -550,8 +558,8 @@ impl Server {
 
         let to_reload = self.reload_manager.lock().query_changed_files();
         if let Some(to_reload) = to_reload {
-            self.reload_manager.lock().set_reload_active();
-            self.reload_project(to_reload);
+            let query_config = self.reload_manager.lock().set_reload_active();
+            self.reload_project(to_reload, query_config);
         }
 
         let (changed, highest_file_id) = self.process_changes_to_vfs_store();
@@ -959,9 +967,14 @@ impl Server {
         always!(config_version <= self.vfs_config_version);
         match progress {
             LoadingProgress::Started => {
+                let pb_message = if self.status != Status::Running {
+                    "Loading source files"
+                } else {
+                    "Reloading source files"
+                };
                 let pb = self
                     .progress
-                    .begin_bar_with_telemetry("Loading source files".into(), Some(n_total));
+                    .begin_bar_with_telemetry(pb_message.into(), Some(n_total));
                 self.transition(Status::Loading(pb));
             }
             LoadingProgress::Progress(n_done) => {
@@ -1431,6 +1444,7 @@ impl Server {
             watch: vec![],
             version: 0,
         };
+        spinner.report("Starting file loader".to_string());
         self.vfs_loader.handle.set_config(vfs_loader_config);
 
         self.projects = Arc::new(projects);
@@ -1487,12 +1501,18 @@ impl Server {
 
     fn update_configuration(&mut self, config: Config) {
         let _p = tracing::info_span!("Server::update_configuration").entered();
-        let _old_config = mem::replace(&mut self.config, Arc::new(config));
+        let old_config = mem::replace(&mut self.config, Arc::new(config));
 
         self.logger
             .reconfigure(LOGGER_NAME, self.config.log_filter());
         self.logger.reconfigure("default", self.config.log_filter());
 
+        if old_config.buck_quick_start() != self.config.buck_quick_start() {
+            self.reload_manager
+                .lock()
+                .set_buck_quickstart(self.config.buck_quick_start());
+        }
+
         // Read the lint config file
         let loader = self.project_loader.clone();
         let loader = loader.lock();
@@ -1641,14 +1661,15 @@ impl Server {
             .register(request.id.clone(), (request.method.clone(), received_timer))
     }
 
-    fn reload_project(&mut self, paths: FxHashSet<AbsPathBuf>) {
+    fn reload_project(&mut self, paths: FxHashSet<AbsPathBuf>, query_config: BuckQueryConfig) {
         if !paths.is_empty() {
             let loader = self.project_loader.clone();
-            let query_config = self.config.buck_query();
             let paths = self.resolve_generated_project_paths(paths);
-            let spinner = self
-                .progress
-                .begin_spinner_with_telemetry("ELP reloading project config".to_string());
+            let spinner_message = match query_config {
+                BuckQueryConfig::BuildGeneratedCode => "ELP generating projects".to_string(),
+                _ => "ELP reloading projects".to_string(),
+            };
+            let spinner = self.progress.begin_spinner_with_telemetry(spinner_message);
             self.project_pool.handle.spawn_with_sender({
                 move |sender| {
                     let mut loader = loader.lock();
@@ -1819,12 +1840,17 @@ impl Server {
         })
     }
 
-    fn fetch_project_completed(&mut self, spinner: &Spinner, projects: Vec<Project>) -> Result<()> {
-        if self.reload_manager.lock().has_changed_files() {
+    fn fetch_project_completed(
+        &mut self,
+        spinner: &Spinner,
+        projects: Vec<Project>,
+    ) -> Result<bool> {
+        if !self.reload_manager.lock().ok_to_switch_workspace() {
             // There are other changed files, abort this reload, to
             // allow the next one.
-            return Ok(());
+            return Ok(false);
         }
+        spinner.report("Switching to loaded projects".to_string());
         if let Err(err) = self.switch_workspaces(spinner, projects) {
             let params = lsp_types::ShowMessageParams {
                 typ: lsp_types::MessageType::ERROR,
@@ -1837,7 +1863,7 @@ impl Server {
             self.register_dynamic_now_operational();
             self.dynamic_registrations_done = true;
         }
-        Ok(())
+        Ok(true)
     }
 
     fn register_dynamic_now_operational(&mut self) {
@@ -2077,6 +2103,23 @@ impl Server {
     }
 }
 
+/// For each buck project, extract a directory inside it, for possible
+/// project reloading to generate targets
+fn extract_dirs_for_buck_projects(projects: &[Project]) -> FxHashSet<AbsPathBuf> {
+    let files: FxHashSet<AbsPathBuf> = projects
+        .iter()
+        .filter_map(|p| {
+            if let ProjectBuildData::Buck(_) = &p.project_build_data {
+                // We just need a single path inside the project somewhere
+                Some(p.project_apps.first()?.dir.clone())
+            } else {
+                None
+            }
+        })
+        .collect();
+    files
+}
+
 fn lsp_msg_for_context(message: &lsp_server::Message) -> String {
     match message {
         lsp_server::Message::Request(m) => m.method.clone(),

From dfa958a8ab7b2d7e9f28e500ca6c468429672bcb Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 28 Oct 2025 04:00:34 -0700
Subject: [PATCH 218/394] 9/n: buck targets: report ELP restarts too in
 telemetry

Summary:
We can now specifiy a `buck_quick_start` config item and have ELP in server mode start up using a 2-step process, first doing a quick `buck targets` query and then the full `elp.bxl` one that includes generating some files, and is slower.

In order to understand the impact of these, we update the existing telemetry that reports the time from the server main loop starting to going operational (able to process client requests).

We now report as follows

- `buck_quick_start` not enabled
Normal operational telemetry using title "ELP operational"
- `buck_quick_start` enabled
"ELP operational (quick start)" for the first load
"ELP operational (full)" for the second

Both of these report the time from the initial main loop startup.

Reviewed By: robertoaloi

Differential Revision: D84343885

fbshipit-source-id: 1883fcdeabf1ba0cccb248d81a0b10fc6b6befb8
---
 crates/elp/src/server.rs                   |  3 +-
 crates/elp/src/server/telemetry_manager.rs | 74 ++++++++++++++--------
 2 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index 13b7255f13..8f1f2d175b 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -991,7 +991,8 @@ impl Server {
                     self.show_message(params);
                 }
                 self.transition(Status::Running);
-                self.telemetry_manager.operational();
+                self.telemetry_manager
+                    .operational(self.config.buck_quick_start());
                 self.initial_load_status = InitialLoading::DoneButVfsChanges;
                 self.schedule_compile_deps();
                 self.schedule_cache();
diff --git a/crates/elp/src/server/telemetry_manager.rs b/crates/elp/src/server/telemetry_manager.rs
index b1cb2d3ac9..787fb85332 100644
--- a/crates/elp/src/server/telemetry_manager.rs
+++ b/crates/elp/src/server/telemetry_manager.rs
@@ -26,17 +26,23 @@ use crate::memory_usage::MemoryUsage;
 
 const PERIODIC_INTERVAL_MS: Duration = Duration::from_millis(60_000);
 
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+enum OperationalState {
+    NotStarted,
+    Started,
+    Restarted,
+}
 pub(crate) struct TelemetryManager {
     last_periodic_processed: Instant,
     server_started_at: SystemTime,
-    already_operational: bool,
+    operational_state: OperationalState,
 }
 impl TelemetryManager {
     pub(crate) fn new() -> Self {
         Self {
             last_periodic_processed: Instant::now(),
             server_started_at: SystemTime::now(),
-            already_operational: false,
+            operational_state: OperationalState::NotStarted,
         }
     }
 
@@ -70,32 +76,48 @@ impl TelemetryManager {
         }
     }
 
-    pub(crate) fn operational(&mut self) {
-        if !self.already_operational {
-            let duration = self
-                .server_started_at
-                .elapsed()
-                .map(|e| e.as_millis())
-                .unwrap_or(0) as u32;
-
-            #[derive(Serialize)]
-            struct Operational {
-                title: String,
+    pub(crate) fn operational(&mut self, buck_quick_start: bool) {
+        let title = if buck_quick_start {
+            match self.operational_state {
+                OperationalState::NotStarted => "ELP operational (quick start)",
+                OperationalState::Started => "ELP operational (fully)",
+                OperationalState::Restarted => return,
             }
-            let data = Operational {
-                title: "ELP operational".to_string(),
-            };
-            let data = serde_json::to_value(data).unwrap_or_else(|err| {
-                serde_json::Value::String(format!("JSON serialization failed: {err}"))
-            });
-            telemetry::send_with_duration(
-                String::from("telemetry"),
-                data,
-                duration,
-                self.server_started_at,
-            );
-            self.already_operational = true;
+        } else {
+            match self.operational_state {
+                OperationalState::NotStarted => "ELP operational",
+                OperationalState::Started => return,
+                OperationalState::Restarted => return,
+            }
+        };
+
+        let duration = self
+            .server_started_at
+            .elapsed()
+            .map(|e| e.as_millis())
+            .unwrap_or(0) as u32;
+
+        #[derive(Serialize)]
+        struct Operational {
+            title: String,
         }
+        let data = Operational {
+            title: title.to_string(),
+        };
+        let data = serde_json::to_value(data).unwrap_or_else(|err| {
+            serde_json::Value::String(format!("JSON serialization failed: {err}"))
+        });
+        telemetry::send_with_duration(
+            String::from("telemetry"),
+            data,
+            duration,
+            self.server_started_at,
+        );
+        self.operational_state = if self.operational_state == OperationalState::NotStarted {
+            OperationalState::Started
+        } else {
+            OperationalState::Restarted
+        };
     }
 }
 

From 46477eeef56b9fa825aa7670262893482ee62f9a Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 28 Oct 2025 05:57:25 -0700
Subject: [PATCH 219/394] Tweak telemetry manager test to not be flaky

Summary:
The `test_lifecycle` test is intended to confirm that we do get multiple segments.

On a lightly loaded machine, the timing should be zero. This is not always the case, so to avoid flakiness we manually zero out the timing, so the essence of the test is not flaky

Reviewed By: jcpetruzza

Differential Revision: D85661410

fbshipit-source-id: b7d1130929692360a1284c78787f89f4e537cd88
---
 crates/elp/src/server/telemetry_manager.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/crates/elp/src/server/telemetry_manager.rs b/crates/elp/src/server/telemetry_manager.rs
index 787fb85332..5d4293d5ec 100644
--- a/crates/elp/src/server/telemetry_manager.rs
+++ b/crates/elp/src/server/telemetry_manager.rs
@@ -278,12 +278,14 @@ mod test {
             // Control lock scope by having it in braces
             let mut telemetry = TEST_TELEMETRY.lock();
             telemetry.next_segment(token.clone(), None);
-            let new = telemetry.active.get(&token).unwrap();
+            let new = telemetry.active.get_mut(&token).unwrap();
             assert_ne!(orig.segment_start_time, new.segment_start_time);
             assert_eq!(orig.start_time, new.start_time);
+            // We sometimes run on a rollover boundary, set the value to zero to avoid flakiness
+            for seg in &mut new.segments {
+                seg.1 = 0;
+            }
             let expected = format!("{:#?}\n", &new.segments);
-            // We sometimes run on a rollover boundary
-            let expected = expected.replace("1", "0");
             expect![[r#"
                 [
                     (

From fec1192e9d4cd5fa18fd9c680f71e7225576eab8 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 28 Oct 2025 07:48:10 -0700
Subject: [PATCH 220/394] Add `elp ssr` command

Summary:
We have the ability to specifiy an AdHoc diagnostic in a config file, from the diff titled `[ELP] Specify SSR match as Ad-Hoc diagnostic`.

We now simplify usage by allowing it to be given on the command line too, so a simple

```
elp ssr "{_A, _B}"
```

will find and report all 2 element tuples in the project.

Note: the full syntax for ssr can also be used if guards are required, e.g.

```
elp ssr "ssr: {_X = _Y} when _X == foo."
```

Reviewed By: michalmuskala

Differential Revision: D85443930

fbshipit-source-id: 108e2a583437fb3a6e702c21aef874395b376e7b
---
 crates/elp/src/bin/args.rs                    |  52 ++++++++
 crates/elp/src/bin/lint_cli.rs                |   3 +-
 crates/elp/src/bin/main.rs                    |  46 +++++++
 crates/elp/src/bin/ssr_cli.rs                 | 121 ++++++++++++++++++
 crates/elp/src/resources/test/help.stdout     |   1 +
 .../linter/ssr_ad_hoc_cli_parse_error.stdout  |   1 +
 .../test/linter/ssr_as_cli_arg.stdout         |   3 +
 crates/elp/src/resources/test/ssr_help.stdout |  17 +++
 crates/ide/src/lib.rs                         |  10 ++
 9 files changed, 253 insertions(+), 1 deletion(-)
 create mode 100644 crates/elp/src/bin/ssr_cli.rs
 create mode 100644 crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parse_error.stdout
 create mode 100644 crates/elp/src/resources/test/linter/ssr_as_cli_arg.stdout
 create mode 100644 crates/elp/src/resources/test/ssr_help.stdout

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index 7ea99c0da6..867f073cfa 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -332,6 +332,50 @@ pub struct Lint {
     pub ignore_apps: Vec<String>,
 }
 
+#[derive(Clone, Debug, Bpaf)]
+pub struct Ssr {
+    /// Path to directory with project, or to a JSON file (defaults to `.`)
+    #[bpaf(argument("PROJECT"), fallback(PathBuf::from(".")))]
+    pub project: PathBuf,
+    /// Parse a single module from the project, not the entire project.
+    #[bpaf(argument("MODULE"))]
+    pub module: Option<String>,
+    /// Parse a single application from the project, not the entire project.
+    #[bpaf(long("app"), long("application"), argument("APP"))]
+    pub app: Option<String>,
+    /// Parse a single file from the project, not the entire project. This can be an include file or escript, etc.
+    #[bpaf(argument("FILE"))]
+    pub file: Option<String>,
+
+    /// Run with rebar
+    pub rebar: bool,
+    /// Rebar3 profile to pickup (default is test)
+    #[bpaf(long("as"), argument("PROFILE"), fallback("test".to_string()))]
+    pub profile: String,
+
+    /// Also generate diagnostics for generated files
+    pub include_generated: bool,
+    /// Also generate diagnostics for test files
+    pub include_tests: bool,
+
+    /// Show diagnostics in JSON format
+    #[bpaf(
+        argument("FORMAT"),
+        complete(format_completer),
+        fallback(None),
+        guard(format_guard, "Please use json")
+    )]
+    pub format: Option<String>,
+
+    /// Report system memory usage and other statistics
+    #[bpaf(long("report-system-stats"))]
+    pub report_system_stats: bool,
+
+    /// SSR spec to use
+    #[bpaf(positional("SSR_SPEC"))]
+    pub ssr_spec: String,
+}
+
 #[derive(Clone, Debug, Bpaf)]
 pub struct Explain {
     /// Error code to explain
@@ -397,6 +441,7 @@ pub enum Command {
     GenerateCompletions(GenerateCompletions),
     RunServer(RunServer),
     Lint(Lint),
+    Ssr(Ssr),
     Version(Version),
     Shell(Shell),
     Explain(Explain),
@@ -507,6 +552,12 @@ pub fn command() -> impl Parser<Command> {
         .command("lint")
         .help("Parse files in project and emit diagnostics, optionally apply fixes.");
 
+    let ssr = ssr()
+        .map(Command::Ssr)
+        .to_options()
+        .command("ssr")
+        .help("Run SSR (Structural Search and Replace) pattern matching on project files.");
+
     let run_server = run_server()
         .map(Command::RunServer)
         .to_options()
@@ -556,6 +607,7 @@ pub fn command() -> impl Parser<Command> {
         eqwalize_target,
         dialyze_all,
         lint,
+        ssr,
         run_server,
         generate_completions,
         parse_all,
diff --git a/crates/elp/src/bin/lint_cli.rs b/crates/elp/src/bin/lint_cli.rs
index dd896b1780..cb28bdb6b7 100644
--- a/crates/elp/src/bin/lint_cli.rs
+++ b/crates/elp/src/bin/lint_cli.rs
@@ -109,7 +109,7 @@ fn get_and_report_diagnostics_config(args: &Lint, cli: &mut dyn Cli) -> Result<D
     Ok(diagnostics_config)
 }
 
-fn load_project(
+pub fn load_project(
     args: &Lint,
     cli: &mut dyn Cli,
     query_config: &BuckQueryConfig,
@@ -396,6 +396,7 @@ fn get_diagnostics_config(args: &Lint) -> Result<DiagnosticsConfig> {
     } else {
         LintConfig::default()
     };
+
     let cfg = DiagnosticsConfig::default()
         .configure_diagnostics(
             &cfg_from_file,
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 2e34447609..85e1e1e5d9 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -43,6 +43,7 @@ mod lint_cli;
 // @fb-only
 mod reporting;
 mod shell;
+mod ssr_cli;
 
 // Use jemalloc as the global allocator
 #[cfg(not(any(target_env = "msvc", target_os = "openbsd")))]
@@ -135,6 +136,7 @@ fn try_main(cli: &mut dyn Cli, args: Args) -> Result<()> {
         args::Command::BuildInfo(args) => build_info_cli::save_build_info(args, &query_config)?,
         args::Command::ProjectInfo(args) => build_info_cli::save_project_info(args, &query_config)?,
         args::Command::Lint(args) => lint_cli::run_lint_command(&args, cli, &query_config)?,
+        args::Command::Ssr(args) => ssr_cli::run_ssr_command(&args, cli, &query_config)?,
         args::Command::GenerateCompletions(args) => {
             let instructions = args::gen_completions(&args.shell);
             writeln!(cli, "#Please run this:\n{instructions}")?
@@ -2000,6 +2002,40 @@ mod tests {
         )
     }
 
+    #[test]
+    fn lint_ssr_as_cli_arg() {
+        simple_snapshot(
+            args_vec!["ssr", "ssr: {_@A, _@B}.",],
+            "linter",
+            expect_file!("../resources/test/linter/ssr_ad_hoc.stdout"),
+            true,
+            None,
+        )
+    }
+
+    #[test]
+    fn lint_ssr_as_cli_arg_without_prefix() {
+        simple_snapshot(
+            args_vec!["ssr", "{_@A, _@B}",],
+            "linter",
+            expect_file!("../resources/test/linter/ssr_ad_hoc.stdout"),
+            true,
+            None,
+        )
+    }
+
+    #[test]
+    fn lint_ssr_as_cli_arg_malformed() {
+        simple_snapshot_expect_stderror(
+            args_vec!["ssr", "ssr: {_@A, = _@B}.",],
+            "linter",
+            expect_file!("../resources/test/linter/ssr_ad_hoc_cli_parse_error.stdout"),
+            true,
+            None,
+            false,
+        )
+    }
+
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
     fn eqwalizer_tests_check(buck: bool) {
@@ -2221,6 +2257,16 @@ mod tests {
         expected.assert_eq(&stdout);
     }
 
+    #[test]
+    fn ssr_help() {
+        let args = args::args()
+            .run_inner(Args::from(&["ssr", "--help"]))
+            .unwrap_err();
+        let expected = expect_file!["../resources/test/ssr_help.stdout"];
+        let stdout = args.unwrap_stdout();
+        expected.assert_eq(&stdout);
+    }
+
     #[test]
     fn build_info_help() {
         let args = args::args()
diff --git a/crates/elp/src/bin/ssr_cli.rs b/crates/elp/src/bin/ssr_cli.rs
new file mode 100644
index 0000000000..467dbada65
--- /dev/null
+++ b/crates/elp/src/bin/ssr_cli.rs
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is dual-licensed under either the MIT license found in the
+ * LICENSE-MIT file in the root directory of this source tree or the Apache
+ * License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+ * of this source tree. You may select, at your option, one of the
+ * above-listed licenses.
+ */
+
+use anyhow::Result;
+use anyhow::bail;
+use elp::cli::Cli;
+use elp_ide::AnalysisHost;
+use elp_ide::diagnostics;
+use elp_ide::diagnostics::DiagnosticsConfig;
+use elp_ide::diagnostics::FallBackToAll;
+use elp_ide::diagnostics::LintConfig;
+use elp_ide::diagnostics::MatchSsr;
+use elp_project_model::buck::BuckQueryConfig;
+
+use crate::args::Ssr;
+use crate::lint_cli;
+
+fn normalize_ssr_pattern(pattern: &str) -> String {
+    if pattern.starts_with("ssr:") {
+        pattern.to_string()
+    } else {
+        format!("ssr: {}.", pattern)
+    }
+}
+
+pub fn run_ssr_command(
+    args: &Ssr,
+    cli: &mut dyn Cli,
+    query_config: &BuckQueryConfig,
+) -> Result<()> {
+    // Normalize the SSR pattern
+    let normalized_pattern = normalize_ssr_pattern(&args.ssr_spec);
+
+    // Validate the SSR pattern early
+    let analysis_host = AnalysisHost::default();
+    let analysis = analysis_host.analysis();
+    match analysis.validate_ssr_pattern(&normalized_pattern) {
+        Ok(Ok(())) => {}
+        Ok(Err(e)) => bail!("invalid SSR pattern '{}': {}", args.ssr_spec, e),
+        Err(_cancelled) => bail!("SSR pattern validation was cancelled"),
+    }
+
+    // Create the lint config with the SSR pattern
+    let mut lint_config = LintConfig::default();
+    let ssr_lint = diagnostics::Lint::LintMatchSsr(MatchSsr {
+        ssr_pattern: normalized_pattern,
+        message: None,
+    });
+    lint_config.ad_hoc_lints.lints.push(ssr_lint);
+
+    // Build the diagnostics config
+    let diagnostics_config = DiagnosticsConfig::default()
+        .configure_diagnostics(
+            &lint_config,
+            &Some("ad-hoc: ssr-match".to_string()),
+            &None,
+            FallBackToAll::Yes,
+        )?
+        .set_include_generated(args.include_generated)
+        .set_experimental(false)
+        .set_use_cli_severity(false);
+
+    if diagnostics_config.enabled.all_enabled() && args.is_format_normal() {
+        writeln!(cli, "Reporting all diagnostics codes")?;
+    }
+
+    // Convert Ssr args to Lint args to reuse lint_cli functionality
+    let lint_args = crate::args::Lint {
+        project: args.project.clone(),
+        module: args.module.clone(),
+        app: args.app.clone(),
+        file: args.file.clone(),
+        rebar: args.rebar,
+        profile: args.profile.clone(),
+        include_generated: args.include_generated,
+        include_tests: args.include_tests,
+        print_diags: true,
+        format: args.format.clone(),
+        prefix: None,
+        include_erlc_diagnostics: false,
+        include_ct_diagnostics: false,
+        include_edoc_diagnostics: false,
+        include_eqwalizer_diagnostics: false,
+        include_suppressed: false,
+        use_cli_severity: false,
+        diagnostic_ignore: None,
+        diagnostic_filter: Some("ad-hoc: ssr-match".to_string()),
+        experimental_diags: false,
+        read_config: false,
+        config_file: None,
+        apply_fix: false,
+        ignore_fix_only: false,
+        in_place: false,
+        to: None,
+        recursive: false,
+        with_check: false,
+        check_eqwalize_all: false,
+        one_shot: false,
+        report_system_stats: args.report_system_stats,
+        ignore_apps: vec![],
+    };
+
+    // Load the project
+    let mut loaded = lint_cli::load_project(&lint_args, cli, query_config)?;
+
+    // Run the codemod with the SSR pattern
+    lint_cli::do_codemod(cli, &mut loaded, &diagnostics_config, &lint_args)
+}
+
+impl Ssr {
+    pub fn is_format_normal(&self) -> bool {
+        self.format.is_none()
+    }
+}
diff --git a/crates/elp/src/resources/test/help.stdout b/crates/elp/src/resources/test/help.stdout
index d384a88220..f1b9803342 100644
--- a/crates/elp/src/resources/test/help.stdout
+++ b/crates/elp/src/resources/test/help.stdout
@@ -16,6 +16,7 @@ Available commands:
     eqwalize-target       Eqwalize all opted-in modules in specified buck target
     dialyze-all           Run Dialyzer on the whole project by shelling out to a `dialyzer-run` tool on the path to do the legwork.
     lint                  Parse files in project and emit diagnostics, optionally apply fixes.
+    ssr                   Run SSR (Structural Search and Replace) pattern matching on project files.
     server                Run lsp server
     generate-completions  Generate shell completions
     parse-all             Dump ast for all files in a project for specified rebar.config file
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parse_error.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parse_error.stdout
new file mode 100644
index 0000000000..7db783fb72
--- /dev/null
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parse_error.stdout
@@ -0,0 +1 @@
+invalid SSR pattern 'ssr: {_@A, = _@B}.': Parse error: Could not lower rule
diff --git a/crates/elp/src/resources/test/linter/ssr_as_cli_arg.stdout b/crates/elp/src/resources/test/linter/ssr_as_cli_arg.stdout
new file mode 100644
index 0000000000..55650830ba
--- /dev/null
+++ b/crates/elp/src/resources/test/linter/ssr_as_cli_arg.stdout
@@ -0,0 +1,3 @@
+Diagnostics reported in 1 modules:
+  app_a: 1
+      15:12-15:17::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
diff --git a/crates/elp/src/resources/test/ssr_help.stdout b/crates/elp/src/resources/test/ssr_help.stdout
new file mode 100644
index 0000000000..36946c6d3c
--- /dev/null
+++ b/crates/elp/src/resources/test/ssr_help.stdout
@@ -0,0 +1,17 @@
+Usage: [--project PROJECT] [--module MODULE] [--app APP] [--file FILE] [--rebar] [--as PROFILE] [--include-generated] [--include-tests] [[--format FORMAT]] [--report-system-stats] <SSR_SPEC>
+
+Available positional items:
+    <SSR_SPEC>  SSR spec to use
+
+Available options:
+        --project <PROJECT>    Path to directory with project, or to a JSON file (defaults to `.`)
+        --module <MODULE>      Parse a single module from the project, not the entire project.
+        --app <APP>            Parse a single application from the project, not the entire project.
+        --file <FILE>          Parse a single file from the project, not the entire project. This can be an include file or escript, etc.
+        --rebar                Run with rebar
+        --as <PROFILE>         Rebar3 profile to pickup (default is test)
+        --include-generated    Also generate diagnostics for generated files
+        --include-tests        Also generate diagnostics for test files
+        --format <FORMAT>      Show diagnostics in JSON format
+        --report-system-stats  Report system memory usage and other statistics
+    -h, --help                 Prints help information
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index 1facbcaedb..dcaff6de70 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -566,6 +566,16 @@ impl Analysis {
         self.with_db(|db| db.is_otp(file_id))
     }
 
+    /// Validates an SSR pattern string by attempting to parse it.
+    /// Returns `Ok(())` if the pattern is valid, or an error message if parsing fails.
+    pub fn validate_ssr_pattern(&self, pattern: &str) -> Cancellable<Result<(), String>> {
+        self.with_db(|db| {
+            elp_ide_ssr::SsrRule::parse_str(db, pattern)
+                .map(|_| ())
+                .map_err(|e| e.to_string())
+        })
+    }
+
     /// Search symbols. Only module names are currently supported.
     pub fn symbol_search(
         &self,

From a269e114195080fe02d97580536c2af3925180aa Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Tue, 28 Oct 2025 09:52:56 -0700
Subject: [PATCH 221/394] Fix CI for OTP 28

Summary: Snapshot `callbacks3_neg` is also OTP version dependent, fix it.

Reviewed By: michalmuskala

Differential Revision: D85675523

fbshipit-source-id: dfabda187190b669ef509c967fe3723de25d2890
---
 ...ks3_neg.pretty => callbacks3_neg-OTP-26.pretty} |  0
 .../check/callbacks3_neg-OTP-27.pretty             | 14 ++++++++++++++
 .../check/callbacks3_neg-OTP-28.pretty             | 14 ++++++++++++++
 .../eqwalizer_tests/check/src/callbacks3_neg.erl   |  2 +-
 4 files changed, 29 insertions(+), 1 deletion(-)
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{callbacks3_neg.pretty => callbacks3_neg-OTP-26.pretty} (100%)
 create mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-27.pretty
 create mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-28.pretty

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-26.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-26.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-27.pretty
new file mode 100644
index 0000000000..63be36e638
--- /dev/null
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-27.pretty
@@ -0,0 +1,14 @@
+error: incorrect_return_type_in_cb_implementation (See https://fb.me/eqwalizer_errors#incorrect_return_type_in_cb_implementation)
+   ┌─ check/src/callbacks3_neg.erl:12:1
+   │
+12 │ -behavior(gen_server).
+   │ ^^^^^^^^^^^^^^^^^^^^^
+   │ │
+   │ Incorrect return type for implementation of gen_server:handle_cast/2. Expected: {'noreply', term()} | {'noreply', term(), timeout() | 'hibernate' | {'continue', term()}} | {'stop', term(), term()}, Got: 'wrong_ret'.
+   │ 
+
+  'wrong_ret' is not compatible with {'noreply', term()} | {'noreply', term(), timeout() | 'hibernate' | {'continue', term()}} | {'stop', term(), term()}
+  because
+  'wrong_ret' is not compatible with {'noreply', term()}
+
+1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-28.pretty
new file mode 100644
index 0000000000..7a8c207891
--- /dev/null
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-28.pretty
@@ -0,0 +1,14 @@
+error: incorrect_return_type_in_cb_implementation (See https://fb.me/eqwalizer_errors#incorrect_return_type_in_cb_implementation)
+   ┌─ check/src/callbacks3_neg.erl:12:1
+   │
+12 │ -behavior(gen_server).
+   │ ^^^^^^^^^^^^^^^^^^^^^
+   │ │
+   │ Incorrect return type for implementation of gen_server:handle_cast/2. Expected: {'noreply', term()} | {'noreply', term(), gen_server:action()} | {'stop', term(), term()}, Got: 'wrong_ret'.
+   │
+
+  'wrong_ret' is not compatible with {'noreply', term()} | {'noreply', term(), gen_server:action()} | {'stop', term(), term()}
+  because
+  'wrong_ret' is not compatible with {'noreply', term()}
+
+1 ERROR
diff --git a/test_projects/eqwalizer_tests/check/src/callbacks3_neg.erl b/test_projects/eqwalizer_tests/check/src/callbacks3_neg.erl
index a8495b8755..8152487669 100644
--- a/test_projects/eqwalizer_tests/check/src/callbacks3_neg.erl
+++ b/test_projects/eqwalizer_tests/check/src/callbacks3_neg.erl
@@ -3,7 +3,7 @@
 %%% This source code is licensed under the Apache 2.0 license found in
 %%% the LICENSE file in the root directory of this source tree.
 
--module(callbacks3_neg).
+-module(callbacks3_neg). % @OTPVersionDependent
 -export([
     init/1,
     handle_call/3,

From ed59eb502ce5c1310e1dc0cde572ba45373dfa3d Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 28 Oct 2025 10:33:30 -0700
Subject: [PATCH 222/394] buck: Applicable files for includes

Summary:
Diff D85429234 titled `[ELP] Fix incorrect project load on go to def in thrift file` checks when a new file is opened in the LSP client if its canonical path is in the list of applicable files for a given project, and of so does not attempt to load a new project for it.

But for historical reasons the list of applicable files did not include `.hrl` ones.  This diff fixes that, together with the change in `elp.bxl` introduced in D85573080 `[buck/prelude] elp.bxl keep full include file name` which returns the actual applicable files rather than just the directory containing them.

Reviewed By: TheGeorge

Differential Revision: D85573144

fbshipit-source-id: da3eb35f1d80e2107ce4ec9eb9585db710aec7ac
---
 crates/project_model/src/buck.rs | 95 ++++++++++++++++----------------
 1 file changed, 49 insertions(+), 46 deletions(-)

diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index fa3be81db2..4555b76b78 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -644,16 +644,20 @@ impl Target {
         }
     }
 
-    fn include_files(&self) -> Vec<AbsPathBuf> {
-        let mut include_files = self.include_files.clone();
+    fn include_dirs(&self) -> Vec<AbsPathBuf> {
+        let mut include_dirs = FxHashSet::from_iter(
+            self.include_files
+                .iter()
+                .map(|path| include_path_from_file(path)),
+        );
         if self.private_header {
             self.src_files.iter().for_each(|path| {
                 if Some("hrl") == path.extension() {
-                    include_files.push(include_path_from_file(path));
+                    include_dirs.insert(include_path_from_file(path));
                 }
             });
         }
-        include_files
+        include_dirs.iter().cloned().collect()
     }
 }
 
@@ -750,49 +754,42 @@ fn make_buck_target(
 ) -> Result<Target> {
     let dir = find_app_root_bxl(root, name, target).expect("could not find app root");
 
-    let (src_files, include_files, target_type, private_header, ebin) =
-        if let Some(ref suite) = target.suite {
-            let src_file = json::canonicalize(buck_path_to_abs_path(root, suite)?)?;
-            let src = vec![src_file.clone()];
-            target_info
-                .path_to_target_name
-                .insert(src_file, name.clone());
-            let mut include_files = vec![];
-            for include in &target.includes {
-                if let Ok(inc) = AbsPathBuf::try_from(include.as_str()) {
-                    include_files.push(inc);
-                }
-            }
-            (src, include_files, TargetType::ErlangTest, false, None)
-        } else {
-            let mut private_header = false;
-            let target_type = compute_target_type(name, target, targets_include_only_prelude);
-            let mut src_files = vec![];
-            for src in &target.srcs {
-                let src = json::canonicalize(buck_path_to_abs_path(root, src).unwrap())?;
-                if Some("hrl") == src.extension() {
-                    private_header = true;
-                }
-                src_files.push(src);
-            }
-            let mut include_files = vec![];
-            for include in &target.includes {
-                let mut inc = buck_path_to_abs_path(root, include).unwrap();
-                if inc.extension().is_some() {
-                    inc.pop();
-                }
-                include_files.push(inc);
+    let (src_files, target_type, private_header, ebin) = if let Some(ref suite) = target.suite {
+        let src_file = json::canonicalize(buck_path_to_abs_path(root, suite)?)?;
+        let src = vec![src_file.clone()];
+        target_info
+            .path_to_target_name
+            .insert(src_file, name.clone());
+        (src, TargetType::ErlangTest, false, None)
+    } else {
+        let mut private_header = false;
+        let target_type = compute_target_type(name, target, targets_include_only_prelude);
+        let mut src_files = vec![];
+        for src in &target.srcs {
+            let src = json::canonicalize(buck_path_to_abs_path(root, src).unwrap())?;
+            if Some("hrl") == src.extension() {
+                private_header = true;
             }
+            src_files.push(src);
+        }
 
-            let ebin = match target_type {
-                TargetType::ThirdParty if build_deps => dep_path
-                    .remove(name)
-                    .map(|dir| dir.join(Utf8PathBuf::from("ebin"))),
-                TargetType::ThirdParty => Some(dir.clone()),
-                _ => None,
-            };
-            (src_files, include_files, target_type, private_header, ebin)
+        let ebin = match target_type {
+            TargetType::ThirdParty if build_deps => dep_path
+                .remove(name)
+                .map(|dir| dir.join(Utf8PathBuf::from("ebin"))),
+            TargetType::ThirdParty => Some(dir.clone()),
+            _ => None,
         };
+        (src_files, target_type, private_header, ebin)
+    };
+    let mut include_files = vec![];
+    for include in &target.includes {
+        if let Ok(inc_abs) = buck_path_to_abs_path(root, include)
+            && let Ok(inc) = json::canonicalize(inc_abs)
+        {
+            include_files.push(inc);
+        }
+    }
     let gen_src_files = target
         .gen_srcs
         .iter()
@@ -1297,14 +1294,20 @@ fn targets_to_project_data_bxl(
             dir: target.dir.clone(),
             ebin: None,
             extra_src_dirs: extra_src_dirs.into_iter().collect(),
-            include_dirs: target.include_files(),
+            include_dirs: target.include_dirs(),
             abs_src_dirs: abs_src_dirs.into_iter().collect(),
             macros,
             parse_transforms: vec![],
             app_type: target.app_type(),
             include_path: vec![],
             gen_src_files: Some(FxHashSet::from_iter(target.gen_src_files.clone())),
-            applicable_files: Some(FxHashSet::from_iter(target.src_files.clone())),
+            applicable_files: Some(FxHashSet::from_iter(
+                target
+                    .src_files
+                    .iter()
+                    .cloned()
+                    .chain(target.include_files.iter().cloned()),
+            )),
             is_test_target: Some(target.target_type == TargetType::ErlangTest),
             is_buck_generated: Some(target.buck_generated),
         };

From 7be8ee44a355a2eead79cda9dcde75e9f8935bb0 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 28 Oct 2025 10:33:30 -0700
Subject: [PATCH 223/394] do not discover projects in buck-out

Summary:
A buck project puts its artefacts into a directory called `buck-out`, with a hash as part of the file name.  When buck is used to generate `.erl` or `.hrl` files, they will end up there.

This means we have no way of knowing what project a given file in `buck-out` belongs to.

When we do load the owning project, it explicitly enumerates all the files belonging to the project in the `applicable_files` part of the `AppData`, and we can then correctly process files in `buck-out`.

The ELP LSP project discovery process starts at the given open file in the IDE, and keeps looking in parent directories until it finds something that identifies an erlang project, such as a `.elp.toml` file.  Even if we have one at the root of the repo, `buck-out` is shared across all projects within the repo, so we do not necessarily know which one the file belongs to.

To prevent loading a fallback project and then not correctly reesolving the file in its correct project when it is opened, we do not initiate project discovery on files withing the `buck-out` directory.

Reviewed By: TD5, TheGeorge

Differential Revision: D85577495

fbshipit-source-id: 58e1ad4ab25e1278493ac4a620119ece6d8971e8
---
 crates/elp/src/server.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index 8f1f2d175b..7a9e3a56a1 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -1808,6 +1808,11 @@ impl Server {
     }
 
     fn fetch_projects_if_needed(&mut self, path: &AbsPath) {
+        // We do not try to load a project for a file that is in the buck-out directory,
+        // as it will have been generated by buck from a file originating in a different directory.
+        if path.to_string().contains("/buck-out/") {
+            return;
+        }
         let path = path.to_path_buf();
         let loader = self.project_loader.clone();
         let query_config = self.config.buck_query();

From 87391f55a07befe856305ce731b7a9052ae057dd Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Tue, 28 Oct 2025 12:47:06 -0700
Subject: [PATCH 224/394] Fix OTP 28 CI

Summary: As title (adding back auto-trimmed whitespace)

Reviewed By: michalmuskala

Differential Revision: D85690173

fbshipit-source-id: 39c3ac7494eb31f778d7bec41c0dd3ed35b06d31
---
 .../test/eqwalizer_tests/check/callbacks3_neg-OTP-28.pretty     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-28.pretty
index 7a8c207891..a24c7a6a48 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-28.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-28.pretty
@@ -5,7 +5,7 @@ error: incorrect_return_type_in_cb_implementation (See https://fb.me/eqwalizer_e
    │ ^^^^^^^^^^^^^^^^^^^^^
    │ │
    │ Incorrect return type for implementation of gen_server:handle_cast/2. Expected: {'noreply', term()} | {'noreply', term(), gen_server:action()} | {'stop', term(), term()}, Got: 'wrong_ret'.
-   │
+   │ 
 
   'wrong_ret' is not compatible with {'noreply', term()} | {'noreply', term(), gen_server:action()} | {'stop', term(), term()}
   because

From aa9a4fc3370410b46fb729e8738a3adc06969d34 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 29 Oct 2025 06:58:19 -0700
Subject: [PATCH 225/394] Add timing telemetry to `elp lint` too

Summary:
We now have the ability to provide telemetry for command line usage of ELP. The initial version did not include for the `elp lint` command.

This diff adds that.

Reviewed By: jcpetruzza

Differential Revision: D85756130

fbshipit-source-id: c52da5864e12290857fc12e05edc097309b94de5
---
 crates/elp/src/bin/lint_cli.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/crates/elp/src/bin/lint_cli.rs b/crates/elp/src/bin/lint_cli.rs
index cb28bdb6b7..4ddf80b5c2 100644
--- a/crates/elp/src/bin/lint_cli.rs
+++ b/crates/elp/src/bin/lint_cli.rs
@@ -16,6 +16,7 @@ use std::path::Path;
 use std::path::PathBuf;
 use std::str;
 use std::sync::Arc;
+use std::time::SystemTime;
 
 use anyhow::Result;
 use anyhow::bail;
@@ -51,6 +52,7 @@ use elp_ide::elp_ide_db::elp_base_db::ProjectId;
 use elp_ide::elp_ide_db::elp_base_db::Vfs;
 use elp_ide::elp_ide_db::elp_base_db::VfsPath;
 use elp_ide::elp_ide_db::source_change::SourceChange;
+use elp_log::telemetry;
 use elp_project_model::AppName;
 use elp_project_model::AppType;
 use elp_project_model::DiscoverConfig;
@@ -75,6 +77,7 @@ pub fn run_lint_command(
     cli: &mut dyn Cli,
     query_config: &BuckQueryConfig,
 ) -> Result<()> {
+    let start_time = SystemTime::now();
     let memory_start = MemoryUsage::now();
 
     if let Some(to) = &args.to {
@@ -86,9 +89,12 @@ pub fn run_lint_command(
     // We load the project after loading config, in case it bails with
     // errors. No point wasting time if the config is wrong.
     let mut loaded = load_project(args, cli, query_config)?;
+    telemetry::report_elapsed_time("lint operational", start_time);
 
     let result = do_codemod(cli, &mut loaded, &diagnostics_config, args);
 
+    telemetry::report_elapsed_time("lint done", start_time);
+
     let memory_end = MemoryUsage::now();
     let memory_used = memory_end - memory_start;
 

From 1c886bd9b751c28d2e8b3406ec67ad910ff4dc28 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 29 Oct 2025 07:37:00 -0700
Subject: [PATCH 226/394] buck: improve target classification for prelude vs
 third-party

Summary:
This diff operated in the context of the buck project model.
Up to now, the buck erlang prelude files had not been updated to be eqwalizer error-free.

They are now fully eqwalized. Part of the internal usage is to tweak both the common test prelude files and our internal source, and so it is convenient to report eqwalizer diagnostics, via `elp eqwalize-all` for these as well.

The buck project model has historically classified the prelude files as third-party, which maps them to a `TargetType::Dep`, and so eqwalizer does not process them.

This diff changes the logic, so that if any of the `.elp.toml` included targets for a project include a buck prelude target, then it will classify all prelude target files as `TargetType::App` instead.

This has the result of ensuring that they are processed for `elp eqwalize-all` of that project.

Reviewed By: jcpetruzza

Differential Revision: D85761256

fbshipit-source-id: 39a8a56870662d8c148f5a646c7ae63a262693a4
---
 crates/project_model/src/buck.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 4555b76b78..064c93de26 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -717,17 +717,17 @@ fn load_buck_targets_bxl(
 
     let mut used_deps = FxHashSet::default();
 
-    let targets_include_only_prelude = buck_config
+    let targets_include_prelude = buck_config
         .included_targets
         .iter()
-        .all(|t| t.starts_with("prelude//"));
+        .any(|t| t.starts_with("prelude//"));
     for (name, buck_target) in &buck_targets {
         if let Ok(target) = make_buck_target(
             root,
             name,
             buck_target,
             buck_config.build_deps,
-            targets_include_only_prelude,
+            targets_include_prelude,
             &mut dep_path,
             &mut target_info,
         ) {
@@ -748,7 +748,7 @@ fn make_buck_target(
     name: &String,
     target: &BuckTarget,
     build_deps: bool,
-    targets_include_only_prelude: bool,
+    targets_include_prelude: bool,
     dep_path: &mut FxHashMap<String, AbsPathBuf>,
     target_info: &mut TargetInfo,
 ) -> Result<Target> {
@@ -763,7 +763,7 @@ fn make_buck_target(
         (src, TargetType::ErlangTest, false, None)
     } else {
         let mut private_header = false;
-        let target_type = compute_target_type(name, target, targets_include_only_prelude);
+        let target_type = compute_target_type(name, target, targets_include_prelude);
         let mut src_files = vec![];
         for src in &target.srcs {
             let src = json::canonicalize(buck_path_to_abs_path(root, src).unwrap())?;
@@ -816,11 +816,11 @@ fn make_buck_target(
 fn compute_target_type(
     name: &TargetFullName,
     target: &BuckTarget,
-    targets_include_only_prelude: bool,
+    targets_include_prelude: bool,
 ) -> TargetType {
     // Check if we are trying to work on the prelude itself
-    let is_prelude_dep = !targets_include_only_prelude && (name.starts_with("prelude//"));
-    if is_prelude_dep || name.contains("//third-party") {
+    let is_prelude_as_third_party = !targets_include_prelude && name.starts_with("prelude//");
+    if is_prelude_as_third_party || name.contains("//third-party") {
         TargetType::ThirdParty
     } else {
         let test_utils = target.labels.contains("test_utils");

From 9d86159962b7c244079bc72ea08362d222011cab Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 29 Oct 2025 08:52:23 -0700
Subject: [PATCH 227/394] Improve the performance of elp ssr

Summary:
The `elp ssr` feature was initially landed as a quick proof of concept.

In paractice, it runs much slower than it should, because it is delegating to the machinery that runs `elp lint`, which does a lot more work than is needed.

This diff makes `elp ssr` a completely standalone command, which only calls the specific diagnostic checker for an ad hoc SSR diagnostic.

Reviewed By: jcpetruzza

Differential Revision: D85760580

fbshipit-source-id: 5bd38f78b08614be99c4a7d4cc69ebed8832fc70
---
 crates/elp/src/bin/args.rs                    |  10 +
 crates/elp/src/bin/main.rs                    |   4 +-
 crates/elp/src/bin/ssr_cli.rs                 | 289 +++++++++++++++---
 .../test/linter/ssr_ad_hoc_cli.stdout         |   3 +
 4 files changed, 261 insertions(+), 45 deletions(-)
 create mode 100644 crates/elp/src/resources/test/linter/ssr_ad_hoc_cli.stdout

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index 867f073cfa..528dbeb5eb 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -783,6 +783,16 @@ impl Lint {
     }
 }
 
+impl Ssr {
+    pub fn is_format_normal(&self) -> bool {
+        self.format.is_none()
+    }
+
+    pub fn is_format_json(&self) -> bool {
+        self.format == Some("json".to_string())
+    }
+}
+
 impl ParseAllElp {
     pub fn is_format_normal(&self) -> bool {
         self.format.is_none()
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 85e1e1e5d9..8d231ba425 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -2007,7 +2007,7 @@ mod tests {
         simple_snapshot(
             args_vec!["ssr", "ssr: {_@A, _@B}.",],
             "linter",
-            expect_file!("../resources/test/linter/ssr_ad_hoc.stdout"),
+            expect_file!("../resources/test/linter/ssr_ad_hoc_cli.stdout"),
             true,
             None,
         )
@@ -2018,7 +2018,7 @@ mod tests {
         simple_snapshot(
             args_vec!["ssr", "{_@A, _@B}",],
             "linter",
-            expect_file!("../resources/test/linter/ssr_ad_hoc.stdout"),
+            expect_file!("../resources/test/linter/ssr_ad_hoc_cli.stdout"),
             true,
             None,
         )
diff --git a/crates/elp/src/bin/ssr_cli.rs b/crates/elp/src/bin/ssr_cli.rs
index 467dbada65..c300fee284 100644
--- a/crates/elp/src/bin/ssr_cli.rs
+++ b/crates/elp/src/bin/ssr_cli.rs
@@ -8,19 +8,47 @@
  * above-listed licenses.
  */
 
+use std::fs;
+use std::path::Path;
+use std::str;
+use std::time::SystemTime;
+
 use anyhow::Result;
 use anyhow::bail;
+use elp::build::load;
+use elp::build::types::LoadResult;
 use elp::cli::Cli;
+use elp::convert;
+use elp::memory_usage::MemoryUsage;
+use elp::otp_file_to_ignore;
+use elp_eqwalizer::Mode;
+use elp_ide::Analysis;
 use elp_ide::AnalysisHost;
 use elp_ide::diagnostics;
 use elp_ide::diagnostics::DiagnosticsConfig;
 use elp_ide::diagnostics::FallBackToAll;
 use elp_ide::diagnostics::LintConfig;
 use elp_ide::diagnostics::MatchSsr;
+use elp_ide::elp_ide_db::elp_base_db::AbsPath;
+use elp_ide::elp_ide_db::elp_base_db::FileId;
+use elp_ide::elp_ide_db::elp_base_db::IncludeOtp;
+use elp_ide::elp_ide_db::elp_base_db::ModuleName;
+use elp_ide::elp_ide_db::elp_base_db::ProjectId;
+use elp_ide::elp_ide_db::elp_base_db::VfsPath;
+use elp_log::telemetry;
+use elp_project_model::AppName;
+use elp_project_model::AppType;
+use elp_project_model::DiscoverConfig;
 use elp_project_model::buck::BuckQueryConfig;
+use hir::Semantic;
+use indicatif::ParallelProgressIterator;
+use paths::Utf8PathBuf;
+use rayon::prelude::ParallelBridge;
+use rayon::prelude::ParallelIterator;
 
 use crate::args::Ssr;
-use crate::lint_cli;
+use crate::reporting;
+use crate::reporting::print_memory_usage;
 
 fn normalize_ssr_pattern(pattern: &str) -> String {
     if pattern.starts_with("ssr:") {
@@ -35,6 +63,8 @@ pub fn run_ssr_command(
     cli: &mut dyn Cli,
     query_config: &BuckQueryConfig,
 ) -> Result<()> {
+    let start_time = SystemTime::now();
+    let memory_start = MemoryUsage::now();
     // Normalize the SSR pattern
     let normalized_pattern = normalize_ssr_pattern(&args.ssr_spec);
 
@@ -71,51 +101,224 @@ pub fn run_ssr_command(
         writeln!(cli, "Reporting all diagnostics codes")?;
     }
 
-    // Convert Ssr args to Lint args to reuse lint_cli functionality
-    let lint_args = crate::args::Lint {
-        project: args.project.clone(),
-        module: args.module.clone(),
-        app: args.app.clone(),
-        file: args.file.clone(),
-        rebar: args.rebar,
-        profile: args.profile.clone(),
-        include_generated: args.include_generated,
-        include_tests: args.include_tests,
-        print_diags: true,
-        format: args.format.clone(),
-        prefix: None,
-        include_erlc_diagnostics: false,
-        include_ct_diagnostics: false,
-        include_edoc_diagnostics: false,
-        include_eqwalizer_diagnostics: false,
-        include_suppressed: false,
-        use_cli_severity: false,
-        diagnostic_ignore: None,
-        diagnostic_filter: Some("ad-hoc: ssr-match".to_string()),
-        experimental_diags: false,
-        read_config: false,
-        config_file: None,
-        apply_fix: false,
-        ignore_fix_only: false,
-        in_place: false,
-        to: None,
-        recursive: false,
-        with_check: false,
-        check_eqwalize_all: false,
-        one_shot: false,
-        report_system_stats: args.report_system_stats,
-        ignore_apps: vec![],
+    // Load the project
+    let mut loaded = load_project(args, cli, query_config)?;
+    telemetry::report_elapsed_time("ssr operational", start_time);
+
+    let r = run_ssr(cli, &mut loaded, &diagnostics_config, args);
+
+    telemetry::report_elapsed_time("ssr done", start_time);
+
+    let memory_end = MemoryUsage::now();
+    let memory_used = memory_end - memory_start;
+
+    // Print memory usage at the end if requested and format is normal
+    if args.is_format_normal() && args.report_system_stats {
+        print_memory_usage(loaded.analysis_host, loaded.vfs, cli)?;
+        writeln!(cli, "{}", memory_used)?;
+    }
+    r
+}
+
+pub fn run_ssr(
+    cli: &mut dyn Cli,
+    loaded: &mut LoadResult,
+    diagnostics_config: &DiagnosticsConfig,
+    args: &Ssr,
+) -> Result<()> {
+    let analysis = loaded.analysis();
+    let (file_id, name) = match &args.module {
+        Some(module) => match analysis.module_file_id(loaded.project_id, module)? {
+            Some(file_id) => {
+                if args.is_format_normal() {
+                    writeln!(cli, "module specified: {module}")?;
+                }
+                (Some(file_id), analysis.module_name(file_id)?)
+            }
+            None => panic!("Module not found: {module}"),
+        },
+        None => match &args.file {
+            Some(file_name) => {
+                if args.is_format_normal() {
+                    writeln!(cli, "file specified: {file_name}")?;
+                }
+                let path_buf = Utf8PathBuf::from_path_buf(fs::canonicalize(file_name).unwrap())
+                    .expect("UTF8 conversion failed");
+                let path = AbsPath::assert(&path_buf);
+                let path = path.as_os_str().to_str().unwrap();
+                (
+                    loaded
+                        .vfs
+                        .file_id(&VfsPath::new_real_path(path.to_string()))
+                        .map(|(id, _)| id),
+                    path_buf.as_path().file_name().map(ModuleName::new),
+                )
+            }
+            None => (None, None),
+        },
     };
 
-    // Load the project
-    let mut loaded = lint_cli::load_project(&lint_args, cli, query_config)?;
-
-    // Run the codemod with the SSR pattern
-    lint_cli::do_codemod(cli, &mut loaded, &diagnostics_config, &lint_args)
+    let mut diags = match (file_id, name) {
+        (None, _) => do_parse_all(cli, &analysis, &loaded.project_id, diagnostics_config, args)?,
+        (Some(file_id), Some(name)) => {
+            if let Some(app) = &args.app
+                && let Ok(Some(file_app)) = analysis.file_app_name(file_id)
+                && file_app != AppName(app.to_string())
+            {
+                panic!("Module {} does not belong to app {}", name.as_str(), app)
+            }
+            do_parse_one(&analysis, diagnostics_config, file_id, &name, args)?
+                .map_or(vec![], |x| vec![x])
+        }
+        (Some(file_id), _) => {
+            panic!("Could not get name from file_id for {file_id:?}")
+        }
+    };
+    if diags.is_empty() {
+        if args.is_format_normal() {
+            writeln!(cli, "No matches found")?;
+        }
+    } else {
+        diags.sort_by(|(a, _, _), (b, _, _)| a.cmp(b));
+        if args.is_format_json() {
+            for (_name, file_id, diags) in &diags {
+                for diag in diags {
+                    // We use JSON output for CI, and want to see warnings too.
+                    // So do not filter on errors only
+                    let vfs_path = loaded.vfs.file_path(*file_id);
+                    let analysis = loaded.analysis();
+                    let root_path = &analysis
+                        .project_data(*file_id)
+                        .unwrap_or_else(|_err| panic!("could not find project data"))
+                        .unwrap_or_else(|| panic!("could not find project data"))
+                        .root_dir;
+                    let relative_path = reporting::get_relative_path(root_path, vfs_path);
+                    print_diagnostic_json(diag, &analysis, *file_id, relative_path, false, cli)?;
+                }
+            }
+        } else {
+            writeln!(cli, "Matches found in {} modules:", diags.len())?;
+            for (name, file_id, diags) in &diags {
+                writeln!(cli, "  {}: {}", name, diags.len())?;
+                for diag in diags {
+                    print_diagnostic(diag, &loaded.analysis(), *file_id, false, cli)?;
+                }
+            }
+        }
+    }
+    Ok(())
 }
 
-impl Ssr {
-    pub fn is_format_normal(&self) -> bool {
-        self.format.is_none()
+fn load_project(
+    args: &Ssr,
+    cli: &mut dyn Cli,
+    query_config: &BuckQueryConfig,
+) -> Result<LoadResult> {
+    log::info!("Loading project at: {:?}", args.project);
+    let config = DiscoverConfig::new(args.rebar, &args.profile);
+    load::load_project_at(
+        cli,
+        &args.project,
+        config,
+        IncludeOtp::Yes,
+        Mode::Server,
+        query_config,
+    )
+}
+
+fn do_parse_all(
+    cli: &dyn Cli,
+    analysis: &Analysis,
+    project_id: &ProjectId,
+    config: &DiagnosticsConfig,
+    args: &Ssr,
+) -> Result<Vec<(String, FileId, Vec<diagnostics::Diagnostic>)>> {
+    let module_index = analysis.module_index(*project_id).unwrap();
+    let module_iter = module_index.iter_own();
+
+    let pb = cli.progress(module_iter.len() as u64, "Scanning modules");
+    let app_name = args.app.as_ref().map(|name| AppName(name.to_string()));
+
+    Ok(module_iter
+        .par_bridge()
+        .progress_with(pb)
+        .map_with(
+            analysis.clone(),
+            |db, (module_name, _file_source, file_id)| {
+                if !otp_file_to_ignore(db, file_id)
+                    && db.file_app_type(file_id).ok() != Some(Some(AppType::Dep))
+                    && (app_name.is_none()
+                        || db.file_app_name(file_id).ok().as_ref() == Some(&app_name))
+                {
+                    do_parse_one(db, config, file_id, module_name.as_str(), args).unwrap()
+                } else {
+                    None
+                }
+            },
+        )
+        .flatten()
+        .collect())
+}
+
+fn do_parse_one(
+    db: &Analysis,
+    config: &DiagnosticsConfig,
+    file_id: FileId,
+    name: &str,
+    args: &Ssr,
+) -> Result<Option<(String, FileId, Vec<diagnostics::Diagnostic>)>> {
+    if !args.include_tests && db.is_test_suite_or_test_helper(file_id)?.unwrap_or(false) {
+        return Ok(None);
+    }
+
+    // Run only the SSR lint configured in lints_from_config
+    let diagnostics = db.with_db(|database| {
+        let sema = Semantic::new(database);
+        let mut diags = Vec::new();
+        config
+            .lints_from_config
+            .get_diagnostics(&mut diags, &sema, file_id);
+        sema.parse(file_id);
+        diags
+    })?;
+
+    if !diagnostics.is_empty() {
+        let res = (name.to_string(), file_id, diagnostics);
+        Ok(Some(res))
+    } else {
+        Ok(None)
     }
 }
+
+fn print_diagnostic(
+    diag: &diagnostics::Diagnostic,
+    analysis: &Analysis,
+    file_id: FileId,
+    use_cli_severity: bool,
+    cli: &mut dyn Cli,
+) -> Result<(), anyhow::Error> {
+    let line_index = analysis.line_index(file_id)?;
+    writeln!(cli, "      {}", diag.print(&line_index, use_cli_severity))?;
+    Ok(())
+}
+
+fn print_diagnostic_json(
+    diagnostic: &diagnostics::Diagnostic,
+    analysis: &Analysis,
+    file_id: FileId,
+    path: &Path,
+    use_cli_severity: bool,
+    cli: &mut dyn Cli,
+) -> Result<(), anyhow::Error> {
+    let line_index = analysis.line_index(file_id)?;
+    let converted_diagnostic =
+        convert::ide_to_arc_diagnostic(&line_index, path, diagnostic, use_cli_severity);
+    writeln!(
+        cli,
+        "{}",
+        serde_json::to_string(&converted_diagnostic).unwrap_or_else(|err| panic!(
+            "print_diagnostics_json failed for '{converted_diagnostic:?}': {err}"
+        ))
+    )?;
+    Ok(())
+}
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli.stdout
new file mode 100644
index 0000000000..2e8c69b6a4
--- /dev/null
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli.stdout
@@ -0,0 +1,3 @@
+Matches found in 1 modules:
+  app_a: 1
+      15:12-15:17::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.

From c3c68c0639f378602cd4dc292ad711dd988965e5 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 29 Oct 2025 10:05:44 -0700
Subject: [PATCH 228/394] BE: Improve order of `elp --help` output

Summary:
As title.
Attempts to group the available options

Reviewed By: jcpetruzza

Differential Revision: D85767261

fbshipit-source-id: c5ae95b6fa45a1637666804c77c587b30dd4abc8
---
 crates/elp/src/bin/args.rs                | 16 +++++++++-------
 crates/elp/src/resources/test/help.stdout | 11 +++++------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index 528dbeb5eb..2cb630bbd5 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -525,7 +525,8 @@ pub fn command() -> impl Parser<Command> {
         .map(Command::EqwalizeStats)
         .to_options()
         .command("eqwalize-stats")
-        .help("Return statistics about code quality for eqWAlizer");
+        .help("Return statistics about code quality for eqWAlizer")
+        .hide();
 
     let dialyze_all = dialyze_all()
         .map(Command::DialyzeAll)
@@ -601,24 +602,25 @@ pub fn command() -> impl Parser<Command> {
         .help("Dump a JSON config stanza suitable for use in VS Code project.json");
 
     construct!([
+        // Note: The order here is what is used for `elp --help` output
+        version,
+        run_server,
+        shell,
         eqwalize,
         eqwalize_all,
         eqwalize_app,
         eqwalize_target,
+        eqwalize_stats,
         dialyze_all,
         lint,
         ssr,
-        run_server,
-        generate_completions,
         parse_all,
         parse_elp,
-        build_info,
-        version,
-        shell,
-        eqwalize_stats,
         explain,
+        build_info,
         project_info,
         glean,
+        generate_completions,
         config_stanza,
     ])
     .fallback(Help())
diff --git a/crates/elp/src/resources/test/help.stdout b/crates/elp/src/resources/test/help.stdout
index f1b9803342..acc7ae286d 100644
--- a/crates/elp/src/resources/test/help.stdout
+++ b/crates/elp/src/resources/test/help.stdout
@@ -10,6 +10,9 @@ Available options:
     -h, --help                 Prints help information
 
 Available commands:
+    version               Print version
+    server                Run lsp server
+    shell                 Starts an interactive ELP shell
     eqwalize              Eqwalize specified module
     eqwalize-all          Eqwalize all opted-in modules in a project
     eqwalize-app          Eqwalize all opted-in modules in specified application
@@ -17,15 +20,11 @@ Available commands:
     dialyze-all           Run Dialyzer on the whole project by shelling out to a `dialyzer-run` tool on the path to do the legwork.
     lint                  Parse files in project and emit diagnostics, optionally apply fixes.
     ssr                   Run SSR (Structural Search and Replace) pattern matching on project files.
-    server                Run lsp server
-    generate-completions  Generate shell completions
     parse-all             Dump ast for all files in a project for specified rebar.config file
     parse-elp             Tree-sitter parse all files in a project for specified rebar.config file
-    build-info            Generate build info JSON file
-    version               Print version
-    shell                 Starts an interactive ELP shell
-    eqwalize-stats        Return statistics about code quality for eqWAlizer
     explain               Explain a diagnostic code
+    build-info            Generate build info JSON file
     project-info          Generate project info file
     glean                 Glean indexer
+    generate-completions  Generate shell completions
     config                Dump a JSON config stanza suitable for use in VS Code project.json

From 4fe43a6aea6729b07fc787504a38712b1d1514b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Muska=C5=82a?= <micmus@meta.com>
Date: Wed, 29 Oct 2025 11:07:50 -0700
Subject: [PATCH 229/394] tests for flattening remote unions

Summary: See next diff

Reviewed By: ilya-klyuchnikov

Differential Revision: D85669552

fbshipit-source-id: 124c06127e88c1bded404e0303a4a97f5f7eaa14
---
 .../eqwalizer_tests/check/lists_tests.pretty  | 58 ++++++++++++++++++-
 .../eqwalizer_tests/check/src/lists_tests.erl | 12 ++++
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests.pretty
index d0768e5669..a1bd362100 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests.pretty
@@ -54,4 +54,60 @@ Because in the expression's type:
   because
   binary() is not compatible with atom()
 
-2 ERRORS
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/lists_tests.erl:22:18
+   │
+22 │ unit_list1(X) -> [X].
+   │                  ^^^
+   │                  │
+   │                  [X].
+Expression has type:   [union2()]
+Context expected type: ['a'] | ['b'] | ['c']
+   │                  
+
+Because in the expression's type:
+  [
+    Here the type is:     union1() | 'c'
+    Context expects type: 'a'
+    No candidate of the expression's type matches the expected type.
+  ]
+
+------------------------------ Detailed message ------------------------------
+
+  [union2()] is not compatible with ['a'] | ['b'] | ['c']
+  because
+  [union2()] is not compatible with ['a']
+  because
+  union2() is not compatible with 'a'
+  because
+  union1() | 'c' is not compatible with 'a'
+
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/lists_tests.erl:28:18
+   │
+28 │ unit_list3(X) -> [X].
+   │                  ^^^
+   │                  │
+   │                  [X].
+Expression has type:   [union2()]
+Context expected type: [union1()] | ['c']
+   │                  
+
+Because in the expression's type:
+  [
+    Here the type is a union type with some valid candidates: union1()
+    However the following candidate: 'c'
+    Differs from the expected type:  'a' | 'b'
+  ]
+
+------------------------------ Detailed message ------------------------------
+
+  [union2()] is not compatible with [union1()] | ['c']
+  because
+  [union2()] is not compatible with [union1()]
+  because
+  union2() is not compatible with union1()
+  because
+  union1() | 'c' is not compatible with union1()
+
+4 ERRORS
diff --git a/test_projects/eqwalizer_tests/check/src/lists_tests.erl b/test_projects/eqwalizer_tests/check/src/lists_tests.erl
index b50a598a24..56d03b7859 100644
--- a/test_projects/eqwalizer_tests/check/src/lists_tests.erl
+++ b/test_projects/eqwalizer_tests/check/src/lists_tests.erl
@@ -14,3 +14,15 @@ lists_union_neg(V1, V2) -> [V1, V2].
 -spec lists_union_2_neg
     (atom(), [atom()] | [binary()]) -> [atom()] | [binary()].
 lists_union_2_neg(V, L) -> [V | L].
+
+-type union1() :: a | b.
+-type union2() :: union1() | c.
+
+-spec unit_list1(union2()) -> [a] | [b] | [c].
+unit_list1(X) -> [X].
+
+-spec unit_list2(union2()) -> [union2()].
+unit_list2(X) -> [X].
+
+-spec unit_list3(union2()) -> [union1()] | [c].
+unit_list3(X) -> [X].

From 2d8eb173fc08ba82d90ca8cf50006b0ef92cf8e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Muska=C5=82a?= <micmus@meta.com>
Date: Wed, 29 Oct 2025 11:07:50 -0700
Subject: [PATCH 230/394] Flatten remote unions too

Summary:
This changes how unions are flattened, to also eagerly flatten remote unions. This already was done for local unions, but remote unions weren't considered, making the operation inconsistent

This impacts 2 places:
* How "unit" lists are typed - this allows `[X]` where `X :: boolean()` to typecheck with `[true] | [false]`.
* How some errors with unions are reported - as you can see in changed tests

While the error reporting with expanded unions for types like boolean looks a bit silly, in general I think it's more useful since you don't need to go look up type alias definitions when debugging the errors.

We also simplify the flatten operation - since D85340363, by construction, unions can't contain `NoneType` and they won't ever be empty.

Reviewed By: TD5

Differential Revision: D85669551

fbshipit-source-id: 4f88ae72dc8746c6cac8558e59c265378f647ab3
---
 .../check/custom-OTP-26.pretty                | 92 ++++++++++++-------
 .../check/custom-OTP-27.pretty                | 92 ++++++++++++-------
 .../check/custom-OTP-28.pretty                | 92 ++++++++++++-------
 .../eqwalizer_tests/check/lists_tests.pretty  | 58 +-----------
 .../test/eqwalizer_tests/check/misc.pretty    | 24 ++---
 .../test/eqwalizer_tests/check/records.pretty | 27 +++++-
 6 files changed, 214 insertions(+), 171 deletions(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-26.pretty
index dff8969ef8..c1ada7b0b2 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-26.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-26.pretty
@@ -811,7 +811,7 @@ Context expected type: fun((number()) -> boolean() | {'true', term()})
 Because in the expression's type:
   fun((binary()) ->
     Here the type is:     [number()]
-    Context expects type: boolean() | {'true', term()}
+    Context expects type: 'false' | 'true' | {'true', term()}
     No candidate matches in the expected union.
   )
 
@@ -821,7 +821,7 @@ Because in the expression's type:
   because
   [number()] is not compatible with boolean() | {'true', term()}
   because
-  [number()] is not compatible with boolean()
+  [number()] is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:739:20
@@ -834,9 +834,16 @@ Expression has type:   'wrong_ret'
 Context expected type: boolean() | {'true', term()}
     │                    
 
+Because in the expression's type:
+  Here the type is:     'wrong_ret'
+  Context expects type: 'false' | 'true' | {'true', term()}
+  No candidate matches in the expected union.
+
+------------------------------ Detailed message ------------------------------
+
   'wrong_ret' is not compatible with boolean() | {'true', term()}
   because
-  'wrong_ret' is not compatible with boolean()
+  'wrong_ret' is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:749:9
@@ -860,7 +867,7 @@ Context expected type: boolean() | {'true', term()}
 Because in the expression's type:
   Here the type is a union type with some valid candidates: {'true', 'a'}
   However the following candidate: 'wrong_ret'
-  Differs from the expected type:  boolean() | {'true', term()}
+  Differs from the expected type:  'false' | 'true' | {'true', term()}
 
 ------------------------------ Detailed message ------------------------------
 
@@ -868,7 +875,7 @@ Because in the expression's type:
   because
   'wrong_ret' is not compatible with boolean() | {'true', term()}
   because
-  'wrong_ret' is not compatible with boolean()
+  'wrong_ret' is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:827:9
@@ -885,7 +892,7 @@ Because in the expression's type:
   fun(('a' | 'b') ->
     Here the type is a union type with some valid candidates: ['a'] | 'true'
     However the following candidate: 'wrong_ret'
-    Differs from the expected type:  boolean() | ['a' | 'b']
+    Differs from the expected type:  'false' | 'true' | ['a' | 'b']
   )
 
 ------------------------------ Detailed message ------------------------------
@@ -896,7 +903,7 @@ Because in the expression's type:
   because
   'wrong_ret' is not compatible with boolean() | ['a' | 'b']
   because
-  'wrong_ret' is not compatible with boolean()
+  'wrong_ret' is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:829:20
@@ -909,9 +916,16 @@ Expression has type:   'wrong_ret'
 Context expected type: boolean() | ['a' | 'b']
     │                    
 
+Because in the expression's type:
+  Here the type is:     'wrong_ret'
+  Context expects type: 'false' | 'true' | ['a' | 'b']
+  No candidate matches in the expected union.
+
+------------------------------ Detailed message ------------------------------
+
   'wrong_ret' is not compatible with boolean() | ['a' | 'b']
   because
-  'wrong_ret' is not compatible with boolean()
+  'wrong_ret' is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:837:9
@@ -927,7 +941,7 @@ Because in the expression's type:
   fun((dynamic()) ->
     Here the type is a union type with some valid candidates: 'true'
     However the following candidate: {'true', 'a'}
-    Differs from the expected type:  boolean() | [Item]
+    Differs from the expected type:  'false' | 'true' | [Item]
   )
 
 ------------------------------ Detailed message ------------------------------
@@ -937,8 +951,7 @@ Because in the expression's type:
   {'true', 'a'} | 'true' is not compatible with boolean() | [Item]
   because
   {'true', 'a'} is not compatible with boolean() | [Item]
-  because
-  {'true', 'a'} is not compatible with boolean()
+  expected union does not contain any tuple type of size 2
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:837:20
@@ -951,9 +964,14 @@ Expression has type:   {'true', 'a'}
 Context expected type: boolean() | [dynamic()]
     │                    
 
-  {'true', 'a'} is not compatible with boolean() | [dynamic()]
-  because
-  {'true', 'a'} is not compatible with boolean()
+Because in the expression's type:
+  Here the type is:     {'true', 'a'}
+  Context expects type: 'false' | 'true' | [dynamic()]
+  No candidate matches in the expected union.
+
+------------------------------ Detailed message ------------------------------
+
+expected union does not contain any tuple type of size 2
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:839:9
@@ -1025,7 +1043,7 @@ Because in the expression's type:
   fun(('a' | 'b') ->
     Here the type is a union type with some valid candidates: ['a'] | 'false'
     However the following candidate: {'true', 'a'}
-    Differs from the expected type:  boolean() | ['a' | 'b']
+    Differs from the expected type:  'false' | 'true' | ['a' | 'b']
   )
 
 ------------------------------ Detailed message ------------------------------
@@ -1035,8 +1053,7 @@ Because in the expression's type:
   ['a'] | 'false' | {'true', 'a'} is not compatible with boolean() | ['a' | 'b']
   because
   {'true', 'a'} is not compatible with boolean() | ['a' | 'b']
-  because
-  {'true', 'a'} is not compatible with boolean()
+  expected union does not contain any tuple type of size 2
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:857:20
@@ -1049,9 +1066,14 @@ Expression has type:   {'true', 'a'}
 Context expected type: boolean() | ['a' | 'b']
     │                    
 
-  {'true', 'a'} is not compatible with boolean() | ['a' | 'b']
-  because
-  {'true', 'a'} is not compatible with boolean()
+Because in the expression's type:
+  Here the type is:     {'true', 'a'}
+  Context expects type: 'false' | 'true' | ['a' | 'b']
+  No candidate matches in the expected union.
+
+------------------------------ Detailed message ------------------------------
+
+expected union does not contain any tuple type of size 2
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:873:9
@@ -1072,7 +1094,7 @@ Because in the expression's type:
   fun(('a' | 'b') ->
     Here the type is a union type with some valid candidates: ['a']
     However the following candidate: 'wrong_ret'
-    Differs from the expected type:  boolean() | ['a' | 'b']
+    Differs from the expected type:  'false' | 'true' | ['a' | 'b']
   )
 
 ------------------------------ Detailed message ------------------------------
@@ -1083,7 +1105,7 @@ Because in the expression's type:
   because
   'wrong_ret' is not compatible with boolean() | ['a' | 'b']
   because
-  'wrong_ret' is not compatible with boolean()
+  'wrong_ret' is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:881:17
@@ -1099,7 +1121,7 @@ Context expected type: boolean() | ['a' | 'b']
 Because in the expression's type:
   Here the type is a union type with some valid candidates: ['a']
   However the following candidate: 'wrong_ret'
-  Differs from the expected type:  boolean() | ['a' | 'b']
+  Differs from the expected type:  'false' | 'true' | ['a' | 'b']
 
 ------------------------------ Detailed message ------------------------------
 
@@ -1107,7 +1129,7 @@ Because in the expression's type:
   because
   'wrong_ret' is not compatible with boolean() | ['a' | 'b']
   because
-  'wrong_ret' is not compatible with boolean()
+  'wrong_ret' is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:891:9
@@ -1123,7 +1145,7 @@ Context expected type: fun((dynamic()) -> boolean() | [dynamic()])
 Because in the expression's type:
   fun((string()) ->
     Here the type is:     atom()
-    Context expects type: boolean() | [dynamic()]
+    Context expects type: 'false' | 'true' | [dynamic()]
     No candidate matches in the expected union.
   )
 
@@ -1133,7 +1155,7 @@ Because in the expression's type:
   because
   atom() is not compatible with boolean() | [dynamic()]
   because
-  atom() is not compatible with boolean()
+  atom() is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:891:9
@@ -1149,7 +1171,7 @@ Context expected type: fun(('a' | 'b') -> boolean() | ['a' | 'b'])
 Because in the expression's type:
   fun((string()) ->
     Here the type is:     atom()
-    Context expects type: boolean() | ['a' | 'b']
+    Context expects type: 'false' | 'true' | ['a' | 'b']
     No candidate matches in the expected union.
   )
 
@@ -1159,7 +1181,7 @@ Because in the expression's type:
   because
   atom() is not compatible with boolean() | ['a' | 'b']
   because
-  atom() is not compatible with boolean()
+  atom() is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:900:9
@@ -2921,9 +2943,16 @@ Expression has type:   'err'
 Context expected type: boolean() | {'true', term()}
      │                       
 
+Because in the expression's type:
+  Here the type is:     'err'
+  Context expects type: 'false' | 'true' | {'true', term()}
+  No candidate matches in the expected union.
+
+------------------------------ Detailed message ------------------------------
+
   'err' is not compatible with boolean() | {'true', term()}
   because
-  'err' is not compatible with boolean()
+  'err' is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2362:5
@@ -2987,13 +3016,14 @@ Context expected type: iodata() | unicode:charlist()
 
 Because in the expression's type:
   Here the type is:     atom()
-  Context expects type: iodata()
+  Context expects type: iolist() | binary()
+  No candidate matches in the expected union.
 
 ------------------------------ Detailed message ------------------------------
 
   atom() is not compatible with iodata() | unicode:charlist()
   because
-  atom() is not compatible with iodata()
+  atom() is not compatible with iolist()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2386:5
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty
index dff8969ef8..c1ada7b0b2 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty
@@ -811,7 +811,7 @@ Context expected type: fun((number()) -> boolean() | {'true', term()})
 Because in the expression's type:
   fun((binary()) ->
     Here the type is:     [number()]
-    Context expects type: boolean() | {'true', term()}
+    Context expects type: 'false' | 'true' | {'true', term()}
     No candidate matches in the expected union.
   )
 
@@ -821,7 +821,7 @@ Because in the expression's type:
   because
   [number()] is not compatible with boolean() | {'true', term()}
   because
-  [number()] is not compatible with boolean()
+  [number()] is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:739:20
@@ -834,9 +834,16 @@ Expression has type:   'wrong_ret'
 Context expected type: boolean() | {'true', term()}
     │                    
 
+Because in the expression's type:
+  Here the type is:     'wrong_ret'
+  Context expects type: 'false' | 'true' | {'true', term()}
+  No candidate matches in the expected union.
+
+------------------------------ Detailed message ------------------------------
+
   'wrong_ret' is not compatible with boolean() | {'true', term()}
   because
-  'wrong_ret' is not compatible with boolean()
+  'wrong_ret' is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:749:9
@@ -860,7 +867,7 @@ Context expected type: boolean() | {'true', term()}
 Because in the expression's type:
   Here the type is a union type with some valid candidates: {'true', 'a'}
   However the following candidate: 'wrong_ret'
-  Differs from the expected type:  boolean() | {'true', term()}
+  Differs from the expected type:  'false' | 'true' | {'true', term()}
 
 ------------------------------ Detailed message ------------------------------
 
@@ -868,7 +875,7 @@ Because in the expression's type:
   because
   'wrong_ret' is not compatible with boolean() | {'true', term()}
   because
-  'wrong_ret' is not compatible with boolean()
+  'wrong_ret' is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:827:9
@@ -885,7 +892,7 @@ Because in the expression's type:
   fun(('a' | 'b') ->
     Here the type is a union type with some valid candidates: ['a'] | 'true'
     However the following candidate: 'wrong_ret'
-    Differs from the expected type:  boolean() | ['a' | 'b']
+    Differs from the expected type:  'false' | 'true' | ['a' | 'b']
   )
 
 ------------------------------ Detailed message ------------------------------
@@ -896,7 +903,7 @@ Because in the expression's type:
   because
   'wrong_ret' is not compatible with boolean() | ['a' | 'b']
   because
-  'wrong_ret' is not compatible with boolean()
+  'wrong_ret' is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:829:20
@@ -909,9 +916,16 @@ Expression has type:   'wrong_ret'
 Context expected type: boolean() | ['a' | 'b']
     │                    
 
+Because in the expression's type:
+  Here the type is:     'wrong_ret'
+  Context expects type: 'false' | 'true' | ['a' | 'b']
+  No candidate matches in the expected union.
+
+------------------------------ Detailed message ------------------------------
+
   'wrong_ret' is not compatible with boolean() | ['a' | 'b']
   because
-  'wrong_ret' is not compatible with boolean()
+  'wrong_ret' is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:837:9
@@ -927,7 +941,7 @@ Because in the expression's type:
   fun((dynamic()) ->
     Here the type is a union type with some valid candidates: 'true'
     However the following candidate: {'true', 'a'}
-    Differs from the expected type:  boolean() | [Item]
+    Differs from the expected type:  'false' | 'true' | [Item]
   )
 
 ------------------------------ Detailed message ------------------------------
@@ -937,8 +951,7 @@ Because in the expression's type:
   {'true', 'a'} | 'true' is not compatible with boolean() | [Item]
   because
   {'true', 'a'} is not compatible with boolean() | [Item]
-  because
-  {'true', 'a'} is not compatible with boolean()
+  expected union does not contain any tuple type of size 2
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:837:20
@@ -951,9 +964,14 @@ Expression has type:   {'true', 'a'}
 Context expected type: boolean() | [dynamic()]
     │                    
 
-  {'true', 'a'} is not compatible with boolean() | [dynamic()]
-  because
-  {'true', 'a'} is not compatible with boolean()
+Because in the expression's type:
+  Here the type is:     {'true', 'a'}
+  Context expects type: 'false' | 'true' | [dynamic()]
+  No candidate matches in the expected union.
+
+------------------------------ Detailed message ------------------------------
+
+expected union does not contain any tuple type of size 2
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:839:9
@@ -1025,7 +1043,7 @@ Because in the expression's type:
   fun(('a' | 'b') ->
     Here the type is a union type with some valid candidates: ['a'] | 'false'
     However the following candidate: {'true', 'a'}
-    Differs from the expected type:  boolean() | ['a' | 'b']
+    Differs from the expected type:  'false' | 'true' | ['a' | 'b']
   )
 
 ------------------------------ Detailed message ------------------------------
@@ -1035,8 +1053,7 @@ Because in the expression's type:
   ['a'] | 'false' | {'true', 'a'} is not compatible with boolean() | ['a' | 'b']
   because
   {'true', 'a'} is not compatible with boolean() | ['a' | 'b']
-  because
-  {'true', 'a'} is not compatible with boolean()
+  expected union does not contain any tuple type of size 2
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:857:20
@@ -1049,9 +1066,14 @@ Expression has type:   {'true', 'a'}
 Context expected type: boolean() | ['a' | 'b']
     │                    
 
-  {'true', 'a'} is not compatible with boolean() | ['a' | 'b']
-  because
-  {'true', 'a'} is not compatible with boolean()
+Because in the expression's type:
+  Here the type is:     {'true', 'a'}
+  Context expects type: 'false' | 'true' | ['a' | 'b']
+  No candidate matches in the expected union.
+
+------------------------------ Detailed message ------------------------------
+
+expected union does not contain any tuple type of size 2
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:873:9
@@ -1072,7 +1094,7 @@ Because in the expression's type:
   fun(('a' | 'b') ->
     Here the type is a union type with some valid candidates: ['a']
     However the following candidate: 'wrong_ret'
-    Differs from the expected type:  boolean() | ['a' | 'b']
+    Differs from the expected type:  'false' | 'true' | ['a' | 'b']
   )
 
 ------------------------------ Detailed message ------------------------------
@@ -1083,7 +1105,7 @@ Because in the expression's type:
   because
   'wrong_ret' is not compatible with boolean() | ['a' | 'b']
   because
-  'wrong_ret' is not compatible with boolean()
+  'wrong_ret' is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:881:17
@@ -1099,7 +1121,7 @@ Context expected type: boolean() | ['a' | 'b']
 Because in the expression's type:
   Here the type is a union type with some valid candidates: ['a']
   However the following candidate: 'wrong_ret'
-  Differs from the expected type:  boolean() | ['a' | 'b']
+  Differs from the expected type:  'false' | 'true' | ['a' | 'b']
 
 ------------------------------ Detailed message ------------------------------
 
@@ -1107,7 +1129,7 @@ Because in the expression's type:
   because
   'wrong_ret' is not compatible with boolean() | ['a' | 'b']
   because
-  'wrong_ret' is not compatible with boolean()
+  'wrong_ret' is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:891:9
@@ -1123,7 +1145,7 @@ Context expected type: fun((dynamic()) -> boolean() | [dynamic()])
 Because in the expression's type:
   fun((string()) ->
     Here the type is:     atom()
-    Context expects type: boolean() | [dynamic()]
+    Context expects type: 'false' | 'true' | [dynamic()]
     No candidate matches in the expected union.
   )
 
@@ -1133,7 +1155,7 @@ Because in the expression's type:
   because
   atom() is not compatible with boolean() | [dynamic()]
   because
-  atom() is not compatible with boolean()
+  atom() is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:891:9
@@ -1149,7 +1171,7 @@ Context expected type: fun(('a' | 'b') -> boolean() | ['a' | 'b'])
 Because in the expression's type:
   fun((string()) ->
     Here the type is:     atom()
-    Context expects type: boolean() | ['a' | 'b']
+    Context expects type: 'false' | 'true' | ['a' | 'b']
     No candidate matches in the expected union.
   )
 
@@ -1159,7 +1181,7 @@ Because in the expression's type:
   because
   atom() is not compatible with boolean() | ['a' | 'b']
   because
-  atom() is not compatible with boolean()
+  atom() is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:900:9
@@ -2921,9 +2943,16 @@ Expression has type:   'err'
 Context expected type: boolean() | {'true', term()}
      │                       
 
+Because in the expression's type:
+  Here the type is:     'err'
+  Context expects type: 'false' | 'true' | {'true', term()}
+  No candidate matches in the expected union.
+
+------------------------------ Detailed message ------------------------------
+
   'err' is not compatible with boolean() | {'true', term()}
   because
-  'err' is not compatible with boolean()
+  'err' is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2362:5
@@ -2987,13 +3016,14 @@ Context expected type: iodata() | unicode:charlist()
 
 Because in the expression's type:
   Here the type is:     atom()
-  Context expects type: iodata()
+  Context expects type: iolist() | binary()
+  No candidate matches in the expected union.
 
 ------------------------------ Detailed message ------------------------------
 
   atom() is not compatible with iodata() | unicode:charlist()
   because
-  atom() is not compatible with iodata()
+  atom() is not compatible with iolist()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2386:5
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-28.pretty
index 3b4bf4867a..a6f331c261 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-28.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-28.pretty
@@ -811,7 +811,7 @@ Context expected type: fun((number()) -> boolean() | {'true', term()})
 Because in the expression's type:
   fun((binary()) ->
     Here the type is:     [number()]
-    Context expects type: boolean() | {'true', term()}
+    Context expects type: 'false' | 'true' | {'true', term()}
     No candidate matches in the expected union.
   )
 
@@ -821,7 +821,7 @@ Because in the expression's type:
   because
   [number()] is not compatible with boolean() | {'true', term()}
   because
-  [number()] is not compatible with boolean()
+  [number()] is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:739:20
@@ -834,9 +834,16 @@ Expression has type:   'wrong_ret'
 Context expected type: boolean() | {'true', term()}
     │                    
 
+Because in the expression's type:
+  Here the type is:     'wrong_ret'
+  Context expects type: 'false' | 'true' | {'true', term()}
+  No candidate matches in the expected union.
+
+------------------------------ Detailed message ------------------------------
+
   'wrong_ret' is not compatible with boolean() | {'true', term()}
   because
-  'wrong_ret' is not compatible with boolean()
+  'wrong_ret' is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:749:9
@@ -860,7 +867,7 @@ Context expected type: boolean() | {'true', term()}
 Because in the expression's type:
   Here the type is a union type with some valid candidates: {'true', 'a'}
   However the following candidate: 'wrong_ret'
-  Differs from the expected type:  boolean() | {'true', term()}
+  Differs from the expected type:  'false' | 'true' | {'true', term()}
 
 ------------------------------ Detailed message ------------------------------
 
@@ -868,7 +875,7 @@ Because in the expression's type:
   because
   'wrong_ret' is not compatible with boolean() | {'true', term()}
   because
-  'wrong_ret' is not compatible with boolean()
+  'wrong_ret' is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:827:9
@@ -885,7 +892,7 @@ Because in the expression's type:
   fun(('a' | 'b') ->
     Here the type is a union type with some valid candidates: ['a'] | 'true'
     However the following candidate: 'wrong_ret'
-    Differs from the expected type:  boolean() | ['a' | 'b']
+    Differs from the expected type:  'false' | 'true' | ['a' | 'b']
   )
 
 ------------------------------ Detailed message ------------------------------
@@ -896,7 +903,7 @@ Because in the expression's type:
   because
   'wrong_ret' is not compatible with boolean() | ['a' | 'b']
   because
-  'wrong_ret' is not compatible with boolean()
+  'wrong_ret' is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:829:20
@@ -909,9 +916,16 @@ Expression has type:   'wrong_ret'
 Context expected type: boolean() | ['a' | 'b']
     │                    
 
+Because in the expression's type:
+  Here the type is:     'wrong_ret'
+  Context expects type: 'false' | 'true' | ['a' | 'b']
+  No candidate matches in the expected union.
+
+------------------------------ Detailed message ------------------------------
+
   'wrong_ret' is not compatible with boolean() | ['a' | 'b']
   because
-  'wrong_ret' is not compatible with boolean()
+  'wrong_ret' is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:837:9
@@ -927,7 +941,7 @@ Because in the expression's type:
   fun((dynamic()) ->
     Here the type is a union type with some valid candidates: 'true'
     However the following candidate: {'true', 'a'}
-    Differs from the expected type:  boolean() | [Item]
+    Differs from the expected type:  'false' | 'true' | [Item]
   )
 
 ------------------------------ Detailed message ------------------------------
@@ -937,8 +951,7 @@ Because in the expression's type:
   {'true', 'a'} | 'true' is not compatible with boolean() | [Item]
   because
   {'true', 'a'} is not compatible with boolean() | [Item]
-  because
-  {'true', 'a'} is not compatible with boolean()
+  expected union does not contain any tuple type of size 2
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:837:20
@@ -951,9 +964,14 @@ Expression has type:   {'true', 'a'}
 Context expected type: boolean() | [dynamic()]
     │                    
 
-  {'true', 'a'} is not compatible with boolean() | [dynamic()]
-  because
-  {'true', 'a'} is not compatible with boolean()
+Because in the expression's type:
+  Here the type is:     {'true', 'a'}
+  Context expects type: 'false' | 'true' | [dynamic()]
+  No candidate matches in the expected union.
+
+------------------------------ Detailed message ------------------------------
+
+expected union does not contain any tuple type of size 2
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:839:9
@@ -1025,7 +1043,7 @@ Because in the expression's type:
   fun(('a' | 'b') ->
     Here the type is a union type with some valid candidates: ['a'] | 'false'
     However the following candidate: {'true', 'a'}
-    Differs from the expected type:  boolean() | ['a' | 'b']
+    Differs from the expected type:  'false' | 'true' | ['a' | 'b']
   )
 
 ------------------------------ Detailed message ------------------------------
@@ -1035,8 +1053,7 @@ Because in the expression's type:
   ['a'] | 'false' | {'true', 'a'} is not compatible with boolean() | ['a' | 'b']
   because
   {'true', 'a'} is not compatible with boolean() | ['a' | 'b']
-  because
-  {'true', 'a'} is not compatible with boolean()
+  expected union does not contain any tuple type of size 2
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:857:20
@@ -1049,9 +1066,14 @@ Expression has type:   {'true', 'a'}
 Context expected type: boolean() | ['a' | 'b']
     │                    
 
-  {'true', 'a'} is not compatible with boolean() | ['a' | 'b']
-  because
-  {'true', 'a'} is not compatible with boolean()
+Because in the expression's type:
+  Here the type is:     {'true', 'a'}
+  Context expects type: 'false' | 'true' | ['a' | 'b']
+  No candidate matches in the expected union.
+
+------------------------------ Detailed message ------------------------------
+
+expected union does not contain any tuple type of size 2
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:873:9
@@ -1072,7 +1094,7 @@ Because in the expression's type:
   fun(('a' | 'b') ->
     Here the type is a union type with some valid candidates: ['a']
     However the following candidate: 'wrong_ret'
-    Differs from the expected type:  boolean() | ['a' | 'b']
+    Differs from the expected type:  'false' | 'true' | ['a' | 'b']
   )
 
 ------------------------------ Detailed message ------------------------------
@@ -1083,7 +1105,7 @@ Because in the expression's type:
   because
   'wrong_ret' is not compatible with boolean() | ['a' | 'b']
   because
-  'wrong_ret' is not compatible with boolean()
+  'wrong_ret' is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:881:17
@@ -1099,7 +1121,7 @@ Context expected type: boolean() | ['a' | 'b']
 Because in the expression's type:
   Here the type is a union type with some valid candidates: ['a']
   However the following candidate: 'wrong_ret'
-  Differs from the expected type:  boolean() | ['a' | 'b']
+  Differs from the expected type:  'false' | 'true' | ['a' | 'b']
 
 ------------------------------ Detailed message ------------------------------
 
@@ -1107,7 +1129,7 @@ Because in the expression's type:
   because
   'wrong_ret' is not compatible with boolean() | ['a' | 'b']
   because
-  'wrong_ret' is not compatible with boolean()
+  'wrong_ret' is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:891:9
@@ -1123,7 +1145,7 @@ Context expected type: fun((dynamic()) -> boolean() | [dynamic()])
 Because in the expression's type:
   fun((string()) ->
     Here the type is:     atom()
-    Context expects type: boolean() | [dynamic()]
+    Context expects type: 'false' | 'true' | [dynamic()]
     No candidate matches in the expected union.
   )
 
@@ -1133,7 +1155,7 @@ Because in the expression's type:
   because
   atom() is not compatible with boolean() | [dynamic()]
   because
-  atom() is not compatible with boolean()
+  atom() is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:891:9
@@ -1149,7 +1171,7 @@ Context expected type: fun(('a' | 'b') -> boolean() | ['a' | 'b'])
 Because in the expression's type:
   fun((string()) ->
     Here the type is:     atom()
-    Context expects type: boolean() | ['a' | 'b']
+    Context expects type: 'false' | 'true' | ['a' | 'b']
     No candidate matches in the expected union.
   )
 
@@ -1159,7 +1181,7 @@ Because in the expression's type:
   because
   atom() is not compatible with boolean() | ['a' | 'b']
   because
-  atom() is not compatible with boolean()
+  atom() is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:900:9
@@ -2921,9 +2943,16 @@ Expression has type:   'err'
 Context expected type: boolean() | {'true', term()}
      │                       
 
+Because in the expression's type:
+  Here the type is:     'err'
+  Context expects type: 'false' | 'true' | {'true', term()}
+  No candidate matches in the expected union.
+
+------------------------------ Detailed message ------------------------------
+
   'err' is not compatible with boolean() | {'true', term()}
   because
-  'err' is not compatible with boolean()
+  'err' is not compatible with 'false'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2362:5
@@ -2987,13 +3016,14 @@ Context expected type: iodata() | unicode:charlist()
 
 Because in the expression's type:
   Here the type is:     atom()
-  Context expects type: iodata()
+  Context expects type: iolist() | binary()
+  No candidate matches in the expected union.
 
 ------------------------------ Detailed message ------------------------------
 
   atom() is not compatible with iodata() | unicode:charlist()
   because
-  atom() is not compatible with iodata()
+  atom() is not compatible with iolist()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2386:5
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests.pretty
index a1bd362100..d0768e5669 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests.pretty
@@ -54,60 +54,4 @@ Because in the expression's type:
   because
   binary() is not compatible with atom()
 
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/lists_tests.erl:22:18
-   │
-22 │ unit_list1(X) -> [X].
-   │                  ^^^
-   │                  │
-   │                  [X].
-Expression has type:   [union2()]
-Context expected type: ['a'] | ['b'] | ['c']
-   │                  
-
-Because in the expression's type:
-  [
-    Here the type is:     union1() | 'c'
-    Context expects type: 'a'
-    No candidate of the expression's type matches the expected type.
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [union2()] is not compatible with ['a'] | ['b'] | ['c']
-  because
-  [union2()] is not compatible with ['a']
-  because
-  union2() is not compatible with 'a'
-  because
-  union1() | 'c' is not compatible with 'a'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/lists_tests.erl:28:18
-   │
-28 │ unit_list3(X) -> [X].
-   │                  ^^^
-   │                  │
-   │                  [X].
-Expression has type:   [union2()]
-Context expected type: [union1()] | ['c']
-   │                  
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: union1()
-    However the following candidate: 'c'
-    Differs from the expected type:  'a' | 'b'
-  ]
-
------------------------------- Detailed message ------------------------------
-
-  [union2()] is not compatible with [union1()] | ['c']
-  because
-  [union2()] is not compatible with [union1()]
-  because
-  union2() is not compatible with union1()
-  because
-  union1() | 'c' is not compatible with union1()
-
-4 ERRORS
+2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/misc.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/misc.pretty
index 22e373f816..45a1d69e57 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/misc.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/misc.pretty
@@ -163,22 +163,16 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                  ^^^^^^^
     │                  │
     │                  [not _].
-Expression has type:   [boolean()]
+Expression has type:   ['false'] | ['true']
 Context expected type: [number()]
     │                  
 
 Because in the expression's type:
   [
-    Here the type is:     boolean()
+    Here the type is:     'false'
     Context expects type: number()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [boolean()] is not compatible with [number()]
-  because
-  boolean() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/misc.erl:124:21
     │
@@ -186,22 +180,16 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     │                     ^^^^^^^^
     │                     │
     │                     [_ or _].
-Expression has type:   [boolean()]
+Expression has type:   ['false'] | ['true']
 Context expected type: [number()]
     │                     
 
 Because in the expression's type:
   [
-    Here the type is:     boolean()
+    Here the type is:     'false'
     Context expects type: number()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [boolean()] is not compatible with [number()]
-  because
-  boolean() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/misc.erl:128:21
     │
@@ -783,9 +771,9 @@ Context expected type: v1_op()
     │     
 
 Because in the expression's type:
-  Here the type is a union type with some valid candidates: v1_op()
+  Here the type is a union type with some valid candidates: 'stuff1' | 'v0_op2' | 'stuff2' | 'v0_op1' | 'v1_op2' | ...
   However the following candidate: 'v2_op'
-  Differs from the expected type:  'v1_op1' | 'v1_op2' | stuff() | v0_op()
+  Differs from the expected type:  'stuff1' | 'v0_op2' | 'stuff2' | 'v0_op1' | 'v1_op2' | ...
 
 ------------------------------ Detailed message ------------------------------
 
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/records.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/records.pretty
index ee4761b7d0..5b6854f238 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/records.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/records.pretty
@@ -223,6 +223,13 @@ Expression has type:   'a'
 Context expected type: number() | boolean()
     │                           
 
+Because in the expression's type:
+  Here the type is:     'a'
+  Context expects type: number() | 'false' | 'true'
+  No candidate matches in the expected union.
+
+------------------------------ Detailed message ------------------------------
+
   'a' is not compatible with number() | boolean()
   because
   'a' is not compatible with number()
@@ -238,6 +245,13 @@ Expression has type:   'a'
 Context expected type: number() | boolean()
     │                       
 
+Because in the expression's type:
+  Here the type is:     'a'
+  Context expects type: number() | 'false' | 'true'
+  No candidate matches in the expected union.
+
+------------------------------ Detailed message ------------------------------
+
   'a' is not compatible with number() | boolean()
   because
   'a' is not compatible with number()
@@ -278,6 +292,13 @@ Expression has type:   'a'
 Context expected type: number() | boolean()
     │                            
 
+Because in the expression's type:
+  Here the type is:     'a'
+  Context expects type: number() | 'false' | 'true'
+  No candidate matches in the expected union.
+
+------------------------------ Detailed message ------------------------------
+
   'a' is not compatible with number() | boolean()
   because
   'a' is not compatible with number()
@@ -358,7 +379,7 @@ Context expected type: #int_bool_box{}
 Because in the expression's type:
   { 'int_bool_box', 
     Here the type is:     'a'
-    Context expects type: number() | boolean()
+    Context expects type: number() | 'false' | 'true'
     No candidate matches in the expected union.
   }
 
@@ -410,14 +431,14 @@ Context expected type: 'true'
 
 Because in the expression's type:
   Here the type is a union type with some valid candidates: 'true'
-  However the following candidate: boolean()
+  However the following candidate: 'false'
   Differs from the expected type:  'true'
 
 ------------------------------ Detailed message ------------------------------
 
   boolean() | 'true' is not compatible with 'true'
   because
-  boolean() is not compatible with 'true'
+  'false' is not compatible with 'true'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:355:13

From 71e2caa6873e47a53607d2b4eec44d0228bfa5af Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Wed, 29 Oct 2025 11:22:32 -0700
Subject: [PATCH 231/394] Remove opaque type tests

Summary: As title. The opaque type tests are cumbersome to maintain since their results change with OTP changes.

Reviewed By: TD5

Differential Revision: D85772507

fbshipit-source-id: c2dd37965e57eed59a4fe2c7674941ded35f7afe
---
 .../test/eqwalizer_tests/check/refine.pretty  | 151 ++++++------------
 .../eqwalizer_tests/check/src/refine.erl      |  27 ----
 2 files changed, 46 insertions(+), 132 deletions(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/refine.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/refine.pretty
index 20a5b05732..b443f787c6 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/refine.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/refine.pretty
@@ -241,84 +241,25 @@ Expression has type:   {'cons', 'nil' | my_list()}
 Context expected type: number()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:177:24
+    ┌─ check/src/refine.erl:175:31
     │
-177 │ opaque1_neg({X, _}) -> X.
-    │                        ^ X.
-Expression has type:   number()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:183:24
-    │
-183 │ opaque2_neg([X, _]) -> X.
-    │                        ^
-    │                        │
-    │                        X.
-Expression has type:   erl_anno:annotation()
-Context expected type: pid()
-    │                        
-
-Because in the expression's type:
-  Here the type is:     tuple()/2 | tuple()/2 | tuple()/2 | tuple()/2 | tuple()/2
-  Context expects type: pid()
-  No candidate of the expression's type matches the expected type.
-
------------------------------- Detailed message ------------------------------
-
-  erl_anno:annotation() is not compatible with pid()
-  because
-  {'file', erl_anno:filename()} | {'generated', erl_anno:generated()} | {'record', erl_anno:record()} | {'text', string()} | {'location', erl_anno:location()} is not compatible with pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:191:7
-    │
-191 │ }) -> X.
-    │       ^ X.
-Expression has type:   'set'
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:198:23
-    │
-198 │ opaque_4_neg(X, X) -> X.
-    │                       ^
-    │                       │
-    │                       X.
-Expression has type:   gb_sets:set(atom())
-Context expected type: pid()
-    │                       
-
-Because in the expression's type:
-  Here the type is:     {number(), gb_sets:gb_set_node(atom())}
-  Context expects type: pid()
-
------------------------------- Detailed message ------------------------------
-
-  gb_sets:set(atom()) is not compatible with pid()
-  because
-  {number(), gb_sets:gb_set_node(atom())} is not compatible with pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:202:31
-    │
-202 │ record_as_tuple1_neg(R, R) -> R.
+175 │ record_as_tuple1_neg(R, R) -> R.
     │                               ^ R.
 Expression has type:   #my_rec{}
 Context expected type: none()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:206:31
+    ┌─ check/src/refine.erl:179:31
     │
-206 │ record_as_tuple2_neg(R, R) -> R.
+179 │ record_as_tuple2_neg(R, R) -> R.
     │                               ^ R.
 Expression has type:   #my_rec{}
 Context expected type: none()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:222:28
+    ┌─ check/src/refine.erl:195:28
     │
-222 │ record_as_tuple6_neg(R) -> R.
+195 │ record_as_tuple6_neg(R) -> R.
     │                            ^
     │                            │
     │                            R.
@@ -340,22 +281,22 @@ Because in the expression's type:
   'my_rec' is not compatible with 'not_my_rec'
 
 error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
-    ┌─ check/src/refine.erl:226:10
+    ┌─ check/src/refine.erl:199:10
     │
-226 │     i :: unknown:unknown()
+199 │     i :: unknown:unknown()
     │          ^^^^^^^^^^^^^^^^^ Unknown id: unknown:unknown/0
 
 error: reference_to_invalid_type (See https://fb.me/eqwalizer_errors#reference_to_invalid_type)
-    ┌─ check/src/refine.erl:228:1
+    ┌─ check/src/refine.erl:201:1
     │  
-228 │ ╭ -spec record_as_tuple7_neg
-229 │ │ (#bad_rec{}) -> {bad_rec, atom()}.
+201 │ ╭ -spec record_as_tuple7_neg
+202 │ │ (#bad_rec{}) -> {bad_rec, atom()}.
     │ ╰─────────────────────────────────^ record_as_tuple7_neg/1 references type with invalid definition: #bad_rec{}
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:240:28
+    ┌─ check/src/refine.erl:213:28
     │
-240 │ tuple_as_record2_neg(R) -> R.
+213 │ tuple_as_record2_neg(R) -> R.
     │                            ^
     │                            │
     │                            R.
@@ -377,49 +318,49 @@ Because in the expression's type:
   atom() is not compatible with number()
 
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/refine.erl:245:1
+    ┌─ check/src/refine.erl:218:1
     │  
-245 │ ╭ tup_guard_record1(X)
-246 │ │     when is_record(X, my_rec) ->
-247 │ │     X * 2.
+218 │ ╭ tup_guard_record1(X)
+219 │ │     when is_record(X, my_rec) ->
+220 │ │     X * 2.
     │ ╰─────────^ Clause is not covered by spec
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:253:5
+    ┌─ check/src/refine.erl:226:5
     │
-253 │     X * 2.
+226 │     X * 2.
     │     ^ X.
 Expression has type:   #my_rec{}
 Context expected type: number()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:259:5
+    ┌─ check/src/refine.erl:232:5
     │
-259 │     X * 2.
+232 │     X * 2.
     │     ^ X.
 Expression has type:   #my_rec{}
 Context expected type: number()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:262:14
+    ┌─ check/src/refine.erl:235:14
     │
-262 │ ftt(X, _) -> X.
+235 │ ftt(X, _) -> X.
     │              ^ X.
 Expression has type:   fun((T) -> 'ok')
 Context expected type: T
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:265:20
+    ┌─ check/src/refine.erl:238:20
     │
-265 │ my_rec_to_ok(X) -> X.
+238 │ my_rec_to_ok(X) -> X.
     │                    ^ X.
 Expression has type:   #my_rec{}
 Context expected type: 'ok'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:277:26
+    ┌─ check/src/refine.erl:250:26
     │
-277 │ use2_neg(F, X) -> ftt(F, X).
+250 │ use2_neg(F, X) -> ftt(F, X).
     │                          ^
     │                          │
     │                          X.
@@ -441,9 +382,9 @@ Because in the expression's type:
   atom() is not compatible with number()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:277:26
+    ┌─ check/src/refine.erl:250:26
     │
-277 │ use2_neg(F, X) -> ftt(F, X).
+250 │ use2_neg(F, X) -> ftt(F, X).
     │                          ^
     │                          │
     │                          X.
@@ -467,9 +408,9 @@ Because in the expression's type:
   atom() is not compatible with number()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:289:26
+    ┌─ check/src/refine.erl:262:26
     │
-289 │ use4_neg(F, X) -> ftt(F, X).
+262 │ use4_neg(F, X) -> ftt(F, X).
     │                          ^
     │                          │
     │                          X.
@@ -491,9 +432,9 @@ Because in the expression's type:
   number() is not compatible with atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:289:26
+    ┌─ check/src/refine.erl:262:26
     │
-289 │ use4_neg(F, X) -> ftt(F, X).
+262 │ use4_neg(F, X) -> ftt(F, X).
     │                          ^
     │                          │
     │                          X.
@@ -517,9 +458,9 @@ Because in the expression's type:
   number() is not compatible with atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:305:21
+    ┌─ check/src/refine.erl:278:21
     │
-305 │ use6_neg(X) -> ttt2(X, x).
+278 │ use6_neg(X) -> ttt2(X, x).
     │                     ^
     │                     │
     │                     X.
@@ -541,9 +482,9 @@ Because in the expression's type:
   number() is not compatible with atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:309:16
+    ┌─ check/src/refine.erl:282:16
     │
-309 │ use7_neg(X) -> ttt1(X, 1).
+282 │ use7_neg(X) -> ttt1(X, 1).
     │                ^^^^^^^^^^
     │                │
     │                ttt1(X, 1).
@@ -563,9 +504,9 @@ Because in the expression's type:
   atom() is not compatible with number()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:313:13
+    ┌─ check/src/refine.erl:286:13
     │
-313 │ deets(X) -> X.
+286 │ deets(X) -> X.
     │             ^
     │             │
     │             X.
@@ -585,9 +526,9 @@ Because in the expression's type:
   'a' is not compatible with {'my_rec', term(), term()}
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:323:5
+    ┌─ check/src/refine.erl:296:5
     │
-323 │     B.
+296 │     B.
     │     ^
     │     │
     │     B.
@@ -607,17 +548,17 @@ Because in the expression's type:
   'undefined' is not compatible with binary()
 
 error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
-    ┌─ check/src/refine.erl:405:27
+    ┌─ check/src/refine.erl:378:27
     │
-405 │     eqwalizer:reveal_type(Name),
+378 │     eqwalizer:reveal_type(Name),
     │                           ^^^^ atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/refine.erl:406:5
+    ┌─ check/src/refine.erl:379:5
     │
-406 │     Name.
+379 │     Name.
     │     ^^^^ Name.
 Expression has type:   atom()
 Context expected type: 'ok'
 
-41 ERRORS
+37 ERRORS
diff --git a/test_projects/eqwalizer_tests/check/src/refine.erl b/test_projects/eqwalizer_tests/check/src/refine.erl
index a887d82535..4140ba4495 100644
--- a/test_projects/eqwalizer_tests/check/src/refine.erl
+++ b/test_projects/eqwalizer_tests/check/src/refine.erl
@@ -170,33 +170,6 @@ exploit_recursive() ->
     refine_recursive_neg({cons, nil}) + 1,
     ok.
 
-% returns a number
--spec opaque1_neg(
-    gb_sets:set(atom())) ->
-    pid().
-opaque1_neg({X, _}) -> X.
-
-% returns a tuple
--spec opaque2_neg(
-    erl_anno:anno()) ->
-    pid().
-opaque2_neg([X, _]) -> X.
-
-% returns an atom
--spec opaque_3_neg(
-    sets:set(atom())
-) -> pid().
-opaque_3_neg({
-    X, _, _, _, _, _, _, _, _
-}) -> X.
-
-% returns a 2-tuple
--spec opaque_4_neg(
-    gb_sets:set(atom()),
-    {term(), term()}
-) -> pid().
-opaque_4_neg(X, X) -> X.
-
 -spec record_as_tuple1_neg
 (#my_rec{}, tuple()) -> none().
 record_as_tuple1_neg(R, R) -> R.

From 1c125dedc12e78d59319ad4670d0295b699057f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Muska=C5=82a?= <micmus@meta.com>
Date: Wed, 29 Oct 2025 15:41:55 -0700
Subject: [PATCH 232/394] use jar version for unoptimised builds

Summary:
This changes local debug builds (linux only) to use a `jar` rather than building the native image for eqwalizer. This speeds up iteration significantly.

We had this before, but struggled with java versions. In this iteration we just use tha java from graalvm that we would use to build the native image - that way we have a consistent java version that we fully control and don't depend on the OS.

Reviewed By: TD5

Differential Revision: D85784216

fbshipit-source-id: 188dd7207865fda770bf2e154e18049030acdc29
---
 crates/eqwalizer/build.rs   | 105 +++++++++++++++++++++---------------
 crates/eqwalizer/src/lib.rs |   2 +-
 2 files changed, 63 insertions(+), 44 deletions(-)

diff --git a/crates/eqwalizer/build.rs b/crates/eqwalizer/build.rs
index f7e9a0acaa..2fb342b00e 100644
--- a/crates/eqwalizer/build.rs
+++ b/crates/eqwalizer/build.rs
@@ -11,16 +11,20 @@
 use std::env;
 use std::fs;
 use std::path::Path;
+use std::path::PathBuf;
 use std::process::Command;
 
 fn main() {
     let source_directory = Path::new("../../../eqwalizer/eqwalizer");
+    let tools_dir = source_directory.join("tools");
     let out_dir = env::var_os("OUT_DIR").unwrap();
     let eqwalizer_out_dir = Path::new("../../../../../buck-out/eqwalizer/scala-3.6.4");
     let dest_path = Path::new(&out_dir).join("eqwalizer");
     let extension;
+    let java;
 
     if let Some(path) = env::var_os("ELP_EQWALIZER_PATH") {
+        java = "java".into();
         let from = Path::new(&path);
         extension = from
             .extension()
@@ -30,60 +34,75 @@ fn main() {
             .to_string();
         fs::copy(from, dest_path).expect("Copying precompiled eqwalizer failed");
     } else {
-        extension = "".to_string();
-        // Use the sbt wrapper on linux or otherwise require sbt to be installed
-        let sbt = fs::canonicalize(source_directory.join("./meta/sbt.sh")).unwrap();
-        let output = Command::new(sbt)
-            .arg("assembly")
-            .current_dir(source_directory)
-            .env("EQWALIZER_USE_BUCK_OUT", "true")
-            .output()
-            .expect("failed to execute sbt assembly");
+        let jar = build_jar(source_directory, eqwalizer_out_dir);
 
-        if !output.status.success() {
-            let stdout =
-                String::from_utf8(output.stdout).expect("valid utf8 output from sbt assembly");
-            let stderr =
-                String::from_utf8(output.stderr).expect("valid utf8 output from sbt assembly");
-            panic!("sbt assembly failed with stdout:\n{stdout}\n\nstderr:\n{stderr}");
+        if env::var("OPT_LEVEL").unwrap_or_default() == "0" {
+            extension = "jar".to_string();
+            java = if env::var("CARGO_CFG_TARGET_OS").unwrap() == "linux" {
+                fs::canonicalize(tools_dir.join("graalvm/bin/java")).unwrap()
+            } else {
+                "java".into()
+            };
+            fs::copy(jar, dest_path).expect("Copying fresh eqwalizer failed");
+        } else {
+            extension = "".to_string();
+            java = "java".into();
+            let image_path = build_native_image(source_directory, eqwalizer_out_dir, jar);
+            fs::copy(image_path, dest_path).expect("Copying fresh eqwalizer failed");
         }
 
-        let jar = fs::canonicalize(eqwalizer_out_dir.join("eqwalizer.jar")).unwrap();
-
-        let native_image =
-            fs::canonicalize(source_directory.join("./meta/native-image.sh")).unwrap();
-        let image_path = fs::canonicalize(eqwalizer_out_dir)
-            .unwrap()
-            .join("eqwalizer");
-        let output = Command::new(native_image)
-            .current_dir(source_directory)
-            .arg("-H:IncludeResources=application.conf")
-            .arg("--no-server")
-            .arg("--no-fallback")
-            .arg("-jar")
-            .arg(jar)
-            .arg(&image_path)
-            .output()
-            .expect("failed to execute native-image");
-
-        if !output.status.success() {
-            let stdout =
-                String::from_utf8(output.stdout).expect("valid utf8 output from native-image");
-            let stderr =
-                String::from_utf8(output.stderr).expect("valid utf8 output from native-image");
-            panic!("native-image failed with stdout:\n{stdout}\n\nstderr:\n{stderr}");
-        }
-
-        fs::copy(image_path, dest_path).expect("Copying fresh eqwalizer failed");
-
         rerun_if_changed(source_directory.join("build.sbt"));
         rerun_if_changed(source_directory.join("src"));
     }
 
     println!("cargo:rustc-env=ELP_EQWALIZER_EXT={extension}");
+    println!("cargo:rustc-env=ELP_EQWALIZER_JAVA={}", java.display());
     println!("cargo:rerun-if-env-changed=ELP_EQWALIZER_PATH");
 }
 
+fn build_native_image(source_directory: &Path, eqwalizer_out_dir: &Path, jar: PathBuf) -> PathBuf {
+    let native_image = fs::canonicalize(source_directory.join("./meta/native-image.sh")).unwrap();
+    let image_path = fs::canonicalize(eqwalizer_out_dir)
+        .unwrap()
+        .join("eqwalizer");
+    let output = Command::new(native_image)
+        .current_dir(source_directory)
+        .arg("-H:IncludeResources=application.conf")
+        .arg("--no-server")
+        .arg("--no-fallback")
+        .arg("-jar")
+        .arg(jar)
+        .arg(&image_path)
+        .output()
+        .expect("failed to execute native-image");
+
+    if !output.status.success() {
+        let stdout = String::from_utf8(output.stdout).expect("valid utf8 output from native-image");
+        let stderr = String::from_utf8(output.stderr).expect("valid utf8 output from native-image");
+        panic!("native-image failed with stdout:\n{stdout}\n\nstderr:\n{stderr}");
+    }
+    image_path
+}
+
+fn build_jar(source_directory: &Path, eqwalizer_out_dir: &Path) -> PathBuf {
+    // Use the sbt wrapper on linux or otherwise require sbt to be installed
+    let sbt = fs::canonicalize(source_directory.join("./meta/sbt.sh")).unwrap();
+    let output = Command::new(sbt)
+        .arg("assembly")
+        .current_dir(source_directory)
+        .env("EQWALIZER_USE_BUCK_OUT", "true")
+        .output()
+        .expect("failed to execute sbt assembly");
+
+    if !output.status.success() {
+        let stdout = String::from_utf8(output.stdout).expect("valid utf8 output from sbt assembly");
+        let stderr = String::from_utf8(output.stderr).expect("valid utf8 output from sbt assembly");
+        panic!("sbt assembly failed with stdout:\n{stdout}\n\nstderr:\n{stderr}");
+    }
+
+    fs::canonicalize(eqwalizer_out_dir.join("eqwalizer.jar")).unwrap()
+}
+
 fn rerun_if_changed(path: impl AsRef<Path>) {
     println!("cargo:rerun-if-changed={}", path.as_ref().display());
 }
diff --git a/crates/eqwalizer/src/lib.rs b/crates/eqwalizer/src/lib.rs
index e8c7b18b92..e6f49460a1 100644
--- a/crates/eqwalizer/src/lib.rs
+++ b/crates/eqwalizer/src/lib.rs
@@ -220,7 +220,7 @@ impl EqwalizerExe {
 
         let (cmd, args) = match ext.as_str() {
             "jar" => (
-                "java".into(),
+                env!("ELP_EQWALIZER_JAVA").into(),
                 vec!["-Xss20M".into(), "-jar".into(), path.into()],
             ),
             "" => (path, vec![]),

From 67416c1b6338ad9398f164b35396145b80435ad4 Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Wed, 29 Oct 2025 17:29:04 -0700
Subject: [PATCH 233/394] Occurrence typing fails with tuple/record mix --
 repro

Summary: A bug in occurrence typing where overlap between tuple types and records is not properly computed.

Reviewed By: TD5

Differential Revision: D85806276

fbshipit-source-id: 96330f16d452ebde1f0fffefd1b70c4a12cbd0c2
---
 .../eqwater/deep_tuples.pretty                | 24 ++++++++++++++++++-
 .../eqwater/src/deep_tuples.erl               |  6 +++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/deep_tuples.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/deep_tuples.pretty
index 5a3c9743cb..2983d4c0ab 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/deep_tuples.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/deep_tuples.pretty
@@ -30,4 +30,26 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
 Expression has type:   'ok'
 Context expected type: none()
 
-4 ERRORS
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ eqwater/src/deep_tuples.erl:38:19
+   │
+38 │ test5({ok, V}) -> V.
+   │                   ^
+   │                   │
+   │                   V.
+Expression has type:   'a' | 'ok'
+Context expected type: 'ok'
+   │                   
+
+Because in the expression's type:
+  Here the type is a union type with some valid candidates: 'ok'
+  However the following candidate: 'a'
+  Differs from the expected type:  'ok'
+
+------------------------------ Detailed message ------------------------------
+
+  'a' | 'ok' is not compatible with 'ok'
+  because
+  'a' is not compatible with 'ok'
+
+5 ERRORS
diff --git a/test_projects/eqwalizer_tests/eqwater/src/deep_tuples.erl b/test_projects/eqwalizer_tests/eqwater/src/deep_tuples.erl
index ff4a3a1d84..b7a5f8b81b 100644
--- a/test_projects/eqwalizer_tests/eqwater/src/deep_tuples.erl
+++ b/test_projects/eqwalizer_tests/eqwater/src/deep_tuples.erl
@@ -30,3 +30,9 @@ test3_neg({{Tag1, _}, {_, _}}) ->
       -> none().
 test4_neg({{_, _}, {Tag2, _}}) ->
   Tag2.
+
+-record(foo, {f1 :: atom(), f2 :: atom()}).
+
+-spec test5(#foo{} | {ok, a | ok}) -> ok.
+test5({ok, a}) -> ok;
+test5({ok, V}) -> V.

From 217fa9af86d42b343a6965b45f3ab34d2aa8a339 Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Wed, 29 Oct 2025 17:29:04 -0700
Subject: [PATCH 234/394] Fix occurrence typing for record/tuple unions

Summary: Fix overlap calculation between record types and tuple types by adding an arity check.

Reviewed By: TD5

Differential Revision: D85806277

fbshipit-source-id: ae17d5c157a1519994da1924542879c37566645a
---
 .../eqwater/deep_tuples.pretty                | 24 +------------------
 .../eqwalizer_tests/eqwater/eqwater.pretty    | 24 +------------------
 2 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/deep_tuples.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/deep_tuples.pretty
index 2983d4c0ab..5a3c9743cb 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/deep_tuples.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/deep_tuples.pretty
@@ -30,26 +30,4 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
 Expression has type:   'ok'
 Context expected type: none()
 
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ eqwater/src/deep_tuples.erl:38:19
-   │
-38 │ test5({ok, V}) -> V.
-   │                   ^
-   │                   │
-   │                   V.
-Expression has type:   'a' | 'ok'
-Context expected type: 'ok'
-   │                   
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'ok'
-  However the following candidate: 'a'
-  Differs from the expected type:  'ok'
-
------------------------------- Detailed message ------------------------------
-
-  'a' | 'ok' is not compatible with 'ok'
-  because
-  'a' is not compatible with 'ok'
-
-5 ERRORS
+4 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater.pretty
index d705840326..ab0cebee3f 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater.pretty
@@ -352,28 +352,6 @@ Because in the expression's type:
   because
   tuple() is not compatible with atom()
 
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ eqwater/src/eqwater.erl:681:18
-    │
-681 │     {_N, _N1} -> X#one_field.f1
-    │                  ^
-    │                  │
-    │                  X.
-Expression has type:   #one_field{} | #two_fields1{}
-Context expected type: #one_field{}
-    │                  
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #one_field{}
-  However the following candidate: #two_fields1{}
-  Differs from the expected type:  #one_field{}
-
------------------------------- Detailed message ------------------------------
-
-  #one_field{} | #two_fields1{} is not compatible with #one_field{}
-  because
-  #two_fields1{} is not compatible with #one_field{}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ eqwater/src/eqwater.erl:839:27
     │
@@ -673,4 +651,4 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
 Expression has type:   fun((term(), term()) -> term())
 Context expected type: 'ok'
 
-39 ERRORS
+38 ERRORS

From bcde92c0a313b3c8008e4d90e7b4acfbc5b4363c Mon Sep 17 00:00:00 2001
From: Kleidi Bujari <kleidi@meta.com>
Date: Thu, 30 Oct 2025 02:30:25 -0700
Subject: [PATCH 235/394] Add eglot to emacs docs

Summary: Adds setup instructions for the built-in eglot LSP client.

Reviewed By: alanz

Differential Revision: D85780256

fbshipit-source-id: d977f4ed5da14f4cc8ebb4b71abdec327d5a3b2c
---
 website/docs/get-started/editors/emacs.md | 28 +++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/website/docs/get-started/editors/emacs.md b/website/docs/get-started/editors/emacs.md
index 5b19fd09f2..5111167df6 100644
--- a/website/docs/get-started/editors/emacs.md
+++ b/website/docs/get-started/editors/emacs.md
@@ -4,15 +4,35 @@ sidebar_position: 2
 
 # Emacs
 
-The ELP project can be used as a [language server](https://microsoft.github.io/language-server-protocol/overviews/lsp/overview/) in the Emacs text editor via the [lsp-mode](https://emacs-lsp.github.io/lsp-mode/) LSP client.
+The ELP project can be used as a [language server](https://microsoft.github.io/language-server-protocol/overviews/lsp/overview/) in the Emacs text editor via the [eglot](https://github.com/joaotavora/eglot) or [lsp-mode](https://emacs-lsp.github.io/lsp-mode/) LSP clients.
 
-## Requirements
+## Eglot
 
-### `lsp-mode`
+Eglot is part of Emacs core since Emacs 29.
+For earlier versions it can be installed with the `eglot` package.
+
+### Configuration
+
+```elisp
+(use-package eglot
+
+  :config
+  ;; Remove default LSP server
+  (setopt eglot-server-programs
+          (assq-delete-all 'erlang-mode eglot-server-programs))
+
+  ;; Enable ELP
+  (add-to-list 'eglot-server-programs
+               '(erlang-mode . ("elp" "server"))
+```
+
+Refer to the [manual](https://elpa.gnu.org/devel/doc/eglot.html#Customization-Variables) for additional configuration options.
+
+## lsp-mode
 
 Install the `lsp-mode` package, which is a generic Emacs client for LSP servers. You can follow [these instructions](https://emacs-lsp.github.io/lsp-mode/page/installation/) to install it.
 
-## Configure Emacs
+### Configuration
 
 Add the following to your emacs `.emacs` file or equivalent.
 

From 77657ba9fbff0ed1121e39d9fd8b2ac3681cd050 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Thu, 30 Oct 2025 10:43:41 -0700
Subject: [PATCH 236/394] BE: tree print with ranges

Summary:
When developing a feature in ELP it is often useful to tree print a body, to see clearly what the HIR representation is in it.

This is disconnected from the original source, however, as we have no indication of precisely where each part originates.

This diff updates tree print to optionally take a `BodySourceMap`, and if present it prints the range of the item when introducing the constructor.

It is use to add a test showing that the lowering of Expr::Paren is incorrect.

Reviewed By: TD5

Differential Revision: D85866631

fbshipit-source-id: 866eeba845f396ba51fcfd01e92d9c264e450534
---
 crates/hir/src/body.rs            |  9 +++++
 crates/hir/src/body/tests.rs      | 67 +++++++++++++++++++++++++++++++
 crates/hir/src/body/tree_print.rs | 67 +++++++++++++++++++++++++++++--
 3 files changed, 140 insertions(+), 3 deletions(-)

diff --git a/crates/hir/src/body.rs b/crates/hir/src/body.rs
index e4731ddc87..cc306f9cd3 100644
--- a/crates/hir/src/body.rs
+++ b/crates/hir/src/body.rs
@@ -661,6 +661,15 @@ impl FunctionClauseBody {
         tree_print::print_function_clause_with_strategy(db, self, strategy)
     }
 
+    pub fn tree_print_with_range(
+        &self,
+        db: &dyn InternDatabase,
+        strategy: Strategy,
+        source_map: &BodySourceMap,
+    ) -> String {
+        tree_print::print_function_clause_with_strategy_and_range(db, self, strategy, source_map)
+    }
+
     pub fn fold<T>(&self, strategy: Strategy, initial: T, callback: AnyCallBack<'_, T>) -> T {
         match &self.from_macro {
             Some(from_macro) if strategy.macros == MacroStrategy::DoNotExpand => {
diff --git a/crates/hir/src/body/tests.rs b/crates/hir/src/body/tests.rs
index dd5e5e4699..1dfb93be52 100644
--- a/crates/hir/src/body/tests.rs
+++ b/crates/hir/src/body/tests.rs
@@ -8,6 +8,8 @@
  * above-listed licenses.
  */
 
+use std::fmt::Write;
+
 use elp_base_db::fixture::WithFixture;
 use expect_test::Expect;
 use expect_test::expect;
@@ -2759,6 +2761,71 @@ fn tree_print_function() {
     );
 }
 
+#[test]
+fn tree_print_function_with_ranges() {
+    let (db, file_ids, _) = TestDB::with_many_files(
+        r#"
+        foo() -> ((3)).
+        "#,
+    );
+    let file_id = file_ids[0];
+    let form_list = db.file_form_list(file_id);
+    let strategy = Strategy {
+        macros: MacroStrategy::ExpandButIncludeMacroCall,
+        parens: ParenStrategy::VisibleParens,
+    };
+    let pretty = form_list
+        .forms()
+        .iter()
+        .flat_map(|&form_idx| match form_idx {
+            FormIdx::FunctionClause(function_id) => {
+                let def_map = db.def_map(file_id);
+                let function_def_id = InFile::new(file_id, FunctionDefId::new(function_id));
+                if let Some(_fun_def) = def_map.get_by_function_id(&function_def_id) {
+                    let (body, source_maps) = db.function_body_with_source(function_def_id);
+                    let mut out = String::new();
+                    if let Some((_, clause)) = body.clauses.iter().next() {
+                        if let Some(na) = clause.name.clone() {
+                            writeln!(out, "function: {na}").ok();
+                        }
+                        if let Some(source_map) = source_maps.first() {
+                            write!(
+                                out,
+                                "{}",
+                                clause.tree_print_with_range(&db, strategy, source_map)
+                            )
+                            .ok();
+                        }
+                    }
+                    writeln!(out, ".").ok();
+                    Some(out)
+                } else {
+                    None
+                }
+            }
+            _ => None,
+        })
+        .collect::<Vec<_>>()
+        .join("");
+    // Note: the paren ranges are incorrect here, they will be fixed in the next diff
+    expect![[r#"
+        function: foo/0
+
+        Clause {
+            pats
+            guards
+            exprs
+                Expr<3>:Expr::Paren { (range: 9..14)
+                    Expr<2>:Expr::Paren { (range: 9..14)
+                        Expr<1>:Literal(Integer(3))
+                    }
+                },
+        }
+        .
+    "#]]
+    .assert_eq(pretty.trim_start());
+}
+
 #[test]
 fn tree_print_type_body() {
     check_ast(
diff --git a/crates/hir/src/body/tree_print.rs b/crates/hir/src/body/tree_print.rs
index ff89265c10..bbdc2e8f01 100644
--- a/crates/hir/src/body/tree_print.rs
+++ b/crates/hir/src/body/tree_print.rs
@@ -21,6 +21,7 @@ use super::RecordBody;
 use super::SpecBody;
 use super::SpecOrCallback;
 use crate::AnyAttribute;
+use crate::AnyExprId;
 use crate::AttributeBody;
 use crate::BinarySeg;
 use crate::CRClause;
@@ -175,6 +176,23 @@ pub(crate) fn print_function_clause_with_strategy(
     out
 }
 
+pub(crate) fn print_function_clause_with_strategy_and_range(
+    db: &dyn InternDatabase,
+    clause: &FunctionClauseBody,
+    strategy: Strategy,
+    source_map: &crate::BodySourceMap,
+) -> String {
+    let mut out = String::new();
+
+    let fold_body = fold_body(strategy, &clause.body);
+    let mut printer = Printer::new_with_strategy_and_range(db, &fold_body, strategy, source_map);
+    printer.print_clause(&clause.clause);
+    write!(out, "{}", printer.result_raw()).unwrap();
+    writeln!(out).unwrap();
+
+    out
+}
+
 pub(crate) fn print_type_alias(
     db: &dyn InternDatabase,
     body: &crate::TypeBody,
@@ -322,6 +340,8 @@ struct Printer<'a> {
     indent_level: usize,
     needs_indent: bool,
     include_id: bool,
+    source_map: Option<&'a crate::BodySourceMap>,
+    current: Option<AnyExprId>,
 }
 
 impl<'a> Printer<'a> {
@@ -334,6 +354,8 @@ impl<'a> Printer<'a> {
             indent_level: 0,
             needs_indent: true,
             include_id: true,
+            source_map: None,
+            current: None,
         }
     }
 
@@ -350,6 +372,27 @@ impl<'a> Printer<'a> {
             indent_level: 0,
             needs_indent: true,
             include_id: true,
+            source_map: None,
+            current: None,
+        }
+    }
+
+    fn new_with_strategy_and_range(
+        db: &'a dyn InternDatabase,
+        body: &'a FoldBody,
+        strategy: Strategy,
+        source_map: &'a crate::BodySourceMap,
+    ) -> Self {
+        Printer {
+            db,
+            body,
+            expand_macros: strategy.macros != MacroStrategy::DoNotExpand,
+            buf: String::new(),
+            indent_level: 0,
+            needs_indent: true,
+            include_id: true,
+            source_map: Some(source_map),
+            current: None,
         }
     }
 
@@ -373,6 +416,7 @@ impl<'a> Printer<'a> {
     }
 
     fn print_expr(&mut self, expr_id: &ExprId) {
+        self.current = Some(AnyExprId::Expr(*expr_id));
         if self.include_id {
             write!(self, "Expr<{}>:", expr_id.into_raw().into_u32()).ok();
         }
@@ -732,6 +776,7 @@ impl<'a> Printer<'a> {
             Expr::Paren { expr } => {
                 self.print_herald("Expr::Paren", &mut |this| {
                     this.print_expr(expr);
+                    writeln!(this).ok();
                 });
             }
             Expr::SsrPlaceholder(ssr) => self.print_ssr_placeholder(ssr),
@@ -739,6 +784,7 @@ impl<'a> Printer<'a> {
     }
 
     fn print_pat(&mut self, pat: &PatId) {
+        self.current = Some(AnyExprId::Pat(*pat));
         if self.include_id {
             write!(self, "Pat<{}>:", pat.into_raw().into_u32()).ok();
         }
@@ -871,6 +917,7 @@ impl<'a> Printer<'a> {
     }
 
     fn print_term(&mut self, term: &TermId) {
+        self.current = Some(AnyExprId::Term(*term));
         match &self.body[*term] {
             Term::Missing => {
                 write!(self, "Term::Missing").ok();
@@ -972,6 +1019,7 @@ impl<'a> Printer<'a> {
     }
 
     fn print_type(&mut self, ty: &TypeExprId) {
+        self.current = Some(AnyExprId::TypeExpr(*ty));
         match &self.body[*ty] {
             TypeExpr::AnnType { var, ty } => {
                 self.print_herald("TypeExpr::AnnType", &mut |this| {
@@ -1234,7 +1282,16 @@ impl<'a> Printer<'a> {
     }
 
     fn print_herald(&mut self, label: &str, print: &mut dyn FnMut(&mut Self)) {
-        writeln!(self, "{label} {{").ok();
+        let range = self
+            .current
+            .and_then(|id| self.source_map.and_then(|sm| sm.any(id)))
+            .map(|es| es.range().range);
+
+        if let Some(r) = range {
+            writeln!(self, "{label} {{ (range: {r:?})").ok();
+        } else {
+            writeln!(self, "{label} {{").ok();
+        }
         self.indent();
         print(self);
         self.dedent();
@@ -3301,7 +3358,9 @@ mod tests {
                     exprs
                         Expr<3>:Expr::Paren {
                             Expr<2>:Expr::Paren {
-                                Expr<1>:Literal(Integer(3))}},
+                                Expr<1>:Literal(Integer(3))
+                            }
+                        },
                 }.
             "#]],
         );
@@ -3348,7 +3407,9 @@ mod tests {
                         Expr<4>:Expr::Tuple {
                             Expr<3>:Expr::Paren {
                                 Expr<2>:Expr::Paren {
-                                    Expr<1>:Literal(Integer(3))}},
+                                    Expr<1>:Literal(Integer(3))
+                                }
+                            },
                         },
                 }.
             "#]],

From 4ba56bc857d6a19ee1c9a66570de96f05a4cb4a2 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Thu, 30 Oct 2025 10:43:41 -0700
Subject: [PATCH 237/394] fix BodySourceMap entries for lowering
 Expr::Paren/Pat::Paren

Summary:
There is an error in tracking the source location in the `BodySourceMap` when lowering into `Expr::Paren` and `Pat::Paren`.

This diff fixes those.

Reviewed By: TD5

Differential Revision: D85866708

fbshipit-source-id: 8a2aa8b55e2981dd4c212114daf5bed15573cfa4
---
 crates/hir/src/body/lower.rs | 15 +++++----------
 crates/hir/src/body/tests.rs | 13 ++++++++-----
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/crates/hir/src/body/lower.rs b/crates/hir/src/body/lower.rs
index f6a03b8a2c..f59f96d0ec 100644
--- a/crates/hir/src/body/lower.rs
+++ b/crates/hir/src/body/lower.rs
@@ -847,11 +847,8 @@ impl<'a> Ctx<'a> {
                 self.alloc_pat(Pat::Missing, Some(expr))
             }
             ast::ExprMax::ParenExpr(paren_expr) => {
-                if let Some(paren_expr) = paren_expr.expr() {
-                    let pat_id = self.lower_pat(&paren_expr);
-                    let ptr = AstPtr::new(&paren_expr);
-                    let source = InFileAstPtr::new(self.curr_file_id(), ptr);
-                    self.record_pat_source(pat_id, source);
+                if let Some(inner_paren_expr) = paren_expr.expr() {
+                    let pat_id = self.lower_pat(&inner_paren_expr);
                     self.alloc_pat(Pat::Paren { pat: pat_id }, Some(expr))
                 } else {
                     self.alloc_pat(Pat::Missing, Some(expr))
@@ -1486,11 +1483,8 @@ impl<'a> Ctx<'a> {
                 }),
             ast::ExprMax::MacroString(_) => self.alloc_expr(Expr::Missing, Some(expr)),
             ast::ExprMax::ParenExpr(paren_expr) => {
-                if let Some(paren_expr) = paren_expr.expr() {
-                    let expr_id = self.lower_expr(&paren_expr);
-                    let ptr = AstPtr::new(expr);
-                    let source = InFileAstPtr::new(self.curr_file_id(), ptr);
-                    self.record_expr_source(expr_id, source);
+                if let Some(inner_expr) = paren_expr.expr() {
+                    let expr_id = self.lower_expr(&inner_expr);
                     self.alloc_expr(Expr::Paren { expr: expr_id }, Some(expr))
                 } else {
                     self.alloc_expr(Expr::Missing, Some(expr))
@@ -2195,6 +2189,7 @@ impl<'a> Ctx<'a> {
                 }),
             ast::ExprMax::MacroString(_) => self.alloc_type_expr(TypeExpr::Missing, Some(expr)),
             ast::ExprMax::ParenExpr(paren_expr) => {
+                // TODO T243351061, update to include TypeExpr::Paren when it exists
                 if let Some(expr) = paren_expr.expr() {
                     let type_expr_id = self.lower_type_expr(&expr);
                     let ptr = AstPtr::new(&expr);
diff --git a/crates/hir/src/body/tests.rs b/crates/hir/src/body/tests.rs
index 1dfb93be52..c616df812d 100644
--- a/crates/hir/src/body/tests.rs
+++ b/crates/hir/src/body/tests.rs
@@ -2765,7 +2765,7 @@ fn tree_print_function() {
 fn tree_print_function_with_ranges() {
     let (db, file_ids, _) = TestDB::with_many_files(
         r#"
-        foo() -> ((3)).
+        foo( (((A))) ) -> ((3)).
         "#,
     );
     let file_id = file_ids[0];
@@ -2807,16 +2807,19 @@ fn tree_print_function_with_ranges() {
         })
         .collect::<Vec<_>>()
         .join("");
-    // Note: the paren ranges are incorrect here, they will be fixed in the next diff
     expect![[r#"
-        function: foo/0
+        function: foo/1
 
         Clause {
             pats
+                Pat<3>:Pat::Paren { (range: 5..12)
+                    Pat<2>:Pat::Paren { (range: 6..11)
+                        Pat<1>:Pat::Paren { (range: 7..10)
+                            Pat<0>:Pat::Var(A)}}},
             guards
             exprs
-                Expr<3>:Expr::Paren { (range: 9..14)
-                    Expr<2>:Expr::Paren { (range: 9..14)
+                Expr<3>:Expr::Paren { (range: 18..23)
+                    Expr<2>:Expr::Paren { (range: 19..22)
                         Expr<1>:Literal(Integer(3))
                     }
                 },

From 88bb35f898fd6a707521724a9b8534aec8fe714f Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Thu, 30 Oct 2025 10:43:41 -0700
Subject: [PATCH 238/394] CLI ssr: allow specifying multiple SSR patterns

Summary:
Since project loading and traversal takes some time, allow matching more than one SSR pattern at the same time.

The CLI arg now accepts multiple patterns, e.g.

```
elp ssr "3" "{4}"
```

Reviewed By: TD5

Differential Revision: D85870548

fbshipit-source-id: d768fbbebb2f74e3cedd4528b2c4831cc1c9f3e7
---
 crates/elp/src/bin/args.rs                    |  9 ++++--
 crates/elp/src/bin/main.rs                    | 11 +++++++
 crates/elp/src/bin/ssr_cli.rs                 | 30 +++++++++++--------
 .../linter/ssr_ad_hoc_cli_multiple.stdout     |  4 +++
 test_projects/linter/app_a/src/app_a_ssr.erl  | 11 +++++++
 5 files changed, 49 insertions(+), 16 deletions(-)
 create mode 100644 crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_multiple.stdout
 create mode 100644 test_projects/linter/app_a/src/app_a_ssr.erl

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index 2cb630bbd5..e5517b323c 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -371,9 +371,12 @@ pub struct Ssr {
     #[bpaf(long("report-system-stats"))]
     pub report_system_stats: bool,
 
-    /// SSR spec to use
-    #[bpaf(positional("SSR_SPEC"))]
-    pub ssr_spec: String,
+    /// SSR specs to use
+    #[bpaf(
+        positional("SSR_SPECS"),
+        guard(at_least_1, "there should be at least one spec")
+    )]
+    pub ssr_specs: Vec<String>,
 }
 
 #[derive(Clone, Debug, Bpaf)]
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 8d231ba425..1aa3a591f0 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -2024,6 +2024,17 @@ mod tests {
         )
     }
 
+    #[test]
+    fn lint_ssr_as_cli_arg_multiple_patterns() {
+        simple_snapshot(
+            args_vec!["ssr", "3" "{4}",],
+            "linter",
+            expect_file!("../resources/test/linter/ssr_ad_hoc_cli_multiple.stdout"),
+            true,
+            None,
+        )
+    }
+
     #[test]
     fn lint_ssr_as_cli_arg_malformed() {
         simple_snapshot_expect_stderror(
diff --git a/crates/elp/src/bin/ssr_cli.rs b/crates/elp/src/bin/ssr_cli.rs
index c300fee284..624c516861 100644
--- a/crates/elp/src/bin/ssr_cli.rs
+++ b/crates/elp/src/bin/ssr_cli.rs
@@ -65,25 +65,29 @@ pub fn run_ssr_command(
 ) -> Result<()> {
     let start_time = SystemTime::now();
     let memory_start = MemoryUsage::now();
-    // Normalize the SSR pattern
-    let normalized_pattern = normalize_ssr_pattern(&args.ssr_spec);
 
-    // Validate the SSR pattern early
+    // Validate all SSR patterns early
     let analysis_host = AnalysisHost::default();
     let analysis = analysis_host.analysis();
-    match analysis.validate_ssr_pattern(&normalized_pattern) {
-        Ok(Ok(())) => {}
-        Ok(Err(e)) => bail!("invalid SSR pattern '{}': {}", args.ssr_spec, e),
-        Err(_cancelled) => bail!("SSR pattern validation was cancelled"),
+    for pattern in &args.ssr_specs {
+        let normalized_pattern = normalize_ssr_pattern(pattern);
+        match analysis.validate_ssr_pattern(&normalized_pattern) {
+            Ok(Ok(())) => {}
+            Ok(Err(e)) => bail!("invalid SSR pattern '{}': {}", pattern, e),
+            Err(_cancelled) => bail!("SSR pattern validation was cancelled"),
+        }
     }
 
-    // Create the lint config with the SSR pattern
+    // Create the lint config with all SSR patterns
     let mut lint_config = LintConfig::default();
-    let ssr_lint = diagnostics::Lint::LintMatchSsr(MatchSsr {
-        ssr_pattern: normalized_pattern,
-        message: None,
-    });
-    lint_config.ad_hoc_lints.lints.push(ssr_lint);
+    for pattern in &args.ssr_specs {
+        let normalized_pattern = normalize_ssr_pattern(pattern);
+        let ssr_lint = diagnostics::Lint::LintMatchSsr(MatchSsr {
+            ssr_pattern: normalized_pattern,
+            message: None,
+        });
+        lint_config.ad_hoc_lints.lints.push(ssr_lint);
+    }
 
     // Build the diagnostics config
     let diagnostics_config = DiagnosticsConfig::default()
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_multiple.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_multiple.stdout
new file mode 100644
index 0000000000..afffa751be
--- /dev/null
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_multiple.stdout
@@ -0,0 +1,4 @@
+Matches found in 1 modules:
+  app_a_ssr: 2
+      6:9-6:14::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: 3.
+      10:10-10:17::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {4}.
diff --git a/test_projects/linter/app_a/src/app_a_ssr.erl b/test_projects/linter/app_a/src/app_a_ssr.erl
new file mode 100644
index 0000000000..a7f6970376
--- /dev/null
+++ b/test_projects/linter/app_a/src/app_a_ssr.erl
@@ -0,0 +1,11 @@
+-module(app_a_ssr).
+
+-export([bar/1, bar2/0]).
+
+%% Used for testing visible parens matching
+bar(X) ->
+     X = ((3)),
+     X = (4).
+
+-define(BAR(X), {X}).
+bar2() -> ?BAR(4).

From 37e84921d7aa5e61391c6cf5d8ea50340d153f2c Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Thu, 30 Oct 2025 11:37:37 -0700
Subject: [PATCH 239/394] Useless error messages -- repro

Summary: Some error messages with unions of maps are useless. Add repros.

Reviewed By: TD5

Differential Revision: D85868726

fbshipit-source-id: c726054b934690f30bc3e5c190d55e9dd25e361f
---
 .../check/error_messages.pretty               | 62 ++++++++++++++++++-
 .../check/src/error_messages.erl              |  8 +++
 2 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages.pretty
index ee63204870..90c058d838 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages.pretty
@@ -125,4 +125,64 @@ Because in the expression's type:
   because
   atom() is not compatible with binary()
 
-6 ERRORS
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/error_messages.erl:37:31
+   │
+37 │ no_good_map_candidate_1(M) -> M.
+   │                               ^
+   │                               │
+   │                               M.
+Expression has type:   #{foo => #{large_map_key_a => 'large_map_val_a', large_map_key_b => 'large_map_val_b'}}
+Context expected type: #{foo => #{large_map_key_c => 'large_map_val_c'} | #{large_map_key_d => 'large_map_val_d'}}
+   │                               
+
+Because in the expression's type:
+  #{ foo =>
+    Here the type is:     #{...}
+    Context expects type: #{...} | #{...}
+    No candidate matches in the expected union.
+  , ... }
+
+------------------------------ Detailed message ------------------------------
+
+  #{foo => #{large_map_key_a => 'large_map_val_a', large_map_key_b => 'large_map_val_b'}} is not compatible with #{foo => #{large_map_key_c => 'large_map_val_c'} | #{large_map_key_d => 'large_map_val_d'}}
+  because
+  at key `foo`:
+  #{foo => #{large_map_key_a => 'large_map_val_a', large_map_key_b => 'large_map_val_b'}} is not compatible with #{foo => #{large_map_key_c => 'large_map_val_c'} | #{large_map_key_d => 'large_map_val_d'}}
+  because
+  #{large_map_key_a => 'large_map_val_a', large_map_key_b => 'large_map_val_b'} is not compatible with #{large_map_key_c => 'large_map_val_c'} | #{large_map_key_d => 'large_map_val_d'}
+  because
+  #{large_map_key_a => 'large_map_val_a', large_map_key_b => 'large_map_val_b'} is not compatible with #{large_map_key_c => 'large_map_val_c'}
+  key `large_map_key_a` is declared in the former but not in the latter and the latter map has no default association
+
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ check/src/error_messages.erl:41:31
+   │
+41 │ no_good_map_candidate_2(M) -> M.
+   │                               ^
+   │                               │
+   │                               M.
+Expression has type:   #{foo => #{large_map_key_a => 'large_map_val_a', large_map_key_b => 'large_map_val_b'}}
+Context expected type: #{foo => #{large_map_key_c => 'large_map_val_c', large_map_key_d => 'large_map_val_d'} | 'any'}
+   │                               
+
+Because in the expression's type:
+  #{ foo =>
+    Here the type is:     #{...}
+    Context expects type: #{...} | 'any'
+    No candidate matches in the expected union.
+  , ... }
+
+------------------------------ Detailed message ------------------------------
+
+  #{foo => #{large_map_key_a => 'large_map_val_a', large_map_key_b => 'large_map_val_b'}} is not compatible with #{foo => #{large_map_key_c => 'large_map_val_c', large_map_key_d => 'large_map_val_d'} | 'any'}
+  because
+  at key `foo`:
+  #{foo => #{large_map_key_a => 'large_map_val_a', large_map_key_b => 'large_map_val_b'}} is not compatible with #{foo => #{large_map_key_c => 'large_map_val_c', large_map_key_d => 'large_map_val_d'} | 'any'}
+  because
+  #{large_map_key_a => 'large_map_val_a', large_map_key_b => 'large_map_val_b'} is not compatible with #{large_map_key_c => 'large_map_val_c', large_map_key_d => 'large_map_val_d'} | 'any'
+  because
+  #{large_map_key_a => 'large_map_val_a', large_map_key_b => 'large_map_val_b'} is not compatible with #{large_map_key_c => 'large_map_val_c', large_map_key_d => 'large_map_val_d'}
+  key `large_map_key_a` is declared in the former but not in the latter and the latter map has no default association
+
+8 ERRORS
diff --git a/test_projects/eqwalizer_tests/check/src/error_messages.erl b/test_projects/eqwalizer_tests/check/src/error_messages.erl
index edeab66990..73f64ae814 100644
--- a/test_projects/eqwalizer_tests/check/src/error_messages.erl
+++ b/test_projects/eqwalizer_tests/check/src/error_messages.erl
@@ -31,3 +31,11 @@ no_record_conversion_2(Foo) -> Foo.
 
 -spec record_conversion(#foo{}) -> {foo, binary(), atom()}.
 record_conversion(Foo) -> Foo.
+
+-spec no_good_map_candidate_1(#{foo => #{large_map_key_a => large_map_val_a, large_map_key_b => large_map_val_b}})
+    -> #{foo => #{large_map_key_c => large_map_val_c} | #{large_map_key_d => large_map_val_d}}.
+no_good_map_candidate_1(M) -> M.
+
+-spec no_good_map_candidate_2(#{foo => #{large_map_key_a => large_map_val_a, large_map_key_b => large_map_val_b}})
+    -> #{foo => #{large_map_key_c => large_map_val_c, large_map_key_d => large_map_val_d} | any}.
+no_good_map_candidate_2(M) -> M.

From 52857fbf6922b1e9b3b5ad96f6ea6031a9dbe818 Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Thu, 30 Oct 2025 11:37:37 -0700
Subject: [PATCH 240/394] Fix error message heuristic on unions of maps

Summary:
The heuristic uses a score of 50 as the limit for a partial match in a union, but partial matches on maps can go as low as 40.
Change the limit to be 40 for both, so that a candidate map is always selected.

Reviewed By: TD5

Differential Revision: D85868725

fbshipit-source-id: 60b1bfda0f58642bda144ac1e3bf2389523101e7
---
 .../test/eqwalizer_tests/check/custom-OTP-26.pretty  |  7 +++++++
 .../test/eqwalizer_tests/check/custom-OTP-27.pretty  |  7 +++++++
 .../test/eqwalizer_tests/check/custom-OTP-28.pretty  |  7 +++++++
 .../test/eqwalizer_tests/check/error_messages.pretty | 12 ++++++------
 .../test/eqwalizer_tests/check/opaque.pretty         |  8 +++++---
 .../eqwalizer_tests/check/recursive_aliases.pretty   |  8 +++++---
 6 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-26.pretty
index c1ada7b0b2..370f7689e9 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-26.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-26.pretty
@@ -792,6 +792,13 @@ Expression has type:   #{'a' | 'b' => atom() | number()}
 Context expected type: #{a := atom(), b := number()} | #{a := atom()}
     │                         
 
+Because in the expression's type:
+  Here the type is:     #{...}
+  Context expects type: #{a := ..., b := ..., ...}
+  The type of the expression is missing the following required keys: a, b.
+
+------------------------------ Detailed message ------------------------------
+
   #{'a' | 'b' => atom() | number()} is not compatible with #{a := atom(), b := number()} | #{a := atom()}
   because
   #{'a' | 'b' => atom() | number()} is not compatible with #{a := atom(), b := number()}
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty
index c1ada7b0b2..370f7689e9 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty
@@ -792,6 +792,13 @@ Expression has type:   #{'a' | 'b' => atom() | number()}
 Context expected type: #{a := atom(), b := number()} | #{a := atom()}
     │                         
 
+Because in the expression's type:
+  Here the type is:     #{...}
+  Context expects type: #{a := ..., b := ..., ...}
+  The type of the expression is missing the following required keys: a, b.
+
+------------------------------ Detailed message ------------------------------
+
   #{'a' | 'b' => atom() | number()} is not compatible with #{a := atom(), b := number()} | #{a := atom()}
   because
   #{'a' | 'b' => atom() | number()} is not compatible with #{a := atom(), b := number()}
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-28.pretty
index a6f331c261..ec107b3c14 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-28.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-28.pretty
@@ -792,6 +792,13 @@ Expression has type:   #{'a' | 'b' => atom() | number()}
 Context expected type: #{a := atom(), b := number()} | #{a := atom()}
     │                         
 
+Because in the expression's type:
+  Here the type is:     #{...}
+  Context expects type: #{a := ..., b := ..., ...}
+  The type of the expression is missing the following required keys: a, b.
+
+------------------------------ Detailed message ------------------------------
+
   #{'a' | 'b' => atom() | number()} is not compatible with #{a := atom(), b := number()} | #{a := atom()}
   because
   #{'a' | 'b' => atom() | number()} is not compatible with #{a := atom(), b := number()}
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages.pretty
index 90c058d838..ab48c38337 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages.pretty
@@ -138,9 +138,9 @@ Context expected type: #{foo => #{large_map_key_c => 'large_map_val_c'} | #{larg
 
 Because in the expression's type:
   #{ foo =>
-    Here the type is:     #{...}
-    Context expects type: #{...} | #{...}
-    No candidate matches in the expected union.
+    Here the type is:     #{large_map_key_a => ...}
+    Context expects type: #{...}
+    The expected map has no corresponding key for: large_map_key_a.
   , ... }
 
 ------------------------------ Detailed message ------------------------------
@@ -168,9 +168,9 @@ Context expected type: #{foo => #{large_map_key_c => 'large_map_val_c', large_ma
 
 Because in the expression's type:
   #{ foo =>
-    Here the type is:     #{...}
-    Context expects type: #{...} | 'any'
-    No candidate matches in the expected union.
+    Here the type is:     #{large_map_key_a => ...}
+    Context expects type: #{...}
+    The expected map has no corresponding key for: large_map_key_a.
   , ... }
 
 ------------------------------ Detailed message ------------------------------
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/opaque.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/opaque.pretty
index eea53f78f7..765efea8fe 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/opaque.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/opaque.pretty
@@ -10,9 +10,11 @@ Context expected type: sets:set({'ok', 'ok'})
    │   
 
 Because in the expression's type:
-  Here the type is a union type with some valid candidates: #set{}
-  However the following candidate: #{{ok, error} => []}
-  Differs from the expected type:  #set{} | #{{ok, ok} => []}
+  The type is a union type with some valid candidates: #set{}
+  However, the following candidate doesn't match:
+  Here the type is:     #{{ok, error} => ...}
+  Context expects type: #{...}
+  The expected map has no corresponding key for: {ok, error}.
 
 ------------------------------ Detailed message ------------------------------
 
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/recursive_aliases.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/recursive_aliases.pretty
index 87d235e56c..215d6a54ae 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/recursive_aliases.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/recursive_aliases.pretty
@@ -166,9 +166,11 @@ Context expected type: mChainA()
     │                       
 
 Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'nil'
-  However the following candidate: #{b := mChainB()}
-  Differs from the expected type:  'nil' | #{a := mChainA()}
+  The type is a union type with some valid candidates: 'nil'
+  However, the following candidate doesn't match:
+  Here the type is:     #{...}
+  Context expects type: #{a := ..., ...}
+  The type of the expression is missing the following required keys: a.
 
 ------------------------------ Detailed message ------------------------------
 

From f37f27cb743456552c4c71c74f7b6066fdb2c840 Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Thu, 30 Oct 2025 17:19:01 -0700
Subject: [PATCH 241/394] Snapshot tests -- better maps:map/2

Summary: A snapshot test for more precise support of `maps:map/2`

Reviewed By: RobinMorisset

Differential Revision: D85677708

fbshipit-source-id: 1520e78419c51ae26604768fd78d787e06301a61
---
 .../check/custom-OTP-27.pretty                | 32 ++++++++++++++++++-
 .../eqwalizer_tests/check/src/custom.erl      | 10 ++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty
index 370f7689e9..fbd40069b8 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty
@@ -3255,4 +3255,34 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
 Expression has type:   number()
 Context expected type: binary()
 
-202 ERRORS
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+     ┌─ check/src/custom.erl:2722:5
+     │    
+2722 │ ╭ ╭     maps:map(fun
+2723 │ │ │         (ka, va) -> va2;
+2724 │ │ │         (_K, V) -> V
+2725 │ │ │     end, M).
+     │ ╰─│───────────^ maps:map(fun, M).
+Expression has type:   #{ka => 'va' | 'vb' | 'vc' | 'va2', kb => 'va' | 'vb' | 'vc' | 'va2', kc => 'va' | 'vb' | 'vc' | 'va2'}
+Context expected type: #{ka => 'va2', kb => 'vb', kc => 'vc'}
+     │   ╰───────────' 
+
+Because in the expression's type:
+  #{ ka =>
+    Here the type is a union type with some valid candidates: 'va2'
+    However the following candidate: 'va'
+    Differs from the expected type:  'va2'
+  , ... }
+
+------------------------------ Detailed message ------------------------------
+
+  #{ka => 'va' | 'vb' | 'vc' | 'va2', kb => 'va' | 'vb' | 'vc' | 'va2', kc => 'va' | 'vb' | 'vc' | 'va2'} is not compatible with #{ka => 'va2', kb => 'vb', kc => 'vc'}
+  because
+  at key `ka`:
+  #{ka => 'va' | 'vb' | 'vc' | 'va2', kb => 'va' | 'vb' | 'vc' | 'va2', kc => 'va' | 'vb' | 'vc' | 'va2'} is not compatible with #{ka => 'va2', kb => 'vb', kc => 'vc'}
+  because
+  'va' | 'vb' | 'vc' | 'va2' is not compatible with 'va2'
+  because
+  'va' is not compatible with 'va2'
+
+203 ERRORS
diff --git a/test_projects/eqwalizer_tests/check/src/custom.erl b/test_projects/eqwalizer_tests/check/src/custom.erl
index b03ddd651e..911bfa3a0a 100644
--- a/test_projects/eqwalizer_tests/check/src/custom.erl
+++ b/test_projects/eqwalizer_tests/check/src/custom.erl
@@ -2713,3 +2713,13 @@ maps_foreach_neg(M) ->
         end,
         M
     ).
+
+-spec maps_map_2_13(
+    #{ka => va, kb => vb, kc => vc}
+) ->
+    #{ka => va2, kb => vb, kc => vc}.
+maps_map_2_13(M) ->
+    maps:map(fun
+        (ka, va) -> va2;
+        (_K, V) -> V
+    end, M).

From 0e9a4881e0019df925f7df178c6dd51b1dbd4ee6 Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Thu, 30 Oct 2025 17:19:01 -0700
Subject: [PATCH 242/394] Better support for maps:map

Summary:
Elab the lambda in `maps:map/2` once for every key/value pair of the given map type, so as to keep the precise association between key and result.

This effectively makes the complexity O(map_fields * clauses) instead of just O(clauses).
However, this shows no noticeable performance impact in production.

Reviewed By: TD5

Differential Revision: D85590251

fbshipit-source-id: 266a4d3f4f5b71ab738ee9c799dda7e30161560a
---
 .../check/custom-OTP-27.pretty                | 32 +------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty
index fbd40069b8..370f7689e9 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty
@@ -3255,34 +3255,4 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
 Expression has type:   number()
 Context expected type: binary()
 
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2722:5
-     │    
-2722 │ ╭ ╭     maps:map(fun
-2723 │ │ │         (ka, va) -> va2;
-2724 │ │ │         (_K, V) -> V
-2725 │ │ │     end, M).
-     │ ╰─│───────────^ maps:map(fun, M).
-Expression has type:   #{ka => 'va' | 'vb' | 'vc' | 'va2', kb => 'va' | 'vb' | 'vc' | 'va2', kc => 'va' | 'vb' | 'vc' | 'va2'}
-Context expected type: #{ka => 'va2', kb => 'vb', kc => 'vc'}
-     │   ╰───────────' 
-
-Because in the expression's type:
-  #{ ka =>
-    Here the type is a union type with some valid candidates: 'va2'
-    However the following candidate: 'va'
-    Differs from the expected type:  'va2'
-  , ... }
-
------------------------------- Detailed message ------------------------------
-
-  #{ka => 'va' | 'vb' | 'vc' | 'va2', kb => 'va' | 'vb' | 'vc' | 'va2', kc => 'va' | 'vb' | 'vc' | 'va2'} is not compatible with #{ka => 'va2', kb => 'vb', kc => 'vc'}
-  because
-  at key `ka`:
-  #{ka => 'va' | 'vb' | 'vc' | 'va2', kb => 'va' | 'vb' | 'vc' | 'va2', kc => 'va' | 'vb' | 'vc' | 'va2'} is not compatible with #{ka => 'va2', kb => 'vb', kc => 'vc'}
-  because
-  'va' | 'vb' | 'vc' | 'va2' is not compatible with 'va2'
-  because
-  'va' is not compatible with 'va2'
-
-203 ERRORS
+202 ERRORS

From a6144459b8fb828a789a4a11cf8034a643340e45 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 31 Oct 2025 04:08:27 -0700
Subject: [PATCH 243/394] CLI ssr: allow specifying macro and parens strategy

Summary:
Structural Search (SSR) matches the syntax tree used internally in ELP, called HIR. This is conceptually similar to Erlang Abstract Forms.

When we lower the surface Erlang language into this, we expand macros and strip of parentheses, as the precedence of items is captured in the actual HIR representation.

But sometimes when we are searching over Erlang code we want to explicitly match parentheses, e.g. if we want to find all instances of redundant duplicate ones.

This diff allows you to do this by issue the command

```
elp ssr --parens "((_A))"
```

Likewise, sometimes you are interested in occurrences of macros. This can now be provided using a match like

```
elp ssr --macros no-expand "?BAR(_X)"
```

Reviewed By: TD5

Differential Revision: D85876784

fbshipit-source-id: ba62d83ed8ea9c7ac30cceda2cac446ecdeefb06
---
 crates/elp/src/bin/args.rs                    |  57 ++++++
 crates/elp/src/bin/main.rs                    |  67 +++++++
 crates/elp/src/bin/ssr_cli.rs                 |   4 +
 crates/elp/src/lib.rs                         |   1 +
 ...rse_elp_lint_explicit_enable_output.stdout |   4 +-
 ...e_elp_no_lint_specified_json_output.stdout |   2 +
 .../parse_elp_no_lint_specified_output.stdout |   5 +-
 .../ssr_ad_hoc_cli_macros_expand.stdout       |   3 +
 .../ssr_ad_hoc_cli_macros_no_expand.stdout    |   3 +
 ...sr_ad_hoc_cli_macros_visible_expand.stdout |   4 +
 .../ssr_ad_hoc_cli_parens_invisible.stdout    |   3 +
 .../ssr_ad_hoc_cli_parens_visible.stdout      |   5 +
 .../test/linter/warnings_as_errors.stdout     |   5 +-
 crates/elp/src/resources/test/ssr_help.stdout |   6 +-
 crates/ide/src/diagnostics/from_config.rs     | 171 +++++++++++++++++-
 15 files changed, 331 insertions(+), 9 deletions(-)
 create mode 100644 crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_expand.stdout
 create mode 100644 crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_no_expand.stdout
 create mode 100644 crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_visible_expand.stdout
 create mode 100644 crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_invisible.stdout
 create mode 100644 crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_visible.stdout

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index e5517b323c..343f6bd820 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -13,12 +13,17 @@ use std::env;
 use std::fs;
 use std::path::PathBuf;
 
+use anyhow::Result;
+use anyhow::bail;
 use bpaf::Bpaf;
 use bpaf::Parser;
 use bpaf::construct;
 use bpaf::long;
 use elp_ide::elp_ide_db::DiagnosticCode;
 use elp_project_model::buck::BuckQueryConfig;
+use hir::fold::MacroStrategy;
+use hir::fold::ParenStrategy;
+use hir::fold::Strategy;
 use itertools::Itertools;
 use serde::Deserialize;
 
@@ -367,6 +372,20 @@ pub struct Ssr {
     )]
     pub format: Option<String>,
 
+    /// Macro expansion strategy: expand | no-expand | visible-expand (default expand)
+    #[bpaf(
+        long("macros"),
+        argument("STRATEGY"),
+        complete(macros_completer),
+        fallback(None),
+        guard(macros_guard, "Please supply a valid macro expansion value")
+    )]
+    pub macro_strategy: Option<String>,
+
+    /// Explicitly match parentheses. If omitted, they are ignored.
+    #[bpaf(long("parens"))]
+    pub paren_strategy: bool,
+
     /// Report system memory usage and other statistics
     #[bpaf(long("report-system-stats"))]
     pub report_system_stats: bool,
@@ -706,6 +725,21 @@ fn format_guard(format: &Option<String>) -> bool {
     }
 }
 
+fn macros_completer(_: &Option<String>) -> Vec<(String, Option<String>)> {
+    vec![
+        ("expand".to_string(), None),
+        ("no-expand".to_string(), None),
+        ("visible-expand".to_string(), None),
+    ]
+}
+
+fn macros_guard(format: &Option<String>) -> bool {
+    match format {
+        None => true,
+        Some(_) => parse_macro_strategy(format).is_ok(),
+    }
+}
+
 #[allow(clippy::ptr_arg)] // This is needed in the BPAF macros
 fn at_least_1(data: &Vec<String>) -> bool {
     !data.is_empty()
@@ -788,6 +822,19 @@ impl Lint {
     }
 }
 
+fn parse_macro_strategy(macro_strategy: &Option<String>) -> Result<MacroStrategy> {
+    match macro_strategy.as_deref() {
+        Some("no-expand") => Ok(MacroStrategy::DoNotExpand),
+        Some("expand") => Ok(MacroStrategy::Expand),
+        Some("visible-expand") => Ok(MacroStrategy::ExpandButIncludeMacroCall),
+        None => Ok(MacroStrategy::Expand),
+        Some(s) => bail!(
+            "Invalid macro strategy '{}'. Valid options are: expand, no-expand, visible-expand",
+            s
+        ),
+    }
+}
+
 impl Ssr {
     pub fn is_format_normal(&self) -> bool {
         self.format.is_none()
@@ -796,6 +843,16 @@ impl Ssr {
     pub fn is_format_json(&self) -> bool {
         self.format == Some("json".to_string())
     }
+
+    pub fn parse_strategy(&self) -> Result<Strategy> {
+        let macros = parse_macro_strategy(&self.macro_strategy)?;
+        let parens = if self.paren_strategy {
+            ParenStrategy::VisibleParens
+        } else {
+            ParenStrategy::InvisibleParens
+        };
+        Ok(Strategy { macros, parens })
+    }
 }
 
 impl ParseAllElp {
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 1aa3a591f0..16b7bbdfbe 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -2047,6 +2047,73 @@ mod tests {
         )
     }
 
+    #[test]
+    fn lint_ssr_as_cli_parens_visible() {
+        simple_snapshot(
+            args_vec!["ssr", "--parens", "(_@A)",],
+            "linter",
+            expect_file!("../resources/test/linter/ssr_ad_hoc_cli_parens_visible.stdout"),
+            true,
+            None,
+        )
+    }
+
+    #[test]
+    fn lint_ssr_as_cli_parens_invisible() {
+        // Invisible parens are the default
+        simple_snapshot(
+            args_vec!["ssr", "(((3)))",],
+            "linter",
+            expect_file!("../resources/test/linter/ssr_ad_hoc_cli_parens_invisible.stdout"),
+            true,
+            None,
+        )
+    }
+
+    #[test]
+    fn lint_ssr_as_cli_macros_expand() {
+        simple_snapshot(
+            args_vec!["ssr", "--macros", "expand", "?BAR(_@AA)", "{4}"],
+            "linter",
+            expect_file!("../resources/test/linter/ssr_ad_hoc_cli_macros_expand.stdout"),
+            true,
+            None,
+        )
+    }
+
+    #[test]
+    fn lint_ssr_as_cli_macros_expand_is_default() {
+        simple_snapshot(
+            args_vec!["ssr", "?BAR(_@AA)", "{4}"],
+            "linter",
+            expect_file!("../resources/test/linter/ssr_ad_hoc_cli_macros_expand.stdout"),
+            true,
+            None,
+        )
+    }
+
+    #[test]
+    fn lint_ssr_as_cli_macros_visible_expand() {
+        simple_snapshot(
+            args_vec!["ssr", "--macros", "visible-expand", "?BAR(_@AA)", "{4}"],
+            "linter",
+            expect_file!("../resources/test/linter/ssr_ad_hoc_cli_macros_visible_expand.stdout"),
+            true,
+            None,
+        )
+    }
+
+    #[test]
+    fn lint_ssr_as_cli_macros_no_expand() {
+        simple_snapshot(
+            args_vec!["ssr", "--macros", "no-expand", "?BAR(_@AA)", "{4}"],
+            "linter",
+            expect_file!("../resources/test/linter/ssr_ad_hoc_cli_macros_no_expand.stdout"),
+            true,
+            None,
+        )
+    }
+
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
     fn eqwalizer_tests_check(buck: bool) {
diff --git a/crates/elp/src/bin/ssr_cli.rs b/crates/elp/src/bin/ssr_cli.rs
index 624c516861..57c4f17928 100644
--- a/crates/elp/src/bin/ssr_cli.rs
+++ b/crates/elp/src/bin/ssr_cli.rs
@@ -78,6 +78,9 @@ pub fn run_ssr_command(
         }
     }
 
+    // Parse the strategy from CLI arguments
+    let strategy = args.parse_strategy()?;
+
     // Create the lint config with all SSR patterns
     let mut lint_config = LintConfig::default();
     for pattern in &args.ssr_specs {
@@ -85,6 +88,7 @@ pub fn run_ssr_command(
         let ssr_lint = diagnostics::Lint::LintMatchSsr(MatchSsr {
             ssr_pattern: normalized_pattern,
             message: None,
+            strategy: Some(strategy),
         });
         lint_config.ad_hoc_lints.lints.push(ssr_lint);
     }
diff --git a/crates/elp/src/lib.rs b/crates/elp/src/lib.rs
index d9aefc9d2f..be14930f12 100644
--- a/crates/elp/src/lib.rs
+++ b/crates/elp/src/lib.rs
@@ -192,6 +192,7 @@ mod tests {
                     Lint::LintMatchSsr(MatchSsr {
                         ssr_pattern: "ssr: _@A = 10.".to_string(),
                         message: None,
+                        strategy: None,
                     }),
                 ],
             },
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_explicit_enable_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_explicit_enable_output.stdout
index 6304537096..cf937cab11 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_explicit_enable_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_explicit_enable_output.stdout
@@ -1,9 +1,11 @@
-Diagnostics reported in 6 modules:
+Diagnostics reported in 7 modules:
   app_a: 2
       4:4-4:34::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
       0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
   app_a_edoc: 1
       0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+  app_a_ssr: 1
+      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
   app_a_unused_param: 2
       0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
       4:4-4:5::[Warning] [L1268] variable 'X' is unused
diff --git a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
index 008b2b5469..8b664bb080 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
@@ -8,6 +8,8 @@
 {"path":"app_a/src/app_a.erl","line":16,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function baz/2 is unused\n\nFor more information see: /erlang-error-index/l/L1230","docPath":null}
 {"path":"app_a/src/app_a_edoc.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012","docPath":"website/docs/erlang-error-index/w/W0012.md"}
 {"path":"app_a/src/app_a_edoc.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
+{"path":"app_a/src/app_a_ssr.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012","docPath":"website/docs/erlang-error-index/w/W0012.md"}
+{"path":"app_a/src/app_a_ssr.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
 {"path":"app_a/src/app_a_unused_param.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012","docPath":"website/docs/erlang-error-index/w/W0012.md"}
 {"path":"app_a/src/app_a_unused_param.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
 {"path":"app_a/src/app_a_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"L1268 (L1268)","original":null,"replacement":null,"description":"variable 'X' is unused\n\nFor more information see: /erlang-error-index/l/L1268","docPath":null}
diff --git a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
index 01ac36d828..954278d91b 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
@@ -1,5 +1,5 @@
 Reporting all diagnostics codes
-Diagnostics reported in 8 modules:
+Diagnostics reported in 9 modules:
   app_a: 8
       4:4-4:34::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
       0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
@@ -12,6 +12,9 @@ Diagnostics reported in 8 modules:
   app_a_edoc: 2
       0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
       0:8-0:18::[WeakWarning] [W0046] The module is not documented.
+  app_a_ssr: 2
+      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+      0:8-0:17::[WeakWarning] [W0046] The module is not documented.
   app_a_unused_param: 3
       0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
       0:8-0:26::[WeakWarning] [W0046] The module is not documented.
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_expand.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_expand.stdout
new file mode 100644
index 0000000000..16ad74ebac
--- /dev/null
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_expand.stdout
@@ -0,0 +1,3 @@
+Matches found in 1 modules:
+  app_a_ssr: 1
+      10:10-10:17::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {4}.
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_no_expand.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_no_expand.stdout
new file mode 100644
index 0000000000..0e246ef6f5
--- /dev/null
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_no_expand.stdout
@@ -0,0 +1,3 @@
+Matches found in 1 modules:
+  app_a_ssr: 1
+      10:10-10:17::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: ?BAR(_@AA).
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_visible_expand.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_visible_expand.stdout
new file mode 100644
index 0000000000..351b8ffee2
--- /dev/null
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_visible_expand.stdout
@@ -0,0 +1,4 @@
+Matches found in 1 modules:
+  app_a_ssr: 2
+      10:10-10:17::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: ?BAR(_@AA).
+      10:10-10:17::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {4}.
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_invisible.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_invisible.stdout
new file mode 100644
index 0000000000..cefa90c758
--- /dev/null
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_invisible.stdout
@@ -0,0 +1,3 @@
+Matches found in 1 modules:
+  app_a_ssr: 1
+      6:9-6:14::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: (((3))).
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_visible.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_visible.stdout
new file mode 100644
index 0000000000..f830e74c63
--- /dev/null
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_visible.stdout
@@ -0,0 +1,5 @@
+Matches found in 1 modules:
+  app_a_ssr: 3
+      6:9-6:14::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: (_@A).
+      6:10-6:13::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: (_@A).
+      7:9-7:12::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: (_@A).
diff --git a/crates/elp/src/resources/test/linter/warnings_as_errors.stdout b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
index 8ffe5b1201..493afa95c7 100644
--- a/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
+++ b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
@@ -1,5 +1,5 @@
 Reporting all diagnostics codes
-Diagnostics reported in 8 modules:
+Diagnostics reported in 9 modules:
   app_a: 8
       4:4-4:34::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
       0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
@@ -12,6 +12,9 @@ Diagnostics reported in 8 modules:
   app_a_edoc: 2
       0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
       0:8-0:18::[WeakWarning] [W0046] The module is not documented.
+  app_a_ssr: 2
+      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+      0:8-0:17::[WeakWarning] [W0046] The module is not documented.
   app_a_unused_param: 3
       0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
       0:8-0:26::[WeakWarning] [W0046] The module is not documented.
diff --git a/crates/elp/src/resources/test/ssr_help.stdout b/crates/elp/src/resources/test/ssr_help.stdout
index 36946c6d3c..a90220787a 100644
--- a/crates/elp/src/resources/test/ssr_help.stdout
+++ b/crates/elp/src/resources/test/ssr_help.stdout
@@ -1,7 +1,7 @@
-Usage: [--project PROJECT] [--module MODULE] [--app APP] [--file FILE] [--rebar] [--as PROFILE] [--include-generated] [--include-tests] [[--format FORMAT]] [--report-system-stats] <SSR_SPEC>
+Usage: [--project PROJECT] [--module MODULE] [--app APP] [--file FILE] [--rebar] [--as PROFILE] [--include-generated] [--include-tests] [[--format FORMAT]] [[--macros STRATEGY]] [--parens] [--report-system-stats] <SSR_SPECS>...
 
 Available positional items:
-    <SSR_SPEC>  SSR spec to use
+    <SSR_SPECS>  SSR specs to use
 
 Available options:
         --project <PROJECT>    Path to directory with project, or to a JSON file (defaults to `.`)
@@ -13,5 +13,7 @@ Available options:
         --include-generated    Also generate diagnostics for generated files
         --include-tests        Also generate diagnostics for test files
         --format <FORMAT>      Show diagnostics in JSON format
+        --macros <STRATEGY>    Macro expansion strategy: expand | no-expand | visible-expand (default expand)
+        --parens               Explicitly match parentheses. If omitted, they are ignored.
         --report-system-stats  Report system memory usage and other statistics
     -h, --help                 Prints help information
diff --git a/crates/ide/src/diagnostics/from_config.rs b/crates/ide/src/diagnostics/from_config.rs
index e3830b0372..678ffbd369 100644
--- a/crates/ide/src/diagnostics/from_config.rs
+++ b/crates/ide/src/diagnostics/from_config.rs
@@ -126,11 +126,50 @@ impl ReplaceInSpec {
 
 // ---------------------------------------------------------------------
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
+#[derive(Debug, Clone)]
 pub struct MatchSsr {
     pub ssr_pattern: String,
-    #[serde(default)]
     pub message: Option<String>,
+    pub strategy: Option<Strategy>,
+}
+
+impl Serialize for MatchSsr {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        use serde::ser::SerializeStruct;
+
+        let mut state = serializer.serialize_struct("MatchSsr", 4)?;
+        state.serialize_field("ssr_pattern", &self.ssr_pattern)?;
+        if let Some(ref message) = self.message {
+            state.serialize_field("message", message)?;
+        }
+        if let Some(strategy) = self.strategy {
+            // Default strategy is Expand and InvisibleParens
+            let is_default = strategy.macros == MacroStrategy::Expand
+                && strategy.parens == ParenStrategy::InvisibleParens;
+
+            // Only serialize strategy if it's not the default
+            if !is_default {
+                // Serialize macro strategy
+                let macro_strategy = match strategy.macros {
+                    MacroStrategy::DoNotExpand => "no-expand",
+                    MacroStrategy::Expand => "expand",
+                    MacroStrategy::ExpandButIncludeMacroCall => "visible-expand",
+                };
+                state.serialize_field("macro_strategy", macro_strategy)?;
+
+                // Serialize paren strategy
+                let paren_strategy = match strategy.parens {
+                    ParenStrategy::VisibleParens => "visible",
+                    ParenStrategy::InvisibleParens => "invisible",
+                };
+                state.serialize_field("paren_strategy", paren_strategy)?;
+            }
+        }
+        state.end()
+    }
 }
 
 impl<'de> Deserialize<'de> for MatchSsr {
@@ -145,6 +184,10 @@ impl<'de> Deserialize<'de> for MatchSsr {
             ssr_pattern: String,
             #[serde(default)]
             message: Option<String>,
+            #[serde(default)]
+            macro_strategy: Option<String>,
+            #[serde(default)]
+            paren_strategy: Option<String>,
         }
 
         let helper = MatchSsrHelper::deserialize(deserializer)?;
@@ -159,19 +202,50 @@ impl<'de> Deserialize<'de> for MatchSsr {
             ))
         })?;
 
+        // Parse strategy from strings if provided
+        let strategy = if helper.macro_strategy.is_some() || helper.paren_strategy.is_some() {
+            let macros = match helper.macro_strategy.as_deref() {
+                Some("no-expand") => MacroStrategy::DoNotExpand,
+                Some("expand") | None => MacroStrategy::Expand,
+                Some("visible-expand") => MacroStrategy::ExpandButIncludeMacroCall,
+                Some(s) => {
+                    return Err(D::Error::custom(format!(
+                        "invalid macro strategy '{}'. Valid options are: expand, no-expand, visible-expand",
+                        s
+                    )));
+                }
+            };
+
+            let parens = match helper.paren_strategy.as_deref() {
+                Some("visible") => ParenStrategy::VisibleParens,
+                Some("invisible") | None => ParenStrategy::InvisibleParens,
+                Some(s) => {
+                    return Err(D::Error::custom(format!(
+                        "invalid paren strategy '{}'. Valid options are: visible, invisible",
+                        s
+                    )));
+                }
+            };
+
+            Some(Strategy { macros, parens })
+        } else {
+            None
+        };
+
         Ok(MatchSsr {
             ssr_pattern: helper.ssr_pattern,
             message: helper.message,
+            strategy,
         })
     }
 }
 
 impl MatchSsr {
     pub fn get_diagnostics(&self, acc: &mut Vec<Diagnostic>, sema: &Semantic, file_id: FileId) {
-        let strategy = Strategy {
+        let strategy = self.strategy.unwrap_or(Strategy {
             macros: MacroStrategy::Expand,
             parens: ParenStrategy::InvisibleParens,
-        };
+        });
 
         let scope = SsrSearchScope::WholeFile(file_id);
         let matches = match_pattern(sema, strategy, &self.ssr_pattern, scope);
@@ -198,6 +272,9 @@ impl MatchSsr {
 #[cfg(test)]
 mod tests {
     use expect_test::expect;
+    use hir::Strategy;
+    use hir::fold::MacroStrategy;
+    use hir::fold::ParenStrategy;
 
     use super::Lint;
     use super::LintsFromConfig;
@@ -579,6 +656,7 @@ mod tests {
         let result = toml::to_string::<MatchSsr>(&MatchSsr {
             ssr_pattern: "ssr: _@A = 10.".to_string(),
             message: Some("Found pattern".to_string()),
+            strategy: None,
         })
         .unwrap();
         expect![[r#"
@@ -604,6 +682,7 @@ mod tests {
                 message: Some(
                     "Found pattern",
                 ),
+                strategy: None,
             }
         "#]]
         .assert_debug_eq(&match_ssr);
@@ -615,6 +694,7 @@ mod tests {
             lints: vec![Lint::LintMatchSsr(MatchSsr {
                 ssr_pattern: "ssr: _@A = 10.".to_string(),
                 message: Some("Found pattern".to_string()),
+                strategy: None,
             })],
         })
         .unwrap();
@@ -626,4 +706,87 @@ mod tests {
         "#]]
         .assert_eq(&result);
     }
+
+    #[test]
+    fn serde_serialize_lint_match_ssr_with_strategy() {
+        let result = toml::to_string::<LintsFromConfig>(&LintsFromConfig {
+            lints: vec![Lint::LintMatchSsr(MatchSsr {
+                ssr_pattern: "ssr: _@A = 10.".to_string(),
+                message: Some("Found pattern".to_string()),
+                strategy: Some(Strategy {
+                    macros: MacroStrategy::Expand,
+                    parens: ParenStrategy::InvisibleParens,
+                }),
+            })],
+        })
+        .unwrap();
+        expect![[r#"
+            [[lints]]
+            type = "LintMatchSsr"
+            ssr_pattern = "ssr: _@A = 10."
+            message = "Found pattern"
+        "#]]
+        .assert_eq(&result);
+    }
+
+    #[test]
+    fn serde_serialize_lint_match_ssr_with_non_default_strategy() {
+        let result = toml::to_string::<LintsFromConfig>(&LintsFromConfig {
+            lints: vec![Lint::LintMatchSsr(MatchSsr {
+                ssr_pattern: "ssr: _@A = 10.".to_string(),
+                message: Some("Found pattern".to_string()),
+                strategy: Some(Strategy {
+                    macros: MacroStrategy::DoNotExpand,
+                    parens: ParenStrategy::VisibleParens,
+                }),
+            })],
+        })
+        .unwrap();
+        expect![[r#"
+            [[lints]]
+            type = "LintMatchSsr"
+            ssr_pattern = "ssr: _@A = 10."
+            message = "Found pattern"
+            macro_strategy = "no-expand"
+            paren_strategy = "visible"
+        "#]]
+        .assert_eq(&result);
+    }
+
+    #[test]
+    fn serde_deserialize_lint_match_ssr_with_strategy() {
+        let match_ssr: LintsFromConfig = toml::from_str(
+            r#"
+              [[lints]]
+              type = "LintMatchSsr"
+              ssr_pattern = "ssr: _@A = 10."
+              message = "Found pattern"
+              macro_strategy = "visible-expand"
+              paren_strategy = "visible"
+             "#,
+        )
+        .unwrap();
+
+        expect![[r#"
+            LintsFromConfig {
+                lints: [
+                    LintMatchSsr(
+                        MatchSsr {
+                            ssr_pattern: "ssr: _@A = 10.",
+                            message: Some(
+                                "Found pattern",
+                            ),
+                            strategy: Some(
+                                Strategy {
+                                    macros: ExpandButIncludeMacroCall,
+                                    parens: VisibleParens,
+                                },
+                            ),
+                        },
+                    ),
+                ],
+            }
+        "#]]
+        .assert_debug_eq(&match_ssr);
+    }
 }

From 90530e35c02398dade6e7640d816cca4a140bf32 Mon Sep 17 00:00:00 2001
From: Rahul Jain <jainrahul6620@meta.com>
Date: Fri, 31 Oct 2025 07:34:33 -0700
Subject: [PATCH 244/394] HIR: record parens for types
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
> Note: This diff is part of hackathon to clean up ELP backlogs using devmate. It is authored by Devmate, so kindly review it carefully!

Implements support for recording parentheses in HIR `TypeExpr`, bringing it to parity with how `Expr` and `Pat` handle parentheses in the ELP (Erlang Language Platform) HIR (High-level Intermediate Representation).

## Problem Statement
The `TypeExpr::Paren` variant already existed in the HIR enum definition (in `/data/sandcastle/boxes/fbsource/fbcode/whatsapp/elp/crates/hir/src/expr.rs` at lines 911-917) but was not being instantiated during AST-to-HIR lowering. This meant that parentheses in type expressions like `((integer()))` or `{((atom())), (integer() | (binary()))}` were being silently discarded, making it impossible to:
1. Analyze parenthesis usage patterns for assist decisions
2. Maintain source fidelity for type expressions
3. Support tools that need to understand the exact structure of type expressions as written

## Implementation Details

### 1. AST Lowering (`/data/sandcastle/boxes/fbsource/fbcode/whatsapp/elp/crates/hir/src/body/lower.rs`)
**Lines 2191-2198**: Updated `lower_type_expr` to properly allocate `TypeExpr::Paren` nodes when encountering parenthesized type expressions:
```rust
ast::ExprMax::ParenExpr(paren_expr) => {
    if let Some(inner_expr) = paren_expr.expr() {
        let type_expr_id = self.lower_type_expr(&inner_expr);
        self.alloc_type_expr(TypeExpr::Paren { ty: type_expr_id }, Some(expr))
    } else {
        self.alloc_type_expr(TypeExpr::Missing, Some(expr))
    }
}
```
This mirrors the pattern used for `Expr::Paren` (lines 1485-1492), ensuring consistency across expression types.

### 2. Fold Traversal (`/data/sandcastle/boxes/fbsource/fbcode/whatsapp/elp/crates/hir/src/fold.rs`)
**Line 1183**: Added `TypeExpr::Paren` case to `do_fold_type_expr` to recursively traverse through parenthesized type expressions:
```rust
TypeExpr::Paren { ty } => self.do_fold_type_expr(*ty, acc),
```

**Lines 2655-2703**: Added two comprehensive test functions that verify the fold behavior:
- `parens_in_type_expr`: Tests simple nested parentheses `((integer()))`
- `parens_in_type_expr_complex`: Tests complex nested parentheses in a tuple/union type `{((atom())), (integer() | (binary()))}`
- Helper functions `count_parens_in_type_expr` and `do_count_parens_in_type_expr` to verify ParenStrategy behavior

### 3. FoldBody Index Implementation (`/data/sandcastle/boxes/fbsource/fbcode/whatsapp/elp/crates/hir/src/body.rs`)
**Lines 1069-1072**: Added `ParenStrategy` handling to the `Index<TypeExprId>` implementation:
```rust
TypeExpr::Paren { ty } => match self.parens {
    ParenStrategy::VisibleParens => &self.body.type_exprs[index],
    ParenStrategy::InvisibleParens => self.index(*ty),
},
```
This allows callers to control whether parentheses are transparent during traversal:
- `VisibleParens`: Returns the Paren node itself, making parentheses observable
- `InvisibleParens`: Recursively indexes through to the inner type, making parentheses transparent

**Line 1067**: Updated comment from "Do not look through macro expansion" to "Apply the visibility strategies to macros and parens" to accurately reflect that the function now handles two visibility strategies (macros and parentheses), not just one.

### 4. Pretty Printing (`/data/sandcastle/boxes/fbsource/fbcode/whatsapp/elp/crates/hir/src/body/pretty.rs`)
**Line 779**: Added `TypeExpr::Paren` case to `print_type` method:
```rust
TypeExpr::Paren { ty } => self.print_type(&self.body[*ty]),
```
This ensures parenthesized types are printed correctly by recursively printing the inner type.

### 5. Tree Printing (`/data/sandcastle/boxes/fbsource/fbcode/whatsapp/elp/crates/hir/src/body/tree_print.rs`)
**Lines 1191-1195**: Added `TypeExpr::Paren` case for debug tree printing:
```rust
TypeExpr::Paren { ty } => {
    self.print_herald("TypeExpr::Paren", &mut |this| {
        this.print_type(ty);
    });
}
```
This provides diagnostic output showing the Paren node in tree representations.

### 6. Updated TypeExpr name method (`/data/sandcastle/boxes/fbsource/fbcode/whatsapp/elp/crates/hir/src/expr.rs`)
**Line 945**: Added name case for `TypeExpr::Paren` to return `"TypeExpr::Paren"` for diagnostic purposes.

## Architecture Pattern
This implementation follows the established architectural pattern used for `Expr::Paren` and `Pat::Paren` throughout the HIR:
1. **Lowering**: Create Paren nodes during AST→HIR conversion
2. **Folding**: Recursively traverse through Paren nodes
3. **FoldBody**: Respect ParenStrategy configuration (visible vs invisible)
4. **Printing**: Handle Paren nodes in both pretty printing and tree printing

This consistency ensures that type expressions have the same level of structural fidelity as regular expressions and patterns, enabling future IDE features and assists that need to understand parenthesis usage.

Reviewed By: alanz

Differential Revision: D85948216

fbshipit-source-id: 42c59c4598f376670eaf568326e59d38aa1139d2
---
 crates/hir/src/body.rs            |  6 +++-
 crates/hir/src/body/lower.rs      | 10 ++----
 crates/hir/src/body/pretty.rs     |  1 +
 crates/hir/src/body/tree_print.rs |  5 +++
 crates/hir/src/expr.rs            |  8 +++++
 crates/hir/src/fold.rs            | 55 +++++++++++++++++++++++++++++--
 6 files changed, 75 insertions(+), 10 deletions(-)

diff --git a/crates/hir/src/body.rs b/crates/hir/src/body.rs
index cc306f9cd3..2f4968b7ba 100644
--- a/crates/hir/src/body.rs
+++ b/crates/hir/src/body.rs
@@ -1065,8 +1065,12 @@ impl Index<TypeExprId> for FoldBody<'_> {
     type Output = TypeExpr;
 
     fn index(&self, index: TypeExprId) -> &Self::Output {
-        // Do not "look through" macro expansion
+        // Apply the visibility strategies to macros and parens
         match &self.body.type_exprs[index] {
+            TypeExpr::Paren { ty } => match self.parens {
+                ParenStrategy::VisibleParens => &self.body.type_exprs[index],
+                ParenStrategy::InvisibleParens => self.index(*ty),
+            },
             type_expr @ TypeExpr::MacroCall { expansion, .. } => match self.macros {
                 VisibleMacros::Yes => type_expr,
                 VisibleMacros::No => self.index(*expansion),
diff --git a/crates/hir/src/body/lower.rs b/crates/hir/src/body/lower.rs
index f59f96d0ec..85c3378930 100644
--- a/crates/hir/src/body/lower.rs
+++ b/crates/hir/src/body/lower.rs
@@ -2189,13 +2189,9 @@ impl<'a> Ctx<'a> {
                 }),
             ast::ExprMax::MacroString(_) => self.alloc_type_expr(TypeExpr::Missing, Some(expr)),
             ast::ExprMax::ParenExpr(paren_expr) => {
-                // TODO T243351061, update to include TypeExpr::Paren when it exists
-                if let Some(expr) = paren_expr.expr() {
-                    let type_expr_id = self.lower_type_expr(&expr);
-                    let ptr = AstPtr::new(&expr);
-                    let source = InFileAstPtr::new(self.curr_file_id(), ptr);
-                    self.record_type_source(type_expr_id, source);
-                    type_expr_id
+                if let Some(inner_expr) = paren_expr.expr() {
+                    let type_expr_id = self.lower_type_expr(&inner_expr);
+                    self.alloc_type_expr(TypeExpr::Paren { ty: type_expr_id }, Some(expr))
                 } else {
                     self.alloc_type_expr(TypeExpr::Missing, Some(expr))
                 }
diff --git a/crates/hir/src/body/pretty.rs b/crates/hir/src/body/pretty.rs
index e19c97e637..5b84b4e8ef 100644
--- a/crates/hir/src/body/pretty.rs
+++ b/crates/hir/src/body/pretty.rs
@@ -776,6 +776,7 @@ impl<'a> Printer<'a> {
                 macro_def: _,
                 macro_name: _,
             } => self.print_type(&self.body[*expansion]),
+            TypeExpr::Paren { ty } => self.print_type(&self.body[*ty]),
             TypeExpr::SsrPlaceholder(ssr) => self.print_ssr_placeholder(ssr),
         }
     }
diff --git a/crates/hir/src/body/tree_print.rs b/crates/hir/src/body/tree_print.rs
index bbdc2e8f01..1123c46b75 100644
--- a/crates/hir/src/body/tree_print.rs
+++ b/crates/hir/src/body/tree_print.rs
@@ -1188,6 +1188,11 @@ impl<'a> Printer<'a> {
                     }
                 });
             }
+            TypeExpr::Paren { ty } => {
+                self.print_herald("TypeExpr::Paren", &mut |this| {
+                    this.print_type(ty);
+                });
+            }
             TypeExpr::SsrPlaceholder(ssr) => self.print_ssr_placeholder(ssr),
         }
     }
diff --git a/crates/hir/src/expr.rs b/crates/hir/src/expr.rs
index 9defb2b071..adf3dea349 100644
--- a/crates/hir/src/expr.rs
+++ b/crates/hir/src/expr.rs
@@ -908,6 +908,13 @@ pub enum TypeExpr {
         macro_def: Option<InFile<DefineId>>,
         macro_name: MacroCallName,
     },
+    Paren {
+        // This constructor allows us to analyze the usage of parens
+        // when deciding on assists.
+        // Much like `TypeExpr::MacroCall`, it is normally hidden during a
+        // `fold`, but can be made visible if needed.
+        ty: TypeExprId,
+    },
     SsrPlaceholder(SsrPlaceholder),
 }
 
@@ -936,6 +943,7 @@ impl TypeExpr {
             TypeExpr::UnaryOp { .. } => "TypeExpr::UnaryOp",
             TypeExpr::Var(_) => "TypeExpr::Var",
             TypeExpr::MacroCall { .. } => "TypeExpr::MacroCall",
+            TypeExpr::Paren { .. } => "TypeExpr::Paren",
             TypeExpr::SsrPlaceholder(_) => "TypeExpr::SsrPlaceholder",
         }
     }
diff --git a/crates/hir/src/fold.rs b/crates/hir/src/fold.rs
index e28a81d0fe..78cd442592 100644
--- a/crates/hir/src/fold.rs
+++ b/crates/hir/src/fold.rs
@@ -1180,6 +1180,7 @@ impl<'a, T> FoldCtx<'a, T> {
                     e
                 }
             }
+            TypeExpr::Paren { ty } => self.do_fold_type_expr(*ty, acc),
             TypeExpr::SsrPlaceholder(_) => acc,
         };
         self.parents.pop();
@@ -1616,7 +1617,7 @@ bar() ->
              -define(AA, {foo,foo,foo}).
              bar(XX) ->
                begin %% clause.exprs[0]
-                 case XX of 
+                 case XX of
                    ?AA -> ok
                  end,
                  {fo~o}
@@ -1678,7 +1679,7 @@ bar() ->
              -define(AA, {foo,foo,foo}).
              bar(XX) ->
                begin %% clause.exprs[0]
-                 case XX of 
+                 case XX of
                    ?AA -> ok
                  end,
                  {fo~o}
@@ -2651,6 +2652,56 @@ bar() ->
         count_parens(fixture_str, 3);
     }
 
+    #[test]
+    fn parens_in_type_expr() {
+        let fixture_str = r#"
+              -type foo() :: ((integer())).
+             "#;
+        count_parens_in_type_expr(fixture_str, 2);
+    }
+
+    #[test]
+    fn parens_in_type_expr_complex() {
+        let fixture_str = r#"
+              -type bar() :: {((atom())), (integer() | (binary()))}.
+             "#;
+        count_parens_in_type_expr(fixture_str, 4);
+    }
+
+    #[track_caller]
+    fn count_parens_in_type_expr(fixture_str: &str, n: u32) {
+        let (db, fixture) = TestDB::with_fixture(fixture_str);
+        let file_id = fixture.files[0];
+        let sema = Semantic::new(&db);
+
+        let r = do_count_parens_in_type_expr(&sema, ParenStrategy::InvisibleParens, file_id);
+        assert_eq!(r, 0);
+
+        let r = do_count_parens_in_type_expr(&sema, ParenStrategy::VisibleParens, file_id);
+        assert_eq!(r, n);
+    }
+
+    fn do_count_parens_in_type_expr(
+        sema: &Semantic,
+        parens: ParenStrategy,
+        file_id: FileId,
+    ) -> u32 {
+        fold_file(
+            sema,
+            Strategy {
+                macros: MacroStrategy::Expand,
+                parens,
+            },
+            file_id,
+            0,
+            &mut |acc, ctx| match ctx.item {
+                AnyExpr::TypeExpr(TypeExpr::Paren { .. }) => acc + 1,
+                _ => acc,
+            },
+            &mut |acc, _on, _form_id| acc,
+        )
+    }
+
     // End of testing paren visibility
     // -----------------------------------------------------------------
 }

From ff680dfa396c1279499d5d96c30b8190d4dd0ebc Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 31 Oct 2025 08:50:13 -0700
Subject: [PATCH 245/394] Properly process changes to open configuration files

Summary:
ELP as an LSP server operates in a dyamic environment, by design. The key thing ts must deal with is changes to files.  A given project loaded into ELP has to process file-changes from two primarily different sources.

The first is open files in the LSP client (VS Code), and these are sent via LSP protocol as they happen, as well as generating a `DidSaveTextDocument` notification when saved.

The other is changes that happen on the filesystem directly, from any source, such as an external editor, version countrol operation, build, or the like. These are monitored via a file watcher, and the watching is also delegated to the LSP client.

There are some wrinkles to this.  We send a registration message to the client to watch all files of interest in a project, both source and configuration.  So of necessity this will overlap with any files that are also open in the IDE.  To avoid double processing these, we only process open files in the `DidSaveTextDocument` notification, and do not process open files in the `DidChangeWatchedFiles` notification.

This is all very well, but at some point there was a rationalisation of change processing, with the realisation that we only care about `DidSaveTextDocument` notifications for triggering diagnostic requests for open files for diagnostic sources not providing on-change diagnostics.  Which is now most of them.

So we modified the registered scope for `DidSaveTextDocument` to only be `.erl`/`.hrl` files.

This meant that we no longer processed changes to configuration files that are open in the IDE, which is the main way they pick up changes.

## This diff

We restore the desired immediate reaction to changed files by never doing the check in the `DidSaveTextDocument` notification processing, since it never applied anyway, and so always doing it in `DidChangeWatchedFiles`.

We also tidy up the registering of watched files by first unregistering, otherwise the client accumulates multiple watches for the same files, and sends a change notification for each registration it has.  Even with this removal, we still get 2 notifications per file change, so add logic to de-dupe them while processing, as updating config can be an expensive operation.

Reviewed By: jcpetruzza

Differential Revision: D85956439

fbshipit-source-id: 961618711347d173596f69f5fd94a435b3fd45b1
---
 crates/elp/src/server.rs | 52 +++++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index 7a9e3a56a1..4914cf9f3f 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -852,19 +852,14 @@ impl Server {
                 if let Ok(path) = convert::abs_path(&change.uri) {
                     // We only put .erl/.hrl files into the
                     // `mem_docs` store, but will get changes for
-                    // other kinds of files. So we neede to do
+                    // other kinds of files. So we need to do
                     // this check.
+                    // Note: we only receive DidSaveTextDocument notifications for files that pass the filter
+                    // in the TextDocumentRegistrationOptions setting at the beginning of main_loop.
                     let opened = convert::vfs_path(&change.uri)
                         .map(|vfs_path| this.mem_docs.read().contains(&vfs_path))
                         .unwrap_or(false);
                     if opened {
-                        if this.should_reload_config_for_path(&path) {
-                            // e.g. `.elp_lint.toml`
-                            this.refresh_config();
-                        }
-                        if this.should_reload_project_for_path(&path, &change) {
-                            this.reload_manager.lock().add(path.clone());
-                        }
                         this.eqwalizer_and_erlang_service_diagnostics_requested = true;
                         if this.config.eqwalizer().all {
                             this.eqwalizer_project_diagnostics_requested = true;
@@ -881,22 +876,31 @@ impl Server {
                 Ok(())
             })?
             .on::<notification::DidChangeWatchedFiles>(|this, params| {
+                // For some reason, we are seeing duplicate notifications for the same file.
+                // But we cannot use FxHashSet because change does not implement Hash.
                 let changes: &[FileEvent] = &params.changes;
                 let mut refresh_config = false;
+                let mut seen: FxHashMap<Url,FileChangeType> = FxHashMap::default();
                 for change in changes {
+                    if seen.get(&change.uri).is_some_and(|prev_typ| prev_typ == &change.typ) {
+                        continue;
+                    }
+                    seen.insert(change.uri.clone(), change.typ);
                     if let Ok(path) = convert::abs_path(&change.uri) {
                         let opened = convert::vfs_path(&change.uri)
                             .map(|vfs_path| this.mem_docs.read().contains(&vfs_path))
                             .unwrap_or(false);
                         log::info!(target: FILE_WATCH_LOGGER_NAME, "DidChangeWatchedFiles:{}:{}", &opened, &path);
+                        // We process config changes here, because we do not register to receive
+                        // DidSaveTextDocument notifiactions for these kinds of files
+                        if this.should_reload_project_for_path(&path, change) {
+                            this.reload_manager.lock().add(path.clone());
+                        }
+                        if this.should_reload_config_for_path(&path) {
+                            // e.g. `.elp_lint.toml`
+                            refresh_config = true;
+                        }
                         if !opened {
-                            if this.should_reload_project_for_path(&path, change) {
-                                this.reload_manager.lock().add(path.clone());
-                            }
-                            if this.should_reload_config_for_path(&path) {
-                                // e.g. `.elp_lint.toml`
-                                refresh_config = true;
-                            }
                             this.vfs_loader.handle.invalidate(path);
                         }
                     }
@@ -1429,8 +1433,24 @@ impl Server {
             watchers: folders.watch,
         };
 
+        let registration_id = "workspace/didChangeWatchedFiles".to_string();
+
+        // Unregister the old watcher
+        let unregistrations = vec![lsp_types::Unregistration {
+            id: registration_id.clone(),
+            method: notification::DidChangeWatchedFiles::METHOD.to_string(),
+        }];
+
+        self.send_request::<request::UnregisterCapability>(
+            lsp_types::UnregistrationParams {
+                unregisterations: unregistrations,
+            },
+            |_, _| Ok(()),
+        );
+
+        // Register the new watcher
         let registrations = vec![lsp_types::Registration {
-            id: "workspace/didChangeWatchedFiles".to_string(),
+            id: registration_id,
             method: notification::DidChangeWatchedFiles::METHOD.to_string(),
             register_options: Some(serde_json::to_value(register_options).unwrap()),
         }];

From 8d1c120ad2ce7b06d618d0538e508579b1c1c015 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Muska=C5=82a?= <micmus@meta.com>
Date: Fri, 31 Oct 2025 15:11:58 -0700
Subject: [PATCH 246/394] no_sleep: don't flag infinity timeout

Summary:
Infinity sleeps are usually done to keep some auxiliary process alive. They also never slow down test - if they were actually blocking for the test, the test would be broken.
There's little value in flagging and linting those.

Reviewed By: ilya-klyuchnikov

Differential Revision: D85987359

fbshipit-source-id: 3691d9c4bae56e93dfc9a526c73136364a75dc70
---
 crates/ide/src/codemod_helpers.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/ide/src/codemod_helpers.rs b/crates/ide/src/codemod_helpers.rs
index d964a58420..8cddb35a82 100644
--- a/crates/ide/src/codemod_helpers.rs
+++ b/crates/ide/src/codemod_helpers.rs
@@ -439,8 +439,9 @@ impl TryFrom<&str> for MFA {
     }
 }
 
+#[allow(unused)]
 pub struct CheckCallCtx<'a, T> {
-    #[allow(unused)]
+    pub sema: &'a Semantic<'a>,
     pub mfa: &'a FunctionMatch,
     pub parents: &'a Vec<ParentId>,
     pub target: &'a CallTarget<ExprId>,
@@ -561,6 +562,7 @@ pub(crate) fn find_call_in_function<CallCtx, MakeCtx, Res>(
             ) {
                 let in_clause = &def_fb.in_clause(clause_id);
                 let context = CheckCallCtx {
+                    sema,
                     mfa,
                     parents: ctx.parents,
                     t,

From 1cc3af77960fbe7c4884e451e024f2a3572358ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Muska=C5=82a?= <micmus@meta.com>
Date: Fri, 31 Oct 2025 15:53:16 -0700
Subject: [PATCH 247/394] codemod_helper: save on some allocations

Summary: We can use slices - no need to allocate new vecs and reallocate args on every iteration

Reviewed By: TD5

Differential Revision: D85989035

fbshipit-source-id: 6116dd9da0067b6b541031e18a1ed618631c7726
---
 crates/ide/src/codemod_helpers.rs             | 19 ++++++++++---------
 .../ide/src/diagnostics/atoms_exhaustion.rs   |  2 +-
 crates/ide/src/diagnostics/meck.rs            |  4 ++--
 crates/ide/src/diagnostics/replace_call.rs    |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/crates/ide/src/codemod_helpers.rs b/crates/ide/src/codemod_helpers.rs
index 8cddb35a82..e06fbdf1ff 100644
--- a/crates/ide/src/codemod_helpers.rs
+++ b/crates/ide/src/codemod_helpers.rs
@@ -446,7 +446,7 @@ pub struct CheckCallCtx<'a, T> {
     pub parents: &'a Vec<ParentId>,
     pub target: &'a CallTarget<ExprId>,
     pub t: &'a T,
-    pub args: Args,
+    pub args: &'a Args,
     pub in_clause: &'a InFunctionClauseBody<'a, &'a FunctionDef>,
 }
 
@@ -471,10 +471,11 @@ impl Args {
         }
     }
 
-    pub fn as_vec(&self) -> Vec<ExprId> {
+    pub fn as_slice(&self) -> &[ExprId] {
+        const EMPTY_SLICE: &[ExprId] = &[];
         match self {
-            Args::Args(args) => args.to_vec(),
-            Args::Arity(_arity) => vec![],
+            Args::Args(args) => args,
+            Args::Arity(_arity) => EMPTY_SLICE,
         }
     }
 }
@@ -486,7 +487,7 @@ pub struct MatchCtx<'a, Extra> {
     pub sema: &'a Semantic<'a>,
     pub def_fb: &'a InFunctionClauseBody<'a, &'a FunctionDef>,
     pub target: &'a CallTarget<ExprId>,
-    pub args: Args,
+    pub args: &'a Args,
     /// Range of the module:fun part of an MFA, if not defined in a
     /// macro.
     pub range_surface_mf: Option<FileRange>,
@@ -550,13 +551,13 @@ pub(crate) fn find_call_in_function<CallCtx, MakeCtx, Res>(
             } && let None = excluded_matcher.get_match(
                 &target,
                 args.arity(),
-                Some(&args.as_vec()),
+                Some(args.as_slice()),
                 sema,
                 &def_fb.body(clause_id),
             ) && let Some((mfa, t)) = matcher.get_match(
                 &target,
                 args.arity(),
-                Some(&args.as_vec()),
+                Some(args.as_slice()),
                 sema,
                 &def_fb.body(clause_id),
             ) {
@@ -567,7 +568,7 @@ pub(crate) fn find_call_in_function<CallCtx, MakeCtx, Res>(
                     parents: ctx.parents,
                     t,
                     target: &target,
-                    args: args.clone(),
+                    args: &args,
                     in_clause,
                 };
                 if let Some(extra) = check_call(context) {
@@ -588,7 +589,7 @@ pub(crate) fn find_call_in_function<CallCtx, MakeCtx, Res>(
                             sema,
                             def_fb: in_clause,
                             target: &target,
-                            args,
+                            args: &args,
                             extra: &extra,
                             range_surface_mf,
                             range: *range,
diff --git a/crates/ide/src/diagnostics/atoms_exhaustion.rs b/crates/ide/src/diagnostics/atoms_exhaustion.rs
index bb15bebc2c..096634c156 100644
--- a/crates/ide/src/diagnostics/atoms_exhaustion.rs
+++ b/crates/ide/src/diagnostics/atoms_exhaustion.rs
@@ -68,7 +68,7 @@ impl FunctionCallLinter for AtomsExhaustionLinter {
             // @fb-only
         let is_safe = false; // @oss-only
         if !is_safe {
-            match context.args.as_vec()[..] {
+            match context.args.as_slice() {
                 [_, options] => {
                     let body = context.in_clause.body();
                     match &body[options].literal_list_contains_atom(context.in_clause, "safe") {
diff --git a/crates/ide/src/diagnostics/meck.rs b/crates/ide/src/diagnostics/meck.rs
index fb79f39b57..e508481337 100644
--- a/crates/ide/src/diagnostics/meck.rs
+++ b/crates/ide/src/diagnostics/meck.rs
@@ -75,7 +75,7 @@ pub(crate) fn check_function(diags: &mut Vec<Diagnostic>, sema: &Semantic, def:
             if in_anonymous_fun(def_fb, parents) {
                 return None;
             }
-            match args.as_vec()[..] {
+            match args.as_slice() {
                 [_module] => Some(()),
                 [_module, options] => {
                     let body = def_fb.body();
@@ -96,7 +96,7 @@ pub(crate) fn check_function(diags: &mut Vec<Diagnostic>, sema: &Semantic, def:
                    args,
                    range,
                    ..
-               }| match args.as_vec()[..] {
+               }| match args.as_slice()[..] {
             [module] => {
                 if let Some(module_range) = def_fb.range_for_expr(module) {
                     if def.file.file_id == range.file_id {
diff --git a/crates/ide/src/diagnostics/replace_call.rs b/crates/ide/src/diagnostics/replace_call.rs
index e27592dd3a..254db47e5e 100644
--- a/crates/ide/src/diagnostics/replace_call.rs
+++ b/crates/ide/src/diagnostics/replace_call.rs
@@ -109,7 +109,7 @@ pub fn replace_call_site_if_args_match(
                     sema,
                     def_fb,
                     file_id,
-                    &args.as_vec(),
+                    args.as_slice(),
                     target,
                     &range,
                 ) {

From d52138b1fef9f8f61ab678bb09bc3d2d47174488 Mon Sep 17 00:00:00 2001
From: Rahul Jain <jainrahul6620@meta.com>
Date: Mon, 3 Nov 2025 05:05:47 -0800
Subject: [PATCH 248/394] Fix duplicate ignore annotations for multiple
 violations on same line

Summary:
> Note: This diff is part of hackathon to clean up ELP backlogs using devmate. It is authored by Devmate, so kindly review it carefully!

Fixes T233431969

When the `no_calls_in_ct_all_groups` linter was migrated from erlint to ELP, a bug
was introduced where multiple violations on the same line would each generate their own
ignore fix, resulting in duplicate ignore comments.

**Problem:**
When two or more function calls on the same line both violated the diagnostic (e.g.,
`list_to_atom()` and `atom_to_list()` on line 123), each diagnostic independently
called `.with_ignore_fix()`. Since ignore fixes are inserted at the **start of the line**
(not at each diagnostic's position), this resulted in duplicate annotations:

```erlang
% elp:ignore WA024 (no_calls_in_ct_all_groups)
% elp:ignore WA024 (no_calls_in_ct_all_groups)
list_to_atom(?SRPROXY_TEST_PREFIX ++ atom_to_list(GroupName)),
```

**Root Cause:** The initial implementation grouped diagnostics by their start position, but this was incorrect because `with_ignore_fix()` computes the line start offset using `start_of_line()` and inserts the comment there. Multiple diagnostics at different column positions on the same line all target the same insertion point.

**Solution:** Modified `check_function()` in `no_calls_in_ct_all_groups.rs` to:

1.  Parse the file to access the syntax tree
2.  Compute the line start offset for each diagnostic using the same `start_of_line()` function that `with_ignore_fix()` uses internally
3.  Group diagnostics by line start offset (not by diagnostic position)
4.  Add the ignore fix only to the first diagnostic in each group
5.  Extend all diagnostics (with or without ignore fixes) to the result vector

This ensures that when multiple violations occur on the same line, only one ignore comment is generated while all diagnostics are still reported to the user.

Reviewed By: alanz

Differential Revision: D85856981

fbshipit-source-id: 5b829e8191cdf5b84de6d12e9e5b974e6246a2da
---
 crates/ide/src/diagnostics.rs | 41 +++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index f51a0714b2..26714a2835 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1887,6 +1887,47 @@ pub(crate) fn make_unexpected_diagnostic(
         .with_severity(Severity::Warning)
 }
 
+/// Deduplicate diagnostics by line start and add ignore fix only to the first diagnostic on each line.
+/// This prevents duplicate ignore fix suggestions when multiple diagnostics occur on the same line.
+pub(crate) fn add_ignore_fix_deduplicated(
+    diagnostics: &mut Vec<Diagnostic>,
+    temp_diagnostics: Vec<Diagnostic>,
+    sema: &Semantic,
+    file_id: FileId,
+) {
+    let parsed = sema.parse(file_id);
+    let mut diagnostics_by_line_start: FxHashMap<u32, Vec<Diagnostic>> = FxHashMap::default();
+
+    for diagnostic in temp_diagnostics {
+        let line_start_offset = if let Some(token) = parsed
+            .value
+            .syntax()
+            .token_at_offset(diagnostic.range.start())
+            .right_biased()
+        {
+            start_of_line(&token).into()
+        } else {
+            diagnostic.range.start().into()
+        };
+
+        diagnostics_by_line_start
+            .entry(line_start_offset)
+            .or_default()
+            .push(diagnostic);
+    }
+
+    for (_, mut diags_on_line) in diagnostics_by_line_start {
+        if let Some(first_diag) = diags_on_line.first_mut() {
+            *first_diag = std::mem::replace(
+                first_diag,
+                Diagnostic::new(DiagnosticCode::default(), "", TextRange::default()),
+            )
+            .with_ignore_fix(sema, file_id);
+        }
+        diagnostics.extend(diags_on_line);
+    }
+}
+
 #[derive(Debug, PartialEq, Eq)]
 pub enum RemoveElpReported {
     Yes,

From 5fd76eb0a39416db9a09d987d467fa9e70cff206 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 3 Nov 2025 08:43:55 -0800
Subject: [PATCH 249/394] Update elp_development.md to include declarative test
 fixtures

Summary: As title. Also tweak the comment on extract annotations to match current usage.

Reviewed By: robertoaloi, TD5

Differential Revision: D85962544

fbshipit-source-id: ec68698a90ea34373b2845339c634986fb921b06
---
 .llms/rules/elp_development.md           | 34 ++++++++++++++++++++++++
 crates/project_model/src/test_fixture.rs | 17 +++++++-----
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/.llms/rules/elp_development.md b/.llms/rules/elp_development.md
index 459a89ee4f..579764599a 100644
--- a/.llms/rules/elp_development.md
+++ b/.llms/rules/elp_development.md
@@ -118,6 +118,40 @@ Every diagnostic must have a corresponding `DiagnosticDescriptor` that defines w
 - Group related tests in the same module
 - Use descriptive test names that explain the scenario
 
+### Declarative Test Fixtures
+
+ELP uses a declarative test fixture system that allows you to write tests with inline annotations and markers directly in test strings. This system is defined in `/data/sandcastle/boxes/fbsource/fbcode/whatsapp/elp/crates/project_model/src/test_fixture.rs`.
+
+#### Key Features
+
+1. **File Organization**: Use `//- /path/to/file.erl` to define multiple files in a single test
+2. **Metadata Markers**: Specify app names, include paths, OTP apps, etc. using metadata after the path
+3. **Annotations**: Mark expected diagnostics or ranges using `%% ^^^` syntax
+4. **Cursors and Ranges**: Use `~` markers to indicate positions or ranges in test code
+
+#### Annotation Syntax
+
+Annotations allow you to mark expected diagnostics, types, or other information directly in test code:
+
+- **Basic annotation**: `%% ^^^ some text` - Points to the range above matching the caret length
+- **Top-of-file marker**: `%% <<< text` (at file start) - Creates annotation at position 0..0
+- **File-wide annotation**: `%% ^^^file text` - Annotation spans the entire file contents
+- **Left-margin annotation**: `%%<^^^ text` - Annotation starts at `%%` position instead of first `^`
+- **Multiline annotations**: Use continuation lines with `%%   | next line`
+
+#### Example Test Fixture
+
+```rust
+let fixture = r#"
+//- /src/main.erl
+-module(main).
+
+foo(X) ->
+    X + undefined.
+  %%    ^^^^^^^^^ error: type mismatch
+"#;
+```
+
 ### Test Data
 
 - Create minimal test cases that focus on specific functionality
diff --git a/crates/project_model/src/test_fixture.rs b/crates/project_model/src/test_fixture.rs
index b2b02ed343..769891190a 100644
--- a/crates/project_model/src/test_fixture.rs
+++ b/crates/project_model/src/test_fixture.rs
@@ -451,21 +451,26 @@ pub fn extract_tags(mut text: &str, tag: &str) -> (Vec<(TextRange, Option<String
 
 // ---------------------------------------------------------------------
 
-/// Extracts `%%^^^ some text` annotations.
+/// Extracts `%% ^^^ some text` annotations.
 ///
 /// A run of `^^^` can be arbitrary long and points to the corresponding range
 /// in the line above.
 ///
-/// The `%% ^file text` syntax can be used to attach `text` to the entirety of
-/// the file.
+/// The `%% <<< text` syntax (at the beginning of the file) creates an annotation
+/// at position 0..0, useful for file-level diagnostics.
 ///
-/// The `%%<^^^ text` syntax can be used to attach `text` the span
-/// starting at `%%`, rather than the first `^`.
+/// The `%% ^^^file text` syntax (with the keyword `file` after the carets) can be
+/// used to attach `text` to the entirety of the file contents.
 ///
-/// Multiline string values are supported:
+/// The `%%<^^^ text` syntax can be used to attach `text` to the span
+/// starting at the `%%` position (left margin), rather than at the first `^`.
 ///
+/// Multiline string values are supported using continuation lines:
+///
+/// ```not_rust
 /// %% ^^^ first line
 /// %%   | second line
+/// ```
 ///
 /// Annotations point to the last line that actually was long enough for the
 /// range, not counting annotations themselves. So overlapping annotations are

From 0bd94b6cc19cf7d164d5edd2903a75b687661966 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 3 Nov 2025 08:43:55 -0800
Subject: [PATCH 250/394] BE: include diagnostic code in test fixtures

Summary:
Our declarative test fixtures allow us to annotate the fixture with the epxected diagnostics to be produced by the test.

Up to now, this has included the severity and text only.

This (massive but regular) diff updates this to include the diagnostic code too.

This makes it clearer that the code is correct, and makes it easier to search for examples of its usage in the test code.

Reviewed By: robertoaloi, TD5

Differential Revision: D86103082

fbshipit-source-id: 6e4ede050350cc90aa437f68da0900a66b7d0625
---
 crates/ide/src/codemod_helpers.rs             | 46 +++++------
 crates/ide/src/common_test.rs                 | 22 ++---
 crates/ide/src/diagnostics.rs                 | 80 +++++++++----------
 crates/ide/src/diagnostics/application_env.rs |  8 +-
 .../ide/src/diagnostics/atoms_exhaustion.rs   |  8 +-
 .../src/diagnostics/binary_string_to_sigil.rs |  2 +-
 .../ide/src/diagnostics/boolean_precedence.rs | 20 ++---
 .../diagnostics/could_be_a_string_literal.rs  | 18 ++---
 crates/ide/src/diagnostics/cross_node_eval.rs | 46 +++++------
 .../ide/src/diagnostics/debugging_function.rs | 10 +--
 .../ide/src/diagnostics/dependent_header.rs   |  8 +-
 .../src/diagnostics/deprecated_function.rs    | 10 +--
 .../ide/src/diagnostics/duplicate_module.rs   |  4 +-
 crates/ide/src/diagnostics/edoc.rs            | 20 ++---
 .../src/diagnostics/effect_free_statement.rs  | 68 ++++++++--------
 ...quality_check_with_unnecessary_operator.rs | 34 ++++----
 .../eqwalizer_assists/expected_type.rs        | 12 +--
 .../eqwalizer_assists/unexported_type.rs      |  2 +-
 .../expression_can_be_simplified.rs           | 16 ++--
 crates/ide/src/diagnostics/head_mismatch.rs   | 12 +--
 .../src/diagnostics/inefficient_enumerate.rs  |  6 +-
 .../src/diagnostics/inefficient_flatlength.rs |  2 +-
 .../ide/src/diagnostics/inefficient_last.rs   |  4 +-
 .../diagnostics/macro_precedence_suprise.rs   |  5 +-
 .../ide/src/diagnostics/map_find_to_syntax.rs |  8 +-
 .../diagnostics/map_insertion_to_syntax.rs    |  4 +-
 crates/ide/src/diagnostics/meck.rs            |  6 +-
 .../missing_compile_warn_missing_spec.rs      | 18 ++---
 .../ide/src/diagnostics/missing_separator.rs  | 10 +--
 .../src/diagnostics/misspelled_attribute.rs   |  6 +-
 crates/ide/src/diagnostics/module_mismatch.rs |  2 +-
 .../ide/src/diagnostics/mutable_variable.rs   |  8 +-
 crates/ide/src/diagnostics/no_catch.rs        |  2 +-
 .../src/diagnostics/no_dialyzer_attribute.rs  |  2 +-
 crates/ide/src/diagnostics/no_error_logger.rs |  4 +-
 .../ide/src/diagnostics/no_garbage_collect.rs |  8 +-
 .../src/diagnostics/no_nowarn_suppressions.rs |  8 +-
 crates/ide/src/diagnostics/no_size.rs         |  8 +-
 .../nonstandard_integer_formatting.rs         | 26 +++---
 .../ide/src/diagnostics/record_tuple_match.rs |  4 +-
 .../src/diagnostics/redundant_assignment.rs   |  4 +-
 crates/ide/src/diagnostics/replace_call.rs    |  2 +-
 crates/ide/src/diagnostics/replace_in_spec.rs |  2 +-
 crates/ide/src/diagnostics/sets_version_2.rs  |  8 +-
 .../ide/src/diagnostics/simplify_negation.rs  |  6 +-
 crates/ide/src/diagnostics/trivial_match.rs   | 38 ++++-----
 .../ide/src/diagnostics/undefined_function.rs | 20 ++---
 crates/ide/src/diagnostics/undefined_macro.rs | 14 ++--
 .../src/diagnostics/undocumented_function.rs  | 25 +++---
 .../src/diagnostics/undocumented_module.rs    | 12 +--
 .../src/diagnostics/unexported_function.rs    |  9 ++-
 .../unnecessary_fold_to_build_map.rs          |  4 +-
 ...sary_map_from_list_around_comprehension.rs |  4 +-
 ...nnecessary_map_to_list_in_comprehension.rs |  2 +-
 .../ide/src/diagnostics/unspecific_include.rs |  2 +-
 .../src/diagnostics/unused_function_args.rs   | 12 +--
 crates/ide/src/diagnostics/unused_include.rs  | 12 +--
 crates/ide/src/diagnostics/unused_macro.rs    |  8 +-
 .../src/diagnostics/unused_record_field.rs    |  8 +-
 crates/ide/src/tests.rs                       |  8 +-
 60 files changed, 397 insertions(+), 390 deletions(-)

diff --git a/crates/ide/src/codemod_helpers.rs b/crates/ide/src/codemod_helpers.rs
index e06fbdf1ff..e06ceafd61 100644
--- a/crates/ide/src/codemod_helpers.rs
+++ b/crates/ide/src/codemod_helpers.rs
@@ -791,9 +791,9 @@ mod tests {
 
             bar(Config) ->
                 foo:fire_bombs(Config),
-            %%  ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Diagnostic Message
+            %%  ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
                 foo:fire_bombs(Config, zz).
-            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Diagnostic Message
+            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
             "#,
         )
     }
@@ -807,9 +807,9 @@ mod tests {
 
             bar(Config) ->
                 foo:fire_bombs(Config),
-            %%  ^^^^^^^^^^^^^^ 💡 warning: Diagnostic Message
+            %%  ^^^^^^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
                 foo:fire_bombs(Config, zz).
-            %%  ^^^^^^^^^^^^^^ 💡 warning: Diagnostic Message
+            %%  ^^^^^^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
             "#,
         )
     }
@@ -825,7 +825,7 @@ mod tests {
 
             bar(Config) ->
                 ?MY_MACRO(Config).
-            %%  ^^^^^^^^^^^^^^^^^ 💡 warning: Diagnostic Message
+            %%  ^^^^^^^^^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
             "#,
         )
     }
@@ -842,7 +842,7 @@ mod tests {
 
             bar(Config) ->
                 ?MY_MACRO(Config).
-            %%  ^^^^^^^^^^^^^^^^^ 💡 warning: Diagnostic Message
+            %%  ^^^^^^^^^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
 
             //- /src/inc.hrl
             -define(MY_MACRO(A), fun() -> foo:fire_bombs(A) end).
@@ -859,7 +859,7 @@ mod tests {
 
             bar(Node) ->
                 spawn(Node, mod, fff, []).
-            %%  ^^^^^ 💡 warning: Diagnostic Message
+            %%  ^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
             "#,
         )
     }
@@ -875,13 +875,13 @@ mod tests {
                 erlang:spawn(fun() -> ok end),
                 spawn(fun() -> ok end),
                 erlang:spawn(Node, fun() -> ok end),
-            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Diagnostic Message
+            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
                 spawn(Node, fun() -> ok end),
-            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Diagnostic Message
+            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
                 erlang:spawn(Node, mod, fff, []),
-            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Diagnostic Message
+            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
                 spawn(Node, mod, fff, []).
-            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Diagnostic Message
+            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
             "#,
         )
     }
@@ -896,7 +896,7 @@ mod tests {
 
             bar() ->
                 erlang:spawn(),
-            %%  ^^^^^^^^^^^^^^ 💡 warning: Diagnostic Message
+            %%  ^^^^^^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
                 spawn().
             "#,
         )
@@ -911,11 +911,11 @@ mod tests {
 
             bar() ->
                 foo:bar(),
-            %%  ^^^^^^^^^ 💡 warning: Diagnostic Message
+            %%  ^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
                 foo:bar(x),
-            %%  ^^^^^^^^^^ 💡 warning: Diagnostic Message
+            %%  ^^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
                 foo:bar(x,y),
-            %%  ^^^^^^^^^^^^ 💡 warning: Diagnostic Message
+            %%  ^^^^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
                 baz:bar().
             "#,
         )
@@ -930,10 +930,10 @@ mod tests {
 
             bar() ->
                 foo:bar(),
-            %%  ^^^^^^^^^ 💡 warning: Diagnostic Message
+            %%  ^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
                 baz:bar(x),
                 foo:florgle(x,y).
-            %%  ^^^^^^^^^^^^^^^^ 💡 warning: Diagnostic Message
+            %%  ^^^^^^^^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
             "#,
         )
     }
@@ -947,11 +947,11 @@ mod tests {
 
             bar() ->
                 foo:bar(),
-            %%  ^^^^^^^^^ 💡 warning: Diagnostic Message
+            %%  ^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
                 baz:bar(x),
-            %%  ^^^^^^^^^^ 💡 warning: Diagnostic Message
+            %%  ^^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
                 local(x,y).
-            %%  ^^^^^^^^^^ 💡 warning: Diagnostic Message
+            %%  ^^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
             local(A,B) -> {A,B}.
             "#,
         )
@@ -966,7 +966,7 @@ mod tests {
 
             bar() ->
                 fo~o:bar().
-            %%  ^^^^^^^^^ 💡 warning: Diagnostic Message
+            %%  ^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
              "#,
             expect![[r#"
             -module(main).
@@ -986,7 +986,7 @@ mod tests {
             -module(main).
             foo(Node, M,F,A) ->
                rpc:c~all(Node, M, F, A).
-            %% ^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Diagnostic Message
+            %% ^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
              "#,
             expect![[r#"
             -module(main).
@@ -1005,7 +1005,7 @@ mod tests {
             -module(main).
             foo(Node, M,F,A) ->
                baz(rpc:c~all(Node, M, F, A)).
-            %%     ^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Diagnostic Message
+            %%     ^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: ad-hoc: test: Diagnostic Message
              "#,
             expect![[r#"
             -module(main).
diff --git a/crates/ide/src/common_test.rs b/crates/ide/src/common_test.rs
index eea87c4422..a5441efd28 100644
--- a/crates/ide/src/common_test.rs
+++ b/crates/ide/src/common_test.rs
@@ -346,7 +346,7 @@ mod tests {
    a(_Config) ->
      ok.
    b(_Config) ->
-%% ^ 💡 error: Unreachable test (b/1)
+%% ^ 💡 error: W0008: Unreachable test (b/1)
      ok.
             "#,
         );
@@ -368,7 +368,7 @@ mod tests {
    a(_Config) ->
      ok.
    b(_Config) ->
-%% ^ 💡 error: Unreachable test (b/1)
+%% ^ 💡 error: W0008: Unreachable test (b/1)
      ok.
             "#,
         );
@@ -391,7 +391,7 @@ mod tests {
    a(_Config) ->
      ok.
    b(_Config) ->
-%% ^ 💡 error: Unreachable test (b/1)
+%% ^ 💡 error: W0008: Unreachable test (b/1)
      ok.
             "#,
         );
@@ -413,7 +413,7 @@ mod tests {
    b(_Config) ->
      ok.
    c(_Config) ->
-%% ^ 💡 error: Unreachable test (c/1)
+%% ^ 💡 error: W0008: Unreachable test (c/1)
      ok.
             "#,
         );
@@ -434,7 +434,7 @@ mod tests {
    b(_Config) ->
      ok.
    c(_Config) ->
-%% ^ 💡 error: Unreachable test (c/1)
+%% ^ 💡 error: W0008: Unreachable test (c/1)
      ok.
             "#,
         );
@@ -453,10 +453,10 @@ mod tests {
     a(_Config) ->
       ok.
     b(_Config) ->
- %% ^ 💡 error: Unreachable test (b/1)
+ %% ^ 💡 error: W0008: Unreachable test (b/1)
       ok.
     c(_Config) ->
- %% ^ 💡 error: Unreachable test (c/1)
+ %% ^ 💡 error: W0008: Unreachable test (c/1)
       ok.
      "#,
         );
@@ -501,7 +501,7 @@ c(_Config) ->
    -export([all/0]).
    -export([a/1, b/1, c/1]).
    all() -> my_external_helper:all().
-%% ^^^ warning: Could not evaluate function. No code lenses for tests will be available.
+%% ^^^ warning: W0021: Could not evaluate function. No code lenses for tests will be available.
    a(_Config) ->
      ok.
    b(_Config) ->
@@ -522,9 +522,9 @@ c(_Config) ->
    -export([all/0, groups/0]).
    -export([a/1, b/1, c/1]).
    all() -> [a].
-%% ^^^ warning: Could not evaluate function. No code lenses for tests will be available.
+%% ^^^ warning: W0021: Could not evaluate function. No code lenses for tests will be available.
    groups() -> my_external_helper:groups().
-%% ^^^^^^ warning: Could not evaluate function. No code lenses for tests will be available.
+%% ^^^^^^ warning: W0021: Could not evaluate function. No code lenses for tests will be available.
    a(_Config) ->
      ok.
    b(_Config) ->
@@ -550,7 +550,7 @@ c(_Config) ->
    a(_Config) ->
      ok.
    b(_Config) ->
-%% ^ 💡 error: Unreachable test (b/1)
+%% ^ 💡 error: W0008: Unreachable test (b/1)
      ok.
 //- /my_app/src/my_behaviour.erl
 -module(my_behaviour).
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 26714a2835..2078335dc3 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -2745,7 +2745,7 @@ mod tests {
             r#"
 -module(main).
 foo() -> XX 3.0.
-    %%   ^^ error: Syntax Error
+    %%   ^^ error: P1711: Syntax Error
 "#,
         );
     }
@@ -2756,7 +2756,7 @@ foo() -> XX 3.0.
             r#"
 -module(main).
 -export([foo/0 bar/1]).
-    %%       ^ warning: Missing ','
+    %%       ^ warning: W0004: Missing ','
 "#,
         );
     }
@@ -2767,7 +2767,7 @@ foo() -> XX 3.0.
             r#"
 -module(main).
 -export_type([foo/0 bar/1]).
-         %%       ^ warning: Missing ','
+         %%       ^ warning: W0004: Missing ','
 "#,
         );
     }
@@ -2778,7 +2778,7 @@ foo() -> XX 3.0.
             r#"
 -module(main).
 -import(bb, [foo/0 bar/1]).
-         %%      ^ warning: Missing ','
+         %%      ^ warning: W0004: Missing ','
 "#,
         );
     }
@@ -2789,7 +2789,7 @@ foo() -> XX 3.0.
             r#"
 -module(main).
 -type foo(A B) :: [A,B].
-       %% ^ warning: Missing ','
+       %% ^ warning: W0004: Missing ','
 "#,
         );
     }
@@ -2800,7 +2800,7 @@ foo() -> XX 3.0.
             r#"
 -module(main).
 -record(foo  {f1, f2 = 3}).
-     %% ^^^ warning: Missing ','
+     %% ^^^ warning: W0004: Missing ','
 main(X) ->
   {X#foo.f1, X#foo.f2}.
 "#,
@@ -2851,7 +2851,7 @@ foo(2)->?baz.
   -file("foo.erl",1).
   -define(baz,4).
   foo(2)->?baz.
-%%^^^^^^^^^^^^^ error: no module definition
+%%^^^^^^^^^^^^^ error: L1201: no module definition
 "#,
         );
     }
@@ -2861,7 +2861,7 @@ foo(2)->?baz.
         check_diagnostics(
             r#"
   baz(1)->4.
-%%^^^^^^^^^^ error: no module definition
+%%^^^^^^^^^^ error: L1201: no module definition
   foo(2)->3.
 "#,
         );
@@ -2941,7 +2941,7 @@ baz(1)->4.
 
             do_foo() ->
               X = foo:bar(),
-            %%    ^^^^^^^^^ 💡 weak: 'foo:bar/0' called
+            %%    ^^^^^^^^^ 💡 weak: ad-hoc: foo:bar/0: 'foo:bar/0' called
               X.
             //- /src/foo.erl
             -module(foo).
@@ -2967,10 +2967,10 @@ baz(1)->4.
     #[test]
     fn label_syntax_error_not_function() {
         let fixture_str = r#"
-  -module(main).
-  -record(person, {(name + XXX)}).
-%%                 ^^^^^^^ error: Syntax Error
-%%                            ^ error: Syntax Error
+    -module(main).
+    -record(person, {(name + XXX)}).
+  %%                 ^^^^^^^ error: P1711: Syntax Error
+  %%                            ^ error: P1711: Syntax Error
 "#;
         check_diagnostics(fixture_str);
         let diagnostic = Diagnostic::error(
@@ -2982,7 +2982,7 @@ baz(1)->4.
         expect![[r#"
             Some(
                 Range(
-                    20..52,
+                    24..56,
                 ),
             )
         "#]]
@@ -2994,7 +2994,7 @@ baz(1)->4.
         check_diagnostics(
             r#"
   baz(1)->4.
-%%^^^^^^^^^^ error: no module definition
+%%^^^^^^^^^^ error: L1201: no module definition
   foo(2)->3.
 "#,
         );
@@ -3018,7 +3018,7 @@ baz(1)->4.
  %% elp:ignore L1201
 
   baz(1)->4.
-%%^^^^^^^^^^ error: no module definition
+%%^^^^^^^^^^ error: L1201: no module definition
   foo(2)->3.
 "#,
         );
@@ -3032,7 +3032,7 @@ baz(1)->4.
 
              baz()->
                Foo = 1,
-             %%^^^ 💡 warning: match is redundant
+             %%^^^ 💡 warning: W0007: match is redundant
                % elp:ignore W0007
                Bar = 2,
                ok.
@@ -3048,11 +3048,11 @@ baz(1)->4.
 
              baz()->
                Foo = 1,
-             %%^^^ 💡 warning: match is redundant
+             %%^^^ 💡 warning: W0007: match is redundant
                % elp:ignore W0007
 
                Bar = 2,
-             %%^^^ 💡 warning: match is redundant
+             %%^^^ 💡 warning: W0007: match is redundant
                ok.
              "#,
         );
@@ -3065,7 +3065,7 @@ baz(1)->4.
              //- edoc
              //- /main/src/main_edoc.erl app:main
              % @unknown
-             %%<^^^^^^^^  warning: tag @unknown not recognized.
+             %%<^^^^^^^^  warning: O0039: tag @unknown not recognized.
              -module(main_edoc).
 
              "#,
@@ -3150,7 +3150,7 @@ baz(1)->4.
 
              -spec foo() -> ok.
              foo( -> ok. %%
-             %%  ^ error: Missing ')'
+             %%  ^ error: W0004: Missing ')'
             "#,
         );
     }
@@ -3180,7 +3180,7 @@ baz(1)->4.
              -export([foo/0]).
 
              foo() -> syntax error oops.
-             %%              ^^^^^ error: syntax error before: error
+             %%              ^^^^^ error: P1711: syntax error before: error
             "#,
         );
     }
@@ -3199,10 +3199,10 @@ baz(1)->4.
 
              foo() ->
                   bar().
-             %%   ^^^^^ error: function bar/0 undefined
+             %%   ^^^^^ error: L1227: function bar/0 undefined
 
              bar() -> !!! %% syntax error
-             %%<^^^^^^^^^ error: Syntax Error
+             %%<^^^^^^^^^ error: P1711: Syntax Error
             "#,
         );
     }
@@ -3216,7 +3216,7 @@ baz(1)->4.
 
              baz()->
                Fo~o = 1.
-             %%^^^ 💡 warning: match is redundant
+             %%^^^ 💡 warning: W0007: match is redundant
              "#,
             expect![[r#"
              -module(main).
@@ -3260,7 +3260,7 @@ baz(1)->4.
 
                 -spec baz() -> ok.
                 baz() -> something_else.
-                %%       ^^^^^^^^^^^^^^ 💡 error: eqwalizer: incompatible_types
+                %%       ^^^^^^^^^^^^^^ 💡 error: eqwalizer: incompatible_types: eqwalizer: incompatible_types
             "#,
             );
         }
@@ -3278,9 +3278,9 @@ baz(1)->4.
                         to_exit_code(run1(Root)),
                     catch
                         _:Reason -> to_exit_code(Reason)
-            %%          ^^^^^^^^^^^  error: Syntax Error
+            %%          ^^^^^^^^^^^  error: P1711: Syntax Error
                     end,
-            %%      ^^^  error: Syntax Error
+            %%      ^^^  error: P1711: Syntax Error
 
                 erlang:halt(ExitCode).
             "#,
@@ -3294,7 +3294,7 @@ baz(1)->4.
 //- erlang_service
   -module(main).
   -export([foo/0, bar/0]).
-%%                ^^^^^  error: function bar/0 undefined
+%%                ^^^^^  error: L1227: function bar/0 undefined
   foo() -> ok.
 "#,
         );
@@ -3307,7 +3307,7 @@ baz(1)->4.
 //- erlang_service
   -module(main).
   -export_type([foo/0, bar/3]).
-%%                     ^^^^^  error: type bar/3 undefined
+%%                     ^^^^^  error: L1295: type bar/3 undefined
   -type foo() :: integer().
 "#,
         );
@@ -3321,7 +3321,7 @@ baz(1)->4.
     -module(main).
     -export([foo/0]).
     -spec bar() -> ok.
-%%        ^^^  error: spec for undefined function bar/0
+%%        ^^^  error: L1308: spec for undefined function bar/0
     foo() -> ok.
 "#,
         );
@@ -3335,7 +3335,7 @@ baz(1)->4.
     -module(main).
 
     -type foo() :: ok.
-%%        ^^^  warning: type foo() is unused
+%%        ^^^  warning: L1296: type foo() is unused
 "#,
         );
 
@@ -3345,7 +3345,7 @@ baz(1)->4.
     -module(main).
 
     -type foo(A, B) :: {A, B}.
-%%        ^^^  warning: type foo(_,_) is unused
+%%        ^^^  warning: L1296: type foo(_,_) is unused
 "#,
         );
     }
@@ -3413,7 +3413,7 @@ baz(1)->4.
               -module(a_file).
 
               -doc {file,"../../doc/src/info.md"}.
-             %%          ^^^^^^^^^^^^^^^^^^^^^^^ warning: can't find doc file "../../doc/src/info.md"
+             %%          ^^^^^^^^^^^^^^^^^^^^^^^ warning: E1599: can't find doc file "../../doc/src/info.md"
 
             "#,
         );
@@ -3429,7 +3429,7 @@ baz(1)->4.
               -module(erlang).
 
               -doc {file,"../../doc/src/info.md"}.
-             %%          ^^^^^^^^^^^^^^^^^^^^^^^ warning: can't find doc file "../../doc/src/info.md"
+             %%          ^^^^^^^^^^^^^^^^^^^^^^^ warning: E1599: can't find doc file "../../doc/src/info.md"
             "#,
         );
     }
@@ -3483,7 +3483,7 @@ baz(1)->4.
                    foo() ->
                      \~"\"\\µA\"" = \~/"\\µA"/
                      X = 3.
-                  %% ^ error: syntax error before: X
+                  %% ^ error: P1711: syntax error before: X
             "#,
         );
     }
@@ -3519,7 +3519,7 @@ baz(1)->4.
                 -export([foo/0]).
 
                 % @docc
-                %%<^^^^^ warning: tag @docc not recognized.
+                %%<^^^^^ warning: O0039: tag @docc not recognized.
                 foo() -> \~"foo".
                 "#,
             );
@@ -3573,7 +3573,7 @@ baz(1)->4.
             -spec error() -> ok.
             error() ->
                 erlang:garbage_collect().
-            %%  ^^^^^^^^^^^^^^^^^^^^^^ 💡 error: Avoid forcing garbage collection.
+            %%  ^^^^^^^^^^^^^^^^^^^^^^ 💡 error: W0047: Avoid forcing garbage collection.
             //- /opt/lib/stdlib-3.17/src/erlang.erl otp_app:/opt/lib/stdlib-3.17
             -module(erlang).
             -export([garbage_collect/0]).
@@ -3614,7 +3614,7 @@ baz(1)->4.
 
             warning() ->
                 erlang:garbage_collect().
-            %%  ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Avoid forcing garbage collection.
+            %%  ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0047: Avoid forcing garbage collection.
             //- /opt/lib/stdlib-3.17/src/erlang.erl otp_app:/opt/lib/stdlib-3.17
             -module(erlang).
             -export([garbage_collect/0]).
@@ -3656,7 +3656,7 @@ baz(1)->4.
 
             warning() ->
                 erlang:garbage_collect().
-            %%  ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Avoid forcing garbage collection.
+            %%  ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0047: Avoid forcing garbage collection.
             //- /opt/lib/stdlib-3.17/src/erlang.erl otp_app:/opt/lib/stdlib-3.17
             -module(erlang).
             -export([garbage_collect/0]).
diff --git a/crates/ide/src/diagnostics/application_env.rs b/crates/ide/src/diagnostics/application_env.rs
index dac88b260c..1e4fe7c4cf 100644
--- a/crates/ide/src/diagnostics/application_env.rs
+++ b/crates/ide/src/diagnostics/application_env.rs
@@ -265,11 +265,11 @@ mod tests {
 
             get_mine() ->
                 application:get_env(misc, key).
-            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: module `main` belongs to app `my_app`, but reads env for `misc`
+            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0011: module `main` belongs to app `my_app`, but reads env for `misc`
 
             get_mine3() ->
                 application:get_env(misc, key, def).
-            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: module `main` belongs to app `my_app`, but reads env for `misc`
+            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0011: module `main` belongs to app `my_app`, but reads env for `misc`
 
             //- /my_app/src/application.erl
             -module(application).
@@ -302,7 +302,7 @@ mod tests {
 
             steal() ->
                 application:get_env(debug, key).
-            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: module `app_env` belongs to app `misc`, but reads env for `debug`
+            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0011: module `app_env` belongs to app `misc`, but reads env for `debug`
 
             //- /misc/src/application.erl app:misc
             -module(application).
@@ -324,7 +324,7 @@ mod tests {
 
             get_mine() ->
                 ?get(misc, key).
-            %%  ^^^^^^^^^^^^^^^ 💡 warning: module `main` belongs to app `my_app`, but reads env for `misc`
+            %%  ^^^^^^^^^^^^^^^ 💡 warning: W0011: module `main` belongs to app `my_app`, but reads env for `misc`
 
             //- /my_app/include/my_header.hrl app:my_app
             -define(get(K,V), application:get_env(K,V)).
diff --git a/crates/ide/src/diagnostics/atoms_exhaustion.rs b/crates/ide/src/diagnostics/atoms_exhaustion.rs
index 096634c156..4708e35b1f 100644
--- a/crates/ide/src/diagnostics/atoms_exhaustion.rs
+++ b/crates/ide/src/diagnostics/atoms_exhaustion.rs
@@ -100,9 +100,9 @@ mod tests {
    -export([main/0]).
    main() ->
      erlang:list_to_atom(foo),
-%%   ^^^^^^^^^^^^^^^^^^^ 💡 warning: Risk of atoms exhaustion.
+%%   ^^^^^^^^^^^^^^^^^^^ 💡 warning: W0023: Risk of atoms exhaustion.
      list_to_atom(foo).
-%%   ^^^^^^^^^^^^ 💡 warning: Risk of atoms exhaustion.
+%%   ^^^^^^^^^^^^ 💡 warning: W0023: Risk of atoms exhaustion.
 
 //- /opt/lib/stdlib-3.17/src/erlang.erl otp_app:/opt/lib/stdlib-3.17
    -module(erlang).
@@ -121,9 +121,9 @@ mod tests {
    -export([main/0]).
    main() ->
      erlang:binary_to_atom(foo),
-%%   ^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Risk of atoms exhaustion.
+%%   ^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0023: Risk of atoms exhaustion.
      binary_to_atom(foo).
-%%   ^^^^^^^^^^^^^^ 💡 warning: Risk of atoms exhaustion.
+%%   ^^^^^^^^^^^^^^ 💡 warning: W0023: Risk of atoms exhaustion.
 
 //- /opt/lib/stdlib-3.17/src/erlang.erl otp_app:/opt/lib/stdlib-3.17
    -module(erlang).
diff --git a/crates/ide/src/diagnostics/binary_string_to_sigil.rs b/crates/ide/src/diagnostics/binary_string_to_sigil.rs
index d87d206583..60a18aa7e1 100644
--- a/crates/ide/src/diagnostics/binary_string_to_sigil.rs
+++ b/crates/ide/src/diagnostics/binary_string_to_sigil.rs
@@ -143,7 +143,7 @@ mod tests {
          -module(binary_string_to_sigil).
 
          fn() -> <<"hello">>.
-         %%      ^^^^^^^^^^^ 💡 weak: Binary string can be written using sigil syntax.
+         %%      ^^^^^^^^^^^ 💡 weak: W0051: Binary string can be written using sigil syntax.
             "#,
         )
     }
diff --git a/crates/ide/src/diagnostics/boolean_precedence.rs b/crates/ide/src/diagnostics/boolean_precedence.rs
index 86650651f7..affbdf9b1d 100644
--- a/crates/ide/src/diagnostics/boolean_precedence.rs
+++ b/crates/ide/src/diagnostics/boolean_precedence.rs
@@ -275,7 +275,7 @@ mod tests {
             foo() ->
               F = fun(X) ->
                 my_is_integer(X) and X > 0 end,
-          %%                     ^^^ 💡 warning: Consider using the short-circuit expression 'andalso' instead of 'and'.
+          %%                     ^^^ 💡 warning: W0025: Consider using the short-circuit expression 'andalso' instead of 'and'.
           %%                       | Or add parentheses to avoid potential ambiguity.
               F.
 
@@ -317,7 +317,7 @@ mod tests {
             -module(main).
             foo(X) ->
               predicate(X) or X > 10.
-          %%               ^^ 💡 warning: Consider using the short-circuit expression 'orelse' instead of 'or'.
+          %%               ^^ 💡 warning: W0025: Consider using the short-circuit expression 'orelse' instead of 'or'.
           %%                | Or add parentheses to avoid potential ambiguity.
 
             predicate(_X) -> false.
@@ -332,7 +332,7 @@ mod tests {
             -module(main).
             foo(S,P) ->
                 (S or P > 3).
-          %%       ^^ 💡 warning: Consider using the short-circuit expression 'orelse' instead of 'or'.
+          %%       ^^ 💡 warning: W0025: Consider using the short-circuit expression 'orelse' instead of 'or'.
           %%        | Or add parentheses to avoid potential ambiguity.
                       "#,
         )
@@ -345,7 +345,7 @@ mod tests {
             -module(main).
             foo(S,P) ->
                 ((S or P > 3)).
-          %%        ^^ 💡 warning: Consider using the short-circuit expression 'orelse' instead of 'or'.
+          %%        ^^ 💡 warning: W0025: Consider using the short-circuit expression 'orelse' instead of 'or'.
           %%         | Or add parentheses to avoid potential ambiguity.
                       "#,
         )
@@ -360,7 +360,7 @@ mod tests {
                 foo() ->
                   F = fun(X) ->
                     my_is_integer(X) a~nd X > 0 end,
-                %%                   ^^^ 💡 warning: Consider using the short-circuit expression 'andalso' instead of 'and'.
+                %%                   ^^^ 💡 warning: W0025: Consider using the short-circuit expression 'andalso' instead of 'and'.
                 %%                     | Or add parentheses to avoid potential ambiguity.
                   F.
 
@@ -388,7 +388,7 @@ mod tests {
             foo() ->
               F = fun(X) ->
                 my_is_integer(X) a~nd X > 0 end,
-            %%                   ^^^ 💡 warning: Consider using the short-circuit expression 'andalso' instead of 'and'.
+            %%                   ^^^ 💡 warning: W0025: Consider using the short-circuit expression 'andalso' instead of 'and'.
             %%                     | Or add parentheses to avoid potential ambiguity.
               F.
 
@@ -412,7 +412,7 @@ mod tests {
             -module(main).
             foo(X) when X < 10 a~nd X > 0 ->
                X + 1.
-            %%                 ^^^ 💡 warning: Consider using the short-circuit expression ',' instead of 'and'.
+            %%                 ^^^ 💡 warning: W0025: Consider using the short-circuit expression ',' instead of 'and'.
             %%                   | Or add parentheses to avoid potential ambiguity.
             "#,
             expect![[r#"
@@ -432,7 +432,7 @@ mod tests {
             foo() ->
               F = fun(X) ->
                 my_is_integer(X) a~nd X > 0 end,
-            %%                   ^^^ 💡 warning: Consider using the short-circuit expression 'andalso' instead of 'and'.
+            %%                   ^^^ 💡 warning: W0025: Consider using the short-circuit expression 'andalso' instead of 'and'.
             %%                     | Or add parentheses to avoid potential ambiguity.
               F.
 
@@ -457,7 +457,7 @@ mod tests {
             foo() ->
               F = fun(X) ->
                 X < 0 o~r X > 10 end,
-            %%        ^^ 💡 warning: Consider using the short-circuit expression 'orelse' instead of 'or'.
+            %%        ^^ 💡 warning: W0025: Consider using the short-circuit expression 'orelse' instead of 'or'.
             %%         | Or add parentheses to avoid potential ambiguity.
               F.
 
@@ -481,7 +481,7 @@ mod tests {
             -module(main).
             foo(X) ->
               predicate(X) o~r X > 10.
-            %%             ^^ 💡 warning: Consider using the short-circuit expression 'orelse' instead of 'or'.
+            %%             ^^ 💡 warning: W0025: Consider using the short-circuit expression 'orelse' instead of 'or'.
             %%              | Or add parentheses to avoid potential ambiguity.
 
             predicate(_X) -> false."#,
diff --git a/crates/ide/src/diagnostics/could_be_a_string_literal.rs b/crates/ide/src/diagnostics/could_be_a_string_literal.rs
index 73b596e0c9..d939163222 100644
--- a/crates/ide/src/diagnostics/could_be_a_string_literal.rs
+++ b/crates/ide/src/diagnostics/could_be_a_string_literal.rs
@@ -265,7 +265,7 @@ mod tests {
          -module(main).
 
          fn() -> list_to_binary("foo").
-         %%      ^^^^^^^^^^^^^^^^^^^^^ 💡 information: Could be rewritten as a binary string literal.
+         %%      ^^^^^^^^^^^^^^^^^^^^^ 💡 information: W0055: Could be rewritten as a binary string literal.
 
          //- /src/erlang.erl
          -module(erlang).
@@ -293,7 +293,7 @@ mod tests {
          -module(main).
 
          fn() -> ~"foo".
-         
+
          "#]],
         )
     }
@@ -306,7 +306,7 @@ mod tests {
          -module(main).
 
          fn() -> erlang:list_to_binary("foo").
-         %%      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 information: Could be rewritten as a binary string literal.
+         %%      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 information: W0055: Could be rewritten as a binary string literal.
 
          //- /src/erlang.erl
          -module(erlang).
@@ -347,7 +347,7 @@ mod tests {
          -module(main).
 
          fn() -> list_to_atom("foo").
-         %%      ^^^^^^^^^^^^^^^^^^^ 💡 information: Could be rewritten as an atom literal.
+         %%      ^^^^^^^^^^^^^^^^^^^ 💡 information: W0055: Could be rewritten as an atom literal.
 
          //- /src/erlang.erl
          -module(erlang).
@@ -388,7 +388,7 @@ mod tests {
          -module(main).
 
          fn() -> erlang:list_to_atom("foo").
-         %%      ^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 information: Could be rewritten as an atom literal.
+         %%      ^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 information: W0055: Could be rewritten as an atom literal.
 
          //- /src/erlang.erl
          -module(erlang).
@@ -429,7 +429,7 @@ mod tests {
          -module(main).
 
          fn() -> atom_to_binary(foo).
-         %%      ^^^^^^^^^^^^^^^^^^^ 💡 information: Could be rewritten as a binary string literal.
+         %%      ^^^^^^^^^^^^^^^^^^^ 💡 information: W0055: Could be rewritten as a binary string literal.
 
          //- /src/erlang.erl
          -module(erlang).
@@ -470,7 +470,7 @@ mod tests {
          -module(main).
 
          fn() -> erlang:atom_to_binary(foo).
-         %%      ^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 information: Could be rewritten as a binary string literal.
+         %%      ^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 information: W0055: Could be rewritten as a binary string literal.
 
          //- /src/erlang.erl
          -module(erlang).
@@ -511,7 +511,7 @@ mod tests {
          -module(main).
 
          fn() -> atom_to_list(foo).
-         %%      ^^^^^^^^^^^^^^^^^ 💡 information: Could be rewritten as a string literal.
+         %%      ^^^^^^^^^^^^^^^^^ 💡 information: W0055: Could be rewritten as a string literal.
 
          //- /src/erlang.erl
          -module(erlang).
@@ -552,7 +552,7 @@ mod tests {
          -module(main).
 
          fn() -> erlang:atom_to_list(foo).
-         %%      ^^^^^^^^^^^^^^^^^^^^^^^^ 💡 information: Could be rewritten as a string literal.
+         %%      ^^^^^^^^^^^^^^^^^^^^^^^^ 💡 information: W0055: Could be rewritten as a string literal.
 
          //- /src/erlang.erl
          -module(erlang).
diff --git a/crates/ide/src/diagnostics/cross_node_eval.rs b/crates/ide/src/diagnostics/cross_node_eval.rs
index a61c058a40..56cf2e1299 100644
--- a/crates/ide/src/diagnostics/cross_node_eval.rs
+++ b/crates/ide/src/diagnostics/cross_node_eval.rs
@@ -111,7 +111,7 @@ mod tests {
 
             foo(Node) ->
                 erlang:spawn(Node, fun() -> ok end).
-            %%  ^^^^^^^^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^^^^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
             "#,
         )
     }
@@ -124,7 +124,7 @@ mod tests {
 
             foo(Node) ->
                 spawn(Node, fun() -> ok end).
-            %%  ^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
 
             "#,
         )
@@ -138,7 +138,7 @@ mod tests {
 
             foo(Node) ->
                 erlang:spawn(Node, modu, ff, []).
-            %%  ^^^^^^^^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^^^^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
 
             "#,
         )
@@ -152,7 +152,7 @@ mod tests {
 
             foo(Node) ->
                 spawn(Node, modu, ff, []).
-            %%  ^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
 
             "#,
         )
@@ -168,7 +168,7 @@ mod tests {
 
             foo(Node) ->
                 erlang:spawn_link(Node, fun() -> ok end).
-            %%  ^^^^^^^^^^^^^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^^^^^^^^^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
             "#,
         )
     }
@@ -181,7 +181,7 @@ mod tests {
 
             foo(Node) ->
                 spawn_link(Node, fun() -> ok end).
-            %%  ^^^^^^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
 
             "#,
         )
@@ -195,7 +195,7 @@ mod tests {
 
             foo(Node) ->
                 erlang:spawn_link(Node, modu, ff, []).
-            %%  ^^^^^^^^^^^^^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^^^^^^^^^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
 
             "#,
         )
@@ -209,7 +209,7 @@ mod tests {
 
             foo(Node) ->
                 spawn_link(Node, modu, ff, []).
-            %%  ^^^^^^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
 
             "#,
         )
@@ -225,7 +225,7 @@ mod tests {
 
             foo(Node) ->
                 erlang:spawn_monitor(Node, fun() -> ok end).
-            %%  ^^^^^^^^^^^^^^^^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^^^^^^^^^^^^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
             "#,
         )
     }
@@ -238,7 +238,7 @@ mod tests {
 
             foo(Node) ->
                 spawn_monitor(Node, fun() -> ok end).
-            %%  ^^^^^^^^^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^^^^^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
 
             "#,
         )
@@ -252,7 +252,7 @@ mod tests {
 
             foo(Node) ->
                 erlang:spawn_monitor(Node, modu, ff, []).
-            %%  ^^^^^^^^^^^^^^^^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^^^^^^^^^^^^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
 
             "#,
         )
@@ -266,7 +266,7 @@ mod tests {
 
             foo(Node) ->
                 spawn_monitor(Node, modu, ff, []).
-            %%  ^^^^^^^^^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^^^^^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
 
             "#,
         )
@@ -282,7 +282,7 @@ mod tests {
 
             foo(Node) ->
                 erlang:spawn_opt(Node, fun() -> ok end, []).
-            %%  ^^^^^^^^^^^^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^^^^^^^^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
             "#,
         )
     }
@@ -295,7 +295,7 @@ mod tests {
 
             foo(Node) ->
                 spawn_opt(Node, fun() -> ok end, []).
-            %%  ^^^^^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
 
             "#,
         )
@@ -309,7 +309,7 @@ mod tests {
 
             foo(Node) ->
                 erlang:spawn_opt(Node, modu, ff, [], []).
-            %%  ^^^^^^^^^^^^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^^^^^^^^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
 
             "#,
         )
@@ -323,7 +323,7 @@ mod tests {
 
             foo(Node) ->
                 spawn_opt(Node, modu, ff, [], []).
-            %%  ^^^^^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
 
             "#,
         )
@@ -337,9 +337,9 @@ mod tests {
 
             foo(Node) ->
                 erts_internal_dist:dist_spawn_request(Node, fun() -> ok end),
-            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
                 erts_internal_dist:dist_spawn_request(Node, modu, ff, [], []).
-            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
 
             "#,
         )
@@ -353,9 +353,9 @@ mod tests {
 
             foo(Node) ->
                 rpc:call(Node, mod, func, []),
-            %%  ^^^^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
                 rpc:multicall([Node], mod, func, []).
-            %%  ^^^^^^^^^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^^^^^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
 
             "#,
         )
@@ -369,9 +369,9 @@ mod tests {
 
             foo(Name, FuncSpec) ->
                 sys:install(Name, FuncSpec),
-            %%  ^^^^^^^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^^^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
                 sys:install(Name, FuncSpec, 500).
-            %%  ^^^^^^^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^^^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
 
             "#,
         )
@@ -401,7 +401,7 @@ mod tests {
 
             foo(Name, FuncSpec) ->
                 sys:inst~all(Name, FuncSpec).
-            %%  ^^^^^^^^^^^^^ 💡 error: Production code must not use cross node eval (e.g. `rpc:call()`)
+            %%  ^^^^^^^^^^^^^ 💡 error: W0014: Production code must not use cross node eval (e.g. `rpc:call()`)
 
             "#,
             expect![[r#"
diff --git a/crates/ide/src/diagnostics/debugging_function.rs b/crates/ide/src/diagnostics/debugging_function.rs
index cdeb147754..904ebe3098 100644
--- a/crates/ide/src/diagnostics/debugging_function.rs
+++ b/crates/ide/src/diagnostics/debugging_function.rs
@@ -113,9 +113,9 @@ mod tests {
 
 error() ->
     redbug:start("io:format/2->return", []),
-%%  ^^^^^^^^^^^^ 💡 weak: Debugging functions should only be used during local debugging and usages should not be checked in.
+%%  ^^^^^^^^^^^^ 💡 weak: W0041: Debugging functions should only be used during local debugging and usages should not be checked in.
     redbug:stop().
-%%  ^^^^^^^^^^^ 💡 weak: Debugging functions should only be used during local debugging and usages should not be checked in.
+%%  ^^^^^^^^^^^ 💡 weak: W0041: Debugging functions should only be used during local debugging and usages should not be checked in.
 
 noerror() ->
     redbug(),
@@ -127,7 +127,7 @@ redbug() ->
 
 start(_) ->
     ok.
- 
+
 //- /src/redbug.erl
 -module(redbug).
 -export([start/2, stop/0]).
@@ -159,7 +159,7 @@ redbug(_) ->
 
 main() ->
     re~dbug:start("io:format/2->return", []).
-%%  ^^^^^^^^^^^^ 💡 weak: Debugging functions should only be used during local debugging and usages should not be checked in.
+%%  ^^^^^^^^^^^^ 💡 weak: W0041: Debugging functions should only be used during local debugging and usages should not be checked in.
 //- /src/redbug.erl
 -module(redbug).
 -export([start/2]).
@@ -191,7 +191,7 @@ main() ->
 
 main() ->
     re~dbug:start("io:format/2->return", []),
-%%  ^^^^^^^^^^^^ 💡 weak: Debugging functions should only be used during local debugging and usages should not be checked in.
+%%  ^^^^^^^^^^^^ 💡 weak: W0041: Debugging functions should only be used during local debugging and usages should not be checked in.
     ok.
 //- /src/redbug.erl
 -module(redbug).
diff --git a/crates/ide/src/diagnostics/dependent_header.rs b/crates/ide/src/diagnostics/dependent_header.rs
index d3b786e240..e0b4d11652 100644
--- a/crates/ide/src/diagnostics/dependent_header.rs
+++ b/crates/ide/src/diagnostics/dependent_header.rs
@@ -119,7 +119,7 @@ mod tests {
             r#"
 //- /include/main.hrl
 -define(MY_MACRO, #my_record{}).
-%%                ^^^^^^^^^^ warning: Record 'my_record' not defined in this context
+%%                ^^^^^^^^^^ warning: W0015: Record 'my_record' not defined in this context
             "#,
         )
     }
@@ -154,7 +154,7 @@ mod tests {
             r#"
 //- /include/main.hrl
 -define(MY_MACRO(Record), Record#my_record.my_field).
-%%                              ^^^^^^^^^^ warning: Record 'my_record' not defined in this context
+%%                              ^^^^^^^^^^ warning: W0015: Record 'my_record' not defined in this context
             "#,
         )
     }
@@ -165,7 +165,7 @@ mod tests {
             r#"
 //- /include/main.hrl
 -define(MY_MACRO, #my_record.my_field).
-%%                ^^^^^^^^^^ warning: Record 'my_record' not defined in this context
+%%                ^^^^^^^^^^ warning: W0015: Record 'my_record' not defined in this context
             "#,
         )
     }
@@ -176,7 +176,7 @@ mod tests {
             r#"
 //- /include/main.hrl
 -define(MY_MACRO(Record), Record#my_record{my_field = 42}).
-%%                              ^^^^^^^^^^ warning: Record 'my_record' not defined in this context
+%%                              ^^^^^^^^^^ warning: W0015: Record 'my_record' not defined in this context
             "#,
         )
     }
diff --git a/crates/ide/src/diagnostics/deprecated_function.rs b/crates/ide/src/diagnostics/deprecated_function.rs
index 65b06006dc..3956282c45 100644
--- a/crates/ide/src/diagnostics/deprecated_function.rs
+++ b/crates/ide/src/diagnostics/deprecated_function.rs
@@ -262,7 +262,7 @@ mod tests {
     ok.
   main() ->
     not_ok_to_use().
-%%  ^^^^^^^^^^^^^ 💡 warning: Function 'not_ok_to_use/0' is deprecated.
+%%  ^^^^^^^^^^^^^ 💡 warning: W0016: Function 'not_ok_to_use/0' is deprecated.
             "#,
         )
     }
@@ -282,7 +282,7 @@ mod tests {
 
   main() ->
     b:not_ok_to_use().
-%%  ^^^^^^^^^^^^^^^ 💡 warning: Function 'not_ok_to_use/0' is deprecated.
+%%  ^^^^^^^^^^^^^^^ 💡 warning: W0016: Function 'not_ok_to_use/0' is deprecated.
             "#,
         )
     }
@@ -296,9 +296,9 @@ mod tests {
   -deprecated({do, 0}).
   main() ->
     do(),
-%%  ^^ 💡 warning: Function 'do/0' is deprecated.
+%%  ^^ 💡 warning: W0016: Function 'do/0' is deprecated.
     ?LAZY(do()).
-%%  ^^^^^^^^^^^ 💡 warning: Function 'do/0' is deprecated.
+%%  ^^^^^^^^^^^ 💡 warning: W0016: Function 'do/0' is deprecated.
   do() ->
     ok.
             "#,
@@ -320,7 +320,7 @@ mod tests {
 
   main() ->
     b:not_ok_to_use().
-%%  ^^^^^^^^^^^^^^^ 💡 warning: Function 'not_ok_to_use/0' is deprecated.
+%%  ^^^^^^^^^^^^^^^ 💡 warning: W0016: Function 'not_ok_to_use/0' is deprecated.
 %%                | Cause I said so.
             "#,
         )
diff --git a/crates/ide/src/diagnostics/duplicate_module.rs b/crates/ide/src/diagnostics/duplicate_module.rs
index de4009cfb8..d9e01ecc53 100644
--- a/crates/ide/src/diagnostics/duplicate_module.rs
+++ b/crates/ide/src/diagnostics/duplicate_module.rs
@@ -67,11 +67,11 @@ mod test {
             r#"
              //- /src/dup_mod.erl
              -module(dup_mod).
-                  %% ^^^^^^^ warning: Duplicate module name
+                  %% ^^^^^^^ warning: W0045: Duplicate module name
 
              //- /src/sub/dup_mod.erl
              -module(dup_mod).
-                  %% ^^^^^^^ warning: Duplicate module name
+                  %% ^^^^^^^ warning: W0045: Duplicate module name
             "#,
         )
     }
diff --git a/crates/ide/src/diagnostics/edoc.rs b/crates/ide/src/diagnostics/edoc.rs
index 1f708b51ea..53858e7cca 100644
--- a/crates/ide/src/diagnostics/edoc.rs
+++ b/crates/ide/src/diagnostics/edoc.rs
@@ -226,7 +226,7 @@ mod tests {
     %% This is some license text.
     %%%-------------------------------------------------------------------
     %% @doc This is the module documentation.
-    %% ^^^^ 💡 warning: EDoc style comments are deprecated. Please use Markdown instead.
+    %% ^^^^ 💡 warning: W0038: EDoc style comments are deprecated. Please use Markdown instead.
     %%      With some more text.
     %%      And some more lines.
     %% @end
@@ -248,7 +248,7 @@ mod tests {
             r#"
     -module(main).
     %% @doc This is the main function documentation.
-    %% ^^^^ 💡 warning: EDoc style comments are deprecated. Please use Markdown instead.
+    %% ^^^^ 💡 warning: W0038: EDoc style comments are deprecated. Please use Markdown instead.
     main() ->
       dep().
 
@@ -264,7 +264,7 @@ mod tests {
     //- /test/main_SUITE.erl extra:test
     -module(main_SUITE).
     %% @doc This is the main function documentation.
-    %% ^^^^ 💡 weak: EDoc style comments are deprecated. Please use Markdown instead.
+    %% ^^^^ 💡 weak: W0038: EDoc style comments are deprecated. Please use Markdown instead.
     main() ->
       dep().
 
@@ -281,14 +281,14 @@ mod tests {
     -export([main/0, main/2]).
 
     %% @doc This is the main function documentation.
-    %% ^^^^ 💡 warning: EDoc style comments are deprecated. Please use Markdown instead.
+    %% ^^^^ 💡 warning: W0038: EDoc style comments are deprecated. Please use Markdown instead.
     %% @see main/2 for more information.
     -spec main() -> tuple().
     main() ->
       main([], []).
 
     %% @doc This is the main function with two arguments documentation.
-    %% ^^^^ 💡 warning: EDoc style comments are deprecated. Please use Markdown instead.
+    %% ^^^^ 💡 warning: W0038: EDoc style comments are deprecated. Please use Markdown instead.
     -spec main(any(), any()) -> tuple().
     main(A, B) ->
       {A, B}.
@@ -305,7 +305,7 @@ mod tests {
     -export_type([my_integer/0]).
 
     %% @doc This is an incorrect type doc
-    %% ^^^^ 💡 warning: EDoc style comments are deprecated. Please use Markdown instead.
+    %% ^^^^ 💡 warning: W0038: EDoc style comments are deprecated. Please use Markdown instead.
     -type my_integer() :: integer().
 
     -type my_integer2() :: integer().
@@ -333,7 +333,7 @@ mod tests {
     -type my_integer2() :: integer().
 
     %% @doc These are docs for the main function
-    %% ^^^^ 💡 warning: EDoc style comments are deprecated. Please use Markdown instead.
+    %% ^^^^ 💡 warning: W0038: EDoc style comments are deprecated. Please use Markdown instead.
     -spec main(any(), any()) -> ok.
     main(A, B) ->
         dep().
@@ -351,7 +351,7 @@ mod tests {
     -export([main/0, main/2]).
 
     %% @doc This is the main function documentation.
-    %% ^^^^ 💡 warning: EDoc style comments are deprecated. Please use Markdown instead.
+    %% ^^^^ 💡 warning: W0038: EDoc style comments are deprecated. Please use Markdown instead.
     %% @see main/2 which is a great function to look at
     %% with a very long description that goes on and on
     -spec main() -> tuple().
@@ -359,7 +359,7 @@ mod tests {
         main([], []).
 
     %% @doc This is the main function with two arguments documentation.
-    %% ^^^^ 💡 warning: EDoc style comments are deprecated. Please use Markdown instead.
+    %% ^^^^ 💡 warning: W0038: EDoc style comments are deprecated. Please use Markdown instead.
     -spec main(any(), any()) -> tuple().
     main(A, B) ->
         {A, B}.
@@ -604,7 +604,7 @@ dep() -> ok.
         check_fix(
             r#"
 -module(main).
-%% @d~oc   
+%% @d~oc
 %% This is some doc
 %% @end
 main() ->
diff --git a/crates/ide/src/diagnostics/effect_free_statement.rs b/crates/ide/src/diagnostics/effect_free_statement.rs
index a5a1a138a9..72d6c8eb8d 100644
--- a/crates/ide/src/diagnostics/effect_free_statement.rs
+++ b/crates/ide/src/diagnostics/effect_free_statement.rs
@@ -275,10 +275,10 @@ mod tests {
             test_foo(_Config) ->
                 do_something(),
                 ok,
-            %%  ^^ 💡 warning: this statement has no effect
+            %%  ^^ 💡 warning: W0006: this statement has no effect
                 do_something_else(),
                 bar,
-            %%  ^^^ 💡 warning: this statement has no effect
+            %%  ^^^ 💡 warning: W0006: this statement has no effect
                 ok.
             do_something() -> ok.
             "#,
@@ -293,7 +293,7 @@ mod tests {
             test_foo(_Config) ->
                 X = 42,
                 X,
-            %%  ^ 💡 warning: this statement has no effect
+            %%  ^ 💡 warning: W0006: this statement has no effect
                 ok.
             "#,
         );
@@ -307,16 +307,16 @@ mod tests {
             test_foo(_Config) ->
                 do_something(),
                 42,
-            %%  ^^ 💡 warning: this statement has no effect
+            %%  ^^ 💡 warning: W0006: this statement has no effect
                 41.9999,
-            %%  ^^^^^^^ 💡 warning: this statement has no effect
+            %%  ^^^^^^^ 💡 warning: W0006: this statement has no effect
                 do_something_else(),
                 "foo",
-            %%  ^^^^^ 💡 warning: this statement has no effect
+            %%  ^^^^^ 💡 warning: W0006: this statement has no effect
                 <<"foo">>,
-            %%  ^^^^^^^^^ 💡 warning: this statement has no effect
+            %%  ^^^^^^^^^ 💡 warning: W0006: this statement has no effect
                 'A',
-            %%  ^^^ 💡 warning: this statement has no effect
+            %%  ^^^ 💡 warning: W0006: this statement has no effect
                 ok.
             do_something() -> 42.
             "#,
@@ -332,13 +332,13 @@ mod tests {
             test_foo(_Config) ->
                 do_something(),
                 fun() -> do_something() end,
-            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: this statement has no effect
+            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0006: this statement has no effect
                 F = fun() -> do_something() end,
                 F(),
                 fun do_something/0,
-            %%  ^^^^^^^^^^^^^^^^^^ 💡 warning: this statement has no effect
+            %%  ^^^^^^^^^^^^^^^^^^ 💡 warning: W0006: this statement has no effect
                 fun erlang:length/1,
-            %%  ^^^^^^^^^^^^^^^^^^^ 💡 warning: this statement has no effect
+            %%  ^^^^^^^^^^^^^^^^^^^ 💡 warning: W0006: this statement has no effect
                 ok.
             do_something() -> 42.
             //- /src/erlang.erl
@@ -357,7 +357,7 @@ mod tests {
             test_foo(_Config) ->
                 (do_something()),
                 (blah),
-            %%  ^^^^^^ 💡 warning: this statement has no effect
+            %%  ^^^^^^ 💡 warning: W0006: this statement has no effect
                 ok.
             do_something() -> (abc).
             "#,
@@ -372,13 +372,13 @@ mod tests {
             test_foo(_Config) ->
                 do_something(),
                 begin abc, blah, ("foo") end,
-            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: this statement has no effect
-            %%        ^^^ 💡 warning: this statement has no effect
-            %%             ^^^^ 💡 warning: this statement has no effect
+            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0006: this statement has no effect
+            %%        ^^^ 💡 warning: W0006: this statement has no effect
+            %%             ^^^^ 💡 warning: W0006: this statement has no effect
                 begin
                   do_something(),
                   blah,
-              %%  ^^^^ 💡 warning: this statement has no effect
+              %%  ^^^^ 💡 warning: W0006: this statement has no effect
                   ok
                 end,
                 ok.
@@ -395,10 +395,10 @@ mod tests {
             test_foo(_Config) ->
                 do_something(),
                 [42, blah, ("foo")],
-            %%  ^^^^^^^^^^^^^^^^^^^ 💡 warning: this statement has no effect
+            %%  ^^^^^^^^^^^^^^^^^^^ 💡 warning: W0006: this statement has no effect
                 [42, do_something(), blah],
                 [],
-            %%  ^^ 💡 warning: this statement has no effect
+            %%  ^^ 💡 warning: W0006: this statement has no effect
                 ok.
             do_something() -> [].
             "#,
@@ -413,10 +413,10 @@ mod tests {
             test_foo(_Config) ->
                 do_something(),
                 {42, [blah], {"foo"}},
-            %%  ^^^^^^^^^^^^^^^^^^^^^ 💡 warning: this statement has no effect
+            %%  ^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0006: this statement has no effect
                 {42, do_something(), blah},
                 {},
-            %%  ^^ 💡 warning: this statement has no effect
+            %%  ^^ 💡 warning: W0006: this statement has no effect
                 ok.
             do_something() -> [].
             "#,
@@ -432,11 +432,11 @@ mod tests {
             test_foo(P) ->
                 do_something(),
                 #person{name="Bob", age=42},
-            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: this statement has no effect
+            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0006: this statement has no effect
                 #person{name=get_name(), age=42},
                 P#person{name="Alice"},
                 #person.name,
-            %%  ^^^^^^^^^^^^ 💡 warning: this statement has no effect
+            %%  ^^^^^^^^^^^^ 💡 warning: W0006: this statement has no effect
                 P#person.name,
                 ok.
             get_name() -> "bob".
@@ -452,7 +452,7 @@ mod tests {
             test_foo(P) ->
                 do_something(),
                 #{name => "Bob", age => 42},
-            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: this statement has no effect
+            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0006: this statement has no effect
                 #{name => get_name(), age => 42},
                 #{get_key() => "Bob", age => 42},
                 P#{name=>"Alice"},
@@ -471,10 +471,10 @@ mod tests {
             test_foo(_P) ->
                 catch do_something(),
                 catch ok,
-            %%  ^^^^^^^^ 💡 warning: this statement has no effect
+            %%  ^^^^^^^^ 💡 warning: W0006: this statement has no effect
                 try does, nothing catch _ -> do_stuff() end,
-            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: this statement has no effect
-                %%  ^^^^ 💡 warning: this statement has no effect
+            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0006: this statement has no effect
+                %%  ^^^^ 💡 warning: W0006: this statement has no effect
                 try
                     does_nothing
                 of _ -> ok
@@ -486,20 +486,20 @@ mod tests {
                     ok
                 end,
                 try does, nothing after blah, ok end,
-            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: this statement has no effect
-                %%  ^^^^ 💡 warning: this statement has no effect
-                                    %%  ^^^^ 💡 warning: this statement has no effect
+            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0006: this statement has no effect
+                %%  ^^^^ 💡 warning: W0006: this statement has no effect
+                                    %%  ^^^^ 💡 warning: W0006: this statement has no effect
                 try
                     does, nothing
-                %%  ^^^^ 💡 warning: this statement has no effect
+                %%  ^^^^ 💡 warning: W0006: this statement has no effect
                 of _ -> foo, bar
-                    %%  ^^^ 💡 warning: this statement has no effect
+                    %%  ^^^ 💡 warning: W0006: this statement has no effect
                 catch
                   _ -> 42, not_ok
-                   %%  ^^ 💡 warning: this statement has no effect
+                   %%  ^^ 💡 warning: W0006: this statement has no effect
                 after
                   [1,2,3],
-              %%  ^^^^^^^ 💡 warning: this statement has no effect
+              %%  ^^^^^^^ 💡 warning: W0006: this statement has no effect
                   ok
                 end,
                 ok.
@@ -522,7 +522,7 @@ mod tests {
 
             blah() ->
                  noop,
-             %%  ^^^^ 💡 warning: this statement has no effect
+             %%  ^^^^ 💡 warning: W0006: this statement has no effect
                  do_something(),
                  ?included_noop(42),
                  do_something(),
diff --git a/crates/ide/src/diagnostics/equality_check_with_unnecessary_operator.rs b/crates/ide/src/diagnostics/equality_check_with_unnecessary_operator.rs
index 803f89b886..92f205f894 100644
--- a/crates/ide/src/diagnostics/equality_check_with_unnecessary_operator.rs
+++ b/crates/ide/src/diagnostics/equality_check_with_unnecessary_operator.rs
@@ -619,7 +619,7 @@ mod tests {
 
          fn(A, Same, Diff) ->
             case A =:= b of true -> Same; false -> Diff end.
-         %%      ^^^^^^^💡 information: Consider rewriting to an equality match.
+         %%      ^^^^^^^💡 information: W0042: Consider rewriting to an equality match.
             "#,
         )
     }
@@ -633,7 +633,7 @@ mod tests {
 
          fn(A, Same, Diff) ->
             case A =:= b of false -> Diff; true -> Same end.
-         %%      ^^^^^^^💡 information: Consider rewriting to an equality match.
+         %%      ^^^^^^^💡 information: W0042: Consider rewriting to an equality match.
             "#,
         )
     }
@@ -724,7 +724,7 @@ mod tests {
 
          fn(B, Same, Diff) ->
             case a =:= B of true -> Same; _ -> Diff end.
-         %%      ^^^^^^^💡 information: Consider rewriting to an equality match.
+         %%      ^^^^^^^💡 information: W0042: Consider rewriting to an equality match.
             "#,
         )
     }
@@ -740,7 +740,7 @@ mod tests {
 
          fn(Same, Diff) ->
             case get_a() =:= foo of true -> Same; _ -> Diff end.
-         %%      ^^^^^^^^^^^^^^^💡 information: Consider rewriting to an equality match.
+         %%      ^^^^^^^^^^^^^^^💡 information: W0042: Consider rewriting to an equality match.
             "#,
         )
     }
@@ -756,7 +756,7 @@ mod tests {
 
          fn(Same, Diff) ->
             case foo =:= get_b() of true -> Same; _ -> Diff end.
-         %%      ^^^^^^^^^^^^^^^💡 information: Consider rewriting to an equality match.
+         %%      ^^^^^^^^^^^^^^^💡 information: W0042: Consider rewriting to an equality match.
             "#,
         )
     }
@@ -908,7 +908,7 @@ mod tests {
 
          fn(A, Same, Diff) ->
             case A =/= b of false -> Same; true -> Diff end.
-         %%      ^^^^^^^💡 information: Consider rewriting to an equality match.
+         %%      ^^^^^^^💡 information: W0042: Consider rewriting to an equality match.
             "#,
         );
         check_diagnostics(
@@ -918,7 +918,7 @@ mod tests {
 
          fn(B, Same, Diff) ->
             case a =/= B of false -> Same; true -> Diff end.
-         %%      ^^^^^^^💡 information: Consider rewriting to an equality match.
+         %%      ^^^^^^^💡 information: W0042: Consider rewriting to an equality match.
             "#,
         )
     }
@@ -932,7 +932,7 @@ mod tests {
 
          fn(A, Same, Diff) ->
             case A =/= b of true -> Diff; false -> Same end.
-         %%      ^^^^^^^💡 information: Consider rewriting to an equality match.
+         %%      ^^^^^^^💡 information: W0042: Consider rewriting to an equality match.
             "#,
         );
         check_diagnostics(
@@ -942,7 +942,7 @@ mod tests {
 
          fn(B, Same, Diff) ->
             case a =/= B of true -> Diff; false -> Same end.
-         %%      ^^^^^^^💡 information: Consider rewriting to an equality match.
+         %%      ^^^^^^^💡 information: W0042: Consider rewriting to an equality match.
             "#,
         )
     }
@@ -956,7 +956,7 @@ mod tests {
 
          fn(A, Same, Diff) ->
             case A =/= b of false -> Same; _ -> Diff end.
-         %%      ^^^^^^^💡 information: Consider rewriting to an equality match.
+         %%      ^^^^^^^💡 information: W0042: Consider rewriting to an equality match.
             "#,
         );
         check_diagnostics(
@@ -966,7 +966,7 @@ mod tests {
 
          fn(B, Same, Diff) ->
             case a =/= B of false -> Same; _ -> Diff end.
-         %%      ^^^^^^^💡 information: Consider rewriting to an equality match.
+         %%      ^^^^^^^💡 information: W0042: Consider rewriting to an equality match.
             "#,
         );
     }
@@ -982,7 +982,7 @@ mod tests {
 
          fn(Same, Diff) ->
             case get_a() =/= bar of false -> Same; _ -> Diff end.
-         %%      ^^^^^^^^^^^^^^^💡 information: Consider rewriting to an equality match.
+         %%      ^^^^^^^^^^^^^^^💡 information: W0042: Consider rewriting to an equality match.
             "#,
         )
     }
@@ -998,7 +998,7 @@ mod tests {
 
          fn(Same, Diff) ->
             case bar =/= get_b() of false -> Same; _ -> Diff end.
-         %%      ^^^^^^^^^^^^^^^💡 information: Consider rewriting to an equality match.
+         %%      ^^^^^^^^^^^^^^^💡 information: W0042: Consider rewriting to an equality match.
             "#,
         )
     }
@@ -1504,7 +1504,7 @@ mod tests {
 
          fn(A, Same, Diff) ->
             if A =:= b -> Same; true -> Diff end.
-         %%    ^^^^^^^💡 information: Consider rewriting to an equality match.
+         %%    ^^^^^^^💡 information: W0042: Consider rewriting to an equality match.
             "#,
         );
         check_diagnostics(
@@ -1514,7 +1514,7 @@ mod tests {
 
          fn(B, Same, Diff) ->
             if a =:= B -> Same; true -> Diff end.
-         %%    ^^^^^^^💡 information: Consider rewriting to an equality match.
+         %%    ^^^^^^^💡 information: W0042: Consider rewriting to an equality match.
             "#,
         );
     }
@@ -1528,7 +1528,7 @@ mod tests {
 
          fn(A, Same, Diff) ->
             if A =/= b -> Diff; true -> Same end.
-         %%    ^^^^^^^💡 information: Consider rewriting to an equality match.
+         %%    ^^^^^^^💡 information: W0042: Consider rewriting to an equality match.
             "#,
         );
         check_diagnostics(
@@ -1538,7 +1538,7 @@ mod tests {
 
          fn(B, Same, Diff) ->
             if a =/= B -> Diff; true -> Same end.
-         %%    ^^^^^^^💡 information: Consider rewriting to an equality match.
+         %%    ^^^^^^^💡 information: W0042: Consider rewriting to an equality match.
             "#,
         )
     }
diff --git a/crates/ide/src/diagnostics/eqwalizer_assists/expected_type.rs b/crates/ide/src/diagnostics/eqwalizer_assists/expected_type.rs
index ff8226b611..ee655d2f8c 100644
--- a/crates/ide/src/diagnostics/eqwalizer_assists/expected_type.rs
+++ b/crates/ide/src/diagnostics/eqwalizer_assists/expected_type.rs
@@ -192,7 +192,7 @@ mod tests {
 
                 -spec baz() -> spec_atom.
                 baz() -> something_else.
-                     %%% ^^^^^^^^^^^^^^ 💡 error: eqwalizer: incompatible_types
+                     %%% ^^^^^^^^^^^^^^ 💡 error: eqwalizer: incompatible_types: eqwalizer: incompatible_types
             "#,
             )
         }
@@ -210,7 +210,7 @@ mod tests {
 
             -spec baz() -> spec_atom.
             baz() -> somet~hing_else.
-                  %% ^^^^^^^^^^^^^^ 💡 error: eqwalizer: incompatible_types
+                  %% ^^^^^^^^^^^^^^ 💡 error: eqwalizer: incompatible_types: eqwalizer: incompatible_types
             "#,
                 expect![[r#"
             -module(bar3e).
@@ -234,7 +234,7 @@ mod tests {
 
             -spec baz() -> spec_atom.
             baz() -> somethin~g_else.
-                  %% ^^^^^^^^^^^^^^ 💡 error: eqwalizer: incompatible_types
+                  %% ^^^^^^^^^^^^^^ 💡 error: eqwalizer: incompatible_types: eqwalizer: incompatible_types
             "#,
                 expect![[r#"
             -module(bar4e).
@@ -258,7 +258,7 @@ mod tests {
 
             -spec baz() -> {ok, number()}.
             baz() -> 5~3.
-              %%     ^^ 💡 error: eqwalizer: incompatible_types
+              %%     ^^ 💡 error: eqwalizer: incompatible_types: eqwalizer: incompatible_types
             "#,
                 expect![[r#"
             -module(bar5e).
@@ -282,7 +282,7 @@ mod tests {
 
             -spec baz() -> {ok, number()}.
             baz() -> 5~3.
-                  %% ^^ 💡 error: eqwalizer: incompatible_types
+                  %% ^^ 💡 error: eqwalizer: incompatible_types: eqwalizer: incompatible_types
             "#,
                 expect![[r#"
             -module(bar6e).
@@ -306,7 +306,7 @@ mod tests {
 
             -spec foo() -> integer().
             foo() -> o~k.
-                  %% ^^ 💡 error: eqwalizer: incompatible_types
+                  %% ^^ 💡 error: eqwalizer: incompatible_types: eqwalizer: incompatible_types
             "#,
                 expect![[r#"
             -module(bar).
diff --git a/crates/ide/src/diagnostics/eqwalizer_assists/unexported_type.rs b/crates/ide/src/diagnostics/eqwalizer_assists/unexported_type.rs
index 61b4bfee32..f83361eaf0 100644
--- a/crates/ide/src/diagnostics/eqwalizer_assists/unexported_type.rs
+++ b/crates/ide/src/diagnostics/eqwalizer_assists/unexported_type.rs
@@ -92,7 +92,7 @@ mod tests {
                 -module(bar).
 
                 -spec baz() -> other:a_type().
-                %%             ^^^^^^^^^^^^^^ 💡 error: eqwalizer: non_exported_id
+                %%             ^^^^^^^^^^^^^^ 💡 error: eqwalizer: non_exported_id: eqwalizer: non_exported_id
                 baz() -> ok.
 
             //- /play/src/other.erl app:play
diff --git a/crates/ide/src/diagnostics/expression_can_be_simplified.rs b/crates/ide/src/diagnostics/expression_can_be_simplified.rs
index f941ff1738..4f3ce6ac57 100644
--- a/crates/ide/src/diagnostics/expression_can_be_simplified.rs
+++ b/crates/ide/src/diagnostics/expression_can_be_simplified.rs
@@ -273,32 +273,32 @@ mod tests {
   -module(main).
   list_ops(X) ->
     f([] ++ [1]),
-   %% ^^^^^^^^^ 💡 warning: Can be simplified to `[1]`.
+   %% ^^^^^^^^^ 💡 warning: W0019: Can be simplified to `[1]`.
     f([2] ++ [1]),
     f(X ++ [1]),
     ok.
 
   arith_ops(X) ->
     f(0 + 42),
-   %% ^^^^^^ 💡 warning: Can be simplified to `42`.
+   %% ^^^^^^ 💡 warning: W0019: Can be simplified to `42`.
     f(40 + 2),
     f(X + 42),
     ok.
 
   short_circuit_boolean_ops(X) ->
     f(true andalso X),
-   %% ^^^^^^^^^^^^^^ 💡 warning: Can be simplified to `X`.
+   %% ^^^^^^^^^^^^^^ 💡 warning: W0019: Can be simplified to `X`.
     f(false orelse X),
-   %% ^^^^^^^^^^^^^^ 💡 warning: Can be simplified to `X`.
+   %% ^^^^^^^^^^^^^^ 💡 warning: W0019: Can be simplified to `X`.
     f(not false),
-   %% ^^^^^^^^^ 💡 warning: Can be simplified to `true`.
+   %% ^^^^^^^^^ 💡 warning: W0019: Can be simplified to `true`.
     f(not true),
-   %% ^^^^^^^^ 💡 warning: Can be simplified to `false`.
+   %% ^^^^^^^^ 💡 warning: W0019: Can be simplified to `false`.
 
       true andalso X,
-   %% ^^^^^^^^^^^^^^ 💡 warning: Can be simplified to `X`.
+   %% ^^^^^^^^^^^^^^ 💡 warning: W0019: Can be simplified to `X`.
     ok.
-      
+
 
   f(X) -> X.
             "#,
diff --git a/crates/ide/src/diagnostics/head_mismatch.rs b/crates/ide/src/diagnostics/head_mismatch.rs
index 259ed2853c..425ed09e6d 100644
--- a/crates/ide/src/diagnostics/head_mismatch.rs
+++ b/crates/ide/src/diagnostics/head_mismatch.rs
@@ -393,7 +393,7 @@ mod tests {
     -module(main).
     foo(0) -> 1;
     boo(1) -> 2.
- %% ^^^ 💡 error: head mismatch 'boo' vs 'foo'
+ %% ^^^ 💡 error: P1700: head mismatch 'boo' vs 'foo'
             "#,
         );
         check_fix(
@@ -418,7 +418,7 @@ mod tests {
             food(0) ->
                 ok;
             fooX(_X) ->
-         %% ^^^^ 💡 error: head mismatch 'fooX' vs 'food'
+         %% ^^^^ 💡 error: P1700: head mismatch 'fooX' vs 'food'
                 no.
 
             bar() ->
@@ -447,7 +447,7 @@ mod tests {
             r#"
     -module(main).
     foo(0) -> 1;
- %% ^^^ 💡 error: head mismatch 'foo' vs 'boo'
+ %% ^^^ 💡 error: P1700: head mismatch 'foo' vs 'boo'
     boo(1) -> 2;
     boo(2) -> 3.
             "#,
@@ -475,7 +475,7 @@ mod tests {
     -module(main).
     foo(0) -> 1;
     foo(1,0) -> 2.
- %% ^^^^^^^^^^^^^ error: head arity mismatch 2 vs 1
+ %% ^^^^^^^^^^^^^ error: P1700: head arity mismatch 2 vs 1
             "#,
         );
     }
@@ -487,7 +487,7 @@ mod tests {
     -module(main).
     foo(2,0) -> 3;
     foo(0) -> 1;
- %% ^^^^^^^^^^^ error: head arity mismatch 1 vs 2
+ %% ^^^^^^^^^^^ error: P1700: head arity mismatch 1 vs 2
     foo(1,0) -> 2.
             "#,
         );
@@ -513,7 +513,7 @@ mod tests {
        F = fun
            (0) -> ok;
            A(N) -> ok
-        %% ^ 💡 error: head mismatch 'A' vs ''
+        %% ^ 💡 error: P1700: head mismatch 'A' vs ''
        end,
        F().
             "#,
diff --git a/crates/ide/src/diagnostics/inefficient_enumerate.rs b/crates/ide/src/diagnostics/inefficient_enumerate.rs
index f09cffae61..01891974e3 100644
--- a/crates/ide/src/diagnostics/inefficient_enumerate.rs
+++ b/crates/ide/src/diagnostics/inefficient_enumerate.rs
@@ -261,7 +261,7 @@ mod tests {
          -module(inefficient_enumerate).
 
          fn(List) -> lists:zip(lists:seq(1,length(List)),List).
-         %%          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: Unnecessary intermediate list allocated.
+         %%          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: W0033: Unnecessary intermediate list allocated.
             "#,
         )
     }
@@ -305,7 +305,7 @@ mod tests {
          -module(inefficient_enumerate).
 
          fn(N, List) -> lists:zip(lists:seq(N,length(List)),List).
-         %%             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: Unnecessary intermediate list allocated.
+         %%             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: W0033: Unnecessary intermediate list allocated.
             "#,
         )
     }
@@ -337,7 +337,7 @@ mod tests {
          -module(inefficient_enumerate).
 
          fn(N, Step, List) -> lists:zip(lists:seq(N,Step,length(List)),List).
-         %%                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: Unnecessary intermediate list allocated.
+         %%                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: W0033: Unnecessary intermediate list allocated.
             "#,
         )
     }
diff --git a/crates/ide/src/diagnostics/inefficient_flatlength.rs b/crates/ide/src/diagnostics/inefficient_flatlength.rs
index 29d2088ffc..7cc2dd14e7 100644
--- a/crates/ide/src/diagnostics/inefficient_flatlength.rs
+++ b/crates/ide/src/diagnostics/inefficient_flatlength.rs
@@ -138,7 +138,7 @@ mod tests {
          -module(inefficient_flatlength).
 
          fn(NestedList) -> length(lists:flatten(NestedList)).
-         %%                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: Unnecessary intermediate flat-list allocated.
+         %%                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: W0028: Unnecessary intermediate flat-list allocated.
             "#,
         )
     }
diff --git a/crates/ide/src/diagnostics/inefficient_last.rs b/crates/ide/src/diagnostics/inefficient_last.rs
index e068ef614c..5c1f6af896 100644
--- a/crates/ide/src/diagnostics/inefficient_last.rs
+++ b/crates/ide/src/diagnostics/inefficient_last.rs
@@ -192,7 +192,7 @@ mod tests {
 
          % elp:ignore W0017 (undefined_function)
          fn(List) -> hd(lists:reverse(List)).
-         %%          ^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Unnecessary intermediate reverse list allocated.
+         %%          ^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0029: Unnecessary intermediate reverse list allocated.
             "#,
         )
     }
@@ -225,7 +225,7 @@ mod tests {
 
          % elp:ignore W0017 (undefined_function)
          fn(List) -> [LastElem|_] = lists:reverse(List), LastElem.
-         %%          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Unnecessary intermediate reverse list allocated.
+         %%          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0029: Unnecessary intermediate reverse list allocated.
             "#,
         )
     }
diff --git a/crates/ide/src/diagnostics/macro_precedence_suprise.rs b/crates/ide/src/diagnostics/macro_precedence_suprise.rs
index eb982359e2..49c627da28 100644
--- a/crates/ide/src/diagnostics/macro_precedence_suprise.rs
+++ b/crates/ide/src/diagnostics/macro_precedence_suprise.rs
@@ -126,6 +126,7 @@ mod tests {
     use crate::tests::check_diagnostics_with_config;
     use crate::tests::check_fix;
 
+    #[track_caller]
     fn check_diagnostics(fixture: &str) {
         let config = DiagnosticsConfig::default()
             .enable(DiagnosticCode::OldEdocSyntax)
@@ -140,7 +141,7 @@ mod tests {
              -module(main).
              -define(MYOP(B,C), B + C).
              foo(A,B,C) -> A * ?MYOP(B,C).
-              %%               ^^^^^^^^^^ 💡 warning: The macro expansion can have unexpected precedence here
+              %%               ^^^^^^^^^^ 💡 warning: W0039: The macro expansion can have unexpected precedence here
              bar(B,C) -> ?MYOP(B,C).
             "#,
         )
@@ -177,7 +178,7 @@ mod tests {
              -define(MYOPB(B,C), ?MYOPA(B, C)).
              -define(MYOPC(B,C), ?MYOPB(B, C)).
              foo(A,B,C) -> A * ?MYOPC(B,C).
-              %%               ^^^^^^^^^^^ 💡 warning: The macro expansion can have unexpected precedence here
+              %%               ^^^^^^^^^^^ 💡 warning: W0039: The macro expansion can have unexpected precedence here
             "#,
         )
     }
diff --git a/crates/ide/src/diagnostics/map_find_to_syntax.rs b/crates/ide/src/diagnostics/map_find_to_syntax.rs
index 2bb80e9307..0f4b9afe72 100644
--- a/crates/ide/src/diagnostics/map_find_to_syntax.rs
+++ b/crates/ide/src/diagnostics/map_find_to_syntax.rs
@@ -548,7 +548,7 @@ mod tests {
          fn(Found, NotFound, M) ->
             % elp:ignore W0017 (undefined_function)
             case maps:find(my_key,M) of {ok, V} -> Found; error -> NotFound end.
-         %% ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^💡 warning: Unnecessary allocation of result tuple when the key is found.
+         %% ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^💡 warning: W0032: Unnecessary allocation of result tuple when the key is found.
             "#,
         )
     }
@@ -563,7 +563,7 @@ mod tests {
          fn(Found, NotFound, M) ->
             % elp:ignore W0017 (undefined_function)
             case maps:find({key_a,key_b},M) of {ok, V} -> Found; error -> NotFound end.
-         %% ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^💡 warning: Unnecessary allocation of result tuple when the key is found.
+         %% ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^💡 warning: W0032: Unnecessary allocation of result tuple when the key is found.
             "#,
         )
     }
@@ -578,7 +578,7 @@ mod tests {
          fn(K, Found, NotFound, M) ->
             % elp:ignore W0017 (undefined_function)
             case maps:find(K,M) of {ok, V} -> Found; error -> NotFound end.
-         %% ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^💡 warning: Unnecessary allocation of result tuple when the key is found.
+         %% ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^💡 warning: W0032: Unnecessary allocation of result tuple when the key is found.
             "#,
         )
     }
@@ -593,7 +593,7 @@ mod tests {
          fn(K, Found, NotFound, M) ->
             % elp:ignore W0017 (undefined_function)
             case maps:find(K,M) of {ok, V} -> Found; _ -> NotFound end.
-         %% ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^💡 warning: Unnecessary allocation of result tuple when the key is found.
+         %% ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^💡 warning: W0032: Unnecessary allocation of result tuple when the key is found.
             "#,
         )
     }
diff --git a/crates/ide/src/diagnostics/map_insertion_to_syntax.rs b/crates/ide/src/diagnostics/map_insertion_to_syntax.rs
index 20fef36dab..5f8c8a5398 100644
--- a/crates/ide/src/diagnostics/map_insertion_to_syntax.rs
+++ b/crates/ide/src/diagnostics/map_insertion_to_syntax.rs
@@ -234,7 +234,7 @@ mod tests {
 
          % elp:ignore W0017 (undefined_function)
          fn(K, V, Map) -> maps:put(K, V, Map).
-         %%               ^^^^^^^^^^^^^^^^^^^💡 weak: Consider using map syntax rather than a function call.
+         %%               ^^^^^^^^^^^^^^^^^^^💡 weak: W0030: Consider using map syntax rather than a function call.
             "#,
         )
     }
@@ -248,7 +248,7 @@ mod tests {
 
          % elp:ignore W0017 (undefined_function)
          fn(K, V, Map) -> maps:update(K, V, Map).
-         %%               ^^^^^^^^^^^^^^^^^^^^^^💡 weak: Consider using map syntax rather than a function call.
+         %%               ^^^^^^^^^^^^^^^^^^^^^^💡 weak: W0031: Consider using map syntax rather than a function call.
             "#,
         )
     }
diff --git a/crates/ide/src/diagnostics/meck.rs b/crates/ide/src/diagnostics/meck.rs
index e508481337..1fc115638d 100644
--- a/crates/ide/src/diagnostics/meck.rs
+++ b/crates/ide/src/diagnostics/meck.rs
@@ -253,7 +253,7 @@ mod tests {
    all() -> [a].
    init_per_suite(Config) ->
      meck:new(my_module).
-%%   ^^^^^^^^^^^^^^^^^^^ 💡 warning: Missing no_link option.
+%%   ^^^^^^^^^^^^^^^^^^^ 💡 warning: W0022: Missing no_link option.
 
    a(_Config) ->
      ok.
@@ -277,7 +277,7 @@ mod tests {
    all() -> [a].
    init_per_group(_Group, Config) ->
      meck:new(my_module),
-%%   ^^^^^^^^^^^^^^^^^^^ 💡 warning: Missing no_link option.
+%%   ^^^^^^^^^^^^^^^^^^^ 💡 warning: W0022: Missing no_link option.
      Config.
 
    a(_Config) ->
@@ -326,7 +326,7 @@ mod tests {
    all() -> [a].
    init_per_suite(Config) ->
      meck:new(my_module, [passthrough, link]).
-%%   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Missing no_link option.
+%%   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0022: Missing no_link option.
 
    a(_Config) ->
      ok.
diff --git a/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs b/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs
index 308d2890c6..6114658bf2 100644
--- a/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs
+++ b/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs
@@ -233,7 +233,7 @@ mod tests {
         check_diagnostics(
             r#"
             //- /erl/my_app/src/main.erl
-            %% <<< 💡 error: Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+            %% <<< 💡 error: W0012: Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
 
             -module(main).
 
@@ -249,7 +249,7 @@ mod tests {
             -module(main).
 
             -compile([export_all, nowarn_export_all]).
-         %% ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 error: Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+         %% ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 error: W0012: Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
 
             "#,
         )
@@ -275,7 +275,7 @@ mod tests {
             -module(main).
 
             -compile(warn_missing_spec).
-         %% ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 error: Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+         %% ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 error: W0012: Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
 
             "#,
         )
@@ -289,7 +289,7 @@ mod tests {
             -module(main).
 
             -compile(nowarn_missing_spec).
-         %% ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 error: Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+         %% ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 error: W0012: Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
 
             "#,
         )
@@ -342,7 +342,7 @@ mod tests {
             -module(main).
 
             -compile(export_all).
-         %% ^^^^^^^^^^^^^^^^^^^^^ 💡 error: Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+         %% ^^^^^^^^^^^^^^^^^^^^^ 💡 error: W0012: Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
             -compile(nowarn_export_all).
             "#,
         )
@@ -516,8 +516,8 @@ mod tests {
             "Ignore problem",
             r#"
             //- /erl/my_app/src/main.erl
-            ~%% <<< 💡 error: Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
-            
+            ~%% <<< 💡 error: W0012: Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+
             -module(main).
 
             "#,
@@ -535,7 +535,7 @@ mod tests {
             "Ignore problem",
             r#"
             //- /erl/my_app/src/main.erl
-            ~%% <<< 💡 error: Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+            ~%% <<< 💡 error: W0012: Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
             %% a comment at the
             %% top of the file
 
@@ -559,7 +559,7 @@ mod tests {
             "Ignore problem",
             r#"
             //- /erl/my_app/src/main.erl
-            ~%% <<< 💡 error: Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+            ~%% <<< 💡 error: W0012: Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
             %% a comment at the
             %% top of the file
 
diff --git a/crates/ide/src/diagnostics/missing_separator.rs b/crates/ide/src/diagnostics/missing_separator.rs
index f5c8713cae..1783b6d3d8 100644
--- a/crates/ide/src/diagnostics/missing_separator.rs
+++ b/crates/ide/src/diagnostics/missing_separator.rs
@@ -148,7 +148,7 @@ mod tests {
             r#"
    -module(main).
    foo(1)->2
-        %% ^ warning: Missing ';'
+        %% ^ warning: W0004: Missing ';'
    foo(2)->3.
 "#,
         );
@@ -161,7 +161,7 @@ mod tests {
    -module(main).
    foo(1)->2;
    foo(2)->3
-        %% ^ warning: Missing ';'
+        %% ^ warning: W0004: Missing ';'
    foo(3)->4.
 "#,
         );
@@ -174,7 +174,7 @@ mod tests {
    -module(main).
    foo(1)->2;
    foo(2)->3
-        %% ^ warning: Missing '.'
+        %% ^ warning: W0004: Missing '.'
 "#,
         );
     }
@@ -186,7 +186,7 @@ mod tests {
    -module(main).
    foo(1)->2;
    foo(2)->3.
-         %% ^ warning: Unexpected '.'
+         %% ^ warning: W0018: Unexpected '.'
    foo(3)->4.
 "#,
         );
@@ -199,7 +199,7 @@ mod tests {
    -module(main).
    foo(1)->2;
    foo(2)->3;
-         %% ^ warning: Unexpected ';'
+         %% ^ warning: W0018: Unexpected ';'
 "#,
         );
     }
diff --git a/crates/ide/src/diagnostics/misspelled_attribute.rs b/crates/ide/src/diagnostics/misspelled_attribute.rs
index b61d3ac635..b3939bc9cf 100644
--- a/crates/ide/src/diagnostics/misspelled_attribute.rs
+++ b/crates/ide/src/diagnostics/misspelled_attribute.rs
@@ -162,7 +162,7 @@ mod tests {
             r#"
     -module(main).
     -dyalizer({nowarn_function, f/0}).
- %%% ^^^^^^^^ 💡 error: misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
+ %%% ^^^^^^^^ 💡 error: W0013: misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
             "#,
         );
         check_fix(
@@ -222,7 +222,7 @@ mod tests {
             r#"
     -module(main).
     -module_doc """
-%%%  ^^^^^^^^^^ 💡 error: misspelled attribute, saw 'module_doc' but expected 'moduledoc'
+%%%  ^^^^^^^^^^ 💡 error: W0013: misspelled attribute, saw 'module_doc' but expected 'moduledoc'
     Hola
     """.
             "#,
@@ -235,7 +235,7 @@ mod tests {
             r#"
     -module(main).
     -docs """
-%%%  ^^^^ 💡 error: misspelled attribute, saw 'docs' but expected 'doc'
+%%%  ^^^^ 💡 error: W0013: misspelled attribute, saw 'docs' but expected 'doc'
     Hola
     """.
     foo() -> ok.
diff --git a/crates/ide/src/diagnostics/module_mismatch.rs b/crates/ide/src/diagnostics/module_mismatch.rs
index f6f7a2405c..c1a57dfbd9 100644
--- a/crates/ide/src/diagnostics/module_mismatch.rs
+++ b/crates/ide/src/diagnostics/module_mismatch.rs
@@ -79,7 +79,7 @@ mod tests {
             r#"
 //- /src/foo.erl
 -module(bar).
-%%      ^^^ 💡 error: Module name (bar) does not match file name (foo)
+%%      ^^^ 💡 error: W0001: Module name (bar) does not match file name (foo)
 "#,
         );
         check_fix(
diff --git a/crates/ide/src/diagnostics/mutable_variable.rs b/crates/ide/src/diagnostics/mutable_variable.rs
index 42a698eaa4..52fe32eccf 100644
--- a/crates/ide/src/diagnostics/mutable_variable.rs
+++ b/crates/ide/src/diagnostics/mutable_variable.rs
@@ -129,7 +129,7 @@ test() ->
     One = 1,
 
     Result = One = Zero,
-%%  ^^^^^^^^^^^^^^^^^^^ error: Possible mutable variable bug
+%%  ^^^^^^^^^^^^^^^^^^^ error: W0005: Possible mutable variable bug
 
     Result.
 "#,
@@ -137,7 +137,7 @@ test() ->
     }
 
     #[test]
-    fn mutable_variable_mutliple_clauses() {
+    fn mutable_variable_multiple_clauses() {
         check_diagnostics(
             r#"
 //- /src/test.erl
@@ -155,8 +155,8 @@ push_eligible(ProductPlatform, _Pu) ->
     false;
 push_eligible(_ProductPlatform, Pu) ->
     AppVersion = ABUserInfo = Pu,
-%%  ^^^^^^^^^^ 💡 warning: match is redundant
-%%               ^^^^^^^^^^ 💡 warning: match is redundant
+%%  ^^^^^^^^^^ 💡 warning: W0007: match is redundant
+%%               ^^^^^^^^^^ 💡 warning: W0007: match is redundant
     false.
 
 "#,
diff --git a/crates/ide/src/diagnostics/no_catch.rs b/crates/ide/src/diagnostics/no_catch.rs
index eeffcc002e..3823131724 100644
--- a/crates/ide/src/diagnostics/no_catch.rs
+++ b/crates/ide/src/diagnostics/no_catch.rs
@@ -93,7 +93,7 @@ mod tests {
 
               catcher(X,Y) ->
               case catch X/Y of
-              %%   ^^^^^ warning: Avoid `catch`.
+              %%   ^^^^^ warning: W0052: Avoid `catch`.
                 {'EXIT', {badarith,_}} -> "uh oh";
                 N -> N
               end.
diff --git a/crates/ide/src/diagnostics/no_dialyzer_attribute.rs b/crates/ide/src/diagnostics/no_dialyzer_attribute.rs
index ec67123aa9..4c501c5ad5 100644
--- a/crates/ide/src/diagnostics/no_dialyzer_attribute.rs
+++ b/crates/ide/src/diagnostics/no_dialyzer_attribute.rs
@@ -63,7 +63,7 @@ mod tests {
             r#"
     -module(main).
     -dialyzer({nowarn_function, foo/0}).
- %% ^^^^^^^^^ warning: Avoid -dialyzer attribute.
+ %% ^^^^^^^^^ warning: W0048: Avoid -dialyzer attribute.
               "#,
         )
     }
diff --git a/crates/ide/src/diagnostics/no_error_logger.rs b/crates/ide/src/diagnostics/no_error_logger.rs
index b48ccf115c..08e94133d0 100644
--- a/crates/ide/src/diagnostics/no_error_logger.rs
+++ b/crates/ide/src/diagnostics/no_error_logger.rs
@@ -50,7 +50,7 @@ mod tests {
               //- /src/main.erl
               -module(main).
               foo() -> error_logger:error_msg("ops").
-                    %% ^^^^^^^^^^^^^^^^^^^^^^ 💡 error: The `error_logger` module is deprecated.
+                    %% ^^^^^^^^^^^^^^^^^^^^^^ 💡 error: W0053: The `error_logger` module is deprecated.
               //- /src/error_logger.erl
               -module(error_logger).
               -export([error_msg/1]).
@@ -67,7 +67,7 @@ mod tests {
               -module(main).
               -import(error_logger, [error_msg/1]).
               foo() -> error_msg("ops").
-                    %% ^^^^^^^^^^^^^^^^ 💡 error: The `error_logger` module is deprecated.
+                    %% ^^^^^^^^^^^^^^^^ 💡 error: W0053: The `error_logger` module is deprecated.
               //- /src/error_logger.erl
               -module(error_logger).
               -export([error_msg/1]).
diff --git a/crates/ide/src/diagnostics/no_garbage_collect.rs b/crates/ide/src/diagnostics/no_garbage_collect.rs
index e24ef7c9a9..4fcfa57257 100644
--- a/crates/ide/src/diagnostics/no_garbage_collect.rs
+++ b/crates/ide/src/diagnostics/no_garbage_collect.rs
@@ -50,10 +50,10 @@ mod tests {
   //- /src/main.erl
   -module(main).
   -export([error/0]).
-  
+
   error() ->
       erlang:garbage_collect().
-  %%  ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Avoid forcing garbage collection.
+  %%  ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0047: Avoid forcing garbage collection.
   //- /opt/lib/stdlib-3.17/src/erlang.erl otp_app:/opt/lib/stdlib-3.17
   -module(erlang).
   -export([garbage_collect/0]).
@@ -69,10 +69,10 @@ mod tests {
   //- /src/main.erl
   -module(main).
   -export([error/0]).
-  
+
   error() ->
       garbage_collect().
-  %%  ^^^^^^^^^^^^^^^ 💡 warning: Avoid forcing garbage collection.
+  %%  ^^^^^^^^^^^^^^^ 💡 warning: W0047: Avoid forcing garbage collection.
   //- /opt/lib/stdlib-3.17/src/erlang.erl otp_app:/opt/lib/stdlib-3.17
   -module(erlang).
   -export([garbage_collect/0]).
diff --git a/crates/ide/src/diagnostics/no_nowarn_suppressions.rs b/crates/ide/src/diagnostics/no_nowarn_suppressions.rs
index f0484f0256..ef258779cd 100644
--- a/crates/ide/src/diagnostics/no_nowarn_suppressions.rs
+++ b/crates/ide/src/diagnostics/no_nowarn_suppressions.rs
@@ -82,7 +82,7 @@ mod tests {
             r#"
   -module(main).
   -compile(nowarn_export_all).
-  %%       ^^^^^^^^^^^^^^^^^ 💡 warning: Do not suppress compiler warnings at module level.
+  %%       ^^^^^^^^^^^^^^^^^ 💡 warning: W0054: Do not suppress compiler warnings at module level.
               "#,
         )
     }
@@ -93,7 +93,7 @@ mod tests {
             r#"
   -module(main).
   -compile({nowarn_unused_function, {unused_function, 1}}).
-  %%        ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Do not suppress compiler warnings at module level.
+  %%        ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0054: Do not suppress compiler warnings at module level.
               "#,
         )
     }
@@ -105,9 +105,9 @@ mod tests {
   -module(main).
   -compile([
       nowarn_export_all,
-  %%  ^^^^^^^^^^^^^^^^^ 💡 warning: Do not suppress compiler warnings at module level.
+  %%  ^^^^^^^^^^^^^^^^^ 💡 warning: W0054: Do not suppress compiler warnings at module level.
       {nowarn_unused_function, {unused_function, 1}}
-  %%   ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Do not suppress compiler warnings at module level.
+  %%   ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0054: Do not suppress compiler warnings at module level.
   ]).
               "#,
         )
diff --git a/crates/ide/src/diagnostics/no_size.rs b/crates/ide/src/diagnostics/no_size.rs
index d298b49cfa..87df996048 100644
--- a/crates/ide/src/diagnostics/no_size.rs
+++ b/crates/ide/src/diagnostics/no_size.rs
@@ -53,10 +53,10 @@ mod tests {
               //- /src/main.erl
               -module(main).
               foo() -> erlang:size({}).
-              %%       ^^^^^^^^^^^ 💡 warning: Avoid using the `size/1` BIF.
-              
+              %%       ^^^^^^^^^^^ 💡 warning: W0050: Avoid using the `size/1` BIF.
+
               bar() -> size(<<>>).
-              %%       ^^^^ 💡 warning: Avoid using the `size/1` BIF.
+              %%       ^^^^ 💡 warning: W0050: Avoid using the `size/1` BIF.
               //- /opt/lib/stdlib-3.17/src/erlang.erl otp_app:/opt/lib/stdlib-3.17
               -module(erlang).
               -export([size/1]).
@@ -72,7 +72,7 @@ mod tests {
               //- /src/main.erl
               -module(main).
               foo() -> er~lang:size({}).
-              
+
               bar() -> size(<<>>).
               //- /opt/lib/stdlib-3.17/src/erlang.erl otp_app:/opt/lib/stdlib-3.17
               -module(erlang).
diff --git a/crates/ide/src/diagnostics/nonstandard_integer_formatting.rs b/crates/ide/src/diagnostics/nonstandard_integer_formatting.rs
index cb353cc63a..d80751c946 100644
--- a/crates/ide/src/diagnostics/nonstandard_integer_formatting.rs
+++ b/crates/ide/src/diagnostics/nonstandard_integer_formatting.rs
@@ -285,7 +285,7 @@ mod tests {
          -module(integer_literal_format).
 
          fn() -> {val, 10000}.
-         %%            ^^^^^ 💡 information: Non-standard integer formatting.
+         %%            ^^^^^ 💡 information: W0043: Non-standard integer formatting.
             "#,
         )
     }
@@ -315,7 +315,7 @@ mod tests {
          -module(integer_literal_format).
 
          fn() -> {val, 16#4865316F774F6C64}.
-         %%            ^^^^^^^^^^^^^^^^^^^ 💡 information: Non-standard integer formatting.
+         %%            ^^^^^^^^^^^^^^^^^^^ 💡 information: W0043: Non-standard integer formatting.
             "#,
         )
     }
@@ -345,7 +345,7 @@ mod tests {
          -module(integer_literal_format).
 
          fn() -> {val, 2#1011011110010001}.
-         %%            ^^^^^^^^^^^^^^^^^^ 💡 information: Non-standard integer formatting.
+         %%            ^^^^^^^^^^^^^^^^^^ 💡 information: W0043: Non-standard integer formatting.
             "#,
         )
     }
@@ -375,7 +375,7 @@ mod tests {
          -module(integer_literal_format).
 
          fn() -> {val, -10000}.
-         %%             ^^^^^ 💡 information: Non-standard integer formatting.
+         %%             ^^^^^ 💡 information: W0043: Non-standard integer formatting.
             "#,
         )
     }
@@ -435,7 +435,7 @@ mod tests {
          -module(integer_literal_format).
 
          fn() -> {val, -16#4865316F774F6C64}.
-         %%             ^^^^^^^^^^^^^^^^^^^ 💡 information: Non-standard integer formatting.
+         %%             ^^^^^^^^^^^^^^^^^^^ 💡 information: W0043: Non-standard integer formatting.
             "#,
         )
     }
@@ -465,7 +465,7 @@ mod tests {
          -module(integer_literal_format).
 
          fn() -> {val, -2#1011011110010001}.
-         %%             ^^^^^^^^^^^^^^^^^^ 💡 information: Non-standard integer formatting.
+         %%             ^^^^^^^^^^^^^^^^^^ 💡 information: W0043: Non-standard integer formatting.
             "#,
         )
     }
@@ -512,7 +512,7 @@ mod tests {
          -module(integer_literal_format).
 
          fn() -> {val, 16#4865316F7_74F6_C64}.
-         %%            ^^^^^^^^^^^^^^^^^^^^^ 💡 information: Non-standard integer formatting.
+         %%            ^^^^^^^^^^^^^^^^^^^^^ 💡 information: W0043: Non-standard integer formatting.
             "#,
         )
     }
@@ -542,7 +542,7 @@ mod tests {
          -module(integer_literal_format).
 
          fn() -> {val, 2#1011011_110010001}.
-         %%            ^^^^^^^^^^^^^^^^^^^ 💡 information: Non-standard integer formatting.
+         %%            ^^^^^^^^^^^^^^^^^^^ 💡 information: W0043: Non-standard integer formatting.
             "#,
         )
     }
@@ -572,7 +572,7 @@ mod tests {
          -module(integer_literal_format).
 
          fn() -> {val, -1000_0}.
-         %%             ^^^^^^ 💡 information: Non-standard integer formatting.
+         %%             ^^^^^^ 💡 information: W0043: Non-standard integer formatting.
             "#,
         )
     }
@@ -602,7 +602,7 @@ mod tests {
          -module(integer_literal_format).
 
          fn() -> {val, -16#4865316F7_74F6C64}.
-         %%             ^^^^^^^^^^^^^^^^^^^^ 💡 information: Non-standard integer formatting.
+         %%             ^^^^^^^^^^^^^^^^^^^^ 💡 information: W0043: Non-standard integer formatting.
             "#,
         )
     }
@@ -632,7 +632,7 @@ mod tests {
          -module(integer_literal_format).
 
          fn() -> {val, -2#101_1011110010001}.
-         %%             ^^^^^^^^^^^^^^^^^^^ 💡 information: Non-standard integer formatting.
+         %%             ^^^^^^^^^^^^^^^^^^^ 💡 information: W0043: Non-standard integer formatting.
             "#,
         )
     }
@@ -662,7 +662,7 @@ mod tests {
          -module(integer_literal_format).
 
          fn() -> {val, +10000}.
-         %%             ^^^^^ 💡 information: Non-standard integer formatting.
+         %%             ^^^^^ 💡 information: W0043: Non-standard integer formatting.
             "#,
         )
     }
@@ -692,7 +692,7 @@ mod tests {
          -module(integer_literal_format).
 
          fn() -> {val, -  10000}.
-         %%               ^^^^^ 💡 information: Non-standard integer formatting.
+         %%               ^^^^^ 💡 information: W0043: Non-standard integer formatting.
             "#,
         )
     }
diff --git a/crates/ide/src/diagnostics/record_tuple_match.rs b/crates/ide/src/diagnostics/record_tuple_match.rs
index 019d6a57f5..5606dce89a 100644
--- a/crates/ide/src/diagnostics/record_tuple_match.rs
+++ b/crates/ide/src/diagnostics/record_tuple_match.rs
@@ -108,7 +108,7 @@ mod tests {
              tt(X) ->
                  A = #my_rec{field1 = 4, field2 = 2},
                  {my_rec, Field1, _} = X,
-              %%  ^^^^^^ warning: matching record 'my_rec' as a tuple.
+              %%  ^^^^^^ warning: W0027: matching record 'my_rec' as a tuple.
                  {A, Field1}.
             "#,
         );
@@ -137,7 +137,7 @@ mod tests {
 
              -record(my_rec, {field1, field2}).
              tt({my_rec, Field1, _}) ->
-              %% ^^^^^^ warning: matching record 'my_rec' as a tuple.
+              %% ^^^^^^ warning: W0027: matching record 'my_rec' as a tuple.
                  A = #my_rec{field1 = 4, field2 = 2},
                  {A, Field1}.
             "#,
diff --git a/crates/ide/src/diagnostics/redundant_assignment.rs b/crates/ide/src/diagnostics/redundant_assignment.rs
index 1521d4117c..6351335533 100644
--- a/crates/ide/src/diagnostics/redundant_assignment.rs
+++ b/crates/ide/src/diagnostics/redundant_assignment.rs
@@ -200,10 +200,10 @@ mod tests {
             do_foo() ->
                 X = 42,
                 Y = X,
-            %%  ^^^^^ 💡 weak: assignment is redundant
+            %%  ^^^^^ 💡 weak: W0009: assignment is redundant
                 bar(Y),
                 Z = Y,
-            %%  ^^^^^ 💡 weak: assignment is redundant
+            %%  ^^^^^ 💡 weak: W0009: assignment is redundant
                 g(Z),
                 case Y of
                   [A] -> C = A;
diff --git a/crates/ide/src/diagnostics/replace_call.rs b/crates/ide/src/diagnostics/replace_call.rs
index 254db47e5e..e83afcb985 100644
--- a/crates/ide/src/diagnostics/replace_call.rs
+++ b/crates/ide/src/diagnostics/replace_call.rs
@@ -536,7 +536,7 @@ mod tests {
                 foo:fire_bombs(Config, 44),
                 foo:fire_bombs(Config, 43),
                 foo:fire_bombs(Config, 42),
-            %%% ^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: 'foo:fire_bombs/2' called with 42
+            %%% ^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: ad-hoc: foo:fire_bombs/2: 'foo:fire_bombs/2' called with 42
                 foo:fire_bombs(Config, 41),
                 foo:fire_bombs(Config, 40).
             //- /src/foo.erl
diff --git a/crates/ide/src/diagnostics/replace_in_spec.rs b/crates/ide/src/diagnostics/replace_in_spec.rs
index 0c43154064..12d8aa3f64 100644
--- a/crates/ide/src/diagnostics/replace_in_spec.rs
+++ b/crates/ide/src/diagnostics/replace_in_spec.rs
@@ -185,7 +185,7 @@ mod tests {
 
             -type one() :: one.
             -spec fn(integer()) -> modu:one().
-            %%                     ^^^^^^^^^^ 💡 weak: Replace 'modu:one/0' with 'modu:other()'
+            %%                     ^^^^^^^^^^ 💡 weak: ad-hoc: modu:one/0: Replace 'modu:one/0' with 'modu:other()'
             fn(0) -> one.
 
             "#,
diff --git a/crates/ide/src/diagnostics/sets_version_2.rs b/crates/ide/src/diagnostics/sets_version_2.rs
index dcd4c41a9f..4535d6839a 100644
--- a/crates/ide/src/diagnostics/sets_version_2.rs
+++ b/crates/ide/src/diagnostics/sets_version_2.rs
@@ -53,11 +53,11 @@ mod tests {
              //- /src/main.erl
              -module(main).
              foo() -> sets:new().
-             %%       ^^^^^^^^ 💡 warning: Prefer `[{version, 2}]` when constructing a set.
-             
+             %%       ^^^^^^^^ 💡 warning: W0049: Prefer `[{version, 2}]` when constructing a set.
+
              bar() -> sets:from_list([]).
-             %%       ^^^^^^^^^^^^^^ 💡 warning: Prefer `[{version, 2}]` when constructing a set.
-             
+             %%       ^^^^^^^^^^^^^^ 💡 warning: W0049: Prefer `[{version, 2}]` when constructing a set.
+
              //- /src/sets.erl
              -module(sets).
              -export([new/0, from_list/1]).
diff --git a/crates/ide/src/diagnostics/simplify_negation.rs b/crates/ide/src/diagnostics/simplify_negation.rs
index 7f381adc4d..bb45c582c9 100644
--- a/crates/ide/src/diagnostics/simplify_negation.rs
+++ b/crates/ide/src/diagnostics/simplify_negation.rs
@@ -246,7 +246,7 @@ mod tests {
 
          fn(A, TrueBranch, FalseBranch) ->
             case not A of true -> FalseBranch; false -> TrueBranch end.
-         %%          ^ 💡 information: Consider rewriting to match directly on the negated expression.
+         %%          ^ 💡 information: W0044: Consider rewriting to match directly on the negated expression.
             "#,
         )
     }
@@ -260,7 +260,7 @@ mod tests {
 
          fn(A, TrueBranch, FalseBranch) ->
             case not A of false -> TrueBranch; true -> FalseBranch end.
-         %%          ^ 💡 information: Consider rewriting to match directly on the negated expression.
+         %%          ^ 💡 information: W0044: Consider rewriting to match directly on the negated expression.
             "#,
         )
     }
@@ -274,7 +274,7 @@ mod tests {
 
          fn(A, TrueBranch, FalseBranch) ->
             if not A -> FalseBranch; true -> TrueBranch end.
-         %%        ^ 💡 information: Consider rewriting to match directly on the negated expression.
+         %%        ^ 💡 information: W0044: Consider rewriting to match directly on the negated expression.
             "#,
         )
     }
diff --git a/crates/ide/src/diagnostics/trivial_match.rs b/crates/ide/src/diagnostics/trivial_match.rs
index ab94c0c9ad..56d3881a9a 100644
--- a/crates/ide/src/diagnostics/trivial_match.rs
+++ b/crates/ide/src/diagnostics/trivial_match.rs
@@ -348,16 +348,16 @@ mod tests {
 
             do_foo() ->
                 42 = 42,
-            %%  ^^ 💡 warning: match is redundant
+            %%  ^^ 💡 warning: W0007: match is redundant
                 42 = 43,
                 "blah" = "blah",
-            %%  ^^^^^^ 💡 warning: match is redundant
+            %%  ^^^^^^ 💡 warning: W0007: match is redundant
                 "blah" = "bleh",
                 'x' = 'x',
-            %%  ^^^ 💡 warning: match is redundant
+            %%  ^^^ 💡 warning: W0007: match is redundant
                 'x' = 'X',
                 true = true,
-            %%  ^^^^ 💡 warning: match is redundant
+            %%  ^^^^ 💡 warning: W0007: match is redundant
                 true = false,
                 ok.
             "#,
@@ -374,12 +374,12 @@ mod tests {
                 X = 42,
                 Y = 42,
                 X = X,
-            %%  ^ 💡 warning: match is redundant
+            %%  ^ 💡 warning: W0007: match is redundant
                 X = Y,
                 {Z} = {Y},
-            %%  ^^^ 💡 warning: match is redundant
+            %%  ^^^ 💡 warning: W0007: match is redundant
                 [W, ok] = [ok, ok],
-            %%  ^^^^^^^ 💡 warning: match is redundant
+            %%  ^^^^^^^ 💡 warning: W0007: match is redundant
                 [_W, ok] = [ok, ok],
                 ok.
             "#,
@@ -395,9 +395,9 @@ mod tests {
             do_foo() ->
                 X = 42,
                 <<"foo", 42>> = <<"foo", 42>>,
-            %%  ^^^^^^^^^^^^^ 💡 warning: match is redundant
+            %%  ^^^^^^^^^^^^^ 💡 warning: W0007: match is redundant
                 <<"foo", X>> = <<"foo", X>>,
-            %%  ^^^^^^^^^^^^ 💡 warning: match is redundant
+            %%  ^^^^^^^^^^^^ 💡 warning: W0007: match is redundant
                 <<"foo", Y>> = <<"foo", 42>>,
                 Y.
             "#,
@@ -412,12 +412,12 @@ mod tests {
             do_foo() ->
                 X = 42,
                 {X, "foo", {foo, bar}} = {X, "foo", {foo, bar}},
-            %%  ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: match is redundant
+            %%  ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0007: match is redundant
                 {X, foo} = {X, bar},
                 {X, "foo", {foo, bar}} = {X, "foo", {foo, pub}},
                 {X, "foo", {foo, bar}} = {X, "foo", {foo, bar, hey}},
                 {} = {},
-            %%  ^^ 💡 warning: match is redundant
+            %%  ^^ 💡 warning: W0007: match is redundant
                 ok.
             "#,
         )
@@ -432,12 +432,12 @@ mod tests {
             do_foo() ->
                 X = 42,
                 [X, ["foo"], [foo, bar]] = [X, ["foo"], [foo, bar]],
-            %%  ^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: match is redundant
+            %%  ^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0007: match is redundant
                 [X, foo] = [X, bar],
                 [X, "foo", [foo, bar]] = [X, "foo", [foo, pub]],
                 [X, "foo", [foo, bar]] = [X, "foo", [foo, bar, hey]],
                 [] = [],
-            %%  ^^ 💡 warning: match is redundant
+            %%  ^^ 💡 warning: W0007: match is redundant
                 ok.
             "#,
         )
@@ -453,12 +453,12 @@ mod tests {
 
             do_foo() ->
                 #person{name = "Joe", age = 42} = #person{age = 42, name = "Joe"},
-            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: match is redundant
+            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0007: match is redundant
                 #person{name = "Joe", age = 43} = #person{age = 42, name = "Joe"},
                 #person{name = "Joe"} = #person{age = 42, name = "Joe"},
-            %%  ^^^^^^^^^^^^^^^^^^^^^ 💡 warning: match is redundant
+            %%  ^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0007: match is redundant
                 #person{age = 42} = #person{age = 42, name = "Joe"},
-            %%  ^^^^^^^^^^^^^^^^^ 💡 warning: match is redundant
+            %%  ^^^^^^^^^^^^^^^^^ 💡 warning: W0007: match is redundant
                 ok.
             "#,
         )
@@ -472,12 +472,12 @@ mod tests {
 
             do_foo() ->
                 #{name := "Joe", age := 42} = #{age => 42, name => "Joe"},
-            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: match is redundant
+            %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0007: match is redundant
                 #{name := "Joe", age := 43} = #{age => 42, name => "Joe"},
                 #{name := "Joe"} = #{age => 42, name => "Joe"},
-            %%  ^^^^^^^^^^^^^^^^ 💡 warning: match is redundant
+            %%  ^^^^^^^^^^^^^^^^ 💡 warning: W0007: match is redundant
                 #{age := 42} = #{age => 42, name => "Joe"},
-            %%  ^^^^^^^^^^^^ 💡 warning: match is redundant
+            %%  ^^^^^^^^^^^^ 💡 warning: W0007: match is redundant
                 ok.
             "#,
         )
diff --git a/crates/ide/src/diagnostics/undefined_function.rs b/crates/ide/src/diagnostics/undefined_function.rs
index 5d898417d3..6472a08f07 100644
--- a/crates/ide/src/diagnostics/undefined_function.rs
+++ b/crates/ide/src/diagnostics/undefined_function.rs
@@ -174,7 +174,7 @@ mod tests {
   main() ->
     _T0 = erlang:monotonic_time(milliseconds),
     _T2 = erlang:monitonic_time(milliseconds),
-%%        ^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Function 'erlang:monitonic_time/1' is undefined.
+%%        ^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0017: Function 'erlang:monitonic_time/1' is undefined.
     exists().
 
   exists() -> ok.
@@ -195,7 +195,7 @@ mod tests {
   main() ->
     dependency:exists(),
     dependency:not_exists().
-%%  ^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Function 'dependency:not_exists/0' is undefined.
+%%  ^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0017: Function 'dependency:not_exists/0' is undefined.
   exists() -> ok.
 //- /src/dependency.erl
   -module(dependency).
@@ -218,9 +218,9 @@ mod tests {
     main:behaviour_info(callbacks),
     hascallback:behaviour_info(callbacks),
     nocallback:behaviour_info(callbacks),
-%%  ^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Function 'nocallback:behaviour_info/1' is undefined.
+%%  ^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0017: Function 'nocallback:behaviour_info/1' is undefined.
     nonexisting:behaviour_info(callbacks),
-%%  ^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Function 'nonexisting:behaviour_info/1' is undefined.
+%%  ^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0017: Function 'nonexisting:behaviour_info/1' is undefined.
 
     behaviour_info(callbacks).
 //- /src/hascallback.erl
@@ -261,7 +261,7 @@ mod tests {
   main() ->
     dependency:exists(),
     dependency:module_info(a, b).
-%%  ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Function 'dependency:module_info/2' is undefined.
+%%  ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0017: Function 'dependency:module_info/2' is undefined.
   exists() -> ok.
 //- /src/dependency.erl
   -module(dependency).
@@ -280,9 +280,9 @@ mod tests {
   -module(main).
   main() ->
     erlang:get_stacktrace(),
-%%  ^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Function 'erlang:get_stacktrace/0' is undefined.
+%%  ^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0017: Function 'erlang:get_stacktrace/0' is undefined.
     dependency:get_stacktrace().
-%%  ^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Function 'dependency:get_stacktrace/0' is undefined.
+%%  ^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0017: Function 'dependency:get_stacktrace/0' is undefined.
             "#,
         )
     }
@@ -296,7 +296,7 @@ mod tests {
   -define(MY_MACRO, fun() -> dep:exists(), dep:not_exists() end).
   main() ->
     ?MY_MACRO().
-%%  ^^^^^^^^^^^ 💡 warning: Function 'dep:not_exists/0' is undefined.
+%%  ^^^^^^^^^^^ 💡 warning: W0017: Function 'dep:not_exists/0' is undefined.
   exists() -> ok.
 //- /src/dep.erl
   -module(dep).
@@ -366,9 +366,9 @@ exists() -> ok.
   main() ->
     {fun dependency:exists/0,
     fun dependency:not_exists/1,
-%%      ^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Function 'dependency:not_exists/1' is undefined.
+%%      ^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0017: Function 'dependency:not_exists/1' is undefined.
     fun dependency:module_info/2}.
-%%      ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Function 'dependency:module_info/2' is undefined.
+%%      ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0017: Function 'dependency:module_info/2' is undefined.
   exists() -> ok.
 //- /src/dependency.erl
   -module(dependency).
diff --git a/crates/ide/src/diagnostics/undefined_macro.rs b/crates/ide/src/diagnostics/undefined_macro.rs
index b4be2ac306..c90e2d1285 100644
--- a/crates/ide/src/diagnostics/undefined_macro.rs
+++ b/crates/ide/src/diagnostics/undefined_macro.rs
@@ -121,7 +121,7 @@ mod tests {
             -module(main).
 
             foo(X) -> ?assertEqual(X,2).
-            %%        ^^^^^^^^^^^^ 💡 error: undefined macro 'assertEqual/2'
+            %%        ^^^^^^^^^^^^ 💡 error: E1508: undefined macro 'assertEqual/2'
             //- /another-app/include/inc.hrl app:another include_path:/another-app/include
             -define(assertEqual(A,B), A =:= B).
            "#,
@@ -159,7 +159,7 @@ mod tests {
             -module(main).
 
             foo(X) -> ?LIFE.
-            %%        ^^^^^ 💡 error: undefined macro 'LIFE'
+            %%        ^^^^^ 💡 error: E1507: undefined macro 'LIFE'
             //- /another-app/include/inc.hrl app:another include_path:/another-app/include
             -define(LIFE, 42).
            "#,
@@ -175,7 +175,7 @@ mod tests {
             -module(main).
 
             foo(X) -> ?'LIFE/42'.
-            %%        ^^^^^^^^^^ 💡 error: undefined macro 'LIFE/42'
+            %%        ^^^^^^^^^^ 💡 error: E1507: undefined macro 'LIFE/42'
             //- /another-app/include/inc.hrl app:another include_path:/another-app/include
             -define('LIFE/42', 42).
            "#,
@@ -191,7 +191,7 @@ mod tests {
             -module(main).
 
             foo(X) -> ?'LIFE/42'(42).
-            %%        ^^^^^^^^^^ 💡 error: undefined macro 'LIFE/42/1'
+            %%        ^^^^^^^^^^ 💡 error: E1508: undefined macro 'LIFE/42/1'
             //- /another-app/include/inc.hrl app:another include_path:/another-app/include
             -define('LIFE/42(X)', X).
            "#,
@@ -208,7 +208,7 @@ mod tests {
             -module(main).
 
             foo(X) -> ?assert~Equal(X,2).
-            %%        ^^^^^^^^^^^^ 💡 error: undefined macro 'assertEqual/2'
+            %%        ^^^^^^^^^^^^ 💡 error: E1508: undefined macro 'assertEqual/2'
 
             //- /app_a/include/inc.hrl app:app_a include_path:/app_a/include
             -define(assertEqual(A,B), A =:= B).
@@ -236,7 +236,7 @@ mod tests {
             -module(main).
 
             foo(X) -> ?assert~Equal(X,2).
-            %%        ^^^^^^^^^^^^ 💡 error: undefined macro 'assertEqual/2'
+            %%        ^^^^^^^^^^^^ 💡 error: E1508: undefined macro 'assertEqual/2'
 
             //- /app_a/include/inc.hrl app:app_a include_path:/app_a/include
             -define(assertEqual(A,B), A =:= B).
@@ -264,7 +264,7 @@ mod tests {
             -module(main).
 
             foo(X) -> ?assert~Equal(X,2).
-            %%        ^^^^^^^^^^^^ 💡 error: undefined macro 'assertEqual/2'
+            %%        ^^^^^^^^^^^^ 💡 error: E1508: undefined macro 'assertEqual/2'
 
             //- /app_a/include/inc.hrl app:app_a include_path:/app_a/include
 
diff --git a/crates/ide/src/diagnostics/undocumented_function.rs b/crates/ide/src/diagnostics/undocumented_function.rs
index 353e79fee3..c895b52622 100644
--- a/crates/ide/src/diagnostics/undocumented_function.rs
+++ b/crates/ide/src/diagnostics/undocumented_function.rs
@@ -118,6 +118,7 @@ mod tests {
             .disable(DiagnosticCode::OldEdocSyntax)
     }
 
+    #[track_caller]
     fn check_diagnostics(fixture: &str) {
         tests::check_diagnostics_with_config(config(), fixture);
     }
@@ -129,7 +130,7 @@ mod tests {
     -module(main).
     -export([main/0]).
     main() ->
- %% ^^^^ weak: The function is non-trivial, exported, but not documented.
+ %% ^^^^ weak: W0040: The function is non-trivial, exported, but not documented.
       [ok,
        ok,
        ok,
@@ -146,7 +147,7 @@ mod tests {
     -module(main).
     -export([main/0]).
     main() ->
- %% ^^^^ weak: The function is non-trivial, exported, but not documented.
+ %% ^^^^ weak: W0040: The function is non-trivial, exported, but not documented.
       [ok,
        ok,
        ok,
@@ -240,7 +241,7 @@ mod tests {
     -module(main).
     -moduledoc false.
     -export([main/0]).
-    
+
     main() ->
       [ok,
        ok,
@@ -258,7 +259,7 @@ mod tests {
     -module(main).
     -moduledoc(false).
     -export([main/0]).
-    
+
     main() ->
       [ok,
        ok,
@@ -276,7 +277,7 @@ mod tests {
     -module(main).
     -moduledoc hidden.
     -export([main/0]).
-    
+
     main() ->
       [ok,
        ok,
@@ -294,7 +295,7 @@ mod tests {
     -module(main).
     -moduledoc(hidden).
     -export([main/0]).
-    
+
     main() ->
       [ok,
        ok,
@@ -314,9 +315,9 @@ mod tests {
     -behaviour(gen_server).
     -export([main/0]).
     -export([handle_call/1]).
-    
+
     main() ->
-    %%<^ weak: The function is non-trivial, exported, but not documented.
+    %%<^ weak: W0040: The function is non-trivial, exported, but not documented.
       [ok,
        ok,
        ok,
@@ -343,12 +344,12 @@ mod tests {
             r#"
     -module(main).
     -export([simple/0, complex/0]).
-    
+
     simple() ->
       ok.
 
     complex() ->
-    %%<^^^^ weak: The function is non-trivial, exported, but not documented.
+    %%<^^^^ weak: W0040: The function is non-trivial, exported, but not documented.
       [ok,
        ok,
        ok,
@@ -364,12 +365,12 @@ mod tests {
             r#"
     -module(main).
     -export([simple/0, complex/1]).
-    
+
     simple() ->
       ok.
 
     complex(a) ->
-    %%<^^^^ weak: The function is non-trivial, exported, but not documented.
+    %%<^^^^ weak: W0040: The function is non-trivial, exported, but not documented.
       [ok];
     complex(b) ->
       [ok,
diff --git a/crates/ide/src/diagnostics/undocumented_module.rs b/crates/ide/src/diagnostics/undocumented_module.rs
index 1e4659c1f8..ad440d5acd 100644
--- a/crates/ide/src/diagnostics/undocumented_module.rs
+++ b/crates/ide/src/diagnostics/undocumented_module.rs
@@ -1,10 +1,11 @@
 /*
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under both the MIT license found in the
- * LICENSE-MIT file in the root directory of this source tree and the Apache
+ * This source code is dual-licensed under either the MIT license found in the
+ * LICENSE-MIT file in the root directory of this source tree or the Apache
  * License, Version 2.0 found in the LICENSE-APACHE file in the root directory
- * of this source tree.
+ * of this source tree. You may select, at your option, one of the
+ * above-listed licenses.
  */
 
 use elp_ide_assists::Assist;
@@ -83,6 +84,7 @@ mod tests {
         DiagnosticsConfig::default().enable(DiagnosticCode::UndocumentedModule)
     }
 
+    #[track_caller]
     fn check_diagnostics(fixture: &str) {
         tests::check_diagnostics_with_config(config(), fixture);
     }
@@ -96,7 +98,7 @@ mod tests {
         check_diagnostics(
             r#"
      -module(main).
-          %% ^^^^ 💡 weak: The module is not documented.
+          %% ^^^^ 💡 weak: W0046: The module is not documented.
          "#,
         )
     }
@@ -141,7 +143,7 @@ mod tests {
         check_diagnostics(
             r#"
      % @doc
-    %% ^^^^ 💡 warning: EDoc style comments are deprecated. Please use Markdown instead.
+    %% ^^^^ 💡 warning: W0038: EDoc style comments are deprecated. Please use Markdown instead.
      % This is a module
      -module(main).
          "#,
diff --git a/crates/ide/src/diagnostics/unexported_function.rs b/crates/ide/src/diagnostics/unexported_function.rs
index 4985b3c4e3..7aae73a9f1 100644
--- a/crates/ide/src/diagnostics/unexported_function.rs
+++ b/crates/ide/src/diagnostics/unexported_function.rs
@@ -127,6 +127,7 @@ mod tests {
     use crate::tests::check_diagnostics_with_config;
     use crate::tests::check_nth_fix;
 
+    #[track_caller]
     pub(crate) fn check_diagnostics(fixture: &str) {
         let config = DiagnosticsConfig::default().disable(elp_ide_db::DiagnosticCode::NoSize);
         check_diagnostics_with_config(config, fixture)
@@ -141,7 +142,7 @@ mod tests {
   main() ->
     dependency:exists(),
     dependency:private().
-%%  ^^^^^^^^^^^^^^^^^^ 💡 warning: Function 'dependency:private/0' is not exported.
+%%  ^^^^^^^^^^^^^^^^^^ 💡 warning: W0026: Function 'dependency:private/0' is not exported.
   exists() -> ok.
 //- /src/dependency.erl
   -module(dependency).
@@ -160,9 +161,9 @@ mod tests {
   -module(main).
   main() ->
     ?MODULE:private(),
-%%  ^^^^^^^^^^^^^^^ 💡 warning: Function 'main:private/0' is not exported.
+%%  ^^^^^^^^^^^^^^^ 💡 warning: W0026: Function 'main:private/0' is not exported.
     main:private().
-%%  ^^^^^^^^^^^^ 💡 warning: Function 'main:private/0' is not exported.
+%%  ^^^^^^^^^^^^ 💡 warning: W0026: Function 'main:private/0' is not exported.
 
   private() -> ok.
             "#,
@@ -178,7 +179,7 @@ mod tests {
 -include("header.hrl").
 
 foo() -> main:bar().
-%%       ^^^^^^^^ 💡 warning: Function 'main:bar/0' is not exported.
+%%       ^^^^^^^^ 💡 warning: W0026: Function 'main:bar/0' is not exported.
 
 //- /src/header.hrl
   bar() -> ok.
diff --git a/crates/ide/src/diagnostics/unnecessary_fold_to_build_map.rs b/crates/ide/src/diagnostics/unnecessary_fold_to_build_map.rs
index 9fabb2f21d..5fea930a9a 100644
--- a/crates/ide/src/diagnostics/unnecessary_fold_to_build_map.rs
+++ b/crates/ide/src/diagnostics/unnecessary_fold_to_build_map.rs
@@ -260,7 +260,7 @@ mod tests {
 
          % elp:ignore W0017 (undefined_function)
          fn(List) -> lists:foldl(fun(K, Acc) -> Acc#{K => []} end, #{}, List).
-         %%          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: Unnecessary explicit fold to construct map from keys.
+         %%          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: W0035: Unnecessary explicit fold to construct map from keys.
             "#,
         )
     }
@@ -274,7 +274,7 @@ mod tests {
 
          % elp:ignore W0017 (undefined_function)
          fn(List) -> lists:foldl(fun({K,V}, Acc) -> Acc#{K => V} end, #{}, List).
-         %%          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: Unnecessary explicit fold to construct map from list.
+         %%          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: W0035: Unnecessary explicit fold to construct map from list.
             "#,
         )
     }
diff --git a/crates/ide/src/diagnostics/unnecessary_map_from_list_around_comprehension.rs b/crates/ide/src/diagnostics/unnecessary_map_from_list_around_comprehension.rs
index 9d337dda7d..d2378528ce 100644
--- a/crates/ide/src/diagnostics/unnecessary_map_from_list_around_comprehension.rs
+++ b/crates/ide/src/diagnostics/unnecessary_map_from_list_around_comprehension.rs
@@ -160,7 +160,7 @@ mod tests {
 
          % elp:ignore W0017 (undefined_function)
          fn(List) -> maps:from_list([{K + 1, V + 2} || {K,V} <- List]).
-         %%          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: Unnecessary intermediate list allocated.
+         %%          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: W0036: Unnecessary intermediate list allocated.
             "#,
         )
     }
@@ -174,7 +174,7 @@ mod tests {
 
          % elp:ignore W0017 (undefined_function)
          fn(List) -> maps:from_list([{element(1, Pair) + 1, element(2, Pair) + 2} || Pair <- List]).
-         %%          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: Unnecessary intermediate list allocated.
+         %%          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: W0036: Unnecessary intermediate list allocated.
             "#,
         )
     }
diff --git a/crates/ide/src/diagnostics/unnecessary_map_to_list_in_comprehension.rs b/crates/ide/src/diagnostics/unnecessary_map_to_list_in_comprehension.rs
index 99859c225d..6dbf3cd4c7 100644
--- a/crates/ide/src/diagnostics/unnecessary_map_to_list_in_comprehension.rs
+++ b/crates/ide/src/diagnostics/unnecessary_map_to_list_in_comprehension.rs
@@ -137,7 +137,7 @@ mod tests {
 
          % elp:ignore W0017 (undefined_function)
          fn(Map) -> [K + V + 1 || {K,V} <- maps:to_list(Map)].
-         %%         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: Unnecessary intermediate list allocated.
+         %%         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: W0034: Unnecessary intermediate list allocated.
             "#,
         )
     }
diff --git a/crates/ide/src/diagnostics/unspecific_include.rs b/crates/ide/src/diagnostics/unspecific_include.rs
index b6306c399f..339874f6ee 100644
--- a/crates/ide/src/diagnostics/unspecific_include.rs
+++ b/crates/ide/src/diagnostics/unspecific_include.rs
@@ -179,7 +179,7 @@ mod tests {
          //- /app_a/src/unspecific_include.erl
            -module(unspecific_include).
            -include("some_header_from_app_a.hrl").
-           %%       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: Unspecific include.
+           %%       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 weak: W0037: Unspecific include.
 
          //- /app_a/include/some_header_from_app_a.hrl include_path:/app_a/include
            -define(A,3).
diff --git a/crates/ide/src/diagnostics/unused_function_args.rs b/crates/ide/src/diagnostics/unused_function_args.rs
index dbe7cd6152..53306052ce 100644
--- a/crates/ide/src/diagnostics/unused_function_args.rs
+++ b/crates/ide/src/diagnostics/unused_function_args.rs
@@ -210,8 +210,8 @@ mod tests {
             r#"
             -module(main).
             do_something(Unused, Used, _AlsoUsed, AlsoUnused, _UnusedButOk) ->
-                     %%% ^^^^^^ 💡 warning: this variable is unused
-                     %%%                          ^^^^^^^^^^ 💡 warning: this variable is unused
+                     %%% ^^^^^^ 💡 warning: W0010: this variable is unused
+                     %%%                          ^^^^^^^^^^ 💡 warning: W0010: this variable is unused
 
                 case Used of
                   undefined -> ok;
@@ -227,8 +227,8 @@ mod tests {
             r#"
             -module(main).
             do_something([Unused | Used], #{foo := {_AlsoUsed, AlsoUnused, _UnusedButOk}}) ->
-                     %%%  ^^^^^^ 💡 warning: this variable is unused
-                     %%%                                       ^^^^^^^^^^ 💡 warning: this variable is unused
+                     %%%  ^^^^^^ 💡 warning: W0010: this variable is unused
+                     %%%                                       ^^^^^^^^^^ 💡 warning: W0010: this variable is unused
 
                 case Used of
                   undefined -> ok;
@@ -302,7 +302,7 @@ mod tests {
                -module(main).
                foo(Args) -> {foo, Args};
                foo(Args2) -> ok.
-               %%  ^^^^^ 💡 warning: this variable is unused
+               %%  ^^^^^ 💡 warning: W0010: this variable is unused
                 "#,
         );
     }
@@ -314,7 +314,7 @@ mod tests {
                -module(main).
                foo(X, _Y = [_Z = {X, _, _} | _]) -> bar;
                foo(X, _Y) -> pub.
-               %%  ^ 💡 warning: this variable is unused
+               %%  ^ 💡 warning: W0010: this variable is unused
             "#,
         );
     }
diff --git a/crates/ide/src/diagnostics/unused_include.rs b/crates/ide/src/diagnostics/unused_include.rs
index 08f23af1d5..3a91377338 100644
--- a/crates/ide/src/diagnostics/unused_include.rs
+++ b/crates/ide/src/diagnostics/unused_include.rs
@@ -265,7 +265,7 @@ mod tests {
 //- /src/foo.erl
   -module(foo).
   -include("foo.hrl").
-%%^^^^^^^^^^^^^^^^^^^^ 💡 warning: Unused file: foo.hrl
+%%^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0020: Unused file: foo.hrl
         "#,
         );
     }
@@ -293,7 +293,7 @@ mod tests {
 //- /src/foo.erl
   -module(foo).
   -include("foo.hrl").
-%%^^^^^^^^^^^^^^^^^^^^ 💡 warning: Unused file: foo.hrl
+%%^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0020: Unused file: foo.hrl
         "#,
         );
     }
@@ -321,7 +321,7 @@ mod tests {
 //- /src/foo.erl
   -module(foo).
   -include("foo.hrl").
-%%^^^^^^^^^^^^^^^^^^^^ 💡 warning: Unused file: foo.hrl
+%%^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0020: Unused file: foo.hrl
         "#,
         );
     }
@@ -350,7 +350,7 @@ mod tests {
 //- /src/foo.erl
   -module(foo).
   -include("foo.hrl").
-%%^^^^^^^^^^^^^^^^^^^^ 💡 warning: Unused file: foo.hrl
+%%^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0020: Unused file: foo.hrl
         "#,
         );
     }
@@ -580,7 +580,7 @@ foo() -> ok.
 //- /src/header.hrl
 %% The following shows up as a wild attribute, which we regard as being used.
    -defin e(X, 1).
-%%  ^^^^^ 💡 error: misspelled attribute, saw 'defin' but expected 'define'
+%%  ^^^^^ 💡 error: W0013: misspelled attribute, saw 'defin' but expected 'define'
 
 -def ine(Y, 2).
 "#,
@@ -594,7 +594,7 @@ foo() -> ok.
 //- /src/main.erl
 -module(main).
   -include("header.hrl").
-%%^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Unused file: header.hrl
+%%^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0020: Unused file: header.hrl
 
 foo() -> ok.
 
diff --git a/crates/ide/src/diagnostics/unused_macro.rs b/crates/ide/src/diagnostics/unused_macro.rs
index 99af05370d..89f00e671b 100644
--- a/crates/ide/src/diagnostics/unused_macro.rs
+++ b/crates/ide/src/diagnostics/unused_macro.rs
@@ -133,7 +133,7 @@ mod tests {
             r#"
 -module(main).
 -define(MEANING_OF_LIFE, 42).
-    %%  ^^^^^^^^^^^^^^^ 💡 warning: Unused macro (MEANING_OF_LIFE)
+    %%  ^^^^^^^^^^^^^^^ 💡 warning: W0002: Unused macro (MEANING_OF_LIFE)
             "#,
         );
         check_fix(
@@ -176,9 +176,9 @@ main() ->
 -module(main).
 -define(USED_MACRO, used_macro).
 -define(UNUSED_MACRO, unused_macro).
-     %% ^^^^^^^^^^^^ 💡 warning: Unused macro (UNUSED_MACRO)
+     %% ^^^^^^^^^^^^ 💡 warning: W0002: Unused macro (UNUSED_MACRO)
 -define(UNUSED_MACRO_WITH_ARG(C), C).
-     %% ^^^^^^^^^^^^^^^^^^^^^ 💡 warning: Unused macro (UNUSED_MACRO_WITH_ARG/1)
+     %% ^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0002: Unused macro (UNUSED_MACRO_WITH_ARG/1)
 
 main() ->
   ?MOD:foo(),
@@ -211,7 +211,7 @@ main() ->
 -module(foo).
 -include("foo.hrl").
 -define(BAR, 42).
-     %% ^^^ 💡 warning: Unused macro (BAR)
+     %% ^^^ 💡 warning: W0002: Unused macro (BAR)
 main() ->
   ?A.
         "#,
diff --git a/crates/ide/src/diagnostics/unused_record_field.rs b/crates/ide/src/diagnostics/unused_record_field.rs
index 33f5bbaac3..cbce6009bf 100644
--- a/crates/ide/src/diagnostics/unused_record_field.rs
+++ b/crates/ide/src/diagnostics/unused_record_field.rs
@@ -100,7 +100,7 @@ mod tests {
 
 -record(used_field, {field_a, field_b = 42}).
 -record(unused_field, {field_c, field_d}).
-                             %% ^^^^^^^ warning: Unused record field (unused_field.field_d)
+                             %% ^^^^^^^ warning: W0003: Unused record field (unused_field.field_d)
 
 main(#used_field{field_a = A, field_b = B}) ->
     {A, B};
@@ -120,7 +120,7 @@ main(R) ->
 
 -record(used_field, {field_a, field_b = 42}).
 -record(unused_field, {field_c :: atom(), field_d :: number()}).
-                                       %% ^^^^^^^ warning: Unused record field (unused_field.field_d)
+                                       %% ^^^^^^^ warning: W0003: Unused record field (unused_field.field_d)
 
 main(#used_field{field_a = A, field_b = B}) ->
     {A, B};
@@ -189,9 +189,9 @@ main(#used_field{field_a = A}) ->
             r#"
 -module(main).
 -record(a, {a1, a2}).
-             %% ^^ warning: Unused record field (a.a2)
+             %% ^^ warning: W0003: Unused record field (a.a2)
 -record(b, {b1, b2}).
-         %% ^^ warning: Unused record field (b.b1)
+         %% ^^ warning: W0003: Unused record field (b.b1)
 main(#a{a1 = #b{b2 = B2}} = A) ->
     {A, B2}.
         "#,
diff --git a/crates/ide/src/tests.rs b/crates/ide/src/tests.rs
index 418adf88da..a32b7e3044 100644
--- a/crates/ide/src/tests.rs
+++ b/crates/ide/src/tests.rs
@@ -396,6 +396,8 @@ fn convert_diagnostics_to_annotations(diagnostics: Vec<Diagnostic>) -> Vec<(Text
                 Severity::Information => "information",
             });
             annotation.push_str(": ");
+            annotation.push_str(&d.code.as_code());
+            annotation.push_str(": ");
             annotation.push_str(&convert_diagnostic_message(&d));
             (d.range, annotation)
         })
@@ -672,11 +674,11 @@ mod test {
     fn filtered_diagnostics_passes_syntax_errors() {
         check_filtered_diagnostics(
             r#"
-            %%<^^^^^^^^^^^^ error: no module definition
+            %%<^^^^^^^^^^^^ error: L1201: no module definition
             foo() ->
                bug bug.
-                %% ^^^^ error: Syntax Error
-               
+                %% ^^^^ error: P1711: Syntax Error
+
             "#,
             &filter,
         )

From 557402920ad1d7d0a87e53b475b0e4b3846aadef Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 3 Nov 2025 12:20:34 -0800
Subject: [PATCH 251/394] Bump OSS VS Code extension to 0.44.0

Summary: In preparation for imminent OSS release.

Reviewed By: jcpetruzza

Differential Revision: D86121429

fbshipit-source-id: 5fee7c4c12c4504490f33c5e3331b97fc2e824db
---
 editors/code/package-lock.json | 4 ++--
 editors/code/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 74ee51b3f6..1e62d62162 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "erlang-language-platform",
-  "version": "0.43.0",
+  "version": "0.44.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "erlang-language-platform",
-      "version": "0.43.0",
+      "version": "0.44.0",
       "hasInstallScript": true,
       "license": "Apache2",
       "devDependencies": {
diff --git a/editors/code/package.json b/editors/code/package.json
index ab784449ee..d54a4de805 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -3,7 +3,7 @@
   "description": "Erlang language server",
   "author": "Meta Platforms, Inc",
   "license": "Apache2",
-  "version": "0.43.0",
+  "version": "0.44.0",
   "icon": "images/elp-logo-color.png",
   "homepage": "https://whatsapp.github.io/erlang-language-platform/",
   "repository": {

From 9e99f9644ed76baa13ae2396a6c325b65f0b099a Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Tue, 4 Nov 2025 04:25:25 -0800
Subject: [PATCH 252/394] Update eqWAlizer submodule (#130)

Summary: Pull Request resolved: https://github.com/whatsapp/erlang-language-platform/pull/130

Reviewed By: michalmuskala

Differential Revision: D85967546

Pulled By: VLanvin

fbshipit-source-id: 09aa6f51e939954bf1f4551553d7df3a1485e084
---
 eqwalizer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eqwalizer b/eqwalizer
index d086735756..bed8636fa6 160000
--- a/eqwalizer
+++ b/eqwalizer
@@ -1 +1 @@
-Subproject commit d0867357568016c305ff428685bfe7322566391f
+Subproject commit bed8636fa6b926e2292697be35e096db2386a78f

From 4227771616ac424864cfd6e8fd70016992560b8d Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 5 Nov 2025 02:27:35 -0800
Subject: [PATCH 253/394] CLI ssr: Add `--dump-config` for .elp_lint.toml
 config snippet

Summary:
We can use the command line `elp ssr` command to search through files in a project for matches, but it is also convenient to be able to examine them in an IDE context.

This diff adds this capability, with two new command line options
- `--info` upgrades the reported diagnostic from weak warning to info
- `--dump-config` emits a toml snippet suitable for placement at the end of an `.elp_lint.toml` file.

```bash
elp ssr --parens --dump-config --info "(3)" "{_A}"

# Add this to your .elp_lint.toml
[[ad_hoc_lints.lints]]
type = "LintMatchSsr"
ssr_pattern = "ssr: (3)."
severity = "info"
macro_strategy = "expand"
paren_strategy = "visible"

[[ad_hoc_lints.lints]]
type = "LintMatchSsr"
ssr_pattern = "ssr: {_A}."
severity = "info"
macro_strategy = "expand"
paren_strategy = "visible"
```

The edit to `.elp_lint.toml` will be immediately picked up, and you will see the matches as normal diagnostics with a blue squiggle for info.

Reviewed By: TD5

Differential Revision: D85960380

fbshipit-source-id: 803c19f1917d939d13e6406e440057632b489ea6
---
 crates/elp/src/bin/args.rs                    |   7 +
 crates/elp/src/bin/main.rs                    |  11 +
 crates/elp/src/bin/ssr_cli.rs                 |  16 +-
 crates/elp/src/lib.rs                         |   1 +
 .../linter/ssr_ad_hoc_cli_dump_config.stdout  |  12 ++
 crates/elp/src/resources/test/ssr_help.stdout |   4 +-
 crates/ide/src/diagnostics/from_config.rs     | 195 +++++++++++++++++-
 7 files changed, 241 insertions(+), 5 deletions(-)
 create mode 100644 crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_dump_config.stdout

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index 343f6bd820..f5f5347951 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -372,6 +372,10 @@ pub struct Ssr {
     )]
     pub format: Option<String>,
 
+    /// Report severity as Info instead of WeakWarning
+    #[bpaf(long("info"))]
+    pub info_severity: bool,
+
     /// Macro expansion strategy: expand | no-expand | visible-expand (default expand)
     #[bpaf(
         long("macros"),
@@ -386,6 +390,9 @@ pub struct Ssr {
     #[bpaf(long("parens"))]
     pub paren_strategy: bool,
 
+    /// Dump a configuration snippet that can be put in .elp_lint.toml to match the given SSR patterns
+    pub dump_config: bool,
+
     /// Report system memory usage and other statistics
     #[bpaf(long("report-system-stats"))]
     pub report_system_stats: bool,
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 16b7bbdfbe..5f26f99fb2 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -2114,6 +2114,17 @@ mod tests {
         )
     }
 
+    #[test]
+    fn lint_ssr_as_cli_dump_config() {
+        simple_snapshot(
+            args_vec!["ssr", "--dump-config", "--info", "?BAR(_@AA)", "{4}"],
+            "linter",
+            expect_file!("../resources/test/linter/ssr_ad_hoc_cli_dump_config.stdout"),
+            true,
+            None,
+        )
+    }
+
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
     fn eqwalizer_tests_check(buck: bool) {
diff --git a/crates/elp/src/bin/ssr_cli.rs b/crates/elp/src/bin/ssr_cli.rs
index 57c4f17928..016d838eb4 100644
--- a/crates/elp/src/bin/ssr_cli.rs
+++ b/crates/elp/src/bin/ssr_cli.rs
@@ -28,6 +28,7 @@ use elp_ide::diagnostics;
 use elp_ide::diagnostics::DiagnosticsConfig;
 use elp_ide::diagnostics::FallBackToAll;
 use elp_ide::diagnostics::LintConfig;
+use elp_ide::diagnostics::LintsFromConfig;
 use elp_ide::diagnostics::MatchSsr;
 use elp_ide::elp_ide_db::elp_base_db::AbsPath;
 use elp_ide::elp_ide_db::elp_base_db::FileId;
@@ -85,10 +86,16 @@ pub fn run_ssr_command(
     let mut lint_config = LintConfig::default();
     for pattern in &args.ssr_specs {
         let normalized_pattern = normalize_ssr_pattern(pattern);
+        let severity = if args.info_severity {
+            Some(diagnostics::Severity::Information)
+        } else {
+            None
+        };
         let ssr_lint = diagnostics::Lint::LintMatchSsr(MatchSsr {
             ssr_pattern: normalized_pattern,
             message: None,
             strategy: Some(strategy),
+            severity,
         });
         lint_config.ad_hoc_lints.lints.push(ssr_lint);
     }
@@ -105,8 +112,13 @@ pub fn run_ssr_command(
         .set_experimental(false)
         .set_use_cli_severity(false);
 
-    if diagnostics_config.enabled.all_enabled() && args.is_format_normal() {
-        writeln!(cli, "Reporting all diagnostics codes")?;
+    if args.dump_config {
+        let result = toml::to_string::<LintsFromConfig>(&diagnostics_config.lints_from_config)?;
+        // This is a subsection of .elp_lint.toml, add subsection prefix
+        let result = result.replace("[[lints]]", "[[ad_hoc_lints.lints]]");
+        writeln!(cli, "\n# Add this to your .elp_lint.toml")?;
+        writeln!(cli, "{}", result)?;
+        return Ok(());
     }
 
     // Load the project
diff --git a/crates/elp/src/lib.rs b/crates/elp/src/lib.rs
index be14930f12..0e9a2e28e6 100644
--- a/crates/elp/src/lib.rs
+++ b/crates/elp/src/lib.rs
@@ -193,6 +193,7 @@ mod tests {
                         ssr_pattern: "ssr: _@A = 10.".to_string(),
                         message: None,
                         strategy: None,
+                        severity: None,
                     }),
                 ],
             },
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_dump_config.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_dump_config.stdout
new file mode 100644
index 0000000000..880b8f3473
--- /dev/null
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_dump_config.stdout
@@ -0,0 +1,12 @@
+
+# Add this to your .elp_lint.toml
+[[ad_hoc_lints.lints]]
+type = "LintMatchSsr"
+ssr_pattern = "ssr: ?BAR(_@AA)."
+severity = "info"
+
+[[ad_hoc_lints.lints]]
+type = "LintMatchSsr"
+ssr_pattern = "ssr: {4}."
+severity = "info"
+
diff --git a/crates/elp/src/resources/test/ssr_help.stdout b/crates/elp/src/resources/test/ssr_help.stdout
index a90220787a..b0e6347314 100644
--- a/crates/elp/src/resources/test/ssr_help.stdout
+++ b/crates/elp/src/resources/test/ssr_help.stdout
@@ -1,4 +1,4 @@
-Usage: [--project PROJECT] [--module MODULE] [--app APP] [--file FILE] [--rebar] [--as PROFILE] [--include-generated] [--include-tests] [[--format FORMAT]] [[--macros STRATEGY]] [--parens] [--report-system-stats] <SSR_SPECS>...
+Usage: [--project PROJECT] [--module MODULE] [--app APP] [--file FILE] [--rebar] [--as PROFILE] [--include-generated] [--include-tests] [[--format FORMAT]] [--info] [[--macros STRATEGY]] [--parens] [--dump-config] [--report-system-stats] <SSR_SPECS>...
 
 Available positional items:
     <SSR_SPECS>  SSR specs to use
@@ -13,7 +13,9 @@ Available options:
         --include-generated    Also generate diagnostics for generated files
         --include-tests        Also generate diagnostics for test files
         --format <FORMAT>      Show diagnostics in JSON format
+        --info                 Report severity as Info instead of WeakWarning
         --macros <STRATEGY>    Macro expansion strategy: expand | no-expand | visible-expand (default expand)
         --parens               Explicitly match parentheses. If omitted, they are ignored.
+        --dump-config          Dump a configuration snippet that can be put in .elp_lint.toml to match the given SSR patterns
         --report-system-stats  Report system memory usage and other statistics
     -h, --help                 Prints help information
diff --git a/crates/ide/src/diagnostics/from_config.rs b/crates/ide/src/diagnostics/from_config.rs
index 678ffbd369..250fa4422d 100644
--- a/crates/ide/src/diagnostics/from_config.rs
+++ b/crates/ide/src/diagnostics/from_config.rs
@@ -131,6 +131,7 @@ pub struct MatchSsr {
     pub ssr_pattern: String,
     pub message: Option<String>,
     pub strategy: Option<Strategy>,
+    pub severity: Option<Severity>,
 }
 
 impl Serialize for MatchSsr {
@@ -140,11 +141,14 @@ impl Serialize for MatchSsr {
     {
         use serde::ser::SerializeStruct;
 
-        let mut state = serializer.serialize_struct("MatchSsr", 4)?;
+        let mut state = serializer.serialize_struct("MatchSsr", 5)?;
         state.serialize_field("ssr_pattern", &self.ssr_pattern)?;
         if let Some(ref message) = self.message {
             state.serialize_field("message", message)?;
         }
+        if let Some(ref severity) = self.severity {
+            state.serialize_field("severity", severity)?;
+        }
         if let Some(strategy) = self.strategy {
             // Default strategy is Expand and InvisibleParens
             let is_default = strategy.macros == MacroStrategy::Expand
@@ -185,6 +189,8 @@ impl<'de> Deserialize<'de> for MatchSsr {
             #[serde(default)]
             message: Option<String>,
             #[serde(default)]
+            severity: Option<Severity>,
+            #[serde(default)]
             macro_strategy: Option<String>,
             #[serde(default)]
             paren_strategy: Option<String>,
@@ -236,6 +242,7 @@ impl<'de> Deserialize<'de> for MatchSsr {
             ssr_pattern: helper.ssr_pattern,
             message: helper.message,
             strategy,
+            severity: helper.severity,
         })
     }
 }
@@ -256,12 +263,13 @@ impl MatchSsr {
                 .clone()
                 .unwrap_or_else(|| format!("SSR pattern matched: {}", self.ssr_pattern));
 
+            let severity = self.severity.unwrap_or(Severity::WeakWarning);
             let diag = Diagnostic::new(
                 DiagnosticCode::AdHoc("ssr-match".to_string()),
                 message,
                 matched.range.range,
             )
-            .with_severity(Severity::WeakWarning);
+            .with_severity(severity);
             acc.push(diag);
         }
     }
@@ -657,6 +665,7 @@ mod tests {
             ssr_pattern: "ssr: _@A = 10.".to_string(),
             message: Some("Found pattern".to_string()),
             strategy: None,
+            severity: None,
         })
         .unwrap();
         expect![[r#"
@@ -683,6 +692,7 @@ mod tests {
                     "Found pattern",
                 ),
                 strategy: None,
+                severity: None,
             }
         "#]]
         .assert_debug_eq(&match_ssr);
@@ -695,6 +705,7 @@ mod tests {
                 ssr_pattern: "ssr: _@A = 10.".to_string(),
                 message: Some("Found pattern".to_string()),
                 strategy: None,
+                severity: None,
             })],
         })
         .unwrap();
@@ -717,6 +728,7 @@ mod tests {
                     macros: MacroStrategy::Expand,
                     parens: ParenStrategy::InvisibleParens,
                 }),
+                severity: None,
             })],
         })
         .unwrap();
@@ -739,6 +751,7 @@ mod tests {
                     macros: MacroStrategy::DoNotExpand,
                     parens: ParenStrategy::VisibleParens,
                 }),
+                severity: None,
             })],
         })
         .unwrap();
@@ -782,6 +795,7 @@ mod tests {
                                     parens: VisibleParens,
                                 },
                             ),
+                            severity: None,
                         },
                     ),
                 ],
@@ -789,4 +803,181 @@ mod tests {
         "#]]
         .assert_debug_eq(&match_ssr);
     }
+
+    #[test]
+    fn serde_serialize_match_ssr_with_severity_error() {
+        use crate::diagnostics::Severity;
+        let result = toml::to_string::<MatchSsr>(&MatchSsr {
+            ssr_pattern: "ssr: _@A = 10.".to_string(),
+            message: Some("Found pattern".to_string()),
+            strategy: None,
+            severity: Some(Severity::Error),
+        })
+        .unwrap();
+        expect![[r#"
+            ssr_pattern = "ssr: _@A = 10."
+            message = "Found pattern"
+            severity = "error"
+        "#]]
+        .assert_eq(&result);
+    }
+
+    #[test]
+    fn serde_serialize_match_ssr_with_severity_warning() {
+        use crate::diagnostics::Severity;
+        let result = toml::to_string::<MatchSsr>(&MatchSsr {
+            ssr_pattern: "ssr: _@A = 10.".to_string(),
+            message: Some("Found pattern".to_string()),
+            strategy: None,
+            severity: Some(Severity::Warning),
+        })
+        .unwrap();
+        expect![[r#"
+            ssr_pattern = "ssr: _@A = 10."
+            message = "Found pattern"
+            severity = "warning"
+        "#]]
+        .assert_eq(&result);
+    }
+
+    #[test]
+    fn serde_serialize_match_ssr_with_severity_weak() {
+        use crate::diagnostics::Severity;
+        let result = toml::to_string::<MatchSsr>(&MatchSsr {
+            ssr_pattern: "ssr: _@A = 10.".to_string(),
+            message: Some("Found pattern".to_string()),
+            strategy: None,
+            severity: Some(Severity::WeakWarning),
+        })
+        .unwrap();
+        expect![[r#"
+            ssr_pattern = "ssr: _@A = 10."
+            message = "Found pattern"
+            severity = "weak"
+        "#]]
+        .assert_eq(&result);
+    }
+
+    #[test]
+    fn serde_serialize_match_ssr_with_severity_info() {
+        use crate::diagnostics::Severity;
+        let result = toml::to_string::<MatchSsr>(&MatchSsr {
+            ssr_pattern: "ssr: _@A = 10.".to_string(),
+            message: Some("Found pattern".to_string()),
+            strategy: None,
+            severity: Some(Severity::Information),
+        })
+        .unwrap();
+        expect![[r#"
+            ssr_pattern = "ssr: _@A = 10."
+            message = "Found pattern"
+            severity = "info"
+        "#]]
+        .assert_eq(&result);
+    }
+
+    #[test]
+    fn serde_deserialize_match_ssr_with_severity() {
+        use crate::diagnostics::Severity;
+        let match_ssr: MatchSsr = toml::from_str(
+            r#"
+              ssr_pattern = "ssr: _@A = 10."
+              message = "Found pattern"
+              severity = "error"
+             "#,
+        )
+        .unwrap();
+
+        assert_eq!(match_ssr.severity, Some(Severity::Error));
+    }
+
+    #[test]
+    fn serde_deserialize_lint_match_ssr_with_severity() {
+        use crate::diagnostics::Severity;
+        let lints: LintsFromConfig = toml::from_str(
+            r#"
+              [[lints]]
+              type = "LintMatchSsr"
+              ssr_pattern = "ssr: _@A = 10."
+              message = "Found pattern"
+              severity = "warning"
+             "#,
+        )
+        .unwrap();
+
+        match &lints.lints[0] {
+            Lint::LintMatchSsr(match_ssr) => {
+                assert_eq!(match_ssr.severity, Some(Severity::Warning));
+            }
+            _ => panic!("Expected LintMatchSsr"),
+        }
+    }
+
+    #[test]
+    fn serde_serialize_lint_match_ssr_with_severity_and_strategy() {
+        use crate::diagnostics::Severity;
+        let result = toml::to_string::<LintsFromConfig>(&LintsFromConfig {
+            lints: vec![Lint::LintMatchSsr(MatchSsr {
+                ssr_pattern: "ssr: _@A = 10.".to_string(),
+                message: Some("Found pattern".to_string()),
+                strategy: Some(Strategy {
+                    macros: MacroStrategy::DoNotExpand,
+                    parens: ParenStrategy::VisibleParens,
+                }),
+                severity: Some(Severity::Error),
+            })],
+        })
+        .unwrap();
+        expect![[r#"
+            [[lints]]
+            type = "LintMatchSsr"
+            ssr_pattern = "ssr: _@A = 10."
+            message = "Found pattern"
+            severity = "error"
+            macro_strategy = "no-expand"
+            paren_strategy = "visible"
+        "#]]
+        .assert_eq(&result);
+    }
+
+    #[test]
+    fn serde_deserialize_lint_match_ssr_with_severity_and_strategy() {
+        let lints: LintsFromConfig = toml::from_str(
+            r#"
+              [[lints]]
+              type = "LintMatchSsr"
+              ssr_pattern = "ssr: _@A = 10."
+              message = "Found pattern"
+              severity = "error"
+              macro_strategy = "no-expand"
+              paren_strategy = "visible"
+             "#,
+        )
+        .unwrap();
+
+        expect![[r#"
+            LintsFromConfig {
+                lints: [
+                    LintMatchSsr(
+                        MatchSsr {
+                            ssr_pattern: "ssr: _@A = 10.",
+                            message: Some(
+                                "Found pattern",
+                            ),
+                            strategy: Some(
+                                Strategy {
+                                    macros: DoNotExpand,
+                                    parens: VisibleParens,
+                                },
+                            ),
+                            severity: Some(
+                                Error,
+                            ),
+                        },
+                    ),
+                ],
+            }
+        "#]]
+        .assert_debug_eq(&lints);
+    }
 }

From 6f2ee22321ce35a6ed9b1dbac5d3c12992a3e3b2 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 7 Nov 2025 03:07:46 -0800
Subject: [PATCH 254/394] buck2: Improve pop-up when the buck project is
 malformed

Summary:
When ELP is loading a buck project it does queries using buck.
Sometimes these fail, because the current state of the buck configuration files is invalid.
In that case, we show a pop-up suggesting that the user examine the buck dashboard, and provide a URL for this.

It is not always clear to the user that this is related to a malformed buck project, rather than a bug in ELP.

This diff tries to make it clearer.

Note that we unfortunately do not have the ability to use any kind of formatting in the displayed message.

Reviewed By: TD5

Differential Revision: D86510447

fbshipit-source-id: 57a93f829d37a8a4d7c8be88d6cf68adcf41c859
---
 crates/elp/src/server.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index 4914cf9f3f..6b596db0dd 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -1803,9 +1803,13 @@ impl Server {
         }
         for (err, uri) in errors {
             if let Some(uri) = uri {
+                // It is not possible to put line breaks or other formatting in the message
+                let error_message = format!(
+                    "Look at `Details` in the buck UI for more information, there is likely an invalid BUCK file: {err}"
+                );
                 let params = lsp_types::ShowMessageRequestParams {
                     typ: lsp_types::MessageType::ERROR,
-                    message: err,
+                    message: error_message,
                     actions: Some(vec![MessageActionItem {
                         title: "Open Buck UI".to_string(),
                         properties: HashMap::from_iter(vec![(

From 85c1586d7da44238981040a0c7e3636ef62d32a7 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 10 Nov 2025 02:04:17 -0800
Subject: [PATCH 255/394] Add initial CLAUDE.md

Summary: As title. Also tweak elp_development.md

Reviewed By: TheGeorge

Differential Revision: D86507504

fbshipit-source-id: 0c3d92728014914c2954e1201d9da8fca56c19c0
---
 elp_development.md | 296 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 296 insertions(+)
 create mode 100644 elp_development.md

diff --git a/elp_development.md b/elp_development.md
new file mode 100644
index 0000000000..78d0e3086e
--- /dev/null
+++ b/elp_development.md
@@ -0,0 +1,296 @@
+---
+llms-gk: 'devmate_elp_development_md'
+apply_to_regex: '^(.*\.rs|.*\.md)$'
+oncalls: ['vscode_erlang']
+---
+# ELP Development Rules for LLMs (OSS)
+
+## Project Overview
+
+ELP (Erlang Language Platform) is a language server and development tools suite
+for Erlang, built in Rust. This project provides IDE features, diagnostics, and
+code analysis for Erlang codebases.
+
+## Diagnostic Code Management
+
+### Adding New Diagnostic Codes
+
+When adding new diagnostic codes to `DiagnosticCode` enum:
+
+1. **Naming Convention**: Use descriptive PascalCase names that clearly indicate
+   the issue
+   - Good: `UnusedFunctionArg`, `MissingCompileWarnMissingSpec`
+   - Bad: `Error1`, `BadCode`
+
+2. **Code Assignment**: Follow the established numbering scheme
+   - `W0000-W9999`: Native ELP diagnostics, visible in the OSS version
+   - Use the next available number in the appropriate range
+   - Never change the number of an existing diagnostic code
+   - Never change the label of an existing diagnostic code
+   - Always add the new diagnostic constructor to the end of the list
+
+3. **Required Methods**: When adding a new variant, update ALL match statements:
+   - `as_code()`: Return the diagnostic code (e.g., "W0053")
+   - `as_label()`: Return snake_case label (e.g., "unused_function_arg")
+   - `allows_fixme_comment()`: Determine if FIXME comments are allowed
+   - `is_syntax_error()`: Mark if this is a syntax error
+
+4. **Documentation**: Add comments explaining complex diagnostic codes
+
+5. **Documentation File**: Create a corresponding documentation file in the
+   website
+   - Location: `website/docs/erlang-error-index/{namespace}/{code}.md`
+   - Example: `W0051` → `website/docs/erlang-error-index/w/W0051.md`
+   - Include frontmatter with `sidebar_position` matching the code number
+   - Structure should include:
+     - Title with code and brief description
+     - Severity level (Error, Warning, WeakWarning, Information)
+     - Code example showing the diagnostic in action
+     - Explanation section describing the issue and why it matters
+     - Optional: Fix suggestions or alternatives
+   - The `as_uri()` method automatically generates URLs pointing to these docs
+
+### Creating DiagnosticDescriptor
+
+Every diagnostic must have a corresponding `DiagnosticDescriptor` that defines
+when and how the diagnostic runs:
+
+1. **Static Descriptor Declaration**: Create a public static descriptor in your
+   diagnostic module
+   - Use `pub(crate) static DESCRIPTOR: DiagnosticDescriptor` pattern
+   - Define `DiagnosticConditions` with appropriate flags
+   - Provide a checker function that implements the diagnostic logic
+
+2. **Diagnostic Conditions**: Configure when the diagnostic should run
+   - `experimental`: Mark as true for experimental/unstable diagnostics
+   - `include_generated`: Set to false if diagnostic shouldn't run on generated
+     code
+   - `include_tests`: Set to false if diagnostic shouldn't run on test files
+   - `default_disabled`: Set to true if diagnostic requires explicit enabling
+
+3. **Checker Function**: Implement the diagnostic logic
+   - Must match signature: `&dyn AdhocSemanticDiagnostics`
+   - Push diagnostics to the `diags` vector using `Diagnostic::new()`
+   - Use helper functions to keep the checker clean and focused
+
+4. **Registration**: Add the descriptor to `diagnostics_descriptors()` function
+   in `diagnostics.rs`
+   - Include your module's `DESCRIPTOR` in the returned vector
+
+5. **Module Structure**: Follow the established pattern
+   - Create separate module files for each diagnostic type
+   - Export the `DESCRIPTOR` as `pub(crate) static`
+   - Include comprehensive tests with `#[cfg(test)]`
+   - Use SSR patterns when appropriate for complex matching
+
+## Rust Code Style
+
+### Error Handling
+
+- Use `Result<T, E>` for fallible operations
+- Prefer `?` operator over explicit match for error propagation
+- Use descriptive error messages with context
+
+### Pattern Matching
+
+- Use exhaustive matches for enums to catch new variants at compile time
+- Add explicit comments when intentionally using catch-all patterns
+- Prefer early returns to reduce nesting
+
+### String Handling
+
+- Use `&str` for borrowed strings, `String` for owned
+- Use `format!()` for complex string formatting
+- Use `to_string()` for simple conversions
+
+### Collections
+
+- Use `FxHashMap` instead of `std::HashMap` for better performance
+- Use `lazy_static!` for expensive static computations
+- Prefer iterators over manual loops where possible
+
+## Testing Guidelines
+
+### Test Structure
+
+- Use `expect_test` for snapshot testing of complex outputs
+- Group related tests in the same module
+- Use descriptive test names that explain the scenario
+
+### Declarative Test Fixtures
+
+ELP uses a declarative test fixture system that allows you to write tests with
+inline annotations and markers directly in test strings. This system is defined
+in `crates/project_model/src/test_fixture.rs`.
+
+#### Key Features
+
+1. **File Organization**: Use `//- /path/to/file.erl` to define multiple files
+   in a single test
+2. **Metadata Markers**: Specify app names, include paths, OTP apps, etc. using
+   metadata after the path
+3. **Annotations**: Mark expected diagnostics or ranges using `%% ^^^` syntax
+4. **Cursors and Ranges**: Use `~` markers to indicate positions or ranges in
+   test code
+
+#### Annotation Syntax
+
+Annotations allow you to mark expected diagnostics, types, or other information
+directly in test code:
+
+- **Basic annotation**: `%% ^^^ some text` - Points to the range above matching
+  the caret length
+- **Top-of-file marker**: `%% <<< text` (at file start) - Creates annotation at
+  position 0..0
+- **File-wide annotation**: `%% ^^^file text` - Annotation spans the entire file
+  contents
+- **Left-margin annotation**: `%%<^^^ text` - Annotation starts at `%%` position
+  instead of first `^`
+- **Multiline annotations**: Use continuation lines with `%%   | next line`
+
+#### Example Test Fixture
+
+```rust
+let fixture = r#"
+//- /src/main.erl
+-module(main).
+
+foo(X) ->
+    X + undefined.
+  %%    ^^^^^^^^^ error: type mismatch
+"#;
+```
+
+### Test Data
+
+- Create minimal test cases that focus on specific functionality
+- Use realistic Erlang code examples in tests
+- Test both positive and negative cases
+
+### Running Tests for Specific Crates
+
+When running tests for a specific crate, you need to specify the crate name, not
+the directory name. The mapping is:
+
+| Crate Name           | Directory Name          |
+| -------------------- | ----------------------- |
+| `elp`                | `crates/elp`            |
+| `elp_base_db`        | `crates/base_db`        |
+| `elp_eqwalizer`      | `crates/eqwalizer`      |
+| `elp_erlang_service` | `crates/erlang_service` |
+| `elp_ide`            | `crates/ide`            |
+| `elp_ide_assists`    | `crates/ide_assists`    |
+| `elp_ide_completion` | `crates/ide_completion` |
+| `elp_ide_db`         | `crates/ide_db`         |
+| `elp_ide_ssr`        | `crates/ide_ssr`        |
+| `elp_log`            | `crates/elp_log`        |
+| `elp_project_model`  | `crates/project_model`  |
+| `elp_syntax`         | `crates/syntax`         |
+| `elp_text_edit`      | `crates/text_edit`      |
+| `elp_types_db`       | `crates/types_db`       |
+| `hir`                | `crates/hir`            |
+
+Example: To run tests for the `elp_ide` crate:
+
+```bash
+cargo test -p elp_ide
+```
+
+Or to run tests in a specific directory:
+
+```bash
+cargo test --manifest-path crates/ide/Cargo.toml
+```
+
+### Existing tests
+
+- Do not change existing tests without asking
+
+## Documentation
+
+### Code Comments
+
+- Document complex algorithms and business logic
+- Explain WHY, not just WHAT the code does
+- Use `///` for public API documentation
+- Use `//` for internal implementation notes
+
+### Error Messages
+
+- Make error messages actionable and user-friendly
+- Include context about what was expected vs. what was found
+- Provide suggestions for fixing the issue when possible
+
+## Performance Considerations
+
+### Memory Usage
+
+- Use `Box<T>` for large enum variants to keep enum size small
+- Consider using `Cow<str>` for strings that might be borrowed or owned
+- Use `Arc<T>` for shared immutable data
+
+### Computation
+
+- Cache expensive computations using `lazy_static!` or `once_cell`
+- Use appropriate data structures (HashMap for lookups, Vec for sequences)
+- Profile code paths that handle large Erlang codebases
+
+## Integration Guidelines
+
+### Erlang Service Integration
+
+- Handle Erlang service errors gracefully
+- Use appropriate namespaces for different error sources
+- Maintain backward compatibility with existing error codes
+
+### IDE Integration
+
+- Provide rich diagnostic information (ranges, severity, fixes)
+- Support quick fixes and code actions where appropriate
+- Ensure diagnostics are fast enough for real-time feedback
+
+## Maintenance
+
+### Backward Compatibility
+
+- Don't change existing diagnostic codes or their meanings
+- Deprecate old codes before removing them
+- Maintain serialization compatibility for configuration files
+
+### Code Organization
+
+- Keep related functionality together in modules
+- Use clear module boundaries and public APIs
+- Minimize dependencies between modules
+
+### Version Management
+
+- Follow semantic versioning for public APIs
+- Document breaking changes in release notes
+- Provide migration guides for major changes
+
+## Common Patterns
+
+### Regex Usage
+
+- Use `lazy_static!` for compiled regexes
+- Prefer specific patterns over overly broad ones
+- Test regex patterns thoroughly with edge cases
+
+### Configuration
+
+- Support both code-based and label-based diagnostic references
+- Use serde for serialization/deserialization
+- Provide sensible defaults for all configuration options
+
+### Error Recovery
+
+- Continue processing after encountering errors when possible
+- Collect multiple errors rather than failing on the first one
+- Provide partial results when full analysis isn't possible
+
+### Process
+
+- Always run tests before finishing
+- Always run `cargo clippy --tests` before submitting PRs
+- Use `cargo fmt` for code formatting

From 412ccca85ea720cd8cac4e930600f2812e6426d6 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 10 Nov 2025 03:01:11 -0800
Subject: [PATCH 256/394] Update elp_development.md to improve declarative test
 example

Summary: We now include the diagnostic code in the expected diagnostic.

Reviewed By: RobinMorisset

Differential Revision: D86658752

fbshipit-source-id: 43f835633a0c81c15d7f43cfcdfde967db9a3178
---
 elp_development.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/elp_development.md b/elp_development.md
index 78d0e3086e..713caf349a 100644
--- a/elp_development.md
+++ b/elp_development.md
@@ -155,9 +155,8 @@ let fixture = r#"
 //- /src/main.erl
 -module(main).
 
-foo(X) ->
-    X + undefined.
-  %%    ^^^^^^^^^ error: type mismatch
+foo( -> ok. %%
+%%  ^ error: W0004: Missing ')'~
 "#;
 ```
 

From 49fb231fe9c2ebc009f1b0621a2edfc45510225d Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 10 Nov 2025 03:36:04 -0800
Subject: [PATCH 257/394] BE: remove workspace reference to non-existent
 erl_ast crate

Summary: As title.

Reviewed By: jcpetruzza

Differential Revision: D86513055

fbshipit-source-id: 068357b9d6976bca2838036c5dbe308afbb52fe7
---
 Cargo.toml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 5814517745..b3b8ae074c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,9 +34,6 @@ elp_text_edit = { path = "./crates/text_edit" }
 elp_types_db = { path = "./crates/types_db" }
 hir = { path = "./crates/hir" }
 
-# Forks
-erl_ast = { path = "./crates/erl_ast" }
-
 # External crates
 trie-rs = "0.4.2"
 always-assert = "0.1.3"

From b01a09f2ffe2258dcfbfb78e9f7d37501f5ccbd7 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 12 Nov 2025 01:56:31 -0800
Subject: [PATCH 258/394] elp ssr: set info priority when `--dump-config` is
 set

Summary:
As title.

It does not make sense to have at least info severity in the IDE, otherwise the squiggles do not show up.

Reviewed By: jcpetruzza

Differential Revision: D86774246

fbshipit-source-id: 0db22ecf1b90c7e7a2d2037c0c45cc8619928c44
---
 crates/elp/src/bin/args.rs                    |  4 ----
 crates/elp/src/bin/main.rs                    | 13 ++++++++++++-
 crates/elp/src/bin/ssr_cli.rs                 |  3 ++-
 crates/elp/src/resources/test/ssr_help.stdout |  3 +--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index f5f5347951..b80bae0ff6 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -372,10 +372,6 @@ pub struct Ssr {
     )]
     pub format: Option<String>,
 
-    /// Report severity as Info instead of WeakWarning
-    #[bpaf(long("info"))]
-    pub info_severity: bool,
-
     /// Macro expansion strategy: expand | no-expand | visible-expand (default expand)
     #[bpaf(
         long("macros"),
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 5f26f99fb2..a34cd76100 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -2117,7 +2117,18 @@ mod tests {
     #[test]
     fn lint_ssr_as_cli_dump_config() {
         simple_snapshot(
-            args_vec!["ssr", "--dump-config", "--info", "?BAR(_@AA)", "{4}"],
+            args_vec!["ssr", "--dump-config", "?BAR(_@AA)", "{4}"],
+            "linter",
+            expect_file!("../resources/test/linter/ssr_ad_hoc_cli_dump_config.stdout"),
+            true,
+            None,
+        )
+    }
+
+    #[test]
+    fn lint_ssr_as_cli_dump_config_without_info() {
+        simple_snapshot(
+            args_vec!["ssr", "--dump-config", "?BAR(_@AA)", "{4}"],
             "linter",
             expect_file!("../resources/test/linter/ssr_ad_hoc_cli_dump_config.stdout"),
             true,
diff --git a/crates/elp/src/bin/ssr_cli.rs b/crates/elp/src/bin/ssr_cli.rs
index 016d838eb4..f3b4c4339f 100644
--- a/crates/elp/src/bin/ssr_cli.rs
+++ b/crates/elp/src/bin/ssr_cli.rs
@@ -86,7 +86,8 @@ pub fn run_ssr_command(
     let mut lint_config = LintConfig::default();
     for pattern in &args.ssr_specs {
         let normalized_pattern = normalize_ssr_pattern(pattern);
-        let severity = if args.info_severity {
+        let severity = if args.dump_config {
+            // Set the severity so that squiggles are shown in the VS Code UI
             Some(diagnostics::Severity::Information)
         } else {
             None
diff --git a/crates/elp/src/resources/test/ssr_help.stdout b/crates/elp/src/resources/test/ssr_help.stdout
index b0e6347314..7e5d3f4559 100644
--- a/crates/elp/src/resources/test/ssr_help.stdout
+++ b/crates/elp/src/resources/test/ssr_help.stdout
@@ -1,4 +1,4 @@
-Usage: [--project PROJECT] [--module MODULE] [--app APP] [--file FILE] [--rebar] [--as PROFILE] [--include-generated] [--include-tests] [[--format FORMAT]] [--info] [[--macros STRATEGY]] [--parens] [--dump-config] [--report-system-stats] <SSR_SPECS>...
+Usage: [--project PROJECT] [--module MODULE] [--app APP] [--file FILE] [--rebar] [--as PROFILE] [--include-generated] [--include-tests] [[--format FORMAT]] [[--macros STRATEGY]] [--parens] [--dump-config] [--report-system-stats] <SSR_SPECS>...
 
 Available positional items:
     <SSR_SPECS>  SSR specs to use
@@ -13,7 +13,6 @@ Available options:
         --include-generated    Also generate diagnostics for generated files
         --include-tests        Also generate diagnostics for test files
         --format <FORMAT>      Show diagnostics in JSON format
-        --info                 Report severity as Info instead of WeakWarning
         --macros <STRATEGY>    Macro expansion strategy: expand | no-expand | visible-expand (default expand)
         --parens               Explicitly match parentheses. If omitted, they are ignored.
         --dump-config          Dump a configuration snippet that can be put in .elp_lint.toml to match the given SSR patterns

From e0c5e94ac0543f27f0a51e5576a832937eabdb4e Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 12 Nov 2025 03:31:52 -0800
Subject: [PATCH 259/394] Add file watch logging for project switch decisions

Summary:
We already have local logging of changes we receive related to file watching, both from VFS and the LSP client.

To contextualise these, include logging of the decisions made at key points in the project loading lifecyle when ELP is running as an LSP server.

Reviewed By: jcpetruzza

Differential Revision: D86679575

fbshipit-source-id: dc4fb2bdab5b489757a618aefee33f544bce4767
---
 crates/elp/src/server.rs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index 6b596db0dd..3d2cf02252 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -507,6 +507,7 @@ impl Server {
                         a_file_per_project = FxHashSet::default();
                     }
                     spinner.end();
+                    log::info!(target: FILE_WATCH_LOGGER_NAME, "Project reloading complete");
                     self.reload_manager
                         .lock()
                         .set_reload_done(a_file_per_project);
@@ -558,6 +559,7 @@ impl Server {
 
         let to_reload = self.reload_manager.lock().query_changed_files();
         if let Some(to_reload) = to_reload {
+            log::info!(target: FILE_WATCH_LOGGER_NAME, "Asking for project reload");
             let query_config = self.reload_manager.lock().set_reload_active();
             self.reload_project(to_reload, query_config);
         }
@@ -1022,8 +1024,10 @@ impl Server {
                 log::info!(target: FILE_WATCH_LOGGER_NAME, "VFS change:{}:{}", &opened, &path);
             }
             if !opened {
-                // This call will add the file to the changed_files, picked
-                // up in `process_changes`, if it has changed.
+                // This call will add the file to the changed_files,
+                // picked up in `process_changes`, only if the new
+                // content is different from the current, checked via
+                // a hash.
                 vfs.set_file_contents(path, contents);
             }
         }
@@ -1396,9 +1400,11 @@ impl Server {
     fn switch_workspaces(&mut self, spinner: &Spinner, new_projects: Vec<Project>) -> Result<()> {
         if new_projects.is_empty() {
             log::info!("nothing new, not switching workspaces");
+            log::info!(target: FILE_WATCH_LOGGER_NAME, "nothing new, not switching workspaces");
             return Ok(());
         }
         log::info!("will switch workspaces");
+        log::info!(target: FILE_WATCH_LOGGER_NAME, "will switch workspaces");
 
         let mut projects: Vec<Project> = self.projects.iter().cloned().collect();
         for project in new_projects {
@@ -1878,6 +1884,7 @@ impl Server {
         if !self.reload_manager.lock().ok_to_switch_workspace() {
             // There are other changed files, abort this reload, to
             // allow the next one.
+            log::info!(target: FILE_WATCH_LOGGER_NAME, "Not switching workspaces, more changed config files");
             return Ok(false);
         }
         spinner.report("Switching to loaded projects".to_string());

From c5263ed926f0492eef11c6aa188f7107b6da6e83 Mon Sep 17 00:00:00 2001
From: Facebook Community Bot <facebook-github-bot@users.noreply.github.com>
Date: Wed, 12 Nov 2025 06:03:18 -0800
Subject: [PATCH 260/394] Re-sync with internal repository (#131)

The internal and external repositories are out of sync. This Pull Request attempts to brings them back in sync by patching the GitHub repository. Please carefully review this patch. You must disable ShipIt for your project in order to merge this pull request. DO NOT IMPORT this pull request. Instead, merge it directly on GitHub using the MERGE BUTTON. Re-enable ShipIt after merging.
---
 .llms/rules/elp_development.md | 117 ++++++-------
 elp_development.md             | 295 ---------------------------------
 2 files changed, 61 insertions(+), 351 deletions(-)
 delete mode 100644 elp_development.md

diff --git a/.llms/rules/elp_development.md b/.llms/rules/elp_development.md
index 579764599a..713caf349a 100644
--- a/.llms/rules/elp_development.md
+++ b/.llms/rules/elp_development.md
@@ -3,13 +3,13 @@ llms-gk: 'devmate_elp_development_md'
 apply_to_regex: '^(.*\.rs|.*\.md)$'
 oncalls: ['vscode_erlang']
 ---
-
-# ELP Development Rules for LLMs
-
+# ELP Development Rules for LLMs (OSS)
 
 ## Project Overview
 
-ELP (Erlang Language Platform) is a language server and development tools suite for Erlang, built in Rust. This project provides IDE features, diagnostics, and code analysis for Erlang codebases.
+ELP (Erlang Language Platform) is a language server and development tools suite
+for Erlang, built in Rust. This project provides IDE features, diagnostics, and
+code analysis for Erlang codebases.
 
 ## Diagnostic Code Management
 
@@ -17,13 +17,13 @@ ELP (Erlang Language Platform) is a language server and development tools suite
 
 When adding new diagnostic codes to `DiagnosticCode` enum:
 
-1. **Naming Convention**: Use descriptive PascalCase names that clearly indicate the issue
+1. **Naming Convention**: Use descriptive PascalCase names that clearly indicate
+   the issue
    - Good: `UnusedFunctionArg`, `MissingCompileWarnMissingSpec`
    - Bad: `Error1`, `BadCode`
 
 2. **Code Assignment**: Follow the established numbering scheme
    - `W0000-W9999`: Native ELP diagnostics, visible in the OSS version
-   - `WA000-WA999`: WhatsApp-specific warnings, only visible in Meta builds
    - Use the next available number in the appropriate range
    - Never change the number of an existing diagnostic code
    - Never change the label of an existing diagnostic code
@@ -37,7 +37,8 @@ When adding new diagnostic codes to `DiagnosticCode` enum:
 
 4. **Documentation**: Add comments explaining complex diagnostic codes
 
-5. **Documentation File**: Create a corresponding documentation file in the website
+5. **Documentation File**: Create a corresponding documentation file in the
+   website
    - Location: `website/docs/erlang-error-index/{namespace}/{code}.md`
    - Example: `W0051` → `website/docs/erlang-error-index/w/W0051.md`
    - Include frontmatter with `sidebar_position` matching the code number
@@ -51,16 +52,19 @@ When adding new diagnostic codes to `DiagnosticCode` enum:
 
 ### Creating DiagnosticDescriptor
 
-Every diagnostic must have a corresponding `DiagnosticDescriptor` that defines when and how the diagnostic runs:
+Every diagnostic must have a corresponding `DiagnosticDescriptor` that defines
+when and how the diagnostic runs:
 
-1. **Static Descriptor Declaration**: Create a public static descriptor in your diagnostic module
+1. **Static Descriptor Declaration**: Create a public static descriptor in your
+   diagnostic module
    - Use `pub(crate) static DESCRIPTOR: DiagnosticDescriptor` pattern
    - Define `DiagnosticConditions` with appropriate flags
    - Provide a checker function that implements the diagnostic logic
 
 2. **Diagnostic Conditions**: Configure when the diagnostic should run
    - `experimental`: Mark as true for experimental/unstable diagnostics
-   - `include_generated`: Set to false if diagnostic shouldn't run on generated code
+   - `include_generated`: Set to false if diagnostic shouldn't run on generated
+     code
    - `include_tests`: Set to false if diagnostic shouldn't run on test files
    - `default_disabled`: Set to true if diagnostic requires explicit enabling
 
@@ -69,7 +73,8 @@ Every diagnostic must have a corresponding `DiagnosticDescriptor` that defines w
    - Push diagnostics to the `diags` vector using `Diagnostic::new()`
    - Use helper functions to keep the checker clean and focused
 
-4. **Registration**: Add the descriptor to `diagnostics_descriptors()` function in `diagnostics.rs`
+4. **Registration**: Add the descriptor to `diagnostics_descriptors()` function
+   in `diagnostics.rs`
    - Include your module's `DESCRIPTOR` in the returned vector
 
 5. **Module Structure**: Follow the established pattern
@@ -78,12 +83,6 @@ Every diagnostic must have a corresponding `DiagnosticDescriptor` that defines w
    - Include comprehensive tests with `#[cfg(test)]`
    - Use SSR patterns when appropriate for complex matching
 
-### Meta-Only vs OSS Code
-
-- Use `@fb-only` and `@oss-only` comments to mark platform-specific code
-- Meta-only diagnostics should use `MetaOnlyDiagnosticCode` wrapper
-- Ensure OSS builds work by providing fallbacks for Meta-only features
-
 ## Rust Code Style
 
 ### Error Handling
@@ -120,23 +119,33 @@ Every diagnostic must have a corresponding `DiagnosticDescriptor` that defines w
 
 ### Declarative Test Fixtures
 
-ELP uses a declarative test fixture system that allows you to write tests with inline annotations and markers directly in test strings. This system is defined in `/data/sandcastle/boxes/fbsource/fbcode/whatsapp/elp/crates/project_model/src/test_fixture.rs`.
+ELP uses a declarative test fixture system that allows you to write tests with
+inline annotations and markers directly in test strings. This system is defined
+in `crates/project_model/src/test_fixture.rs`.
 
 #### Key Features
 
-1. **File Organization**: Use `//- /path/to/file.erl` to define multiple files in a single test
-2. **Metadata Markers**: Specify app names, include paths, OTP apps, etc. using metadata after the path
+1. **File Organization**: Use `//- /path/to/file.erl` to define multiple files
+   in a single test
+2. **Metadata Markers**: Specify app names, include paths, OTP apps, etc. using
+   metadata after the path
 3. **Annotations**: Mark expected diagnostics or ranges using `%% ^^^` syntax
-4. **Cursors and Ranges**: Use `~` markers to indicate positions or ranges in test code
+4. **Cursors and Ranges**: Use `~` markers to indicate positions or ranges in
+   test code
 
 #### Annotation Syntax
 
-Annotations allow you to mark expected diagnostics, types, or other information directly in test code:
+Annotations allow you to mark expected diagnostics, types, or other information
+directly in test code:
 
-- **Basic annotation**: `%% ^^^ some text` - Points to the range above matching the caret length
-- **Top-of-file marker**: `%% <<< text` (at file start) - Creates annotation at position 0..0
-- **File-wide annotation**: `%% ^^^file text` - Annotation spans the entire file contents
-- **Left-margin annotation**: `%%<^^^ text` - Annotation starts at `%%` position instead of first `^`
+- **Basic annotation**: `%% ^^^ some text` - Points to the range above matching
+  the caret length
+- **Top-of-file marker**: `%% <<< text` (at file start) - Creates annotation at
+  position 0..0
+- **File-wide annotation**: `%% ^^^file text` - Annotation spans the entire file
+  contents
+- **Left-margin annotation**: `%%<^^^ text` - Annotation starts at `%%` position
+  instead of first `^`
 - **Multiline annotations**: Use continuation lines with `%%   | next line`
 
 #### Example Test Fixture
@@ -146,9 +155,8 @@ let fixture = r#"
 //- /src/main.erl
 -module(main).
 
-foo(X) ->
-    X + undefined.
-  %%    ^^^^^^^^^ error: type mismatch
+foo( -> ok. %%
+%%  ^ error: W0004: Missing ')'~
 "#;
 ```
 
@@ -160,34 +168,37 @@ foo(X) ->
 
 ### Running Tests for Specific Crates
 
-When running tests for a specific crate, you need to specify the crate name, not the directory name. The mapping is:
+When running tests for a specific crate, you need to specify the crate name, not
+the directory name. The mapping is:
 
-| Crate Name | Directory Name |
-|------------|----------------|
-| `elp_base_db` | `crates/base_db` |
-| `elp_eqwalizer` | `crates/eqwalizer` |
+| Crate Name           | Directory Name          |
+| -------------------- | ----------------------- |
+| `elp`                | `crates/elp`            |
+| `elp_base_db`        | `crates/base_db`        |
+| `elp_eqwalizer`      | `crates/eqwalizer`      |
 | `elp_erlang_service` | `crates/erlang_service` |
-| `elp_ide` | `crates/ide` |
-| `elp_ide_assists` | `crates/ide_assists` |
+| `elp_ide`            | `crates/ide`            |
+| `elp_ide_assists`    | `crates/ide_assists`    |
 | `elp_ide_completion` | `crates/ide_completion` |
-| `elp_ide_db` | `crates/ide_db` |
-| `elp_ide_ssr` | `crates/ide_ssr` |
-| `elp_log` | `crates/elp_log` |
-| `elp_project_model` | `crates/project_model` |
-| `elp_syntax` | `crates/syntax` |
-| `elp_text_edit` | `crates/text_edit` |
-| `elp_types_db` | `crates/types_db` |
-| `hir` | `crates/hir` |
-| `erl_ast` | `crates/erl_ast` |
+| `elp_ide_db`         | `crates/ide_db`         |
+| `elp_ide_ssr`        | `crates/ide_ssr`        |
+| `elp_log`            | `crates/elp_log`        |
+| `elp_project_model`  | `crates/project_model`  |
+| `elp_syntax`         | `crates/syntax`         |
+| `elp_text_edit`      | `crates/text_edit`      |
+| `elp_types_db`       | `crates/types_db`       |
+| `hir`                | `crates/hir`            |
 
 Example: To run tests for the `elp_ide` crate:
+
 ```bash
-./meta/cargo.sh test -p elp_ide
+cargo test -p elp_ide
 ```
 
 Or to run tests in a specific directory:
+
 ```bash
-./meta/cargo.sh test --manifest-path crates/ide/Cargo.toml
+cargo test --manifest-path crates/ide/Cargo.toml
 ```
 
 ### Existing tests
@@ -277,14 +288,8 @@ Or to run tests in a specific directory:
 - Collect multiple errors rather than failing on the first one
 - Provide partial results when full analysis isn't possible
 
-### Tools
-
-- ELP uses a cargo workspace.
-- Inside Meta, use `./meta/cargo.sh` instead of `cargo`
-- Inside Meta, use `./meta/clippy.sh` to run clippy
-- Use `arc lint --apply-patches` for formatting.
-
 ### Process
 
-- Always run tests before finishing.
-- Always run `./meta/cargo.sh clippy --tests` before submitting a diff
+- Always run tests before finishing
+- Always run `cargo clippy --tests` before submitting PRs
+- Use `cargo fmt` for code formatting
diff --git a/elp_development.md b/elp_development.md
deleted file mode 100644
index 713caf349a..0000000000
--- a/elp_development.md
+++ /dev/null
@@ -1,295 +0,0 @@
----
-llms-gk: 'devmate_elp_development_md'
-apply_to_regex: '^(.*\.rs|.*\.md)$'
-oncalls: ['vscode_erlang']
----
-# ELP Development Rules for LLMs (OSS)
-
-## Project Overview
-
-ELP (Erlang Language Platform) is a language server and development tools suite
-for Erlang, built in Rust. This project provides IDE features, diagnostics, and
-code analysis for Erlang codebases.
-
-## Diagnostic Code Management
-
-### Adding New Diagnostic Codes
-
-When adding new diagnostic codes to `DiagnosticCode` enum:
-
-1. **Naming Convention**: Use descriptive PascalCase names that clearly indicate
-   the issue
-   - Good: `UnusedFunctionArg`, `MissingCompileWarnMissingSpec`
-   - Bad: `Error1`, `BadCode`
-
-2. **Code Assignment**: Follow the established numbering scheme
-   - `W0000-W9999`: Native ELP diagnostics, visible in the OSS version
-   - Use the next available number in the appropriate range
-   - Never change the number of an existing diagnostic code
-   - Never change the label of an existing diagnostic code
-   - Always add the new diagnostic constructor to the end of the list
-
-3. **Required Methods**: When adding a new variant, update ALL match statements:
-   - `as_code()`: Return the diagnostic code (e.g., "W0053")
-   - `as_label()`: Return snake_case label (e.g., "unused_function_arg")
-   - `allows_fixme_comment()`: Determine if FIXME comments are allowed
-   - `is_syntax_error()`: Mark if this is a syntax error
-
-4. **Documentation**: Add comments explaining complex diagnostic codes
-
-5. **Documentation File**: Create a corresponding documentation file in the
-   website
-   - Location: `website/docs/erlang-error-index/{namespace}/{code}.md`
-   - Example: `W0051` → `website/docs/erlang-error-index/w/W0051.md`
-   - Include frontmatter with `sidebar_position` matching the code number
-   - Structure should include:
-     - Title with code and brief description
-     - Severity level (Error, Warning, WeakWarning, Information)
-     - Code example showing the diagnostic in action
-     - Explanation section describing the issue and why it matters
-     - Optional: Fix suggestions or alternatives
-   - The `as_uri()` method automatically generates URLs pointing to these docs
-
-### Creating DiagnosticDescriptor
-
-Every diagnostic must have a corresponding `DiagnosticDescriptor` that defines
-when and how the diagnostic runs:
-
-1. **Static Descriptor Declaration**: Create a public static descriptor in your
-   diagnostic module
-   - Use `pub(crate) static DESCRIPTOR: DiagnosticDescriptor` pattern
-   - Define `DiagnosticConditions` with appropriate flags
-   - Provide a checker function that implements the diagnostic logic
-
-2. **Diagnostic Conditions**: Configure when the diagnostic should run
-   - `experimental`: Mark as true for experimental/unstable diagnostics
-   - `include_generated`: Set to false if diagnostic shouldn't run on generated
-     code
-   - `include_tests`: Set to false if diagnostic shouldn't run on test files
-   - `default_disabled`: Set to true if diagnostic requires explicit enabling
-
-3. **Checker Function**: Implement the diagnostic logic
-   - Must match signature: `&dyn AdhocSemanticDiagnostics`
-   - Push diagnostics to the `diags` vector using `Diagnostic::new()`
-   - Use helper functions to keep the checker clean and focused
-
-4. **Registration**: Add the descriptor to `diagnostics_descriptors()` function
-   in `diagnostics.rs`
-   - Include your module's `DESCRIPTOR` in the returned vector
-
-5. **Module Structure**: Follow the established pattern
-   - Create separate module files for each diagnostic type
-   - Export the `DESCRIPTOR` as `pub(crate) static`
-   - Include comprehensive tests with `#[cfg(test)]`
-   - Use SSR patterns when appropriate for complex matching
-
-## Rust Code Style
-
-### Error Handling
-
-- Use `Result<T, E>` for fallible operations
-- Prefer `?` operator over explicit match for error propagation
-- Use descriptive error messages with context
-
-### Pattern Matching
-
-- Use exhaustive matches for enums to catch new variants at compile time
-- Add explicit comments when intentionally using catch-all patterns
-- Prefer early returns to reduce nesting
-
-### String Handling
-
-- Use `&str` for borrowed strings, `String` for owned
-- Use `format!()` for complex string formatting
-- Use `to_string()` for simple conversions
-
-### Collections
-
-- Use `FxHashMap` instead of `std::HashMap` for better performance
-- Use `lazy_static!` for expensive static computations
-- Prefer iterators over manual loops where possible
-
-## Testing Guidelines
-
-### Test Structure
-
-- Use `expect_test` for snapshot testing of complex outputs
-- Group related tests in the same module
-- Use descriptive test names that explain the scenario
-
-### Declarative Test Fixtures
-
-ELP uses a declarative test fixture system that allows you to write tests with
-inline annotations and markers directly in test strings. This system is defined
-in `crates/project_model/src/test_fixture.rs`.
-
-#### Key Features
-
-1. **File Organization**: Use `//- /path/to/file.erl` to define multiple files
-   in a single test
-2. **Metadata Markers**: Specify app names, include paths, OTP apps, etc. using
-   metadata after the path
-3. **Annotations**: Mark expected diagnostics or ranges using `%% ^^^` syntax
-4. **Cursors and Ranges**: Use `~` markers to indicate positions or ranges in
-   test code
-
-#### Annotation Syntax
-
-Annotations allow you to mark expected diagnostics, types, or other information
-directly in test code:
-
-- **Basic annotation**: `%% ^^^ some text` - Points to the range above matching
-  the caret length
-- **Top-of-file marker**: `%% <<< text` (at file start) - Creates annotation at
-  position 0..0
-- **File-wide annotation**: `%% ^^^file text` - Annotation spans the entire file
-  contents
-- **Left-margin annotation**: `%%<^^^ text` - Annotation starts at `%%` position
-  instead of first `^`
-- **Multiline annotations**: Use continuation lines with `%%   | next line`
-
-#### Example Test Fixture
-
-```rust
-let fixture = r#"
-//- /src/main.erl
--module(main).
-
-foo( -> ok. %%
-%%  ^ error: W0004: Missing ')'~
-"#;
-```
-
-### Test Data
-
-- Create minimal test cases that focus on specific functionality
-- Use realistic Erlang code examples in tests
-- Test both positive and negative cases
-
-### Running Tests for Specific Crates
-
-When running tests for a specific crate, you need to specify the crate name, not
-the directory name. The mapping is:
-
-| Crate Name           | Directory Name          |
-| -------------------- | ----------------------- |
-| `elp`                | `crates/elp`            |
-| `elp_base_db`        | `crates/base_db`        |
-| `elp_eqwalizer`      | `crates/eqwalizer`      |
-| `elp_erlang_service` | `crates/erlang_service` |
-| `elp_ide`            | `crates/ide`            |
-| `elp_ide_assists`    | `crates/ide_assists`    |
-| `elp_ide_completion` | `crates/ide_completion` |
-| `elp_ide_db`         | `crates/ide_db`         |
-| `elp_ide_ssr`        | `crates/ide_ssr`        |
-| `elp_log`            | `crates/elp_log`        |
-| `elp_project_model`  | `crates/project_model`  |
-| `elp_syntax`         | `crates/syntax`         |
-| `elp_text_edit`      | `crates/text_edit`      |
-| `elp_types_db`       | `crates/types_db`       |
-| `hir`                | `crates/hir`            |
-
-Example: To run tests for the `elp_ide` crate:
-
-```bash
-cargo test -p elp_ide
-```
-
-Or to run tests in a specific directory:
-
-```bash
-cargo test --manifest-path crates/ide/Cargo.toml
-```
-
-### Existing tests
-
-- Do not change existing tests without asking
-
-## Documentation
-
-### Code Comments
-
-- Document complex algorithms and business logic
-- Explain WHY, not just WHAT the code does
-- Use `///` for public API documentation
-- Use `//` for internal implementation notes
-
-### Error Messages
-
-- Make error messages actionable and user-friendly
-- Include context about what was expected vs. what was found
-- Provide suggestions for fixing the issue when possible
-
-## Performance Considerations
-
-### Memory Usage
-
-- Use `Box<T>` for large enum variants to keep enum size small
-- Consider using `Cow<str>` for strings that might be borrowed or owned
-- Use `Arc<T>` for shared immutable data
-
-### Computation
-
-- Cache expensive computations using `lazy_static!` or `once_cell`
-- Use appropriate data structures (HashMap for lookups, Vec for sequences)
-- Profile code paths that handle large Erlang codebases
-
-## Integration Guidelines
-
-### Erlang Service Integration
-
-- Handle Erlang service errors gracefully
-- Use appropriate namespaces for different error sources
-- Maintain backward compatibility with existing error codes
-
-### IDE Integration
-
-- Provide rich diagnostic information (ranges, severity, fixes)
-- Support quick fixes and code actions where appropriate
-- Ensure diagnostics are fast enough for real-time feedback
-
-## Maintenance
-
-### Backward Compatibility
-
-- Don't change existing diagnostic codes or their meanings
-- Deprecate old codes before removing them
-- Maintain serialization compatibility for configuration files
-
-### Code Organization
-
-- Keep related functionality together in modules
-- Use clear module boundaries and public APIs
-- Minimize dependencies between modules
-
-### Version Management
-
-- Follow semantic versioning for public APIs
-- Document breaking changes in release notes
-- Provide migration guides for major changes
-
-## Common Patterns
-
-### Regex Usage
-
-- Use `lazy_static!` for compiled regexes
-- Prefer specific patterns over overly broad ones
-- Test regex patterns thoroughly with edge cases
-
-### Configuration
-
-- Support both code-based and label-based diagnostic references
-- Use serde for serialization/deserialization
-- Provide sensible defaults for all configuration options
-
-### Error Recovery
-
-- Continue processing after encountering errors when possible
-- Collect multiple errors rather than failing on the first one
-- Provide partial results when full analysis isn't possible
-
-### Process
-
-- Always run tests before finishing
-- Always run `cargo clippy --tests` before submitting PRs
-- Use `cargo fmt` for code formatting

From f4b93ec388531f8d068c5398080c04379295d10c Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 12 Nov 2025 06:30:58 -0800
Subject: [PATCH 261/394] Improve file watch logging destination

Summary: The temp directory location is not the same on all platforms.

Reviewed By: jcpetruzza

Differential Revision: D86679320

fbshipit-source-id: 39db19df4377798348ae81c87ffb9599e6f87334
---
 crates/elp/src/server/setup.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/crates/elp/src/server/setup.rs b/crates/elp/src/server/setup.rs
index 6dade5c677..8dba975e73 100644
--- a/crates/elp/src/server/setup.rs
+++ b/crates/elp/src/server/setup.rs
@@ -33,6 +33,7 @@ use super::FILE_WATCH_LOGGER_NAME;
 use super::logger::LspLogger;
 use crate::config::Config;
 use crate::from_json;
+// @fb-only
 use crate::server::Handle;
 use crate::server::LOGGER_NAME;
 use crate::server::Server;
@@ -125,8 +126,9 @@ impl ServerSetup {
 
         // Set up a logger for tracking down why we are seeing stale
         // results when branches are switched, as per T218973130
-        let log_dir = "/tmp/elp";
-        let _ = fs::create_dir_all(log_dir);
+        // @fb-only
+        let log_dir = format!("{}/elp", std::env::temp_dir().display()); // @oss-only
+        let _ = fs::create_dir_all(&log_dir);
         let log_file = format!(
             "{}/elp_file_watch_reports-{}.log",
             log_dir,

From 4486d66840a5645853ad553ca7a6cf9b2a879526 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Thu, 13 Nov 2025 03:14:38 -0800
Subject: [PATCH 262/394] Clarify tool usage for building and testing the
 project in elp_development.md

Summary: Clarify tool usage for building and testing the project in elp_development.md

Reviewed By: TD5

Differential Revision: D86951935

fbshipit-source-id: 972aea59d3050c258270bbb1694b968d83655858
---
 .llms/rules/elp_development.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/.llms/rules/elp_development.md b/.llms/rules/elp_development.md
index 713caf349a..0a024728a1 100644
--- a/.llms/rules/elp_development.md
+++ b/.llms/rules/elp_development.md
@@ -11,6 +11,27 @@ ELP (Erlang Language Platform) is a language server and development tools suite
 for Erlang, built in Rust. This project provides IDE features, diagnostics, and
 code analysis for Erlang codebases.
 
+## Build System
+
+Use standard Cargo commands:
+
+```bash
+# Build
+cargo build --release
+
+# Run tests
+cargo test --workspace
+
+# Run clippy
+cargo clippy --tests
+
+# Format code
+cargo fmt
+
+# Code generation
+cargo xtask codegen
+```
+
 ## Diagnostic Code Management
 
 ### Adding New Diagnostic Codes

From 395db3dda795f948082b88dc65e44fc11e752636 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 13 Nov 2025 06:33:43 -0800
Subject: [PATCH 263/394] Add `lists_reverse_append` linter

Summary:
Introduce a new linter which identifies usages of the following pattern:

```
lists:reverse(List) ++ Tail
```

Suggesting to replace them with the more performing:

```
lists:reverse(List, Tail)
```

Reviewed By: michalmuskala, alanz

Differential Revision: D86967410

fbshipit-source-id: cc5142aa9548a69792bb5ba9ff6698afbd38227c
---
 crates/ide/src/diagnostics.rs                 |   2 +
 .../src/diagnostics/lists_reverse_append.rs   | 187 ++++++++++++++++++
 crates/ide_db/src/diagnostic_code.rs          |   4 +
 website/docs/erlang-error-index/w/W0056.md    |  45 +++++
 4 files changed, 238 insertions(+)
 create mode 100644 crates/ide/src/diagnostics/lists_reverse_append.rs
 create mode 100644 website/docs/erlang-error-index/w/W0056.md

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 2078335dc3..e82fe79468 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -108,6 +108,7 @@ mod head_mismatch;
 mod inefficient_enumerate;
 mod inefficient_flatlength;
 mod inefficient_last;
+mod lists_reverse_append;
 mod macro_precedence_suprise;
 mod map_find_to_syntax;
 mod map_insertion_to_syntax;
@@ -1558,6 +1559,7 @@ const SSR_PATTERN_LINTERS: &[&dyn SsrPatternsDiagnostics] = &[
     &binary_string_to_sigil::LINTER,
     &unnecessary_map_to_list_in_comprehension::LINTER,
     &could_be_a_string_literal::LINTER,
+    &lists_reverse_append::LINTER,
 ];
 
 /// Generic linters
diff --git a/crates/ide/src/diagnostics/lists_reverse_append.rs b/crates/ide/src/diagnostics/lists_reverse_append.rs
new file mode 100644
index 0000000000..96743b6f28
--- /dev/null
+++ b/crates/ide/src/diagnostics/lists_reverse_append.rs
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is dual-licensed under either the MIT license found in the
+ * LICENSE-MIT file in the root directory of this source tree or the Apache
+ * License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+ * of this source tree. You may select, at your option, one of the
+ * above-listed licenses.
+ */
+
+//! Lint: lists_reverse_append
+//!
+//! Detect patterns of the form `lists:reverse(_@L) ++ _@T` and suggest `lists:reverse(_@L, _@T)`
+
+use elp_ide_assists::Assist;
+use elp_ide_db::DiagnosticCode;
+use elp_ide_db::elp_base_db::FileId;
+use elp_ide_db::source_change::SourceChangeBuilder;
+use hir::Semantic;
+
+use crate::diagnostics::Linter;
+use crate::diagnostics::SsrPatternsLinter;
+use crate::fix;
+
+pub(crate) struct ListsReverseAppendLinter;
+
+impl Linter for ListsReverseAppendLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::ListsReverseAppend
+    }
+
+    fn description(&self) -> &'static str {
+        "Use `lists:reverse/2` instead of `lists:reverse/1 ++ Tail` for better performance."
+    }
+}
+
+impl SsrPatternsLinter for ListsReverseAppendLinter {
+    type Context = ();
+
+    fn patterns(&self) -> Vec<(String, Self::Context)> {
+        vec![(format!("ssr: lists:reverse({LIST_VAR}) ++ {TAIL_VAR}."), ())]
+    }
+
+    fn fixes(
+        &self,
+        _context: &Self::Context,
+        matched: &elp_ide_ssr::Match,
+        sema: &Semantic,
+        _file_id: FileId,
+    ) -> Option<Vec<Assist>> {
+        let list_match = matched.placeholder_text(sema, LIST_VAR)?;
+        let tail_match = matched.placeholder_text(sema, TAIL_VAR)?;
+        let mut builder = SourceChangeBuilder::new(matched.range.file_id);
+        let replacement = format!("lists:reverse({list_match}, {tail_match})");
+        let range = matched.range.range;
+        builder.replace(range, replacement);
+        let fixes = vec![fix(
+            "lists_reverse_append",
+            "Use lists:reverse/2",
+            builder.finish(),
+            range,
+        )];
+        Some(fixes)
+    }
+}
+
+pub(crate) static LINTER: ListsReverseAppendLinter = ListsReverseAppendLinter;
+
+static LIST_VAR: &str = "_@L";
+static TAIL_VAR: &str = "_@T";
+
+#[cfg(test)]
+mod tests {
+
+    use expect_test::Expect;
+    use expect_test::expect;
+
+    use crate::diagnostics::Diagnostic;
+    use crate::diagnostics::DiagnosticCode;
+    use crate::tests;
+
+    fn filter(d: &Diagnostic) -> bool {
+        d.code == DiagnosticCode::ListsReverseAppend
+    }
+
+    #[track_caller]
+    fn check_diagnostics(fixture: &str) {
+        tests::check_filtered_diagnostics(fixture, &filter)
+    }
+
+    #[track_caller]
+    fn check_fix(fixture_before: &str, fixture_after: Expect) {
+        tests::check_fix(fixture_before, fixture_after)
+    }
+
+    #[test]
+    fn detects_lists_reverse_append() {
+        check_diagnostics(
+            r#"
+        //- /src/lists_reverse_append.erl
+        -module(lists_reverse_append).
+
+        reverse_and_append(List, Tail) ->
+            lists:reverse(List) ++ Tail.
+        %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0056: Use `lists:reverse/2` instead of `lists:reverse/1 ++ Tail` for better performance.
+           "#,
+        )
+    }
+
+    #[test]
+    fn detects_lists_reverse_append_with_variables() {
+        check_diagnostics(
+            r#"
+        //- /src/lists_reverse_append.erl
+        -module(lists_reverse_append).
+
+        process(Items, Acc) ->
+            lists:reverse(Items) ++ Acc.
+        %%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0056: Use `lists:reverse/2` instead of `lists:reverse/1 ++ Tail` for better performance.
+           "#,
+        )
+    }
+
+    #[test]
+    fn ignores_regular_reverse() {
+        check_diagnostics(
+            r#"
+        //- /src/lists_reverse_append.erl
+        -module(lists_reverse_append).
+
+        reverse_only(List) ->
+            lists:reverse(List).
+           "#,
+        )
+    }
+
+    #[test]
+    fn ignores_regular_append() {
+        check_diagnostics(
+            r#"
+        //- /src/lists_reverse_append.erl
+        -module(lists_reverse_append).
+
+        append_only(A, B) ->
+            A ++ B.
+           "#,
+        )
+    }
+
+    #[test]
+    fn fixes_lists_reverse_append() {
+        check_fix(
+            r#"
+        //- /src/lists_reverse_append.erl
+        -module(lists_reverse_append).
+
+        reverse_and_append(List, Tail) ->
+            lists:re~verse(List) ++ Tail.
+           "#,
+            expect![[r#"
+        -module(lists_reverse_append).
+
+        reverse_and_append(List, Tail) ->
+            lists:reverse(List, Tail).
+           "#]],
+        )
+    }
+
+    #[test]
+    fn fixes_lists_reverse_append_with_complex_expressions() {
+        check_fix(
+            r#"
+        //- /src/lists_reverse_append.erl
+        -module(lists_reverse_append).
+
+        process([H|T], Acc) ->
+            lists:rev~erse([H|T]) ++ [1, 2, 3].
+           "#,
+            expect![[r#"
+        -module(lists_reverse_append).
+
+        process([H|T], Acc) ->
+            lists:reverse([H|T], [1, 2, 3]).
+           "#]],
+        )
+    }
+}
diff --git a/crates/ide_db/src/diagnostic_code.rs b/crates/ide_db/src/diagnostic_code.rs
index d3e73636bd..860d61befa 100644
--- a/crates/ide_db/src/diagnostic_code.rs
+++ b/crates/ide_db/src/diagnostic_code.rs
@@ -89,6 +89,7 @@ pub enum DiagnosticCode {
     NoErrorLogger,
     NoNoWarnSuppressions,
     CouldBeAStringLiteral,
+    ListsReverseAppend,
 
     // Wrapper for erlang service diagnostic codes
     ErlangService(String),
@@ -248,6 +249,7 @@ impl DiagnosticCode {
             DiagnosticCode::NoErrorLogger => "W0053".to_string(),
             DiagnosticCode::NoNoWarnSuppressions => "W0054".to_string(),
             DiagnosticCode::CouldBeAStringLiteral => "W0055".to_string(),
+            DiagnosticCode::ListsReverseAppend => "W0056".to_string(),
             DiagnosticCode::ErlangService(c) => c.to_string(),
             DiagnosticCode::Eqwalizer(c) => format!("eqwalizer: {c}"),
             DiagnosticCode::AdHoc(c) => format!("ad-hoc: {c}"),
@@ -344,6 +346,7 @@ impl DiagnosticCode {
             DiagnosticCode::NoErrorLogger => "no_error_logger".to_string(),
             DiagnosticCode::NoNoWarnSuppressions => "no_nowarn_suppressions".to_string(),
             DiagnosticCode::CouldBeAStringLiteral => "could_be_a_binary_string_literal".to_string(),
+            DiagnosticCode::ListsReverseAppend => "lists_reverse_append".to_string(),
 
             DiagnosticCode::ErlangService(c) => c.to_string(),
             DiagnosticCode::Eqwalizer(c) => c.to_string(),
@@ -520,6 +523,7 @@ impl DiagnosticCode {
             DiagnosticCode::NoCatch => false,
             DiagnosticCode::NoErrorLogger => false,
             DiagnosticCode::NoNoWarnSuppressions => false,
+            DiagnosticCode::ListsReverseAppend => false,
 
             DiagnosticCode::BinaryStringToSigil => false,
             DiagnosticCode::ErlangService(_) => false,
diff --git a/website/docs/erlang-error-index/w/W0056.md b/website/docs/erlang-error-index/w/W0056.md
new file mode 100644
index 0000000000..14848f5898
--- /dev/null
+++ b/website/docs/erlang-error-index/w/W0056.md
@@ -0,0 +1,45 @@
+---
+sidebar_position: 56
+---
+
+# W0056 - Use `lists:reverse/2` instead of `lists:reverse/1 ++ Tail`
+
+## Warning
+
+```erlang
+reverse_and_append(List, Tail) ->
+    lists:reverse(List) ++ Tail.
+%%  ^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0056: Use `lists:reverse/2` instead of `lists:reverse/1 ++ Tail` for better performance.
+```
+
+## Explanation
+
+The warning indicates that you are using the pattern `lists:reverse(List) ++ Tail`, which is inefficient. This pattern first reverses the list, creating an intermediate reversed list, and then appends the tail to it using the `++` operator.
+
+The Erlang standard library provides a more efficient function `lists:reverse/2` that performs both operations in a single pass without creating the intermediate reversed list.
+
+### Why This Matters
+
+- **Performance**: Using `lists:reverse/1` followed by `++` creates an unnecessary intermediate data structure
+- **Memory**: The intermediate reversed list consumes additional memory that is immediately discarded
+- **Idiomatic Erlang**: `lists:reverse/2` is the idiomatic way to reverse and prepend in Erlang
+
+### Fix
+
+Replace the pattern with `lists:reverse/2`:
+
+```erlang
+reverse_and_append(List, Tail) ->
+    lists:reverse(List, Tail).
+```
+
+### How lists:reverse/2 Works
+
+The second argument to `lists:reverse/2` acts as an accumulator that gets prepended to the reversed list:
+
+```erlang
+lists:reverse([1, 2, 3], [4, 5, 6]).
+% Returns: [3, 2, 1, 4, 5, 6]
+```
+
+This is equivalent to `lists:reverse([1, 2, 3]) ++ [4, 5, 6]` but significantly more efficient.

From f050c6c671603d80144f26f1babc8cdfdfd27eb0 Mon Sep 17 00:00:00 2001
From: Tom Davies <tomdavies@meta.com>
Date: Thu, 13 Nov 2025 07:23:15 -0800
Subject: [PATCH 264/394] Support calls to lists:nth/2

Summary:
Fixes a query as to why we report on `hd(lists:reverse(L))`, but not `lists:nth(1, lists:reverse(L))`.

For the purposes of this diagnostic, `lists:nth(1, lists:reverse(L))` is equivalent to `hd(lists:reverse(L))`, so we trigger on that too.

Reviewed By: alanz

Differential Revision: D86969766

fbshipit-source-id: e6a022a10267d04c6700b3ee5fc9fa31a02b75ac
---
 .../ide/src/diagnostics/inefficient_last.rs   | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/crates/ide/src/diagnostics/inefficient_last.rs b/crates/ide/src/diagnostics/inefficient_last.rs
index 5c1f6af896..c120d7ca7f 100644
--- a/crates/ide/src/diagnostics/inefficient_last.rs
+++ b/crates/ide/src/diagnostics/inefficient_last.rs
@@ -38,6 +38,7 @@ pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
     },
     checker: &|acc, sema, file_id, _ext| {
         inefficient_last_hd_ssr(acc, sema, file_id);
+        inefficient_last_nth_ssr(acc, sema, file_id);
         inefficient_last_pat_ssr(acc, sema, file_id);
     },
 };
@@ -62,6 +63,24 @@ fn inefficient_last_hd_ssr(diags: &mut Vec<Diagnostic>, sema: &Semantic, file_id
     });
 }
 
+// lists:nth(1, L) is functionally equivalent to hd(L)
+fn inefficient_last_nth_ssr(diags: &mut Vec<Diagnostic>, sema: &Semantic, file_id: FileId) {
+    let matches = match_pattern_in_file_functions(
+        sema,
+        Strategy {
+            macros: MacroStrategy::Expand,
+            parens: ParenStrategy::InvisibleParens,
+        },
+        file_id,
+        format!("ssr: lists:nth(1, lists:reverse({LIST_VAR})).").as_str(),
+    );
+    matches.matches.iter().for_each(|m| {
+        if let Some(diagnostic) = make_diagnostic_hd(sema, file_id, m) {
+            diags.push(diagnostic)
+        }
+    });
+}
+
 fn inefficient_last_pat_ssr(diags: &mut Vec<Diagnostic>, sema: &Semantic, file_id: FileId) {
     let matches = match_pattern_in_file_functions(
         sema,
@@ -248,4 +267,50 @@ mod tests {
             "#]],
         )
     }
+
+    #[test]
+    fn ignores_inefficient_last_via_nth_when_index_is_not_one() {
+        check_diagnostics(
+            r#"
+         //- /src/inefficient_last.erl
+         -module(inefficient_last).
+
+         % elp:ignore W0017 (undefined_function)
+         fn(List) -> lists:nth(3, lists:reverse(List)).
+            "#,
+        )
+    }
+
+    #[test]
+    fn detects_inefficient_last_via_nth() {
+        check_diagnostics(
+            r#"
+         //- /src/inefficient_last.erl
+         -module(inefficient_last).
+
+         % elp:ignore W0017 (undefined_function)
+         fn(List) -> lists:nth(1, lists:reverse(List)).
+         %%          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0029: Unnecessary intermediate reverse list allocated.
+            "#,
+        )
+    }
+
+    #[test]
+    fn fixes_inefficient_last_via_nth() {
+        check_fix(
+            r#"
+         //- /src/inefficient_last.erl
+         -module(inefficient_last).
+
+         % elp:ignore W0017 (undefined_function)
+         fn(List) -> lists:nth(1, lists:re~verse(List)).
+            "#,
+            expect![[r#"
+         -module(inefficient_last).
+
+         % elp:ignore W0017 (undefined_function)
+         fn(List) -> lists:last(List).
+            "#]],
+        )
+    }
 }

From 59ec8ab04251314e1bf8e06a95c2c58dd3e60064 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 14 Nov 2025 04:01:31 -0800
Subject: [PATCH 265/394] 1/n: includes: add not-yet-failing test case for
 nested include buck targets

Summary:
This diff sets up a test case to demonstrate a problem which will be fixed by this stack, as it is currently silently ignored.

As such, there is no failure reported in the test. That will change later in the stack.

It is possible to configure a buck2 project with nested include files so that it compiles with buck2, and also with our erlang_service, but that we are unable to properly lower it into HIR and so do not resolve macros in ELP.

This occurs when we have three buck2 targets, A,B,C each in a separate directory.
- A has both B and C as dependencies, but
- B does not have C as one.

Then
- target A contains a .erl file that includes a .hrl from target B
- the .hrl in target B includes a .hrl from target C

So from A we can resolve the entire chain of includes via dependencies, but from B we cannot.

And ELP lowers the file into HIR for B in the context of B, so does not resolve the include at C, and silently fails to do so, entering a `Expr::Missing` value instead.

Reviewed By: TD5

Differential Revision: D86963334

fbshipit-source-id: 57b51714513fc78cd21083adea6abd12a9350571
---
 .../buck_tests_2/resolves_generated_includes.stdout  |  4 +++-
 test_projects/buck_tests_2/.elp.toml                 |  5 ++++-
 .../buck_tests_2/check_include/src/top_includer.erl  | 12 ++++++++++++
 .../include/top_includer.hrl                         |  4 ++++
 .../include/separate_include.hrl                     |  2 ++
 5 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 test_projects/buck_tests_2/check_include/src/top_includer.erl
 create mode 100644 test_projects/buck_tests_2/check_include_separate_1/include/top_includer.hrl
 create mode 100644 test_projects/buck_tests_2/check_include_separate_2/include/separate_include.hrl

diff --git a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
index 7787c17575..295a51e424 100644
--- a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
+++ b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
@@ -1,5 +1,5 @@
 Reporting all diagnostics codes
-Diagnostics reported in 4 modules:
+Diagnostics reported in 5 modules:
   app_a: 3
       0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
       5:9-5:31::[WeakWarning] [W0037] Unspecific include.
@@ -9,6 +9,8 @@ Diagnostics reported in 4 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: 1
+      0:8-0:20::[WeakWarning] [W0046] The module is not documented.
   wa_buck2_module_search: 6
       19:0-19:18::[WeakWarning] [W0040] The function is non-trivial, exported, but not documented.
       2:8-2:30::[WeakWarning] [W0046] The module is not documented.
diff --git a/test_projects/buck_tests_2/.elp.toml b/test_projects/buck_tests_2/.elp.toml
index 4ea681809f..35f02a72f3 100644
--- a/test_projects/buck_tests_2/.elp.toml
+++ b/test_projects/buck_tests_2/.elp.toml
@@ -1,7 +1,10 @@
 [buck]
 enabled = true
 build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test_projects/buck_tests_2/util/app_a/..." ]
+included_targets = [
+    "fbcode//whatsapp/elp/test_projects/buck_tests_2/util/app_a/...",
+    "fbcode//whatsapp/elp/test_projects/buck_tests_2:check_include"
+    ]
 excluded_targets = [ "fbcode//whatsapp/elp/test_projects/buck_tests_2:test_elp_ignored" ]
 source_root = "whatsapp/elp/test_projects/buck_tests_2"
 
diff --git a/test_projects/buck_tests_2/check_include/src/top_includer.erl b/test_projects/buck_tests_2/check_include/src/top_includer.erl
new file mode 100644
index 0000000000..4893314930
--- /dev/null
+++ b/test_projects/buck_tests_2/check_include/src/top_includer.erl
@@ -0,0 +1,12 @@
+-module(top_includer).
+
+-compile(warn_missing_spec_all).
+
+-export([foo/0]).
+
+-include_lib("check_include_separate_1/include/top_includer.hrl").
+
+-spec foo() -> ok.
+foo() ->
+    ?FIRST,
+    ?SECOND.
diff --git a/test_projects/buck_tests_2/check_include_separate_1/include/top_includer.hrl b/test_projects/buck_tests_2/check_include_separate_1/include/top_includer.hrl
new file mode 100644
index 0000000000..c117baed75
--- /dev/null
+++ b/test_projects/buck_tests_2/check_include_separate_1/include/top_includer.hrl
@@ -0,0 +1,4 @@
+
+-include_lib("check_include_separate_2/include/separate_include.hrl").
+
+-define(FIRST, 1).
diff --git a/test_projects/buck_tests_2/check_include_separate_2/include/separate_include.hrl b/test_projects/buck_tests_2/check_include_separate_2/include/separate_include.hrl
new file mode 100644
index 0000000000..1e0c48bf56
--- /dev/null
+++ b/test_projects/buck_tests_2/check_include_separate_2/include/separate_include.hrl
@@ -0,0 +1,2 @@
+
+-define(SECOND, ok).

From 6fe7f108a168ad5c9093368a889c01aa80a06131 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 14 Nov 2025 04:01:31 -0800
Subject: [PATCH 266/394] 2/n: includes: record macro expansion failures when
 lowering to HIR

Summary:
Record failed macro expansions when lowering to HIR.

We track them in the `BodySourceMap`, as we need to report based on `ast` locations.

Later diffs in this stack will turn them into ide Diagnostics, but that type is not available here because HIR is a leaf in the crate graph.

Reviewed By: TD5

Differential Revision: D86963333

fbshipit-source-id: 6f9afecbb10f6a2c999689e007f735f0bafbdf43
---
 .../resolves_generated_includes.stdout        |  6 ++-
 crates/hir/src/body.rs                        | 20 ++++++++++
 crates/hir/src/body/lower.rs                  | 39 +++++++++++++++++--
 crates/hir/src/lib.rs                         |  2 +
 .../check_include/src/top_includer.erl        |  4 +-
 5 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
index 295a51e424..5f1a5b09f4 100644
--- a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
+++ b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
@@ -9,8 +9,12 @@ 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: 1
+  top_includer: 5
+      9:0-9:3::[WeakWarning] [W0040] The function is non-trivial, exported, but not documented.
       0:8-0:20::[WeakWarning] [W0046] The module is not documented.
+      12:4-12:10::[Error] [E1508] undefined macro 'THIRD/2'
+      4:9-4:14::[Error] [L1227] function foo/0 undefined
+      8:6-8:9::[Error] [L1308] spec for undefined function foo/0
   wa_buck2_module_search: 6
       19:0-19:18::[WeakWarning] [W0040] The function is non-trivial, exported, but not documented.
       2:8-2:30::[WeakWarning] [W0046] The module is not documented.
diff --git a/crates/hir/src/body.rs b/crates/hir/src/body.rs
index 2f4968b7ba..0252a44ee1 100644
--- a/crates/hir/src/body.rs
+++ b/crates/hir/src/body.rs
@@ -1155,6 +1155,21 @@ pub type ExprSource = InFileAstPtr<ast::Expr>;
 
 pub type MacroSource = InFileAstPtr<ast::MacroCallExpr>;
 
+/// Lightweight diagnostic for body lowering
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct BodyDiagnostic {
+    /// Location of the problematic construct
+    pub source: MacroSource,
+    /// Type of diagnostic
+    pub kind: BodyDiagnosticKind,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum BodyDiagnosticKind {
+    /// Macro failed to expand/resolve
+    UnresolvedMacro,
+}
+
 #[derive(Clone, PartialEq, Eq, Debug, Hash)]
 pub struct InFileAstPtr<T>(InFile<AstPtr<T>>)
 where
@@ -1231,6 +1246,7 @@ pub struct BodySourceMap {
     term_map: FxHashMap<ExprSource, TermId>,
     term_map_back: ArenaMap<TermId, ExprSource>,
     macro_map: FxHashMap<MacroSource, ResolvedMacro>,
+    diagnostics: Vec<BodyDiagnostic>,
 }
 
 impl BodySourceMap {
@@ -1292,6 +1308,10 @@ impl BodySourceMap {
             .get(&InFileAstPtr::from_infile(call))
             .copied()
     }
+
+    pub fn diagnostics(&self) -> &[BodyDiagnostic] {
+        &self.diagnostics
+    }
 }
 
 #[cfg(test)]
diff --git a/crates/hir/src/body/lower.rs b/crates/hir/src/body/lower.rs
index 85c3378930..7408ece032 100644
--- a/crates/hir/src/body/lower.rs
+++ b/crates/hir/src/body/lower.rs
@@ -38,6 +38,8 @@ use crate::AttributeBody;
 use crate::BasedInteger;
 use crate::BinarySeg;
 use crate::Body;
+use crate::BodyDiagnostic;
+use crate::BodyDiagnosticKind;
 use crate::BodySourceMap;
 use crate::CRClause;
 use crate::CallTarget;
@@ -116,6 +118,8 @@ pub struct Ctx<'a> {
     // This means we need to lower a Var specially when processing a SSR
     // template, where if it has a prefix of `_@` it is a placeholder.
     in_ssr: bool,
+    // Diagnostics collected during body lowering
+    diagnostics: Vec<BodyDiagnostic>,
 }
 
 #[derive(Debug)]
@@ -152,6 +156,7 @@ impl<'a> Ctx<'a> {
             starting_stack_size: 1,
             macro_source_map: FxHashMap::default(),
             in_ssr: false,
+            diagnostics: Vec::new(),
         }
     }
 
@@ -216,6 +221,7 @@ impl<'a> Ctx<'a> {
 
         assert!(self.body.origin.is_valid());
         self.body.shrink_to_fit();
+        self.source_map.diagnostics = self.diagnostics;
         (Arc::new(self.body), self.source_map)
     }
 
@@ -812,6 +818,9 @@ impl<'a> Ctx<'a> {
                     )
                 })
                 .unwrap_or_else(|| {
+                    // Record diagnostic for unresolved macro
+                    self.record_unresolved_macro(call);
+
                     let expansion = self.alloc_pat(Pat::Missing, Some(expr));
                     let args = call
                         .args()
@@ -1169,6 +1178,9 @@ impl<'a> Ctx<'a> {
                 })
                 .flatten()
                 .unwrap_or_else(|| {
+                    // Record diagnostic for unresolved macro
+                    self.record_unresolved_macro(call);
+
                     call.args()
                         .iter()
                         .flat_map(|args| args.args())
@@ -1400,8 +1412,8 @@ impl<'a> Ctx<'a> {
                 let exprs = self.lower_lc_exprs(lc.lc_exprs());
                 self.alloc_expr(Expr::Comprehension { builder, exprs }, Some(expr))
             }
-            ast::ExprMax::MacroCallExpr(call) => self
-                .resolve_macro(call, |this, source, replacement| match replacement {
+            ast::ExprMax::MacroCallExpr(call) => {
+                self.resolve_macro(call, |this, source, replacement| match replacement {
                     MacroReplacement::BuiltIn(built_in) => {
                         this.lower_built_in_macro(built_in).map(|literal| {
                             let expr_id = this.alloc_expr(Expr::Literal(literal), None);
@@ -1464,6 +1476,9 @@ impl<'a> Ctx<'a> {
                     )
                 })
                 .unwrap_or_else(|| {
+                    // Record diagnostic for unresolved macro
+                    self.record_unresolved_macro(call);
+
                     let expansion = self.alloc_expr(Expr::Missing, Some(expr));
                     let args = call
                         .args()
@@ -1480,7 +1495,8 @@ impl<'a> Ctx<'a> {
                         },
                         Some(expr),
                     )
-                }),
+                })
+            }
             ast::ExprMax::MacroString(_) => self.alloc_expr(Expr::Missing, Some(expr)),
             ast::ExprMax::ParenExpr(paren_expr) => {
                 if let Some(inner_expr) = paren_expr.expr() {
@@ -1990,6 +2006,9 @@ impl<'a> Ctx<'a> {
                 })
                 .flatten()
                 .unwrap_or_else(|| {
+                    // Record diagnostic for unresolved macro
+                    self.record_unresolved_macro(call);
+
                     call.args()
                         .iter()
                         .flat_map(|args| args.args())
@@ -2170,6 +2189,9 @@ impl<'a> Ctx<'a> {
                     )
                 })
                 .unwrap_or_else(|| {
+                    // Record diagnostic for unresolved macro
+                    self.record_unresolved_macro(call);
+
                     let expansion = self.alloc_type_expr(TypeExpr::Missing, Some(expr));
                     let args = call
                         .args()
@@ -2536,6 +2558,9 @@ impl<'a> Ctx<'a> {
                     )
                 })
                 .unwrap_or_else(|| {
+                    // Record diagnostic for unresolved macro
+                    self.record_unresolved_macro(call);
+
                     let expansion = self.alloc_term(Term::Missing, Some(expr));
                     let args = call
                         .args()
@@ -2997,6 +3022,14 @@ impl<'a> Ctx<'a> {
         self.macro_source_map.insert(name, source);
     }
 
+    fn record_unresolved_macro(&mut self, call: &ast::MacroCallExpr) {
+        let source = InFileAstPtr::new(self.curr_file_id(), AstPtr::new(call).cast().unwrap());
+        self.diagnostics.push(BodyDiagnostic {
+            source,
+            kind: BodyDiagnosticKind::UnresolvedMacro,
+        });
+    }
+
     fn curr_file_id(&self) -> FileId {
         self.macro_stack[self.macro_stack_id].file_id
     }
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 11d4b40971..9f51b0d70f 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -35,6 +35,8 @@ mod test_db;
 pub use body::AnyAttribute;
 pub use body::AttributeBody;
 pub use body::Body;
+pub use body::BodyDiagnostic;
+pub use body::BodyDiagnosticKind;
 pub use body::BodyOrigin;
 pub use body::BodySourceMap;
 pub use body::DefineBody;
diff --git a/test_projects/buck_tests_2/check_include/src/top_includer.erl b/test_projects/buck_tests_2/check_include/src/top_includer.erl
index 4893314930..ebe984a0df 100644
--- a/test_projects/buck_tests_2/check_include/src/top_includer.erl
+++ b/test_projects/buck_tests_2/check_include/src/top_includer.erl
@@ -9,4 +9,6 @@
 -spec foo() -> ok.
 foo() ->
     ?FIRST,
-    ?SECOND.
+    ?SECOND,
+    ?THIRD(41,34),
+    ?FUNCTION_NAME.

From 42ef1d19242cb553a3b634aa4750ad3f73a33851 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 14 Nov 2025 04:01:31 -0800
Subject: [PATCH 267/394] 3/n: includes: convert HIR diagnostics into ide
 Diagnostic W0057

Summary:
Create a new diagnostic W0057 (hir_unresolved_macro) to report macros not resolved during HIR lowering.

For a properly configured buck2 project this simply shadows the existing Erlang service `E1507` / `E1508` diagnostics, but for an incorrectly configured one they show up alone.

The next diff filters them out if they are already reported.

It also ensures it does not report on usages of `?FUNCTION_NAME` or ?FUNCTION_ARITY` in the replacement part of a `-define()` attribute.

Reviewed By: TD5

Differential Revision: D86963336

fbshipit-source-id: 08f8d1b6c58dde6ee0a106f9151b237709dc56e0
---
 .../resolves_generated_includes.stdout        |   6 +-
 .../include_lib_non_dependency_fails.stdout   |   3 +-
 .../include_lib_non_dependency_rebar.stdout   |   3 +-
 crates/hir/src/body/lower.rs                  |  16 ++
 crates/ide/src/diagnostics.rs                 | 158 ++++++++++++++++++
 crates/ide/src/diagnostics/unused_macro.rs    |   4 +-
 crates/ide/src/tests.rs                       |   4 +-
 crates/ide_db/src/diagnostic_code.rs          |   4 +
 .../check_include/src/top_includer.erl        |   6 +-
 website/docs/erlang-error-index/w/W0057.md    | 106 ++++++++++++
 10 files changed, 299 insertions(+), 11 deletions(-)
 create mode 100644 website/docs/erlang-error-index/w/W0057.md

diff --git a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
index 5f1a5b09f4..8ca4ec00a2 100644
--- a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
+++ b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
@@ -9,12 +9,10 @@ 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: 5
-      9:0-9:3::[WeakWarning] [W0040] The function is non-trivial, exported, but not documented.
+  top_includer: 3
+      12:4-12:10::[Warning] [W0057] undefined macro 'THIRD/2'
       0:8-0:20::[WeakWarning] [W0046] The module is not documented.
       12:4-12:10::[Error] [E1508] undefined macro 'THIRD/2'
-      4:9-4:14::[Error] [L1227] function foo/0 undefined
-      8:6-8:9::[Error] [L1308] spec for undefined function foo/0
   wa_buck2_module_search: 6
       19:0-19:18::[WeakWarning] [W0040] The function is non-trivial, exported, but not documented.
       2:8-2:30::[WeakWarning] [W0046] The module is not documented.
diff --git a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout
index c0fe03edea..33dc4b534a 100644
--- a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout
+++ b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout
@@ -1,8 +1,9 @@
 module specified: main_app
 Diagnostics reported in 1 modules:
-  main_app: 5
+  main_app: 6
       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'
diff --git a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout
index 513197d889..dceea92cf3 100644
--- a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout
+++ b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout
@@ -1,7 +1,8 @@
 module specified: main_app
 Diagnostics reported in 1 modules:
-  main_app: 4
+  main_app: 5
       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'
diff --git a/crates/hir/src/body/lower.rs b/crates/hir/src/body/lower.rs
index 7408ece032..ae7236754b 100644
--- a/crates/hir/src/body/lower.rs
+++ b/crates/hir/src/body/lower.rs
@@ -118,6 +118,8 @@ pub struct Ctx<'a> {
     // This means we need to lower a Var specially when processing a SSR
     // template, where if it has a prefix of `_@` it is a placeholder.
     in_ssr: bool,
+    // Track when we're lowering the RHS of a define preprocessor directive
+    in_macro_rhs: bool,
     // Diagnostics collected during body lowering
     diagnostics: Vec<BodyDiagnostic>,
 }
@@ -156,6 +158,7 @@ impl<'a> Ctx<'a> {
             starting_stack_size: 1,
             macro_source_map: FxHashMap::default(),
             in_ssr: false,
+            in_macro_rhs: false,
             diagnostics: Vec::new(),
         }
     }
@@ -407,7 +410,9 @@ impl<'a> Ctx<'a> {
         let replacement = define.replacement();
         match replacement {
             Some(MacroDefReplacement::Expr(expr)) => {
+                self.in_macro_rhs = true;
                 let expr = self.lower_expr(&expr);
+                self.in_macro_rhs = false;
                 let (body, source_map) = self.finish();
                 (DefineBody { body, expr }, source_map)
             }
@@ -3023,6 +3028,17 @@ impl<'a> Ctx<'a> {
     }
 
     fn record_unresolved_macro(&mut self, call: &ast::MacroCallExpr) {
+        // If we're in a macro RHS and this is ?FUNCTION_NAME or ?FUNCTION_ARITY, skip the diagnostic
+        if self.in_macro_rhs {
+            let macro_name = self.macro_call_name(call.name());
+            if let MacroCallName::Var(var) = macro_name {
+                let name_str = var.as_string(self.db.upcast());
+                if name_str == "FUNCTION_NAME" || name_str == "FUNCTION_ARITY" {
+                    return;
+                }
+            }
+        }
+
         let source = InFileAstPtr::new(self.curr_file_id(), AstPtr::new(call).cast().unwrap());
         self.diagnostics.push(BodyDiagnostic {
             source,
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index e82fe79468..9621ab85d6 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -67,7 +67,9 @@ use elp_text_edit::TextEdit;
 use elp_types_db::TypedSemantic;
 use fxhash::FxHashMap;
 use fxhash::FxHashSet;
+use hir::FormIdx;
 use hir::InFile;
+use hir::PPDirective;
 use hir::Semantic;
 use hir::db::DefDatabase;
 use hir::fold::MacroStrategy;
@@ -1400,6 +1402,7 @@ pub fn native_diagnostics(
         }
 
         res.append(&mut form_missing_separator_diagnostics(&parse));
+        res.extend(get_hir_diagnostics(db, file_id));
 
         adhoc_semantic_diagnostics
             .iter()
@@ -1743,6 +1746,143 @@ pub fn filter_diagnostics(diagnostics: Vec<Diagnostic>, code: DiagnosticCode) ->
     diagnostics.into_iter().filter(|d| d.code == code).collect()
 }
 
+/// Retrieve all BodyDiagnostic values from the BodySourceMaps from lowering
+/// all the bodies for a given FileId.
+///
+/// This function iterates through all forms in the file and collects diagnostics
+/// from the BodySourceMaps associated with each form's body.
+pub fn collect_body_diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<hir::BodyDiagnostic> {
+    let sema = Semantic::new(db);
+    let form_list = sema.form_list(file_id);
+    let mut diagnostics = Vec::new();
+
+    for form_idx in form_list.forms().iter() {
+        let body_map = match form_idx {
+            FormIdx::FunctionClause(function_clause_id) => {
+                let (_, body_map) = sema
+                    .db
+                    .function_clause_body_with_source(InFile::new(file_id, *function_clause_id));
+                Some(body_map)
+            }
+            FormIdx::TypeAlias(type_alias_id) => {
+                let (_, body_map) = sema
+                    .db
+                    .type_body_with_source(InFile::new(file_id, *type_alias_id));
+                Some(body_map)
+            }
+            FormIdx::Spec(spec_id) => {
+                let (_, body_map) = sema
+                    .db
+                    .spec_body_with_source(InFile::new(file_id, *spec_id));
+                Some(body_map)
+            }
+            FormIdx::Callback(callback_id) => {
+                let (_, body_map) = sema
+                    .db
+                    .callback_body_with_source(InFile::new(file_id, *callback_id));
+                Some(body_map)
+            }
+            FormIdx::Record(record_id) => {
+                let (_, body_map) = sema
+                    .db
+                    .record_body_with_source(InFile::new(file_id, *record_id));
+                Some(body_map)
+            }
+            FormIdx::Attribute(attribute_id) => {
+                let (_, body_map) = sema
+                    .db
+                    .attribute_body_with_source(InFile::new(file_id, *attribute_id));
+                Some(body_map)
+            }
+            FormIdx::CompileOption(compile_option_id) => {
+                let (_, body_map) = sema
+                    .db
+                    .compile_body_with_source(InFile::new(file_id, *compile_option_id));
+                Some(body_map)
+            }
+            FormIdx::PPDirective(idx) => {
+                if let PPDirective::Define(define_id) = &form_list[*idx] {
+                    let (_, body_map) = sema
+                        .db
+                        .define_body_with_source(InFile::new(file_id, *define_id));
+                    Some(body_map)
+                } else {
+                    None
+                }
+            }
+            _ => None,
+        };
+
+        if let Some(body_map) = body_map {
+            diagnostics.extend_from_slice(body_map.diagnostics());
+        }
+    }
+
+    diagnostics
+}
+
+/// Convert HIR body diagnostics to IDE Diagnostics.
+/// This function takes the diagnostics collected during HIR lowering and converts
+/// them to the IDE Diagnostic format for display to users.
+pub fn get_hir_diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<Diagnostic> {
+    let body_diagnostics = collect_body_diagnostics(db, file_id);
+
+    body_diagnostics
+        .into_iter()
+        .filter_map(|body_diag| {
+            let full_range = body_diag.source.range();
+
+            // Only include diagnostics for the requested file
+            if full_range.file_id != file_id {
+                return None;
+            }
+
+            let (code, message, range) = match body_diag.kind {
+                hir::BodyDiagnosticKind::UnresolvedMacro => {
+                    // Get the macro call AST node to extract name and arity
+                    let macro_call = body_diag.source.to_ast(db);
+                    let macro_name = macro_call
+                        .name()
+                        .map(|name| name.to_string())
+                        .unwrap_or_else(|| "?".to_string());
+
+                    let message = match macro_call.arity() {
+                        Some(arity) => format!("undefined macro '{}/{}'", macro_name, arity),
+                        None => format!("undefined macro '{}'", macro_name),
+                    };
+
+                    // For macros with arguments, only highlight the name part, not the full call
+                    let range = macro_call
+                        .name()
+                        .map(|name| {
+                            // Get the syntax range of just the macro name
+                            let name_range = name.syntax().text_range();
+                            // Include the '?' prefix by extending one character to the left
+                            if name_range.start() > 0.into() {
+                                TextRange::new(
+                                    name_range.start() - TextSize::from(1),
+                                    name_range.end(),
+                                )
+                            } else {
+                                name_range
+                            }
+                        })
+                        .unwrap_or(full_range.range);
+
+                    (DiagnosticCode::HirUnresolvedMacro, message, range)
+                }
+            };
+
+            Some(
+                Diagnostic::new(code, message, range)
+                    // We set the severity to Warning for now, until we have cleaned
+                    // up the code base from this diagnostic
+                    .with_severity(Severity::Warning),
+            )
+        })
+        .collect()
+}
+
 fn no_module_definition_diagnostic(
     diagnostics: &mut Vec<Diagnostic>,
     parse: &Parse<ast::SourceFile>,
@@ -3750,4 +3890,22 @@ baz(1)->4.
             "#,
         );
     }
+
+    #[test]
+    fn no_unused_macro_in_macro_rhs_for_function_name() {
+        let config = DiagnosticsConfig::default()
+            .set_experimental(true)
+            .disable(DiagnosticCode::UnspecificInclude)
+            .disable(DiagnosticCode::BinaryStringToSigil);
+        check_diagnostics_with_config(
+            config,
+            r#"
+            //- /my_app/src/a_file.erl
+              -module(a_file).
+              -define(A_MACRO, ?FUNCTION_NAME).
+              foo() -> ?A_MACRO.
+
+            "#,
+        );
+    }
 }
diff --git a/crates/ide/src/diagnostics/unused_macro.rs b/crates/ide/src/diagnostics/unused_macro.rs
index 89f00e671b..c25f5990a4 100644
--- a/crates/ide/src/diagnostics/unused_macro.rs
+++ b/crates/ide/src/diagnostics/unused_macro.rs
@@ -123,7 +123,9 @@ mod tests {
 
     #[track_caller]
     pub(crate) fn check_diagnostics(fixture: &str) {
-        let config = DiagnosticsConfig::default().disable(DiagnosticCode::UndefinedFunction);
+        let config = DiagnosticsConfig::default()
+            .disable(DiagnosticCode::UndefinedFunction)
+            .disable(DiagnosticCode::HirUnresolvedMacro);
         check_diagnostics_with_config(config, fixture)
     }
 
diff --git a/crates/ide/src/tests.rs b/crates/ide/src/tests.rs
index a32b7e3044..9b0cf18341 100644
--- a/crates/ide/src/tests.rs
+++ b/crates/ide/src/tests.rs
@@ -376,7 +376,8 @@ pub(crate) fn check_diagnostics(fixture: &str) {
     let config = DiagnosticsConfig::default()
         .set_experimental(true)
         .disable(DiagnosticCode::UnspecificInclude)
-        .disable(DiagnosticCode::BinaryStringToSigil);
+        .disable(DiagnosticCode::BinaryStringToSigil)
+        .disable(DiagnosticCode::HirUnresolvedMacro);
     check_diagnostics_with_config(config, fixture)
 }
 
@@ -524,6 +525,7 @@ pub fn check_no_parse_errors(analysis: &Analysis, file_id: FileId) {
     let config = DiagnosticsConfig::default()
         .disable(DiagnosticCode::UnspecificInclude)
         .disable(DiagnosticCode::UndefinedFunction)
+        .disable(DiagnosticCode::HirUnresolvedMacro)
         .disable(DiagnosticCode::NoCatch);
     check_no_parse_errors_with_config(analysis, file_id, &config, &vec![]);
 }
diff --git a/crates/ide_db/src/diagnostic_code.rs b/crates/ide_db/src/diagnostic_code.rs
index 860d61befa..ecde7d1bfb 100644
--- a/crates/ide_db/src/diagnostic_code.rs
+++ b/crates/ide_db/src/diagnostic_code.rs
@@ -90,6 +90,7 @@ pub enum DiagnosticCode {
     NoNoWarnSuppressions,
     CouldBeAStringLiteral,
     ListsReverseAppend,
+    HirUnresolvedMacro,
 
     // Wrapper for erlang service diagnostic codes
     ErlangService(String),
@@ -250,6 +251,7 @@ impl DiagnosticCode {
             DiagnosticCode::NoNoWarnSuppressions => "W0054".to_string(),
             DiagnosticCode::CouldBeAStringLiteral => "W0055".to_string(),
             DiagnosticCode::ListsReverseAppend => "W0056".to_string(),
+            DiagnosticCode::HirUnresolvedMacro => "W0057".to_string(),
             DiagnosticCode::ErlangService(c) => c.to_string(),
             DiagnosticCode::Eqwalizer(c) => format!("eqwalizer: {c}"),
             DiagnosticCode::AdHoc(c) => format!("ad-hoc: {c}"),
@@ -347,6 +349,7 @@ impl DiagnosticCode {
             DiagnosticCode::NoNoWarnSuppressions => "no_nowarn_suppressions".to_string(),
             DiagnosticCode::CouldBeAStringLiteral => "could_be_a_binary_string_literal".to_string(),
             DiagnosticCode::ListsReverseAppend => "lists_reverse_append".to_string(),
+            DiagnosticCode::HirUnresolvedMacro => "hir_unresolved_macro".to_string(),
 
             DiagnosticCode::ErlangService(c) => c.to_string(),
             DiagnosticCode::Eqwalizer(c) => c.to_string(),
@@ -524,6 +527,7 @@ impl DiagnosticCode {
             DiagnosticCode::NoErrorLogger => false,
             DiagnosticCode::NoNoWarnSuppressions => false,
             DiagnosticCode::ListsReverseAppend => false,
+            DiagnosticCode::HirUnresolvedMacro => false,
 
             DiagnosticCode::BinaryStringToSigil => false,
             DiagnosticCode::ErlangService(_) => false,
diff --git a/test_projects/buck_tests_2/check_include/src/top_includer.erl b/test_projects/buck_tests_2/check_include/src/top_includer.erl
index ebe984a0df..79f50ee108 100644
--- a/test_projects/buck_tests_2/check_include/src/top_includer.erl
+++ b/test_projects/buck_tests_2/check_include/src/top_includer.erl
@@ -2,13 +2,13 @@
 
 -compile(warn_missing_spec_all).
 
--export([foo/0]).
-
 -include_lib("check_include_separate_1/include/top_includer.hrl").
 
--spec foo() -> ok.
+-define(A_MACRO, ?FUNCTION_NAME).
+
 foo() ->
     ?FIRST,
+    ?A_MACRO
     ?SECOND,
     ?THIRD(41,34),
     ?FUNCTION_NAME.
diff --git a/website/docs/erlang-error-index/w/W0057.md b/website/docs/erlang-error-index/w/W0057.md
new file mode 100644
index 0000000000..990c4648b6
--- /dev/null
+++ b/website/docs/erlang-error-index/w/W0057.md
@@ -0,0 +1,106 @@
+---
+sidebar_position: 57
+---
+
+# W0057 - Undefined macro
+
+## Error
+
+```erlang
+-module(example).
+
+foo() ->
+    ?UNDEFINED_MACRO.
+%%  ^^^^^^^^^^^^^^^^ error: W0057: undefined macro 'UNDEFINED_MACRO'
+
+bar(X) ->
+    ?UNDEFINED_WITH_ARGS(X, 42).
+%%  ^^^^^^^^^^^^^^^^^^^^ error: W0057: undefined macro 'UNDEFINED_WITH_ARGS/2'
+```
+
+This diagnostic is triggered when a macro usage cannot be resolved in ELP native
+diagnostic processing. The macro is referenced in the code but has not been defined
+in the current file or any included header files.
+
+**Important:** This diagnostic corresponds to Erlang service diagnostics
+**E1507** (for macros without arguments) and **E1508** (for macros with
+arguments). W0057 only appears when the corresponding Erlang service diagnostic
+does not appear. If you see W0057 in a Buck project, it is likely a sign that
+the project is not defined properly in your TARGETS/BUCK file.
+
+## Common Causes
+
+1. **Missing macro definition**: The macro has not been defined with
+   `-define()`.
+2. **Missing include file**: The macro is defined in a header file that has not
+   been included.
+3. **Typo in macro name**: The macro name is misspelled.
+4. **Conditional compilation**: The macro is defined within a conditional block
+   (e.g., `-ifdef()`) that is not active.
+
+## Fix
+
+### Define the macro
+
+If the macro is not defined anywhere, add a `-define()` directive:
+
+```erlang
+-module(example).
+
+-define(UNDEFINED_MACRO, 42).
+-define(UNDEFINED_WITH_ARGS(X, Y), X + Y).
+
+foo() ->
+    ?UNDEFINED_MACRO.
+
+bar(X) ->
+    ?UNDEFINED_WITH_ARGS(X, 42).
+```
+
+### Include the header file
+
+If the macro is defined in a header file, add the appropriate `-include()` or
+`-include_lib()` directive:
+
+```erlang
+-module(example).
+
+-include("macros.hrl").
+
+foo() ->
+    ?UNDEFINED_MACRO.
+```
+
+### Fix typos
+
+If the macro name is misspelled, correct it to match the definition:
+
+```erlang
+-module(example).
+
+-define(DEFINED_MACRO, 42).
+
+foo() ->
+    ?DEFINED_MACRO.  % Fixed typo
+```
+
+## Relationship to Erlang Service Diagnostics
+
+W0057 is filtered out when the Erlang service reports the corresponding
+diagnostics:
+
+- **E1507**: undefined macro (without arguments)
+- **E1508**: undefined macro (with arguments)
+
+When both diagnostics detect the same issue, only the Erlang service diagnostic
+will be shown to avoid duplication.
+
+## Buck Project Configuration
+
+If you see W0057 in a Buck project, this typically indicates that your TARGETS
+file is not properly configured. The Erlang service relies on Buck to understand
+the project structure, dependencies, and include paths. Check that:
+
+- All application dependencies are declared in the `deps` attribute
+- Include paths are properly configured
+- The macro definition is in an accessible dependency

From ed673119e4bd5c154311cb51bb9d484dbd2c8c5d Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 14 Nov 2025 04:01:31 -0800
Subject: [PATCH 268/394] 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
---
 .../resolves_generated_includes.stdout        |  3 +-
 .../include_lib_non_dependency_fails.stdout   |  3 +-
 .../include_lib_non_dependency_rebar.stdout   |  3 +-
 crates/ide/src/diagnostics.rs                 | 57 +++++++++++++++++--
 4 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
index 8ca4ec00a2..d38837fe1d 100644
--- a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
+++ b/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
diff --git a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout
index 33dc4b534a..c0fe03edea 100644
--- a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout
+++ b/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'
diff --git a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout
index dceea92cf3..513197d889 100644
--- a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout
+++ b/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'
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 9621ab85d6..960c8762a2 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/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

From a8bb2de049ce5933b7d0910eaf88d9c61bd2305a Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 14 Nov 2025 04:35:24 -0800
Subject: [PATCH 269/394] 5/n: include: report HIR unresolved include files
 W0058

Summary:
For a buck project, if the dependencies are not set up properly for ELP use, it may compile but ELP is unable to resolve a nested include file when processing the middle ones in a chain.

This diff adds a check for the HIR include file resolution so this can be detected.

For a properly configured buck project this is redundant, because the Erlang service already reports `E1516` for this.

The next diff filters out occurrences generated here in that case.

Reviewed By: TD5

Differential Revision: D86963331

fbshipit-source-id: 356cefeba61e306fb3541a21ba16c189aa8c8faa
---
 .../resolves_generated_includes.stdout        |   3 +-
 .../parse_elp_custom_build_tool.jsonl         |   3 +-
 .../include_lib_non_dependency_fails.stdout   |   3 +-
 .../include_lib_non_dependency_rebar.stdout   |   3 +-
 crates/hir/src/body.rs                        |  22 ++--
 crates/hir/src/body/lower.rs                  |   7 +-
 crates/hir/src/form_list.rs                   |  17 +++
 crates/hir/src/lib.rs                         |   1 -
 crates/ide/src/diagnostics.rs                 |  65 ++++++++---
 crates/ide/src/tests.rs                       |   3 +-
 crates/ide_db/src/diagnostic_code.rs          |   4 +
 .../include/top_includer.hrl                  |   1 +
 website/docs/erlang-error-index/w/W0058.md    | 108 ++++++++++++++++++
 13 files changed, 207 insertions(+), 33 deletions(-)
 create mode 100644 website/docs/erlang-error-index/w/W0058.md

diff --git a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
index d38837fe1d..59714ddd01 100644
--- a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
+++ b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
@@ -9,8 +9,9 @@ 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: 2
+  top_includer: 3
       0:8-0:20::[WeakWarning] [W0046] The module is not documented.
+      0:1-0:1::[Error] [L0000] Issue in included file
       12:4-12:10::[Error] [E1508] undefined macro 'THIRD/2'
   wa_buck2_module_search: 6
       19:0-19:18::[WeakWarning] [W0040] The function is non-trivial, exported, but not documented.
diff --git a/crates/elp/src/resources/test/custom_build_tool/parse_elp_custom_build_tool.jsonl b/crates/elp/src/resources/test/custom_build_tool/parse_elp_custom_build_tool.jsonl
index ac87aa6ec4..4acde049ae 100644
--- a/crates/elp/src/resources/test/custom_build_tool/parse_elp_custom_build_tool.jsonl
+++ b/crates/elp/src/resources/test/custom_build_tool/parse_elp_custom_build_tool.jsonl
@@ -1,4 +1,5 @@
 module specified: app_b
 Diagnostics reported in 1 modules:
-  app_b: 1
+  app_b: 2
+      2:13-2:38::[Warning] [W0058] can't find include lib "app_a/include/app_b.hrl"
       2:13-2:38::[Error] [E1516] can't find include lib "app_a/include/app_b.hrl"
diff --git a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout
index c0fe03edea..87b946c385 100644
--- a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout
+++ b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout
@@ -1,6 +1,7 @@
 module specified: main_app
 Diagnostics reported in 1 modules:
-  main_app: 5
+  main_app: 6
+      4:13-4:55::[Warning] [W0058] can't find include lib "external_app/include/external_header.hrl"
       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.
diff --git a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout
index 513197d889..198330cb2f 100644
--- a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout
+++ b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout
@@ -1,7 +1,8 @@
 module specified: main_app
 Diagnostics reported in 1 modules:
-  main_app: 4
+  main_app: 5
       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'
diff --git a/crates/hir/src/body.rs b/crates/hir/src/body.rs
index 0252a44ee1..9ebac17c66 100644
--- a/crates/hir/src/body.rs
+++ b/crates/hir/src/body.rs
@@ -43,6 +43,7 @@ use crate::FormList;
 use crate::FunctionClause;
 use crate::FunctionClauseId;
 use crate::InFile;
+use crate::IncludeAttributeId;
 use crate::Literal;
 use crate::Name;
 use crate::NameArity;
@@ -1157,17 +1158,20 @@ pub type MacroSource = InFileAstPtr<ast::MacroCallExpr>;
 
 /// Lightweight diagnostic for body lowering
 #[derive(Debug, Clone, PartialEq, Eq)]
-pub struct BodyDiagnostic {
-    /// Location of the problematic construct
-    pub source: MacroSource,
-    /// Type of diagnostic
-    pub kind: BodyDiagnosticKind,
+pub enum BodyDiagnostic {
+    /// Macro failed to expand/resolve
+    UnresolvedMacro(MacroSource),
+    /// Include failed to resolve
+    UnresolvedInclude(InFile<IncludeAttributeId>),
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum BodyDiagnosticKind {
-    /// Macro failed to expand/resolve
-    UnresolvedMacro,
+impl BodyDiagnostic {
+    pub fn file_id(&self) -> FileId {
+        match self {
+            BodyDiagnostic::UnresolvedMacro(src) => src.file_id(),
+            BodyDiagnostic::UnresolvedInclude(include) => include.file_id,
+        }
+    }
 }
 
 #[derive(Clone, PartialEq, Eq, Debug, Hash)]
diff --git a/crates/hir/src/body/lower.rs b/crates/hir/src/body/lower.rs
index ae7236754b..4abf0737b2 100644
--- a/crates/hir/src/body/lower.rs
+++ b/crates/hir/src/body/lower.rs
@@ -39,7 +39,6 @@ use crate::BasedInteger;
 use crate::BinarySeg;
 use crate::Body;
 use crate::BodyDiagnostic;
-use crate::BodyDiagnosticKind;
 use crate::BodySourceMap;
 use crate::CRClause;
 use crate::CallTarget;
@@ -3040,10 +3039,8 @@ impl<'a> Ctx<'a> {
         }
 
         let source = InFileAstPtr::new(self.curr_file_id(), AstPtr::new(call).cast().unwrap());
-        self.diagnostics.push(BodyDiagnostic {
-            source,
-            kind: BodyDiagnosticKind::UnresolvedMacro,
-        });
+        self.diagnostics
+            .push(BodyDiagnostic::UnresolvedMacro(source));
     }
 
     fn curr_file_id(&self) -> FileId {
diff --git a/crates/hir/src/form_list.rs b/crates/hir/src/form_list.rs
index 560befbb4b..c33af25622 100644
--- a/crates/hir/src/form_list.rs
+++ b/crates/hir/src/form_list.rs
@@ -650,6 +650,23 @@ impl IncludeAttribute {
     pub fn range(&self, db: &dyn DefDatabase, file_id: FileId) -> TextRange {
         self.form_id().get_ast(db, file_id).syntax().text_range()
     }
+
+    pub fn file_range(&self, db: &dyn DefDatabase, file_id: FileId) -> TextRange {
+        let form = self.form_id().get_ast(db, file_id);
+        match form {
+            ast::Form::PreprocessorDirective(ast::PreprocessorDirective::PpInclude(pp_include)) => {
+                pp_include
+                    .include_range()
+                    .unwrap_or_else(|| pp_include.text_range())
+            }
+            ast::Form::PreprocessorDirective(ast::PreprocessorDirective::PpIncludeLib(
+                pp_include_lib,
+            )) => pp_include_lib
+                .include_range()
+                .unwrap_or_else(|| pp_include_lib.text_range()),
+            _ => form.syntax().text_range(),
+        }
+    }
 }
 
 /// -deprecated
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 9f51b0d70f..1ec75fd25e 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -36,7 +36,6 @@ pub use body::AnyAttribute;
 pub use body::AttributeBody;
 pub use body::Body;
 pub use body::BodyDiagnostic;
-pub use body::BodyDiagnosticKind;
 pub use body::BodyOrigin;
 pub use body::BodySourceMap;
 pub use body::DefineBody;
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 960c8762a2..fd0062122c 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1801,13 +1801,29 @@ pub fn collect_body_diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<hir::
                 Some(body_map)
             }
             FormIdx::PPDirective(idx) => {
-                if let PPDirective::Define(define_id) = &form_list[*idx] {
-                    let (_, body_map) = sema
-                        .db
-                        .define_body_with_source(InFile::new(file_id, *define_id));
-                    Some(body_map)
-                } else {
-                    None
+                match &form_list[*idx] {
+                    PPDirective::Define(define_id) => {
+                        let (_, body_map) = sema
+                            .db
+                            .define_body_with_source(InFile::new(file_id, *define_id));
+                        Some(body_map)
+                    }
+                    PPDirective::Include(include_id) => {
+                        // Try to resolve the include
+                        if sema
+                            .db
+                            .resolve_include(InFile::new(file_id, *include_id))
+                            .is_none()
+                        {
+                            // Include resolution failed, create a diagnostic
+                            diagnostics.push(hir::BodyDiagnostic::UnresolvedInclude(InFile::new(
+                                file_id,
+                                *include_id,
+                            )));
+                        }
+                        None
+                    }
+                    _ => None,
                 }
             }
             _ => None,
@@ -1830,17 +1846,18 @@ pub fn get_hir_diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<Diagnostic
     body_diagnostics
         .into_iter()
         .filter_map(|body_diag| {
-            let full_range = body_diag.source.range();
-
             // Only include diagnostics for the requested file
-            if full_range.file_id != file_id {
+            if body_diag.file_id() != file_id {
                 return None;
             }
 
-            let (code, message, range) = match body_diag.kind {
-                hir::BodyDiagnosticKind::UnresolvedMacro => {
+            let (code, message, range) = match &body_diag {
+                hir::BodyDiagnostic::UnresolvedMacro(macro_source) => {
+                    // Determine range for UnresolvedMacro
+                    let full_range = macro_source.range();
+
                     // Get the macro call AST node to extract name and arity
-                    let macro_call = body_diag.source.to_ast(db);
+                    let macro_call = macro_source.to_ast(db);
                     let macro_name = macro_call
                         .name()
                         .map(|name| name.to_string())
@@ -1871,6 +1888,28 @@ pub fn get_hir_diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<Diagnostic
 
                     (DiagnosticCode::HirUnresolvedMacro, message, range)
                 }
+                hir::BodyDiagnostic::UnresolvedInclude(include) => {
+                    // Get the include attribute from the form_list
+                    let sema = Semantic::new(db);
+                    let form_list = sema.form_list(file_id);
+                    let include_attr = &form_list[include.value];
+
+                    // Extract path and range from IncludeAttribute
+                    let path = include_attr.path().to_string();
+                    let range = include_attr.file_range(db, file_id);
+
+                    // Use appropriate message based on include type
+                    let message = match include_attr {
+                        hir::IncludeAttribute::Include { .. } => {
+                            format!("can't find include file \"{}\"", path)
+                        }
+                        hir::IncludeAttribute::IncludeLib { .. } => {
+                            format!("can't find include lib \"{}\"", path)
+                        }
+                    };
+
+                    (DiagnosticCode::HirUnresolvedInclude, message, range)
+                }
             };
 
             Some(
diff --git a/crates/ide/src/tests.rs b/crates/ide/src/tests.rs
index 9b0cf18341..bd607b5d30 100644
--- a/crates/ide/src/tests.rs
+++ b/crates/ide/src/tests.rs
@@ -377,7 +377,8 @@ pub(crate) fn check_diagnostics(fixture: &str) {
         .set_experimental(true)
         .disable(DiagnosticCode::UnspecificInclude)
         .disable(DiagnosticCode::BinaryStringToSigil)
-        .disable(DiagnosticCode::HirUnresolvedMacro);
+        .disable(DiagnosticCode::HirUnresolvedMacro)
+        .disable(DiagnosticCode::HirUnresolvedInclude);
     check_diagnostics_with_config(config, fixture)
 }
 
diff --git a/crates/ide_db/src/diagnostic_code.rs b/crates/ide_db/src/diagnostic_code.rs
index ecde7d1bfb..cee17251e8 100644
--- a/crates/ide_db/src/diagnostic_code.rs
+++ b/crates/ide_db/src/diagnostic_code.rs
@@ -91,6 +91,7 @@ pub enum DiagnosticCode {
     CouldBeAStringLiteral,
     ListsReverseAppend,
     HirUnresolvedMacro,
+    HirUnresolvedInclude,
 
     // Wrapper for erlang service diagnostic codes
     ErlangService(String),
@@ -252,6 +253,7 @@ impl DiagnosticCode {
             DiagnosticCode::CouldBeAStringLiteral => "W0055".to_string(),
             DiagnosticCode::ListsReverseAppend => "W0056".to_string(),
             DiagnosticCode::HirUnresolvedMacro => "W0057".to_string(),
+            DiagnosticCode::HirUnresolvedInclude => "W0058".to_string(),
             DiagnosticCode::ErlangService(c) => c.to_string(),
             DiagnosticCode::Eqwalizer(c) => format!("eqwalizer: {c}"),
             DiagnosticCode::AdHoc(c) => format!("ad-hoc: {c}"),
@@ -350,6 +352,7 @@ impl DiagnosticCode {
             DiagnosticCode::CouldBeAStringLiteral => "could_be_a_binary_string_literal".to_string(),
             DiagnosticCode::ListsReverseAppend => "lists_reverse_append".to_string(),
             DiagnosticCode::HirUnresolvedMacro => "hir_unresolved_macro".to_string(),
+            DiagnosticCode::HirUnresolvedInclude => "hir_unresolved_include".to_string(),
 
             DiagnosticCode::ErlangService(c) => c.to_string(),
             DiagnosticCode::Eqwalizer(c) => c.to_string(),
@@ -528,6 +531,7 @@ impl DiagnosticCode {
             DiagnosticCode::NoNoWarnSuppressions => false,
             DiagnosticCode::ListsReverseAppend => false,
             DiagnosticCode::HirUnresolvedMacro => false,
+            DiagnosticCode::HirUnresolvedInclude => false,
 
             DiagnosticCode::BinaryStringToSigil => false,
             DiagnosticCode::ErlangService(_) => false,
diff --git a/test_projects/buck_tests_2/check_include_separate_1/include/top_includer.hrl b/test_projects/buck_tests_2/check_include_separate_1/include/top_includer.hrl
index c117baed75..5c88a7806e 100644
--- a/test_projects/buck_tests_2/check_include_separate_1/include/top_includer.hrl
+++ b/test_projects/buck_tests_2/check_include_separate_1/include/top_includer.hrl
@@ -1,4 +1,5 @@
 
 -include_lib("check_include_separate_2/include/separate_include.hrl").
+-include("does_not_exist.hrl").
 
 -define(FIRST, 1).
diff --git a/website/docs/erlang-error-index/w/W0058.md b/website/docs/erlang-error-index/w/W0058.md
new file mode 100644
index 0000000000..acad4c2d79
--- /dev/null
+++ b/website/docs/erlang-error-index/w/W0058.md
@@ -0,0 +1,108 @@
+---
+sidebar_position: 58
+---
+
+# W0058 - Can't find include file
+
+## Error
+
+```erlang
+-module(example).
+
+-include("missing_header.hrl").
+%% error: W0058: can't find include file "missing_header.hrl"
+
+-include_lib("missing_app/include/header.hrl").
+%% error: W0058: can't find include lib "missing_app/include/header.hrl"
+```
+
+This diagnostic is triggered when an include file referenced by `-include()` or
+`-include_lib()` cannot be resolved by the ELP native diagnostic processing.
+The file path cannot be found in the search paths available to ELP.
+
+**Important:** This diagnostic corresponds to Erlang service diagnostic
+**E1516** (can't find include file/lib). W0058 only appears when the
+corresponding Erlang service diagnostic does not appear. If you see W0058 in a
+Buck project, it is likely a sign that the project is not defined properly in
+your TARGETS file.
+
+## Common Causes
+
+1. **Missing file**: The include file does not exist at the specified path.
+2. **Incorrect path**: The path to the include file is incorrect or misspelled.
+3. **Missing application dependency**: For `-include_lib()`, the referenced
+   application is not listed as a dependency.
+4. **Incorrect include path configuration**: The directory containing the header
+   file is not in the configured include paths.
+
+## Fix
+
+### Verify the file exists
+
+Make sure the include file exists at the expected location.
+
+### Fix the path
+
+Correct the path to match the actual file location:
+
+```erlang
+-module(example).
+
+% Correct path to the include file
+-include("correct_header.hrl").
+
+% Correct application name and path
+-include_lib("correct_app/include/header.hrl").
+```
+
+### Add missing dependency
+
+For `-include_lib()`, ensure the application is listed as a dependency in your
+build configuration:
+
+**rebar.config:**
+
+```erlang
+{deps, [
+    missing_app
+]}.
+```
+
+**Buck TARGETS file:**
+
+```python
+erlang_app(
+    name = "my_app",
+    deps = [
+        "//path/to:missing_app",
+    ],
+)
+```
+
+### Configure include paths
+
+Ensure the directory containing the header file is in your project's include
+paths configuration.
+
+## Relationship to Erlang Service Diagnostics
+
+W0058 is filtered out when the Erlang service reports the corresponding
+diagnostic:
+
+- **E1516**: can't find include file/lib
+
+When both diagnostics detect the same issue, only the Erlang service diagnostic
+will be shown to avoid duplication.
+
+## Buck Project Configuration
+
+If you see W0058 in a Buck project, this typically indicates that your TARGETS
+file is not properly configured. The Erlang service relies on Buck to understand
+the project structure, dependencies, and include paths. Check that:
+
+- All application dependencies are declared in the `deps` attribute
+- For `-include_lib()` directives, the referenced application is included as a
+  dependency
+- Include paths are properly configured with the `include` or `include_lib`
+  attributes
+- The header file is defined in a dependency of the buck target holding the current file

From 276297e366734a1fffee06f8cd0af492d8690536 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 14 Nov 2025 04:35:24 -0800
Subject: [PATCH 270/394] 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
---
 .../parse_elp_custom_build_tool.jsonl         |  3 +-
 .../include_lib_non_dependency_fails.stdout   |  3 +-
 .../include_lib_non_dependency_rebar.stdout   |  3 +-
 crates/ide/src/diagnostics.rs                 | 51 +++++++++++++++----
 4 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/crates/elp/src/resources/test/custom_build_tool/parse_elp_custom_build_tool.jsonl b/crates/elp/src/resources/test/custom_build_tool/parse_elp_custom_build_tool.jsonl
index 4acde049ae..ac87aa6ec4 100644
--- a/crates/elp/src/resources/test/custom_build_tool/parse_elp_custom_build_tool.jsonl
+++ b/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"
diff --git a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout
index 87b946c385..c0fe03edea 100644
--- a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_fails.stdout
+++ b/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.
diff --git a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout b/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout
index 198330cb2f..513197d889 100644
--- a/crates/elp/src/resources/test/include_lib_dependency_test/include_lib_non_dependency_rebar.stdout
+++ b/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'
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index fd0062122c..1afe56f0d4 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -2858,8 +2858,9 @@ 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 {
@@ -2867,6 +2868,9 @@ pub fn attach_related_diagnostics(
             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,6 +2886,13 @@ 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()
@@ -2889,26 +2900,46 @@ pub fn attach_related_diagnostics(
         .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 W0056 only if there's no matching E1507/E1508
-        !has_matching_erlang_service
+            // Keep W0057 only if there's no matching E1516
+            return !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

From aca24c8fc39e9dd0bc538c27d289a2120fe92ddd Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 14 Nov 2025 10:05:06 -0800
Subject: [PATCH 271/394] Convert missing_compile_warn_missing_spec linter to
 use trait

Summary:
Even if the `missing_compile_warn_missing_spec` is supposed to be disabled by default, it still runs. This is due to a flawed logic in `diagnostics.rs`, originally introduced in D59272525.

This is problematic, since open-source projects such as OTP see a huge number of errors when running the `elp lint` command without specifying a custom configuration.

By converting the linter to use the new trait, we incidentally fix the bug.

Two more linters use a `default_disabled: true` property in their descriptors: `undocumented_module` and `undocumented_function`. They will be converted next, and the logic to handle the `default_disabled` will eventually be removed.

Reviewed By: alanz

Differential Revision: D86978483

fbshipit-source-id: 5a89ff0fd1297a1e75db9d4b60d75b70f98d1e0c
---
 .../resolves_generated_includes.stdout        |   6 +-
 ...e_elp_no_lint_specified_json_output.stdout |   7 -
 .../parse_elp_no_lint_specified_output.stdout |  21 +-
 .../test/linter/warnings_as_errors.stdout     |  21 +-
 crates/ide/src/diagnostics.rs                 |  26 +-
 .../missing_compile_warn_missing_spec.rs      | 289 ++++++++++--------
 test_projects/linter/elp_lint_test2.toml      |   3 +
 7 files changed, 203 insertions(+), 170 deletions(-)

diff --git a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
index 59714ddd01..b5ed320571 100644
--- a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
+++ b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
@@ -1,11 +1,9 @@
 Reporting all diagnostics codes
 Diagnostics reported in 5 modules:
-  app_a: 3
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+  app_a: 2
       5:9-5:31::[WeakWarning] [W0037] Unspecific include.
       0:8-0:13::[WeakWarning] [W0046] The module is not documented.
-  auto_gen_a: 2
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+  auto_gen_a: 1
       0:8-0:18::[WeakWarning] [W0046] The module is not documented.
   eqwalizer: 1
       1:8-1:17::[WeakWarning] [W0046] The module is not documented.
diff --git a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
index 8b664bb080..b8924b40ed 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
@@ -1,22 +1,16 @@
 {"path":"app_a/src/app_a.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0011 (application_get_env)","original":null,"replacement":null,"description":"module `app_a` belongs to app `app_a`, but reads env for `misc`\n\nFor more information see: /erlang-error-index/w/W0011","docPath":"website/docs/erlang-error-index/w/W0011.md"}
-{"path":"app_a/src/app_a.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012","docPath":"website/docs/erlang-error-index/w/W0012.md"}
 {"path":"app_a/src/app_a.erl","line":9,"char":1,"code":"ELP","severity":"error","name":"P1700 (head_mismatch)","original":null,"replacement":null,"description":"head mismatch 'fooX' vs 'food'\n\nFor more information see: /erlang-error-index/p/P1700","docPath":null}
 {"path":"app_a/src/app_a.erl","line":8,"char":7,"code":"ELP","severity":"warning","name":"W0018 (unexpected_semi_or_dot)","original":null,"replacement":null,"description":"Unexpected ';'\n\nFor more information see: /erlang-error-index/w/W0018","docPath":"website/docs/erlang-error-index/w/W0018.md"}
 {"path":"app_a/src/app_a.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
 {"path":"app_a/src/app_a.erl","line":13,"char":5,"code":"ELP","severity":"warning","name":"W0026 (unexported_function)","original":null,"replacement":null,"description":"Function 'app_a:baz/2' is not exported.\n\nFor more information see: /erlang-error-index/w/W0026","docPath":"website/docs/erlang-error-index/w/W0026.md"}
 {"path":"app_a/src/app_a.erl","line":12,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function bar/0 is unused\n\nFor more information see: /erlang-error-index/l/L1230","docPath":null}
 {"path":"app_a/src/app_a.erl","line":16,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function baz/2 is unused\n\nFor more information see: /erlang-error-index/l/L1230","docPath":null}
-{"path":"app_a/src/app_a_edoc.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012","docPath":"website/docs/erlang-error-index/w/W0012.md"}
 {"path":"app_a/src/app_a_edoc.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
-{"path":"app_a/src/app_a_ssr.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012","docPath":"website/docs/erlang-error-index/w/W0012.md"}
 {"path":"app_a/src/app_a_ssr.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
-{"path":"app_a/src/app_a_unused_param.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012","docPath":"website/docs/erlang-error-index/w/W0012.md"}
 {"path":"app_a/src/app_a_unused_param.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
 {"path":"app_a/src/app_a_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"L1268 (L1268)","original":null,"replacement":null,"description":"variable 'X' is unused\n\nFor more information see: /erlang-error-index/l/L1268","docPath":null}
 {"path":"app_b/src/app_b.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0011 (application_get_env)","original":null,"replacement":null,"description":"module `app_b` belongs to app `app_b`, but reads env for `misc`\n\nFor more information see: /erlang-error-index/w/W0011","docPath":"website/docs/erlang-error-index/w/W0011.md"}
-{"path":"app_b/src/app_b.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012","docPath":"website/docs/erlang-error-index/w/W0012.md"}
 {"path":"app_b/src/app_b.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
-{"path":"app_b/src/app_b_unused_param.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012","docPath":"website/docs/erlang-error-index/w/W0012.md"}
 {"path":"app_b/src/app_b_unused_param.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
 {"path":"app_b/src/app_b_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"L1268 (L1268)","original":null,"replacement":null,"description":"variable 'X' is unused\n\nFor more information see: /erlang-error-index/l/L1268","docPath":null}
 {"path":"app_a/src/custom_function_matches.erl","line":13,"char":5,"code":"ELP","severity":"warning","name":"W0017 (undefined_function)","original":null,"replacement":null,"description":"Function 'excluded:function/0' is undefined.\n\nFor more information see: /erlang-error-index/w/W0017","docPath":"website/docs/erlang-error-index/w/W0017.md"}
@@ -26,5 +20,4 @@
 {"path":"app_a/src/expression_updates_literal.erl","line":7,"char":1,"code":"ELP","severity":"warning","name":"L1309 (L1309)","original":null,"replacement":null,"description":"missing specification for function a_fun/0\n\nFor more information see: /erlang-error-index/l/L1309","docPath":null}
 {"path":"app_a/src/expression_updates_literal.erl","line":8,"char":7,"code":"ELP","severity":"warning","name":"L1318 (L1318)","original":null,"replacement":null,"description":"expression updates a literal\n\nFor more information see: /erlang-error-index/l/L1318","docPath":null}
 {"path":"app_a/src/spelling.erl","line":2,"char":2,"code":"ELP","severity":"error","name":"W0013 (misspelled_attribute)","original":null,"replacement":null,"description":"misspelled attribute, saw 'dyalizer' but expected 'dialyzer'\n\nFor more information see: /erlang-error-index/w/W0013","docPath":"website/docs/erlang-error-index/w/W0013.md"}
-{"path":"app_a/src/spelling.erl","line":1,"char":1,"code":"ELP","severity":"error","name":"W0012 (compile-warn-missing-spec)","original":null,"replacement":null,"description":"Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.\n\nFor more information see: /erlang-error-index/w/W0012","docPath":"website/docs/erlang-error-index/w/W0012.md"}
 {"path":"app_a/src/spelling.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
diff --git a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
index 954278d91b..6e3e3d56ea 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
@@ -1,30 +1,24 @@
 Reporting all diagnostics codes
 Diagnostics reported in 9 modules:
-  app_a: 8
+  app_a: 7
       4:4-4:34::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
       8:0-8:4::[Error] [P1700] head mismatch 'fooX' vs 'food'
       7:6-7:7::[Warning] [W0018] Unexpected ';'
       0:8-0:13::[WeakWarning] [W0046] The module is not documented.
       12:4-12:13::[Warning] [W0026] Function 'app_a:baz/2' is not exported.
       11:0-11:3::[Warning] [L1230] function bar/0 is unused
       15:0-15:3::[Warning] [L1230] function baz/2 is unused
-  app_a_edoc: 2
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+  app_a_edoc: 1
       0:8-0:18::[WeakWarning] [W0046] The module is not documented.
-  app_a_ssr: 2
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+  app_a_ssr: 1
       0:8-0:17::[WeakWarning] [W0046] The module is not documented.
-  app_a_unused_param: 3
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+  app_a_unused_param: 2
       0:8-0:26::[WeakWarning] [W0046] The module is not documented.
       4:4-4:5::[Warning] [L1268] variable 'X' is unused
-  app_b: 3
+  app_b: 2
       4:4-4:34::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
       0:8-0:13::[WeakWarning] [W0046] The module is not documented.
-  app_b_unused_param: 3
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+  app_b_unused_param: 2
       0:8-0:26::[WeakWarning] [W0046] The module is not documented.
       4:4-4:5::[Warning] [L1268] variable 'X' is unused
   custom_function_matches: 3
@@ -35,7 +29,6 @@ Diagnostics reported in 9 modules:
       1:8-1:34::[WeakWarning] [W0046] The module is not documented.
       6:0-6:5::[Warning] [L1309] missing specification for function a_fun/0
       7:6-8:15::[Warning] [L1318] expression updates a literal
-  spelling: 3
+  spelling: 2
       1:1-1:9::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
       0:8-0:16::[WeakWarning] [W0046] The module is not documented.
diff --git a/crates/elp/src/resources/test/linter/warnings_as_errors.stdout b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
index 493afa95c7..60edb2b6d4 100644
--- a/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
+++ b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
@@ -1,30 +1,24 @@
 Reporting all diagnostics codes
 Diagnostics reported in 9 modules:
-  app_a: 8
+  app_a: 7
       4:4-4:34::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
       8:0-8:4::[Error] [P1700] head mismatch 'fooX' vs 'food'
       7:6-7:7::[Warning] [W0018] Unexpected ';'
       0:8-0:13::[WeakWarning] [W0046] The module is not documented.
       12:4-12:13::[Warning] [W0026] Function 'app_a:baz/2' is not exported.
       11:0-11:3::[Error] [L1230] function bar/0 is unused
       15:0-15:3::[Error] [L1230] function baz/2 is unused
-  app_a_edoc: 2
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+  app_a_edoc: 1
       0:8-0:18::[WeakWarning] [W0046] The module is not documented.
-  app_a_ssr: 2
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+  app_a_ssr: 1
       0:8-0:17::[WeakWarning] [W0046] The module is not documented.
-  app_a_unused_param: 3
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+  app_a_unused_param: 2
       0:8-0:26::[WeakWarning] [W0046] The module is not documented.
       4:4-4:5::[Error] [L1268] variable 'X' is unused
-  app_b: 3
+  app_b: 2
       4:4-4:34::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
       0:8-0:13::[WeakWarning] [W0046] The module is not documented.
-  app_b_unused_param: 3
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+  app_b_unused_param: 2
       0:8-0:26::[WeakWarning] [W0046] The module is not documented.
       4:4-4:5::[Error] [L1268] variable 'X' is unused
   custom_function_matches: 3
@@ -35,7 +29,6 @@ Diagnostics reported in 9 modules:
       1:8-1:34::[WeakWarning] [W0046] The module is not documented.
       6:0-6:5::[Error] [L1309] missing specification for function a_fun/0
       7:6-8:15::[Error] [L1318] expression updates a literal
-  spelling: 3
+  spelling: 2
       1:1-1:9::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
       0:8-0:16::[WeakWarning] [W0046] The module is not documented.
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 1afe56f0d4..c435e16efb 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1106,15 +1106,31 @@ impl DiagnosticsConfig {
     }
 
     pub fn enable(mut self, code: DiagnosticCode) -> DiagnosticsConfig {
-        self.enabled.enable(code);
+        self.enabled.enable(code.clone());
+        self.set_linter_enabled(code, true);
         self
     }
 
     pub fn disable(mut self, code: DiagnosticCode) -> DiagnosticsConfig {
-        self.disabled.insert(code);
+        self.disabled.insert(code.clone());
+        self.set_linter_enabled(code, false);
         self
     }
 
+    fn set_linter_enabled(&mut self, code: DiagnosticCode, is_enabled: bool) {
+        let lint_config = self.lint_config.get_or_insert_with(LintConfig::default);
+        lint_config
+            .linters
+            .entry(code)
+            .and_modify(|linter_config| {
+                linter_config.is_enabled = Some(is_enabled);
+            })
+            .or_insert_with(|| LinterConfig {
+                is_enabled: Some(is_enabled),
+                ..Default::default()
+            });
+    }
+
     pub fn set_lints_from_config(
         mut self,
         lints_from_config: &LintsFromConfig,
@@ -1475,7 +1491,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &map_find_to_syntax::DESCRIPTOR,
         &expression_can_be_simplified::DESCRIPTOR,
         &application_env::DESCRIPTOR,
-        &missing_compile_warn_missing_spec::DESCRIPTOR,
         &dependent_header::DESCRIPTOR,
         &deprecated_function::DESCRIPTOR,
         &head_mismatch::DESCRIPTOR_SEMANTIC,
@@ -1566,7 +1581,10 @@ const SSR_PATTERN_LINTERS: &[&dyn SsrPatternsDiagnostics] = &[
 ];
 
 /// Generic linters
-const GENERIC_LINTERS: &[&dyn GenericDiagnostics] = &[&unused_macro::LINTER];
+const GENERIC_LINTERS: &[&dyn GenericDiagnostics] = &[
+    &unused_macro::LINTER,
+    &missing_compile_warn_missing_spec::LINTER,
+];
 
 /// Unified registry for all types of linters
 pub(crate) fn linters() -> Vec<DiagnosticLinter> {
diff --git a/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs b/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs
index 6114658bf2..681672ba8e 100644
--- a/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs
+++ b/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs
@@ -1,10 +1,11 @@
 /*
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
- * This source code is licensed under both the MIT license found in the
- * LICENSE-MIT file in the root directory of this source tree and the Apache
+ * This source code is dual-licensed under either the MIT license found in the
+ * LICENSE-MIT file in the root directory of this source tree or the Apache
  * License, Version 2.0 found in the LICENSE-APACHE file in the root directory
- * of this source tree.
+ * of this source tree. You may select, at your option, one of the
+ * above-listed licenses.
  */
 
 //! Lint/fix: missing_compile_warn_missing_spec
@@ -15,6 +16,7 @@
 
 use elp_ide_assists::helpers::add_compile_option;
 use elp_ide_assists::helpers::rename_atom_in_compile_attribute;
+use elp_ide_db::DiagnosticCode;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::FileKind;
 use elp_ide_db::source_change::SourceChangeBuilder;
@@ -36,94 +38,162 @@ use hir::known;
 use lazy_static::lazy_static;
 
 use super::DIAGNOSTIC_WHOLE_FILE_RANGE;
-use super::Diagnostic;
-use super::DiagnosticConditions;
-use super::DiagnosticDescriptor;
+use crate::diagnostics::GenericLinter;
+use crate::diagnostics::GenericLinterMatchContext;
+use crate::diagnostics::Linter;
+use crate::diagnostics::Severity;
 use crate::fix;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: false,
-        include_tests: false,
-        default_disabled: true,
-    },
-    checker: &|diags, sema, file_id, file_kind| {
-        missing_compile_warn_missing_spec(diags, sema, file_id, file_kind);
-    },
-};
+pub(crate) struct MissingCompileWarnMissingSpec;
 
-fn missing_compile_warn_missing_spec(
-    diags: &mut Vec<Diagnostic>,
-    sema: &Semantic,
-    file_id: FileId,
-    file_kind: FileKind,
-) {
-    match file_kind {
-        FileKind::Header | FileKind::Other | FileKind::OutsideProjectModel => {
-            return;
-        }
-        _ => {}
+impl Linter for MissingCompileWarnMissingSpec {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::MissingCompileWarnMissingSpec
     }
-
-    let form_list = sema.form_list(file_id);
-    if form_list.compile_attributes().next().is_none() {
-        report_diagnostic(sema, None, file_id, (Found::No, None), diags);
+    fn description(&self) -> &'static str {
+        "Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced."
     }
-    let attributes = form_list
-        .compile_attributes()
-        .map(|(idx, compile_attribute)| {
-            let co = sema.db.compile_body(InFile::new(file_id, idx));
-            let is_present = FoldCtx::fold_term(
-                Strategy {
-                    macros: MacroStrategy::Expand,
-                    parens: ParenStrategy::InvisibleParens,
-                },
-                &co.body,
-                co.value,
-                (Found::No, None),
-                &mut |acc, ctx| match &ctx.item {
-                    AnyExpr::Term(Term::Literal(Literal::Atom(atom))) => {
-                        let name = sema.db.lookup_atom(*atom);
-                        if MISSING_SPEC_ALL_OPTIONS.contains(&name) {
-                            (Found::WarnMissingSpecAll, Some(idx))
-                        } else if MISSING_SPEC_OPTIONS.contains(&name) {
-                            (Found::WarnMissingSpec, Some(idx))
-                        } else {
-                            acc
-                        }
-                    }
-                    _ => acc,
-                },
-            );
-            (is_present, compile_attribute)
-        })
-        .collect::<Vec<_>>();
-
-    let what = attributes
-        .iter()
-        .fold((Found::No, None), |acc, ((present, idx), _)| {
-            if acc.0 == Found::No {
-                (*present, *idx)
-            } else {
-                acc
-            }
-        });
-    if what.0 != Found::WarnMissingSpecAll {
-        // Report on first compile attribute only
-        if let Some((_, compile_attribute)) = attributes.first() {
-            let range = compile_attribute
-                .form_id
-                .get_ast(sema.db, file_id)
-                .syntax()
-                .text_range();
-            report_diagnostic(sema, Some(range), file_id, what, diags)
+    fn severity(&self) -> Severity {
+        Severity::Error
+    }
+    fn should_process_test_files(&self) -> bool {
+        false
+    }
+    fn is_enabled(&self) -> bool {
+        false
+    }
+    fn should_process_file_id(&self, sema: &Semantic, file_id: FileId) -> bool {
+        let file_kind = sema.db.file_kind(file_id);
+        match file_kind {
+            FileKind::Header | FileKind::Other | FileKind::OutsideProjectModel => false,
+            _ => true,
         }
     }
 }
 
-#[derive(Debug, Clone, Copy, Eq, PartialEq)]
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
+pub struct Context {
+    found: Found,
+    compile_option_id: Option<CompileOptionId>,
+    target_range: TextRange,
+}
+
+impl GenericLinter for MissingCompileWarnMissingSpec {
+    type Context = Context;
+
+    fn matches(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<GenericLinterMatchContext<Context>>> {
+        let mut res = Vec::new();
+        let form_list = sema.form_list(file_id);
+        if form_list.compile_attributes().next().is_none() {
+            res.push(GenericLinterMatchContext {
+                range: DIAGNOSTIC_WHOLE_FILE_RANGE,
+                context: Context {
+                    found: Found::No,
+                    compile_option_id: None,
+                    target_range: DIAGNOSTIC_WHOLE_FILE_RANGE,
+                },
+            });
+        }
+        let attributes = form_list
+            .compile_attributes()
+            .map(|(idx, compile_attribute)| {
+                let co = sema.db.compile_body(InFile::new(file_id, idx));
+                let is_present = FoldCtx::fold_term(
+                    Strategy {
+                        macros: MacroStrategy::Expand,
+                        parens: ParenStrategy::InvisibleParens,
+                    },
+                    &co.body,
+                    co.value,
+                    (Found::No, None),
+                    &mut |acc, ctx| match &ctx.item {
+                        AnyExpr::Term(Term::Literal(Literal::Atom(atom))) => {
+                            let name = sema.db.lookup_atom(*atom);
+                            if MISSING_SPEC_ALL_OPTIONS.contains(&name) {
+                                (Found::WarnMissingSpecAll, Some(idx))
+                            } else if MISSING_SPEC_OPTIONS.contains(&name) {
+                                (Found::WarnMissingSpec, Some(idx))
+                            } else {
+                                acc
+                            }
+                        }
+                        _ => acc,
+                    },
+                );
+                (is_present, compile_attribute)
+            })
+            .collect::<Vec<_>>();
+        let what = attributes
+            .iter()
+            .fold((Found::No, None), |acc, ((present, idx), _)| {
+                if acc.0 == Found::No {
+                    (*present, *idx)
+                } else {
+                    acc
+                }
+            });
+        if what.0 != Found::WarnMissingSpecAll {
+            // Report on first compile attribute only
+            if let Some((_, compile_attribute)) = attributes.first() {
+                let range = compile_attribute
+                    .form_id
+                    .get_ast(sema.db, file_id)
+                    .syntax()
+                    .text_range();
+                res.push(GenericLinterMatchContext {
+                    range,
+                    context: Context {
+                        found: what.0,
+                        compile_option_id: what.1,
+                        target_range: range,
+                    },
+                });
+            }
+        }
+        Some(res)
+    }
+
+    fn fixes(
+        &self,
+        context: &Self::Context,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<elp_ide_assists::Assist>> {
+        let mut builder = SourceChangeBuilder::new(file_id);
+        if context.found == Found::No {
+            add_compile_option(sema, file_id, "warn_missing_spec_all", None, &mut builder);
+        } else {
+            // We already have warn_missing_spec, upgrade it to warn_missing_spec_all
+            if let Some(co_id) = context.compile_option_id {
+                rename_atom_in_compile_attribute(
+                    sema,
+                    file_id,
+                    &co_id,
+                    "warn_missing_spec",
+                    "warn_missing_spec_all",
+                    &mut builder,
+                );
+            }
+        }
+        let edit = builder.finish();
+        Some(vec![fix(
+            "add_warn_missing_spec_all",
+            "Add compile option 'warn_missing_spec_all'",
+            edit,
+            context.target_range,
+        )])
+    }
+}
+
+pub static LINTER: MissingCompileWarnMissingSpec = MissingCompileWarnMissingSpec;
+
+#[derive(Debug, Default, Clone, Copy, Eq, PartialEq)]
 enum Found {
+    #[default]
     No,
     WarnMissingSpec,
     WarnMissingSpecAll,
@@ -146,43 +216,6 @@ lazy_static! {
     };
 }
 
-fn report_diagnostic(
-    sema: &Semantic,
-    range: Option<TextRange>,
-    file_id: FileId,
-    what: (Found, Option<CompileOptionId>),
-    diags: &mut Vec<Diagnostic>,
-) {
-    let range = range.unwrap_or(DIAGNOSTIC_WHOLE_FILE_RANGE);
-
-    let mut builder = SourceChangeBuilder::new(file_id);
-    if what.0 == Found::No {
-        add_compile_option(sema, file_id, "warn_missing_spec_all", None, &mut builder);
-    } else {
-        // We already have warn_missing_spec, upgrade it to warn_missing_spec_all
-        if let Some(co_id) = what.1 {
-            rename_atom_in_compile_attribute(
-                sema,
-                file_id,
-                &co_id,
-                "warn_missing_spec",
-                "warn_missing_spec_all",
-                &mut builder,
-            );
-        }
-    }
-    let edit = builder.finish();
-    let d = Diagnostic::new(
-        crate::diagnostics::DiagnosticCode::MissingCompileWarnMissingSpec,
-            "Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced.".to_string(),
-        range,
-    ).with_fixes(Some(vec![fix("add_warn_missing_spec_all",
-                               "Add compile option 'warn_missing_spec_all'",
-                               edit, range)]))
-    .with_ignore_fix(sema, file_id);
-    diags.push(d);
-}
-
 #[cfg(test)]
 mod tests {
 
@@ -197,8 +230,9 @@ mod tests {
 
     #[track_caller]
     pub(crate) fn check_fix(fixture_before: &str, fixture_after: Expect) {
-        let config =
-            DiagnosticsConfig::default().enable(DiagnosticCode::MissingCompileWarnMissingSpec);
+        let config = DiagnosticsConfig::default()
+            .disable(DiagnosticCode::NoNoWarnSuppressions)
+            .enable(DiagnosticCode::MissingCompileWarnMissingSpec);
         check_fix_with_config(config, fixture_before, fixture_after)
     }
 
@@ -208,17 +242,17 @@ mod tests {
         fixture_before: &str,
         fixture_after: Expect,
     ) {
-        let config =
-            DiagnosticsConfig::default().enable(DiagnosticCode::MissingCompileWarnMissingSpec);
+        let config = DiagnosticsConfig::default()
+            .disable(DiagnosticCode::NoNoWarnSuppressions)
+            .enable(DiagnosticCode::MissingCompileWarnMissingSpec);
         check_specific_fix_with_config(Some(assist_label), fixture_before, fixture_after, config)
     }
 
     #[track_caller]
     pub(crate) fn check_diagnostics(fixture: &str) {
         let config = DiagnosticsConfig::default()
-            .enable(DiagnosticCode::MissingCompileWarnMissingSpec)
             .disable(DiagnosticCode::NoNoWarnSuppressions)
-            .disable(DiagnosticCode::UnspecificInclude);
+            .enable(DiagnosticCode::MissingCompileWarnMissingSpec);
         check_diagnostics_with_config(config, fixture)
     }
 
@@ -367,19 +401,20 @@ mod tests {
 
     #[test]
     fn not_in_generated_file() {
-        check_diagnostics(
+        check_diagnostics(&format!(
             r#"
             //- /erl/my_app/src/main.erl
             %% -*- coding: utf-8 -*-
             %% Automatically generated, do not edit
-            %% @generated from blah
+            %% @{} from blah
             %% To generate, see targets and instructions in local Makefile
             %% Version source: git
             -module(main).
             -eqwalizer(ignore).
 
             "#,
-        )
+            "generated" // Separate string, to avoid to mark this module itself as generated
+        ))
     }
 
     #[test]
diff --git a/test_projects/linter/elp_lint_test2.toml b/test_projects/linter/elp_lint_test2.toml
index 22878a22a6..0b70173c8b 100644
--- a/test_projects/linter/elp_lint_test2.toml
+++ b/test_projects/linter/elp_lint_test2.toml
@@ -1,2 +1,5 @@
 enabled_lints =['L1268', 'W0011', 'W0012']
 disabled_lints = []
+
+[linters.compile-warn-missing-spec]
+enabled = true

From 20b8d9950a4295424b638c6f56ecfedeb2301219 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 14 Nov 2025 10:05:06 -0800
Subject: [PATCH 272/394] Convert undocumented_module linter to use trait

Summary:
Even if the `undocumented_module` is supposed to be disabled by default, it still runs. This is due to a flawed logic in `diagnostics.rs`, originally introduced in D59272525.

This is problematic, since open-source projects such as OTP see a huge number of errors when running the `elp lint` command without specifying a custom configuration.

By converting the linter to use the new trait, we incidentally fix the bug.

One more linters uses a `default_disabled: true` property in its descriptor: `undocumented_function`. It will be converted next, and the logic to handle the `default_disabled` will eventually be removed.

Reviewed By: alanz

Differential Revision: D87059857

fbshipit-source-id: 7fb6eff8773c786c6894548c914b8e3c78c38745
---
 .../resolves_generated_includes.stdout        |  15 +--
 ...e_elp_no_lint_specified_json_output.stdout |   8 --
 .../parse_elp_no_lint_specified_output.stdout |  24 +---
 .../test/linter/warnings_as_errors.stdout     |  24 +---
 crates/ide/src/diagnostics.rs                 |   2 +-
 .../src/diagnostics/undocumented_module.rs    | 121 +++++++++++-------
 6 files changed, 93 insertions(+), 101 deletions(-)

diff --git a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
index b5ed320571..913a0281ee 100644
--- a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
+++ b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
@@ -1,19 +1,12 @@
 Reporting all diagnostics codes
-Diagnostics reported in 5 modules:
-  app_a: 2
+Diagnostics reported in 3 modules:
+  app_a: 1
       5:9-5:31::[WeakWarning] [W0037] Unspecific include.
-      0:8-0:13::[WeakWarning] [W0046] The module is not documented.
-  auto_gen_a: 1
-      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
-      0:8-0:20::[WeakWarning] [W0046] The module is not documented.
+  top_includer: 2
       0:1-0:1::[Error] [L0000] Issue in included file
       12:4-12:10::[Error] [E1508] undefined macro 'THIRD/2'
-  wa_buck2_module_search: 6
+  wa_buck2_module_search: 5
       19:0-19:18::[WeakWarning] [W0040] The function is non-trivial, exported, but not documented.
-      2:8-2:30::[WeakWarning] [W0046] The module is not documented.
       54:18-54:31::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
       56:18-56:28::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
       56:38-56:51::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
diff --git a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
index b8924b40ed..0385484785 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
@@ -1,23 +1,15 @@
 {"path":"app_a/src/app_a.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0011 (application_get_env)","original":null,"replacement":null,"description":"module `app_a` belongs to app `app_a`, but reads env for `misc`\n\nFor more information see: /erlang-error-index/w/W0011","docPath":"website/docs/erlang-error-index/w/W0011.md"}
 {"path":"app_a/src/app_a.erl","line":9,"char":1,"code":"ELP","severity":"error","name":"P1700 (head_mismatch)","original":null,"replacement":null,"description":"head mismatch 'fooX' vs 'food'\n\nFor more information see: /erlang-error-index/p/P1700","docPath":null}
 {"path":"app_a/src/app_a.erl","line":8,"char":7,"code":"ELP","severity":"warning","name":"W0018 (unexpected_semi_or_dot)","original":null,"replacement":null,"description":"Unexpected ';'\n\nFor more information see: /erlang-error-index/w/W0018","docPath":"website/docs/erlang-error-index/w/W0018.md"}
-{"path":"app_a/src/app_a.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
 {"path":"app_a/src/app_a.erl","line":13,"char":5,"code":"ELP","severity":"warning","name":"W0026 (unexported_function)","original":null,"replacement":null,"description":"Function 'app_a:baz/2' is not exported.\n\nFor more information see: /erlang-error-index/w/W0026","docPath":"website/docs/erlang-error-index/w/W0026.md"}
 {"path":"app_a/src/app_a.erl","line":12,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function bar/0 is unused\n\nFor more information see: /erlang-error-index/l/L1230","docPath":null}
 {"path":"app_a/src/app_a.erl","line":16,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function baz/2 is unused\n\nFor more information see: /erlang-error-index/l/L1230","docPath":null}
-{"path":"app_a/src/app_a_edoc.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
-{"path":"app_a/src/app_a_ssr.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
-{"path":"app_a/src/app_a_unused_param.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
 {"path":"app_a/src/app_a_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"L1268 (L1268)","original":null,"replacement":null,"description":"variable 'X' is unused\n\nFor more information see: /erlang-error-index/l/L1268","docPath":null}
 {"path":"app_b/src/app_b.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0011 (application_get_env)","original":null,"replacement":null,"description":"module `app_b` belongs to app `app_b`, but reads env for `misc`\n\nFor more information see: /erlang-error-index/w/W0011","docPath":"website/docs/erlang-error-index/w/W0011.md"}
-{"path":"app_b/src/app_b.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
-{"path":"app_b/src/app_b_unused_param.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
 {"path":"app_b/src/app_b_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"L1268 (L1268)","original":null,"replacement":null,"description":"variable 'X' is unused\n\nFor more information see: /erlang-error-index/l/L1268","docPath":null}
 {"path":"app_a/src/custom_function_matches.erl","line":13,"char":5,"code":"ELP","severity":"warning","name":"W0017 (undefined_function)","original":null,"replacement":null,"description":"Function 'excluded:function/0' is undefined.\n\nFor more information see: /erlang-error-index/w/W0017","docPath":"website/docs/erlang-error-index/w/W0017.md"}
 {"path":"app_a/src/custom_function_matches.erl","line":14,"char":5,"code":"ELP","severity":"warning","name":"W0017 (undefined_function)","original":null,"replacement":null,"description":"Function 'not_excluded:function/0' is undefined.\n\nFor more information see: /erlang-error-index/w/W0017","docPath":"website/docs/erlang-error-index/w/W0017.md"}
 {"path":"app_a/src/custom_function_matches.erl","line":15,"char":5,"code":"ELP","severity":"warning","name":"W0017 (undefined_function)","original":null,"replacement":null,"description":"Function 'cross:call/0' is undefined.\n\nFor more information see: /erlang-error-index/w/W0017","docPath":"website/docs/erlang-error-index/w/W0017.md"}
-{"path":"app_a/src/expression_updates_literal.erl","line":2,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
 {"path":"app_a/src/expression_updates_literal.erl","line":7,"char":1,"code":"ELP","severity":"warning","name":"L1309 (L1309)","original":null,"replacement":null,"description":"missing specification for function a_fun/0\n\nFor more information see: /erlang-error-index/l/L1309","docPath":null}
 {"path":"app_a/src/expression_updates_literal.erl","line":8,"char":7,"code":"ELP","severity":"warning","name":"L1318 (L1318)","original":null,"replacement":null,"description":"expression updates a literal\n\nFor more information see: /erlang-error-index/l/L1318","docPath":null}
 {"path":"app_a/src/spelling.erl","line":2,"char":2,"code":"ELP","severity":"error","name":"W0013 (misspelled_attribute)","original":null,"replacement":null,"description":"misspelled attribute, saw 'dyalizer' but expected 'dialyzer'\n\nFor more information see: /erlang-error-index/w/W0013","docPath":"website/docs/erlang-error-index/w/W0013.md"}
-{"path":"app_a/src/spelling.erl","line":1,"char":9,"code":"ELP","severity":"disabled","name":"W0046 (undocumented_module)","original":null,"replacement":null,"description":"The module is not documented.\n\nFor more information see: /erlang-error-index/w/W0046","docPath":"website/docs/erlang-error-index/w/W0046.md"}
diff --git a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
index 6e3e3d56ea..2efe7fa2de 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
@@ -1,34 +1,24 @@
 Reporting all diagnostics codes
-Diagnostics reported in 9 modules:
-  app_a: 7
+Diagnostics reported in 7 modules:
+  app_a: 6
       4:4-4:34::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
       8:0-8:4::[Error] [P1700] head mismatch 'fooX' vs 'food'
       7:6-7:7::[Warning] [W0018] Unexpected ';'
-      0:8-0:13::[WeakWarning] [W0046] The module is not documented.
       12:4-12:13::[Warning] [W0026] Function 'app_a:baz/2' is not exported.
       11:0-11:3::[Warning] [L1230] function bar/0 is unused
       15:0-15:3::[Warning] [L1230] function baz/2 is unused
-  app_a_edoc: 1
-      0:8-0:18::[WeakWarning] [W0046] The module is not documented.
-  app_a_ssr: 1
-      0:8-0:17::[WeakWarning] [W0046] The module is not documented.
-  app_a_unused_param: 2
-      0:8-0:26::[WeakWarning] [W0046] The module is not documented.
+  app_a_unused_param: 1
       4:4-4:5::[Warning] [L1268] variable 'X' is unused
-  app_b: 2
+  app_b: 1
       4:4-4:34::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
-      0:8-0:13::[WeakWarning] [W0046] The module is not documented.
-  app_b_unused_param: 2
-      0:8-0:26::[WeakWarning] [W0046] The module is not documented.
+  app_b_unused_param: 1
       4:4-4:5::[Warning] [L1268] variable 'X' is unused
   custom_function_matches: 3
       12:4-12:21::[Warning] [W0017] Function 'excluded:function/0' is undefined.
       13:4-13:25::[Warning] [W0017] Function 'not_excluded:function/0' is undefined.
       14:4-14:14::[Warning] [W0017] Function 'cross:call/0' is undefined.
-  expression_updates_literal: 3
-      1:8-1:34::[WeakWarning] [W0046] The module is not documented.
+  expression_updates_literal: 2
       6:0-6:5::[Warning] [L1309] missing specification for function a_fun/0
       7:6-8:15::[Warning] [L1318] expression updates a literal
-  spelling: 2
+  spelling: 1
       1:1-1:9::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
-      0:8-0:16::[WeakWarning] [W0046] The module is not documented.
diff --git a/crates/elp/src/resources/test/linter/warnings_as_errors.stdout b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
index 60edb2b6d4..831df4f97a 100644
--- a/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
+++ b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
@@ -1,34 +1,24 @@
 Reporting all diagnostics codes
-Diagnostics reported in 9 modules:
-  app_a: 7
+Diagnostics reported in 7 modules:
+  app_a: 6
       4:4-4:34::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
       8:0-8:4::[Error] [P1700] head mismatch 'fooX' vs 'food'
       7:6-7:7::[Warning] [W0018] Unexpected ';'
-      0:8-0:13::[WeakWarning] [W0046] The module is not documented.
       12:4-12:13::[Warning] [W0026] Function 'app_a:baz/2' is not exported.
       11:0-11:3::[Error] [L1230] function bar/0 is unused
       15:0-15:3::[Error] [L1230] function baz/2 is unused
-  app_a_edoc: 1
-      0:8-0:18::[WeakWarning] [W0046] The module is not documented.
-  app_a_ssr: 1
-      0:8-0:17::[WeakWarning] [W0046] The module is not documented.
-  app_a_unused_param: 2
-      0:8-0:26::[WeakWarning] [W0046] The module is not documented.
+  app_a_unused_param: 1
       4:4-4:5::[Error] [L1268] variable 'X' is unused
-  app_b: 2
+  app_b: 1
       4:4-4:34::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
-      0:8-0:13::[WeakWarning] [W0046] The module is not documented.
-  app_b_unused_param: 2
-      0:8-0:26::[WeakWarning] [W0046] The module is not documented.
+  app_b_unused_param: 1
       4:4-4:5::[Error] [L1268] variable 'X' is unused
   custom_function_matches: 3
       12:4-12:21::[Warning] [W0017] Function 'excluded:function/0' is undefined.
       13:4-13:25::[Warning] [W0017] Function 'not_excluded:function/0' is undefined.
       14:4-14:14::[Warning] [W0017] Function 'cross:call/0' is undefined.
-  expression_updates_literal: 3
-      1:8-1:34::[WeakWarning] [W0046] The module is not documented.
+  expression_updates_literal: 2
       6:0-6:5::[Error] [L1309] missing specification for function a_fun/0
       7:6-8:15::[Error] [L1318] expression updates a literal
-  spelling: 2
+  spelling: 1
       1:1-1:9::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
-      0:8-0:16::[WeakWarning] [W0046] The module is not documented.
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index c435e16efb..fa84826faf 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1502,7 +1502,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &macro_precedence_suprise::DESCRIPTOR,
         &undocumented_function::DESCRIPTOR,
         &duplicate_module::DESCRIPTOR,
-        &undocumented_module::DESCRIPTOR,
         &no_dialyzer_attribute::DESCRIPTOR,
         &no_catch::DESCRIPTOR,
         &no_nowarn_suppressions::DESCRIPTOR,
@@ -1584,6 +1583,7 @@ const SSR_PATTERN_LINTERS: &[&dyn SsrPatternsDiagnostics] = &[
 const GENERIC_LINTERS: &[&dyn GenericDiagnostics] = &[
     &unused_macro::LINTER,
     &missing_compile_warn_missing_spec::LINTER,
+    &undocumented_module::LINTER,
 ];
 
 /// Unified registry for all types of linters
diff --git a/crates/ide/src/diagnostics/undocumented_module.rs b/crates/ide/src/diagnostics/undocumented_module.rs
index ad440d5acd..96a3a6c13a 100644
--- a/crates/ide/src/diagnostics/undocumented_module.rs
+++ b/crates/ide/src/diagnostics/undocumented_module.rs
@@ -14,62 +14,89 @@ use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChangeBuilder;
 use elp_syntax::AstNode;
 use elp_text_edit::TextRange;
-use elp_text_edit::TextSize;
 use hir::Semantic;
 
-use super::Diagnostic;
-use super::DiagnosticCode;
-use super::DiagnosticConditions;
-use super::DiagnosticDescriptor;
-use super::Severity;
+use crate::diagnostics::DiagnosticCode;
+use crate::diagnostics::GenericLinter;
+use crate::diagnostics::GenericLinterMatchContext;
+use crate::diagnostics::Linter;
+use crate::diagnostics::Severity;
+use crate::fix;
 
-const DIAGNOSTIC_CODE: DiagnosticCode = DiagnosticCode::UndocumentedModule;
-const DIAGNOSTIC_MESSAGE: &str = "The module is not documented.";
-const DIAGNOSTIC_SEVERITY: Severity = Severity::WeakWarning;
-const FIX_ID: &str = "add_moduledoc_false";
-const FIX_LABEL: &str = "Add `-moduledoc false.` attribute";
+pub(crate) struct UndocumentedModuleLinter;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: false,
-        include_tests: false,
-        default_disabled: true,
-    },
-    checker: &|diags, sema, file_id, _ext| {
-        check(diags, sema, file_id);
-    },
-};
-
-fn check(diagnostics: &mut Vec<Diagnostic>, sema: &Semantic, file_id: FileId) -> Option<()> {
-    let def_map = sema.def_map_local(file_id);
-    let module_attribute = sema.module_attribute(file_id)?;
-    let module_has_no_docs = def_map.moduledoc.is_empty()
-        && def_map.moduledoc_metadata.is_empty()
-        && sema
-            .module_edoc_header(file_id, &module_attribute)
-            .is_none();
-    if module_has_no_docs {
-        let module_name = module_attribute.name()?;
-        let module_name_range = module_name.syntax().text_range();
-        let moduledoc_insert_offset = helpers::moduledoc_insert_offset(sema, file_id)?;
-        let fixes = fixes(file_id, moduledoc_insert_offset, module_name_range);
-        let diagnostic = Diagnostic::new(DIAGNOSTIC_CODE, DIAGNOSTIC_MESSAGE, module_name_range)
-            .with_severity(DIAGNOSTIC_SEVERITY)
-            .with_fixes(Some(fixes));
-        diagnostics.push(diagnostic);
+impl Linter for UndocumentedModuleLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::UndocumentedModule
+    }
+
+    fn description(&self) -> &'static str {
+        "The module is not documented."
+    }
+
+    fn severity(&self) -> Severity {
+        Severity::WeakWarning
+    }
+
+    fn is_enabled(&self) -> bool {
+        false
+    }
+
+    fn should_process_test_files(&self) -> bool {
+        false
     }
-    Some(())
 }
 
-fn fixes(file_id: FileId, insert_offset: TextSize, show_range: TextRange) -> Vec<Assist> {
-    let mut builder = SourceChangeBuilder::new(file_id);
-    builder.insert(insert_offset, "-moduledoc false.\n");
-    let source_change = builder.finish();
-    let fix = crate::fix(FIX_ID, FIX_LABEL, source_change, show_range);
-    vec![fix]
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
+pub struct Context {
+    module_name_range: TextRange,
 }
 
+impl GenericLinter for UndocumentedModuleLinter {
+    type Context = Context;
+
+    fn matches(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<GenericLinterMatchContext<Context>>> {
+        let mut res = Vec::new();
+        let def_map = sema.def_map_local(file_id);
+        let module_attribute = sema.module_attribute(file_id)?;
+        let module_has_no_docs = def_map.moduledoc.is_empty()
+            && def_map.moduledoc_metadata.is_empty()
+            && sema
+                .module_edoc_header(file_id, &module_attribute)
+                .is_none();
+        if module_has_no_docs {
+            let module_name = module_attribute.name()?;
+            let module_name_range = module_name.syntax().text_range();
+            let context = Context { module_name_range };
+            res.push(GenericLinterMatchContext {
+                range: module_name_range,
+                context,
+            });
+        }
+        Some(res)
+    }
+
+    fn fixes(&self, context: &Context, sema: &Semantic, file_id: FileId) -> Option<Vec<Assist>> {
+        let insert_offset = helpers::moduledoc_insert_offset(sema, file_id)?;
+        let mut builder = SourceChangeBuilder::new(file_id);
+        builder.insert(insert_offset, "-moduledoc false.\n");
+        let source_change = builder.finish();
+        let fix = fix(
+            "add_moduledoc_false",
+            "Add `-moduledoc false.` attribute",
+            source_change,
+            context.module_name_range,
+        );
+        Some(vec![fix])
+    }
+}
+
+pub static LINTER: UndocumentedModuleLinter = UndocumentedModuleLinter;
+
 #[cfg(test)]
 mod tests {
 

From 30a992691fadfe520665c347996618e9fd4290bb Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 14 Nov 2025 10:05:06 -0800
Subject: [PATCH 273/394] Convert the undocumented_function linter to use trait

Summary:
Even if the `undocumented_function` is supposed to be disabled by default, it still runs. This is due to a flawed logic in `diagnostics.rs`, originally introduced in D59272525.

This is problematic, since open-source projects such as OTP see a huge number of errors when running the `elp lint` command without specifying a custom configuration.

By converting the linter to use the new trait, we incidentally fix the bug.

This was the last linter using the `default_disabled: true` logic. At this point the enabled/disabled logic can be simplified.

Reviewed By: alanz

Differential Revision: D87060203

fbshipit-source-id: 1121d286c766fb461420e3268aca817169020d7d
---
 .../resolves_generated_includes.stdout        |   3 +-
 crates/ide/src/diagnostics.rs                 |   2 +-
 .../src/diagnostics/undocumented_function.rs  | 104 ++++++++++++------
 3 files changed, 70 insertions(+), 39 deletions(-)

diff --git a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
index 913a0281ee..83f167f14a 100644
--- a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
+++ b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
@@ -5,8 +5,7 @@ Diagnostics reported in 3 modules:
   top_includer: 2
       0:1-0:1::[Error] [L0000] Issue in included file
       12:4-12:10::[Error] [E1508] undefined macro 'THIRD/2'
-  wa_buck2_module_search: 5
-      19:0-19:18::[WeakWarning] [W0040] The function is non-trivial, exported, but not documented.
+  wa_buck2_module_search: 4
       54:18-54:31::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
       56:18-56:28::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
       56:38-56:51::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index fa84826faf..d01bb86d87 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1500,7 +1500,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &unspecific_include::DESCRIPTOR,
         &edoc::DESCRIPTOR,
         &macro_precedence_suprise::DESCRIPTOR,
-        &undocumented_function::DESCRIPTOR,
         &duplicate_module::DESCRIPTOR,
         &no_dialyzer_attribute::DESCRIPTOR,
         &no_catch::DESCRIPTOR,
@@ -1584,6 +1583,7 @@ const GENERIC_LINTERS: &[&dyn GenericDiagnostics] = &[
     &unused_macro::LINTER,
     &missing_compile_warn_missing_spec::LINTER,
     &undocumented_module::LINTER,
+    &undocumented_function::LINTER,
 ];
 
 /// Unified registry for all types of linters
diff --git a/crates/ide/src/diagnostics/undocumented_function.rs b/crates/ide/src/diagnostics/undocumented_function.rs
index c895b52622..41fdeb0229 100644
--- a/crates/ide/src/diagnostics/undocumented_function.rs
+++ b/crates/ide/src/diagnostics/undocumented_function.rs
@@ -8,11 +8,12 @@
  * above-listed licenses.
  */
 
-use elp_ide_assists::helpers::unwrap_parens;
 // Diagnostic: undocumented-function
+use elp_ide_assists::helpers::unwrap_parens;
 use elp_ide_db::elp_base_db::FileId;
 use elp_syntax::ast;
 use elp_syntax::ast::Atom;
+use elp_text_edit::TextRange;
 use fxhash::FxHashSet;
 use hir::AsName;
 use hir::FunctionDef;
@@ -21,37 +22,66 @@ use hir::Semantic;
 use hir::form_list::ModuleDocAttribute;
 use hir::known;
 
-use super::Diagnostic;
-use super::DiagnosticCode;
-use super::DiagnosticConditions;
-use super::DiagnosticDescriptor;
-use super::Severity;
+use crate::diagnostics::DiagnosticCode;
+use crate::diagnostics::GenericLinter;
+use crate::diagnostics::GenericLinterMatchContext;
+use crate::diagnostics::Linter;
+use crate::diagnostics::Severity;
 
-const DIAGNOSTIC_CODE: DiagnosticCode = DiagnosticCode::UndocumentedFunction;
-const DIAGNOSTIC_MESSAGE: &str = "The function is non-trivial, exported, but not documented.";
-const DIAGNOSTIC_SEVERITY: Severity = Severity::WeakWarning;
+pub(crate) struct UndocumentedFunctionLinter;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: false,
-        include_tests: false,
-        default_disabled: true,
-    },
-    checker: &|diags, sema, file_id, _ext| {
-        check(diags, sema, file_id);
-    },
-};
+impl Linter for UndocumentedFunctionLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::UndocumentedFunction
+    }
 
-fn check(diagnostics: &mut Vec<Diagnostic>, sema: &Semantic, file_id: FileId) {
-    let callbacks = sema.resolve_callbacks(file_id);
-    if !contains_moduledoc_hidden_attribute(sema, file_id) {
-        sema.def_map_local(file_id)
-            .get_functions()
-            .for_each(|(_arity, def)| check_function(diagnostics, sema, def, &callbacks));
+    fn description(&self) -> &'static str {
+        "The function is non-trivial, exported, but not documented."
+    }
+
+    fn severity(&self) -> Severity {
+        Severity::WeakWarning
+    }
+
+    fn is_enabled(&self) -> bool {
+        false
+    }
+
+    fn should_process_test_files(&self) -> bool {
+        false
     }
 }
 
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
+pub struct Context {
+    range: TextRange,
+}
+
+impl GenericLinter for UndocumentedFunctionLinter {
+    type Context = Context;
+
+    fn matches(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<GenericLinterMatchContext<Context>>> {
+        let mut res = Vec::new();
+        let callbacks = sema.resolve_callbacks(file_id);
+        if !contains_moduledoc_hidden_attribute(sema, file_id) {
+            sema.def_map_local(file_id)
+                .get_functions()
+                .for_each(|(_arity, def)| {
+                    if let Some(match_context) = check_function(sema, def, &callbacks) {
+                        res.push(match_context);
+                    }
+                });
+        }
+        Some(res)
+    }
+}
+
+pub static LINTER: UndocumentedFunctionLinter = UndocumentedFunctionLinter;
+
 fn contains_moduledoc_hidden_attribute(sema: &Semantic, file_id: FileId) -> bool {
     sema.form_list(file_id)
         .moduledoc_attributes()
@@ -87,20 +117,22 @@ fn function_should_be_checked(
 }
 
 fn check_function(
-    diagnostics: &mut Vec<Diagnostic>,
     sema: &Semantic,
     def: &FunctionDef,
     callbacks: &FxHashSet<NameArity>,
-) {
+) -> Option<GenericLinterMatchContext<Context>> {
     if function_should_be_checked(sema, def, callbacks)
         && !def.has_doc_attribute()
         && !def.has_doc_attribute_metadata()
         && def.edoc_comments(sema.db).is_none()
         && let Some(name_range) = def.name_range(sema.db)
     {
-        let diagnostic = Diagnostic::new(DIAGNOSTIC_CODE, DIAGNOSTIC_MESSAGE, name_range)
-            .with_severity(DIAGNOSTIC_SEVERITY);
-        diagnostics.push(diagnostic);
+        Some(GenericLinterMatchContext {
+            range: name_range,
+            context: Context { range: name_range },
+        })
+    } else {
+        None
     }
 }
 
@@ -130,7 +162,7 @@ mod tests {
     -module(main).
     -export([main/0]).
     main() ->
- %% ^^^^ weak: W0040: The function is non-trivial, exported, but not documented.
+ %% ^^^^ 💡 weak: W0040: The function is non-trivial, exported, but not documented.
       [ok,
        ok,
        ok,
@@ -147,7 +179,7 @@ mod tests {
     -module(main).
     -export([main/0]).
     main() ->
- %% ^^^^ weak: W0040: The function is non-trivial, exported, but not documented.
+ %% ^^^^ 💡 weak: W0040: The function is non-trivial, exported, but not documented.
       [ok,
        ok,
        ok,
@@ -317,7 +349,7 @@ mod tests {
     -export([handle_call/1]).
 
     main() ->
-    %%<^ weak: W0040: The function is non-trivial, exported, but not documented.
+    %%<^ 💡 weak: W0040: The function is non-trivial, exported, but not documented.
       [ok,
        ok,
        ok,
@@ -349,7 +381,7 @@ mod tests {
       ok.
 
     complex() ->
-    %%<^^^^ weak: W0040: The function is non-trivial, exported, but not documented.
+    %%<^^^^ 💡 weak: W0040: The function is non-trivial, exported, but not documented.
       [ok,
        ok,
        ok,
@@ -370,7 +402,7 @@ mod tests {
       ok.
 
     complex(a) ->
-    %%<^^^^ weak: W0040: The function is non-trivial, exported, but not documented.
+    %%<^^^^ 💡 weak: W0040: The function is non-trivial, exported, but not documented.
       [ok];
     complex(b) ->
       [ok,

From 717422ebfed8fc9d87473e2b410641ff02a84ae0 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 17 Nov 2025 02:22:16 -0800
Subject: [PATCH 274/394] Convert the no_catch linter to use a trait

Summary: Simple conversion to use the new trait.

Reviewed By: TD5

Differential Revision: D87078566

fbshipit-source-id: 5e019d3b968a78997d1ebe24f5b168cf8fce4b1f
---
 crates/ide/src/diagnostics.rs          |  2 +-
 crates/ide/src/diagnostics/no_catch.rs | 77 +++++++++++++++++---------
 2 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index d01bb86d87..a6684a7144 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1502,7 +1502,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &macro_precedence_suprise::DESCRIPTOR,
         &duplicate_module::DESCRIPTOR,
         &no_dialyzer_attribute::DESCRIPTOR,
-        &no_catch::DESCRIPTOR,
         &no_nowarn_suppressions::DESCRIPTOR,
     ]
 }
@@ -1584,6 +1583,7 @@ const GENERIC_LINTERS: &[&dyn GenericDiagnostics] = &[
     &missing_compile_warn_missing_spec::LINTER,
     &undocumented_module::LINTER,
     &undocumented_function::LINTER,
+    &no_catch::LINTER,
 ];
 
 /// Unified registry for all types of linters
diff --git a/crates/ide/src/diagnostics/no_catch.rs b/crates/ide/src/diagnostics/no_catch.rs
index 3823131724..a804f248bd 100644
--- a/crates/ide/src/diagnostics/no_catch.rs
+++ b/crates/ide/src/diagnostics/no_catch.rs
@@ -8,7 +8,8 @@
  * above-listed licenses.
  */
 
-use elp_ide_db::DiagnosticCode;
+// Diagnostic: no-catch
+use elp_ide_db::elp_base_db::FileId;
 use elp_syntax::AstNode;
 use hir::AnyExpr;
 use hir::AnyExprId;
@@ -20,28 +21,48 @@ use hir::Strategy;
 use hir::fold::MacroStrategy;
 use hir::fold::ParenStrategy;
 
-use super::DiagnosticConditions;
-use super::DiagnosticDescriptor;
-use crate::diagnostics::Diagnostic;
-use crate::diagnostics::Severity;
+use crate::diagnostics::DiagnosticCode;
+use crate::diagnostics::GenericLinter;
+use crate::diagnostics::GenericLinterMatchContext;
+use crate::diagnostics::Linter;
 
-const DIAGNOSTIC_CODE: DiagnosticCode = DiagnosticCode::NoCatch;
-const DIAGNOSTIC_MESSAGE: &str = "Avoid `catch`.";
-const DIAGNOSTIC_SEVERITY: Severity = Severity::Warning;
+pub(crate) struct NoCatchLinter;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: false,
-        include_tests: true,
-        default_disabled: false,
-    },
-    checker: &|diagnostics, sema, file_id, _ext| {
-        sema.for_each_function(file_id, |def| check_function(diagnostics, sema, def));
-    },
-};
+impl Linter for NoCatchLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::NoCatch
+    }
 
-fn check_function(diagnostics: &mut Vec<Diagnostic>, sema: &Semantic, def: &FunctionDef) {
+    fn description(&self) -> &'static str {
+        "Avoid `catch`."
+    }
+}
+
+impl GenericLinter for NoCatchLinter {
+    type Context = ();
+
+    fn matches(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<GenericLinterMatchContext<Self::Context>>> {
+        let mut res = Vec::new();
+        sema.def_map_local(file_id)
+            .get_functions()
+            .for_each(|(_, def)| {
+                check_function(&mut res, sema, def);
+            });
+        Some(res)
+    }
+}
+
+pub static LINTER: NoCatchLinter = NoCatchLinter;
+
+fn check_function(
+    matches: &mut Vec<GenericLinterMatchContext<()>>,
+    sema: &Semantic,
+    def: &FunctionDef,
+) {
     let def_fb = def.in_function_body(sema, def);
     def_fb.fold_function(
         Strategy {
@@ -52,15 +73,19 @@ fn check_function(diagnostics: &mut Vec<Diagnostic>, sema: &Semantic, def: &Func
         &mut |_acc, clause_id, ctx| {
             if let AnyExpr::Expr(Expr::Catch { expr: _ }) = ctx.item {
                 let map = def_fb.get_body_map(clause_id);
-                if let Some(diagnostic) = make_diagnostic(sema, &map, ctx.item_id) {
-                    diagnostics.push(diagnostic);
+                if let Some(match_context) = make_match_context(sema, &map, ctx.item_id) {
+                    matches.push(match_context);
                 }
             };
         },
     )
 }
 
-fn make_diagnostic(sema: &Semantic, map: &BodySourceMap, item_id: AnyExprId) -> Option<Diagnostic> {
+fn make_match_context(
+    sema: &Semantic,
+    map: &BodySourceMap,
+    item_id: AnyExprId,
+) -> Option<GenericLinterMatchContext<()>> {
     match item_id {
         AnyExprId::Expr(expr_id) => {
             let ast_ptr = map.expr(expr_id)?;
@@ -68,9 +93,7 @@ fn make_diagnostic(sema: &Semantic, map: &BodySourceMap, item_id: AnyExprId) ->
                 elp_syntax::ast::Expr::CatchExpr(catch_expr) => {
                     let catch_keyword = catch_expr.syntax().first_token()?;
                     let range = catch_keyword.text_range();
-                    let diagnostic = Diagnostic::new(DIAGNOSTIC_CODE, DIAGNOSTIC_MESSAGE, range)
-                        .with_severity(DIAGNOSTIC_SEVERITY);
-                    Some(diagnostic)
+                    Some(GenericLinterMatchContext { range, context: () })
                 }
                 _ => None,
             }
@@ -93,7 +116,7 @@ mod tests {
 
               catcher(X,Y) ->
               case catch X/Y of
-              %%   ^^^^^ warning: W0052: Avoid `catch`.
+              %%   ^^^^^ 💡 warning: W0052: Avoid `catch`.
                 {'EXIT', {badarith,_}} -> "uh oh";
                 N -> N
               end.

From 8394c84d6b4a5604b39c48a54deede5e084cfad5 Mon Sep 17 00:00:00 2001
From: Daniel Gorin <danielgo@meta.com>
Date: Mon, 17 Nov 2025 13:07:42 -0800
Subject: [PATCH 275/394] Bump docusaurus to 3.9.2

Summary: This also bumps js-yaml to 4.1.1, addressing CVE-2025-64718

Reviewed By: robertoaloi

Differential Revision: D87222063

fbshipit-source-id: f36270df43f8412a880df7e730f562178a825156
---
 website/package.json |    4 +-
 website/yarn.lock    | 2233 +++++++++++++++++++-----------------------
 2 files changed, 1026 insertions(+), 1211 deletions(-)

diff --git a/website/package.json b/website/package.json
index 4053a7477f..5d813e2035 100644
--- a/website/package.json
+++ b/website/package.json
@@ -16,8 +16,8 @@
     "write-heading-ids": "docusaurus write-heading-ids"
   },
   "dependencies": {
-    "@docusaurus/core": "3.6.3",
-    "@docusaurus/preset-classic": "3.6.3",
+    "@docusaurus/core": "3.9.2",
+    "@docusaurus/preset-classic": "3.9.2",
     "@mdx-js/react": "^3.0.0",
     "clsx": "^2.0.0",
     "prism-react-renderer": "^2.3.0",
diff --git a/website/yarn.lock b/website/yarn.lock
index c07cd453c7..1aa091c893 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -2,274 +2,191 @@
 # yarn lockfile v1
 
 
-"@algolia/autocomplete-core@1.17.7":
-  version "1.17.7"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.17.7.tgz#2c410baa94a47c5c5f56ed712bb4a00ebe24088b"
-  integrity sha512-BjiPOW6ks90UKl7TwMv7oNQMnzU+t/wk9mgIDi6b1tXpUek7MW0lbNOUHpvam9pe3lVCf4xPFT+lK7s+e+fs7Q==
+"@ai-sdk/gateway@2.0.9":
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/@ai-sdk/gateway/-/gateway-2.0.9.tgz#33b77dfee9a068df7bd8e11b4e10b9f1ee4228dd"
+  integrity sha512-E6x4h5CPPPJ0za1r5HsLtHbeI+Tp3H+YFtcH8G3dSSPFE6w+PZINzB4NxLZmg1QqSeA5HTP3ZEzzsohp0o2GEw==
   dependencies:
-    "@algolia/autocomplete-plugin-algolia-insights" "1.17.7"
-    "@algolia/autocomplete-shared" "1.17.7"
+    "@ai-sdk/provider" "2.0.0"
+    "@ai-sdk/provider-utils" "3.0.17"
+    "@vercel/oidc" "3.0.3"
 
-"@algolia/autocomplete-plugin-algolia-insights@1.17.7":
-  version "1.17.7"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.17.7.tgz#7d2b105f84e7dd8f0370aa4c4ab3b704e6760d82"
-  integrity sha512-Jca5Ude6yUOuyzjnz57og7Et3aXjbwCSDf/8onLHSQgw1qW3ALl9mrMWaXb5FmPVkV3EtkD2F/+NkT6VHyPu9A==
+"@ai-sdk/provider-utils@3.0.17":
+  version "3.0.17"
+  resolved "https://registry.yarnpkg.com/@ai-sdk/provider-utils/-/provider-utils-3.0.17.tgz#2f3d0be398d3f165efe8dd252b63aea6ac3896d1"
+  integrity sha512-TR3Gs4I3Tym4Ll+EPdzRdvo/rc8Js6c4nVhFLuvGLX/Y4V9ZcQMa/HTiYsHEgmYrf1zVi6Q145UEZUfleOwOjw==
   dependencies:
-    "@algolia/autocomplete-shared" "1.17.7"
+    "@ai-sdk/provider" "2.0.0"
+    "@standard-schema/spec" "^1.0.0"
+    eventsource-parser "^3.0.6"
 
-"@algolia/autocomplete-preset-algolia@1.17.7":
-  version "1.17.7"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.17.7.tgz#c9badc0d73d62db5bf565d839d94ec0034680ae9"
-  integrity sha512-ggOQ950+nwbWROq2MOCIL71RE0DdQZsceqrg32UqnhDz8FlO9rL8ONHNsI2R1MH0tkgVIDKI/D0sMiUchsFdWA==
+"@ai-sdk/provider@2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@ai-sdk/provider/-/provider-2.0.0.tgz#b853c739d523b33675bc74b6c506b2c690bc602b"
+  integrity sha512-6o7Y2SeO9vFKB8lArHXehNuusnpddKPk7xqL7T2/b+OvXMRIXUO1rR4wcv1hAFUAT9avGZshty3Wlua/XA7TvA==
   dependencies:
-    "@algolia/autocomplete-shared" "1.17.7"
+    json-schema "^0.4.0"
 
-"@algolia/autocomplete-shared@1.17.7":
-  version "1.17.7"
-  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.17.7.tgz#105e84ad9d1a31d3fb86ba20dc890eefe1a313a0"
-  integrity sha512-o/1Vurr42U/qskRSuhBH+VKxMvkkUVTLU6WZQr+L5lGZZLYWyhdzWjW0iGXY7EkwRTjBqvN2EsR81yCTGV/kmg==
-
-"@algolia/cache-browser-local-storage@4.24.0":
-  version "4.24.0"
-  resolved "https://registry.yarnpkg.com/@algolia/cache-browser-local-storage/-/cache-browser-local-storage-4.24.0.tgz#97bc6d067a9fd932b9c922faa6b7fd6e546e1348"
-  integrity sha512-t63W9BnoXVrGy9iYHBgObNXqYXM3tYXCjDSHeNwnsc324r4o5UiVKUiAB4THQ5z9U5hTj6qUvwg/Ez43ZD85ww==
+"@ai-sdk/react@^2.0.30":
+  version "2.0.93"
+  resolved "https://registry.yarnpkg.com/@ai-sdk/react/-/react-2.0.93.tgz#c81f8550a2ac44799c7527a75be19b1c3cf60dac"
+  integrity sha512-2TzhpQr10HuWxpqyHpSAUMRUqD1G2O73J2sAaJChomVDbjr7BwpM0mdR3aRamCXNtuLiJmTFQhbNzw8fXMBdYw==
   dependencies:
-    "@algolia/cache-common" "4.24.0"
+    "@ai-sdk/provider-utils" "3.0.17"
+    ai "5.0.93"
+    swr "^2.2.5"
+    throttleit "2.1.0"
 
-"@algolia/cache-common@4.24.0":
-  version "4.24.0"
-  resolved "https://registry.yarnpkg.com/@algolia/cache-common/-/cache-common-4.24.0.tgz#81a8d3a82ceb75302abb9b150a52eba9960c9744"
-  integrity sha512-emi+v+DmVLpMGhp0V9q9h5CdkURsNmFC+cOS6uK9ndeJm9J4TiqSvPYVu+THUP8P/S08rxf5x2P+p3CfID0Y4g==
-
-"@algolia/cache-in-memory@4.24.0":
-  version "4.24.0"
-  resolved "https://registry.yarnpkg.com/@algolia/cache-in-memory/-/cache-in-memory-4.24.0.tgz#ffcf8872f3a10cb85c4f4641bdffd307933a6e44"
-  integrity sha512-gDrt2so19jW26jY3/MkFg5mEypFIPbPoXsQGQWAi6TrCPsNOSEYepBMPlucqWigsmEy/prp5ug2jy/N3PVG/8w==
+"@algolia/abtesting@1.10.0":
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/@algolia/abtesting/-/abtesting-1.10.0.tgz#7f4c915d3e3188e6af101e6f4e829cda795d3caf"
+  integrity sha512-mQT3jwuTgX8QMoqbIR7mPlWkqQqBPQaPabQzm37xg2txMlaMogK/4hCiiESGdg39MlHZOVHeV+0VJuE7f5UK8A==
   dependencies:
-    "@algolia/cache-common" "4.24.0"
+    "@algolia/client-common" "5.44.0"
+    "@algolia/requester-browser-xhr" "5.44.0"
+    "@algolia/requester-fetch" "5.44.0"
+    "@algolia/requester-node-http" "5.44.0"
 
-"@algolia/client-abtesting@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-abtesting/-/client-abtesting-5.15.0.tgz#6414895e2246dc7b7facd97bd98c3abe13cabe59"
-  integrity sha512-FaEM40iuiv1mAipYyiptP4EyxkJ8qHfowCpEeusdHUC4C7spATJYArD2rX3AxkVeREkDIgYEOuXcwKUbDCr7Nw==
+"@algolia/autocomplete-core@1.19.2":
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-core/-/autocomplete-core-1.19.2.tgz#702df67a08cb3cfe8c33ee1111ef136ec1a9e232"
+  integrity sha512-mKv7RyuAzXvwmq+0XRK8HqZXt9iZ5Kkm2huLjgn5JoCPtDy+oh9yxUMfDDaVCw0oyzZ1isdJBc7l9nuCyyR7Nw==
   dependencies:
-    "@algolia/client-common" "5.15.0"
-    "@algolia/requester-browser-xhr" "5.15.0"
-    "@algolia/requester-fetch" "5.15.0"
-    "@algolia/requester-node-http" "5.15.0"
+    "@algolia/autocomplete-plugin-algolia-insights" "1.19.2"
+    "@algolia/autocomplete-shared" "1.19.2"
 
-"@algolia/client-account@4.24.0":
-  version "4.24.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-account/-/client-account-4.24.0.tgz#eba7a921d828e7c8c40a32d4add21206c7fe12f1"
-  integrity sha512-adcvyJ3KjPZFDybxlqnf+5KgxJtBjwTPTeyG2aOyoJvx0Y8dUQAEOEVOJ/GBxX0WWNbmaSrhDURMhc+QeevDsA==
+"@algolia/autocomplete-plugin-algolia-insights@1.19.2":
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.19.2.tgz#3584b625b9317e333d1ae43664d02358e175c52d"
+  integrity sha512-TjxbcC/r4vwmnZaPwrHtkXNeqvlpdyR+oR9Wi2XyfORkiGkLTVhX2j+O9SaCCINbKoDfc+c2PB8NjfOnz7+oKg==
   dependencies:
-    "@algolia/client-common" "4.24.0"
-    "@algolia/client-search" "4.24.0"
-    "@algolia/transporter" "4.24.0"
+    "@algolia/autocomplete-shared" "1.19.2"
 
-"@algolia/client-analytics@4.24.0":
-  version "4.24.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-4.24.0.tgz#9d2576c46a9093a14e668833c505ea697a1a3e30"
-  integrity sha512-y8jOZt1OjwWU4N2qr8G4AxXAzaa8DBvyHTWlHzX/7Me1LX8OayfgHexqrsL4vSBcoMmVw2XnVW9MhL+Y2ZDJXg==
+"@algolia/autocomplete-shared@1.19.2":
+  version "1.19.2"
+  resolved "https://registry.yarnpkg.com/@algolia/autocomplete-shared/-/autocomplete-shared-1.19.2.tgz#c0b7b8dc30a5c65b70501640e62b009535e4578f"
+  integrity sha512-jEazxZTVD2nLrC+wYlVHQgpBoBB5KPStrJxLzsIFl6Kqd1AlG9sIAGl39V5tECLpIQzB3Qa2T6ZPJ1ChkwMK/w==
+
+"@algolia/client-abtesting@5.44.0":
+  version "5.44.0"
+  resolved "https://registry.yarnpkg.com/@algolia/client-abtesting/-/client-abtesting-5.44.0.tgz#33e35fb59bfdb5bef26eb38902de5bdae3766e1e"
+  integrity sha512-KY5CcrWhRTUo/lV7KcyjrZkPOOF9bjgWpMj9z98VA+sXzVpZtkuskBLCKsWYFp2sbwchZFTd3wJM48H0IGgF7g==
   dependencies:
-    "@algolia/client-common" "4.24.0"
-    "@algolia/client-search" "4.24.0"
-    "@algolia/requester-common" "4.24.0"
-    "@algolia/transporter" "4.24.0"
+    "@algolia/client-common" "5.44.0"
+    "@algolia/requester-browser-xhr" "5.44.0"
+    "@algolia/requester-fetch" "5.44.0"
+    "@algolia/requester-node-http" "5.44.0"
 
-"@algolia/client-analytics@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-5.15.0.tgz#7ca1043cba7ac225d30e8bb52579504946b95f58"
-  integrity sha512-lho0gTFsQDIdCwyUKTtMuf9nCLwq9jOGlLGIeQGKDxXF7HbiAysFIu5QW/iQr1LzMgDyM9NH7K98KY+BiIFriQ==
+"@algolia/client-analytics@5.44.0":
+  version "5.44.0"
+  resolved "https://registry.yarnpkg.com/@algolia/client-analytics/-/client-analytics-5.44.0.tgz#2fdf0d41ac39fd071a9cde7c9a118b2ffb3ce8d9"
+  integrity sha512-LKOCE8S4ewI9bN3ot9RZoYASPi8b78E918/DVPW3HHjCMUe6i+NjbNG6KotU4RpP6AhRWZjjswbOkWelUO+OoA==
   dependencies:
-    "@algolia/client-common" "5.15.0"
-    "@algolia/requester-browser-xhr" "5.15.0"
-    "@algolia/requester-fetch" "5.15.0"
-    "@algolia/requester-node-http" "5.15.0"
+    "@algolia/client-common" "5.44.0"
+    "@algolia/requester-browser-xhr" "5.44.0"
+    "@algolia/requester-fetch" "5.44.0"
+    "@algolia/requester-node-http" "5.44.0"
 
-"@algolia/client-common@4.24.0":
-  version "4.24.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-4.24.0.tgz#77c46eee42b9444a1d1c1583a83f7df4398a649d"
-  integrity sha512-bc2ROsNL6w6rqpl5jj/UywlIYC21TwSSoFHKl01lYirGMW+9Eek6r02Tocg4gZ8HAw3iBvu6XQiM3BEbmEMoiA==
+"@algolia/client-common@5.44.0":
+  version "5.44.0"
+  resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-5.44.0.tgz#aacc0fe3d07afae0d70bf7581b39d377f0bc0b7a"
+  integrity sha512-1yyJm4OYC2cztbS28XYVWwLXdwpLsMG4LoZLOltVglQ2+hc/i9q9fUDZyjRa2Bqt4DmkIfezagfMrokhyH4uxQ==
+
+"@algolia/client-insights@5.44.0":
+  version "5.44.0"
+  resolved "https://registry.yarnpkg.com/@algolia/client-insights/-/client-insights-5.44.0.tgz#350f93bab703fa102acf82685364732937369025"
+  integrity sha512-wVQWK6jYYsbEOjIMI+e5voLGPUIbXrvDj392IckXaCPvQ6vCMTXakQqOYCd+znQdL76S+3wHDo77HZWiAYKrtA==
   dependencies:
-    "@algolia/requester-common" "4.24.0"
-    "@algolia/transporter" "4.24.0"
+    "@algolia/client-common" "5.44.0"
+    "@algolia/requester-browser-xhr" "5.44.0"
+    "@algolia/requester-fetch" "5.44.0"
+    "@algolia/requester-node-http" "5.44.0"
 
-"@algolia/client-common@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-common/-/client-common-5.15.0.tgz#cd47ae07a3afc7065438a2dab29f8434f848928e"
-  integrity sha512-IofrVh213VLsDkPoSKMeM9Dshrv28jhDlBDLRcVJQvlL8pzue7PEB1EZ4UoJFYS3NSn7JOcJ/V+olRQzXlJj1w==
-
-"@algolia/client-insights@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-insights/-/client-insights-5.15.0.tgz#f3bead0edd10e69365895da4a96044064b504f4d"
-  integrity sha512-bDDEQGfFidDi0UQUCbxXOCdphbVAgbVmxvaV75cypBTQkJ+ABx/Npw7LkFGw1FsoVrttlrrQbwjvUB6mLVKs/w==
+"@algolia/client-personalization@5.44.0":
+  version "5.44.0"
+  resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-5.44.0.tgz#b2c20dc59026babd695c571eb6015a8b46acb892"
+  integrity sha512-lkgRjOjOkqmIkebHjHpU9rLJcJNUDMm+eVSW/KJQYLjGqykEZxal+nYJJTBbLceEU2roByP/+27ZmgIwCdf0iA==
   dependencies:
-    "@algolia/client-common" "5.15.0"
-    "@algolia/requester-browser-xhr" "5.15.0"
-    "@algolia/requester-fetch" "5.15.0"
-    "@algolia/requester-node-http" "5.15.0"
+    "@algolia/client-common" "5.44.0"
+    "@algolia/requester-browser-xhr" "5.44.0"
+    "@algolia/requester-fetch" "5.44.0"
+    "@algolia/requester-node-http" "5.44.0"
 
-"@algolia/client-personalization@4.24.0":
-  version "4.24.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-4.24.0.tgz#8b47789fb1cb0f8efbea0f79295b7c5a3850f6ae"
-  integrity sha512-l5FRFm/yngztweU0HdUzz1rC4yoWCFo3IF+dVIVTfEPg906eZg5BOd1k0K6rZx5JzyyoP4LdmOikfkfGsKVE9w==
+"@algolia/client-query-suggestions@5.44.0":
+  version "5.44.0"
+  resolved "https://registry.yarnpkg.com/@algolia/client-query-suggestions/-/client-query-suggestions-5.44.0.tgz#d39d0b21fe6b38f8dab2f1f201db6d6e5225908f"
+  integrity sha512-sYfhgwKu6NDVmZHL1WEKVLsOx/jUXCY4BHKLUOcYa8k4COCs6USGgz6IjFkUf+niwq8NCECMmTC4o/fVQOalsA==
   dependencies:
-    "@algolia/client-common" "4.24.0"
-    "@algolia/requester-common" "4.24.0"
-    "@algolia/transporter" "4.24.0"
+    "@algolia/client-common" "5.44.0"
+    "@algolia/requester-browser-xhr" "5.44.0"
+    "@algolia/requester-fetch" "5.44.0"
+    "@algolia/requester-node-http" "5.44.0"
 
-"@algolia/client-personalization@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-personalization/-/client-personalization-5.15.0.tgz#e962793ebf737a5ffa4867d2dfdfe17924be3833"
-  integrity sha512-LfaZqLUWxdYFq44QrasCDED5bSYOswpQjSiIL7Q5fYlefAAUO95PzBPKCfUhSwhb4rKxigHfDkd81AvEicIEoA==
+"@algolia/client-search@5.44.0":
+  version "5.44.0"
+  resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-5.44.0.tgz#04ca43ee8181bf16f9df085286214ad3c06de126"
+  integrity sha512-/FRKUM1G4xn3vV8+9xH1WJ9XknU8rkBGlefruq9jDhYUAvYozKimhrmC2pRqw/RyHhPivmgZCRuC8jHP8piz4Q==
   dependencies:
-    "@algolia/client-common" "5.15.0"
-    "@algolia/requester-browser-xhr" "5.15.0"
-    "@algolia/requester-fetch" "5.15.0"
-    "@algolia/requester-node-http" "5.15.0"
-
-"@algolia/client-query-suggestions@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-query-suggestions/-/client-query-suggestions-5.15.0.tgz#d9a2d0d0660241bdae5fc36a6f1fcf339abbafeb"
-  integrity sha512-wu8GVluiZ5+il8WIRsGKu8VxMK9dAlr225h878GGtpTL6VBvwyJvAyLdZsfFIpY0iN++jiNb31q2C1PlPL+n/A==
-  dependencies:
-    "@algolia/client-common" "5.15.0"
-    "@algolia/requester-browser-xhr" "5.15.0"
-    "@algolia/requester-fetch" "5.15.0"
-    "@algolia/requester-node-http" "5.15.0"
-
-"@algolia/client-search@4.24.0":
-  version "4.24.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-4.24.0.tgz#75e6c02d33ef3e0f34afd9962c085b856fc4a55f"
-  integrity sha512-uRW6EpNapmLAD0mW47OXqTP8eiIx5F6qN9/x/7HHO6owL3N1IXqydGwW5nhDFBrV+ldouro2W1VX3XlcUXEFCA==
-  dependencies:
-    "@algolia/client-common" "4.24.0"
-    "@algolia/requester-common" "4.24.0"
-    "@algolia/transporter" "4.24.0"
-
-"@algolia/client-search@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/client-search/-/client-search-5.15.0.tgz#8645f5bc87a959b8008e021d8b31d55a47920b94"
-  integrity sha512-Z32gEMrRRpEta5UqVQA612sLdoqY3AovvUPClDfMxYrbdDAebmGDVPtSogUba1FZ4pP5dx20D3OV3reogLKsRA==
-  dependencies:
-    "@algolia/client-common" "5.15.0"
-    "@algolia/requester-browser-xhr" "5.15.0"
-    "@algolia/requester-fetch" "5.15.0"
-    "@algolia/requester-node-http" "5.15.0"
+    "@algolia/client-common" "5.44.0"
+    "@algolia/requester-browser-xhr" "5.44.0"
+    "@algolia/requester-fetch" "5.44.0"
+    "@algolia/requester-node-http" "5.44.0"
 
 "@algolia/events@^4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@algolia/events/-/events-4.0.1.tgz#fd39e7477e7bc703d7f893b556f676c032af3950"
   integrity sha512-FQzvOCgoFXAbf5Y6mYozw2aj5KCJoA3m4heImceldzPSMbdyS4atVjJzXKMsfX3wnZTFYwkkt8/z8UesLHlSBQ==
 
-"@algolia/ingestion@1.15.0":
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/ingestion/-/ingestion-1.15.0.tgz#a3f3ec2139042f8597c2a975430a6f77cd764db3"
-  integrity sha512-MkqkAxBQxtQ5if/EX2IPqFA7LothghVyvPoRNA/meS2AW2qkHwcxjuiBxv4H6mnAVEPfJlhu9rkdVz9LgCBgJg==
+"@algolia/ingestion@1.44.0":
+  version "1.44.0"
+  resolved "https://registry.yarnpkg.com/@algolia/ingestion/-/ingestion-1.44.0.tgz#f6bd13216c5a589414f43f9bec78db55cb022d90"
+  integrity sha512-5+S5ynwMmpTpCLXGjTDpeIa81J+R4BLH0lAojOhmeGSeGEHQTqacl/4sbPyDTcidvnWhaqtyf8m42ue6lvISAw==
   dependencies:
-    "@algolia/client-common" "5.15.0"
-    "@algolia/requester-browser-xhr" "5.15.0"
-    "@algolia/requester-fetch" "5.15.0"
-    "@algolia/requester-node-http" "5.15.0"
+    "@algolia/client-common" "5.44.0"
+    "@algolia/requester-browser-xhr" "5.44.0"
+    "@algolia/requester-fetch" "5.44.0"
+    "@algolia/requester-node-http" "5.44.0"
 
-"@algolia/logger-common@4.24.0":
-  version "4.24.0"
-  resolved "https://registry.yarnpkg.com/@algolia/logger-common/-/logger-common-4.24.0.tgz#28d439976019ec0a46ba7a1a739ef493d4ef8123"
-  integrity sha512-LLUNjkahj9KtKYrQhFKCzMx0BY3RnNP4FEtO+sBybCjJ73E8jNdaKJ/Dd8A/VA4imVHP5tADZ8pn5B8Ga/wTMA==
-
-"@algolia/logger-console@4.24.0":
-  version "4.24.0"
-  resolved "https://registry.yarnpkg.com/@algolia/logger-console/-/logger-console-4.24.0.tgz#c6ff486036cd90b81d07a95aaba04461da7e1c65"
-  integrity sha512-X4C8IoHgHfiUROfoRCV+lzSy+LHMgkoEEU1BbKcsfnV0i0S20zyy0NLww9dwVHUWNfPPxdMU+/wKmLGYf96yTg==
+"@algolia/monitoring@1.44.0":
+  version "1.44.0"
+  resolved "https://registry.yarnpkg.com/@algolia/monitoring/-/monitoring-1.44.0.tgz#423fa61d68826a72cd5c468b45b232d8ba379775"
+  integrity sha512-xhaTN8pXJjR6zkrecg4Cc9YZaQK2LKm2R+LkbAq+AYGBCWJxtSGlNwftozZzkUyq4AXWoyoc0x2SyBtq5LRtqQ==
   dependencies:
-    "@algolia/logger-common" "4.24.0"
+    "@algolia/client-common" "5.44.0"
+    "@algolia/requester-browser-xhr" "5.44.0"
+    "@algolia/requester-fetch" "5.44.0"
+    "@algolia/requester-node-http" "5.44.0"
 
-"@algolia/monitoring@1.15.0":
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/monitoring/-/monitoring-1.15.0.tgz#1eb58722ec9ea6e5de3621150f97a43571bd312e"
-  integrity sha512-QPrFnnGLMMdRa8t/4bs7XilPYnoUXDY8PMQJ1sf9ZFwhUysYYhQNX34/enoO0LBjpoOY6rLpha39YQEFbzgKyQ==
+"@algolia/recommend@5.44.0":
+  version "5.44.0"
+  resolved "https://registry.yarnpkg.com/@algolia/recommend/-/recommend-5.44.0.tgz#7e52b3e612bfd5bf82d14e05f577888a038279fa"
+  integrity sha512-GNcite/uOIS7wgRU1MT7SdNIupGSW+vbK9igIzMePvD2Dl8dy0O3urKPKIbTuZQqiVH1Cb84y5cgLvwNrdCj/Q==
   dependencies:
-    "@algolia/client-common" "5.15.0"
-    "@algolia/requester-browser-xhr" "5.15.0"
-    "@algolia/requester-fetch" "5.15.0"
-    "@algolia/requester-node-http" "5.15.0"
+    "@algolia/client-common" "5.44.0"
+    "@algolia/requester-browser-xhr" "5.44.0"
+    "@algolia/requester-fetch" "5.44.0"
+    "@algolia/requester-node-http" "5.44.0"
 
-"@algolia/recommend@4.24.0":
-  version "4.24.0"
-  resolved "https://registry.yarnpkg.com/@algolia/recommend/-/recommend-4.24.0.tgz#8a3f78aea471ee0a4836b78fd2aad4e9abcaaf34"
-  integrity sha512-P9kcgerfVBpfYHDfVZDvvdJv0lEoCvzNlOy2nykyt5bK8TyieYyiD0lguIJdRZZYGre03WIAFf14pgE+V+IBlw==
+"@algolia/requester-browser-xhr@5.44.0":
+  version "5.44.0"
+  resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-5.44.0.tgz#a007b2c7b665224b04e61a1246fa015f06bd4100"
+  integrity sha512-YZHBk72Cd7pcuNHzbhNzF/FbbYszlc7JhZlDyQAchnX5S7tcemSS96F39Sy8t4O4WQLpFvUf1MTNedlitWdOsQ==
   dependencies:
-    "@algolia/cache-browser-local-storage" "4.24.0"
-    "@algolia/cache-common" "4.24.0"
-    "@algolia/cache-in-memory" "4.24.0"
-    "@algolia/client-common" "4.24.0"
-    "@algolia/client-search" "4.24.0"
-    "@algolia/logger-common" "4.24.0"
-    "@algolia/logger-console" "4.24.0"
-    "@algolia/requester-browser-xhr" "4.24.0"
-    "@algolia/requester-common" "4.24.0"
-    "@algolia/requester-node-http" "4.24.0"
-    "@algolia/transporter" "4.24.0"
+    "@algolia/client-common" "5.44.0"
 
-"@algolia/recommend@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/recommend/-/recommend-5.15.0.tgz#8f3359ee7e855849ac3872f67c0672f6835c8f79"
-  integrity sha512-5eupMwSqMLDObgSMF0XG958zR6GJP3f7jHDQ3/WlzCM9/YIJiWIUoJFGsko9GYsA5xbLDHE/PhWtq4chcCdaGQ==
+"@algolia/requester-fetch@5.44.0":
+  version "5.44.0"
+  resolved "https://registry.yarnpkg.com/@algolia/requester-fetch/-/requester-fetch-5.44.0.tgz#055202db6b1ab37e042f207acb9e7f788e710089"
+  integrity sha512-B9WHl+wQ7uf46t9cq+vVM/ypVbOeuldVDq9OtKsX2ApL2g/htx6ImB9ugDOOJmB5+fE31/XPTuCcYz/j03+idA==
   dependencies:
-    "@algolia/client-common" "5.15.0"
-    "@algolia/requester-browser-xhr" "5.15.0"
-    "@algolia/requester-fetch" "5.15.0"
-    "@algolia/requester-node-http" "5.15.0"
+    "@algolia/client-common" "5.44.0"
 
-"@algolia/requester-browser-xhr@4.24.0":
-  version "4.24.0"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-4.24.0.tgz#313c5edab4ed73a052e75803855833b62dd19c16"
-  integrity sha512-Z2NxZMb6+nVXSjF13YpjYTdvV3032YTBSGm2vnYvYPA6mMxzM3v5rsCiSspndn9rzIW4Qp1lPHBvuoKJV6jnAA==
+"@algolia/requester-node-http@5.44.0":
+  version "5.44.0"
+  resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-5.44.0.tgz#3e2f56491303d1a94d172e98a1560af350950c01"
+  integrity sha512-MULm0qeAIk4cdzZ/ehJnl1o7uB5NMokg83/3MKhPq0Pk7+I0uELGNbzIfAkvkKKEYcHALemKdArtySF9eKzh/A==
   dependencies:
-    "@algolia/requester-common" "4.24.0"
-
-"@algolia/requester-browser-xhr@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-browser-xhr/-/requester-browser-xhr-5.15.0.tgz#5ffdccdf5cd7814ed3486bed418edb6db25c32a2"
-  integrity sha512-Po/GNib6QKruC3XE+WKP1HwVSfCDaZcXu48kD+gwmtDlqHWKc7Bq9lrS0sNZ456rfCKhXksOmMfUs4wRM/Y96w==
-  dependencies:
-    "@algolia/client-common" "5.15.0"
-
-"@algolia/requester-common@4.24.0":
-  version "4.24.0"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-common/-/requester-common-4.24.0.tgz#1c60c198031f48fcdb9e34c4057a3ea987b9a436"
-  integrity sha512-k3CXJ2OVnvgE3HMwcojpvY6d9kgKMPRxs/kVohrwF5WMr2fnqojnycZkxPoEg+bXm8fi5BBfFmOqgYztRtHsQA==
-
-"@algolia/requester-fetch@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-fetch/-/requester-fetch-5.15.0.tgz#2ce94d4855090fac192b208d95eeea22e1ca4489"
-  integrity sha512-rOZ+c0P7ajmccAvpeeNrUmEKoliYFL8aOR5qGW5pFq3oj3Iept7Y5mEtEsOBYsRt6qLnaXn4zUKf+N8nvJpcIw==
-  dependencies:
-    "@algolia/client-common" "5.15.0"
-
-"@algolia/requester-node-http@4.24.0":
-  version "4.24.0"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-4.24.0.tgz#4461593714031d02aa7da221c49df675212f482f"
-  integrity sha512-JF18yTjNOVYvU/L3UosRcvbPMGT9B+/GQWNWnenIImglzNVGpyzChkXLnrSf6uxwVNO6ESGu6oN8MqcGQcjQJw==
-  dependencies:
-    "@algolia/requester-common" "4.24.0"
-
-"@algolia/requester-node-http@5.15.0":
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/@algolia/requester-node-http/-/requester-node-http-5.15.0.tgz#e2020afcdaea56dc204bc6c82daab41478b32d87"
-  integrity sha512-b1jTpbFf9LnQHEJP5ddDJKE2sAlhYd7EVSOWgzo/27n/SfCoHfqD0VWntnWYD83PnOKvfe8auZ2+xCb0TXotrQ==
-  dependencies:
-    "@algolia/client-common" "5.15.0"
-
-"@algolia/transporter@4.24.0":
-  version "4.24.0"
-  resolved "https://registry.yarnpkg.com/@algolia/transporter/-/transporter-4.24.0.tgz#226bb1f8af62430374c1972b2e5c8580ab275102"
-  integrity sha512-86nI7w6NzWxd1Zp9q3413dRshDqAzSbsQjhcDhPIatEFiZrL1/TjnHL8S7jVKFePlIMzDsZWXAXwXzcok9c5oA==
-  dependencies:
-    "@algolia/cache-common" "4.24.0"
-    "@algolia/logger-common" "4.24.0"
-    "@algolia/requester-common" "4.24.0"
+    "@algolia/client-common" "5.44.0"
 
 "@ampproject/remapping@^2.2.0":
   version "2.3.0"
@@ -292,7 +209,7 @@
   resolved "https://registry.yarnpkg.com/@antfu/utils/-/utils-8.1.1.tgz#95b1947d292a9a2efffba2081796dcaa05ecedfb"
   integrity sha512-Mex9nXf9vR6AhcXmMrlz/HVgYYZpVGJ6YlPgwl7UnaFpnshXs6EK/oa5Gpf3CzENMjkvEx2tQtntGnb7UtSTOQ==
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.16.0", "@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.0", "@babel/code-frame@^7.26.2", "@babel/code-frame@^7.8.3":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.25.9", "@babel/code-frame@^7.26.0", "@babel/code-frame@^7.26.2":
   version "7.26.2"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
   integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==
@@ -1246,92 +1163,136 @@
   resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
   integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
 
-"@csstools/cascade-layer-name-parser@^2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-2.0.4.tgz#64d128529397aa1e1c986f685713363b262b81b1"
-  integrity sha512-7DFHlPuIxviKYZrOiwVU/PiHLm3lLUR23OMuEEtfEOQTOp9hzQ2JjdY6X5H18RVuUPJqSCI+qNnD5iOLMVE0bA==
+"@csstools/cascade-layer-name-parser@^2.0.5":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-2.0.5.tgz#43f962bebead0052a9fed1a2deeb11f85efcbc72"
+  integrity sha512-p1ko5eHgV+MgXFVa4STPKpvPxr6ReS8oS2jzTukjR74i5zJNyWO1ZM1m8YKBXnzDKWfBN1ztLYlHxbVemDD88A==
 
-"@csstools/color-helpers@^5.0.1":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-5.0.1.tgz#829f1c76f5800b79c51c709e2f36821b728e0e10"
-  integrity sha512-MKtmkA0BX87PKaO1NFRTFH+UnkgnmySQOvNxJubsadusqPEC2aJ9MOQiMceZJJ6oitUl/i0L6u0M1IrmAOmgBA==
+"@csstools/color-helpers@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-5.1.0.tgz#106c54c808cabfd1ab4c602d8505ee584c2996ef"
+  integrity sha512-S11EXWJyy0Mz5SYvRmY8nJYTFFd1LCNV+7cXyAgQtOOuzb4EsgfqDufL+9esx72/eLhsRdGZwaldu/h+E4t4BA==
 
-"@csstools/css-calc@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-2.1.0.tgz#3f28b8f8f736b8f78abbc75eebd55c756207e773"
-  integrity sha512-X69PmFOrjTZfN5ijxtI8hZ9kRADFSLrmmQ6hgDJ272Il049WGKpDY64KhrFm/7rbWve0z81QepawzjkKlqkNGw==
+"@csstools/css-calc@^2.1.4":
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-2.1.4.tgz#8473f63e2fcd6e459838dd412401d5948f224c65"
+  integrity sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==
 
-"@csstools/css-color-parser@^3.0.6":
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-3.0.6.tgz#e646838f6aab4618aeea7ba0c4921a254e180276"
-  integrity sha512-S/IjXqTHdpI4EtzGoNCHfqraXF37x12ZZHA1Lk7zoT5pm2lMjFuqhX/89L7dqX4CcMacKK+6ZCs5TmEGb/+wKw==
+"@csstools/css-color-parser@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz#4e386af3a99dd36c46fef013cfe4c1c341eed6f0"
+  integrity sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==
   dependencies:
-    "@csstools/color-helpers" "^5.0.1"
-    "@csstools/css-calc" "^2.1.0"
+    "@csstools/color-helpers" "^5.1.0"
+    "@csstools/css-calc" "^2.1.4"
 
-"@csstools/css-parser-algorithms@^3.0.4":
+"@csstools/css-parser-algorithms@^3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.5.tgz#5755370a9a29abaec5515b43c8b3f2cf9c2e3076"
+  integrity sha512-DaDeUkXZKjdGhgYaHNJTV9pV7Y9B3b644jCLs9Upc3VeNGg6LWARAT6O+Q+/COo+2gg/bM5rhpMAtf70WqfBdQ==
+
+"@csstools/css-tokenizer@^3.0.4":
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz#74426e93bd1c4dcab3e441f5cc7ba4fb35d94356"
-  integrity sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==
+  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-3.0.4.tgz#333fedabc3fd1a8e5d0100013731cf19e6a8c5d3"
+  integrity sha512-Vd/9EVDiu6PPJt9yAh6roZP6El1xHrdvIVGjyBsHR0RYwNHgL7FJPyIIW4fANJNG6FtyZfvlRPpFI4ZM/lubvw==
 
-"@csstools/css-tokenizer@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz#a5502c8539265fecbd873c1e395a890339f119c2"
-  integrity sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==
+"@csstools/media-query-list-parser@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-4.0.3.tgz#7aec77bcb89c2da80ef207e73f474ef9e1b3cdf1"
+  integrity sha512-HAYH7d3TLRHDOUQK4mZKf9k9Ph/m8Akstg66ywKR4SFAigjs3yBiUeZtFxywiTm5moZMAp/5W/ZuFnNXXYLuuQ==
 
-"@csstools/media-query-list-parser@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-4.0.2.tgz#e80e17eba1693fceafb8d6f2cfc68c0e7a9ab78a"
-  integrity sha512-EUos465uvVvMJehckATTlNqGj4UJWkTmdWuDMjqvSUkjGpmOyFZBVwb4knxCm/k2GMTXY+c/5RkdndzFYWeX5A==
+"@csstools/postcss-alpha-function@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-alpha-function/-/postcss-alpha-function-1.0.1.tgz#7989605711de7831bc7cd75b94c9b5bac9c3728e"
+  integrity sha512-isfLLwksH3yHkFXfCI2Gcaqg7wGGHZZwunoJzEZk0yKYIokgre6hYVFibKL3SYAoR1kBXova8LB+JoO5vZzi9w==
+  dependencies:
+    "@csstools/css-color-parser" "^3.1.0"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.2.1"
+    "@csstools/utilities" "^2.0.0"
 
-"@csstools/postcss-cascade-layers@^5.0.1":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-5.0.1.tgz#9640313e64b5e39133de7e38a5aa7f40dc259597"
-  integrity sha512-XOfhI7GShVcKiKwmPAnWSqd2tBR0uxt+runAxttbSp/LY2U16yAVPmAf7e9q4JJ0d+xMNmpwNDLBXnmRCl3HMQ==
+"@csstools/postcss-cascade-layers@^5.0.2":
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-5.0.2.tgz#dd2c70db3867b88975f2922da3bfbae7d7a2cae7"
+  integrity sha512-nWBE08nhO8uWl6kSAeCx4im7QfVko3zLrtgWZY4/bP87zrSPpSyN/3W3TDqz1jJuH+kbKOHXg5rJnK+ZVYcFFg==
   dependencies:
     "@csstools/selector-specificity" "^5.0.0"
     postcss-selector-parser "^7.0.0"
 
-"@csstools/postcss-color-function@^4.0.6":
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-4.0.6.tgz#dabd1e516ccd4c7bd5803e37075a503b5f7f0ac4"
-  integrity sha512-EcvXfC60cTIumzpsxWuvVjb7rsJEHPvqn3jeMEBUaE3JSc4FRuP7mEQ+1eicxWmIrs3FtzMH9gR3sgA5TH+ebQ==
+"@csstools/postcss-color-function-display-p3-linear@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function-display-p3-linear/-/postcss-color-function-display-p3-linear-1.0.1.tgz#3017ff5e1f65307d6083e58e93d76724fb1ebf9f"
+  integrity sha512-E5qusdzhlmO1TztYzDIi8XPdPoYOjoTY6HBYBCYSj+Gn4gQRBlvjgPQXzfzuPQqt8EhkC/SzPKObg4Mbn8/xMg==
   dependencies:
-    "@csstools/css-color-parser" "^3.0.6"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/css-color-parser" "^3.1.0"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.2.1"
     "@csstools/utilities" "^2.0.0"
 
-"@csstools/postcss-color-mix-function@^3.0.6":
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-mix-function/-/postcss-color-mix-function-3.0.6.tgz#d971832ec30b3b60363bceddfeb4b90c7cc0f4b8"
-  integrity sha512-jVKdJn4+JkASYGhyPO+Wa5WXSx1+oUgaXb3JsjJn/BlrtFh5zjocCY7pwWi0nuP24V1fY7glQsxEYcYNy0dMFg==
+"@csstools/postcss-color-function@^4.0.12":
+  version "4.0.12"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-4.0.12.tgz#a7c85a98c77b522a194a1bbb00dd207f40c7a771"
+  integrity sha512-yx3cljQKRaSBc2hfh8rMZFZzChaFgwmO2JfFgFr1vMcF3C/uyy5I4RFIBOIWGq1D+XbKCG789CGkG6zzkLpagA==
   dependencies:
-    "@csstools/css-color-parser" "^3.0.6"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/css-color-parser" "^3.1.0"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.2.1"
     "@csstools/utilities" "^2.0.0"
 
-"@csstools/postcss-content-alt-text@^2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-content-alt-text/-/postcss-content-alt-text-2.0.4.tgz#76f4687fb15ed45bc1139bb71e5775779762897a"
-  integrity sha512-YItlZUOuZJCBlRaCf8Aucc1lgN41qYGALMly0qQllrxYJhiyzlI6RxOTMUvtWk+KhS8GphMDsDhKQ7KTPfEMSw==
+"@csstools/postcss-color-mix-function@^3.0.12":
+  version "3.0.12"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-mix-function/-/postcss-color-mix-function-3.0.12.tgz#2f1ee9f8208077af069545c9bd79bb9733382c2a"
+  integrity sha512-4STERZfCP5Jcs13P1U5pTvI9SkgLgfMUMhdXW8IlJWkzOOOqhZIjcNhWtNJZes2nkBDsIKJ0CJtFtuaZ00moag==
   dependencies:
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/css-color-parser" "^3.1.0"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.2.1"
     "@csstools/utilities" "^2.0.0"
 
-"@csstools/postcss-exponential-functions@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-exponential-functions/-/postcss-exponential-functions-2.0.5.tgz#0c39f75df3357ee1e444b0aa0ede4e12aafea0e9"
-  integrity sha512-mi8R6dVfA2nDoKM3wcEi64I8vOYEgQVtVKCfmLHXupeLpACfGAided5ddMt5f+CnEodNu4DifuVwb0I6fQDGGQ==
+"@csstools/postcss-color-mix-variadic-function-arguments@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-mix-variadic-function-arguments/-/postcss-color-mix-variadic-function-arguments-1.0.2.tgz#b4012b62a4eaa24d694172bb7137f9d2319cb8f2"
+  integrity sha512-rM67Gp9lRAkTo+X31DUqMEq+iK+EFqsidfecmhrteErxJZb6tUoJBVQca1Vn1GpDql1s1rD1pKcuYzMsg7Z1KQ==
   dependencies:
-    "@csstools/css-calc" "^2.1.0"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
+    "@csstools/css-color-parser" "^3.1.0"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.2.1"
+    "@csstools/utilities" "^2.0.0"
+
+"@csstools/postcss-content-alt-text@^2.0.8":
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-content-alt-text/-/postcss-content-alt-text-2.0.8.tgz#1d52da1762893c32999ff76839e48d6ec7c7a4cb"
+  integrity sha512-9SfEW9QCxEpTlNMnpSqFaHyzsiRpZ5J5+KqCu1u5/eEJAWsMhzT40qf0FIbeeglEvrGRMdDzAxMIz3wqoGSb+Q==
+  dependencies:
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.2.1"
+    "@csstools/utilities" "^2.0.0"
+
+"@csstools/postcss-contrast-color-function@^2.0.12":
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-contrast-color-function/-/postcss-contrast-color-function-2.0.12.tgz#ca46986d095c60f208d9e3f24704d199c9172637"
+  integrity sha512-YbwWckjK3qwKjeYz/CijgcS7WDUCtKTd8ShLztm3/i5dhh4NaqzsbYnhm4bjrpFpnLZ31jVcbK8YL77z3GBPzA==
+  dependencies:
+    "@csstools/css-color-parser" "^3.1.0"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.2.1"
+    "@csstools/utilities" "^2.0.0"
+
+"@csstools/postcss-exponential-functions@^2.0.9":
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-exponential-functions/-/postcss-exponential-functions-2.0.9.tgz#fc03d1272888cb77e64cc1a7d8a33016e4f05c69"
+  integrity sha512-abg2W/PI3HXwS/CZshSa79kNWNZHdJPMBXeZNyPQFbbj8sKO3jXxOt/wF7juJVjyDTc6JrvaUZYFcSBZBhaxjw==
+  dependencies:
+    "@csstools/css-calc" "^2.1.4"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
 
 "@csstools/postcss-font-format-keywords@^4.0.0":
   version "4.0.0"
@@ -1341,67 +1302,67 @@
     "@csstools/utilities" "^2.0.0"
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-gamut-mapping@^2.0.6":
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-gamut-mapping/-/postcss-gamut-mapping-2.0.6.tgz#04ec6a50fdbca2a30dec56e6bb780c79621e47a7"
-  integrity sha512-0ke7fmXfc8H+kysZz246yjirAH6JFhyX9GTlyRnM0exHO80XcA9zeJpy5pOp5zo/AZiC/q5Pf+Hw7Pd6/uAoYA==
+"@csstools/postcss-gamut-mapping@^2.0.11":
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-gamut-mapping/-/postcss-gamut-mapping-2.0.11.tgz#be0e34c9f0142852cccfc02b917511f0d677db8b"
+  integrity sha512-fCpCUgZNE2piVJKC76zFsgVW1apF6dpYsqGyH8SIeCcM4pTEsRTWTLCaJIMKFEundsCKwY1rwfhtrio04RJ4Dw==
   dependencies:
-    "@csstools/css-color-parser" "^3.0.6"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
+    "@csstools/css-color-parser" "^3.1.0"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
 
-"@csstools/postcss-gradients-interpolation-method@^5.0.6":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-gradients-interpolation-method/-/postcss-gradients-interpolation-method-5.0.6.tgz#67fa61ada95e4534687fa76cd2d15ac74386560e"
-  integrity sha512-Itrbx6SLUzsZ6Mz3VuOlxhbfuyLTogG5DwEF1V8dAi24iMuvQPIHd7Ti+pNDp7j6WixndJGZaoNR0f9VSzwuTg==
+"@csstools/postcss-gradients-interpolation-method@^5.0.12":
+  version "5.0.12"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-gradients-interpolation-method/-/postcss-gradients-interpolation-method-5.0.12.tgz#0955cce4d97203b861bf66742bbec611b2f3661c"
+  integrity sha512-jugzjwkUY0wtNrZlFeyXzimUL3hN4xMvoPnIXxoZqxDvjZRiSh+itgHcVUWzJ2VwD/VAMEgCLvtaJHX+4Vj3Ow==
   dependencies:
-    "@csstools/css-color-parser" "^3.0.6"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/css-color-parser" "^3.1.0"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.2.1"
     "@csstools/utilities" "^2.0.0"
 
-"@csstools/postcss-hwb-function@^4.0.6":
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-4.0.6.tgz#c40f557a54ed45e75c601a9ba7a08d315f64dbd7"
-  integrity sha512-927Pqy3a1uBP7U8sTfaNdZVB0mNXzIrJO/GZ8us9219q9n06gOqCdfZ0E6d1P66Fm0fYHvxfDbfcUuwAn5UwhQ==
+"@csstools/postcss-hwb-function@^4.0.12":
+  version "4.0.12"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-4.0.12.tgz#07f7ecb08c50e094673bd20eaf7757db0162beee"
+  integrity sha512-mL/+88Z53KrE4JdePYFJAQWFrcADEqsLprExCM04GDNgHIztwFzj0Mbhd/yxMBngq0NIlz58VVxjt5abNs1VhA==
   dependencies:
-    "@csstools/css-color-parser" "^3.0.6"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/css-color-parser" "^3.1.0"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.2.1"
     "@csstools/utilities" "^2.0.0"
 
-"@csstools/postcss-ic-unit@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-4.0.0.tgz#b60ec06500717c337447c39ae7fe7952eeb9d48f"
-  integrity sha512-9QT5TDGgx7wD3EEMN3BSUG6ckb6Eh5gSPT5kZoVtUuAonfPmLDJyPhqR4ntPpMYhUKAMVKAg3I/AgzqHMSeLhA==
+"@csstools/postcss-ic-unit@^4.0.4":
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-4.0.4.tgz#2ee2da0690db7edfbc469279711b9e69495659d2"
+  integrity sha512-yQ4VmossuOAql65sCPppVO1yfb7hDscf4GseF0VCA/DTDaBc0Wtf8MTqVPfjGYlT5+2buokG0Gp7y0atYZpwjg==
   dependencies:
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/postcss-progressive-custom-properties" "^4.2.1"
     "@csstools/utilities" "^2.0.0"
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-initial@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-initial/-/postcss-initial-2.0.0.tgz#a86f5fc59ab9f16f1422dade4c58bd941af5df22"
-  integrity sha512-dv2lNUKR+JV+OOhZm9paWzYBXOCi+rJPqJ2cJuhh9xd8USVrd0cBEPczla81HNOyThMQWeCcdln3gZkQV2kYxA==
+"@csstools/postcss-initial@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-initial/-/postcss-initial-2.0.1.tgz#c385bd9d8ad31ad159edd7992069e97ceea4d09a"
+  integrity sha512-L1wLVMSAZ4wovznquK0xmC7QSctzO4D0Is590bxpGqhqjboLXYA16dWZpfwImkdOgACdQ9PqXsuRroW6qPlEsg==
 
-"@csstools/postcss-is-pseudo-class@^5.0.1":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-5.0.1.tgz#12041448fedf01090dd4626022c28b7f7623f58e"
-  integrity sha512-JLp3POui4S1auhDR0n8wHd/zTOWmMsmK3nQd3hhL6FhWPaox5W7j1se6zXOG/aP07wV2ww0lxbKYGwbBszOtfQ==
+"@csstools/postcss-is-pseudo-class@^5.0.3":
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-5.0.3.tgz#d34e850bcad4013c2ed7abe948bfa0448aa8eb74"
+  integrity sha512-jS/TY4SpG4gszAtIg7Qnf3AS2pjcUM5SzxpApOrlndMeGhIbaTzWBzzP/IApXoNWEW7OhcjkRT48jnAUIFXhAQ==
   dependencies:
     "@csstools/selector-specificity" "^5.0.0"
     postcss-selector-parser "^7.0.0"
 
-"@csstools/postcss-light-dark-function@^2.0.7":
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-light-dark-function/-/postcss-light-dark-function-2.0.7.tgz#807c170cd28eebb0c00e64dfc6ab0bf418f19209"
-  integrity sha512-ZZ0rwlanYKOHekyIPaU+sVm3BEHCe+Ha0/px+bmHe62n0Uc1lL34vbwrLYn6ote8PHlsqzKeTQdIejQCJ05tfw==
+"@csstools/postcss-light-dark-function@^2.0.11":
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-light-dark-function/-/postcss-light-dark-function-2.0.11.tgz#0df448aab9a33cb9a085264ff1f396fb80c4437d"
+  integrity sha512-fNJcKXJdPM3Lyrbmgw2OBbaioU7yuKZtiXClf4sGdQttitijYlZMD5K7HrC/eF83VRWRrYq6OZ0Lx92leV2LFA==
   dependencies:
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.2.1"
     "@csstools/utilities" "^2.0.0"
 
 "@csstools/postcss-logical-float-and-clear@^3.0.0":
@@ -1426,32 +1387,32 @@
   dependencies:
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-logical-viewport-units@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-viewport-units/-/postcss-logical-viewport-units-3.0.3.tgz#f6cc63520ca2a6eb76b9cd946070c38dda66d733"
-  integrity sha512-OC1IlG/yoGJdi0Y+7duz/kU/beCwO+Gua01sD6GtOtLi7ByQUpcIqs7UE/xuRPay4cHgOMatWdnDdsIDjnWpPw==
+"@csstools/postcss-logical-viewport-units@^3.0.4":
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-viewport-units/-/postcss-logical-viewport-units-3.0.4.tgz#016d98a8b7b5f969e58eb8413447eb801add16fc"
+  integrity sha512-q+eHV1haXA4w9xBwZLKjVKAWn3W2CMqmpNpZUk5kRprvSiBEGMgrNH3/sJZ8UA3JgyHaOt3jwT9uFa4wLX4EqQ==
   dependencies:
-    "@csstools/css-tokenizer" "^3.0.3"
+    "@csstools/css-tokenizer" "^3.0.4"
     "@csstools/utilities" "^2.0.0"
 
-"@csstools/postcss-media-minmax@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-media-minmax/-/postcss-media-minmax-2.0.5.tgz#66970aa8d8057f84b88aff21f385194fbe03eb11"
-  integrity sha512-sdh5i5GToZOIAiwhdntRWv77QDtsxP2r2gXW/WbLSCoLr00KTq/yiF1qlQ5XX2+lmiFa8rATKMcbwl3oXDMNew==
+"@csstools/postcss-media-minmax@^2.0.9":
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-media-minmax/-/postcss-media-minmax-2.0.9.tgz#184252d5b93155ae526689328af6bdf3fc113987"
+  integrity sha512-af9Qw3uS3JhYLnCbqtZ9crTvvkR+0Se+bBqSr7ykAnl9yKhk6895z9rf+2F4dClIDJWxgn0iZZ1PSdkhrbs2ig==
   dependencies:
-    "@csstools/css-calc" "^2.1.0"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/media-query-list-parser" "^4.0.2"
+    "@csstools/css-calc" "^2.1.4"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/media-query-list-parser" "^4.0.3"
 
-"@csstools/postcss-media-queries-aspect-ratio-number-values@^3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-3.0.4.tgz#d71102172c74baf3f892fac88cf1ea46a961600d"
-  integrity sha512-AnGjVslHMm5xw9keusQYvjVWvuS7KWK+OJagaG0+m9QnIjZsrysD2kJP/tr/UJIyYtMCtu8OkUd+Rajb4DqtIQ==
+"@csstools/postcss-media-queries-aspect-ratio-number-values@^3.0.5":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-3.0.5.tgz#f485c31ec13d6b0fb5c528a3474334a40eff5f11"
+  integrity sha512-zhAe31xaaXOY2Px8IYfoVTB3wglbJUVigGphFLj6exb7cjZRH9A6adyE22XfFK3P2PzwRk0VDeTJmaxpluyrDg==
   dependencies:
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/media-query-list-parser" "^4.0.2"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/media-query-list-parser" "^4.0.3"
 
 "@csstools/postcss-nested-calc@^4.0.0":
   version "4.0.0"
@@ -1468,42 +1429,42 @@
   dependencies:
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-oklab-function@^4.0.6":
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-4.0.6.tgz#17e8dfb6422dfd8d77256def5d5be8335ea7af34"
-  integrity sha512-Hptoa0uX+XsNacFBCIQKTUBrFKDiplHan42X73EklG6XmQLG7/aIvxoNhvZ7PvOWMt67Pw3bIlUY2nD6p5vL8A==
+"@csstools/postcss-oklab-function@^4.0.12":
+  version "4.0.12"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-4.0.12.tgz#416640ef10227eea1375b47b72d141495950971d"
+  integrity sha512-HhlSmnE1NKBhXsTnNGjxvhryKtO7tJd1w42DKOGFD6jSHtYOrsJTQDKPMwvOfrzUAk8t7GcpIfRyM7ssqHpFjg==
   dependencies:
-    "@csstools/css-color-parser" "^3.0.6"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/css-color-parser" "^3.1.0"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.2.1"
     "@csstools/utilities" "^2.0.0"
 
-"@csstools/postcss-progressive-custom-properties@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-4.0.0.tgz#ecdb85bcdb1852d73970a214a376684a91f82bdc"
-  integrity sha512-XQPtROaQjomnvLUSy/bALTR5VCtTVUFwYs1SblvYgLSeTo2a/bMNwUwo2piXw5rTv/FEYiy5yPSXBqg9OKUx7Q==
+"@csstools/postcss-progressive-custom-properties@^4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-4.2.1.tgz#c39780b9ff0d554efb842b6bd75276aa6f1705db"
+  integrity sha512-uPiiXf7IEKtUQXsxu6uWtOlRMXd2QWWy5fhxHDnPdXKCQckPP3E34ZgDoZ62r2iT+UOgWsSbM4NvHE5m3mAEdw==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-random-function@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-random-function/-/postcss-random-function-1.0.1.tgz#73a0b62b5dbbc03c25a28f085235eb61b09a2fb0"
-  integrity sha512-Ab/tF8/RXktQlFwVhiC70UNfpFQRhtE5fQQoP2pO+KCPGLsLdWFiOuHgSRtBOqEshCVAzR4H6o38nhvRZq8deA==
+"@csstools/postcss-random-function@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-random-function/-/postcss-random-function-2.0.1.tgz#3191f32fe72936e361dadf7dbfb55a0209e2691e"
+  integrity sha512-q+FQaNiRBhnoSNo+GzqGOIBKoHQ43lYz0ICrV+UudfWnEF6ksS6DsBIJSISKQT2Bvu3g4k6r7t0zYrk5pDlo8w==
   dependencies:
-    "@csstools/css-calc" "^2.1.0"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
+    "@csstools/css-calc" "^2.1.4"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
 
-"@csstools/postcss-relative-color-syntax@^3.0.6":
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-relative-color-syntax/-/postcss-relative-color-syntax-3.0.6.tgz#4b8bc219b34b16f5abdbbcf09ac13e65bff6ef16"
-  integrity sha512-yxP618Xb+ji1I624jILaYM62uEmZcmbdmFoZHoaThw896sq0vU39kqTTF+ZNic9XyPtPMvq0vyvbgmHaszq8xg==
+"@csstools/postcss-relative-color-syntax@^3.0.12":
+  version "3.0.12"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-relative-color-syntax/-/postcss-relative-color-syntax-3.0.12.tgz#ced792450102441f7c160e1d106f33e4b44181f8"
+  integrity sha512-0RLIeONxu/mtxRtf3o41Lq2ghLimw0w9ByLWnnEVuy89exmEEq8bynveBxNW3nyHqLAFEeNtVEmC1QK9MZ8Huw==
   dependencies:
-    "@csstools/css-color-parser" "^3.0.6"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/css-color-parser" "^3.1.0"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.2.1"
     "@csstools/utilities" "^2.0.0"
 
 "@csstools/postcss-scope-pseudo-class@^4.0.1":
@@ -1513,50 +1474,50 @@
   dependencies:
     postcss-selector-parser "^7.0.0"
 
-"@csstools/postcss-sign-functions@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-sign-functions/-/postcss-sign-functions-1.1.0.tgz#a524fae1374b0e167729f612ca875d7b1b334262"
-  integrity sha512-SLcc20Nujx/kqbSwDmj6oaXgpy3UjFhBy1sfcqPgDkHfOIfUtUVH7OXO+j7BU4v/At5s61N5ZX6shvgPwluhsA==
+"@csstools/postcss-sign-functions@^1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-sign-functions/-/postcss-sign-functions-1.1.4.tgz#a9ac56954014ae4c513475b3f1b3e3424a1e0c12"
+  integrity sha512-P97h1XqRPcfcJndFdG95Gv/6ZzxUBBISem0IDqPZ7WMvc/wlO+yU0c5D/OCpZ5TJoTt63Ok3knGk64N+o6L2Pg==
   dependencies:
-    "@csstools/css-calc" "^2.1.0"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
+    "@csstools/css-calc" "^2.1.4"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
 
-"@csstools/postcss-stepped-value-functions@^4.0.5":
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-4.0.5.tgz#4d68633d502fbe2b6ef3898e368e3540488a0d8a"
-  integrity sha512-G6SJ6hZJkhxo6UZojVlLo14MohH4J5J7z8CRBrxxUYy9JuZiIqUo5TBYyDGcE0PLdzpg63a7mHSJz3VD+gMwqw==
+"@csstools/postcss-stepped-value-functions@^4.0.9":
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-4.0.9.tgz#36036f1a0e5e5ee2308e72f3c9cb433567c387b9"
+  integrity sha512-h9btycWrsex4dNLeQfyU3y3w40LMQooJWFMm/SK9lrKguHDcFl4VMkncKKoXi2z5rM9YGWbUQABI8BT2UydIcA==
   dependencies:
-    "@csstools/css-calc" "^2.1.0"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
+    "@csstools/css-calc" "^2.1.4"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
 
-"@csstools/postcss-text-decoration-shorthand@^4.0.1":
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-4.0.1.tgz#251fab0939d50c6fd73bb2b830b2574188efa087"
-  integrity sha512-xPZIikbx6jyzWvhms27uugIc0I4ykH4keRvoa3rxX5K7lEhkbd54rjj/dv60qOCTisoS+3bmwJTeyV1VNBrXaw==
+"@csstools/postcss-text-decoration-shorthand@^4.0.3":
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-4.0.3.tgz#fae1b70f07d1b7beb4c841c86d69e41ecc6f743c"
+  integrity sha512-KSkGgZfx0kQjRIYnpsD7X2Om9BUXX/Kii77VBifQW9Ih929hK0KNjVngHDH0bFB9GmfWcR9vJYJJRvw/NQjkrA==
   dependencies:
-    "@csstools/color-helpers" "^5.0.1"
+    "@csstools/color-helpers" "^5.1.0"
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-trigonometric-functions@^4.0.5":
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-4.0.5.tgz#267b95a8bd45536e0360596b6da660a9eb6aac83"
-  integrity sha512-/YQThYkt5MLvAmVu7zxjhceCYlKrYddK6LEmK5I4ojlS6BmO9u2yO4+xjXzu2+NPYmHSTtP4NFSamBCMmJ1NJA==
+"@csstools/postcss-trigonometric-functions@^4.0.9":
+  version "4.0.9"
+  resolved "https://registry.yarnpkg.com/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-4.0.9.tgz#3f94ed2e319b57f2c59720b64e4d0a8a6fb8c3b2"
+  integrity sha512-Hnh5zJUdpNrJqK9v1/E3BbrQhaDTj5YiX7P61TOvUhoDHnUmsNNxcDAgkQ32RrcWx9GVUvfUNPcUkn8R3vIX6A==
   dependencies:
-    "@csstools/css-calc" "^2.1.0"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
+    "@csstools/css-calc" "^2.1.4"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
 
 "@csstools/postcss-unset-value@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@csstools/postcss-unset-value/-/postcss-unset-value-4.0.0.tgz#7caa981a34196d06a737754864baf77d64de4bba"
   integrity sha512-cBz3tOCI5Fw6NIFEwU3RiwK6mn3nKegjpJuzCndoGq3BZPkUjnsq7uQmIeMNeMbMk7YD2MfKcgCpZwX5jyXqCA==
 
-"@csstools/selector-resolve-nested@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/selector-resolve-nested/-/selector-resolve-nested-3.0.0.tgz#704a9b637975680e025e069a4c58b3beb3e2752a"
-  integrity sha512-ZoK24Yku6VJU1gS79a5PFmC8yn3wIapiKmPgun0hZgEI5AOqgH2kiPRsPz1qkGv4HL+wuDLH83yQyk6inMYrJQ==
+"@csstools/selector-resolve-nested@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@csstools/selector-resolve-nested/-/selector-resolve-nested-3.1.0.tgz#848c6f44cb65e3733e478319b9342b7aa436fac7"
+  integrity sha512-mf1LEW0tJLKfWyvn5KdDrhpxHyuxpbNwTIwOYLIvsTffeyOf85j5oIzfG0yosxDgx/sswlqBnESYUcQH0vgZ0g==
 
 "@csstools/selector-specificity@^5.0.0":
   version "5.0.0"
@@ -1573,25 +1534,34 @@
   resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
-"@docsearch/css@3.8.0":
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-3.8.0.tgz#c70a1a326249d878ab7c630d7a908c6769a38db3"
-  integrity sha512-pieeipSOW4sQ0+bE5UFC51AOZp9NGxg89wAlZ1BAQFaiRAGK1IKUaPQ0UGZeNctJXyqZ1UvBtOQh2HH+U5GtmA==
+"@docsearch/core@4.3.1":
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/@docsearch/core/-/core-4.3.1.tgz#88a97a6fe4d4025269b6dee8b9d070b76758ad82"
+  integrity sha512-ktVbkePE+2h9RwqCUMbWXOoebFyDOxHqImAqfs+lC8yOU+XwEW4jgvHGJK079deTeHtdhUNj0PXHSnhJINvHzQ==
 
-"@docsearch/react@^3.5.2":
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/@docsearch/react/-/react-3.8.0.tgz#c32165e34fadea8a0283c8b61cd73e6e1844797d"
-  integrity sha512-WnFK720+iwTVt94CxY3u+FgX6exb3BfN5kE9xUY6uuAH/9W/UFboBZFLlrw/zxFRHoHZCOXRtOylsXF+6LHI+Q==
+"@docsearch/css@4.3.2":
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/@docsearch/css/-/css-4.3.2.tgz#d47d25336c9516b419245fa74e8dd5ae84a17492"
+  integrity sha512-K3Yhay9MgkBjJJ0WEL5MxnACModX9xuNt3UlQQkDEDZJZ0+aeWKtOkxHNndMRkMBnHdYvQjxkm6mdlneOtU1IQ==
+
+"@docsearch/react@^3.9.0 || ^4.1.0":
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/@docsearch/react/-/react-4.3.2.tgz#450b8341cb5cca03737a00075d4dfd3a904a3e3e"
+  integrity sha512-74SFD6WluwvgsOPqifYOviEEVwDxslxfhakTlra+JviaNcs7KK/rjsPj89kVEoQc9FUxRkAofaJnHIR7pb4TSQ==
   dependencies:
-    "@algolia/autocomplete-core" "1.17.7"
-    "@algolia/autocomplete-preset-algolia" "1.17.7"
-    "@docsearch/css" "3.8.0"
-    algoliasearch "^5.12.0"
+    "@ai-sdk/react" "^2.0.30"
+    "@algolia/autocomplete-core" "1.19.2"
+    "@docsearch/core" "4.3.1"
+    "@docsearch/css" "4.3.2"
+    ai "^5.0.30"
+    algoliasearch "^5.28.0"
+    marked "^16.3.0"
+    zod "^4.1.8"
 
-"@docusaurus/babel@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/babel/-/babel-3.6.3.tgz#016714fe7a8807d0fc2f7180eace5e82bebbb8a6"
-  integrity sha512-7dW9Hat9EHYCVicFXYA4hjxBY38+hPuCURL8oRF9fySRm7vzNWuEOghA1TXcykuXZp0HLG2td4RhDxCvGG7tNw==
+"@docusaurus/babel@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/babel/-/babel-3.9.2.tgz#f956c638baeccf2040e482c71a742bc7e35fdb22"
+  integrity sha512-GEANdi/SgER+L7Japs25YiGil/AUDnFFHaCGPBbundxoWtCkA2lmy7/tFmgED4y1htAy6Oi4wkJEQdGssnw9MA==
   dependencies:
     "@babel/core" "^7.25.9"
     "@babel/generator" "^7.25.9"
@@ -1603,55 +1573,54 @@
     "@babel/runtime" "^7.25.9"
     "@babel/runtime-corejs3" "^7.25.9"
     "@babel/traverse" "^7.25.9"
-    "@docusaurus/logger" "3.6.3"
-    "@docusaurus/utils" "3.6.3"
+    "@docusaurus/logger" "3.9.2"
+    "@docusaurus/utils" "3.9.2"
     babel-plugin-dynamic-import-node "^2.3.3"
     fs-extra "^11.1.1"
     tslib "^2.6.0"
 
-"@docusaurus/bundler@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/bundler/-/bundler-3.6.3.tgz#f09c2e29613f988b874a4be2247708e121b7fc5c"
-  integrity sha512-47JLuc8D4wA+6VOvmMd5fUC9rFppBQpQOnxDYiVXffm/DeV/wmm3sbpNd5Y+O+G2+nevLTRnvCm/qyancv0Y3A==
+"@docusaurus/bundler@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/bundler/-/bundler-3.9.2.tgz#0ca82cda4acf13a493e3f66061aea351e9d356cf"
+  integrity sha512-ZOVi6GYgTcsZcUzjblpzk3wH1Fya2VNpd5jtHoCCFcJlMQ1EYXZetfAnRHLcyiFeBABaI1ltTYbOBtH/gahGVA==
   dependencies:
     "@babel/core" "^7.25.9"
-    "@docusaurus/babel" "3.6.3"
-    "@docusaurus/cssnano-preset" "3.6.3"
-    "@docusaurus/logger" "3.6.3"
-    "@docusaurus/types" "3.6.3"
-    "@docusaurus/utils" "3.6.3"
+    "@docusaurus/babel" "3.9.2"
+    "@docusaurus/cssnano-preset" "3.9.2"
+    "@docusaurus/logger" "3.9.2"
+    "@docusaurus/types" "3.9.2"
+    "@docusaurus/utils" "3.9.2"
     babel-loader "^9.2.1"
-    clean-css "^5.3.2"
+    clean-css "^5.3.3"
     copy-webpack-plugin "^11.0.0"
-    css-loader "^6.8.1"
+    css-loader "^6.11.0"
     css-minimizer-webpack-plugin "^5.0.1"
     cssnano "^6.1.2"
     file-loader "^6.2.0"
     html-minifier-terser "^7.2.0"
-    mini-css-extract-plugin "^2.9.1"
+    mini-css-extract-plugin "^2.9.2"
     null-loader "^4.0.1"
-    postcss "^8.4.26"
-    postcss-loader "^7.3.3"
-    postcss-preset-env "^10.1.0"
-    react-dev-utils "^12.0.1"
+    postcss "^8.5.4"
+    postcss-loader "^7.3.4"
+    postcss-preset-env "^10.2.1"
     terser-webpack-plugin "^5.3.9"
     tslib "^2.6.0"
     url-loader "^4.1.1"
     webpack "^5.95.0"
     webpackbar "^6.0.1"
 
-"@docusaurus/core@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-3.6.3.tgz#6bf968ee26a36d71387bab293f27ccffc0e428b6"
-  integrity sha512-xL7FRY9Jr5DWqB6pEnqgKqcMPJOX5V0pgWXi5lCiih11sUBmcFKM7c3+GyxcVeeWFxyYSDP3grLTWqJoP4P9Vw==
+"@docusaurus/core@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-3.9.2.tgz#cc970f29b85a8926d63c84f8cffdcda43ed266ff"
+  integrity sha512-HbjwKeC+pHUFBfLMNzuSjqFE/58+rLVKmOU3lxQrpsxLBOGosYco/Q0GduBb0/jEMRiyEqjNT/01rRdOMWq5pw==
   dependencies:
-    "@docusaurus/babel" "3.6.3"
-    "@docusaurus/bundler" "3.6.3"
-    "@docusaurus/logger" "3.6.3"
-    "@docusaurus/mdx-loader" "3.6.3"
-    "@docusaurus/utils" "3.6.3"
-    "@docusaurus/utils-common" "3.6.3"
-    "@docusaurus/utils-validation" "3.6.3"
+    "@docusaurus/babel" "3.9.2"
+    "@docusaurus/bundler" "3.9.2"
+    "@docusaurus/logger" "3.9.2"
+    "@docusaurus/mdx-loader" "3.9.2"
+    "@docusaurus/utils" "3.9.2"
+    "@docusaurus/utils-common" "3.9.2"
+    "@docusaurus/utils-validation" "3.9.2"
     boxen "^6.2.1"
     chalk "^4.1.2"
     chokidar "^3.5.3"
@@ -1659,69 +1628,68 @@
     combine-promises "^1.1.0"
     commander "^5.1.0"
     core-js "^3.31.1"
-    del "^6.1.1"
     detect-port "^1.5.1"
     escape-html "^1.0.3"
     eta "^2.2.0"
     eval "^0.1.8"
+    execa "5.1.1"
     fs-extra "^11.1.1"
     html-tags "^3.3.1"
     html-webpack-plugin "^5.6.0"
     leven "^3.1.0"
     lodash "^4.17.21"
+    open "^8.4.0"
     p-map "^4.0.0"
     prompts "^2.4.2"
-    react-dev-utils "^12.0.1"
-    react-helmet-async "^1.3.0"
+    react-helmet-async "npm:@slorber/react-helmet-async@1.3.0"
     react-loadable "npm:@docusaurus/react-loadable@6.0.0"
     react-loadable-ssr-addon-v5-slorber "^1.0.1"
     react-router "^5.3.4"
     react-router-config "^5.1.1"
     react-router-dom "^5.3.4"
-    rtl-detect "^1.0.4"
     semver "^7.5.4"
     serve-handler "^6.1.6"
-    shelljs "^0.8.5"
+    tinypool "^1.0.2"
     tslib "^2.6.0"
     update-notifier "^6.0.2"
     webpack "^5.95.0"
     webpack-bundle-analyzer "^4.10.2"
-    webpack-dev-server "^4.15.2"
+    webpack-dev-server "^5.2.2"
     webpack-merge "^6.0.1"
 
-"@docusaurus/cssnano-preset@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-3.6.3.tgz#ea19b307183ec20dea4927efc4ddf249150b8c6a"
-  integrity sha512-qP7SXrwZ+23GFJdPN4aIHQrZW+oH/7tzwEuc/RNL0+BdZdmIjYQqUxdXsjE4lFxLNZjj0eUrSNYIS6xwfij+5Q==
+"@docusaurus/cssnano-preset@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-3.9.2.tgz#523aab65349db3c51a77f2489048d28527759428"
+  integrity sha512-8gBKup94aGttRduABsj7bpPFTX7kbwu+xh3K9NMCF5K4bWBqTFYW+REKHF6iBVDHRJ4grZdIPbvkiHd/XNKRMQ==
   dependencies:
     cssnano-preset-advanced "^6.1.2"
-    postcss "^8.4.38"
+    postcss "^8.5.4"
     postcss-sort-media-queries "^5.2.0"
     tslib "^2.6.0"
 
-"@docusaurus/logger@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-3.6.3.tgz#c6e514c9429487ef38be2f2129b2b842740d92fd"
-  integrity sha512-xSubJixcNyMV9wMV4q0s47CBz3Rlc5jbcCCuij8pfQP8qn/DIpt0ks8W6hQWzHAedg/J/EwxxUOUrnEoKzJo8g==
+"@docusaurus/logger@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-3.9.2.tgz#6ec6364b90f5a618a438cc9fd01ac7376869f92a"
+  integrity sha512-/SVCc57ByARzGSU60c50rMyQlBuMIJCjcsJlkphxY6B0GV4UH3tcA1994N8fFfbJ9kX3jIBe/xg3XP5qBtGDbA==
   dependencies:
     chalk "^4.1.2"
     tslib "^2.6.0"
 
-"@docusaurus/mdx-loader@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-3.6.3.tgz#127babc7cdb26d37c723bc3ae518bda17ce40160"
-  integrity sha512-3iJdiDz9540ppBseeI93tWTDtUGVkxzh59nMq4ignylxMuXBLK8dFqVeaEor23v1vx6TrGKZ2FuLaTB+U7C0QQ==
+"@docusaurus/mdx-loader@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-3.9.2.tgz#78d238de6c6203fa811cc2a7e90b9b79e111408c"
+  integrity sha512-wiYoGwF9gdd6rev62xDU8AAM8JuLI/hlwOtCzMmYcspEkzecKrP8J8X+KpYnTlACBUUtXNJpSoCwFWJhLRevzQ==
   dependencies:
-    "@docusaurus/logger" "3.6.3"
-    "@docusaurus/utils" "3.6.3"
-    "@docusaurus/utils-validation" "3.6.3"
+    "@docusaurus/logger" "3.9.2"
+    "@docusaurus/utils" "3.9.2"
+    "@docusaurus/utils-validation" "3.9.2"
     "@mdx-js/mdx" "^3.0.0"
     "@slorber/remark-comment" "^1.0.0"
     escape-html "^1.0.3"
     estree-util-value-to-estree "^3.0.1"
     file-loader "^6.2.0"
     fs-extra "^11.1.1"
-    image-size "^1.0.2"
+    image-size "^2.0.2"
     mdast-util-mdx "^3.0.0"
     mdast-util-to-string "^4.0.0"
     rehype-raw "^7.0.0"
@@ -1737,182 +1705,209 @@
     vfile "^6.0.1"
     webpack "^5.88.1"
 
-"@docusaurus/module-type-aliases@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/module-type-aliases/-/module-type-aliases-3.6.3.tgz#1f7030b1cf1f658cf664d41b6eadba93bbe51d87"
-  integrity sha512-MjaXX9PN/k5ugNvfRZdWyKWq4FsrhN4LEXaj0pEmMebJuBNlFeGyKQUa9DRhJHpadNaiMLrbo9m3U7Ig5YlsZg==
+"@docusaurus/module-type-aliases@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/module-type-aliases/-/module-type-aliases-3.9.2.tgz#993c7cb0114363dea5ef6855e989b3ad4b843a34"
+  integrity sha512-8qVe2QA9hVLzvnxP46ysuofJUIc/yYQ82tvA/rBTrnpXtCjNSFLxEZfd5U8cYZuJIVlkPxamsIgwd5tGZXfvew==
   dependencies:
-    "@docusaurus/types" "3.6.3"
+    "@docusaurus/types" "3.9.2"
     "@types/history" "^4.7.11"
     "@types/react" "*"
     "@types/react-router-config" "*"
     "@types/react-router-dom" "*"
-    react-helmet-async "*"
+    react-helmet-async "npm:@slorber/react-helmet-async@1.3.0"
     react-loadable "npm:@docusaurus/react-loadable@6.0.0"
 
-"@docusaurus/plugin-content-blog@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-3.6.3.tgz#d6a597e4bfdeb3f1f6ce06d2ac86207296988cc9"
-  integrity sha512-k0ogWwwJU3pFRFfvW1kRVHxzf2DutLGaaLjAnHVEU6ju+aRP0Z5ap/13DHyPOfHeE4WKpn/M0TqjdwZAcY3kAw==
+"@docusaurus/plugin-content-blog@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-3.9.2.tgz#d5ce51eb7757bdab0515e2dd26a793ed4e119df9"
+  integrity sha512-3I2HXy3L1QcjLJLGAoTvoBnpOwa6DPUa3Q0dMK19UTY9mhPkKQg/DYhAGTiBUKcTR0f08iw7kLPqOhIgdV3eVQ==
   dependencies:
-    "@docusaurus/core" "3.6.3"
-    "@docusaurus/logger" "3.6.3"
-    "@docusaurus/mdx-loader" "3.6.3"
-    "@docusaurus/theme-common" "3.6.3"
-    "@docusaurus/types" "3.6.3"
-    "@docusaurus/utils" "3.6.3"
-    "@docusaurus/utils-common" "3.6.3"
-    "@docusaurus/utils-validation" "3.6.3"
+    "@docusaurus/core" "3.9.2"
+    "@docusaurus/logger" "3.9.2"
+    "@docusaurus/mdx-loader" "3.9.2"
+    "@docusaurus/theme-common" "3.9.2"
+    "@docusaurus/types" "3.9.2"
+    "@docusaurus/utils" "3.9.2"
+    "@docusaurus/utils-common" "3.9.2"
+    "@docusaurus/utils-validation" "3.9.2"
     cheerio "1.0.0-rc.12"
     feed "^4.2.2"
     fs-extra "^11.1.1"
     lodash "^4.17.21"
-    reading-time "^1.5.0"
+    schema-dts "^1.1.2"
     srcset "^4.0.0"
     tslib "^2.6.0"
     unist-util-visit "^5.0.0"
     utility-types "^3.10.0"
     webpack "^5.88.1"
 
-"@docusaurus/plugin-content-docs@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-docs/-/plugin-content-docs-3.6.3.tgz#aae044d2af6996d1a6de8d815aca8a83b485e0a5"
-  integrity sha512-r2wS8y/fsaDcxkm20W5bbYJFPzdWdEaTWVYjNxlHlcmX086eqQR1Fomlg9BHTJ0dLXPzAlbC8EN4XqMr3QzNCQ==
+"@docusaurus/plugin-content-docs@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-docs/-/plugin-content-docs-3.9.2.tgz#cd8f2d1c06e53c3fa3d24bdfcb48d237bf2d6b2e"
+  integrity sha512-C5wZsGuKTY8jEYsqdxhhFOe1ZDjH0uIYJ9T/jebHwkyxqnr4wW0jTkB72OMqNjsoQRcb0JN3PcSeTwFlVgzCZg==
   dependencies:
-    "@docusaurus/core" "3.6.3"
-    "@docusaurus/logger" "3.6.3"
-    "@docusaurus/mdx-loader" "3.6.3"
-    "@docusaurus/module-type-aliases" "3.6.3"
-    "@docusaurus/theme-common" "3.6.3"
-    "@docusaurus/types" "3.6.3"
-    "@docusaurus/utils" "3.6.3"
-    "@docusaurus/utils-common" "3.6.3"
-    "@docusaurus/utils-validation" "3.6.3"
+    "@docusaurus/core" "3.9.2"
+    "@docusaurus/logger" "3.9.2"
+    "@docusaurus/mdx-loader" "3.9.2"
+    "@docusaurus/module-type-aliases" "3.9.2"
+    "@docusaurus/theme-common" "3.9.2"
+    "@docusaurus/types" "3.9.2"
+    "@docusaurus/utils" "3.9.2"
+    "@docusaurus/utils-common" "3.9.2"
+    "@docusaurus/utils-validation" "3.9.2"
     "@types/react-router-config" "^5.0.7"
     combine-promises "^1.1.0"
     fs-extra "^11.1.1"
     js-yaml "^4.1.0"
     lodash "^4.17.21"
+    schema-dts "^1.1.2"
     tslib "^2.6.0"
     utility-types "^3.10.0"
     webpack "^5.88.1"
 
-"@docusaurus/plugin-content-pages@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-pages/-/plugin-content-pages-3.6.3.tgz#0a5a43d1677ee519f63a54634653c54ddf41f475"
-  integrity sha512-eHrmTgjgLZsuqfsYr5X2xEwyIcck0wseSofWrjTwT9FLOWp+KDmMAuVK+wRo7sFImWXZk3oV/xX/g9aZrhD7OA==
+"@docusaurus/plugin-content-pages@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-pages/-/plugin-content-pages-3.9.2.tgz#22db6c88ade91cec0a9e87a00b8089898051b08d"
+  integrity sha512-s4849w/p4noXUrGpPUF0BPqIAfdAe76BLaRGAGKZ1gTDNiGxGcpsLcwJ9OTi1/V8A+AzvsmI9pkjie2zjIQZKA==
   dependencies:
-    "@docusaurus/core" "3.6.3"
-    "@docusaurus/mdx-loader" "3.6.3"
-    "@docusaurus/types" "3.6.3"
-    "@docusaurus/utils" "3.6.3"
-    "@docusaurus/utils-validation" "3.6.3"
+    "@docusaurus/core" "3.9.2"
+    "@docusaurus/mdx-loader" "3.9.2"
+    "@docusaurus/types" "3.9.2"
+    "@docusaurus/utils" "3.9.2"
+    "@docusaurus/utils-validation" "3.9.2"
     fs-extra "^11.1.1"
     tslib "^2.6.0"
     webpack "^5.88.1"
 
-"@docusaurus/plugin-debug@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-debug/-/plugin-debug-3.6.3.tgz#4e62ddfbae4d597b073f8e3c632cc12d012339e3"
-  integrity sha512-zB9GXfIZNPRfzKnNjU6xGVrqn9bPXuGhpjgsuc/YtcTDjnjhasg38NdYd5LEqXex5G/zIorQgWB3n6x/Ut62vQ==
+"@docusaurus/plugin-css-cascade-layers@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-css-cascade-layers/-/plugin-css-cascade-layers-3.9.2.tgz#358c85f63f1c6a11f611f1b8889d9435c11b22f8"
+  integrity sha512-w1s3+Ss+eOQbscGM4cfIFBlVg/QKxyYgj26k5AnakuHkKxH6004ZtuLe5awMBotIYF2bbGDoDhpgQ4r/kcj4rQ==
   dependencies:
-    "@docusaurus/core" "3.6.3"
-    "@docusaurus/types" "3.6.3"
-    "@docusaurus/utils" "3.6.3"
+    "@docusaurus/core" "3.9.2"
+    "@docusaurus/types" "3.9.2"
+    "@docusaurus/utils" "3.9.2"
+    "@docusaurus/utils-validation" "3.9.2"
+    tslib "^2.6.0"
+
+"@docusaurus/plugin-debug@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-debug/-/plugin-debug-3.9.2.tgz#b5df4db115583f5404a252dbf66f379ff933e53c"
+  integrity sha512-j7a5hWuAFxyQAkilZwhsQ/b3T7FfHZ+0dub6j/GxKNFJp2h9qk/P1Bp7vrGASnvA9KNQBBL1ZXTe7jlh4VdPdA==
+  dependencies:
+    "@docusaurus/core" "3.9.2"
+    "@docusaurus/types" "3.9.2"
+    "@docusaurus/utils" "3.9.2"
     fs-extra "^11.1.1"
-    react-json-view-lite "^1.2.0"
+    react-json-view-lite "^2.3.0"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-google-analytics@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-3.6.3.tgz#63648d469b1e3c50fad8878e7a7db9856e503d5f"
-  integrity sha512-rCDNy1QW8Dag7nZq67pcum0bpFLrwvxJhYuVprhFh8BMBDxV0bY+bAkGHbSf68P3Bk9C3hNOAXX1srGLIDvcTA==
+"@docusaurus/plugin-google-analytics@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-3.9.2.tgz#857fe075fdeccdf6959e62954d9efe39769fa247"
+  integrity sha512-mAwwQJ1Us9jL/lVjXtErXto4p4/iaLlweC54yDUK1a97WfkC6Z2k5/769JsFgwOwOP+n5mUQGACXOEQ0XDuVUw==
   dependencies:
-    "@docusaurus/core" "3.6.3"
-    "@docusaurus/types" "3.6.3"
-    "@docusaurus/utils-validation" "3.6.3"
+    "@docusaurus/core" "3.9.2"
+    "@docusaurus/types" "3.9.2"
+    "@docusaurus/utils-validation" "3.9.2"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-google-gtag@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-3.6.3.tgz#8a1388b4123904be17e661ea7aa71d798d0c046e"
-  integrity sha512-+OyDvhM6rqVkQOmLVkQWVJAizEEfkPzVWtIHXlWPOCFGK9X4/AWeBSrU0WG4iMg9Z4zD4YDRrU+lvI4s6DSC+w==
+"@docusaurus/plugin-google-gtag@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-3.9.2.tgz#df75b1a90ae9266b0471909ba0265f46d5dcae62"
+  integrity sha512-YJ4lDCphabBtw19ooSlc1MnxtYGpjFV9rEdzjLsUnBCeis2djUyCozZaFhCg6NGEwOn7HDDyMh0yzcdRpnuIvA==
   dependencies:
-    "@docusaurus/core" "3.6.3"
-    "@docusaurus/types" "3.6.3"
-    "@docusaurus/utils-validation" "3.6.3"
+    "@docusaurus/core" "3.9.2"
+    "@docusaurus/types" "3.9.2"
+    "@docusaurus/utils-validation" "3.9.2"
     "@types/gtag.js" "^0.0.12"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-google-tag-manager@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-3.6.3.tgz#38cbe416803f29782807cebf3ebf240cb47c3c74"
-  integrity sha512-1M6UPB13gWUtN2UHX083/beTn85PlRI9ABItTl/JL1FJ5dJTWWFXXsHf9WW/6hrVwthwTeV/AGbGKvLKV+IlCA==
+"@docusaurus/plugin-google-tag-manager@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-3.9.2.tgz#d1a3cf935acb7d31b84685e92d70a1d342946677"
+  integrity sha512-LJtIrkZN/tuHD8NqDAW1Tnw0ekOwRTfobWPsdO15YxcicBo2ykKF0/D6n0vVBfd3srwr9Z6rzrIWYrMzBGrvNw==
   dependencies:
-    "@docusaurus/core" "3.6.3"
-    "@docusaurus/types" "3.6.3"
-    "@docusaurus/utils-validation" "3.6.3"
+    "@docusaurus/core" "3.9.2"
+    "@docusaurus/types" "3.9.2"
+    "@docusaurus/utils-validation" "3.9.2"
     tslib "^2.6.0"
 
-"@docusaurus/plugin-sitemap@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-3.6.3.tgz#0458e6f7476ab6fd1466e01b153a3211d3223c53"
-  integrity sha512-94qOO4M9Fwv9KfVQJsgbe91k+fPJ4byf1L3Ez8TUa6TAFPo/BrLwQ80zclHkENlL1824TuxkcMKv33u6eydQCg==
+"@docusaurus/plugin-sitemap@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-3.9.2.tgz#e1d9f7012942562cc0c6543d3cb2cdc4ae713dc4"
+  integrity sha512-WLh7ymgDXjG8oPoM/T4/zUP7KcSuFYRZAUTl8vR6VzYkfc18GBM4xLhcT+AKOwun6kBivYKUJf+vlqYJkm+RHw==
   dependencies:
-    "@docusaurus/core" "3.6.3"
-    "@docusaurus/logger" "3.6.3"
-    "@docusaurus/types" "3.6.3"
-    "@docusaurus/utils" "3.6.3"
-    "@docusaurus/utils-common" "3.6.3"
-    "@docusaurus/utils-validation" "3.6.3"
+    "@docusaurus/core" "3.9.2"
+    "@docusaurus/logger" "3.9.2"
+    "@docusaurus/types" "3.9.2"
+    "@docusaurus/utils" "3.9.2"
+    "@docusaurus/utils-common" "3.9.2"
+    "@docusaurus/utils-validation" "3.9.2"
     fs-extra "^11.1.1"
     sitemap "^7.1.1"
     tslib "^2.6.0"
 
-"@docusaurus/preset-classic@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/preset-classic/-/preset-classic-3.6.3.tgz#072298b5b6d0de7d0346b1e9b550a30ef2add56d"
-  integrity sha512-VHSYWROT3flvNNI1SrnMOtW1EsjeHNK9dhU6s9eY5hryZe79lUqnZJyze/ymDe2LXAqzyj6y5oYvyBoZZk6ErA==
+"@docusaurus/plugin-svgr@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-svgr/-/plugin-svgr-3.9.2.tgz#62857ed79d97c0150d25f7e7380fdee65671163a"
+  integrity sha512-n+1DE+5b3Lnf27TgVU5jM1d4x5tUh2oW5LTsBxJX4PsAPV0JGcmI6p3yLYtEY0LRVEIJh+8RsdQmRE66wSV8mw==
   dependencies:
-    "@docusaurus/core" "3.6.3"
-    "@docusaurus/plugin-content-blog" "3.6.3"
-    "@docusaurus/plugin-content-docs" "3.6.3"
-    "@docusaurus/plugin-content-pages" "3.6.3"
-    "@docusaurus/plugin-debug" "3.6.3"
-    "@docusaurus/plugin-google-analytics" "3.6.3"
-    "@docusaurus/plugin-google-gtag" "3.6.3"
-    "@docusaurus/plugin-google-tag-manager" "3.6.3"
-    "@docusaurus/plugin-sitemap" "3.6.3"
-    "@docusaurus/theme-classic" "3.6.3"
-    "@docusaurus/theme-common" "3.6.3"
-    "@docusaurus/theme-search-algolia" "3.6.3"
-    "@docusaurus/types" "3.6.3"
+    "@docusaurus/core" "3.9.2"
+    "@docusaurus/types" "3.9.2"
+    "@docusaurus/utils" "3.9.2"
+    "@docusaurus/utils-validation" "3.9.2"
+    "@svgr/core" "8.1.0"
+    "@svgr/webpack" "^8.1.0"
+    tslib "^2.6.0"
+    webpack "^5.88.1"
 
-"@docusaurus/theme-classic@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/theme-classic/-/theme-classic-3.6.3.tgz#00599a9de5fd5c122fd1b8c59d3b755878f2a72c"
-  integrity sha512-1RRLK1tSArI2c00qugWYO3jRocjOZwGF1mBzPPylDVRwWCS/rnWWR91ChdbbaxIupRJ+hX8ZBYrwr5bbU0oztQ==
+"@docusaurus/preset-classic@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/preset-classic/-/preset-classic-3.9.2.tgz#85cc4f91baf177f8146c9ce896dfa1f0fd377050"
+  integrity sha512-IgyYO2Gvaigi21LuDIe+nvmN/dfGXAiMcV/murFqcpjnZc7jxFAxW+9LEjdPt61uZLxG4ByW/oUmX/DDK9t/8w==
   dependencies:
-    "@docusaurus/core" "3.6.3"
-    "@docusaurus/logger" "3.6.3"
-    "@docusaurus/mdx-loader" "3.6.3"
-    "@docusaurus/module-type-aliases" "3.6.3"
-    "@docusaurus/plugin-content-blog" "3.6.3"
-    "@docusaurus/plugin-content-docs" "3.6.3"
-    "@docusaurus/plugin-content-pages" "3.6.3"
-    "@docusaurus/theme-common" "3.6.3"
-    "@docusaurus/theme-translations" "3.6.3"
-    "@docusaurus/types" "3.6.3"
-    "@docusaurus/utils" "3.6.3"
-    "@docusaurus/utils-common" "3.6.3"
-    "@docusaurus/utils-validation" "3.6.3"
+    "@docusaurus/core" "3.9.2"
+    "@docusaurus/plugin-content-blog" "3.9.2"
+    "@docusaurus/plugin-content-docs" "3.9.2"
+    "@docusaurus/plugin-content-pages" "3.9.2"
+    "@docusaurus/plugin-css-cascade-layers" "3.9.2"
+    "@docusaurus/plugin-debug" "3.9.2"
+    "@docusaurus/plugin-google-analytics" "3.9.2"
+    "@docusaurus/plugin-google-gtag" "3.9.2"
+    "@docusaurus/plugin-google-tag-manager" "3.9.2"
+    "@docusaurus/plugin-sitemap" "3.9.2"
+    "@docusaurus/plugin-svgr" "3.9.2"
+    "@docusaurus/theme-classic" "3.9.2"
+    "@docusaurus/theme-common" "3.9.2"
+    "@docusaurus/theme-search-algolia" "3.9.2"
+    "@docusaurus/types" "3.9.2"
+
+"@docusaurus/theme-classic@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-classic/-/theme-classic-3.9.2.tgz#6e514f99a0ff42b80afcf42d5e5d042618311ce0"
+  integrity sha512-IGUsArG5hhekXd7RDb11v94ycpJpFdJPkLnt10fFQWOVxAtq5/D7hT6lzc2fhyQKaaCE62qVajOMKL7OiAFAIA==
+  dependencies:
+    "@docusaurus/core" "3.9.2"
+    "@docusaurus/logger" "3.9.2"
+    "@docusaurus/mdx-loader" "3.9.2"
+    "@docusaurus/module-type-aliases" "3.9.2"
+    "@docusaurus/plugin-content-blog" "3.9.2"
+    "@docusaurus/plugin-content-docs" "3.9.2"
+    "@docusaurus/plugin-content-pages" "3.9.2"
+    "@docusaurus/theme-common" "3.9.2"
+    "@docusaurus/theme-translations" "3.9.2"
+    "@docusaurus/types" "3.9.2"
+    "@docusaurus/utils" "3.9.2"
+    "@docusaurus/utils-common" "3.9.2"
+    "@docusaurus/utils-validation" "3.9.2"
     "@mdx-js/react" "^3.0.0"
     clsx "^2.0.0"
-    copy-text-to-clipboard "^3.2.0"
     infima "0.2.0-alpha.45"
     lodash "^4.17.21"
     nprogress "^0.2.0"
-    postcss "^8.4.26"
+    postcss "^8.5.4"
     prism-react-renderer "^2.3.0"
     prismjs "^1.29.0"
     react-router-dom "^5.3.4"
@@ -1920,15 +1915,15 @@
     tslib "^2.6.0"
     utility-types "^3.10.0"
 
-"@docusaurus/theme-common@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/theme-common/-/theme-common-3.6.3.tgz#a8a6ebd2b0fd7a5cca4d0c6a2f9ccff905fa7438"
-  integrity sha512-b8ZkhczXHDxWWyvz+YJy4t/PlPbEogTTbgnHoflYnH7rmRtyoodTsu8WVM12la5LmlMJBclBXFl29OH8kPE7gg==
+"@docusaurus/theme-common@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-common/-/theme-common-3.9.2.tgz#487172c6fef9815c2746ef62a71e4f5b326f9ba5"
+  integrity sha512-6c4DAbR6n6nPbnZhY2V3tzpnKnGL+6aOsLvFL26VRqhlczli9eWG0VDUNoCQEPnGwDMhPS42UhSAnz5pThm5Ag==
   dependencies:
-    "@docusaurus/mdx-loader" "3.6.3"
-    "@docusaurus/module-type-aliases" "3.6.3"
-    "@docusaurus/utils" "3.6.3"
-    "@docusaurus/utils-common" "3.6.3"
+    "@docusaurus/mdx-loader" "3.9.2"
+    "@docusaurus/module-type-aliases" "3.9.2"
+    "@docusaurus/utils" "3.9.2"
+    "@docusaurus/utils-common" "3.9.2"
     "@types/history" "^4.7.11"
     "@types/react" "*"
     "@types/react-router-config" "*"
@@ -1938,21 +1933,21 @@
     tslib "^2.6.0"
     utility-types "^3.10.0"
 
-"@docusaurus/theme-search-algolia@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/theme-search-algolia/-/theme-search-algolia-3.6.3.tgz#1a3331a489f392f5b032c4efc5f431e57eddf7ce"
-  integrity sha512-rt+MGCCpYgPyWCGXtbxlwFbTSobu15jWBTPI2LHsHNa5B0zSmOISX6FWYAPt5X1rNDOqMGM0FATnh7TBHRohVA==
+"@docusaurus/theme-search-algolia@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-search-algolia/-/theme-search-algolia-3.9.2.tgz#420fd5b27fc1673b48151fdc9fe7167ba135ed50"
+  integrity sha512-GBDSFNwjnh5/LdkxCKQHkgO2pIMX1447BxYUBG2wBiajS21uj64a+gH/qlbQjDLxmGrbrllBrtJkUHxIsiwRnw==
   dependencies:
-    "@docsearch/react" "^3.5.2"
-    "@docusaurus/core" "3.6.3"
-    "@docusaurus/logger" "3.6.3"
-    "@docusaurus/plugin-content-docs" "3.6.3"
-    "@docusaurus/theme-common" "3.6.3"
-    "@docusaurus/theme-translations" "3.6.3"
-    "@docusaurus/utils" "3.6.3"
-    "@docusaurus/utils-validation" "3.6.3"
-    algoliasearch "^4.18.0"
-    algoliasearch-helper "^3.13.3"
+    "@docsearch/react" "^3.9.0 || ^4.1.0"
+    "@docusaurus/core" "3.9.2"
+    "@docusaurus/logger" "3.9.2"
+    "@docusaurus/plugin-content-docs" "3.9.2"
+    "@docusaurus/theme-common" "3.9.2"
+    "@docusaurus/theme-translations" "3.9.2"
+    "@docusaurus/utils" "3.9.2"
+    "@docusaurus/utils-validation" "3.9.2"
+    algoliasearch "^5.37.0"
+    algoliasearch-helper "^3.26.0"
     clsx "^2.0.0"
     eta "^2.2.0"
     fs-extra "^11.1.1"
@@ -1960,61 +1955,62 @@
     tslib "^2.6.0"
     utility-types "^3.10.0"
 
-"@docusaurus/theme-translations@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/theme-translations/-/theme-translations-3.6.3.tgz#6e473835ea016ce4acd7d2997f411811db8c4f6b"
-  integrity sha512-Gb0regclToVlngSIIwUCtBMQBq48qVUaN1XQNKW4XwlsgUyk0vP01LULdqbem7czSwIeBAFXFoORJ0RPX7ht/w==
+"@docusaurus/theme-translations@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/theme-translations/-/theme-translations-3.9.2.tgz#238cd69c2da92d612be3d3b4f95944c1d0f1e041"
+  integrity sha512-vIryvpP18ON9T9rjgMRFLr2xJVDpw1rtagEGf8Ccce4CkTrvM/fRB8N2nyWYOW5u3DdjkwKw5fBa+3tbn9P4PA==
   dependencies:
     fs-extra "^11.1.1"
     tslib "^2.6.0"
 
-"@docusaurus/types@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/types/-/types-3.6.3.tgz#e87592e31616da1b8dc473e4c8205c61885a1518"
-  integrity sha512-xD9oTGDrouWzefkhe9ogB2fDV96/82cRpNGx2HIvI5L87JHNhQVIWimQ/3JIiiX/TEd5S9s+VO6FFguwKNRVow==
+"@docusaurus/types@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/types/-/types-3.9.2.tgz#e482cf18faea0d1fa5ce0e3f1e28e0f32d2593eb"
+  integrity sha512-Ux1JUNswg+EfUEmajJjyhIohKceitY/yzjRUpu04WXgvVz+fbhVC0p+R0JhvEu4ytw8zIAys2hrdpQPBHRIa8Q==
   dependencies:
     "@mdx-js/mdx" "^3.0.0"
     "@types/history" "^4.7.11"
+    "@types/mdast" "^4.0.2"
     "@types/react" "*"
     commander "^5.1.0"
     joi "^17.9.2"
-    react-helmet-async "^1.3.0"
+    react-helmet-async "npm:@slorber/react-helmet-async@1.3.0"
     utility-types "^3.10.0"
     webpack "^5.95.0"
     webpack-merge "^5.9.0"
 
-"@docusaurus/utils-common@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-3.6.3.tgz#57f840bd6f0928cf10060198cb421f1b9212c8f5"
-  integrity sha512-v4nKDaANLgT3pMBewHYEMAl/ufY0LkXao1QkFWzI5huWFOmNQ2UFzv2BiKeHX5Ownis0/w6cAyoxPhVdDonlSQ==
+"@docusaurus/utils-common@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-3.9.2.tgz#e89bfcf43d66359f43df45293fcdf22814847460"
+  integrity sha512-I53UC1QctruA6SWLvbjbhCpAw7+X7PePoe5pYcwTOEXD/PxeP8LnECAhTHHwWCblyUX5bMi4QLRkxvyZ+IT8Aw==
   dependencies:
-    "@docusaurus/types" "3.6.3"
+    "@docusaurus/types" "3.9.2"
     tslib "^2.6.0"
 
-"@docusaurus/utils-validation@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-3.6.3.tgz#3eca7125235eb90983ff660b97a71f331e331f57"
-  integrity sha512-bhEGGiN5BE38h21vjqD70Gxg++j+PfYVddDUE5UFvLDup68QOcpD33CLr+2knPorlxRbEaNfz6HQDUMQ3HuqKw==
+"@docusaurus/utils-validation@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-3.9.2.tgz#04aec285604790806e2fc5aa90aa950dc7ba75ae"
+  integrity sha512-l7yk3X5VnNmATbwijJkexdhulNsQaNDwoagiwujXoxFbWLcxHQqNQ+c/IAlzrfMMOfa/8xSBZ7KEKDesE/2J7A==
   dependencies:
-    "@docusaurus/logger" "3.6.3"
-    "@docusaurus/utils" "3.6.3"
-    "@docusaurus/utils-common" "3.6.3"
+    "@docusaurus/logger" "3.9.2"
+    "@docusaurus/utils" "3.9.2"
+    "@docusaurus/utils-common" "3.9.2"
     fs-extra "^11.2.0"
     joi "^17.9.2"
     js-yaml "^4.1.0"
     lodash "^4.17.21"
     tslib "^2.6.0"
 
-"@docusaurus/utils@3.6.3":
-  version "3.6.3"
-  resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-3.6.3.tgz#8dcb1969e4011a84dfb0a031da806dadddebf0ea"
-  integrity sha512-0R/FR3bKVl4yl8QwbL4TYFfR+OXBRpVUaTJdENapBGR3YMwfM6/JnhGilWQO8AOwPJGtGoDK7ib8+8UF9f3OZQ==
+"@docusaurus/utils@3.9.2":
+  version "3.9.2"
+  resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-3.9.2.tgz#ffab7922631c7e0febcb54e6d499f648bf8a89eb"
+  integrity sha512-lBSBiRruFurFKXr5Hbsl2thmGweAPmddhF3jb99U4EMDA5L+e5Y1rAkOS07Nvrup7HUMBDrCV45meaxZnt28nQ==
   dependencies:
-    "@docusaurus/logger" "3.6.3"
-    "@docusaurus/types" "3.6.3"
-    "@docusaurus/utils-common" "3.6.3"
-    "@svgr/webpack" "^8.1.0"
+    "@docusaurus/logger" "3.9.2"
+    "@docusaurus/types" "3.9.2"
+    "@docusaurus/utils-common" "3.9.2"
     escape-string-regexp "^4.0.0"
+    execa "5.1.1"
     file-loader "^6.2.0"
     fs-extra "^11.1.1"
     github-slugger "^1.5.0"
@@ -2024,9 +2020,9 @@
     js-yaml "^4.1.0"
     lodash "^4.17.21"
     micromatch "^4.0.5"
+    p-queue "^6.6.2"
     prompts "^2.4.2"
     resolve-pathname "^3.0.0"
-    shelljs "^0.8.5"
     tslib "^2.6.0"
     url-loader "^4.1.1"
     utility-types "^3.10.0"
@@ -2240,6 +2236,11 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
+"@opentelemetry/api@1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.9.0.tgz#d03eba68273dc0f7509e2a3d5cba21eae10379fe"
+  integrity sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==
+
 "@pkgjs/parseargs@^0.11.0":
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
@@ -2312,6 +2313,11 @@
     micromark-util-character "^1.1.0"
     micromark-util-symbol "^1.0.1"
 
+"@standard-schema/spec@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@standard-schema/spec/-/spec-1.0.0.tgz#f193b73dc316c4170f2e82a881da0f550d551b9c"
+  integrity sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==
+
 "@svgr/babel-plugin-add-jsx-attribute@8.0.0":
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-8.0.0.tgz#4001f5d5dd87fa13303e36ee106e3ff3a7eb8b22"
@@ -2835,7 +2841,7 @@
   dependencies:
     "@types/istanbul-lib-report" "*"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -2921,11 +2927,6 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.45.tgz#2c0fafd78705e7a18b7906b5201a522719dc5190"
   integrity sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==
 
-"@types/parse-json@^4.0.0":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239"
-  integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==
-
 "@types/parse5@^5.0.0":
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-5.0.3.tgz#e7b5aebbac150f8b5fdd4a46e7f0bd8e65e19109"
@@ -3092,6 +3093,11 @@
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
   integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
 
+"@vercel/oidc@3.0.3":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@vercel/oidc/-/oidc-3.0.3.tgz#82c2b6dd4d5c3b37dcb1189718cdeb9db402d052"
+  integrity sha512-yNEQvPcVrK9sIe637+I0jD6leluPxzwJKx/Haw6F4H77CdDsszUn5V3o96LPziXkSNE2B83+Z3mjqGKBK/R6Gg==
+
 "@webassemblyjs/ast@1.14.1", "@webassemblyjs/ast@^1.14.1":
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.14.1.tgz#a9f6a07f2b03c95c8d38c4536a1fdfb521ff55b6"
@@ -3258,7 +3264,7 @@ acorn@^8.0.0, acorn@^8.0.4, acorn@^8.11.0, acorn@^8.14.0, acorn@^8.8.2:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"
   integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==
 
-address@^1.0.1, address@^1.1.2:
+address@^1.0.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/address/-/address-1.2.2.tgz#2b5248dac5485a6390532c6a517fda2e3faac89e"
   integrity sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==
@@ -3271,6 +3277,16 @@ aggregate-error@^3.0.0:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
 
+ai@5.0.93, ai@^5.0.30:
+  version "5.0.93"
+  resolved "https://registry.yarnpkg.com/ai/-/ai-5.0.93.tgz#040fff47ce6603b36ed9b8b7ca228c2400d94be3"
+  integrity sha512-9eGcu+1PJgPg4pRNV4L7tLjRR3wdJC9CXQoNMvtqvYNOLZHFCzjHtVIOr2SIkoJJeu2+sOy3hyiSuTmy2MA40g==
+  dependencies:
+    "@ai-sdk/gateway" "2.0.9"
+    "@ai-sdk/provider" "2.0.0"
+    "@ai-sdk/provider-utils" "3.0.17"
+    "@opentelemetry/api" "1.9.0"
+
 ajv-formats@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
@@ -3278,7 +3294,7 @@ ajv-formats@^2.1.1:
   dependencies:
     ajv "^8.0.0"
 
-ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
+ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
@@ -3290,7 +3306,7 @@ ajv-keywords@^5.1.0:
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@^6.12.2, ajv@^6.12.5:
+ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -3310,52 +3326,32 @@ ajv@^8.0.0, ajv@^8.9.0:
     json-schema-traverse "^1.0.0"
     require-from-string "^2.0.2"
 
-algoliasearch-helper@^3.13.3:
-  version "3.22.5"
-  resolved "https://registry.yarnpkg.com/algoliasearch-helper/-/algoliasearch-helper-3.22.5.tgz#2fcc26814e10a121a2c2526a1b05c754061c56c0"
-  integrity sha512-lWvhdnc+aKOKx8jyA3bsdEgHzm/sglC4cYdMG4xSQyRiPLJVJtH/IVYZG3Hp6PkTEhQqhyVYkeP9z2IlcHJsWw==
+algoliasearch-helper@^3.26.0:
+  version "3.26.1"
+  resolved "https://registry.yarnpkg.com/algoliasearch-helper/-/algoliasearch-helper-3.26.1.tgz#5b7f0874a2751c3d6de675d5403d8fa2f015023f"
+  integrity sha512-CAlCxm4fYBXtvc5MamDzP6Svu8rW4z9me4DCBY1rQ2UDJ0u0flWmusQ8M3nOExZsLLRcUwUPoRAPMrhzOG3erw==
   dependencies:
     "@algolia/events" "^4.0.1"
 
-algoliasearch@^4.18.0:
-  version "4.24.0"
-  resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-4.24.0.tgz#b953b3e2309ef8f25da9de311b95b994ac918275"
-  integrity sha512-bf0QV/9jVejssFBmz2HQLxUadxk574t4iwjCKp5E7NBzwKkrDEhKPISIIjAU/p6K5qDx3qoeh4+26zWN1jmw3g==
+algoliasearch@^5.28.0, algoliasearch@^5.37.0:
+  version "5.44.0"
+  resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-5.44.0.tgz#25017f7ea7afcd35b35fb5a790a78694e5dddf4b"
+  integrity sha512-f8IpsbdQjzTjr/4mJ/jv5UplrtyMnnciGax6/B0OnLCs2/GJTK13O4Y7Ff1AvJVAaztanH+m5nzPoUq6EAy+aA==
   dependencies:
-    "@algolia/cache-browser-local-storage" "4.24.0"
-    "@algolia/cache-common" "4.24.0"
-    "@algolia/cache-in-memory" "4.24.0"
-    "@algolia/client-account" "4.24.0"
-    "@algolia/client-analytics" "4.24.0"
-    "@algolia/client-common" "4.24.0"
-    "@algolia/client-personalization" "4.24.0"
-    "@algolia/client-search" "4.24.0"
-    "@algolia/logger-common" "4.24.0"
-    "@algolia/logger-console" "4.24.0"
-    "@algolia/recommend" "4.24.0"
-    "@algolia/requester-browser-xhr" "4.24.0"
-    "@algolia/requester-common" "4.24.0"
-    "@algolia/requester-node-http" "4.24.0"
-    "@algolia/transporter" "4.24.0"
-
-algoliasearch@^5.12.0:
-  version "5.15.0"
-  resolved "https://registry.yarnpkg.com/algoliasearch/-/algoliasearch-5.15.0.tgz#09cef5a2555c4554b37a99f0488ea6ab2347e625"
-  integrity sha512-Yf3Swz1s63hjvBVZ/9f2P1Uu48GjmjCN+Esxb6MAONMGtZB1fRX8/S1AhUTtsuTlcGovbYLxpHgc7wEzstDZBw==
-  dependencies:
-    "@algolia/client-abtesting" "5.15.0"
-    "@algolia/client-analytics" "5.15.0"
-    "@algolia/client-common" "5.15.0"
-    "@algolia/client-insights" "5.15.0"
-    "@algolia/client-personalization" "5.15.0"
-    "@algolia/client-query-suggestions" "5.15.0"
-    "@algolia/client-search" "5.15.0"
-    "@algolia/ingestion" "1.15.0"
-    "@algolia/monitoring" "1.15.0"
-    "@algolia/recommend" "5.15.0"
-    "@algolia/requester-browser-xhr" "5.15.0"
-    "@algolia/requester-fetch" "5.15.0"
-    "@algolia/requester-node-http" "5.15.0"
+    "@algolia/abtesting" "1.10.0"
+    "@algolia/client-abtesting" "5.44.0"
+    "@algolia/client-analytics" "5.44.0"
+    "@algolia/client-common" "5.44.0"
+    "@algolia/client-insights" "5.44.0"
+    "@algolia/client-personalization" "5.44.0"
+    "@algolia/client-query-suggestions" "5.44.0"
+    "@algolia/client-search" "5.44.0"
+    "@algolia/ingestion" "1.44.0"
+    "@algolia/monitoring" "1.44.0"
+    "@algolia/recommend" "5.44.0"
+    "@algolia/requester-browser-xhr" "5.44.0"
+    "@algolia/requester-fetch" "5.44.0"
+    "@algolia/requester-node-http" "5.44.0"
 
 ansi-align@^3.0.1:
   version "3.0.1"
@@ -3459,11 +3455,6 @@ astring@^1.8.0:
   resolved "https://registry.yarnpkg.com/astring/-/astring-1.9.0.tgz#cc73e6062a7eb03e7d19c22d8b0b3451fd9bfeef"
   integrity sha512-LElXdjswlqjWrPpJFg1Fx4wpkOCxj1TDHlSV4PlaRxHGWko024xICaa97ZkMfs6DRKlCguiAI+rbXv5GWwXIkg==
 
-at-least-node@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
-  integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
-
 autocomplete.js@^0.37.0:
   version "0.37.1"
   resolved "https://registry.yarnpkg.com/autocomplete.js/-/autocomplete.js-0.37.1.tgz#a29a048d827e7d2bf8f7df8b831766e5cc97df01"
@@ -3483,6 +3474,18 @@ autoprefixer@^10.4.19:
     picocolors "^1.0.1"
     postcss-value-parser "^4.2.0"
 
+autoprefixer@^10.4.21:
+  version "10.4.22"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.22.tgz#90b27ab55ec0cf0684210d1f056f7d65dac55f16"
+  integrity sha512-ARe0v/t9gO28Bznv6GgqARmVqcWOV3mfgUPn9becPHMiD3o9BwlRgaeccZnwTpZ7Zwqrm+c1sUSsMxIzQzc8Xg==
+  dependencies:
+    browserslist "^4.27.0"
+    caniuse-lite "^1.0.30001754"
+    fraction.js "^5.3.4"
+    normalize-range "^0.1.2"
+    picocolors "^1.1.1"
+    postcss-value-parser "^4.2.0"
+
 available-typed-arrays@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846"
@@ -3549,6 +3552,11 @@ base64-js@^1.3.1:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
+baseline-browser-mapping@^2.8.25:
+  version "2.8.28"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.8.28.tgz#9ef511f5a7c19d74a94cafcbf951608398e9bdb3"
+  integrity sha512-gYjt7OIqdM0PcttNYP2aVrr2G0bMALkBaoehD4BuRGjAOtipg0b6wHg1yNL+s5zSnLZZrGHOw4IrND8CD+3oIQ==
+
 batch@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
@@ -3642,7 +3650,7 @@ braces@^3.0.3, braces@~3.0.2:
   dependencies:
     fill-range "^7.1.1"
 
-browserslist@^4.0.0, browserslist@^4.18.1, browserslist@^4.23.0, browserslist@^4.23.1, browserslist@^4.23.3, browserslist@^4.24.0, browserslist@^4.24.2:
+browserslist@^4.0.0, browserslist@^4.23.0, browserslist@^4.23.3, browserslist@^4.24.0, browserslist@^4.24.2:
   version "4.24.2"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.24.2.tgz#f5845bc91069dbd55ee89faf9822e1d885d16580"
   integrity sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==
@@ -3652,6 +3660,17 @@ browserslist@^4.0.0, browserslist@^4.18.1, browserslist@^4.23.0, browserslist@^4
     node-releases "^2.0.18"
     update-browserslist-db "^1.1.1"
 
+browserslist@^4.26.0, browserslist@^4.27.0:
+  version "4.28.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.28.0.tgz#9cefece0a386a17a3cd3d22ebf67b9deca1b5929"
+  integrity sha512-tbydkR/CxfMwelN0vwdP/pLkDwyAASZ+VfWm4EOwlB6SWhx1sYnWLqo8N5j0rAzPfzfRaxt0mM/4wPU/Su84RQ==
+  dependencies:
+    baseline-browser-mapping "^2.8.25"
+    caniuse-lite "^1.0.30001754"
+    electron-to-chromium "^1.5.249"
+    node-releases "^2.0.27"
+    update-browserslist-db "^1.1.4"
+
 buffer-from@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
@@ -3756,12 +3775,17 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001669:
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001687.tgz#d0ac634d043648498eedf7a3932836beba90ebae"
   integrity sha512-0S/FDhf4ZiqrTUiQ39dKeUjYRjkv7lOZU1Dgif2rIqrTzX/1wV2hfKu9TOm1IHkdSijfLswxTFzl/cvir+SLSQ==
 
+caniuse-lite@^1.0.30001754:
+  version "1.0.30001755"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001755.tgz#c01cfb1c30f5acf1229391666ec03492f4c332ff"
+  integrity sha512-44V+Jm6ctPj7R52Na4TLi3Zri4dWUljJd+RDm+j8LtNCc/ihLCT+X1TzoOAkRETEWqjuLnh9581Tl80FvK7jVA==
+
 ccount@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/ccount/-/ccount-2.0.1.tgz#17a3bf82302e0870d6da43a01311a8bc02a3ecf5"
   integrity sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==
 
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
+chalk@^4.0.0, chalk@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
@@ -3843,7 +3867,7 @@ chevrotain@~11.0.3:
     "@chevrotain/utils" "11.0.3"
     lodash-es "4.17.21"
 
-chokidar@^3.4.2, chokidar@^3.5.3, chokidar@^3.6.0:
+chokidar@^3.5.3, chokidar@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
   integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
@@ -3868,7 +3892,7 @@ ci-info@^3.2.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4"
   integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==
 
-clean-css@^5.2.2, clean-css@^5.3.2, clean-css@~5.3.2:
+clean-css@^5.2.2, clean-css@^5.3.3, clean-css@~5.3.2:
   version "5.3.3"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.3.tgz#b330653cd3bd6b75009cc25c714cae7b93351ccd"
   integrity sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==
@@ -4105,11 +4129,6 @@ cookie@0.7.1, cookie@>=0.7.0:
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-1.0.2.tgz#27360701532116bd3f1f9416929d176afe1e4610"
   integrity sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==
 
-copy-text-to-clipboard@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.2.0.tgz#0202b2d9bdae30a49a53f898626dcc3b49ad960b"
-  integrity sha512-RnJFp1XR/LOBDckxTib5Qjr/PMfkatD0MUCQgdpqS8MdKiNUzBjAQBEN6oUy+jW7LI93BBG3DtMB2KOOKpGs2Q==
-
 copy-webpack-plugin@^11.0.0:
   version "11.0.0"
   resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz#96d4dbdb5f73d02dd72d0528d1958721ab72e04a"
@@ -4158,17 +4177,6 @@ cose-base@^2.2.0:
   dependencies:
     layout-base "^2.0.0"
 
-cosmiconfig@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
-  integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==
-  dependencies:
-    "@types/parse-json" "^4.0.0"
-    import-fresh "^3.1.0"
-    parse-json "^5.0.0"
-    path-type "^4.0.0"
-    yaml "^1.7.2"
-
 cosmiconfig@^8.1.3, cosmiconfig@^8.3.5:
   version "8.3.6"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.3.6.tgz#060a2b871d66dba6c8538ea1118ba1ac16f5fae3"
@@ -4207,16 +4215,16 @@ css-declaration-sorter@^7.2.0:
   resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-7.2.0.tgz#6dec1c9523bc4a643e088aab8f09e67a54961024"
   integrity sha512-h70rUM+3PNFuaBDTLe8wF/cdWu+dOZmb7pJt8Z2sedYbAcQVQV/tEchueg3GWxwqS0cxtbxmaHEdkNACqcvsow==
 
-css-has-pseudo@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-7.0.1.tgz#adbb51821e51f7a7c1d2df4d12827870cc311137"
-  integrity sha512-EOcoyJt+OsuKfCADgLT7gADZI5jMzIe/AeI6MeAYKiFBDmNmM7kk46DtSfMj5AohUJisqVzopBpnQTlvbyaBWg==
+css-has-pseudo@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-7.0.3.tgz#a5ee2daf5f70a2032f3cefdf1e36e7f52a243873"
+  integrity sha512-oG+vKuGyqe/xvEMoxAQrhi7uY16deJR3i7wwhBerVrGQKSqUC5GiOVxTpM9F9B9hw0J+eKeOWLH7E9gZ1Dr5rA==
   dependencies:
     "@csstools/selector-specificity" "^5.0.0"
     postcss-selector-parser "^7.0.0"
     postcss-value-parser "^4.2.0"
 
-css-loader@^6.8.1:
+css-loader@^6.11.0:
   version "6.11.0"
   resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.11.0.tgz#33bae3bf6363d0a7c2cf9031c96c744ff54d85ba"
   integrity sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==
@@ -4295,10 +4303,10 @@ css-what@^6.0.1, css-what@^6.1.0:
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
   integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
 
-cssdb@^8.2.1:
-  version "8.2.2"
-  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-8.2.2.tgz#0a5bcbc47a297e6b0296e6082f60363e17b337d4"
-  integrity sha512-Z3kpWyvN68aKyeMxOUGmffQeHjvrzDxbre2B2ikr/WqQ4ZMkhHu2nOD6uwSeq3TpuOYU7ckvmJRAUIt6orkYUg==
+cssdb@^8.4.2:
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-8.4.2.tgz#1a367ab1904c97af0bb2c7ae179764deae7b078b"
+  integrity sha512-PzjkRkRUS+IHDJohtxkIczlxPPZqRo0nXplsYXOMBRPjcVRjj1W4DfvRgshUYTVuUigU7ptVYkFJQ7abUB0nyg==
 
 cssesc@^3.0.0:
   version "3.0.0"
@@ -4687,7 +4695,7 @@ debounce@^1.2.1:
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"
   integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
 
-debug@2.6.9, debug@^2.6.0:
+debug@2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -4734,7 +4742,7 @@ deep-extend@^0.6.0:
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
-deepmerge@^4.2.2, deepmerge@^4.3.1:
+deepmerge@^4.3.1:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
   integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
@@ -4785,20 +4793,6 @@ define-properties@^1.1.3, define-properties@^1.2.1:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
-del@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/del/-/del-6.1.1.tgz#3b70314f1ec0aa325c6b14eb36b95786671edb7a"
-  integrity sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==
-  dependencies:
-    globby "^11.0.1"
-    graceful-fs "^4.2.4"
-    is-glob "^4.0.1"
-    is-path-cwd "^2.2.0"
-    is-path-inside "^3.0.2"
-    p-map "^4.0.0"
-    rimraf "^3.0.2"
-    slash "^3.0.0"
-
 delaunator@5:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/delaunator/-/delaunator-5.0.1.tgz#39032b08053923e924d6094fe2cde1a99cc51278"
@@ -4816,7 +4810,7 @@ depd@~1.1.2:
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
 
-dequal@^2.0.0:
+dequal@^2.0.0, dequal@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
   integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
@@ -4831,14 +4825,6 @@ detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
-detect-port-alt@^1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275"
-  integrity sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==
-  dependencies:
-    address "^1.0.1"
-    debug "^2.6.0"
-
 detect-port@^1.5.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/detect-port/-/detect-port-1.6.1.tgz#45e4073997c5f292b957cb678fb0bb8ed4250a67"
@@ -5028,6 +5014,11 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
+electron-to-chromium@^1.5.249:
+  version "1.5.254"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.254.tgz#94b84c0a5faff94b334536090a9dec1c74b10130"
+  integrity sha512-DcUsWpVhv9svsKRxnSCZ86SjD+sp32SGidNB37KpqXJncp1mfUgKbHvBomE89WJDbfVKw1mdv5+ikrvd43r+Bg==
+
 electron-to-chromium@^1.5.41:
   version "1.5.71"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.71.tgz#d8b5dba1e55b320f2f4e9b1ca80738f53fcfec2b"
@@ -5317,7 +5308,7 @@ eval@^0.1.8:
     "@types/node" "*"
     require-like ">= 0.1.1"
 
-eventemitter3@^4.0.0:
+eventemitter3@^4.0.0, eventemitter3@^4.0.4:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
@@ -5327,6 +5318,26 @@ events@^3.2.0:
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
+eventsource-parser@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/eventsource-parser/-/eventsource-parser-3.0.6.tgz#292e165e34cacbc936c3c92719ef326d4aeb4e90"
+  integrity sha512-Vo1ab+QXPzZ4tCa8SwIHJFaSzy4R6SHf7BY79rFBDf0idraZWAkYrDjDj8uWaSm3S2TK+hJ7/t1CEmZ7jXw+pg==
+
+execa@5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
+  dependencies:
+    cross-spawn "^7.0.3"
+    get-stream "^6.0.0"
+    human-signals "^2.1.0"
+    is-stream "^2.0.0"
+    merge-stream "^2.0.0"
+    npm-run-path "^4.0.1"
+    onetime "^5.1.2"
+    signal-exit "^3.0.3"
+    strip-final-newline "^2.0.0"
+
 exenv@^1.2.0:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d"
@@ -5455,11 +5466,6 @@ file-loader@^6.2.0:
     loader-utils "^2.0.0"
     schema-utils "^3.0.0"
 
-filesize@^8.0.6:
-  version "8.0.7"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-8.0.7.tgz#695e70d80f4e47012c132d57a059e80c6b580bd8"
-  integrity sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==
-
 fill-range@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
@@ -5488,21 +5494,6 @@ find-cache-dir@^4.0.0:
     common-path-prefix "^3.0.0"
     pkg-dir "^7.0.0"
 
-find-up@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
-  integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
-  dependencies:
-    locate-path "^3.0.0"
-
-find-up@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
-  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
-  dependencies:
-    locate-path "^6.0.0"
-    path-exists "^4.0.0"
-
 find-up@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-6.3.0.tgz#2abab3d3280b2dc7ac10199ef324c4e002c8c790"
@@ -5536,25 +5527,6 @@ foreground-child@^3.1.0:
     cross-spawn "^7.0.0"
     signal-exit "^4.0.1"
 
-fork-ts-checker-webpack-plugin@^6.5.0:
-  version "6.5.3"
-  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.3.tgz#eda2eff6e22476a2688d10661688c47f611b37f3"
-  integrity sha512-SbH/l9ikmMWycd5puHJKTkZJKddF4iRLyW3DeZ08HTI7NGyLS38MXd/KGgeWumQO7YNQbW2u/NtPT2YowbPaGQ==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@types/json-schema" "^7.0.5"
-    chalk "^4.1.0"
-    chokidar "^3.4.2"
-    cosmiconfig "^6.0.0"
-    deepmerge "^4.2.2"
-    fs-extra "^9.0.0"
-    glob "^7.1.6"
-    memfs "^3.1.2"
-    minimatch "^3.0.4"
-    schema-utils "2.7.0"
-    semver "^7.3.2"
-    tapable "^1.0.0"
-
 form-data-encoder@^2.1.2:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-2.1.4.tgz#261ea35d2a70d48d30ec7a9603130fa5515e9cd5"
@@ -5575,6 +5547,11 @@ fraction.js@^4.3.7:
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
   integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
 
+fraction.js@^5.3.4:
+  version "5.3.4"
+  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-5.3.4.tgz#8c0fcc6a9908262df4ed197427bdeef563e0699a"
+  integrity sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==
+
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
@@ -5598,26 +5575,6 @@ fs-extra@^11.1.1, fs-extra@^11.2.0:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-extra@^9.0.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
-  integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
-  dependencies:
-    at-least-node "^1.0.0"
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
-fs-monkey@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.6.tgz#8ead082953e88d992cf3ff844faa907b26756da2"
-  integrity sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg==
-
-fs.realpath@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
-
 fsevents@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
@@ -5664,7 +5621,7 @@ get-own-enumerable-property-symbols@^3.0.0:
   resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
   integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==
 
-get-stream@^6.0.1:
+get-stream@^6.0.0, get-stream@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
@@ -5705,18 +5662,6 @@ glob@^10.3.10:
     package-json-from-dist "^1.0.0"
     path-scurry "^1.11.1"
 
-glob@^7.0.0, glob@^7.1.3, glob@^7.1.6:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
-  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.1.1"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
 global-dirs@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.1.tgz#0c488971f066baceda21447aecb1a8b911d22485"
@@ -5724,22 +5669,6 @@ global-dirs@^3.0.0:
   dependencies:
     ini "2.0.0"
 
-global-modules@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
-  integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
-  dependencies:
-    global-prefix "^3.0.0"
-
-global-prefix@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97"
-  integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==
-  dependencies:
-    ini "^1.3.5"
-    kind-of "^6.0.2"
-    which "^1.3.1"
-
 globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
@@ -5750,7 +5679,7 @@ globals@^15.14.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-15.15.0.tgz#7c4761299d41c32b075715a4ce1ede7897ff72a8"
   integrity sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==
 
-globby@^11.0.1, globby@^11.0.4, globby@^11.1.0:
+globby@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
@@ -6276,6 +6205,11 @@ http2-wrapper@^2.1.10:
     quick-lru "^5.1.1"
     resolve-alpn "^1.2.0"
 
+human-signals@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
+  integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
+
 hyperdyperid@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/hyperdyperid/-/hyperdyperid-1.2.0.tgz#59668d323ada92228d2a869d3e474d5a33b69e6b"
@@ -6310,7 +6244,7 @@ ignore@^5.2.0, ignore@^5.2.4:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
   integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
-image-size@>=1.2.1, image-size@^1.0.2:
+image-size@>=1.2.1, image-size@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/image-size/-/image-size-2.0.2.tgz#84a7b43704db5736f364bf0d1b029821299b4bdc"
   integrity sha512-IRqXKlaXwgSMAMtpNzZa1ZAe8m+Sa1770Dhk8VkSsP9LS+iHD62Zd8FQKs8fbPiagBE7BzoFX23cxFnwshpV6w==
@@ -6320,12 +6254,7 @@ immediate@^3.2.3:
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.3.0.tgz#1aef225517836bcdf7f2a2de2600c79ff0269266"
   integrity sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q==
 
-immer@^9.0.7:
-  version "9.0.21"
-  resolved "https://registry.yarnpkg.com/immer/-/immer-9.0.21.tgz#1e025ea31a40f24fb064f1fef23e931496330176"
-  integrity sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==
-
-import-fresh@^3.1.0, import-fresh@^3.3.0:
+import-fresh@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -6353,30 +6282,22 @@ infima@0.2.0-alpha.45:
   resolved "https://registry.yarnpkg.com/infima/-/infima-0.2.0-alpha.45.tgz#542aab5a249274d81679631b492973dd2c1e7466"
   integrity sha512-uyH0zfr1erU1OohLk0fT4Rrb94AOhguWNOcD9uGrSpRvNB+6gZXUoJX5J0NtvzBO10YZ9PgvA4NFgt+fYg8ojw==
 
-inflight@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
-  dependencies:
-    once "^1.3.0"
-    wrappy "1"
-
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
-  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
-
 inherits@2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
+inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
 ini@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
   integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
 
-ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
+ini@^1.3.4, ini@~1.3.0:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
@@ -6401,11 +6322,6 @@ internmap@^1.0.0:
   resolved "https://registry.yarnpkg.com/internmap/-/internmap-1.0.1.tgz#0017cc8a3b99605f0302f2b198d272e015e5df95"
   integrity sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==
 
-interpret@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
-  integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
-
 invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
@@ -6577,11 +6493,6 @@ is-obj@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
   integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
 
-is-path-cwd@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
-  integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
-
 is-path-inside@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
@@ -6621,10 +6532,10 @@ is-regexp@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
   integrity sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==
 
-is-root@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c"
-  integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==
+is-stream@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
 is-typed-array@^1.1.3:
   version "1.1.13"
@@ -6744,17 +6655,17 @@ joi@^17.9.2:
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-yaml@^3.13.1:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.2.tgz#77485ce1dd7f33c061fd1b16ecea23b55fcb04b0"
+  integrity sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
 js-yaml@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.1.tgz#854c292467705b699476e1a2decc0c8a3458806b"
+  integrity sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==
   dependencies:
     argparse "^2.0.1"
 
@@ -6783,6 +6694,11 @@ json-schema-traverse@^1.0.0:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
+json-schema@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
+  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
+
 json5@^2.1.2, json5@^2.2.3:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
@@ -6901,11 +6817,6 @@ loader-utils@^2.0.0:
     emojis-list "^3.0.0"
     json5 "^2.1.2"
 
-loader-utils@^3.2.0:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.3.1.tgz#735b9a19fd63648ca7adbd31c2327dfe281304e5"
-  integrity sha512-FMJTLMXfCLMLfJxcX9PFqX5qD88Z5MRGaZCVzfuqeZSPsyiBzs+pahDQjbIWz2QIzPZz0NX9Zy4FX3lmK6YHIg==
-
 local-pkg@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/local-pkg/-/local-pkg-1.1.2.tgz#c03d208787126445303f8161619dc701afa4abb5"
@@ -6915,21 +6826,6 @@ local-pkg@^1.0.0:
     pkg-types "^2.3.0"
     quansync "^0.2.11"
 
-locate-path@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"
-  integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==
-  dependencies:
-    p-locate "^3.0.0"
-    path-exists "^3.0.0"
-
-locate-path@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
-  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
-  dependencies:
-    p-locate "^5.0.0"
-
 locate-path@^7.1.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-7.2.0.tgz#69cb1779bd90b35ab1e771e1f2f89a202c2a8a8a"
@@ -7040,6 +6936,11 @@ marked@^16.0.0:
   resolved "https://registry.yarnpkg.com/marked/-/marked-16.2.0.tgz#c407a4f7ed3acc1110812525cfd1b0ed8502792c"
   integrity sha512-LbbTuye+0dWRz2TS9KJ7wsnD4KAtpj0MVkWc90XvBa6AslXsT0hTBVH5k32pcSyHH1fst9XEFJunXHktVy0zlg==
 
+marked@^16.3.0:
+  version "16.4.2"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-16.4.2.tgz#4959a64be6c486f0db7467ead7ce288de54290a3"
+  integrity sha512-TI3V8YYWvkVf3KJe1dRkpnjs68JUPyEa5vjKrp1XEEJUAOaQc+Qj+L1qWbPd0SJuAdQkFU0h73sXXqwDYxsiDA==
+
 mdast-util-definitions@^5.0.0:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-5.1.2.tgz#9910abb60ac5d7115d6819b57ae0bcef07a3f7a7"
@@ -7461,13 +7362,6 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
-memfs@^3.1.2:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6"
-  integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ==
-  dependencies:
-    fs-monkey "^1.0.4"
-
 memfs@^4.6.0:
   version "4.17.2"
   resolved "https://registry.yarnpkg.com/memfs/-/memfs-4.17.2.tgz#1f71a6d85c8c53b4f1b388234ed981a690c7e227"
@@ -8325,6 +8219,11 @@ mime@1.6.0:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
+mimic-fn@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
 mimic-response@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
@@ -8335,10 +8234,10 @@ mimic-response@^4.0.0:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-4.0.0.tgz#35468b19e7c75d10f5165ea25e75a5ceea7cf70f"
   integrity sha512-e5ISH9xMYU0DzrT+jl8q2ze9D6eWBto+I8CNpe+VI+K2J/F/k3PdkdTdz4wvGVH4NTpo+NRYTVIuMQEMMcsLqg==
 
-mini-css-extract-plugin@^2.9.1:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz#966031b468917a5446f4c24a80854b2947503c5b"
-  integrity sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==
+mini-css-extract-plugin@^2.9.2:
+  version "2.9.4"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.4.tgz#cafa1a42f8c71357f49cd1566810d74ff1cb0200"
+  integrity sha512-ZWYT7ln73Hptxqxk2DxPU9MmapXRhxkJD6tkSR04dnQxm8BGu2hzgKLugK5yySD97u/8yy7Ma7E76k9ZdvtjkQ==
   dependencies:
     schema-utils "^4.0.0"
     tapable "^2.2.1"
@@ -8348,7 +8247,7 @@ minimalistic-assert@^1.0.0:
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-minimatch@3.1.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1:
+minimatch@3.1.2, minimatch@^3.0.4:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -8424,6 +8323,11 @@ mz@^2.7.0:
     object-assign "^4.0.1"
     thenify-all "^1.0.0"
 
+nanoid@^3.3.11:
+  version "3.3.11"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
+  integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==
+
 nanoid@^3.3.7:
   version "3.3.8"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
@@ -8486,6 +8390,11 @@ node-releases@^2.0.18:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f"
   integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==
 
+node-releases@^2.0.27:
+  version "2.0.27"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.27.tgz#eedca519205cf20f650f61d56b070db111231e4e"
+  integrity sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==
+
 nopt@1.0.10:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
@@ -8513,6 +8422,13 @@ not@^0.1.0:
   resolved "https://registry.yarnpkg.com/not/-/not-0.1.0.tgz#c9691c1746c55dcfbe54cbd8bd4ff041bc2b519d"
   integrity sha512-5PDmaAsVfnWUgTUbJ3ERwn7u79Z0dYxN9ErxCpVJJqe2RK0PJ3z+iFUxuqjwtlDDegXvtWoxD/3Fzxox7tFGWA==
 
+npm-run-path@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
+  dependencies:
+    path-key "^3.0.0"
+
 nprogress@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/nprogress/-/nprogress-0.2.0.tgz#cb8f34c53213d895723fcbab907e9422adbcafb1"
@@ -8583,12 +8499,12 @@ on-headers@>=1.1.0, on-headers@~1.0.2:
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.1.0.tgz#59da4f91c45f5f989c6e4bcedc5a3b0aed70ff65"
   integrity sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==
 
-once@^1.3.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+onetime@^5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
-    wrappy "1"
+    mimic-fn "^2.1.0"
 
 open@^10.0.3:
   version "10.1.2"
@@ -8619,19 +8535,10 @@ p-cancelable@^3.0.0:
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-3.0.0.tgz#63826694b54d61ca1c20ebcb6d3ecf5e14cd8050"
   integrity sha512-mlVgR3PGuzlo0MmTdk4cXqXWlwQDLnONTAg6sm62XkMJEiRxN3GL3SffkYvqwonbkJBcrI7Uvv5Zh9yjvn2iUw==
 
-p-limit@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
-  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
-  dependencies:
-    p-try "^2.0.0"
-
-p-limit@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
-  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
-  dependencies:
-    yocto-queue "^0.1.0"
+p-finally@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+  integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==
 
 p-limit@^4.0.0:
   version "4.0.0"
@@ -8640,20 +8547,6 @@ p-limit@^4.0.0:
   dependencies:
     yocto-queue "^1.0.0"
 
-p-locate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4"
-  integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==
-  dependencies:
-    p-limit "^2.0.0"
-
-p-locate@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
-  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
-  dependencies:
-    p-limit "^3.0.2"
-
 p-locate@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-6.0.0.tgz#3da9a49d4934b901089dca3302fa65dc5a05c04f"
@@ -8668,6 +8561,14 @@ p-map@^4.0.0:
   dependencies:
     aggregate-error "^3.0.0"
 
+p-queue@^6.6.2:
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-6.6.2.tgz#2068a9dcf8e67dd0ec3e7a2bcb76810faa85e426"
+  integrity sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==
+  dependencies:
+    eventemitter3 "^4.0.4"
+    p-timeout "^3.2.0"
+
 p-retry@^6.2.0:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-6.2.1.tgz#81828f8dc61c6ef5a800585491572cc9892703af"
@@ -8677,10 +8578,12 @@ p-retry@^6.2.0:
     is-network-error "^1.0.0"
     retry "^0.13.1"
 
-p-try@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
-  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+p-timeout@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-3.2.0.tgz#c7e17abc971d2a7962ef83626b35d635acf23dfe"
+  integrity sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==
+  dependencies:
+    p-finally "^1.0.0"
 
 package-json-from-dist@^1.0.0:
   version "1.0.1"
@@ -8731,7 +8634,7 @@ parse-entities@^4.0.0:
     is-decimal "^2.0.0"
     is-hexadecimal "^2.0.0"
 
-parse-json@^5.0.0, parse-json@^5.2.0:
+parse-json@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
   integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
@@ -8789,32 +8692,17 @@ path-data-parser@0.1.0, path-data-parser@^0.1.0:
   resolved "https://registry.yarnpkg.com/path-data-parser/-/path-data-parser-0.1.0.tgz#8f5ba5cc70fc7becb3dcefaea08e2659aba60b8c"
   integrity sha512-NOnmBpt5Y2RWbuv0LMzsayp3lVylAHLPUTut412ZA3l+C4uw4ZVkQbjShYCQ8TCpUMdPapr4YjUqLYD6v68j+w==
 
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==
-
-path-exists@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
-  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-
 path-exists@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7"
   integrity sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==
 
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
-
 path-is-inside@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==
 
-path-key@^3.1.0:
+path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
@@ -8920,13 +8808,6 @@ pkg-types@^2.3.0:
     exsolve "^1.0.7"
     pathe "^2.0.3"
 
-pkg-up@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5"
-  integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==
-  dependencies:
-    find-up "^3.0.0"
-
 points-on-curve@0.2.0, points-on-curve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/points-on-curve/-/points-on-curve-0.2.0.tgz#7dbb98c43791859434284761330fa893cb81b4d1"
@@ -8967,15 +8848,15 @@ postcss-clamp@^4.1.0:
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-color-functional-notation@^7.0.6:
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-7.0.6.tgz#d74c1e2294b72287eb9af079c04b7ddeff7ec5b3"
-  integrity sha512-wLXvm8RmLs14Z2nVpB4CWlnvaWPRcOZFltJSlcbYwSJ1EDZKsKDhPKIMecCnuU054KSmlmubkqczmm6qBPCBhA==
+postcss-color-functional-notation@^7.0.12:
+  version "7.0.12"
+  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-7.0.12.tgz#9a3df2296889e629fde18b873bb1f50a4ecf4b83"
+  integrity sha512-TLCW9fN5kvO/u38/uesdpbx3e8AkTYhMvDZYa9JpmImWuTE99bDQ7GU7hdOADIZsiI9/zuxfAJxny/khknp1Zw==
   dependencies:
-    "@csstools/css-color-parser" "^3.0.6"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/css-color-parser" "^3.1.0"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.2.1"
     "@csstools/utilities" "^2.0.0"
 
 postcss-color-hex-alpha@^10.0.0:
@@ -9012,35 +8893,35 @@ postcss-convert-values@^6.1.0:
     browserslist "^4.23.0"
     postcss-value-parser "^4.2.0"
 
-postcss-custom-media@^11.0.5:
-  version "11.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-11.0.5.tgz#2fcd88a9b1d4da41c67dac6f2def903063a3377d"
-  integrity sha512-SQHhayVNgDvSAdX9NQ/ygcDQGEY+aSF4b/96z7QUX6mqL5yl/JgG/DywcF6fW9XbnCRE+aVYk+9/nqGuzOPWeQ==
+postcss-custom-media@^11.0.6:
+  version "11.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-11.0.6.tgz#6b450e5bfa209efb736830066682e6567bd04967"
+  integrity sha512-C4lD4b7mUIw+RZhtY7qUbf4eADmb7Ey8BFA2px9jUbwg7pjTZDl4KY4bvlUV+/vXQvzQRfiGEVJyAbtOsCMInw==
   dependencies:
-    "@csstools/cascade-layer-name-parser" "^2.0.4"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/media-query-list-parser" "^4.0.2"
+    "@csstools/cascade-layer-name-parser" "^2.0.5"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/media-query-list-parser" "^4.0.3"
 
-postcss-custom-properties@^14.0.4:
-  version "14.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-14.0.4.tgz#de9c663285a98833a946d7003a34369d3ce373a9"
-  integrity sha512-QnW8FCCK6q+4ierwjnmXF9Y9KF8q0JkbgVfvQEMa93x1GT8FvOiUevWCN2YLaOWyByeDX8S6VFbZEeWoAoXs2A==
+postcss-custom-properties@^14.0.6:
+  version "14.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-14.0.6.tgz#1af73a650bf115ba052cf915287c9982825fc90e"
+  integrity sha512-fTYSp3xuk4BUeVhxCSJdIPhDLpJfNakZKoiTDx7yRGCdlZrSJR7mWKVOBS4sBF+5poPQFMj2YdXx1VHItBGihQ==
   dependencies:
-    "@csstools/cascade-layer-name-parser" "^2.0.4"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
+    "@csstools/cascade-layer-name-parser" "^2.0.5"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
     "@csstools/utilities" "^2.0.0"
     postcss-value-parser "^4.2.0"
 
-postcss-custom-selectors@^8.0.4:
-  version "8.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-8.0.4.tgz#95ef8268fdbbbd84f34cf84a4517c9d99d419c5a"
-  integrity sha512-ASOXqNvDCE0dAJ/5qixxPeL1aOVGHGW2JwSy7HyjWNbnWTQCl+fDc968HY1jCmZI0+BaYT5CxsOiUhavpG/7eg==
+postcss-custom-selectors@^8.0.5:
+  version "8.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-8.0.5.tgz#9448ed37a12271d7ab6cb364b6f76a46a4a323e8"
+  integrity sha512-9PGmckHQswiB2usSO6XMSswO2yFWVoCAuih1yl9FVcwkscLjRKjwsjM3t+NIWpSU2Jx3eOiK2+t4vVTQaoCHHg==
   dependencies:
-    "@csstools/cascade-layer-name-parser" "^2.0.4"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
+    "@csstools/cascade-layer-name-parser" "^2.0.5"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
     postcss-selector-parser "^7.0.0"
 
 postcss-dir-pseudo-class@^9.0.1:
@@ -9077,12 +8958,12 @@ postcss-discard-unused@^6.0.5:
   dependencies:
     postcss-selector-parser "^6.0.16"
 
-postcss-double-position-gradients@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-6.0.0.tgz#eddd424ec754bb543d057d4d2180b1848095d4d2"
-  integrity sha512-JkIGah3RVbdSEIrcobqj4Gzq0h53GG4uqDPsho88SgY84WnpkTpI0k50MFK/sX7XqVisZ6OqUfFnoUO6m1WWdg==
+postcss-double-position-gradients@^6.0.4:
+  version "6.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-6.0.4.tgz#b482d08b5ced092b393eb297d07976ab482d4cad"
+  integrity sha512-m6IKmxo7FxSP5nF2l63QbCC3r+bWpFUWmZXZf096WxG0m7Vl1Q1+ruFOhpdDRmKrRS+S3Jtk+TVk/7z0+BVK6g==
   dependencies:
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/postcss-progressive-custom-properties" "^4.2.1"
     "@csstools/utilities" "^2.0.0"
     postcss-value-parser "^4.2.0"
 
@@ -9118,18 +8999,18 @@ postcss-image-set-function@^7.0.0:
     "@csstools/utilities" "^2.0.0"
     postcss-value-parser "^4.2.0"
 
-postcss-lab-function@^7.0.6:
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-7.0.6.tgz#3121800fc7939ed1d9a1e87abeb33c407151252c"
-  integrity sha512-HPwvsoK7C949vBZ+eMyvH2cQeMr3UREoHvbtra76/UhDuiViZH6pir+z71UaJQohd7VDSVUdR6TkWYKExEc9aQ==
+postcss-lab-function@^7.0.12:
+  version "7.0.12"
+  resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-7.0.12.tgz#eb555ac542607730eb0a87555074e4a5c6eef6e4"
+  integrity sha512-tUcyRk1ZTPec3OuKFsqtRzW2Go5lehW29XA21lZ65XmzQkz43VY2tyWEC202F7W3mILOjw0voOiuxRGTsN+J9w==
   dependencies:
-    "@csstools/css-color-parser" "^3.0.6"
-    "@csstools/css-parser-algorithms" "^3.0.4"
-    "@csstools/css-tokenizer" "^3.0.3"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
+    "@csstools/css-color-parser" "^3.1.0"
+    "@csstools/css-parser-algorithms" "^3.0.5"
+    "@csstools/css-tokenizer" "^3.0.4"
+    "@csstools/postcss-progressive-custom-properties" "^4.2.1"
     "@csstools/utilities" "^2.0.0"
 
-postcss-loader@^7.3.3:
+postcss-loader@^7.3.4:
   version "7.3.4"
   resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.3.4.tgz#aed9b79ce4ed7e9e89e56199d25ad1ec8f606209"
   integrity sha512-iW5WTTBSC5BfsBJ9daFMPVrLT36MrNiC6fqOZTTaHjBNX6Pfd5p+hSBqe/fEeNd7pc13QiAyGt7VdGMw4eRC4A==
@@ -9138,10 +9019,10 @@ postcss-loader@^7.3.3:
     jiti "^1.20.0"
     semver "^7.5.4"
 
-postcss-logical@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-8.0.0.tgz#0db0b90c2dc53b485a8074a4b7a906297544f58d"
-  integrity sha512-HpIdsdieClTjXLOyYdUPAX/XQASNIwdKt5hoZW08ZOAiI+tbV0ta1oclkpVkW5ANU+xJvk3KkA0FejkjGLXUkg==
+postcss-logical@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-8.1.0.tgz#4092b16b49e3ecda70c4d8945257da403d167228"
+  integrity sha512-pL1hXFQ2fEXNKiNiAgtfA005T9FBxky5zkX6s4GZM2D8RkVgRqz3f4g1JUoq925zXv495qk8UNldDwh8uGEDoA==
   dependencies:
     postcss-value-parser "^4.2.0"
 
@@ -9231,12 +9112,12 @@ postcss-modules-values@^4.0.0:
   dependencies:
     icss-utils "^5.0.0"
 
-postcss-nesting@^13.0.1:
-  version "13.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-13.0.1.tgz#c405796d7245a3e4c267a9956cacfe9670b5d43e"
-  integrity sha512-VbqqHkOBOt4Uu3G8Dm8n6lU5+9cJFxiuty9+4rcoyRPO9zZS1JIs6td49VIoix3qYqELHlJIn46Oih9SAKo+yQ==
+postcss-nesting@^13.0.2:
+  version "13.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-13.0.2.tgz#fde0d4df772b76d03b52eccc84372e8d1ca1402e"
+  integrity sha512-1YCI290TX+VP0U/K/aFxzHzQWHWURL+CtHMSbex1lCdpXD1SoR2sYuxDu5aNI9lPoXpKTCggFZiDJbwylU0LEQ==
   dependencies:
-    "@csstools/selector-resolve-nested" "^3.0.0"
+    "@csstools/selector-resolve-nested" "^3.1.0"
     "@csstools/selector-specificity" "^5.0.0"
     postcss-selector-parser "^7.0.0"
 
@@ -9334,67 +9215,71 @@ postcss-place@^10.0.0:
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-preset-env@^10.1.0:
-  version "10.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-10.1.1.tgz#6ee631272353fb1c4a9711943e9b80a178ffce44"
-  integrity sha512-wqqsnBFD6VIwcHHRbhjTOcOi4qRVlB26RwSr0ordPj7OubRRxdWebv/aLjKLRR8zkZrbxZyuus03nOIgC5elMQ==
+postcss-preset-env@^10.2.1:
+  version "10.4.0"
+  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-10.4.0.tgz#fa6167a307f337b2bcdd1d125604ff97cdeb5142"
+  integrity sha512-2kqpOthQ6JhxqQq1FSAAZGe9COQv75Aw8WbsOvQVNJ2nSevc9Yx/IKZGuZ7XJ+iOTtVon7LfO7ELRzg8AZ+sdw==
   dependencies:
-    "@csstools/postcss-cascade-layers" "^5.0.1"
-    "@csstools/postcss-color-function" "^4.0.6"
-    "@csstools/postcss-color-mix-function" "^3.0.6"
-    "@csstools/postcss-content-alt-text" "^2.0.4"
-    "@csstools/postcss-exponential-functions" "^2.0.5"
+    "@csstools/postcss-alpha-function" "^1.0.1"
+    "@csstools/postcss-cascade-layers" "^5.0.2"
+    "@csstools/postcss-color-function" "^4.0.12"
+    "@csstools/postcss-color-function-display-p3-linear" "^1.0.1"
+    "@csstools/postcss-color-mix-function" "^3.0.12"
+    "@csstools/postcss-color-mix-variadic-function-arguments" "^1.0.2"
+    "@csstools/postcss-content-alt-text" "^2.0.8"
+    "@csstools/postcss-contrast-color-function" "^2.0.12"
+    "@csstools/postcss-exponential-functions" "^2.0.9"
     "@csstools/postcss-font-format-keywords" "^4.0.0"
-    "@csstools/postcss-gamut-mapping" "^2.0.6"
-    "@csstools/postcss-gradients-interpolation-method" "^5.0.6"
-    "@csstools/postcss-hwb-function" "^4.0.6"
-    "@csstools/postcss-ic-unit" "^4.0.0"
-    "@csstools/postcss-initial" "^2.0.0"
-    "@csstools/postcss-is-pseudo-class" "^5.0.1"
-    "@csstools/postcss-light-dark-function" "^2.0.7"
+    "@csstools/postcss-gamut-mapping" "^2.0.11"
+    "@csstools/postcss-gradients-interpolation-method" "^5.0.12"
+    "@csstools/postcss-hwb-function" "^4.0.12"
+    "@csstools/postcss-ic-unit" "^4.0.4"
+    "@csstools/postcss-initial" "^2.0.1"
+    "@csstools/postcss-is-pseudo-class" "^5.0.3"
+    "@csstools/postcss-light-dark-function" "^2.0.11"
     "@csstools/postcss-logical-float-and-clear" "^3.0.0"
     "@csstools/postcss-logical-overflow" "^2.0.0"
     "@csstools/postcss-logical-overscroll-behavior" "^2.0.0"
     "@csstools/postcss-logical-resize" "^3.0.0"
-    "@csstools/postcss-logical-viewport-units" "^3.0.3"
-    "@csstools/postcss-media-minmax" "^2.0.5"
-    "@csstools/postcss-media-queries-aspect-ratio-number-values" "^3.0.4"
+    "@csstools/postcss-logical-viewport-units" "^3.0.4"
+    "@csstools/postcss-media-minmax" "^2.0.9"
+    "@csstools/postcss-media-queries-aspect-ratio-number-values" "^3.0.5"
     "@csstools/postcss-nested-calc" "^4.0.0"
     "@csstools/postcss-normalize-display-values" "^4.0.0"
-    "@csstools/postcss-oklab-function" "^4.0.6"
-    "@csstools/postcss-progressive-custom-properties" "^4.0.0"
-    "@csstools/postcss-random-function" "^1.0.1"
-    "@csstools/postcss-relative-color-syntax" "^3.0.6"
+    "@csstools/postcss-oklab-function" "^4.0.12"
+    "@csstools/postcss-progressive-custom-properties" "^4.2.1"
+    "@csstools/postcss-random-function" "^2.0.1"
+    "@csstools/postcss-relative-color-syntax" "^3.0.12"
     "@csstools/postcss-scope-pseudo-class" "^4.0.1"
-    "@csstools/postcss-sign-functions" "^1.1.0"
-    "@csstools/postcss-stepped-value-functions" "^4.0.5"
-    "@csstools/postcss-text-decoration-shorthand" "^4.0.1"
-    "@csstools/postcss-trigonometric-functions" "^4.0.5"
+    "@csstools/postcss-sign-functions" "^1.1.4"
+    "@csstools/postcss-stepped-value-functions" "^4.0.9"
+    "@csstools/postcss-text-decoration-shorthand" "^4.0.3"
+    "@csstools/postcss-trigonometric-functions" "^4.0.9"
     "@csstools/postcss-unset-value" "^4.0.0"
-    autoprefixer "^10.4.19"
-    browserslist "^4.23.1"
+    autoprefixer "^10.4.21"
+    browserslist "^4.26.0"
     css-blank-pseudo "^7.0.1"
-    css-has-pseudo "^7.0.1"
+    css-has-pseudo "^7.0.3"
     css-prefers-color-scheme "^10.0.0"
-    cssdb "^8.2.1"
+    cssdb "^8.4.2"
     postcss-attribute-case-insensitive "^7.0.1"
     postcss-clamp "^4.1.0"
-    postcss-color-functional-notation "^7.0.6"
+    postcss-color-functional-notation "^7.0.12"
     postcss-color-hex-alpha "^10.0.0"
     postcss-color-rebeccapurple "^10.0.0"
-    postcss-custom-media "^11.0.5"
-    postcss-custom-properties "^14.0.4"
-    postcss-custom-selectors "^8.0.4"
+    postcss-custom-media "^11.0.6"
+    postcss-custom-properties "^14.0.6"
+    postcss-custom-selectors "^8.0.5"
     postcss-dir-pseudo-class "^9.0.1"
-    postcss-double-position-gradients "^6.0.0"
+    postcss-double-position-gradients "^6.0.4"
     postcss-focus-visible "^10.0.1"
     postcss-focus-within "^9.0.1"
     postcss-font-variant "^5.0.0"
     postcss-gap-properties "^6.0.0"
     postcss-image-set-function "^7.0.0"
-    postcss-lab-function "^7.0.6"
-    postcss-logical "^8.0.0"
-    postcss-nesting "^13.0.1"
+    postcss-lab-function "^7.0.12"
+    postcss-logical "^8.1.0"
+    postcss-nesting "^13.0.2"
     postcss-opacity-percentage "^3.0.0"
     postcss-overflow-shorthand "^6.0.0"
     postcss-page-break "^3.0.4"
@@ -9492,7 +9377,7 @@ postcss-zindex@^6.0.2:
   resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-6.0.2.tgz#e498304b83a8b165755f53db40e2ea65a99b56e1"
   integrity sha512-5BxW9l1evPB/4ZIc+2GobEBoKC+h8gPGCMi+jxsYvd2x0mjq7wazk6DrP71pStqxE9Foxh5TVnonbWpFZzXaYg==
 
-postcss@^8.4.21, postcss@^8.4.24, postcss@^8.4.26, postcss@^8.4.33, postcss@^8.4.38:
+postcss@^8.4.21, postcss@^8.4.24, postcss@^8.4.33:
   version "8.4.49"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19"
   integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
@@ -9501,6 +9386,15 @@ postcss@^8.4.21, postcss@^8.4.24, postcss@^8.4.26, postcss@^8.4.33, postcss@^8.4
     picocolors "^1.1.1"
     source-map-js "^1.2.1"
 
+postcss@^8.5.4:
+  version "8.5.6"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.6.tgz#2825006615a619b4f62a9e7426cc120b349a8f3c"
+  integrity sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==
+  dependencies:
+    nanoid "^3.3.11"
+    picocolors "^1.1.1"
+    source-map-js "^1.2.1"
+
 pretty-error@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6"
@@ -9645,36 +9539,6 @@ rc@1.2.8:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-dev-utils@^12.0.1:
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-12.0.1.tgz#ba92edb4a1f379bd46ccd6bcd4e7bc398df33e73"
-  integrity sha512-84Ivxmr17KjUupyqzFode6xKhjwuEJDROWKJy/BthkL7Wn6NJ8h4WE6k/exAv6ImS+0oZLRRW5j/aINMHyeGeQ==
-  dependencies:
-    "@babel/code-frame" "^7.16.0"
-    address "^1.1.2"
-    browserslist "^4.18.1"
-    chalk "^4.1.2"
-    cross-spawn "^7.0.3"
-    detect-port-alt "^1.1.6"
-    escape-string-regexp "^4.0.0"
-    filesize "^8.0.6"
-    find-up "^5.0.0"
-    fork-ts-checker-webpack-plugin "^6.5.0"
-    global-modules "^2.0.0"
-    globby "^11.0.4"
-    gzip-size "^6.0.0"
-    immer "^9.0.7"
-    is-root "^2.1.0"
-    loader-utils "^3.2.0"
-    open "^8.4.0"
-    pkg-up "^3.1.0"
-    prompts "^2.4.2"
-    react-error-overlay "^6.0.11"
-    recursive-readdir "^2.2.2"
-    shell-quote "^1.7.3"
-    strip-ansi "^6.0.1"
-    text-table "^0.2.0"
-
 react-dom@^18.0.0:
   version "18.3.1"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4"
@@ -9683,29 +9547,15 @@ react-dom@^18.0.0:
     loose-envify "^1.1.0"
     scheduler "^0.23.2"
 
-react-error-overlay@^6.0.11:
-  version "6.0.11"
-  resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb"
-  integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==
-
-react-fast-compare@^3.2.0, react-fast-compare@^3.2.2:
+react-fast-compare@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.2.tgz#929a97a532304ce9fee4bcae44234f1ce2c21d49"
   integrity sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==
 
-react-helmet-async@*:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-2.0.5.tgz#cfc70cd7bb32df7883a8ed55502a1513747223ec"
-  integrity sha512-rYUYHeus+i27MvFE+Jaa4WsyBKGkL6qVgbJvSBoX8mbsWoABJXdEO0bZyi0F6i+4f0NuIb8AvqPMj3iXFHkMwg==
-  dependencies:
-    invariant "^2.2.4"
-    react-fast-compare "^3.2.2"
-    shallowequal "^1.1.0"
-
-react-helmet-async@^1.3.0:
+"react-helmet-async@npm:@slorber/react-helmet-async@1.3.0":
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/react-helmet-async/-/react-helmet-async-1.3.0.tgz#7bd5bf8c5c69ea9f02f6083f14ce33ef545c222e"
-  integrity sha512-9jZ57/dAn9t3q6hneQS0wukqC2ENOBgMNVEhb/ZG9ZSxUetzVIw4iAmEU38IaVg3QGYauQPhSeUTuIUtFglWpg==
+  resolved "https://registry.yarnpkg.com/@slorber/react-helmet-async/-/react-helmet-async-1.3.0.tgz#11fbc6094605cf60aa04a28c17e0aab894b4ecff"
+  integrity sha512-e9/OK8VhwUSc67diWI8Rb3I0YgI9/SBQtnhe9aEuK6MhZm7ntZZimXgwXnd8W96YTmSOb9M4d8LwhRZyhWr/1A==
   dependencies:
     "@babel/runtime" "^7.12.5"
     invariant "^2.2.4"
@@ -9718,10 +9568,10 @@ react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
-react-json-view-lite@^1.2.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/react-json-view-lite/-/react-json-view-lite-1.5.0.tgz#377cc302821717ac79a1b6d099e1891df54c8662"
-  integrity sha512-nWqA1E4jKPklL2jvHWs6s+7Na0qNgw9HCP6xehdQJeg6nPBTFZgGwyko9Q0oj+jQWKTTVRS30u0toM5wiuL3iw==
+react-json-view-lite@^2.3.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/react-json-view-lite/-/react-json-view-lite-2.5.0.tgz#c7ff011c7cc80e9900abc7aa4916c6a5c6d6c1c6"
+  integrity sha512-tk7o7QG9oYyELWHL8xiMQ8x4WzjCzbWNyig3uexmkLb54r8jO0yH3WCWx8UZS0c49eSA4QUmG5caiRJ8fAn58g==
 
 react-lifecycles-compat@^3.0.0:
   version "3.0.4"
@@ -9832,18 +9682,6 @@ readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
-reading-time@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/reading-time/-/reading-time-1.5.0.tgz#d2a7f1b6057cb2e169beaf87113cc3411b5bc5bb"
-  integrity sha512-onYyVhBNr4CmAxFsKS7bz+uTLRakypIe4R+5A824vBSkQy/hB3fZepoVEf8OVAxzLvK+H/jm9TzpI3ETSm64Kg==
-
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  integrity sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==
-  dependencies:
-    resolve "^1.1.6"
-
 recma-build-jsx@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/recma-build-jsx/-/recma-build-jsx-1.0.0.tgz#c02f29e047e103d2fab2054954e1761b8ea253c4"
@@ -9884,13 +9722,6 @@ recma-stringify@^1.0.0:
     unified "^11.0.0"
     vfile "^6.0.0"
 
-recursive-readdir@^2.2.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.2.3.tgz#e726f328c0d69153bcabd5c322d3195252379372"
-  integrity sha512-8HrF5ZsXk5FAH9dgsx3BlUer73nIhuj+9OrQwEbLTPOBzGkL1lsFCR01am+v+0m2Cmbs1nP12hLDl5FA7EszKA==
-  dependencies:
-    minimatch "^3.0.5"
-
 regenerate-unicode-properties@^10.2.0:
   version "10.2.0"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz#626e39df8c372338ea9b8028d1f99dc3fd9c3db0"
@@ -10164,7 +9995,7 @@ resolve-pathname@^3.0.0:
   resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd"
   integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng==
 
-resolve@^1.1.6, resolve@^1.14.2:
+resolve@^1.14.2:
   version "1.22.8"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
   integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
@@ -10190,13 +10021,6 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
 robust-predicates@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/robust-predicates/-/robust-predicates-3.0.2.tgz#d5b28528c4824d20fc48df1928d41d9efa1ad771"
@@ -10212,11 +10036,6 @@ roughjs@^4.6.6:
     points-on-curve "^0.2.0"
     points-on-path "^0.2.1"
 
-rtl-detect@^1.0.4:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/rtl-detect/-/rtl-detect-1.1.2.tgz#ca7f0330af5c6bb626c15675c642ba85ad6273c6"
-  integrity sha512-PGMBq03+TTG/p/cRB7HCLKJ1MgDIi07+QU1faSjiYRfmY5UsAttV9Hs08jDAHVwcOwmVLcSJkpwyfXszVjWfIQ==
-
 rtlcss@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/rtlcss/-/rtlcss-4.3.0.tgz#f8efd4d5b64f640ec4af8fa25b65bacd9e07cc97"
@@ -10278,14 +10097,10 @@ scheduler@^0.23.2:
   dependencies:
     loose-envify "^1.1.0"
 
-schema-utils@2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
-  integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==
-  dependencies:
-    "@types/json-schema" "^7.0.4"
-    ajv "^6.12.2"
-    ajv-keywords "^3.4.1"
+schema-dts@^1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/schema-dts/-/schema-dts-1.1.5.tgz#9237725d305bac3469f02b292a035107595dc324"
+  integrity sha512-RJr9EaCmsLzBX2NDiO5Z3ux2BVosNZN5jo0gWgsyKvxKIUL5R3swNvoorulAeL9kLB0iTSX7V6aokhla2m7xbg==
 
 schema-utils@^3.0.0, schema-utils@^3.1.1, schema-utils@^3.2.0:
   version "3.3.0"
@@ -10349,7 +10164,7 @@ semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.2, semver@^7.5.4, semver@^7.6.3:
+semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.2, semver@^7.5.4, semver@^7.6.3:
   version "7.6.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
   integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
@@ -10462,20 +10277,11 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shell-quote@^1.7.3, shell-quote@^1.8.1:
+shell-quote@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.2.tgz#d2d83e057959d53ec261311e9e9b8f51dcb2934a"
   integrity sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==
 
-shelljs@^0.8.5:
-  version "0.8.5"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c"
-  integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
 side-channel@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
@@ -10486,7 +10292,7 @@ side-channel@^1.0.6:
     get-intrinsic "^1.2.4"
     object-inspect "^1.13.1"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2:
+signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
@@ -10713,6 +10519,11 @@ strip-bom-string@^1.0.0:
   resolved "https://registry.yarnpkg.com/strip-bom-string/-/strip-bom-string-1.0.0.tgz#e5211e9224369fbb81d633a2f00044dc8cedad92"
   integrity sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==
 
+strip-final-newline@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
+
 strip-json-comments@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
@@ -10800,6 +10611,14 @@ svgo@^3.0.2, svgo@^3.2.0:
     csso "^5.0.5"
     picocolors "^1.0.0"
 
+swr@^2.2.5:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/swr/-/swr-2.3.6.tgz#5fee0ee8a0762a16871ee371075cb09422b64f50"
+  integrity sha512-wfHRmHWk/isGNMwlLGlZX5Gzz/uTgo0o2IRuTMcf4CPuPFJZlq0rDaKUx+ozB5nBOReNV1kiOyzMfj+MBMikLw==
+  dependencies:
+    dequal "^2.0.3"
+    use-sync-external-store "^1.4.0"
+
 synp@^1.9.10:
   version "1.9.14"
   resolved "https://registry.yarnpkg.com/synp/-/synp-1.9.14.tgz#1feb222d273f6092c6c264746277e95655c60717"
@@ -10815,11 +10634,6 @@ synp@^1.9.10:
     semver "^7.6.3"
     sort-object-keys "^1.1.3"
 
-tapable@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
-  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
-
 tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0, tapable@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
@@ -10846,11 +10660,6 @@ terser@^5.10.0, terser@^5.15.1, terser@^5.26.0:
     commander "^2.20.0"
     source-map-support "~0.5.20"
 
-text-table@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
-
 thenify-all@^1.0.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"
@@ -10870,6 +10679,11 @@ thingies@^1.20.0:
   resolved "https://registry.yarnpkg.com/thingies/-/thingies-1.21.0.tgz#e80fbe58fd6fdaaab8fad9b67bd0a5c943c445c1"
   integrity sha512-hsqsJsFMsV+aD4s3CWKk85ep/3I9XzYV/IXaSouJMYIoDlgyi11cBhsqYe9/geRfB0YIikBQg6raRaM+nIMP9g==
 
+throttleit@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-2.1.0.tgz#a7e4aa0bf4845a5bd10daa39ea0c783f631a07b4"
+  integrity sha512-nt6AMGKW1p/70DF/hGBdJB57B8Tspmbp5gfJ8ilhLnt7kkr2ye7hzD6NVG8GGErk2HWF34igrL2CXmNIkzKqKw==
+
 thunky@^1.0.2:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
@@ -10890,6 +10704,11 @@ tinyexec@^1.0.1:
   resolved "https://registry.yarnpkg.com/tinyexec/-/tinyexec-1.0.1.tgz#70c31ab7abbb4aea0a24f55d120e5990bfa1e0b1"
   integrity sha512-5uC6DDlmeqiOwCPmK9jMSdOuZTh8bU39Ys6yidB+UTt5hfZUPGAypSgFRiEp+jbi9qH40BLDvy85jIU88wKSqw==
 
+tinypool@^1.0.2:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-1.1.1.tgz#059f2d042bd37567fbc017d3d426bdd2a2612591"
+  integrity sha512-Zba82s87IFq9A9XmjiX5uZA/ARWDrB03OHlq+Vw1fSdt0I+4/Kutwy8BP4Y/y/aORMo61FQ0vIb5j44vSo5Pkg==
+
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
@@ -11234,6 +11053,14 @@ update-browserslist-db@^1.1.1:
     escalade "^3.2.0"
     picocolors "^1.1.0"
 
+update-browserslist-db@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.4.tgz#7802aa2ae91477f255b86e0e46dbc787a206ad4a"
+  integrity sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A==
+  dependencies:
+    escalade "^3.2.0"
+    picocolors "^1.1.1"
+
 update-notifier@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-6.0.2.tgz#a6990253dfe6d5a02bd04fbb6a61543f55026b60"
@@ -11275,6 +11102,11 @@ use-editable@^2.3.3:
   resolved "https://registry.yarnpkg.com/use-editable/-/use-editable-2.3.3.tgz#a292fe9ba4c291cd28d1cc2728c75a5fc8d9a33f"
   integrity sha512-7wVD2JbfAFJ3DK0vITvXBdpd9JAz5BcKAAolsnLBuBn6UDDwBGuCIAGvR3yA2BNKm578vAMVHFCWaOcA+BhhiA==
 
+use-sync-external-store@^1.4.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz#b174bfa65cb2b526732d9f2ac0a408027876f32d"
+  integrity sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==
+
 util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -11511,7 +11343,7 @@ webpack-dev-middleware@^7.4.2:
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
-webpack-dev-server@>=5.2.1, webpack-dev-server@^4.15.2:
+webpack-dev-server@>=5.2.1, webpack-dev-server@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-5.2.2.tgz#96a143d50c58fef0c79107e61df911728d7ceb39"
   integrity sha512-QcQ72gh8a+7JO63TAx/6XZf/CWhgMzu5m0QirvPfGvptOusAxG12w2+aua1Jkjr7hzaWDnJ2n6JFeexMHI+Zjg==
@@ -11651,13 +11483,6 @@ which@4.0.0:
   dependencies:
     isexe "^3.1.1"
 
-which@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
-  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
-  dependencies:
-    isexe "^2.0.0"
-
 which@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
@@ -11702,11 +11527,6 @@ wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
     string-width "^5.0.1"
     strip-ansi "^7.0.1"
 
-wrappy@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
-
 write-file-atomic@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
@@ -11749,11 +11569,6 @@ yallist@^3.0.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
-yaml@^1.7.2:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
-  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
-
 yarn-audit-fix@^9.3.10:
   version "9.3.12"
   resolved "https://registry.yarnpkg.com/yarn-audit-fix/-/yarn-audit-fix-9.3.12.tgz#cc34e87aa080bace32f2f105be6b581a3cb6eb24"
@@ -11778,16 +11593,16 @@ yarn-audit-fix@^9.3.10:
     synp "^1.9.10"
     tslib "^2.5.3"
 
-yocto-queue@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
-  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
-
 yocto-queue@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.1.1.tgz#fef65ce3ac9f8a32ceac5a634f74e17e5b232110"
   integrity sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==
 
+zod@^4.1.8:
+  version "4.1.12"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-4.1.12.tgz#64f1ea53d00eab91853195653b5af9eee68970f0"
+  integrity sha512-JInaHOamG8pt5+Ey8kGmdcAcg3OL9reK8ltczgHTAwNhMys/6ThXHityHxVV2p3fkw/c+MAvBHFVYHFZDmjMCQ==
+
 zwitch@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-1.0.5.tgz#d11d7381ffed16b742f6af7b3f223d5cd9fe9920"

From dcf4e3a4ffca424a3e8caa99b32ce74d345b3f76 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 19 Nov 2025 03:56:10 -0800
Subject: [PATCH 276/394] add file_id to diagnostic RelatedInformation

Summary:
A given diagnostic can have related information in it, which carries relevant context to the provided diagnostic.
For example, for a head mismatch diagnostic, it reports the specific head location(s) that do not match.

The LSP spec uses a `Location` for these, which includes a file URL, meaning the related info can be in a different file from where the diagnostic is reported.

In ELP, we currently do not provide a way of populating this information, so can only refer to related information within the same file.  Thic can result in erroneous outcomes.

## This diff
We include a `FileId` in our internal `RelatedInformation` structure, and map it to a URL when serializing for transmission to the LSP client

Reviewed By: robertoaloi

Differential Revision: D87316542

fbshipit-source-id: 5f94eb4fe5bb73e7bf1fff7cad458231c51bd6f0
---
 crates/elp/src/bin/elp_parse_cli.rs           | 27 +++++----------
 crates/elp/src/convert.rs                     | 34 ++++++++++++-------
 crates/elp/src/server.rs                      | 22 ++++++++++--
 crates/ide/src/diagnostics.rs                 |  7 ++--
 crates/ide/src/diagnostics/head_mismatch.rs   |  4 ++-
 .../src/diagnostics/misspelled_attribute.rs   |  1 +
 crates/ide/src/diagnostics_collection.rs      |  4 +--
 crates/ide/src/tests.rs                       |  3 +-
 8 files changed, 63 insertions(+), 39 deletions(-)

diff --git a/crates/elp/src/bin/elp_parse_cli.rs b/crates/elp/src/bin/elp_parse_cli.rs
index fcc8652ec2..16d4675d7d 100644
--- a/crates/elp/src/bin/elp_parse_cli.rs
+++ b/crates/elp/src/bin/elp_parse_cli.rs
@@ -24,7 +24,6 @@ use elp::cli::Cli;
 use elp::convert;
 use elp::memory_usage::MemoryUsage;
 use elp::otp_file_to_ignore;
-use elp::server::file_id_to_url;
 use elp_eqwalizer::Mode;
 use elp_ide::Analysis;
 use elp_ide::diagnostics;
@@ -132,8 +131,7 @@ pub fn parse_all(
         (None, _, true) => do_parse_all_seq(cli, &loaded, &cfg, &args.to)?,
         (None, _, false) => do_parse_all_par(cli, &loaded, &cfg, &args.to)?,
         (Some(file_id), Some(name), _) => {
-            do_parse_one(&analysis, &loaded.vfs, &cfg, &args.to, file_id, &name)?
-                .map_or(vec![], |x| vec![x])
+            do_parse_one(&analysis, &cfg, &args.to, file_id, &name)?.map_or(vec![], |x| vec![x])
         }
         (Some(file_id), _, _) => panic!("Could not get name from file_id for {file_id:?}"),
     };
@@ -144,10 +142,6 @@ pub fn parse_all(
 
     let db = loaded.analysis_host.raw_database();
 
-    // We need a `Url` for converting to the lsp_types::Diagnostic for
-    // printing, but do not print it out. So just create a dummy value
-    let url = lsp_types::Url::parse("file:///unused_url").ok().unwrap();
-
     telemetry::report_elapsed_time("parse-elp operational", start_time);
 
     let memory_end = MemoryUsage::now();
@@ -197,7 +191,7 @@ pub fn parse_all(
                             cli,
                         )?;
                     } else {
-                        print_diagnostic(&diag, &line_index, &url, &mut err_in_diag, cli)?;
+                        print_diagnostic(&diag, &line_index, &mut err_in_diag, cli)?;
                     }
                 }
             }
@@ -242,11 +236,10 @@ fn print_diagnostic_json(
 fn print_diagnostic(
     diag: &diagnostics::Diagnostic,
     line_index: &LineIndex,
-    url: &lsp_types::Url,
     err_in_diag: &mut bool,
     cli: &mut dyn Cli,
 ) -> Result<(), anyhow::Error> {
-    let diag = convert::ide_to_lsp_diagnostic(line_index, url, diag);
+    let diag = convert::ide_to_lsp_diagnostic(line_index, diag, |_file_id| None);
     let severity = match diag.severity {
         None => DiagnosticSeverity::ERROR,
         Some(sev) => {
@@ -289,7 +282,6 @@ fn do_parse_all_par(
 
     let pb = cli.progress(module_iter.len() as u64, "Parsing modules");
 
-    let vfs = &loaded.vfs;
     Ok(module_iter
         .par_bridge()
         .progress_with(pb)
@@ -300,7 +292,7 @@ fn do_parse_all_par(
                     && file_source == FileSource::Src
                     && db.file_app_type(file_id).ok() != Some(Some(AppType::Dep))
                 {
-                    do_parse_one(db, vfs, config, to, file_id, module_name.as_str()).unwrap()
+                    do_parse_one(db, config, to, file_id, module_name.as_str()).unwrap()
                 } else {
                     None
                 }
@@ -321,7 +313,6 @@ fn do_parse_all_seq(
 
     let pb = cli.progress(module_iter.len() as u64, "Parsing modules (sequential)");
 
-    let vfs = &loaded.vfs;
     let db = loaded.analysis();
     Ok(module_iter
         .progress_with(pb)
@@ -330,7 +321,7 @@ fn do_parse_all_seq(
                 && file_source == FileSource::Src
                 && db.file_app_type(file_id).ok() != Some(Some(AppType::Dep))
             {
-                do_parse_one(&db, vfs, config, to, file_id, module_name.as_str()).unwrap()
+                do_parse_one(&db, config, to, file_id, module_name.as_str()).unwrap()
             } else {
                 None
             }
@@ -340,13 +331,11 @@ fn do_parse_all_seq(
 
 fn do_parse_one(
     db: &Analysis,
-    vfs: &Vfs,
     config: &DiagnosticsConfig,
     to: &Option<PathBuf>,
     file_id: FileId,
     name: &str,
 ) -> Result<Option<ParseResult>> {
-    let url = file_id_to_url(vfs, file_id);
     let native = db.native_diagnostics(config, &vec![], file_id)?;
     let erlang_service_diagnostics =
         db.erlang_service_diagnostics(file_id, config, RemoveElpReported::Yes)?;
@@ -364,11 +353,13 @@ fn do_parse_one(
         let mut output = File::create(to_path)?;
 
         for diagnostic in native.iter() {
-            let diagnostic = convert::ide_to_lsp_diagnostic(&line_index, &url, diagnostic);
+            let diagnostic =
+                convert::ide_to_lsp_diagnostic(&line_index, diagnostic, |_file_id| None);
             writeln!(output, "{diagnostic:?}")?;
         }
         for diagnostic in erlang_service.iter() {
-            let diagnostic = convert::ide_to_lsp_diagnostic(&line_index, &url, diagnostic);
+            let diagnostic =
+                convert::ide_to_lsp_diagnostic(&line_index, diagnostic, |_file_id| None);
             writeln!(output, "{diagnostic:?}")?;
         }
     }
diff --git a/crates/elp/src/convert.rs b/crates/elp/src/convert.rs
index 3f68488f7d..3715353c11 100644
--- a/crates/elp/src/convert.rs
+++ b/crates/elp/src/convert.rs
@@ -26,6 +26,7 @@ use elp_ide::elp_ide_db::assists::AssistContextDiagnostic;
 use elp_ide::elp_ide_db::assists::AssistContextDiagnosticCode;
 use elp_ide::elp_ide_db::elp_base_db::AbsPath;
 use elp_ide::elp_ide_db::elp_base_db::AbsPathBuf;
+use elp_ide::elp_ide_db::elp_base_db::FileId;
 use elp_ide::elp_ide_db::elp_base_db::VfsPath;
 use lsp_types::DiagnosticRelatedInformation;
 use lsp_types::Location;
@@ -67,11 +68,14 @@ pub fn diagnostic_severity(severity: Severity) -> lsp_types::DiagnosticSeverity
     }
 }
 
-pub fn ide_to_lsp_diagnostic(
+pub fn ide_to_lsp_diagnostic<F>(
     line_index: &LineIndex,
-    url: &Url,
     d: &Diagnostic,
-) -> lsp_types::Diagnostic {
+    get_file_info: F,
+) -> lsp_types::Diagnostic
+where
+    F: Fn(FileId) -> Option<(LineIndex, Url)>,
+{
     let code_description = match &d.code_doc_uri {
         Some(uri) => match lsp_types::Url::parse(uri) {
             Ok(href) => Some(lsp_types::CodeDescription { href }),
@@ -90,7 +94,7 @@ pub fn ide_to_lsp_diagnostic(
         code_description,
         source,
         message: d.message.clone(),
-        related_information: from_related(line_index, url, &d.related_info),
+        related_information: from_related(get_file_info, &d.related_info),
         tags: d.tag.as_ref().map(lsp_diagnostic_tags),
         data: None,
     }
@@ -165,22 +169,26 @@ pub fn eqwalizer_to_arc_diagnostic(
     )
 }
 
-fn from_related(
-    line_index: &LineIndex,
-    url: &Url,
+fn from_related<F>(
+    get_file_info: F,
     r: &Option<Vec<RelatedInformation>>,
-) -> Option<Vec<DiagnosticRelatedInformation>> {
+) -> Option<Vec<DiagnosticRelatedInformation>>
+where
+    F: Fn(elp_ide::elp_ide_db::elp_base_db::FileId) -> Option<(LineIndex, Url)>,
+{
     r.as_ref().map(|ri| {
         ri.iter()
-            .map(|i| {
+            .filter_map(|i| {
+                // Get the line index and URL for the file that contains the related information
+                let (line_index, uri) = get_file_info(i.file_id)?;
                 let location = Location {
-                    range: range(line_index, i.range),
-                    uri: url.clone(),
+                    range: range(&line_index, i.range),
+                    uri,
                 };
-                DiagnosticRelatedInformation {
+                Some(DiagnosticRelatedInformation {
                     location,
                     message: i.message.clone(),
-                }
+                })
             })
             .collect()
     })
diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index 3d2cf02252..bec67159cd 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -624,7 +624,16 @@ impl Server {
                     .diagnostics
                     .diagnostics_for(*file_id)
                     .iter()
-                    .map(|d| ide_to_lsp_diagnostic(&line_index, &url, d))
+                    .map(|d| {
+                        let vfs = self.vfs.clone();
+                        ide_to_lsp_diagnostic(&line_index, d, |related_file_id| {
+                            // Get the line index and URL for the related file
+                            let url = file_id_to_url(&vfs.read(), related_file_id);
+                            let snapshot = self.snapshot();
+                            let line_index = snapshot.analysis.line_index(related_file_id).ok()?;
+                            Some(((*line_index).clone(), url))
+                        })
+                    })
                     .collect();
 
                 self.send_notification::<notification::PublishDiagnostics>(
@@ -828,11 +837,20 @@ impl Server {
                         Arc::make_mut(&mut this.diagnostics)
                             .clear(file_id);
                         if let Ok(line_index) = analysis.line_index(file_id) {
+                            let vfs = this.vfs.clone();
                             diagnostics = this
                                 .diagnostics
                                 .diagnostics_for(file_id)
                                 .iter()
-                                .map(|d| ide_to_lsp_diagnostic(&line_index, &url, d))
+                                .map(|d| {
+                                    let snapshot = this.snapshot();
+                                    ide_to_lsp_diagnostic(&line_index, d, |related_file_id| {
+                                        // Get the line index and URL for the related file
+                                        let url = file_id_to_url(&vfs.read(), related_file_id);
+                                        let line_index = snapshot.analysis.line_index(related_file_id).ok()?;
+                                        Some(((*line_index).clone(), url))
+                                    })
+                                })
                                 .collect()
                         }
                     }
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index a6684a7144..4f8a9f8732 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -227,8 +227,9 @@ impl Diagnostic {
         self
     }
 
-    pub(crate) fn as_related(&self) -> RelatedInformation {
+    pub(crate) fn as_related(&self, file_id: FileId) -> RelatedInformation {
         RelatedInformation {
+            file_id,
             range: self.range,
             message: self.message.clone(),
         }
@@ -447,6 +448,7 @@ impl Diagnostic {
 
 #[derive(Debug, Clone)]
 pub struct RelatedInformation {
+    pub file_id: FileId,
     pub range: TextRange,
     pub message: String,
 }
@@ -2818,6 +2820,7 @@ fn combine_syntax_errors(native: &Labeled, erlang_service: &Labeled) -> Labeled
 /// Combine the ELP and erlang_service diagnostics.  In particular,
 /// flatten any cascading diagnostics if possible.
 pub fn attach_related_diagnostics(
+    file_id: FileId,
     native: LabeledDiagnostics,
     erlang_service: LabeledDiagnostics,
 ) -> Vec<Diagnostic> {
@@ -2853,7 +2856,7 @@ pub fn attach_related_diagnostics(
         .flat_map(|(mfa_label, syntax_error_diags)| {
             if let Some(related) = erlang_service.labeled_undefined_errors.get(mfa_label) {
                 undefineds_to_remove.insert(mfa_label);
-                let related_info = related.iter().map(|d| d.as_related()).collect_vec();
+                let related_info = related.iter().map(|d| d.as_related(file_id)).collect_vec();
                 syntax_error_diags
                     .iter()
                     .map(|d| d.clone().with_related(Some(related_info.clone())))
diff --git a/crates/ide/src/diagnostics/head_mismatch.rs b/crates/ide/src/diagnostics/head_mismatch.rs
index 425ed09e6d..b548b84dff 100644
--- a/crates/ide/src/diagnostics/head_mismatch.rs
+++ b/crates/ide/src/diagnostics/head_mismatch.rs
@@ -270,6 +270,7 @@ impl Validate<String> for Name {
             attr_loc,
         )
         .with_related(Some(vec![RelatedInformation {
+            file_id,
             range: ref_loc,
             message: "Mismatched clause name".to_string(),
         }]))
@@ -293,7 +294,7 @@ impl Validate<usize> for Arity {
 
     fn make_diagnostic(
         self,
-        _file_id: FileId,
+        file_id: FileId,
         attr: &usize,
         hattr: &usize,
         attr_loc: TextRange,
@@ -305,6 +306,7 @@ impl Validate<usize> for Arity {
             attr_loc,
         )
         .with_related(Some(vec![RelatedInformation {
+            file_id,
             range: ref_loc,
             message: "Mismatched clause".to_string(),
         }]))
diff --git a/crates/ide/src/diagnostics/misspelled_attribute.rs b/crates/ide/src/diagnostics/misspelled_attribute.rs
index b3939bc9cf..9dc5868879 100644
--- a/crates/ide/src/diagnostics/misspelled_attribute.rs
+++ b/crates/ide/src/diagnostics/misspelled_attribute.rs
@@ -133,6 +133,7 @@ fn make_diagnostic(
         attr_name_range,
     )
     .with_related(Some(vec![RelatedInformation {
+        file_id,
         range: attr_name_range,
         message: "Misspelled attribute".to_string(),
     }]))
diff --git a/crates/ide/src/diagnostics_collection.rs b/crates/ide/src/diagnostics_collection.rs
index d944e223da..f15aed182c 100644
--- a/crates/ide/src/diagnostics_collection.rs
+++ b/crates/ide/src/diagnostics_collection.rs
@@ -104,7 +104,7 @@ impl DiagnosticCollection {
         let native = self.native.get(&file_id).unwrap_or(&empty_diags);
         let erlang_service = self.erlang_service.get(&file_id).unwrap_or(&empty_diags);
         let mut combined: Vec<Diagnostic> =
-            attach_related_diagnostics(native.clone(), erlang_service.clone());
+            attach_related_diagnostics(file_id, native.clone(), erlang_service.clone());
         let eqwalizer = self.eqwalizer.get(&file_id).into_iter().flatten().cloned();
         let eqwalizer_project = self
             .eqwalizer_project
@@ -348,7 +348,7 @@ mod tests {
             let file_id = *file_id;
             let diagnostics = diagnostics::native_diagnostics(&db, &config, &vec![], file_id);
 
-            let combined = attach_related_diagnostics(diagnostics, extra_diags.clone());
+            let combined = attach_related_diagnostics(file_id, diagnostics, extra_diags.clone());
             let expected = fixture.annotations_by_file_id(&file_id);
             let mut actual = combined
                 .into_iter()
diff --git a/crates/ide/src/tests.rs b/crates/ide/src/tests.rs
index bd607b5d30..71125f5094 100644
--- a/crates/ide/src/tests.rs
+++ b/crates/ide/src/tests.rs
@@ -513,7 +513,8 @@ pub(crate) fn check_diagnostics_with_config_and_extra(
     for file_id in &fixture.files {
         let file_id = *file_id;
         let diagnostics = diagnostics::native_diagnostics(&analysis.db, &config, &vec![], file_id);
-        let diagnostics = diagnostics::attach_related_diagnostics(diagnostics, extra_diags.clone());
+        let diagnostics =
+            diagnostics::attach_related_diagnostics(file_id, diagnostics, extra_diags.clone());
 
         let expected = fixture.annotations_by_file_id(&file_id);
         let actual = convert_diagnostics_to_annotations(diagnostics);

From 8efb4fe29ced0a425f743a51a56773ea72bf5a8e Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 19 Nov 2025 03:56:10 -0800
Subject: [PATCH 277/394] BE: track related info in declarative tests

Summary:
Our declarative tests allow us to add annotations for expected diagnostics, so we can clearly see and check what is generated.

But at present there is no way to check any related information for a diagnostic.

This diff adds that capability, showing related information together with the FileId and range each refers to.

Reviewed By: robertoaloi

Differential Revision: D87316965

fbshipit-source-id: ea7db2980b11950c3552befec7b666665ceef84b
---
 .llms/rules/elp_development.md                 |  6 ++++++
 crates/ide/src/diagnostics.rs                  |  5 +++++
 crates/ide/src/diagnostics/head_mismatch.rs    |  6 ++++++
 .../src/diagnostics/misspelled_attribute.rs    |  3 +++
 crates/ide/src/diagnostics/unused_include.rs   |  1 +
 crates/ide/src/tests.rs                        | 17 +++++++++++++++++
 crates/project_model/src/test_fixture.rs       | 18 ++++++++++++++++--
 7 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/.llms/rules/elp_development.md b/.llms/rules/elp_development.md
index 0a024728a1..efd132ac4b 100644
--- a/.llms/rules/elp_development.md
+++ b/.llms/rules/elp_development.md
@@ -168,6 +168,12 @@ directly in test code:
 - **Left-margin annotation**: `%%<^^^ text` - Annotation starts at `%%` position
   instead of first `^`
 - **Multiline annotations**: Use continuation lines with `%%   | next line`
+  - Continuation lines are particularly useful for diagnostics with related information:
+    ```erlang
+    foo() -> syntax error oops.
+    %%              ^^^^^ error: P1711: syntax error before: error
+    %%                  | Related info: 0:45-50 function foo/0 undefined
+    ```
 
 #### Example Test Fixture
 
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 4f8a9f8732..5e25b9d385 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -3433,6 +3433,9 @@ baz(1)->4.
              -spec foo() -> ok.
              foo( -> ok. %%
              %%  ^ error: W0004: Missing ')'
+             %%  | Related info: 0:21-43 function foo/0 undefined
+             %%  | Related info: 0:74-79 function foo/0 undefined
+             %%  | Related info: 0:82-99 spec for undefined function foo/0
             "#,
         );
     }
@@ -3463,6 +3466,7 @@ baz(1)->4.
 
              foo() -> syntax error oops.
              %%              ^^^^^ error: P1711: syntax error before: error
+             %%                  | Related info: 0:25-30 function foo/0 undefined
             "#,
         );
     }
@@ -3766,6 +3770,7 @@ baz(1)->4.
                      \~"\"\\µA\"" = \~/"\\µA"/
                      X = 3.
                   %% ^ error: P1711: syntax error before: X
+                  %% | Related info: 0:32-37 function foo/0 undefined
             "#,
         );
     }
diff --git a/crates/ide/src/diagnostics/head_mismatch.rs b/crates/ide/src/diagnostics/head_mismatch.rs
index b548b84dff..3a92d6f931 100644
--- a/crates/ide/src/diagnostics/head_mismatch.rs
+++ b/crates/ide/src/diagnostics/head_mismatch.rs
@@ -396,6 +396,7 @@ mod tests {
     foo(0) -> 1;
     boo(1) -> 2.
  %% ^^^ 💡 error: P1700: head mismatch 'boo' vs 'foo'
+ %%   | Related info: 0:21-24 Mismatched clause name
             "#,
         );
         check_fix(
@@ -421,6 +422,7 @@ mod tests {
                 ok;
             fooX(_X) ->
          %% ^^^^ 💡 error: P1700: head mismatch 'fooX' vs 'food'
+         %%    | Related info: 0:21-25 Mismatched clause name
                 no.
 
             bar() ->
@@ -450,6 +452,7 @@ mod tests {
     -module(main).
     foo(0) -> 1;
  %% ^^^ 💡 error: P1700: head mismatch 'foo' vs 'boo'
+ %%   | Related info: 0:37-40 Mismatched clause name
     boo(1) -> 2;
     boo(2) -> 3.
             "#,
@@ -478,6 +481,7 @@ mod tests {
     foo(0) -> 1;
     foo(1,0) -> 2.
  %% ^^^^^^^^^^^^^ error: P1700: head arity mismatch 2 vs 1
+ %%             | Related info: 0:21-32 Mismatched clause
             "#,
         );
     }
@@ -490,6 +494,7 @@ mod tests {
     foo(2,0) -> 3;
     foo(0) -> 1;
  %% ^^^^^^^^^^^ error: P1700: head arity mismatch 1 vs 2
+ %%           | Related info: 0:21-34 Mismatched clause
     foo(1,0) -> 2.
             "#,
         );
@@ -516,6 +521,7 @@ mod tests {
            (0) -> ok;
            A(N) -> ok
         %% ^ 💡 error: P1700: head mismatch 'A' vs ''
+        %% | Related info: 0:44-53 Mismatched clause name
        end,
        F().
             "#,
diff --git a/crates/ide/src/diagnostics/misspelled_attribute.rs b/crates/ide/src/diagnostics/misspelled_attribute.rs
index 9dc5868879..6ba95c8ef9 100644
--- a/crates/ide/src/diagnostics/misspelled_attribute.rs
+++ b/crates/ide/src/diagnostics/misspelled_attribute.rs
@@ -164,6 +164,7 @@ mod tests {
     -module(main).
     -dyalizer({nowarn_function, f/0}).
  %%% ^^^^^^^^ 💡 error: W0013: misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
+ %%%        | Related info: 0:22-30 Misspelled attribute
             "#,
         );
         check_fix(
@@ -224,6 +225,7 @@ mod tests {
     -module(main).
     -module_doc """
 %%%  ^^^^^^^^^^ 💡 error: W0013: misspelled attribute, saw 'module_doc' but expected 'moduledoc'
+%%%           | Related info: 0:24-34 Misspelled attribute
     Hola
     """.
             "#,
@@ -237,6 +239,7 @@ mod tests {
     -module(main).
     -docs """
 %%%  ^^^^ 💡 error: W0013: misspelled attribute, saw 'docs' but expected 'doc'
+%%%     | Related info: 0:24-28 Misspelled attribute
     Hola
     """.
     foo() -> ok.
diff --git a/crates/ide/src/diagnostics/unused_include.rs b/crates/ide/src/diagnostics/unused_include.rs
index 3a91377338..959181a328 100644
--- a/crates/ide/src/diagnostics/unused_include.rs
+++ b/crates/ide/src/diagnostics/unused_include.rs
@@ -581,6 +581,7 @@ foo() -> ok.
 %% The following shows up as a wild attribute, which we regard as being used.
    -defin e(X, 1).
 %%  ^^^^^ 💡 error: W0013: misspelled attribute, saw 'defin' but expected 'define'
+%%    | Related info: 1:82-87 Misspelled attribute
 
 -def ine(Y, 2).
 "#,
diff --git a/crates/ide/src/tests.rs b/crates/ide/src/tests.rs
index 71125f5094..8d71b65dad 100644
--- a/crates/ide/src/tests.rs
+++ b/crates/ide/src/tests.rs
@@ -401,6 +401,23 @@ fn convert_diagnostics_to_annotations(diagnostics: Vec<Diagnostic>) -> Vec<(Text
             annotation.push_str(&d.code.as_code());
             annotation.push_str(": ");
             annotation.push_str(&convert_diagnostic_message(&d));
+
+            // Append related info to the annotation
+            if let Some(related_info) = &d.related_info {
+                // Sort related info alphabetically by message for consistent test output
+                let mut sorted_info = related_info.clone();
+                sorted_info.sort_by(|a, b| a.message.cmp(&b.message));
+                for info in sorted_info {
+                    annotation.push_str(&format!(
+                        "\nRelated info: {}:{}-{} {}",
+                        info.file_id.index(),
+                        u32::from(info.range.start()),
+                        u32::from(info.range.end()),
+                        info.message
+                    ));
+                }
+            }
+
             (d.range, annotation)
         })
         .collect::<Vec<_>>();
diff --git a/crates/project_model/src/test_fixture.rs b/crates/project_model/src/test_fixture.rs
index 769891190a..ac60d3b7c2 100644
--- a/crates/project_model/src/test_fixture.rs
+++ b/crates/project_model/src/test_fixture.rs
@@ -472,6 +472,14 @@ pub fn extract_tags(mut text: &str, tag: &str) -> (Vec<(TextRange, Option<String
 /// %%   | second line
 /// ```
 ///
+/// This is useful for representing diagnostics with related information:
+///
+/// ```not_rust
+/// foo() -> syntax error oops.
+/// %%              ^^^^^ error: P1711: syntax error before: error
+/// %%                  | Related info: 0:25-30 function foo/0 undefined
+/// ```
+///
 /// Annotations point to the last line that actually was long enough for the
 /// range, not counting annotations themselves. So overlapping annotations are
 /// possible:
@@ -551,10 +559,16 @@ pub fn extract_annotations(text: &str) -> (Vec<(TextRange, String)>, String) {
                             if !res.is_empty() {
                                 offset += annotation_offset;
                                 this_line_annotations.push((offset, res.len() - 1));
-                                let &(_, idx) = prev_line_annotations
+                                // Try to find a previous annotation at the same offset
+                                let idx = if let Some(&(_, idx)) = prev_line_annotations
                                     .iter()
                                     .find(|&&(off, _idx)| off == offset)
-                                    .unwrap();
+                                {
+                                    idx
+                                } else {
+                                    // If no exact offset match, append to the most recent annotation
+                                    res.len() - 1
+                                };
                                 res[idx].1.push('\n');
                                 res[idx].1.push_str(&content);
                             }

From 9a912293111545ec367f596a3e528af5b45e67d9 Mon Sep 17 00:00:00 2001
From: Jon Janzen <jonjanzen@meta.com>
Date: Wed, 19 Nov 2025 11:28:14 -0800
Subject: [PATCH 278/394] Rollback submodule to enable syncing

---
 eqwalizer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eqwalizer b/eqwalizer
index bed8636fa6..16e6b5d339 160000
--- a/eqwalizer
+++ b/eqwalizer
@@ -1 +1 @@
-Subproject commit bed8636fa6b926e2292697be35e096db2386a78f
+Subproject commit 16e6b5d3398b7c3067a95e577fadafb2f4ccb0a1

From 65de999b3be6a52b412b60405336f2e53cc1f720 Mon Sep 17 00:00:00 2001
From: Open Source Bot <generatedunixname499836121@fb.com>
Date: Wed, 19 Nov 2025 09:40:39 -0800
Subject: [PATCH 279/394] Updating hashes

Summary:
GitHub commits:

https://github.com/facebook/buck2-prelude/commit/5a717a3930afa31d2d411a985fda3c0c90451156
https://github.com/facebook/facebook-for-woocommerce/commit/b93909fb2a7468218e155d1ab06ec577d2e47160
https://github.com/facebook/fb303/commit/c4ca15fcd7bca6d601ffddfddeea83a0ff4ec353
https://github.com/facebook/fbthrift/commit/2d38838986f88e8c300cda9c89799e540bcaa3d1
https://github.com/facebook/folly/commit/f777219636b7682fd33226862e38ade13e61dac7
https://github.com/facebook/mvfst/commit/2ac8a7c0bb4e555a701088f3f827684642a485ba
https://github.com/facebook/proxygen/commit/8010220b213cf39d738b327111649aa222dd3b53
https://github.com/facebook/wangle/commit/c5209193b7e23a60a9ae6da26e5c390cc5030cbe
https://github.com/facebookexperimental/edencommon/commit/01b2a4fb6013cbe7f79521070f627156c75a585e
https://github.com/facebookexperimental/rust-shed/commit/c22a8d4dd86485103b34fc6f512d922458657566
https://github.com/facebookincubator/fizz/commit/03c425fcf4b8b1e34d74c12f06927c633caaa272
https://github.com/facebookincubator/llm_orchestrator/commit/ce1f68dda55a00071064d97d3b40201643aee7ef
https://github.com/whatsapp/eqwalizer/commit/1e0f24c5b8f2b023fdd53d4571c3240430d31f69

Reviewed By: sdwilsh

fbshipit-source-id: 8f60cbe0f2feac847240f89707cb2023201f1e54
---
 eqwalizer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eqwalizer b/eqwalizer
index 16e6b5d339..1e0f24c5b8 160000
--- a/eqwalizer
+++ b/eqwalizer
@@ -1 +1 @@
-Subproject commit 16e6b5d3398b7c3067a95e577fadafb2f4ccb0a1
+Subproject commit 1e0f24c5b8f2b023fdd53d4571c3240430d31f69

From 479c76ce85a0ab8e141a8c1356931bdb4ea39c20 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 20 Nov 2025 01:02:30 -0800
Subject: [PATCH 280/394] Add unavailable_type diagnostic

Summary:
Introduce a new `unavailable_type` diagnostic, which warns about types which are correctly defined, but referenced from a module which does not have the application where the type is defined as a dependency.

The diagnostic, which is complementary to eqWAlizer's [unknown_id](https://github.com/WhatsApp/eqwalizer/blob/main/docs/reference/errors.md#unknown_id) (for remote types) and Erlang/OTP's L1295/undefined_type (for local types), can be seen a step towards a ELP-powered XRef.

The diagnostic works by scanning the `-spec`, `-type`, `-opaque` and `-callback` attributes. If a type is referenced, we verify whether the OTP application where the type is defined is a (recursive) dependency for the application where the type usage occurs.

The diagnostic is currently disabled by default.

Reviewed By: alanz

Differential Revision: D87341709

fbshipit-source-id: a7729de093f50ae2bdc0c2138019e4a5503e7359
---
 crates/elp/src/bin/main.rs                    |  17 +
 .../test/xref/unavailable_type.stdout         |   5 +
 crates/hir/src/expr.rs                        |  20 ++
 crates/ide/src/diagnostics.rs                 |   2 +
 .../ide/src/diagnostics/unavailable_type.rs   | 294 ++++++++++++++++++
 crates/ide_db/src/diagnostic_code.rs          |   4 +
 test_projects/xref/.elp.toml                  |   5 +
 .../xref/app_a/src/unavailable_type.erl       |   6 +
 test_projects/xref/app_b/src/app_b.erl        |   8 +
 test_projects/xref/app_c/src/app_c.erl        |   8 +
 .../xref/elp_lint_unavailable_type.toml       |   2 +
 website/docs/erlang-error-index/w/W0059.md    |  37 +++
 12 files changed, 408 insertions(+)
 create mode 100644 crates/elp/src/resources/test/xref/unavailable_type.stdout
 create mode 100644 crates/ide/src/diagnostics/unavailable_type.rs
 create mode 100644 test_projects/xref/.elp.toml
 create mode 100644 test_projects/xref/app_a/src/unavailable_type.erl
 create mode 100644 test_projects/xref/app_b/src/app_b.erl
 create mode 100644 test_projects/xref/app_c/src/app_c.erl
 create mode 100644 test_projects/xref/elp_lint_unavailable_type.toml
 create mode 100644 website/docs/erlang-error-index/w/W0059.md

diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index a34cd76100..4cec310e22 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -1971,6 +1971,23 @@ mod tests {
         )
     }
 
+    #[test]
+    fn lint_unavailable_type() {
+        simple_snapshot(
+            args_vec![
+                "lint",
+                "--config-file",
+                "../../test_projects/xref/elp_lint_unavailable_type.toml",
+                "--module",
+                "unavailable_type"
+            ],
+            "xref",
+            expect_file!("../resources/test/xref/unavailable_type.stdout"),
+            true,
+            None,
+        )
+    }
+
     #[test]
     fn lint_ssr_from_config() {
         simple_snapshot(
diff --git a/crates/elp/src/resources/test/xref/unavailable_type.stdout b/crates/elp/src/resources/test/xref/unavailable_type.stdout
new file mode 100644
index 0000000000..acec636118
--- /dev/null
+++ b/crates/elp/src/resources/test/xref/unavailable_type.stdout
@@ -0,0 +1,5 @@
+Reporting all diagnostics codes
+module specified: unavailable_type
+Diagnostics reported in 1 modules:
+  unavailable_type: 1
+      3:42-3:57::[Warning] [W0059] The type 'app_c:my_type_c/0' is defined in application 'app_c', but the application is not a dependency of 'app_a' (defined in 'fbcode//whatsapp/elp/test_projects/xref:app_a').
diff --git a/crates/hir/src/expr.rs b/crates/hir/src/expr.rs
index adf3dea349..114930efe3 100644
--- a/crates/hir/src/expr.rs
+++ b/crates/hir/src/expr.rs
@@ -581,6 +581,26 @@ impl CallTarget<TypeExprId> {
             }
         }
     }
+
+    pub fn range(&self, sema: &Semantic, body: &Body) -> Option<FileRange> {
+        match self {
+            CallTarget::Local { name } => {
+                let name_any_id = AnyExprId::TypeExpr(*name);
+                body.range_for_any(sema, name_any_id)
+            }
+            CallTarget::Remote { module, name, .. } => {
+                let module_any_id = AnyExprId::TypeExpr(*module);
+                let name_any_id = AnyExprId::TypeExpr(*name);
+
+                let name_range = body.range_for_any(sema, name_any_id)?;
+                if let Some(module_range) = body.range_for_any(sema, module_any_id) {
+                    module_range.cover(name_range)
+                } else {
+                    Some(name_range)
+                }
+            }
+        }
+    }
 }
 
 impl CallTarget<ExprId> {
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 5e25b9d385..28e39270f6 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -135,6 +135,7 @@ mod replace_in_spec;
 mod sets_version_2;
 mod simplify_negation;
 mod trivial_match;
+mod unavailable_type;
 mod undefined_function;
 mod undefined_macro;
 mod undocumented_function;
@@ -1586,6 +1587,7 @@ const GENERIC_LINTERS: &[&dyn GenericDiagnostics] = &[
     &undocumented_module::LINTER,
     &undocumented_function::LINTER,
     &no_catch::LINTER,
+    &unavailable_type::LINTER,
 ];
 
 /// Unified registry for all types of linters
diff --git a/crates/ide/src/diagnostics/unavailable_type.rs b/crates/ide/src/diagnostics/unavailable_type.rs
new file mode 100644
index 0000000000..6a674f651b
--- /dev/null
+++ b/crates/ide/src/diagnostics/unavailable_type.rs
@@ -0,0 +1,294 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is dual-licensed under either the MIT license found in the
+ * LICENSE-MIT file in the root directory of this source tree or the Apache
+ * License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+ * of this source tree. You may select, at your option, one of the
+ * above-listed licenses.
+ */
+
+// Diagnostic: unavailable-type
+//
+// Return a warning when referring to a type which is not defined in the module's dependencies.
+// This diagnostic checks if a type referenced in specs, type definitions, or opaque types exists in:
+// 1. The current module (local types)
+// 2. Built-in Erlang types
+// 3. Types from the module's application dependencies (including OTP apps)
+
+use std::borrow::Cow;
+
+use elp_ide_db::elp_base_db::AppData;
+use elp_ide_db::elp_base_db::FileId;
+use elp_project_model::AppName;
+use hir::AnyExpr;
+use hir::Callback;
+use hir::InFile;
+use hir::Semantic;
+use hir::Spec;
+use hir::Strategy;
+use hir::TypeAlias;
+use hir::TypeExpr;
+use hir::fold::Fold;
+use hir::fold::MacroStrategy;
+use hir::fold::ParenStrategy;
+
+use super::DiagnosticCode;
+use crate::diagnostics::GenericLinter;
+use crate::diagnostics::GenericLinterMatchContext;
+use crate::diagnostics::Linter;
+
+pub(crate) struct UnavailableTypeLinter;
+
+impl Linter for UnavailableTypeLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::UnavailableType
+    }
+    fn description(&self) -> &'static str {
+        "Type is not available through dependencies."
+    }
+    fn is_enabled(&self) -> bool {
+        false
+    }
+}
+
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
+pub struct Context {
+    type_label: String,
+    defining_app: String,
+    referencing_app: String,
+    referencing_target: String,
+}
+
+impl GenericLinter for UnavailableTypeLinter {
+    type Context = Context;
+
+    fn matches(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<GenericLinterMatchContext<Self::Context>>> {
+        // Early return if we don't have app data - can't determine type availability
+        let referencing_app_data = sema.db.file_app_data(file_id)?;
+
+        // Extract target once here - if not available, can't create diagnostics anyway
+        let referencing_target = referencing_app_data.buck_target_name.as_ref()?;
+
+        let mut res = Vec::new();
+        let form_list = sema.form_list(file_id);
+
+        // Check -spec attributes
+        for (spec_id, _spec) in form_list.specs() {
+            check_spec(
+                &mut res,
+                sema,
+                file_id,
+                &referencing_app_data,
+                referencing_target,
+                spec_id,
+            );
+        }
+
+        // Check -type and -opaque attributes
+        for (type_alias_id, _type_alias) in form_list.type_aliases() {
+            check_type_alias(
+                &mut res,
+                sema,
+                file_id,
+                &referencing_app_data,
+                referencing_target,
+                type_alias_id,
+            );
+        }
+
+        // Check -callback attributes
+        for (callback_id, _callback) in form_list.callback_attributes() {
+            check_callback(
+                &mut res,
+                sema,
+                file_id,
+                &referencing_app_data,
+                referencing_target,
+                callback_id,
+            );
+        }
+
+        Some(res)
+    }
+
+    fn match_description(&self, context: &Self::Context) -> Cow<'_, str> {
+        Cow::Owned(format!(
+            "The type '{}' is defined in application '{}', but the application is not a dependency of '{}' (defined in '{}').",
+            context.type_label,
+            context.defining_app,
+            context.referencing_app,
+            context.referencing_target
+        ))
+    }
+}
+
+pub static LINTER: UnavailableTypeLinter = UnavailableTypeLinter;
+
+fn check_spec(
+    matches: &mut Vec<GenericLinterMatchContext<Context>>,
+    sema: &Semantic,
+    file_id: FileId,
+    referencing_app_data: &AppData,
+    referencing_target: &String,
+    spec_id: hir::SpecId,
+) {
+    let spec_id = InFile::new(file_id, spec_id);
+    let spec_body = sema.db.spec_body(spec_id);
+
+    Spec::fold(
+        sema,
+        Strategy {
+            macros: MacroStrategy::Expand,
+            parens: ParenStrategy::InvisibleParens,
+        },
+        spec_id,
+        (),
+        &mut |_acc, ctx| {
+            check_type_call(
+                matches,
+                sema,
+                file_id,
+                referencing_app_data,
+                referencing_target,
+                &ctx,
+                &spec_body.body,
+            );
+        },
+    );
+}
+
+fn check_type_alias(
+    matches: &mut Vec<GenericLinterMatchContext<Context>>,
+    sema: &Semantic,
+    file_id: FileId,
+    referencing_app_data: &AppData,
+    referencing_target: &String,
+    type_alias_id: hir::TypeAliasId,
+) {
+    let type_alias_id = InFile::new(file_id, type_alias_id);
+    let type_body = sema.db.type_body(type_alias_id);
+
+    TypeAlias::fold(
+        sema,
+        Strategy {
+            macros: MacroStrategy::Expand,
+            parens: ParenStrategy::InvisibleParens,
+        },
+        type_alias_id,
+        (),
+        &mut |_acc, ctx| {
+            check_type_call(
+                matches,
+                sema,
+                file_id,
+                referencing_app_data,
+                referencing_target,
+                &ctx,
+                &type_body.body,
+            );
+        },
+    );
+}
+
+fn check_callback(
+    matches: &mut Vec<GenericLinterMatchContext<Context>>,
+    sema: &Semantic,
+    file_id: FileId,
+    referencing_app_data: &AppData,
+    referencing_target: &String,
+    callback_id: hir::CallbackId,
+) {
+    let callback_id = InFile::new(file_id, callback_id);
+    let callback_body = sema.db.callback_body(callback_id);
+
+    Callback::fold(
+        sema,
+        Strategy {
+            macros: MacroStrategy::Expand,
+            parens: ParenStrategy::InvisibleParens,
+        },
+        callback_id,
+        (),
+        &mut |_acc, ctx| {
+            check_type_call(
+                matches,
+                sema,
+                file_id,
+                referencing_app_data,
+                referencing_target,
+                &ctx,
+                &callback_body.body,
+            );
+        },
+    );
+}
+
+fn is_type_available(
+    sema: &Semantic,
+    referencing_app_data: &AppData,
+    referencing_target: &String,
+    referencing_app_name: &AppName,
+    defining_app_name: &AppName,
+) -> bool {
+    // Types from the same app are always available
+    if referencing_app_name == defining_app_name {
+        return true;
+    }
+
+    // Check if type is available through dependencies
+    if let Some(include_mapping) = &sema
+        .db
+        .project_data(referencing_app_data.project_id)
+        .include_mapping
+    {
+        include_mapping.is_dep(referencing_target, defining_app_name)
+    } else {
+        // Can't determine - be conservative and allow it
+        true
+    }
+}
+
+fn check_type_call(
+    matches: &mut Vec<GenericLinterMatchContext<Context>>,
+    sema: &Semantic,
+    file_id: FileId,
+    referencing_app_data: &AppData,
+    referencing_target: &String,
+    ctx: &hir::fold::AnyCallBackCtx<'_>,
+    body: &hir::Body,
+) -> Option<()> {
+    if let AnyExpr::TypeExpr(TypeExpr::Call { target, args }) = &ctx.item {
+        let arity = args.len() as u32;
+        let target_label = target.label(arity, sema, body)?;
+        let target_range = target.range(sema, body)?;
+        let type_alias_def = target.resolve_call(arity, sema, file_id, body)?;
+        let defining_file_id = type_alias_def.file.file_id;
+        let defining_app_data = sema.db.file_app_data(defining_file_id)?;
+        let defining_app_name = &defining_app_data.name;
+        let referencing_app_name = &referencing_app_data.name;
+
+        if !is_type_available(
+            sema,
+            referencing_app_data,
+            referencing_target,
+            referencing_app_name,
+            defining_app_name,
+        ) {
+            matches.push(GenericLinterMatchContext {
+                range: target_range.range,
+                context: Context {
+                    type_label: target_label.to_string(),
+                    defining_app: defining_app_name.to_string(),
+                    referencing_app: referencing_app_name.to_string(),
+                    referencing_target: referencing_target.to_string(),
+                },
+            });
+        }
+    }
+    Some(())
+}
diff --git a/crates/ide_db/src/diagnostic_code.rs b/crates/ide_db/src/diagnostic_code.rs
index cee17251e8..957caecb09 100644
--- a/crates/ide_db/src/diagnostic_code.rs
+++ b/crates/ide_db/src/diagnostic_code.rs
@@ -52,6 +52,7 @@ pub enum DiagnosticCode {
     DependentHeader,
     DeprecatedFunction,
     UndefinedFunction,
+    UnavailableType,
     Unexpected(String),
     ExpressionCanBeSimplified,
     CannotEvaluateCTCallbacks,
@@ -254,6 +255,7 @@ impl DiagnosticCode {
             DiagnosticCode::ListsReverseAppend => "W0056".to_string(),
             DiagnosticCode::HirUnresolvedMacro => "W0057".to_string(),
             DiagnosticCode::HirUnresolvedInclude => "W0058".to_string(),
+            DiagnosticCode::UnavailableType => "W0059".to_string(),
             DiagnosticCode::ErlangService(c) => c.to_string(),
             DiagnosticCode::Eqwalizer(c) => format!("eqwalizer: {c}"),
             DiagnosticCode::AdHoc(c) => format!("ad-hoc: {c}"),
@@ -353,6 +355,7 @@ impl DiagnosticCode {
             DiagnosticCode::ListsReverseAppend => "lists_reverse_append".to_string(),
             DiagnosticCode::HirUnresolvedMacro => "hir_unresolved_macro".to_string(),
             DiagnosticCode::HirUnresolvedInclude => "hir_unresolved_include".to_string(),
+            DiagnosticCode::UnavailableType => "unavailable_type".to_string(),
 
             DiagnosticCode::ErlangService(c) => c.to_string(),
             DiagnosticCode::Eqwalizer(c) => c.to_string(),
@@ -497,6 +500,7 @@ impl DiagnosticCode {
             DiagnosticCode::DependentHeader => false,
             DiagnosticCode::DeprecatedFunction => false,
             DiagnosticCode::UndefinedFunction => false,
+            DiagnosticCode::UnavailableType => false,
             DiagnosticCode::Unexpected(_) => false,
             DiagnosticCode::ExpressionCanBeSimplified => false,
             DiagnosticCode::UnnecessaryFlatteningToFindFlatLength => false,
diff --git a/test_projects/xref/.elp.toml b/test_projects/xref/.elp.toml
new file mode 100644
index 0000000000..afda912287
--- /dev/null
+++ b/test_projects/xref/.elp.toml
@@ -0,0 +1,5 @@
+[buck]
+enabled = true
+build_deps = false
+included_targets = [ "fbcode//whatsapp/elp/test_projects/xref/..." ]
+source_root = "whatsapp/elp/test_projects/xref"
diff --git a/test_projects/xref/app_a/src/unavailable_type.erl b/test_projects/xref/app_a/src/unavailable_type.erl
new file mode 100644
index 0000000000..d6d8f4935b
--- /dev/null
+++ b/test_projects/xref/app_a/src/unavailable_type.erl
@@ -0,0 +1,6 @@
+-module(unavailable_type).
+-export([test_types/0]).
+
+-spec test_types() -> {app_b:my_type_b(), app_c:my_type_c()}.
+test_types() ->
+    {"hello", 42}.
diff --git a/test_projects/xref/app_b/src/app_b.erl b/test_projects/xref/app_b/src/app_b.erl
new file mode 100644
index 0000000000..d56609b179
--- /dev/null
+++ b/test_projects/xref/app_b/src/app_b.erl
@@ -0,0 +1,8 @@
+-module(app_b).
+-export([my_function/0]).
+
+-type my_type_b() :: string().
+-export_type([my_type_b/0]).
+
+-spec my_function() -> my_type_b().
+my_function() -> "hello from b".
diff --git a/test_projects/xref/app_c/src/app_c.erl b/test_projects/xref/app_c/src/app_c.erl
new file mode 100644
index 0000000000..040f77f26f
--- /dev/null
+++ b/test_projects/xref/app_c/src/app_c.erl
@@ -0,0 +1,8 @@
+-module(app_c).
+-export([my_function/0]).
+
+-type my_type_c() :: integer().
+-export_type([my_type_c/0]).
+
+-spec my_function() -> my_type_c().
+my_function() -> 42.
diff --git a/test_projects/xref/elp_lint_unavailable_type.toml b/test_projects/xref/elp_lint_unavailable_type.toml
new file mode 100644
index 0000000000..629a5228bf
--- /dev/null
+++ b/test_projects/xref/elp_lint_unavailable_type.toml
@@ -0,0 +1,2 @@
+[linters.unavailable_type]
+enabled = true
diff --git a/website/docs/erlang-error-index/w/W0059.md b/website/docs/erlang-error-index/w/W0059.md
new file mode 100644
index 0000000000..fd2e990cb3
--- /dev/null
+++ b/website/docs/erlang-error-index/w/W0059.md
@@ -0,0 +1,37 @@
+---
+sidebar_position: 59
+---
+
+# W0059: Unavailable Type
+
+## Error
+
+```erlang
+-module(main).
+-spec foo() -> dep:nonexistent_type().
+%%             ^^^^^^^^^^^^^^^^^^^^^^ warning: W0059: Type 'dep:nonexistent_type/0' is not available through dependencies.
+foo() -> ok.
+```
+
+## Explanation
+
+This diagnostic warns you when your code references a type that either:
+
+1. Does not exist (is undefined)
+2. Is not accessible because it's from a module outside your application's dependencies
+3. Exists but is not exported from the defining module
+
+
+### What This Diagnostic Checks
+
+The diagnostic examines:
+
+- Type specifications (`-spec` attributes)
+- Type definitions (`-type` and `-opaque` attributes)
+- Callback specifications (`-callback` attributes)
+
+## How to Fix
+
+* Check if the type actually exists
+* Verify the name and arity of the type
+* Add the application that defines the type to your application's dependencies or move the type definition to an application that is already a dependency

From 89ca2807407897d0d2842dcd6b8647a8177546e9 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 20 Nov 2025 01:02:30 -0800
Subject: [PATCH 281/394] Ensure that linters specified via --diagnostic-filter
 run, even if disabled by default

Summary:
It is counterintuitive that, if a linter is disabled, it does not run when `--diagnostic-code` explicitly selects it.

This diff solves the issue.

Reviewed By: alanz

Differential Revision: D87434612

fbshipit-source-id: 7cc19544602f77e086919f0094b64120120fa7d4
---
 crates/ide/src/diagnostics.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 28e39270f6..0b78998d62 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1055,7 +1055,7 @@ impl DiagnosticsConfig {
             let diagnostic_filter = DiagnosticCode::from(diagnostic_filter.as_str());
             // Make sure we do not mask the one we explicitly asked for
             disabled_diagnostics.remove(&diagnostic_filter);
-            allowed_diagnostics.insert(diagnostic_filter);
+            allowed_diagnostics.insert(diagnostic_filter.clone());
         }
 
         // Make sure the enabled ones win out over disabled if a lint appears in both
@@ -1073,6 +1073,13 @@ impl DiagnosticsConfig {
         }
         self.lints_from_config = lint_config.ad_hoc_lints.clone();
         self.lint_config = Some(lint_config.clone());
+
+        // If a diagnostic_filter is specified, enable the corresponding linter in lint_config
+        if let Some(diagnostic_filter) = diagnostic_filter {
+            let diagnostic_filter_code = DiagnosticCode::from(diagnostic_filter.as_str());
+            self.set_linter_enabled(diagnostic_filter_code, true);
+        }
+
         self.request_erlang_service_diagnostics = self.request_erlang_service_diagnostics();
         Ok(self)
     }
@@ -4030,6 +4037,7 @@ baz(1)->4.
 
             warning() ->
                 erlang:garbage_collect().
+            %%  ^^^^^^^^^^^^^^^^^^^^^^ 💡 warning: W0047: Avoid forcing garbage collection.
             //- /opt/lib/stdlib-3.17/src/erlang.erl otp_app:/opt/lib/stdlib-3.17
             -module(erlang).
             -export([garbage_collect/0]).

From cac1c952f9c471ca1bb17ad3d699917a52410997 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 20 Nov 2025 01:02:30 -0800
Subject: [PATCH 282/394] Extend unavailable_type diagnostic to also scan
 record definitions

Summary: Take into account type references from record definitions when computing the `unavailable_type` diagnostic.

Reviewed By: TD5

Differential Revision: D87442698

fbshipit-source-id: 982a5e815877147d17e1d472230f06859263d343
---
 .../test/xref/unavailable_type.stdout         |  5 +-
 crates/hir/src/form_list.rs                   |  5 ++
 .../ide/src/diagnostics/unavailable_type.rs   | 46 +++++++++++++++++++
 .../xref/app_a/src/unavailable_type.erl       | 10 +++-
 4 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/crates/elp/src/resources/test/xref/unavailable_type.stdout b/crates/elp/src/resources/test/xref/unavailable_type.stdout
index acec636118..5b71b7d2d3 100644
--- a/crates/elp/src/resources/test/xref/unavailable_type.stdout
+++ b/crates/elp/src/resources/test/xref/unavailable_type.stdout
@@ -1,5 +1,6 @@
 Reporting all diagnostics codes
 module specified: unavailable_type
 Diagnostics reported in 1 modules:
-  unavailable_type: 1
-      3:42-3:57::[Warning] [W0059] The type 'app_c:my_type_c/0' is defined in application 'app_c', but the application is not a dependency of 'app_a' (defined in 'fbcode//whatsapp/elp/test_projects/xref:app_a').
+  unavailable_type: 2
+      9:42-9:57::[Warning] [W0059] The type 'app_c:my_type_c/0' is defined in application 'app_c', but the application is not a dependency of 'app_a' (defined in 'fbcode//whatsapp/elp/test_projects/xref:app_a').
+      5:15-5:30::[Warning] [W0059] The type 'app_c:my_type_c/0' is defined in application 'app_c', but the application is not a dependency of 'app_a' (defined in 'fbcode//whatsapp/elp/test_projects/xref:app_a').
diff --git a/crates/hir/src/form_list.rs b/crates/hir/src/form_list.rs
index c33af25622..a1431d7506 100644
--- a/crates/hir/src/form_list.rs
+++ b/crates/hir/src/form_list.rs
@@ -188,6 +188,11 @@ impl FormList {
         self.data.type_aliases.iter()
     }
 
+    /// Returns the -record declarations in the file
+    pub fn records(&self) -> impl Iterator<Item = (RecordId, &Record)> {
+        self.data.records.iter()
+    }
+
     pub fn find_form(&self, form: &ast::Form) -> Option<FormIdx> {
         self.map_back.get(&AstPtr::new(form)).copied()
     }
diff --git a/crates/ide/src/diagnostics/unavailable_type.rs b/crates/ide/src/diagnostics/unavailable_type.rs
index 6a674f651b..6f2f52c122 100644
--- a/crates/ide/src/diagnostics/unavailable_type.rs
+++ b/crates/ide/src/diagnostics/unavailable_type.rs
@@ -24,6 +24,7 @@ use elp_project_model::AppName;
 use hir::AnyExpr;
 use hir::Callback;
 use hir::InFile;
+use hir::Record;
 use hir::Semantic;
 use hir::Spec;
 use hir::Strategy;
@@ -113,6 +114,18 @@ impl GenericLinter for UnavailableTypeLinter {
             );
         }
 
+        // Check -record attributes
+        for (record_id, _record) in form_list.records() {
+            check_record(
+                &mut res,
+                sema,
+                file_id,
+                &referencing_app_data,
+                referencing_target,
+                record_id,
+            );
+        }
+
         Some(res)
     }
 
@@ -228,6 +241,39 @@ fn check_callback(
     );
 }
 
+fn check_record(
+    matches: &mut Vec<GenericLinterMatchContext<Context>>,
+    sema: &Semantic,
+    file_id: FileId,
+    referencing_app_data: &AppData,
+    referencing_target: &String,
+    record_id: hir::RecordId,
+) {
+    let record_id = InFile::new(file_id, record_id);
+    let record_body = sema.db.record_body(record_id);
+
+    Record::fold(
+        sema,
+        Strategy {
+            macros: MacroStrategy::Expand,
+            parens: ParenStrategy::InvisibleParens,
+        },
+        record_id,
+        (),
+        &mut |_acc, ctx| {
+            check_type_call(
+                matches,
+                sema,
+                file_id,
+                referencing_app_data,
+                referencing_target,
+                &ctx,
+                &record_body.body,
+            );
+        },
+    );
+}
+
 fn is_type_available(
     sema: &Semantic,
     referencing_app_data: &AppData,
diff --git a/test_projects/xref/app_a/src/unavailable_type.erl b/test_projects/xref/app_a/src/unavailable_type.erl
index d6d8f4935b..ddf4fc00d2 100644
--- a/test_projects/xref/app_a/src/unavailable_type.erl
+++ b/test_projects/xref/app_a/src/unavailable_type.erl
@@ -1,6 +1,12 @@
 -module(unavailable_type).
 -export([test_types/0]).
 
--spec test_types() -> {app_b:my_type_b(), app_c:my_type_c()}.
+-record(my_record, {
+    field_a :: app_b:my_type_b(),
+    field_b :: app_c:my_type_c(),
+    field_c :: binary()
+}).
+
+-spec test_types() -> {app_b:my_type_b(), app_c:my_type_c(), #my_record{}}.
 test_types() ->
-    {"hello", 42}.
+    {"hello", 42, #my_record{field_a = "", field_b = 42, field_c = <<>>}}.

From 74ed6b2de493365ff5ad1a96f383c25e8f2b16de Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 20 Nov 2025 01:02:30 -0800
Subject: [PATCH 283/394] Convert no_dialyzer_attribute linter to use a trait

Summary: Simple conversion to use the new trait.

Reviewed By: TD5

Differential Revision: D87079003

fbshipit-source-id: 7caaf84bf43882045637fe870046537e5eb82a5f
---
 crates/ide/src/diagnostics.rs                 |  2 +-
 .../src/diagnostics/no_dialyzer_attribute.rs  | 73 ++++++++++---------
 website/docs/erlang-error-index/w/W0048.md    |  2 +-
 3 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 0b78998d62..6630dcf067 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1511,7 +1511,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &edoc::DESCRIPTOR,
         &macro_precedence_suprise::DESCRIPTOR,
         &duplicate_module::DESCRIPTOR,
-        &no_dialyzer_attribute::DESCRIPTOR,
         &no_nowarn_suppressions::DESCRIPTOR,
     ]
 }
@@ -1595,6 +1594,7 @@ const GENERIC_LINTERS: &[&dyn GenericDiagnostics] = &[
     &undocumented_function::LINTER,
     &no_catch::LINTER,
     &unavailable_type::LINTER,
+    &no_dialyzer_attribute::LINTER,
 ];
 
 /// Unified registry for all types of linters
diff --git a/crates/ide/src/diagnostics/no_dialyzer_attribute.rs b/crates/ide/src/diagnostics/no_dialyzer_attribute.rs
index 4c501c5ad5..9a671e6c65 100644
--- a/crates/ide/src/diagnostics/no_dialyzer_attribute.rs
+++ b/crates/ide/src/diagnostics/no_dialyzer_attribute.rs
@@ -8,50 +8,55 @@
  * above-listed licenses.
  */
 
-use elp_ide_db::DiagnosticCode;
+// Diagnostic: no-dialyzer-attribute
 use elp_ide_db::elp_base_db::FileId;
 use hir::Semantic;
 use hir::known;
 
-use crate::diagnostics::Diagnostic;
-use crate::diagnostics::DiagnosticConditions;
-use crate::diagnostics::DiagnosticDescriptor;
-use crate::diagnostics::Severity;
+use crate::diagnostics::DiagnosticCode;
+use crate::diagnostics::GenericLinter;
+use crate::diagnostics::GenericLinterMatchContext;
+use crate::diagnostics::Linter;
 
-const DIAGNOSTIC_CODE: DiagnosticCode = DiagnosticCode::NoDialyzerAttribute;
-const DIAGNOSTIC_MESSAGE: &str = "Avoid -dialyzer attribute.";
-const DIAGNOSTIC_SEVERITY: Severity = Severity::Warning;
+pub(crate) struct NoDialyzerAttributeLinter;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: false,
-        include_tests: false,
-        default_disabled: false,
-    },
-    checker: &|diags, sema, file_id, _ext| {
-        no_dialyzer_attribute(diags, sema, file_id);
-    },
-};
+impl Linter for NoDialyzerAttributeLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::NoDialyzerAttribute
+    }
 
-fn no_dialyzer_attribute(diagnostics: &mut Vec<Diagnostic>, sema: &Semantic, file_id: FileId) {
-    let form_list = sema.db.file_form_list(file_id);
-    form_list.attributes().for_each(|(_idx, attr)| {
-        if attr.name == known::dialyzer
-            && let Some(diagnostic) = make_diagnostic(sema, file_id, attr)
-        {
-            diagnostics.push(diagnostic);
-        }
-    });
+    fn description(&self) -> &'static str {
+        "Avoid using the -dialyzer attribute."
+    }
+
+    fn should_process_test_files(&self) -> bool {
+        false
+    }
 }
 
-fn make_diagnostic(sema: &Semantic, file_id: FileId, attr: &hir::Attribute) -> Option<Diagnostic> {
-    let range = attr.name_range(sema.db, file_id)?;
-    let diagnostic = Diagnostic::new(DIAGNOSTIC_CODE, DIAGNOSTIC_MESSAGE, range)
-        .with_severity(DIAGNOSTIC_SEVERITY);
-    Some(diagnostic)
+impl GenericLinter for NoDialyzerAttributeLinter {
+    type Context = ();
+
+    fn matches(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<GenericLinterMatchContext<Self::Context>>> {
+        let mut res = Vec::new();
+        let form_list = sema.db.file_form_list(file_id);
+        form_list.attributes().for_each(|(_idx, attr)| {
+            if attr.name == known::dialyzer
+                && let Some(range) = attr.name_range(sema.db, file_id)
+            {
+                res.push(GenericLinterMatchContext { range, context: () })
+            }
+        });
+        Some(res)
+    }
 }
 
+pub static LINTER: NoDialyzerAttributeLinter = NoDialyzerAttributeLinter;
+
 #[cfg(test)]
 mod tests {
 
@@ -63,7 +68,7 @@ mod tests {
             r#"
     -module(main).
     -dialyzer({nowarn_function, foo/0}).
- %% ^^^^^^^^^ warning: W0048: Avoid -dialyzer attribute.
+ %% ^^^^^^^^^ 💡 warning: W0048: Avoid using the -dialyzer attribute.
               "#,
         )
     }
diff --git a/website/docs/erlang-error-index/w/W0048.md b/website/docs/erlang-error-index/w/W0048.md
index 42d21cec9c..a6e1631148 100644
--- a/website/docs/erlang-error-index/w/W0048.md
+++ b/website/docs/erlang-error-index/w/W0048.md
@@ -9,7 +9,7 @@ sidebar_position: 48
 ```erlang
     -module(main).
     -dialyzer({nowarn_function, foo/0}).
-%%  ^^^^^^^^^ 💡 warning: Avoid -dialyzer attribute.
+%%  ^^^^^^^^^ 💡 warning: Avoid using the -dialyzer attribute.
 ```
 
 ## Explanation

From 5187bf3d3f367c11fefa6f29ad9041b6d72e7187 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 20 Nov 2025 01:02:30 -0800
Subject: [PATCH 284/394] Convert duplicate_module linter to use a trait

Summary: Simple conversion to use the new trait.

Reviewed By: TD5

Differential Revision: D87445553

fbshipit-source-id: 8b45cea1dcefe71b0cd573aa4529433974943d3f
---
 crates/ide/src/diagnostics.rs                 |  2 +-
 .../ide/src/diagnostics/duplicate_module.rs   | 81 ++++++++++---------
 website/docs/erlang-error-index/w/W0045.md    |  2 +-
 3 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 6630dcf067..59a17db167 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1510,7 +1510,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &unspecific_include::DESCRIPTOR,
         &edoc::DESCRIPTOR,
         &macro_precedence_suprise::DESCRIPTOR,
-        &duplicate_module::DESCRIPTOR,
         &no_nowarn_suppressions::DESCRIPTOR,
     ]
 }
@@ -1595,6 +1594,7 @@ const GENERIC_LINTERS: &[&dyn GenericDiagnostics] = &[
     &no_catch::LINTER,
     &unavailable_type::LINTER,
     &no_dialyzer_attribute::LINTER,
+    &duplicate_module::LINTER,
 ];
 
 /// Unified registry for all types of linters
diff --git a/crates/ide/src/diagnostics/duplicate_module.rs b/crates/ide/src/diagnostics/duplicate_module.rs
index d9e01ecc53..09eb548b31 100644
--- a/crates/ide/src/diagnostics/duplicate_module.rs
+++ b/crates/ide/src/diagnostics/duplicate_module.rs
@@ -12,51 +12,58 @@
 //
 // Return a warning if more than one module has the same name
 
-use elp_ide_db::DiagnosticCode;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::ModuleName;
 use elp_syntax::AstNode;
 use hir::Semantic;
 
-use super::Diagnostic;
-use super::DiagnosticConditions;
-use super::DiagnosticDescriptor;
-use crate::diagnostics::Severity;
+use crate::diagnostics::DiagnosticCode;
+use crate::diagnostics::GenericLinter;
+use crate::diagnostics::GenericLinterMatchContext;
+use crate::diagnostics::Linter;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: false,
-        include_tests: false, // Allow duplication in test fixtures
-        default_disabled: false,
-    },
-    checker: &|diags, sema, file_id, _file_kind| {
-        check_file(diags, sema, &file_id);
-    },
-};
+pub(crate) struct DuplicateModuleLinter;
 
-fn check_file(acc: &mut Vec<Diagnostic>, sema: &Semantic, file_id: &FileId) -> Option<()> {
-    // We cannot ask for the module name from the module_index, as
-    // this file_id may be discarded as a duplicate
-    let module_name_ast = sema.module_attribute_name(*file_id)?;
-    let module_name = ModuleName::new(module_name_ast.text()?.as_str());
-
-    let app_data = sema.db.file_app_data(*file_id)?;
-    let module_index = sema.db.module_index(app_data.project_id);
-    if let Some(_dups) = module_index.duplicates(&module_name) {
-        let range = module_name_ast.syntax().text_range();
-        acc.push(
-            Diagnostic::new(
-                DiagnosticCode::DuplicateModule,
-                "Duplicate module name",
-                range,
-            )
-            .with_severity(Severity::Warning),
-        );
+impl Linter for DuplicateModuleLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::DuplicateModule
+    }
+
+    fn description(&self) -> &'static str {
+        "A module with this name exists elsewhere"
+    }
+
+    fn should_process_test_files(&self) -> bool {
+        false // Allow duplication in test fixtures
     }
-    Some(())
 }
 
+impl GenericLinter for DuplicateModuleLinter {
+    type Context = ();
+
+    fn matches(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<GenericLinterMatchContext<Self::Context>>> {
+        let mut res = Vec::new();
+        // We cannot ask for the module name from the module_index, as
+        // this file_id may be discarded as a duplicate
+        let module_name_ast = sema.module_attribute_name(file_id)?;
+        let module_name = ModuleName::new(module_name_ast.text()?.as_str());
+
+        let app_data = sema.db.file_app_data(file_id)?;
+        let module_index = sema.db.module_index(app_data.project_id);
+        if let Some(_dups) = module_index.duplicates(&module_name) {
+            let range = module_name_ast.syntax().text_range();
+            res.push(GenericLinterMatchContext { range, context: () });
+        }
+        Some(res)
+    }
+}
+
+pub static LINTER: DuplicateModuleLinter = DuplicateModuleLinter;
+
 #[cfg(test)]
 mod test {
     use crate::tests::check_diagnostics;
@@ -67,11 +74,11 @@ mod test {
             r#"
              //- /src/dup_mod.erl
              -module(dup_mod).
-                  %% ^^^^^^^ warning: W0045: Duplicate module name
+                  %% ^^^^^^^ 💡 warning: W0045: A module with this name exists elsewhere
 
              //- /src/sub/dup_mod.erl
              -module(dup_mod).
-                  %% ^^^^^^^ warning: W0045: Duplicate module name
+                  %% ^^^^^^^ 💡 warning: W0045: A module with this name exists elsewhere
             "#,
         )
     }
diff --git a/website/docs/erlang-error-index/w/W0045.md b/website/docs/erlang-error-index/w/W0045.md
index 13c908d8a0..c68f83ef4d 100644
--- a/website/docs/erlang-error-index/w/W0045.md
+++ b/website/docs/erlang-error-index/w/W0045.md
@@ -8,7 +8,7 @@ sidebar_position: 45
 
 ```erlang
 -module(my_module).
-    %%  ^^^^^^^^^ warning: Duplicate module name
+    %%  ^^^^^^^^^ warning: A module with this name exists elsewhere
 ```
 
 ## Explanation

From e9a9035e5ad8379e59167283d4aa8ae897bc5364 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 20 Nov 2025 04:38:57 -0800
Subject: [PATCH 285/394] Convert no_warn_suppressions linter to use a trait

Summary: Simple conversion to use the new trait.

Reviewed By: jcpetruzza

Differential Revision: D87447644

fbshipit-source-id: 74e0caf1fc8fd289013af2fc69839b25f0b9bdc4
---
 crates/ide/src/diagnostics.rs                 |  2 +-
 .../src/diagnostics/no_nowarn_suppressions.rs | 89 ++++++++++---------
 2 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 59a17db167..68197dfa9b 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1510,7 +1510,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &unspecific_include::DESCRIPTOR,
         &edoc::DESCRIPTOR,
         &macro_precedence_suprise::DESCRIPTOR,
-        &no_nowarn_suppressions::DESCRIPTOR,
     ]
 }
 
@@ -1595,6 +1594,7 @@ const GENERIC_LINTERS: &[&dyn GenericDiagnostics] = &[
     &unavailable_type::LINTER,
     &no_dialyzer_attribute::LINTER,
     &duplicate_module::LINTER,
+    &no_nowarn_suppressions::LINTER,
 ];
 
 /// Unified registry for all types of linters
diff --git a/crates/ide/src/diagnostics/no_nowarn_suppressions.rs b/crates/ide/src/diagnostics/no_nowarn_suppressions.rs
index ef258779cd..a0b36f87b8 100644
--- a/crates/ide/src/diagnostics/no_nowarn_suppressions.rs
+++ b/crates/ide/src/diagnostics/no_nowarn_suppressions.rs
@@ -16,62 +16,63 @@ use hir::Semantic;
 use lazy_static::lazy_static;
 use regex::Regex;
 
-use crate::diagnostics::Diagnostic;
 use crate::diagnostics::DiagnosticCode;
-use crate::diagnostics::DiagnosticConditions;
-use crate::diagnostics::DiagnosticDescriptor;
-use crate::diagnostics::Severity;
+use crate::diagnostics::GenericLinter;
+use crate::diagnostics::GenericLinterMatchContext;
+use crate::diagnostics::Linter;
 
-const DIAGNOSTIC_CODE: DiagnosticCode = DiagnosticCode::NoNoWarnSuppressions;
-const DIAGNOSTIC_MESSAGE: &str = "Do not suppress compiler warnings at module level.";
-const DIAGNOSTIC_SEVERITY: Severity = Severity::Warning;
+pub(crate) struct NoNoWarnSuppressionsLinter;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: false,
-        include_tests: true,
-        default_disabled: false,
-    },
-    checker: &|diags, sema, file_id, _ext| {
-        no_warn_suppression(diags, sema, file_id);
-    },
-};
-
-fn no_warn_suppression(diagnostics: &mut Vec<Diagnostic>, sema: &Semantic, file_id: FileId) {
-    lazy_static! {
-        static ref NOWARN_REGEX: Regex = Regex::new(r"^nowarn_").unwrap();
+impl Linter for NoNoWarnSuppressionsLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::NoNoWarnSuppressions
     }
 
-    let form_list = sema.db.file_form_list(file_id);
-    for (_compile_option_idx, compile_option) in form_list.compile_attributes() {
-        let attr = compile_option.form_id.get_ast(sema.db, file_id);
-        if let Some(expr) = attr.options() {
-            // Blindly search for any atom matching the nowarn_ prefix
-            for n in expr.syntax().descendants() {
-                match_ast! {
-                    match n {
-                        ast::Atom(atom) => {
-                            if let Some(atom_text) = atom.text()
-                                && NOWARN_REGEX.is_match(&atom_text) {
-                                    let diagnostic = Diagnostic::new(
-                                        DIAGNOSTIC_CODE,
-                                        DIAGNOSTIC_MESSAGE,
-                                        atom.syntax().text_range(),
-                                    )
-                                    .with_ignore_fix(sema, file_id)
-                                    .with_severity(DIAGNOSTIC_SEVERITY);
-                                    diagnostics.push(diagnostic);
-                                }
-                        },
-                        _ => {}
+    fn description(&self) -> &'static str {
+        "Do not suppress compiler warnings at module level."
+    }
+}
+
+impl GenericLinter for NoNoWarnSuppressionsLinter {
+    type Context = ();
+
+    fn matches(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<GenericLinterMatchContext<Self::Context>>> {
+        lazy_static! {
+            static ref NOWARN_REGEX: Regex = Regex::new(r"^nowarn_").unwrap();
+        }
+
+        let mut res = Vec::new();
+        let form_list = sema.db.file_form_list(file_id);
+        for (_compile_option_idx, compile_option) in form_list.compile_attributes() {
+            let attr = compile_option.form_id.get_ast(sema.db, file_id);
+            if let Some(expr) = attr.options() {
+                // Blindly search for any atom matching the nowarn_ prefix
+                for n in expr.syntax().descendants() {
+                    match_ast! {
+                        match n {
+                            ast::Atom(atom) => {
+                                if let Some(atom_text) = atom.text()
+                                    && NOWARN_REGEX.is_match(&atom_text) {
+                                        let range = atom.syntax().text_range();
+                                        res.push(GenericLinterMatchContext { range, context: () });
+                                    }
+                            },
+                            _ => {}
+                        }
                     }
                 }
             }
         }
+        Some(res)
     }
 }
 
+pub static LINTER: NoNoWarnSuppressionsLinter = NoNoWarnSuppressionsLinter;
+
 #[cfg(test)]
 mod tests {
     use crate::tests;

From 77ff228aae33bea6ba4ccb9b83c4d83c273a8529 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 20 Nov 2025 04:38:57 -0800
Subject: [PATCH 286/394] Convert macro_precedence_surprise linter to use a
 trait

Summary: Simple conversion to use the new trait.

Reviewed By: jcpetruzza

Differential Revision: D87516327

fbshipit-source-id: 8a6669c4c337a54ecf0a65c864df8be40d82e720
---
 crates/ide/src/diagnostics.rs                 |   2 +-
 .../diagnostics/macro_precedence_suprise.rs   | 172 ++++++++++--------
 2 files changed, 94 insertions(+), 80 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 68197dfa9b..6522455018 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1509,7 +1509,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &record_tuple_match::DESCRIPTOR,
         &unspecific_include::DESCRIPTOR,
         &edoc::DESCRIPTOR,
-        &macro_precedence_suprise::DESCRIPTOR,
     ]
 }
 
@@ -1595,6 +1594,7 @@ const GENERIC_LINTERS: &[&dyn GenericDiagnostics] = &[
     &no_dialyzer_attribute::LINTER,
     &duplicate_module::LINTER,
     &no_nowarn_suppressions::LINTER,
+    &macro_precedence_suprise::LINTER,
 ];
 
 /// Unified registry for all types of linters
diff --git a/crates/ide/src/diagnostics/macro_precedence_suprise.rs b/crates/ide/src/diagnostics/macro_precedence_suprise.rs
index 49c627da28..700f54441e 100644
--- a/crates/ide/src/diagnostics/macro_precedence_suprise.rs
+++ b/crates/ide/src/diagnostics/macro_precedence_suprise.rs
@@ -15,14 +15,12 @@
 
 use elp_ide_assists::Assist;
 use elp_ide_assists::helpers::add_parens_edit;
-use elp_ide_db::DiagnosticCode;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
 use elp_text_edit::TextRange;
 use hir::AnyExpr;
 use hir::AnyExprRef;
 use hir::Expr;
-use hir::ExprSource;
 use hir::Semantic;
 use hir::Strategy;
 use hir::fold::MacroStrategy;
@@ -30,92 +28,108 @@ use hir::fold::ParenStrategy;
 use hir::fold::ParentId;
 use hir::fold::fold_file_functions;
 
-use super::Diagnostic;
-use super::DiagnosticConditions;
-use super::DiagnosticDescriptor;
-use super::Severity;
+use crate::diagnostics::DiagnosticCode;
+use crate::diagnostics::GenericLinter;
+use crate::diagnostics::GenericLinterMatchContext;
+use crate::diagnostics::Linter;
 use crate::fix;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: true,
-        include_tests: true,
-        default_disabled: false,
-    },
-    checker: &|diags, sema, file_id, _file_kind| {
-        check_file(diags, sema, &file_id);
-    },
-};
-
-/// Look for macro expansions. If we find one, check what the top-level expansion gives us.
-fn check_file(acc: &mut Vec<Diagnostic>, sema: &Semantic, file_id: &FileId) {
-    let fold_strategy = Strategy {
-        macros: MacroStrategy::ExpandButIncludeMacroCall,
-        parens: ParenStrategy::VisibleParens,
-    };
-    let index_strategy = Strategy {
-        macros: MacroStrategy::Expand,
-        parens: ParenStrategy::VisibleParens,
-    };
-
-    fold_file_functions(sema, fold_strategy, *file_id, (), &mut |_acc, ctx| {
-        if let AnyExpr::Expr(Expr::MacroCall { expansion, .. }) = &ctx.item
-            && let Some((body, _body_map, ast)) = ctx.body_with_expr_source(sema)
-        {
-            let visible_parens_body = body.index_with_strategy(index_strategy);
-            if let Expr::BinaryOp { .. } = &visible_parens_body[*expansion]
-                && let ParentId::HirIdx(hir_idx) = ctx.parent()
-                && hir_idx.body_origin == ctx.body_origin
-            {
-                // We can have nested macro
-                // calls, which are not
-                // visible in the
-                // visible_parens_body. Report
-                // on the top-level one only.
-                let fold_body = body.index_with_strategy(fold_strategy);
-                match &fold_body.get_any(hir_idx.idx) {
-                    AnyExprRef::Expr(Expr::MacroCall { .. }) => {}
-                    _ => {
-                        if let AnyExprRef::Expr(Expr::BinaryOp { .. }) =
-                            &visible_parens_body.get_any(hir_idx.idx)
-                        {
-                            make_diagnostic(acc, file_id, ast);
-                        }
-                    }
-                };
-            };
-        }
-    });
+#[derive(Debug, Default, Clone, PartialEq)]
+pub(crate) struct MacroPrecedenceContext {
+    range: TextRange,
 }
 
-fn make_diagnostic(acc: &mut Vec<Diagnostic>, file_id: &FileId, ast: ExprSource) {
-    let range = ast.range();
-    if range.file_id == *file_id {
-        let fix = add_parens_fix(*file_id, &range.range);
-        acc.push(
-            Diagnostic::new(
-                DiagnosticCode::MacroPrecedenceEscape,
-                "The macro expansion can have unexpected precedence here",
-                range.range,
-            )
-            .with_severity(Severity::Warning)
-            .with_fixes(Some(vec![fix])),
-        );
+pub(crate) struct MacroPrecedenceSupriseLinter;
+
+impl Linter for MacroPrecedenceSupriseLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::MacroPrecedenceEscape
+    }
+
+    fn description(&self) -> &'static str {
+        "The macro expansion can have unexpected precedence here"
+    }
+
+    fn should_process_generated_files(&self) -> bool {
+        true
     }
 }
 
-fn add_parens_fix(file_id: FileId, range: &TextRange) -> Assist {
-    let assist_message = "Add parens to macro call".to_string();
-    let edit = add_parens_edit(range);
-    fix(
-        "macro_precedence_add_parens",
-        &assist_message,
-        SourceChange::from_text_edit(file_id, edit.clone()),
-        *range,
-    )
+impl GenericLinter for MacroPrecedenceSupriseLinter {
+    type Context = MacroPrecedenceContext;
+
+    fn matches(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<GenericLinterMatchContext<Self::Context>>> {
+        let fold_strategy = Strategy {
+            macros: MacroStrategy::ExpandButIncludeMacroCall,
+            parens: ParenStrategy::VisibleParens,
+        };
+        let index_strategy = Strategy {
+            macros: MacroStrategy::Expand,
+            parens: ParenStrategy::VisibleParens,
+        };
+
+        let mut res = Vec::new();
+        fold_file_functions(sema, fold_strategy, file_id, (), &mut |_acc, ctx| {
+            if let AnyExpr::Expr(Expr::MacroCall { expansion, .. }) = &ctx.item
+                && let Some((body, _body_map, ast)) = ctx.body_with_expr_source(sema)
+            {
+                let visible_parens_body = body.index_with_strategy(index_strategy);
+                if let Expr::BinaryOp { .. } = &visible_parens_body[*expansion]
+                    && let ParentId::HirIdx(hir_idx) = ctx.parent()
+                    && hir_idx.body_origin == ctx.body_origin
+                {
+                    // We can have nested macro
+                    // calls, which are not
+                    // visible in the
+                    // visible_parens_body. Report
+                    // on the top-level one only.
+                    let fold_body = body.index_with_strategy(fold_strategy);
+                    match &fold_body.get_any(hir_idx.idx) {
+                        AnyExprRef::Expr(Expr::MacroCall { .. }) => {}
+                        _ => {
+                            if let AnyExprRef::Expr(Expr::BinaryOp { .. }) =
+                                &visible_parens_body.get_any(hir_idx.idx)
+                            {
+                                let range = ast.range();
+                                if range.file_id == file_id {
+                                    let context = MacroPrecedenceContext { range: range.range };
+                                    res.push(GenericLinterMatchContext {
+                                        range: range.range,
+                                        context,
+                                    });
+                                }
+                            }
+                        }
+                    };
+                };
+            }
+        });
+        Some(res)
+    }
+
+    fn fixes(
+        &self,
+        context: &Self::Context,
+        _sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<Assist>> {
+        let edit = add_parens_edit(&context.range);
+        let fix = fix(
+            "macro_precedence_add_parens",
+            "Add parens to macro call",
+            SourceChange::from_text_edit(file_id, edit),
+            context.range,
+        );
+        Some(vec![fix])
+    }
 }
 
+pub static LINTER: MacroPrecedenceSupriseLinter = MacroPrecedenceSupriseLinter;
+
 #[cfg(test)]
 mod tests {
 

From 7571e571553e0ef40fabcf034ab123ec3f7da876 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Thu, 20 Nov 2025 07:30:38 -0800
Subject: [PATCH 287/394] BE: fix off-by-one in `elp lint` diagnostic output

Summary:
When running any elp CLI command that produces diagnostics, the locations are incorrect, as they use the internal coordinate frame rather than the usual one for IDEs and other tools.

This means each line and col location is one less than it should be.

This diff fixes that, so the locations make sense to users.

Note: it does not affect output using `--format json`, which already does this.

Reviewed By: TD5

Differential Revision: D87539540

fbshipit-source-id: 27abd4ac5fb9e5056fc9e3397257d9e5cb9e678d
---
 crates/elp/src/bin/lint_cli.rs                | 12 +++----
 .../resolves_generated_includes.stdout        | 14 ++++----
 .../diagnostics/lint_report_suppressed.stdout |  2 +-
 .../diagnostics/parse_elp_lint_fix.stdout     |  4 +--
 .../parse_elp_lint_recursive.stdout           | 32 +++++++++----------
 .../linter/custom_function_matches.stdout     |  2 +-
 .../resources/test/linter/elp_lint_ct.stdout  |  2 +-
 .../test/linter/elp_lint_edoc.stdout          |  2 +-
 .../test/linter/parse_elp_lint2.stdout        |  2 +-
 .../linter/parse_elp_lint_adhoc_output.stdout |  8 ++---
 .../test/linter/parse_elp_lint_app.stdout     |  2 +-
 .../parse_elp_lint_config_output.stdout       | 16 +++++-----
 ...parse_elp_lint_custom_config_output.stdout |  8 ++---
 .../parse_elp_lint_erlang_service.stdout      |  2 +-
 ...rse_elp_lint_explicit_enable_output.stdout | 22 ++++++-------
 .../linter/parse_elp_lint_fix_ignore.stdout   |  4 +--
 .../parse_elp_lint_fixme_spelling.stdout      |  4 +--
 .../test/linter/parse_elp_lint_ignore.stdout  | 10 +++---
 .../linter/parse_elp_lint_ignore_apps.stdout  |  2 +-
 .../parse_elp_lint_ignore_apps_b.stdout       |  4 +--
 .../parse_elp_no_lint_specified_output.stdout | 30 ++++++++---------
 .../resources/test/linter/ssr_ad_hoc.stdout   |  2 +-
 .../test/linter/ssr_ad_hoc_cli.stdout         |  2 +-
 .../ssr_ad_hoc_cli_macros_expand.stdout       |  2 +-
 .../ssr_ad_hoc_cli_macros_no_expand.stdout    |  2 +-
 ...sr_ad_hoc_cli_macros_visible_expand.stdout |  4 +--
 .../linter/ssr_ad_hoc_cli_multiple.stdout     |  4 +--
 .../ssr_ad_hoc_cli_parens_invisible.stdout    |  2 +-
 .../ssr_ad_hoc_cli_parens_visible.stdout      |  6 ++--
 .../test/linter/warnings_as_errors.stdout     | 30 ++++++++---------
 .../test/xref/unavailable_type.stdout         |  4 +--
 crates/ide/src/diagnostics.rs                 |  8 ++---
 32 files changed, 125 insertions(+), 125 deletions(-)

diff --git a/crates/elp/src/bin/lint_cli.rs b/crates/elp/src/bin/lint_cli.rs
index 4ddf80b5c2..3bc2271072 100644
--- a/crates/elp/src/bin/lint_cli.rs
+++ b/crates/elp/src/bin/lint_cli.rs
@@ -1088,11 +1088,11 @@ mod tests {
               head_mismatcX(0) -> 0.
           "#,
             expect![[r#"
-            module specified: lints
-            Diagnostics reported in 1 modules:
-              lints: 1
-                  4:2-4:15::[Error] [P1700] head mismatch 'head_mismatcX' vs 'head_mismatch'
-        "#]],
+                module specified: lints
+                Diagnostics reported in 1 modules:
+                  lints: 1
+                      5:3-5:16::[Error] [P1700] head mismatch 'head_mismatcX' vs 'head_mismatch'
+            "#]],
             expect![""],
         );
     }
@@ -1111,7 +1111,7 @@ mod tests {
                 module specified: lints
                 Diagnostics reported in 1 modules:
                   lints: 1
-                      2:2-2:5::[Warning] [L1230] function foo/0 is unused
+                      3:3-3:6::[Warning] [L1230] function foo/0 is unused
             "#]],
             expect![""],
         );
diff --git a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
index 83f167f14a..378f86c01e 100644
--- a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
+++ b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
@@ -1,12 +1,12 @@
 Reporting all diagnostics codes
 Diagnostics reported in 3 modules:
   app_a: 1
-      5:9-5:31::[WeakWarning] [W0037] Unspecific include.
+      6:10-6:32::[WeakWarning] [W0037] Unspecific include.
   top_includer: 2
-      0:1-0:1::[Error] [L0000] Issue in included file
-      12:4-12:10::[Error] [E1508] undefined macro 'THIRD/2'
+      1:2-1:2::[Error] [L0000] Issue in included file
+      13:5-13:11::[Error] [E1508] undefined macro 'THIRD/2'
   wa_buck2_module_search: 4
-      54:18-54:31::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
-      56:18-56:28::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
-      56:38-56:51::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
-      60:30-60:40::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
+      55:19-55:32::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
+      57:19-57:29::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
+      57:39-57:52::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
+      61:31-61:41::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
diff --git a/crates/elp/src/resources/test/diagnostics/lint_report_suppressed.stdout b/crates/elp/src/resources/test/diagnostics/lint_report_suppressed.stdout
index c8cdedb3ea..cda6044675 100644
--- a/crates/elp/src/resources/test/diagnostics/lint_report_suppressed.stdout
+++ b/crates/elp/src/resources/test/diagnostics/lint_report_suppressed.stdout
@@ -1,4 +1,4 @@
 module specified: suppressed
 Diagnostics reported in 1 modules:
   suppressed: 1
-      7:4-7:8::[Warning] [W0007] match is redundant
+      8:5-8:9::[Warning] [W0007] match is redundant
diff --git a/crates/elp/src/resources/test/diagnostics/parse_elp_lint_fix.stdout b/crates/elp/src/resources/test/diagnostics/parse_elp_lint_fix.stdout
index b3a5f365b7..5cee41edd5 100644
--- a/crates/elp/src/resources/test/diagnostics/parse_elp_lint_fix.stdout
+++ b/crates/elp/src/resources/test/diagnostics/parse_elp_lint_fix.stdout
@@ -1,11 +1,11 @@
 module specified: lints
 Diagnostics reported in 1 modules:
   lints: 1
-      4:0-4:13::[Error] [P1700] head mismatch 'head_mismatcX' vs 'head_mismatch'
+      5:1-5:14::[Error] [P1700] head mismatch 'head_mismatcX' vs 'head_mismatch'
 ---------------------------------------------
 
 Applying fix in module 'lints' for
-      4:0-4:13::[Error] [P1700] head mismatch 'head_mismatcX' vs 'head_mismatch'
+      5:1-5:14::[Error] [P1700] head mismatch 'head_mismatcX' vs 'head_mismatch'
 @@ -1,6 +1,6 @@
  -module(lints).
  -export([head_mismatch/1]).
diff --git a/crates/elp/src/resources/test/diagnostics/parse_elp_lint_recursive.stdout b/crates/elp/src/resources/test/diagnostics/parse_elp_lint_recursive.stdout
index 6bcfecb8a6..d947376488 100644
--- a/crates/elp/src/resources/test/diagnostics/parse_elp_lint_recursive.stdout
+++ b/crates/elp/src/resources/test/diagnostics/parse_elp_lint_recursive.stdout
@@ -1,12 +1,12 @@
 module specified: lint_recursive
 Diagnostics reported in 1 modules:
   lint_recursive: 2
-      18:4-18:11::[Warning] [W0007] match is redundant
-      13:4-13:11::[Warning] [W0007] match is redundant
+      19:5-19:12::[Warning] [W0007] match is redundant
+      14:5-14:12::[Warning] [W0007] match is redundant
 ---------------------------------------------
 
 Applying fix in module 'lint_recursive' for
-      18:4-18:11::[Warning] [W0007] match is redundant
+      19:5-19:12::[Warning] [W0007] match is redundant
 @@ -16,7 +16,7 @@
  
  test_foo2(Config) ->
@@ -21,12 +21,12 @@ Applying fix in module 'lint_recursive' for
 
 New filtered diagnostics
   lint_recursive: 2
-      13:4-13:11::[Warning] [W0007] match is redundant
-      18:4-18:10::[Warning] [W0006] this statement has no effect
+      14:5-14:12::[Warning] [W0007] match is redundant
+      19:5-19:11::[Warning] [W0006] this statement has no effect
 ---------------------------------------------
 
 Applying fix in module 'lint_recursive' for
-      13:4-13:11::[Warning] [W0007] match is redundant
+      14:5-14:12::[Warning] [W0007] match is redundant
 @@ -11,7 +11,7 @@
  %% something/0.
  test_foo(Config) ->
@@ -41,12 +41,12 @@ Applying fix in module 'lint_recursive' for
 
 New filtered diagnostics
   lint_recursive: 2
-      18:4-18:10::[Warning] [W0006] this statement has no effect
-      13:4-13:10::[Warning] [W0006] this statement has no effect
+      19:5-19:11::[Warning] [W0006] this statement has no effect
+      14:5-14:11::[Warning] [W0006] this statement has no effect
 ---------------------------------------------
 
 Applying fix in module 'lint_recursive' for
-      18:4-18:10::[Warning] [W0006] this statement has no effect
+      19:5-19:11::[Warning] [W0006] this statement has no effect
 @@ -16,7 +16,6 @@
  
  test_foo2(Config) ->
@@ -60,12 +60,12 @@ Applying fix in module 'lint_recursive' for
 
 New filtered diagnostics
   lint_recursive: 2
-      16:10-16:16::[Warning] [W0010] this variable is unused
-      13:4-13:10::[Warning] [W0006] this statement has no effect
+      17:11-17:17::[Warning] [W0010] this variable is unused
+      14:5-14:11::[Warning] [W0006] this statement has no effect
 ---------------------------------------------
 
 Applying fix in module 'lint_recursive' for
-      16:10-16:16::[Warning] [W0010] this variable is unused
+      17:11-17:17::[Warning] [W0010] this variable is unused
 @@ -14,7 +14,7 @@
      Config,
      clean_mocks().
@@ -80,11 +80,11 @@ Applying fix in module 'lint_recursive' for
 
 New filtered diagnostics
   lint_recursive: 1
-      13:4-13:10::[Warning] [W0006] this statement has no effect
+      14:5-14:11::[Warning] [W0006] this statement has no effect
 ---------------------------------------------
 
 Applying fix in module 'lint_recursive' for
-      13:4-13:10::[Warning] [W0006] this statement has no effect
+      14:5-14:11::[Warning] [W0006] this statement has no effect
 @@ -11,7 +11,6 @@
  %% something/0.
  test_foo(Config) ->
@@ -98,11 +98,11 @@ Applying fix in module 'lint_recursive' for
 
 New filtered diagnostics
   lint_recursive: 1
-      11:9-11:15::[Warning] [W0010] this variable is unused
+      12:10-12:16::[Warning] [W0010] this variable is unused
 ---------------------------------------------
 
 Applying fix in module 'lint_recursive' for
-      11:9-11:15::[Warning] [W0010] this variable is unused
+      12:10-12:16::[Warning] [W0010] this variable is unused
 @@ -9,7 +9,7 @@
  %% We want to check that the "no effect" statements in test_foo/1 and
  %% test_foo2/1 are removed, but not the ones in clean_mocks/0 and
diff --git a/crates/elp/src/resources/test/linter/custom_function_matches.stdout b/crates/elp/src/resources/test/linter/custom_function_matches.stdout
index 08c0321771..961154e550 100644
--- a/crates/elp/src/resources/test/linter/custom_function_matches.stdout
+++ b/crates/elp/src/resources/test/linter/custom_function_matches.stdout
@@ -2,4 +2,4 @@ Reporting all diagnostics codes
 module specified: custom_function_matches
 Diagnostics reported in 1 modules:
   custom_function_matches: 1
-      13:4-13:25::[Warning] [W0017] Function 'not_excluded:function/0' is undefined.
+      14:5-14:26::[Warning] [W0017] Function 'not_excluded:function/0' is undefined.
diff --git a/crates/elp/src/resources/test/linter/elp_lint_ct.stdout b/crates/elp/src/resources/test/linter/elp_lint_ct.stdout
index db2b6e3afa..773b1f4d9c 100644
--- a/crates/elp/src/resources/test/linter/elp_lint_ct.stdout
+++ b/crates/elp/src/resources/test/linter/elp_lint_ct.stdout
@@ -1,3 +1,3 @@
 Diagnostics reported in 1 modules:
   app_a_unreachable_test_SUITE: 1
-      7:0-7:1::[Error] [W0008] Unreachable test (b/1)
+      8:1-8:2::[Error] [W0008] Unreachable test (b/1)
diff --git a/crates/elp/src/resources/test/linter/elp_lint_edoc.stdout b/crates/elp/src/resources/test/linter/elp_lint_edoc.stdout
index 022b3b8972..8b60108476 100644
--- a/crates/elp/src/resources/test/linter/elp_lint_edoc.stdout
+++ b/crates/elp/src/resources/test/linter/elp_lint_edoc.stdout
@@ -1,3 +1,3 @@
 Diagnostics reported in 1 modules:
   app_a_edoc: 1
-      4:0-5:0::[Warning] [O0039] tag @docc not recognized.
+      5:1-6:1::[Warning] [O0039] tag @docc not recognized.
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint2.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint2.stdout
index b0cc8a1337..00ffa07782 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint2.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint2.stdout
@@ -1,4 +1,4 @@
 module specified: app_a
 Diagnostics reported in 1 modules:
   app_a: 1
-      8:0-8:4::[Error] [P1700] head mismatch 'fooX' vs 'food'
+      9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_adhoc_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_adhoc_output.stdout
index 5adeaace66..97e3ef307f 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_adhoc_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_adhoc_output.stdout
@@ -1,13 +1,13 @@
 module specified: app_b
 Diagnostics reported in 1 modules:
   app_b: 2
-      7:4-7:35::[WeakWarning] [ad-hoc: application:get_env/2] 'application:get_env/2' called
-      4:4-4:34::[WeakWarning] [ad-hoc: application:get_env/2] 'application:get_env/2' called
+      8:5-8:36::[WeakWarning] [ad-hoc: application:get_env/2] 'application:get_env/2' called
+      5:5-5:35::[WeakWarning] [ad-hoc: application:get_env/2] 'application:get_env/2' called
 ---------------------------------------------
 
 Applying fixes in module 'app_b' for
-      7:4-7:35::[WeakWarning] [ad-hoc: application:get_env/2] 'application:get_env/2' called
-      4:4-4:34::[WeakWarning] [ad-hoc: application:get_env/2] 'application:get_env/2' called
+      8:5-8:36::[WeakWarning] [ad-hoc: application:get_env/2] 'application:get_env/2' called
+      5:5-5:35::[WeakWarning] [ad-hoc: application:get_env/2] 'application:get_env/2' called
 @@ -1,8 +1,8 @@
  -module(app_b).
  -export([application_env_error/0, application_env_no_error/0]).
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_app.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_app.stdout
index a5c27f4367..f1938756fc 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_app.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_app.stdout
@@ -1,3 +1,3 @@
 Diagnostics reported in 1 modules:
   app_a: 1
-      8:0-8:4::[Error] [P1700] head mismatch 'fooX' vs 'food'
+      9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_config_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_config_output.stdout
index 8b6d166b16..d4ef132ea6 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_config_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_config_output.stdout
@@ -1,13 +1,13 @@
 Diagnostics reported in 4 modules:
   app_a: 3
-      8:5-8:6::[Warning] [W0010] this variable is unused
-      4:4-4:34::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
-      8:0-8:4::[Error] [P1700] head mismatch 'fooX' vs 'food'
+      9:6-9:7::[Warning] [W0010] this variable is unused
+      5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
+      9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
   app_a_unused_param: 2
-      4:4-4:5::[Warning] [W0010] this variable is unused
-      4:4-4:5::[Warning] [L1268] variable 'X' is unused
+      5:5-5:6::[Warning] [W0010] this variable is unused
+      5:5-5:6::[Warning] [L1268] variable 'X' is unused
   app_b: 1
-      4:4-4:34::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
+      5:5-5:35::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
   app_b_unused_param: 2
-      4:4-4:5::[Warning] [W0010] this variable is unused
-      4:4-4:5::[Warning] [L1268] variable 'X' is unused
+      5:5-5:6::[Warning] [W0010] this variable is unused
+      5:5-5:6::[Warning] [L1268] variable 'X' is unused
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_custom_config_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_custom_config_output.stdout
index 50166d0687..3927f2c196 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_custom_config_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_custom_config_output.stdout
@@ -1,9 +1,9 @@
 Diagnostics reported in 4 modules:
   app_a: 1
-      4:4-4:34::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
+      5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
   app_a_unused_param: 1
-      4:4-4:5::[Warning] [L1268] variable 'X' is unused
+      5:5-5:6::[Warning] [L1268] variable 'X' is unused
   app_b: 1
-      4:4-4:34::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
+      5:5-5:35::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
   app_b_unused_param: 1
-      4:4-4:5::[Warning] [L1268] variable 'X' is unused
+      5:5-5:6::[Warning] [L1268] variable 'X' is unused
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_erlang_service.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_erlang_service.stdout
index 071903fae8..74b091100b 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_erlang_service.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_erlang_service.stdout
@@ -1,4 +1,4 @@
 module specified: expression_updates_literal
 Diagnostics reported in 1 modules:
   expression_updates_literal: 1
-      7:6-8:15::[Warning] [L1318] expression updates a literal
+      8:7-9:16::[Warning] [L1318] expression updates a literal
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_explicit_enable_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_explicit_enable_output.stdout
index cf937cab11..d051fc19fc 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_explicit_enable_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_explicit_enable_output.stdout
@@ -1,19 +1,19 @@
 Diagnostics reported in 7 modules:
   app_a: 2
-      4:4-4:34::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+      5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
+      1:1-1:1::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
   app_a_edoc: 1
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+      1:1-1:1::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
   app_a_ssr: 1
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+      1:1-1:1::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
   app_a_unused_param: 2
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
-      4:4-4:5::[Warning] [L1268] variable 'X' is unused
+      1:1-1:1::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+      5:5-5:6::[Warning] [L1268] variable 'X' is unused
   app_b: 2
-      4:4-4:34::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+      5:5-5:35::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
+      1:1-1:1::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
   app_b_unused_param: 2
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
-      4:4-4:5::[Warning] [L1268] variable 'X' is unused
+      1:1-1:1::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+      5:5-5:6::[Warning] [L1268] variable 'X' is unused
   spelling: 1
-      0:0-0:0::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+      1:1-1:1::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_fix_ignore.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_fix_ignore.stdout
index 4c42e88eec..c573704321 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_fix_ignore.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_fix_ignore.stdout
@@ -1,11 +1,11 @@
 module specified: app_b
 Diagnostics reported in 1 modules:
   app_b: 1
-      4:4-4:34::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
+      5:5-5:35::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
 ---------------------------------------------
 
 Applying fix in module 'app_b' for
-      4:4-4:34::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
+      5:5-5:35::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
 @@ -1,7 +1,8 @@
  -module(app_b).
  -export([application_env_error/0, application_env_no_error/0]).
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_fixme_spelling.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_fixme_spelling.stdout
index fcba7f3aee..b8c9d1896e 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_fixme_spelling.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_fixme_spelling.stdout
@@ -1,11 +1,11 @@
 module specified: spelling
 Diagnostics reported in 1 modules:
   spelling: 1
-      1:1-1:9::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
+      2:2-2:10::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
 ---------------------------------------------
 
 Applying fix in module 'spelling' for
-      1:1-1:9::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
+      2:2-2:10::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
 @@ -1,4 +1,5 @@
  -module(spelling).
 +% elp:fixme W0013 (misspelled_attribute)
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_ignore.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_ignore.stdout
index 07a81b80e2..dbdb7db051 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_ignore.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_ignore.stdout
@@ -1,9 +1,9 @@
 Diagnostics reported in 3 modules:
   app_a: 1
-      8:5-8:6::[Warning] [W0010] this variable is unused
+      9:6-9:7::[Warning] [W0010] this variable is unused
   app_a_unused_param: 2
-      4:4-4:5::[Warning] [W0010] this variable is unused
-      4:4-4:5::[Warning] [L1268] variable 'X' is unused
+      5:5-5:6::[Warning] [W0010] this variable is unused
+      5:5-5:6::[Warning] [L1268] variable 'X' is unused
   app_b_unused_param: 2
-      4:4-4:5::[Warning] [W0010] this variable is unused
-      4:4-4:5::[Warning] [L1268] variable 'X' is unused
+      5:5-5:6::[Warning] [W0010] this variable is unused
+      5:5-5:6::[Warning] [L1268] variable 'X' is unused
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_ignore_apps.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_ignore_apps.stdout
index e7a35d0262..58caba3339 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_ignore_apps.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_ignore_apps.stdout
@@ -1,3 +1,3 @@
 Diagnostics reported in 1 modules:
   app_b_unused_param: 1
-      4:4-4:5::[Warning] [W0010] this variable is unused
+      5:5-5:6::[Warning] [W0010] this variable is unused
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_ignore_apps_b.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_ignore_apps_b.stdout
index 00d4e2355e..963181a031 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_ignore_apps_b.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_ignore_apps_b.stdout
@@ -1,5 +1,5 @@
 Diagnostics reported in 2 modules:
   app_a: 1
-      8:5-8:6::[Warning] [W0010] this variable is unused
+      9:6-9:7::[Warning] [W0010] this variable is unused
   app_a_unused_param: 1
-      4:4-4:5::[Warning] [W0010] this variable is unused
+      5:5-5:6::[Warning] [W0010] this variable is unused
diff --git a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
index 2efe7fa2de..b2adfefad5 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
@@ -1,24 +1,24 @@
 Reporting all diagnostics codes
 Diagnostics reported in 7 modules:
   app_a: 6
-      4:4-4:34::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
-      8:0-8:4::[Error] [P1700] head mismatch 'fooX' vs 'food'
-      7:6-7:7::[Warning] [W0018] Unexpected ';'
-      12:4-12:13::[Warning] [W0026] Function 'app_a:baz/2' is not exported.
-      11:0-11:3::[Warning] [L1230] function bar/0 is unused
-      15:0-15:3::[Warning] [L1230] function baz/2 is unused
+      5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
+      9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
+      8:7-8:8::[Warning] [W0018] Unexpected ';'
+      13:5-13:14::[Warning] [W0026] Function 'app_a:baz/2' is not exported.
+      12:1-12:4::[Warning] [L1230] function bar/0 is unused
+      16:1-16:4::[Warning] [L1230] function baz/2 is unused
   app_a_unused_param: 1
-      4:4-4:5::[Warning] [L1268] variable 'X' is unused
+      5:5-5:6::[Warning] [L1268] variable 'X' is unused
   app_b: 1
-      4:4-4:34::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
+      5:5-5:35::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
   app_b_unused_param: 1
-      4:4-4:5::[Warning] [L1268] variable 'X' is unused
+      5:5-5:6::[Warning] [L1268] variable 'X' is unused
   custom_function_matches: 3
-      12:4-12:21::[Warning] [W0017] Function 'excluded:function/0' is undefined.
-      13:4-13:25::[Warning] [W0017] Function 'not_excluded:function/0' is undefined.
-      14:4-14:14::[Warning] [W0017] Function 'cross:call/0' is undefined.
+      13:5-13:22::[Warning] [W0017] Function 'excluded:function/0' is undefined.
+      14:5-14:26::[Warning] [W0017] Function 'not_excluded:function/0' is undefined.
+      15:5-15:15::[Warning] [W0017] Function 'cross:call/0' is undefined.
   expression_updates_literal: 2
-      6:0-6:5::[Warning] [L1309] missing specification for function a_fun/0
-      7:6-8:15::[Warning] [L1318] expression updates a literal
+      7:1-7:6::[Warning] [L1309] missing specification for function a_fun/0
+      8:7-9:16::[Warning] [L1318] expression updates a literal
   spelling: 1
-      1:1-1:9::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
+      2:2-2:10::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc.stdout
index 55650830ba..9d331b77c3 100644
--- a/crates/elp/src/resources/test/linter/ssr_ad_hoc.stdout
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc.stdout
@@ -1,3 +1,3 @@
 Diagnostics reported in 1 modules:
   app_a: 1
-      15:12-15:17::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
+      16:13-16:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli.stdout
index 2e8c69b6a4..4560a933ae 100644
--- a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli.stdout
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli.stdout
@@ -1,3 +1,3 @@
 Matches found in 1 modules:
   app_a: 1
-      15:12-15:17::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
+      16:13-16:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_expand.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_expand.stdout
index 16ad74ebac..5f34373ba6 100644
--- a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_expand.stdout
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_expand.stdout
@@ -1,3 +1,3 @@
 Matches found in 1 modules:
   app_a_ssr: 1
-      10:10-10:17::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {4}.
+      11:11-11:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {4}.
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_no_expand.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_no_expand.stdout
index 0e246ef6f5..17017a5b70 100644
--- a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_no_expand.stdout
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_no_expand.stdout
@@ -1,3 +1,3 @@
 Matches found in 1 modules:
   app_a_ssr: 1
-      10:10-10:17::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: ?BAR(_@AA).
+      11:11-11:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: ?BAR(_@AA).
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_visible_expand.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_visible_expand.stdout
index 351b8ffee2..7ea212c37d 100644
--- a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_visible_expand.stdout
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_visible_expand.stdout
@@ -1,4 +1,4 @@
 Matches found in 1 modules:
   app_a_ssr: 2
-      10:10-10:17::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: ?BAR(_@AA).
-      10:10-10:17::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {4}.
+      11:11-11:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: ?BAR(_@AA).
+      11:11-11:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {4}.
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_multiple.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_multiple.stdout
index afffa751be..f47bfe428f 100644
--- a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_multiple.stdout
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_multiple.stdout
@@ -1,4 +1,4 @@
 Matches found in 1 modules:
   app_a_ssr: 2
-      6:9-6:14::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: 3.
-      10:10-10:17::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {4}.
+      7:10-7:15::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: 3.
+      11:11-11:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {4}.
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_invisible.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_invisible.stdout
index cefa90c758..653173722f 100644
--- a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_invisible.stdout
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_invisible.stdout
@@ -1,3 +1,3 @@
 Matches found in 1 modules:
   app_a_ssr: 1
-      6:9-6:14::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: (((3))).
+      7:10-7:15::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: (((3))).
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_visible.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_visible.stdout
index f830e74c63..7b84e1f651 100644
--- a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_visible.stdout
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_visible.stdout
@@ -1,5 +1,5 @@
 Matches found in 1 modules:
   app_a_ssr: 3
-      6:9-6:14::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: (_@A).
-      6:10-6:13::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: (_@A).
-      7:9-7:12::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: (_@A).
+      7:10-7:15::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: (_@A).
+      7:11-7:14::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: (_@A).
+      8:10-8:13::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: (_@A).
diff --git a/crates/elp/src/resources/test/linter/warnings_as_errors.stdout b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
index 831df4f97a..78880f4472 100644
--- a/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
+++ b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
@@ -1,24 +1,24 @@
 Reporting all diagnostics codes
 Diagnostics reported in 7 modules:
   app_a: 6
-      4:4-4:34::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
-      8:0-8:4::[Error] [P1700] head mismatch 'fooX' vs 'food'
-      7:6-7:7::[Warning] [W0018] Unexpected ';'
-      12:4-12:13::[Warning] [W0026] Function 'app_a:baz/2' is not exported.
-      11:0-11:3::[Error] [L1230] function bar/0 is unused
-      15:0-15:3::[Error] [L1230] function baz/2 is unused
+      5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
+      9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
+      8:7-8:8::[Warning] [W0018] Unexpected ';'
+      13:5-13:14::[Warning] [W0026] Function 'app_a:baz/2' is not exported.
+      12:1-12:4::[Error] [L1230] function bar/0 is unused
+      16:1-16:4::[Error] [L1230] function baz/2 is unused
   app_a_unused_param: 1
-      4:4-4:5::[Error] [L1268] variable 'X' is unused
+      5:5-5:6::[Error] [L1268] variable 'X' is unused
   app_b: 1
-      4:4-4:34::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
+      5:5-5:35::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
   app_b_unused_param: 1
-      4:4-4:5::[Error] [L1268] variable 'X' is unused
+      5:5-5:6::[Error] [L1268] variable 'X' is unused
   custom_function_matches: 3
-      12:4-12:21::[Warning] [W0017] Function 'excluded:function/0' is undefined.
-      13:4-13:25::[Warning] [W0017] Function 'not_excluded:function/0' is undefined.
-      14:4-14:14::[Warning] [W0017] Function 'cross:call/0' is undefined.
+      13:5-13:22::[Warning] [W0017] Function 'excluded:function/0' is undefined.
+      14:5-14:26::[Warning] [W0017] Function 'not_excluded:function/0' is undefined.
+      15:5-15:15::[Warning] [W0017] Function 'cross:call/0' is undefined.
   expression_updates_literal: 2
-      6:0-6:5::[Error] [L1309] missing specification for function a_fun/0
-      7:6-8:15::[Error] [L1318] expression updates a literal
+      7:1-7:6::[Error] [L1309] missing specification for function a_fun/0
+      8:7-9:16::[Error] [L1318] expression updates a literal
   spelling: 1
-      1:1-1:9::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
+      2:2-2:10::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
diff --git a/crates/elp/src/resources/test/xref/unavailable_type.stdout b/crates/elp/src/resources/test/xref/unavailable_type.stdout
index 5b71b7d2d3..1521d13194 100644
--- a/crates/elp/src/resources/test/xref/unavailable_type.stdout
+++ b/crates/elp/src/resources/test/xref/unavailable_type.stdout
@@ -2,5 +2,5 @@ Reporting all diagnostics codes
 module specified: unavailable_type
 Diagnostics reported in 1 modules:
   unavailable_type: 2
-      9:42-9:57::[Warning] [W0059] The type 'app_c:my_type_c/0' is defined in application 'app_c', but the application is not a dependency of 'app_a' (defined in 'fbcode//whatsapp/elp/test_projects/xref:app_a').
-      5:15-5:30::[Warning] [W0059] The type 'app_c:my_type_c/0' is defined in application 'app_c', but the application is not a dependency of 'app_a' (defined in 'fbcode//whatsapp/elp/test_projects/xref:app_a').
+      10:43-10:58::[Warning] [W0059] The type 'app_c:my_type_c/0' is defined in application 'app_c', but the application is not a dependency of 'app_a' (defined in 'fbcode//whatsapp/elp/test_projects/xref:app_a').
+      6:16-6:31::[Warning] [W0059] The type 'app_c:my_type_c/0' is defined in application 'app_c', but the application is not a dependency of 'app_a' (defined in 'fbcode//whatsapp/elp/test_projects/xref:app_a').
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 6522455018..4aae3078c5 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -381,10 +381,10 @@ impl Diagnostic {
 
         format!(
             "{}:{}-{}:{}::[{:?}] [{}] {}",
-            start.line,
-            start.col_utf16,
-            end.line,
-            end.col_utf16,
+            start.line + 1,
+            start.col_utf16 + 1,
+            end.line + 1,
+            end.col_utf16 + 1,
             self.severity(use_cli_severity),
             self.code,
             self.message

From 44409a4346b5538730b48064ae04a8822b958b4b Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 21 Nov 2025 02:03:27 -0800
Subject: [PATCH 288/394] Remove bench runner draft

Reviewed By: alanz

Differential Revision: D87516838

fbshipit-source-id: ab8bc396f005e8c3cf843583b61bd0e06e8ee2ca
---
 bench_runner/example_bench/benches/main.rs | 60 ----------------------
 bench_runner/runner/main.rs                | 16 ------
 2 files changed, 76 deletions(-)
 delete mode 100644 bench_runner/example_bench/benches/main.rs
 delete mode 100644 bench_runner/runner/main.rs

diff --git a/bench_runner/example_bench/benches/main.rs b/bench_runner/example_bench/benches/main.rs
deleted file mode 100644
index 6b2733b5b9..0000000000
--- a/bench_runner/example_bench/benches/main.rs
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is dual-licensed under either the MIT license found in the
- * LICENSE-MIT file in the root directory of this source tree or the Apache
- * License, Version 2.0 found in the LICENSE-APACHE file in the root directory
- * of this source tree. You may select, at your option, one of the
- * above-listed licenses.
- */
-
-use std::thread;
-use std::time;
-
-use criterion::BenchmarkId;
-use criterion::Criterion;
-use criterion::criterion_group;
-use criterion::criterion_main;
-
-fn fibonacci_slow(n: u64) -> u64 {
-    match n {
-        0 => 1,
-        1 => 1,
-        n => fibonacci_slow(n - 1) + fibonacci_slow(n - 2),
-    }
-}
-
-fn fibonacci_fast(n: u64) -> u64 {
-    let mut a = 0;
-    let mut b = 1;
-    let millis = time::Duration::from_millis(12);
-    thread::sleep(millis);
-
-    match n {
-        0 => b,
-        _ => {
-            for _ in 0..n {
-                let c = a + b;
-                a = b;
-                b = c;
-            }
-            b
-        }
-    }
-}
-
-fn bench_fibs(c: &mut Criterion) {
-    let mut group = c.benchmark_group("Fibonacci");
-    for i in [20u64, 21u64].iter() {
-        group.bench_with_input(BenchmarkId::new("Recursive", i), i, |b, i| {
-            b.iter(|| fibonacci_slow(*i))
-        });
-        group.bench_with_input(BenchmarkId::new("Iterative", i), i, |b, i| {
-            b.iter(|| fibonacci_fast(*i))
-        });
-    }
-    group.finish();
-}
-
-criterion_group!(benches, bench_fibs);
-criterion_main!(benches);
diff --git a/bench_runner/runner/main.rs b/bench_runner/runner/main.rs
deleted file mode 100644
index f895c08c52..0000000000
--- a/bench_runner/runner/main.rs
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is dual-licensed under either the MIT license found in the
- * LICENSE-MIT file in the root directory of this source tree or the Apache
- * License, Version 2.0 found in the LICENSE-APACHE file in the root directory
- * of this source tree. You may select, at your option, one of the
- * above-listed licenses.
- */
-
-use std::env;
-
-fn main() {
-    let args: Vec<String> = env::args().collect();
-    println!("ARGS: {:?}", args);
-}

From 1788ac77bde55dd98f2257961721a69cd63af51e Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 21 Nov 2025 02:03:27 -0800
Subject: [PATCH 289/394] Move Emacs configuration under editors

Summary:
We already have a `editors` directory with editor-specific packages and configurations. Move the Emacs sample there.

Also reference it from the Emacs installation docs, to make it simpler to find.

Reviewed By: alanz

Differential Revision: D87517087

fbshipit-source-id: 754324de280ec094d6756d8702738d16fbdf268b
---
 {elisp => editors/emacs}/dotemacs.el      | 0
 website/docs/get-started/editors/emacs.md | 2 ++
 2 files changed, 2 insertions(+)
 rename {elisp => editors/emacs}/dotemacs.el (100%)

diff --git a/elisp/dotemacs.el b/editors/emacs/dotemacs.el
similarity index 100%
rename from elisp/dotemacs.el
rename to editors/emacs/dotemacs.el
diff --git a/website/docs/get-started/editors/emacs.md b/website/docs/get-started/editors/emacs.md
index 5111167df6..a444e87721 100644
--- a/website/docs/get-started/editors/emacs.md
+++ b/website/docs/get-started/editors/emacs.md
@@ -54,6 +54,8 @@ Add the following to your emacs `.emacs` file or equivalent.
 
 For a list of available configuration option, please refer to [this page](https://emacs-lsp.github.io/lsp-mode/page/lsp-erlang-elp/) and to the [`lsp-mode` settings documentation](https://emacs-lsp.github.io/lsp-mode/page/settings/mode/).
 
+There is also a [`.dotemacs`](https://github.com/WhatsApp/erlang-language-platform/blob/main/editors/emacs/dotemacs.el) file in the ELP repository that you can use as a reference.
+
 ## Troubleshooting
 
 #### The following servers support current file but do not have automatic installation

From b25b590a278bd03f609b0a42136f85c16ed165c5 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 21 Nov 2025 02:03:27 -0800
Subject: [PATCH 290/394] Move tree-diff functionality from syntax to ide_db
 crate

Summary:
# Context

The `text_edit` crate contains a single file, `lib.rs`. We can remove the entire crate by moving the functionality into a `text_edit.rs` in the `ide_db` crate. This is in line with Rust Analyzer.

# Problem

The move would eventually create a circular dependency between `syntax` and `ide_db`.

# Solution

To untangle the circular dependency, we can move the `tree-diff` functionality to the `ide_db` crate. Again, this is in line with Rust Analyzer.

Reviewed By: alanz

Differential Revision: D87524148

fbshipit-source-id: 90b1df3d4191a63c0d74c49af9fafec6578f530c
---
 Cargo.lock                         |   3 +-
 crates/ide_db/Cargo.toml           |   2 +
 crates/ide_db/src/lib.rs           |   1 +
 crates/ide_db/src/source_change.rs |   4 +-
 crates/ide_db/src/tree_diff.rs     | 505 +++++++++++++++++++++++++++++
 crates/syntax/Cargo.toml           |   1 -
 crates/syntax/src/algo.rs          | 489 ----------------------------
 7 files changed, 512 insertions(+), 493 deletions(-)
 create mode 100644 crates/ide_db/src/tree_diff.rs

diff --git a/Cargo.lock b/Cargo.lock
index 03f23763eb..bb400e89c3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -637,6 +637,7 @@ name = "elp_ide_db"
 version = "1.1.0"
 dependencies = [
  "anyhow",
+ "cov-mark",
  "eetf",
  "either",
  "elp_base_db",
@@ -650,6 +651,7 @@ dependencies = [
  "fxhash",
  "hir",
  "indexmap 2.9.0",
+ "itertools 0.10.5",
  "lazy_static",
  "log",
  "memchr",
@@ -734,7 +736,6 @@ dependencies = [
 name = "elp_syntax"
 version = "1.1.0"
 dependencies = [
- "cov-mark",
  "eetf",
  "elp_ide_db",
  "elp_text_edit",
diff --git a/crates/ide_db/Cargo.toml b/crates/ide_db/Cargo.toml
index babeee31b9..52cee9b67c 100644
--- a/crates/ide_db/Cargo.toml
+++ b/crates/ide_db/Cargo.toml
@@ -17,10 +17,12 @@ elp_types_db.workspace = true
 hir.workspace = true
 
 anyhow.workspace = true
+cov-mark.workspace = true
 eetf.workspace = true
 either.workspace = true
 fxhash.workspace = true
 indexmap.workspace = true
+itertools.workspace = true
 lazy_static.workspace = true
 log.workspace = true
 memchr.workspace = true
diff --git a/crates/ide_db/src/lib.rs b/crates/ide_db/src/lib.rs
index 0240d8498d..1ef15d91ae 100644
--- a/crates/ide_db/src/lib.rs
+++ b/crates/ide_db/src/lib.rs
@@ -66,6 +66,7 @@ pub mod assists;
 pub mod helpers;
 pub mod rename;
 pub mod source_change;
+pub mod tree_diff;
 
 pub use defs::ReferenceClass;
 pub use defs::ReferenceType;
diff --git a/crates/ide_db/src/source_change.rs b/crates/ide_db/src/source_change.rs
index bb64431772..e387682aba 100644
--- a/crates/ide_db/src/source_change.rs
+++ b/crates/ide_db/src/source_change.rs
@@ -20,7 +20,6 @@ use std::mem;
 use elp_base_db::AnchoredPathBuf;
 use elp_base_db::FileId;
 use elp_syntax::SyntaxNode;
-use elp_syntax::algo;
 use elp_text_edit::TextEdit;
 use elp_text_edit::TextEditBuilder;
 use elp_text_edit::TextRange;
@@ -29,6 +28,7 @@ use fxhash::FxHashMap;
 use stdx::never;
 
 use crate::helpers::SnippetCap;
+use crate::tree_diff::diff;
 
 #[derive(Default, Debug, Clone)]
 pub struct SourceChange {
@@ -171,7 +171,7 @@ impl SourceChangeBuilder {
 
     fn commit(&mut self) {
         if let Some(tm) = self.mutated_tree.take() {
-            algo::diff(&tm.immutable, &tm.mutable_clone).into_text_edit(&mut self.edit)
+            diff(&tm.immutable, &tm.mutable_clone).into_text_edit(&mut self.edit)
         }
 
         let edit = mem::take(&mut self.edit).finish();
diff --git a/crates/ide_db/src/tree_diff.rs b/crates/ide_db/src/tree_diff.rs
new file mode 100644
index 0000000000..70b29f4d35
--- /dev/null
+++ b/crates/ide_db/src/tree_diff.rs
@@ -0,0 +1,505 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is dual-licensed under either the MIT license found in the
+ * LICENSE-MIT file in the root directory of this source tree or the Apache
+ * License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+ * of this source tree. You may select, at your option, one of the
+ * above-listed licenses.
+ */
+
+//! Basic tree diffing functionality.
+
+use std::hash::BuildHasherDefault;
+
+use elp_syntax::NodeOrToken;
+use elp_syntax::SyntaxElement;
+use elp_syntax::SyntaxNode;
+use elp_text_edit::TextEditBuilder;
+use fxhash::FxHashMap;
+use indexmap::IndexMap;
+
+type FxIndexMap<K, V> = IndexMap<K, V, BuildHasherDefault<fxhash::FxHasher>>;
+
+#[derive(Debug, Hash, PartialEq, Eq)]
+enum TreeDiffInsertPos {
+    After(SyntaxElement),
+    AsFirstChild(SyntaxElement),
+}
+
+#[derive(Debug)]
+pub struct TreeDiff {
+    replacements: FxHashMap<SyntaxElement, SyntaxElement>,
+    deletions: Vec<SyntaxElement>,
+    // the vec as well as the indexmap are both here to preserve order
+    insertions: FxIndexMap<TreeDiffInsertPos, Vec<SyntaxElement>>,
+}
+
+impl TreeDiff {
+    pub fn into_text_edit(&self, builder: &mut TextEditBuilder) {
+        let _p = tracing::info_span!("into_text_edit").entered();
+
+        for (anchor, to) in self.insertions.iter() {
+            let offset = match anchor {
+                TreeDiffInsertPos::After(it) => it.text_range().end(),
+                TreeDiffInsertPos::AsFirstChild(it) => it.text_range().start(),
+            };
+            to.iter()
+                .for_each(|to| builder.insert(offset, to.to_string()));
+        }
+        for (from, to) in self.replacements.iter() {
+            builder.replace(from.text_range(), to.to_string())
+        }
+        for text_range in self.deletions.iter().map(SyntaxElement::text_range) {
+            builder.delete(text_range);
+        }
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.replacements.is_empty() && self.deletions.is_empty() && self.insertions.is_empty()
+    }
+}
+
+/// Finds a (potentially minimal) diff, which, applied to `from`, will result in `to`.
+///
+/// Specifically, returns a structure that consists of a replacements, insertions and deletions
+/// such that applying this map on `from` will result in `to`.
+///
+/// This function tries to find a fine-grained diff.
+pub fn diff(from: &SyntaxNode, to: &SyntaxNode) -> TreeDiff {
+    let _p = tracing::info_span!("diff").entered();
+
+    let mut diff = TreeDiff {
+        replacements: FxHashMap::default(),
+        insertions: FxIndexMap::default(),
+        deletions: Vec::new(),
+    };
+    let (from, to) = (from.clone().into(), to.clone().into());
+
+    if !syntax_element_eq(&from, &to) {
+        go(&mut diff, from, to);
+    }
+    return diff;
+
+    fn syntax_element_eq(lhs: &SyntaxElement, rhs: &SyntaxElement) -> bool {
+        lhs.kind() == rhs.kind()
+            && lhs.text_range().len() == rhs.text_range().len()
+            && match (&lhs, &rhs) {
+                (NodeOrToken::Node(lhs), NodeOrToken::Node(rhs)) => {
+                    lhs == rhs || lhs.text() == rhs.text()
+                }
+                (NodeOrToken::Token(lhs), NodeOrToken::Token(rhs)) => lhs.text() == rhs.text(),
+                _ => false,
+            }
+    }
+
+    // FIXME: this is horribly inefficient. I bet there's a cool algorithm to diff trees properly.
+    fn go(diff: &mut TreeDiff, lhs: SyntaxElement, rhs: SyntaxElement) {
+        let (lhs, rhs) = match lhs.as_node().zip(rhs.as_node()) {
+            Some((lhs, rhs)) => (lhs, rhs),
+            _ => {
+                cov_mark::hit!(diff_node_token_replace);
+                diff.replacements.insert(lhs, rhs);
+                return;
+            }
+        };
+
+        let mut look_ahead_scratch = Vec::default();
+
+        let mut rhs_children = rhs.children_with_tokens();
+        let mut lhs_children = lhs.children_with_tokens();
+        let mut last_lhs = None;
+        loop {
+            let lhs_child = lhs_children.next();
+            match (lhs_child.clone(), rhs_children.next()) {
+                (None, None) => break,
+                (None, Some(element)) => {
+                    let insert_pos = match last_lhs.clone() {
+                        Some(prev) => {
+                            cov_mark::hit!(diff_insert);
+                            TreeDiffInsertPos::After(prev)
+                        }
+                        // first iteration, insert into out parent as the first child
+                        None => {
+                            cov_mark::hit!(diff_insert_as_first_child);
+                            TreeDiffInsertPos::AsFirstChild(lhs.clone().into())
+                        }
+                    };
+                    diff.insertions.entry(insert_pos).or_default().push(element);
+                }
+                (Some(element), None) => {
+                    cov_mark::hit!(diff_delete);
+                    diff.deletions.push(element);
+                }
+                (Some(ref lhs_ele), Some(ref rhs_ele)) if syntax_element_eq(lhs_ele, rhs_ele) => {}
+                (Some(lhs_ele), Some(rhs_ele)) => {
+                    // nodes differ, look for lhs_ele in rhs, if its found we can mark everything up
+                    // until that element as insertions. This is important to keep the diff minimal
+                    // in regards to insertions that have been actually done, this is important for
+                    // use insertions as we do not want to replace the entire module node.
+                    look_ahead_scratch.push(rhs_ele.clone());
+                    let mut rhs_children_clone = rhs_children.clone();
+                    let mut insert = false;
+                    for rhs_child in rhs_children_clone.by_ref() {
+                        if syntax_element_eq(&lhs_ele, &rhs_child) {
+                            cov_mark::hit!(diff_insertions);
+                            insert = true;
+                            break;
+                        } else {
+                            look_ahead_scratch.push(rhs_child);
+                        }
+                    }
+                    let drain = look_ahead_scratch.drain(..);
+                    if insert {
+                        let insert_pos = if let Some(prev) = last_lhs.clone().filter(|_| insert) {
+                            TreeDiffInsertPos::After(prev)
+                        } else {
+                            cov_mark::hit!(insert_first_child);
+                            TreeDiffInsertPos::AsFirstChild(lhs.clone().into())
+                        };
+
+                        diff.insertions.entry(insert_pos).or_default().extend(drain);
+                        rhs_children = rhs_children_clone;
+                    } else {
+                        go(diff, lhs_ele, rhs_ele)
+                    }
+                }
+            }
+            last_lhs = lhs_child.or(last_lhs);
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use elp_syntax::AstNode;
+    use elp_syntax::SourceFile;
+    use elp_syntax::SyntaxElement;
+    use elp_syntax::SyntaxKind;
+    use elp_text_edit::TextEdit;
+    use expect_test::Expect;
+    use expect_test::expect;
+    use itertools::Itertools;
+
+    #[test]
+    fn replace_node_token() {
+        cov_mark::check!(diff_node_token_replace);
+        check_diff(
+            r#"-module(foo)."#,
+            r#"ident"#,
+            expect![[r#"
+                insertions:
+
+
+
+                replacements:
+
+                Line 0: Token(ANON_DASH@0..1 "-") -> ident
+
+                deletions:
+
+                Line 1: module
+                Line 1: (
+                Line 1: foo
+                Line 1: )
+                Line 1: .
+            "#]],
+        );
+    }
+
+    #[test]
+    fn replace_parent() {
+        cov_mark::check!(diff_node_token_replace);
+        check_diff(
+            r#""#,
+            r#"-module(foo)."#,
+            expect![[r#"
+                insertions:
+
+
+
+                replacements:
+
+                Line 0: Token(SOURCE_FILE@0..0 "") -> -module(foo).
+
+                deletions:
+
+
+            "#]],
+        );
+    }
+
+    #[test]
+    fn insert_last() {
+        cov_mark::check!(diff_insert);
+        check_diff(
+            r#"
+-module(foo).
+-use(foo).
+-use(bar)."#,
+            r#"
+-module(foo).
+-use(foo).
+-use(bar).
+-use(baz)."#,
+            expect![[r#"
+                insertions:
+
+                Line 3: After(Node(WILD_ATTRIBUTE@26..36))
+                -> "\n"
+                -> -use(baz).
+
+                replacements:
+
+
+
+                deletions:
+
+
+            "#]],
+        );
+    }
+
+    #[test]
+    fn insert_middle() {
+        check_diff(
+            r#"
+-module(foo).
+-use(foo).
+-use(bar)."#,
+            r#"
+-module(foo).
+-use(foo).
+-use(baz).
+-use(bar)."#,
+            expect![[r#"
+                insertions:
+
+                Line 3: After(Token(WHITESPACE@25..26 "\n"))
+                -> -use(baz).
+                -> "\n"
+
+                replacements:
+
+
+
+                deletions:
+
+
+            "#]],
+        )
+    }
+
+    #[test]
+    fn insert_first() {
+        check_diff(
+            r#"
+-use(bar).
+-use(baz)."#,
+            r#"
+-export([foo/0]).
+-use(bar).
+-use(baz)."#,
+            expect![[r#"
+                insertions:
+
+                Line 0: After(Token(WHITESPACE@0..1 "\n"))
+                -> -export([foo/0]).
+                -> "\n"
+
+                replacements:
+
+
+
+                deletions:
+
+
+            "#]],
+        )
+    }
+
+    #[test]
+    fn first_child_insertion() {
+        // cov_mark::check!(insert_first_child);
+        check_diff(
+            r#"
+main() ->
+  ok."#,
+            r#"
+-module(foo).
+
+main() ->
+  ok."#,
+            expect![[r#"
+                insertions:
+
+                Line 0: After(Token(WHITESPACE@0..1 "\n"))
+                -> -module(foo).
+                -> "\n\n"
+
+                replacements:
+
+
+
+                deletions:
+
+
+            "#]],
+        );
+    }
+
+    #[test]
+    fn delete_last() {
+        cov_mark::check!(diff_delete);
+        check_diff(
+            r#"-module(foo).
+            -bar([baz])."#,
+            r#"-module(foo)."#,
+            expect![[r#"
+                insertions:
+
+
+
+                replacements:
+
+
+
+                deletions:
+
+                Line 1: "\n            "
+                Line 2: -bar([baz]).
+            "#]],
+        );
+    }
+
+    #[test]
+    fn delete_middle() {
+        // cov_mark::check!(diff_insertions);
+        check_diff(
+            r#"
+-export([foo/0,bar/1]).
+-bar(aaa).
+
+-foo(bbb).
+"#,
+            r#"
+-export([foo/0,bar/1]).
+
+-foo(bbb).
+"#,
+            expect![[r#"
+                insertions:
+
+                Line 1: After(Node(EXPORT_ATTRIBUTE@1..24))
+                -> "\n\n"
+                -> -foo(bbb).
+
+                replacements:
+
+
+
+                deletions:
+
+                Line 2: -bar(aaa).
+                Line 3: "\n\n"
+                Line 4: -foo(bbb).
+                Line 5: "\n"
+            "#]],
+        )
+    }
+
+    #[test]
+    fn delete_first() {
+        check_diff(
+            r#"
+-export([foo/0,bar/1]).
+
+-foo(bbb).
+"#,
+            r#"
+-foo(bbb).
+"#,
+            expect![[r#"
+                insertions:
+
+
+
+                replacements:
+
+                Line 1: Token(ANON_DASH@1..2 "-") -> -foo
+                Line 2: Token(ANON_EXPORT@2..8 "export") -> (bbb)
+                Line 2: Token(ANON_LPAREN@8..9 "(") -> .
+                Line 2: Token(WHITESPACE@24..26 "\n\n") -> "\n"
+
+                deletions:
+
+                Line 2: [
+                Line 2: foo/0
+                Line 2: ,
+                Line 2: bar/1
+                Line 2: ]
+                Line 2: )
+                Line 2: .
+                Line 3: -foo(bbb).
+                Line 4: "\n"
+            "#]],
+        )
+    }
+
+    fn check_diff(from: &str, to: &str, expected_diff: Expect) {
+        let from_node = SourceFile::parse_text(from).tree().syntax().clone();
+        let to_node = SourceFile::parse_text(to).tree().syntax().clone();
+        let diff = super::diff(&from_node, &to_node);
+
+        let line_number =
+            |syn: &SyntaxElement| from[..syn.text_range().start().into()].lines().count();
+
+        let fmt_syntax = |syn: &SyntaxElement| match syn.kind() {
+            SyntaxKind::WHITESPACE => format!("{:?}", syn.to_string()),
+            _ => format!("{syn}"),
+        };
+
+        let insertions =
+            diff.insertions
+                .iter()
+                .format_with("\n", |(k, v), f| -> Result<(), std::fmt::Error> {
+                    f(&format!(
+                        "Line {}: {:?}\n-> {}",
+                        line_number(match k {
+                            super::TreeDiffInsertPos::After(syn) => syn,
+                            super::TreeDiffInsertPos::AsFirstChild(syn) => syn,
+                        }),
+                        k,
+                        v.iter().format_with("\n-> ", |v, f| f(&fmt_syntax(v)))
+                    ))
+                });
+
+        let replacements = diff
+            .replacements
+            .iter()
+            .sorted_by_key(|(syntax, _)| syntax.text_range().start())
+            .format_with("\n", |(k, v), f| {
+                f(&format!(
+                    "Line {}: {:?} -> {}",
+                    line_number(k),
+                    k,
+                    fmt_syntax(v)
+                ))
+            });
+
+        let deletions = diff.deletions.iter().format_with("\n", |v, f| {
+            f(&format!("Line {}: {}", line_number(v), &fmt_syntax(v)))
+        });
+
+        let actual = format!(
+            "insertions:\n\n{insertions}\n\nreplacements:\n\n{replacements}\n\ndeletions:\n\n{deletions}\n"
+        );
+        expected_diff.assert_eq(&actual);
+
+        let mut from = from.to_owned();
+        let mut text_edit = TextEdit::builder();
+        diff.into_text_edit(&mut text_edit);
+        text_edit.finish().apply(&mut from);
+        assert_eq!(&*from, to, "diff did not turn `from` to `to`");
+    }
+}
diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml
index 081efa08d4..80ed01f28c 100644
--- a/crates/syntax/Cargo.toml
+++ b/crates/syntax/Cargo.toml
@@ -9,7 +9,6 @@ workspace = true
 [dependencies]
 elp_text_edit.workspace = true
 
-cov-mark.workspace = true
 eetf.workspace = true
 fxhash.workspace = true
 indexmap.workspace = true
diff --git a/crates/syntax/src/algo.rs b/crates/syntax/src/algo.rs
index af72d7de98..08b7ed9a1f 100644
--- a/crates/syntax/src/algo.rs
+++ b/crates/syntax/src/algo.rs
@@ -10,12 +10,8 @@
 
 //! Collection of assorted algorithms for syntax trees.
 
-use std::hash::BuildHasherDefault;
 use std::ops::RangeInclusive;
 
-use elp_text_edit::TextEditBuilder;
-use fxhash::FxHashMap;
-use indexmap::IndexMap;
 use itertools::Itertools;
 use rowan::NodeOrToken;
 
@@ -178,157 +174,6 @@ pub enum InsertPosition<T> {
     After(T),
 }
 
-type FxIndexMap<K, V> = IndexMap<K, V, BuildHasherDefault<fxhash::FxHasher>>;
-
-#[derive(Debug, Hash, PartialEq, Eq)]
-enum TreeDiffInsertPos {
-    After(SyntaxElement),
-    AsFirstChild(SyntaxElement),
-}
-
-#[derive(Debug)]
-pub struct TreeDiff {
-    replacements: FxHashMap<SyntaxElement, SyntaxElement>,
-    deletions: Vec<SyntaxElement>,
-    // the vec as well as the indexmap are both here to preserve order
-    insertions: FxIndexMap<TreeDiffInsertPos, Vec<SyntaxElement>>,
-}
-
-impl TreeDiff {
-    pub fn into_text_edit(&self, builder: &mut TextEditBuilder) {
-        let _p = tracing::info_span!("into_text_edit").entered();
-
-        for (anchor, to) in self.insertions.iter() {
-            let offset = match anchor {
-                TreeDiffInsertPos::After(it) => it.text_range().end(),
-                TreeDiffInsertPos::AsFirstChild(it) => it.text_range().start(),
-            };
-            to.iter()
-                .for_each(|to| builder.insert(offset, to.to_string()));
-        }
-        for (from, to) in self.replacements.iter() {
-            builder.replace(from.text_range(), to.to_string())
-        }
-        for text_range in self.deletions.iter().map(SyntaxElement::text_range) {
-            builder.delete(text_range);
-        }
-    }
-
-    pub fn is_empty(&self) -> bool {
-        self.replacements.is_empty() && self.deletions.is_empty() && self.insertions.is_empty()
-    }
-}
-
-/// Finds a (potentially minimal) diff, which, applied to `from`, will result in `to`.
-///
-/// Specifically, returns a structure that consists of a replacements, insertions and deletions
-/// such that applying this map on `from` will result in `to`.
-///
-/// This function tries to find a fine-grained diff.
-pub fn diff(from: &SyntaxNode, to: &SyntaxNode) -> TreeDiff {
-    let _p = tracing::info_span!("diff").entered();
-
-    let mut diff = TreeDiff {
-        replacements: FxHashMap::default(),
-        insertions: FxIndexMap::default(),
-        deletions: Vec::new(),
-    };
-    let (from, to) = (from.clone().into(), to.clone().into());
-
-    if !syntax_element_eq(&from, &to) {
-        go(&mut diff, from, to);
-    }
-    return diff;
-
-    fn syntax_element_eq(lhs: &SyntaxElement, rhs: &SyntaxElement) -> bool {
-        lhs.kind() == rhs.kind()
-            && lhs.text_range().len() == rhs.text_range().len()
-            && match (&lhs, &rhs) {
-                (NodeOrToken::Node(lhs), NodeOrToken::Node(rhs)) => {
-                    lhs == rhs || lhs.text() == rhs.text()
-                }
-                (NodeOrToken::Token(lhs), NodeOrToken::Token(rhs)) => lhs.text() == rhs.text(),
-                _ => false,
-            }
-    }
-
-    // FIXME: this is horribly inefficient. I bet there's a cool algorithm to diff trees properly.
-    fn go(diff: &mut TreeDiff, lhs: SyntaxElement, rhs: SyntaxElement) {
-        let (lhs, rhs) = match lhs.as_node().zip(rhs.as_node()) {
-            Some((lhs, rhs)) => (lhs, rhs),
-            _ => {
-                cov_mark::hit!(diff_node_token_replace);
-                diff.replacements.insert(lhs, rhs);
-                return;
-            }
-        };
-
-        let mut look_ahead_scratch = Vec::default();
-
-        let mut rhs_children = rhs.children_with_tokens();
-        let mut lhs_children = lhs.children_with_tokens();
-        let mut last_lhs = None;
-        loop {
-            let lhs_child = lhs_children.next();
-            match (lhs_child.clone(), rhs_children.next()) {
-                (None, None) => break,
-                (None, Some(element)) => {
-                    let insert_pos = match last_lhs.clone() {
-                        Some(prev) => {
-                            cov_mark::hit!(diff_insert);
-                            TreeDiffInsertPos::After(prev)
-                        }
-                        // first iteration, insert into out parent as the first child
-                        None => {
-                            cov_mark::hit!(diff_insert_as_first_child);
-                            TreeDiffInsertPos::AsFirstChild(lhs.clone().into())
-                        }
-                    };
-                    diff.insertions.entry(insert_pos).or_default().push(element);
-                }
-                (Some(element), None) => {
-                    cov_mark::hit!(diff_delete);
-                    diff.deletions.push(element);
-                }
-                (Some(ref lhs_ele), Some(ref rhs_ele)) if syntax_element_eq(lhs_ele, rhs_ele) => {}
-                (Some(lhs_ele), Some(rhs_ele)) => {
-                    // nodes differ, look for lhs_ele in rhs, if its found we can mark everything up
-                    // until that element as insertions. This is important to keep the diff minimal
-                    // in regards to insertions that have been actually done, this is important for
-                    // use insertions as we do not want to replace the entire module node.
-                    look_ahead_scratch.push(rhs_ele.clone());
-                    let mut rhs_children_clone = rhs_children.clone();
-                    let mut insert = false;
-                    for rhs_child in rhs_children_clone.by_ref() {
-                        if syntax_element_eq(&lhs_ele, &rhs_child) {
-                            cov_mark::hit!(diff_insertions);
-                            insert = true;
-                            break;
-                        } else {
-                            look_ahead_scratch.push(rhs_child);
-                        }
-                    }
-                    let drain = look_ahead_scratch.drain(..);
-                    if insert {
-                        let insert_pos = if let Some(prev) = last_lhs.clone().filter(|_| insert) {
-                            TreeDiffInsertPos::After(prev)
-                        } else {
-                            cov_mark::hit!(insert_first_child);
-                            TreeDiffInsertPos::AsFirstChild(lhs.clone().into())
-                        };
-
-                        diff.insertions.entry(insert_pos).or_default().extend(drain);
-                        rhs_children = rhs_children_clone;
-                    } else {
-                        go(diff, lhs_ele, rhs_ele)
-                    }
-                }
-            }
-            last_lhs = lhs_child.or(last_lhs);
-        }
-    }
-}
-
 /// Adds specified children (tokens or nodes) to the current node at the
 /// specific position.
 ///
@@ -452,337 +297,3 @@ fn to_green_element(element: SyntaxElement) -> NodeOrToken<rowan::GreenNode, row
         NodeOrToken::Token(it) => it.green().to_owned().into(),
     }
 }
-
-#[cfg(test)]
-mod tests {
-    use elp_text_edit::TextEdit;
-    use expect_test::Expect;
-    use expect_test::expect;
-    use itertools::Itertools;
-
-    use crate::AstNode;
-    use crate::SyntaxElement;
-    use crate::SyntaxKind;
-
-    #[test]
-    fn replace_node_token() {
-        cov_mark::check!(diff_node_token_replace);
-        check_diff(
-            r#"-module(foo)."#,
-            r#"ident"#,
-            expect![[r#"
-                insertions:
-
-
-
-                replacements:
-
-                Line 0: Token(ANON_DASH@0..1 "-") -> ident
-
-                deletions:
-
-                Line 1: module
-                Line 1: (
-                Line 1: foo
-                Line 1: )
-                Line 1: .
-            "#]],
-        );
-    }
-
-    #[test]
-    fn replace_parent() {
-        cov_mark::check!(diff_node_token_replace);
-        check_diff(
-            r#""#,
-            r#"-module(foo)."#,
-            expect![[r#"
-                insertions:
-
-
-
-                replacements:
-
-                Line 0: Token(SOURCE_FILE@0..0 "") -> -module(foo).
-
-                deletions:
-
-
-            "#]],
-        );
-    }
-
-    #[test]
-    fn insert_last() {
-        cov_mark::check!(diff_insert);
-        check_diff(
-            r#"
--module(foo).
--use(foo).
--use(bar)."#,
-            r#"
--module(foo).
--use(foo).
--use(bar).
--use(baz)."#,
-            expect![[r#"
-                insertions:
-
-                Line 3: After(Node(WILD_ATTRIBUTE@26..36))
-                -> "\n"
-                -> -use(baz).
-
-                replacements:
-
-
-
-                deletions:
-
-
-            "#]],
-        );
-    }
-
-    #[test]
-    fn insert_middle() {
-        check_diff(
-            r#"
--module(foo).
--use(foo).
--use(bar)."#,
-            r#"
--module(foo).
--use(foo).
--use(baz).
--use(bar)."#,
-            expect![[r#"
-                insertions:
-
-                Line 3: After(Token(WHITESPACE@25..26 "\n"))
-                -> -use(baz).
-                -> "\n"
-
-                replacements:
-
-
-
-                deletions:
-
-
-            "#]],
-        )
-    }
-
-    #[test]
-    fn insert_first() {
-        check_diff(
-            r#"
--use(bar).
--use(baz)."#,
-            r#"
--export([foo/0]).
--use(bar).
--use(baz)."#,
-            expect![[r#"
-                insertions:
-
-                Line 0: After(Token(WHITESPACE@0..1 "\n"))
-                -> -export([foo/0]).
-                -> "\n"
-
-                replacements:
-
-
-
-                deletions:
-
-
-            "#]],
-        )
-    }
-
-    #[test]
-    fn first_child_insertion() {
-        // cov_mark::check!(insert_first_child);
-        check_diff(
-            r#"
-main() ->
-  ok."#,
-            r#"
--module(foo).
-
-main() ->
-  ok."#,
-            expect![[r#"
-                insertions:
-
-                Line 0: After(Token(WHITESPACE@0..1 "\n"))
-                -> -module(foo).
-                -> "\n\n"
-
-                replacements:
-
-
-
-                deletions:
-
-
-            "#]],
-        );
-    }
-
-    #[test]
-    fn delete_last() {
-        cov_mark::check!(diff_delete);
-        check_diff(
-            r#"-module(foo).
-            -bar([baz])."#,
-            r#"-module(foo)."#,
-            expect![[r#"
-                insertions:
-
-
-
-                replacements:
-
-
-
-                deletions:
-
-                Line 1: "\n            "
-                Line 2: -bar([baz]).
-            "#]],
-        );
-    }
-
-    #[test]
-    fn delete_middle() {
-        // cov_mark::check!(diff_insertions);
-        check_diff(
-            r#"
--export([foo/0,bar/1]).
--bar(aaa).
-
--foo(bbb).
-"#,
-            r#"
--export([foo/0,bar/1]).
-
--foo(bbb).
-"#,
-            expect![[r#"
-                insertions:
-
-                Line 1: After(Node(EXPORT_ATTRIBUTE@1..24))
-                -> "\n\n"
-                -> -foo(bbb).
-
-                replacements:
-
-
-
-                deletions:
-
-                Line 2: -bar(aaa).
-                Line 3: "\n\n"
-                Line 4: -foo(bbb).
-                Line 5: "\n"
-            "#]],
-        )
-    }
-
-    #[test]
-    fn delete_first() {
-        check_diff(
-            r#"
--export([foo/0,bar/1]).
-
--foo(bbb).
-"#,
-            r#"
--foo(bbb).
-"#,
-            expect![[r#"
-                insertions:
-
-
-
-                replacements:
-
-                Line 1: Token(ANON_DASH@1..2 "-") -> -foo
-                Line 2: Token(ANON_EXPORT@2..8 "export") -> (bbb)
-                Line 2: Token(ANON_LPAREN@8..9 "(") -> .
-                Line 2: Token(WHITESPACE@24..26 "\n\n") -> "\n"
-
-                deletions:
-
-                Line 2: [
-                Line 2: foo/0
-                Line 2: ,
-                Line 2: bar/1
-                Line 2: ]
-                Line 2: )
-                Line 2: .
-                Line 3: -foo(bbb).
-                Line 4: "\n"
-            "#]],
-        )
-    }
-
-    fn check_diff(from: &str, to: &str, expected_diff: Expect) {
-        let from_node = crate::SourceFile::parse_text(from).tree().syntax().clone();
-        let to_node = crate::SourceFile::parse_text(to).tree().syntax().clone();
-        let diff = super::diff(&from_node, &to_node);
-
-        let line_number =
-            |syn: &SyntaxElement| from[..syn.text_range().start().into()].lines().count();
-
-        let fmt_syntax = |syn: &SyntaxElement| match syn.kind() {
-            SyntaxKind::WHITESPACE => format!("{:?}", syn.to_string()),
-            _ => format!("{syn}"),
-        };
-
-        let insertions =
-            diff.insertions
-                .iter()
-                .format_with("\n", |(k, v), f| -> Result<(), std::fmt::Error> {
-                    f(&format!(
-                        "Line {}: {:?}\n-> {}",
-                        line_number(match k {
-                            super::TreeDiffInsertPos::After(syn) => syn,
-                            super::TreeDiffInsertPos::AsFirstChild(syn) => syn,
-                        }),
-                        k,
-                        v.iter().format_with("\n-> ", |v, f| f(&fmt_syntax(v)))
-                    ))
-                });
-
-        let replacements = diff
-            .replacements
-            .iter()
-            .sorted_by_key(|(syntax, _)| syntax.text_range().start())
-            .format_with("\n", |(k, v), f| {
-                f(&format!(
-                    "Line {}: {:?} -> {}",
-                    line_number(k),
-                    k,
-                    fmt_syntax(v)
-                ))
-            });
-
-        let deletions = diff.deletions.iter().format_with("\n", |v, f| {
-            f(&format!("Line {}: {}", line_number(v), &fmt_syntax(v)))
-        });
-
-        let actual = format!(
-            "insertions:\n\n{insertions}\n\nreplacements:\n\n{replacements}\n\ndeletions:\n\n{deletions}\n"
-        );
-        expected_diff.assert_eq(&actual);
-
-        let mut from = from.to_owned();
-        let mut text_edit = TextEdit::builder();
-        diff.into_text_edit(&mut text_edit);
-        text_edit.finish().apply(&mut from);
-        assert_eq!(&*from, to, "diff did not turn `from` to `to`");
-    }
-}

From 99501811a569595654e735e334db107c50e3cbf0 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 21 Nov 2025 02:03:27 -0800
Subject: [PATCH 291/394] Remove text_edit crate

Summary:
The `text_edit` crate contains a single file. Move it to the `ide_db` crate, and remove the whole `text_edit` crate.

This is in line with Rust Analyzer.

Reviewed By: alanz

Differential Revision: D87539326

fbshipit-source-id: cdc8f71902bc084eca79ae54ca71584ac48ed637
---
 Cargo.lock                                        | 15 ++-------------
 Cargo.toml                                        |  1 -
 crates/elp/Cargo.toml                             |  2 +-
 crates/elp/src/bin/lint_cli.rs                    |  2 +-
 crates/elp/src/to_proto.rs                        |  4 ++--
 crates/ide/Cargo.toml                             |  3 +--
 crates/ide/src/diagnostics.rs                     |  2 +-
 crates/ide/src/diagnostics/boolean_precedence.rs  |  4 ++--
 crates/ide/src/diagnostics/debugging_function.rs  |  2 +-
 crates/ide/src/diagnostics/dependent_header.rs    |  2 +-
 crates/ide/src/diagnostics/deprecated_function.rs |  6 +++---
 crates/ide/src/diagnostics/edoc.rs                |  4 ++--
 .../ide/src/diagnostics/effect_free_statement.rs  |  2 +-
 .../eqwalizer_assists/expected_type.rs            |  4 ++--
 crates/ide/src/diagnostics/head_mismatch.rs       |  2 +-
 .../src/diagnostics/macro_precedence_suprise.rs   |  2 +-
 crates/ide/src/diagnostics/meck.rs                |  4 ++--
 .../missing_compile_warn_missing_spec.rs          |  2 +-
 .../ide/src/diagnostics/misspelled_attribute.rs   |  2 +-
 crates/ide/src/diagnostics/module_mismatch.rs     |  2 +-
 .../diagnostics/nonstandard_integer_formatting.rs |  2 +-
 crates/ide/src/diagnostics/record_tuple_match.rs  |  2 +-
 crates/ide/src/diagnostics/replace_call.rs        |  2 +-
 crates/ide/src/diagnostics/replace_in_spec.rs     |  2 +-
 crates/ide/src/diagnostics/trivial_match.rs       |  2 +-
 crates/ide/src/diagnostics/undefined_macro.rs     |  2 +-
 .../ide/src/diagnostics/undocumented_function.rs  |  2 +-
 crates/ide/src/diagnostics/undocumented_module.rs |  2 +-
 crates/ide/src/diagnostics/unspecific_include.rs  |  4 ++--
 .../ide/src/diagnostics/unused_function_args.rs   |  4 ++--
 crates/ide/src/diagnostics/unused_include.rs      |  2 +-
 crates/ide/src/diagnostics/unused_macro.rs        |  2 +-
 crates/ide/src/diagnostics_collection.rs          |  2 +-
 crates/ide/src/rename.rs                          |  2 +-
 crates/ide/src/tests.rs                           |  2 +-
 crates/ide_assists/Cargo.toml                     |  1 -
 crates/ide_assists/src/handlers/add_doc.rs        |  2 +-
 crates/ide_assists/src/handlers/flip_sep.rs       |  2 +-
 .../src/handlers/implement_behaviour.rs           |  4 ++--
 .../ide_assists/src/handlers/inline_function.rs   |  2 +-
 crates/ide_assists/src/helpers.rs                 |  4 ++--
 crates/ide_db/Cargo.toml                          |  2 +-
 crates/ide_db/src/helpers.rs                      |  2 +-
 crates/ide_db/src/lib.rs                          |  3 ++-
 crates/ide_db/src/rename.rs                       |  2 +-
 crates/ide_db/src/source_change.rs                |  8 ++++----
 .../src/lib.rs => ide_db/src/text_edit.rs}        |  1 -
 crates/ide_db/src/tree_diff.rs                    |  6 ++++--
 crates/syntax/Cargo.toml                          |  2 --
 crates/text_edit/Cargo.toml                       | 11 -----------
 50 files changed, 64 insertions(+), 89 deletions(-)
 rename crates/{text_edit/src/lib.rs => ide_db/src/text_edit.rs} (99%)
 delete mode 100644 crates/text_edit/Cargo.toml

diff --git a/Cargo.lock b/Cargo.lock
index bb400e89c3..2da9907eca 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -446,10 +446,10 @@ dependencies = [
  "crossbeam-channel",
  "elp_eqwalizer",
  "elp_ide",
+ "elp_ide_db",
  "elp_log",
  "elp_project_model",
  "elp_syntax",
- "elp_text_edit",
  "env_logger",
  "expect-test",
  "fs_extra",
@@ -572,7 +572,6 @@ dependencies = [
  "elp_ide_ssr",
  "elp_project_model",
  "elp_syntax",
- "elp_text_edit",
  "elp_types_db",
  "env_logger",
  "expect-test",
@@ -604,7 +603,6 @@ dependencies = [
  "cov-mark",
  "elp_ide_db",
  "elp_syntax",
- "elp_text_edit",
  "expect-test",
  "fxhash",
  "hir",
@@ -645,7 +643,6 @@ dependencies = [
  "elp_erlang_service",
  "elp_project_model",
  "elp_syntax",
- "elp_text_edit",
  "elp_types_db",
  "expect-test",
  "fxhash",
@@ -666,6 +663,7 @@ dependencies = [
  "strum",
  "strum_macros",
  "tempfile",
+ "text-size",
  "toml",
  "tracing",
 ]
@@ -738,7 +736,6 @@ version = "1.1.0"
 dependencies = [
  "eetf",
  "elp_ide_db",
- "elp_text_edit",
  "expect-test",
  "fxhash",
  "indexmap 2.9.0",
@@ -758,14 +755,6 @@ dependencies = [
  "tree-sitter-erlang",
 ]
 
-[[package]]
-name = "elp_text_edit"
-version = "1.1.0"
-dependencies = [
- "itertools 0.10.5",
- "text-size",
-]
-
 [[package]]
 name = "elp_types_db"
 version = "1.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index b3b8ae074c..825530fe4c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,7 +30,6 @@ elp_ide_ssr = { path = "./crates/ide_ssr" }
 elp_log = { path = "./crates/elp_log" }
 elp_project_model = { path = "./crates/project_model" }
 elp_syntax = { path = "./crates/syntax" }
-elp_text_edit = { path = "./crates/text_edit" }
 elp_types_db = { path = "./crates/types_db" }
 hir = { path = "./crates/hir" }
 
diff --git a/crates/elp/Cargo.toml b/crates/elp/Cargo.toml
index 66552ada1d..2a1b6e8b65 100644
--- a/crates/elp/Cargo.toml
+++ b/crates/elp/Cargo.toml
@@ -18,10 +18,10 @@ workspace = true
 [dependencies]
 elp_eqwalizer.workspace = true
 elp_ide.workspace = true
+elp_ide_db.workspace = true
 elp_log.workspace = true
 elp_project_model.workspace = true
 elp_syntax.workspace = true
-elp_text_edit.workspace = true
 hir.workspace = true
 
 always-assert.workspace = true
diff --git a/crates/elp/src/bin/lint_cli.rs b/crates/elp/src/bin/lint_cli.rs
index 3bc2271072..fcce5cac98 100644
--- a/crates/elp/src/bin/lint_cli.rs
+++ b/crates/elp/src/bin/lint_cli.rs
@@ -52,12 +52,12 @@ use elp_ide::elp_ide_db::elp_base_db::ProjectId;
 use elp_ide::elp_ide_db::elp_base_db::Vfs;
 use elp_ide::elp_ide_db::elp_base_db::VfsPath;
 use elp_ide::elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextSize;
 use elp_log::telemetry;
 use elp_project_model::AppName;
 use elp_project_model::AppType;
 use elp_project_model::DiscoverConfig;
 use elp_project_model::buck::BuckQueryConfig;
-use elp_text_edit::TextSize;
 use fxhash::FxHashMap;
 use fxhash::FxHashSet;
 use hir::FormIdx;
diff --git a/crates/elp/src/to_proto.rs b/crates/elp/src/to_proto.rs
index f9263cfcab..70d316d5c6 100644
--- a/crates/elp/src/to_proto.rs
+++ b/crates/elp/src/to_proto.rs
@@ -48,9 +48,9 @@ use elp_ide::elp_ide_db::elp_base_db::FilePosition;
 use elp_ide::elp_ide_db::elp_base_db::FileRange;
 use elp_ide::elp_ide_db::rename::RenameError;
 use elp_ide::elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::Indel;
+use elp_ide_db::text_edit::TextEdit;
 use elp_project_model::ProjectBuildData;
-use elp_text_edit::Indel;
-use elp_text_edit::TextEdit;
 use lsp_types::CompletionItemTag;
 use lsp_types::Hover;
 use lsp_types::HoverContents;
diff --git a/crates/ide/Cargo.toml b/crates/ide/Cargo.toml
index aba9731379..acba8ef642 100644
--- a/crates/ide/Cargo.toml
+++ b/crates/ide/Cargo.toml
@@ -10,12 +10,11 @@ workspace = true
 elp_eqwalizer.workspace = true
 elp_erlang_service.workspace = true
 elp_ide_assists.workspace = true
-elp_ide_completion.workspace = true
 elp_ide_db.workspace = true
+elp_ide_completion.workspace = true
 elp_ide_ssr.workspace = true
 elp_project_model.workspace = true
 elp_syntax.workspace = true
-elp_text_edit.workspace = true
 elp_types_db.workspace = true
 hir.workspace = true
 
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 4aae3078c5..f8932db145 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -44,6 +44,7 @@ use elp_ide_db::metadata::Kind;
 use elp_ide_db::metadata::Metadata;
 use elp_ide_db::metadata::Source;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
 use elp_ide_ssr::Match;
 use elp_ide_ssr::SsrSearchScope;
 use elp_ide_ssr::match_pattern;
@@ -63,7 +64,6 @@ use elp_syntax::ast::edit::IndentLevel;
 use elp_syntax::ast::edit::start_of_line;
 use elp_syntax::label::Label;
 use elp_syntax::ted::Element;
-use elp_text_edit::TextEdit;
 use elp_types_db::TypedSemantic;
 use fxhash::FxHashMap;
 use fxhash::FxHashSet;
diff --git a/crates/ide/src/diagnostics/boolean_precedence.rs b/crates/ide/src/diagnostics/boolean_precedence.rs
index affbdf9b1d..f2ba0fe542 100644
--- a/crates/ide/src/diagnostics/boolean_precedence.rs
+++ b/crates/ide/src/diagnostics/boolean_precedence.rs
@@ -24,11 +24,11 @@ use elp_ide_assists::helpers::unwrap_parens;
 use elp_ide_db::DiagnosticCode;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
+use elp_ide_db::text_edit::TextRange;
 use elp_syntax::ast;
 use elp_syntax::ast::BinaryOp;
 use elp_syntax::ast::LogicOp;
-use elp_text_edit::TextEdit;
-use elp_text_edit::TextRange;
 use hir::AnyExpr;
 use hir::AnyExprId;
 use hir::AnyExprRef;
diff --git a/crates/ide/src/diagnostics/debugging_function.rs b/crates/ide/src/diagnostics/debugging_function.rs
index 904ebe3098..185736d207 100644
--- a/crates/ide/src/diagnostics/debugging_function.rs
+++ b/crates/ide/src/diagnostics/debugging_function.rs
@@ -11,7 +11,7 @@
 use elp_ide_assists::Assist;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChangeBuilder;
-use elp_text_edit::TextRange;
+use elp_ide_db::text_edit::TextRange;
 use hir::Semantic;
 
 use crate::FunctionMatch;
diff --git a/crates/ide/src/diagnostics/dependent_header.rs b/crates/ide/src/diagnostics/dependent_header.rs
index e0b4d11652..4729f05872 100644
--- a/crates/ide/src/diagnostics/dependent_header.rs
+++ b/crates/ide/src/diagnostics/dependent_header.rs
@@ -14,10 +14,10 @@
 
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::FileKind;
+use elp_ide_db::text_edit::TextRange;
 use elp_syntax::AstNode;
 use elp_syntax::ast;
 use elp_syntax::ast::RecordName;
-use elp_text_edit::TextRange;
 use hir::AnyExpr;
 use hir::InFile;
 use hir::Name;
diff --git a/crates/ide/src/diagnostics/deprecated_function.rs b/crates/ide/src/diagnostics/deprecated_function.rs
index 3956282c45..540edfcca3 100644
--- a/crates/ide/src/diagnostics/deprecated_function.rs
+++ b/crates/ide/src/diagnostics/deprecated_function.rs
@@ -21,10 +21,10 @@
 use elp_ide_assists::Assist;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
+use elp_ide_db::text_edit::TextRange;
+use elp_ide_db::text_edit::TextSize;
 use elp_syntax::AstNode;
-use elp_text_edit::TextEdit;
-use elp_text_edit::TextRange;
-use elp_text_edit::TextSize;
 use hir::AnyExpr;
 use hir::Expr;
 use hir::FunctionDef;
diff --git a/crates/ide/src/diagnostics/edoc.rs b/crates/ide/src/diagnostics/edoc.rs
index 53858e7cca..0daae4f7f6 100644
--- a/crates/ide/src/diagnostics/edoc.rs
+++ b/crates/ide/src/diagnostics/edoc.rs
@@ -14,9 +14,9 @@ use elp_ide_assists::helpers;
 use elp_ide_assists::helpers::extend_range;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChangeBuilder;
+use elp_ide_db::text_edit::TextRange;
+use elp_ide_db::text_edit::TextSize;
 use elp_syntax::AstNode;
-use elp_text_edit::TextRange;
-use elp_text_edit::TextSize;
 use fxhash::FxHashSet;
 use hir::Attribute;
 use hir::Semantic;
diff --git a/crates/ide/src/diagnostics/effect_free_statement.rs b/crates/ide/src/diagnostics/effect_free_statement.rs
index 72d6c8eb8d..9aec815fbb 100644
--- a/crates/ide/src/diagnostics/effect_free_statement.rs
+++ b/crates/ide/src/diagnostics/effect_free_statement.rs
@@ -17,11 +17,11 @@ use std::iter;
 
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::AstNode;
 use elp_syntax::SyntaxElement;
 use elp_syntax::SyntaxKind;
 use elp_syntax::ast;
-use elp_text_edit::TextEdit;
 use hir::AnyExprId;
 use hir::Expr;
 use hir::ExprId;
diff --git a/crates/ide/src/diagnostics/eqwalizer_assists/expected_type.rs b/crates/ide/src/diagnostics/eqwalizer_assists/expected_type.rs
index ee655d2f8c..081f6e43ae 100644
--- a/crates/ide/src/diagnostics/eqwalizer_assists/expected_type.rs
+++ b/crates/ide/src/diagnostics/eqwalizer_assists/expected_type.rs
@@ -15,8 +15,8 @@ use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::FilePosition;
 use elp_ide_db::find_best_token;
 use elp_ide_db::source_change::SourceChange;
-use elp_text_edit::TextEdit;
-use elp_text_edit::TextSize;
+use elp_ide_db::text_edit::TextEdit;
+use elp_ide_db::text_edit::TextSize;
 use elp_types_db::eqwalizer::StructuredDiagnostic;
 use elp_types_db::eqwalizer::tc_diagnostics::ExpectedSubtype;
 use elp_types_db::eqwalizer::tc_diagnostics::TypeError;
diff --git a/crates/ide/src/diagnostics/head_mismatch.rs b/crates/ide/src/diagnostics/head_mismatch.rs
index 3a92d6f931..edfb1d8518 100644
--- a/crates/ide/src/diagnostics/head_mismatch.rs
+++ b/crates/ide/src/diagnostics/head_mismatch.rs
@@ -13,13 +13,13 @@ use std::hash::Hash;
 
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::SyntaxToken;
 use elp_syntax::TextRange;
 use elp_syntax::ast;
 use elp_syntax::ast::AstNode;
 use elp_syntax::ast::ClauseSeparator;
 use elp_syntax::syntax_node::SyntaxNode;
-use elp_text_edit::TextEdit;
 use fxhash::FxHashMap;
 use hir::Semantic;
 
diff --git a/crates/ide/src/diagnostics/macro_precedence_suprise.rs b/crates/ide/src/diagnostics/macro_precedence_suprise.rs
index 700f54441e..838ddb3d9c 100644
--- a/crates/ide/src/diagnostics/macro_precedence_suprise.rs
+++ b/crates/ide/src/diagnostics/macro_precedence_suprise.rs
@@ -17,7 +17,7 @@ use elp_ide_assists::Assist;
 use elp_ide_assists::helpers::add_parens_edit;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
-use elp_text_edit::TextRange;
+use elp_ide_db::text_edit::TextRange;
 use hir::AnyExpr;
 use hir::AnyExprRef;
 use hir::Expr;
diff --git a/crates/ide/src/diagnostics/meck.rs b/crates/ide/src/diagnostics/meck.rs
index 1fc115638d..8919ddb770 100644
--- a/crates/ide/src/diagnostics/meck.rs
+++ b/crates/ide/src/diagnostics/meck.rs
@@ -10,8 +10,8 @@
 
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChangeBuilder;
-use elp_text_edit::TextRange;
-use elp_text_edit::TextSize;
+use elp_ide_db::text_edit::TextRange;
+use elp_ide_db::text_edit::TextSize;
 use hir::AnyExprId;
 use hir::Expr;
 use hir::FunctionDef;
diff --git a/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs b/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs
index 681672ba8e..4f61ea5190 100644
--- a/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs
+++ b/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs
@@ -20,8 +20,8 @@ use elp_ide_db::DiagnosticCode;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::FileKind;
 use elp_ide_db::source_change::SourceChangeBuilder;
+use elp_ide_db::text_edit::TextRange;
 use elp_syntax::AstNode;
-use elp_text_edit::TextRange;
 use fxhash::FxHashSet;
 use hir::AnyExpr;
 use hir::CompileOptionId;
diff --git a/crates/ide/src/diagnostics/misspelled_attribute.rs b/crates/ide/src/diagnostics/misspelled_attribute.rs
index 6ba95c8ef9..90695f52d1 100644
--- a/crates/ide/src/diagnostics/misspelled_attribute.rs
+++ b/crates/ide/src/diagnostics/misspelled_attribute.rs
@@ -10,9 +10,9 @@
 
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::ast::AstNode;
 use elp_syntax::ast::WildAttribute;
-use elp_text_edit::TextEdit;
 use hir::Attribute;
 use hir::Semantic;
 
diff --git a/crates/ide/src/diagnostics/module_mismatch.rs b/crates/ide/src/diagnostics/module_mismatch.rs
index c1a57dfbd9..77181b55ef 100644
--- a/crates/ide/src/diagnostics/module_mismatch.rs
+++ b/crates/ide/src/diagnostics/module_mismatch.rs
@@ -15,11 +15,11 @@
 use elp_ide_assists::Assist;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::AstNode;
 use elp_syntax::SyntaxNode;
 use elp_syntax::TextRange;
 use elp_syntax::ast;
-use elp_text_edit::TextEdit;
 use hir::Semantic;
 
 use crate::Diagnostic;
diff --git a/crates/ide/src/diagnostics/nonstandard_integer_formatting.rs b/crates/ide/src/diagnostics/nonstandard_integer_formatting.rs
index d80751c946..63b0a450cb 100644
--- a/crates/ide/src/diagnostics/nonstandard_integer_formatting.rs
+++ b/crates/ide/src/diagnostics/nonstandard_integer_formatting.rs
@@ -15,8 +15,8 @@
 use elp_ide_db::DiagnosticCode;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChangeBuilder;
+use elp_ide_db::text_edit::TextRange;
 use elp_syntax::AstNode;
-use elp_text_edit::TextRange;
 use hir::AnyExpr;
 use hir::BasedInteger;
 use hir::Expr;
diff --git a/crates/ide/src/diagnostics/record_tuple_match.rs b/crates/ide/src/diagnostics/record_tuple_match.rs
index 5606dce89a..9756bfeb73 100644
--- a/crates/ide/src/diagnostics/record_tuple_match.rs
+++ b/crates/ide/src/diagnostics/record_tuple_match.rs
@@ -15,7 +15,7 @@
 use elp_ide_db::DiagnosticCode;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::FileRange;
-use elp_text_edit::TextRange;
+use elp_ide_db::text_edit::TextRange;
 use hir::AnyExpr;
 use hir::FunctionDef;
 use hir::Literal;
diff --git a/crates/ide/src/diagnostics/replace_call.rs b/crates/ide/src/diagnostics/replace_call.rs
index e83afcb985..fa16acf356 100644
--- a/crates/ide/src/diagnostics/replace_call.rs
+++ b/crates/ide/src/diagnostics/replace_call.rs
@@ -15,9 +15,9 @@
 
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::TextRange;
 use elp_syntax::ast;
-use elp_text_edit::TextEdit;
 use hir::AnyExprId;
 use hir::CallTarget;
 use hir::Expr;
diff --git a/crates/ide/src/diagnostics/replace_in_spec.rs b/crates/ide/src/diagnostics/replace_in_spec.rs
index 12d8aa3f64..a5df5217e2 100644
--- a/crates/ide/src/diagnostics/replace_in_spec.rs
+++ b/crates/ide/src/diagnostics/replace_in_spec.rs
@@ -16,8 +16,8 @@
 use elp_ide_db::DiagnosticCode;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::SmolStr;
-use elp_text_edit::TextEdit;
 use fxhash::FxHashSet;
 use hir::AnyExpr;
 use hir::InFile;
diff --git a/crates/ide/src/diagnostics/trivial_match.rs b/crates/ide/src/diagnostics/trivial_match.rs
index 56d3881a9a..705cc22d7e 100644
--- a/crates/ide/src/diagnostics/trivial_match.rs
+++ b/crates/ide/src/diagnostics/trivial_match.rs
@@ -17,9 +17,9 @@ use std::collections::HashMap;
 
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::TextRange;
 use elp_syntax::ast;
-use elp_text_edit::TextEdit;
 use hir::AnyExpr;
 use hir::AnyExprId;
 use hir::BinarySeg;
diff --git a/crates/ide/src/diagnostics/undefined_macro.rs b/crates/ide/src/diagnostics/undefined_macro.rs
index c90e2d1285..51ee0ceaff 100644
--- a/crates/ide/src/diagnostics/undefined_macro.rs
+++ b/crates/ide/src/diagnostics/undefined_macro.rs
@@ -15,7 +15,7 @@ use elp_ide_db::DiagnosticCode;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::path_for_file;
 use elp_ide_db::source_change::SourceChange;
-use elp_text_edit::TextEdit;
+use elp_ide_db::text_edit::TextEdit;
 use fxhash::FxHashSet;
 use hir::Semantic;
 use lazy_static::lazy_static;
diff --git a/crates/ide/src/diagnostics/undocumented_function.rs b/crates/ide/src/diagnostics/undocumented_function.rs
index 41fdeb0229..ab193cdcd5 100644
--- a/crates/ide/src/diagnostics/undocumented_function.rs
+++ b/crates/ide/src/diagnostics/undocumented_function.rs
@@ -11,9 +11,9 @@
 // Diagnostic: undocumented-function
 use elp_ide_assists::helpers::unwrap_parens;
 use elp_ide_db::elp_base_db::FileId;
+use elp_ide_db::text_edit::TextRange;
 use elp_syntax::ast;
 use elp_syntax::ast::Atom;
-use elp_text_edit::TextRange;
 use fxhash::FxHashSet;
 use hir::AsName;
 use hir::FunctionDef;
diff --git a/crates/ide/src/diagnostics/undocumented_module.rs b/crates/ide/src/diagnostics/undocumented_module.rs
index 96a3a6c13a..f93b04d1bf 100644
--- a/crates/ide/src/diagnostics/undocumented_module.rs
+++ b/crates/ide/src/diagnostics/undocumented_module.rs
@@ -12,8 +12,8 @@ use elp_ide_assists::Assist;
 use elp_ide_assists::helpers;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChangeBuilder;
+use elp_ide_db::text_edit::TextRange;
 use elp_syntax::AstNode;
-use elp_text_edit::TextRange;
 use hir::Semantic;
 
 use crate::diagnostics::DiagnosticCode;
diff --git a/crates/ide/src/diagnostics/unspecific_include.rs b/crates/ide/src/diagnostics/unspecific_include.rs
index 339874f6ee..c9a9644ae3 100644
--- a/crates/ide/src/diagnostics/unspecific_include.rs
+++ b/crates/ide/src/diagnostics/unspecific_include.rs
@@ -14,9 +14,9 @@ use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::generated_file_include_lib;
 use elp_ide_db::elp_base_db::path_for_file;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
+use elp_ide_db::text_edit::TextRange;
 use elp_syntax::ast;
-use elp_text_edit::TextEdit;
-use elp_text_edit::TextRange;
 use hir::InFile;
 use hir::Semantic;
 
diff --git a/crates/ide/src/diagnostics/unused_function_args.rs b/crates/ide/src/diagnostics/unused_function_args.rs
index 53306052ce..ec4825e522 100644
--- a/crates/ide/src/diagnostics/unused_function_args.rs
+++ b/crates/ide/src/diagnostics/unused_function_args.rs
@@ -18,9 +18,9 @@ use std::collections::HashSet;
 
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
+use elp_ide_db::text_edit::TextRange;
 use elp_syntax::ast;
-use elp_text_edit::TextEdit;
-use elp_text_edit::TextRange;
 use hir::AnyExpr;
 use hir::AnyExprId;
 use hir::FunctionClauseDef;
diff --git a/crates/ide/src/diagnostics/unused_include.rs b/crates/ide/src/diagnostics/unused_include.rs
index 959181a328..04a1a8490e 100644
--- a/crates/ide/src/diagnostics/unused_include.rs
+++ b/crates/ide/src/diagnostics/unused_include.rs
@@ -17,9 +17,9 @@ use elp_ide_db::SearchScope;
 use elp_ide_db::SymbolDefinition;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::SmolStr;
 use elp_syntax::ast::AstNode;
-use elp_text_edit::TextEdit;
 use fxhash::FxHashMap;
 use fxhash::FxHashSet;
 use hir::FormIdx;
diff --git a/crates/ide/src/diagnostics/unused_macro.rs b/crates/ide/src/diagnostics/unused_macro.rs
index c25f5990a4..089371f85b 100644
--- a/crates/ide/src/diagnostics/unused_macro.rs
+++ b/crates/ide/src/diagnostics/unused_macro.rs
@@ -19,9 +19,9 @@ use elp_ide_assists::helpers::extend_range;
 use elp_ide_db::SymbolDefinition;
 use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
+use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::AstNode;
 use elp_syntax::TextRange;
-use elp_text_edit::TextEdit;
 use hir::Semantic;
 
 use crate::diagnostics::DiagnosticCode;
diff --git a/crates/ide/src/diagnostics_collection.rs b/crates/ide/src/diagnostics_collection.rs
index f15aed182c..4abe143dd9 100644
--- a/crates/ide/src/diagnostics_collection.rs
+++ b/crates/ide/src/diagnostics_collection.rs
@@ -266,8 +266,8 @@ mod tests {
     use std::iter::once;
 
     use elp_ide_db::elp_base_db::FileId;
+    use elp_ide_db::text_edit::TextRange;
     use elp_syntax::label::Label;
-    use elp_text_edit::TextRange;
     use fxhash::FxHashMap;
     use fxhash::FxHashSet;
 
diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index 2642aed015..ab7731f619 100644
--- a/crates/ide/src/rename.rs
+++ b/crates/ide/src/rename.rs
@@ -175,11 +175,11 @@ pub(crate) mod tests {
     use elp_ide_db::RootDatabase;
     use elp_ide_db::elp_base_db::assert_eq_text;
     use elp_ide_db::elp_base_db::fixture::WithFixture as _;
+    use elp_ide_db::text_edit::TextEdit;
     use elp_project_model::test_fixture::trim_indent;
     use elp_syntax::AstNode;
     use elp_syntax::algo;
     use elp_syntax::ast;
-    use elp_text_edit::TextEdit;
     use hir::AnyExprId;
     use hir::InFile;
     use hir::Semantic;
diff --git a/crates/ide/src/tests.rs b/crates/ide/src/tests.rs
index 8d71b65dad..233a7a33f8 100644
--- a/crates/ide/src/tests.rs
+++ b/crates/ide/src/tests.rs
@@ -20,8 +20,8 @@ use elp_ide_db::elp_base_db::SourceDatabaseExt;
 use elp_ide_db::elp_base_db::assert_eq_text;
 use elp_ide_db::elp_base_db::fixture::WithFixture;
 use elp_ide_db::elp_base_db::remove_annotations;
+use elp_ide_db::text_edit::TextRange;
 use elp_project_model::test_fixture::trim_indent;
-use elp_text_edit::TextRange;
 use expect_test::Expect;
 use itertools::Itertools;
 
diff --git a/crates/ide_assists/Cargo.toml b/crates/ide_assists/Cargo.toml
index 167e1f4b11..b2277cd12d 100644
--- a/crates/ide_assists/Cargo.toml
+++ b/crates/ide_assists/Cargo.toml
@@ -9,7 +9,6 @@ workspace = true
 [dependencies]
 elp_ide_db.workspace = true
 elp_syntax.workspace = true
-elp_text_edit.workspace = true
 hir.workspace = true
 
 cov-mark.workspace = true
diff --git a/crates/ide_assists/src/handlers/add_doc.rs b/crates/ide_assists/src/handlers/add_doc.rs
index b1f51a7b90..87a511fbff 100644
--- a/crates/ide_assists/src/handlers/add_doc.rs
+++ b/crates/ide_assists/src/handlers/add_doc.rs
@@ -12,9 +12,9 @@ use std::fmt::Write;
 
 use elp_ide_db::assists::AssistId;
 use elp_ide_db::assists::AssistKind;
+use elp_ide_db::text_edit::TextSize;
 use elp_syntax::AstNode;
 use elp_syntax::ast;
-use elp_text_edit::TextSize;
 use hir::FunctionDef;
 
 use crate::AssistContext;
diff --git a/crates/ide_assists/src/handlers/flip_sep.rs b/crates/ide_assists/src/handlers/flip_sep.rs
index 662e31b3e9..65ae663518 100644
--- a/crates/ide_assists/src/handlers/flip_sep.rs
+++ b/crates/ide_assists/src/handlers/flip_sep.rs
@@ -10,12 +10,12 @@
 
 use elp_ide_db::assists::AssistId;
 use elp_ide_db::assists::AssistKind;
+use elp_ide_db::text_edit::TextRange;
 use elp_syntax::AstNode;
 use elp_syntax::Direction;
 use elp_syntax::SyntaxKind;
 use elp_syntax::SyntaxToken;
 use elp_syntax::algo::non_trivia_sibling;
-use elp_text_edit::TextRange;
 use fxhash::FxHashSet;
 use hir::InFile;
 
diff --git a/crates/ide_assists/src/handlers/implement_behaviour.rs b/crates/ide_assists/src/handlers/implement_behaviour.rs
index 384ac8a65b..2821e9214e 100644
--- a/crates/ide_assists/src/handlers/implement_behaviour.rs
+++ b/crates/ide_assists/src/handlers/implement_behaviour.rs
@@ -12,10 +12,10 @@ use std::cmp::max;
 
 use elp_ide_db::assists::AssistId;
 use elp_ide_db::assists::AssistKind;
+use elp_ide_db::text_edit::TextRange;
+use elp_ide_db::text_edit::TextSize;
 use elp_syntax::AstNode;
 use elp_syntax::ast::BehaviourAttribute;
-use elp_text_edit::TextRange;
-use elp_text_edit::TextSize;
 use hir::Callback;
 use hir::CallbackId;
 use hir::InFile;
diff --git a/crates/ide_assists/src/handlers/inline_function.rs b/crates/ide_assists/src/handlers/inline_function.rs
index 69dbb1c55d..055395af52 100644
--- a/crates/ide_assists/src/handlers/inline_function.rs
+++ b/crates/ide_assists/src/handlers/inline_function.rs
@@ -22,6 +22,7 @@ use elp_ide_db::elp_base_db::FileRange;
 use elp_ide_db::find_best_token;
 use elp_ide_db::helpers::get_call;
 use elp_ide_db::rename::SafetyChecks;
+use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::AstNode;
 use elp_syntax::NodeOrToken;
 use elp_syntax::SyntaxKind;
@@ -32,7 +33,6 @@ use elp_syntax::TextSize;
 use elp_syntax::ast;
 use elp_syntax::ast::HasArity;
 use elp_syntax::ast::edit::IndentLevel;
-use elp_text_edit::TextEdit;
 use fxhash::FxHashSet;
 use hir::FunctionDef;
 use hir::InFile;
diff --git a/crates/ide_assists/src/helpers.rs b/crates/ide_assists/src/helpers.rs
index bb2a38cf1b..121b1dda41 100644
--- a/crates/ide_assists/src/helpers.rs
+++ b/crates/ide_assists/src/helpers.rs
@@ -20,6 +20,8 @@ use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::helpers::top_insert_position;
 use elp_ide_db::rename::is_safe_function;
 use elp_ide_db::source_change::SourceChangeBuilder;
+use elp_ide_db::text_edit::TextEdit;
+use elp_ide_db::text_edit::TextSize;
 use elp_syntax::AstNode;
 use elp_syntax::AstPtr;
 use elp_syntax::Direction;
@@ -34,8 +36,6 @@ use elp_syntax::algo;
 use elp_syntax::algo::skip_inline_comment;
 use elp_syntax::ast;
 use elp_syntax::match_ast;
-use elp_text_edit::TextEdit;
-use elp_text_edit::TextSize;
 use fxhash::FxHashSet;
 use hir::Attribute;
 use hir::Body;
diff --git a/crates/ide_db/Cargo.toml b/crates/ide_db/Cargo.toml
index 52cee9b67c..927391ba93 100644
--- a/crates/ide_db/Cargo.toml
+++ b/crates/ide_db/Cargo.toml
@@ -12,7 +12,6 @@ elp_eqwalizer.workspace = true
 elp_erlang_service.workspace = true
 elp_project_model.workspace = true
 elp_syntax.workspace = true
-elp_text_edit.workspace = true
 elp_types_db.workspace = true
 hir.workspace = true
 
@@ -37,6 +36,7 @@ stdx.workspace = true
 strum.workspace = true
 strum_macros.workspace = true
 tempfile.workspace = true
+text-size.workspace = true
 toml.workspace = true
 tracing.workspace = true
 
diff --git a/crates/ide_db/src/helpers.rs b/crates/ide_db/src/helpers.rs
index cad66d9e48..c92be86f5f 100644
--- a/crates/ide_db/src/helpers.rs
+++ b/crates/ide_db/src/helpers.rs
@@ -15,9 +15,9 @@ use elp_syntax::SourceFile;
 use elp_syntax::SyntaxKind;
 use elp_syntax::SyntaxNode;
 use elp_syntax::SyntaxToken;
+use elp_syntax::TextSize;
 use elp_syntax::TokenAtOffset;
 use elp_syntax::ast;
-use elp_text_edit::TextSize;
 use hir::FormList;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
diff --git a/crates/ide_db/src/lib.rs b/crates/ide_db/src/lib.rs
index 1ef15d91ae..a00ea1f0d9 100644
--- a/crates/ide_db/src/lib.rs
+++ b/crates/ide_db/src/lib.rs
@@ -60,6 +60,7 @@ mod line_index;
 // @fb-only
 pub mod metadata;
 mod search;
+pub mod text_edit;
 
 // ---------------------------------------------------------------------
 pub mod assists;
@@ -420,8 +421,8 @@ impl TypedSemantic for RootDatabase {
 mod tests {
     use elp_base_db::SourceDatabase;
     use elp_base_db::fixture::WithFixture;
-    use elp_text_edit::TextRange;
 
+    use super::text_edit::TextRange;
     use crate::RootDatabase;
 
     #[test]
diff --git a/crates/ide_db/src/rename.rs b/crates/ide_db/src/rename.rs
index c25ee41e2a..3ea610554e 100644
--- a/crates/ide_db/src/rename.rs
+++ b/crates/ide_db/src/rename.rs
@@ -20,7 +20,6 @@ use elp_base_db::FileRange;
 use elp_syntax::AstNode;
 use elp_syntax::ast;
 use elp_syntax::ast::in_erlang_module;
-use elp_text_edit::TextEdit;
 use hir::InFile;
 use hir::Semantic;
 
@@ -28,6 +27,7 @@ use crate::SymbolDefinition;
 use crate::helpers::get_call;
 use crate::search::NameLike;
 use crate::source_change::SourceChange;
+use crate::text_edit::TextEdit;
 
 pub type RenameResult<T> = Result<T, RenameError>;
 
diff --git a/crates/ide_db/src/source_change.rs b/crates/ide_db/src/source_change.rs
index e387682aba..e4afbd8742 100644
--- a/crates/ide_db/src/source_change.rs
+++ b/crates/ide_db/src/source_change.rs
@@ -20,14 +20,14 @@ use std::mem;
 use elp_base_db::AnchoredPathBuf;
 use elp_base_db::FileId;
 use elp_syntax::SyntaxNode;
-use elp_text_edit::TextEdit;
-use elp_text_edit::TextEditBuilder;
-use elp_text_edit::TextRange;
-use elp_text_edit::TextSize;
+use elp_syntax::TextRange;
+use elp_syntax::TextSize;
 use fxhash::FxHashMap;
 use stdx::never;
 
 use crate::helpers::SnippetCap;
+use crate::text_edit::TextEdit;
+use crate::text_edit::TextEditBuilder;
 use crate::tree_diff::diff;
 
 #[derive(Default, Debug, Clone)]
diff --git a/crates/text_edit/src/lib.rs b/crates/ide_db/src/text_edit.rs
similarity index 99%
rename from crates/text_edit/src/lib.rs
rename to crates/ide_db/src/text_edit.rs
index 42dac0f3ac..0410102569 100644
--- a/crates/text_edit/src/lib.rs
+++ b/crates/ide_db/src/text_edit.rs
@@ -15,7 +15,6 @@
 //! `rust-analyzer` never mutates text itself and only sends diffs to clients,
 //! so `TextEdit` is the ultimate representation of the work done by
 //! rust-analyzer.
-
 use std::cmp::max;
 
 use itertools::Itertools;
diff --git a/crates/ide_db/src/tree_diff.rs b/crates/ide_db/src/tree_diff.rs
index 70b29f4d35..5bca5c2ec2 100644
--- a/crates/ide_db/src/tree_diff.rs
+++ b/crates/ide_db/src/tree_diff.rs
@@ -15,10 +15,11 @@ use std::hash::BuildHasherDefault;
 use elp_syntax::NodeOrToken;
 use elp_syntax::SyntaxElement;
 use elp_syntax::SyntaxNode;
-use elp_text_edit::TextEditBuilder;
 use fxhash::FxHashMap;
 use indexmap::IndexMap;
 
+use crate::text_edit::TextEditBuilder;
+
 type FxIndexMap<K, V> = IndexMap<K, V, BuildHasherDefault<fxhash::FxHasher>>;
 
 #[derive(Debug, Hash, PartialEq, Eq)]
@@ -176,11 +177,12 @@ mod tests {
     use elp_syntax::SourceFile;
     use elp_syntax::SyntaxElement;
     use elp_syntax::SyntaxKind;
-    use elp_text_edit::TextEdit;
     use expect_test::Expect;
     use expect_test::expect;
     use itertools::Itertools;
 
+    use crate::text_edit::TextEdit;
+
     #[test]
     fn replace_node_token() {
         cov_mark::check!(diff_node_token_replace);
diff --git a/crates/syntax/Cargo.toml b/crates/syntax/Cargo.toml
index 80ed01f28c..1f8d1aaa63 100644
--- a/crates/syntax/Cargo.toml
+++ b/crates/syntax/Cargo.toml
@@ -7,8 +7,6 @@ version.workspace = true
 workspace = true
 
 [dependencies]
-elp_text_edit.workspace = true
-
 eetf.workspace = true
 fxhash.workspace = true
 indexmap.workspace = true
diff --git a/crates/text_edit/Cargo.toml b/crates/text_edit/Cargo.toml
deleted file mode 100644
index 59d333adc7..0000000000
--- a/crates/text_edit/Cargo.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-[package]
-name = "elp_text_edit"
-edition.workspace = true
-version.workspace = true
-
-[lints]
-workspace = true
-
-[dependencies]
-itertools.workspace = true
-text-size.workspace = true

From 5820634ce2c1e85ceac813430b04520c0cb544c8 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 21 Nov 2025 02:03:27 -0800
Subject: [PATCH 292/394] Allow severity method to receive &Semantic and FileId
 as arguments

Summary:
# Context

We want to convert the `edoc` linter to use a trait.

# Problem

The `edoc` linter has a different `Severity` for source code and test files.

# Solution

We can extend the `severity` and `cli_severity` methods to accept `sema` and `file_id`. This way, we can customize the severity based on the file. The new arguments will be used by the edoc linter in a subsequent diff.

Reviewed By: alanz

Differential Revision: D87545262

fbshipit-source-id: d7546d7d77ec019c2a2edc846e69134e93a6fe90
---
 crates/ide/src/diagnostics.rs                      | 14 +++++++-------
 .../ide/src/diagnostics/binary_string_to_sigil.rs  |  2 +-
 .../src/diagnostics/could_be_a_string_literal.rs   |  2 +-
 crates/ide/src/diagnostics/cross_node_eval.rs      |  5 ++++-
 crates/ide/src/diagnostics/debugging_function.rs   |  4 ++--
 .../missing_compile_warn_missing_spec.rs           |  2 +-
 crates/ide/src/diagnostics/no_error_logger.rs      |  5 ++++-
 .../ide/src/diagnostics/undocumented_function.rs   |  2 +-
 crates/ide/src/diagnostics/undocumented_module.rs  |  2 +-
 .../diagnostics/unnecessary_fold_to_build_map.rs   |  2 +-
 .../unnecessary_map_to_list_in_comprehension.rs    |  2 +-
 11 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index f8932db145..de828e5086 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -511,13 +511,13 @@ pub(crate) trait Linter {
     fn description(&self) -> &'static str;
 
     // The severity for the lint issue. It defaults to `Warning`.
-    fn severity(&self) -> Severity {
+    fn severity(&self, _sema: &Semantic, _file_id: FileId) -> Severity {
         Severity::Warning
     }
 
     // For CLI, when using the --use-cli-severity flag. It defaults to `severity()`
-    fn cli_severity(&self) -> Severity {
-        self.severity()
+    fn cli_severity(&self, sema: &Semantic, file_id: FileId) -> Severity {
+        self.severity(sema, file_id)
     }
 
     // Specify if the linter issues can be suppressed via a `% elp:ignore` comment.
@@ -1649,16 +1649,16 @@ fn diagnostics_from_linters(
             let severity = if let Some(lint_config) = config.lint_config.as_ref() {
                 lint_config
                     .get_severity_override(&linter.id())
-                    .unwrap_or_else(|| linter.severity())
+                    .unwrap_or_else(|| linter.severity(sema, file_id))
             } else {
-                linter.severity()
+                linter.severity(sema, file_id)
             };
             let cli_severity = if let Some(lint_config) = config.lint_config.as_ref() {
                 lint_config
                     .get_severity_override(&linter.id())
-                    .unwrap_or_else(|| linter.cli_severity())
+                    .unwrap_or_else(|| linter.cli_severity(sema, file_id))
             } else {
-                linter.cli_severity()
+                linter.cli_severity(sema, file_id)
             };
             match l {
                 DiagnosticLinter::FunctionCall(function_linter) => {
diff --git a/crates/ide/src/diagnostics/binary_string_to_sigil.rs b/crates/ide/src/diagnostics/binary_string_to_sigil.rs
index 60a18aa7e1..91b08f9d1d 100644
--- a/crates/ide/src/diagnostics/binary_string_to_sigil.rs
+++ b/crates/ide/src/diagnostics/binary_string_to_sigil.rs
@@ -38,7 +38,7 @@ impl Linter for BinaryStringToSigilLinter {
         "Binary string can be written using sigil syntax."
     }
 
-    fn severity(&self) -> Severity {
+    fn severity(&self, _sema: &Semantic, _file_id: FileId) -> Severity {
         Severity::WeakWarning
     }
 
diff --git a/crates/ide/src/diagnostics/could_be_a_string_literal.rs b/crates/ide/src/diagnostics/could_be_a_string_literal.rs
index d939163222..03ea0e6274 100644
--- a/crates/ide/src/diagnostics/could_be_a_string_literal.rs
+++ b/crates/ide/src/diagnostics/could_be_a_string_literal.rs
@@ -39,7 +39,7 @@ impl Linter for CouldBeAStringLiteralLinter {
         "Could be rewritten as a literal."
     }
 
-    fn severity(&self) -> Severity {
+    fn severity(&self, _sema: &Semantic, _file_id: FileId) -> Severity {
         Severity::Information
     }
 }
diff --git a/crates/ide/src/diagnostics/cross_node_eval.rs b/crates/ide/src/diagnostics/cross_node_eval.rs
index 56cf2e1299..f50ca663e3 100644
--- a/crates/ide/src/diagnostics/cross_node_eval.rs
+++ b/crates/ide/src/diagnostics/cross_node_eval.rs
@@ -12,6 +12,9 @@
 //!
 //! Return a diagnostic for rpc calls to remote nodes.
 
+use elp_ide_db::elp_base_db::FileId;
+use hir::Semantic;
+
 use crate::codemod_helpers::FunctionMatch;
 use crate::diagnostics::DiagnosticCode;
 use crate::diagnostics::FunctionCallLinter;
@@ -28,7 +31,7 @@ impl Linter for CrossNodeEvalLinter {
     fn description(&self) -> &'static str {
         "Production code must not use cross node eval (e.g. `rpc:call()`)"
     }
-    fn severity(&self) -> Severity {
+    fn severity(&self, _sema: &Semantic, _file_id: FileId) -> Severity {
         Severity::Error
     }
     fn should_process_test_files(&self) -> bool {
diff --git a/crates/ide/src/diagnostics/debugging_function.rs b/crates/ide/src/diagnostics/debugging_function.rs
index 185736d207..94c3d11364 100644
--- a/crates/ide/src/diagnostics/debugging_function.rs
+++ b/crates/ide/src/diagnostics/debugging_function.rs
@@ -34,10 +34,10 @@ impl Linter for NoDebuggingFunctionLinter {
     fn description(&self) -> &'static str {
         "Debugging functions should only be used during local debugging and usages should not be checked in."
     }
-    fn severity(&self) -> Severity {
+    fn severity(&self, _sema: &Semantic, _file_id: FileId) -> Severity {
         Severity::WeakWarning
     }
-    fn cli_severity(&self) -> Severity {
+    fn cli_severity(&self, _sema: &Semantic, _file_id: FileId) -> Severity {
         Severity::Error
     }
     fn should_process_generated_files(&self) -> bool {
diff --git a/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs b/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs
index 4f61ea5190..b1f24eb60f 100644
--- a/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs
+++ b/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs
@@ -53,7 +53,7 @@ impl Linter for MissingCompileWarnMissingSpec {
     fn description(&self) -> &'static str {
         "Please add \"-compile(warn_missing_spec_all).\" to the module. If exported functions are not all specced, they need to be specced."
     }
-    fn severity(&self) -> Severity {
+    fn severity(&self, _sema: &Semantic, _file_id: FileId) -> Severity {
         Severity::Error
     }
     fn should_process_test_files(&self) -> bool {
diff --git a/crates/ide/src/diagnostics/no_error_logger.rs b/crates/ide/src/diagnostics/no_error_logger.rs
index 08e94133d0..d587d3f3c7 100644
--- a/crates/ide/src/diagnostics/no_error_logger.rs
+++ b/crates/ide/src/diagnostics/no_error_logger.rs
@@ -8,6 +8,9 @@
  * above-listed licenses.
  */
 
+use elp_ide_db::elp_base_db::FileId;
+use hir::Semantic;
+
 use crate::codemod_helpers::FunctionMatch;
 use crate::diagnostics::DiagnosticCode;
 use crate::diagnostics::FunctionCallLinter;
@@ -23,7 +26,7 @@ impl Linter for NoErrorLoggerLinter {
     fn description(&self) -> &'static str {
         "The `error_logger` module is deprecated."
     }
-    fn severity(&self) -> Severity {
+    fn severity(&self, _sema: &Semantic, _file_id: FileId) -> Severity {
         Severity::Error
     }
 }
diff --git a/crates/ide/src/diagnostics/undocumented_function.rs b/crates/ide/src/diagnostics/undocumented_function.rs
index ab193cdcd5..f1d0aa06b5 100644
--- a/crates/ide/src/diagnostics/undocumented_function.rs
+++ b/crates/ide/src/diagnostics/undocumented_function.rs
@@ -39,7 +39,7 @@ impl Linter for UndocumentedFunctionLinter {
         "The function is non-trivial, exported, but not documented."
     }
 
-    fn severity(&self) -> Severity {
+    fn severity(&self, _sema: &Semantic, _file_id: FileId) -> Severity {
         Severity::WeakWarning
     }
 
diff --git a/crates/ide/src/diagnostics/undocumented_module.rs b/crates/ide/src/diagnostics/undocumented_module.rs
index f93b04d1bf..eeb4caf7b1 100644
--- a/crates/ide/src/diagnostics/undocumented_module.rs
+++ b/crates/ide/src/diagnostics/undocumented_module.rs
@@ -34,7 +34,7 @@ impl Linter for UndocumentedModuleLinter {
         "The module is not documented."
     }
 
-    fn severity(&self) -> Severity {
+    fn severity(&self, _sema: &Semantic, _file_id: FileId) -> Severity {
         Severity::WeakWarning
     }
 
diff --git a/crates/ide/src/diagnostics/unnecessary_fold_to_build_map.rs b/crates/ide/src/diagnostics/unnecessary_fold_to_build_map.rs
index 5fea930a9a..40f16da4d8 100644
--- a/crates/ide/src/diagnostics/unnecessary_fold_to_build_map.rs
+++ b/crates/ide/src/diagnostics/unnecessary_fold_to_build_map.rs
@@ -49,7 +49,7 @@ impl Linter for UnnecessaryFoldToBuildMapLinter {
         "Unnecessary explicit fold to construct map."
     }
 
-    fn severity(&self) -> Severity {
+    fn severity(&self, _sema: &Semantic, _file_id: FileId) -> Severity {
         Severity::WeakWarning
     }
 }
diff --git a/crates/ide/src/diagnostics/unnecessary_map_to_list_in_comprehension.rs b/crates/ide/src/diagnostics/unnecessary_map_to_list_in_comprehension.rs
index 6dbf3cd4c7..0c2ed5e140 100644
--- a/crates/ide/src/diagnostics/unnecessary_map_to_list_in_comprehension.rs
+++ b/crates/ide/src/diagnostics/unnecessary_map_to_list_in_comprehension.rs
@@ -33,7 +33,7 @@ impl Linter for UnnecessaryMapToListInComprehensionLinter {
         "Unnecessary intermediate list allocated."
     }
 
-    fn severity(&self) -> Severity {
+    fn severity(&self, _sema: &Semantic, _file_id: FileId) -> Severity {
         Severity::WeakWarning
     }
 }

From 9860cc85f11a0c8681e6108e4e8ad8e170024ef5 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 21 Nov 2025 02:44:09 -0800
Subject: [PATCH 293/394] Publish OSS extension to OpenVSX marketplace

Summary:
As requested by several users:

https://github.com/WhatsApp/erlang-language-platform/issues/127

We can publish the extension to the open-vsx.org marketplace, in addition to the Microsoft one.

This enables using ELP in VSCodium.

Reviewed By: alanz

Differential Revision: D87625612

fbshipit-source-id: 8ee143cc3853b7ded04193802d32e164602be8d0
---
 .github/workflows/ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 471b9d2418..0a2bb2508f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -200,6 +200,8 @@ jobs:
           node-version: 20
       - name: Install VSCE
         run: npm install -g vsce
+      - name: Install OVSX
+        run: npm install -g ovsx
       - name: Prepare VS Code Extension to host binaries (No Windows)
         if: matrix.os != 'windows'
         run: mkdir -p editors/code/bin
@@ -285,3 +287,7 @@ jobs:
         working-directory: editors/code
         if: ${{ github.event_name == 'release' && matrix.vscode-publish && matrix.os != 'windows' }}
         run: vsce publish -p ${{ secrets.VSCE_PAT }} --packagePath erlang-language-platform.vsix
+      - name: Publish extension to OpenVSX marketplace
+        working-directory: editors/code
+        if: ${{ github.event_name == 'release' && matrix.vscode-publish && matrix.os != 'windows' }}
+        run: ovsx publish -p ${{ secrets.OVSX_PAT }} --packagePath erlang-language-platform.vsix

From 5470044b61d95e02db0cabb0987b0a456bc5a858 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 21 Nov 2025 05:49:13 -0800
Subject: [PATCH 294/394] Bump js-yaml from 4.1.0 to 4.1.1 and glob from 10.4.5
 to 10.5.0

Summary: Fix https://github.com/nodeca/js-yaml/security/advisories/GHSA-mh29-5h37-fv8m and https://github.com/isaacs/node-glob/security/advisories/GHSA-5j98-mcp5-4vw2

Reviewed By: jcpetruzza

Differential Revision: D87634207

fbshipit-source-id: 50ef19e9b138252d43a631b2c9501ca9a764b74a
---
 editors/code/package-lock.json | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 1e62d62162..5e28184214 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -1448,10 +1448,11 @@
       "dev": true
     },
     "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -1624,9 +1625,9 @@
       }
     },
     "node_modules/mocha/node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+      "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -3399,9 +3400,9 @@
       "dev": true
     },
     "js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
+      "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
       "dev": true,
       "requires": {
         "argparse": "^2.0.1"
@@ -3532,9 +3533,9 @@
           }
         },
         "glob": {
-          "version": "10.4.5",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-          "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+          "version": "10.5.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz",
+          "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==",
           "dev": true,
           "requires": {
             "foreground-child": "^3.1.0",

From fbdb3e1baf1e2c8ce7c9ee4bda979a3b8bf71c07 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 21 Nov 2025 08:12:17 -0800
Subject: [PATCH 295/394] ssr: Improve rendering of result

Summary:
Inside ELP an SSR match is exposed as a diagnostic.  So the way it is output to the command line is as a diagnostic, giving location and the pattern that matched.

This is not very useful when exploring a code base from the command line.

This diff brings the ability to show the source for a matching diagnostic.  The command line interface is modeled on the one for grep, so it should be familiar to users.

It will automatically use colour if in a TTY context, but this can be controlled via CLI or environment variable.

Reviewed By: TD5

Differential Revision: D87634862

fbshipit-source-id: 52604d21100274b2abba9e364acbb972914aa4ac
---
 crates/elp/src/bin/args.rs                    |  42 +++
 crates/elp/src/bin/main.rs                    |  17 +
 crates/elp/src/bin/ssr_cli.rs                 | 355 +++++++++++++++++-
 ...e_elp_no_lint_specified_json_output.stdout |   1 +
 .../parse_elp_no_lint_specified_output.stdout |   3 +-
 .../resources/test/linter/ssr_ad_hoc.stdout   |   3 +-
 .../test/linter/ssr_ad_hoc_cli.stdout         |   3 +-
 .../test/linter/ssr_context_separator.stdout  |  17 +
 .../test/linter/warnings_as_errors.stdout     |   3 +-
 crates/elp/src/resources/test/ssr_help.stdout |  37 +-
 test_projects/linter/app_a/src/app_a.erl      |   6 +
 11 files changed, 463 insertions(+), 24 deletions(-)
 create mode 100644 crates/elp/src/resources/test/linter/ssr_context_separator.stdout

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index b80bae0ff6..93356a202b 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -389,6 +389,40 @@ pub struct Ssr {
     /// Dump a configuration snippet that can be put in .elp_lint.toml to match the given SSR patterns
     pub dump_config: bool,
 
+    /// Show source code context for matches
+    #[bpaf(long("show-source"))]
+    pub show_source: bool,
+
+    /// Print NUM lines of leading context, enables --show-source
+    #[bpaf(short('B'), long("before-context"), argument("NUM"))]
+    pub before_context: Option<usize>,
+
+    /// Print NUM lines of trailing context, enables --show-source
+    #[bpaf(short('A'), long("after-context"), argument("NUM"))]
+    pub after_context: Option<usize>,
+
+    /// Print NUM lines of output context, enables --show-source
+    #[bpaf(short('C'), long("context"), argument("NUM"))]
+    pub context: Option<usize>,
+
+    /// Print SEP on line between matches with context, enables --show-source
+    #[bpaf(long("group-separator"), argument("SEP"))]
+    pub group_separator: Option<String>,
+
+    /// Do not print separator for matches with context, enables --show-source
+    #[bpaf(long("no-group-separator"))]
+    pub no_group_separator: bool,
+
+    /// Use markers to highlight the matching strings; WHEN is 'always', 'never', or 'auto'
+    #[bpaf(
+        long("color"),
+        long("colour"),
+        argument("WHEN"),
+        fallback(Some("auto".to_string())),
+        guard(color_guard, "Please use always, never, or auto")
+    )]
+    pub color: Option<String>,
+
     /// Report system memory usage and other statistics
     #[bpaf(long("report-system-stats"))]
     pub report_system_stats: bool,
@@ -743,6 +777,14 @@ fn macros_guard(format: &Option<String>) -> bool {
     }
 }
 
+fn color_guard(color: &Option<String>) -> bool {
+    match color {
+        None => true,
+        Some(c) if c == "always" || c == "never" || c == "auto" => true,
+        _ => false,
+    }
+}
+
 #[allow(clippy::ptr_arg)] // This is needed in the BPAF macros
 fn at_least_1(data: &Vec<String>) -> bool {
     !data.is_empty()
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 4cec310e22..fb551f4aee 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -2041,6 +2041,23 @@ mod tests {
         )
     }
 
+    #[test]
+    fn lint_ssr_with_context_and_separator() {
+        simple_snapshot(
+            args_vec![
+                "ssr",
+                "--context", "2",
+                "--group-separator", "====",
+                "--colour", "never"
+                "{_@A, _@B}",
+            ],
+            "linter",
+            expect_file!("../resources/test/linter/ssr_context_separator.stdout"),
+            true,
+            None,
+        )
+    }
+
     #[test]
     fn lint_ssr_as_cli_arg_multiple_patterns() {
         simple_snapshot(
diff --git a/crates/elp/src/bin/ssr_cli.rs b/crates/elp/src/bin/ssr_cli.rs
index f3b4c4339f..46143d1616 100644
--- a/crates/elp/src/bin/ssr_cli.rs
+++ b/crates/elp/src/bin/ssr_cli.rs
@@ -9,6 +9,7 @@
  */
 
 use std::fs;
+use std::io::IsTerminal;
 use std::path::Path;
 use std::str;
 use std::time::SystemTime;
@@ -30,6 +31,7 @@ use elp_ide::diagnostics::FallBackToAll;
 use elp_ide::diagnostics::LintConfig;
 use elp_ide::diagnostics::LintsFromConfig;
 use elp_ide::diagnostics::MatchSsr;
+use elp_ide::elp_ide_db::LineCol;
 use elp_ide::elp_ide_db::elp_base_db::AbsPath;
 use elp_ide::elp_ide_db::elp_base_db::FileId;
 use elp_ide::elp_ide_db::elp_base_db::IncludeOtp;
@@ -218,11 +220,84 @@ pub fn run_ssr(
                 }
             }
         } else {
-            writeln!(cli, "Matches found in {} modules:", diags.len())?;
+            // Determine if we should show source context
+            // If any context flags are set, automatically enable source display
+            let show_source = args.show_source
+                || args.before_context.is_some()
+                || args.after_context.is_some()
+                || args.context.is_some()
+                || args.group_separator.is_some()
+                || args.no_group_separator;
+            let (before_lines, after_lines) = calculate_context_lines(args);
+            let has_context = before_lines > 0 || after_lines > 0;
+            let group_separator = should_show_group_separator(args, has_context && show_source);
+            let mut first_match = true;
+
+            if !show_source {
+                writeln!(cli, "Matches found in {} modules:", diags.len())?;
+            }
+
             for (name, file_id, diags) in &diags {
-                writeln!(cli, "  {}: {}", name, diags.len())?;
+                if !show_source {
+                    writeln!(cli, "  {}: {}", name, diags.len())?;
+                }
                 for diag in diags {
-                    print_diagnostic(diag, &loaded.analysis(), *file_id, false, cli)?;
+                    // Print group separator before each match (except the first) if showing source with context
+                    if show_source
+                        && !first_match
+                        && let Some(ref sep) = group_separator
+                    {
+                        writeln!(cli, "{}", sep)?;
+                    }
+                    first_match = false;
+
+                    // Get relative path for diagnostic output
+                    let vfs_path = loaded.vfs.file_path(*file_id);
+                    let analysis = loaded.analysis();
+                    let root_path = &analysis
+                        .project_data(*file_id)
+                        .unwrap_or_else(|_err| panic!("could not find project data"))
+                        .unwrap_or_else(|| panic!("could not find project data"))
+                        .root_dir;
+                    let relative_path = reporting::get_relative_path(root_path, vfs_path);
+
+                    // Only show path when showing source context
+                    let path_to_show = if show_source {
+                        Some(relative_path)
+                    } else {
+                        None
+                    };
+                    print_diagnostic(diag, &loaded.analysis(), *file_id, path_to_show, false, cli)?;
+
+                    // Only show source context if --show-source or --show-source-markers is set
+                    if show_source {
+                        // Determine if color should be used
+                        let should_show_color = should_use_color(args);
+
+                        // When not using color, always use markers to indicate the match
+                        if should_show_color {
+                            print_source_with_context(
+                                diag,
+                                &loaded.analysis(),
+                                *file_id,
+                                before_lines,
+                                after_lines,
+                                true, // use_color
+                                cli,
+                            )?;
+                        } else {
+                            // No color: use markers to indicate the match
+                            print_source_with_context_markers(
+                                diag,
+                                &loaded.analysis(),
+                                *file_id,
+                                before_lines,
+                                after_lines,
+                                cli,
+                            )?;
+                        }
+                        writeln!(cli)?; // Add blank line after source context
+                    }
                 }
             }
         }
@@ -299,7 +374,6 @@ fn do_parse_one(
         config
             .lints_from_config
             .get_diagnostics(&mut diags, &sema, file_id);
-        sema.parse(file_id);
         diags
     })?;
 
@@ -315,11 +389,17 @@ fn print_diagnostic(
     diag: &diagnostics::Diagnostic,
     analysis: &Analysis,
     file_id: FileId,
+    path: Option<&Path>,
     use_cli_severity: bool,
     cli: &mut dyn Cli,
 ) -> Result<(), anyhow::Error> {
     let line_index = analysis.line_index(file_id)?;
-    writeln!(cli, "      {}", diag.print(&line_index, use_cli_severity))?;
+    let diag_str = diag.print(&line_index, use_cli_severity);
+    if let Some(path) = path {
+        writeln!(cli, "{}:{}", path.display(), diag_str)?;
+    } else {
+        writeln!(cli, "      {}", diag_str)?;
+    }
     Ok(())
 }
 
@@ -343,3 +423,268 @@ fn print_diagnostic_json(
     )?;
     Ok(())
 }
+
+/// Print a line with color highlighting
+fn print_line_with_color(
+    line_num: usize,
+    line_content: &str,
+    is_match_line: bool,
+    start: &LineCol,
+    end: &LineCol,
+    current_line: u32,
+    cli: &mut dyn Cli,
+) -> Result<(), anyhow::Error> {
+    // Line number in gray
+    write!(cli, "\x1b[90m{:4} |\x1b[0m ", line_num)?;
+
+    if !is_match_line {
+        // Non-match line: print normally
+        writeln!(cli, "{}", line_content)?;
+    } else {
+        // Match line: highlight the matched portion
+        if current_line == start.line && current_line == end.line {
+            // Single-line match
+            let start_col = start.col_utf16 as usize;
+            let end_col = end.col_utf16 as usize;
+
+            let before = &line_content[..start_col.min(line_content.len())];
+            let matched =
+                &line_content[start_col.min(line_content.len())..end_col.min(line_content.len())];
+            let after = &line_content[end_col.min(line_content.len())..];
+
+            write!(cli, "{}", before)?;
+            write!(cli, "\x1b[91;1m{}\x1b[0m", matched)?; // Red bold
+            writeln!(cli, "{}", after)?;
+        } else if current_line == start.line {
+            // First line of multi-line match
+            let start_col = start.col_utf16 as usize;
+            let before = &line_content[..start_col.min(line_content.len())];
+            let matched = &line_content[start_col.min(line_content.len())..];
+
+            write!(cli, "{}", before)?;
+            writeln!(cli, "\x1b[91;1m{}\x1b[0m", matched)?; // Red bold
+        } else if current_line == end.line {
+            // Last line of multi-line match
+            let end_col = end.col_utf16 as usize;
+            let matched = &line_content[..end_col.min(line_content.len())];
+            let after = &line_content[end_col.min(line_content.len())..];
+
+            write!(cli, "\x1b[91;1m{}\x1b[0m", matched)?; // Red bold
+            writeln!(cli, "{}", after)?;
+        } else {
+            // Middle line of multi-line match
+            writeln!(cli, "\x1b[91;1m{}\x1b[0m", line_content)?; // Red bold
+        }
+    }
+
+    Ok(())
+}
+
+/// Calculate context lines from the new grep-style arguments
+fn calculate_context_lines(args: &Ssr) -> (usize, usize) {
+    // -C/--context takes precedence and sets both before and after
+    if let Some(context) = args.context {
+        return (context, context);
+    }
+
+    // Otherwise use individual before/after values, defaulting to 0
+    let before = args.before_context.unwrap_or(0);
+    let after = args.after_context.unwrap_or(0);
+    (before, after)
+}
+
+/// Determine if a group separator should be shown
+fn should_show_group_separator(args: &Ssr, has_context: bool) -> Option<String> {
+    // If --no-group-separator is set, don't show separator
+    if args.no_group_separator {
+        return None;
+    }
+
+    // Only show separators if there's context to separate
+    if !has_context {
+        return None;
+    }
+
+    // Use custom separator if provided, otherwise default to "--"
+    Some(
+        args.group_separator
+            .clone()
+            .unwrap_or_else(|| "--".to_string()),
+    )
+}
+
+/// Determine if color should be used based on the new --color argument
+fn should_use_color(args: &Ssr) -> bool {
+    match args.color.as_deref() {
+        Some("always") => true,
+        Some("never") => false,
+        Some("auto") | None => {
+            // Check NO_COLOR environment variable - if set (regardless of value), disable color
+            // Also check if stdout is connected to a TTY
+            std::env::var("NO_COLOR").is_err() && std::io::stdout().is_terminal()
+        }
+        _ => false, // Should be caught by the guard, but handle anyway
+    }
+}
+
+/// Print source code context with the specified before/after context lines
+fn print_source_with_context(
+    diag: &diagnostics::Diagnostic,
+    analysis: &Analysis,
+    file_id: FileId,
+    before_lines: usize,
+    after_lines: usize,
+    use_color: bool,
+    cli: &mut dyn Cli,
+) -> Result<(), anyhow::Error> {
+    let line_index = analysis.line_index(file_id)?;
+    let source = &analysis.file_text(file_id)?;
+
+    let range = diag.range;
+    let start = line_index.line_col(range.start());
+    let end = line_index.line_col(range.end());
+
+    let lines: Vec<&str> = source.lines().collect();
+    let total_lines = lines.len();
+
+    // Calculate the range of lines to display
+    let first_line = start.line.saturating_sub(before_lines as u32) as usize;
+    let last_line = ((end.line + after_lines as u32 + 1) as usize).min(total_lines);
+
+    // Display the source context
+    for line_idx in first_line..last_line {
+        let line_num = line_idx + 1;
+        let line_content = lines.get(line_idx).unwrap_or(&"");
+
+        // Check if this line contains part of the match
+        let is_match_line = line_idx >= start.line as usize && line_idx <= end.line as usize;
+
+        if use_color {
+            print_line_with_color(
+                line_num,
+                line_content,
+                is_match_line,
+                &start,
+                &end,
+                line_idx as u32,
+                cli,
+            )?;
+        } else {
+            // Just print the line without any highlighting
+            write!(cli, "{:4} | ", line_num)?;
+            writeln!(cli, "{}", line_content)?;
+        }
+    }
+
+    Ok(())
+}
+
+/// Print source code context with text markers
+fn print_source_with_context_markers(
+    diag: &diagnostics::Diagnostic,
+    analysis: &Analysis,
+    file_id: FileId,
+    before_lines: usize,
+    after_lines: usize,
+    cli: &mut dyn Cli,
+) -> Result<(), anyhow::Error> {
+    let line_index = analysis.line_index(file_id)?;
+    let source = &analysis.file_text(file_id)?;
+
+    let range = diag.range;
+    let start = line_index.line_col(range.start());
+    let end = line_index.line_col(range.end());
+
+    let lines: Vec<&str> = source.lines().collect();
+    let total_lines = lines.len();
+
+    // Calculate the range of lines to display
+    let first_line = start.line.saturating_sub(before_lines as u32) as usize;
+    let last_line = ((end.line + after_lines as u32 + 1) as usize).min(total_lines);
+
+    // Display the source context
+    for line_idx in first_line..last_line {
+        let line_num = line_idx + 1;
+        let line_content = lines.get(line_idx).unwrap_or(&"");
+
+        // Check if this line contains part of the match
+        let is_match_line = line_idx >= start.line as usize && line_idx <= end.line as usize;
+
+        print_line_with_markers(
+            line_num,
+            line_content,
+            is_match_line,
+            &start,
+            &end,
+            line_idx as u32,
+            cli,
+        )?;
+    }
+
+    Ok(())
+}
+
+/// Print a line with text markers (like diagnostic carets)
+fn print_line_with_markers(
+    line_num: usize,
+    line_content: &str,
+    is_match_line: bool,
+    start: &LineCol,
+    end: &LineCol,
+    current_line: u32,
+    cli: &mut dyn Cli,
+) -> Result<(), anyhow::Error> {
+    // Line number
+    write!(cli, "{:4} | ", line_num)?;
+    writeln!(cli, "{}", line_content)?;
+
+    if is_match_line {
+        // Print marker line with ^^^ under the match
+        write!(cli, "     | ")?; // Indent to match line content
+
+        if current_line == start.line && current_line == end.line {
+            // Single-line match
+            let start_col = start.col_utf16 as usize;
+            let end_col = end.col_utf16 as usize;
+            let marker_len = (end_col - start_col).max(1);
+
+            // Spaces before the marker
+            for _ in 0..start_col {
+                write!(cli, " ")?;
+            }
+            // Marker carets
+            for _ in 0..marker_len {
+                write!(cli, "^")?;
+            }
+            writeln!(cli)?;
+        } else if current_line == start.line {
+            // First line of multi-line match
+            let start_col = start.col_utf16 as usize;
+            let marker_len = line_content.len().saturating_sub(start_col).max(1);
+
+            for _ in 0..start_col {
+                write!(cli, " ")?;
+            }
+            for _ in 0..marker_len {
+                write!(cli, "^")?;
+            }
+            writeln!(cli)?;
+        } else if current_line == end.line {
+            // Last line of multi-line match
+            let end_col = end.col_utf16 as usize;
+
+            for _ in 0..end_col {
+                write!(cli, "^")?;
+            }
+            writeln!(cli)?;
+        } else {
+            // Middle line of multi-line match
+            for _ in 0..line_content.len() {
+                write!(cli, "^")?;
+            }
+            writeln!(cli)?;
+        }
+    }
+
+    Ok(())
+}
diff --git a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
index 0385484785..7608728f1e 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
@@ -4,6 +4,7 @@
 {"path":"app_a/src/app_a.erl","line":13,"char":5,"code":"ELP","severity":"warning","name":"W0026 (unexported_function)","original":null,"replacement":null,"description":"Function 'app_a:baz/2' is not exported.\n\nFor more information see: /erlang-error-index/w/W0026","docPath":"website/docs/erlang-error-index/w/W0026.md"}
 {"path":"app_a/src/app_a.erl","line":12,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function bar/0 is unused\n\nFor more information see: /erlang-error-index/l/L1230","docPath":null}
 {"path":"app_a/src/app_a.erl","line":16,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function baz/2 is unused\n\nFor more information see: /erlang-error-index/l/L1230","docPath":null}
+{"path":"app_a/src/app_a.erl","line":20,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function bat/2 is unused\n\nFor more information see: /erlang-error-index/l/L1230","docPath":null}
 {"path":"app_a/src/app_a_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"L1268 (L1268)","original":null,"replacement":null,"description":"variable 'X' is unused\n\nFor more information see: /erlang-error-index/l/L1268","docPath":null}
 {"path":"app_b/src/app_b.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0011 (application_get_env)","original":null,"replacement":null,"description":"module `app_b` belongs to app `app_b`, but reads env for `misc`\n\nFor more information see: /erlang-error-index/w/W0011","docPath":"website/docs/erlang-error-index/w/W0011.md"}
 {"path":"app_b/src/app_b_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"L1268 (L1268)","original":null,"replacement":null,"description":"variable 'X' is unused\n\nFor more information see: /erlang-error-index/l/L1268","docPath":null}
diff --git a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
index b2adfefad5..879f0e024c 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
@@ -1,12 +1,13 @@
 Reporting all diagnostics codes
 Diagnostics reported in 7 modules:
-  app_a: 6
+  app_a: 7
       5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
       9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
       8:7-8:8::[Warning] [W0018] Unexpected ';'
       13:5-13:14::[Warning] [W0026] Function 'app_a:baz/2' is not exported.
       12:1-12:4::[Warning] [L1230] function bar/0 is unused
       16:1-16:4::[Warning] [L1230] function baz/2 is unused
+      20:1-20:4::[Warning] [L1230] function bat/2 is unused
   app_a_unused_param: 1
       5:5-5:6::[Warning] [L1268] variable 'X' is unused
   app_b: 1
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc.stdout
index 9d331b77c3..b081749a91 100644
--- a/crates/elp/src/resources/test/linter/ssr_ad_hoc.stdout
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc.stdout
@@ -1,3 +1,4 @@
 Diagnostics reported in 1 modules:
-  app_a: 1
+  app_a: 2
       16:13-16:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
+      20:13-20:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli.stdout
index 4560a933ae..7e57212d83 100644
--- a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli.stdout
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli.stdout
@@ -1,3 +1,4 @@
 Matches found in 1 modules:
-  app_a: 1
+  app_a: 2
       16:13-16:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
+      20:13-20:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
diff --git a/crates/elp/src/resources/test/linter/ssr_context_separator.stdout b/crates/elp/src/resources/test/linter/ssr_context_separator.stdout
new file mode 100644
index 0000000000..99ac995b14
--- /dev/null
+++ b/crates/elp/src/resources/test/linter/ssr_context_separator.stdout
@@ -0,0 +1,17 @@
+app_a/src/app_a.erl:16:13-16:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
+  14 |     app_b:application_env_error().
+  15 | 
+  16 | baz(A,B) -> {A,B}.
+     |             ^^^^^
+  17 | 
+  18 | % Some more context, see if it renders
+
+====
+app_a/src/app_a.erl:20:13-20:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
+  18 | % Some more context, see if it renders
+  19 | 
+  20 | bat(A,B) -> {A,B}.
+     |             ^^^^^
+  21 | 
+  22 | % And some more context, see if it renders
+
diff --git a/crates/elp/src/resources/test/linter/warnings_as_errors.stdout b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
index 78880f4472..0625ceb723 100644
--- a/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
+++ b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
@@ -1,12 +1,13 @@
 Reporting all diagnostics codes
 Diagnostics reported in 7 modules:
-  app_a: 6
+  app_a: 7
       5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
       9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
       8:7-8:8::[Warning] [W0018] Unexpected ';'
       13:5-13:14::[Warning] [W0026] Function 'app_a:baz/2' is not exported.
       12:1-12:4::[Error] [L1230] function bar/0 is unused
       16:1-16:4::[Error] [L1230] function baz/2 is unused
+      20:1-20:4::[Error] [L1230] function bat/2 is unused
   app_a_unused_param: 1
       5:5-5:6::[Error] [L1268] variable 'X' is unused
   app_b: 1
diff --git a/crates/elp/src/resources/test/ssr_help.stdout b/crates/elp/src/resources/test/ssr_help.stdout
index 7e5d3f4559..982d2327e6 100644
--- a/crates/elp/src/resources/test/ssr_help.stdout
+++ b/crates/elp/src/resources/test/ssr_help.stdout
@@ -1,20 +1,27 @@
-Usage: [--project PROJECT] [--module MODULE] [--app APP] [--file FILE] [--rebar] [--as PROFILE] [--include-generated] [--include-tests] [[--format FORMAT]] [[--macros STRATEGY]] [--parens] [--dump-config] [--report-system-stats] <SSR_SPECS>...
+Usage: [--project PROJECT] [--module MODULE] [--app APP] [--file FILE] [--rebar] [--as PROFILE] [--include-generated] [--include-tests] [[--format FORMAT]] [[--macros STRATEGY]] [--parens] [--dump-config] [--show-source] [-B NUM] [-A NUM] [-C NUM] [--group-separator SEP] [--no-group-separator] [[--color WHEN]] [--report-system-stats] <SSR_SPECS>...
 
 Available positional items:
     <SSR_SPECS>  SSR specs to use
 
 Available options:
-        --project <PROJECT>    Path to directory with project, or to a JSON file (defaults to `.`)
-        --module <MODULE>      Parse a single module from the project, not the entire project.
-        --app <APP>            Parse a single application from the project, not the entire project.
-        --file <FILE>          Parse a single file from the project, not the entire project. This can be an include file or escript, etc.
-        --rebar                Run with rebar
-        --as <PROFILE>         Rebar3 profile to pickup (default is test)
-        --include-generated    Also generate diagnostics for generated files
-        --include-tests        Also generate diagnostics for test files
-        --format <FORMAT>      Show diagnostics in JSON format
-        --macros <STRATEGY>    Macro expansion strategy: expand | no-expand | visible-expand (default expand)
-        --parens               Explicitly match parentheses. If omitted, they are ignored.
-        --dump-config          Dump a configuration snippet that can be put in .elp_lint.toml to match the given SSR patterns
-        --report-system-stats  Report system memory usage and other statistics
-    -h, --help                 Prints help information
+        --project <PROJECT>      Path to directory with project, or to a JSON file (defaults to `.`)
+        --module <MODULE>        Parse a single module from the project, not the entire project.
+        --app <APP>              Parse a single application from the project, not the entire project.
+        --file <FILE>            Parse a single file from the project, not the entire project. This can be an include file or escript, etc.
+        --rebar                  Run with rebar
+        --as <PROFILE>           Rebar3 profile to pickup (default is test)
+        --include-generated      Also generate diagnostics for generated files
+        --include-tests          Also generate diagnostics for test files
+        --format <FORMAT>        Show diagnostics in JSON format
+        --macros <STRATEGY>      Macro expansion strategy: expand | no-expand | visible-expand (default expand)
+        --parens                 Explicitly match parentheses. If omitted, they are ignored.
+        --dump-config            Dump a configuration snippet that can be put in .elp_lint.toml to match the given SSR patterns
+        --show-source            Show source code context for matches
+    -B, --before-context <NUM>   Print NUM lines of leading context, enables --show-source
+    -A, --after-context <NUM>    Print NUM lines of trailing context, enables --show-source
+    -C, --context <NUM>          Print NUM lines of output context, enables --show-source
+        --group-separator <SEP>  Print SEP on line between matches with context, enables --show-source
+        --no-group-separator     Do not print separator for matches with context, enables --show-source
+        --color <WHEN>           Use markers to highlight the matching strings; WHEN is 'always', 'never', or 'auto'
+        --report-system-stats    Report system memory usage and other statistics
+    -h, --help                   Prints help information
diff --git a/test_projects/linter/app_a/src/app_a.erl b/test_projects/linter/app_a/src/app_a.erl
index 167b8e6d6d..86593395dd 100644
--- a/test_projects/linter/app_a/src/app_a.erl
+++ b/test_projects/linter/app_a/src/app_a.erl
@@ -14,3 +14,9 @@ bar() ->
     app_b:application_env_error().
 
 baz(A,B) -> {A,B}.
+
+% Some more context, see if it renders
+
+bat(A,B) -> {A,B}.
+
+% And some more context, see if it renders

From 0c2b43eb27b5c9a476abb83296f4ef4ad4b17d88 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 21 Nov 2025 10:19:14 -0800
Subject: [PATCH 296/394] ssr: add test explicitly using colour output

Summary: As title

Reviewed By: TD5

Differential Revision: D87651912

fbshipit-source-id: 347be29dbb6f0dd71396dbb404b2ac98a9dbabc0
---
 crates/elp/src/bin/main.rs                     | 17 +++++++++++++++++
 .../linter/ssr_context_separator_color.stdout  | 18 ++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 crates/elp/src/resources/test/linter/ssr_context_separator_color.stdout

diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index fb551f4aee..0684c50228 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -2058,6 +2058,23 @@ mod tests {
         )
     }
 
+    #[test]
+    fn lint_ssr_with_context_and_separator_color() {
+        simple_snapshot(
+            args_vec![
+                "ssr",
+                "--context", "2",
+                "--group-separator", "====",
+                "--colour", "always"
+                "{_@A, _@B}",
+            ],
+            "linter",
+            expect_file!("../resources/test/linter/ssr_context_separator_color.stdout"),
+            true,
+            None,
+        )
+    }
+
     #[test]
     fn lint_ssr_as_cli_arg_multiple_patterns() {
         simple_snapshot(
diff --git a/crates/elp/src/resources/test/linter/ssr_context_separator_color.stdout b/crates/elp/src/resources/test/linter/ssr_context_separator_color.stdout
new file mode 100644
index 0000000000..119d62a52b
--- /dev/null
+++ b/crates/elp/src/resources/test/linter/ssr_context_separator_color.stdout
@@ -0,0 +1,18 @@
+  app_a: 2
+app_a/src/app_a.erl:16:13-16:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
+  14 |     app_b:application_env_error().
+  15 | 
+  16 | baz(A,B) -> {A,B}.
+  17 | 
+  18 | % Some more context, see if it renders
+
+====
+app_a/src/app_a.erl:20:13-20:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
+  18 | % Some more context, see if it renders
+  19 | 
+  20 | bat(A,B) -> {A,B}.
+  21 | 
+  22 | % And some more context, see if it renders
+
+
+Matches found in 1 modules

From bc2c3f05d4eff3681364616b5f9423711765e62d Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Sat, 22 Nov 2025 06:22:58 -0800
Subject: [PATCH 297/394] Require glob >=10.5.0

Summary: Solves [GHSA-5j98-mcp5-4vw2](https://github.com/isaacs/node-glob/security/advisories/GHSA-5j98-mcp5-4vw2?fbclid=IwY2xjawONHSxleHRuA2FlbQIxMQBicmlkETFmTTVyb3hBUmNTbUNLeDlrc3J0YwZhcHBfaWQBMAABHt4eAVx-Yk7Cnshn0Hqrh-vQ8xKvHyVaF7_ovUMQhWSrRWN8um2ZimI4Vfmu_aem_B4s_KCafXrEOOcNU-AnJRA).

Reviewed By: TheGeorge

Differential Revision: D87628344

fbshipit-source-id: ab6ff51e5ddade4b93318606d573e6f7e5d043d5
---
 website/package.json |  3 +-
 website/yarn.lock    | 83 ++++++++++++++++++++------------------------
 2 files changed, 39 insertions(+), 47 deletions(-)

diff --git a/website/package.json b/website/package.json
index 5d813e2035..f8f738328c 100644
--- a/website/package.json
+++ b/website/package.json
@@ -62,6 +62,7 @@
     "brace-expansion": ">=1.1.12",
     "webpack-dev-server": ">=5.2.1",
     "on-headers": ">=1.1.0",
-    "mermaid": ">=11.10.0"
+    "mermaid": ">=11.10.0",
+    "glob": ">=10.5.0"
   }
 }
diff --git a/website/yarn.lock b/website/yarn.lock
index 1aa091c893..182874330e 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -2059,6 +2059,18 @@
     local-pkg "^1.0.0"
     mlly "^1.7.4"
 
+"@isaacs/balanced-match@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz#3081dadbc3460661b751e7591d7faea5df39dd29"
+  integrity sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==
+
+"@isaacs/brace-expansion@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz#4b3dabab7d8e75a429414a96bd67bf4c1d13e0f3"
+  integrity sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==
+  dependencies:
+    "@isaacs/balanced-match" "^4.0.1"
+
 "@jest/schemas@^29.6.3":
   version "29.6.3"
   resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-29.6.3.tgz#430b5ce8a4e0044a7e3819663305a7b3091c8e03"
@@ -3636,7 +3648,7 @@ boxen@^7.0.0:
     widest-line "^4.0.1"
     wrap-ansi "^8.1.0"
 
-brace-expansion@>=1.1.12, brace-expansion@^1.1.7, brace-expansion@^2.0.1:
+brace-expansion@>=1.1.12, brace-expansion@^1.1.7:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-4.0.1.tgz#3387e13eaa2992025d05ea47308f77e4a8dedd1e"
   integrity sha512-YClrbvTCXGe70pU2JiEiPLYXO9gQkyxYeKpJIQHVS/gOs6EWMQP2RYBwjFLNT322Ji8TOC3IMPfsYCedNpzKfA==
@@ -4187,7 +4199,7 @@ cosmiconfig@^8.1.3, cosmiconfig@^8.3.5:
     parse-json "^5.2.0"
     path-type "^4.0.0"
 
-cross-spawn@>=6.0.6, cross-spawn@^7.0.0, cross-spawn@^7.0.3:
+cross-spawn@>=6.0.6, cross-spawn@^7.0.3:
   version "7.0.6"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
   integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
@@ -5519,14 +5531,6 @@ for-each@^0.3.3:
   dependencies:
     is-callable "^1.1.3"
 
-foreground-child@^3.1.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.3.0.tgz#0ac8644c06e431439f8561db8ecf29a7b5519c77"
-  integrity sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==
-  dependencies:
-    cross-spawn "^7.0.0"
-    signal-exit "^4.0.1"
-
 form-data-encoder@^2.1.2:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-2.1.4.tgz#261ea35d2a70d48d30ec7a9603130fa5515e9cd5"
@@ -5650,17 +5654,14 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@^10.3.10:
-  version "10.4.5"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
-  integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
+glob@>=10.5.0, glob@^10.3.10:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-13.0.0.tgz#9d9233a4a274fc28ef7adce5508b7ef6237a1be3"
+  integrity sha512-tvZgpqk6fz4BaNZ66ZsRaZnbHvP/jG3uKJvAZOwEVUL4RTA5nJeeLYfyN9/VA8NX/V3IBG+hkeuGpKjvELkVhA==
   dependencies:
-    foreground-child "^3.1.0"
-    jackspeak "^3.1.2"
-    minimatch "^9.0.4"
+    minimatch "^10.1.1"
     minipass "^7.1.2"
-    package-json-from-dist "^1.0.0"
-    path-scurry "^1.11.1"
+    path-scurry "^2.0.0"
 
 global-dirs@^3.0.0:
   version "3.0.1"
@@ -6593,7 +6594,7 @@ isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
-jackspeak@2.1.1, jackspeak@^3.1.2:
+jackspeak@2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.1.1.tgz#2a42db4cfbb7e55433c28b6f75d8b796af9669cd"
   integrity sha512-juf9stUEwUaILepraGOWIJTLwg48bUnBmRqd2ln2Os1sW987zeoj/hzhbvRB95oMuS2ZTpjULmdwHNX4rzZIZw==
@@ -6887,10 +6888,10 @@ lowercase-keys@^3.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-3.0.0.tgz#c5e7d442e37ead247ae9db117a9d0a467c89d4f2"
   integrity sha512-ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==
 
-lru-cache@^10.2.0:
-  version "10.4.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
-  integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
+lru-cache@^11.0.0:
+  version "11.2.2"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.2.2.tgz#40fd37edffcfae4b2940379c0722dc6eeaa75f24"
+  integrity sha512-F9ODfyqML2coTIsQpSkRHnLSZMtkU8Q+mSfcaIyKwy58u+8k5nvAYeiNhsyMARvzNcXJ9QfWVrcPsC9e9rAxtg==
 
 lru-cache@^5.1.1:
   version "5.1.1"
@@ -8254,19 +8255,19 @@ minimatch@3.1.2, minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^9.0.4:
-  version "9.0.5"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.5.tgz#d74f9dd6b57d83d8e98cfb82133b03978bc929e5"
-  integrity sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==
+minimatch@^10.1.1:
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.1.1.tgz#e6e61b9b0c1dcab116b5a7d1458e8b6ae9e73a55"
+  integrity sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==
   dependencies:
-    brace-expansion "^2.0.1"
+    "@isaacs/brace-expansion" "^5.0.0"
 
 minimist@^1.2.0:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
-"minipass@^5.0.0 || ^6.0.2 || ^7.0.0", minipass@^7.1.2:
+minipass@^7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
   integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
@@ -8585,11 +8586,6 @@ p-timeout@^3.2.0:
   dependencies:
     p-finally "^1.0.0"
 
-package-json-from-dist@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505"
-  integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==
-
 package-json@^8.1.0:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/package-json/-/package-json-8.1.1.tgz#3e9948e43df40d1e8e78a85485f1070bf8f03dc8"
@@ -8724,13 +8720,13 @@ path-root@^0.1.1:
   dependencies:
     path-root-regex "^0.1.0"
 
-path-scurry@^1.11.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.11.1.tgz#7960a668888594a0720b12a911d1a742ab9f11d2"
-  integrity sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==
+path-scurry@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-2.0.1.tgz#4b6572376cfd8b811fca9cd1f5c24b3cbac0fe10"
+  integrity sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==
   dependencies:
-    lru-cache "^10.2.0"
-    minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
+    lru-cache "^11.0.0"
+    minipass "^7.1.2"
 
 path-to-regexp@0.1.12:
   version "0.1.12"
@@ -10297,11 +10293,6 @@ signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
-signal-exit@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
-  integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
-
 sirv@^2.0.3:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/sirv/-/sirv-2.0.4.tgz#5dd9a725c578e34e449f332703eb2a74e46a29b0"

From 473c0f1c5620f1560381f3e64b25b9385e4262d9 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 24 Nov 2025 02:55:57 -0800
Subject: [PATCH 298/394] Fix failing test

Summary: As title

Reviewed By: ilya-klyuchnikov, michalmuskala

Differential Revision: D87765456

fbshipit-source-id: deb9fc32f4bc547215619e43fecdaecf7ceb5a0f
---
 .../resources/test/linter/ssr_context_separator_color.stdout   | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/crates/elp/src/resources/test/linter/ssr_context_separator_color.stdout b/crates/elp/src/resources/test/linter/ssr_context_separator_color.stdout
index 119d62a52b..139250e2f2 100644
--- a/crates/elp/src/resources/test/linter/ssr_context_separator_color.stdout
+++ b/crates/elp/src/resources/test/linter/ssr_context_separator_color.stdout
@@ -1,4 +1,3 @@
-  app_a: 2
 app_a/src/app_a.erl:16:13-16:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
   14 |     app_b:application_env_error().
   15 | 
@@ -14,5 +13,3 @@ app_a/src/app_a.erl:20:13-20:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern m
   21 | 
   22 | % And some more context, see if it renders
 
-
-Matches found in 1 modules

From 0de513221f8ea2eaa401de92c04d11cbccc8a5a9 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 24 Nov 2025 05:04:16 -0800
Subject: [PATCH 299/394] ssr: stream command line match results

Summary:
It is annoying to wait for the entire body of code to be processed before seing results. Since the ssr search is based purely on the ast of a module, the search is embarrasingle trivial.

So report the results as they are found.

This does mean the summary statistic has to come at the end.

Reviewed By: TD5

Differential Revision: D87651432

fbshipit-source-id: b51b7bd94f8069113154adac9b1bf68f9b7351b3
---
 crates/elp/src/bin/ssr_cli.rs                 | 295 ++++++++++--------
 .../test/linter/ssr_ad_hoc_cli.stdout         |   3 +-
 .../ssr_ad_hoc_cli_macros_expand.stdout       |   3 +-
 .../ssr_ad_hoc_cli_macros_no_expand.stdout    |   3 +-
 ...sr_ad_hoc_cli_macros_visible_expand.stdout |   3 +-
 .../linter/ssr_ad_hoc_cli_multiple.stdout     |   3 +-
 .../ssr_ad_hoc_cli_parens_invisible.stdout    |   3 +-
 .../ssr_ad_hoc_cli_parens_visible.stdout      |   3 +-
 .../test/linter/ssr_context_separator.stdout  |   3 +
 9 files changed, 182 insertions(+), 137 deletions(-)

diff --git a/crates/elp/src/bin/ssr_cli.rs b/crates/elp/src/bin/ssr_cli.rs
index 46143d1616..9a080a4907 100644
--- a/crates/elp/src/bin/ssr_cli.rs
+++ b/crates/elp/src/bin/ssr_cli.rs
@@ -12,10 +12,12 @@ use std::fs;
 use std::io::IsTerminal;
 use std::path::Path;
 use std::str;
+use std::thread;
 use std::time::SystemTime;
 
 use anyhow::Result;
 use anyhow::bail;
+use crossbeam_channel::unbounded;
 use elp::build::load;
 use elp::build::types::LoadResult;
 use elp::cli::Cli;
@@ -44,7 +46,6 @@ use elp_project_model::AppType;
 use elp_project_model::DiscoverConfig;
 use elp_project_model::buck::BuckQueryConfig;
 use hir::Semantic;
-use indicatif::ParallelProgressIterator;
 use paths::Utf8PathBuf;
 use rayon::prelude::ParallelBridge;
 use rayon::prelude::ParallelIterator;
@@ -181,8 +182,22 @@ pub fn run_ssr(
         },
     };
 
-    let mut diags = match (file_id, name) {
-        (None, _) => do_parse_all(cli, &analysis, &loaded.project_id, diagnostics_config, args)?,
+    let mut match_count = 0;
+
+    match (file_id, name) {
+        (None, _) => {
+            // Streaming case: process all modules
+            let project_id = loaded.project_id;
+            do_parse_all_streaming(
+                cli,
+                &analysis,
+                &project_id,
+                diagnostics_config,
+                args,
+                loaded,
+                &mut match_count,
+            )?;
+        }
         (Some(file_id), Some(name)) => {
             if let Some(app) = &args.app
                 && let Ok(Some(file_app)) = analysis.file_app_name(file_id)
@@ -190,115 +205,170 @@ pub fn run_ssr(
             {
                 panic!("Module {} does not belong to app {}", name.as_str(), app)
             }
-            do_parse_one(&analysis, diagnostics_config, file_id, &name, args)?
-                .map_or(vec![], |x| vec![x])
+            if let Some(diag) = do_parse_one(&analysis, diagnostics_config, file_id, &name, args)? {
+                match_count = 1;
+                print_single_result(cli, loaded, &diag, args)?;
+            }
         }
         (Some(file_id), _) => {
             panic!("Could not get name from file_id for {file_id:?}")
         }
     };
-    if diags.is_empty() {
+
+    if match_count == 0 {
         if args.is_format_normal() {
             writeln!(cli, "No matches found")?;
         }
-    } else {
-        diags.sort_by(|(a, _, _), (b, _, _)| a.cmp(b));
-        if args.is_format_json() {
-            for (_name, file_id, diags) in &diags {
-                for diag in diags {
-                    // We use JSON output for CI, and want to see warnings too.
-                    // So do not filter on errors only
-                    let vfs_path = loaded.vfs.file_path(*file_id);
-                    let analysis = loaded.analysis();
-                    let root_path = &analysis
-                        .project_data(*file_id)
-                        .unwrap_or_else(|_err| panic!("could not find project data"))
-                        .unwrap_or_else(|| panic!("could not find project data"))
-                        .root_dir;
-                    let relative_path = reporting::get_relative_path(root_path, vfs_path);
-                    print_diagnostic_json(diag, &analysis, *file_id, relative_path, false, cli)?;
-                }
-            }
-        } else {
-            // Determine if we should show source context
-            // If any context flags are set, automatically enable source display
-            let show_source = args.show_source
-                || args.before_context.is_some()
-                || args.after_context.is_some()
-                || args.context.is_some()
-                || args.group_separator.is_some()
-                || args.no_group_separator;
-            let (before_lines, after_lines) = calculate_context_lines(args);
-            let has_context = before_lines > 0 || after_lines > 0;
-            let group_separator = should_show_group_separator(args, has_context && show_source);
-            let mut first_match = true;
+    } else if args.is_format_normal() {
+        writeln!(cli, "\nMatches found in {} modules", match_count)?;
+    }
 
-            if !show_source {
-                writeln!(cli, "Matches found in {} modules:", diags.len())?;
-            }
+    Ok(())
+}
 
-            for (name, file_id, diags) in &diags {
-                if !show_source {
-                    writeln!(cli, "  {}: {}", name, diags.len())?;
-                }
-                for diag in diags {
-                    // Print group separator before each match (except the first) if showing source with context
-                    if show_source
-                        && !first_match
-                        && let Some(ref sep) = group_separator
+fn do_parse_all_streaming(
+    cli: &mut dyn Cli,
+    analysis: &Analysis,
+    project_id: &ProjectId,
+    config: &DiagnosticsConfig,
+    args: &Ssr,
+    loaded: &mut LoadResult,
+    match_count: &mut usize,
+) -> Result<()> {
+    let module_index = analysis.module_index(*project_id).unwrap();
+    let app_name = args.app.as_ref().map(|name| AppName(name.to_string()));
+
+    // Create a channel for streaming results
+    let (tx, rx) = unbounded();
+
+    // Spawn a thread to process modules in parallel and send results
+    let analysis_clone = analysis.clone();
+    let config_clone = config.clone();
+    let args_clone = args.clone();
+
+    // Collect modules into an owned vector
+    let modules: Vec<_> = module_index
+        .iter_own()
+        .map(|(name, source, file_id)| (name.as_str().to_string(), source, file_id))
+        .collect();
+
+    thread::spawn(move || {
+        modules
+            .into_iter()
+            .par_bridge()
+            .map_with(
+                (analysis_clone, tx),
+                |(db, tx), (module_name, _file_source, file_id)| {
+                    if !otp_file_to_ignore(db, file_id)
+                        && db.file_app_type(file_id).ok() != Some(Some(AppType::Dep))
+                        && (app_name.is_none()
+                            || db.file_app_name(file_id).ok().as_ref() == Some(&app_name))
+                        && let Ok(Some(result)) =
+                            do_parse_one(db, &config_clone, file_id, &module_name, &args_clone)
                     {
-                        writeln!(cli, "{}", sep)?;
+                        // Send result through channel
+                        let _ = tx.send(result);
                     }
-                    first_match = false;
+                },
+            )
+            .for_each(|_| {}); // Consume the iterator
+        // Channel is dropped here, signaling end of results
+    });
 
-                    // Get relative path for diagnostic output
-                    let vfs_path = loaded.vfs.file_path(*file_id);
-                    let analysis = loaded.analysis();
-                    let root_path = &analysis
-                        .project_data(*file_id)
-                        .unwrap_or_else(|_err| panic!("could not find project data"))
-                        .unwrap_or_else(|| panic!("could not find project data"))
-                        .root_dir;
-                    let relative_path = reporting::get_relative_path(root_path, vfs_path);
+    // Process and print results as they arrive from the channel
+    for result in rx {
+        *match_count += 1;
+        print_single_result(cli, loaded, &result, args)?;
+    }
 
-                    // Only show path when showing source context
-                    let path_to_show = if show_source {
-                        Some(relative_path)
-                    } else {
-                        None
-                    };
-                    print_diagnostic(diag, &loaded.analysis(), *file_id, path_to_show, false, cli)?;
+    Ok(())
+}
 
-                    // Only show source context if --show-source or --show-source-markers is set
-                    if show_source {
-                        // Determine if color should be used
-                        let should_show_color = should_use_color(args);
+fn print_single_result(
+    cli: &mut dyn Cli,
+    loaded: &mut LoadResult,
+    result: &(String, FileId, Vec<diagnostics::Diagnostic>),
+    args: &Ssr,
+) -> Result<()> {
+    let (name, file_id, diags) = result;
 
-                        // When not using color, always use markers to indicate the match
-                        if should_show_color {
-                            print_source_with_context(
-                                diag,
-                                &loaded.analysis(),
-                                *file_id,
-                                before_lines,
-                                after_lines,
-                                true, // use_color
-                                cli,
-                            )?;
-                        } else {
-                            // No color: use markers to indicate the match
-                            print_source_with_context_markers(
-                                diag,
-                                &loaded.analysis(),
-                                *file_id,
-                                before_lines,
-                                after_lines,
-                                cli,
-                            )?;
-                        }
-                        writeln!(cli)?; // Add blank line after source context
-                    }
+    if args.is_format_json() {
+        for diag in diags {
+            let vfs_path = loaded.vfs.file_path(*file_id);
+            let analysis = loaded.analysis();
+            let root_path = &analysis
+                .project_data(*file_id)
+                .unwrap_or_else(|_err| panic!("could not find project data"))
+                .unwrap_or_else(|| panic!("could not find project data"))
+                .root_dir;
+            let relative_path = reporting::get_relative_path(root_path, vfs_path);
+            print_diagnostic_json(diag, &analysis, *file_id, relative_path, false, cli)?;
+        }
+    } else {
+        writeln!(cli, "  {}: {}", name, diags.len())?;
+
+        // Determine if we should show source context
+        let show_source = args.show_source
+            || args.before_context.is_some()
+            || args.after_context.is_some()
+            || args.context.is_some()
+            || args.group_separator.is_some()
+            || args.no_group_separator;
+        let (before_lines, after_lines) = calculate_context_lines(args);
+        let has_context = before_lines > 0 || after_lines > 0;
+        let group_separator = should_show_group_separator(args, has_context && show_source);
+
+        for (idx, diag) in diags.iter().enumerate() {
+            // Print group separator before each match (except the first) if showing source with context
+            if show_source
+                && idx > 0
+                && let Some(ref sep) = group_separator
+            {
+                writeln!(cli, "{}", sep)?;
+            }
+            // Get relative path for diagnostic output
+            let vfs_path = loaded.vfs.file_path(*file_id);
+            let analysis = loaded.analysis();
+            let root_path = &analysis
+                .project_data(*file_id)
+                .unwrap_or_else(|_err| panic!("could not find project data"))
+                .unwrap_or_else(|| panic!("could not find project data"))
+                .root_dir;
+            let relative_path = reporting::get_relative_path(root_path, vfs_path);
+
+            // Only show path when showing source context
+            let path_to_show = if show_source {
+                Some(relative_path)
+            } else {
+                None
+            };
+            print_diagnostic(diag, &loaded.analysis(), *file_id, path_to_show, false, cli)?;
+
+            // Only show source context if --show-source or --show-source-markers is set
+            if show_source {
+                let should_show_color = should_use_color(args);
+
+                if should_show_color {
+                    print_source_with_context(
+                        diag,
+                        &loaded.analysis(),
+                        *file_id,
+                        before_lines,
+                        after_lines,
+                        true,
+                        cli,
+                    )?;
+                } else {
+                    print_source_with_context_markers(
+                        diag,
+                        &loaded.analysis(),
+                        *file_id,
+                        before_lines,
+                        after_lines,
+                        cli,
+                    )?;
                 }
+                writeln!(cli)?;
             }
         }
     }
@@ -321,41 +391,6 @@ fn load_project(
         query_config,
     )
 }
-
-fn do_parse_all(
-    cli: &dyn Cli,
-    analysis: &Analysis,
-    project_id: &ProjectId,
-    config: &DiagnosticsConfig,
-    args: &Ssr,
-) -> Result<Vec<(String, FileId, Vec<diagnostics::Diagnostic>)>> {
-    let module_index = analysis.module_index(*project_id).unwrap();
-    let module_iter = module_index.iter_own();
-
-    let pb = cli.progress(module_iter.len() as u64, "Scanning modules");
-    let app_name = args.app.as_ref().map(|name| AppName(name.to_string()));
-
-    Ok(module_iter
-        .par_bridge()
-        .progress_with(pb)
-        .map_with(
-            analysis.clone(),
-            |db, (module_name, _file_source, file_id)| {
-                if !otp_file_to_ignore(db, file_id)
-                    && db.file_app_type(file_id).ok() != Some(Some(AppType::Dep))
-                    && (app_name.is_none()
-                        || db.file_app_name(file_id).ok().as_ref() == Some(&app_name))
-                {
-                    do_parse_one(db, config, file_id, module_name.as_str(), args).unwrap()
-                } else {
-                    None
-                }
-            },
-        )
-        .flatten()
-        .collect())
-}
-
 fn do_parse_one(
     db: &Analysis,
     config: &DiagnosticsConfig,
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli.stdout
index 7e57212d83..e673a7be31 100644
--- a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli.stdout
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli.stdout
@@ -1,4 +1,5 @@
-Matches found in 1 modules:
   app_a: 2
       16:13-16:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
       20:13-20:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
+
+Matches found in 1 modules
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_expand.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_expand.stdout
index 5f34373ba6..78f52012ac 100644
--- a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_expand.stdout
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_expand.stdout
@@ -1,3 +1,4 @@
-Matches found in 1 modules:
   app_a_ssr: 1
       11:11-11:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {4}.
+
+Matches found in 1 modules
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_no_expand.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_no_expand.stdout
index 17017a5b70..f5a1e98710 100644
--- a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_no_expand.stdout
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_no_expand.stdout
@@ -1,3 +1,4 @@
-Matches found in 1 modules:
   app_a_ssr: 1
       11:11-11:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: ?BAR(_@AA).
+
+Matches found in 1 modules
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_visible_expand.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_visible_expand.stdout
index 7ea212c37d..6f49895580 100644
--- a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_visible_expand.stdout
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_macros_visible_expand.stdout
@@ -1,4 +1,5 @@
-Matches found in 1 modules:
   app_a_ssr: 2
       11:11-11:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: ?BAR(_@AA).
       11:11-11:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {4}.
+
+Matches found in 1 modules
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_multiple.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_multiple.stdout
index f47bfe428f..a71ebede29 100644
--- a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_multiple.stdout
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_multiple.stdout
@@ -1,4 +1,5 @@
-Matches found in 1 modules:
   app_a_ssr: 2
       7:10-7:15::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: 3.
       11:11-11:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {4}.
+
+Matches found in 1 modules
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_invisible.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_invisible.stdout
index 653173722f..6938fabb87 100644
--- a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_invisible.stdout
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_invisible.stdout
@@ -1,3 +1,4 @@
-Matches found in 1 modules:
   app_a_ssr: 1
       7:10-7:15::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: (((3))).
+
+Matches found in 1 modules
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_visible.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_visible.stdout
index 7b84e1f651..a43317a2cf 100644
--- a/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_visible.stdout
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc_cli_parens_visible.stdout
@@ -1,5 +1,6 @@
-Matches found in 1 modules:
   app_a_ssr: 3
       7:10-7:15::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: (_@A).
       7:11-7:14::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: (_@A).
       8:10-8:13::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: (_@A).
+
+Matches found in 1 modules
diff --git a/crates/elp/src/resources/test/linter/ssr_context_separator.stdout b/crates/elp/src/resources/test/linter/ssr_context_separator.stdout
index 99ac995b14..f791ea85bf 100644
--- a/crates/elp/src/resources/test/linter/ssr_context_separator.stdout
+++ b/crates/elp/src/resources/test/linter/ssr_context_separator.stdout
@@ -1,3 +1,4 @@
+  app_a: 2
 app_a/src/app_a.erl:16:13-16:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
   14 |     app_b:application_env_error().
   15 | 
@@ -15,3 +16,5 @@ app_a/src/app_a.erl:20:13-20:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern m
   21 | 
   22 | % And some more context, see if it renders
 
+
+Matches found in 1 modules

From be0cb21ea7a277289a43ef96a5b70459d8642ff1 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 24 Nov 2025 05:04:16 -0800
Subject: [PATCH 300/394] Make `elp search` a synonym for `elp ssr`

Summary:
As title.

In future we may remove `elp ssr`.

Reviewed By: TD5

Differential Revision: D87766502

fbshipit-source-id: c9742292afe35984002d02b20ec0e051cfee125f
---
 crates/elp/src/bin/args.rs                |  7 +++++++
 crates/elp/src/bin/main.rs                | 10 ++++++++++
 crates/elp/src/resources/test/help.stdout |  1 +
 3 files changed, 18 insertions(+)

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index 93356a202b..a9f4950275 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -612,6 +612,12 @@ pub fn command() -> impl Parser<Command> {
         .command("lint")
         .help("Parse files in project and emit diagnostics, optionally apply fixes.");
 
+    let search = ssr()
+        .map(Command::Ssr)
+        .to_options()
+        .command("search")
+        .help("Alias for 'ssr': Run SSR (Structural Search and Replace) pattern matching on project files.");
+
     let ssr = ssr()
         .map(Command::Ssr)
         .to_options()
@@ -673,6 +679,7 @@ pub fn command() -> impl Parser<Command> {
         dialyze_all,
         lint,
         ssr,
+        search,
         parse_all,
         parse_elp,
         explain,
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 0684c50228..7dc91de70e 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -2418,6 +2418,16 @@ mod tests {
         expected.assert_eq(&stdout);
     }
 
+    #[test]
+    fn search_help() {
+        let args = args::args()
+            .run_inner(Args::from(&["search", "--help"]))
+            .unwrap_err();
+        let expected = expect_file!["../resources/test/ssr_help.stdout"];
+        let stdout = args.unwrap_stdout();
+        expected.assert_eq(&stdout);
+    }
+
     #[test]
     fn build_info_help() {
         let args = args::args()
diff --git a/crates/elp/src/resources/test/help.stdout b/crates/elp/src/resources/test/help.stdout
index acc7ae286d..3370ec3090 100644
--- a/crates/elp/src/resources/test/help.stdout
+++ b/crates/elp/src/resources/test/help.stdout
@@ -20,6 +20,7 @@ Available commands:
     dialyze-all           Run Dialyzer on the whole project by shelling out to a `dialyzer-run` tool on the path to do the legwork.
     lint                  Parse files in project and emit diagnostics, optionally apply fixes.
     ssr                   Run SSR (Structural Search and Replace) pattern matching on project files.
+    search                Alias for 'ssr': Run SSR (Structural Search and Replace) pattern matching on project files.
     parse-all             Dump ast for all files in a project for specified rebar.config file
     parse-elp             Tree-sitter parse all files in a project for specified rebar.config file
     explain               Explain a diagnostic code

From fe49f6ba3cfa5477ec49948833a3633fffc7e761 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 24 Nov 2025 09:47:00 -0800
Subject: [PATCH 301/394] Implement support for renaming macros

Summary: Long awaited feature: the ability to rename macros.

Reviewed By: alanz

Differential Revision: D87635298

fbshipit-source-id: 252ccd64193251fa9b0ce91cf6ab421c15c84086
---
 crates/ide/src/rename.rs    | 315 ++++++++++++++++++++++++++++++++++++
 crates/ide_db/src/rename.rs |  81 +++++++++-
 2 files changed, 394 insertions(+), 2 deletions(-)

diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index ab7731f619..e034fa24a1 100644
--- a/crates/ide/src/rename.rs
+++ b/crates/ide/src/rename.rs
@@ -77,6 +77,28 @@ fn find_definitions(
     syntax: &SyntaxNode,
     position: FilePosition,
 ) -> RenameResult<Vec<SymbolDefinition>> {
+    // Try to find a macro name and classify it to resolve definitions (including across includes)
+    if let Some(macro_name) = algo::find_node_at_offset::<ast::MacroName>(syntax, position.offset)
+        && let Some(token) = macro_name.syntax().first_token()
+    {
+        let location = InFile {
+            file_id: position.file_id,
+            value: token,
+        };
+        match SymbolClass::classify(sema, location) {
+            Some(SymbolClass::Definition(def)) => return Ok(vec![def]),
+            Some(SymbolClass::Reference { refs, typ: _ }) => match refs {
+                ReferenceClass::Definition(def) => return Ok(vec![def]),
+                ReferenceClass::MultiMacro(defs) => {
+                    return Ok(defs.into_iter().map(SymbolDefinition::Define).collect());
+                }
+                _ => {}
+            },
+            None => {}
+        }
+    }
+
+    // If not a macro, try to find a general name
     let symbols =
         if let Some(name_like) = algo::find_node_at_offset::<ast::Name>(syntax, position.offset) {
             match &name_like {
@@ -1183,6 +1205,258 @@ pub(crate) mod tests {
         );
     }
 
+    #[test]
+    fn test_rename_macro() {
+        check_rename(
+            "NEW_MACRO",
+            r#"
+            -define(OLD_~MACRO, value).
+            foo() -> ?OLD_MACRO.
+            "#,
+            r#"
+            -define(NEW_MACRO, value).
+            foo() -> ?NEW_MACRO.
+            "#,
+        );
+    }
+
+    #[test]
+    fn test_rename_macro_from_reference() {
+        check_rename(
+            "NEW_MACRO",
+            r#"
+            -define(OLD_MACRO, value).
+            foo() -> ?OLD_~MACRO.
+            "#,
+            r#"
+            -define(NEW_MACRO, value).
+            foo() -> ?NEW_MACRO.
+            "#,
+        );
+    }
+
+    #[test]
+    fn test_rename_macro_atom() {
+        check_rename(
+            "new_macro",
+            r#"
+            -define(old_~macro, value).
+            foo() -> ?old_macro.
+            "#,
+            r#"
+            -define(new_macro, value).
+            foo() -> ?new_macro.
+            "#,
+        );
+    }
+
+    #[test]
+    fn test_rename_macro_atom_from_reference() {
+        check_rename(
+            "new_macro",
+            r#"
+            -define(old_macro, value).
+            foo() -> ?old_~macro.
+            "#,
+            r#"
+            -define(new_macro, value).
+            foo() -> ?new_macro.
+            "#,
+        );
+    }
+
+    #[test]
+    fn test_rename_macro_from_definition_multi_file() {
+        check_rename(
+            "NEW_MACRO",
+            r#"
+            //- /src/common.hrl
+            -define(OLD_~MACRO, value).
+
+            //- /src/module_a.erl
+            -module(module_a).
+            -include("common.hrl").
+            foo() -> ?OLD_MACRO.
+
+            //- /src/module_b.erl
+            -module(module_b).
+            -include("common.hrl").
+            bar() -> ?OLD_MACRO.
+            "#,
+            r#"
+            //- /src/common.hrl
+            -define(NEW_MACRO, value).
+
+            //- /src/module_a.erl
+            -module(module_a).
+            -include("common.hrl").
+            foo() -> ?NEW_MACRO.
+
+            //- /src/module_b.erl
+            -module(module_b).
+            -include("common.hrl").
+            bar() -> ?NEW_MACRO.
+            "#,
+        );
+    }
+
+    #[test]
+    fn test_rename_macro_from_usage_multi_file() {
+        check_rename(
+            "NEW_MACRO",
+            r#"
+            //- /src/common.hrl
+            -define(OLD_MACRO, value).
+
+            //- /src/module_a.erl
+            -module(module_a).
+            -include("common.hrl").
+            foo() -> ?OLD_~MACRO.
+
+            //- /src/module_b.erl
+            -module(module_b).
+            -include("common.hrl").
+            bar() -> ?OLD_MACRO.
+            "#,
+            r#"
+            //- /src/common.hrl
+            -define(NEW_MACRO, value).
+
+            //- /src/module_a.erl
+            -module(module_a).
+            -include("common.hrl").
+            foo() -> ?NEW_MACRO.
+
+            //- /src/module_b.erl
+            -module(module_b).
+            -include("common.hrl").
+            bar() -> ?NEW_MACRO.
+            "#,
+        );
+    }
+
+    #[test]
+    fn test_rename_macro_name_clash() {
+        check_rename(
+            "EXISTING_MACRO",
+            r#"
+            -define(OLD_~MACRO, value1).
+            -define(EXISTING_MACRO, value2).
+            foo() -> ?OLD_MACRO.
+            "#,
+            r#"error: Macro 'EXISTING_MACRO' already in scope"#,
+        );
+    }
+
+    #[test]
+    fn test_rename_macro_from_usage_ifdef() {
+        check_rename(
+            "NEW_MACRO",
+            r#"
+            //- /src/common.hrl
+            -ifndef(TEST).
+                -define(OLD_MACRO, value1).
+            -else.
+                -define(OLD_MACRO, value2).
+            -endif.
+
+            //- /src/module_a.erl
+            -module(module_a).
+            -include("common.hrl").
+            foo() -> ?OLD_~MACRO.
+
+            //- /src/module_b.erl
+            -module(module_b).
+            -include("common.hrl").
+            bar() -> ?OLD_MACRO.
+            "#,
+            r#"
+            //- /src/common.hrl
+            -ifndef(TEST).
+                -define(OLD_MACRO, value1).
+            -else.
+                -define(NEW_MACRO, value2).
+            -endif.
+
+            //- /src/module_a.erl
+            -module(module_a).
+            -include("common.hrl").
+            foo() -> ?NEW_MACRO.
+
+            //- /src/module_b.erl
+            -module(module_b).
+            -include("common.hrl").
+            bar() -> ?NEW_MACRO.
+            "#,
+        );
+    }
+
+    #[test]
+    fn test_rename_macro_name_clash_from_reference() {
+        check_rename(
+            "EXISTING_MACRO",
+            r#"
+            -define(OLD_MACRO, value1).
+            -define(EXISTING_MACRO, value2).
+            foo() -> ?OLD_~MACRO.
+            "#,
+            r#"error: Macro 'EXISTING_MACRO' already in scope"#,
+        );
+    }
+
+    #[test]
+    fn test_rename_macro_name_clash_from_reference_multi_file() {
+        check_rename(
+            "EXISTING_MACRO",
+            r#"
+            //- /src/common.hrl
+            -define(OLD_MACRO, value1).
+
+            //- /src/module_a.erl
+            -module(module_a).
+            -include("common.hrl").
+            foo() -> ?OLD_~MACRO.
+
+            //- /src/module_b.erl
+            -module(module_b).
+            -include("common.hrl").
+            -define(EXISTING_MACRO, value3).
+            bar() -> ?OLD_MACRO.
+            "#,
+            r#"error: Macro 'EXISTING_MACRO' already in scope"#,
+        );
+    }
+
+    #[test]
+    fn test_rename_macro_different_arity_ok() {
+        check_rename(
+            "EXISTING_MACRO",
+            r#"
+            -define(OLD_~MACRO, value1).
+            -define(EXISTING_MACRO(X), X).
+            foo() -> ?OLD_MACRO.
+            "#,
+            r#"
+            -define(EXISTING_MACRO, value1).
+            -define(EXISTING_MACRO(X), X).
+            foo() -> ?EXISTING_MACRO.
+            "#,
+        );
+    }
+
+    #[test]
+    fn test_rename_macro_same_arity_conflict() {
+        check_rename(
+            "EXISTING_MACRO",
+            r#"
+            -define(OLD_~MACRO(X), X).
+            -define(EXISTING_MACRO(Y), Y).
+            foo() -> ?OLD_MACRO(1).
+            "#,
+            r#"error: Macro 'EXISTING_MACRO' already in scope"#,
+        );
+    }
+
     #[test]
     fn test_rename_in_rpc_call_4() {
         check_rename(
@@ -2018,4 +2292,45 @@ pub(crate) mod tests {
                     ok."#,
         );
     }
+
+    #[test]
+    fn test_rename_macro_separate_definitions() {
+        check_rename(
+            "NEW_MACRO",
+            r#"
+            //- /src/a.hrl
+            -define(MACRO, ok).
+
+            //- /src/a.erl
+            -module(a).
+            -include("a.hrl").
+            foo() -> ?MACRO~.
+
+            //- /src/b.hrl
+            -define(MACRO, error).
+
+            //- /src/b.erl
+            -module(b).
+            -include("b.hrl").
+            bar() -> ?MACRO.
+            "#,
+            r#"
+            //- /src/a.hrl
+            -define(NEW_MACRO, ok).
+
+            //- /src/a.erl
+            -module(a).
+            -include("a.hrl").
+            foo() -> ?NEW_MACRO.
+
+            //- /src/b.hrl
+            -define(MACRO, error).
+
+            //- /src/b.erl
+            -module(b).
+            -include("b.hrl").
+            bar() -> ?MACRO.
+            "#,
+        );
+    }
 }
diff --git a/crates/ide_db/src/rename.rs b/crates/ide_db/src/rename.rs
index 3ea610554e..6d7ee4e907 100644
--- a/crates/ide_db/src/rename.rs
+++ b/crates/ide_db/src/rename.rs
@@ -79,6 +79,18 @@ pub fn is_valid_function_name(new_name: &String) -> bool {
     }
 }
 
+// Delegate checking macro name validity to the parser
+// Macros can be either atoms or variables
+pub fn is_valid_macro_name(new_name: &String) -> bool {
+    let parse = ast::SourceFile::parse_text(format!("-define({new_name}, value).").as_str());
+    matches!(
+        parse.tree().forms().next(),
+        Some(ast::Form::PreprocessorDirective(
+            ast::PreprocessorDirective::PpDefine(_)
+        ))
+    )
+}
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum SafetyChecks {
     Yes,
@@ -123,8 +135,30 @@ impl SymbolDefinition {
             SymbolDefinition::Callback(_) => {
                 rename_error!("Cannot rename callback")
             }
-            SymbolDefinition::Define(_) => {
-                rename_error!("Cannot rename define")
+            SymbolDefinition::Define(define) => {
+                if safety_check == SafetyChecks::Yes && !is_valid_macro_name(new_name) {
+                    rename_error!("Invalid new macro name: '{}'", new_name);
+                }
+
+                let arity = define.define.name.arity();
+                if safety_check == SafetyChecks::Yes {
+                    // Check safety in the file where the macro is defined
+                    if !is_safe_macro(sema, define.file.file_id, new_name, arity) {
+                        rename_error!("Macro '{}' already in scope", new_name);
+                    }
+
+                    // Also check safety in all files where the macro is used
+                    let usages = self.clone().usages(sema).all();
+                    for (file_id, _refs) in usages.iter() {
+                        if file_id != define.file.file_id
+                            && !is_safe_macro(sema, file_id, new_name, arity)
+                        {
+                            rename_error!("Macro '{}' already in scope", new_name);
+                        }
+                    }
+                }
+
+                self.rename_reference(sema, new_name, parens_needed_in_context, safety_check)
             }
             SymbolDefinition::Header(_) => {
                 rename_error!("Cannot rename header")
@@ -151,6 +185,19 @@ impl SymbolDefinition {
                     range,
                 })
             }
+            SymbolDefinition::Define(d) => {
+                // Get the macro definition location
+                let source = d.source(sema.db.upcast());
+                if let Some(name) = source.name() {
+                    let range = name.syntax().text_range();
+                    Some(FileRange {
+                        file_id: d.file.file_id,
+                        range,
+                    })
+                } else {
+                    None
+                }
+            }
             _ => None,
         }
     }
@@ -215,6 +262,23 @@ impl SymbolDefinition {
                 );
                 Ok(source_change)
             }
+            SymbolDefinition::Define(_define) => {
+                // Find all usages of the macro
+                let usages = self.clone().usages(sema).all();
+
+                // Also need to rename the definition itself
+                // Get the macro definition location
+                let (file_id, def_edit) = source_edit_from_def(sema, self.clone(), new_name)?;
+                source_change.insert_source_edit(file_id, def_edit);
+
+                source_edit_from_usages(
+                    &mut source_change,
+                    usages.iter().collect(),
+                    new_name,
+                    parens_needed_in_context,
+                );
+                Ok(source_change)
+            }
             SymbolDefinition::Var(var) => {
                 let usages = sema
                     .find_local_usages_ast(InFile {
@@ -388,6 +452,19 @@ pub fn is_safe_function(sema: &Semantic, file_id: FileId, new_name: &str, arity:
     scope_ok && !in_erlang_module(new_name, arity as usize)
 }
 
+/// Check that the new macro name is not already defined in scope.
+/// Macros are identified by both name and arity, similar to functions.
+pub fn is_safe_macro(sema: &Semantic, file_id: FileId, new_name: &str, arity: Option<u32>) -> bool {
+    sema.db
+        .def_map(file_id)
+        .get_macros()
+        .iter()
+        .all(|(name, _)| {
+            // A macro is considered different if either the name or arity differs
+            *name.name().to_string() != *new_name || name.arity() != arity
+        })
+}
+
 /// Check that the new function name is not in scope already in the
 /// module via an explicit import.
 pub fn is_safe_remote_function(

From 8dbbd1f6d4e22ae9131f82ec1d7124b324518ce7 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 24 Nov 2025 10:10:03 -0800
Subject: [PATCH 302/394] Back out "Fix failing test"

Summary: As title

Reviewed By: robertoaloi

Differential Revision: D87786080

fbshipit-source-id: ab642c7b92b51c4df38fdef64f6741423e70e55a
---
 .../resources/test/linter/ssr_context_separator_color.stdout   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crates/elp/src/resources/test/linter/ssr_context_separator_color.stdout b/crates/elp/src/resources/test/linter/ssr_context_separator_color.stdout
index 139250e2f2..119d62a52b 100644
--- a/crates/elp/src/resources/test/linter/ssr_context_separator_color.stdout
+++ b/crates/elp/src/resources/test/linter/ssr_context_separator_color.stdout
@@ -1,3 +1,4 @@
+  app_a: 2
 app_a/src/app_a.erl:16:13-16:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
   14 |     app_b:application_env_error().
   15 | 
@@ -13,3 +14,5 @@ app_a/src/app_a.erl:20:13-20:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern m
   21 | 
   22 | % And some more context, see if it renders
 
+
+Matches found in 1 modules

From 4fa7b6c8ac17ff26f9157e85ab00302fb4055d82 Mon Sep 17 00:00:00 2001
From: Cj Longoria <cjlongoria@meta.com>
Date: Tue, 25 Nov 2025 02:19:37 -0800
Subject: [PATCH 303/394] add internal rustfmt bin to elp cargo script

Summary: Add our nightly rustfmt binary to PATH for elp cargo shell script. This keeps the formatting consistent between `arc f` and `cargo.sh fmt` by using the same rustfmt.toml and rustfmt binary.

Reviewed By: alanz

Differential Revision: D87853695

fbshipit-source-id: dbb378acb8e48f5910187d32757d5f5597305df7
---
 crates/syntax/src/syntax_kind/generated.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crates/syntax/src/syntax_kind/generated.rs b/crates/syntax/src/syntax_kind/generated.rs
index 716d46d25a..781d35aaaf 100644
--- a/crates/syntax/src/syntax_kind/generated.rs
+++ b/crates/syntax/src/syntax_kind/generated.rs
@@ -1,7 +1,8 @@
 //! @generated file, do not edit by hand, see `xtask/src/codegen.rs`
 
 #![allow(bad_style, missing_docs, unreachable_pub)]
-use num_derive::{FromPrimitive, ToPrimitive};
+use num_derive::FromPrimitive;
+use num_derive::ToPrimitive;
 #[doc = r" The kind of syntax node, e.g. `ATOM`, `IF_KW`, or `DOT`."]
 #[derive(
     Clone,

From 8997d5eb037df7145f010d6c79d0b74ab7e1abb9 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 25 Nov 2025 02:19:42 -0800
Subject: [PATCH 304/394] Implement support for renaming types

Summary: Long awaited feature: the ability to rename types. Take the opportunity to fix the range of the type name not to include arguments.

Reviewed By: alanz

Differential Revision: D87643493

fbshipit-source-id: e7fd3d13ff71ef5a3049aae3a242606899e582be
---
 crates/hir/src/module_data.rs      |   5 +-
 crates/ide/src/document_symbols.rs |   4 +-
 crates/ide/src/rename.rs           | 364 ++++++++++++++++++++++++++++-
 crates/ide_db/src/rename.rs        |  79 ++++++-
 4 files changed, 435 insertions(+), 17 deletions(-)

diff --git a/crates/hir/src/module_data.rs b/crates/hir/src/module_data.rs
index b081cbd539..0420e19bb6 100644
--- a/crates/hir/src/module_data.rs
+++ b/crates/hir/src/module_data.rs
@@ -615,8 +615,9 @@ impl TypeAliasDef {
     }
 
     pub fn name_range(&self, db: &dyn SourceDatabase) -> Option<TextRange> {
-        let range = self.source(db).type_name()?.syntax().text_range();
-        Some(range)
+        let type_name = self.source(db).type_name()?;
+        let name = type_name.name()?;
+        Some(name.syntax().text_range())
     }
 
     /// This information is used for completion.
diff --git a/crates/ide/src/document_symbols.rs b/crates/ide/src/document_symbols.rs
index 390a975132..daed2c6368 100644
--- a/crates/ide/src/document_symbols.rs
+++ b/crates/ide/src/document_symbols.rs
@@ -264,7 +264,7 @@ mod tests {
    -record(my_second_record, {my_list :: [] }).
 %%         ^^^^^^^^^^^^^^^^ Record | my_second_record
    -type my_integer() :: integer().
-%%       ^^^^^^^^^^^^ Type | my_integer/0
+%%       ^^^^^^^^^^ Type | my_integer/0
 
    -define(MEANING_OF_LIFE, 42).
 %%         ^^^^^^^^^^^^^^^ Define | MEANING_OF_LIFE
@@ -340,7 +340,7 @@ mod tests {
     -record(included_record, {my_field :: integer()}).
 %%          ^^^^^^^^^^^^^^^ Record | included_record
     -type local_type() :: integer().
-%%        ^^^^^^^^^^^^ Type | local_type/0
+%%        ^^^^^^^^^^ Type | local_type/0
     local_function() -> ok.
 %%  ^^^^^^^^^^^^^^ Function | local_function/0
 "#,
diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index e034fa24a1..0cedbe1d90 100644
--- a/crates/ide/src/rename.rs
+++ b/crates/ide/src/rename.rs
@@ -2276,20 +2276,362 @@ pub(crate) mod tests {
         check_rename(
             "new_name",
             r#"
-               //- /src/baz.erl
-               -module(baz).
-               foo() ->
-                   erpc:send_request(node, ?MODULE, bar, [], label, collection).
+                //- /src/baz.erl
+                -module(baz).
+                foo() ->
+                    erpc:send_request(node, ?MODULE, bar, [], label, collection).
 
-               b~ar() ->
-                    ok."#,
+                b~ar() ->
+                     ok."#,
             r#"
-               -module(baz).
-               foo() ->
-                   erpc:send_request(node, ?MODULE, new_name, [], label, collection).
+                -module(baz).
+                foo() ->
+                    erpc:send_request(node, ?MODULE, new_name, [], label, collection).
 
-               new_name() ->
-                    ok."#,
+                new_name() ->
+                     ok."#,
+        );
+    }
+
+    // ---------------------------------
+    // Type Renaming Tests
+    // ---------------------------------
+
+    #[test]
+    fn test_rename_type_simple() {
+        check_rename(
+            "new_type",
+            r#"
+            -module(main).
+            -type ol~d_type() :: ok.
+            -spec foo(old_type()) -> ok.
+            foo(_) -> ok.
+            "#,
+            r#"
+            -module(main).
+            -type new_type() :: ok.
+            -spec foo(new_type()) -> ok.
+            foo(_) -> ok.
+            "#,
+        );
+    }
+
+    #[test]
+    fn test_rename_type_with_arity() {
+        check_rename(
+            "new_type",
+            r#"
+            -module(main).
+            -type old_~type(T) :: {ok, T}.
+            -spec foo(old_type(integer())) -> ok.
+            foo(_) -> ok.
+            "#,
+            r#"
+            -module(main).
+            -type new_type(T) :: {ok, T}.
+            -spec foo(new_type(integer())) -> ok.
+            foo(_) -> ok.
+            "#,
+        );
+    }
+
+    #[test]
+    fn test_rename_type_from_usage() {
+        check_rename(
+            "new_type",
+            r#"
+            -module(main).
+            -type old_type() :: ok.
+            -spec foo(old_~type()) -> ok.
+            foo(_) -> ok.
+            "#,
+            r#"
+            -module(main).
+            -type new_type() :: ok.
+            -spec foo(new_type()) -> ok.
+            foo(_) -> ok.
+            "#,
+        );
+    }
+
+    #[test]
+    fn test_rename_opaque_type() {
+        check_rename(
+            "new_type",
+            r#"
+            -module(main).
+            -opaque old_~type() :: {internal, term()}.
+            -spec create() -> old_type().
+            create() -> {internal, data}.
+            "#,
+            r#"
+            -module(main).
+            -opaque new_type() :: {internal, term()}.
+            -spec create() -> new_type().
+            create() -> {internal, data}.
+            "#,
+        );
+    }
+
+    #[test]
+    fn test_rename_type_fails_name_clash() {
+        check_rename(
+            "existing_type",
+            r#"
+            -module(main).
+            -type old_~type() :: ok.
+            -type existing_type() :: error.
+            "#,
+            r#"error: Type 'existing_type/0' already in scope"#,
+        );
+    }
+
+    #[test]
+    fn test_rename_type_allows_different_arity() {
+        check_rename(
+            "existing_type",
+            r#"
+            -module(main).
+            -type old_~type() :: ok.
+            -type existing_type(T) :: {error, T}.
+            "#,
+            r#"
+            -module(main).
+            -type existing_type() :: ok.
+            -type existing_type(T) :: {error, T}.
+            "#,
+        );
+    }
+
+    #[test]
+    fn test_rename_type_invalid_name() {
+        check_rename(
+            "New_Type",
+            r#"
+            -module(main).
+            -type old_~type() :: ok.
+            "#,
+            r#"error: Invalid new type name: 'New_Type'"#,
+        );
+    }
+
+    #[test]
+    fn test_rename_type_remote_reference() {
+        check_rename(
+            "new_type",
+            r#"
+            //- /src/module_a.erl
+            -module(module_a).
+            -export_type([old_~type/0]).
+            -type old_type() :: {ok, term()}.
+
+            //- /src/module_b.erl
+            -module(module_b).
+            -spec foo(module_a:old_type()) -> ok.
+            foo(_) -> ok.
+            "#,
+            r#"
+            //- /src/module_a.erl
+            -module(module_a).
+            -export_type([new_type/0]).
+            -type new_type() :: {ok, term()}.
+
+            //- /src/module_b.erl
+            -module(module_b).
+            -spec foo(module_a:new_type()) -> ok.
+            foo(_) -> ok.
+            "#,
+        );
+    }
+
+    #[test]
+    fn test_rename_type_remote_reference_from_usage() {
+        check_rename(
+            "new_type",
+            r#"
+            //- /src/module_a.erl
+            -module(module_a).
+            -export_type([old_type/0]).
+            -type old_type() :: {ok, term()}.
+
+            //- /src/module_b.erl
+            -module(module_b).
+            -spec foo(module_a:old_~type()) -> ok.
+            foo(_) -> ok.
+            "#,
+            r#"
+            //- /src/module_a.erl
+            -module(module_a).
+            -export_type([new_type/0]).
+            -type new_type() :: {ok, term()}.
+
+            //- /src/module_b.erl
+            -module(module_b).
+            -spec foo(module_a:new_type()) -> ok.
+            foo(_) -> ok.
+            "#,
+        );
+    }
+
+    #[test]
+    fn test_rename_type_from_header_multi_file() {
+        check_rename(
+            "new_type",
+            r#"
+            //- /src/types.hrl
+            -type old_~type() :: {ok, term()}.
+
+            //- /src/module_a.erl
+            -module(module_a).
+            -include("types.hrl").
+            -spec foo(old_type()) -> ok.
+            foo(_) -> ok.
+
+            //- /src/module_b.erl
+            -module(module_b).
+            -include("types.hrl").
+            -spec bar(old_type()) -> ok.
+            bar(_) -> ok.
+            "#,
+            r#"
+            //- /src/types.hrl
+            -type new_type() :: {ok, term()}.
+
+            //- /src/module_a.erl
+            -module(module_a).
+            -include("types.hrl").
+            -spec foo(new_type()) -> ok.
+            foo(_) -> ok.
+
+            //- /src/module_b.erl
+            -module(module_b).
+            -include("types.hrl").
+            -spec bar(new_type()) -> ok.
+            bar(_) -> ok.
+            "#,
+        );
+    }
+
+    #[test]
+    fn test_rename_type_from_usage_in_header() {
+        check_rename(
+            "new_type",
+            r#"
+            //- /src/types.hrl
+            -type old_type() :: {ok, term()}.
+
+            //- /src/module_a.erl
+            -module(module_a).
+            -include("types.hrl").
+            -spec foo(old_~type()) -> ok.
+            foo(_) -> ok.
+
+            //- /src/module_b.erl
+            -module(module_b).
+            -include("types.hrl").
+            -spec bar(old_type()) -> ok.
+            bar(_) -> ok.
+            "#,
+            r#"
+            //- /src/types.hrl
+            -type new_type() :: {ok, term()}.
+
+            //- /src/module_a.erl
+            -module(module_a).
+            -include("types.hrl").
+            -spec foo(new_type()) -> ok.
+            foo(_) -> ok.
+
+            //- /src/module_b.erl
+            -module(module_b).
+            -include("types.hrl").
+            -spec bar(new_type()) -> ok.
+            bar(_) -> ok.
+            "#,
+        );
+    }
+
+    #[test]
+    fn test_rename_type_name_clash_in_remote_module() {
+        check_rename(
+            "existing_type",
+            r#"
+            //- /src/module_a.erl
+            -module(module_a).
+            -export_type([old_type/0]).
+            -type old_~type() :: {ok, term()}.
+
+            //- /src/module_b.erl
+            -module(module_b).
+            -type existing_type() :: error.
+            -spec foo(module_a:old_type()) -> ok.
+            foo(_) -> ok.
+            "#,
+            r#"error: Type 'existing_type/0' already in scope"#,
+        );
+    }
+
+    #[test]
+    fn test_rename_type_name_clash_from_header_multi_file() {
+        check_rename(
+            "existing_type",
+            r#"
+            //- /src/types.hrl
+            -type old_type() :: {ok, term()}.
+
+            //- /src/module_a.erl
+            -module(module_a).
+            -include("types.hrl").
+            -spec foo(old_~type()) -> ok.
+            foo(_) -> ok.
+
+            //- /src/module_b.erl
+            -module(module_b).
+            -include("types.hrl").
+            -type existing_type() :: error.
+            -spec bar(old_type()) -> ok.
+            bar(_) -> ok.
+            "#,
+            r#"error: Type 'existing_type/0' already in scope"#,
+        );
+    }
+
+    #[test]
+    fn test_rename_opaque_type_from_header() {
+        check_rename(
+            "new_type",
+            r#"
+            //- /src/types.hrl
+            -opaque old_~type() :: {internal, term()}.
+
+            //- /src/module_a.erl
+            -module(module_a).
+            -include("types.hrl").
+            -spec create() -> old_type().
+            create() -> {internal, data}.
+
+            //- /src/module_b.erl
+            -module(module_b).
+            -include("types.hrl").
+            -spec use(old_type()) -> ok.
+            use(_) -> ok.
+            "#,
+            r#"
+            //- /src/types.hrl
+            -opaque new_type() :: {internal, term()}.
+
+            //- /src/module_a.erl
+            -module(module_a).
+            -include("types.hrl").
+            -spec create() -> new_type().
+            create() -> {internal, data}.
+
+            //- /src/module_b.erl
+            -module(module_b).
+            -include("types.hrl").
+            -spec use(new_type()) -> ok.
+            use(_) -> ok.
+            "#,
         );
     }
 
diff --git a/crates/ide_db/src/rename.rs b/crates/ide_db/src/rename.rs
index 6d7ee4e907..889569ca4e 100644
--- a/crates/ide_db/src/rename.rs
+++ b/crates/ide_db/src/rename.rs
@@ -91,6 +91,21 @@ pub fn is_valid_macro_name(new_name: &String) -> bool {
     )
 }
 
+// Delegate checking type name validity to the parser
+pub fn is_valid_type_name(new_name: &String) -> bool {
+    let parse = ast::SourceFile::parse_text(format!("-type {new_name}() :: ok.").as_str());
+    // Check that we got a TypeAlias form
+    if let Some(ast::Form::TypeAlias(type_alias)) = parse.tree().forms().next() {
+        // Check that the name is an atom (not a variable)
+        if let Some(type_name) = type_alias.name()
+            && let Some(ast::Name::Atom(_)) = type_name.name()
+        {
+            return true;
+        }
+    }
+    false
+}
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum SafetyChecks {
     Yes,
@@ -129,8 +144,30 @@ impl SymbolDefinition {
             SymbolDefinition::RecordField(_) => {
                 rename_error!("Cannot rename record field")
             }
-            SymbolDefinition::Type(_) => {
-                rename_error!("Cannot rename type")
+            SymbolDefinition::Type(type_alias) => {
+                if safety_check == SafetyChecks::Yes && !is_valid_type_name(new_name) {
+                    rename_error!("Invalid new type name: '{}'", new_name);
+                }
+
+                let arity = type_alias.name().arity();
+                if safety_check == SafetyChecks::Yes {
+                    // Check safety in the file where the type is defined
+                    if !is_safe_type(sema, type_alias.file.file_id, new_name, arity) {
+                        rename_error!("Type '{}/{}' already in scope", new_name, arity);
+                    }
+
+                    // Also check safety in all files where the type is used
+                    let usages = self.clone().usages(sema).all();
+                    for (file_id, _refs) in usages.iter() {
+                        if file_id != type_alias.file.file_id
+                            && !is_safe_type(sema, file_id, new_name, arity)
+                        {
+                            rename_error!("Type '{}/{}' already in scope", new_name, arity);
+                        }
+                    }
+                }
+
+                self.rename_reference(sema, new_name, parens_needed_in_context, safety_check)
             }
             SymbolDefinition::Callback(_) => {
                 rename_error!("Cannot rename callback")
@@ -198,6 +235,14 @@ impl SymbolDefinition {
                     None
                 }
             }
+            SymbolDefinition::Type(t) => {
+                // Get the type definition location
+                let range = t.name_range(sema.db.upcast())?;
+                Some(FileRange {
+                    file_id: t.file.file_id,
+                    range,
+                })
+            }
             _ => None,
         }
     }
@@ -279,6 +324,23 @@ impl SymbolDefinition {
                 );
                 Ok(source_change)
             }
+            SymbolDefinition::Type(_type_alias) => {
+                // Find all usages of the type
+                let usages = self.clone().usages(sema).all();
+
+                // Also need to rename the definition itself
+                // Get the type definition location
+                let (file_id, def_edit) = source_edit_from_def(sema, self.clone(), new_name)?;
+                source_change.insert_source_edit(file_id, def_edit);
+
+                source_edit_from_usages(
+                    &mut source_change,
+                    usages.iter().collect(),
+                    new_name,
+                    parens_needed_in_context,
+                );
+                Ok(source_change)
+            }
             SymbolDefinition::Var(var) => {
                 let usages = sema
                     .find_local_usages_ast(InFile {
@@ -465,6 +527,19 @@ pub fn is_safe_macro(sema: &Semantic, file_id: FileId, new_name: &str, arity: Op
         })
 }
 
+/// Check that the new type name is not already defined in scope.
+/// Types are identified by both name and arity, similar to functions and macros.
+pub fn is_safe_type(sema: &Semantic, file_id: FileId, new_name: &str, arity: u32) -> bool {
+    sema.db
+        .def_map(file_id)
+        .get_types()
+        .iter()
+        .all(|(name, _)| {
+            // A type is considered different if either the name or arity differs
+            *name.name().to_string() != *new_name || name.arity() != arity
+        })
+}
+
 /// Check that the new function name is not in scope already in the
 /// module via an explicit import.
 pub fn is_safe_remote_function(

From 0da6ec3079dd58b21448ccc8f370a07dedb290aa Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 25 Nov 2025 02:35:22 -0800
Subject: [PATCH 305/394] Introduce elp --color argument to control ANSI color
 codes

Summary: Also respond to the `NO_COLOR` environment variable, as per [no-color.org](no-color.org).

Reviewed By: jcpetruzza

Differential Revision: D77446683

fbshipit-source-id: c7b14c64813ca98a1163fb2f9e651ea304e5757d
---
 crates/elp/src/bin/args.rs                    |  20 +--
 crates/elp/src/bin/main.rs                    | 159 +++++++++++++++++-
 crates/elp/src/bin/ssr_cli.rs                 |  20 ++-
 crates/elp/src/cli.rs                         | 114 +++++++++++--
 crates/elp/src/resources/test/help.stdout     |   3 +-
 crates/elp/src/resources/test/ssr_help.stdout |   3 +-
 6 files changed, 280 insertions(+), 39 deletions(-)

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index a9f4950275..f533688b82 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -413,16 +413,6 @@ pub struct Ssr {
     #[bpaf(long("no-group-separator"))]
     pub no_group_separator: bool,
 
-    /// Use markers to highlight the matching strings; WHEN is 'always', 'never', or 'auto'
-    #[bpaf(
-        long("color"),
-        long("colour"),
-        argument("WHEN"),
-        fallback(Some("auto".to_string())),
-        guard(color_guard, "Please use always, never, or auto")
-    )]
-    pub color: Option<String>,
-
     /// Report system memory usage and other statistics
     #[bpaf(long("report-system-stats"))]
     pub report_system_stats: bool,
@@ -527,6 +517,16 @@ pub struct Args {
     /// Use buck2 targets for first stage project loading
     pub buck_quick_start: bool,
 
+    /// Use color in output; WHEN is 'always', 'never', or 'auto'
+    #[bpaf(
+        long("color"),
+        long("colour"),
+        argument("WHEN"),
+        fallback(Some("always".to_string())),
+        guard(color_guard, "Please use always, never, or auto")
+    )]
+    pub color: Option<String>,
+
     #[bpaf(external(command))]
     pub command: Command,
 }
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 7dc91de70e..909224f6f2 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -10,6 +10,7 @@
 
 use std::env;
 use std::fs;
+use std::io::IsTerminal;
 use std::io::Write;
 use std::path::PathBuf;
 use std::process;
@@ -65,9 +66,23 @@ const THREAD_STACK_SIZE: usize = 10_000_000;
 
 fn main() {
     let _timer = timeit!("main");
-    let mut cli = cli::Real::default();
     let args = args::args().run();
-    let res = try_main(&mut cli, args);
+    let use_color = match args.color.as_deref() {
+        Some("always") => true,
+        Some("never") => false,
+        Some("auto") | None => {
+            // Check NO_COLOR environment variable - if set (regardless of value), disable color
+            // Also check if stdout is connected to a TTY
+            env::var("NO_COLOR").is_err() && std::io::stdout().is_terminal()
+        }
+        _ => false, // Should be caught by the guard, but handle anyway
+    };
+    let mut cli: Box<dyn cli::Cli> = if use_color {
+        Box::new(cli::Real::default())
+    } else {
+        Box::new(cli::NoColor::default())
+    };
+    let res = try_main(&mut *cli, args);
     let code = handle_res(res, cli.err());
     process::exit(code);
 }
@@ -136,7 +151,9 @@ fn try_main(cli: &mut dyn Cli, args: Args) -> Result<()> {
         args::Command::BuildInfo(args) => build_info_cli::save_build_info(args, &query_config)?,
         args::Command::ProjectInfo(args) => build_info_cli::save_project_info(args, &query_config)?,
         args::Command::Lint(args) => lint_cli::run_lint_command(&args, cli, &query_config)?,
-        args::Command::Ssr(args) => ssr_cli::run_ssr_command(&args, cli, &query_config)?,
+        args::Command::Ssr(ssr_args) => {
+            ssr_cli::run_ssr_command(&ssr_args, cli, &query_config, &args.color)?
+        }
         args::Command::GenerateCompletions(args) => {
             let instructions = args::gen_completions(&args.shell);
             writeln!(cli, "#Please run this:\n{instructions}")?
@@ -2045,10 +2062,13 @@ mod tests {
     fn lint_ssr_with_context_and_separator() {
         simple_snapshot(
             args_vec![
+                "--colour",
+                "never",
                 "ssr",
-                "--context", "2",
-                "--group-separator", "====",
-                "--colour", "never"
+                "--context",
+                "2",
+                "--group-separator",
+                "====",
                 "{_@A, _@B}",
             ],
             "linter",
@@ -2062,10 +2082,13 @@ mod tests {
     fn lint_ssr_with_context_and_separator_color() {
         simple_snapshot(
             args_vec![
+                "--colour",
+                "always",
                 "ssr",
-                "--context", "2",
-                "--group-separator", "====",
-                "--colour", "always"
+                "--context",
+                "2",
+                "--group-separator",
+                "====",
                 "{_@A, _@B}",
             ],
             "linter",
@@ -2318,6 +2341,117 @@ mod tests {
         }
     }
 
+    #[test_case(false ; "rebar")]
+    #[test_case(true  ; "buck")]
+    fn eqwalize_with_color_vs_no_color(buck: bool) {
+        if otp_supported_by_eqwalizer() {
+            // Test with color (default)
+            let (mut args_color, _path) =
+                add_project(args_vec!["eqwalize", "app_a"], "standard", None, None);
+            if !buck {
+                args_color.push("--rebar".into());
+            }
+
+            // Test without color
+            let (mut args_no_color, _) = add_project(
+                args_vec!["--color", "never", "eqwalize", "app_a"],
+                "standard",
+                None,
+                None,
+            );
+            if !buck {
+                args_no_color.push("--rebar".into());
+            }
+
+            let (stdout_color, stderr_color, code_color) = elp(args_color);
+            let (stdout_no_color, stderr_no_color, code_no_color) = elp(args_no_color);
+
+            // Both should have same exit code
+            assert_eq!(code_color, code_no_color);
+
+            // Both should have same stderr behavior
+            if code_color == 0 {
+                assert!(stderr_color.is_empty());
+                assert!(stderr_no_color.is_empty());
+            }
+
+            // The content should be similar but no-color version should not contain ANSI escape codes
+            // ANSI color codes typically start with \x1b[ or \u{1b}[
+            let _has_ansi_color = stdout_color.contains('\x1b');
+            let has_ansi_no_color = stdout_no_color.contains('\x1b');
+
+            // With --color never, there should be no ANSI escape sequences
+            assert!(
+                !has_ansi_no_color,
+                "Output with --color never should not contain ANSI escape codes"
+            );
+
+            // The outputs should be functionally equivalent when ANSI codes are stripped
+            let stripped_color = strip_ansi_codes(&stdout_color);
+            assert_eq!(
+                stripped_color, stdout_no_color,
+                "Content should be identical after stripping ANSI codes"
+            );
+        }
+    }
+
+    #[test_case(false ; "rebar")]
+    #[test_case(true  ; "buck")]
+    fn eqwalize_with_no_color_env_var(buck: bool) {
+        if otp_supported_by_eqwalizer() {
+            // Test with NO_COLOR environment variable set
+            unsafe {
+                env::set_var("NO_COLOR", "1");
+            }
+
+            let (mut args_no_color_env, _) =
+                add_project(args_vec!["eqwalize", "app_a"], "standard", None, None);
+            if !buck {
+                args_no_color_env.push("--rebar".into());
+            }
+
+            let (stdout_no_color_env, stderr_no_color_env, code_no_color_env) =
+                elp(args_no_color_env);
+
+            // Clean up environment variable
+            unsafe {
+                env::remove_var("NO_COLOR");
+            }
+
+            // Test with normal color (for comparison)
+            let (mut args_color, _) =
+                add_project(args_vec!["eqwalize", "app_a"], "standard", None, None);
+            if !buck {
+                args_color.push("--rebar".into());
+            }
+
+            let (stdout_color, stderr_color, code_color) = elp(args_color);
+
+            // Both should have same exit code
+            assert_eq!(code_color, code_no_color_env);
+
+            // Both should have same stderr behavior
+            if code_color == 0 {
+                assert!(stderr_color.is_empty());
+                assert!(stderr_no_color_env.is_empty());
+            }
+
+            // The NO_COLOR env var version should not contain ANSI escape codes
+            let has_ansi_no_color_env = stdout_no_color_env.contains('\x1b');
+            assert!(
+                !has_ansi_no_color_env,
+                "Output with NO_COLOR env var should not contain ANSI escape codes"
+            );
+
+            // The outputs should be functionally equivalent when ANSI codes are stripped
+            let stripped_color = strip_ansi_codes(&stdout_color);
+            assert_eq!(
+                stripped_color, stdout_no_color_env,
+                "Content should be identical after stripping ANSI codes"
+            );
+        }
+    }
+
     // -----------------------------------------------------------------
 
     #[test]
@@ -2836,6 +2970,13 @@ mod tests {
         format!("../../test_projects/{project}")
     }
 
+    fn strip_ansi_codes(s: &str) -> String {
+        lazy_static! {
+            static ref ANSI_RE: Regex = Regex::new(r"\x1b\[[0-9;]*m").unwrap();
+        }
+        ANSI_RE.replace_all(s, "").to_string()
+    }
+
     struct BackupFiles {
         // Restore the first Path to the second
         restore: Vec<(PathBuf, PathBuf)>,
diff --git a/crates/elp/src/bin/ssr_cli.rs b/crates/elp/src/bin/ssr_cli.rs
index 9a080a4907..1458e2eb27 100644
--- a/crates/elp/src/bin/ssr_cli.rs
+++ b/crates/elp/src/bin/ssr_cli.rs
@@ -66,6 +66,7 @@ pub fn run_ssr_command(
     args: &Ssr,
     cli: &mut dyn Cli,
     query_config: &BuckQueryConfig,
+    global_color: &Option<String>,
 ) -> Result<()> {
     let start_time = SystemTime::now();
     let memory_start = MemoryUsage::now();
@@ -129,7 +130,7 @@ pub fn run_ssr_command(
     let mut loaded = load_project(args, cli, query_config)?;
     telemetry::report_elapsed_time("ssr operational", start_time);
 
-    let r = run_ssr(cli, &mut loaded, &diagnostics_config, args);
+    let r = run_ssr(cli, &mut loaded, &diagnostics_config, args, global_color);
 
     telemetry::report_elapsed_time("ssr done", start_time);
 
@@ -149,6 +150,7 @@ pub fn run_ssr(
     loaded: &mut LoadResult,
     diagnostics_config: &DiagnosticsConfig,
     args: &Ssr,
+    global_color: &Option<String>,
 ) -> Result<()> {
     let analysis = loaded.analysis();
     let (file_id, name) = match &args.module {
@@ -194,6 +196,7 @@ pub fn run_ssr(
                 &project_id,
                 diagnostics_config,
                 args,
+                global_color,
                 loaded,
                 &mut match_count,
             )?;
@@ -207,7 +210,7 @@ pub fn run_ssr(
             }
             if let Some(diag) = do_parse_one(&analysis, diagnostics_config, file_id, &name, args)? {
                 match_count = 1;
-                print_single_result(cli, loaded, &diag, args)?;
+                print_single_result(cli, loaded, &diag, args, global_color)?;
             }
         }
         (Some(file_id), _) => {
@@ -226,12 +229,14 @@ pub fn run_ssr(
     Ok(())
 }
 
+#[allow(clippy::too_many_arguments)]
 fn do_parse_all_streaming(
     cli: &mut dyn Cli,
     analysis: &Analysis,
     project_id: &ProjectId,
     config: &DiagnosticsConfig,
     args: &Ssr,
+    global_color: &Option<String>,
     loaded: &mut LoadResult,
     match_count: &mut usize,
 ) -> Result<()> {
@@ -278,7 +283,7 @@ fn do_parse_all_streaming(
     // Process and print results as they arrive from the channel
     for result in rx {
         *match_count += 1;
-        print_single_result(cli, loaded, &result, args)?;
+        print_single_result(cli, loaded, &result, args, global_color)?;
     }
 
     Ok(())
@@ -289,6 +294,7 @@ fn print_single_result(
     loaded: &mut LoadResult,
     result: &(String, FileId, Vec<diagnostics::Diagnostic>),
     args: &Ssr,
+    global_color: &Option<String>,
 ) -> Result<()> {
     let (name, file_id, diags) = result;
 
@@ -346,7 +352,7 @@ fn print_single_result(
 
             // Only show source context if --show-source or --show-source-markers is set
             if show_source {
-                let should_show_color = should_use_color(args);
+                let should_show_color = should_use_color(global_color);
 
                 if should_show_color {
                     print_source_with_context(
@@ -548,9 +554,9 @@ fn should_show_group_separator(args: &Ssr, has_context: bool) -> Option<String>
     )
 }
 
-/// Determine if color should be used based on the new --color argument
-fn should_use_color(args: &Ssr) -> bool {
-    match args.color.as_deref() {
+/// Determine if color should be used based on the global --color argument
+fn should_use_color(color: &Option<String>) -> bool {
+    match color.as_deref() {
         Some("always") => true,
         Some("never") => false,
         Some("auto") | None => {
diff --git a/crates/elp/src/cli.rs b/crates/elp/src/cli.rs
index b3070768d6..0678aaebc1 100644
--- a/crates/elp/src/cli.rs
+++ b/crates/elp/src/cli.rs
@@ -30,18 +30,13 @@ pub trait Cli: Write + WriteColor {
     fn err(&mut self) -> &mut dyn Write;
 }
 
-pub struct Real(StandardStream, Stderr);
+pub struct StandardCli(StandardStream, Stderr);
 
-impl Default for Real {
-    fn default() -> Self {
-        Self(
-            StandardStream::stdout(ColorChoice::Always),
-            std::io::stderr(),
-        )
+impl StandardCli {
+    fn new(color_choice: ColorChoice) -> Self {
+        Self(StandardStream::stdout(color_choice), std::io::stderr())
     }
-}
 
-impl Real {
     fn progress_with_style(
         &self,
         len: u64,
@@ -59,7 +54,7 @@ impl Real {
     }
 }
 
-impl Cli for Real {
+impl Cli for StandardCli {
     fn progress(&self, len: u64, prefix: &'static str) -> ProgressBar {
         self.progress_with_style(len, prefix, "  {prefix:25!} {bar} {pos}/{len} {wide_msg}")
     }
@@ -84,6 +79,63 @@ impl Cli for Real {
     }
 }
 
+impl Write for StandardCli {
+    fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
+        self.0.write(buf)
+    }
+
+    fn flush(&mut self) -> std::io::Result<()> {
+        self.0.flush()
+    }
+}
+
+impl WriteColor for StandardCli {
+    fn supports_color(&self) -> bool {
+        self.0.supports_color()
+    }
+
+    fn set_color(&mut self, spec: &ColorSpec) -> std::io::Result<()> {
+        self.0.set_color(spec)
+    }
+
+    fn reset(&mut self) -> std::io::Result<()> {
+        self.0.reset()
+    }
+}
+
+pub struct Real(StandardCli);
+pub struct NoColor(StandardCli);
+
+impl Default for Real {
+    fn default() -> Self {
+        Real(StandardCli::new(ColorChoice::Always))
+    }
+}
+
+impl Default for NoColor {
+    fn default() -> Self {
+        NoColor(StandardCli::new(ColorChoice::Never))
+    }
+}
+
+impl Cli for Real {
+    fn progress(&self, len: u64, prefix: &'static str) -> ProgressBar {
+        self.0.progress(len, prefix)
+    }
+
+    fn simple_progress(&self, len: u64, prefix: &'static str) -> ProgressBar {
+        self.0.simple_progress(len, prefix)
+    }
+
+    fn spinner(&self, prefix: &'static str) -> ProgressBar {
+        self.0.spinner(prefix)
+    }
+
+    fn err(&mut self) -> &mut dyn Write {
+        self.0.err()
+    }
+}
+
 impl Write for Real {
     fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
         self.0.write(buf)
@@ -108,6 +160,48 @@ impl WriteColor for Real {
     }
 }
 
+impl Cli for NoColor {
+    fn progress(&self, len: u64, prefix: &'static str) -> ProgressBar {
+        self.0.progress(len, prefix)
+    }
+
+    fn simple_progress(&self, len: u64, prefix: &'static str) -> ProgressBar {
+        self.0.simple_progress(len, prefix)
+    }
+
+    fn spinner(&self, prefix: &'static str) -> ProgressBar {
+        self.0.spinner(prefix)
+    }
+
+    fn err(&mut self) -> &mut dyn Write {
+        self.0.err()
+    }
+}
+
+impl Write for NoColor {
+    fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
+        self.0.write(buf)
+    }
+
+    fn flush(&mut self) -> std::io::Result<()> {
+        self.0.flush()
+    }
+}
+
+impl WriteColor for NoColor {
+    fn supports_color(&self) -> bool {
+        self.0.supports_color()
+    }
+
+    fn set_color(&mut self, spec: &ColorSpec) -> std::io::Result<()> {
+        self.0.set_color(spec)
+    }
+
+    fn reset(&mut self) -> std::io::Result<()> {
+        self.0.reset()
+    }
+}
+
 pub struct Fake(Buffer, Vec<u8>);
 
 impl Default for Fake {
diff --git a/crates/elp/src/resources/test/help.stdout b/crates/elp/src/resources/test/help.stdout
index 3370ec3090..1510d5bddb 100644
--- a/crates/elp/src/resources/test/help.stdout
+++ b/crates/elp/src/resources/test/help.stdout
@@ -1,4 +1,4 @@
-Usage: [--log-file LOG_FILE] [--erl ERL] [--escript ESCRIPT] [--no-log-buffering] [--no-buck-generated] [--buck-quick-start] [COMMAND ...]
+Usage: [--log-file LOG_FILE] [--erl ERL] [--escript ESCRIPT] [--no-log-buffering] [--no-buck-generated] [--buck-quick-start] [[--color WHEN]] [COMMAND ...]
 
 Available options:
         --log-file <LOG_FILE>
@@ -7,6 +7,7 @@ Available options:
         --no-log-buffering
         --no-buck-generated    When using buck, do not invoke a build step for generated files.
         --buck-quick-start     Use buck2 targets for first stage project loading
+        --color <WHEN>         Use color in output; WHEN is 'always', 'never', or 'auto'
     -h, --help                 Prints help information
 
 Available commands:
diff --git a/crates/elp/src/resources/test/ssr_help.stdout b/crates/elp/src/resources/test/ssr_help.stdout
index 982d2327e6..d51bdf1627 100644
--- a/crates/elp/src/resources/test/ssr_help.stdout
+++ b/crates/elp/src/resources/test/ssr_help.stdout
@@ -1,4 +1,4 @@
-Usage: [--project PROJECT] [--module MODULE] [--app APP] [--file FILE] [--rebar] [--as PROFILE] [--include-generated] [--include-tests] [[--format FORMAT]] [[--macros STRATEGY]] [--parens] [--dump-config] [--show-source] [-B NUM] [-A NUM] [-C NUM] [--group-separator SEP] [--no-group-separator] [[--color WHEN]] [--report-system-stats] <SSR_SPECS>...
+Usage: [--project PROJECT] [--module MODULE] [--app APP] [--file FILE] [--rebar] [--as PROFILE] [--include-generated] [--include-tests] [[--format FORMAT]] [[--macros STRATEGY]] [--parens] [--dump-config] [--show-source] [-B NUM] [-A NUM] [-C NUM] [--group-separator SEP] [--no-group-separator] [--report-system-stats] <SSR_SPECS>...
 
 Available positional items:
     <SSR_SPECS>  SSR specs to use
@@ -22,6 +22,5 @@ Available options:
     -C, --context <NUM>          Print NUM lines of output context, enables --show-source
         --group-separator <SEP>  Print SEP on line between matches with context, enables --show-source
         --no-group-separator     Do not print separator for matches with context, enables --show-source
-        --color <WHEN>           Use markers to highlight the matching strings; WHEN is 'always', 'never', or 'auto'
         --report-system-stats    Report system memory usage and other statistics
     -h, --help                   Prints help information

From 06892be8c11d363251b0d5fc2c82d1b203e18988 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Thu, 27 Nov 2025 01:48:55 -0800
Subject: [PATCH 306/394] Add server telemetry for workspace statistics

Summary:
As title.

Note that for a buck project using quick start, we will get two values per project startup, the first smaller value is from processing the result of `buck2 targets`, the second includes any generated files from running `elp.bxl`

Reviewed By: jcpetruzza

Differential Revision: D87923914

fbshipit-source-id: 8b10cb1ef685250f022cf360e1b2d5f621c17407
---
 crates/elp/src/project_loader.rs |  2 +-
 crates/elp/src/server.rs         | 10 ++++++++++
 crates/project_model/src/buck.rs | 10 ++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/crates/elp/src/project_loader.rs b/crates/elp/src/project_loader.rs
index d2c76cd270..103353e5db 100644
--- a/crates/elp/src/project_loader.rs
+++ b/crates/elp/src/project_loader.rs
@@ -192,7 +192,7 @@ impl ReloadManager {
         self.get_query_config()
     }
 
-    fn get_query_config(&self) -> BuckQueryConfig {
+    pub fn get_query_config(&self) -> BuckQueryConfig {
         if self.buck_quick_start {
             match self.buck_generated {
                 BuckGenerated::NoLoadDone => BuckQueryConfig::BuckTargetsOnly,
diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index bec67159cd..523be45ed5 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -1453,6 +1453,16 @@ impl Server {
 
         self.file_set_config = folders.file_set_config;
 
+        let watch_count = folders.watch.len();
+        let buck_query_config = self.reload_manager.lock().get_query_config();
+        let data = serde_json::json!({
+            "app_count": project_apps.all_apps.len(),
+            "project_count": projects.len(),
+            "watch_count": watch_count,
+            "query_config": buck_query_config.to_string(),
+        });
+        telemetry::send("project_size".to_string(), data);
+
         let register_options = lsp_types::DidChangeWatchedFilesRegistrationOptions {
             watchers: folders.watch,
         };
diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 064c93de26..e360ec848b 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -873,6 +873,16 @@ pub enum BuckQueryConfig {
     BuckTargetsOnly,
 }
 
+impl fmt::Display for BuckQueryConfig {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            BuckQueryConfig::BuildGeneratedCode => write!(f, "BuildGeneratedCode"),
+            BuckQueryConfig::NoBuildGeneratedCode => write!(f, "NoBuildGeneratedCode"),
+            BuckQueryConfig::BuckTargetsOnly => write!(f, "BuckTargetsOnly"),
+        }
+    }
+}
+
 fn filter_buck_targets(
     buck_config: &BuckConfig,
     result: FxHashMap<String, BuckTarget>,

From 7b124c7f069b9a41145d590de610f6cc5e76ed52 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 28 Nov 2025 02:27:14 -0800
Subject: [PATCH 307/394] Server: Impose a priority on next task selection

Summary:
The ELP main loop is a message pump.  It calls `next_message` and processes it, until done.

There are multiple message sources, and the current code takes one at random from all available sources.

This diff changes this to an ordered selection, giving explicit priority when more than one source is ready at the same time.

This is motivated by
1. Make sure the messages we send go out as soon as possible (progress, telemetry)
2. Now that the vfs loader uses all available cores to speed up loading, make sure the loader progress messages do not drown out all others.

Reviewed By: michalmuskala

Differential Revision: D87984388

fbshipit-source-id: 3b8cc5f6614bdf9699e805b03da6b5696829d280
---
 crates/elp/src/server.rs | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index 523be45ed5..65c75a1bbc 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -24,7 +24,7 @@ use anyhow::bail;
 use capabilities::text_document_symbols_dynamic_registration;
 use crossbeam_channel::Receiver;
 use crossbeam_channel::Sender;
-use crossbeam_channel::select;
+use crossbeam_channel::select_biased;
 use dispatch::NotificationDispatcher;
 use elp_eqwalizer::ast::Pos;
 use elp_eqwalizer::types::Type;
@@ -434,27 +434,28 @@ impl Server {
     }
 
     fn next_event(&self) -> Option<Event> {
-        select! {
-            recv(self.connection.receiver) -> msg => {
-                msg.ok().map(Event::Lsp)
-            }
-
-            recv(self.vfs_loader.receiver) -> msg => {
-                Some(Event::Vfs(msg.unwrap()))
-            }
-
-            recv(self.task_pool.receiver) -> msg => {
-                Some(Event::Task(msg.unwrap()))
-            }
-
+        // Select the next event, in order of priority.
+        // If multiple operations are ready at the same time, the
+        // operation nearest to the front of the list is always selected.
+        select_biased! {
+            // We want to send progress messages as soon as possible
             recv(self.progress.receiver()) -> msg => {
                 Some(Event::Task(Task::Progress(msg.unwrap())))
             }
 
+            // Ditto telemetry
             recv(telemetry::receiver()) -> msg => {
                 Some(Event::Telemetry(msg.unwrap()))
             }
 
+            recv(self.connection.receiver) -> msg => {
+                msg.ok().map(Event::Lsp)
+            }
+
+            recv(self.task_pool.receiver) -> msg => {
+                Some(Event::Task(msg.unwrap()))
+            }
+
             recv (self.project_pool.receiver) -> msg => {
                 Some(Event::Task(msg.unwrap()))
             }
@@ -467,6 +468,16 @@ impl Server {
                 Some(Event::Task(msg.unwrap()))
             }
 
+            // We put vfs loader events last, they run with all
+            // available threads, we do not want to starve the
+            // other sources.
+            // Note: when we do process one, we will coalesce
+            // all pending vfs loader events into a single main loop turn
+            recv(self.vfs_loader.receiver) -> msg => {
+                Some(Event::Vfs(msg.unwrap()))
+            }
+
+
         }
     }
 

From 38c84d39a64573e2bdf9a2cd222e62023906b309 Mon Sep 17 00:00:00 2001
From: Daniel Gorin <danielgo@meta.com>
Date: Fri, 28 Nov 2025 03:19:17 -0800
Subject: [PATCH 308/394] Remove unclear bits of W0050 docs

Summary:
# Context
W0050 asks users to prefer the more efficient `tuple_size/1` and `byte_size/1`, instead of `size/1`.

# Problem
The explanation is muddled by some advice to always guard the usages of `byte_size/1` with `is_binary/1`. This doesn't make intuitive sense and there's nothing in the docs of `byte_size/1` that suggests this is advisable in any way.

# This diff
Remove this part. I'm also removing the part that rewrites `size/1` in terms of `byte_size/1` and `tuple_size/1` as it doesn't seem to be adding anything.

Reviewed By: TD5

Differential Revision: D87986348

fbshipit-source-id: dbd6aeec71989bc367f3d22b58a71d893b7fff76
---
 website/docs/erlang-error-index/w/W0050.md | 42 ++++++++--------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/website/docs/erlang-error-index/w/W0050.md b/website/docs/erlang-error-index/w/W0050.md
index a0d43d7171..8c8210dcca 100644
--- a/website/docs/erlang-error-index/w/W0050.md
+++ b/website/docs/erlang-error-index/w/W0050.md
@@ -20,40 +20,26 @@ size(Input) ->
 
 ## Explanation
 
-The [`size/1`](https://www.erlang.org/doc/apps/erts/erlang#size/1) BIF returns
-the size for both tuples and binaries.
+The [`size/1`](https://www.erlang.org/doc/apps/erts/erlang#size/1) BIF can be
+used to return the size tuples, binaries and bitstrings.
 
-The BIF is not optimized by the
-[JIT](https://www.erlang.org/doc/apps/erts/beamasm.html) though, and its use can
-result in worse types for
-[dialyzer](https://www.erlang.org/doc/apps/dialyzer/dialyzer.html) and
-[eqWAlizer](https://github.com/WhatsApp/eqwalizer).
+However, this BIF is not optimized by the
+[JIT](https://www.erlang.org/doc/apps/erts/beamasm.html); it may report
+inaccurate values for bitstrings, and its use can result in worse types for
+[dialyzer](https://www.erlang.org/doc/apps/dialyzer/dialyzer.html).
 
-When one knows that the value being tested must be a tuple, `tuple_size/1`
-should always be preferred.
+What to do instead:
 
-When one knows that the value being tested must be a binary, `byte_size/1`
-should be preferred. However, `byte_size/1` also accepts a bitstring (rounding
-up size to a whole number of bytes), so one must make sure that the call to
-`byte_size/1` is preceded by a call to `is_binary/1` to ensure that bitstrings
-are rejected. Note that the compiler removes redundant calls to `is_binary/1`,
-so if one is not sure whether previous code had made sure that the argument is a
-binary, it does not harm to add an `is_binary/1` test immediately before the
-call to `byte_size/1`.
+- For tuples, use `tuple_size/1`.
 
-For the above use case, a better approach would be:
+- For binaries, use `byte_size/1`.
+
+- For bitstrings, use `byte_size/1`, but please notice that while `byte_size/1`
+  rounds _up_ to the nearest byte, `size/1` would round _down_:
 
 ```erlang
--module(main).
--export([size/1]).
-
--type input() :: tuple() | binary().
-
--spec size(input()) -> non_neg_integer().
-size(Input) when is_tuple(Input) ->
-    erlang:tuple_size(Input);
-size(Input) when is_binary(Input) ->
-    erlang:byte_size(Input).
+4 = byte_size(<<0:25>>).
+3 = size(<<0:25>>).
 ```
 
 For more information, see the Erlang

From 87bc60c5248b781687fd17e176fc2c4e2182b8d5 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 28 Nov 2025 12:31:40 -0800
Subject: [PATCH 309/394] Remove support for obsolete test_utils and
 elp_enabled Buck2 labels

Summary:
Simplify the classification of test applications, by removing support for the obsolete "test_utils" and "elp_enabled" labels.

A subsequent diff will make it possible to customize the labels via the `.elp.toml` configuration file.

Reviewed By: michalmuskala, alanz

Differential Revision: D88004904

fbshipit-source-id: fde38e8ce5a4f5c742c647a63ef736d3bbc84f51
---
 crates/project_model/src/buck.rs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index e360ec848b..d0498a237a 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -823,13 +823,11 @@ fn compute_target_type(
     if is_prelude_as_third_party || name.contains("//third-party") {
         TargetType::ThirdParty
     } else {
-        let test_utils = target.labels.contains("test_utils");
         let test_application = target.labels.contains("test_application");
-        let elp_enabled = target.labels.contains("elp_enabled");
-        match (elp_enabled, test_application, test_utils) {
-            (true, _, _) => TargetType::ErlangApp,
-            (false, false, false) => TargetType::ErlangApp,
-            (_, _, _) => TargetType::ErlangTestUtils,
+        if test_application {
+            TargetType::ErlangTestUtils
+        } else {
+            TargetType::ErlangApp
         }
     }
 }

From 3e873e691d6711b17850e723c02899a43301bdd9 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 28 Nov 2025 12:31:40 -0800
Subject: [PATCH 310/394] Make labels to denote test applications configurable

Summary: Make it possible to customize the set of labels that in a Buck2 `erlang_application` target can identify a "test" application. Make it default to "test application".

Reviewed By: alanz, michalmuskala

Differential Revision: D88005051

fbshipit-source-id: d5a7cbb89373def5796420fa178c0a86fd72e3ed
---
 crates/project_model/src/buck.rs              | 29 +++++++++++++++----
 crates/project_model/src/lib.rs               |  5 ++++
 .../get-started/configure-project/elp-toml.md | 18 ++++++++++--
 3 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index d0498a237a..09e2a7b131 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -88,6 +88,14 @@ pub struct BuckConfig {
     #[serde(default)]
     pub excluded_targets: Vec<String>,
     pub(crate) source_root: Option<PathBuf>,
+    /// Buck2 labels that denote test applications.
+    /// Defaults to ["test_application"] if not specified.
+    #[serde(default = "default_test_application_labels")]
+    pub test_application_labels: Vec<String>,
+}
+
+fn default_test_application_labels() -> Vec<String> {
+    vec!["test_application".to_string()]
 }
 
 impl BuckConfig {
@@ -726,7 +734,7 @@ fn load_buck_targets_bxl(
             root,
             name,
             buck_target,
-            buck_config.build_deps,
+            buck_config,
             targets_include_prelude,
             &mut dep_path,
             &mut target_info,
@@ -747,7 +755,7 @@ fn make_buck_target(
     root: &AbsPathBuf,
     name: &String,
     target: &BuckTarget,
-    build_deps: bool,
+    buck_config: &BuckConfig,
     targets_include_prelude: bool,
     dep_path: &mut FxHashMap<String, AbsPathBuf>,
     target_info: &mut TargetInfo,
@@ -763,7 +771,12 @@ fn make_buck_target(
         (src, TargetType::ErlangTest, false, None)
     } else {
         let mut private_header = false;
-        let target_type = compute_target_type(name, target, targets_include_prelude);
+        let target_type = compute_target_type(
+            name,
+            target,
+            targets_include_prelude,
+            &buck_config.test_application_labels,
+        );
         let mut src_files = vec![];
         for src in &target.srcs {
             let src = json::canonicalize(buck_path_to_abs_path(root, src).unwrap())?;
@@ -774,7 +787,7 @@ fn make_buck_target(
         }
 
         let ebin = match target_type {
-            TargetType::ThirdParty if build_deps => dep_path
+            TargetType::ThirdParty if buck_config.build_deps => dep_path
                 .remove(name)
                 .map(|dir| dir.join(Utf8PathBuf::from("ebin"))),
             TargetType::ThirdParty => Some(dir.clone()),
@@ -817,14 +830,17 @@ fn compute_target_type(
     name: &TargetFullName,
     target: &BuckTarget,
     targets_include_prelude: bool,
+    test_application_labels: &[String],
 ) -> TargetType {
     // Check if we are trying to work on the prelude itself
     let is_prelude_as_third_party = !targets_include_prelude && name.starts_with("prelude//");
     if is_prelude_as_third_party || name.contains("//third-party") {
         TargetType::ThirdParty
     } else {
-        let test_application = target.labels.contains("test_application");
-        if test_application {
+        let is_test_application = test_application_labels
+            .iter()
+            .any(|label| target.labels.contains(label));
+        if is_test_application {
             TargetType::ErlangTestUtils
         } else {
             TargetType::ErlangApp
@@ -1609,6 +1625,7 @@ mod tests {
                 included_targets: vec![],
                 excluded_targets: vec![],
                 source_root: None,
+                test_application_labels: vec!["test_application".to_string()],
             };
             let generated_args = if build_generated {
                 vec!["--build_generated_code", "true"]
diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs
index 53e550d05a..2c8727399c 100644
--- a/crates/project_model/src/lib.rs
+++ b/crates/project_model/src/lib.rs
@@ -1839,6 +1839,7 @@ mod tests {
                     "root//target/four".to_string(),
                 ],
                 source_root: Some(PathBuf::from("path/to/root")),
+                test_application_labels: vec!["test_application".to_string()],
             }),
             eqwalizer: EqwalizerConfig {
                 enable_all: true,
@@ -1864,6 +1865,7 @@ mod tests {
             included_targets = ["root//target/one", "root//target/two"]
             excluded_targets = ["root//target/three", "root//target/four"]
             source_root = "path/to/root"
+            test_application_labels = ["test_application"]
 
             [eqwalizer]
             enable_all = true
@@ -1937,6 +1939,9 @@ mod tests {
                         source_root: Some(
                             "path/to/root",
                         ),
+                        test_application_labels: [
+                            "test_application",
+                        ],
                     },
                 ),
                 eqwalizer: EqwalizerConfig {
diff --git a/website/docs/get-started/configure-project/elp-toml.md b/website/docs/get-started/configure-project/elp-toml.md
index 931d207989..90a9eb5f1e 100644
--- a/website/docs/get-started/configure-project/elp-toml.md
+++ b/website/docs/get-started/configure-project/elp-toml.md
@@ -111,9 +111,21 @@ Configure the interaction between ELP and the [Buck2](https://buck2.build/)
 build tool. See [this presentation](https://youtu.be/4ALgsBqNBhQ) for details
 about Erlang support for Buck2.
 
-| Key     | Type    | Description                      |
-| ------- | ------- | -------------------------------- |
-| enabled | Boolean | Discover the project using Buck2 |
+| Key                     | Type             | Description                                                                                                              | Default                |
+| ----------------------- | ---------------- | ------------------------------------------------------------------------------------------------------------------------ | ---------------------- |
+| enabled                 | Boolean          | Discover the project using Buck2                                                                                         |                        |
+| test_application_labels | Array of Strings | Buck2 labels that identify test application targets. Targets with any of these labels will be treated as test utilities. | `["test_application"]` |
+
+The `test_application_labels` setting allows you to customize which Buck2 labels
+indicate test applications. This is useful for:
+
+Example usage:
+
+```toml
+[buck]
+enabled = true
+test_application_labels = ["test_application", "integration_test", "e2e_test"]
+```
 
 :::warning
 

From 89c0c87b0f23ea14ee6f818f9bc15afad46f17df Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Mon, 1 Dec 2025 07:13:44 -0800
Subject: [PATCH 311/394] Do not check for eqwalizer disappearing if we did not
 unpack it

Summary:
The normal case for the ELP executable is to have a copy of eqwalizer as a Graalvm exe embedded inside ELP. At startup, this is unpacked to a temporary directory, so we can run it.

In the past we had issues where external processes would clean up the temporary directory, and so it would disappear. To mitigate this, we check if the file still exists before running it, and recreate it if not.

BUT, if we are running with ELP_EQWALIZER_PATH pointing to the eqwalizer jar file, as per the OSS local build instructions, then we do not unpack it to a temporary directory, *and* the command name is set to simply "java", which is not a file, as it should be resolved from the path. As a result the current existence check fails, and we continuously report that eqwalizer has disappeared.

This diff changes the check to only be made if we have in fact unpacked eqwalizer to a temporary directory.

Reviewed By: TD5

Differential Revision: D88071028

fbshipit-source-id: 21e7c4897dd6a8f6ae6fe137c413b2fab094d936
---
 crates/eqwalizer/src/lib.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/crates/eqwalizer/src/lib.rs b/crates/eqwalizer/src/lib.rs
index e6f49460a1..54333570fd 100644
--- a/crates/eqwalizer/src/lib.rs
+++ b/crates/eqwalizer/src/lib.rs
@@ -244,7 +244,9 @@ impl EqwalizerExe {
 impl Eqwalizer {
     fn cmd(&self) -> Command {
         let mut exe = EQWALIZER_EXE.lock();
-        if !exe.cmd.is_file() {
+        // This check is for the temporary directory being removed by an external process.
+        // As such, it is only applicable if ther *is* a temporary directory.
+        if exe._file.is_some() && !exe.cmd.is_file() {
             log::error!("Eqwalizer exe has disappeared, recreating");
             // We have a problem with the eqwalizer exe file, recreate it
             *exe = EqwalizerExe::ensure_exe();

From 270b8f46143ac9788756c59cd4d38dae395adb12 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 1 Dec 2025 08:24:18 -0800
Subject: [PATCH 312/394] Fix support for rebar3 projects in IDE

Summary:
# Context

A number of `rebar3` users reported false positive diagnostics, including `duplicated module` when using ELP in combination with a basic rebar3 umbrella project. The problem only appears after the project is compiled.

# Problem

The issue is caused by a bug in the project discovery for rebar3. The project is not correctly recognized as a `rebar3` project, but as a `No manifest` one. This causes ELP to recursively look for Erlang applications within the project directory, discarding the rebar3 structure.

Since rebar3 projects populate a `_build` directory with symlinks to the project applications, each application is found twice, leading to "duplicated module" diagnostics. This is also behind a number of related issues, since paths (e.g. `extra_src_dirs`) are not correctly discovered.

# Solution

The `path` argument for the `discover_in_place` function contains the path to the `.elp.toml` configuration file. When looking for rebar3 projects, we are passing the path as-is, which is why discovery fails. Instead, we should be passing the base directory for the file, where the `rebar.config` resides.

Reviewed By: alanz

Differential Revision: D88071314

fbshipit-source-id: d79edbcdf7a01512f753db668606cb798e65b74b
---
 crates/project_model/src/lib.rs | 62 ++++++++++++++++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

diff --git a/crates/project_model/src/lib.rs b/crates/project_model/src/lib.rs
index 2c8727399c..233c687afc 100644
--- a/crates/project_model/src/lib.rs
+++ b/crates/project_model/src/lib.rs
@@ -339,7 +339,13 @@ impl ProjectManifest {
     pub fn discover_in_place(path: &AbsPath, rebar_profile: Profile) -> Result<ProjectManifest> {
         let _timer = timeit!("discover projects in place");
         // We skip looking for the TOML file since we have already found it.
-        if let Some(r) = Self::discover_rebar(path, Some(rebar_profile), IncludeParentDirs::No)? {
+        if let Some(elp_config_basedir) = path.parent()
+            && let Some(r) = Self::discover_rebar(
+                &elp_config_basedir.to_path_buf(),
+                Some(rebar_profile),
+                IncludeParentDirs::No,
+            )?
+        {
             return Ok(r);
         }
         if let Some(s) = Self::discover_static(path, IncludeParentDirs::No)? {
@@ -1571,6 +1577,60 @@ mod tests {
         .assert_eq(&debug_normalise_temp_dir(dir, &manifest));
     }
 
+    #[test]
+    fn test_toml_empty_rebar_config() {
+        if cfg!(feature = "buck") {
+            let spec = r#"
+        //- /root/.elp.toml
+        //- /root/rebar.config
+        //- /root/app_a/src/app.erl
+        -module(app).
+        "#;
+            let dir = FixtureWithProjectMeta::gen_project(spec);
+            let discovered = ProjectManifest::discover(
+                &to_abs_path_buf(&dir.path().join("root/app_a/src/app.erl")).unwrap(),
+            );
+            expect![[r#"
+                Ok(
+                    (
+                        ElpConfig {
+                            config_path: Some(
+                                AbsPathBuf(
+                                    "TMPDIR/root/.elp.toml",
+                                ),
+                            ),
+                            build_info: None,
+                            buck: None,
+                            eqwalizer: EqwalizerConfig {
+                                enable_all: true,
+                                max_tasks: 4,
+                                ignore_modules: [],
+                                ignore_modules_compiled_patterns: [],
+                            },
+                            rebar: ElpRebarConfig {
+                                profile: "test",
+                            },
+                            otp: OtpConfig {
+                                exclude_apps: [],
+                            },
+                        },
+                        Rebar(
+                            RebarConfig {
+                                config_file: AbsPathBuf(
+                                    "TMPDIR/root/rebar.config",
+                                ),
+                                profile: Profile(
+                                    "test",
+                                ),
+                            },
+                        ),
+                    ),
+                )
+            "#]]
+            .assert_eq(&debug_normalise_temp_dir(dir, &discovered));
+        }
+    }
+
     #[test]
     fn test_toml_empty() {
         // This one is a real worst-case. We force discovery to happen in

From eafb4940c73510967a4e8a5768736d53bacd9870 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 1 Dec 2025 09:05:40 -0800
Subject: [PATCH 313/394] Convert edoc linter to use a trait

Summary: Mechanical conversion.

Reviewed By: alanz

Differential Revision: D87546425

fbshipit-source-id: 4d938866586d89f9a6751e9b0c787c1faf1759d0
---
 crates/ide/src/diagnostics.rs      |   2 +-
 crates/ide/src/diagnostics/edoc.rs | 189 ++++++++++++++++++-----------
 2 files changed, 118 insertions(+), 73 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index de828e5086..b72e695325 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1508,7 +1508,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &boolean_precedence::DESCRIPTOR,
         &record_tuple_match::DESCRIPTOR,
         &unspecific_include::DESCRIPTOR,
-        &edoc::DESCRIPTOR,
     ]
 }
 
@@ -1595,6 +1594,7 @@ const GENERIC_LINTERS: &[&dyn GenericDiagnostics] = &[
     &duplicate_module::LINTER,
     &no_nowarn_suppressions::LINTER,
     &macro_precedence_suprise::LINTER,
+    &edoc::LINTER,
 ];
 
 /// Unified registry for all types of linters
diff --git a/crates/ide/src/diagnostics/edoc.rs b/crates/ide/src/diagnostics/edoc.rs
index 0daae4f7f6..ead44d7331 100644
--- a/crates/ide/src/diagnostics/edoc.rs
+++ b/crates/ide/src/diagnostics/edoc.rs
@@ -10,6 +10,7 @@
 
 // Diagnostic: edoc
 
+use elp_ide_assists::Assist;
 use elp_ide_assists::helpers;
 use elp_ide_assists::helpers::extend_range;
 use elp_ide_db::elp_base_db::FileId;
@@ -17,87 +18,136 @@ use elp_ide_db::source_change::SourceChangeBuilder;
 use elp_ide_db::text_edit::TextRange;
 use elp_ide_db::text_edit::TextSize;
 use elp_syntax::AstNode;
+use elp_syntax::ast;
 use fxhash::FxHashSet;
 use hir::Attribute;
+use hir::InFileAstPtr;
 use hir::Semantic;
 use hir::edoc::EdocHeader;
 use hir::edoc::EdocHeaderKind;
 use hir::known;
 
-use super::Diagnostic;
 use super::DiagnosticCode;
-use super::DiagnosticConditions;
-use super::DiagnosticDescriptor;
+use super::GenericLinter;
+use super::GenericLinterMatchContext;
+use super::Linter;
 use super::Severity;
 
-const DIAGNOSTIC_CODE: DiagnosticCode = DiagnosticCode::OldEdocSyntax;
-const DIAGNOSTIC_MESSAGE: &str = "EDoc style comments are deprecated. Please use Markdown instead.";
-const CONVERT_FIX_ID: &str = "convert_to_markdown";
-const CONVERT_FIX_LABEL: &str = "Convert to Markdown";
+pub(crate) struct EdocLinter;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: false,
-        include_tests: true,
-        default_disabled: false,
-    },
-    checker: &|diags, sema, file_id, _ext| {
-        check(diags, sema, file_id);
-    },
-};
+impl Linter for EdocLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::OldEdocSyntax
+    }
 
-fn check(diagnostics: &mut Vec<Diagnostic>, sema: &Semantic, file_id: FileId) {
-    if let Some(comments) = sema.file_edoc_comments(file_id) {
-        for header in comments.values() {
-            if let Some(doc) = &header.doc {
-                if let Some(doc_start) = header.start() {
-                    diagnostics.push(old_edoc_syntax_diagnostic(
-                        sema, file_id, doc.range, header, doc_start,
-                    ));
-                }
-            } else if let Some(equiv) = &header.equiv {
-                if let Some(doc_start) = header.start() {
-                    diagnostics.push(old_edoc_syntax_diagnostic(
-                        sema,
-                        file_id,
-                        equiv.range,
-                        header,
-                        doc_start,
-                    ));
-                }
-            } else if let Some(deprecated) = &header.deprecated {
-                if let Some(doc_start) = header.start() {
-                    diagnostics.push(old_edoc_syntax_diagnostic(
-                        sema,
-                        file_id,
-                        deprecated.range,
-                        header,
-                        doc_start,
-                    ));
-                }
-            } else if let Some(hidden) = &header.hidden
-                && let Some(doc_start) = header.start()
-            {
-                diagnostics.push(old_edoc_syntax_diagnostic(
-                    sema,
-                    file_id,
-                    hidden.range,
-                    header,
-                    doc_start,
-                ));
-            }
+    fn description(&self) -> &'static str {
+        "EDoc style comments are deprecated. Please use Markdown instead."
+    }
+
+    fn severity(&self, sema: &Semantic, file_id: FileId) -> Severity {
+        match sema.db.is_test_suite_or_test_helper(file_id) {
+            Some(true) => Severity::WeakWarning,
+            _ => Severity::Warning,
         }
     }
 }
 
-fn old_edoc_syntax_diagnostic(
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
+pub struct Context {
+    header_ptr: Option<InFileAstPtr<ast::Form>>,
+    doc_start: TextSize,
+    range: TextRange,
+}
+
+impl GenericLinter for EdocLinter {
+    type Context = Context;
+
+    fn matches(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<GenericLinterMatchContext<Context>>> {
+        let mut res = Vec::new();
+        if let Some(comments) = sema.file_edoc_comments(file_id) {
+            for (header_ptr, header) in comments.iter() {
+                if let Some(doc) = &header.doc {
+                    if let Some(doc_start) = header.start() {
+                        res.push(GenericLinterMatchContext {
+                            range: doc.range,
+                            context: Context {
+                                header_ptr: Some(*header_ptr),
+                                doc_start,
+                                range: doc.range,
+                            },
+                        });
+                    }
+                } else if let Some(equiv) = &header.equiv {
+                    if let Some(doc_start) = header.start() {
+                        res.push(GenericLinterMatchContext {
+                            range: equiv.range,
+                            context: Context {
+                                header_ptr: Some(*header_ptr),
+                                doc_start,
+                                range: equiv.range,
+                            },
+                        });
+                    }
+                } else if let Some(deprecated) = &header.deprecated {
+                    if let Some(doc_start) = header.start() {
+                        res.push(GenericLinterMatchContext {
+                            range: deprecated.range,
+                            context: Context {
+                                header_ptr: Some(*header_ptr),
+                                doc_start,
+                                range: deprecated.range,
+                            },
+                        });
+                    }
+                } else if let Some(hidden) = &header.hidden
+                    && let Some(doc_start) = header.start()
+                {
+                    res.push(GenericLinterMatchContext {
+                        range: hidden.range,
+                        context: Context {
+                            header_ptr: Some(*header_ptr),
+                            doc_start,
+                            range: hidden.range,
+                        },
+                    });
+                }
+            }
+        }
+        Some(res)
+    }
+
+    fn fixes(
+        &self,
+        context: &Self::Context,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<Assist>> {
+        let comments = sema.file_edoc_comments(file_id)?;
+        let header_ptr = context.header_ptr.as_ref()?;
+        let header = comments.get(header_ptr)?;
+        Some(vec![old_edoc_syntax_fix(
+            sema,
+            file_id,
+            header,
+            context.doc_start,
+            context.range,
+        )])
+    }
+}
+
+pub static LINTER: EdocLinter = EdocLinter;
+
+fn old_edoc_syntax_fix(
     sema: &Semantic,
     file_id: FileId,
-    show_range: TextRange,
     header: &EdocHeader,
     start_offset: TextSize,
-) -> Diagnostic {
+    range: TextRange,
+) -> Assist {
     let eep59_insert_offset = match header.kind {
         EdocHeaderKind::Module => {
             helpers::moduledoc_insert_offset(sema, file_id).unwrap_or(start_offset)
@@ -135,17 +185,12 @@ fn old_edoc_syntax_diagnostic(
     }
     builder.insert(eep59_insert_offset, header.to_eep59());
     let source_change = builder.finish();
-    let fix = crate::fix(CONVERT_FIX_ID, CONVERT_FIX_LABEL, source_change, show_range);
-    Diagnostic::new(DIAGNOSTIC_CODE, DIAGNOSTIC_MESSAGE, show_range)
-        .with_severity(severity(sema, file_id))
-        .with_fixes(Some(vec![fix]))
-}
-
-fn severity(sema: &Semantic, file_id: FileId) -> Severity {
-    match sema.db.is_test_suite_or_test_helper(file_id) {
-        Some(true) => Severity::WeakWarning,
-        _ => Severity::Warning,
-    }
+    crate::fix(
+        "convert_to_markdown",
+        "Convert to Markdown",
+        source_change,
+        range,
+    )
 }
 
 fn author_exists(author: &str, authors: &FxHashSet<String>) -> bool {

From f80d50389d92dd3858b152c02886266c90fe257f Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 2 Dec 2025 01:53:20 -0800
Subject: [PATCH 314/394] remove --prefix command line argument

Summary: This should no longer be needed, remove it to reduce code complexity

Reviewed By: jcpetruzza

Differential Revision: D87929715

fbshipit-source-id: c62a6e07084d555bba12dafb96fb893e33f6dc9f
---
 crates/elp/src/bin/args.rs                    |  4 --
 crates/elp/src/bin/glean.rs                   | 54 ++-----------------
 crates/elp/src/bin/lint_cli.rs                | 11 +---
 crates/elp/src/bin/main.rs                    | 32 -----------
 .../elp/src/resources/test/glean_help.stdout  |  3 +-
 .../elp/src/resources/test/lint_help.stdout   |  3 +-
 .../parse_elp_lint_json_output_prefix.stdout  |  3 --
 7 files changed, 8 insertions(+), 102 deletions(-)
 delete mode 100644 crates/elp/src/resources/test/linter/parse_elp_lint_json_output_prefix.stdout

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index f533688b82..f63d569b52 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -274,8 +274,6 @@ pub struct Lint {
         guard(format_guard, "Please use json")
     )]
     pub format: Option<String>,
-    /// Optional prefix to prepend to each diagnostic file path. Only used when --format=json is set
-    pub prefix: Option<String>,
 
     /// Include diagnostics produced by erlc
     pub include_erlc_diagnostics: bool,
@@ -469,8 +467,6 @@ pub struct Glean {
     pub pretty: bool,
     /// Output each fact separately
     pub multi: bool,
-    /// Optional prefix to prepend to each fact
-    pub prefix: Option<String>,
 }
 
 #[derive(Clone, Debug, Bpaf)]
diff --git a/crates/elp/src/bin/glean.rs b/crates/elp/src/bin/glean.rs
index dad833e0c1..c31d45dc9e 100644
--- a/crates/elp/src/bin/glean.rs
+++ b/crates/elp/src/bin/glean.rs
@@ -11,7 +11,6 @@
 use core::option::Option::None;
 use std::io::Write;
 use std::mem;
-use std::path::Path;
 
 use anyhow::Result;
 use elp::build::load;
@@ -93,7 +92,6 @@ struct GleanFileId(u32);
 #[derive(Clone, Debug, Default)]
 struct IndexConfig {
     pub multi: bool,
-    pub prefix: Option<String>,
 }
 
 impl From<GleanFileId> for FileId {
@@ -769,10 +767,7 @@ pub struct GleanIndexer {
 
 pub fn index(args: &Glean, cli: &mut dyn Cli, query_config: &BuckQueryConfig) -> Result<()> {
     let (indexer, _loaded) = GleanIndexer::new(args, cli, query_config)?;
-    let config = IndexConfig {
-        multi: args.multi,
-        prefix: args.prefix.clone(),
-    };
+    let config = IndexConfig { multi: args.multi };
     let (facts, module_index) = indexer.index(config)?;
     write_results(facts, module_index, cli, args)
 }
@@ -861,14 +856,7 @@ impl GleanIndexer {
                 let source_root_id = db.file_source_root(file_id);
                 let source_root = db.source_root(source_root_id);
                 let path = source_root.path_for_file(&file_id).unwrap();
-                match Self::index_file(
-                    db,
-                    file_id,
-                    path,
-                    project_id,
-                    &module_index,
-                    config.prefix.as_ref(),
-                ) {
+                match Self::index_file(db, file_id, path, project_id, &module_index) {
                     Some((file, line, decl, xref, facts, module_fact)) => {
                         let mut result = FxHashMap::default();
                         result.insert(
@@ -884,14 +872,7 @@ impl GleanIndexer {
                     .into_par_iter()
                     .map_with(self.analysis.clone(), |analysis, (file_id, path)| {
                         analysis.with_db(|db| {
-                            Self::index_file(
-                                db,
-                                file_id,
-                                &path,
-                                project_id,
-                                &module_index,
-                                config.prefix.as_ref(),
-                            )
+                            Self::index_file(db, file_id, &path, project_id, &module_index)
                         })
                     })
                     .flatten()
@@ -948,7 +929,6 @@ impl GleanIndexer {
         path: &VfsPath,
         project_id: ProjectId,
         module_index: &FxHashMap<GleanFileId, String>,
-        prefix: Option<&String>,
     ) -> Option<(
         FileFact,
         FileLinesFact,
@@ -957,7 +937,7 @@ impl GleanIndexer {
         Option<(Vec<FunctionDeclarationFact>, XRefFact)>,
         Option<ModuleFact>,
     )> {
-        let file_fact = Self::file_fact(db, file_id, path, project_id, prefix)?;
+        let file_fact = Self::file_fact(db, file_id, path, project_id)?;
         let line_fact = Self::line_fact(db, file_id);
         let mut xref_v2 = Self::xrefs_v2(db, file_id, module_index);
         let mut file_decl = Self::declarations_v2(db, file_id, path)?;
@@ -1173,16 +1153,12 @@ impl GleanIndexer {
         file_id: FileId,
         path: &VfsPath,
         project_id: ProjectId,
-        prefix: Option<&String>,
     ) -> Option<FileFact> {
         let project_data = db.project_data(project_id);
         let root = project_data.root_dir.as_path();
         let file_path = path.as_path()?;
         let file_path = file_path.strip_prefix(root)?;
-        let file_path = match prefix {
-            Some(prefix) => Path::new(&prefix).join(file_path).to_str()?.into(),
-            None => file_path.as_str().to_string(),
-        };
+        let file_path = file_path.as_str().to_string();
         Some(FileFact::new(file_id, file_path))
     }
 
@@ -2063,7 +2039,6 @@ mod tests {
             v2: true,
             pretty: false,
             multi: false,
-            prefix: None,
         };
         let mut module_index = FxHashMap::default();
         module_index.insert(file_id.into(), module_name.to_string());
@@ -2090,25 +2065,6 @@ mod tests {
         );
     }
 
-    #[test]
-    fn file_fact_prefix_test() {
-        let spec = r#"
-        //- /glean/app_glean/src/glean_module2.erl
-        -module(glean_module2).
-        "#;
-        let config = IndexConfig {
-            multi: false,
-            prefix: Some("my/prefix".to_string()),
-        };
-        let result = facts_with_annotations_with_config(spec, config).0;
-        assert_eq!(result.file_facts.len(), 1);
-        let file_fact = &result.file_facts[0];
-        assert_eq!(
-            file_fact.file_path.as_str(),
-            "my/prefix/glean/app_glean/src/glean_module2.erl"
-        );
-    }
-
     #[test]
     fn line_fact_with_new_line_test() {
         let spec = r#"
diff --git a/crates/elp/src/bin/lint_cli.rs b/crates/elp/src/bin/lint_cli.rs
index fcce5cac98..6807d81f25 100644
--- a/crates/elp/src/bin/lint_cli.rs
+++ b/crates/elp/src/bin/lint_cli.rs
@@ -13,7 +13,6 @@ use std::fs;
 use std::fs::File;
 use std::io::Write;
 use std::path::Path;
-use std::path::PathBuf;
 use std::str;
 use std::sync::Arc;
 use std::time::SystemTime;
@@ -326,12 +325,11 @@ pub fn do_codemod(
                             .unwrap_or_else(|| panic!("could not find project data"))
                             .root_dir;
                         let relative_path = reporting::get_relative_path(root_path, vfs_path);
-                        let prefix = args.prefix.as_ref();
                         print_diagnostic_json(
                             diag,
                             &analysis,
                             *file_id,
-                            with_prefix(relative_path, prefix).as_path(),
+                            relative_path,
                             args.use_cli_severity,
                             cli,
                         )?;
@@ -942,13 +940,6 @@ fn get_form_id_at_offset(
     Some(form_id)
 }
 
-fn with_prefix(path: &Path, prefix: Option<&String>) -> PathBuf {
-    match prefix {
-        Some(prefix) => Path::new(prefix).join(path),
-        None => path.into(),
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use std::ffi::OsString;
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 909224f6f2..b227259a52 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -1661,38 +1661,6 @@ mod tests {
         .expect("bad test");
     }
 
-    #[test_case(false ; "rebar")]
-    #[test_case(true  ; "buck")]
-    fn lint_json_output_prefix(buck: bool) {
-        let tmp_dir = make_tmp_dir();
-        let tmp_path = tmp_dir.path();
-        check_lint_fix_stderr(
-            args_vec![
-                "lint",
-                "--diagnostic-filter",
-                "W0010",
-                "--experimental",
-                "--format",
-                "json",
-                "--prefix",
-                "my/prefix"
-            ],
-            "linter",
-            expect_file!("../resources/test/linter/parse_elp_lint_json_output_prefix.stdout"),
-            101,
-            buck,
-            None,
-            tmp_path,
-            Path::new("../resources/test/lint/lint_recursive"),
-            &[],
-            false,
-            Some(expect![[r#"
-                Errors found
-            "#]]),
-        )
-        .expect("bad test");
-    }
-
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
     fn lint_applies_fix_using_to_dir(buck: bool) {
diff --git a/crates/elp/src/resources/test/glean_help.stdout b/crates/elp/src/resources/test/glean_help.stdout
index bdde2ec540..c4e938e143 100644
--- a/crates/elp/src/resources/test/glean_help.stdout
+++ b/crates/elp/src/resources/test/glean_help.stdout
@@ -1,4 +1,4 @@
-Usage: [--project PROJECT] [--module MODULE] [--to TO] [--v2] [--pretty] [--multi] [--prefix ARG]
+Usage: [--project PROJECT] [--module MODULE] [--to TO] [--v2] [--pretty] [--multi]
 
 Available options:
         --project <PROJECT>  Path to directory with project, or to a JSON file (defaults to `.`)
@@ -7,5 +7,4 @@ Available options:
         --v2                 Produce glean db with macros, types, xrefs. Incompatible with previous
         --pretty             Pretty print
         --multi              Output each fact separately
-        --prefix <ARG>       Optional prefix to prepend to each fact
     -h, --help               Prints help information
diff --git a/crates/elp/src/resources/test/lint_help.stdout b/crates/elp/src/resources/test/lint_help.stdout
index 8d03db6ee3..ec4c25c70a 100644
--- a/crates/elp/src/resources/test/lint_help.stdout
+++ b/crates/elp/src/resources/test/lint_help.stdout
@@ -1,4 +1,4 @@
-Usage: [--project PROJECT] [--module MODULE] [--app APP] [--file FILE] [--rebar] [--as PROFILE] [--include-generated] [--include-tests] [--no-diags] [[--format FORMAT]] [--prefix ARG] [--include-erlc-diagnostics] [--include-ct-diagnostics] [--include-edoc-diagnostics] [--include-eqwalizer-diagnostics] [--include-suppressed] [--use-cli-severity] [--diagnostic-ignore CODE] [--diagnostic-filter CODE] [--experimental] [--read-config] [--config-file CONFIG_FILE] [--apply-fix] [--ignore-fix-only] [--in-place] [--to TO] [--recursive] [--with-check] [--check-eqwalize-all] [--one-shot] [--report-system-stats] <IGNORED_APPS>...
+Usage: [--project PROJECT] [--module MODULE] [--app APP] [--file FILE] [--rebar] [--as PROFILE] [--include-generated] [--include-tests] [--no-diags] [[--format FORMAT]] [--include-erlc-diagnostics] [--include-ct-diagnostics] [--include-edoc-diagnostics] [--include-eqwalizer-diagnostics] [--include-suppressed] [--use-cli-severity] [--diagnostic-ignore CODE] [--diagnostic-filter CODE] [--experimental] [--read-config] [--config-file CONFIG_FILE] [--apply-fix] [--ignore-fix-only] [--in-place] [--to TO] [--recursive] [--with-check] [--check-eqwalize-all] [--one-shot] [--report-system-stats] <IGNORED_APPS>...
 
 Available positional items:
     <IGNORED_APPS>  Rest of args are space separated list of apps to ignore
@@ -14,7 +14,6 @@ Available options:
         --include-tests                  Also generate diagnostics for test files
         --no-diags                       Do not print the full diagnostics for a file, just the count
         --format <FORMAT>                Show diagnostics in JSON format
-        --prefix <ARG>                   Optional prefix to prepend to each diagnostic file path. Only used when --format=json is set
         --include-erlc-diagnostics       Include diagnostics produced by erlc
         --include-ct-diagnostics         Include Common Test diagnostics
         --include-edoc-diagnostics       Include EDoc diagnostics
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_json_output_prefix.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_json_output_prefix.stdout
deleted file mode 100644
index 7389cc926a..0000000000
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_json_output_prefix.stdout
+++ /dev/null
@@ -1,3 +0,0 @@
-{"path":"my/prefix/app_a/src/app_a.erl","line":9,"char":6,"code":"ELP","severity":"warning","name":"W0010 (unused_function_arg)","original":null,"replacement":null,"description":"this variable is unused\n\nFor more information see: /erlang-error-index/w/W0010","docPath":"website/docs/erlang-error-index/w/W0010.md"}
-{"path":"my/prefix/app_a/src/app_a_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0010 (unused_function_arg)","original":null,"replacement":null,"description":"this variable is unused\n\nFor more information see: /erlang-error-index/w/W0010","docPath":"website/docs/erlang-error-index/w/W0010.md"}
-{"path":"my/prefix/app_b/src/app_b_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0010 (unused_function_arg)","original":null,"replacement":null,"description":"this variable is unused\n\nFor more information see: /erlang-error-index/w/W0010","docPath":"website/docs/erlang-error-index/w/W0010.md"}

From e4b89ebac565bc1fc4e275509c2661e57f91250f Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 2 Dec 2025 03:07:14 -0800
Subject: [PATCH 315/394] BE: fix clippy warnings

Summary: As title

Reviewed By: michalmuskala, TD5, robertoaloi

Differential Revision: D88143231

fbshipit-source-id: d7eebb3449b3c05a07ba1b5228930c13dd5708f0
---
 crates/ide/src/diagnostics.rs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index b72e695325..b8aa41bcda 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -464,9 +464,10 @@ impl fmt::Display for Diagnostic {
     }
 }
 
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Default)]
 pub enum Severity {
     Error,
+    #[default]
     Warning,
     // `WeakWarning` maps onto a Notice warning when used in the LSP
     // environment, and in VS Code this means it does not show up in
@@ -476,12 +477,6 @@ pub enum Severity {
     Information,
 }
 
-impl Default for Severity {
-    fn default() -> Self {
-        Self::Warning // Pick one
-    }
-}
-
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub enum Category {
     Experimental,

From cbe9a058cc3adcb5f66e1e83eac1a33819d94fe9 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 2 Dec 2025 04:52:04 -0800
Subject: [PATCH 316/394] update dependencies for dependabot

Summary: As title

Reviewed By: michalmuskala

Differential Revision: D88143729

fbshipit-source-id: cd5ecc02442e7661b4bf2f7e3f9b7f346561b2c4
---
 website/package.json |   8 +-
 website/yarn.lock    | 621 ++++++++++++++++++++++++-------------------
 2 files changed, 353 insertions(+), 276 deletions(-)

diff --git a/website/package.json b/website/package.json
index f8f738328c..49a34973ca 100644
--- a/website/package.json
+++ b/website/package.json
@@ -20,8 +20,8 @@
     "@docusaurus/preset-classic": "3.9.2",
     "@mdx-js/react": "^3.0.0",
     "clsx": "^2.0.0",
-    "prism-react-renderer": "^2.3.0",
     "docusaurus-plugin-internaldocs-fb": "^1.18.4",
+    "prism-react-renderer": "^2.3.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
   },
@@ -63,6 +63,10 @@
     "webpack-dev-server": ">=5.2.1",
     "on-headers": ">=1.1.0",
     "mermaid": ">=11.10.0",
-    "glob": ">=10.5.0"
+    "glob": ">=10.5.0",
+    "node-forge": ">=1.3.2",
+    "mdast-util-to-hast": ">=13.2.1",
+    "remark-rehype": ">=11.0.0",
+    "express": ">=4.22.0"
   }
 }
diff --git a/website/yarn.lock b/website/yarn.lock
index 182874330e..1ac9f2033a 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -3251,7 +3251,15 @@ abbrev@1:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-accepts@~1.3.4, accepts@~1.3.8:
+accepts@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-2.0.0.tgz#bbcf4ba5075467f3f2131eab3cffc73c2f5d7895"
+  integrity sha512-5cvg6CtKwfgdmVqY1WIiXKc3Q1bkRqGLi+2W/6ao+6Y7gu/RCwRuAhGEzh5B4KlszSuTLgZYuqFqo5bImjNKng==
+  dependencies:
+    mime-types "^3.0.0"
+    negotiator "^1.0.0"
+
+accepts@~1.3.4:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
   integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
@@ -3441,11 +3449,6 @@ argparse@^2.0.1:
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-array-flatten@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
-
 array-union@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
@@ -3589,23 +3592,20 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
   integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
 
-body-parser@1.20.3:
-  version "1.20.3"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6"
-  integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==
+body-parser@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-2.2.1.tgz#6df606b0eb0a6e3f783dde91dde182c24c82438c"
+  integrity sha512-nfDwkulwiZYQIGwxdy0RUmowMhKcFVcYXUU7m4QlKYim1rUtg83xm2yjZ40QjDuc291AJjjeSc9b++AWHSgSHw==
   dependencies:
-    bytes "3.1.2"
-    content-type "~1.0.5"
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    on-finished "2.4.1"
-    qs "6.13.0"
-    raw-body "2.5.2"
-    type-is "~1.6.18"
-    unpipe "1.0.0"
+    bytes "^3.1.2"
+    content-type "^1.0.5"
+    debug "^4.4.3"
+    http-errors "^2.0.0"
+    iconv-lite "^0.7.0"
+    on-finished "^2.4.1"
+    qs "^6.14.0"
+    raw-body "^3.0.1"
+    type-is "^2.0.1"
 
 bonjour-service@^1.2.1:
   version "1.3.0"
@@ -3708,7 +3708,7 @@ bytes@3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
   integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==
 
-bytes@3.1.2:
+bytes@3.1.2, bytes@^3.1.2, bytes@~3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
@@ -3739,6 +3739,14 @@ call-bind-apply-helpers@^1.0.0:
     es-errors "^1.3.0"
     function-bind "^1.1.2"
 
+call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6"
+  integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==
+  dependencies:
+    es-errors "^1.3.0"
+    function-bind "^1.1.2"
+
 call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.7:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.8.tgz#0736a9660f537e3388826f440d5ec45f744eaa4c"
@@ -3749,6 +3757,14 @@ call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.7:
     get-intrinsic "^1.2.4"
     set-function-length "^1.2.2"
 
+call-bound@^1.0.2:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.4.tgz#238de935d2a2a692928c538c7ccfa91067fd062a"
+  integrity sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==
+  dependencies:
+    call-bind-apply-helpers "^1.0.2"
+    get-intrinsic "^1.3.0"
+
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -3782,15 +3798,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001669:
-  version "1.0.30001687"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001687.tgz#d0ac634d043648498eedf7a3932836beba90ebae"
-  integrity sha512-0S/FDhf4ZiqrTUiQ39dKeUjYRjkv7lOZU1Dgif2rIqrTzX/1wV2hfKu9TOm1IHkdSijfLswxTFzl/cvir+SLSQ==
-
-caniuse-lite@^1.0.30001754:
-  version "1.0.30001755"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001755.tgz#c01cfb1c30f5acf1229391666ec03492f4c332ff"
-  integrity sha512-44V+Jm6ctPj7R52Na4TLi3Zri4dWUljJd+RDm+j8LtNCc/ihLCT+X1TzoOAkRETEWqjuLnh9581Tl80FvK7jVA==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001646, caniuse-lite@^1.0.30001669, caniuse-lite@^1.0.30001754:
+  version "1.0.30001757"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001757.tgz"
+  integrity sha512-r0nnL/I28Zi/yjk1el6ilj27tKcdjLsNqAOZr0yVjWPrSQyHgKI2INaEWw21bAQSv2LXRt1XuCS/GomNpWOxsQ==
 
 ccount@^2.0.0:
   version "2.0.1"
@@ -4114,14 +4125,12 @@ content-disposition@0.5.2:
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
   integrity sha512-kRGRZw3bLlFISDBgwTSA1TMBFN6J6GWDeubmDE3AF+3+yXL8hTWv8r5rkLbqYXY4RjPk/EzHnClI3zQf1cFmHA==
 
-content-disposition@0.5.4:
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
-  integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
-  dependencies:
-    safe-buffer "5.2.1"
+content-disposition@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-1.0.1.tgz#a8b7bbeb2904befdfb6787e5c0c086959f605f9b"
+  integrity sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q==
 
-content-type@~1.0.4, content-type@~1.0.5:
+content-type@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
   integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
@@ -4131,12 +4140,12 @@ convert-source-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
-cookie-signature@1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
+cookie-signature@^1.2.1:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.2.2.tgz#57c7fc3cc293acab9fec54d73e15690ebe4a1793"
+  integrity sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==
 
-cookie@0.7.1, cookie@>=0.7.0:
+cookie@>=0.7.0, cookie@^0.7.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-1.0.2.tgz#27360701532116bd3f1f9416929d176afe1e4610"
   integrity sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==
@@ -4721,6 +4730,13 @@ debug@4, debug@^4.0.0, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
   dependencies:
     ms "^2.1.3"
 
+debug@^4.3.5, debug@^4.4.3:
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
+  integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
+  dependencies:
+    ms "^2.1.3"
+
 debug@^4.3.6:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
@@ -4812,7 +4828,7 @@ delaunator@5:
   dependencies:
     robust-predicates "^3.0.2"
 
-depd@2.0.0:
+depd@^2.0.0, depd@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
@@ -4827,11 +4843,6 @@ dequal@^2.0.0, dequal@^2.0.3:
   resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
   integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
 
-destroy@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
-  integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
-
 detect-node@^2.0.4:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
@@ -5011,6 +5022,15 @@ dot-prop@^6.0.1:
   dependencies:
     is-obj "^2.0.0"
 
+dunder-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a"
+  integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==
+  dependencies:
+    call-bind-apply-helpers "^1.0.1"
+    es-errors "^1.3.0"
+    gopd "^1.2.0"
+
 duplexer@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
@@ -5061,12 +5081,7 @@ emoticon@^4.0.1:
   resolved "https://registry.yarnpkg.com/emoticon/-/emoticon-4.1.0.tgz#d5a156868ee173095627a33de3f1e914c3dde79e"
   integrity sha512-VWZfnxqwNcc51hIy/sbOdEem6D+cVtpPzEEtVAFdaas30+1dgkyaOQ4sQ6Bp0tOMqWO1v+HQfYaoodOkdhK6SQ==
 
-encodeurl@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
-
-encodeurl@~2.0.0:
+encodeurl@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58"
   integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==
@@ -5108,6 +5123,11 @@ es-define-property@^1.0.0:
   dependencies:
     get-intrinsic "^1.2.4"
 
+es-define-property@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa"
+  integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==
+
 es-errors@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
@@ -5118,6 +5138,13 @@ es-module-lexer@^1.2.1:
   resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.5.4.tgz#a8efec3a3da991e60efa6b633a7cad6ab8d26b78"
   integrity sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==
 
+es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1"
+  integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==
+  dependencies:
+    es-errors "^1.3.0"
+
 esast-util-from-estree@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/esast-util-from-estree/-/esast-util-from-estree-2.0.0.tgz#8d1cfb51ad534d2f159dc250e604f3478a79f1ad"
@@ -5307,7 +5334,7 @@ eta@^2.2.0:
   resolved "https://registry.yarnpkg.com/eta/-/eta-2.2.0.tgz#eb8b5f8c4e8b6306561a455e62cd7492fe3a9b8a"
   integrity sha512-UVQ72Rqjy/ZKQalzV5dCCJP80GrmPrMxh6NlNf+erV6ObL0ZFkhCstWRawS85z3smdr3d2wXPsZEY7rDPfGd2g==
 
-etag@~1.8.1:
+etag@^1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
   integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
@@ -5355,42 +5382,39 @@ exenv@^1.2.0:
   resolved "https://registry.yarnpkg.com/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d"
   integrity sha512-Z+ktTxTwv9ILfgKCk32OX3n/doe+OcLTRtqK9pcL+JsP3J1/VW8Uvl4ZjLlKqeW4rzK4oesDOGMEMRIZqtP4Iw==
 
-express@^4.21.2:
-  version "4.21.2"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.21.2.tgz#cf250e48362174ead6cea4a566abef0162c1ec32"
-  integrity sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==
+express@>=4.22.0, express@^4.21.2:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-5.2.1.tgz#8f21d15b6d327f92b4794ecf8cb08a72f956ac04"
+  integrity sha512-hIS4idWWai69NezIdRt2xFVofaF4j+6INOpJlVOLDO8zXGpUVEVzIYk12UUi2JzjEzWL3IOAxcTubgz9Po0yXw==
   dependencies:
-    accepts "~1.3.8"
-    array-flatten "1.1.1"
-    body-parser "1.20.3"
-    content-disposition "0.5.4"
-    content-type "~1.0.4"
-    cookie "0.7.1"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "2.0.0"
-    encodeurl "~2.0.0"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "1.3.1"
-    fresh "0.5.2"
-    http-errors "2.0.0"
-    merge-descriptors "1.0.3"
-    methods "~1.1.2"
-    on-finished "2.4.1"
-    parseurl "~1.3.3"
-    path-to-regexp "0.1.12"
-    proxy-addr "~2.0.7"
-    qs "6.13.0"
-    range-parser "~1.2.1"
-    safe-buffer "5.2.1"
-    send "0.19.0"
-    serve-static "1.16.2"
-    setprototypeof "1.2.0"
-    statuses "2.0.1"
-    type-is "~1.6.18"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
+    accepts "^2.0.0"
+    body-parser "^2.2.1"
+    content-disposition "^1.0.0"
+    content-type "^1.0.5"
+    cookie "^0.7.1"
+    cookie-signature "^1.2.1"
+    debug "^4.4.0"
+    depd "^2.0.0"
+    encodeurl "^2.0.0"
+    escape-html "^1.0.3"
+    etag "^1.8.1"
+    finalhandler "^2.1.0"
+    fresh "^2.0.0"
+    http-errors "^2.0.0"
+    merge-descriptors "^2.0.0"
+    mime-types "^3.0.0"
+    on-finished "^2.4.1"
+    once "^1.4.0"
+    parseurl "^1.3.3"
+    proxy-addr "^2.0.7"
+    qs "^6.14.0"
+    range-parser "^1.2.1"
+    router "^2.2.0"
+    send "^1.1.0"
+    serve-static "^2.2.0"
+    statuses "^2.0.1"
+    type-is "^2.0.1"
+    vary "^1.1.2"
 
 exsolve@^1.0.7:
   version "1.0.7"
@@ -5485,18 +5509,17 @@ fill-range@^7.1.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-finalhandler@1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.3.1.tgz#0c575f1d1d324ddd1da35ad7ece3df7d19088019"
-  integrity sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==
+finalhandler@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-2.1.1.tgz#a2c517a6559852bcdb06d1f8bd7f51b68fad8099"
+  integrity sha512-S8KoZgRZN+a5rNwqTxlZZePjT/4cnm0ROV70LedRHZ0p8u9fRID0hJUZQpkKLzro8LfmC8sx23bY6tVNxv8pQA==
   dependencies:
-    debug "2.6.9"
-    encodeurl "~2.0.0"
-    escape-html "~1.0.3"
-    on-finished "2.4.1"
-    parseurl "~1.3.3"
-    statuses "2.0.1"
-    unpipe "~1.0.0"
+    debug "^4.4.0"
+    encodeurl "^2.0.0"
+    escape-html "^1.0.3"
+    on-finished "^2.4.1"
+    parseurl "^1.3.3"
+    statuses "^2.0.1"
 
 find-cache-dir@^4.0.0:
   version "4.0.0"
@@ -5556,10 +5579,10 @@ fraction.js@^5.3.4:
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-5.3.4.tgz#8c0fcc6a9908262df4ed197427bdeef563e0699a"
   integrity sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==
 
-fresh@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
+fresh@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-2.0.0.tgz#8dd7df6a1b3a1b3a5cf186c05a5dd267622635a4"
+  integrity sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==
 
 fs-extra@^10.1.0:
   version "10.1.0"
@@ -5620,11 +5643,35 @@ get-intrinsic@^1.2.4:
     has-symbols "^1.0.3"
     hasown "^2.0.0"
 
+get-intrinsic@^1.2.5, get-intrinsic@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01"
+  integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==
+  dependencies:
+    call-bind-apply-helpers "^1.0.2"
+    es-define-property "^1.0.1"
+    es-errors "^1.3.0"
+    es-object-atoms "^1.1.1"
+    function-bind "^1.1.2"
+    get-proto "^1.0.1"
+    gopd "^1.2.0"
+    has-symbols "^1.1.0"
+    hasown "^2.0.2"
+    math-intrinsics "^1.1.0"
+
 get-own-enumerable-property-symbols@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
   integrity sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==
 
+get-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
+  integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
+  dependencies:
+    dunder-proto "^1.0.1"
+    es-object-atoms "^1.0.0"
+
 get-stream@^6.0.0, get-stream@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
@@ -5703,7 +5750,7 @@ globby@^13.1.1, globby@^13.1.4:
     merge2 "^1.4.1"
     slash "^4.0.0"
 
-gopd@^1.0.1:
+gopd@^1.0.1, gopd@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1"
   integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==
@@ -5781,7 +5828,7 @@ has-proto@^1.0.1:
   dependencies:
     call-bind "^1.0.7"
 
-has-symbols@^1.0.3:
+has-symbols@^1.0.3, has-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338"
   integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==
@@ -6151,16 +6198,16 @@ http-deceiver@^1.2.7:
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
   integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==
 
-http-errors@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
-  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
+http-errors@^2.0.0, http-errors@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.1.tgz#36d2f65bc909c8790018dd36fb4d93da6caae06b"
+  integrity sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==
   dependencies:
-    depd "2.0.0"
-    inherits "2.0.4"
-    setprototypeof "1.2.0"
-    statuses "2.0.1"
-    toidentifier "1.0.1"
+    depd "~2.0.0"
+    inherits "~2.0.4"
+    setprototypeof "~1.2.0"
+    statuses "~2.0.2"
+    toidentifier "~1.0.1"
 
 http-errors@~1.6.2:
   version "1.6.3"
@@ -6216,13 +6263,6 @@ hyperdyperid@^1.2.0:
   resolved "https://registry.yarnpkg.com/hyperdyperid/-/hyperdyperid-1.2.0.tgz#59668d323ada92228d2a869d3e474d5a33b69e6b"
   integrity sha512-Y93lCzHYgGWdrJ66yIktxiaGULYc6oGiABxhcO5AufBeOyoIdZF7bIfLaOrbM0iGIOXQQgxxRrFEnb+Y6w1n4A==
 
-iconv-lite@0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
-  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
 iconv-lite@0.6:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
@@ -6230,6 +6270,13 @@ iconv-lite@0.6:
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
+iconv-lite@^0.7.0, iconv-lite@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.7.0.tgz#c50cd80e6746ca8115eb98743afa81aa0e147a3e"
+  integrity sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
 icss-utils@^5.0.0, icss-utils@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
@@ -6288,7 +6335,7 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
-inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
+inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3, inherits@~2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -6521,6 +6568,11 @@ is-plain-object@^5.0.0:
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
   integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
 
+is-promise@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-4.0.0.tgz#42ff9f84206c1991d26debf520dd5c01042dd2f3"
+  integrity sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==
+
 is-reference@^3.0.0:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-3.0.3.tgz#9ef7bf9029c70a67b2152da4adf57c23d718910f"
@@ -6942,14 +6994,10 @@ marked@^16.3.0:
   resolved "https://registry.yarnpkg.com/marked/-/marked-16.4.2.tgz#4959a64be6c486f0db7467ead7ce288de54290a3"
   integrity sha512-TI3V8YYWvkVf3KJe1dRkpnjs68JUPyEa5vjKrp1XEEJUAOaQc+Qj+L1qWbPd0SJuAdQkFU0h73sXXqwDYxsiDA==
 
-mdast-util-definitions@^5.0.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/mdast-util-definitions/-/mdast-util-definitions-5.1.2.tgz#9910abb60ac5d7115d6819b57ae0bcef07a3f7a7"
-  integrity sha512-8SVPMuHqlPME/z3gqVwWY4zVXn8lqKv/pAhC57FuJ40ImXyBpmO5ukh98zB2v7Blql2FiHjHv9LVztSIqjY+MA==
-  dependencies:
-    "@types/mdast" "^3.0.0"
-    "@types/unist" "^2.0.0"
-    unist-util-visit "^4.0.0"
+math-intrinsics@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9"
+  integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==
 
 mdast-util-directive@^3.0.0:
   version "3.0.0"
@@ -7276,24 +7324,10 @@ mdast-util-phrasing@^4.0.0:
     "@types/mdast" "^4.0.0"
     unist-util-is "^6.0.0"
 
-mdast-util-to-hast@^12.1.0:
-  version "12.3.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-12.3.0.tgz#045d2825fb04374e59970f5b3f279b5700f6fb49"
-  integrity sha512-pits93r8PhnIoU4Vy9bjW39M2jJ6/tdHyja9rrot9uujkN7UTU9SDnE6WNJz/IGyQk3XHX6yNNtrBH6cQzm8Hw==
-  dependencies:
-    "@types/hast" "^2.0.0"
-    "@types/mdast" "^3.0.0"
-    mdast-util-definitions "^5.0.0"
-    micromark-util-sanitize-uri "^1.1.0"
-    trim-lines "^3.0.0"
-    unist-util-generated "^2.0.0"
-    unist-util-position "^4.0.0"
-    unist-util-visit "^4.0.0"
-
-mdast-util-to-hast@^13.0.0:
-  version "13.2.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-13.2.0.tgz#5ca58e5b921cc0a3ded1bc02eed79a4fe4fe41f4"
-  integrity sha512-QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==
+mdast-util-to-hast@>=13.2.1, mdast-util-to-hast@^13.0.0:
+  version "13.2.1"
+  resolved "https://registry.yarnpkg.com/mdast-util-to-hast/-/mdast-util-to-hast-13.2.1.tgz#d7ff84ca499a57e2c060ae67548ad950e689a053"
+  integrity sha512-cctsq2wp5vTsLIcaymblUriiTcZd0CwWtCbLvrOzYCDZoWyMNV8sZ7krj09FSnsiJi3WVsHLM4k6Dq/yaPyCXA==
   dependencies:
     "@types/hast" "^3.0.0"
     "@types/mdast" "^4.0.0"
@@ -7358,10 +7392,10 @@ mdn-data@2.0.30:
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
   integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==
 
-media-typer@0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
+media-typer@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-1.1.0.tgz#6ab74b8f2d3320f2064b2a87a38e7931ff3a5561"
+  integrity sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==
 
 memfs@^4.6.0:
   version "4.17.2"
@@ -7373,10 +7407,10 @@ memfs@^4.6.0:
     tree-dump "^1.0.1"
     tslib "^2.0.0"
 
-merge-descriptors@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5"
-  integrity sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==
+merge-descriptors@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-2.0.0.tgz#ea922f660635a2249ee565e0449f951e6b603808"
+  integrity sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==
 
 merge-stream@^2.0.0:
   version "2.0.0"
@@ -7414,11 +7448,6 @@ mermaid@>=11.10.0, mermaid@^10.9.0:
     ts-dedent "^2.2.0"
     uuid "^11.1.0"
 
-methods@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
-
 micromark-core-commonmark@^1.0.0, micromark-core-commonmark@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-1.1.0.tgz#1386628df59946b2d39fb2edfd10f3e8e0a75bb8"
@@ -8074,7 +8103,7 @@ micromark-util-resolve-all@^2.0.0:
   dependencies:
     micromark-util-types "^2.0.0"
 
-micromark-util-sanitize-uri@^1.0.0, micromark-util-sanitize-uri@^1.1.0:
+micromark-util-sanitize-uri@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-1.2.0.tgz#613f738e4400c6eedbc53590c67b197e30d7f90d"
   integrity sha512-QO4GXv0XZfWey4pYFndLUKEAktKkG5kZTdUNaTAkzbuJxn2tNBOr+QtxR2XpWaMhbImT2dPzyLrPXLlPhph34A==
@@ -8196,6 +8225,11 @@ mime-db@1.52.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.53.0.tgz#3cb63cd820fc29896d9d4e8c32ab4fcd74ccb447"
   integrity sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==
 
+mime-db@^1.54.0:
+  version "1.54.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.54.0.tgz#cddb3ee4f9c64530dff640236661d42cb6a314f5"
+  integrity sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==
+
 mime-db@~1.33.0:
   version "1.33.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
@@ -8208,17 +8242,19 @@ mime-types@2.1.18:
   dependencies:
     mime-db "~1.33.0"
 
-mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34:
+mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
     mime-db "1.52.0"
 
-mime@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
-  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+mime-types@^3.0.0, mime-types@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-3.0.2.tgz#39002d4182575d5af036ffa118100f2524b2e2ab"
+  integrity sha512-Lbgzdk0h4juoQ9fCKXW4by0UJqj+nOOrI9MJ1sSj4nI8aI2eo1qmvQEie4VD1glsS250n15LsWsYtCugiStS5A==
+  dependencies:
+    mime-db "^1.54.0"
 
 mimic-fn@^2.1.0:
   version "2.1.0"
@@ -8302,7 +8338,7 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
-ms@2.1.3, ms@^2.1.3:
+ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -8339,6 +8375,11 @@ negotiator@0.6.3:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
+negotiator@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-1.0.0.tgz#b6c91bb47172d69f93cfd7c357bbb529019b5f6a"
+  integrity sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==
+
 negotiator@~0.6.4:
   version "0.6.4"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7"
@@ -8381,10 +8422,10 @@ node-fetch@2.6.7:
   dependencies:
     whatwg-url "^5.0.0"
 
-node-forge@^1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
-  integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
+node-forge@>=1.3.2, node-forge@^1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.2.tgz#d0d2659a26eef778bf84d73e7f55c08144ee7750"
+  integrity sha512-6xKiQ+cph9KImrRh0VsjH2d8/GXA4FIMlgU4B757iI1ApvcyA9VlouP0yZJha01V+huImO+kKMU7ih+2+E14fw==
 
 node-releases@^2.0.18:
   version "2.0.18"
@@ -8455,10 +8496,10 @@ object-assign@^4.0.1, object-assign@^4.1.1:
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
-object-inspect@^1.13.1:
-  version "1.13.3"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.3.tgz#f14c183de51130243d6d18ae149375ff50ea488a"
-  integrity sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==
+object-inspect@^1.13.3:
+  version "1.13.4"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213"
+  integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==
 
 object-is@^1.1.5:
   version "1.1.6"
@@ -8488,7 +8529,7 @@ obuf@^1.0.0, obuf@^1.1.2:
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
   integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
-on-finished@2.4.1, on-finished@^2.4.1:
+on-finished@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
   integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
@@ -8500,6 +8541,13 @@ on-headers@>=1.1.0, on-headers@~1.0.2:
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.1.0.tgz#59da4f91c45f5f989c6e4bcedc5a3b0aed70ff65"
   integrity sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==
 
+once@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+  dependencies:
+    wrappy "1"
+
 onetime@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
@@ -8665,7 +8713,7 @@ parse5@^7.0.0:
   dependencies:
     entities "^4.5.0"
 
-parseurl@~1.3.2, parseurl@~1.3.3:
+parseurl@^1.3.3, parseurl@~1.3.2:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
@@ -8728,11 +8776,6 @@ path-scurry@^2.0.0:
     lru-cache "^11.0.0"
     minipass "^7.1.2"
 
-path-to-regexp@0.1.12:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz#d5e1a12e478a976d432ef3c58d534b9923164bb7"
-  integrity sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==
-
 path-to-regexp@3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-3.3.0.tgz#f7f31d32e8518c2660862b644414b6d5c63a611b"
@@ -8745,6 +8788,11 @@ path-to-regexp@^1.7.0:
   dependencies:
     isarray "0.0.1"
 
+path-to-regexp@^8.0.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-8.3.0.tgz#aa818a6981f99321003a08987d3cec9c3474cd1f"
+  integrity sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==
+
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
@@ -9456,7 +9504,7 @@ proto-list@~1.2.1:
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
   integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
 
-proxy-addr@~2.0.7:
+proxy-addr@^2.0.7:
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
   integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
@@ -9476,12 +9524,12 @@ pupa@^3.1.0:
   dependencies:
     escape-goat "^4.0.0"
 
-qs@6.13.0:
-  version "6.13.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"
-  integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==
+qs@^6.14.0:
+  version "6.14.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.0.tgz#c63fa40680d2c5c941412a0e899c89af60c0a930"
+  integrity sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==
   dependencies:
-    side-channel "^1.0.6"
+    side-channel "^1.1.0"
 
 quansync@^0.2.11:
   version "0.2.11"
@@ -9510,20 +9558,20 @@ range-parser@1.2.0:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
   integrity sha512-kA5WQoNVo4t9lNx2kQNFCxKeBl5IbbSNBl1M/tLkw9WCn+hxNBAW5Qh8gdhs63CJnhjJ2zQWFoqPJP2sK1AV5A==
 
-range-parser@^1.2.1, range-parser@~1.2.1:
+range-parser@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.5.2:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
-  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
+raw-body@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-3.0.2.tgz#3e3ada5ae5568f9095d84376fd3a49b8fb000a51"
+  integrity sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==
   dependencies:
-    bytes "3.1.2"
-    http-errors "2.0.0"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
+    bytes "~3.1.2"
+    http-errors "~2.0.1"
+    iconv-lite "~0.7.0"
+    unpipe "~1.0.0"
 
 rc@1.2.8:
   version "1.2.8"
@@ -9908,20 +9956,10 @@ remark-parse@^11.0.0:
     micromark-util-types "^2.0.0"
     unified "^11.0.0"
 
-remark-rehype@^10.0.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-10.1.0.tgz#32dc99d2034c27ecaf2e0150d22a6dcccd9a6279"
-  integrity sha512-EFmR5zppdBp0WQeDVZ/b66CWJipB2q2VLNFMabzDSGR66Z2fQii83G5gTBbgGEnEEA0QRussvrFHxk1HWGJskw==
-  dependencies:
-    "@types/hast" "^2.0.0"
-    "@types/mdast" "^3.0.0"
-    mdast-util-to-hast "^12.1.0"
-    unified "^10.0.0"
-
-remark-rehype@^11.0.0:
-  version "11.1.1"
-  resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-11.1.1.tgz#f864dd2947889a11997c0a2667cd6b38f685bca7"
-  integrity sha512-g/osARvjkBXb6Wo0XvAeXQohVta8i84ACbenPpoSsxTOQH/Ae0/RGP4WZgnMH5pMLpsj4FG7OHmcIcXxpza8eQ==
+remark-rehype@>=11.0.0, remark-rehype@^10.0.0, remark-rehype@^11.0.0:
+  version "11.1.2"
+  resolved "https://registry.yarnpkg.com/remark-rehype/-/remark-rehype-11.1.2.tgz#2addaadda80ca9bd9aa0da763e74d16327683b37"
+  integrity sha512-Dh7l57ianaEoIpzbp0PC9UKAdCSVklD8E5Rpw7ETfbTl3FqcOOgq5q2LVDhgGCkaBv7p24JXikPdvhhmHvKMsw==
   dependencies:
     "@types/hast" "^3.0.0"
     "@types/mdast" "^4.0.0"
@@ -10032,6 +10070,17 @@ roughjs@^4.6.6:
     points-on-curve "^0.2.0"
     points-on-path "^0.2.1"
 
+router@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/router/-/router-2.2.0.tgz#019be620b711c87641167cc79b99090f00b146ef"
+  integrity sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==
+  dependencies:
+    debug "^4.4.0"
+    depd "^2.0.0"
+    is-promise "^4.0.0"
+    parseurl "^1.3.3"
+    path-to-regexp "^8.0.0"
+
 rtlcss@^4.1.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/rtlcss/-/rtlcss-4.3.0.tgz#f8efd4d5b64f640ec4af8fa25b65bacd9e07cc97"
@@ -10076,7 +10125,7 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
+"safer-buffer@>= 2.1.2 < 3.0.0":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
@@ -10165,24 +10214,22 @@ semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.2, semver@^7.5.4, semve
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
   integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
 
-send@0.19.0:
-  version "0.19.0"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8"
-  integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==
+send@^1.1.0, send@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/send/-/send-1.2.0.tgz#32a7554fb777b831dfa828370f773a3808d37212"
+  integrity sha512-uaW0WwXKpL9blXE2o0bRhoL2EGXIrZxQ2ZQ4mgcfoBxdFmQold+qWsD2jLrfZ0trjKL6vOw0j//eAwcALFjKSw==
   dependencies:
-    debug "2.6.9"
-    depd "2.0.0"
-    destroy "1.2.0"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "2.0.0"
-    mime "1.6.0"
-    ms "2.1.3"
-    on-finished "2.4.1"
-    range-parser "~1.2.1"
-    statuses "2.0.1"
+    debug "^4.3.5"
+    encodeurl "^2.0.0"
+    escape-html "^1.0.3"
+    etag "^1.8.1"
+    fresh "^2.0.0"
+    http-errors "^2.0.0"
+    mime-types "^3.0.1"
+    ms "^2.1.3"
+    on-finished "^2.4.1"
+    range-parser "^1.2.1"
+    statuses "^2.0.1"
 
 serialize-javascript@^6.0.0, serialize-javascript@^6.0.1:
   version "6.0.2"
@@ -10217,15 +10264,15 @@ serve-index@^1.9.1:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
-serve-static@1.16.2:
-  version "1.16.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.2.tgz#b6a5343da47f6bdd2673848bf45754941e803296"
-  integrity sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==
+serve-static@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-2.2.0.tgz#9c02564ee259bdd2251b82d659a2e7e1938d66f9"
+  integrity sha512-61g9pCh0Vnh7IutZjtLGGpTA355+OPn2TyDv/6ivP2h/AdAVX9azsoxmg2/M6nZeQZNYBEwIcsne1mJd9oQItQ==
   dependencies:
-    encodeurl "~2.0.0"
-    escape-html "~1.0.3"
-    parseurl "~1.3.3"
-    send "0.19.0"
+    encodeurl "^2.0.0"
+    escape-html "^1.0.3"
+    parseurl "^1.3.3"
+    send "^1.2.0"
 
 set-function-length@^1.2.2:
   version "1.2.2"
@@ -10244,7 +10291,7 @@ setprototypeof@1.1.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
   integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
-setprototypeof@1.2.0:
+setprototypeof@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
@@ -10278,15 +10325,45 @@ shell-quote@^1.8.1:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.2.tgz#d2d83e057959d53ec261311e9e9b8f51dcb2934a"
   integrity sha512-AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==
 
-side-channel@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
-  integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==
+side-channel-list@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"
+  integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==
   dependencies:
-    call-bind "^1.0.7"
     es-errors "^1.3.0"
-    get-intrinsic "^1.2.4"
-    object-inspect "^1.13.1"
+    object-inspect "^1.13.3"
+
+side-channel-map@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/side-channel-map/-/side-channel-map-1.0.1.tgz#d6bb6b37902c6fef5174e5f533fab4c732a26f42"
+  integrity sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==
+  dependencies:
+    call-bound "^1.0.2"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.5"
+    object-inspect "^1.13.3"
+
+side-channel-weakmap@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz#11dda19d5368e40ce9ec2bdc1fb0ecbc0790ecea"
+  integrity sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==
+  dependencies:
+    call-bound "^1.0.2"
+    es-errors "^1.3.0"
+    get-intrinsic "^1.2.5"
+    object-inspect "^1.13.3"
+    side-channel-map "^1.0.1"
+
+side-channel@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9"
+  integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==
+  dependencies:
+    es-errors "^1.3.0"
+    object-inspect "^1.13.3"
+    side-channel-list "^1.0.0"
+    side-channel-map "^1.0.1"
+    side-channel-weakmap "^1.0.2"
 
 signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
   version "3.0.7"
@@ -10427,16 +10504,16 @@ srcset@^4.0.0:
   resolved "https://registry.yarnpkg.com/srcset/-/srcset-4.0.0.tgz#336816b665b14cd013ba545b6fe62357f86e65f4"
   integrity sha512-wvLeHgcVHKO8Sc/H/5lkGreJQVeYMm9rlmt8PuR1xE31rIuXhuzznUUqAt8MqLhB3MqJdFzlNAfpcWnxiFUcPw==
 
-statuses@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
-  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
-
 "statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
+statuses@^2.0.1, statuses@~2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.2.tgz#8f75eecef765b5e1cfcdc080da59409ed424e382"
+  integrity sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==
+
 std-env@^3.7.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.8.0.tgz#b56ffc1baf1a29dcc80a3bdf11d7fca7c315e7d5"
@@ -10715,7 +10792,7 @@ to-vfile@^6.1.0:
     is-buffer "^2.0.0"
     vfile "^4.0.0"
 
-toidentifier@1.0.1:
+toidentifier@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
@@ -10780,13 +10857,14 @@ type-fest@^2.13.0, type-fest@^2.5.0:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b"
   integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==
 
-type-is@~1.6.18:
-  version "1.6.18"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
-  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+type-is@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-2.0.1.tgz#64f6cf03f92fce4015c2b224793f6bdd4b068c97"
+  integrity sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==
   dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.24"
+    content-type "^1.0.5"
+    media-typer "^1.1.0"
+    mime-types "^3.0.0"
 
 typedarray-to-buffer@^3.1.5:
   version "3.1.5"
@@ -10885,11 +10963,6 @@ unist-util-find-after@^3.0.0:
   dependencies:
     unist-util-is "^4.0.0"
 
-unist-util-generated@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/unist-util-generated/-/unist-util-generated-2.0.1.tgz#e37c50af35d3ed185ac6ceacb6ca0afb28a85cae"
-  integrity sha512-qF72kLmPxAw0oN2fwpWIqbXAVyEqUzDHMsbtPvOudIlUzXYFIeQIuxXQCRCFh22B7cixvU0MG7m3MW8FTq/S+A==
-
 unist-util-is@^4.0.0, unist-util-is@^4.0.2:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-4.1.0.tgz#976e5f462a7a5de73d94b706bac1b90671b57797"
@@ -11031,7 +11104,7 @@ universalify@^2.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
   integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
 
-unpipe@1.0.0, unpipe@~1.0.0:
+unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
@@ -11124,11 +11197,6 @@ utility-types@^3.10.0:
   resolved "https://registry.yarnpkg.com/utility-types/-/utility-types-3.11.0.tgz#607c40edb4f258915e901ea7995607fdf319424c"
   integrity sha512-6Z7Ma2aVEWisaL6TvBCy7P8rm2LQoPv6dJ7ecIaIixHcwfbJ0x7mWdbcwlIM5IGQxPZSFYeqRCqlOOeKoJYMkw==
 
-utils-merge@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
-
 uuid@^11.1.0:
   version "11.1.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-11.1.0.tgz#9549028be1753bb934fc96e2bca09bb4105ae912"
@@ -11162,7 +11230,7 @@ value-equal@^1.0.1:
   resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c"
   integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==
 
-vary@~1.1.2:
+vary@^1.1.2, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
@@ -11518,6 +11586,11 @@ wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
     string-width "^5.0.1"
     strip-ansi "^7.0.1"
 
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
+
 write-file-atomic@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"

From 8558c9d5dcd8b416966caa8cef0fe5f558f94b48 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 2 Dec 2025 08:11:47 -0800
Subject: [PATCH 317/394] Add tree_print for a whole module

Summary:
As per title.

We use tree_print as a development diagnostic tool.
The test runner for tree_print itself had code to tree_print an entire module via its forms.

This diff extracts this code and makes it available for use elsewhere.

Reviewed By: TD5

Differential Revision: D88159685

fbshipit-source-id: daf1bd1c25d22b9d9f48863b428538efe37a267c
---
 crates/hir/src/body/tree_print.rs | 226 +++++++++++++++++++++++-------
 1 file changed, 174 insertions(+), 52 deletions(-)

diff --git a/crates/hir/src/body/tree_print.rs b/crates/hir/src/body/tree_print.rs
index 1123c46b75..4aa6591d84 100644
--- a/crates/hir/src/body/tree_print.rs
+++ b/crates/hir/src/body/tree_print.rs
@@ -15,6 +15,8 @@ use std::fmt;
 use std::fmt::Write as _;
 use std::str;
 
+use elp_base_db::FileId;
+
 use super::DefineBody;
 use super::FoldBody;
 use super::RecordBody;
@@ -33,11 +35,15 @@ use crate::ComprehensionExpr;
 use crate::Define;
 use crate::Expr;
 use crate::ExprId;
+use crate::FormIdx;
 use crate::FunType;
 use crate::FunctionBody;
 use crate::FunctionClauseBody;
+use crate::FunctionDefId;
+use crate::InFile;
 use crate::ListType;
 use crate::Literal;
+use crate::PPDirective;
 use crate::Pat;
 use crate::PatId;
 use crate::Record;
@@ -50,6 +56,7 @@ use crate::TermId;
 use crate::TypeAlias;
 use crate::TypeExpr;
 use crate::TypeExprId;
+use crate::db::DefDatabase;
 use crate::db::InternDatabase;
 use crate::expr::Guards;
 use crate::expr::MaybeExpr;
@@ -332,6 +339,63 @@ pub(crate) fn print_ssr(db: &dyn InternDatabase, body: &SsrBody) -> String {
     printer.result()
 }
 
+#[allow(dead_code)] // This is used for debugging
+pub fn print_form_list(db: &dyn DefDatabase, file_id: FileId, strategy: Strategy) -> String {
+    let form_list = db.file_form_list(file_id);
+    let dbi: &dyn InternDatabase = db;
+    form_list
+        .forms()
+        .iter()
+        .flat_map(|&form_idx| -> Option<String> {
+            match form_idx {
+                FormIdx::FunctionClause(function_id) => {
+                    let body =
+                        db.function_body(InFile::new(file_id, FunctionDefId::new(function_id)));
+                    Some(body.tree_print(dbi, strategy))
+                }
+                FormIdx::TypeAlias(type_alias_id) => {
+                    let type_alias = &form_list[type_alias_id];
+                    let body = db.type_body(InFile::new(file_id, type_alias_id));
+                    Some(body.tree_print(dbi, type_alias))
+                }
+                FormIdx::Spec(spec_id) => {
+                    let spec = SpecOrCallback::Spec(form_list[spec_id].clone());
+                    let body = db.spec_body(InFile::new(file_id, spec_id));
+                    Some(body.tree_print(dbi, spec))
+                }
+                FormIdx::Callback(callback_id) => {
+                    let spec = SpecOrCallback::Callback(form_list[callback_id].clone());
+                    let body = db.callback_body(InFile::new(file_id, callback_id));
+                    Some(body.tree_print(dbi, spec))
+                }
+                FormIdx::Record(record_id) => {
+                    let body = db.record_body(InFile::new(file_id, record_id));
+                    Some(body.print(dbi, &form_list, record_id))
+                }
+                FormIdx::Attribute(attribute_id) => {
+                    let attribute = AnyAttribute::Attribute(form_list[attribute_id].clone());
+                    let body = db.attribute_body(InFile::new(file_id, attribute_id));
+                    Some(body.print(dbi, attribute))
+                }
+                FormIdx::CompileOption(attribute_id) => {
+                    let attribute = AnyAttribute::CompileOption(form_list[attribute_id].clone());
+                    let body = db.compile_body(InFile::new(file_id, attribute_id));
+                    Some(body.tree_print(dbi, attribute))
+                }
+                FormIdx::PPDirective(pp) => match form_list[pp] {
+                    PPDirective::Define(define) => {
+                        let body = db.define_body(InFile::new(file_id, define));
+                        Some(body.tree_print(dbi, &form_list[define]))
+                    }
+                    _ => None,
+                },
+                _ => None,
+            }
+        })
+        .collect::<Vec<_>>()
+        .join("")
+}
+
 struct Printer<'a> {
     db: &'a dyn InternDatabase,
     body: &'a FoldBody<'a>,
@@ -1523,13 +1587,8 @@ mod tests {
     use expect_test::Expect;
     use expect_test::expect;
 
-    use crate::AnyAttribute;
-    use crate::FormIdx;
-    use crate::FunctionDefId;
-    use crate::InFile;
-    use crate::SpecOrCallback;
     use crate::Strategy;
-    use crate::db::DefDatabase;
+    use crate::body::tree_print::print_form_list;
     use crate::fold::MacroStrategy;
     use crate::fold::ParenStrategy;
     use crate::test_db::TestDB;
@@ -1546,52 +1605,7 @@ mod tests {
     #[track_caller]
     fn check_with_strategy(strategy: Strategy, fixture: &str, expect: Expect) {
         let (db, file_id) = TestDB::with_single_file(fixture);
-        let form_list = db.file_form_list(file_id);
-        let pretty = form_list
-            .forms()
-            .iter()
-            .flat_map(|&form_idx| -> Option<String> {
-                match form_idx {
-                    FormIdx::FunctionClause(function_id) => {
-                        let body =
-                            db.function_body(InFile::new(file_id, FunctionDefId::new(function_id)));
-                        Some(body.tree_print(&db, strategy))
-                    }
-                    FormIdx::TypeAlias(type_alias_id) => {
-                        let type_alias = &form_list[type_alias_id];
-                        let body = db.type_body(InFile::new(file_id, type_alias_id));
-                        Some(body.tree_print(&db, type_alias))
-                    }
-                    FormIdx::Spec(spec_id) => {
-                        let spec = SpecOrCallback::Spec(form_list[spec_id].clone());
-                        let body = db.spec_body(InFile::new(file_id, spec_id));
-                        Some(body.tree_print(&db, spec))
-                    }
-                    FormIdx::Callback(callback_id) => {
-                        let spec = SpecOrCallback::Callback(form_list[callback_id].clone());
-                        let body = db.callback_body(InFile::new(file_id, callback_id));
-                        Some(body.tree_print(&db, spec))
-                    }
-                    FormIdx::Record(record_id) => {
-                        let body = db.record_body(InFile::new(file_id, record_id));
-                        Some(body.print(&db, &form_list, record_id))
-                    }
-                    FormIdx::Attribute(attribute_id) => {
-                        let attribute = AnyAttribute::Attribute(form_list[attribute_id].clone());
-                        let body = db.attribute_body(InFile::new(file_id, attribute_id));
-                        Some(body.print(&db, attribute))
-                    }
-                    FormIdx::CompileOption(attribute_id) => {
-                        let attribute =
-                            AnyAttribute::CompileOption(form_list[attribute_id].clone());
-                        let body = db.compile_body(InFile::new(file_id, attribute_id));
-                        Some(body.tree_print(&db, attribute))
-                    }
-                    _ => None,
-                }
-            })
-            .collect::<Vec<_>>()
-            .join("");
+        let pretty = print_form_list(&db, file_id, strategy);
         expect.assert_eq(pretty.trim_start());
     }
 
@@ -1999,6 +2013,16 @@ mod tests {
             foo() -> ?EXPR(2).
             "#,
             expect![[r#"
+                -define(EXPR/1,
+                    Expr<2>:Expr::BinaryOp {
+                        lhs
+                            Expr<0>:Literal(Integer(1))
+                        rhs
+                            Expr<1>:Expr::Var(X)
+                        op
+                            ArithOp(Add),
+                    }
+                ).
                 function: foo/0
                 Clause {
                     pats
@@ -3420,4 +3444,102 @@ mod tests {
             "#]],
         );
     }
+
+    #[test]
+    fn top_level_macro() {
+        // Note: we currently lower a macro as an Expr only.
+        // We have special processing in lower_clause_or_macro_body
+        // to deal with top level macros, at the ast level.
+        check(
+            r#"
+             -define(FOO(X), baz() -> X).
+             -define(BAR(X), {X}).
+             ?FOO(42).
+             foo() -> ?BAR(42).
+            "#,
+            expect![[r#"
+                -define(FOO/1,
+                    Expr<0>:Expr::Missing
+                ).
+
+                -define(BAR/1,
+                    Expr<1>:Expr::Tuple {
+                        Expr<0>:Expr::Var(X),
+                    }
+                ).
+                function: baz/0
+                Clause {
+                    pats
+                    guards
+                    exprs
+                        Expr<2>:Literal(Integer(42)),
+                }.
+                function: foo/0
+                Clause {
+                    pats
+                    guards
+                    exprs
+                        Expr<4>:Expr::MacroCall {
+                            args
+                                Expr<3>:Literal(Integer(42)),
+                            macro_def
+                                Some(InFile { file_id: FileId(0), value: Idx::<Define>(1) })
+                            expansion
+                                Expr<2>:Expr::Tuple {
+                                    Expr<1>:Literal(Integer(42)),
+                                }
+                        },
+                }.
+            "#]],
+        );
+    }
+
+    #[test]
+    fn top_level_forms() {
+        check(
+            r#"
+             -module(main).
+             bug
+             -compile([export_all]).
+             -wild('foo').
+             -type foo() :: ok.
+             -spec bar() -> ok.
+             bar() -> ok.
+             -callback baz() -> ok.
+             -record(rec, {f}).
+            "#,
+            expect![[r#"
+                -compile(
+                    Term::List {
+                        exprs
+                            Literal(Atom('export_all')),
+                        tail
+                    }
+                ).
+
+                -wild(foo).
+
+                -type foo() :: Literal(Atom('ok')).
+
+                -spec bar
+                    () ->
+                        Literal(Atom('ok')).
+                function: bar/0
+                Clause {
+                    pats
+                    guards
+                    exprs
+                        Expr<1>:Literal(Atom('ok')),
+                }.
+
+                -callback baz
+                    () ->
+                        Literal(Atom('ok')).
+
+                -record(rec, {
+                    f
+                }).
+            "#]],
+        );
+    }
 }

From 8bd2c5e571793c45c4c6dead3122d3251ee84780 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 3 Dec 2025 03:18:32 -0800
Subject: [PATCH 318/394] Include related information in `elp lint` non-json
 output

Summary:
An ELP Diagnostic can have related information in it, which provide additional context to the reported Diagnostic.

Although these are shown in the IDE when running as a server, they are not currently shown from the  command line.

This diff updates the `elp lint` command to display them, when not emitting JSON.

There are 3 variations, depending on where the related information is
-  same file: just show the range
- some erlang module: show the module name and range
- an erlang include file: show the full path and range

Reviewed By: robertoaloi

Differential Revision: D88010319

fbshipit-source-id: 26748ec7183a139a57ae97b75a9a61f62da27000
---
 crates/elp/src/bin/lint_cli.rs                | 69 +++++++++++++++++++
 .../diagnostics/parse_elp_lint_fix.stdout     |  2 +
 .../test/linter/parse_elp_lint2.stdout        |  1 +
 .../test/linter/parse_elp_lint_app.stdout     |  1 +
 .../parse_elp_lint_config_output.stdout       |  1 +
 .../parse_elp_lint_fixme_spelling.stdout      |  2 +
 .../parse_elp_no_lint_specified_output.stdout |  2 +
 .../test/linter/warnings_as_errors.stdout     |  2 +
 8 files changed, 80 insertions(+)

diff --git a/crates/elp/src/bin/lint_cli.rs b/crates/elp/src/bin/lint_cli.rs
index 6807d81f25..8450d7b28b 100644
--- a/crates/elp/src/bin/lint_cli.rs
+++ b/crates/elp/src/bin/lint_cli.rs
@@ -353,6 +353,7 @@ pub fn do_codemod(
                         print_diagnostic(
                             diag,
                             &loaded.analysis(),
+                            &loaded.vfs,
                             *file_id,
                             args.use_cli_severity,
                             cli,
@@ -419,12 +420,76 @@ fn get_diagnostics_config(args: &Lint) -> Result<DiagnosticsConfig> {
 fn print_diagnostic(
     diag: &diagnostics::Diagnostic,
     analysis: &Analysis,
+    vfs: &Vfs,
     file_id: FileId,
     use_cli_severity: bool,
     cli: &mut dyn Cli,
 ) -> Result<(), anyhow::Error> {
     let line_index = analysis.line_index(file_id)?;
     writeln!(cli, "      {}", diag.print(&line_index, use_cli_severity))?;
+
+    // Print any related information, indented
+    if let Some(related_info) = &diag.related_info {
+        for info in related_info {
+            let info_line_index = analysis.line_index(info.file_id)?;
+            let start = info_line_index.line_col(info.range.start());
+            let end = info_line_index.line_col(info.range.end());
+
+            // Include file identifier if related info is from a different file
+            if info.file_id != file_id {
+                let file_identifier =
+                    if let Ok(Some(module_name)) = analysis.module_name(info.file_id) {
+                        // It's a module (.erl file), use module name
+                        format!("[{}]", module_name.as_str())
+                    } else {
+                        // Not a module (e.g., include file), use relative path
+                        let vfs_path = vfs.file_path(info.file_id);
+                        if let Ok(Some(project_data)) = analysis.project_data(info.file_id) {
+                            let relative_path =
+                                reporting::get_relative_path(&project_data.root_dir, vfs_path);
+                            format!("[{}]", relative_path.display())
+                        } else {
+                            // Fallback: just show location without file identifier
+                            String::new()
+                        }
+                    };
+
+                if file_identifier.is_empty() {
+                    writeln!(
+                        cli,
+                        "        {}:{}-{}:{}: {}",
+                        start.line + 1,
+                        start.col_utf16 + 1,
+                        end.line + 1,
+                        end.col_utf16 + 1,
+                        info.message
+                    )?;
+                } else {
+                    writeln!(
+                        cli,
+                        "        {} {}:{}-{}:{}: {}",
+                        file_identifier,
+                        start.line + 1,
+                        start.col_utf16 + 1,
+                        end.line + 1,
+                        end.col_utf16 + 1,
+                        info.message
+                    )?;
+                }
+            } else {
+                writeln!(
+                    cli,
+                    "        {}:{}-{}:{}: {}",
+                    start.line + 1,
+                    start.col_utf16 + 1,
+                    end.line + 1,
+                    end.col_utf16 + 1,
+                    info.message
+                )?;
+            }
+        }
+    }
+
     Ok(())
 }
 
@@ -663,6 +728,7 @@ impl<'a> Lints<'a> {
                         print_diagnostic(
                             diag,
                             &self.analysis_host.analysis(),
+                            self.vfs,
                             *file_id,
                             self.args.use_cli_severity,
                             cli,
@@ -738,6 +804,7 @@ impl<'a> Lints<'a> {
                     print_diagnostic(
                         diagnostic,
                         &self.analysis_host.analysis(),
+                        self.vfs,
                         file_id,
                         self.args.use_cli_severity,
                         cli,
@@ -805,6 +872,7 @@ impl<'a> Lints<'a> {
                     print_diagnostic(
                         &diagnostic,
                         &self.analysis_host.analysis(),
+                        self.vfs,
                         file_id,
                         self.args.use_cli_severity,
                         cli,
@@ -1083,6 +1151,7 @@ mod tests {
                 Diagnostics reported in 1 modules:
                   lints: 1
                       5:3-5:16::[Error] [P1700] head mismatch 'head_mismatcX' vs 'head_mismatch'
+                        4:3-4:16: Mismatched clause name
             "#]],
             expect![""],
         );
diff --git a/crates/elp/src/resources/test/diagnostics/parse_elp_lint_fix.stdout b/crates/elp/src/resources/test/diagnostics/parse_elp_lint_fix.stdout
index 5cee41edd5..27caa7b1d7 100644
--- a/crates/elp/src/resources/test/diagnostics/parse_elp_lint_fix.stdout
+++ b/crates/elp/src/resources/test/diagnostics/parse_elp_lint_fix.stdout
@@ -2,10 +2,12 @@ module specified: lints
 Diagnostics reported in 1 modules:
   lints: 1
       5:1-5:14::[Error] [P1700] head mismatch 'head_mismatcX' vs 'head_mismatch'
+        4:1-4:14: Mismatched clause name
 ---------------------------------------------
 
 Applying fix in module 'lints' for
       5:1-5:14::[Error] [P1700] head mismatch 'head_mismatcX' vs 'head_mismatch'
+        4:1-4:14: Mismatched clause name
 @@ -1,6 +1,6 @@
  -module(lints).
  -export([head_mismatch/1]).
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint2.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint2.stdout
index 00ffa07782..6d3ab47e91 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint2.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint2.stdout
@@ -2,3 +2,4 @@ module specified: app_a
 Diagnostics reported in 1 modules:
   app_a: 1
       9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
+        7:1-7:5: Mismatched clause name
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_app.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_app.stdout
index f1938756fc..0432896183 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_app.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_app.stdout
@@ -1,3 +1,4 @@
 Diagnostics reported in 1 modules:
   app_a: 1
       9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
+        7:1-7:5: Mismatched clause name
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_config_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_config_output.stdout
index d4ef132ea6..285ca216f3 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_config_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_config_output.stdout
@@ -3,6 +3,7 @@ Diagnostics reported in 4 modules:
       9:6-9:7::[Warning] [W0010] this variable is unused
       5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
       9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
+        7:1-7:5: Mismatched clause name
   app_a_unused_param: 2
       5:5-5:6::[Warning] [W0010] this variable is unused
       5:5-5:6::[Warning] [L1268] variable 'X' is unused
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_fixme_spelling.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_fixme_spelling.stdout
index b8c9d1896e..c7616519bf 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_fixme_spelling.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_fixme_spelling.stdout
@@ -2,10 +2,12 @@ module specified: spelling
 Diagnostics reported in 1 modules:
   spelling: 1
       2:2-2:10::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
+        2:2-2:10: Misspelled attribute
 ---------------------------------------------
 
 Applying fix in module 'spelling' for
       2:2-2:10::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
+        2:2-2:10: Misspelled attribute
 @@ -1,4 +1,5 @@
  -module(spelling).
 +% elp:fixme W0013 (misspelled_attribute)
diff --git a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
index 879f0e024c..65f84fc805 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
@@ -3,6 +3,7 @@ Diagnostics reported in 7 modules:
   app_a: 7
       5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
       9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
+        7:1-7:5: Mismatched clause name
       8:7-8:8::[Warning] [W0018] Unexpected ';'
       13:5-13:14::[Warning] [W0026] Function 'app_a:baz/2' is not exported.
       12:1-12:4::[Warning] [L1230] function bar/0 is unused
@@ -23,3 +24,4 @@ Diagnostics reported in 7 modules:
       8:7-9:16::[Warning] [L1318] expression updates a literal
   spelling: 1
       2:2-2:10::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
+        2:2-2:10: Misspelled attribute
diff --git a/crates/elp/src/resources/test/linter/warnings_as_errors.stdout b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
index 0625ceb723..706dc801a5 100644
--- a/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
+++ b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
@@ -3,6 +3,7 @@ Diagnostics reported in 7 modules:
   app_a: 7
       5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
       9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
+        7:1-7:5: Mismatched clause name
       8:7-8:8::[Warning] [W0018] Unexpected ';'
       13:5-13:14::[Warning] [W0026] Function 'app_a:baz/2' is not exported.
       12:1-12:4::[Error] [L1230] function bar/0 is unused
@@ -23,3 +24,4 @@ Diagnostics reported in 7 modules:
       8:7-9:16::[Error] [L1318] expression updates a literal
   spelling: 1
       2:2-2:10::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
+        2:2-2:10: Misspelled attribute

From 1fc2f63da81115faf20d32430f640af4faa52301 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 3 Dec 2025 03:18:32 -0800
Subject: [PATCH 319/394] Correctly report diagnostics from header file

Summary:
It can happen that an included file has errors in it.

ELP is supposed to notice this, and report it with an L0000 (issue_in_included_file) diagnostic.

Unfortunately the logic for reporting this in the erlang service did not properly account for the exact location information reported in the `file` attribute, so this always fell back to a location of 0,0 in the including file. As a result, the diagnostic did not show up properly.

## This diff

We fix it by reporting the location according to the representation  used in the erlang service, and making sure we choose the correct include location.

We also add the diagnostic found in the included file as related information, so it is available in the original file

Reviewed By: robertoaloi

Differential Revision: D88010399

fbshipit-source-id: 4a1d2d76a809c104db059e9433200e1bfcf2ac59
---
 crates/elp/src/bin/erlang_service_cli.rs      |   7 +-
 .../resolves_generated_includes.stdout        |   6 +-
 .../diagnostics/parse_all_diagnostics1.stdout |   2 +-
 crates/erlang_service/src/lib.rs              |  15 +-
 crates/ide/src/diagnostics.rs                 | 212 ++++++++++++++----
 erlang_service/src/erlang_service_lint.erl    | 101 ++++++++-
 .../check_include/src/top_includer.erl        |   1 +
 .../include/include_with_bug.hrl              |   5 +
 .../include/top_includer.hrl                  |   1 +
 9 files changed, 288 insertions(+), 62 deletions(-)
 create mode 100644 test_projects/buck_tests_2/check_include_separate_1/include/include_with_bug.hrl

diff --git a/crates/elp/src/bin/erlang_service_cli.rs b/crates/elp/src/bin/erlang_service_cli.rs
index 6611bdffae..5b39a4aa06 100644
--- a/crates/elp/src/bin/erlang_service_cli.rs
+++ b/crates/elp/src/bin/erlang_service_cli.rs
@@ -150,14 +150,15 @@ pub fn do_parse_one(
             .chain(result.warnings.iter())
             .map(|err| {
                 let relative_path: &Path = err.path.strip_prefix(root_dir).unwrap_or(&err.path);
-                let (range, line_num) = match err.location {
+                let (range, line_num) = match &err.location {
                     None => (None, convert::position(&line_index, 0.into()).line + 1),
                     Some(DiagnosticLocation::Normal(range)) => (
                         Some(range),
                         convert::position(&line_index, range.start()).line + 1,
                     ),
                     Some(DiagnosticLocation::Included {
-                        directive_location,
+                        file_attribute_location: directive_location,
+                        error_path: _,
                         error_location: _,
                     }) => (
                         Some(directive_location),
@@ -169,7 +170,7 @@ pub fn do_parse_one(
                     relative_path: relative_path.to_owned(),
                     line_num,
                     msg: err.msg.to_owned(),
-                    range,
+                    range: range.copied(),
                 }
             })
             .collect();
diff --git a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
index 378f86c01e..b1773fd731 100644
--- a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
+++ b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
@@ -3,8 +3,10 @@ Diagnostics reported in 3 modules:
   app_a: 1
       6:10-6:32::[WeakWarning] [W0037] Unspecific include.
   top_includer: 2
-      1:2-1:2::[Error] [L0000] Issue in included file
-      13:5-13:11::[Error] [E1508] undefined macro 'THIRD/2'
+      6:1-6:67::[Error] [L0000] Issue in included file
+        [check_include_separate_1/include/include_with_bug.hrl] 5:14-5:18: E1507: undefined macro 'FOO'
+        [check_include_separate_1/include/top_includer.hrl] 3:10-3:30: E1516: can't find include file "does_not_exist.hrl"
+      14:5-14:11::[Error] [E1508] undefined macro 'THIRD/2'
   wa_buck2_module_search: 4
       55:19-55:32::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
       57:19-57:29::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
diff --git a/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics1.stdout b/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics1.stdout
index a1db95ccbf..7fe610f781 100644
--- a/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics1.stdout
+++ b/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics1.stdout
@@ -2,7 +2,7 @@ module specified: diagnostics
 Diagnostics reported in 1 modules:
   diagnostics: 6
       2:9-2:26::[Hint] [W0037] Unspecific include.
-      3:0-3:0::[Error] [L0000] Issue in included file
+      3:0-3:35::[Error] [L0000] Issue in included file
       3:9-3:33::[Hint] [W0037] Unspecific include.
       5:30-5:44::[Error] [L1295] type undefined_type/0 undefined
       6:0-6:4::[Warning] [L1230] function main/1 is unused
diff --git a/crates/erlang_service/src/lib.rs b/crates/erlang_service/src/lib.rs
index 16020d78f6..072f439db3 100644
--- a/crates/erlang_service/src/lib.rs
+++ b/crates/erlang_service/src/lib.rs
@@ -59,12 +59,13 @@ lazy_static! {
     pub static ref ESCRIPT: RwLock<String> = RwLock::new("escript".to_string());
 }
 
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Hash)]
+#[derive(Clone, Debug, Eq, PartialEq, Hash)]
 pub enum DiagnosticLocation {
     Normal(TextRange),
     Included {
-        directive_location: TextRange, // Location of include directive in the file compiled
-        error_location: TextRange,     // Location of the error in the included file
+        file_attribute_location: TextRange, // Location of file_attribute for included file in the file compiled abstract forms
+        error_path: PathBuf, // Path of the file containing the error. It could be via a deeply nested include
+        error_location: TextRange, // Location of the error in the included file
     },
 }
 
@@ -735,7 +736,8 @@ fn decode_errors(buf: &[u8]) -> Result<Vec<ParseError>> {
 
     eetf::Term::decode(buf)?
         .as_match(pattern::VarList((
-            Str,
+            Str, // path
+            Str, // error path
             pattern::Or((
                 (pattern::U32, pattern::U32), // Normal location
                 pattern::FixList(((pattern::U32, pattern::U32), (pattern::U32, pattern::U32))), // Location in include file
@@ -747,7 +749,7 @@ fn decode_errors(buf: &[u8]) -> Result<Vec<ParseError>> {
         .map_err(|err| anyhow!("Failed to decode errors: {:?}", err))
         .map(|res| {
             res.into_iter()
-                .map(|(path, position, msg, code)| ParseError {
+                .map(|(path, error_path, position, msg, code)| ParseError {
                     path: path.into(),
                     location: match position {
                         pattern::Union3::A((a, b)) => Some(DiagnosticLocation::Normal(
@@ -755,7 +757,8 @@ fn decode_errors(buf: &[u8]) -> Result<Vec<ParseError>> {
                         )),
                         pattern::Union3::B(((a, b), (c, d))) => {
                             Some(DiagnosticLocation::Included {
-                                directive_location: safe_textrange(a.into(), b.into()),
+                                file_attribute_location: safe_textrange(a.into(), b.into()),
+                                error_path: error_path.into(),
                                 error_location: safe_textrange(c.into(), d.into()),
                             })
                         }
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index b8aa41bcda..a5a46c442d 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -11,6 +11,7 @@
 use std::borrow::Cow;
 use std::collections::BTreeSet;
 use std::fmt;
+use std::path::Path;
 use std::sync::Arc;
 
 use anyhow::Result;
@@ -38,6 +39,7 @@ use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::elp_base_db::FileKind;
 use elp_ide_db::elp_base_db::FileRange;
 use elp_ide_db::elp_base_db::ProjectId;
+use elp_ide_db::elp_base_db::VfsPath;
 use elp_ide_db::erlang_service::DiagnosticLocation;
 use elp_ide_db::erlang_service::ParseError;
 use elp_ide_db::metadata::Kind;
@@ -2166,51 +2168,54 @@ pub fn erlang_service_diagnostics(
         let mut warning_info: BTreeSet<(FileId, TextSize, TextSize, String, String)> =
             BTreeSet::default();
 
+        // Track related information for L0000 diagnostics from included files
+        let mut related_info_map: FxHashMap<(FileId, TextSize, TextSize), Vec<RelatedInformation>> =
+            FxHashMap::default();
+
         res.errors
             .iter()
-            .filter_map(|d| parse_error_to_diagnostic_info(db, file_id, d))
+            .filter_map(|d| parse_error_to_diagnostic_info(db, file_id, d, &mut related_info_map))
             .for_each(|val| {
                 error_info.insert(val);
             });
         res.warnings
             .iter()
-            .filter_map(|d| parse_error_to_diagnostic_info(db, file_id, d))
+            .filter_map(|d| parse_error_to_diagnostic_info(db, file_id, d, &mut related_info_map))
             .for_each(|val| {
                 warning_info.insert(val);
             });
 
         let warning_severity = config.erlang_service_warning_severity();
 
+        let to_diagnostic = |file_id: FileId,
+                             start: TextSize,
+                             end: TextSize,
+                             code: String,
+                             msg: String,
+                             severity: Severity| {
+            let range = TextRange::new(start, end);
+            let mut diagnostic = tag_erlang_service_diagnostic(
+                Diagnostic::new(DiagnosticCode::ErlangService(code.clone()), msg, range)
+                    .with_severity(severity),
+            );
+            if code == "L0000"
+                && let Some(related) = related_info_map.get(&(file_id, start, end))
+            {
+                diagnostic = diagnostic.with_related(Some(related.clone()));
+            }
+            (file_id, diagnostic)
+        };
+
         let diags: Vec<(FileId, Diagnostic)> = error_info
             .into_iter()
             .map(|(file_id, start, end, code, msg)| {
-                (
-                    file_id,
-                    tag_erlang_service_diagnostic(
-                        Diagnostic::new(
-                            DiagnosticCode::ErlangService(code),
-                            msg,
-                            TextRange::new(start, end),
-                        )
-                        .with_severity(Severity::Error),
-                    ),
-                )
+                to_diagnostic(file_id, start, end, code, msg, Severity::Error)
             })
             .chain(
                 warning_info
                     .into_iter()
                     .map(|(file_id, start, end, code, msg)| {
-                        (
-                            file_id,
-                            tag_erlang_service_diagnostic(
-                                Diagnostic::new(
-                                    DiagnosticCode::ErlangService(code),
-                                    msg,
-                                    TextRange::new(start, end),
-                                )
-                                .with_severity(warning_severity),
-                            ),
-                        )
+                        to_diagnostic(file_id, start, end, code, msg, warning_severity)
                     }),
             )
             .collect();
@@ -2599,20 +2604,68 @@ fn parse_error_to_diagnostic_info(
     db: &RootDatabase,
     file_id: FileId,
     parse_error: &ParseError,
+    related_info_map: &mut FxHashMap<(FileId, TextSize, TextSize), Vec<RelatedInformation>>,
 ) -> Option<(FileId, TextSize, TextSize, String, String)> {
-    match parse_error.location {
+    match &parse_error.location {
         Some(DiagnosticLocation::Included {
-            directive_location,
+            file_attribute_location,
+            error_path,
             error_location,
-        }) => included_file_file_id(db, file_id, directive_location).map(|included_file_id| {
-            (
-                included_file_id,
-                error_location.start(),
-                error_location.end(),
-                parse_error.code.clone(),
-                parse_error.msg.clone(),
-            )
-        }),
+        }) => {
+            // Get the FileId for the file containing the error by searching through source roots
+
+            // Note: we can have our .erl file which includes A.hrl which includes B.hrl, and B.hrl has an error.
+            // In this case, the error location will be in B.hrl, but the file_attribute_location will be 1..1, for the entry into B.hrl.
+            // The parse_error.path will correctly refer to B.hrl
+            // In this case, we need to report the error in the .erl file, at the include directive location.
+            // But how do we detemine that? We need to find an include chain from the .erl file to the included
+            // file. The A->B chain can be arbitrarily long.
+            // So, in the erlang service, we must report the chain of `file` attributes seen.
+
+            // For errors in included files, report L0000 at the include directive location
+            // and add the actual error as related information
+            if let Some(directive_range) =
+                include_directive_range(db, file_id, *file_attribute_location)
+            {
+                // Store related info about the actual error in the included file
+                if let Some(error_file_id) = related_file_id(db, file_id, error_path) {
+                    let related_info = RelatedInformation {
+                        file_id: error_file_id,
+                        range: *error_location,
+                        message: format!("{}: {}", parse_error.code, parse_error.msg),
+                    };
+                    related_info_map
+                        .entry((file_id, directive_range.start(), directive_range.end()))
+                        .or_default()
+                        .push(related_info);
+                } else {
+                    log::warn!("Could not find file for path {}", error_path.display());
+                }
+
+                // Return diagnostic at the include directive with code L0000
+                Some((
+                    file_id,
+                    directive_range.start(),
+                    directive_range.end(),
+                    "L0000".to_string(),
+                    "Issue in included file".to_string(),
+                ))
+            } else {
+                // Fallback: if we can't find the include directive range, try to report
+                // at the included file itself
+                included_file_file_id(db, file_id, *file_attribute_location).map(
+                    |included_file_id| {
+                        (
+                            included_file_id,
+                            error_location.start(),
+                            error_location.end(),
+                            parse_error.code.clone(),
+                            parse_error.msg.clone(),
+                        )
+                    },
+                )
+            }
+        }
         Some(DiagnosticLocation::Normal(range)) => {
             let default_range = (
                 file_id,
@@ -2622,11 +2675,13 @@ fn parse_error_to_diagnostic_info(
                 parse_error.msg.clone(),
             );
             match parse_error.code.as_str() {
+                // Do not report L0000, it is already reported via a DiagnosticLocation::Included parse error
+                "L0000" => None,
                 // For certain warnings, OTP returns a diagnostic with a wide range (e.g. a full record definition)
                 // That can be very verbose and distracting, so we try restricting the range to the relevant parts only.
                 "L1227" => {
                     let name = function_undefined_from_message(&parse_error.msg);
-                    match exported_function_name_range(db, file_id, name, range) {
+                    match exported_function_name_range(db, file_id, name, *range) {
                         Some(name_range) => Some((
                             file_id,
                             name_range.start(),
@@ -2639,7 +2694,7 @@ fn parse_error_to_diagnostic_info(
                 }
                 "L1295" => {
                     let name = type_undefined_from_message(&parse_error.msg);
-                    match exported_type_name_range(db, file_id, name, range) {
+                    match exported_type_name_range(db, file_id, name, *range) {
                         Some(name_range) => Some((
                             file_id,
                             name_range.start(),
@@ -2650,7 +2705,7 @@ fn parse_error_to_diagnostic_info(
                         None => Some(default_range),
                     }
                 }
-                "L1230" | "L1309" => match function_name_range(db, file_id, range) {
+                "L1230" | "L1309" => match function_name_range(db, file_id, *range) {
                     Some(name_range) => Some((
                         file_id,
                         name_range.start(),
@@ -2660,7 +2715,7 @@ fn parse_error_to_diagnostic_info(
                     )),
                     None => Some(default_range),
                 },
-                "L1296" => match type_alias_name_range(db, file_id, range) {
+                "L1296" => match type_alias_name_range(db, file_id, *range) {
                     Some(name_range) => Some((
                         file_id,
                         name_range.start(),
@@ -2670,7 +2725,7 @@ fn parse_error_to_diagnostic_info(
                     )),
                     None => Some(default_range),
                 },
-                "L1308" => match spec_name_range(db, file_id, range) {
+                "L1308" => match spec_name_range(db, file_id, *range) {
                     Some(name_range) => Some((
                         file_id,
                         name_range.start(),
@@ -2680,7 +2735,7 @@ fn parse_error_to_diagnostic_info(
                     )),
                     None => Some(default_range),
                 },
-                "L1260" => match record_name_range(db, file_id, range) {
+                "L1260" => match record_name_range(db, file_id, *range) {
                     Some(name_range) => Some((
                         file_id,
                         name_range.start(),
@@ -2703,6 +2758,22 @@ fn parse_error_to_diagnostic_info(
     }
 }
 
+fn related_file_id(db: &RootDatabase, file_id: FileId, path: &Path) -> Option<FileId> {
+    db.file_project_id(file_id).and_then(|project_id| {
+        let vfs_path = VfsPath::new_real_path(path.to_string_lossy().as_ref().to_string());
+
+        let project_data = db.project_data(project_id);
+        // Search through all source roots in the project to find the file
+        project_data
+            .source_roots
+            .iter()
+            .find_map(|&source_root_id| {
+                let source_root = db.source_root(source_root_id);
+                source_root.file_for_path(&vfs_path)
+            })
+    })
+}
+
 fn exported_function_name_range(
     db: &RootDatabase,
     file_id: FileId,
@@ -2787,13 +2858,13 @@ fn type_alias_name_range(
 pub fn included_file_file_id(
     db: &RootDatabase,
     file_id: FileId,
-    directive_range: TextRange,
+    file_attribute_location: TextRange,
 ) -> Option<FileId> {
     let parsed = db.parse(file_id);
     let form_list = db.file_form_list(file_id);
     let include = form_list.includes().find_map(|(idx, include)| {
         let form = include.form_id().get(&parsed.tree());
-        if form.syntax().text_range().contains(directive_range.start()) {
+        if form.syntax().text_range().start() >= file_attribute_location.start() {
             db.resolve_include(InFile::new(file_id, idx))
         } else {
             None
@@ -2802,6 +2873,30 @@ pub fn included_file_file_id(
     Some(include)
 }
 
+/// For an error in an included file, find the next form occurring after `file_attribute_location`
+/// in the file, and return its full syntax range provided it is an include or include_lib
+fn include_directive_range(
+    db: &RootDatabase,
+    file_id: FileId,
+    file_attribute_location: TextRange,
+) -> Option<TextRange> {
+    let parsed = db.parse(file_id);
+    let form_list = db.file_form_list(file_id);
+
+    form_list.includes().find_map(|(_, include)| {
+        let form = include.form_id().get(&parsed.tree());
+        let form_range = form.syntax().text_range();
+
+        // Check if this form starts after directive_location
+        if form_range.start() >= file_attribute_location.start() {
+            // Return the full syntax range of the include directive
+            Some(form_range)
+        } else {
+            None
+        }
+    })
+}
+
 /// Given syntax errors from ELP native and erlang service, combine
 /// them by discarding any erlang service syntax errors for a form if
 /// ELP has reported any too.  This is done by merging labels, with
@@ -3742,6 +3837,37 @@ baz(1)->4.
         );
     }
 
+    #[test]
+    fn erlang_service_nested_include_resolution() {
+        check_diagnostics(
+            r#"
+               //- erlang_service
+               //- /src/app_a_include.erl
+                   -module(app_a_include).
+                   -export([test/0]).
+                %%          ^^^^^^ error: L1227: function test/0 undefined
+
+                   -include("first.hrl").
+                %% ^^^^^^^^^^^^^^^^^^^^^^ error: L0000: Issue in included file
+                %%                      | Related info: 1:13-30 E1516: can't find include file "second_typo.hrl"
+
+                   test() ->
+                       ?FIRST_MACRO,
+                       ?SECOND_MACRO.
+                    %% ^^^^^^^^^^^^^ error: E1507: undefined macro 'SECOND_MACRO'
+
+               //- /src/first.hrl
+                   -include("second_typo.hrl").
+                %%          ^^^^^^^^^^^^^^^^^ error: E1516: can't find include file "second_typo.hrl"
+
+                   -define(FIRST_MACRO, 1).
+
+               //- /src/second.hrl
+                   -define(SECOND_MACRO, "Hello from nested header").
+            "#,
+        );
+    }
+
     #[test]
     fn erlang_service_include_resolution_doc() {
         check_diagnostics(
diff --git a/erlang_service/src/erlang_service_lint.erl b/erlang_service/src/erlang_service_lint.erl
index 77223da49a..bc5a2faf3b 100644
--- a/erlang_service/src/erlang_service_lint.erl
+++ b/erlang_service/src/erlang_service_lint.erl
@@ -178,6 +178,7 @@ format_error(_Forms, _OriginalPath, Path, {Line, Mod, Reason}) when is_integer(L
     [
         {
             unicode:characters_to_list(Path),
+            unicode:characters_to_list("ignored"),
             none,
             unicode:characters_to_list(
                 io_lib:format("~p: ~ts", [Line, Mod:format_error(Reason)])
@@ -189,6 +190,7 @@ format_error(_Forms, SamePath, SamePath, {Location, Mod, Reason}) ->
     [
         {
             unicode:characters_to_list(SamePath),
+            unicode:characters_to_list("ignored"),
             % Location would be {Line, Col} for a erlc compiler error/warning,
             % but {ByteStart, ByteEnd} for an eqwalizer diagnostic.
             % This is deciphered on elp side.
@@ -199,18 +201,19 @@ format_error(_Forms, SamePath, SamePath, {Location, Mod, Reason}) ->
             erlang_service_error_codes:make_code(Mod, Reason)
         }
     ];
-format_error(Forms, OriginalPath, Path, {Location, Mod, Reason}) ->
+format_error(Forms, IncluderPath, ErrorPath, {Location, Mod, Reason}) ->
     %% The original path and reported error path are different, the
     %% error is in an included file.
     %% This can be from an include, include_lib, behaviour or parse_transform
-    IncludeLocation = inclusion_range(Forms, Path),
+    IncludeLocation = inclusion_range(Forms, ErrorPath),
 
     %% We return an error at the location the error occurs, as well as
     %% a list of the errors in the included file. ELP will determine
     %% the appropriate FileId and emit diagnostics for the include file.
     [
         {
-            unicode:characters_to_list(OriginalPath),
+            unicode:characters_to_list(IncluderPath),
+            unicode:characters_to_list(ErrorPath),
             % Location would be {Line, Col} for a erlc compiler error/warning,
             % but {ByteStart, ByteEnd} for an eqwalizer diagnostic.
             % This is deciphered on elp side.
@@ -219,7 +222,8 @@ format_error(Forms, OriginalPath, Path, {Location, Mod, Reason}) ->
             erlang_service_error_codes:make_code(erlang_service_error_codes, "Issue in included file")
         },
         {
-            unicode:characters_to_list(Path),
+            unicode:characters_to_list(IncluderPath),
+            unicode:characters_to_list(ErrorPath),
             % Location would be {Line, Col} for a erlc compiler error/warning,
             % but {ByteStart, ByteEnd} for an eqwalizer diagnostic.
             % This is deciphered on elp side.
@@ -232,13 +236,96 @@ format_error(Forms, OriginalPath, Path, {Location, Mod, Reason}) ->
     ].
 
 inclusion_range(Forms, Path) ->
-    case [Location || {attribute, Location, file, {FormPath, _}} <- Forms, FormPath == Path] of
-        [{Loc, _}] ->
-            {Loc, Loc};
+    %% The `include` or `include_lib` directive is processed by epp, so
+    %% it does not show up in the abstract forms directly. We infer its
+    %% location by looking for the `file` attribute with the same path,
+    %% which is inserted when epp starts processing a new file.
+    %% The wrinkle is that the range of the `file` attribute does not
+    %% correspond to the location of the `include` directive, but the last
+    %% thing processed in the current file.
+
+    %% Track the full include context for a given path.
+    %% In the forms, process the file attributes.
+    %% Every time it has a Location of {0,0}, the file has been entered or re-entered
+    %% Keep a stack for the current location, pushing to it when a {0,0} is found for it,
+    %% popping when a {0,0} with the same path is found.
+    FileAttrs = [{Loc, FormPath} || {attribute, Loc, file, {FormPath, _}} <- Forms],
+
+    Context = build_include_context(FileAttrs, Path),
+
+    case Context of
+        [ _, {IncludeLoc, _IncludePath} | _Rest] ->
+            %% Return the location from the second entry (the include directive location in the parent file)
+            %% Extract the position from the location tuple and return as a range
+            case IncludeLoc of
+                {Pos, _} -> {Pos, Pos};
+                Pos when is_integer(Pos) -> {Pos, Pos}
+            end;
         _ ->
             {1, 1}
     end.
 
+%% Build the include context stack for a given path
+build_include_context(FileAttrs, TargetPath) ->
+    {_FinalStack, Context} = lists:foldl(
+        fun({Location, FilePath}, {Stack, ContextAcc}) ->
+            case Location of
+                {0, 0} ->
+                    %% Entering or re-entering a file
+                    case find_in_stack(Stack, FilePath) of
+                        not_found ->
+                            %% First time seeing this path - push to stack
+                            NewStack = [{Location, FilePath} | Stack],
+                            NewContextAcc =
+                                case FilePath of
+                                    TargetPath ->
+                                        %% Found our target path, capture current stack (reversed to get bottom-up order)
+                                        lists:reverse(NewStack);
+                                    _ ->
+                                        ContextAcc
+                                end,
+                            {NewStack, NewContextAcc};
+                        _Found ->
+                            %% Re-entering a file that was on the stack - pop back to it
+                            NewStack = pop_to_path(Stack, FilePath),
+                            {NewStack, ContextAcc}
+                    end;
+                _ ->
+                    %% Non-zero location - this is an include directive
+                    %% Push this file onto the stack
+                    NewStack = [{Location, FilePath} | Stack],
+                    NewContextAcc =
+                        case FilePath of
+                            TargetPath ->
+                                %% Found our target path, capture current stack (reversed to get bottom-up order)
+                                lists:reverse(NewStack);
+                            _ ->
+                                ContextAcc
+                        end,
+                    {NewStack, NewContextAcc}
+            end
+        end,
+        {[], []},
+        FileAttrs
+    ),
+    Context.
+
+%% Find a path in the stack
+find_in_stack([], _Path) ->
+    not_found;
+find_in_stack([{Loc, Path} | _Rest], Path) ->
+    {found, Loc};
+find_in_stack([_ | Rest], Path) ->
+    find_in_stack(Rest, Path).
+
+%% Pop the stack until we find the given path (inclusive)
+pop_to_path([], _Path) ->
+    [];
+pop_to_path([{_Loc, Path} | _Rest] = Stack, Path) ->
+    Stack;
+pop_to_path([_ | Rest], Path) ->
+    pop_to_path(Rest, Path).
+
 extract_forms(Id, FileName, FileId, FileText, Options) ->
     case filename:extension(FileName) of
         ".erl" ->
diff --git a/test_projects/buck_tests_2/check_include/src/top_includer.erl b/test_projects/buck_tests_2/check_include/src/top_includer.erl
index 79f50ee108..6f12fdb31d 100644
--- a/test_projects/buck_tests_2/check_include/src/top_includer.erl
+++ b/test_projects/buck_tests_2/check_include/src/top_includer.erl
@@ -2,6 +2,7 @@
 
 -compile(warn_missing_spec_all).
 
+-include_lib("stdlib/include/ms_transform.hrl").
 -include_lib("check_include_separate_1/include/top_includer.hrl").
 
 -define(A_MACRO, ?FUNCTION_NAME).
diff --git a/test_projects/buck_tests_2/check_include_separate_1/include/include_with_bug.hrl b/test_projects/buck_tests_2/check_include_separate_1/include/include_with_bug.hrl
new file mode 100644
index 0000000000..82ab343676
--- /dev/null
+++ b/test_projects/buck_tests_2/check_include_separate_1/include/include_with_bug.hrl
@@ -0,0 +1,5 @@
+%% This file has a deliberate bug in it, to ensure we get a diagnostic
+%% in the including file.
+%%
+
+type foo() = ?FOO.
diff --git a/test_projects/buck_tests_2/check_include_separate_1/include/top_includer.hrl b/test_projects/buck_tests_2/check_include_separate_1/include/top_includer.hrl
index 5c88a7806e..b67b5b8b2b 100644
--- a/test_projects/buck_tests_2/check_include_separate_1/include/top_includer.hrl
+++ b/test_projects/buck_tests_2/check_include_separate_1/include/top_includer.hrl
@@ -1,5 +1,6 @@
 
 -include_lib("check_include_separate_2/include/separate_include.hrl").
 -include("does_not_exist.hrl").
+-include("include_with_bug.hrl").
 
 -define(FIRST, 1).

From 3461b8502994efdc62bdd22a1dcf1cbab8dcce3a Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 3 Dec 2025 06:46:58 -0800
Subject: [PATCH 320/394] Improve emacs eglot config

Summary: Add a hook to automatically enable it in erlang-mode, and add the missing closing parens.

Reviewed By: lisztspace

Differential Revision: D88264639

fbshipit-source-id: d3d8166dd233ddc59ff6bb082f3c022851aec5dc
---
 website/docs/get-started/editors/emacs.md | 33 ++++++++++++++++-------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/website/docs/get-started/editors/emacs.md b/website/docs/get-started/editors/emacs.md
index a444e87721..28b1c63e24 100644
--- a/website/docs/get-started/editors/emacs.md
+++ b/website/docs/get-started/editors/emacs.md
@@ -4,17 +4,21 @@ sidebar_position: 2
 
 # Emacs
 
-The ELP project can be used as a [language server](https://microsoft.github.io/language-server-protocol/overviews/lsp/overview/) in the Emacs text editor via the [eglot](https://github.com/joaotavora/eglot) or [lsp-mode](https://emacs-lsp.github.io/lsp-mode/) LSP clients.
+The ELP project can be used as a
+[language server](https://microsoft.github.io/language-server-protocol/overviews/lsp/overview/)
+in the Emacs text editor via the [eglot](https://github.com/joaotavora/eglot) or
+[lsp-mode](https://emacs-lsp.github.io/lsp-mode/) LSP clients.
 
 ## Eglot
 
-Eglot is part of Emacs core since Emacs 29.
-For earlier versions it can be installed with the `eglot` package.
+Eglot is part of Emacs core since Emacs 29. For earlier versions it can be
+installed with the `eglot` package.
 
 ### Configuration
 
 ```elisp
 (use-package eglot
+  :hook ((erlang-mode . eglot-ensure))
 
   :config
   ;; Remove default LSP server
@@ -23,14 +27,19 @@ For earlier versions it can be installed with the `eglot` package.
 
   ;; Enable ELP
   (add-to-list 'eglot-server-programs
-               '(erlang-mode . ("elp" "server"))
+               '(erlang-mode . ("elp" "server"))))
 ```
 
-Refer to the [manual](https://elpa.gnu.org/devel/doc/eglot.html#Customization-Variables) for additional configuration options.
+Refer to the
+[manual](https://elpa.gnu.org/devel/doc/eglot.html#Customization-Variables) for
+additional configuration options.
 
 ## lsp-mode
 
-Install the `lsp-mode` package, which is a generic Emacs client for LSP servers. You can follow [these instructions](https://emacs-lsp.github.io/lsp-mode/page/installation/) to install it.
+Install the `lsp-mode` package, which is a generic Emacs client for LSP servers.
+You can follow
+[these instructions](https://emacs-lsp.github.io/lsp-mode/page/installation/) to
+install it.
 
 ### Configuration
 
@@ -52,15 +61,21 @@ Add the following to your emacs `.emacs` file or equivalent.
   )
 ```
 
-For a list of available configuration option, please refer to [this page](https://emacs-lsp.github.io/lsp-mode/page/lsp-erlang-elp/) and to the [`lsp-mode` settings documentation](https://emacs-lsp.github.io/lsp-mode/page/settings/mode/).
+For a list of available configuration option, please refer to
+[this page](https://emacs-lsp.github.io/lsp-mode/page/lsp-erlang-elp/) and to
+the
+[`lsp-mode` settings documentation](https://emacs-lsp.github.io/lsp-mode/page/settings/mode/).
 
-There is also a [`.dotemacs`](https://github.com/WhatsApp/erlang-language-platform/blob/main/editors/emacs/dotemacs.el) file in the ELP repository that you can use as a reference.
+There is also a
+[`.dotemacs`](https://github.com/WhatsApp/erlang-language-platform/blob/main/editors/emacs/dotemacs.el)
+file in the ELP repository that you can use as a reference.
 
 ## Troubleshooting
 
 #### The following servers support current file but do not have automatic installation
 
-Ensure that the `elp` executable is available in your `PATH` via Emacs. A workaround is:
+Ensure that the `elp` executable is available in your `PATH` via Emacs. A
+workaround is:
 
 ```elisp
 ;; Ensure your Emacs environment looks like your user's shell one

From 9ef2fec36e1bf760482acdbc522e8caef5a86cae Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 4 Dec 2025 07:38:39 -0800
Subject: [PATCH 321/394] Add test for hierarchical config support

Summary:
# Context

We want ELP to support hierarchical linter configurations. This means that, by placing a `.elp_lint.toml` file inside an OTP application dir it should be possible to specialize a more generic project-level linter configuration.

# This diff

This diff introduces a new test project, named "hierarchical_config" to showcase the most basic form of the goal: the project is composed by two OTP applications (`app_a` and `app_b`). After applying the generic lint configuration, both applications should have two lint issues: an unused macro and an unused function. By placing an additional `.elp_lint.toml` file inside `app_a` to disable the unused macro linter, the unused macro lint issue should only be reported for `app_b`.

Since the feature is not implemented yet and the unused macro linter will be reported for both applications, the test is marked as "should panic". This will change at the end of the stack.

Reviewed By: alanz

Differential Revision: D85569527

fbshipit-source-id: 0772e3a84a25f23c3d6b7ae6c0c955f1206e2c6a
---
 crates/elp/src/bin/main.rs                          | 13 +++++++++++++
 .../resources/test/hierarchical_config/basic.stdout |  7 +++++++
 test_projects/hierarchical_config/.elp.toml         |  5 +++++
 test_projects/hierarchical_config/.elp_lint.toml    |  5 +++++
 .../hierarchical_config/app_a/.elp_lint.toml        |  4 ++++
 .../hierarchical_config/app_a/src/app_a.app.src     |  3 +++
 .../hierarchical_config/app_a/src/app_a.erl         |  7 +++++++
 .../hierarchical_config/app_b/src/app_b.app.src     |  3 +++
 .../hierarchical_config/app_b/src/app_b.erl         |  7 +++++++
 test_projects/hierarchical_config/rebar.config      |  7 +++++++
 10 files changed, 61 insertions(+)
 create mode 100644 crates/elp/src/resources/test/hierarchical_config/basic.stdout
 create mode 100644 test_projects/hierarchical_config/.elp.toml
 create mode 100644 test_projects/hierarchical_config/.elp_lint.toml
 create mode 100644 test_projects/hierarchical_config/app_a/.elp_lint.toml
 create mode 100644 test_projects/hierarchical_config/app_a/src/app_a.app.src
 create mode 100644 test_projects/hierarchical_config/app_a/src/app_a.erl
 create mode 100644 test_projects/hierarchical_config/app_b/src/app_b.app.src
 create mode 100644 test_projects/hierarchical_config/app_b/src/app_b.erl
 create mode 100644 test_projects/hierarchical_config/rebar.config

diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index b227259a52..cc4c6b8332 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -2178,6 +2178,19 @@ mod tests {
         )
     }
 
+    #[test_case(false ; "rebar")]
+    #[test_case(true  ; "buck")]
+    #[should_panic] // Support for hierarchical config is not implemented yet
+    fn lint_hierarchical_config_basic(buck: bool) {
+        simple_snapshot(
+            args_vec!["lint", "--read-config"],
+            "hierarchical_config",
+            expect_file!("../resources/test/hierarchical_config/basic.stdout"),
+            buck,
+            None,
+        );
+    }
+
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
     fn eqwalizer_tests_check(buck: bool) {
diff --git a/crates/elp/src/resources/test/hierarchical_config/basic.stdout b/crates/elp/src/resources/test/hierarchical_config/basic.stdout
new file mode 100644
index 0000000000..851813b00c
--- /dev/null
+++ b/crates/elp/src/resources/test/hierarchical_config/basic.stdout
@@ -0,0 +1,7 @@
+Reporting all diagnostics codes
+Diagnostics reported in 2 modules:
+  app_a: 1
+      6:1-6:5::[Warning] [L1230] function main/0 is unused
+  app_b: 2
+      4:9-4:16::[Warning] [W0002] Unused macro (MACRO_B)
+      6:1-6:5::[Warning] [L1230] function main/0 is unused
diff --git a/test_projects/hierarchical_config/.elp.toml b/test_projects/hierarchical_config/.elp.toml
new file mode 100644
index 0000000000..1033c181ee
--- /dev/null
+++ b/test_projects/hierarchical_config/.elp.toml
@@ -0,0 +1,5 @@
+[buck]
+enabled = true
+build_deps = false
+included_targets = [ "fbcode//whatsapp/elp/test_projects/hierarchical_config/..." ]
+source_root = "whatsapp/elp/test_projects/hierarchical_config"
diff --git a/test_projects/hierarchical_config/.elp_lint.toml b/test_projects/hierarchical_config/.elp_lint.toml
new file mode 100644
index 0000000000..6cc536f399
--- /dev/null
+++ b/test_projects/hierarchical_config/.elp_lint.toml
@@ -0,0 +1,5 @@
+enabled_lints = []
+disabled_lints = [
+    "W0012",
+    "W0046"
+]
diff --git a/test_projects/hierarchical_config/app_a/.elp_lint.toml b/test_projects/hierarchical_config/app_a/.elp_lint.toml
new file mode 100644
index 0000000000..7445514e73
--- /dev/null
+++ b/test_projects/hierarchical_config/app_a/.elp_lint.toml
@@ -0,0 +1,4 @@
+enabled_lints = []
+disabled_lints = [
+    "W0002"
+]
diff --git a/test_projects/hierarchical_config/app_a/src/app_a.app.src b/test_projects/hierarchical_config/app_a/src/app_a.app.src
new file mode 100644
index 0000000000..1381435a46
--- /dev/null
+++ b/test_projects/hierarchical_config/app_a/src/app_a.app.src
@@ -0,0 +1,3 @@
+{application, app_a,
+  [{description, "example app A"}, {vsn, "inplace"}, {applications, [kernel, stdlib]}]
+}.
diff --git a/test_projects/hierarchical_config/app_a/src/app_a.erl b/test_projects/hierarchical_config/app_a/src/app_a.erl
new file mode 100644
index 0000000000..5b856d4f02
--- /dev/null
+++ b/test_projects/hierarchical_config/app_a/src/app_a.erl
@@ -0,0 +1,7 @@
+-module(app_a).
+
+-define(MACRO_A, 1).
+-define(MACRO_B, 1).
+
+main() ->
+    ?MACRO_A.
diff --git a/test_projects/hierarchical_config/app_b/src/app_b.app.src b/test_projects/hierarchical_config/app_b/src/app_b.app.src
new file mode 100644
index 0000000000..4112b4129f
--- /dev/null
+++ b/test_projects/hierarchical_config/app_b/src/app_b.app.src
@@ -0,0 +1,3 @@
+{application, app_b,
+  [{description, "example app B"}, {vsn, "inplace"}, {applications, [kernel, stdlib]}]
+}.
diff --git a/test_projects/hierarchical_config/app_b/src/app_b.erl b/test_projects/hierarchical_config/app_b/src/app_b.erl
new file mode 100644
index 0000000000..ad2453d0de
--- /dev/null
+++ b/test_projects/hierarchical_config/app_b/src/app_b.erl
@@ -0,0 +1,7 @@
+-module(app_b).
+
+-define(MACRO_A, 1).
+-define(MACRO_B, 1).
+
+main() ->
+    ?MACRO_A.
diff --git a/test_projects/hierarchical_config/rebar.config b/test_projects/hierarchical_config/rebar.config
new file mode 100644
index 0000000000..2dcacbc5b3
--- /dev/null
+++ b/test_projects/hierarchical_config/rebar.config
@@ -0,0 +1,7 @@
+{project_app_dirs, [
+    "app_a",
+    "app_b"
+]}.
+
+{erl_opts, [debug_info]}.
+{deps, []}.

From d42e431df4992ccc707a27d6f3e6789efaf47226 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 4 Dec 2025 07:38:39 -0800
Subject: [PATCH 322/394] Add merge logic for linters configuration

Summary:
# Context

We want ELP to support hierarchical linter configurations. This means that, by placing a `.elp_lint.toml` file inside an OTP application dir it should be possible to specialize a more generic project-level linter configuration.

# This diff

Introduce the concept of "merging" two linter configurations. This mechanism, currently unused, will then be used when resolving the linter configuration for a given application.

Reviewed By: alanz

Differential Revision: D85573621

fbshipit-source-id: f52a9ed100be794be23c97174b12ce36c3ca7aba
---
 crates/ide/src/diagnostics.rs | 234 ++++++++++++++++++++++++++++++++++
 1 file changed, 234 insertions(+)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index a5a46c442d..af15ee80e8 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1167,6 +1167,29 @@ impl DiagnosticsConfig {
 }
 
 impl LintConfig {
+    /// Merges this LintConfig with another, with the other config taking precedence.
+    pub fn merge(mut self, other: LintConfig) -> LintConfig {
+        self.enabled_lints.extend(other.enabled_lints);
+        self.disabled_lints.extend(other.disabled_lints);
+
+        if other.erlang_service.warnings_as_errors {
+            self.erlang_service.warnings_as_errors = true;
+        }
+
+        self.ad_hoc_lints.lints.extend(other.ad_hoc_lints.lints);
+
+        for (key, other_linter_config) in other.linters {
+            self.linters
+                .entry(key)
+                .and_modify(|existing| {
+                    *existing = existing.clone().merge(other_linter_config.clone())
+                })
+                .or_insert(other_linter_config);
+        }
+
+        self
+    }
+
     /// Get the is_enabled override for a linter based on its diagnostic code
     pub fn get_is_enabled_override(&self, diagnostic_code: &DiagnosticCode) -> Option<bool> {
         self.linters.get(diagnostic_code)?.is_enabled
@@ -1243,9 +1266,43 @@ pub struct FunctionCallLinterConfig {
     exclude: Option<Vec<FunctionMatch>>,
 }
 
+impl FunctionCallLinterConfig {
+    /// Merges this FunctionCallLinterConfig with another, extending the include and exclude lists.
+    pub fn merge(self, other: FunctionCallLinterConfig) -> FunctionCallLinterConfig {
+        let mut merged_include = self.include.unwrap_or_default();
+        if let Some(other_include) = other.include {
+            merged_include.extend(other_include);
+        }
+        let include = if merged_include.is_empty() {
+            None
+        } else {
+            Some(merged_include)
+        };
+
+        let mut merged_exclude = self.exclude.unwrap_or_default();
+        if let Some(other_exclude) = other.exclude {
+            merged_exclude.extend(other_exclude);
+        }
+        let exclude = if merged_exclude.is_empty() {
+            None
+        } else {
+            Some(merged_exclude)
+        };
+
+        FunctionCallLinterConfig { include, exclude }
+    }
+}
+
 #[derive(Deserialize, Serialize, Default, Debug, Clone)]
 pub struct SsrPatternsLinterConfig {}
 
+impl SsrPatternsLinterConfig {
+    /// Merges this SsrPatternsLinterConfig with another (trivial since it's empty).
+    pub fn merge(self, _other: SsrPatternsLinterConfig) -> SsrPatternsLinterConfig {
+        self
+    }
+}
+
 #[derive(Deserialize, Serialize, Debug, Clone)]
 #[serde(untagged)]
 pub enum LinterTraitConfig {
@@ -1253,6 +1310,25 @@ pub enum LinterTraitConfig {
     SsrPatternsLinterConfig(SsrPatternsLinterConfig),
 }
 
+impl LinterTraitConfig {
+    /// Merges this LinterTraitConfig with another. Only merges if both are the same variant.
+    /// If variants differ, returns the other config.
+    pub fn merge(self, other: LinterTraitConfig) -> LinterTraitConfig {
+        match (self, other) {
+            (
+                LinterTraitConfig::FunctionCallLinterConfig(self_config),
+                LinterTraitConfig::FunctionCallLinterConfig(other_config),
+            ) => LinterTraitConfig::FunctionCallLinterConfig(self_config.merge(other_config)),
+            (
+                LinterTraitConfig::SsrPatternsLinterConfig(self_config),
+                LinterTraitConfig::SsrPatternsLinterConfig(other_config),
+            ) => LinterTraitConfig::SsrPatternsLinterConfig(self_config.merge(other_config)),
+            // If variants differ, other takes precedence
+            (_, other) => other,
+        }
+    }
+}
+
 /// Configuration for a specific linter that allows overriding default settings
 #[derive(Deserialize, Serialize, Debug, Clone, Default)]
 pub struct LinterConfig {
@@ -1266,6 +1342,27 @@ pub struct LinterConfig {
     pub config: Option<LinterTraitConfig>,
 }
 
+impl LinterConfig {
+    /// Merges this LinterConfig with another, with the other config taking precedence
+    /// for any fields that are Some.
+    pub fn merge(self, other: LinterConfig) -> LinterConfig {
+        let merged_config = match (self.config, other.config) {
+            (Some(self_cfg), Some(other_cfg)) => Some(self_cfg.merge(other_cfg)),
+            (None, some_cfg) => some_cfg,
+            (some_cfg, None) => some_cfg,
+        };
+
+        LinterConfig {
+            is_enabled: other.is_enabled.or(self.is_enabled),
+            severity: other.severity.or(self.severity),
+            include_tests: other.include_tests.or(self.include_tests),
+            include_generated: other.include_generated.or(self.include_generated),
+            experimental: other.experimental.or(self.experimental),
+            config: merged_config,
+        }
+    }
+}
+
 impl<'de> Deserialize<'de> for Severity {
     fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
     where
@@ -4184,4 +4281,141 @@ baz(1)->4.
             "#,
         );
     }
+
+    #[test]
+    fn test_lint_config_merge() {
+        let code1 = DiagnosticCode::from("W0001");
+        let code2 = DiagnosticCode::from("W0002");
+        let code3 = DiagnosticCode::from("W0003");
+
+        let mut config1 = LintConfig {
+            enabled_lints: vec![code1.clone()],
+            disabled_lints: vec![code2.clone()],
+            ..Default::default()
+        };
+        config1.erlang_service.warnings_as_errors = false;
+
+        config1
+            .ad_hoc_lints
+            .lints
+            .push(Lint::ReplaceCall(ReplaceCall {
+                matcher: FunctionMatch::mf("mod1", "func1"),
+                action: ReplaceCallAction::Replace(Replacement::UseOk),
+            }));
+
+        config1.linters.insert(
+            code1.clone(),
+            LinterConfig {
+                is_enabled: Some(true),
+                severity: Some(Severity::Error),
+                include_tests: None,
+                include_generated: None,
+                experimental: None,
+                config: Some(LinterTraitConfig::FunctionCallLinterConfig(
+                    FunctionCallLinterConfig {
+                        include: Some(vec![FunctionMatch::mf("mod_a", "func_a")]),
+                        exclude: None,
+                    },
+                )),
+            },
+        );
+
+        let mut config2 = LintConfig {
+            enabled_lints: vec![code3.clone()],
+            disabled_lints: vec![code1.clone()],
+            ..Default::default()
+        };
+        config2.erlang_service.warnings_as_errors = true;
+
+        config2
+            .ad_hoc_lints
+            .lints
+            .push(Lint::ReplaceCall(ReplaceCall {
+                matcher: FunctionMatch::mf("mod2", "func2"),
+                action: ReplaceCallAction::Replace(Replacement::UseOk),
+            }));
+
+        config2.linters.insert(
+            code1.clone(),
+            LinterConfig {
+                is_enabled: Some(false),
+                severity: Some(Severity::Warning),
+                include_tests: Some(true),
+                include_generated: None,
+                experimental: None,
+                config: Some(LinterTraitConfig::FunctionCallLinterConfig(
+                    FunctionCallLinterConfig {
+                        include: Some(vec![FunctionMatch::mf("mod_b", "func_b")]),
+                        exclude: Some(vec![FunctionMatch::mf("mod_c", "func_c")]),
+                    },
+                )),
+            },
+        );
+
+        config2.linters.insert(
+            code2.clone(),
+            LinterConfig {
+                is_enabled: Some(true),
+                severity: None,
+                include_tests: None,
+                include_generated: Some(true),
+                experimental: None,
+                config: None,
+            },
+        );
+
+        let merged = config1.merge(config2);
+
+        assert_eq!(merged.enabled_lints.len(), 2);
+        assert!(merged.enabled_lints.contains(&code1));
+        assert!(merged.enabled_lints.contains(&code3));
+
+        assert_eq!(merged.disabled_lints.len(), 2);
+        assert!(merged.disabled_lints.contains(&code2));
+        assert!(merged.disabled_lints.contains(&code1));
+
+        assert!(merged.erlang_service.warnings_as_errors);
+
+        assert_eq!(merged.ad_hoc_lints.lints.len(), 2);
+
+        assert_eq!(merged.linters.len(), 2);
+        let linter_config1 = merged.linters.get(&code1).unwrap();
+        assert_eq!(linter_config1.is_enabled, Some(false));
+        assert_eq!(linter_config1.severity, Some(Severity::Warning));
+        assert_eq!(linter_config1.include_tests, Some(true));
+
+        if let Some(LinterTraitConfig::FunctionCallLinterConfig(function_config)) =
+            &linter_config1.config
+        {
+            assert_eq!(function_config.include.as_ref().unwrap().len(), 2);
+            assert!(
+                function_config
+                    .include
+                    .as_ref()
+                    .unwrap()
+                    .contains(&FunctionMatch::mf("mod_a", "func_a"))
+            );
+            assert!(
+                function_config
+                    .include
+                    .as_ref()
+                    .unwrap()
+                    .contains(&FunctionMatch::mf("mod_b", "func_b"))
+            );
+            assert_eq!(function_config.exclude.as_ref().unwrap().len(), 1);
+            assert!(
+                function_config
+                    .exclude
+                    .as_ref()
+                    .unwrap()
+                    .contains(&FunctionMatch::mf("mod_c", "func_c"))
+            );
+        } else {
+            panic!("Expected FunctionCallLinterConfig");
+        }
+
+        let linter_config2 = merged.linters.get(&code2).unwrap();
+        assert_eq!(linter_config2.is_enabled, Some(true));
+        assert_eq!(linter_config2.include_generated, Some(true));
+    }
 }

From 796f015f20f9d6a3adff7febbd8870140292c163 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 4 Dec 2025 09:45:48 -0800
Subject: [PATCH 323/394] Make it possible to run buck tests in isolation

Summary:
The buck2 tests seem to rely on a global state, which is only set for some of the test cases.

As a consequence, running all tests together works, but running some of them in isolation fails.

Consistently set the global state in all tests. As a follow-up, we could refactor this in a helper function.

Reviewed By: alanz

Differential Revision: D88274947

fbshipit-source-id: 5f22894e74bd41458139a93cd063647d95b86296
---
 crates/project_model/src/buck.rs | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 09e2a7b131..013f3cbc87 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -1432,6 +1432,10 @@ mod tests {
         "#;
         let dir = FixtureWithProjectMeta::gen_project(spec);
         let root = AbsPath::assert(Utf8Path::from_path(dir.path()).unwrap());
+        let _guard = set_test_cell_info(vec![(
+            "cell".to_string(),
+            dir.path().to_string_lossy().into_owned(),
+        )]);
         let target_name = "cell//app_a:app_a".to_string();
         let target = BuckTarget {
             name: "app_a".to_string(),
@@ -1460,6 +1464,10 @@ mod tests {
         "#;
         let dir = FixtureWithProjectMeta::gen_project(spec);
         let root = AbsPath::assert(Utf8Path::from_path(dir.path()).unwrap());
+        let _guard = set_test_cell_info(vec![(
+            "cell".to_string(),
+            dir.path().to_string_lossy().into_owned(),
+        )]);
         let target_name = "cell//app_a:app_a".to_string();
         let target = BuckTarget {
             name: "app_a".to_string(),
@@ -1488,6 +1496,10 @@ mod tests {
         "#;
         let dir = FixtureWithProjectMeta::gen_project(spec);
         let root = AbsPath::assert(Utf8Path::from_path(dir.path()).unwrap());
+        let _guard = set_test_cell_info(vec![(
+            "cell".to_string(),
+            dir.path().to_string_lossy().into_owned(),
+        )]);
         let target_name = "cell//app_a:app_a".to_string();
         let target = BuckTarget {
             name: "app_a".to_string(),
@@ -1586,6 +1598,10 @@ mod tests {
         "#;
         let dir = FixtureWithProjectMeta::gen_project(spec);
         let root = AbsPath::assert(Utf8Path::from_path(dir.path()).unwrap());
+        let _guard = set_test_cell_info(vec![(
+            "cell".to_string(),
+            dir.path().to_string_lossy().into_owned(),
+        )]);
         let target_name = "cell//app_a:app_a".to_string();
         let target = BuckTarget {
             name: "app_a".to_string(),

From c9cba57e40d98230b766531bb2444879e17dc5db Mon Sep 17 00:00:00 2001
From: Eddie Shen <xes@meta.com>
Date: Fri, 5 Dec 2025 00:22:38 -0800
Subject: [PATCH 324/394] Replace Duration::from_secs(60) to
 Duration::from_mins(1)

Summary:
X-link: https://github.com/meta-pytorch/torchft/pull/297

X-link: https://github.com/meta-pytorch/monarch/pull/2066

Rust 1.91 introduced `Duration::from_mins`.

This diff replaces some instances of `Duration::from_secs` with the corresponding `Duration::from_mins`.

Reviewed By: dtolnay

Differential Revision: D88434166

fbshipit-source-id: e5e86763e0f4cfa6da502d32f1f98ffc198399ed
---
 crates/elp/tests/slow-tests/support.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/elp/tests/slow-tests/support.rs b/crates/elp/tests/slow-tests/support.rs
index bf482a7816..2c794f6246 100644
--- a/crates/elp/tests/slow-tests/support.rs
+++ b/crates/elp/tests/slow-tests/support.rs
@@ -408,7 +408,7 @@ impl Drop for TestServer {
 struct Timeout;
 
 fn recv_timeout(receiver: &Receiver<Message>) -> Result<Option<Message>, Timeout> {
-    let timeout = Duration::from_secs(60);
+    let timeout = Duration::from_mins(1);
     select! {
         recv(receiver) -> msg => Ok(msg.ok()),
         recv(after(timeout)) -> _ => Err(Timeout),

From fd8fb4abeb4231942ab340c4c3fa3c4e48ada36e Mon Sep 17 00:00:00 2001
From: Eddie Shen <xes@meta.com>
Date: Fri, 5 Dec 2025 00:22:38 -0800
Subject: [PATCH 325/394] Replace Duration::from_secs(240) to
 Duration::from_mins(4)

Summary:
Rust 1.91 introduced `Duration::from_mins`.

This diff replaces some instances of `Duration::from_secs` with the corresponding `Duration::from_mins`.

Reviewed By: dtolnay

Differential Revision: D88441014

fbshipit-source-id: 88d368316aeb6e4deb328e2052c105d70da9be06
---
 crates/eqwalizer/src/ipc.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/eqwalizer/src/ipc.rs b/crates/eqwalizer/src/ipc.rs
index 30b1dae582..4d10d663ec 100644
--- a/crates/eqwalizer/src/ipc.rs
+++ b/crates/eqwalizer/src/ipc.rs
@@ -159,8 +159,8 @@ pub struct IpcHandle {
     _child_for_drop: JodChild,
 }
 
-const WRITE_TIMEOUT: Duration = Duration::from_secs(240);
-const READ_TIMEOUT: Duration = Duration::from_secs(240);
+const WRITE_TIMEOUT: Duration = Duration::from_mins(4);
+const READ_TIMEOUT: Duration = Duration::from_mins(4);
 
 impl IpcHandle {
     fn spawn_cmd(cmd: &mut Command) -> Result<Child> {

From 016e0d7c1e4b3b194db11975c0c911d475e952cc Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 5 Dec 2025 03:48:33 -0800
Subject: [PATCH 326/394] Fix false positive for undefined_function linter

Summary:
It can happen that, when looking for undefined functions, we could not resolve the module name at compile-time.

With the old logic, we would incorrectly flag the case as an "invalid function".

With the improved version, we do not flag the case if we are not sure, avoiding a number of false positives.
A test case highlighting the issue is added as a unit test.

Reviewed By: TD5

Differential Revision: D88474342

fbshipit-source-id: f0f5ae1272f8264c5e11c6e8a7855e75a2832841
---
 .../ide/src/diagnostics/undefined_function.rs | 73 ++++++++++++++++---
 1 file changed, 62 insertions(+), 11 deletions(-)

diff --git a/crates/ide/src/diagnostics/undefined_function.rs b/crates/ide/src/diagnostics/undefined_function.rs
index 6472a08f07..189edf06f5 100644
--- a/crates/ide/src/diagnostics/undefined_function.rs
+++ b/crates/ide/src/diagnostics/undefined_function.rs
@@ -80,19 +80,45 @@ impl FunctionCallLinter for UndefinedFunctionLinter {
                     return None;
                 }
 
-                if sema.is_atom_named(name, &known::module_info) && (arity == 0 || arity == 1)
-                    || sema
-                        .resolve_module_expr(def_fb.file_id(), module)
-                        .is_some_and(|module| is_automatically_added(sema, module, name, arity))
-                {
+                if sema.is_atom_named(name, &known::module_info) && (arity == 0 || arity == 1) {
                     return None;
                 }
-                match context
-                    .target
-                    .resolve_call(arity, sema, def_fb.file_id(), &def_fb.body())
-                {
-                    Some(_) => None,
-                    None => Some(context.target.label(arity, sema, &def_fb.body())),
+
+                // Try to resolve the module expression to a static module
+                let resolved_module = sema.resolve_module_expr(def_fb.file_id(), module);
+
+                match resolved_module {
+                    Some(resolved_module) => {
+                        // Module exists, check if the function exists
+                        match context.target.resolve_call(
+                            arity,
+                            sema,
+                            def_fb.file_id(),
+                            &def_fb.body(),
+                        ) {
+                            Some(_) => None,
+                            None => {
+                                // Function doesn't exist - check if it would be automatically added
+                                if is_automatically_added(sema, resolved_module, name, arity) {
+                                    return None;
+                                }
+                                Some(context.target.label(arity, sema, &def_fb.body()))
+                            }
+                        }
+                    }
+                    None => {
+                        // Module cannot be resolved. If the module expression is a static atom,
+                        // it means the module doesn't exist and we should report it.
+                        // If it's a dynamic expression (e.g., a variable or function call),
+                        // we can't determine at compile time whether it's defined.
+                        if module.as_atom().is_some() {
+                            // Static module name that doesn't exist - report as undefined
+                            Some(context.target.label(arity, sema, &def_fb.body()))
+                        } else {
+                            // Dynamic module expression - can't determine at compile time
+                            None
+                        }
+                    }
                 }
             }
             // Diagnostic L1227 already covers the case for local calls, so avoid double-reporting
@@ -413,4 +439,29 @@ exists() -> ok.
             "#,
         )
     }
+
+    #[test]
+    fn test_macro_remote_call() {
+        check_diagnostics(
+            r#"
+    //- /src/main.erl
+    -module(main).
+    -export([do/0]).
+    -define(COUNT_BACKEND, (count_backend:count_module())).
+    -define(COUNT(Name), ?COUNT_BACKEND:count(Name)).
+    
+    do() ->
+        ?COUNT('error.count').
+    
+    //- /src/stats.erl
+    -module(stats).
+    -export([count/1]).
+    count(_) -> ok.
+    //- /src/count_backend.erl
+    -module(count_backend).
+    -export([count_module/0]).
+    count_module() -> ?MODULE.
+            "#,
+        )
+    }
 }

From 4726f8144da03b4e30320bafda8ef80544db9baa Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 8 Dec 2025 04:50:14 -0800
Subject: [PATCH 327/394] Convert missing_module linter to use a trait

Summary:
The diagnostic was computed in the `diagnostics.rs` module. By using a trait we ensure the code is more readable and the intention is clear.
We also modularize the code in `diagnostics.rs`.

Reviewed By: alanz

Differential Revision: D88349260

fbshipit-source-id: f761a9c9b0da188643b6e5eae35b30a74cb5d262
---
 crates/ide/src/diagnostics.rs                 |  88 +-----------
 .../expression_can_be_simplified.rs           |  11 +-
 crates/ide/src/diagnostics/missing_module.rs  | 132 ++++++++++++++++++
 crates/ide/src/tests.rs                       |   2 +-
 4 files changed, 149 insertions(+), 84 deletions(-)
 create mode 100644 crates/ide/src/diagnostics/missing_module.rs

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index af15ee80e8..02ad08fc0d 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -119,6 +119,7 @@ mod map_insertion_to_syntax;
 mod meck;
 // @fb-only
 mod missing_compile_warn_missing_spec;
+mod missing_module;
 mod missing_separator;
 mod misspelled_attribute;
 mod module_mismatch;
@@ -1514,11 +1515,8 @@ pub fn native_diagnostics(
     let labeled_syntax_errors = if report_diagnostics {
         let sema = Semantic::new(db);
 
-        if file_kind.is_module() {
-            no_module_definition_diagnostic(&mut res, &parse);
-            if config.include_generated || !db.is_generated(file_id) {
-                unused_include::unused_includes(&sema, db, &mut res, file_id);
-            }
+        if file_kind.is_module() && (config.include_generated || !db.is_generated(file_id)) {
+            unused_include::unused_includes(&sema, db, &mut res, file_id);
         }
 
         res.append(&mut form_missing_separator_diagnostics(&parse));
@@ -1689,6 +1687,7 @@ const GENERIC_LINTERS: &[&dyn GenericDiagnostics] = &[
     &no_nowarn_suppressions::LINTER,
     &macro_precedence_suprise::LINTER,
     &edoc::LINTER,
+    &missing_module::LINTER,
 ];
 
 /// Unified registry for all types of linters
@@ -2045,34 +2044,6 @@ pub fn get_hir_diagnostics(db: &RootDatabase, file_id: FileId) -> Vec<Diagnostic
         .collect()
 }
 
-fn no_module_definition_diagnostic(
-    diagnostics: &mut Vec<Diagnostic>,
-    parse: &Parse<ast::SourceFile>,
-) {
-    let mut report = |range| {
-        let diagnostic =
-            Diagnostic::new(DiagnosticCode::MissingModule, "no module definition", range);
-        diagnostics.push(diagnostic);
-    };
-    for form in parse.tree().forms() {
-        match form {
-            ast::Form::PreprocessorDirective(_) => {
-                continue; // skip any directives
-            }
-            ast::Form::FileAttribute(_) => {
-                continue; // skip
-            }
-            ast::Form::ModuleAttribute(_) => {
-                break;
-            }
-            other_form => {
-                report(other_form.syntax().text_range());
-                break;
-            }
-        }
-    }
-}
-
 fn form_missing_separator_diagnostics(parse: &Parse<ast::SourceFile>) -> Vec<Diagnostic> {
     parse
         .tree()
@@ -3310,53 +3281,6 @@ main(X) ->
     //     )
     // }
 
-    #[test]
-    fn fun_decl_module_decl_ok() {
-        check_diagnostics(
-            r#"
--file("main.erl",1).
--define(baz,4).
--module(main).
-foo(2)->?baz.
-"#,
-        );
-    }
-
-    #[test]
-    fn fun_decl_module_decl_missing() {
-        check_diagnostics(
-            r#"
-  -file("foo.erl",1).
-  -define(baz,4).
-  foo(2)->?baz.
-%%^^^^^^^^^^^^^ error: L1201: no module definition
-"#,
-        );
-    }
-
-    #[test]
-    fn fun_decl_module_decl_missing_2() {
-        check_diagnostics(
-            r#"
-  baz(1)->4.
-%%^^^^^^^^^^ error: L1201: no module definition
-  foo(2)->3.
-"#,
-        );
-    }
-
-    #[test]
-    fn fun_decl_module_decl_after_preprocessor() {
-        check_diagnostics(
-            r#"
--ifndef(snmpm_net_if_mt).
--module(main).
--endif.
-baz(1)->4.
-"#,
-        );
-    }
-
     #[test]
     fn filter_diagnostics() {
         let diag1 = DiagnosticCode::ErlangService("P1700".to_string());
@@ -3472,7 +3396,7 @@ baz(1)->4.
         check_diagnostics(
             r#"
   baz(1)->4.
-%%^^^^^^^^^^ error: L1201: no module definition
+%%^^^^^^^^^^ 💡 error: L1201: no module definition
   foo(2)->3.
 "#,
         );
@@ -3496,7 +3420,7 @@ baz(1)->4.
  %% elp:ignore L1201
 
   baz(1)->4.
-%%^^^^^^^^^^ error: L1201: no module definition
+%%^^^^^^^^^^ 💡 error: L1201: no module definition
   foo(2)->3.
 "#,
         );
diff --git a/crates/ide/src/diagnostics/expression_can_be_simplified.rs b/crates/ide/src/diagnostics/expression_can_be_simplified.rs
index 4f3ce6ac57..4c9144e5c0 100644
--- a/crates/ide/src/diagnostics/expression_can_be_simplified.rs
+++ b/crates/ide/src/diagnostics/expression_can_be_simplified.rs
@@ -261,10 +261,19 @@ fn as_expr_id(any_expre_id: hir::AnyExprId) -> Option<hir::ExprId> {
 
 #[cfg(test)]
 mod tests {
+    use elp_ide_db::DiagnosticCode;
+    use expect_test::Expect;
     use expect_test::expect;
 
+    use crate::diagnostics::DiagnosticsConfig;
     use crate::tests::check_diagnostics;
-    use crate::tests::check_fix;
+    use crate::tests::check_fix_with_config;
+
+    #[track_caller]
+    fn check_fix(fixture_before: &str, fixture_after: Expect) {
+        let config = DiagnosticsConfig::default().disable(DiagnosticCode::MissingModule);
+        check_fix_with_config(config, fixture_before, fixture_after);
+    }
 
     #[test]
     fn test_generates_diagnostics() {
diff --git a/crates/ide/src/diagnostics/missing_module.rs b/crates/ide/src/diagnostics/missing_module.rs
new file mode 100644
index 0000000000..3fcbbf0fb7
--- /dev/null
+++ b/crates/ide/src/diagnostics/missing_module.rs
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is dual-licensed under either the MIT license found in the
+ * LICENSE-MIT file in the root directory of this source tree or the Apache
+ * License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+ * of this source tree. You may select, at your option, one of the
+ * above-listed licenses.
+ */
+
+// Diagnostic: missing-module
+//
+// Return a diagnostic if a module does not have a module definition
+
+use elp_ide_db::elp_base_db::FileId;
+use elp_syntax::AstNode;
+use elp_syntax::ast;
+use hir::Semantic;
+
+use crate::diagnostics::DiagnosticCode;
+use crate::diagnostics::GenericLinter;
+use crate::diagnostics::GenericLinterMatchContext;
+use crate::diagnostics::Linter;
+use crate::diagnostics::Severity;
+
+pub(crate) struct MissingModuleLinter;
+
+impl Linter for MissingModuleLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::MissingModule
+    }
+
+    fn description(&self) -> &'static str {
+        "no module definition"
+    }
+
+    fn severity(&self, _sema: &Semantic, _file_id: FileId) -> super::Severity {
+        Severity::Error
+    }
+
+    fn should_process_file_id(&self, sema: &Semantic, file_id: FileId) -> bool {
+        let file_kind = sema.db.file_kind(file_id);
+        file_kind.is_module()
+    }
+}
+
+impl GenericLinter for MissingModuleLinter {
+    type Context = ();
+
+    fn matches(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<GenericLinterMatchContext<Self::Context>>> {
+        let parse = sema.db.parse(file_id);
+        let mut res = Vec::new();
+
+        for form in parse.tree().forms() {
+            match form {
+                ast::Form::PreprocessorDirective(_) => {
+                    continue; // skip any directives
+                }
+                ast::Form::FileAttribute(_) => {
+                    continue; // skip
+                }
+                ast::Form::ModuleAttribute(_) => {
+                    break;
+                }
+                other_form => {
+                    let range = other_form.syntax().text_range();
+                    res.push(GenericLinterMatchContext { range, context: () });
+                    break;
+                }
+            }
+        }
+        Some(res)
+    }
+}
+
+pub static LINTER: MissingModuleLinter = MissingModuleLinter;
+
+#[cfg(test)]
+mod tests {
+    use crate::tests::check_diagnostics;
+
+    #[test]
+    fn fun_decl_module_decl_ok() {
+        check_diagnostics(
+            r#"
+-file("main.erl",1).
+-define(baz,4).
+-module(main).
+foo(2)->?baz.
+"#,
+        );
+    }
+
+    #[test]
+    fn fun_decl_module_decl_missing() {
+        check_diagnostics(
+            r#"
+  -file("foo.erl",1).
+  -define(baz,4).
+  foo(2)->?baz.
+%%^^^^^^^^^^^^^💡 error: L1201: no module definition
+"#,
+        );
+    }
+
+    #[test]
+    fn fun_decl_module_decl_missing_2() {
+        check_diagnostics(
+            r#"
+  baz(1)->4.
+%%^^^^^^^^^^💡 error: L1201: no module definition
+  foo(2)->3.
+"#,
+        );
+    }
+
+    #[test]
+    fn fun_decl_module_decl_after_preprocessor() {
+        check_diagnostics(
+            r#"
+-ifndef(snmpm_net_if_mt).
+-module(main).
+-endif.
+baz(1)->4.
+"#,
+        );
+    }
+}
diff --git a/crates/ide/src/tests.rs b/crates/ide/src/tests.rs
index 233a7a33f8..86f0a57555 100644
--- a/crates/ide/src/tests.rs
+++ b/crates/ide/src/tests.rs
@@ -695,7 +695,7 @@ mod test {
     fn filtered_diagnostics_passes_syntax_errors() {
         check_filtered_diagnostics(
             r#"
-            %%<^^^^^^^^^^^^ error: L1201: no module definition
+            %%<^^^^^^^^^^^^ 💡 error: L1201: no module definition
             foo() ->
                bug bug.
                 %% ^^^^ error: P1711: Syntax Error

From 61512bf9b9ff4be35cdf803e1cf80009ec79660a Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 8 Dec 2025 04:50:14 -0800
Subject: [PATCH 328/394] Convert unused_include linter to use trait

Summary: By using a trait we not only make the code more modular and readable, but we also have the ability to enable/disable the linter via config (without running it).

Reviewed By: michalmuskala

Differential Revision: D88351141

fbshipit-source-id: 7bcb3b2f72b1eb119f83b1784982d32867f9c486
---
 crates/ide/src/diagnostics.rs                 |   5 +-
 .../ide/src/diagnostics/unspecific_include.rs |   4 +-
 crates/ide/src/diagnostics/unused_include.rs  | 150 +++++++++++++-----
 3 files changed, 110 insertions(+), 49 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 02ad08fc0d..e4958e25b3 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1515,10 +1515,6 @@ pub fn native_diagnostics(
     let labeled_syntax_errors = if report_diagnostics {
         let sema = Semantic::new(db);
 
-        if file_kind.is_module() && (config.include_generated || !db.is_generated(file_id)) {
-            unused_include::unused_includes(&sema, db, &mut res, file_id);
-        }
-
         res.append(&mut form_missing_separator_diagnostics(&parse));
         res.extend(get_hir_diagnostics(db, file_id));
 
@@ -1688,6 +1684,7 @@ const GENERIC_LINTERS: &[&dyn GenericDiagnostics] = &[
     &macro_precedence_suprise::LINTER,
     &edoc::LINTER,
     &missing_module::LINTER,
+    &unused_include::LINTER,
 ];
 
 /// Unified registry for all types of linters
diff --git a/crates/ide/src/diagnostics/unspecific_include.rs b/crates/ide/src/diagnostics/unspecific_include.rs
index c9a9644ae3..223e5a0064 100644
--- a/crates/ide/src/diagnostics/unspecific_include.rs
+++ b/crates/ide/src/diagnostics/unspecific_include.rs
@@ -156,6 +156,7 @@ mod tests {
     use expect_test::expect;
 
     use crate::diagnostics::Diagnostic;
+    use crate::diagnostics::DiagnosticsConfig;
     use crate::tests;
 
     fn filter(d: &Diagnostic) -> bool {
@@ -169,7 +170,8 @@ mod tests {
 
     #[track_caller]
     fn check_fix(fixture_before: &str, fixture_after: Expect) {
-        tests::check_fix(fixture_before, fixture_after)
+        let config = DiagnosticsConfig::default().disable(DiagnosticCode::UnusedInclude);
+        tests::check_fix_with_config(config, fixture_before, fixture_after)
     }
 
     #[test]
diff --git a/crates/ide/src/diagnostics/unused_include.rs b/crates/ide/src/diagnostics/unused_include.rs
index 04a1a8490e..0e0c84458b 100644
--- a/crates/ide/src/diagnostics/unused_include.rs
+++ b/crates/ide/src/diagnostics/unused_include.rs
@@ -12,6 +12,8 @@
 //
 // Return a warning if nothing is used from an include file
 
+use std::borrow::Cow;
+
 use elp_ide_assists::helpers::extend_range;
 use elp_ide_db::SearchScope;
 use elp_ide_db::SymbolDefinition;
@@ -19,6 +21,7 @@ use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
 use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::SmolStr;
+use elp_syntax::TextRange;
 use elp_syntax::ast::AstNode;
 use fxhash::FxHashMap;
 use fxhash::FxHashSet;
@@ -31,9 +34,11 @@ use hir::db::DefDatabase;
 use hir::known;
 use lazy_static::lazy_static;
 
-use super::Diagnostic;
+use crate::Assist;
 use crate::diagnostics::DiagnosticCode;
-use crate::diagnostics::Severity;
+use crate::diagnostics::GenericLinter;
+use crate::diagnostics::GenericLinterMatchContext;
+use crate::diagnostics::Linter;
 use crate::fix;
 
 lazy_static! {
@@ -43,56 +48,113 @@ lazy_static! {
         .collect();
 }
 
-pub(crate) fn unused_includes(
-    sema: &Semantic,
-    db: &dyn DefDatabase,
-    diagnostics: &mut Vec<Diagnostic>,
-    file_id: FileId,
-) {
-    let form_list = db.file_form_list(file_id);
-    let mut cache = Default::default();
-    let source_file = db.parse(file_id);
-    for (include_idx, attr) in form_list.includes() {
-        if !EXCLUDES.contains(attr.path()) {
-            let in_file = InFile::new(file_id, include_idx);
-            if let Some(include_file_id) = db.resolve_include(in_file) {
-                if is_file_used(sema, db, include_file_id, file_id, &mut cache) {
-                    continue;
-                }
+pub(crate) struct UnusedIncludeLinter;
 
-                let path = match attr {
-                    IncludeAttribute::Include { path, .. } => path,
-                    IncludeAttribute::IncludeLib { path, .. } => path,
-                };
-                let attribute = attr.form_id().get(&source_file.tree());
-                let attribute_syntax = attribute.syntax();
-                let attribute_range = attribute_syntax.text_range();
-                let mut edit_builder = TextEdit::builder();
-                let extended_attribute_range = extend_range(attribute_syntax);
-                edit_builder.delete(extended_attribute_range);
-                let edit = edit_builder.finish();
+impl Linter for UnusedIncludeLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::UnusedInclude
+    }
 
-                let diagnostic = Diagnostic::new(
-                    DiagnosticCode::UnusedInclude,
-                    format!("Unused file: {path}"),
-                    attribute_range,
-                )
-                .with_severity(Severity::Warning)
-                .with_fixes(Some(vec![fix(
-                    "remove_unused_include",
-                    "Remove unused include",
-                    SourceChange::from_text_edit(file_id, edit.clone()),
-                    attribute_range,
-                )]));
+    fn description(&self) -> &'static str {
+        "Unused include file"
+    }
 
-                log::debug!("Found unused include {path:?}");
+    fn should_process_file_id(&self, sema: &Semantic, file_id: FileId) -> bool {
+        let file_kind = sema.db.file_kind(file_id);
+        file_kind.is_module()
+    }
 
-                diagnostics.push(diagnostic);
-            }
+    fn should_process_generated_files(&self) -> bool {
+        true
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct Context {
+    path: SmolStr,
+    extended_range: TextRange,
+}
+
+impl Default for Context {
+    fn default() -> Self {
+        Context {
+            path: SmolStr::new(""),
+            extended_range: TextRange::default(),
         }
     }
 }
 
+impl GenericLinter for UnusedIncludeLinter {
+    type Context = Context;
+
+    fn matches(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<GenericLinterMatchContext<Self::Context>>> {
+        let db = sema.db;
+        let form_list = db.file_form_list(file_id);
+        let mut cache = Default::default();
+        let source_file = db.parse(file_id);
+        let mut res = Vec::new();
+
+        for (include_idx, attr) in form_list.includes() {
+            if !EXCLUDES.contains(attr.path()) {
+                let in_file = InFile::new(file_id, include_idx);
+                if let Some(include_file_id) = db.resolve_include(in_file) {
+                    if is_file_used(sema, db, include_file_id, file_id, &mut cache) {
+                        continue;
+                    }
+
+                    let path = match attr {
+                        IncludeAttribute::Include { path, .. } => path,
+                        IncludeAttribute::IncludeLib { path, .. } => path,
+                    };
+                    let attribute = attr.form_id().get(&source_file.tree());
+                    let attribute_syntax = attribute.syntax();
+                    let attribute_range = attribute_syntax.text_range();
+                    let extended_attribute_range = extend_range(attribute_syntax);
+
+                    log::debug!("Found unused include {path:?}");
+
+                    res.push(GenericLinterMatchContext {
+                        range: attribute_range,
+                        context: Context {
+                            path: path.clone(),
+                            extended_range: extended_attribute_range,
+                        },
+                    });
+                }
+            }
+        }
+        Some(res)
+    }
+
+    fn match_description(&self, context: &Self::Context) -> Cow<'_, str> {
+        Cow::Owned(format!("Unused file: {}", context.path))
+    }
+
+    fn fixes(
+        &self,
+        context: &Self::Context,
+        _sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<Assist>> {
+        let mut edit_builder = TextEdit::builder();
+        edit_builder.delete(context.extended_range);
+        let edit = edit_builder.finish();
+
+        Some(vec![fix(
+            "remove_unused_include",
+            "Remove unused include",
+            SourceChange::from_text_edit(file_id, edit),
+            context.extended_range,
+        )])
+    }
+}
+
+pub static LINTER: UnusedIncludeLinter = UnusedIncludeLinter;
+
 fn is_file_used(
     sema: &Semantic,
     db: &dyn DefDatabase,

From 4e6851c71a8662f5fb3150866fd27baacd767647 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 8 Dec 2025 04:50:14 -0800
Subject: [PATCH 329/394] Convert misspelled_attribute linter to use a trait

Summary: Mechanical conversion. I also removed the "related info" since they did not seem to provide any additional benefit.

Reviewed By: TD5

Differential Revision: D88379801

fbshipit-source-id: 10926fdc31b88b5755ff346f97948cf83569f71e
---
 .../parse_elp_lint_fixme_spelling.stdout      |   2 -
 .../parse_elp_no_lint_specified_output.stdout |   1 -
 .../test/linter/warnings_as_errors.stdout     |   1 -
 crates/ide/src/diagnostics.rs                 |   4 +-
 .../src/diagnostics/misspelled_attribute.rs   | 162 ++++++++++--------
 crates/ide/src/diagnostics/unused_include.rs  |   1 -
 6 files changed, 95 insertions(+), 76 deletions(-)

diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_fixme_spelling.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_fixme_spelling.stdout
index c7616519bf..b8c9d1896e 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_fixme_spelling.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_fixme_spelling.stdout
@@ -2,12 +2,10 @@ module specified: spelling
 Diagnostics reported in 1 modules:
   spelling: 1
       2:2-2:10::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
-        2:2-2:10: Misspelled attribute
 ---------------------------------------------
 
 Applying fix in module 'spelling' for
       2:2-2:10::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
-        2:2-2:10: Misspelled attribute
 @@ -1,4 +1,5 @@
  -module(spelling).
 +% elp:fixme W0013 (misspelled_attribute)
diff --git a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
index 65f84fc805..6a4b28b72b 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
@@ -24,4 +24,3 @@ Diagnostics reported in 7 modules:
       8:7-9:16::[Warning] [L1318] expression updates a literal
   spelling: 1
       2:2-2:10::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
-        2:2-2:10: Misspelled attribute
diff --git a/crates/elp/src/resources/test/linter/warnings_as_errors.stdout b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
index 706dc801a5..2d9eae2b6e 100644
--- a/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
+++ b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
@@ -24,4 +24,3 @@ Diagnostics reported in 7 modules:
       8:7-9:16::[Error] [L1318] expression updates a literal
   spelling: 1
       2:2-2:10::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
-        2:2-2:10: Misspelled attribute
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index e4958e25b3..3292aedc6d 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1685,6 +1685,7 @@ const GENERIC_LINTERS: &[&dyn GenericDiagnostics] = &[
     &edoc::LINTER,
     &missing_module::LINTER,
     &unused_include::LINTER,
+    &misspelled_attribute::LINTER,
 ];
 
 /// Unified registry for all types of linters
@@ -1848,13 +1849,12 @@ fn widen_range(range: TextRange) -> TextRange {
     }
 }
 
-pub fn syntax_diagnostics(
+fn syntax_diagnostics(
     sema: &Semantic,
     parse: &Parse<ast::SourceFile>,
     res: &mut Vec<Diagnostic>,
     file_id: FileId,
 ) {
-    misspelled_attribute::misspelled_attribute(sema, res, file_id);
     for node in parse.tree().syntax().descendants() {
         head_mismatch::head_mismatch(res, file_id, &node);
         module_mismatch::module_mismatch(sema, res, file_id, &node);
diff --git a/crates/ide/src/diagnostics/misspelled_attribute.rs b/crates/ide/src/diagnostics/misspelled_attribute.rs
index 90695f52d1..f328f57b20 100644
--- a/crates/ide/src/diagnostics/misspelled_attribute.rs
+++ b/crates/ide/src/diagnostics/misspelled_attribute.rs
@@ -12,14 +12,16 @@ use elp_ide_db::elp_base_db::FileId;
 use elp_ide_db::source_change::SourceChange;
 use elp_ide_db::text_edit::TextEdit;
 use elp_syntax::ast::AstNode;
-use elp_syntax::ast::WildAttribute;
-use hir::Attribute;
 use hir::Semantic;
 
-use super::Diagnostic;
+use super::DiagnosticCode;
+use super::GenericLinter;
+use super::GenericLinterMatchContext;
+use super::Linter;
+use crate::Assist;
 use crate::TextRange;
 use crate::TextSize;
-use crate::diagnostics::RelatedInformation;
+use crate::diagnostics::Severity;
 use crate::fix;
 
 // Diagnostic: misspelled_attribute
@@ -34,26 +36,92 @@ use crate::fix;
 // ```
 // -include_lib("/foo/bar/baz.hrl").
 // ```
-pub(crate) fn misspelled_attribute(
-    sema: &Semantic,
-    diagnostics: &mut Vec<Diagnostic>,
-    file_id: FileId,
-) {
-    let form_list = sema.db.file_form_list(file_id);
-    let potential_misspellings = form_list.attributes().filter_map(|(id, attr)| {
-        looks_like_misspelling(attr).map(|suggested_rename| (id, attr, suggested_rename))
-    });
-    potential_misspellings.for_each(|(_id, attr, suggested_rename)| {
+
+pub(crate) struct MisspelledAttributeLinter;
+
+impl Linter for MisspelledAttributeLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::MisspelledAttribute
+    }
+
+    fn description(&self) -> &'static str {
+        "misspelled attribute"
+    }
+
+    fn severity(&self, _sema: &Semantic, _file_id: FileId) -> super::Severity {
+        Severity::Error
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Default)]
+pub struct Context {
+    range: TextRange,
+    attr_name: String,
+    suggested_rename: String,
+}
+
+impl GenericLinter for MisspelledAttributeLinter {
+    type Context = Context;
+
+    fn matches(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<GenericLinterMatchContext<Self::Context>>> {
+        let form_list = sema.db.file_form_list(file_id);
         let parsed_file = sema.db.parse(file_id);
-        let attr_form = attr.form_id.get(&parsed_file.tree());
-        diagnostics.push(make_diagnostic(
-            sema,
-            file_id,
-            attr,
-            attr_form,
-            suggested_rename,
-        ))
-    })
+        let mut res = Vec::new();
+
+        for (_id, attr) in form_list.attributes() {
+            if let Some(suggested_rename) = looks_like_misspelling(attr) {
+                let attr_form = attr.form_id.get(&parsed_file.tree());
+                if let Some(attr_name_node) = attr_form.name() {
+                    let attr_name_range_with_hyphen = attr_name_node.syntax().text_range();
+                    let attr_name_range = TextRange::new(
+                        attr_name_range_with_hyphen
+                            .start()
+                            .checked_add(TextSize::of('-'))
+                            .unwrap(),
+                        attr_name_range_with_hyphen.end(),
+                    );
+
+                    res.push(GenericLinterMatchContext {
+                        range: attr_name_range,
+                        context: Context {
+                            range: attr_name_range,
+                            attr_name: attr.name.to_string(),
+                            suggested_rename: suggested_rename.to_string(),
+                        },
+                    });
+                }
+            }
+        }
+        Some(res)
+    }
+
+    fn match_description(&self, context: &Self::Context) -> std::borrow::Cow<'_, str> {
+        format!(
+            "misspelled attribute, saw '{}' but expected '{}'",
+            context.attr_name, context.suggested_rename
+        )
+        .into()
+    }
+
+    fn fixes(
+        &self,
+        context: &Self::Context,
+        _sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<Assist>> {
+        let edit = TextEdit::replace(context.range, context.suggested_rename.clone());
+        let msg = format!("Change to '{}'", context.suggested_rename);
+        Some(vec![fix(
+            "fix_misspelled_attribute",
+            &msg,
+            SourceChange::from_text_edit(file_id, edit),
+            context.range,
+        )])
+    }
 }
 
 const KNOWN_ATTRIBUTES: &[&str] = &[
@@ -85,7 +153,7 @@ const KNOWN_ATTRIBUTES: &[&str] = &[
     "doc",
 ];
 
-fn looks_like_misspelling(attr: &Attribute) -> Option<&str> {
+fn looks_like_misspelling(attr: &hir::Attribute) -> Option<&str> {
     let mut suggestions: Vec<(&str, f64)> = KNOWN_ATTRIBUTES
         .iter()
         .filter(|&known| &attr.name != known)
@@ -103,48 +171,7 @@ fn looks_like_misspelling(attr: &Attribute) -> Option<&str> {
         .copied()
 }
 
-fn make_diagnostic(
-    sema: &Semantic,
-    file_id: FileId,
-    attr: &Attribute,
-    attr_form: WildAttribute,
-    suggested_rename: &str,
-) -> Diagnostic {
-    // Includes the '-', e.g. "-dialyzer" from `-dialyzer([]).`, but we don't
-    // want to apply another `.name()`, because for attributes with special
-    // meanings like `-record(foo, ...).` we would get "foo"
-    let attr_name_range_with_hyphen = attr_form.name().unwrap().syntax().text_range();
-    let attr_name_range = TextRange::new(
-        attr_name_range_with_hyphen
-            .start()
-            .checked_add(TextSize::of('-'))
-            .unwrap(),
-        attr_name_range_with_hyphen.end(),
-    );
-
-    let edit = TextEdit::replace(attr_name_range, suggested_rename.to_string());
-
-    Diagnostic::new(
-        super::DiagnosticCode::MisspelledAttribute,
-        format!(
-            "misspelled attribute, saw '{}' but expected '{}'",
-            attr.name, suggested_rename
-        ),
-        attr_name_range,
-    )
-    .with_related(Some(vec![RelatedInformation {
-        file_id,
-        range: attr_name_range,
-        message: "Misspelled attribute".to_string(),
-    }]))
-    .with_fixes(Some(vec![fix(
-        "fix_misspelled_attribute",
-        format!("Change misspelled attribute to '{suggested_rename}'").as_str(),
-        SourceChange::from_text_edit(file_id, edit),
-        attr_name_range,
-    )]))
-    .with_ignore_fix(sema, file_id)
-}
+pub static LINTER: MisspelledAttributeLinter = MisspelledAttributeLinter;
 
 // To run the tests via cargo
 // cargo test --package elp_ide --lib
@@ -164,7 +191,6 @@ mod tests {
     -module(main).
     -dyalizer({nowarn_function, f/0}).
  %%% ^^^^^^^^ 💡 error: W0013: misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
- %%%        | Related info: 0:22-30 Misspelled attribute
             "#,
         );
         check_fix(
@@ -225,7 +251,6 @@ mod tests {
     -module(main).
     -module_doc """
 %%%  ^^^^^^^^^^ 💡 error: W0013: misspelled attribute, saw 'module_doc' but expected 'moduledoc'
-%%%           | Related info: 0:24-34 Misspelled attribute
     Hola
     """.
             "#,
@@ -239,7 +264,6 @@ mod tests {
     -module(main).
     -docs """
 %%%  ^^^^ 💡 error: W0013: misspelled attribute, saw 'docs' but expected 'doc'
-%%%     | Related info: 0:24-28 Misspelled attribute
     Hola
     """.
     foo() -> ok.
diff --git a/crates/ide/src/diagnostics/unused_include.rs b/crates/ide/src/diagnostics/unused_include.rs
index 0e0c84458b..eed17b3c5c 100644
--- a/crates/ide/src/diagnostics/unused_include.rs
+++ b/crates/ide/src/diagnostics/unused_include.rs
@@ -643,7 +643,6 @@ foo() -> ok.
 %% The following shows up as a wild attribute, which we regard as being used.
    -defin e(X, 1).
 %%  ^^^^^ 💡 error: W0013: misspelled attribute, saw 'defin' but expected 'define'
-%%    | Related info: 1:82-87 Misspelled attribute
 
 -def ine(Y, 2).
 "#,

From e1296c5c14b9a4a6fca735796a136fd580c7ce87 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 8 Dec 2025 04:50:14 -0800
Subject: [PATCH 330/394] Convert boolean_precedence linter to use a trait

Summary: Mechanical conversion, no functional change.

Reviewed By: TheGeorge

Differential Revision: D88620344

fbshipit-source-id: fb8a06f034b9c8ebf088acedad1d75769b340293
---
 crates/ide/src/diagnostics.rs                 |   2 +-
 .../ide/src/diagnostics/boolean_precedence.rs | 196 ++++++++++--------
 2 files changed, 116 insertions(+), 82 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 3292aedc6d..f9373e25b4 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -1593,7 +1593,6 @@ pub fn diagnostics_descriptors<'a>() -> Vec<&'a DiagnosticDescriptor<'a>> {
         &deprecated_function::DESCRIPTOR,
         &head_mismatch::DESCRIPTOR_SEMANTIC,
         &missing_separator::DESCRIPTOR,
-        &boolean_precedence::DESCRIPTOR,
         &record_tuple_match::DESCRIPTOR,
         &unspecific_include::DESCRIPTOR,
     ]
@@ -1686,6 +1685,7 @@ const GENERIC_LINTERS: &[&dyn GenericDiagnostics] = &[
     &missing_module::LINTER,
     &unused_include::LINTER,
     &misspelled_attribute::LINTER,
+    &boolean_precedence::LINTER,
 ];
 
 /// Unified registry for all types of linters
diff --git a/crates/ide/src/diagnostics/boolean_precedence.rs b/crates/ide/src/diagnostics/boolean_precedence.rs
index f2ba0fe542..21e374a4f5 100644
--- a/crates/ide/src/diagnostics/boolean_precedence.rs
+++ b/crates/ide/src/diagnostics/boolean_precedence.rs
@@ -15,6 +15,7 @@
 // https://www.erlang.org/doc/system/expressions.html#operator-precedence
 // So this often results in incorrect or buggy code.
 
+use std::borrow::Cow;
 use std::fmt;
 use std::fmt::Display;
 
@@ -45,29 +46,107 @@ use hir::fold::MacroStrategy;
 use hir::fold::ParenStrategy;
 use hir::fold::ParentId;
 
-use super::Diagnostic;
-use super::DiagnosticConditions;
-use super::DiagnosticDescriptor;
-use super::Severity;
+use super::GenericLinter;
+use super::GenericLinterMatchContext;
+use super::Linter;
+use crate::Assist;
 use crate::fix;
 
-pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
-    conditions: DiagnosticConditions {
-        experimental: false,
-        include_generated: false,
-        include_tests: true,
-        default_disabled: false,
-    },
-    checker: &|diags, sema, file_id, _ext| {
-        boolean_precedence(diags, sema, file_id);
-    },
-};
+pub(crate) struct BooleanPrecedenceLinter;
 
-fn boolean_precedence(diagnostics: &mut Vec<Diagnostic>, sema: &Semantic, file_id: FileId) {
-    sema.for_each_function(file_id, |def| check_function(diagnostics, sema, def));
+impl Linter for BooleanPrecedenceLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::BooleanPrecedence
+    }
+
+    fn description(&self) -> &'static str {
+        "boolean precedence"
+    }
 }
 
-fn check_function(diagnostics: &mut Vec<Diagnostic>, sema: &Semantic, def: &FunctionDef) {
+#[derive(Debug, Clone, PartialEq, Eq, Default)]
+pub struct Context {
+    range: TextRange,
+    preceding_ws_range: TextRange,
+    op: Op,
+    lhs_complex: bool,
+    rhs_complex: bool,
+    add_parens_range: TextRange,
+}
+
+impl GenericLinter for BooleanPrecedenceLinter {
+    type Context = Context;
+
+    fn matches(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<GenericLinterMatchContext<Self::Context>>> {
+        let mut res = Vec::new();
+        sema.for_each_function(file_id, |def| {
+            check_function(&mut res, sema, def);
+        });
+        Some(res)
+    }
+
+    fn match_description(&self, context: &Self::Context) -> Cow<'_, str> {
+        format!(
+            "Consider using the short-circuit expression '{}' instead of '{}'.\nOr add parentheses to avoid potential ambiguity.",
+            context.op.preferred(),
+            context.op,
+        )
+        .into()
+    }
+
+    fn fixes(
+        &self,
+        context: &Self::Context,
+        _sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<Assist>> {
+        let mut fixes = Vec::new();
+
+        // Add "replace with preferred operator" fix
+        let assist_message = format!("Replace '{}' with '{}'", context.op, context.op.preferred());
+        let edit = TextEdit::replace(
+            context.op.range(context.range, context.preceding_ws_range),
+            context.op.preferred().to_string(),
+        );
+        fixes.push(fix(
+            "replace_boolean_operator",
+            &assist_message,
+            SourceChange::from_text_edit(file_id, edit),
+            context.range,
+        ));
+
+        // Add "add parens" fixes if applicable
+        if context.lhs_complex {
+            fixes.push(parens_fix("LHS", file_id, context));
+        }
+        if context.rhs_complex {
+            fixes.push(parens_fix("RHS", file_id, context));
+        }
+
+        Some(fixes)
+    }
+}
+
+fn parens_fix(side: &str, file_id: FileId, context: &Context) -> Assist {
+    let assist_message = format!("Add parens to {side}");
+    let edit = add_parens_edit(&context.add_parens_range);
+    fix(
+        "replace_boolean_operator_add_parens",
+        &assist_message,
+        SourceChange::from_text_edit(file_id, edit),
+        context.range,
+    )
+}
+
+fn check_function(
+    matches: &mut Vec<GenericLinterMatchContext<Context>>,
+    sema: &Semantic,
+    def: &FunctionDef,
+) {
     let def_fb = def.in_function_body(sema, def);
     def_fb.clone().fold_function(
         Strategy {
@@ -91,28 +170,20 @@ fn check_function(diagnostics: &mut Vec<Diagnostic>, sema: &Semantic, def: &Func
                 _ => None,
             };
             if let Some(op) = op {
-                report(
-                    sema,
-                    &def_fb,
-                    def.file.file_id,
-                    clause_id,
-                    ctx,
-                    op,
-                    diagnostics,
-                );
+                collect_match(matches, sema, &def_fb, def.file.file_id, clause_id, ctx, op);
             }
         },
     )
 }
 
-fn report(
+fn collect_match(
+    matches: &mut Vec<GenericLinterMatchContext<Context>>,
     sema: &Semantic,
     def_fb: &InFunctionBody<&FunctionDef>,
     file_id: FileId,
     clause_id: ClauseId,
     ctx: AnyCallBackCtx,
     binop: (Op, ExprId, ExprId),
-    diagnostics: &mut Vec<Diagnostic>,
 ) -> Option<()> {
     /*
     we have (inserting parens for tree)
@@ -156,39 +227,26 @@ fn report(
             let (_op, token) = binop_ast.op()?;
             let range = token.text_range();
             let preceding_ws_range = include_preceding_whitespace(&token);
-            let mut d = make_diagnostic(file_id, range, preceding_ws_range, binop)
-                .with_ignore_fix(sema, def_fb.file_id());
-            if lhs_complex {
-                add_parens_fix(file_id, &range, add_parens_range, "LHS", &mut d);
-            }
-            if rhs_complex {
-                add_parens_fix(file_id, &range, add_parens_range, "RHS", &mut d);
-            }
-            diagnostics.push(d);
+
+            matches.push(GenericLinterMatchContext {
+                range,
+                context: Context {
+                    range,
+                    preceding_ws_range,
+                    op: binop,
+                    lhs_complex,
+                    rhs_complex,
+                    add_parens_range,
+                },
+            });
         }
     };
     Some(())
 }
 
-fn add_parens_fix(
-    file_id: FileId,
-    range: &TextRange,
-    expr_range: TextRange,
-    where_str: &str,
-    diag: &mut Diagnostic,
-) {
-    let assist_message = format!("Add parens to {where_str}");
-    let edit = add_parens_edit(&expr_range);
-    diag.add_fix(fix(
-        "replace_boolean_operator_add_parens",
-        &assist_message,
-        SourceChange::from_text_edit(file_id, edit.clone()),
-        *range,
-    ));
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
 enum Op {
+    #[default]
     And,
     AndInGuard,
     Or,
@@ -223,31 +281,7 @@ impl Op {
     }
 }
 
-fn make_diagnostic(
-    file_id: FileId,
-    range: TextRange,
-    preceding_ws_range: TextRange,
-    op: Op,
-) -> Diagnostic {
-    let message = format!(
-        "Consider using the short-circuit expression '{}' instead of '{}'.\nOr add parentheses to avoid potential ambiguity.",
-        op.preferred(),
-        op,
-    );
-    let assist_message = format!("Replace '{}' with '{}'", op, op.preferred());
-    let edit = TextEdit::replace(
-        op.range(range, preceding_ws_range),
-        op.preferred().to_string(),
-    );
-    Diagnostic::new(DiagnosticCode::BooleanPrecedence, message, range)
-        .with_severity(Severity::Warning)
-        .with_fixes(Some(vec![fix(
-            "replace_boolean_operator",
-            &assist_message,
-            SourceChange::from_text_edit(file_id, edit.clone()),
-            range,
-        )]))
-}
+pub static LINTER: BooleanPrecedenceLinter = BooleanPrecedenceLinter;
 
 #[cfg(test)]
 mod tests {

From 0f7069d02e99ea12300caac84a790bddf1fe2c51 Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Tue, 9 Dec 2025 06:29:17 -0800
Subject: [PATCH 331/394] Deprecate old error messages

Summary: As title. Remove the "detailed message" part, which is too verbose and mostly useless now.

Reviewed By: TD5

Differential Revision: D88633277

fbshipit-source-id: 092691c2520983148fa0ef8d61a62bd1149a1231
---
 .../eqwalizer_tests/check/any_fun_type.pretty |  26 -
 .../test/eqwalizer_tests/check/approx.pretty  |   6 -
 .../eqwalizer_tests/check/auto_imports.pretty |   9 +-
 .../eqwalizer_tests/check/booleans.pretty     |   6 -
 .../check/case_predicates.pretty              |  19 -
 .../eqwalizer_tests/check/complex_maps.pretty |  76 --
 .../check/comprehensions.pretty               |  44 --
 .../check/contravariant.pretty                |  10 -
 .../check/custom-OTP-27.pretty                | 746 +-----------------
 .../check/dynamic_calls.pretty                |  48 +-
 .../check/dynamic_catch.pretty                |   6 -
 .../eqwalizer_tests/check/dynamic_fun.pretty  |  30 -
 .../check/dynamic_generics.pretty             |  32 -
 .../check/dynamic_local_funs.pretty           |   6 -
 .../check/dynamic_refine.pretty               |  23 -
 .../eqwalizer_tests/check/elab_clause.pretty  |  12 -
 .../check/error_messages.pretty               |  67 +-
 .../test/eqwalizer_tests/check/format.pretty  |   6 -
 .../test/eqwalizer_tests/check/funs.pretty    |  74 --
 .../test/eqwalizer_tests/check/funs2.pretty   |  30 -
 .../check/generic_fun_application.pretty      | 231 ------
 .../check/generics_with_unions.pretty         |  57 --
 .../check/gradual_bounded.pretty              |  28 -
 .../check/gradual_complex_types.pretty        |  25 -
 .../check/gradual_custom.pretty               |  74 --
 .../check/gradual_maybe.pretty                |   8 -
 .../eqwalizer_tests/check/gradual_misc.pretty |  17 +-
 .../check/guard_b_connections.pretty          |  40 -
 .../eqwalizer_tests/check/guards_logic.pretty |  15 -
 .../test/eqwalizer_tests/check/hints.pretty   |  12 -
 .../test/eqwalizer_tests/check/iolists.pretty |  16 -
 .../eqwalizer_tests/check/lists_tests.pretty  |  20 -
 .../test/eqwalizer_tests/check/misc.pretty    | 128 +--
 .../test/eqwalizer_tests/check/neg.pretty     |   7 -
 .../test/eqwalizer_tests/check/numbers.pretty |  13 -
 .../test/eqwalizer_tests/check/opaque.pretty  |  32 -
 .../test/eqwalizer_tests/check/other.pretty   |   6 -
 .../test/eqwalizer_tests/check/otp28.pretty   |  45 --
 .../eqwalizer_tests/check/otp_opaques.pretty  |  33 -
 .../eqwalizer_tests/check/overloaded.pretty   |  30 +-
 .../check/overloaded_specs_union.pretty       |  14 -
 .../test/eqwalizer_tests/check/pats.pretty    |   6 -
 .../test/eqwalizer_tests/check/records.pretty | 119 +--
 .../check/recursive_aliases.pretty            |  71 --
 .../test/eqwalizer_tests/check/refine.pretty  | 120 ---
 .../check/strict_complex_types.pretty         |  18 -
 .../eqwalizer_tests/check/subtype_neg.pretty  |  96 ---
 .../test/eqwalizer_tests/check/t_maps.pretty  | 278 -------
 .../test/eqwalizer_tests/check/tries.pretty   |   6 -
 .../eqwalizer_tests/check/tuple_union.pretty  |  21 -
 .../eqwalizer_tests/check/type_asserts.pretty |  57 --
 .../check/use_dynamic_gradual.pretty          |   7 -
 .../check/use_dynamic_strict.pretty           |   7 -
 .../eqwalizer_tests/eqwater/eqwater.pretty    | 158 +---
 .../eqwater/eqwater_lists.pretty              |  38 -
 .../eqwater/eqwater_maps.pretty               |  18 -
 .../eqwater/eqwater_records.pretty            |  42 -
 .../eqwater/eqwater_sound.pretty              |  16 -
 .../eqwater/unlimited_refinement.pretty       |   6 -
 .../fault_tolerance/fault_tolerance.pretty    |  12 -
 .../eqwalize_all_bail_on_error_failure.pretty |  40 -
 .../standard/eqwalize_all_diagnostics.jsonl   |  10 +-
 .../standard/eqwalize_all_diagnostics.pretty  |  40 -
 .../eqwalize_all_diagnostics_gen.jsonl        |  10 +-
 .../test/standard/eqwalize_app_a.jsonl        |   6 +-
 .../test/standard/eqwalize_app_a.pretty       |  26 -
 .../standard/eqwalize_app_a_lists_fast.pretty |  14 -
 .../standard/eqwalize_app_diagnostics.pretty  |  40 -
 .../eqwalize_app_diagnostics_gen.pretty       |  40 -
 .../eqwalize_app_diagnostics_gen_rebar.pretty |  40 -
 .../eqwalize_app_diagnostics_rebar.pretty     |  40 -
 .../eqwalize_target_diagnostics.pretty        |  40 -
 crates/elp/tests/slow-tests/main.rs           |   6 +-
 73 files changed, 43 insertions(+), 3532 deletions(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/any_fun_type.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/any_fun_type.pretty
index c2a5c42406..69251d1a75 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/any_fun_type.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/any_fun_type.pretty
@@ -37,12 +37,6 @@ Because in the expression's type:
   Here the type is:     fun((term()) -> term())
   Context expects type: fun((term(), term()) -> term())
 
------------------------------- Detailed message ------------------------------
-
-  fun((term()) -> term()) is not compatible with f2()
-  because
-  fun((term()) -> term()) is not compatible with fun((term(), term()) -> term())
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
    ┌─ check/src/any_fun_type.erl:64:1
    │
@@ -67,16 +61,6 @@ Because in the expression's type:
     Differs from the expected type:  'a'
   )
 
------------------------------- Detailed message ------------------------------
-
-  f5('a' | 'b') is not compatible with f4('a')
-  because
-  fun((term()) -> 'a' | 'b') is not compatible with f4('a')
-  because
-  fun((term()) -> 'a' | 'b') is not compatible with fun((...) -> 'a')
-  because
-  'a' | 'b' is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/any_fun_type.erl:98:20
    │
@@ -103,14 +87,4 @@ Because in the expression's type:
     Differs from the expected type:  'a'
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((term()) -> 'a' | 'b') is not compatible with f4('a')
-  because
-  fun((term()) -> 'a' | 'b') is not compatible with fun((...) -> 'a')
-  because
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
 7 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/approx.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/approx.pretty
index 0fe7555553..15655d9cac 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/approx.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/approx.pretty
@@ -60,12 +60,6 @@ Because in the expression's type:
   However the following candidate: string()
   Differs from the expected type:  'anything'
 
------------------------------- Detailed message ------------------------------
-
-  string() | dynamic() is not compatible with 'anything'
-  because
-  string() is not compatible with 'anything'
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
    ┌─ check/src/approx.erl:74:1
    │  
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/auto_imports.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/auto_imports.pretty
index f1d2ca6927..2c9ecb3a1f 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/auto_imports.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/auto_imports.pretty
@@ -2,15 +2,8 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    ┌─ check/src/auto_imports.erl:22:20
    │
 22 │   erlang:error(ok, ok).
-   │                    ^^
-   │                    │
-   │                    'ok'.
+   │                    ^^ 'ok'.
 Expression has type:   'ok'
 Context expected type: [term()] | 'none'
-   │                    
-
-  'ok' is not compatible with [term()] | 'none'
-  because
-  'ok' is not compatible with [term()]
 
 1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/booleans.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/booleans.pretty
index 4407c43d42..7227163b41 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/booleans.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/booleans.pretty
@@ -22,10 +22,4 @@ Because in the expression's type:
   However the following candidate: 'false'
   Differs from the expected type:  'true'
 
------------------------------- Detailed message ------------------------------
-
-  'false' | 'true' is not compatible with 'true'
-  because
-  'false' is not compatible with 'true'
-
 2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates.pretty
index 9aff530657..a3bc7c96f9 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/case_predicates.pretty
@@ -72,17 +72,6 @@ Because in the expression's type:
     Differs from the expected type:  pid()
   }
 
------------------------------- Detailed message ------------------------------
-
-  {'p', pid() | reference()} is not compatible with {'a', atom()} | {'p', pid()}
-  because
-  at tuple index 2:
-  {'p', pid() | reference()} is not compatible with {'p', pid()}
-  because
-  pid() | reference() is not compatible with pid()
-  because
-  reference() is not compatible with pid()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/case_predicates.erl:144:10
     │
@@ -99,14 +88,6 @@ Because in the expression's type:
   However the following candidate: 'restarting'
   Differs from the expected type:  {'p', pid()} | 'undefined'
 
------------------------------- Detailed message ------------------------------
-
-  'undefined' | 'restarting' is not compatible with {'p', pid()} | 'undefined'
-  because
-  'restarting' is not compatible with {'p', pid()} | 'undefined'
-  because
-  'restarting' is not compatible with {'p', pid()}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/case_predicates.erl:174:16
     │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/complex_maps.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/complex_maps.pretty
index 3143803509..aae5348c54 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/complex_maps.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/complex_maps.pretty
@@ -14,10 +14,6 @@ Because in the expression's type:
   Context expects type: #{...}
   The expected map has no corresponding key for: c.
 
------------------------------- Detailed message ------------------------------
-
-key `c` is declared in the former but not in the latter and the latter map has no default association
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/complex_maps.erl:17:21
    │
@@ -35,15 +31,6 @@ Because in the expression's type:
     Context expects type: number()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{a => 'b', c => 'd'} is not compatible with #{a => 'b', atom() => number()}
-  because
-  #{a => 'b', c => 'd'} is not compatible with #{a => 'b', atom() => number()}
-  key `c` is declared in the former but not in the latter and key `c` isn't compatible with the default association of the latter map
-  because
-  'd' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/complex_maps.erl:20:19
    │
@@ -60,13 +47,6 @@ Because in the expression's type:
   Context expects type: #{...} (no default association)
   The expected map has no default association while the type of the expression has one.
 
------------------------------- Detailed message ------------------------------
-
-  #{a => 'b', atom() => atom()} is not compatible with #{a => 'b', c => 'd'}
-  key c is not present in the former map but is incompatible with its default association
-  because
-  atom() is not compatible with 'd'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/complex_maps.erl:23:19
    │
@@ -85,13 +65,6 @@ Because in the expression's type:
   , ... }
   The context introduces a new association c => 'd' which is incompatible with the expression's default association.
 
------------------------------- Detailed message ------------------------------
-
-  #{a => 'b', atom() => number()} is not compatible with #{a => 'b', c => 'd', atom() => number()}
-  key c is not present in the former map but is incompatible with its default association
-  because
-  number() is not compatible with 'd'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/complex_maps.erl:38:21
    │
@@ -108,13 +81,6 @@ Because in the expression's type:
   Context expects type: #{...} (no default association)
   The expected map has no default association while the type of the expression has one.
 
------------------------------- Detailed message ------------------------------
-
-  #{a => 'b', atom() => atom()} is not compatible with #{a => 'b'}
-  because
-  #{a => 'b', atom() => atom()} is not compatible with #{a => 'b'}
-  the latter map has no default association while the first map has one
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/complex_maps.erl:44:26
    │
@@ -131,13 +97,6 @@ Because in the expression's type:
   Context expects type: #{...} (no default association)
   The expected map has no default association while the type of the expression has one.
 
------------------------------- Detailed message ------------------------------
-
-  #{a => 'b', dynamic(atom()) => atom()} is not compatible with #{a => 'b'}
-  because
-  #{a => 'b', dynamic(atom()) => atom()} is not compatible with #{a => 'b'}
-  the latter map has no default association while the first map has one
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/complex_maps.erl:47:26
    │
@@ -154,13 +113,6 @@ Because in the expression's type:
   Context expects type: #{...} (no default association)
   The expected map has no default association while the type of the expression has one.
 
------------------------------- Detailed message ------------------------------
-
-  #{a => 'b', atom() => dynamic(atom())} is not compatible with #{a => 'b'}
-  because
-  #{a => 'b', atom() => dynamic(atom())} is not compatible with #{a => 'b'}
-  the latter map has no default association while the first map has one
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/complex_maps.erl:56:44
    │
@@ -218,13 +170,6 @@ Because in the expression's type:
     Context expects type: atom()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{atom() => binary()} is not compatible with #{a => binary(), atom() => atom()}
-  the default associations are not compatible
-  because
-  binary() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/complex_maps.erl:83:28
    │
@@ -242,13 +187,6 @@ Because in the expression's type:
     Context expects type: atom()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{a := 'b', atom() => binary()} is not compatible with #{a => 'b', {c, d} => atom() | binary(), term() => atom()}
-  the default associations are not compatible
-  because
-  binary() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/complex_maps.erl:86:28
    │
@@ -266,13 +204,6 @@ Because in the expression's type:
     Context expects type: atom()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{a := 'b', atom() => binary()} is not compatible with #{a => 'b', {c, d} => atom() | binary(), atom() => atom()}
-  the default associations are not compatible
-  because
-  binary() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/complex_maps.erl:89:29
    │
@@ -290,11 +221,4 @@ Because in the expression's type:
     Context expects type: binary()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{dynamic() => atom()} is not compatible with #{dynamic() => binary()}
-  the default associations are not compatible
-  because
-  atom() is not compatible with binary()
-
 16 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/comprehensions.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/comprehensions.pretty
index 396ce7fc52..2b387ca9b9 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/comprehensions.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/comprehensions.pretty
@@ -15,12 +15,6 @@ Because in the expression's type:
     Context expects type: atom()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/comprehensions.erl:40:16
    │
@@ -86,12 +80,6 @@ Because in the expression's type:
     Context expects type: binary()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [binary()]
-  because
-  number() is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/comprehensions.erl:72:5
    │
@@ -270,12 +258,6 @@ Because in the expression's type:
     Context expects type: binary()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [atom()] is not compatible with [binary()]
-  because
-  atom() is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/comprehensions.erl:226:5
     │
@@ -293,12 +275,6 @@ Because in the expression's type:
     Context expects type: 'false'
   ]
 
------------------------------- Detailed message ------------------------------
-
-  ['true'] is not compatible with ['false']
-  because
-  'true' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/comprehensions.erl:231:5
     │
@@ -316,12 +292,6 @@ Because in the expression's type:
     Context expects type: 'false'
   ]
 
------------------------------- Detailed message ------------------------------
-
-  ['true'] is not compatible with ['false']
-  because
-  'true' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/comprehensions.erl:239:5
     │
@@ -339,12 +309,6 @@ Because in the expression's type:
     Context expects type: atom()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/comprehensions.erl:267:5
     │
@@ -363,14 +327,6 @@ Because in the expression's type:
     Differs from the expected type:  binary()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [binary() | 'undefined'] is not compatible with [binary()]
-  because
-  binary() | 'undefined' is not compatible with binary()
-  because
-  'undefined' is not compatible with binary()
-
 error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
     ┌─ check/src/comprehensions.erl:386:9
     │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/contravariant.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/contravariant.pretty
index 69c58c0e77..f228f5cd50 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/contravariant.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/contravariant.pretty
@@ -16,14 +16,4 @@ Because in the expression's type:
     Differs from the expected type:  'a'
   ) -> 'ok')
 
------------------------------- Detailed message ------------------------------
-
-  ref_contravariant('a') is not compatible with ref_contravariant_ab()
-  because
-  contravariant('a') is not compatible with ref_contravariant_ab()
-  because
-  fun(('a') -> 'ok') is not compatible with ref_contravariant_ab()
-  because
-  fun(('a') -> 'ok') is not compatible with ref_contravariant('a' | 'b')
-
 1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty
index 370f7689e9..efc8c47aa0 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty
@@ -37,12 +37,6 @@ Because in the expression's type:
   However the following candidate: [dynamic()]
   Differs from the expected type:  tuple()
 
------------------------------- Detailed message ------------------------------
-
-  {atom(), string()} | [dynamic()] is not compatible with tuple()
-  because
-  [dynamic()] is not compatible with tuple()
-
 error: index_out_of_bounds (See https://fb.me/eqwalizer_errors#index_out_of_bounds)
    ┌─ check/src/custom.erl:48:5
    │
@@ -74,12 +68,6 @@ Because in the expression's type:
   However the following candidate: number()
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  atom() | number() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/custom.erl:68:5
    │
@@ -96,12 +84,6 @@ Because in the expression's type:
   However the following candidate: number()
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  dynamic() | number() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/custom.erl:86:5
    │
@@ -118,12 +100,6 @@ Because in the expression's type:
   However the following candidate: string()
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  'foo' | 'ok' | 'error' | number() | string() is not compatible with atom()
-  because
-  string() is not compatible with atom()
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
    ┌─ check/src/custom.erl:91:1
    │  
@@ -202,12 +178,6 @@ Because in the expression's type:
   However the following candidate: number()
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  number() | atom() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:200:5
     │
@@ -224,12 +194,6 @@ Because in the expression's type:
   However the following candidate: number()
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  number() | atom() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:206:5
     │    
@@ -249,15 +213,6 @@ Because in the expression's type:
     Differs from the expected type:  number()
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {atom(), 'undefined' | number()} is not compatible with {atom(), number()}
-  because
-  'undefined' | number() is not compatible with number()
-  because
-  'undefined' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:221:27
     │
@@ -274,14 +229,6 @@ Because in the expression's type:
   However the following candidate: 'c_v'
   Differs from the expected type:  'a_v' | 'b_v'
 
------------------------------- Detailed message ------------------------------
-
-  'a_v' | 'c_v' is not compatible with 'a_v' | 'b_v'
-  because
-  'c_v' is not compatible with 'a_v' | 'b_v'
-  because
-  'c_v' is not compatible with 'a_v'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:233:27
     │
@@ -298,14 +245,6 @@ Because in the expression's type:
   However the following candidate: 'c_v'
   Differs from the expected type:  'a_v' | 'b_v' | 'undefined'
 
------------------------------- Detailed message ------------------------------
-
-  'undefined' | 'a_v' | 'c_v' is not compatible with 'a_v' | 'b_v' | 'undefined'
-  because
-  'c_v' is not compatible with 'a_v' | 'b_v' | 'undefined'
-  because
-  'c_v' is not compatible with 'a_v'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:309:5
     │
@@ -362,28 +301,13 @@ Because in the expression's type:
   However the following candidate: 'a'
   Differs from the expected type:  #{term() => term()} | maps:iterator()
 
------------------------------- Detailed message ------------------------------
-
-  #{K => V} | 'a' is not compatible with #{term() => term()} | maps:iterator()
-  because
-  'a' is not compatible with #{term() => term()} | maps:iterator()
-  because
-  'a' is not compatible with #{term() => term()}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:425:20
     │
 425 │     maps:filter(F, non_kv),
-    │                    ^^^^^^
-    │                    │
-    │                    'non_kv'.
+    │                    ^^^^^^ 'non_kv'.
 Expression has type:   'non_kv'
 Context expected type: #{term() => term()} | maps:iterator()
-    │                    
-
-  'non_kv' is not compatible with #{term() => term()} | maps:iterator()
-  because
-  'non_kv' is not compatible with #{term() => term()}
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:454:5
@@ -403,13 +327,6 @@ Because in the expression's type:
     Context expects type: boolean()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{number() => pid()} is not compatible with #{number() => boolean()}
-  the default associations are not compatible
-  because
-  pid() is not compatible with boolean()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:474:14
     │
@@ -451,29 +368,13 @@ Because in the expression's type:
     Context expects type: 'a'
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{a := boolean(), b := boolean()} is not compatible with #{a => 'a', b => 'b'}
-  because
-  at key `a`:
-  #{a := boolean(), b := boolean()} is not compatible with #{a => 'a', b => 'b'}
-  because
-  boolean() is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:503:17
     │
 503 │     maps:map(F, non_kv),
-    │                 ^^^^^^
-    │                 │
-    │                 'non_kv'.
+    │                 ^^^^^^ 'non_kv'.
 Expression has type:   'non_kv'
 Context expected type: #{term() => term()} | maps:iterator()
-    │                 
-
-  'non_kv' is not compatible with #{term() => term()} | maps:iterator()
-  because
-  'non_kv' is not compatible with #{term() => term()}
 
 error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
     ┌─ check/src/custom.erl:538:9
@@ -502,14 +403,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [[[]]] is not compatible with [number() | 'a' | 'b']
-  because
-  [[]] is not compatible with number() | 'a' | 'b'
-  because
-  [[]] is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:545:28
     │
@@ -531,14 +424,6 @@ Because in the expression's type:
     ]
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [[[[]]]] is not compatible with [[[]]]
-  because
-  [[[]]] is not compatible with [[]]
-  because
-  [[]] is not compatible with []
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:552:5
     │  
@@ -555,16 +440,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     ┌─ check/src/custom.erl:555:9
     │
 555 │         non_kv
-    │         ^^^^^^
-    │         │
-    │         'non_kv'.
+    │         ^^^^^^ 'non_kv'.
 Expression has type:   'non_kv'
 Context expected type: #{term() => term()} | maps:iterator()
-    │         
-
-  'non_kv' is not compatible with #{term() => term()} | maps:iterator()
-  because
-  'non_kv' is not compatible with #{term() => term()}
 
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ check/src/custom.erl:560:1
@@ -606,12 +484,6 @@ Because in the expression's type:
   However the following candidate: []
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  [] | atom() is not compatible with atom()
-  because
-  [] is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:601:9
     │
@@ -682,30 +554,13 @@ Because in the expression's type:
     Differs from the expected type:  binary()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [number() | binary() | atom()] is not compatible with [binary()] | [number()] | [atom()]
-  because
-  [number() | binary() | atom()] is not compatible with [binary()]
-  because
-  number() | binary() | atom() is not compatible with binary()
-  because
-  number() is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:671:41
     │
 671 │ maps_to_list_7_neg(Num) -> maps:to_list(Num).
-    │                                         ^^^
-    │                                         │
-    │                                         Num.
+    │                                         ^^^ Num.
 Expression has type:   number()
 Context expected type: #{term() => term()} | maps:iterator()
-    │                                         
-
-  number() is not compatible with #{term() => term()} | maps:iterator()
-  because
-  number() is not compatible with #{term() => term()}
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:675:25
@@ -723,13 +578,6 @@ Because in the expression's type:
   Context expects type: #{...} (no default association)
   The expected map has no default association while the type of the expression has one.
 
------------------------------- Detailed message ------------------------------
-
-  #{'b' | 'a' | 'c' => number() | string() | atom()} is not compatible with #{a => string(), b => number(), c => atom()}
-  key a is not present in the former map but is incompatible with its default association
-  because
-  number() | string() | atom() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:679:25
     │
@@ -746,13 +594,6 @@ Because in the expression's type:
   Context expects type: #{...} (no default association)
   The expected map has no default association while the type of the expression has one.
 
------------------------------- Detailed message ------------------------------
-
-  #{'b' | 'a' | 'c' => number() | string() | atom()} is not compatible with #{a => string(), b => number() | boolean(), c => atom()}
-  key a is not present in the former map but is incompatible with its default association
-  because
-  number() | string() | atom() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:683:25
     │
@@ -769,10 +610,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., b := ..., ...}
   The type of the expression is missing the following required keys: a, b.
 
------------------------------- Detailed message ------------------------------
-
-keys `a`, `b` are declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:697:44
     │
@@ -797,13 +634,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., b := ..., ...}
   The type of the expression is missing the following required keys: a, b.
 
------------------------------- Detailed message ------------------------------
-
-  #{'a' | 'b' => atom() | number()} is not compatible with #{a := atom(), b := number()} | #{a := atom()}
-  because
-  #{'a' | 'b' => atom() | number()} is not compatible with #{a := atom(), b := number()}
-  keys `a`, `b` are declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:721:9
     │
@@ -822,14 +652,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((binary()) -> [number()]) is not compatible with fun((number()) -> boolean() | {'true', term()})
-  because
-  [number()] is not compatible with boolean() | {'true', term()}
-  because
-  [number()] is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:739:20
     │
@@ -846,12 +668,6 @@ Because in the expression's type:
   Context expects type: 'false' | 'true' | {'true', term()}
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-  'wrong_ret' is not compatible with boolean() | {'true', term()}
-  because
-  'wrong_ret' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:749:9
     │
@@ -876,14 +692,6 @@ Because in the expression's type:
   However the following candidate: 'wrong_ret'
   Differs from the expected type:  'false' | 'true' | {'true', term()}
 
------------------------------- Detailed message ------------------------------
-
-  {'true', 'a'} | 'wrong_ret' is not compatible with boolean() | {'true', term()}
-  because
-  'wrong_ret' is not compatible with boolean() | {'true', term()}
-  because
-  'wrong_ret' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:827:9
     │    
@@ -902,16 +710,6 @@ Because in the expression's type:
     Differs from the expected type:  'false' | 'true' | ['a' | 'b']
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun(('a' | 'b') -> ['a'] | 'true' | 'wrong_ret') is not compatible with fun(('a' | 'b') -> boolean() | ['a' | 'b'])
-  because
-  ['a'] | 'true' | 'wrong_ret' is not compatible with boolean() | ['a' | 'b']
-  because
-  'wrong_ret' is not compatible with boolean() | ['a' | 'b']
-  because
-  'wrong_ret' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:829:20
     │
@@ -928,12 +726,6 @@ Because in the expression's type:
   Context expects type: 'false' | 'true' | ['a' | 'b']
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-  'wrong_ret' is not compatible with boolean() | ['a' | 'b']
-  because
-  'wrong_ret' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:837:9
     │    
@@ -951,15 +743,6 @@ Because in the expression's type:
     Differs from the expected type:  'false' | 'true' | [Item]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((dynamic()) -> {'true', 'a'} | 'true') is not compatible with fun((Item) -> boolean() | [Item])
-  because
-  {'true', 'a'} | 'true' is not compatible with boolean() | [Item]
-  because
-  {'true', 'a'} is not compatible with boolean() | [Item]
-  expected union does not contain any tuple type of size 2
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:837:20
     │
@@ -976,10 +759,6 @@ Because in the expression's type:
   Context expects type: 'false' | 'true' | [dynamic()]
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-expected union does not contain any tuple type of size 2
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:839:9
     │
@@ -995,12 +774,6 @@ Because in the expression's type:
   Here the type is:     'not_a_queue'
   Context expects type: {[Item], [Item]}
 
------------------------------- Detailed message ------------------------------
-
-  'not_a_queue' is not compatible with queue:queue(Item)
-  because
-  'not_a_queue' is not compatible with {[Item], [Item]}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:839:9
     │
@@ -1016,12 +789,6 @@ Because in the expression's type:
   Here the type is:     'not_a_queue'
   Context expects type: {[dynamic()], [dynamic()]}
 
------------------------------- Detailed message ------------------------------
-
-  'not_a_queue' is not compatible with queue:queue(dynamic())
-  because
-  'not_a_queue' is not compatible with {[dynamic()], [dynamic()]}
-
 error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
     ┌─ check/src/custom.erl:846:9
     │  
@@ -1053,15 +820,6 @@ Because in the expression's type:
     Differs from the expected type:  'false' | 'true' | ['a' | 'b']
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun(('a' | 'b') -> ['a'] | 'false' | {'true', 'a'}) is not compatible with fun(('a' | 'b') -> boolean() | ['a' | 'b'])
-  because
-  ['a'] | 'false' | {'true', 'a'} is not compatible with boolean() | ['a' | 'b']
-  because
-  {'true', 'a'} is not compatible with boolean() | ['a' | 'b']
-  expected union does not contain any tuple type of size 2
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:857:20
     │
@@ -1078,10 +836,6 @@ Because in the expression's type:
   Context expects type: 'false' | 'true' | ['a' | 'b']
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-expected union does not contain any tuple type of size 2
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:873:9
     │    
@@ -1104,16 +858,6 @@ Because in the expression's type:
     Differs from the expected type:  'false' | 'true' | ['a' | 'b']
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun(('a' | 'b') -> ['a'] | 'wrong_ret') is not compatible with fun(('a' | 'b') -> boolean() | ['a' | 'b'])
-  because
-  ['a'] | 'wrong_ret' is not compatible with boolean() | ['a' | 'b']
-  because
-  'wrong_ret' is not compatible with boolean() | ['a' | 'b']
-  because
-  'wrong_ret' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:881:17
     │
@@ -1130,14 +874,6 @@ Because in the expression's type:
   However the following candidate: 'wrong_ret'
   Differs from the expected type:  'false' | 'true' | ['a' | 'b']
 
------------------------------- Detailed message ------------------------------
-
-  ['a'] | 'wrong_ret' is not compatible with boolean() | ['a' | 'b']
-  because
-  'wrong_ret' is not compatible with boolean() | ['a' | 'b']
-  because
-  'wrong_ret' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:891:9
     │
@@ -1156,14 +892,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((string()) -> atom()) is not compatible with fun((dynamic()) -> boolean() | [dynamic()])
-  because
-  atom() is not compatible with boolean() | [dynamic()]
-  because
-  atom() is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:891:9
     │
@@ -1182,14 +910,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((string()) -> atom()) is not compatible with fun(('a' | 'b') -> boolean() | ['a' | 'b'])
-  because
-  atom() is not compatible with boolean() | ['a' | 'b']
-  because
-  atom() is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:900:9
     │
@@ -1207,12 +927,6 @@ Because in the expression's type:
     Context expects type: boolean() | [atom()]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((atom()) -> boolean() | [atom()])
-  because
-  string() is not compatible with boolean() | [atom()]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:900:9
     │
@@ -1230,12 +944,6 @@ Because in the expression's type:
     Context expects type: boolean() | [dynamic(atom())]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((dynamic(atom())) -> boolean() | [dynamic(atom())])
-  because
-  string() is not compatible with boolean() | [dynamic(atom())]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:909:9
     │
@@ -1253,12 +961,6 @@ Because in the expression's type:
     Context expects type: boolean() | [atom()]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((atom()) -> boolean() | [atom()])
-  because
-  string() is not compatible with boolean() | [atom()]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:909:9
     │
@@ -1276,12 +978,6 @@ Because in the expression's type:
     Context expects type: boolean() | [dynamic(atom())]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((dynamic(atom())) -> boolean() | [dynamic(atom())])
-  because
-  string() is not compatible with boolean() | [dynamic(atom())]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:919:9
     │
@@ -1299,12 +995,6 @@ Because in the expression's type:
     Context expects type: boolean() | [atom()]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((atom()) -> boolean() | [atom()])
-  because
-  string() is not compatible with boolean() | [atom()]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:919:9
     │
@@ -1322,12 +1012,6 @@ Because in the expression's type:
     Context expects type: boolean() | [dynamic(atom())]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((dynamic(atom())) -> boolean() | [dynamic(atom())])
-  because
-  string() is not compatible with boolean() | [dynamic(atom())]
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ check/src/custom.erl:925:1
     │  
@@ -1356,12 +1040,6 @@ Because in the expression's type:
     Context expects type: boolean() | [atom()]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((atom()) -> boolean() | [atom()])
-  because
-  string() is not compatible with boolean() | [atom()]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:927:9
     │
@@ -1379,12 +1057,6 @@ Because in the expression's type:
     Context expects type: boolean() | [dynamic(atom())]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((dynamic(atom())) -> boolean() | [dynamic(atom())])
-  because
-  string() is not compatible with boolean() | [dynamic(atom())]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:955:5
     │  
@@ -1434,12 +1106,6 @@ Because in the expression's type:
     Context expects type: tuple()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  ['non_tuple'] is not compatible with [tuple()]
-  because
-  'non_tuple' is not compatible with tuple()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:975:5
     │  
@@ -1540,14 +1206,6 @@ Because in the expression's type:
     Differs from the expected type:  number()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  ['a' | number()] is not compatible with [number()]
-  because
-  'a' | number() is not compatible with number()
-  because
-  'a' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1042:15
      │
@@ -1592,31 +1250,17 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      ┌─ check/src/custom.erl:1100:5
      │
 1100 │     proplists:get_value(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('k', L).
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L).
 Expression has type:   term()
 Context expected type: pid() | 'undefined'
-     │     
-
-  term() is not compatible with pid() | 'undefined'
-  because
-  term() is not compatible with pid()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1106:5
      │
 1106 │     proplists:get_value(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('k', L).
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L).
 Expression has type:   term()
 Context expected type: pid() | 'undefined' | 'v'
-     │     
-
-  term() is not compatible with pid() | 'undefined' | 'v'
-  because
-  term() is not compatible with pid()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1111:5
@@ -1630,31 +1274,17 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      ┌─ check/src/custom.erl:1117:5
      │
 1117 │     proplists:get_value(k, L, 3).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('k', L, 3).
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L, 3).
 Expression has type:   term()
 Context expected type: pid() | number()
-     │     
-
-  term() is not compatible with pid() | number()
-  because
-  term() is not compatible with pid()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1123:5
      │
 1123 │     proplists:get_value(k, L, my_default).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('k', L, 'my_default').
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L, 'my_default').
 Expression has type:   term()
 Context expected type: 'v1' | 'v2' | 'my_default'
-     │     
-
-  term() is not compatible with 'v1' | 'v2' | 'my_default'
-  because
-  term() is not compatible with 'v1'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1129:5
@@ -1722,14 +1352,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with [pid() | 'default']
-  because
-  term() is not compatible with pid() | 'default'
-  because
-  term() is not compatible with pid()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1166:5
      │
@@ -1748,14 +1370,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with [pid() | 'default' | 'v']
-  because
-  term() is not compatible with pid() | 'default' | 'v'
-  because
-  term() is not compatible with pid()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1171:5
      │
@@ -1773,12 +1387,6 @@ Because in the expression's type:
     Context expects type: pid()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with [pid()]
-  because
-  term() is not compatible with pid()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1176:5
      │
@@ -1846,12 +1454,6 @@ Because in the expression's type:
     Context expects type: 'c'
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with ['c']
-  because
-  term() is not compatible with 'c'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1197:5
      │
@@ -1870,14 +1472,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with ['a' | 'b' | 'c']
-  because
-  term() is not compatible with 'a' | 'b' | 'c'
-  because
-  term() is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1202:24
      │
@@ -1903,41 +1497,21 @@ Because in the expression's type:
     Context expects type: 'a'
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with ['a']
-  because
-  term() is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1215:5
      │
 1215 │     proplists:get_value(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('k', L).
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L).
 Expression has type:   term()
 Context expected type: 'a' | pid()
-     │     
-
-  term() is not compatible with 'a' | pid()
-  because
-  term() is not compatible with 'a'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1220:5
      │
 1220 │     proplists:get_value(k, b).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('k', 'b').
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', 'b').
 Expression has type:   term()
 Context expected type: 'a' | pid()
-     │     
-
-  term() is not compatible with 'a' | pid()
-  because
-  term() is not compatible with 'a'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1220:28
@@ -1987,12 +1561,6 @@ Because in the expression's type:
   However the following candidate: tuple()
   Differs from the expected type:  'none'
 
------------------------------- Detailed message ------------------------------
-
-  'none' | tuple() is not compatible with 'none'
-  because
-  tuple() is not compatible with 'none'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1252:29
      │
@@ -2065,17 +1633,6 @@ Because in the expression's type:
     ]
   , [term()]}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {[[term()]], [term()]} is not compatible with {[plist('a', 'b')], plist('a', 'b')}
-  because
-  [[term()]] is not compatible with [plist('a', 'b')]
-  because
-  [term()] is not compatible with plist('a', 'b')
-  because
-  [term()] is not compatible with ['a' | {'a', 'b'}]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1315:21
      │
@@ -2120,46 +1677,25 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      ┌─ check/src/custom.erl:1363:5
      │
 1363 │     proplists:get_value(a, [a]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('a', ['a']).
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('a', ['a']).
 Expression has type:   term()
 Context expected type: 'true' | 'undefined'
-     │     
-
-  term() is not compatible with 'true' | 'undefined'
-  because
-  term() is not compatible with 'true'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1368:5
      │
 1368 │     proplists:get_value(X, [a]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value(X, ['a']).
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value(X, ['a']).
 Expression has type:   term()
 Context expected type: 'true' | 'undefined'
-     │     
-
-  term() is not compatible with 'true' | 'undefined'
-  because
-  term() is not compatible with 'true'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1373:5
      │
 1373 │     proplists:get_value(a, [a], b).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('a', ['a'], 'b').
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('a', ['a'], 'b').
 Expression has type:   term()
 Context expected type: 'true' | 'b'
-     │     
-
-  term() is not compatible with 'true' | 'b'
-  because
-  term() is not compatible with 'true'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1416:5
@@ -2194,12 +1730,6 @@ Because in the expression's type:
     Context expects type: tuple()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [tuple()]
-  because
-  number() is not compatible with tuple()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1448:5
      │    
@@ -2222,14 +1752,6 @@ Because in the expression's type:
     Differs from the expected type:  number()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [string() | number()] is not compatible with [number()]
-  because
-  string() | number() is not compatible with number()
-  because
-  string() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1482:5
      │
@@ -2373,17 +1895,6 @@ Because in the expression's type:
     , A}
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [{A, B} | {B, A}] is not compatible with [{A, B}]
-  because
-  {A, B} | {B, A} is not compatible with {A, B}
-  because
-  at tuple index 1:
-  {B, A} is not compatible with {A, B}
-  because
-  B is not compatible with A
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1757:5
      │    
@@ -2404,10 +1915,6 @@ Because in the expression's type:
   Context expects type: #{...}
   The expected map has no corresponding key for: a.
 
------------------------------- Detailed message ------------------------------
-
-key `a` is declared in the former but not in the latter and the latter map has no default association
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1769:18
      │
@@ -2451,10 +1958,6 @@ Because in the expression's type:
   Context expects type: #{b := ..., ...}
   The type of the expression is missing the following required keys: b.
 
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1826:5
      │    
@@ -2472,10 +1975,6 @@ Because in the expression's type:
   Context expects type: #{b := ..., ...}
   The type of the expression is missing the following required keys: b.
 
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1827:12
      │
@@ -2501,10 +2000,6 @@ Because in the expression's type:
   Context expects type: #{b := ..., ...}
   The type of the expression is missing the following required keys: b.
 
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1854:5
      │
@@ -2525,16 +2020,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      ┌─ check/src/custom.erl:1916:23
      │
 1916 │     custom_overloaded(X).
-     │                       ^
-     │                       │
-     │                       X.
+     │                       ^ X.
 Expression has type:   term()
 Context expected type: atom() | binary()
-     │                       
-
-  term() is not compatible with atom() | binary()
-  because
-  term() is not compatible with atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1939:5
@@ -2554,15 +2042,6 @@ Because in the expression's type:
     Differs from the expected type:  number()
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {atom(), number() | pid()} is not compatible with {atom(), number()}
-  because
-  number() | pid() is not compatible with number()
-  because
-  pid() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2041:5
      │
@@ -2578,14 +2057,6 @@ Because in the expression's type:
   Here the type is:     string() | binary()
   Context expects type: string()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2046:5
      │
@@ -2601,14 +2072,6 @@ Because in the expression's type:
   Here the type is:     string() | binary()
   Context expects type: string()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2051:5
      │
@@ -2624,14 +2087,6 @@ Because in the expression's type:
   Here the type is:     string() | binary()
   Context expects type: string()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2066:5
      │
@@ -2648,14 +2103,6 @@ Because in the expression's type:
   However the following candidate: string()
   Differs from the expected type:  binary()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with binary()
-  because
-  string() | binary() is not compatible with binary()
-  because
-  string() is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2081:19
      │
@@ -2674,16 +2121,6 @@ Because in the expression's type:
     Differs from the expected type:  string() | atom() | file:deep_list() | binary()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [binary() | pid()] is not compatible with [file:name_all()]
-  because
-  binary() | pid() is not compatible with file:name_all()
-  because
-  binary() | pid() is not compatible with string() | atom() | file:deep_list() | binary()
-  because
-  pid() is not compatible with string() | atom() | file:deep_list() | binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2086:5
      │
@@ -2699,14 +2136,6 @@ Because in the expression's type:
   Here the type is:     string() | binary()
   Context expects type: string()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2091:5
      │
@@ -2722,14 +2151,6 @@ Because in the expression's type:
   Here the type is:     string() | binary()
   Context expects type: string()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2096:5
      │
@@ -2745,14 +2166,6 @@ Because in the expression's type:
   Here the type is:     string() | binary()
   Context expects type: string()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2111:5
      │
@@ -2769,14 +2182,6 @@ Because in the expression's type:
   However the following candidate: string()
   Differs from the expected type:  binary()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with binary()
-  because
-  string() | binary() is not compatible with binary()
-  because
-  string() is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2121:25
      │
@@ -2793,14 +2198,6 @@ Because in the expression's type:
   Context expects type: string() | atom() | file:deep_list() | binary()
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-  pid() is not compatible with file:name_all()
-  because
-  pid() is not compatible with string() | atom() | file:deep_list() | binary()
-  because
-  pid() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2150:5
      │    
@@ -2822,17 +2219,6 @@ Because in the expression's type:
     ]
   , [atom() | number()]}
 
------------------------------- Detailed message ------------------------------
-
-  queue:queue(atom() | number()) is not compatible with queue:queue(number())
-  because
-  {[atom() | number()], [atom() | number()]} is not compatible with queue:queue(number())
-  because
-  at tuple index 1:
-  {[atom() | number()], [atom() | number()]} is not compatible with {[number()], [number()]}
-  because
-  [atom() | number()] is not compatible with [number()]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2191:5
      │
@@ -2851,15 +2237,6 @@ Because in the expression's type:
   Context expects type: #{count := ..., ...}
   The type of the expression is missing the following required keys: count.
 
------------------------------- Detailed message ------------------------------
-
-  #{count := number(), module := 'foo'} | #{module := 'foo'} is not compatible with state1()
-  because
-  #{count := number(), module := 'foo'} | #{module := 'foo'} is not compatible with #{count := number(), module := atom()}
-  because
-  #{module := 'foo'} is not compatible with #{count := number(), module := atom()}
-  key `count` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2223:13
      │
@@ -2884,10 +2261,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., ...}
   The type of the expression is missing the following required keys: a.
 
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2320:5
      │    
@@ -2908,10 +2281,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., b := ..., ...}
   The type of the expression is missing the following required keys: a, b.
 
------------------------------- Detailed message ------------------------------
-
-keys `a`, `b` are declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2342:5
      │    
@@ -2932,13 +2301,6 @@ Because in the expression's type:
     Context expects type: atom()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{atom() => binary()} is not compatible with #{atom() => atom()}
-  the default associations are not compatible
-  because
-  binary() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2354:23
      │
@@ -2955,12 +2317,6 @@ Because in the expression's type:
   Context expects type: 'false' | 'true' | {'true', term()}
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-  'err' is not compatible with boolean() | {'true', term()}
-  because
-  'err' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2362:5
      │    
@@ -2979,13 +2335,6 @@ Because in the expression's type:
     Context expects type: atom()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{atom() => binary()} is not compatible with #{atom() => atom()}
-  the default associations are not compatible
-  because
-  binary() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2363:45
      │
@@ -3026,12 +2375,6 @@ Because in the expression's type:
   Context expects type: iolist() | binary()
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-  atom() is not compatible with iodata() | unicode:charlist()
-  because
-  atom() is not compatible with iolist()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2386:5
      │
@@ -3060,17 +2403,6 @@ Because in the expression's type:
     }
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [{'return', 'something'}] is not compatible with [{'newline', 'cr' | 'lf' | 'any' | 'crlf' | 'anycrlf'} | 'notempty_atstart' | 'noteol' | 'bsr_unicode' | 'notbol' | 'global' | {'match_limit_recursion', number()} | 'bsr_anycrlf' | re:compile_option() | {'match_limit', number()} | {'offset', number()} | 'notempty' | {'return', 'iodata' | 'list' | 'binary'} | 'anchored']
-  because
-  {'return', 'something'} is not compatible with {'newline', 'cr' | 'lf' | 'any' | 'crlf' | 'anycrlf'} | 'notempty_atstart' | 'noteol' | 'bsr_unicode' | 'notbol' | 'global' | {'match_limit_recursion', number()} | 'bsr_anycrlf' | re:compile_option() | {'match_limit', number()} | {'offset', number()} | 'notempty' | {'return', 'iodata' | 'list' | 'binary'} | 'anchored'
-  because
-  at tuple index 2:
-  {'return', 'something'} is not compatible with {'return', 'iodata' | 'list' | 'binary'}
-  because
-  'something' is not compatible with 'iodata' | 'list' | 'binary'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2506:5
      │
@@ -3090,15 +2422,6 @@ Because in the expression's type:
     ]
   , [atom()]}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {[number()], [atom()]} is not compatible with {[atom()], [number()]}
-  because
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2518:5
      │
@@ -3120,18 +2443,6 @@ Because in the expression's type:
     ]
   , [{term(), atom()}]}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {[{term(), number()}], [{term(), atom()}]} is not compatible with {[{term(), atom()}], [{term(), number()}]}
-  because
-  [{term(), number()}] is not compatible with [{term(), atom()}]
-  because
-  at tuple index 2:
-  {term(), number()} is not compatible with {term(), atom()}
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2536:5
      │
@@ -3153,18 +2464,6 @@ Because in the expression's type:
     ]
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {[{'ok', atom()}], [{'ok', atom()} | {'error', term()}]} is not compatible with {[{'ok', atom()}], [{'error', term()}]}
-  because
-  [{'ok', atom()} | {'error', term()}] is not compatible with [{'error', term()}]
-  because
-  {'ok', atom()} | {'error', term()} is not compatible with {'error', term()}
-  because
-  at tuple index 1:
-  {'ok', atom()} is not compatible with {'error', term()}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2576:33
      │
@@ -3181,10 +2480,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., ...}
   The type of the expression is missing the following required keys: a.
 
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2586:33
      │
@@ -3202,15 +2497,6 @@ Because in the expression's type:
     Context expects type: 'true'
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{a => number()} is not compatible with #{a => 'true'}
-  because
-  at key `a`:
-  #{a => number()} is not compatible with #{a => 'true'}
-  because
-  number() is not compatible with 'true'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2596:33
      │
@@ -3227,10 +2513,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., ...}
   The type of the expression is missing the following required keys: a.
 
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2709:40
      │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_calls.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_calls.pretty
index a8dc692a9b..bc6265b8c1 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_calls.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_calls.pretty
@@ -66,61 +66,33 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    ┌─ check/src/dynamic_calls.erl:78:14
    │
 78 │     (FUnion)(false).
-   │              ^^^^^
-   │              │
-   │              'false'.
+   │              ^^^^^ 'false'.
 Expression has type:   'false'
 Context expected type: 'a1' | 'a2'
-   │              
-
-  'false' is not compatible with 'a1' | 'a2'
-  because
-  'false' is not compatible with 'a1'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/dynamic_calls.erl:78:14
    │
 78 │     (FUnion)(false).
-   │              ^^^^^
-   │              │
-   │              'false'.
+   │              ^^^^^ 'false'.
 Expression has type:   'false'
 Context expected type: 'a2' | 'a3'
-   │              
-
-  'false' is not compatible with 'a2' | 'a3'
-  because
-  'false' is not compatible with 'a2'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/dynamic_calls.erl:86:20
    │
 86 │     Res = (FUnion)(false),
-   │                    ^^^^^
-   │                    │
-   │                    'false'.
+   │                    ^^^^^ 'false'.
 Expression has type:   'false'
 Context expected type: 'a1' | 'a2'
-   │                    
-
-  'false' is not compatible with 'a1' | 'a2'
-  because
-  'false' is not compatible with 'a1'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/dynamic_calls.erl:86:20
    │
 86 │     Res = (FUnion)(false),
-   │                    ^^^^^
-   │                    │
-   │                    'false'.
+   │                    ^^^^^ 'false'.
 Expression has type:   'false'
 Context expected type: 'a2' | 'a3'
-   │                    
-
-  'false' is not compatible with 'a2' | 'a3'
-  because
-  'false' is not compatible with 'a2'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/dynamic_calls.erl:87:5
@@ -146,12 +118,6 @@ Because in the expression's type:
   However the following candidate: 'r2'
   Differs from the expected type:  'r1'
 
------------------------------- Detailed message ------------------------------
-
-  'r1' | 'r2' is not compatible with 'r1'
-  because
-  'r2' is not compatible with 'r1'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/dynamic_calls.erl:94:5
    │
@@ -176,12 +142,6 @@ Because in the expression's type:
   However the following candidate: 'r2'
   Differs from the expected type:  'r1'
 
------------------------------- Detailed message ------------------------------
-
-  'r1' | 'r2' | 'r3' is not compatible with 'r1'
-  because
-  'r2' is not compatible with 'r1'
-
 error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
     ┌─ check/src/dynamic_calls.erl:108:5
     │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_catch.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_catch.pretty
index a8135429d1..78fd9f16f2 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_catch.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_catch.pretty
@@ -14,10 +14,4 @@ Because in the expression's type:
   However the following candidate: atom()
   Differs from the expected type:  binary()
 
------------------------------- Detailed message ------------------------------
-
-  atom() | dynamic() is not compatible with binary()
-  because
-  atom() is not compatible with binary()
-
 1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_fun.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_fun.pretty
index 1f55b0f88a..7f7add29a8 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_fun.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_fun.pretty
@@ -72,16 +72,6 @@ Because in the expression's type:
     Differs from the expected type:  'a'
   )
 
------------------------------- Detailed message ------------------------------
-
-  f5('a' | 'b') is not compatible with f4('a')
-  because
-  fun((term()) -> 'a' | 'b') is not compatible with f4('a')
-  because
-  fun((term()) -> 'a' | 'b') is not compatible with fun((...) -> 'a')
-  because
-  'a' | 'b' is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/dynamic_fun.erl:155:20
     │
@@ -108,16 +98,6 @@ Because in the expression's type:
     Differs from the expected type:  'a'
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((term()) -> 'a' | 'b') is not compatible with f4('a')
-  because
-  fun((term()) -> 'a' | 'b') is not compatible with fun((...) -> 'a')
-  because
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/dynamic_fun.erl:176:21
     │
@@ -136,16 +116,6 @@ Because in the expression's type:
     Differs from the expected type:  'a'
   )
 
------------------------------- Detailed message ------------------------------
-
-  f4('a' | 'b') is not compatible with fun((term()) -> 'a')
-  because
-  fun((...) -> 'a' | 'b') is not compatible with fun((term()) -> 'a')
-  because
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/dynamic_fun.erl:208:34
     │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_generics.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_generics.pretty
index cd54f2d176..78c9a41f3f 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_generics.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_generics.pretty
@@ -38,12 +38,6 @@ Because in the expression's type:
   However the following candidate: number()
   Differs from the expected type:  none()
 
------------------------------- Detailed message ------------------------------
-
-  number() | dynamic() is not compatible with none()
-  because
-  number() is not compatible with none()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/dynamic_generics.erl:72:3
    │
@@ -68,12 +62,6 @@ Because in the expression's type:
   However the following candidate: string()
   Differs from the expected type:  'ok'
 
------------------------------- Detailed message ------------------------------
-
-  dynamic() | string() is not compatible with 'ok'
-  because
-  string() is not compatible with 'ok'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/dynamic_generics.erl:87:3
    │
@@ -112,14 +100,6 @@ Because in the expression's type:
     Differs from the expected type:  number()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [number() | 'three'] is not compatible with [number()]
-  because
-  number() | 'three' is not compatible with number()
-  because
-  'three' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/dynamic_generics.erl:115:9
     │
@@ -136,12 +116,6 @@ Because in the expression's type:
   However the following candidate: 'three'
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  number() | 'three' is not compatible with number()
-  because
-  'three' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/dynamic_generics.erl:115:22
     │
@@ -158,12 +132,6 @@ Because in the expression's type:
   However the following candidate: 'three'
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  number() | 'three' is not compatible with number()
-  because
-  'three' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/dynamic_generics.erl:127:13
     │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_local_funs.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_local_funs.pretty
index 3ca5a136e6..6e82aa3702 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_local_funs.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_local_funs.pretty
@@ -14,12 +14,6 @@ Because in the expression's type:
   However the following candidate: number()
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  dynamic() | number() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/dynamic_local_funs.erl:36:15
    │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine.pretty
index 9d7187f610..ce03971816 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/dynamic_refine.pretty
@@ -100,12 +100,6 @@ Because in the expression's type:
   However the following candidate: 'error'
   Differs from the expected type:  'ok'
 
------------------------------- Detailed message ------------------------------
-
-  dynamic() | 'error' is not compatible with 'ok'
-  because
-  'error' is not compatible with 'ok'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/dynamic_refine.erl:236:3
     │
@@ -138,12 +132,6 @@ Because in the expression's type:
   However the following candidate: 'err'
   Differs from the expected type:  'ok'
 
------------------------------- Detailed message ------------------------------
-
-  dyn_alias() | 'err' is not compatible with 'ok'
-  because
-  'err' is not compatible with 'ok'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/dynamic_refine.erl:260:27
     │
@@ -162,15 +150,4 @@ Because in the expression's type:
     Differs from the expected type:  'ok'
   }
 
------------------------------- Detailed message ------------------------------
-
-  union() is not compatible with {'ok'}
-  because
-  at tuple index 1:
-  {dyn_alias() | 'err'} is not compatible with {'ok'}
-  because
-  dyn_alias() | 'err' is not compatible with 'ok'
-  because
-  'err' is not compatible with 'ok'
-
 16 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/elab_clause.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/elab_clause.pretty
index b9fdc2fbce..e02928cc14 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/elab_clause.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/elab_clause.pretty
@@ -38,12 +38,6 @@ Because in the expression's type:
   However the following candidate: 'error'
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  'error' | 'exit' | 'throw' | number() is not compatible with number()
-  because
-  'error' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/elab_clause.erl:86:5
    │
@@ -60,12 +54,6 @@ Because in the expression's type:
   However the following candidate: [dynamic()]
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  number() | [dynamic()] is not compatible with number()
-  because
-  [dynamic()] is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/elab_clause.erl:93:17
    │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages.pretty
index ab48c38337..fab550d5e6 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/error_messages.pretty
@@ -15,17 +15,6 @@ Because in the expression's type:
     Context expects type: number()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{bar := atom(), baz := atom()} is not compatible with foo_map() | #{foo => atom()}
-  because
-  #{bar := atom(), baz := atom()} is not compatible with foo_map()
-  because
-  #{bar := atom(), baz := atom()} is not compatible with #{bar => atom(), baz => number(), other => atom(), other2 => atom(), other3 => atom(), other4 => atom(), other5 => atom()}
-  because
-  at key `baz`:
-  #{bar := atom(), baz := atom()} is not compatible with #{bar => atom(), baz => number(), other => atom(), other2 => atom(), other3 => atom(), other4 => atom(), other5 => atom()}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/error_messages.erl:19:24
    │
@@ -44,12 +33,6 @@ Because in the expression's type:
     The expected map has no corresponding key for: baz.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [#{bar => 'a' | 'b'} | #{baz => 'a' | 'b'}] is not compatible with [#{bar => 'a'}]
-  because
-  #{bar => 'a' | 'b'} | #{baz => 'a' | 'b'} is not compatible with #{bar => 'a'}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/error_messages.erl:22:22
    │
@@ -68,15 +51,6 @@ Because in the expression's type:
     Differs from the expected type:  binary()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{'undefined' | binary() => atom()} is not compatible with #{binary() => atom()}
-  the default associations are not compatible
-  because
-  'undefined' | binary() is not compatible with binary()
-  because
-  'undefined' is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/error_messages.erl:27:32
    │
@@ -89,17 +63,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    ┌─ check/src/error_messages.erl:30:32
    │
 30 │ no_record_conversion_2(Foo) -> Foo.
-   │                                ^^^
-   │                                │
-   │                                Foo.
+   │                                ^^^ Foo.
 Expression has type:   #foo{}
 Context expected type: {binary(), atom(), atom()}
-   │                                
-
-  at tuple index 1:
-  {'foo', atom(), atom()} is not compatible with {binary(), atom(), atom()}
-  because
-  'foo' is not compatible with binary()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/error_messages.erl:33:27
@@ -118,13 +84,6 @@ Because in the expression's type:
     Context expects type: binary()
   , atom()}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'foo', atom(), atom()} is not compatible with {'foo', binary(), atom()}
-  because
-  atom() is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/error_messages.erl:37:31
    │
@@ -143,18 +102,6 @@ Because in the expression's type:
     The expected map has no corresponding key for: large_map_key_a.
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{foo => #{large_map_key_a => 'large_map_val_a', large_map_key_b => 'large_map_val_b'}} is not compatible with #{foo => #{large_map_key_c => 'large_map_val_c'} | #{large_map_key_d => 'large_map_val_d'}}
-  because
-  at key `foo`:
-  #{foo => #{large_map_key_a => 'large_map_val_a', large_map_key_b => 'large_map_val_b'}} is not compatible with #{foo => #{large_map_key_c => 'large_map_val_c'} | #{large_map_key_d => 'large_map_val_d'}}
-  because
-  #{large_map_key_a => 'large_map_val_a', large_map_key_b => 'large_map_val_b'} is not compatible with #{large_map_key_c => 'large_map_val_c'} | #{large_map_key_d => 'large_map_val_d'}
-  because
-  #{large_map_key_a => 'large_map_val_a', large_map_key_b => 'large_map_val_b'} is not compatible with #{large_map_key_c => 'large_map_val_c'}
-  key `large_map_key_a` is declared in the former but not in the latter and the latter map has no default association
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/error_messages.erl:41:31
    │
@@ -173,16 +120,4 @@ Because in the expression's type:
     The expected map has no corresponding key for: large_map_key_a.
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{foo => #{large_map_key_a => 'large_map_val_a', large_map_key_b => 'large_map_val_b'}} is not compatible with #{foo => #{large_map_key_c => 'large_map_val_c', large_map_key_d => 'large_map_val_d'} | 'any'}
-  because
-  at key `foo`:
-  #{foo => #{large_map_key_a => 'large_map_val_a', large_map_key_b => 'large_map_val_b'}} is not compatible with #{foo => #{large_map_key_c => 'large_map_val_c', large_map_key_d => 'large_map_val_d'} | 'any'}
-  because
-  #{large_map_key_a => 'large_map_val_a', large_map_key_b => 'large_map_val_b'} is not compatible with #{large_map_key_c => 'large_map_val_c', large_map_key_d => 'large_map_val_d'} | 'any'
-  because
-  #{large_map_key_a => 'large_map_val_a', large_map_key_b => 'large_map_val_b'} is not compatible with #{large_map_key_c => 'large_map_val_c', large_map_key_d => 'large_map_val_d'}
-  key `large_map_key_a` is declared in the former but not in the latter and the latter map has no default association
-
 8 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/format.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/format.pretty
index f6d7701c2e..1a6ae465e8 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/format.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/format.pretty
@@ -13,10 +13,4 @@ Because in the expression's type:
   Here the type is:     [number() | io_lib:chars()]
   Context expects type: string()
 
------------------------------- Detailed message ------------------------------
-
-  io_lib:chars() is not compatible with string()
-  because
-  [number() | io_lib:chars()] is not compatible with string()
-
 1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/funs.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/funs.pretty
index 589448836f..1e2c339ecc 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/funs.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/funs.pretty
@@ -29,12 +29,6 @@ Because in the expression's type:
   Here the type is:     number()
   Context expects type: [term()]
 
------------------------------- Detailed message ------------------------------
-
-  n() is not compatible with [term()]
-  because
-  number() is not compatible with [term()]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/funs.erl:63:9
    │
@@ -50,12 +44,6 @@ Because in the expression's type:
   Here the type is:     [dynamic()]
   Context expects type: number()
 
------------------------------- Detailed message ------------------------------
-
-  [dynamic()] is not compatible with n()
-  because
-  [dynamic()] is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/funs.erl:70:13
    │
@@ -71,12 +59,6 @@ Because in the expression's type:
   Here the type is:     binary()
   Context expects type: number()
 
------------------------------- Detailed message ------------------------------
-
-  binary() is not compatible with n()
-  because
-  binary() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/funs.erl:70:35
    │
@@ -92,12 +74,6 @@ Because in the expression's type:
   Here the type is:     number()
   Context expects type: atom()
 
------------------------------- Detailed message ------------------------------
-
-  n() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/funs.erl:77:5
    │    
@@ -116,14 +92,6 @@ Because in the expression's type:
     Context expects type: 'a'
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [n()] is not compatible with ['a']
-  because
-  n() is not compatible with 'a'
-  because
-  number() is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/funs.erl:90:18
    │
@@ -139,12 +107,6 @@ Because in the expression's type:
   Here the type is:     number()
   Context expects type: [term()]
 
------------------------------- Detailed message ------------------------------
-
-  n() is not compatible with [term()]
-  because
-  number() is not compatible with [term()]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/funs.erl:90:18
    │
@@ -160,12 +122,6 @@ Because in the expression's type:
   Here the type is:     [dynamic()]
   Context expects type: number()
 
------------------------------- Detailed message ------------------------------
-
-  [dynamic()] is not compatible with n()
-  because
-  [dynamic()] is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/funs.erl:90:23
    │
@@ -181,12 +137,6 @@ Because in the expression's type:
   Here the type is:     number()
   Context expects type: [term()]
 
------------------------------- Detailed message ------------------------------
-
-  n() is not compatible with [term()]
-  because
-  number() is not compatible with [term()]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/funs.erl:96:31
    │
@@ -202,12 +152,6 @@ Because in the expression's type:
   Here the type is:     number()
   Context expects type: atom()
 
------------------------------- Detailed message ------------------------------
-
-  n() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/funs.erl:97:9
    │
@@ -223,12 +167,6 @@ Because in the expression's type:
   Here the type is:     number()
   Context expects type: [term()]
 
------------------------------- Detailed message ------------------------------
-
-  n() is not compatible with [term()]
-  because
-  number() is not compatible with [term()]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/funs.erl:97:9
    │
@@ -244,12 +182,6 @@ Because in the expression's type:
   Here the type is:     [dynamic()]
   Context expects type: number()
 
------------------------------- Detailed message ------------------------------
-
-  [dynamic()] is not compatible with n()
-  because
-  [dynamic()] is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/funs.erl:97:14
    │
@@ -265,12 +197,6 @@ Because in the expression's type:
   Here the type is:     number()
   Context expects type: [term()]
 
------------------------------- Detailed message ------------------------------
-
-  n() is not compatible with [term()]
-  because
-  number() is not compatible with [term()]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/funs.erl:104:7
     │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/funs2.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/funs2.pretty
index 7b20cba52c..f3a82abfd6 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/funs2.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/funs2.pretty
@@ -19,14 +19,6 @@ Because in the expression's type:
     ]
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [[[[]]]] is not compatible with [[[]]]
-  because
-  [[[]]] is not compatible with [[]]
-  because
-  [[]] is not compatible with []
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/funs2.erl:54:5
    │
@@ -66,12 +58,6 @@ Because in the expression's type:
     Context expects type: atom()
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((atom()) -> atom())
-  because
-  string() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/funs2.erl:101:9
     │
@@ -90,14 +76,6 @@ Because in the expression's type:
     Differs from the expected type:  atom()
   ) -> string())
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((dynamic() | fun((string()) -> atom())) -> dynamic() | fun((string()) -> atom()))
-  because
-  dynamic() | fun((string()) -> atom()) is not compatible with atom()
-  because
-  fun((string()) -> atom()) is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/funs2.erl:101:9
     │
@@ -116,14 +94,6 @@ Because in the expression's type:
     Differs from the expected type:  atom()
   ) -> string())
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((dynamic() | string() | fun((string()) -> atom())) -> dynamic() | string() | fun((string()) -> atom()))
-  because
-  dynamic() | string() | fun((string()) -> atom()) is not compatible with atom()
-  because
-  string() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/funs2.erl:152:27
     │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/generic_fun_application.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/generic_fun_application.pretty
index c10af08c9d..ae03bc49c8 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/generic_fun_application.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/generic_fun_application.pretty
@@ -31,12 +31,6 @@ Because in the expression's type:
     Context expects type: atom()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/generic_fun_application.erl:38:29
    │
@@ -54,14 +48,6 @@ Because in the expression's type:
     Context expects type: atom()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [dynamic(atom())]
-  because
-  number() is not compatible with dynamic(atom())
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/generic_fun_application.erl:43:5
    │
@@ -87,12 +73,6 @@ Because in the expression's type:
     Context expects type: B
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> pid()) is not compatible with fun((number()) -> B)
-  because
-  pid() is not compatible with B
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/generic_fun_application.erl:43:18
    │
@@ -111,14 +91,6 @@ Because in the expression's type:
     Differs from the expected type:  atom()
   ) -> pid())
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> pid()) is not compatible with fun((dynamic() | number()) -> pid())
-  because
-  dynamic() | number() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/generic_fun_application.erl:47:33
    │
@@ -136,12 +108,6 @@ Because in the expression's type:
     Context expects type: atom()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/generic_fun_application.erl:47:33
    │
@@ -159,14 +125,6 @@ Because in the expression's type:
     Context expects type: atom()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [dynamic(atom())]
-  because
-  number() is not compatible with dynamic(atom())
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/generic_fun_application.erl:48:5
    │
@@ -192,12 +150,6 @@ Because in the expression's type:
     Context expects type: B
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> pid()) is not compatible with fun((number()) -> B)
-  because
-  pid() is not compatible with B
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/generic_fun_application.erl:52:22
    │
@@ -216,14 +168,6 @@ Because in the expression's type:
     Differs from the expected type:  atom()
   ) -> pid())
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> pid()) is not compatible with fun((dynamic() | number()) -> pid())
-  because
-  dynamic() | number() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/generic_fun_application.erl:53:5
    │
@@ -272,10 +216,6 @@ Because in the expression's type:
   Context expects type: #{...}
   The expected map has no corresponding key for: true.
 
------------------------------- Detailed message ------------------------------
-
-key `true` is declared in the former but not in the latter and the latter map has no default association
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/generic_fun_application.erl:99:13
    │
@@ -365,15 +305,6 @@ Because in the expression's type:
     Context expects type: T
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{a => number()} is not compatible with #{atom() => T}
-  because
-  #{a => number()} is not compatible with #{atom() => T}
-  key `a` is declared in the former but not in the latter and key `a` isn't compatible with the default association of the latter map
-  because
-  number() is not compatible with T
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:126:5
     │
@@ -414,12 +345,6 @@ Because in the expression's type:
   However the following candidate: 'b'
   Differs from the expected type:  'a'
 
------------------------------- Detailed message ------------------------------
-
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:157:5
     │
@@ -444,12 +369,6 @@ Because in the expression's type:
   However the following candidate: 'b'
   Differs from the expected type:  'a'
 
------------------------------- Detailed message ------------------------------
-
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:172:5
     │
@@ -466,12 +385,6 @@ Because in the expression's type:
   However the following candidate: 'a'
   Differs from the expected type:  'b'
 
------------------------------- Detailed message ------------------------------
-
-  'a' | 'b' is not compatible with 'b'
-  because
-  'a' is not compatible with 'b'
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ check/src/generic_fun_application.erl:226:1
     │  
@@ -521,12 +434,6 @@ Because in the expression's type:
     Context expects type: X
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun(() -> A) is not compatible with fun(() -> X)
-  because
-  A is not compatible with X
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:276:5
     │
@@ -567,12 +474,6 @@ Because in the expression's type:
   However the following candidate: Last
   Differs from the expected type:  'first'
 
------------------------------- Detailed message ------------------------------
-
-  'first' | Last is not compatible with 'first'
-  because
-  Last is not compatible with 'first'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:296:5
     │
@@ -589,12 +490,6 @@ Because in the expression's type:
   However the following candidate: T
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  atom() | T is not compatible with atom()
-  because
-  T is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:322:5
     │    
@@ -612,13 +507,6 @@ Because in the expression's type:
     Context expects type: pid()
   , pid()}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {number(), pid()} is not compatible with {pid(), number()}
-  because
-  number() is not compatible with pid()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:330:5
     │
@@ -677,12 +565,6 @@ Because in the expression's type:
   Context expects type: fun((A) -> A) with 0 type parameters
   The number of type parameters doesn't match.
 
------------------------------- Detailed message ------------------------------
-
-  fun((Z) -> Z) | fun((dynamic()) -> dynamic()) is not compatible with fun((A) -> A)
-  because
-  fun((Z) -> Z) with 1 type parameter is not compatible with fun((A) -> A) with 0 type parameters
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:346:9
     │
@@ -701,12 +583,6 @@ Because in the expression's type:
   Context expects type: fun((dynamic()) -> dynamic()) with 0 type parameters
   The number of type parameters doesn't match.
 
------------------------------- Detailed message ------------------------------
-
-  fun((Z) -> Z) | fun((dynamic()) -> dynamic()) is not compatible with fun((dynamic()) -> dynamic())
-  because
-  fun((Z) -> Z) with 1 type parameter is not compatible with fun((dynamic()) -> dynamic()) with 0 type parameters
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:346:9
     │
@@ -725,12 +601,6 @@ Because in the expression's type:
   Context expects type: fun((A) -> A) with 0 type parameters
   The number of type parameters doesn't match.
 
------------------------------- Detailed message ------------------------------
-
-  fun((Z) -> Z) | fun((dynamic()) -> dynamic()) is not compatible with fun((A) -> A)
-  because
-  fun((Z) -> Z) with 1 type parameter is not compatible with fun((A) -> A) with 0 type parameters
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:358:9
     │
@@ -781,12 +651,6 @@ Because in the expression's type:
   Context expects type: fun((Z) -> Z) with 0 type parameters
   The number of type parameters doesn't match.
 
------------------------------- Detailed message ------------------------------
-
-  fun((Z) -> Z) | fun((dynamic()) -> dynamic()) is not compatible with fun((Z) -> Z)
-  because
-  fun((Z) -> Z) with 1 type parameter is not compatible with fun((Z) -> Z) with 0 type parameters
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:358:9
     │
@@ -805,12 +669,6 @@ Because in the expression's type:
   Context expects type: fun((dynamic()) -> dynamic()) with 0 type parameters
   The number of type parameters doesn't match.
 
------------------------------- Detailed message ------------------------------
-
-  fun((Z) -> Z) | fun((dynamic()) -> dynamic()) is not compatible with fun((dynamic()) -> dynamic())
-  because
-  fun((Z) -> Z) with 1 type parameter is not compatible with fun((dynamic()) -> dynamic()) with 0 type parameters
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:358:9
     │
@@ -829,12 +687,6 @@ Because in the expression's type:
   Context expects type: fun((Z) -> Z) with 0 type parameters
   The number of type parameters doesn't match.
 
------------------------------- Detailed message ------------------------------
-
-  fun((Z) -> Z) | fun((dynamic()) -> dynamic()) is not compatible with fun((Z) -> Z)
-  because
-  fun((Z) -> Z) with 1 type parameter is not compatible with fun((Z) -> Z) with 0 type parameters
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:432:18
     │
@@ -875,10 +727,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., ...}
   The type of the expression is missing the following required keys: a.
 
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:441:16
     │
@@ -895,10 +743,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., ...}
   The type of the expression is missing the following required keys: a.
 
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:446:15
     │
@@ -916,12 +760,6 @@ Because in the expression's type:
     Context expects type: T
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((#{a => number()}) -> number()) is not compatible with fun((#{{T} => T}) -> T)
-  because
-  number() is not compatible with T
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:446:15
     │
@@ -940,15 +778,6 @@ Because in the expression's type:
     The expected map has no default association while the type of the expression has one.
   ) -> number())
 
------------------------------- Detailed message ------------------------------
-
-  fun((#{a => number()}) -> number()) is not compatible with fun((#{{number()} => number()}) -> number())
-  because
-  #{{number()} => number()} is not compatible with #{a => number()}
-  because
-  #{{number()} => number()} is not compatible with #{a => number()}
-  the latter map has no default association while the first map has one
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:471:24
     │
@@ -966,12 +795,6 @@ Because in the expression's type:
     Context expects type: 'c'
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun(('a') -> 'b') is not compatible with fun(('a') -> 'c')
-  because
-  'b' is not compatible with 'c'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:478:17
     │
@@ -988,10 +811,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., ...}
   The type of the expression is missing the following required keys: a.
 
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:478:17
     │
@@ -1008,10 +827,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., ...}
   The type of the expression is missing the following required keys: a.
 
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:500:36
     │
@@ -1048,16 +863,6 @@ Because in the expression's type:
     ) -> 'ok')
   ) -> 'ok')
 
------------------------------- Detailed message ------------------------------
-
-  contravar(contravar('a' | 'b')) is not compatible with contravar(contravar('a'))
-  because
-  fun((contravar('a' | 'b')) -> 'ok') is not compatible with contravar(contravar('a'))
-  because
-  fun((contravar('a' | 'b')) -> 'ok') is not compatible with fun((contravar('a')) -> 'ok')
-  because
-  contravar('a') is not compatible with contravar('a' | 'b')
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:563:5
     │
@@ -1075,14 +880,6 @@ Because in the expression's type:
     Context expects type: 'a'
   ) -> 'a')
 
------------------------------- Detailed message ------------------------------
-
-  invar('a') is not compatible with fun((atom()) -> atom())
-  because
-  fun(('a') -> 'a') is not compatible with fun((atom()) -> atom())
-  because
-  atom() is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:569:5
     │
@@ -1100,16 +897,6 @@ Because in the expression's type:
     Context expects type: 'a'
   ) -> 'a')
 
------------------------------- Detailed message ------------------------------
-
-  invar('a') is not compatible with invar(atom())
-  because
-  fun(('a') -> 'a') is not compatible with invar(atom())
-  because
-  fun(('a') -> 'a') is not compatible with fun((atom()) -> atom())
-  because
-  atom() is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:585:5
     │
@@ -1125,12 +912,6 @@ Because in the expression's type:
   Here the type is:     'a'
   Context expects type: fun(('a') -> 'a')
 
------------------------------- Detailed message ------------------------------
-
-  'a' is not compatible with invar('a')
-  because
-  'a' is not compatible with fun(('a') -> 'a')
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ check/src/generic_fun_application.erl:625:1
     │
@@ -1175,10 +956,6 @@ Because in the expression's type:
   Context expects type: #{...}
   The expected map has no corresponding key for: extra.
 
------------------------------- Detailed message ------------------------------
-
-key `extra` is declared in the former but not in the latter and the latter map has no default association
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:721:25
     │
@@ -1205,14 +982,6 @@ Because in the expression's type:
     Differs from the expected type:  'a'
   ) -> 'a')
 
------------------------------- Detailed message ------------------------------
-
-  fun(('a') -> 'a') is not compatible with fun(('a' | 'b') -> 'a' | 'b')
-  because
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generic_fun_application.erl:752:32
     │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/generics_with_unions.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/generics_with_unions.pretty
index 53cd1350ec..9c03aa9a60 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/generics_with_unions.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/generics_with_unions.pretty
@@ -16,15 +16,6 @@ Because in the expression's type:
     Differs from the expected type:  T
   , T | U}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {T | U, T | U} is not compatible with {T, U}
-  because
-  T | U is not compatible with T
-  because
-  U is not compatible with T
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/generics_with_unions.erl:70:19
    │
@@ -62,12 +53,6 @@ Because in the expression's type:
   Here the type is:     [prop('a', number())]
   Context expects type: 'wrong_ret'
 
------------------------------- Detailed message ------------------------------
-
-  props('a', number()) is not compatible with 'wrong_ret'
-  because
-  [prop('a', number())] is not compatible with 'wrong_ret'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generics_with_unions.erl:217:19
     │
@@ -92,12 +77,6 @@ Because in the expression's type:
   However the following candidate: [T]
   Differs from the expected type:  T
 
------------------------------- Detailed message ------------------------------
-
-  [T] | T is not compatible with T
-  because
-  [T] is not compatible with T
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generics_with_unions.erl:221:17
     │
@@ -114,12 +93,6 @@ Because in the expression's type:
   However the following candidate: [T]
   Differs from the expected type:  T
 
------------------------------- Detailed message ------------------------------
-
-  T | [T] is not compatible with T
-  because
-  [T] is not compatible with T
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generics_with_unions.erl:222:19
     │
@@ -171,14 +144,6 @@ Because in the expression's type:
     Context expects type: K
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [K] | [[K]] is not compatible with [K]
-  because
-  [[K]] is not compatible with [K]
-  because
-  [K] is not compatible with K
-
 error: ambiguous_union (See https://fb.me/eqwalizer_errors#ambiguous_union)
     ┌─ check/src/generics_with_unions.erl:332:31
     │
@@ -205,17 +170,6 @@ Because in the expression's type:
     }
   ) -> 'ok')
 
------------------------------- Detailed message ------------------------------
-
-  query() is not compatible with fun(({'i', 'atom'}) -> 'ok')
-  because
-  fun(({'a', atom()} | {'b', binary()} | {'i', number()}) -> 'ok') is not compatible with fun(({'i', 'atom'}) -> 'ok')
-  because
-  {'i', 'atom'} is not compatible with {'a', atom()} | {'b', binary()} | {'i', number()}
-  because
-  at tuple index 2:
-  {'i', 'atom'} is not compatible with {'i', number()}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/generics_with_unions.erl:392:17
     │
@@ -235,15 +189,4 @@ Because in the expression's type:
     }
   ) -> 'ok')
 
------------------------------- Detailed message ------------------------------
-
-  query() is not compatible with fun(({'a', number()}) -> 'ok')
-  because
-  fun(({'a', atom()} | {'b', binary()} | {'i', number()}) -> 'ok') is not compatible with fun(({'a', number()}) -> 'ok')
-  because
-  {'a', number()} is not compatible with {'a', atom()} | {'b', binary()} | {'i', number()}
-  because
-  at tuple index 2:
-  {'a', number()} is not compatible with {'a', atom()}
-
 16 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_bounded.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_bounded.pretty
index bbd9109d68..1987f06692 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_bounded.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_bounded.pretty
@@ -14,12 +14,6 @@ Because in the expression's type:
   However the following candidate: 'b'
   Differs from the expected type:  'c'
 
------------------------------- Detailed message ------------------------------
-
-  dyn('a') | 'b' is not compatible with 'c'
-  because
-  'b' is not compatible with 'c'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/gradual_bounded.erl:25:26
    │
@@ -35,16 +29,6 @@ Because in the expression's type:
   Here the type is:     'a'
   Context expects type: 'b'
 
------------------------------- Detailed message ------------------------------
-
-  'a' is not compatible with dyn('b')
-  because
-  'a' is not compatible with dynamic('b')
-  because
-  'a' is not compatible with dynamic('b')
-  because
-  'a' is not compatible with 'b'
-
 error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
    ┌─ check/src/gradual_bounded.erl:44:27
    │
@@ -85,12 +69,6 @@ Because in the expression's type:
   However the following candidate: 'test'
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  'test' | number() is not compatible with number()
-  because
-  'test' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/gradual_bounded.erl:89:5
    │
@@ -107,10 +85,4 @@ Because in the expression's type:
   However the following candidate: 'test'
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  'test' | dyn(number()) is not compatible with number()
-  because
-  'test' is not compatible with number()
-
 8 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_complex_types.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_complex_types.pretty
index b7111f9239..a7a81c8fb4 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_complex_types.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_complex_types.pretty
@@ -13,12 +13,6 @@ Because in the expression's type:
   Here the type is:     'undefined'
   Context expects type: #{...}
 
------------------------------- Detailed message ------------------------------
-
-  'undefined' is not compatible with complex_map()
-  because
-  'undefined' is not compatible with #{id := number(), {secret, id} => number(), atom() => term()}
-
 error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
    ┌─ check/src/gradual_complex_types.erl:29:25
    │
@@ -46,12 +40,6 @@ Because in the expression's type:
   Here the type is:     #{...}
   Context expects type: [T]
 
------------------------------- Detailed message ------------------------------
-
-  complex_map() is not compatible with [T]
-  because
-  #{id := number(), {secret, id} => number(), atom() => term()} is not compatible with [T]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/gradual_complex_types.erl:48:16
    │
@@ -67,12 +55,6 @@ Because in the expression's type:
   Here the type is:     #{...}
   Context expects type: [dynamic()]
 
------------------------------- Detailed message ------------------------------
-
-  complex_map() is not compatible with [dynamic()]
-  because
-  #{id := number(), {secret, id} => number(), atom() => term()} is not compatible with [dynamic()]
-
 error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
    ┌─ check/src/gradual_complex_types.erl:55:25
    │
@@ -110,11 +92,4 @@ Because in the expression's type:
     Context expects type: number()
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {dyn_map(), 'ok'} is not compatible with {#{a => 'atom'}, number()}
-  because
-  'ok' is not compatible with number()
-
 9 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_custom.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_custom.pretty
index 34e16f1479..065a377d0d 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_custom.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_custom.pretty
@@ -100,12 +100,6 @@ Because in the expression's type:
   However the following candidate: 'a'
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  dynamic() | 'a' is not compatible with number()
-  because
-  'a' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/gradual_custom.erl:120:3
     │
@@ -202,12 +196,6 @@ Because in the expression's type:
   Context expects type: 'ok'
   No candidate of the expression's type matches the expected type.
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with 'ok'
-  because
-  string() | binary() is not compatible with 'ok'
-
 error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
     ┌─ check/src/gradual_custom.erl:210:25
     │
@@ -230,12 +218,6 @@ Because in the expression's type:
   Context expects type: 'ok'
   No candidate of the expression's type matches the expected type.
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with 'ok'
-  because
-  string() | binary() is not compatible with 'ok'
-
 error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
     ┌─ check/src/gradual_custom.erl:217:25
     │
@@ -258,12 +240,6 @@ Because in the expression's type:
   Context expects type: 'ok'
   No candidate of the expression's type matches the expected type.
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with 'ok'
-  because
-  string() | binary() is not compatible with 'ok'
-
 error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
     ┌─ check/src/gradual_custom.erl:224:25
     │
@@ -286,12 +262,6 @@ Because in the expression's type:
   Context expects type: 'ok'
   No candidate of the expression's type matches the expected type.
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with 'ok'
-  because
-  string() | binary() is not compatible with 'ok'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/gradual_custom.erl:245:19
     │
@@ -308,12 +278,6 @@ Because in the expression's type:
   However the following candidate: 'undefined'
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  number() | 'undefined' is not compatible with number()
-  because
-  'undefined' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/gradual_custom.erl:257:19
     │
@@ -330,12 +294,6 @@ Because in the expression's type:
   However the following candidate: atom()
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  number() | atom() | binary() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/gradual_custom.erl:263:19
     │
@@ -352,12 +310,6 @@ Because in the expression's type:
   However the following candidate: atom()
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  number() | dynamic() | number() | atom() | dynamic() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/gradual_custom.erl:269:19
     │
@@ -374,12 +326,6 @@ Because in the expression's type:
   However the following candidate: atom()
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  number() | dynamic() | atom() | dynamic() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
 error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
     ┌─ check/src/gradual_custom.erl:277:25
     │
@@ -402,12 +348,6 @@ Because in the expression's type:
   However the following candidate: {none()}
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  dynamic() | {none()} is not compatible with number()
-  because
-  {none()} is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/gradual_custom.erl:325:13
     │
@@ -424,14 +364,6 @@ Because in the expression's type:
   However the following candidate: 'undefined'
   Differs from the expected type:  'foo' | 'bar' | binary()
 
------------------------------- Detailed message ------------------------------
-
-  'bar' | 'undefined' | 'foo' is not compatible with 'foo' | 'bar' | binary()
-  because
-  'undefined' is not compatible with 'foo' | 'bar' | binary()
-  because
-  'undefined' is not compatible with 'foo'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/gradual_custom.erl:343:3
     │
@@ -448,10 +380,4 @@ Because in the expression's type:
   However the following candidate: 'bar'
   Differs from the expected type:  'foo'
 
------------------------------- Detailed message ------------------------------
-
-  'foo' | 'bar' is not compatible with 'foo'
-  because
-  'bar' is not compatible with 'foo'
-
 37 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_maybe.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_maybe.pretty
index 5587da0d7e..35a509f2f6 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_maybe.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_maybe.pretty
@@ -62,14 +62,6 @@ Because in the expression's type:
   However the following candidate: 'a'
   Differs from the expected type:  'b' | 'c'
 
------------------------------- Detailed message ------------------------------
-
-  'a' | 'b' | 'c' is not compatible with 'b' | 'c'
-  because
-  'a' is not compatible with 'b' | 'c'
-  because
-  'a' is not compatible with 'b'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/gradual_maybe.erl:147:14
     │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc.pretty
index 107e1b6e30..28618b5f77 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/gradual_misc.pretty
@@ -16,16 +16,6 @@ Because in the expression's type:
     Differs from the expected type:  'a'
   ) -> 'ok')
 
------------------------------- Detailed message ------------------------------
-
-  opaque:contravariant('a') is not compatible with opaque:contravariant('a' | 'b')
-  because
-  fun(('a') -> 'ok') is not compatible with opaque:contravariant('a' | 'b')
-  because
-  fun(('a') -> 'ok') is not compatible with fun(('a' | 'b') -> 'ok')
-  because
-  'a' | 'b' is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/gradual_misc.erl:38:5
    │
@@ -45,13 +35,8 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    ┌─ check/src/gradual_misc.erl:46:41
    │
 46 │ refine_tuple_neg(T) when is_tuple(T) -> T;
-   │                                         ^
-   │                                         │
-   │                                         T.
+   │                                         ^ T.
 Expression has type:   {'b', 'c'}
 Context expected type: 'a' | {none()}
-   │                                         
-
-expected union does not contain any tuple type of size 2
 
 4 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/guard_b_connections.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/guard_b_connections.pretty
index 88bcfb1267..74cd6b4ca4 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/guard_b_connections.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/guard_b_connections.pretty
@@ -14,14 +14,6 @@ Because in the expression's type:
   However the following candidate: #r2{}
   Differs from the expected type:  #r1{}
 
------------------------------- Detailed message ------------------------------
-
-  #r1{} | #r2{} is not compatible with r1()
-  because
-  #r1{} | #r2{} is not compatible with #r1{}
-  because
-  #r2{} is not compatible with #r1{}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/guard_b_connections.erl:27:3
    │
@@ -38,14 +30,6 @@ Because in the expression's type:
   However the following candidate: #r2{}
   Differs from the expected type:  #r1{}
 
------------------------------- Detailed message ------------------------------
-
-  #r1{} | #r2{} is not compatible with r1()
-  because
-  #r1{} | #r2{} is not compatible with #r1{}
-  because
-  #r2{} is not compatible with #r1{}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/guard_b_connections.erl:32:3
    │
@@ -62,14 +46,6 @@ Because in the expression's type:
   However the following candidate: #r2{}
   Differs from the expected type:  #r1{}
 
------------------------------- Detailed message ------------------------------
-
-  #r1{} | #r2{} is not compatible with r1()
-  because
-  #r1{} | #r2{} is not compatible with #r1{}
-  because
-  #r2{} is not compatible with #r1{}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/guard_b_connections.erl:38:3
    │
@@ -86,14 +62,6 @@ Because in the expression's type:
   However the following candidate: #r2{}
   Differs from the expected type:  #r1{}
 
------------------------------- Detailed message ------------------------------
-
-  #r1{} | #r2{} is not compatible with r1()
-  because
-  #r1{} | #r2{} is not compatible with #r1{}
-  because
-  #r2{} is not compatible with #r1{}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/guard_b_connections.erl:44:3
    │
@@ -110,12 +78,4 @@ Because in the expression's type:
   However the following candidate: #r2{}
   Differs from the expected type:  #r1{}
 
------------------------------- Detailed message ------------------------------
-
-  #r1{} | #r2{} is not compatible with r1()
-  because
-  #r1{} | #r2{} is not compatible with #r1{}
-  because
-  #r2{} is not compatible with #r1{}
-
 5 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/guards_logic.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/guards_logic.pretty
index c287958c68..bc1b2fff4a 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/guards_logic.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/guards_logic.pretty
@@ -30,14 +30,6 @@ Because in the expression's type:
   However the following candidate: pid()
   Differs from the expected type:  number() | atom()
 
------------------------------- Detailed message ------------------------------
-
-  number() | atom() | pid() is not compatible with number() | atom()
-  because
-  pid() is not compatible with number() | atom()
-  because
-  pid() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/guards_logic.erl:73:5
    │
@@ -55,13 +47,6 @@ Because in the expression's type:
     Context expects type: number()
   , term()}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {term(), term()} is not compatible with {number(), number()}
-  because
-  term() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/guards_logic.erl:101:46
     │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/hints.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/hints.pretty
index 2e9f03966d..f990884695 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/hints.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/hints.pretty
@@ -38,12 +38,6 @@ Because in the expression's type:
   However the following candidate: term()
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  term() | 'undefined' is not compatible with atom()
-  because
-  term() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/hints.erl:52:5
    │
@@ -60,12 +54,6 @@ Because in the expression's type:
   However the following candidate: term()
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  term() | 'undefined' is not compatible with atom()
-  because
-  term() is not compatible with atom()
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
    ┌─ check/src/hints.erl:55:1
    │  
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/iolists.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/iolists.pretty
index bf9d6e219b..00e34f9cb8 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/iolists.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/iolists.pretty
@@ -23,14 +23,6 @@ Because in the expression's type:
     Differs from the expected type:  binary()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [atom() | binary()] is not compatible with [binary()]
-  because
-  atom() | binary() is not compatible with binary()
-  because
-  atom() is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/iolists.erl:55:22
    │
@@ -49,14 +41,6 @@ Because in the expression's type:
     Differs from the expected type:  atom()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [atom() | binary()] is not compatible with [atom()]
-  because
-  atom() | binary() is not compatible with atom()
-  because
-  binary() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/iolists.erl:60:27
    │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests.pretty
index d0768e5669..4b2ec521dd 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/lists_tests.pretty
@@ -16,16 +16,6 @@ Because in the expression's type:
     Differs from the expected type:  atom()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [atom() | binary()] is not compatible with [atom()] | [binary()]
-  because
-  [atom() | binary()] is not compatible with [atom()]
-  because
-  atom() | binary() is not compatible with atom()
-  because
-  binary() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/lists_tests.erl:16:28
    │
@@ -44,14 +34,4 @@ Because in the expression's type:
     Differs from the expected type:  atom()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [atom() | binary()] is not compatible with [atom()] | [binary()]
-  because
-  [atom() | binary()] is not compatible with [atom()]
-  because
-  atom() | binary() is not compatible with atom()
-  because
-  binary() is not compatible with atom()
-
 2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/misc.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/misc.pretty
index 45a1d69e57..ec963a6249 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/misc.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/misc.pretty
@@ -127,12 +127,6 @@ Because in the expression's type:
     Context expects type: atom()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/misc.erl:116:21
     │
@@ -150,12 +144,6 @@ Because in the expression's type:
     Context expects type: atom()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/misc.erl:120:18
     │
@@ -207,12 +195,6 @@ Because in the expression's type:
     Context expects type: number()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [atom()] is not compatible with [number()]
-  because
-  atom() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/misc.erl:143:29
     │
@@ -323,31 +305,17 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     ┌─ check/src/misc.erl:352:22
     │
 352 │     catch test69_pos(atom).
-    │                      ^^^^
-    │                      │
-    │                      'atom'.
+    │                      ^^^^ 'atom'.
 Expression has type:   'atom'
 Context expected type: [atom()] | [number()]
-    │                      
-
-  'atom' is not compatible with [atom()] | [number()]
-  because
-  'atom' is not compatible with [atom()]
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/misc.erl:357:22
     │
 357 │     catch test69_pos(atom).
-    │                      ^^^^
-    │                      │
-    │                      'atom'.
+    │                      ^^^^ 'atom'.
 Expression has type:   'atom'
 Context expected type: [atom()] | [number()]
-    │                      
-
-  'atom' is not compatible with [atom()] | [number()]
-  because
-  'atom' is not compatible with [atom()]
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/misc.erl:404:11
@@ -393,17 +361,6 @@ Because in the expression's type:
     ]
   , [atom() | number()]}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {[number() | atom()], [atom() | number()]} is not compatible with {[atom()], [number()]}
-  because
-  [number() | atom()] is not compatible with [atom()]
-  because
-  number() | atom() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/misc.erl:461:5
     │
@@ -424,17 +381,6 @@ Because in the expression's type:
     ]
   , [atom() | number()]}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {[atom() | number()], [atom() | number()]} is not compatible with {[atom()] | [number()], [atom()] | [number()]}
-  because
-  [atom() | number()] is not compatible with [atom()] | [number()]
-  because
-  [atom() | number()] is not compatible with [atom()]
-  because
-  atom() | number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/misc.erl:465:12
     │
@@ -509,16 +455,6 @@ Because in the expression's type:
     Differs from the expected type:  atom() | number()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [atom() | binary()] is not compatible with [atom() | number()]
-  because
-  atom() | binary() is not compatible with atom() | number()
-  because
-  binary() is not compatible with atom() | number()
-  because
-  binary() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/misc.erl:575:14
     │
@@ -552,12 +488,6 @@ Because in the expression's type:
     Context expects type: [A]
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [A] is not compatible with [[A]]
-  because
-  A is not compatible with [A]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/misc.erl:611:21
     │
@@ -752,13 +682,6 @@ Because in the expression's type:
     Context expects type: 'ok'
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {none(), 'err'} is not compatible with {'ok', 'ok'}
-  because
-  'err' is not compatible with 'ok'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/misc.erl:741:5
     │
@@ -775,16 +698,6 @@ Because in the expression's type:
   However the following candidate: 'v2_op'
   Differs from the expected type:  'stuff1' | 'v0_op2' | 'stuff2' | 'v0_op1' | 'v1_op2' | ...
 
------------------------------- Detailed message ------------------------------
-
-  v2_op() is not compatible with v1_op()
-  because
-  'v2_op' | v1_op() is not compatible with v1_op()
-  because
-  'v2_op' | v1_op() is not compatible with 'v1_op1' | 'v1_op2' | stuff() | v0_op()
-  because
-  'v2_op' is not compatible with 'v1_op1' | 'v1_op2' | stuff() | v0_op()
-
 error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
     ┌─ check/src/misc.erl:760:1
     │
@@ -834,16 +747,6 @@ Because in the expression's type:
   Context expects type: #set{} | #{term() => []}
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-  misc:set() is not compatible with sets:set()
-  because
-  [] is not compatible with sets:set()
-  because
-  [] is not compatible with sets:set(term())
-  because
-  [] is not compatible with #set{} | #{term() => []}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/misc.erl:850:5
     │
@@ -861,13 +764,6 @@ Because in the expression's type:
     Context expects type: pid()
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 3:
-  {'ok', 'lists', number()} is not compatible with {'ok', atom(), pid()}
-  because
-  number() is not compatible with pid()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/misc.erl:860:5
     │
@@ -907,12 +803,6 @@ Because in the expression's type:
   Here the type is:     {binary()}
   Context expects type: [binary()]
 
------------------------------- Detailed message ------------------------------
-
-  {binary()} is not compatible with erlang:iovec()
-  because
-  {binary()} is not compatible with [binary()]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/misc.erl:949:15
     │
@@ -939,14 +829,6 @@ Because in the expression's type:
     No candidate of the expression's type matches the expected type.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  ['MM' | 'MS' | 'EE' | 'MA' | 'GE'] is not compatible with [erlang:priority_level()]
-  because
-  'MM' | 'MS' | 'EE' | 'MA' | 'GE' is not compatible with erlang:priority_level()
-  because
-  'MM' | 'MS' | 'EE' | 'MA' | 'GE' is not compatible with 'low' | 'normal' | 'high' | 'max'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/misc.erl:971:5
     │
@@ -962,12 +844,6 @@ Because in the expression's type:
   Here the type is:     {number(), number(), number()}
   Context expects type: atom()
 
------------------------------- Detailed message ------------------------------
-
-  erlang:timestamp() is not compatible with atom()
-  because
-  {number(), number(), number()} is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/misc.erl:987:12
     │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/neg.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/neg.pretty
index 55ce8bf6f5..585b5f8642 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/neg.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/neg.pretty
@@ -39,13 +39,6 @@ Because in the expression's type:
     Context expects type: atom()
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'ok', term()} is not compatible with {atom(), atom()}
-  because
-  term() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/neg.erl:27:21
    │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/numbers.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/numbers.pretty
index 8760657fa4..8c78c1ffbe 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/numbers.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/numbers.pretty
@@ -150,12 +150,6 @@ Because in the expression's type:
   However the following candidate: 'a'
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  'a' | number() is not compatible with number()
-  because
-  'a' is not compatible with number()
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ check/src/numbers.erl:538:1
     │  
@@ -300,13 +294,6 @@ Because in the expression's type:
     Context expects type: 'ok'
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 5:
-  {number(), number(), number(), number(), 'error'} is not compatible with {number(), number(), number(), number(), 'ok'}
-  because
-  'error' is not compatible with 'ok'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/numbers.erl:658:3
     │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/opaque.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/opaque.pretty
index 765efea8fe..5c207ff164 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/opaque.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/opaque.pretty
@@ -16,16 +16,6 @@ Because in the expression's type:
   Context expects type: #{...}
   The expected map has no corresponding key for: {ok, error}.
 
------------------------------- Detailed message ------------------------------
-
-  sets:set({'ok', 'error'}) is not compatible with sets:set({'ok', 'ok'})
-  because
-  #set{} | #{{ok, error} => []} is not compatible with sets:set({'ok', 'ok'})
-  because
-  #set{} | #{{ok, error} => []} is not compatible with #set{} | #{{ok, ok} => []}
-  because
-  #{{ok, error} => []} is not compatible with #set{} | #{{ok, ok} => []}
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
    ┌─ check/src/opaque.erl:29:1
    │
@@ -47,12 +37,6 @@ Because in the expression's type:
   Here the type is:     {'ok'}
   Context expects type: none()
 
------------------------------- Detailed message ------------------------------
-
-  misc:o() is not compatible with none()
-  because
-  {'ok'} is not compatible with none()
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
    ┌─ check/src/opaque.erl:86:1
    │  
@@ -93,14 +77,6 @@ Because in the expression's type:
   However the following candidate: 'a'
   Differs from the expected type:  {'ok'}
 
------------------------------- Detailed message ------------------------------
-
-  misc:o() | 'a' is not compatible with misc:o()
-  because
-  misc:o() | 'a' is not compatible with {'ok'}
-  because
-  'a' is not compatible with {'ok'}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/opaque.erl:135:18
     │
@@ -117,14 +93,6 @@ Because in the expression's type:
   However the following candidate: 'a'
   Differs from the expected type:  {'ok'}
 
------------------------------- Detailed message ------------------------------
-
-  misc:o() | 'a' is not compatible with misc:o()
-  because
-  misc:o() | 'a' is not compatible with {'ok'}
-  because
-  'a' is not compatible with {'ok'}
-
 error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
     ┌─ check/src/opaque.erl:150:1
     │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/other.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/other.pretty
index b75aabcf84..da1b4e48cb 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/other.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/other.pretty
@@ -13,12 +13,6 @@ Because in the expression's type:
   Here the type is:     term()
   Context expects type: #{...}
 
------------------------------- Detailed message ------------------------------
-
-  term() is not compatible with logger:metadata()
-  because
-  term() is not compatible with #{domain => [atom()], file => file:filename(), gl => pid(), line => number(), mfa => {atom(), atom(), number()}, pid => pid(), report_cb => logger:report_cb(), time => logger:timestamp(), atom() => term()}
-
 error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
    ┌─ check/src/other.erl:59:27
    │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/otp28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/otp28.pretty
index 026d55c435..5113f80c15 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/otp28.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/otp28.pretty
@@ -14,14 +14,6 @@ Because in the expression's type:
   Context expects type: 'ok' | 'error'
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-  'warning' is not compatible with foo()
-  because
-  'warning' is not compatible with 'ok' | 'error'
-  because
-  'warning' is not compatible with 'ok'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/otp28.erl:28:5
    │
@@ -39,12 +31,6 @@ Because in the expression's type:
     Context expects type: atom()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/otp28.erl:40:5
    │
@@ -62,12 +48,6 @@ Because in the expression's type:
     Context expects type: pid()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [binary()] is not compatible with [pid()]
-  because
-  binary() is not compatible with pid()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/otp28.erl:52:5
    │
@@ -95,15 +75,6 @@ Because in the expression's type:
     }
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [{atom(), binary()}] is not compatible with [{atom(), atom()}]
-  because
-  at tuple index 2:
-  {atom(), binary()} is not compatible with {atom(), atom()}
-  because
-  binary() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/otp28.erl:68:5
    │
@@ -121,13 +92,6 @@ Because in the expression's type:
     Context expects type: atom()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{atom() => binary()} is not compatible with #{atom() => atom()}
-  the default associations are not compatible
-  because
-  binary() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/otp28.erl:76:5
    │
@@ -147,13 +111,4 @@ Because in the expression's type:
     , atom()}
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [{atom(), binary(), binary(), atom()}] is not compatible with [{atom(), binary(), atom(), binary()}]
-  because
-  at tuple index 3:
-  {atom(), binary(), binary(), atom()} is not compatible with {atom(), binary(), atom(), binary()}
-  because
-  binary() is not compatible with atom()
-
 7 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/otp_opaques.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/otp_opaques.pretty
index b41039f95b..59bd5e6099 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/otp_opaques.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/otp_opaques.pretty
@@ -17,17 +17,6 @@ Because in the expression's type:
     , term(), term()}
   }
 
------------------------------- Detailed message ------------------------------
-
-  gb_sets:set(atom()) is not compatible with gb_sets:set(number())
-  because
-  {number(), gb_sets:gb_set_node(atom())} is not compatible with gb_sets:set(number())
-  because
-  at tuple index 2:
-  {number(), gb_sets:gb_set_node(atom())} is not compatible with {number(), gb_sets:gb_set_node(number())}
-  because
-  gb_sets:gb_set_node(atom()) is not compatible with gb_sets:gb_set_node(number())
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/otp_opaques.erl:42:5
    │
@@ -45,12 +34,6 @@ Because in the expression's type:
     Context expects type: A
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [[A]] is not compatible with [A]
-  because
-  [A] is not compatible with A
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/otp_opaques.erl:99:17
    │
@@ -67,14 +50,6 @@ Because in the expression's type:
   Context expects type: #set{} | #{a => []}
   No candidate of the expression's type matches the expected type.
 
------------------------------- Detailed message ------------------------------
-
-  maps:iterator('k', 'v') is not compatible with sets:set('a')
-  because
-  {'k', 'v', maps:iterator('k', 'v')} | 'none' | [number()] | [['k']] is not compatible with sets:set('a')
-  because
-  {'k', 'v', maps:iterator('k', 'v')} | 'none' | [number()] | [['k']] is not compatible with #set{} | #{a => []}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/otp_opaques.erl:102:13
     │
@@ -99,14 +74,6 @@ Because in the expression's type:
   Context expects type: #set{} | #{a => []}
   No candidate of the expression's type matches the expected type.
 
------------------------------- Detailed message ------------------------------
-
-  maps:iterator('k', 'v') is not compatible with sets:set('a')
-  because
-  {'k', 'v', maps:iterator('k', 'v')} | 'none' | [number()] | [['k']] is not compatible with sets:set('a')
-  because
-  {'k', 'v', maps:iterator('k', 'v')} | 'none' | [number()] | [['k']] is not compatible with #set{} | #{a => []}
-
 error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
     ┌─ check/src/otp_opaques.erl:124:5
     │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded.pretty
index 117ed8b349..aa87b295ad 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded.pretty
@@ -30,26 +30,13 @@ Because in the expression's type:
     Context expects type: 'b'
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun(('a') -> 'z') is not compatible with fun(('a') -> 'b') | fun(('a') -> 'c')
-  because
-  fun(('a') -> 'z') is not compatible with fun(('a') -> 'b')
-  because
-  'z' is not compatible with 'b'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/overloaded.erl:126:15
     │
 126 │     Res = bar({fun(a) -> a end}),
-    │               ^^^^^^^^^^^^^^^^^
-    │               │
-    │               {fun}.
+    │               ^^^^^^^^^^^^^^^^^ {fun}.
 Expression has type:   {fun((dynamic()) -> dynamic())}
 Context expected type: fun(('a') -> 'b') | fun(('a') -> 'c')
-    │               
-
-expected union does not contain any tuple type of size 1
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/overloaded.erl:198:37
@@ -107,12 +94,6 @@ Because in the expression's type:
   However the following candidate: {}
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  number() | {} is not compatible with number()
-  because
-  {} is not compatible with number()
-
 error: unbound_type_var (See https://fb.me/eqwalizer_errors#unbound_type_var)
     ┌─ check/src/overloaded.erl:261:1
     │
@@ -130,16 +111,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     ┌─ check/src/overloaded.erl:269:14
     │
 269 │     _ = swap(""),
-    │              ^^
-    │              │
-    │              string_lit.
+    │              ^^ string_lit.
 Expression has type:   []
 Context expected type: atom() | binary()
-    │              
-
-  [] is not compatible with atom() | binary()
-  because
-  [] is not compatible with atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/overloaded.erl:290:5
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded_specs_union.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded_specs_union.pretty
index 3483635724..6687ec3321 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded_specs_union.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/overloaded_specs_union.pretty
@@ -14,12 +14,6 @@ Because in the expression's type:
   However the following candidate: pid()
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  atom() | pid() is not compatible with atom()
-  because
-  pid() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/overloaded_specs_union.erl:19:29
    │
@@ -36,12 +30,4 @@ Because in the expression's type:
   However the following candidate: pid()
   Differs from the expected type:  atom() | binary()
 
------------------------------- Detailed message ------------------------------
-
-  atom() | binary() | pid() is not compatible with atom() | binary()
-  because
-  pid() is not compatible with atom() | binary()
-  because
-  pid() is not compatible with atom()
-
 2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/pats.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/pats.pretty
index d0d4f19c1a..171c12dc46 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/pats.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/pats.pretty
@@ -14,10 +14,4 @@ Because in the expression's type:
   However the following candidate: 'error'
   Differs from the expected type:  #{term() => term()}
 
------------------------------- Detailed message ------------------------------
-
-  #{a => 'ok'} | 'error' is not compatible with #{term() => term()}
-  because
-  'error' is not compatible with #{term() => term()}
-
 1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/records.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/records.pretty
index 5b6854f238..f59eda6cd2 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/records.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/records.pretty
@@ -18,16 +18,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
    ┌─ check/src/records.erl:50:21
    │
 50 │ mk_rec_neg(rec2) -> #rec2{}.
-   │                     ^^^^^^^
-   │                     │
-   │                     #rec2{...}.
+   │                     ^^^^^^^ #rec2{...}.
 Expression has type:   #rec2{}
 Context expected type: #rec1{} | #rec3{}
-   │                     
-
-  #rec2{} is not compatible with #rec1{} | #rec3{}
-  because
-  #rec2{} is not compatible with #rec1{}
 
 error: undefined_field (See https://fb.me/eqwalizer_errors#undefined_field)
    ┌─ check/src/records.erl:59:11
@@ -108,13 +101,6 @@ Because in the expression's type:
     Context expects type: number()
   , number()}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {atom(), number()} is not compatible with {number(), atom()}
-  because
-  atom() is not compatible with number()
-
 error: undefined_field (See https://fb.me/eqwalizer_errors#undefined_field)
     ┌─ check/src/records.erl:144:17
     │
@@ -181,14 +167,6 @@ Because in the expression's type:
     Context expects type: number()
   }
 
------------------------------- Detailed message ------------------------------
-
-  #any_box{inner :: 'ok'} is not compatible with int_box()
-  because
-  #any_box{inner :: 'ok'} is not compatible with #any_box{inner :: number()}
-  because
-  'ok' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:222:5
     │
@@ -206,12 +184,6 @@ Because in the expression's type:
     Context expects type: number()
   }
 
------------------------------- Detailed message ------------------------------
-
-  #any_box{inner :: 'ok'} is not compatible with #any_box{inner :: number()}
-  because
-  'ok' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:282:27
     │
@@ -228,12 +200,6 @@ Because in the expression's type:
   Context expects type: number() | 'false' | 'true'
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-  'a' is not compatible with number() | boolean()
-  because
-  'a' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:287:23
     │
@@ -250,12 +216,6 @@ Because in the expression's type:
   Context expects type: number() | 'false' | 'true'
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-  'a' is not compatible with number() | boolean()
-  because
-  'a' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:292:5
     │
@@ -273,14 +233,6 @@ Because in the expression's type:
     Context expects type: number()
   }
 
------------------------------- Detailed message ------------------------------
-
-  #int_bool_box{inner :: 'true'} is not compatible with only_int_box()
-  because
-  #int_bool_box{inner :: 'true'} is not compatible with #int_bool_box{inner :: number()}
-  because
-  'true' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:308:28
     │
@@ -297,12 +249,6 @@ Because in the expression's type:
   Context expects type: number() | 'false' | 'true'
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-  'a' is not compatible with number() | boolean()
-  because
-  'a' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:314:5
     │
@@ -320,14 +266,6 @@ Because in the expression's type:
     Context expects type: boolean()
   }
 
------------------------------- Detailed message ------------------------------
-
-  #int_bool_box{inner :: number()} is not compatible with only_bool_box()
-  because
-  #int_bool_box{inner :: number()} is not compatible with #int_bool_box{inner :: boolean()}
-  because
-  number() is not compatible with boolean()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:319:5
     │
@@ -343,12 +281,6 @@ Because in the expression's type:
   Here the type is:     #int_bool_box{inner :: number()}
   Context expects type: #any_box{}
 
------------------------------- Detailed message ------------------------------
-
-  only_int_box() is not compatible with #any_box{}
-  because
-  #int_bool_box{inner :: number()} is not compatible with #any_box{}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:319:5
     │
@@ -383,15 +315,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'int_bool_box', 'a'} is not compatible with {'int_bool_box', number() | boolean()}
-  because
-  'a' is not compatible with number() | boolean()
-  because
-  'a' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:334:5
     │
@@ -409,15 +332,6 @@ Because in the expression's type:
     Context expects type: number()
   }
 
------------------------------- Detailed message ------------------------------
-
-  {'int_bool_box', 'a'} is not compatible with only_int_box()
-  because
-  at tuple index 2:
-  {'int_bool_box', 'a'} is not compatible with {'int_bool_box', number()}
-  because
-  'a' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:352:5
     │
@@ -434,12 +348,6 @@ Because in the expression's type:
   However the following candidate: 'false'
   Differs from the expected type:  'true'
 
------------------------------- Detailed message ------------------------------
-
-  boolean() | 'true' is not compatible with 'true'
-  because
-  'false' is not compatible with 'true'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:355:13
     │
@@ -463,12 +371,6 @@ Because in the expression's type:
   Here the type is:     #bad_default{}
   Context expects type: #int_bool_box{inner :: number()}
 
------------------------------- Detailed message ------------------------------
-
-  #bad_default{} is not compatible with only_int_box()
-  because
-  #bad_default{} is not compatible with #int_bool_box{inner :: number()}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:372:5
     │
@@ -486,13 +388,6 @@ Because in the expression's type:
     Context expects type: 'bad_default'
   , number()}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {'int_bool_box', number()} is not compatible with {'bad_default', number()}
-  because
-  'int_bool_box' is not compatible with 'bad_default'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:388:31
     │
@@ -510,12 +405,6 @@ Because in the expression's type:
     Context expects type: number()
   }
 
------------------------------- Detailed message ------------------------------
-
-  #refined_two_fields{} is not compatible with #refined_two_fields{inner :: number()}
-  because
-  term() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/records.erl:402:5
     │
@@ -594,12 +483,6 @@ Because in the expression's type:
   However the following candidate: 'my_record'
   Differs from the expected type:  binary()
 
------------------------------- Detailed message ------------------------------
-
-  'my_record' | binary() is not compatible with binary()
-  because
-  'my_record' is not compatible with binary()
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ check/src/records.erl:517:1
     │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/recursive_aliases.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/recursive_aliases.pretty
index 215d6a54ae..ffd83bc179 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/recursive_aliases.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/recursive_aliases.pretty
@@ -17,16 +17,6 @@ Because in the expression's type:
     Context expects type: 'b'
   , chainA()}
 
------------------------------- Detailed message ------------------------------
-
-  chainA() is not compatible with chainB()
-  because
-  'nil' | {'a', chainA()} is not compatible with chainB()
-  because
-  'nil' | {'a', chainA()} is not compatible with 'nil' | {'b', chainB()}
-  because
-  {'a', chainA()} is not compatible with 'nil' | {'b', chainB()}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/recursive_aliases.erl:62:20
    │
@@ -46,16 +36,6 @@ Because in the expression's type:
     Context expects type: 'a'
   , chainB()}
 
------------------------------- Detailed message ------------------------------
-
-  chainB() is not compatible with chainA()
-  because
-  'nil' | {'b', chainB()} is not compatible with chainA()
-  because
-  'nil' | {'b', chainB()} is not compatible with 'nil' | {'a', chainA()}
-  because
-  {'b', chainB()} is not compatible with 'nil' | {'a', chainA()}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/recursive_aliases.erl:65:20
    │
@@ -75,16 +55,6 @@ Because in the expression's type:
     Context expects type: 'a'
   , chainAB()}
 
------------------------------- Detailed message ------------------------------
-
-  chainAB() is not compatible with chainA()
-  because
-  'nil' | {'a', chainAB()} | {'b', chainAB()} is not compatible with chainA()
-  because
-  'nil' | {'a', chainAB()} | {'b', chainAB()} is not compatible with 'nil' | {'a', chainA()}
-  because
-  {'b', chainAB()} is not compatible with 'nil' | {'a', chainA()}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/recursive_aliases.erl:68:20
    │
@@ -104,16 +74,6 @@ Because in the expression's type:
     Context expects type: 'b'
   , chainAB()}
 
------------------------------- Detailed message ------------------------------
-
-  chainAB() is not compatible with chainB()
-  because
-  'nil' | {'a', chainAB()} | {'b', chainAB()} is not compatible with chainB()
-  because
-  'nil' | {'a', chainAB()} | {'b', chainAB()} is not compatible with 'nil' | {'b', chainB()}
-  because
-  {'a', chainAB()} is not compatible with 'nil' | {'b', chainB()}
-
 error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
    ┌─ check/src/recursive_aliases.erl:70:1
    │
@@ -143,17 +103,6 @@ Because in the expression's type:
   However the following candidate: {'a', atom(), pchainA(atom())}
   Differs from the expected type:  'nil' | {'a', pchainAB(atom())} | {'b', pchainAB(atom())}
 
------------------------------- Detailed message ------------------------------
-
-  pchainA(atom()) is not compatible with pchainAB(atom())
-  because
-  'nil' | {'a', atom(), pchainA(atom())} is not compatible with pchainAB(atom())
-  because
-  'nil' | {'a', atom(), pchainA(atom())} is not compatible with 'nil' | {'a', pchainAB(atom())} | {'b', pchainAB(atom())}
-  because
-  {'a', atom(), pchainA(atom())} is not compatible with 'nil' | {'a', pchainAB(atom())} | {'b', pchainAB(atom())}
-  expected union does not contain any tuple type of size 3
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/recursive_aliases.erl:113:23
     │
@@ -172,16 +121,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., ...}
   The type of the expression is missing the following required keys: a.
 
------------------------------- Detailed message ------------------------------
-
-  mChainB() is not compatible with mChainA()
-  because
-  'nil' | #{b := mChainB()} is not compatible with mChainA()
-  because
-  'nil' | #{b := mChainB()} is not compatible with 'nil' | #{a := mChainA()}
-  because
-  #{b := mChainB()} is not compatible with 'nil' | #{a := mChainA()}
-
 error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
     ┌─ check/src/recursive_aliases.erl:138:15
     │
@@ -210,16 +149,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   , pchainA('a')}
 
------------------------------- Detailed message ------------------------------
-
-  pchainA('a') is not compatible with pchainA('b' | 'c')
-  because
-  'nil' | {'a', 'a', pchainA('a')} is not compatible with pchainA('b' | 'c')
-  because
-  'nil' | {'a', 'a', pchainA('a')} is not compatible with 'nil' | {'a', 'b' | 'c', pchainA('b' | 'c')}
-  because
-  {'a', 'a', pchainA('a')} is not compatible with 'nil' | {'a', 'b' | 'c', pchainA('b' | 'c')}
-
 error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
     ┌─ check/src/recursive_aliases.erl:202:1
     │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/refine.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/refine.pretty
index b443f787c6..711e1dc2e9 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/refine.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/refine.pretty
@@ -23,13 +23,6 @@ Because in the expression's type:
     Context expects type: none()
   , A}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {B, A} is not compatible with {none(), none()}
-  because
-  B is not compatible with none()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/refine.erl:22:15
    │
@@ -55,12 +48,6 @@ Because in the expression's type:
     Context expects type: none()
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((B | A) -> A) is not compatible with fun((A | B) -> none())
-  because
-  A is not compatible with none()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/refine.erl:34:16
    │
@@ -78,12 +65,6 @@ Because in the expression's type:
     Context expects type: none()
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom() | A) -> A) is not compatible with fun((A | atom()) -> none())
-  because
-  A is not compatible with none()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/refine.erl:84:27
    │
@@ -133,13 +114,6 @@ Because in the expression's type:
     Context expects type: none()
   , binary()}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {number(), binary()} is not compatible with {none(), none()}
-  because
-  number() is not compatible with none()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/refine.erl:126:32
     │
@@ -157,13 +131,6 @@ Because in the expression's type:
     Context expects type: none()
   , atom()}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {number(), atom()} is not compatible with {none(), none()}
-  because
-  number() is not compatible with none()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/refine.erl:139:28
     │
@@ -190,14 +157,6 @@ Because in the expression's type:
     Differs from the expected type:  'a'
   ]
 
------------------------------- Detailed message ------------------------------
-
-  ['a' | 'b'] is not compatible with ['a']
-  because
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/refine.erl:151:28
     │
@@ -224,14 +183,6 @@ Because in the expression's type:
     Differs from the expected type:  'a'
   ]
 
------------------------------- Detailed message ------------------------------
-
-  ['a' | 'b'] is not compatible with ['a']
-  because
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/refine.erl:166:5
     │
@@ -273,13 +224,6 @@ Because in the expression's type:
     Context expects type: 'not_my_rec'
   , number(), atom()}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {'my_rec', number(), atom()} is not compatible with {'not_my_rec', term(), term()}
-  because
-  'my_rec' is not compatible with 'not_my_rec'
-
 error: unknown_id (See https://fb.me/eqwalizer_errors#unknown_id)
     ┌─ check/src/refine.erl:199:10
     │
@@ -310,13 +254,6 @@ Because in the expression's type:
     Context expects type: number()
   , number()}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'my_rec', atom(), number()} is not compatible with {'my_rec', number(), atom()}
-  because
-  atom() is not compatible with number()
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ check/src/refine.erl:218:1
     │  
@@ -374,13 +311,6 @@ Because in the expression's type:
     Context expects type: number()
   , number()}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'my_rec', atom(), number()} is not compatible with {'my_rec', number(), atom()}
-  because
-  atom() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/refine.erl:250:26
     │
@@ -398,15 +328,6 @@ Because in the expression's type:
     Context expects type: number()
   , number()}
 
------------------------------- Detailed message ------------------------------
-
-  {'my_rec', atom(), number()} is not compatible with dynamic(#my_rec{})
-  because
-  at tuple index 2:
-  {'my_rec', atom(), number()} is not compatible with {'my_rec', number(), atom()}
-  because
-  atom() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/refine.erl:262:26
     │
@@ -424,13 +345,6 @@ Because in the expression's type:
     Context expects type: atom()
   , atom()}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'my_rec', number(), atom()} is not compatible with {'my_rec', atom(), number()}
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/refine.erl:262:26
     │
@@ -448,15 +362,6 @@ Because in the expression's type:
     Context expects type: atom()
   , atom()}
 
------------------------------- Detailed message ------------------------------
-
-  #my_rec{} is not compatible with dynamic({'my_rec', atom(), number()})
-  because
-  at tuple index 2:
-  {'my_rec', number(), atom()} is not compatible with {'my_rec', atom(), number()}
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/refine.erl:278:21
     │
@@ -474,13 +379,6 @@ Because in the expression's type:
     Context expects type: atom()
   , atom()}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'my_rec', number(), atom()} is not compatible with {'my_rec', atom(), atom()}
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/refine.erl:282:16
     │
@@ -497,12 +395,6 @@ Because in the expression's type:
   However the following candidate: atom()
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  atom() | number() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/refine.erl:286:13
     │
@@ -519,12 +411,6 @@ Because in the expression's type:
   However the following candidate: 'a'
   Differs from the expected type:  {'my_rec', term(), term()}
 
------------------------------- Detailed message ------------------------------
-
-  #my_rec{} | 'a' is not compatible with {'my_rec', term(), term()}
-  because
-  'a' is not compatible with {'my_rec', term(), term()}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/refine.erl:296:5
     │
@@ -541,12 +427,6 @@ Because in the expression's type:
   However the following candidate: 'undefined'
   Differs from the expected type:  binary()
 
------------------------------- Detailed message ------------------------------
-
-  'undefined' | binary() is not compatible with binary()
-  because
-  'undefined' is not compatible with binary()
-
 error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
     ┌─ check/src/refine.erl:378:27
     │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/strict_complex_types.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/strict_complex_types.pretty
index cc9f9d0634..8943deb90a 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/strict_complex_types.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/strict_complex_types.pretty
@@ -13,12 +13,6 @@ Because in the expression's type:
   Here the type is:     'undefined'
   Context expects type: #{...}
 
------------------------------- Detailed message ------------------------------
-
-  'undefined' is not compatible with complex_map()
-  because
-  'undefined' is not compatible with #{id := number(), {secret, id} => number(), atom() => term()}
-
 error: reveal_type (See https://fb.me/eqwalizer_errors#reveal_type)
    ┌─ check/src/strict_complex_types.erl:29:25
    │
@@ -46,12 +40,6 @@ Because in the expression's type:
   Here the type is:     #{...}
   Context expects type: [T]
 
------------------------------- Detailed message ------------------------------
-
-  complex_map() is not compatible with [T]
-  because
-  #{id := number(), {secret, id} => number(), atom() => term()} is not compatible with [T]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/strict_complex_types.erl:48:16
    │
@@ -67,10 +55,4 @@ Because in the expression's type:
   Here the type is:     #{...}
   Context expects type: [dynamic()]
 
------------------------------- Detailed message ------------------------------
-
-  complex_map() is not compatible with [dynamic()]
-  because
-  #{id := number(), {secret, id} => number(), atom() => term()} is not compatible with [dynamic()]
-
 5 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/subtype_neg.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/subtype_neg.pretty
index 1ee53764d2..4413a8fee8 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/subtype_neg.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/subtype_neg.pretty
@@ -31,12 +31,6 @@ Because in the expression's type:
     Context expects type: atom()
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> term()) is not compatible with fun((term()) -> atom())
-  because
-  term() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/subtype_neg.erl:27:11
    │
@@ -53,14 +47,6 @@ Because in the expression's type:
   However the following candidate: 'c'
   Differs from the expected type:  'a' | 'b'
 
------------------------------- Detailed message ------------------------------
-
-  'a' | 'b' | 'c' is not compatible with 'a' | 'b'
-  because
-  'c' is not compatible with 'a' | 'b'
-  because
-  'c' is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/subtype_neg.erl:30:11
    │
@@ -87,17 +73,6 @@ Because in the expression's type:
     Differs from the expected type:  'a'
   , 'a' | 'b'}
 
------------------------------- Detailed message ------------------------------
-
-  {'a' | 'b', 'a' | 'b'} is not compatible with {'a', 'b'} | {'b', 'a'}
-  because
-  at tuple index 1:
-  {'a' | 'b', 'a' | 'b'} is not compatible with {'a', 'b'}
-  because
-  'a' | 'b' is not compatible with 'a'
-  because
-  'b' is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/subtype_neg.erl:38:11
    │
@@ -116,17 +91,6 @@ Because in the expression's type:
     Differs from the expected type:  'a'
   , ab()}
 
------------------------------- Detailed message ------------------------------
-
-  pair_ab() is not compatible with pair_diff_elems()
-  because
-  {ab(), ab()} is not compatible with pair_diff_elems()
-  because
-  {ab(), ab()} is not compatible with {'a', 'b'} | {'b', 'a'}
-  because
-  at tuple index 1:
-  {ab(), ab()} is not compatible with {'a', 'b'}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/subtype_neg.erl:41:11
    │
@@ -151,10 +115,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., ...}
   The type of the expression is missing the following required keys: a.
 
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/subtype_neg.erl:52:13
    │
@@ -171,10 +131,6 @@ Because in the expression's type:
   Context expects type: #{...}
   The expected map has no corresponding key for: b.
 
------------------------------- Detailed message ------------------------------
-
-key `b` is declared in the former but not in the latter and the latter map has no default association
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/subtype_neg.erl:60:13
    │
@@ -191,10 +147,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., ...}
   The type of the expression is missing the following required keys: a.
 
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/subtype_neg.erl:64:13
    │
@@ -212,13 +164,6 @@ Because in the expression's type:
     Context expects type: atom()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{term() => number()} is not compatible with #{atom() => number()}
-  the default associations are not compatible
-  because
-  term() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/subtype_neg.erl:68:13
    │
@@ -236,13 +181,6 @@ Because in the expression's type:
     Context expects type: number()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{atom() => term()} is not compatible with #{atom() => number()}
-  the default associations are not compatible
-  because
-  term() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/subtype_neg.erl:72:13
    │
@@ -259,13 +197,6 @@ Because in the expression's type:
   Context expects type: #{...} (no default association)
   The expected map has no default association while the type of the expression has one.
 
------------------------------- Detailed message ------------------------------
-
-  #{atom() => term()} is not compatible with #{}
-  because
-  #{atom() => term()} is not compatible with #{}
-  the latter map has no default association while the first map has one
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/subtype_neg.erl:79:15
    │
@@ -291,13 +222,6 @@ Because in the expression's type:
     Context expects type: 'ok'
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {{}, 'error'} is not compatible with {tuple(), 'ok'}
-  because
-  'error' is not compatible with 'ok'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/subtype_neg.erl:87:5
    │
@@ -315,13 +239,6 @@ Because in the expression's type:
     Context expects type: 'ok'
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {[], 'error'} is not compatible with {[pid()], 'ok'}
-  because
-  'error' is not compatible with 'ok'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/subtype_neg.erl:91:5
    │
@@ -339,13 +256,6 @@ Because in the expression's type:
     Context expects type: 'ok'
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {[], 'error'} is not compatible with {iolist(), 'ok'}
-  because
-  'error' is not compatible with 'ok'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/subtype_neg.erl:94:13
    │
@@ -382,10 +292,4 @@ Because in the expression's type:
     Context expects type: none()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  ['a'] | [none()] is not compatible with []
-  because
-  ['a'] is not compatible with []
-
 20 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/t_maps.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/t_maps.pretty
index d0e08f9ac4..5c2b07ae96 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/t_maps.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/t_maps.pretty
@@ -15,13 +15,6 @@ Because in the expression's type:
     Context expects type: atom()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{number() => number()} is not compatible with #{number() => atom()}
-  the default associations are not compatible
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/t_maps.erl:41:5
    │
@@ -40,15 +33,6 @@ Because in the expression's type:
     Differs from the expected type:  atom()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{number() => 'zero' | number()} is not compatible with #{number() => atom()}
-  the default associations are not compatible
-  because
-  'zero' | number() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/t_maps.erl:56:5
    │
@@ -66,15 +50,6 @@ Because in the expression's type:
     Context expects type: number()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{one := 'one', zero := number()} is not compatible with #{one => number(), zero := number()}
-  because
-  at key `one`:
-  #{one := 'one', zero := number()} is not compatible with #{one => number(), zero := number()}
-  because
-  'one' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/t_maps.erl:80:5
    │
@@ -108,15 +83,6 @@ Because in the expression's type:
     Context expects type: n()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{b() => term()} is not compatible with #{n() => term()}
-  the default associations are not compatible
-  because
-  b() is not compatible with n()
-  because
-  boolean() is not compatible with n()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:140:26
     │
@@ -134,17 +100,6 @@ Because in the expression's type:
     Context expects type: n()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{a := b()} is not compatible with #{a := n()}
-  because
-  at key `a`:
-  #{a := b()} is not compatible with #{a := n()}
-  because
-  b() is not compatible with n()
-  because
-  boolean() is not compatible with n()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:145:26
     │
@@ -162,17 +117,6 @@ Because in the expression's type:
     Context expects type: n()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{a := b()} is not compatible with #{a => n()}
-  because
-  at key `a`:
-  #{a := b()} is not compatible with #{a => n()}
-  because
-  b() is not compatible with n()
-  because
-  boolean() is not compatible with n()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:155:26
     │
@@ -189,10 +133,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., ...}
   The type of the expression is missing the following required keys: a.
 
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ check/src/t_maps.erl:165:1
     │
@@ -216,17 +156,6 @@ Because in the expression's type:
     Context expects type: atom()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{a := a(), n() => a()} is not compatible with #{a() => a()}
-  the default associations are not compatible
-  because
-  n() is not compatible with a()
-  because
-  number() is not compatible with a()
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:208:5
     │
@@ -244,17 +173,6 @@ Because in the expression's type:
     Context expects type: number()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{a := a(), n() => a()} is not compatible with #{n() => a()}
-  because
-  #{a := a(), n() => a()} is not compatible with #{n() => a()}
-  key `a` is declared in the former but not in the latter and key `a` isn't compatible with the default association of the latter map
-  because
-  'a' is not compatible with n()
-  because
-  'a' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:216:5
     │
@@ -272,17 +190,6 @@ Because in the expression's type:
     Context expects type: number()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{a := a(), n() => a()} is not compatible with #{n() => a()}
-  because
-  #{a := a(), n() => a()} is not compatible with #{n() => a()}
-  key `a` is declared in the former but not in the latter and key `a` isn't compatible with the default association of the latter map
-  because
-  'a' is not compatible with n()
-  because
-  'a' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:224:5
     │
@@ -300,17 +207,6 @@ Because in the expression's type:
     Context expects type: number()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{a => a(), n() => a()} is not compatible with #{n() => a()}
-  because
-  #{a => a(), n() => a()} is not compatible with #{n() => a()}
-  key `a` is declared in the former but not in the latter and key `a` isn't compatible with the default association of the latter map
-  because
-  'a' is not compatible with n()
-  because
-  'a' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:242:5
     │
@@ -328,17 +224,6 @@ Because in the expression's type:
     Context expects type: F1
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{bar := B1, foo := F1} is not compatible with foo_bar(B1, F1)
-  because
-  #{bar := B1, foo := F1} is not compatible with #{bar := F1, foo := B1}
-  because
-  at key `bar`:
-  #{bar := B1, foo := F1} is not compatible with #{bar := F1, foo := B1}
-  because
-  B1 is not compatible with F1
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:254:5
     │
@@ -356,17 +241,6 @@ Because in the expression's type:
     Context expects type: F1
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{bar := B1, foo := F1} is not compatible with foo_bar_opt(B1, F1)
-  because
-  #{bar := B1, foo := F1} is not compatible with #{bar => F1, foo => B1}
-  because
-  at key `bar`:
-  #{bar := B1, foo := F1} is not compatible with #{bar => F1, foo => B1}
-  because
-  B1 is not compatible with F1
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:266:5
     │
@@ -385,17 +259,6 @@ Because in the expression's type:
     Differs from the expected type:  K1 | K2
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{K1 | V2 => V1 | K2} is not compatible with kv(K1 | K2, V1 | V2)
-  because
-  #{K1 | V2 => V1 | K2} is not compatible with #{K1 | K2 => V1 | V2}
-  the default associations are not compatible
-  because
-  K1 | V2 is not compatible with K1 | K2
-  because
-  V2 is not compatible with K1 | K2
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:283:19
     │
@@ -412,10 +275,6 @@ Because in the expression's type:
   Context expects type: #{...}
   The expected map has no corresponding key for: b.
 
------------------------------- Detailed message ------------------------------
-
-key `b` is declared in the former but not in the latter and the latter map has no default association
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:307:22
     │
@@ -433,17 +292,6 @@ Because in the expression's type:
     Context expects type: number()
   , n()}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {a(), n()} is not compatible with {n(), a()}
-  because
-  a() is not compatible with n()
-  because
-  atom() is not compatible with n()
-  because
-  atom() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:321:5
     │
@@ -461,17 +309,6 @@ Because in the expression's type:
     Context expects type: number()
   , n()}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {a(), n()} is not compatible with {n(), a()}
-  because
-  a() is not compatible with n()
-  because
-  atom() is not compatible with n()
-  because
-  atom() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:334:25
     │
@@ -489,13 +326,6 @@ Because in the expression's type:
     Context expects type: K
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{V => K} is not compatible with #{K => V}
-  the default associations are not compatible
-  because
-  V is not compatible with K
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:351:25
     │
@@ -515,17 +345,6 @@ Because in the expression's type:
     Context expects type: atom()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{a() => n()} | #{n() => a()} | #{id => 'id' | 'no_id'} is not compatible with #{a() | n() => a()}
-  because
-  #{a() => n()} is not compatible with #{a() | n() => a()}
-  the default associations are not compatible
-  because
-  n() is not compatible with a()
-  because
-  number() is not compatible with a()
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ check/src/t_maps.erl:356:1
     │
@@ -556,15 +375,6 @@ Because in the expression's type:
     No candidate of the expression's type matches the expected type.
   , a()}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {'a' | 'b', a()} is not compatible with {n(), a()}
-  because
-  'a' | 'b' is not compatible with n()
-  because
-  'a' | 'b' is not compatible with number()
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ check/src/t_maps.erl:429:1
     │
@@ -611,10 +421,6 @@ Because in the expression's type:
   Context expects type: #{n := ..., ...}
   The type of the expression is missing the following required keys: n.
 
------------------------------- Detailed message ------------------------------
-
-key `n` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:536:5
     │
@@ -633,17 +439,6 @@ Because in the expression's type:
     Differs from the expected type:  'b' | 'c'
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{a => 'b' | 'c' | 'a'} is not compatible with #{a => 'b' | 'c'}
-  because
-  at key `a`:
-  #{a => 'b' | 'c' | 'a'} is not compatible with #{a => 'b' | 'c'}
-  because
-  'b' | 'c' | 'a' is not compatible with 'b' | 'c'
-  because
-  'a' is not compatible with 'b' | 'c'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:571:5
     │
@@ -660,15 +455,6 @@ Because in the expression's type:
   Context expects type: #{item_v2 := ..., ...}
   The type of the expression is missing the following required keys: item_v2.
 
------------------------------- Detailed message ------------------------------
-
-  rec_shape() is not compatible with rec_shape_v2()
-  because
-  #{item := rec_shape() | 'undefined'} is not compatible with rec_shape_v2()
-  because
-  #{item := rec_shape() | 'undefined'} is not compatible with #{item_v2 := rec_shape_v2() | 'undefined'}
-  key `item_v2` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:629:5
     │
@@ -687,14 +473,6 @@ Because in the expression's type:
     Differs from the expected type:  'a' | #{item := 'a' | gen_shape('a')}
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  gen_shape('a' | 'b') is not compatible with 'a' | #{item := 'a' | #{item := 'a' | gen_shape('a')}}
-  because
-  #{item := 'a' | 'b' | gen_shape('a' | 'b')} is not compatible with 'a' | #{item := 'a' | #{item := 'a' | gen_shape('a')}}
-  because
-  #{item := 'a' | 'b' | gen_shape('a' | 'b')} is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:641:5
     │
@@ -711,15 +489,6 @@ Because in the expression's type:
   Context expects type: #{item := ..., ...}
   The type of the expression is missing the following required keys: item.
 
------------------------------- Detailed message ------------------------------
-
-  gen_shape_v2('a') is not compatible with gen_shape('a')
-  because
-  #{item_v2 := 'a' | gen_shape_v2('a')} is not compatible with gen_shape('a')
-  because
-  #{item_v2 := 'a' | gen_shape_v2('a')} is not compatible with #{item := 'a' | gen_shape('a')}
-  key `item` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:648:5
     │
@@ -736,10 +505,6 @@ Because in the expression's type:
   Context expects type: #{...}
   The expected map has no corresponding key for: d.
 
------------------------------- Detailed message ------------------------------
-
-key `d` is declared in the former but not in the latter and the latter map has no default association
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:661:5
     │
@@ -757,15 +522,6 @@ Because in the expression's type:
     Context expects type: 'ka'
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{a => 'va', b => 'vb', c => 'vc', d => 'vd', e => 've'} is not compatible with #{a => 'ka', b => 'kb', c => 'kc'}
-  because
-  at key `a`:
-  #{a => 'va', b => 'vb', c => 'vc', d => 'vd', e => 've'} is not compatible with #{a => 'ka', b => 'kb', c => 'kc'}
-  because
-  'va' is not compatible with 'ka'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:675:5
     │
@@ -782,10 +538,6 @@ Because in the expression's type:
   Context expects type: #{c := ..., ...}
   The type of the expression is missing the following required keys: c.
 
------------------------------- Detailed message ------------------------------
-
-key `c` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:682:5
     │
@@ -802,10 +554,6 @@ Because in the expression's type:
   Context expects type: #{b := ..., ...}
   The type of the expression is missing the following required keys: b.
 
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:689:5
     │
@@ -822,10 +570,6 @@ Because in the expression's type:
   Context expects type: #{b := ..., ...}
   The type of the expression is missing the following required keys: b.
 
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:710:5
     │
@@ -842,10 +586,6 @@ Because in the expression's type:
   Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}
   The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.
 
------------------------------- Detailed message ------------------------------
-
-keys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:732:27
     │
@@ -862,13 +602,6 @@ Because in the expression's type:
   Context expects type: #{...} (no default association)
   The expected map has no default association while the type of the expression has one.
 
------------------------------- Detailed message ------------------------------
-
-  #{'a' | 'b' => boolean()} is not compatible with #{a => 'true', b => boolean()}
-  key a is not present in the former map but is incompatible with its default association
-  because
-  boolean() is not compatible with 'true'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:737:27
     │
@@ -885,10 +618,6 @@ Because in the expression's type:
   Context expects type: #{b := ..., ...}
   The type of the expression is missing the following required keys: b.
 
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/t_maps.erl:742:27
     │
@@ -905,11 +634,4 @@ Because in the expression's type:
   Context expects type: #{...} (no default association)
   The expected map has no default association while the type of the expression has one.
 
------------------------------- Detailed message ------------------------------
-
-  #{'a' | 'b' => boolean()} is not compatible with #{a => boolean()}
-  because
-  #{'a' | 'b' => boolean()} is not compatible with #{a => boolean()}
-  the latter map has no default association while the first map has one
-
 44 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/tries.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/tries.pretty
index 471b5c8ebe..5f9c8914f4 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/tries.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/tries.pretty
@@ -22,12 +22,6 @@ Because in the expression's type:
   However the following candidate: []
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  [] | 'error' is not compatible with atom()
-  because
-  [] is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/tries.erl:75:16
    │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/tuple_union.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/tuple_union.pretty
index e02af30869..5b2cca1631 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/tuple_union.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/tuple_union.pretty
@@ -16,17 +16,6 @@ Because in the expression's type:
     Differs from the expected type:  'ok'
   , 'arg' | 'nil'}
 
------------------------------- Detailed message ------------------------------
-
-  t4() is not compatible with t5()
-  because
-  {'msg', 'ok' | 'err', 'arg' | 'nil'} is not compatible with t5()
-  because
-  {'msg', 'ok' | 'err', 'arg' | 'nil'} is not compatible with {'msg', 'ok', 'arg'} | {'msg', 'err', 'arg'} | {'msg', 'ok', 'nil'} | {'msg', 'err', 'nil'}
-  because
-  at tuple index 2:
-  {'msg', 'ok' | 'err', 'arg' | 'nil'} is not compatible with {'msg', 'ok', 'arg'}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/tuple_union.erl:66:26
    │
@@ -47,14 +36,4 @@ Because in the expression's type:
     No candidate of the expression's type matches the expected type.
   , tree2()}
 
------------------------------- Detailed message ------------------------------
-
-  tree3() is not compatible with tree1()
-  because
-  {'leaf', atom()} | {'b1' | 'b2' | 'b3', tree2()} is not compatible with tree1()
-  because
-  {'leaf', atom()} | {'b1' | 'b2' | 'b3', tree2()} is not compatible with {'leaf', atom()} | {'b1', tree1()} | {'b2', tree1()}
-  because
-  {'b1' | 'b2' | 'b3', tree2()} is not compatible with {'leaf', atom()} | {'b1', tree1()} | {'b2', tree1()}
-
 2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/type_asserts.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/type_asserts.pretty
index c5fb63ed41..069950f003 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/type_asserts.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/type_asserts.pretty
@@ -22,12 +22,6 @@ Because in the expression's type:
   However the following candidate: string()
   Differs from the expected type:  binary()
 
------------------------------- Detailed message ------------------------------
-
-  string() | binary() is not compatible with binary()
-  because
-  string() is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/type_asserts.erl:63:26
    │
@@ -63,17 +57,6 @@ Because in the expression's type:
     Context expects type: atom()
   , atom()}
 
------------------------------- Detailed message ------------------------------
-
-  'false' | {number(), atom()} is not compatible with 'false' | {atom(), number()}
-  because
-  {number(), atom()} is not compatible with 'false' | {atom(), number()}
-  because
-  at tuple index 1:
-  {number(), atom()} is not compatible with {atom(), number()}
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/type_asserts.erl:92:3
    │
@@ -91,13 +74,6 @@ Because in the expression's type:
     Context expects type: number()
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'false' | number(), term()} is not compatible with {'false' | number(), number()}
-  because
-  term() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/type_asserts.erl:105:39
     │
@@ -150,17 +126,6 @@ Because in the expression's type:
     The expected map has no corresponding key for: kb.
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} is not compatible with #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}}
-  because
-  #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} is not compatible with #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}}
-  the default associations are not compatible
-  because
-  #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'} is not compatible with #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}
-  because
-  #{ka := 'va', kb := 'vb', kc := 'vc'} is not compatible with #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/type_asserts.erl:129:9
     │
@@ -179,17 +144,6 @@ Because in the expression's type:
     The expected map has no corresponding key for: kb.
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} is not compatible with #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}}
-  because
-  #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} is not compatible with #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}}
-  the default associations are not compatible
-  because
-  #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'} is not compatible with #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}
-  because
-  #{ka := 'va', kb := 'vb', kc := 'vc'} is not compatible with #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/type_asserts.erl:132:9
     │
@@ -208,17 +162,6 @@ Because in the expression's type:
     The expected map has no corresponding key for: kb.
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} is not compatible with #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} | #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}}
-  because
-  #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'}} is not compatible with #{dynamic() => #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}}
-  the default associations are not compatible
-  because
-  #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kb := 'vb', kc := 'vc'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb', kc := 'vc'} | #{kb := 'vb'} is not compatible with #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}
-  because
-  #{ka := 'va', kb := 'vb', kc := 'vc'} is not compatible with #{kc := 'vc'} | #{ka := 'va'} | #{ka := 'va', kc := 'vc'} | #{ka := 'va', kb := 'vb'} | #{kb := 'vb'}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/type_asserts.erl:156:24
     │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_gradual.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_gradual.pretty
index d03afc8cf8..b0892292bd 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_gradual.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_gradual.pretty
@@ -15,11 +15,4 @@ Because in the expression's type:
     Context expects type: atom()
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {binary()} is not compatible with {atom()}
-  because
-  binary() is not compatible with atom()
-
 1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_strict.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_strict.pretty
index 12f1d81948..034dbd779d 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_strict.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/use_dynamic_strict.pretty
@@ -15,11 +15,4 @@ Because in the expression's type:
     Context expects type: atom()
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {binary()} is not compatible with {atom()}
-  because
-  binary() is not compatible with atom()
-
 1 ERROR
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater.pretty
index ab0cebee3f..3c6de10f94 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater.pretty
@@ -14,12 +14,6 @@ Because in the expression's type:
   However the following candidate: number()
   Differs from the expected type:  binary()
 
------------------------------- Detailed message ------------------------------
-
-  number() | binary() is not compatible with binary()
-  because
-  number() is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ eqwater/src/eqwater.erl:172:22
     │
@@ -36,12 +30,6 @@ Because in the expression's type:
   However the following candidate: number()
   Differs from the expected type:  binary()
 
------------------------------- Detailed message ------------------------------
-
-  number() | binary() is not compatible with binary()
-  because
-  number() is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ eqwater/src/eqwater.erl:183:7
     │
@@ -58,12 +46,6 @@ Because in the expression's type:
   However the following candidate: number()
   Differs from the expected type:  binary()
 
------------------------------- Detailed message ------------------------------
-
-  number() | binary() is not compatible with binary()
-  because
-  number() is not compatible with binary()
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ eqwater/src/eqwater.erl:228:1
     │
@@ -86,12 +68,6 @@ Because in the expression's type:
   However the following candidate: #ab_rec{}
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  #ab_rec{} | atom() is not compatible with atom()
-  because
-  #ab_rec{} is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ eqwater/src/eqwater.erl:356:16
     │
@@ -108,12 +84,6 @@ Because in the expression's type:
   However the following candidate: #ab_rec{}
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  #ab_rec{} | atom() is not compatible with atom()
-  because
-  #ab_rec{} is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ eqwater/src/eqwater.erl:404:25
     │
@@ -152,12 +122,6 @@ Because in the expression's type:
   However the following candidate: atom()
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  number() | atom() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ eqwater/src/eqwater.erl:419:1
     │  
@@ -182,12 +146,6 @@ Because in the expression's type:
   However the following candidate: atom()
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  number() | atom() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ eqwater/src/eqwater.erl:429:25
     │
@@ -204,12 +162,6 @@ Because in the expression's type:
   However the following candidate: atom()
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  number() | atom() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ eqwater/src/eqwater.erl:496:3
     │
@@ -235,13 +187,6 @@ Because in the expression's type:
     Context expects type: atom()
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {'union_field', binary()} is not compatible with {'union_field', atom()}
-  because
-  binary() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ eqwater/src/eqwater.erl:559:50
     │
@@ -258,12 +203,6 @@ Because in the expression's type:
   However the following candidate: 'ok'
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  number() | 'ok' is not compatible with number()
-  because
-  'ok' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ eqwater/src/eqwater.erl:590:8
     │
@@ -280,12 +219,6 @@ Because in the expression's type:
   However the following candidate: #c{}
   Differs from the expected type:  #b{}
 
------------------------------- Detailed message ------------------------------
-
-  #b{} | #c{} is not compatible with #b{}
-  because
-  #c{} is not compatible with #b{}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ eqwater/src/eqwater.erl:631:27
     │
@@ -302,12 +235,6 @@ Because in the expression's type:
   However the following candidate: A
   Differs from the expected type:  B
 
------------------------------- Detailed message ------------------------------
-
-  A | B is not compatible with B
-  because
-  A is not compatible with B
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ eqwater/src/eqwater.erl:649:17
     │
@@ -324,12 +251,6 @@ Because in the expression's type:
   However the following candidate: fun()
   Differs from the expected type:  {term()}
 
------------------------------- Detailed message ------------------------------
-
-  fun() | {term()} is not compatible with {term()}
-  because
-  fun() is not compatible with {term()}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ eqwater/src/eqwater.erl:660:17
     │
@@ -346,12 +267,6 @@ Because in the expression's type:
   However the following candidate: tuple()
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  tuple() | atom() is not compatible with atom()
-  because
-  tuple() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ eqwater/src/eqwater.erl:839:27
     │
@@ -368,12 +283,6 @@ Because in the expression's type:
   However the following candidate: atom()
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  number() | atom() is not compatible with number()
-  because
-  atom() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ eqwater/src/eqwater.erl:997:31
     │
@@ -412,12 +321,6 @@ Because in the expression's type:
   However the following candidate: 'undefined'
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  number() | 'undefined' is not compatible with number()
-  because
-  'undefined' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ eqwater/src/eqwater.erl:1122:14
      │
@@ -437,14 +340,6 @@ Because in the expression's type:
     Context expects type: atom()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [[atom()]] | [atom()] is not compatible with [atom()]
-  because
-  [[atom()]] is not compatible with [atom()]
-  because
-  [atom()] is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ eqwater/src/eqwater.erl:1131:15
      │
@@ -464,14 +359,6 @@ Because in the expression's type:
     Context expects type: atom()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [[atom()]] | [atom()] is not compatible with [atom()]
-  because
-  [[atom()]] is not compatible with [atom()]
-  because
-  [atom()] is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ eqwater/src/eqwater.erl:1155:7
      │
@@ -488,12 +375,6 @@ Because in the expression's type:
   However the following candidate: string()
   Differs from the expected type:  binary()
 
------------------------------- Detailed message ------------------------------
-
-  binary() | string() is not compatible with binary()
-  because
-  string() is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ eqwater/src/eqwater.erl:1181:7
      │
@@ -510,12 +391,6 @@ Because in the expression's type:
   However the following candidate: atom()
   Differs from the expected type:  binary()
 
------------------------------- Detailed message ------------------------------
-
-  binary() | atom() is not compatible with binary()
-  because
-  atom() is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ eqwater/src/eqwater.erl:1189:60
      │
@@ -532,12 +407,6 @@ Because in the expression's type:
   However the following candidate: 'ok'
   Differs from the expected type:  binary()
 
------------------------------- Detailed message ------------------------------
-
-  'ok' | binary() is not compatible with binary()
-  because
-  'ok' is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ eqwater/src/eqwater.erl:1194:30
      │
@@ -554,12 +423,6 @@ Because in the expression's type:
   However the following candidate: binary()
   Differs from the expected type:  'ok'
 
------------------------------- Detailed message ------------------------------
-
-  binary() | 'ok' is not compatible with 'ok'
-  because
-  binary() is not compatible with 'ok'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ eqwater/src/eqwater.erl:1225:14
      │
@@ -576,12 +439,6 @@ Because in the expression's type:
   However the following candidate: {term(), my_list()}
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  {term(), my_list()} | number() is not compatible with number()
-  because
-  {term(), my_list()} is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ eqwater/src/eqwater.erl:1231:31
      │
@@ -606,12 +463,6 @@ Because in the expression's type:
   However the following candidate: 'a'
   Differs from the expected type:  'b'
 
------------------------------- Detailed message ------------------------------
-
-  'a' | 'b' is not compatible with 'b'
-  because
-  'a' is not compatible with 'b'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ eqwater/src/eqwater.erl:1269:5
      │
@@ -624,16 +475,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      ┌─ eqwater/src/eqwater.erl:1286:60
      │
 1286 │ negate_atoms_neg(A) when not ((A == a) orelse (A == b)) -> A;
-     │                                                            ^
-     │                                                            │
-     │                                                            A.
+     │                                                            ^ A.
 Expression has type:   'c'
 Context expected type: 'a' | 'b'
-     │                                                            
-
-  'c' is not compatible with 'a' | 'b'
-  because
-  'c' is not compatible with 'a'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ eqwater/src/eqwater.erl:1291:43
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists.pretty
index c5cd5a3b25..bfb8103b16 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_lists.pretty
@@ -16,14 +16,6 @@ Because in the expression's type:
     Differs from the expected type:  binary()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [binary() | atom()] is not compatible with [binary()]
-  because
-  binary() | atom() is not compatible with binary()
-  because
-  atom() is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ eqwater/src/eqwater_lists.erl:48:23
    │
@@ -57,12 +49,6 @@ Because in the expression's type:
   However the following candidate: []
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  atom() | [] is not compatible with atom()
-  because
-  [] is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ eqwater/src/eqwater_lists.erl:61:19
    │
@@ -79,12 +65,6 @@ Because in the expression's type:
   However the following candidate: []
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  atom() | [] is not compatible with atom()
-  because
-  [] is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ eqwater/src/eqwater_lists.erl:69:19
    │
@@ -121,14 +101,6 @@ Because in the expression's type:
     Context expects type: binary()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [atom()] | [binary()] is not compatible with [binary()]
-  because
-  [atom()] is not compatible with [binary()]
-  because
-  atom() is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ eqwater/src/eqwater_lists.erl:97:23
    │
@@ -155,14 +127,4 @@ Because in the expression's type:
     Differs from the expected type:  atom()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [atom() | binary()] is not compatible with [atom()] | [binary()]
-  because
-  [atom() | binary()] is not compatible with [atom()]
-  because
-  atom() | binary() is not compatible with atom()
-  because
-  binary() is not compatible with atom()
-
 8 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps.pretty
index 847411f766..037e6b14a6 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps.pretty
@@ -14,10 +14,6 @@ Because in the expression's type:
   Context expects type: #{b := ..., ...}
   The type of the expression is missing the following required keys: b.
 
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ eqwater/src/eqwater_maps.erl:27:22
    │
@@ -34,10 +30,6 @@ Because in the expression's type:
   Context expects type: #{b := ..., ...}
   The type of the expression is missing the following required keys: b.
 
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ eqwater/src/eqwater_maps.erl:36:22
    │
@@ -54,12 +46,6 @@ Because in the expression's type:
   However the following candidate: #{}
   Differs from the expected type:  'ok'
 
------------------------------- Detailed message ------------------------------
-
-  #{} | 'ok' is not compatible with 'ok'
-  because
-  #{} is not compatible with 'ok'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ eqwater/src/eqwater_maps.erl:42:22
    │
@@ -76,10 +62,6 @@ Because in the expression's type:
   Context expects type: #{b := ..., ...}
   The type of the expression is missing the following required keys: b.
 
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ eqwater/src/eqwater_maps.erl:55:34
    │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_records.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_records.pretty
index 5a01001d2e..245813d1e8 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_records.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_records.pretty
@@ -14,14 +14,6 @@ Because in the expression's type:
   However the following candidate: #rec1{}
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  user() is not compatible with number()
-  because
-  #rec1{} | number() is not compatible with number()
-  because
-  #rec1{} is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ eqwater/src/eqwater_records.erl:40:16
    │
@@ -38,14 +30,6 @@ Because in the expression's type:
   However the following candidate: #rec1{}
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  user() is not compatible with number()
-  because
-  #rec1{} | number() is not compatible with number()
-  because
-  #rec1{} is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ eqwater/src/eqwater_records.erl:47:11
    │
@@ -62,14 +46,6 @@ Because in the expression's type:
   However the following candidate: #rec1{}
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  user() is not compatible with number()
-  because
-  #rec1{} | number() is not compatible with number()
-  because
-  #rec1{} is not compatible with number()
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ eqwater/src/eqwater_records.erl:104:1
     │  
@@ -96,15 +72,6 @@ Because in the expression's type:
     Context expects type: #rec1{}
   , #rec1{}}
 
------------------------------- Detailed message ------------------------------
-
-  {#rec1{}, #rec2{}} | {#rec2{}, #rec1{}} is not compatible with {#rec1{}, #rec2{}}
-  because
-  at tuple index 1:
-  {#rec2{}, #rec1{}} is not compatible with {#rec1{}, #rec2{}}
-  because
-  #rec2{} is not compatible with #rec1{}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ eqwater/src/eqwater_records.erl:115:25
     │
@@ -124,13 +91,4 @@ Because in the expression's type:
     Context expects type: #rec1{}
   , #rec1{}}
 
------------------------------- Detailed message ------------------------------
-
-  {#rec1{}, #rec2{}} | {#rec2{}, #rec1{}} is not compatible with {#rec1{}, #rec2{}}
-  because
-  at tuple index 1:
-  {#rec2{}, #rec1{}} is not compatible with {#rec1{}, #rec2{}}
-  because
-  #rec2{} is not compatible with #rec1{}
-
 6 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_sound.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_sound.pretty
index 4ee35cc78d..332e999cda 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_sound.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_sound.pretty
@@ -14,14 +14,6 @@ Because in the expression's type:
   However the following candidate: binary()
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  ab() is not compatible with atom()
-  because
-  atom() | binary() is not compatible with atom()
-  because
-  binary() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ eqwater/src/eqwater_sound.erl:50:14
    │
@@ -38,14 +30,6 @@ Because in the expression's type:
   However the following candidate: atom()
   Differs from the expected type:  binary()
 
------------------------------- Detailed message ------------------------------
-
-  ab() is not compatible with binary()
-  because
-  atom() | binary() is not compatible with binary()
-  because
-  atom() is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ eqwater/src/eqwater_sound.erl:53:28
    │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/unlimited_refinement.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/unlimited_refinement.pretty
index 8b70994f10..c0c48c5e3c 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/unlimited_refinement.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/unlimited_refinement.pretty
@@ -14,12 +14,6 @@ Because in the expression's type:
   However the following candidate: binary()
   Differs from the expected type:  number()
 
------------------------------- Detailed message ------------------------------
-
-  binary() | number() is not compatible with number()
-  because
-  binary() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ eqwater/src/unlimited_refinement.erl:94:14
    │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance.pretty b/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance.pretty
index 803ac23f35..554970c163 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/fault_tolerance/fault_tolerance.pretty
@@ -416,12 +416,6 @@ Because in the expression's type:
     Context expects type: atom()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with [atom()]
-  because
-  term() is not compatible with atom()
-
 error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
     ┌─ fault_tolerance/src/fault_tolerance.erl:169:8
     │
@@ -672,12 +666,6 @@ Because in the expression's type:
   However the following candidate: []
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  dynamic() | [] is not compatible with atom()
-  because
-  [] is not compatible with atom()
-
 error: expected_fun_type (See https://fb.me/eqwalizer_errors#expected_fun_type)
     ┌─ fault_tolerance/src/fault_tolerance.erl:254:11
     │
diff --git a/crates/elp/src/resources/test/standard/eqwalize_all_bail_on_error_failure.pretty b/crates/elp/src/resources/test/standard/eqwalize_all_bail_on_error_failure.pretty
index 08361b2a89..bfbe45f508 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_all_bail_on_error_failure.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_all_bail_on_error_failure.pretty
@@ -44,10 +44,6 @@ Because in the expression's type:
   Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}
   The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.
 
------------------------------- Detailed message ------------------------------
-
-keys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ app_a/src/app_a.erl:102:5
     │
@@ -68,17 +64,6 @@ Because in the expression's type:
     , ... }
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  at key `b`:
-  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ app_a/src/app_a.erl:125:5
     │
@@ -100,17 +85,6 @@ Because in the expression's type:
     , ... }
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  at key `b`:
-  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ app_a/test/app_a_SUITE.erl:18:5
    │
@@ -179,14 +153,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with [T | X]
-  because
-  term() is not compatible with T | X
-  because
-  term() is not compatible with T
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ app_a/src/app_a_lists.erl:1305:15
      │
@@ -204,12 +170,6 @@ Because in the expression's type:
     Context expects type: T
   ) -> boolean() | {'true', X})
 
------------------------------- Detailed message ------------------------------
-
-  fun((T) -> boolean() | {'true', X}) is not compatible with fun((term()) -> boolean() | {'true', term()})
-  because
-  term() is not compatible with T
-
 error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
    ┌─ app_a/src/app_a_mod2.erl:22:1
    │
diff --git a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.jsonl b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.jsonl
index 536452ef3a..8636389098 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.jsonl
+++ b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.jsonl
@@ -2,9 +2,9 @@
 {"path":"app_a/src/app_a.erl","line":14,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/src/app_a.erl","line":18,"char":13,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/src/app_a.erl","line":56,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: redundant_fixme","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nredundant fixme\n```\n\n> [docs on `redundant_fixme`](https://fb.me/eqwalizer_errors#redundant_fixme)","docPath":null}
-{"path":"app_a/src/app_a.erl","line":78,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}\nContext expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}\n```\n```\nBecause in the expression's type:\n  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}\n  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}\n  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.\n\n------------------------------ Detailed message ------------------------------\n\nkeys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
-{"path":"app_a/src/app_a.erl","line":102,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d => atom()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      Here the type is:     #{d => ..., ...}\n      Context expects type: #{d := ..., e := ..., ...}\n      The type of the expression is missing the following required keys: d, e.\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
-{"path":"app_a/src/app_a.erl","line":125,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      #{ d =>\n        Here the type is:     pid()\n        Context expects type: atom()\n      , ... }\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":78,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}\nContext expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}\n```\n```\nBecause in the expression's type:\n  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}\n  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}\n  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":102,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d => atom()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      Here the type is:     #{d => ..., ...}\n      Context expects type: #{d := ..., e := ..., ...}\n      The type of the expression is missing the following required keys: d, e.\n    , ... }\n  , ... }\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":125,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      #{ d =>\n        Here the type is:     pid()\n        Context expects type: atom()\n      , ... }\n    , ... }\n  , ... }\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/test/app_a_SUITE.erl","line":18,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"app_a_test_helpers:fail()","replacement":null,"description":"```lang=error,counterexample\n`app_a_test_helpers:fail()`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/src/app_a_errors_generated.erl","line":8,"char":10,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'wrong_ret'","replacement":null,"description":"```lang=error,counterexample\n`'wrong_ret'`.\n\nExpression has type:   'wrong_ret'\nContext expected type: 'foo'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/src/app_a_lists.erl","line":576,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"flatmap(thing_to_list/1, List)","replacement":null,"description":"```lang=error,counterexample\n`flatmap(thing_to_list/1, List)`.\n\nExpression has type:   [term()]\nContext expected type: string()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
@@ -12,8 +12,8 @@
 {"path":"app_a/src/app_a_lists.erl","line":595,"char":29,"code":"ELP","severity":"error","name":"eqWAlizer: recursive_constraint","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nRecursive constraint: DeepList\n```\n\n> [docs on `recursive_constraint`](https://fb.me/eqwalizer_errors#recursive_constraint)","docPath":null}
 {"path":"app_a/src/app_a_lists.erl","line":613,"char":29,"code":"ELP","severity":"error","name":"eqWAlizer: recursive_constraint","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nRecursive constraint: DeepList\n```\n\n> [docs on `recursive_constraint`](https://fb.me/eqwalizer_errors#recursive_constraint)","docPath":null}
 {"path":"app_a/src/app_a_lists.erl","line":1114,"char":36,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"H3","replacement":null,"description":"```lang=error,counterexample\n`H3`.\n\nExpression has type:   term()\nContext expected type: [term()]\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
-{"path":"app_a/src/app_a_lists.erl","line":1305,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"filtermap(F, L)","replacement":null,"description":"```lang=error,counterexample\n`filtermap(F, L)`.\n\nExpression has type:   [term()]\nContext expected type: [T | X]\n```\n```\nBecause in the expression's type:\n  [\n    Here the type is:     term()\n    Context expects type: T | X\n    No candidate matches in the expected union.\n  ]\n\n------------------------------ Detailed message ------------------------------\n\n  [term()] is not compatible with [T | X]\n  because\n  term() is not compatible with T | X\n  because\n  term() is not compatible with T\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
-{"path":"app_a/src/app_a_lists.erl","line":1305,"char":15,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"F","replacement":null,"description":"```lang=error,counterexample\n`F`.\n\nExpression has type:   fun((T) -> boolean() | {'true', X})\nContext expected type: fun((term()) -> boolean() | {'true', term()})\n```\n```\nBecause in the expression's type:\n  fun((\n    Here the type is:     term()\n    Context expects type: T\n  ) -> boolean() | {'true', X})\n\n------------------------------ Detailed message ------------------------------\n\n  fun((T) -> boolean() | {'true', X}) is not compatible with fun((term()) -> boolean() | {'true', term()})\n  because\n  term() is not compatible with T\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a_lists.erl","line":1305,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"filtermap(F, L)","replacement":null,"description":"```lang=error,counterexample\n`filtermap(F, L)`.\n\nExpression has type:   [term()]\nContext expected type: [T | X]\n```\n```\nBecause in the expression's type:\n  [\n    Here the type is:     term()\n    Context expects type: T | X\n    No candidate matches in the expected union.\n  ]\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a_lists.erl","line":1305,"char":15,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"F","replacement":null,"description":"```lang=error,counterexample\n`F`.\n\nExpression has type:   fun((T) -> boolean() | {'true', X})\nContext expected type: fun((term()) -> boolean() | {'true', term()})\n```\n```\nBecause in the expression's type:\n  fun((\n    Here the type is:     term()\n    Context expects type: T\n  ) -> boolean() | {'true', X})\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/src/app_a_mod2.erl","line":22,"char":1,"code":"ELP","severity":"error","name":"eqWAlizer: type_alias_is_non_productive","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nrecursive type invalid/0 is not productive\n```\n\n> [docs on `type_alias_is_non_productive`](https://fb.me/eqwalizer_errors#type_alias_is_non_productive)","docPath":null}
 {"path":"app_a/src/app_a_mod2.erl","line":31,"char":9,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/test/app_a_test_helpers.erl","line":6,"char":11,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'wrong_ret'","replacement":null,"description":"```lang=error,counterexample\n`'wrong_ret'`.\n\nExpression has type:   'wrong_ret'\nContext expected type: 'error'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
diff --git a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.pretty b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.pretty
index 08361b2a89..bfbe45f508 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.pretty
@@ -44,10 +44,6 @@ Because in the expression's type:
   Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}
   The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.
 
------------------------------- Detailed message ------------------------------
-
-keys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ app_a/src/app_a.erl:102:5
     │
@@ -68,17 +64,6 @@ Because in the expression's type:
     , ... }
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  at key `b`:
-  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ app_a/src/app_a.erl:125:5
     │
@@ -100,17 +85,6 @@ Because in the expression's type:
     , ... }
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  at key `b`:
-  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ app_a/test/app_a_SUITE.erl:18:5
    │
@@ -179,14 +153,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with [T | X]
-  because
-  term() is not compatible with T | X
-  because
-  term() is not compatible with T
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ app_a/src/app_a_lists.erl:1305:15
      │
@@ -204,12 +170,6 @@ Because in the expression's type:
     Context expects type: T
   ) -> boolean() | {'true', X})
 
------------------------------- Detailed message ------------------------------
-
-  fun((T) -> boolean() | {'true', X}) is not compatible with fun((term()) -> boolean() | {'true', term()})
-  because
-  term() is not compatible with T
-
 error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
    ┌─ app_a/src/app_a_mod2.erl:22:1
    │
diff --git a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics_gen.jsonl b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics_gen.jsonl
index 536452ef3a..8636389098 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics_gen.jsonl
+++ b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics_gen.jsonl
@@ -2,9 +2,9 @@
 {"path":"app_a/src/app_a.erl","line":14,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/src/app_a.erl","line":18,"char":13,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/src/app_a.erl","line":56,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: redundant_fixme","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nredundant fixme\n```\n\n> [docs on `redundant_fixme`](https://fb.me/eqwalizer_errors#redundant_fixme)","docPath":null}
-{"path":"app_a/src/app_a.erl","line":78,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}\nContext expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}\n```\n```\nBecause in the expression's type:\n  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}\n  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}\n  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.\n\n------------------------------ Detailed message ------------------------------\n\nkeys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
-{"path":"app_a/src/app_a.erl","line":102,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d => atom()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      Here the type is:     #{d => ..., ...}\n      Context expects type: #{d := ..., e := ..., ...}\n      The type of the expression is missing the following required keys: d, e.\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
-{"path":"app_a/src/app_a.erl","line":125,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      #{ d =>\n        Here the type is:     pid()\n        Context expects type: atom()\n      , ... }\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":78,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}\nContext expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}\n```\n```\nBecause in the expression's type:\n  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}\n  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}\n  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":102,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d => atom()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      Here the type is:     #{d => ..., ...}\n      Context expects type: #{d := ..., e := ..., ...}\n      The type of the expression is missing the following required keys: d, e.\n    , ... }\n  , ... }\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":125,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      #{ d =>\n        Here the type is:     pid()\n        Context expects type: atom()\n      , ... }\n    , ... }\n  , ... }\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/test/app_a_SUITE.erl","line":18,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"app_a_test_helpers:fail()","replacement":null,"description":"```lang=error,counterexample\n`app_a_test_helpers:fail()`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/src/app_a_errors_generated.erl","line":8,"char":10,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'wrong_ret'","replacement":null,"description":"```lang=error,counterexample\n`'wrong_ret'`.\n\nExpression has type:   'wrong_ret'\nContext expected type: 'foo'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/src/app_a_lists.erl","line":576,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"flatmap(thing_to_list/1, List)","replacement":null,"description":"```lang=error,counterexample\n`flatmap(thing_to_list/1, List)`.\n\nExpression has type:   [term()]\nContext expected type: string()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
@@ -12,8 +12,8 @@
 {"path":"app_a/src/app_a_lists.erl","line":595,"char":29,"code":"ELP","severity":"error","name":"eqWAlizer: recursive_constraint","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nRecursive constraint: DeepList\n```\n\n> [docs on `recursive_constraint`](https://fb.me/eqwalizer_errors#recursive_constraint)","docPath":null}
 {"path":"app_a/src/app_a_lists.erl","line":613,"char":29,"code":"ELP","severity":"error","name":"eqWAlizer: recursive_constraint","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nRecursive constraint: DeepList\n```\n\n> [docs on `recursive_constraint`](https://fb.me/eqwalizer_errors#recursive_constraint)","docPath":null}
 {"path":"app_a/src/app_a_lists.erl","line":1114,"char":36,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"H3","replacement":null,"description":"```lang=error,counterexample\n`H3`.\n\nExpression has type:   term()\nContext expected type: [term()]\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
-{"path":"app_a/src/app_a_lists.erl","line":1305,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"filtermap(F, L)","replacement":null,"description":"```lang=error,counterexample\n`filtermap(F, L)`.\n\nExpression has type:   [term()]\nContext expected type: [T | X]\n```\n```\nBecause in the expression's type:\n  [\n    Here the type is:     term()\n    Context expects type: T | X\n    No candidate matches in the expected union.\n  ]\n\n------------------------------ Detailed message ------------------------------\n\n  [term()] is not compatible with [T | X]\n  because\n  term() is not compatible with T | X\n  because\n  term() is not compatible with T\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
-{"path":"app_a/src/app_a_lists.erl","line":1305,"char":15,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"F","replacement":null,"description":"```lang=error,counterexample\n`F`.\n\nExpression has type:   fun((T) -> boolean() | {'true', X})\nContext expected type: fun((term()) -> boolean() | {'true', term()})\n```\n```\nBecause in the expression's type:\n  fun((\n    Here the type is:     term()\n    Context expects type: T\n  ) -> boolean() | {'true', X})\n\n------------------------------ Detailed message ------------------------------\n\n  fun((T) -> boolean() | {'true', X}) is not compatible with fun((term()) -> boolean() | {'true', term()})\n  because\n  term() is not compatible with T\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a_lists.erl","line":1305,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"filtermap(F, L)","replacement":null,"description":"```lang=error,counterexample\n`filtermap(F, L)`.\n\nExpression has type:   [term()]\nContext expected type: [T | X]\n```\n```\nBecause in the expression's type:\n  [\n    Here the type is:     term()\n    Context expects type: T | X\n    No candidate matches in the expected union.\n  ]\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a_lists.erl","line":1305,"char":15,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"F","replacement":null,"description":"```lang=error,counterexample\n`F`.\n\nExpression has type:   fun((T) -> boolean() | {'true', X})\nContext expected type: fun((term()) -> boolean() | {'true', term()})\n```\n```\nBecause in the expression's type:\n  fun((\n    Here the type is:     term()\n    Context expects type: T\n  ) -> boolean() | {'true', X})\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/src/app_a_mod2.erl","line":22,"char":1,"code":"ELP","severity":"error","name":"eqWAlizer: type_alias_is_non_productive","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nrecursive type invalid/0 is not productive\n```\n\n> [docs on `type_alias_is_non_productive`](https://fb.me/eqwalizer_errors#type_alias_is_non_productive)","docPath":null}
 {"path":"app_a/src/app_a_mod2.erl","line":31,"char":9,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/test/app_a_test_helpers.erl","line":6,"char":11,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'wrong_ret'","replacement":null,"description":"```lang=error,counterexample\n`'wrong_ret'`.\n\nExpression has type:   'wrong_ret'\nContext expected type: 'error'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
diff --git a/crates/elp/src/resources/test/standard/eqwalize_app_a.jsonl b/crates/elp/src/resources/test/standard/eqwalize_app_a.jsonl
index f56ea404dc..943c4a231d 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_app_a.jsonl
+++ b/crates/elp/src/resources/test/standard/eqwalize_app_a.jsonl
@@ -2,6 +2,6 @@
 {"path":"app_a/src/app_a.erl","line":14,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/src/app_a.erl","line":18,"char":13,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/src/app_a.erl","line":56,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: redundant_fixme","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nredundant fixme\n```\n\n> [docs on `redundant_fixme`](https://fb.me/eqwalizer_errors#redundant_fixme)","docPath":null}
-{"path":"app_a/src/app_a.erl","line":78,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}\nContext expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}\n```\n```\nBecause in the expression's type:\n  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}\n  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}\n  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.\n\n------------------------------ Detailed message ------------------------------\n\nkeys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
-{"path":"app_a/src/app_a.erl","line":102,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d => atom()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      Here the type is:     #{d => ..., ...}\n      Context expects type: #{d := ..., e := ..., ...}\n      The type of the expression is missing the following required keys: d, e.\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
-{"path":"app_a/src/app_a.erl","line":125,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      #{ d =>\n        Here the type is:     pid()\n        Context expects type: atom()\n      , ... }\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":78,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}\nContext expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}\n```\n```\nBecause in the expression's type:\n  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}\n  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}\n  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":102,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d => atom()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      Here the type is:     #{d => ..., ...}\n      Context expects type: #{d := ..., e := ..., ...}\n      The type of the expression is missing the following required keys: d, e.\n    , ... }\n  , ... }\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/src/app_a.erl","line":125,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"X","replacement":null,"description":"```lang=error,counterexample\n`X`.\n\nExpression has type:   id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n```\n```\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      #{ d =>\n        Here the type is:     pid()\n        Context expects type: atom()\n      , ... }\n    , ... }\n  , ... }\n```\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
diff --git a/crates/elp/src/resources/test/standard/eqwalize_app_a.pretty b/crates/elp/src/resources/test/standard/eqwalize_app_a.pretty
index 3cfdbd0dc2..f5f3065414 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_app_a.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_app_a.pretty
@@ -44,10 +44,6 @@ Because in the expression's type:
   Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}
   The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.
 
------------------------------- Detailed message ------------------------------
-
-keys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ app_a/src/app_a.erl:102:5
     │
@@ -68,17 +64,6 @@ Because in the expression's type:
     , ... }
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  at key `b`:
-  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ app_a/src/app_a.erl:125:5
     │
@@ -100,15 +85,4 @@ Because in the expression's type:
     , ... }
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  at key `b`:
-  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
-
 7 ERRORS
diff --git a/crates/elp/src/resources/test/standard/eqwalize_app_a_lists_fast.pretty b/crates/elp/src/resources/test/standard/eqwalize_app_a_lists_fast.pretty
index f61a47edfe..8c93bd01fe 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_app_a_lists_fast.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_app_a_lists_fast.pretty
@@ -50,14 +50,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with [T | X]
-  because
-  term() is not compatible with T | X
-  because
-  term() is not compatible with T
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ app_a/src/app_a_lists.erl:1305:15
      │
@@ -75,10 +67,4 @@ Because in the expression's type:
     Context expects type: T
   ) -> boolean() | {'true', X})
 
------------------------------- Detailed message ------------------------------
-
-  fun((T) -> boolean() | {'true', X}) is not compatible with fun((term()) -> boolean() | {'true', term()})
-  because
-  term() is not compatible with T
-
 7 ERRORS
diff --git a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics.pretty b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics.pretty
index 472665ffe8..482195c7ab 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics.pretty
@@ -44,10 +44,6 @@ Because in the expression's type:
   Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}
   The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.
 
------------------------------- Detailed message ------------------------------
-
-keys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ app_a/src/app_a.erl:102:5
     │
@@ -68,17 +64,6 @@ Because in the expression's type:
     , ... }
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  at key `b`:
-  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ app_a/src/app_a.erl:125:5
     │
@@ -100,17 +85,6 @@ Because in the expression's type:
     , ... }
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  at key `b`:
-  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
   ┌─ app_a/src/app_a_errors_generated.erl:8:10
   │
@@ -171,14 +145,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with [T | X]
-  because
-  term() is not compatible with T | X
-  because
-  term() is not compatible with T
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ app_a/src/app_a_lists.erl:1305:15
      │
@@ -196,12 +162,6 @@ Because in the expression's type:
     Context expects type: T
   ) -> boolean() | {'true', X})
 
------------------------------- Detailed message ------------------------------
-
-  fun((T) -> boolean() | {'true', X}) is not compatible with fun((term()) -> boolean() | {'true', term()})
-  because
-  term() is not compatible with T
-
 error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
    ┌─ app_a/src/app_a_mod2.erl:22:1
    │
diff --git a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen.pretty b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen.pretty
index 472665ffe8..482195c7ab 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen.pretty
@@ -44,10 +44,6 @@ Because in the expression's type:
   Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}
   The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.
 
------------------------------- Detailed message ------------------------------
-
-keys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ app_a/src/app_a.erl:102:5
     │
@@ -68,17 +64,6 @@ Because in the expression's type:
     , ... }
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  at key `b`:
-  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ app_a/src/app_a.erl:125:5
     │
@@ -100,17 +85,6 @@ Because in the expression's type:
     , ... }
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  at key `b`:
-  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
   ┌─ app_a/src/app_a_errors_generated.erl:8:10
   │
@@ -171,14 +145,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with [T | X]
-  because
-  term() is not compatible with T | X
-  because
-  term() is not compatible with T
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ app_a/src/app_a_lists.erl:1305:15
      │
@@ -196,12 +162,6 @@ Because in the expression's type:
     Context expects type: T
   ) -> boolean() | {'true', X})
 
------------------------------- Detailed message ------------------------------
-
-  fun((T) -> boolean() | {'true', X}) is not compatible with fun((term()) -> boolean() | {'true', term()})
-  because
-  term() is not compatible with T
-
 error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
    ┌─ app_a/src/app_a_mod2.erl:22:1
    │
diff --git a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen_rebar.pretty b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen_rebar.pretty
index 6782313a4a..67d78913b6 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen_rebar.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen_rebar.pretty
@@ -44,10 +44,6 @@ Because in the expression's type:
   Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}
   The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.
 
------------------------------- Detailed message ------------------------------
-
-keys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ app_a/src/app_a.erl:102:5
     │
@@ -68,17 +64,6 @@ Because in the expression's type:
     , ... }
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  at key `b`:
-  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ app_a/src/app_a.erl:125:5
     │
@@ -100,17 +85,6 @@ Because in the expression's type:
     , ... }
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  at key `b`:
-  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ app_a/test/app_a_SUITE.erl:18:5
    │
@@ -179,14 +153,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with [T | X]
-  because
-  term() is not compatible with T | X
-  because
-  term() is not compatible with T
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ app_a/src/app_a_lists.erl:1305:15
      │
@@ -204,12 +170,6 @@ Because in the expression's type:
     Context expects type: T
   ) -> boolean() | {'true', X})
 
------------------------------- Detailed message ------------------------------
-
-  fun((T) -> boolean() | {'true', X}) is not compatible with fun((term()) -> boolean() | {'true', term()})
-  because
-  term() is not compatible with T
-
 error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
    ┌─ app_a/src/app_a_mod2.erl:22:1
    │
diff --git a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_rebar.pretty b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_rebar.pretty
index 6782313a4a..67d78913b6 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_rebar.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_rebar.pretty
@@ -44,10 +44,6 @@ Because in the expression's type:
   Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}
   The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.
 
------------------------------- Detailed message ------------------------------
-
-keys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ app_a/src/app_a.erl:102:5
     │
@@ -68,17 +64,6 @@ Because in the expression's type:
     , ... }
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  at key `b`:
-  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ app_a/src/app_a.erl:125:5
     │
@@ -100,17 +85,6 @@ Because in the expression's type:
     , ... }
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  at key `b`:
-  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ app_a/test/app_a_SUITE.erl:18:5
    │
@@ -179,14 +153,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with [T | X]
-  because
-  term() is not compatible with T | X
-  because
-  term() is not compatible with T
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ app_a/src/app_a_lists.erl:1305:15
      │
@@ -204,12 +170,6 @@ Because in the expression's type:
     Context expects type: T
   ) -> boolean() | {'true', X})
 
------------------------------- Detailed message ------------------------------
-
-  fun((T) -> boolean() | {'true', X}) is not compatible with fun((term()) -> boolean() | {'true', term()})
-  because
-  term() is not compatible with T
-
 error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
    ┌─ app_a/src/app_a_mod2.erl:22:1
    │
diff --git a/crates/elp/src/resources/test/standard/eqwalize_target_diagnostics.pretty b/crates/elp/src/resources/test/standard/eqwalize_target_diagnostics.pretty
index 472665ffe8..482195c7ab 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_target_diagnostics.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_target_diagnostics.pretty
@@ -44,10 +44,6 @@ Because in the expression's type:
   Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}
   The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.
 
------------------------------- Detailed message ------------------------------
-
-keys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ app_a/src/app_a.erl:102:5
     │
@@ -68,17 +64,6 @@ Because in the expression's type:
     , ... }
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  at key `b`:
-  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ app_a/src/app_a.erl:125:5
     │
@@ -100,17 +85,6 @@ Because in the expression's type:
     , ... }
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  at key `b`:
-  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}
-  because
-  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
   ┌─ app_a/src/app_a_errors_generated.erl:8:10
   │
@@ -171,14 +145,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with [T | X]
-  because
-  term() is not compatible with T | X
-  because
-  term() is not compatible with T
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ app_a/src/app_a_lists.erl:1305:15
      │
@@ -196,12 +162,6 @@ Because in the expression's type:
     Context expects type: T
   ) -> boolean() | {'true', X})
 
------------------------------- Detailed message ------------------------------
-
-  fun((T) -> boolean() | {'true', X}) is not compatible with fun((term()) -> boolean() | {'true', term()})
-  because
-  term() is not compatible with T
-
 error: type_alias_is_non_productive (See https://fb.me/eqwalizer_errors#type_alias_is_non_productive)
    ┌─ app_a/src/app_a_mod2.erl:22:1
    │
diff --git a/crates/elp/tests/slow-tests/main.rs b/crates/elp/tests/slow-tests/main.rs
index 98455e8850..60167593fd 100644
--- a/crates/elp/tests/slow-tests/main.rs
+++ b/crates/elp/tests/slow-tests/main.rs
@@ -268,7 +268,7 @@ fn test_e2e_eqwalizer_module() {
                       "codeDescription": {
                         "href": "https://fb.me/eqwalizer_errors#incompatible_types"
                       },
-                      "message": "`X`.\nExpression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}\nContext expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}\n\nBecause in the expression's type:\n  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}\n  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}\n  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.\n\n------------------------------ Detailed message ------------------------------\n\nkeys `k_req1`, `k_req2`, `k_req3` are declared as required in the latter but not in the former\n        See https://fb.me/eqwalizer_errors#incompatible_types",
+                      "message": "`X`.\nExpression has type:   #{k_extra => term(), k_ok => term(), k_req1 => term(), k_req2 => term(), k_wrong1 => pid(), k_wrong2 => pid()}\nContext expected type: #{k_ok => term(), k_req1 := atom(), k_req2 := atom(), k_req3 := atom(), k_wrong1 => atom(), k_wrong2 => atom()}\n\nBecause in the expression's type:\n  Here the type is:     #{k_req2 => ..., k_req1 => ..., ...}\n  Context expects type: #{k_req3 := ..., k_req2 := ..., k_req1 := ..., ...}\n  The type of the expression is missing the following required keys: k_req3, k_req2, k_req1.\n        See https://fb.me/eqwalizer_errors#incompatible_types",
                       "range": {
                         "end": {
                           "character": 5,
@@ -287,7 +287,7 @@ fn test_e2e_eqwalizer_module() {
                       "codeDescription": {
                         "href": "https://fb.me/eqwalizer_errors#incompatible_types"
                       },
-                      "message": "`X`.\nExpression has type:   id(#{a := 'va', b := #{c := #{d => atom()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      Here the type is:     #{d => ..., ...}\n      Context expects type: #{d := ..., e := ..., ...}\n      The type of the expression is missing the following required keys: d, e.\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d => atom()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d => atom()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d => atom()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n        See https://fb.me/eqwalizer_errors#incompatible_types",
+                      "message": "`X`.\nExpression has type:   id(#{a := 'va', b := #{c := #{d => atom()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      Here the type is:     #{d => ..., ...}\n      Context expects type: #{d := ..., e := ..., ...}\n      The type of the expression is missing the following required keys: d, e.\n    , ... }\n  , ... }\n        See https://fb.me/eqwalizer_errors#incompatible_types",
                       "range": {
                         "end": {
                           "character": 5,
@@ -306,7 +306,7 @@ fn test_e2e_eqwalizer_module() {
                       "codeDescription": {
                         "href": "https://fb.me/eqwalizer_errors#incompatible_types"
                       },
-                      "message": "`X`.\nExpression has type:   id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      #{ d =>\n        Here the type is:     pid()\n        Context expects type: atom()\n      , ... }\n    , ... }\n  , ... }\n\n------------------------------ Detailed message ------------------------------\n\n  id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}}) is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  at key `b`:\n  #{a := 'va', b := #{c := #{d := pid(), e := pid()}}} is not compatible with #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n  because\n  #{c := #{d := pid(), e := pid()}} is not compatible with #{c := id(#{d := atom(), e := atom()})}\n        See https://fb.me/eqwalizer_errors#incompatible_types",
+                      "message": "`X`.\nExpression has type:   id(#{a := 'va', b := #{c := #{d := pid(), e := pid()}}})\nContext expected type: #{a := 'va', b := #{c := id(#{d := atom(), e := atom()})}}\n\nBecause in the expression's type:\n  #{ b =>\n    #{ c =>\n      #{ d =>\n        Here the type is:     pid()\n        Context expects type: atom()\n      , ... }\n    , ... }\n  , ... }\n        See https://fb.me/eqwalizer_errors#incompatible_types",
                       "range": {
                         "end": {
                           "character": 5,

From c404d942df248cd99cb2c2a8537c2f306006512f Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alan.zimm@gmail.com>
Date: Tue, 9 Dec 2025 07:58:59 -0800
Subject: [PATCH 332/394] Update emacs eglot instructions for semantic tokens
 (#138)

Summary: Pull Request resolved: https://github.com/whatsapp/erlang-language-platform/pull/138

Reviewed By: michalmuskala

Differential Revision: D88746400

Pulled By: alanz

fbshipit-source-id: 0bfda35e25ebf62b62ec7f8209d1787fdbb58e80
---
 website/docs/get-started/editors/emacs.md | 59 +++++++++++++++++++++++
 1 file changed, 59 insertions(+)

diff --git a/website/docs/get-started/editors/emacs.md b/website/docs/get-started/editors/emacs.md
index 28b1c63e24..072e6902da 100644
--- a/website/docs/get-started/editors/emacs.md
+++ b/website/docs/get-started/editors/emacs.md
@@ -18,6 +18,7 @@ installed with the `eglot` package.
 
 ```elisp
 (use-package eglot
+  :ensure t
   :hook ((erlang-mode . eglot-ensure))
 
   :config
@@ -34,6 +35,64 @@ Refer to the
 [manual](https://elpa.gnu.org/devel/doc/eglot.html#Customization-Variables) for
 additional configuration options.
 
+### Semantic tokens
+
+Semantic token support has been added to eglot, but is not yet in the
+released version. But it is possible to install the updated version
+of eglot.
+
+To do so, add
+
+```elisp
+(add-to-list 'package-archives '("gnu-devel" . "https://elpa.gnu.org/devel/"))
+```
+
+to your `init.el`, then run `M-x eglot-upgrade-eglot`
+
+Once upgraded, add the following to the `(use-package` entry for `eglot`
+
+```elisp
+  (setq eglot-semantic-token-modifiers '
+    ("bound" "exported_function" "exported_type" "deprecated_function" "type_dynamic"))
+
+  ;; Each face name arises as a template from the modifiers as
+  ;; "eglot-semantic-%s-face"
+  (defface eglot-semantic-bound-face
+    '((t :underline t))
+    "The face modification to use for bound variables in patterns."
+    :group 'eglot-semantic-semantic-tokens)
+
+  (defface eglot-semantic-exported_function-face
+    '((t :underline t))
+    "The face modification to use for exported functions."
+    :group 'eglot-semantic-semantic-tokens)
+
+  (defface eglot-semantic-exported_type-face
+    '((t :underline t))
+    "The face modification to use for exported types."
+    :group 'eglot-semantic-semantic-tokens)
+
+  (defface eglot-semantic-deprecated_function-face
+    '((t :strike-through t))
+    "The face modification to use for deprecated functions."
+    :group 'eglot-semantic-semantic-tokens)
+
+  (defface eglot-semantic-type_dynamic-face
+    '((t (:weight bold)))
+    "The face modification to use for dynamic types."
+    :group 'eglot-semantic-semantic-tokens)
+
+  ;; Bare eglot makes the refresh a no-op. Provide our own version for
+  ;; when Eqwalizer gets its results.
+  (cl-defmethod eglot-handle-request
+    (server (_method (eql workspace/semanticTokens/refresh)) &rest args)
+    "Handle workspace/semanticTokens/refresh by refreshing font-lock."
+    (dolist (buffer (eglot--managed-buffers server))
+      (eglot--when-live-buffer buffer
+        (eglot--widening (font-lock-flush)))))
+```
+
+
 ## lsp-mode
 
 Install the `lsp-mode` package, which is a generic Emacs client for LSP servers.

From debed39b4261b4d7380e3a32d8d9b4ecf2c59120 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 9 Dec 2025 08:47:59 -0800
Subject: [PATCH 333/394] streaming results for elp lint

Summary:
At the moment the `elp lint` command processes all the files, and then renders the diagnostics at the end.  This can be annoying if you are wanting to just check for occurrences of a diagnostic.

This diff changes the behaviour to stream the results instead as they arrive.
This behaviour is turned off if
- the new `--no-stream` argument is given
- `elp lint` emits json formatted diagnostics
- `elp lint` applies fixes

Reviewed By: TheGeorge

Differential Revision: D88010824

fbshipit-source-id: dc725c1d503f56da6bb1c392cd88f635832320dc
---
 crates/elp/src/bin/args.rs                    |   8 +
 crates/elp/src/bin/lint_cli.rs                | 531 ++++++++++++++----
 crates/elp/src/bin/main.rs                    | 139 ++++-
 .../resolves_generated_includes.stdout        |  17 +-
 .../diagnostics/lint_report_suppressed.stdout |   5 +-
 .../diagnostics/parse_elp_lint_fix.stdout     |   5 +-
 .../parse_elp_lint_recursive.stdout           |   7 +-
 .../test/hierarchical_config/basic.stdout     |  11 +-
 .../elp/src/resources/test/lint_help.stdout   |   3 +-
 .../linter/custom_function_matches.stdout     |   5 +-
 .../resources/test/linter/elp_lint_ct.stdout  |   5 +-
 .../test/linter/elp_lint_edoc.stdout          |   5 +-
 .../test/linter/parse_elp_lint2.stdout        |   5 +-
 .../linter/parse_elp_lint_adhoc_output.stdout |   7 +-
 .../test/linter/parse_elp_lint_app.stdout     |   5 +-
 .../parse_elp_lint_config_output.stdout       |  22 +-
 ...parse_elp_lint_custom_config_output.stdout |  14 +-
 .../parse_elp_lint_erlang_service.stdout      |   5 +-
 ...rse_elp_lint_explicit_enable_output.stdout |  31 +-
 .../linter/parse_elp_lint_fix_ignore.stdout   |   5 +-
 .../parse_elp_lint_fixme_spelling.stdout      |   5 +-
 .../test/linter/parse_elp_lint_ignore.stdout  |  15 +-
 .../linter/parse_elp_lint_ignore_apps.stdout  |   5 +-
 .../parse_elp_lint_ignore_apps_b.stdout       |   8 +-
 .../linter/parse_elp_lint_json_output.stdout  |   2 +-
 ...e_elp_no_lint_specified_json_output.stdout |  12 +-
 .../parse_elp_no_lint_specified_output.stdout |  43 +-
 .../resources/test/linter/ssr_ad_hoc.stdout   |   7 +-
 .../test/linter/warnings_as_errors.stdout     |  43 +-
 .../test/xref/unavailable_type.stdout         |   7 +-
 30 files changed, 663 insertions(+), 319 deletions(-)

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index f63d569b52..906ebf09f0 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -330,6 +330,9 @@ pub struct Lint {
     #[bpaf(long("report-system-stats"))]
     pub report_system_stats: bool,
 
+    /// Disable streaming of diagnostics when applying fixes (collect all before printing)
+    pub no_stream: bool,
+
     /// Rest of args are space separated list of apps to ignore
     #[bpaf(positional("IGNORED_APPS"))]
     pub ignore_apps: Vec<String>,
@@ -868,6 +871,11 @@ impl Lint {
     pub fn is_format_json(&self) -> bool {
         self.format == Some("json".to_string())
     }
+
+    /// To prevent flaky test results we allow disabling streaming when applying fixes
+    pub fn skip_stream_print(&self) -> bool {
+        self.apply_fix && self.no_stream
+    }
 }
 
 fn parse_macro_strategy(macro_strategy: &Option<String>) -> Result<MacroStrategy> {
diff --git a/crates/elp/src/bin/lint_cli.rs b/crates/elp/src/bin/lint_cli.rs
index 8450d7b28b..f7ac4ff114 100644
--- a/crates/elp/src/bin/lint_cli.rs
+++ b/crates/elp/src/bin/lint_cli.rs
@@ -15,10 +15,12 @@ use std::io::Write;
 use std::path::Path;
 use std::str;
 use std::sync::Arc;
+use std::thread;
 use std::time::SystemTime;
 
 use anyhow::Result;
 use anyhow::bail;
+use crossbeam_channel::unbounded;
 use elp::build::load;
 use elp::build::types::LoadResult;
 use elp::cli::Cli;
@@ -61,7 +63,6 @@ use fxhash::FxHashMap;
 use fxhash::FxHashSet;
 use hir::FormIdx;
 use hir::InFile;
-use indicatif::ParallelProgressIterator;
 use itertools::Itertools;
 use paths::Utf8PathBuf;
 use rayon::prelude::ParallelBridge;
@@ -131,47 +132,101 @@ pub fn load_project(
     )
 }
 
-fn do_parse_all(
-    cli: &dyn Cli,
+fn do_diagnostics_all(
+    cli: &mut dyn Cli,
     analysis: &Analysis,
     project_id: &ProjectId,
     config: &DiagnosticsConfig,
     args: &Lint,
-) -> Result<Vec<(String, FileId, DiagnosticCollection)>> {
+    loaded: &LoadResult,
+    module: &Option<String>,
+) -> Result<(Vec<(String, FileId, DiagnosticCollection)>, bool, bool)> {
     let module_index = analysis.module_index(*project_id).unwrap();
-    let module_iter = module_index.iter_own();
 
     let ignored_apps: FxHashSet<Option<Option<AppName>>> = args
         .ignore_apps
         .iter()
         .map(|name| Some(Some(AppName(name.to_string()))))
         .collect();
-    let pb = cli.progress(module_iter.len() as u64, "Parsing modules");
     let app_name = args.app.as_ref().map(|name| AppName(name.to_string()));
 
-    Ok(module_iter
-        .par_bridge()
-        .progress_with(pb)
-        .map_with(
-            analysis.clone(),
-            |db, (module_name, _file_source, file_id)| {
-                if !otp_file_to_ignore(db, file_id)
-                    && db.file_app_type(file_id).ok() != Some(Some(AppType::Dep))
-                    && !ignored_apps.contains(&db.file_app_name(file_id).ok())
-                    && (app_name.is_none()
-                        || db.file_app_name(file_id).ok().as_ref() == Some(&app_name))
-                {
-                    do_parse_one(db, config, file_id, module_name.as_str(), args).unwrap()
-                } else {
-                    None
-                }
-            },
-        )
-        .flatten()
-        .collect())
+    // Create a channel for streaming results
+    let (tx, rx) = unbounded();
+
+    // Collect modules into an owned vector
+    let modules: Vec<_> = module_index
+        .iter_own()
+        .map(|(name, source, file_id)| (name.as_str().to_string(), source, file_id))
+        .collect();
+
+    let analysis_clone = analysis.clone();
+    let config_clone = config.clone();
+    let args_clone = args.clone();
+
+    let join_handle = thread::spawn(move || {
+        modules
+            .into_iter()
+            .par_bridge()
+            .map_with(
+                (analysis_clone, tx),
+                |(db, tx), (module_name, _file_source, file_id)| {
+                    if !otp_file_to_ignore(db, file_id)
+                        && db.file_app_type(file_id).ok() != Some(Some(AppType::Dep))
+                        && !ignored_apps.contains(&db.file_app_name(file_id).ok())
+                        && (app_name.is_none()
+                            || db.file_app_name(file_id).ok().as_ref() == Some(&app_name))
+                        && let Ok(Some(result)) = do_diagnostics_one(
+                            db,
+                            &config_clone,
+                            file_id,
+                            &module_name,
+                            &args_clone,
+                        )
+                    {
+                        // Send result through channel
+                        let _ = tx.send(result);
+                    }
+                },
+            )
+            .for_each(|_| {}); // Consume the iterator
+    });
+
+    // Collect results as they arrive from the channel
+    let mut results = Vec::new();
+    let mut err_in_diag = false;
+    let mut module_count = 0;
+    let mut any_diagnostics_printed = false;
+
+    for result in rx {
+        let printed = if args.skip_stream_print() {
+            false
+        } else {
+            print_diagnostic_result(
+                cli,
+                analysis,
+                config,
+                args,
+                loaded,
+                module,
+                &mut err_in_diag,
+                &mut module_count,
+                &result,
+            )?
+        };
+        any_diagnostics_printed = any_diagnostics_printed || printed;
+        results.push(result);
+    }
+
+    // Wait for the thread to complete before returning
+    // This ensures that analysis_clone is dropped and its read lock is released
+    join_handle
+        .join()
+        .expect("Failed to join diagnostics thread");
+
+    Ok((results, err_in_diag, any_diagnostics_printed))
 }
 
-fn do_parse_one(
+fn do_diagnostics_one(
     db: &Analysis,
     config: &DiagnosticsConfig,
     file_id: FileId,
@@ -238,7 +293,9 @@ pub fn do_codemod(
 ) -> Result<()> {
     // Declare outside the block so it has the right lifetime for filter_diagnostics
     let res;
-    let mut initial_diags = {
+    let streamed_err_in_diag;
+    let mut any_diagnostics_printed = false;
+    let initial_diags = {
         // We put this in its own block so that analysis is
         // freed before we apply lints. To apply lints
         // recursively, we need to update the underlying
@@ -278,7 +335,18 @@ pub fn do_codemod(
 
         res = match (file_id, name) {
             (None, _) => {
-                do_parse_all(cli, &analysis, &loaded.project_id, diagnostics_config, args)?
+                let (results, err_in_diag, any_printed) = do_diagnostics_all(
+                    cli,
+                    &analysis,
+                    &loaded.project_id,
+                    diagnostics_config,
+                    args,
+                    loaded,
+                    &args.module,
+                )?;
+                streamed_err_in_diag = err_in_diag;
+                any_diagnostics_printed = any_printed;
+                results
             }
             (Some(file_id), Some(name)) => {
                 if let Some(app) = &args.app
@@ -287,87 +355,100 @@ pub fn do_codemod(
                 {
                     panic!("Module {} does not belong to app {}", name.as_str(), app)
                 }
-                do_parse_one(&analysis, diagnostics_config, file_id, &name, args)?
-                    .map_or(vec![], |x| vec![x])
+                let result =
+                    do_diagnostics_one(&analysis, diagnostics_config, file_id, &name, args)?
+                        .map_or(vec![], |x| vec![x]);
+
+                // Print diagnostics for the single file
+                let mut err_in_diag = false;
+                let mut module_count = 0;
+                if args.skip_stream_print() {
+                    any_diagnostics_printed = false;
+                } else {
+                    for r in &result {
+                        let printed = print_diagnostic_result(
+                            cli,
+                            &analysis,
+                            diagnostics_config,
+                            args,
+                            loaded,
+                            &args.module,
+                            &mut err_in_diag,
+                            &mut module_count,
+                            r,
+                        )?;
+                        any_diagnostics_printed = any_diagnostics_printed || printed;
+                    }
+                }
+
+                streamed_err_in_diag = err_in_diag;
+                result
             }
             (Some(file_id), _) => {
                 panic!("Could not get name from file_id for {file_id:?}")
             }
         };
 
-        filter_diagnostics(
-            &analysis,
-            &args.module,
-            Some(&diagnostics_config.enabled),
-            &res,
-            &FxHashSet::default(),
-        )?
+        res
     };
-    if initial_diags.is_empty() {
+    let mut err_in_diag = streamed_err_in_diag;
+    // At this point, the analysis variable from above is dropped
+
+    // Print "No diagnostics reported" if no diagnostics were found after filtering
+    if !any_diagnostics_printed {
         if args.is_format_normal() {
             writeln!(cli, "No diagnostics reported")?;
         }
     } else {
-        initial_diags.sort_by(|(a, _, _), (b, _, _)| a.cmp(b));
-        let mut err_in_diag = false;
-        if args.is_format_json() {
-            for (_name, file_id, diags) in &initial_diags {
-                if args.print_diags {
-                    for diag in diags {
-                        // We use JSON output for CI, and want to see warnings too.
-                        // So do not filter on errors only
-                        err_in_diag = true;
-                        let vfs_path = loaded.vfs.file_path(*file_id);
-                        let analysis = loaded.analysis();
-                        let root_path = &analysis
-                            .project_data(*file_id)
-                            .unwrap_or_else(|_err| panic!("could not find project data"))
-                            .unwrap_or_else(|| panic!("could not find project data"))
-                            .root_dir;
-                        let relative_path = reporting::get_relative_path(root_path, vfs_path);
-                        print_diagnostic_json(
-                            diag,
-                            &analysis,
-                            *file_id,
-                            relative_path,
-                            args.use_cli_severity,
-                            cli,
-                        )?;
-                    }
-                }
-            }
-        } else {
-            writeln!(
-                cli,
-                "Diagnostics reported in {} modules:",
-                initial_diags.len()
-            )?;
-
-            for (name, file_id, diags) in &initial_diags {
-                writeln!(cli, "  {}: {}", name, diags.len())?;
-                if args.print_diags {
-                    for diag in diags {
-                        if let diagnostics::Severity::Error = diag.severity {
-                            err_in_diag = true;
-                        };
-                        print_diagnostic(
-                            diag,
-                            &loaded.analysis(),
-                            &loaded.vfs,
-                            *file_id,
-                            args.use_cli_severity,
-                            cli,
-                        )?;
-                    }
-                }
-            }
-        }
         if args.apply_fix && diagnostics_config.enabled.all_enabled() {
             bail!(
                 "We cannot apply fixes if all diagnostics enabled. Perhaps provide --diagnostic-filter"
             );
         }
         if args.apply_fix && !diagnostics_config.enabled.all_enabled() {
+            let mut initial_diags = {
+                let analysis = loaded.analysis();
+                filter_diagnostics(
+                    &analysis,
+                    &args.module,
+                    Some(&diagnostics_config.enabled),
+                    &initial_diags,
+                    &FxHashSet::default(),
+                )?
+            };
+            if args.skip_stream_print() {
+                initial_diags.sort_by(|(a, _, _), (b, _, _)| a.cmp(b));
+                let module_count: &mut i32 = &mut 0;
+                let has_diagnostics: &mut bool = &mut false;
+                if args.is_format_json() {
+                    do_print_diagnostics_json_filtered(
+                        cli,
+                        args,
+                        loaded,
+                        &mut err_in_diag,
+                        module_count,
+                        has_diagnostics,
+                        &initial_diags,
+                    )?;
+                } else {
+                    {
+                        // Scope the analysis instance to ensure it's dropped before creating Lints
+                        let analysis = loaded.analysis();
+                        do_print_diagnostics_filtered(
+                            cli,
+                            &analysis,
+                            args,
+                            loaded,
+                            &mut err_in_diag,
+                            module_count,
+                            has_diagnostics,
+                            &initial_diags,
+                        )?;
+                        // Analysis is dropped here
+                    }
+                }
+            }
+
             let mut changed_files = FxHashSet::default();
             let mut lints = Lints::new(
                 &mut loaded.analysis_host,
@@ -395,6 +476,206 @@ pub fn do_codemod(
     Ok(())
 }
 
+#[allow(clippy::too_many_arguments)]
+fn print_diagnostic_result(
+    cli: &mut dyn Cli,
+    analysis: &Analysis,
+    config: &DiagnosticsConfig,
+    args: &Lint,
+    loaded: &LoadResult,
+    module: &Option<String>,
+    err_in_diag: &mut bool,
+    module_count: &mut i32,
+    result: &(String, FileId, DiagnosticCollection),
+) -> Result<bool> {
+    if args.is_format_json() {
+        do_print_diagnostic_collection_json(
+            cli,
+            analysis,
+            config,
+            args,
+            loaded,
+            module,
+            err_in_diag,
+            module_count,
+            result,
+        )
+    } else {
+        do_print_diagnostic_collection(
+            cli,
+            analysis,
+            config,
+            args,
+            loaded,
+            module,
+            err_in_diag,
+            module_count,
+            result,
+        )
+    }
+}
+
+#[allow(clippy::too_many_arguments)]
+fn do_print_diagnostic_collection(
+    cli: &mut dyn Cli,
+    analysis: &Analysis,
+    config: &DiagnosticsConfig,
+    args: &Lint,
+    loaded: &LoadResult,
+    module: &Option<String>,
+    err_in_diag: &mut bool,
+    module_count: &mut i32,
+    result: &(String, FileId, DiagnosticCollection),
+) -> Result<bool> {
+    let single_result = vec![result.clone()];
+    let mut has_diagnostics = false;
+    if let Ok(filtered) = filter_diagnostics(
+        analysis,
+        module,
+        Some(&config.enabled),
+        &single_result,
+        &FxHashSet::default(),
+    ) {
+        do_print_diagnostics_filtered(
+            cli,
+            analysis,
+            args,
+            loaded,
+            err_in_diag,
+            module_count,
+            &mut has_diagnostics,
+            &filtered,
+        )?;
+    }
+    Ok(has_diagnostics)
+}
+
+#[allow(clippy::too_many_arguments)]
+fn do_print_diagnostics_filtered(
+    cli: &mut dyn Cli,
+    analysis: &Analysis,
+    args: &Lint,
+    loaded: &LoadResult,
+    err_in_diag: &mut bool,
+    module_count: &mut i32,
+    has_diagnostics: &mut bool,
+    filtered: &[(String, FileId, Vec<diagnostics::Diagnostic>)],
+) -> Result<(), anyhow::Error> {
+    let _: () = for (name, file_id, diags) in filtered {
+        if !diags.is_empty() {
+            *has_diagnostics = true;
+            if *module_count == 0 {
+                writeln!(cli, "Diagnostics reported:")?;
+            }
+            *module_count += 1;
+            if !args.print_diags {
+                writeln!(cli, "  {}: {}", name, diags.len())?;
+            } else {
+                for diag in diags {
+                    if let diagnostics::Severity::Error = diag.severity {
+                        *err_in_diag = true;
+                    };
+                    // Get relative path for diagnostic output
+                    let vfs_path = loaded.vfs.file_path(*file_id);
+                    let root_path = &analysis
+                        .project_data(*file_id)
+                        .unwrap_or_else(|_err| panic!("could not find project data"))
+                        .unwrap_or_else(|| panic!("could not find project data"))
+                        .root_dir;
+                    let relative_path = reporting::get_relative_path(root_path, vfs_path);
+                    print_diagnostic(
+                        diag,
+                        analysis,
+                        &loaded.vfs,
+                        *file_id,
+                        Some(relative_path),
+                        args.use_cli_severity,
+                        cli,
+                    )?;
+                }
+            }
+        }
+    };
+    Ok(())
+}
+
+#[allow(clippy::too_many_arguments)]
+fn do_print_diagnostic_collection_json(
+    cli: &mut dyn Cli,
+    analysis: &Analysis,
+    config: &DiagnosticsConfig,
+    args: &Lint,
+    loaded: &LoadResult,
+    module: &Option<String>,
+    err_in_diag: &mut bool,
+    module_count: &mut i32,
+    result: &(String, FileId, DiagnosticCollection),
+) -> Result<bool> {
+    let single_result = vec![result.clone()];
+    let mut has_diagnostics = false;
+    if let Ok(filtered) = filter_diagnostics(
+        analysis,
+        module,
+        Some(&config.enabled),
+        &single_result,
+        &FxHashSet::default(),
+    ) {
+        do_print_diagnostics_json_filtered(
+            cli,
+            args,
+            loaded,
+            err_in_diag,
+            module_count,
+            &mut has_diagnostics,
+            &filtered,
+        )?;
+    }
+    Ok(has_diagnostics)
+}
+
+fn do_print_diagnostics_json_filtered(
+    cli: &mut dyn Cli,
+    args: &Lint,
+    loaded: &LoadResult,
+    err_in_diag: &mut bool,
+    module_count: &mut i32,
+    has_diagnostics: &mut bool,
+    filtered: &[(String, FileId, Vec<diagnostics::Diagnostic>)],
+) -> Result<(), anyhow::Error> {
+    let _: () = for (name, file_id, diags) in filtered {
+        if !diags.is_empty() {
+            *has_diagnostics = true;
+            *module_count += 1;
+            if !args.print_diags {
+                writeln!(cli, "  {}: {}", name, diags.len())?;
+            } else {
+                for diag in diags {
+                    *err_in_diag = true;
+
+                    // Get relative path for diagnostic output
+                    let vfs_path = loaded.vfs.file_path(*file_id);
+                    let analysis = loaded.analysis();
+                    let root_path = &analysis
+                        .project_data(*file_id)
+                        .unwrap_or_else(|_err| panic!("could not find project data"))
+                        .unwrap_or_else(|| panic!("could not find project data"))
+                        .root_dir;
+                    let relative_path = reporting::get_relative_path(root_path, vfs_path);
+                    print_diagnostic_json(
+                        diag,
+                        &analysis,
+                        *file_id,
+                        relative_path,
+                        args.use_cli_severity,
+                        cli,
+                    )?;
+                }
+            }
+        }
+    };
+    Ok(())
+}
+
 fn get_diagnostics_config(args: &Lint) -> Result<DiagnosticsConfig> {
     let cfg_from_file = if args.read_config || args.config_file.is_some() {
         read_lint_config_file(&args.project, &args.config_file)?
@@ -422,11 +703,17 @@ fn print_diagnostic(
     analysis: &Analysis,
     vfs: &Vfs,
     file_id: FileId,
+    path: Option<&Path>,
     use_cli_severity: bool,
     cli: &mut dyn Cli,
 ) -> Result<(), anyhow::Error> {
     let line_index = analysis.line_index(file_id)?;
-    writeln!(cli, "      {}", diag.print(&line_index, use_cli_severity))?;
+    let diag_str = diag.print(&line_index, use_cli_severity);
+    if let Some(path) = path {
+        writeln!(cli, "{}:{}", path.display(), diag_str)?;
+    } else {
+        writeln!(cli, "      {}", diag_str)?;
+    }
 
     // Print any related information, indented
     if let Some(related_info) = &diag.related_info {
@@ -674,13 +961,10 @@ impl<'a> Lints<'a> {
                         if self.args.check_eqwalize_all {
                             writeln!(cli, "Running eqwalize-all to check for knock-on problems.")?;
                         }
-                        let diags = do_parse_one(
-                            &self.analysis_host.analysis(),
-                            self.cfg,
-                            file_id,
-                            &name,
-                            self.args,
-                        )?;
+                        let diags = {
+                            let analysis = self.analysis_host.analysis();
+                            do_diagnostics_one(&analysis, self.cfg, file_id, &name, self.args)?
+                        };
                         let err_in_diags = diags.iter().any(|(_, file_id, diags)| {
                             let diags = diags.diagnostics_for(*file_id);
                             diags
@@ -691,14 +975,15 @@ impl<'a> Lints<'a> {
                             bail!("Applying change introduces an error diagnostic");
                         } else {
                             self.changed_files.insert((file_id, name.clone()));
-                            let changes = changes
-                                .iter()
-                                .filter_map(|d| {
-                                    form_from_diff(&self.analysis_host.analysis(), file_id, d)
-                                })
-                                .collect::<Vec<_>>();
+                            let changed_forms = {
+                                let analysis = self.analysis_host.analysis();
+                                changes
+                                    .iter()
+                                    .filter_map(|d| form_from_diff(&analysis, file_id, d))
+                                    .collect::<Vec<_>>()
+                            };
 
-                            for form_id in &changes {
+                            for form_id in &changed_forms {
                                 self.changed_forms.insert(InFile::new(file_id, *form_id));
                             }
 
@@ -711,25 +996,24 @@ impl<'a> Lints<'a> {
                 .flatten()
                 .collect::<Vec<_>>();
 
-            let new_diagnostics = filter_diagnostics(
-                &self.analysis_host.analysis(),
-                &None,
-                None,
-                &new_diags,
-                &self.changed_forms,
-            )?;
+            let new_diagnostics = {
+                let analysis = self.analysis_host.analysis();
+                filter_diagnostics(&analysis, &None, None, &new_diags, &self.changed_forms)?
+            };
             self.diags = diagnostics_by_file_id(&new_diagnostics);
             if !self.diags.is_empty() {
                 writeln!(cli, "---------------------------------------------\n")?;
                 writeln!(cli, "New filtered diagnostics")?;
+                let analysis = self.analysis_host.analysis();
                 for (file_id, (name, diags)) in &self.diags {
                     writeln!(cli, "  {}: {}", name, diags.len())?;
                     for diag in diags.iter() {
                         print_diagnostic(
                             diag,
-                            &self.analysis_host.analysis(),
+                            &analysis,
                             self.vfs,
                             *file_id,
+                            None,
                             self.args.use_cli_severity,
                             cli,
                         )?;
@@ -801,11 +1085,13 @@ impl<'a> Lints<'a> {
                 if format_normal {
                     writeln!(cli, "---------------------------------------------\n")?;
                     writeln!(cli, "Applying fix in module '{name}' for")?;
+                    let analysis = self.analysis_host.analysis();
                     print_diagnostic(
                         diagnostic,
-                        &self.analysis_host.analysis(),
+                        &analysis,
                         self.vfs,
                         file_id,
+                        None,
                         self.args.use_cli_severity,
                         cli,
                     )?;
@@ -874,6 +1160,7 @@ impl<'a> Lints<'a> {
                         &self.analysis_host.analysis(),
                         self.vfs,
                         file_id,
+                        None,
                         self.args.use_cli_severity,
                         cli,
                     )?;
@@ -1148,9 +1435,8 @@ mod tests {
           "#,
             expect![[r#"
                 module specified: lints
-                Diagnostics reported in 1 modules:
-                  lints: 1
-                      5:3-5:16::[Error] [P1700] head mismatch 'head_mismatcX' vs 'head_mismatch'
+                Diagnostics reported:
+                app_a/src/lints.erl:5:3-5:16::[Error] [P1700] head mismatch 'head_mismatcX' vs 'head_mismatch'
                         4:3-4:16: Mismatched clause name
             "#]],
             expect![""],
@@ -1169,9 +1455,8 @@ mod tests {
           "#,
             expect![[r#"
                 module specified: lints
-                Diagnostics reported in 1 modules:
-                  lints: 1
-                      3:3-3:6::[Warning] [L1230] function foo/0 is unused
+                Diagnostics reported:
+                app_a/src/lints.erl:3:3-3:6::[Warning] [L1230] function foo/0 is unused
             "#]],
             expect![""],
         );
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index cc4c6b8332..59089b1c6e 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -1347,6 +1347,7 @@ mod tests {
         check_lint_fix(
             args_vec![
                 "lint",
+                "--no-stream",
                 "--diagnostic-filter",
                 "W0010",
                 "--experimental",
@@ -1374,6 +1375,7 @@ mod tests {
         check_lint_fix(
             args_vec![
                 "lint",
+                "--no-stream",
                 "--diagnostic-filter",
                 "W0010",
                 "--experimental",
@@ -1399,7 +1401,7 @@ mod tests {
     fn lint_config_file_used(buck: bool) {
         let tmp_dir = make_tmp_dir();
         let tmp_path = tmp_dir.path();
-        check_lint_fix_stderr(
+        check_lint_fix_stderr_sorted(
             args_vec![
                 "lint",
                 "--diagnostic-filter",
@@ -1456,7 +1458,7 @@ mod tests {
     fn lint_custom_config_file_used(buck: bool) {
         let tmp_dir = make_tmp_dir();
         let tmp_path = tmp_dir.path();
-        check_lint_fix(
+        check_lint_fix_stderr_sorted(
             args_vec![
                 "lint",
                 "--experimental",
@@ -1472,6 +1474,7 @@ mod tests {
             Path::new("../resources/test/lint/lint_recursive"),
             &[],
             false,
+            None,
         )
         .expect("bad test");
     }
@@ -1510,7 +1513,7 @@ mod tests {
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
     fn lint_diagnostic_ignore(buck: bool) {
-        simple_snapshot(
+        simple_snapshot_sorted(
             args_vec![
                 "lint",
                 "--experimental",
@@ -1570,8 +1573,8 @@ mod tests {
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
     fn lint_no_diagnostics_filter_all_enabled(buck: bool) {
-        simple_snapshot_expect_error(
-            args_vec!["lint",],
+        simple_snapshot_expect_error_sorted(
+            args_vec!["lint"],
             "linter",
             expect_file!("../resources/test/linter/parse_elp_no_lint_specified_output.stdout"),
             buck,
@@ -1582,7 +1585,7 @@ mod tests {
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
     fn lint_no_diagnostics_filter_all_enabled_json(buck: bool) {
-        simple_snapshot_expect_error(
+        simple_snapshot_expect_error_sorted(
             args_vec!["lint", "--format", "json"],
             "linter",
             expect_file!("../resources/test/linter/parse_elp_no_lint_specified_json_output.stdout"),
@@ -1609,7 +1612,7 @@ mod tests {
     fn lint_explicit_enable_diagnostic(buck: bool) {
         let tmp_dir = make_tmp_dir();
         let tmp_path = tmp_dir.path();
-        check_lint_fix_stderr(
+        check_lint_fix_stderr_sorted(
             args_vec![
                 "lint",
                 "--config-file",
@@ -1636,7 +1639,7 @@ mod tests {
     fn lint_json_output(buck: bool) {
         let tmp_dir = make_tmp_dir();
         let tmp_path = tmp_dir.path();
-        check_lint_fix_stderr(
+        check_lint_fix_stderr_sorted(
             args_vec![
                 "lint",
                 "--diagnostic-filter",
@@ -1848,7 +1851,7 @@ mod tests {
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
     fn lint_edoc(buck: bool) {
-        simple_snapshot(
+        simple_snapshot_sorted(
             args_vec![
                 "lint",
                 "--include-edoc-diagnostics",
@@ -1882,7 +1885,7 @@ mod tests {
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
     fn lint_ct_include_tests(buck: bool) {
-        simple_snapshot_expect_error(
+        simple_snapshot_expect_error_sorted(
             args_vec![
                 "lint",
                 "--include-ct-diagnostics",
@@ -1900,8 +1903,8 @@ mod tests {
     #[test]
     fn lint_resolves_generated_includes() {
         if cfg!(feature = "buck") {
-            simple_snapshot_expect_error(
-                args_vec!["lint"],
+            simple_snapshot_expect_error_sorted(
+                args_vec!["lint", "--module", "top_includer",],
                 "buck_tests_2",
                 expect_file!("../resources/test/buck_tests_2/resolves_generated_includes.stdout"),
                 true,
@@ -1926,9 +1929,10 @@ mod tests {
 
     #[test]
     fn lint_warnings_as_errors() {
-        simple_snapshot_expect_error(
+        simple_snapshot_expect_error_sorted(
             args_vec![
                 "lint",
+                "--no-stream"
                 "--config-file",
                 "../../test_projects/linter/elp_lint_warnings_as_errors.toml"
             ],
@@ -1975,7 +1979,7 @@ mod tests {
 
     #[test]
     fn lint_ssr_from_config() {
-        simple_snapshot(
+        simple_snapshot_sorted(
             args_vec![
                 "lint",
                 "--config-file",
@@ -2180,9 +2184,8 @@ mod tests {
 
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
-    #[should_panic] // Support for hierarchical config is not implemented yet
     fn lint_hierarchical_config_basic(buck: bool) {
-        simple_snapshot(
+        simple_snapshot_sorted(
             args_vec!["lint", "--read-config"],
             "hierarchical_config",
             expect_file!("../resources/test/hierarchical_config/basic.stdout"),
@@ -2761,6 +2764,61 @@ mod tests {
         }
     }
 
+    fn simple_snapshot_expect_error_sorted(
+        args: Vec<OsString>,
+        project: &str,
+        expected: ExpectFile,
+        buck: bool,
+        file: Option<&str>,
+    ) {
+        if !buck || cfg!(feature = "buck") {
+            let (mut args, path) = add_project(args, project, file, None);
+            if !buck {
+                args.push("--rebar".into());
+            }
+            let (stdout, stderr, code) = elp(args);
+            assert_eq!(
+                code, 101,
+                "Expected exit code 101, got: {code}\nstdout:\n{stdout}\nstderr:\n{stderr}"
+            );
+            let sorted_stdout = sort_lines(&stdout);
+            assert_normalised_file(expected, &sorted_stdout, path, false);
+        }
+    }
+
+    fn sort_lines(s: &str) -> String {
+        let mut lines: Vec<&str> = s.lines().collect();
+        lines.sort();
+        lines.join("\n")
+    }
+
+    #[track_caller]
+    fn simple_snapshot_sorted(
+        args: Vec<OsString>,
+        project: &str,
+        expected: ExpectFile,
+        buck: bool,
+        file: Option<&str>,
+    ) {
+        if !buck || cfg!(feature = "buck") {
+            let (mut args, path) = add_project(args, project, file, None);
+            if !buck {
+                args.push("--rebar".into());
+            }
+            let (stdout, stderr, code) = elp(args);
+            assert_eq!(
+                code, 0,
+                "failed with unexpected exit code: got {code} not 0\nstdout:\n{stdout}\nstderr:\n{stderr}"
+            );
+            let sorted_stdout = sort_lines(&stdout);
+            assert_normalised_file(expected, &sorted_stdout, path, false);
+            assert!(
+                stderr.is_empty(),
+                "expected stderr to be empty, got:\n{stderr}"
+            )
+        }
+    }
+
     fn simple_snapshot_expect_stderror(
         args: Vec<OsString>,
         project: &str,
@@ -2894,6 +2952,55 @@ mod tests {
         Ok(())
     }
 
+    #[allow(clippy::too_many_arguments)]
+    fn check_lint_fix_stderr_sorted(
+        args: Vec<OsString>,
+        project: &str,
+        expected: ExpectFile,
+        expected_code: i32,
+        buck: bool,
+        file: Option<&str>,
+        actual_dir: &Path,
+        expected_dir: &Path,
+        files: &[(&str, &str)],
+        backup_files: bool,
+        expected_stderr: Option<Expect>,
+    ) -> Result<()> {
+        if !buck || cfg!(feature = "buck") {
+            let (mut args, path) = add_project(args, project, file, None);
+            if !buck {
+                args.push("--rebar".into());
+            }
+            let orig_files = files.iter().map(|x| x.0).collect::<Vec<_>>();
+            // Take a backup. The Drop instance will restore at the end
+            let _backup = if backup_files {
+                BackupFiles::save_files(project, &orig_files)
+            } else {
+                BackupFiles::save_files(project, &[])
+            };
+            let (stdout, stderr, code) = elp(args);
+            assert_eq!(
+                code, expected_code,
+                "Expected exit code {expected_code}, got: {code}\nstdout:\n{stdout}\nstderr:\n{stderr}"
+            );
+            if let Some(expected_stderr) = expected_stderr {
+                expected_stderr.assert_eq(&stderr);
+            } else {
+                expect![[""]].assert_eq(&stderr);
+            }
+            let sorted_stdout = sort_lines(&stdout);
+            assert_normalised_file(expected, &sorted_stdout, path, false);
+            for (expected_file, file) in files {
+                let expected = expect_file!(expected_dir.join(expected_file));
+                let actual = actual_dir.join(file);
+                assert!(actual.exists());
+                let content = fs::read_to_string(actual).unwrap();
+                expected.assert_eq(content.as_str());
+            }
+        }
+        Ok(())
+    }
+
     fn assert_normalised_file(
         expected: ExpectFile,
         actual: &str,
diff --git a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
index b1773fd731..d4954b84ee 100644
--- a/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
+++ b/crates/elp/src/resources/test/buck_tests_2/resolves_generated_includes.stdout
@@ -1,14 +1,7 @@
-Reporting all diagnostics codes
-Diagnostics reported in 3 modules:
-  app_a: 1
-      6:10-6:32::[WeakWarning] [W0037] Unspecific include.
-  top_includer: 2
-      6:1-6:67::[Error] [L0000] Issue in included file
         [check_include_separate_1/include/include_with_bug.hrl] 5:14-5:18: E1507: undefined macro 'FOO'
         [check_include_separate_1/include/top_includer.hrl] 3:10-3:30: E1516: can't find include file "does_not_exist.hrl"
-      14:5-14:11::[Error] [E1508] undefined macro 'THIRD/2'
-  wa_buck2_module_search: 4
-      55:19-55:32::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
-      57:19-57:29::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
-      57:39-57:52::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
-      61:31-61:41::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
+Diagnostics reported:
+Reporting all diagnostics codes
+check_include/src/top_includer.erl:14:5-14:11::[Error] [E1508] undefined macro 'THIRD/2'
+check_include/src/top_includer.erl:6:1-6:67::[Error] [L0000] Issue in included file
+module specified: top_includer
\ No newline at end of file
diff --git a/crates/elp/src/resources/test/diagnostics/lint_report_suppressed.stdout b/crates/elp/src/resources/test/diagnostics/lint_report_suppressed.stdout
index cda6044675..523b8d4bc7 100644
--- a/crates/elp/src/resources/test/diagnostics/lint_report_suppressed.stdout
+++ b/crates/elp/src/resources/test/diagnostics/lint_report_suppressed.stdout
@@ -1,4 +1,3 @@
 module specified: suppressed
-Diagnostics reported in 1 modules:
-  suppressed: 1
-      8:5-8:9::[Warning] [W0007] match is redundant
+Diagnostics reported:
+app_a/src/suppressed.erl:8:5-8:9::[Warning] [W0007] match is redundant
diff --git a/crates/elp/src/resources/test/diagnostics/parse_elp_lint_fix.stdout b/crates/elp/src/resources/test/diagnostics/parse_elp_lint_fix.stdout
index 27caa7b1d7..f040cee98e 100644
--- a/crates/elp/src/resources/test/diagnostics/parse_elp_lint_fix.stdout
+++ b/crates/elp/src/resources/test/diagnostics/parse_elp_lint_fix.stdout
@@ -1,7 +1,6 @@
 module specified: lints
-Diagnostics reported in 1 modules:
-  lints: 1
-      5:1-5:14::[Error] [P1700] head mismatch 'head_mismatcX' vs 'head_mismatch'
+Diagnostics reported:
+app_a/src/lints.erl:5:1-5:14::[Error] [P1700] head mismatch 'head_mismatcX' vs 'head_mismatch'
         4:1-4:14: Mismatched clause name
 ---------------------------------------------
 
diff --git a/crates/elp/src/resources/test/diagnostics/parse_elp_lint_recursive.stdout b/crates/elp/src/resources/test/diagnostics/parse_elp_lint_recursive.stdout
index d947376488..a88f567370 100644
--- a/crates/elp/src/resources/test/diagnostics/parse_elp_lint_recursive.stdout
+++ b/crates/elp/src/resources/test/diagnostics/parse_elp_lint_recursive.stdout
@@ -1,8 +1,7 @@
 module specified: lint_recursive
-Diagnostics reported in 1 modules:
-  lint_recursive: 2
-      19:5-19:12::[Warning] [W0007] match is redundant
-      14:5-14:12::[Warning] [W0007] match is redundant
+Diagnostics reported:
+app_a/src/lint_recursive.erl:19:5-19:12::[Warning] [W0007] match is redundant
+app_a/src/lint_recursive.erl:14:5-14:12::[Warning] [W0007] match is redundant
 ---------------------------------------------
 
 Applying fix in module 'lint_recursive' for
diff --git a/crates/elp/src/resources/test/hierarchical_config/basic.stdout b/crates/elp/src/resources/test/hierarchical_config/basic.stdout
index 851813b00c..b0ccc8796b 100644
--- a/crates/elp/src/resources/test/hierarchical_config/basic.stdout
+++ b/crates/elp/src/resources/test/hierarchical_config/basic.stdout
@@ -1,7 +1,6 @@
+Diagnostics reported:
 Reporting all diagnostics codes
-Diagnostics reported in 2 modules:
-  app_a: 1
-      6:1-6:5::[Warning] [L1230] function main/0 is unused
-  app_b: 2
-      4:9-4:16::[Warning] [W0002] Unused macro (MACRO_B)
-      6:1-6:5::[Warning] [L1230] function main/0 is unused
+app_a/src/app_a.erl:4:9-4:16::[Warning] [W0002] Unused macro (MACRO_B)
+app_a/src/app_a.erl:6:1-6:5::[Warning] [L1230] function main/0 is unused
+app_b/src/app_b.erl:4:9-4:16::[Warning] [W0002] Unused macro (MACRO_B)
+app_b/src/app_b.erl:6:1-6:5::[Warning] [L1230] function main/0 is unused
\ No newline at end of file
diff --git a/crates/elp/src/resources/test/lint_help.stdout b/crates/elp/src/resources/test/lint_help.stdout
index ec4c25c70a..bffdd1fe91 100644
--- a/crates/elp/src/resources/test/lint_help.stdout
+++ b/crates/elp/src/resources/test/lint_help.stdout
@@ -1,4 +1,4 @@
-Usage: [--project PROJECT] [--module MODULE] [--app APP] [--file FILE] [--rebar] [--as PROFILE] [--include-generated] [--include-tests] [--no-diags] [[--format FORMAT]] [--include-erlc-diagnostics] [--include-ct-diagnostics] [--include-edoc-diagnostics] [--include-eqwalizer-diagnostics] [--include-suppressed] [--use-cli-severity] [--diagnostic-ignore CODE] [--diagnostic-filter CODE] [--experimental] [--read-config] [--config-file CONFIG_FILE] [--apply-fix] [--ignore-fix-only] [--in-place] [--to TO] [--recursive] [--with-check] [--check-eqwalize-all] [--one-shot] [--report-system-stats] <IGNORED_APPS>...
+Usage: [--project PROJECT] [--module MODULE] [--app APP] [--file FILE] [--rebar] [--as PROFILE] [--include-generated] [--include-tests] [--no-diags] [[--format FORMAT]] [--include-erlc-diagnostics] [--include-ct-diagnostics] [--include-edoc-diagnostics] [--include-eqwalizer-diagnostics] [--include-suppressed] [--use-cli-severity] [--diagnostic-ignore CODE] [--diagnostic-filter CODE] [--experimental] [--read-config] [--config-file CONFIG_FILE] [--apply-fix] [--ignore-fix-only] [--in-place] [--to TO] [--recursive] [--with-check] [--check-eqwalize-all] [--one-shot] [--report-system-stats] [--no-stream] <IGNORED_APPS>...
 
 Available positional items:
     <IGNORED_APPS>  Rest of args are space separated list of apps to ignore
@@ -37,4 +37,5 @@ Available options:
         --one-shot                       Apply to all matching diagnostic occurrences at once, rather
                                          than one at a time.
         --report-system-stats            Report system memory usage and other statistics
+        --no-stream                      Disable streaming of diagnostics when applying fixes (collect all before printing)
     -h, --help                           Prints help information
diff --git a/crates/elp/src/resources/test/linter/custom_function_matches.stdout b/crates/elp/src/resources/test/linter/custom_function_matches.stdout
index 961154e550..c552fa7dfa 100644
--- a/crates/elp/src/resources/test/linter/custom_function_matches.stdout
+++ b/crates/elp/src/resources/test/linter/custom_function_matches.stdout
@@ -1,5 +1,4 @@
 Reporting all diagnostics codes
 module specified: custom_function_matches
-Diagnostics reported in 1 modules:
-  custom_function_matches: 1
-      14:5-14:26::[Warning] [W0017] Function 'not_excluded:function/0' is undefined.
+Diagnostics reported:
+app_a/src/custom_function_matches.erl:14:5-14:26::[Warning] [W0017] Function 'not_excluded:function/0' is undefined.
diff --git a/crates/elp/src/resources/test/linter/elp_lint_ct.stdout b/crates/elp/src/resources/test/linter/elp_lint_ct.stdout
index 773b1f4d9c..471efc7900 100644
--- a/crates/elp/src/resources/test/linter/elp_lint_ct.stdout
+++ b/crates/elp/src/resources/test/linter/elp_lint_ct.stdout
@@ -1,3 +1,2 @@
-Diagnostics reported in 1 modules:
-  app_a_unreachable_test_SUITE: 1
-      8:1-8:2::[Error] [W0008] Unreachable test (b/1)
+Diagnostics reported:
+app_a/test/app_a_unreachable_test_SUITE.erl:8:1-8:2::[Error] [W0008] Unreachable test (b/1)
\ No newline at end of file
diff --git a/crates/elp/src/resources/test/linter/elp_lint_edoc.stdout b/crates/elp/src/resources/test/linter/elp_lint_edoc.stdout
index 8b60108476..a667df3930 100644
--- a/crates/elp/src/resources/test/linter/elp_lint_edoc.stdout
+++ b/crates/elp/src/resources/test/linter/elp_lint_edoc.stdout
@@ -1,3 +1,2 @@
-Diagnostics reported in 1 modules:
-  app_a_edoc: 1
-      5:1-6:1::[Warning] [O0039] tag @docc not recognized.
+Diagnostics reported:
+app_a/src/app_a_edoc.erl:5:1-6:1::[Warning] [O0039] tag @docc not recognized.
\ No newline at end of file
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint2.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint2.stdout
index 6d3ab47e91..47dc6d4a5e 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint2.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint2.stdout
@@ -1,5 +1,4 @@
 module specified: app_a
-Diagnostics reported in 1 modules:
-  app_a: 1
-      9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
+Diagnostics reported:
+app_a/src/app_a.erl:9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
         7:1-7:5: Mismatched clause name
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_adhoc_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_adhoc_output.stdout
index 97e3ef307f..0d0d56491d 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_adhoc_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_adhoc_output.stdout
@@ -1,8 +1,7 @@
 module specified: app_b
-Diagnostics reported in 1 modules:
-  app_b: 2
-      8:5-8:36::[WeakWarning] [ad-hoc: application:get_env/2] 'application:get_env/2' called
-      5:5-5:35::[WeakWarning] [ad-hoc: application:get_env/2] 'application:get_env/2' called
+Diagnostics reported:
+app_b/src/app_b.erl:8:5-8:36::[WeakWarning] [ad-hoc: application:get_env/2] 'application:get_env/2' called
+app_b/src/app_b.erl:5:5-5:35::[WeakWarning] [ad-hoc: application:get_env/2] 'application:get_env/2' called
 ---------------------------------------------
 
 Applying fixes in module 'app_b' for
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_app.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_app.stdout
index 0432896183..edd7c5cf1c 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_app.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_app.stdout
@@ -1,4 +1,3 @@
-Diagnostics reported in 1 modules:
-  app_a: 1
-      9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
+Diagnostics reported:
+app_a/src/app_a.erl:9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
         7:1-7:5: Mismatched clause name
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_config_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_config_output.stdout
index 285ca216f3..6daa076a31 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_config_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_config_output.stdout
@@ -1,14 +1,10 @@
-Diagnostics reported in 4 modules:
-  app_a: 3
-      9:6-9:7::[Warning] [W0010] this variable is unused
-      5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
-      9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
         7:1-7:5: Mismatched clause name
-  app_a_unused_param: 2
-      5:5-5:6::[Warning] [W0010] this variable is unused
-      5:5-5:6::[Warning] [L1268] variable 'X' is unused
-  app_b: 1
-      5:5-5:35::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
-  app_b_unused_param: 2
-      5:5-5:6::[Warning] [W0010] this variable is unused
-      5:5-5:6::[Warning] [L1268] variable 'X' is unused
+Diagnostics reported:
+app_a/src/app_a.erl:5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
+app_a/src/app_a.erl:9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
+app_a/src/app_a.erl:9:6-9:7::[Warning] [W0010] this variable is unused
+app_a/src/app_a_unused_param.erl:5:5-5:6::[Warning] [L1268] variable 'X' is unused
+app_a/src/app_a_unused_param.erl:5:5-5:6::[Warning] [W0010] this variable is unused
+app_b/src/app_b.erl:5:5-5:35::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
+app_b/src/app_b_unused_param.erl:5:5-5:6::[Warning] [L1268] variable 'X' is unused
+app_b/src/app_b_unused_param.erl:5:5-5:6::[Warning] [W0010] this variable is unused
\ No newline at end of file
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_custom_config_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_custom_config_output.stdout
index 3927f2c196..90ccbcb5c0 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_custom_config_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_custom_config_output.stdout
@@ -1,9 +1,5 @@
-Diagnostics reported in 4 modules:
-  app_a: 1
-      5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
-  app_a_unused_param: 1
-      5:5-5:6::[Warning] [L1268] variable 'X' is unused
-  app_b: 1
-      5:5-5:35::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
-  app_b_unused_param: 1
-      5:5-5:6::[Warning] [L1268] variable 'X' is unused
+Diagnostics reported:
+app_a/src/app_a.erl:5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
+app_a/src/app_a_unused_param.erl:5:5-5:6::[Warning] [L1268] variable 'X' is unused
+app_b/src/app_b.erl:5:5-5:35::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
+app_b/src/app_b_unused_param.erl:5:5-5:6::[Warning] [L1268] variable 'X' is unused
\ No newline at end of file
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_erlang_service.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_erlang_service.stdout
index 74b091100b..eeb41e5adf 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_erlang_service.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_erlang_service.stdout
@@ -1,4 +1,3 @@
 module specified: expression_updates_literal
-Diagnostics reported in 1 modules:
-  expression_updates_literal: 1
-      8:7-9:16::[Warning] [L1318] expression updates a literal
+Diagnostics reported:
+app_a/src/expression_updates_literal.erl:8:7-9:16::[Warning] [L1318] expression updates a literal
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_explicit_enable_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_explicit_enable_output.stdout
index d051fc19fc..1d7771b3b9 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_explicit_enable_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_explicit_enable_output.stdout
@@ -1,19 +1,12 @@
-Diagnostics reported in 7 modules:
-  app_a: 2
-      5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
-      1:1-1:1::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
-  app_a_edoc: 1
-      1:1-1:1::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
-  app_a_ssr: 1
-      1:1-1:1::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
-  app_a_unused_param: 2
-      1:1-1:1::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
-      5:5-5:6::[Warning] [L1268] variable 'X' is unused
-  app_b: 2
-      5:5-5:35::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
-      1:1-1:1::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
-  app_b_unused_param: 2
-      1:1-1:1::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
-      5:5-5:6::[Warning] [L1268] variable 'X' is unused
-  spelling: 1
-      1:1-1:1::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+Diagnostics reported:
+app_a/src/app_a.erl:1:1-1:1::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+app_a/src/app_a.erl:5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
+app_a/src/app_a_edoc.erl:1:1-1:1::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+app_a/src/app_a_ssr.erl:1:1-1:1::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+app_a/src/app_a_unused_param.erl:1:1-1:1::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+app_a/src/app_a_unused_param.erl:5:5-5:6::[Warning] [L1268] variable 'X' is unused
+app_a/src/spelling.erl:1:1-1:1::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+app_b/src/app_b.erl:1:1-1:1::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+app_b/src/app_b.erl:5:5-5:35::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
+app_b/src/app_b_unused_param.erl:1:1-1:1::[Error] [W0012] Please add "-compile(warn_missing_spec_all)." to the module. If exported functions are not all specced, they need to be specced.
+app_b/src/app_b_unused_param.erl:5:5-5:6::[Warning] [L1268] variable 'X' is unused
\ No newline at end of file
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_fix_ignore.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_fix_ignore.stdout
index c573704321..3e4a25f329 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_fix_ignore.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_fix_ignore.stdout
@@ -1,7 +1,6 @@
 module specified: app_b
-Diagnostics reported in 1 modules:
-  app_b: 1
-      5:5-5:35::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
+Diagnostics reported:
+app_b/src/app_b.erl:5:5-5:35::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
 ---------------------------------------------
 
 Applying fix in module 'app_b' for
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_fixme_spelling.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_fixme_spelling.stdout
index b8c9d1896e..2cec0678d2 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_fixme_spelling.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_fixme_spelling.stdout
@@ -1,7 +1,6 @@
 module specified: spelling
-Diagnostics reported in 1 modules:
-  spelling: 1
-      2:2-2:10::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
+Diagnostics reported:
+app_a/src/spelling.erl:2:2-2:10::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
 ---------------------------------------------
 
 Applying fix in module 'spelling' for
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_ignore.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_ignore.stdout
index dbdb7db051..1e7e049554 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_ignore.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_ignore.stdout
@@ -1,9 +1,6 @@
-Diagnostics reported in 3 modules:
-  app_a: 1
-      9:6-9:7::[Warning] [W0010] this variable is unused
-  app_a_unused_param: 2
-      5:5-5:6::[Warning] [W0010] this variable is unused
-      5:5-5:6::[Warning] [L1268] variable 'X' is unused
-  app_b_unused_param: 2
-      5:5-5:6::[Warning] [W0010] this variable is unused
-      5:5-5:6::[Warning] [L1268] variable 'X' is unused
+Diagnostics reported:
+app_a/src/app_a.erl:9:6-9:7::[Warning] [W0010] this variable is unused
+app_a/src/app_a_unused_param.erl:5:5-5:6::[Warning] [L1268] variable 'X' is unused
+app_a/src/app_a_unused_param.erl:5:5-5:6::[Warning] [W0010] this variable is unused
+app_b/src/app_b_unused_param.erl:5:5-5:6::[Warning] [L1268] variable 'X' is unused
+app_b/src/app_b_unused_param.erl:5:5-5:6::[Warning] [W0010] this variable is unused
\ No newline at end of file
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_ignore_apps.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_ignore_apps.stdout
index 58caba3339..4b8d3cc466 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_ignore_apps.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_ignore_apps.stdout
@@ -1,3 +1,2 @@
-Diagnostics reported in 1 modules:
-  app_b_unused_param: 1
-      5:5-5:6::[Warning] [W0010] this variable is unused
+Diagnostics reported:
+app_b/src/app_b_unused_param.erl:5:5-5:6::[Warning] [W0010] this variable is unused
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_ignore_apps_b.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_ignore_apps_b.stdout
index 963181a031..3d59c453e3 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_ignore_apps_b.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_ignore_apps_b.stdout
@@ -1,5 +1,3 @@
-Diagnostics reported in 2 modules:
-  app_a: 1
-      9:6-9:7::[Warning] [W0010] this variable is unused
-  app_a_unused_param: 1
-      5:5-5:6::[Warning] [W0010] this variable is unused
+Diagnostics reported:
+app_a/src/app_a_unused_param.erl:5:5-5:6::[Warning] [W0010] this variable is unused
+app_a/src/app_a.erl:9:6-9:7::[Warning] [W0010] this variable is unused
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_json_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_json_output.stdout
index 4fb3478926..5d6b5e78bc 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_json_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_json_output.stdout
@@ -1,3 +1,3 @@
 {"path":"app_a/src/app_a.erl","line":9,"char":6,"code":"ELP","severity":"warning","name":"W0010 (unused_function_arg)","original":null,"replacement":null,"description":"this variable is unused\n\nFor more information see: /erlang-error-index/w/W0010","docPath":"website/docs/erlang-error-index/w/W0010.md"}
 {"path":"app_a/src/app_a_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0010 (unused_function_arg)","original":null,"replacement":null,"description":"this variable is unused\n\nFor more information see: /erlang-error-index/w/W0010","docPath":"website/docs/erlang-error-index/w/W0010.md"}
-{"path":"app_b/src/app_b_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0010 (unused_function_arg)","original":null,"replacement":null,"description":"this variable is unused\n\nFor more information see: /erlang-error-index/w/W0010","docPath":"website/docs/erlang-error-index/w/W0010.md"}
+{"path":"app_b/src/app_b_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0010 (unused_function_arg)","original":null,"replacement":null,"description":"this variable is unused\n\nFor more information see: /erlang-error-index/w/W0010","docPath":"website/docs/erlang-error-index/w/W0010.md"}
\ No newline at end of file
diff --git a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
index 7608728f1e..6e07ea2bba 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
@@ -1,16 +1,16 @@
-{"path":"app_a/src/app_a.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0011 (application_get_env)","original":null,"replacement":null,"description":"module `app_a` belongs to app `app_a`, but reads env for `misc`\n\nFor more information see: /erlang-error-index/w/W0011","docPath":"website/docs/erlang-error-index/w/W0011.md"}
-{"path":"app_a/src/app_a.erl","line":9,"char":1,"code":"ELP","severity":"error","name":"P1700 (head_mismatch)","original":null,"replacement":null,"description":"head mismatch 'fooX' vs 'food'\n\nFor more information see: /erlang-error-index/p/P1700","docPath":null}
-{"path":"app_a/src/app_a.erl","line":8,"char":7,"code":"ELP","severity":"warning","name":"W0018 (unexpected_semi_or_dot)","original":null,"replacement":null,"description":"Unexpected ';'\n\nFor more information see: /erlang-error-index/w/W0018","docPath":"website/docs/erlang-error-index/w/W0018.md"}
-{"path":"app_a/src/app_a.erl","line":13,"char":5,"code":"ELP","severity":"warning","name":"W0026 (unexported_function)","original":null,"replacement":null,"description":"Function 'app_a:baz/2' is not exported.\n\nFor more information see: /erlang-error-index/w/W0026","docPath":"website/docs/erlang-error-index/w/W0026.md"}
 {"path":"app_a/src/app_a.erl","line":12,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function bar/0 is unused\n\nFor more information see: /erlang-error-index/l/L1230","docPath":null}
+{"path":"app_a/src/app_a.erl","line":13,"char":5,"code":"ELP","severity":"warning","name":"W0026 (unexported_function)","original":null,"replacement":null,"description":"Function 'app_a:baz/2' is not exported.\n\nFor more information see: /erlang-error-index/w/W0026","docPath":"website/docs/erlang-error-index/w/W0026.md"}
 {"path":"app_a/src/app_a.erl","line":16,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function baz/2 is unused\n\nFor more information see: /erlang-error-index/l/L1230","docPath":null}
 {"path":"app_a/src/app_a.erl","line":20,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function bat/2 is unused\n\nFor more information see: /erlang-error-index/l/L1230","docPath":null}
+{"path":"app_a/src/app_a.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0011 (application_get_env)","original":null,"replacement":null,"description":"module `app_a` belongs to app `app_a`, but reads env for `misc`\n\nFor more information see: /erlang-error-index/w/W0011","docPath":"website/docs/erlang-error-index/w/W0011.md"}
+{"path":"app_a/src/app_a.erl","line":8,"char":7,"code":"ELP","severity":"warning","name":"W0018 (unexpected_semi_or_dot)","original":null,"replacement":null,"description":"Unexpected ';'\n\nFor more information see: /erlang-error-index/w/W0018","docPath":"website/docs/erlang-error-index/w/W0018.md"}
+{"path":"app_a/src/app_a.erl","line":9,"char":1,"code":"ELP","severity":"error","name":"P1700 (head_mismatch)","original":null,"replacement":null,"description":"head mismatch 'fooX' vs 'food'\n\nFor more information see: /erlang-error-index/p/P1700","docPath":null}
 {"path":"app_a/src/app_a_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"L1268 (L1268)","original":null,"replacement":null,"description":"variable 'X' is unused\n\nFor more information see: /erlang-error-index/l/L1268","docPath":null}
-{"path":"app_b/src/app_b.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0011 (application_get_env)","original":null,"replacement":null,"description":"module `app_b` belongs to app `app_b`, but reads env for `misc`\n\nFor more information see: /erlang-error-index/w/W0011","docPath":"website/docs/erlang-error-index/w/W0011.md"}
-{"path":"app_b/src/app_b_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"L1268 (L1268)","original":null,"replacement":null,"description":"variable 'X' is unused\n\nFor more information see: /erlang-error-index/l/L1268","docPath":null}
 {"path":"app_a/src/custom_function_matches.erl","line":13,"char":5,"code":"ELP","severity":"warning","name":"W0017 (undefined_function)","original":null,"replacement":null,"description":"Function 'excluded:function/0' is undefined.\n\nFor more information see: /erlang-error-index/w/W0017","docPath":"website/docs/erlang-error-index/w/W0017.md"}
 {"path":"app_a/src/custom_function_matches.erl","line":14,"char":5,"code":"ELP","severity":"warning","name":"W0017 (undefined_function)","original":null,"replacement":null,"description":"Function 'not_excluded:function/0' is undefined.\n\nFor more information see: /erlang-error-index/w/W0017","docPath":"website/docs/erlang-error-index/w/W0017.md"}
 {"path":"app_a/src/custom_function_matches.erl","line":15,"char":5,"code":"ELP","severity":"warning","name":"W0017 (undefined_function)","original":null,"replacement":null,"description":"Function 'cross:call/0' is undefined.\n\nFor more information see: /erlang-error-index/w/W0017","docPath":"website/docs/erlang-error-index/w/W0017.md"}
 {"path":"app_a/src/expression_updates_literal.erl","line":7,"char":1,"code":"ELP","severity":"warning","name":"L1309 (L1309)","original":null,"replacement":null,"description":"missing specification for function a_fun/0\n\nFor more information see: /erlang-error-index/l/L1309","docPath":null}
 {"path":"app_a/src/expression_updates_literal.erl","line":8,"char":7,"code":"ELP","severity":"warning","name":"L1318 (L1318)","original":null,"replacement":null,"description":"expression updates a literal\n\nFor more information see: /erlang-error-index/l/L1318","docPath":null}
 {"path":"app_a/src/spelling.erl","line":2,"char":2,"code":"ELP","severity":"error","name":"W0013 (misspelled_attribute)","original":null,"replacement":null,"description":"misspelled attribute, saw 'dyalizer' but expected 'dialyzer'\n\nFor more information see: /erlang-error-index/w/W0013","docPath":"website/docs/erlang-error-index/w/W0013.md"}
+{"path":"app_b/src/app_b.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0011 (application_get_env)","original":null,"replacement":null,"description":"module `app_b` belongs to app `app_b`, but reads env for `misc`\n\nFor more information see: /erlang-error-index/w/W0011","docPath":"website/docs/erlang-error-index/w/W0011.md"}
+{"path":"app_b/src/app_b_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"L1268 (L1268)","original":null,"replacement":null,"description":"variable 'X' is unused\n\nFor more information see: /erlang-error-index/l/L1268","docPath":null}
\ No newline at end of file
diff --git a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
index 6a4b28b72b..9f7a5405b4 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
@@ -1,26 +1,19 @@
-Reporting all diagnostics codes
-Diagnostics reported in 7 modules:
-  app_a: 7
-      5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
-      9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
         7:1-7:5: Mismatched clause name
-      8:7-8:8::[Warning] [W0018] Unexpected ';'
-      13:5-13:14::[Warning] [W0026] Function 'app_a:baz/2' is not exported.
-      12:1-12:4::[Warning] [L1230] function bar/0 is unused
-      16:1-16:4::[Warning] [L1230] function baz/2 is unused
-      20:1-20:4::[Warning] [L1230] function bat/2 is unused
-  app_a_unused_param: 1
-      5:5-5:6::[Warning] [L1268] variable 'X' is unused
-  app_b: 1
-      5:5-5:35::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
-  app_b_unused_param: 1
-      5:5-5:6::[Warning] [L1268] variable 'X' is unused
-  custom_function_matches: 3
-      13:5-13:22::[Warning] [W0017] Function 'excluded:function/0' is undefined.
-      14:5-14:26::[Warning] [W0017] Function 'not_excluded:function/0' is undefined.
-      15:5-15:15::[Warning] [W0017] Function 'cross:call/0' is undefined.
-  expression_updates_literal: 2
-      7:1-7:6::[Warning] [L1309] missing specification for function a_fun/0
-      8:7-9:16::[Warning] [L1318] expression updates a literal
-  spelling: 1
-      2:2-2:10::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
+Diagnostics reported:
+Reporting all diagnostics codes
+app_a/src/app_a.erl:12:1-12:4::[Warning] [L1230] function bar/0 is unused
+app_a/src/app_a.erl:13:5-13:14::[Warning] [W0026] Function 'app_a:baz/2' is not exported.
+app_a/src/app_a.erl:16:1-16:4::[Warning] [L1230] function baz/2 is unused
+app_a/src/app_a.erl:20:1-20:4::[Warning] [L1230] function bat/2 is unused
+app_a/src/app_a.erl:5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
+app_a/src/app_a.erl:8:7-8:8::[Warning] [W0018] Unexpected ';'
+app_a/src/app_a.erl:9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
+app_a/src/app_a_unused_param.erl:5:5-5:6::[Warning] [L1268] variable 'X' is unused
+app_a/src/custom_function_matches.erl:13:5-13:22::[Warning] [W0017] Function 'excluded:function/0' is undefined.
+app_a/src/custom_function_matches.erl:14:5-14:26::[Warning] [W0017] Function 'not_excluded:function/0' is undefined.
+app_a/src/custom_function_matches.erl:15:5-15:15::[Warning] [W0017] Function 'cross:call/0' is undefined.
+app_a/src/expression_updates_literal.erl:7:1-7:6::[Warning] [L1309] missing specification for function a_fun/0
+app_a/src/expression_updates_literal.erl:8:7-9:16::[Warning] [L1318] expression updates a literal
+app_a/src/spelling.erl:2:2-2:10::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
+app_b/src/app_b.erl:5:5-5:35::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
+app_b/src/app_b_unused_param.erl:5:5-5:6::[Warning] [L1268] variable 'X' is unused
\ No newline at end of file
diff --git a/crates/elp/src/resources/test/linter/ssr_ad_hoc.stdout b/crates/elp/src/resources/test/linter/ssr_ad_hoc.stdout
index b081749a91..7ded0e8d2f 100644
--- a/crates/elp/src/resources/test/linter/ssr_ad_hoc.stdout
+++ b/crates/elp/src/resources/test/linter/ssr_ad_hoc.stdout
@@ -1,4 +1,3 @@
-Diagnostics reported in 1 modules:
-  app_a: 2
-      16:13-16:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
-      20:13-20:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
+Diagnostics reported:
+app_a/src/app_a.erl:16:13-16:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
+app_a/src/app_a.erl:20:13-20:18::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: {_@A, _@B}.
\ No newline at end of file
diff --git a/crates/elp/src/resources/test/linter/warnings_as_errors.stdout b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
index 2d9eae2b6e..00d8506230 100644
--- a/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
+++ b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
@@ -1,26 +1,19 @@
-Reporting all diagnostics codes
-Diagnostics reported in 7 modules:
-  app_a: 7
-      5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
-      9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
         7:1-7:5: Mismatched clause name
-      8:7-8:8::[Warning] [W0018] Unexpected ';'
-      13:5-13:14::[Warning] [W0026] Function 'app_a:baz/2' is not exported.
-      12:1-12:4::[Error] [L1230] function bar/0 is unused
-      16:1-16:4::[Error] [L1230] function baz/2 is unused
-      20:1-20:4::[Error] [L1230] function bat/2 is unused
-  app_a_unused_param: 1
-      5:5-5:6::[Error] [L1268] variable 'X' is unused
-  app_b: 1
-      5:5-5:35::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
-  app_b_unused_param: 1
-      5:5-5:6::[Error] [L1268] variable 'X' is unused
-  custom_function_matches: 3
-      13:5-13:22::[Warning] [W0017] Function 'excluded:function/0' is undefined.
-      14:5-14:26::[Warning] [W0017] Function 'not_excluded:function/0' is undefined.
-      15:5-15:15::[Warning] [W0017] Function 'cross:call/0' is undefined.
-  expression_updates_literal: 2
-      7:1-7:6::[Error] [L1309] missing specification for function a_fun/0
-      8:7-9:16::[Error] [L1318] expression updates a literal
-  spelling: 1
-      2:2-2:10::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
+Diagnostics reported:
+Reporting all diagnostics codes
+app_a/src/app_a.erl:12:1-12:4::[Error] [L1230] function bar/0 is unused
+app_a/src/app_a.erl:13:5-13:14::[Warning] [W0026] Function 'app_a:baz/2' is not exported.
+app_a/src/app_a.erl:16:1-16:4::[Error] [L1230] function baz/2 is unused
+app_a/src/app_a.erl:20:1-20:4::[Error] [L1230] function bat/2 is unused
+app_a/src/app_a.erl:5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
+app_a/src/app_a.erl:8:7-8:8::[Warning] [W0018] Unexpected ';'
+app_a/src/app_a.erl:9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
+app_a/src/app_a_unused_param.erl:5:5-5:6::[Error] [L1268] variable 'X' is unused
+app_a/src/custom_function_matches.erl:13:5-13:22::[Warning] [W0017] Function 'excluded:function/0' is undefined.
+app_a/src/custom_function_matches.erl:14:5-14:26::[Warning] [W0017] Function 'not_excluded:function/0' is undefined.
+app_a/src/custom_function_matches.erl:15:5-15:15::[Warning] [W0017] Function 'cross:call/0' is undefined.
+app_a/src/expression_updates_literal.erl:7:1-7:6::[Error] [L1309] missing specification for function a_fun/0
+app_a/src/expression_updates_literal.erl:8:7-9:16::[Error] [L1318] expression updates a literal
+app_a/src/spelling.erl:2:2-2:10::[Error] [W0013] misspelled attribute, saw 'dyalizer' but expected 'dialyzer'
+app_b/src/app_b.erl:5:5-5:35::[Warning] [W0011] module `app_b` belongs to app `app_b`, but reads env for `misc`
+app_b/src/app_b_unused_param.erl:5:5-5:6::[Error] [L1268] variable 'X' is unused
\ No newline at end of file
diff --git a/crates/elp/src/resources/test/xref/unavailable_type.stdout b/crates/elp/src/resources/test/xref/unavailable_type.stdout
index 1521d13194..7064c359ff 100644
--- a/crates/elp/src/resources/test/xref/unavailable_type.stdout
+++ b/crates/elp/src/resources/test/xref/unavailable_type.stdout
@@ -1,6 +1,5 @@
 Reporting all diagnostics codes
 module specified: unavailable_type
-Diagnostics reported in 1 modules:
-  unavailable_type: 2
-      10:43-10:58::[Warning] [W0059] The type 'app_c:my_type_c/0' is defined in application 'app_c', but the application is not a dependency of 'app_a' (defined in 'fbcode//whatsapp/elp/test_projects/xref:app_a').
-      6:16-6:31::[Warning] [W0059] The type 'app_c:my_type_c/0' is defined in application 'app_c', but the application is not a dependency of 'app_a' (defined in 'fbcode//whatsapp/elp/test_projects/xref:app_a').
+Diagnostics reported:
+app_a/src/unavailable_type.erl:10:43-10:58::[Warning] [W0059] The type 'app_c:my_type_c/0' is defined in application 'app_c', but the application is not a dependency of 'app_a' (defined in 'fbcode//whatsapp/elp/test_projects/xref:app_a').
+app_a/src/unavailable_type.erl:6:16-6:31::[Warning] [W0059] The type 'app_c:my_type_c/0' is defined in application 'app_c', but the application is not a dependency of 'app_a' (defined in 'fbcode//whatsapp/elp/test_projects/xref:app_a').

From 77e0ff9bc824bbb6dd408cdc023fa64088784afd Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 9 Dec 2025 08:47:59 -0800
Subject: [PATCH 334/394] Remove `pre_parse_for_speed` from `elp eqwalize-all`

Summary:
Measurements show it makes no difference to the run-time of `elp eqwalize-all`, and it is an impediment to providing streaming output.

Without this, parsing happens on-demand as files are processed by eqwalizer, so we can generate output as each is processed.

Reviewed By: robertoaloi

Differential Revision: D88379872

fbshipit-source-id: 5110788ac5a7ef471038db9de0abfa00bbe7312f
---
 crates/elp/src/bin/eqwalizer_cli.rs | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/crates/elp/src/bin/eqwalizer_cli.rs b/crates/elp/src/bin/eqwalizer_cli.rs
index c946babe42..a91bcdd869 100644
--- a/crates/elp/src/bin/eqwalizer_cli.rs
+++ b/crates/elp/src/bin/eqwalizer_cli.rs
@@ -482,8 +482,6 @@ fn eqwalize(
         bail!("No files to eqWAlize detected")
     }
 
-    pre_parse_for_speed(reporter, analysis.clone(), &file_ids);
-
     let files_count = file_ids.len();
     let pb = reporter.progress(files_count as u64, "EqWAlizing");
     let output = loaded.with_eqwalizer_progress_bar(pb.clone(), move |analysis| {
@@ -602,17 +600,6 @@ fn eqwalize(
     }
 }
 
-fn pre_parse_for_speed(reporter: &dyn Reporter, analysis: Analysis, file_ids: &[FileId]) {
-    let pb = reporter.progress(file_ids.len() as u64, "Parsing modules");
-    file_ids
-        .par_iter()
-        .progress_with(pb.clone())
-        .for_each_with(analysis, |analysis, &file_id| {
-            let _ = analysis.module_ast(file_id);
-        });
-    pb.finish();
-}
-
 fn set_eqwalizer_config(loaded: &mut LoadResult) {
     let config = EqwalizerConfig::default();
     let db = loaded.analysis_host.raw_database_mut();

From 1a086de994a226e81e870e836a042880ea6cb288 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 9 Dec 2025 08:47:59 -0800
Subject: [PATCH 335/394] BE: args.color

Summary: Move the decision-making logic for choosing to output color in CLI usage into a single place.

Reviewed By: TD5

Differential Revision: D88377007

fbshipit-source-id: 398552dba1547a9e9c0b5e6cd38808316280dd7a
---
 crates/elp/src/bin/args.rs    | 15 +++++++++++++++
 crates/elp/src/bin/main.rs    | 15 +++------------
 crates/elp/src/bin/ssr_cli.rs | 35 +++++++++--------------------------
 3 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index 906ebf09f0..0f057ce1e6 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -11,6 +11,7 @@
 use std::cmp::Ordering;
 use std::env;
 use std::fs;
+use std::io::IsTerminal;
 use std::path::PathBuf;
 
 use anyhow::Result;
@@ -540,6 +541,20 @@ impl Args {
             BuckQueryConfig::BuildGeneratedCode
         }
     }
+
+    /// Determine if color should be used based on the --color argument
+    pub fn should_use_color(&self) -> bool {
+        match self.color.as_deref() {
+            Some("always") => true,
+            Some("never") => false,
+            Some("auto") | None => {
+                // Check NO_COLOR environment variable - if set (regardless of value), disable color
+                // Also check if stdout is connected to a TTY
+                env::var("NO_COLOR").is_err() && std::io::stdout().is_terminal()
+            }
+            _ => false, // Should be caught by the guard, but handle anyway
+        }
+    }
 }
 
 pub fn command() -> impl Parser<Command> {
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 59089b1c6e..2ecb900759 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -10,7 +10,6 @@
 
 use std::env;
 use std::fs;
-use std::io::IsTerminal;
 use std::io::Write;
 use std::path::PathBuf;
 use std::process;
@@ -67,16 +66,7 @@ const THREAD_STACK_SIZE: usize = 10_000_000;
 fn main() {
     let _timer = timeit!("main");
     let args = args::args().run();
-    let use_color = match args.color.as_deref() {
-        Some("always") => true,
-        Some("never") => false,
-        Some("auto") | None => {
-            // Check NO_COLOR environment variable - if set (regardless of value), disable color
-            // Also check if stdout is connected to a TTY
-            env::var("NO_COLOR").is_err() && std::io::stdout().is_terminal()
-        }
-        _ => false, // Should be caught by the guard, but handle anyway
-    };
+    let use_color = args.should_use_color();
     let mut cli: Box<dyn cli::Cli> = if use_color {
         Box::new(cli::Real::default())
     } else {
@@ -134,6 +124,7 @@ fn try_main(cli: &mut dyn Cli, args: Args) -> Result<()> {
         setup_thread_pool();
     });
     let query_config = args.query_config();
+    let use_color = args.should_use_color();
     match args.command {
         args::Command::RunServer(_) => run_server(logger)?,
         args::Command::ParseAll(args) => erlang_service_cli::parse_all(&args, cli, &query_config)?,
@@ -152,7 +143,7 @@ fn try_main(cli: &mut dyn Cli, args: Args) -> Result<()> {
         args::Command::ProjectInfo(args) => build_info_cli::save_project_info(args, &query_config)?,
         args::Command::Lint(args) => lint_cli::run_lint_command(&args, cli, &query_config)?,
         args::Command::Ssr(ssr_args) => {
-            ssr_cli::run_ssr_command(&ssr_args, cli, &query_config, &args.color)?
+            ssr_cli::run_ssr_command(&ssr_args, cli, &query_config, use_color)?
         }
         args::Command::GenerateCompletions(args) => {
             let instructions = args::gen_completions(&args.shell);
diff --git a/crates/elp/src/bin/ssr_cli.rs b/crates/elp/src/bin/ssr_cli.rs
index 1458e2eb27..f5729034b2 100644
--- a/crates/elp/src/bin/ssr_cli.rs
+++ b/crates/elp/src/bin/ssr_cli.rs
@@ -9,7 +9,6 @@
  */
 
 use std::fs;
-use std::io::IsTerminal;
 use std::path::Path;
 use std::str;
 use std::thread;
@@ -66,7 +65,7 @@ pub fn run_ssr_command(
     args: &Ssr,
     cli: &mut dyn Cli,
     query_config: &BuckQueryConfig,
-    global_color: &Option<String>,
+    use_color: bool,
 ) -> Result<()> {
     let start_time = SystemTime::now();
     let memory_start = MemoryUsage::now();
@@ -130,7 +129,7 @@ pub fn run_ssr_command(
     let mut loaded = load_project(args, cli, query_config)?;
     telemetry::report_elapsed_time("ssr operational", start_time);
 
-    let r = run_ssr(cli, &mut loaded, &diagnostics_config, args, global_color);
+    let r = run_ssr(cli, &mut loaded, &diagnostics_config, args, use_color);
 
     telemetry::report_elapsed_time("ssr done", start_time);
 
@@ -150,7 +149,7 @@ pub fn run_ssr(
     loaded: &mut LoadResult,
     diagnostics_config: &DiagnosticsConfig,
     args: &Ssr,
-    global_color: &Option<String>,
+    use_color: bool,
 ) -> Result<()> {
     let analysis = loaded.analysis();
     let (file_id, name) = match &args.module {
@@ -196,7 +195,7 @@ pub fn run_ssr(
                 &project_id,
                 diagnostics_config,
                 args,
-                global_color,
+                use_color,
                 loaded,
                 &mut match_count,
             )?;
@@ -210,7 +209,7 @@ pub fn run_ssr(
             }
             if let Some(diag) = do_parse_one(&analysis, diagnostics_config, file_id, &name, args)? {
                 match_count = 1;
-                print_single_result(cli, loaded, &diag, args, global_color)?;
+                print_single_result(cli, loaded, &diag, args, use_color)?;
             }
         }
         (Some(file_id), _) => {
@@ -236,7 +235,7 @@ fn do_parse_all_streaming(
     project_id: &ProjectId,
     config: &DiagnosticsConfig,
     args: &Ssr,
-    global_color: &Option<String>,
+    use_color: bool,
     loaded: &mut LoadResult,
     match_count: &mut usize,
 ) -> Result<()> {
@@ -283,7 +282,7 @@ fn do_parse_all_streaming(
     // Process and print results as they arrive from the channel
     for result in rx {
         *match_count += 1;
-        print_single_result(cli, loaded, &result, args, global_color)?;
+        print_single_result(cli, loaded, &result, args, use_color)?;
     }
 
     Ok(())
@@ -294,7 +293,7 @@ fn print_single_result(
     loaded: &mut LoadResult,
     result: &(String, FileId, Vec<diagnostics::Diagnostic>),
     args: &Ssr,
-    global_color: &Option<String>,
+    use_color: bool,
 ) -> Result<()> {
     let (name, file_id, diags) = result;
 
@@ -352,9 +351,7 @@ fn print_single_result(
 
             // Only show source context if --show-source or --show-source-markers is set
             if show_source {
-                let should_show_color = should_use_color(global_color);
-
-                if should_show_color {
+                if use_color {
                     print_source_with_context(
                         diag,
                         &loaded.analysis(),
@@ -554,20 +551,6 @@ fn should_show_group_separator(args: &Ssr, has_context: bool) -> Option<String>
     )
 }
 
-/// Determine if color should be used based on the global --color argument
-fn should_use_color(color: &Option<String>) -> bool {
-    match color.as_deref() {
-        Some("always") => true,
-        Some("never") => false,
-        Some("auto") | None => {
-            // Check NO_COLOR environment variable - if set (regardless of value), disable color
-            // Also check if stdout is connected to a TTY
-            std::env::var("NO_COLOR").is_err() && std::io::stdout().is_terminal()
-        }
-        _ => false, // Should be caught by the guard, but handle anyway
-    }
-}
-
 /// Print source code context with the specified before/after context lines
 fn print_source_with_context(
     diag: &diagnostics::Diagnostic,

From f6b54832d7464fd23640951712f76e7d402fcfc9 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 10 Dec 2025 03:29:08 -0800
Subject: [PATCH 336/394] Convert malformed_include linter to use a trait

Summary: Mechanical conversion, no functional change.

Reviewed By: alanz

Differential Revision: D88623867

fbshipit-source-id: 2d1f17430a44a705f22ec542e242165beb577285
---
 crates/ide/src/diagnostics/unspecific_include.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crates/ide/src/diagnostics/unspecific_include.rs b/crates/ide/src/diagnostics/unspecific_include.rs
index 223e5a0064..f7405c798a 100644
--- a/crates/ide/src/diagnostics/unspecific_include.rs
+++ b/crates/ide/src/diagnostics/unspecific_include.rs
@@ -152,6 +152,7 @@ fn replace_include_path(
 #[cfg(test)]
 mod tests {
     use elp_ide_db::DiagnosticCode;
+    // @fb-only
     use expect_test::Expect;
     use expect_test::expect;
 
@@ -168,9 +169,12 @@ mod tests {
         tests::check_filtered_diagnostics(fixture, &filter)
     }
 
+    #[rustfmt::skip]
     #[track_caller]
     fn check_fix(fixture_before: &str, fixture_after: Expect) {
-        let config = DiagnosticsConfig::default().disable(DiagnosticCode::UnusedInclude);
+        let config = DiagnosticsConfig::default()
+            // @fb-only
+            .disable(DiagnosticCode::UnusedInclude);
         tests::check_fix_with_config(config, fixture_before, fixture_after)
     }
 

From 4df5a7ae8169fb57eb968d6ec894f43fd1591a8c Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 10 Dec 2025 03:45:29 -0800
Subject: [PATCH 337/394] Bump OSS VS Code extension version to 0.45.0

Summary: In preparation for OSS release.

Reviewed By: alanz

Differential Revision: D88839310

fbshipit-source-id: f489b3e503c41e8302193cbdc78a46859967cbda
---
 editors/code/package-lock.json | 4 ++--
 editors/code/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 5e28184214..66d227ce12 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "erlang-language-platform",
-  "version": "0.44.0",
+  "version": "0.45.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "erlang-language-platform",
-      "version": "0.44.0",
+      "version": "0.45.0",
       "hasInstallScript": true,
       "license": "Apache2",
       "devDependencies": {
diff --git a/editors/code/package.json b/editors/code/package.json
index d54a4de805..ae34cde798 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -3,7 +3,7 @@
   "description": "Erlang language server",
   "author": "Meta Platforms, Inc",
   "license": "Apache2",
-  "version": "0.44.0",
+  "version": "0.45.0",
   "icon": "images/elp-logo-color.png",
   "homepage": "https://whatsapp.github.io/erlang-language-platform/",
   "repository": {

From 6dbefe9bd0b40ad5481a67311b27575ba8377cb5 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 10 Dec 2025 03:50:13 -0800
Subject: [PATCH 338/394] Add Homebrew installation instructions for Mac users

Summary:
Mac users can now install ELP using the dedicated Homebrew formula at https://formulae.brew.sh/formula/erlang-language-platform. This provides a simpler installation method compared to downloading binaries manually or building from source.

Updated the installation documentation to highlight Homebrew as the easiest installation method for Mac users, placing it before the binary installation instructions.

Reviewed By: TheGeorge

Differential Revision: D88836106

fbshipit-source-id: 4df1340e7fe29e56e29e089d840f56092864b503
---
 website/docs/get-started/install.md | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/website/docs/get-started/install.md b/website/docs/get-started/install.md
index 4c8adb7bb1..74cc3b9159 100644
--- a/website/docs/get-started/install.md
+++ b/website/docs/get-started/install.md
@@ -4,9 +4,26 @@ sidebar_position: 2
 
 # Install ELP
 
-The easiest way to install to ELP is [from binary](#from-binary). It is also
+The easiest way to install ELP on Mac is [using Homebrew](#using-homebrew-mac).
+For other platforms, you can install [from binary](#from-binary). It is also
 possible to compile it [from source](#from-source).
 
+## Using Homebrew (Mac)
+
+Mac users can install ELP using the dedicated Homebrew formula:
+
+```
+brew install erlang-language-platform
+```
+
+This will install the latest version of ELP and make it available in your PATH.
+
+For more information about the Homebrew formula, visit:
+https://formulae.brew.sh/formula/erlang-language-platform
+
+Follow [these steps](cli.md#verify-elp-is-correctly-installed) to verify ELP is
+correctly installed.
+
 ## From Binary
 
 Visit our

From a4ded31602cdd2d2a2c7ed29face13a31c3f630a Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 10 Dec 2025 07:00:19 -0800
Subject: [PATCH 339/394] Bump OSS VS Code extension to 0.46.0

Summary:
Several issues were affecting GitHub CI, preventing the extension to be correctly published to the marketplace.
A new release will therefore be necessary, hence the new bump.

Reviewed By: alanz

Differential Revision: D88848737

fbshipit-source-id: f4c31f1bbc5bb3aeec7359c8c8a5d1faeb0c2f9e
---
 editors/code/package-lock.json | 4 ++--
 editors/code/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 66d227ce12..1adcc191a7 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "erlang-language-platform",
-  "version": "0.45.0",
+  "version": "0.46.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "erlang-language-platform",
-      "version": "0.45.0",
+      "version": "0.46.0",
       "hasInstallScript": true,
       "license": "Apache2",
       "devDependencies": {
diff --git a/editors/code/package.json b/editors/code/package.json
index ae34cde798..ef5b9a1700 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -3,7 +3,7 @@
   "description": "Erlang language server",
   "author": "Meta Platforms, Inc",
   "license": "Apache2",
-  "version": "0.45.0",
+  "version": "0.46.0",
   "icon": "images/elp-logo-color.png",
   "homepage": "https://whatsapp.github.io/erlang-language-platform/",
   "repository": {

From a239a322cf9f5584d620429d9efbed697e34ed88 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 10 Dec 2025 07:03:12 -0800
Subject: [PATCH 340/394] Manually bump eqwalizer to the latest available
 version (#139)

Summary: Pull Request resolved: https://github.com/whatsapp/erlang-language-platform/pull/139

Reviewed By: alanz

Differential Revision: D88849209

Pulled By: robertoaloi

fbshipit-source-id: f3433841b248804dde41fca866680f8c6eaef338
---
 eqwalizer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eqwalizer b/eqwalizer
index 1e0f24c5b8..a835ce03b0 160000
--- a/eqwalizer
+++ b/eqwalizer
@@ -1 +1 @@
-Subproject commit 1e0f24c5b8f2b023fdd53d4571c3240430d31f69
+Subproject commit a835ce03b0308a9869af964e35a24466b49cda51

From ed8820b3b22c5ee603d49db6dd145734343e0765 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 10 Dec 2025 07:06:17 -0800
Subject: [PATCH 341/394] Update Intel runners to mac-15-interl

Summary:
The Mac OS 13 Ventura runner images are [deprecated](https://github.com/actions/runner-images/issues/13046).
This results in a [CI error](https://github.com/WhatsApp/erlang-language-platform/actions/runs/20099328252).

This applies the recommended remediation.

Reviewed By: alanz

Differential Revision: D88848551

fbshipit-source-id: 201fa45e4834b082e84a150343042ae5a6104189
---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0a2bb2508f..cf3834b5ad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        platform-arch: [ubuntu-22.04-x64, ubuntu-22.04-arm, macos-13-x64, macos-latest-arm, windows-2022-x64]
+        platform-arch: [ubuntu-22.04-x64, ubuntu-22.04-arm, macos-15-x64, macos-latest-arm, windows-2022-x64]
         otp-version: [26.2, 27.3, 28.0]
         include:
           - otp-version: 26.2
@@ -55,8 +55,8 @@ jobs:
             os: linux
             target: aarch64-unknown-linux-gnu
             vscode-target: linux-arm64
-          - platform-arch: macos-13-x64
-            platform: macos-13
+          - platform-arch: macos-15-x64
+            platform: macos-15-intel
             os: macos
             target: x86_64-apple-darwin
             vscode-target: darwin-x64

From 29c017c565bf30af19bf98e312ec9632c4dc1266 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 10 Dec 2025 07:06:30 -0800
Subject: [PATCH 342/394] Polish extension README, improve package.json for
 discoverability

Summary:
* Polish extension README (which is rendered [here](https://marketplace.visualstudio.com/items?itemName=erlang-language-platform.erlang-language-platform)).
* Set `displayName` (see [reference](https://code.visualstudio.com/api/references/extension-manifest)) to improve discoverability and hopefully ranking
* Update description
* Add `erlang` keyword to improve discoverability/ranking

Reviewed By: alanz

Differential Revision: D88847040

fbshipit-source-id: e2185e790f0711dd383d6cc51ad56716eeebb61e
---
 editors/code/README.md    | 85 ++++++++++++++++++++++++++++++++++-----
 editors/code/package.json |  6 ++-
 2 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/editors/code/README.md b/editors/code/README.md
index b03ce757f2..ff5663d5ca 100644
--- a/editors/code/README.md
+++ b/editors/code/README.md
@@ -1,19 +1,82 @@
 # Erlang Language Platform
 
-Provide support for the [Erlang](https://www.erlang.org/) Programming Language.
+The **Erlang Language Platform (ELP)** is a modern Language Server Protocol
+(LSP) implementation for Erlang, developed by WhatsApp. ELP provides
+comprehensive IDE support for Erlang development, bringing features you'd expect
+from modern development tools to the Erlang ecosystem.
+
+Built with scalability and performance in mind, ELP uses incremental analysis to
+handle large codebases efficiently, making it suitable for projects of any size.
 
 ## Features
 
-* Syntax Highlighting
-* Go To Definition
-* Find References
-* Auto-completion
-* Call Hierarchy
-* Signature Help
-* Diagnostics
-* Inlay Hints
-* ...
+### Code Intelligence
+
+- **📍 Go To Definition** - Jump to function, type, record definitions, etc
+- **🔍 Find References** - Find all usages of functions, types, and variables
+- **✨ Auto-completion** - Intelligent code completion for functions, variables,
+  modules and more
+- **🏷️ Hover Information** - View documentation and type information on hover
+- **📞 Call Hierarchy** - Explore caller/callee relationships
+- **✍️ Signature Help** - Parameter hints while typing function calls
+- **📋 Inlay Hints** - Display parameter names inline
+- **🎨 Syntax Highlighting** - Full Erlang syntax support
+- **📝 Code Lenses** - Inline actions for running tests and debugging
+- **🔄 Workspace Symbol Search** - Quickly find symbols across your project
+
+### Code Quality
+
+- **🔧 Diagnostics** - Real-time error and warning detection
+- **💡 Code Actions** - Quick fixes and refactoring suggestions
+- **🧪 Eqwalizer Integration** - Type checking with
+  [Eqwalizer](https://github.com/WhatsApp/eqwalizer)
+
+### Debugging & Testing
+
+- **🐞 Integrated Debugger** - Debug Erlang applications with breakpoints and
+  variable inspection
 
 ## Documentation
 
-See https://whatsapp.github.io/erlang-language-platform/ for more information.
+For comprehensive documentation, visit:
+
+- **📚
+  [Official Documentation](https://whatsapp.github.io/erlang-language-platform/)**
+- **🚀
+  [Getting Started Guide](https://whatsapp.github.io/erlang-language-platform/docs/get-started/)**
+- **⚙️
+  [Configuration Reference](https://whatsapp.github.io/erlang-language-platform/docs/configuration/)**
+- **❓ [FAQ](https://whatsapp.github.io/erlang-language-platform/docs/faq/)**
+
+## Contributing
+
+We welcome contributions! Please see our
+[Contributing Guide](https://github.com/WhatsApp/erlang-language-platform/blob/main/CONTRIBUTING.md)
+for details.
+
+## Community & Support
+
+- **🐛 Issues**:
+  [GitHub Issues](https://github.com/WhatsApp/erlang-language-platform/issues)
+- **💬 Discussions**:
+  [GitHub Discussions](https://github.com/WhatsApp/erlang-language-platform/discussions)
+
+## License
+
+ELP is dual-licensed under:
+
+- [Apache License 2.0](https://github.com/WhatsApp/erlang-language-platform/blob/main/LICENSE-APACHE)
+- [MIT License](https://github.com/WhatsApp/erlang-language-platform/blob/main/LICENSE-MIT)
+
+## Acknowledgments
+
+ELP was designed at **WhatsApp** and inspired by the
+[Rust Analyzer](https://rust-analyzer.github.io/) project. Special thanks to all
+[contributors](https://github.com/WhatsApp/erlang-language-platform/graphs/contributors)
+who have helped make ELP better.
+
+---
+
+<p align="center">
+  Made with ❤️ by the WhatsApp team
+</p>
diff --git a/editors/code/package.json b/editors/code/package.json
index ef5b9a1700..ebf55e7c86 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -1,6 +1,7 @@
 {
   "name": "erlang-language-platform",
-  "description": "Erlang language server",
+  "displayName": "Erlang Language Platform",
+  "description": "Erlang Language Support for VS Code, by WhatsApp.",
   "author": "Meta Platforms, Inc",
   "license": "Apache2",
   "version": "0.46.0",
@@ -20,7 +21,8 @@
     "Testing"
   ],
   "keywords": [
-    "elp"
+    "elp",
+    "erlang"
   ],
   "engines": {
     "vscode": "^1.75.0"

From 0aef1f4005a6ac63aeb017f93c630841e083367f Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Wed, 10 Dec 2025 08:08:55 -0800
Subject: [PATCH 343/394] Update fixtures for OTP 26/28

Summary: As title.

Reviewed By: robertoaloi, TD5

Differential Revision: D88853775

fbshipit-source-id: 8954794c428f6f1139ebe4f393ed80d1836a2784
---
 .../check/custom-OTP-26.pretty                | 746 +-----------------
 .../check/custom-OTP-28.pretty                | 746 +-----------------
 2 files changed, 28 insertions(+), 1464 deletions(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-26.pretty
index 370f7689e9..efc8c47aa0 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-26.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-26.pretty
@@ -37,12 +37,6 @@ Because in the expression's type:
   However the following candidate: [dynamic()]
   Differs from the expected type:  tuple()
 
------------------------------- Detailed message ------------------------------
-
-  {atom(), string()} | [dynamic()] is not compatible with tuple()
-  because
-  [dynamic()] is not compatible with tuple()
-
 error: index_out_of_bounds (See https://fb.me/eqwalizer_errors#index_out_of_bounds)
    ┌─ check/src/custom.erl:48:5
    │
@@ -74,12 +68,6 @@ Because in the expression's type:
   However the following candidate: number()
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  atom() | number() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/custom.erl:68:5
    │
@@ -96,12 +84,6 @@ Because in the expression's type:
   However the following candidate: number()
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  dynamic() | number() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/custom.erl:86:5
    │
@@ -118,12 +100,6 @@ Because in the expression's type:
   However the following candidate: string()
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  'foo' | 'ok' | 'error' | number() | string() is not compatible with atom()
-  because
-  string() is not compatible with atom()
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
    ┌─ check/src/custom.erl:91:1
    │  
@@ -202,12 +178,6 @@ Because in the expression's type:
   However the following candidate: number()
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  number() | atom() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:200:5
     │
@@ -224,12 +194,6 @@ Because in the expression's type:
   However the following candidate: number()
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  number() | atom() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:206:5
     │    
@@ -249,15 +213,6 @@ Because in the expression's type:
     Differs from the expected type:  number()
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {atom(), 'undefined' | number()} is not compatible with {atom(), number()}
-  because
-  'undefined' | number() is not compatible with number()
-  because
-  'undefined' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:221:27
     │
@@ -274,14 +229,6 @@ Because in the expression's type:
   However the following candidate: 'c_v'
   Differs from the expected type:  'a_v' | 'b_v'
 
------------------------------- Detailed message ------------------------------
-
-  'a_v' | 'c_v' is not compatible with 'a_v' | 'b_v'
-  because
-  'c_v' is not compatible with 'a_v' | 'b_v'
-  because
-  'c_v' is not compatible with 'a_v'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:233:27
     │
@@ -298,14 +245,6 @@ Because in the expression's type:
   However the following candidate: 'c_v'
   Differs from the expected type:  'a_v' | 'b_v' | 'undefined'
 
------------------------------- Detailed message ------------------------------
-
-  'undefined' | 'a_v' | 'c_v' is not compatible with 'a_v' | 'b_v' | 'undefined'
-  because
-  'c_v' is not compatible with 'a_v' | 'b_v' | 'undefined'
-  because
-  'c_v' is not compatible with 'a_v'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:309:5
     │
@@ -362,28 +301,13 @@ Because in the expression's type:
   However the following candidate: 'a'
   Differs from the expected type:  #{term() => term()} | maps:iterator()
 
------------------------------- Detailed message ------------------------------
-
-  #{K => V} | 'a' is not compatible with #{term() => term()} | maps:iterator()
-  because
-  'a' is not compatible with #{term() => term()} | maps:iterator()
-  because
-  'a' is not compatible with #{term() => term()}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:425:20
     │
 425 │     maps:filter(F, non_kv),
-    │                    ^^^^^^
-    │                    │
-    │                    'non_kv'.
+    │                    ^^^^^^ 'non_kv'.
 Expression has type:   'non_kv'
 Context expected type: #{term() => term()} | maps:iterator()
-    │                    
-
-  'non_kv' is not compatible with #{term() => term()} | maps:iterator()
-  because
-  'non_kv' is not compatible with #{term() => term()}
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:454:5
@@ -403,13 +327,6 @@ Because in the expression's type:
     Context expects type: boolean()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{number() => pid()} is not compatible with #{number() => boolean()}
-  the default associations are not compatible
-  because
-  pid() is not compatible with boolean()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:474:14
     │
@@ -451,29 +368,13 @@ Because in the expression's type:
     Context expects type: 'a'
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{a := boolean(), b := boolean()} is not compatible with #{a => 'a', b => 'b'}
-  because
-  at key `a`:
-  #{a := boolean(), b := boolean()} is not compatible with #{a => 'a', b => 'b'}
-  because
-  boolean() is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:503:17
     │
 503 │     maps:map(F, non_kv),
-    │                 ^^^^^^
-    │                 │
-    │                 'non_kv'.
+    │                 ^^^^^^ 'non_kv'.
 Expression has type:   'non_kv'
 Context expected type: #{term() => term()} | maps:iterator()
-    │                 
-
-  'non_kv' is not compatible with #{term() => term()} | maps:iterator()
-  because
-  'non_kv' is not compatible with #{term() => term()}
 
 error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
     ┌─ check/src/custom.erl:538:9
@@ -502,14 +403,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [[[]]] is not compatible with [number() | 'a' | 'b']
-  because
-  [[]] is not compatible with number() | 'a' | 'b'
-  because
-  [[]] is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:545:28
     │
@@ -531,14 +424,6 @@ Because in the expression's type:
     ]
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [[[[]]]] is not compatible with [[[]]]
-  because
-  [[[]]] is not compatible with [[]]
-  because
-  [[]] is not compatible with []
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:552:5
     │  
@@ -555,16 +440,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     ┌─ check/src/custom.erl:555:9
     │
 555 │         non_kv
-    │         ^^^^^^
-    │         │
-    │         'non_kv'.
+    │         ^^^^^^ 'non_kv'.
 Expression has type:   'non_kv'
 Context expected type: #{term() => term()} | maps:iterator()
-    │         
-
-  'non_kv' is not compatible with #{term() => term()} | maps:iterator()
-  because
-  'non_kv' is not compatible with #{term() => term()}
 
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ check/src/custom.erl:560:1
@@ -606,12 +484,6 @@ Because in the expression's type:
   However the following candidate: []
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  [] | atom() is not compatible with atom()
-  because
-  [] is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:601:9
     │
@@ -682,30 +554,13 @@ Because in the expression's type:
     Differs from the expected type:  binary()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [number() | binary() | atom()] is not compatible with [binary()] | [number()] | [atom()]
-  because
-  [number() | binary() | atom()] is not compatible with [binary()]
-  because
-  number() | binary() | atom() is not compatible with binary()
-  because
-  number() is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:671:41
     │
 671 │ maps_to_list_7_neg(Num) -> maps:to_list(Num).
-    │                                         ^^^
-    │                                         │
-    │                                         Num.
+    │                                         ^^^ Num.
 Expression has type:   number()
 Context expected type: #{term() => term()} | maps:iterator()
-    │                                         
-
-  number() is not compatible with #{term() => term()} | maps:iterator()
-  because
-  number() is not compatible with #{term() => term()}
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:675:25
@@ -723,13 +578,6 @@ Because in the expression's type:
   Context expects type: #{...} (no default association)
   The expected map has no default association while the type of the expression has one.
 
------------------------------- Detailed message ------------------------------
-
-  #{'b' | 'a' | 'c' => number() | string() | atom()} is not compatible with #{a => string(), b => number(), c => atom()}
-  key a is not present in the former map but is incompatible with its default association
-  because
-  number() | string() | atom() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:679:25
     │
@@ -746,13 +594,6 @@ Because in the expression's type:
   Context expects type: #{...} (no default association)
   The expected map has no default association while the type of the expression has one.
 
------------------------------- Detailed message ------------------------------
-
-  #{'b' | 'a' | 'c' => number() | string() | atom()} is not compatible with #{a => string(), b => number() | boolean(), c => atom()}
-  key a is not present in the former map but is incompatible with its default association
-  because
-  number() | string() | atom() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:683:25
     │
@@ -769,10 +610,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., b := ..., ...}
   The type of the expression is missing the following required keys: a, b.
 
------------------------------- Detailed message ------------------------------
-
-keys `a`, `b` are declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:697:44
     │
@@ -797,13 +634,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., b := ..., ...}
   The type of the expression is missing the following required keys: a, b.
 
------------------------------- Detailed message ------------------------------
-
-  #{'a' | 'b' => atom() | number()} is not compatible with #{a := atom(), b := number()} | #{a := atom()}
-  because
-  #{'a' | 'b' => atom() | number()} is not compatible with #{a := atom(), b := number()}
-  keys `a`, `b` are declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:721:9
     │
@@ -822,14 +652,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((binary()) -> [number()]) is not compatible with fun((number()) -> boolean() | {'true', term()})
-  because
-  [number()] is not compatible with boolean() | {'true', term()}
-  because
-  [number()] is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:739:20
     │
@@ -846,12 +668,6 @@ Because in the expression's type:
   Context expects type: 'false' | 'true' | {'true', term()}
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-  'wrong_ret' is not compatible with boolean() | {'true', term()}
-  because
-  'wrong_ret' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:749:9
     │
@@ -876,14 +692,6 @@ Because in the expression's type:
   However the following candidate: 'wrong_ret'
   Differs from the expected type:  'false' | 'true' | {'true', term()}
 
------------------------------- Detailed message ------------------------------
-
-  {'true', 'a'} | 'wrong_ret' is not compatible with boolean() | {'true', term()}
-  because
-  'wrong_ret' is not compatible with boolean() | {'true', term()}
-  because
-  'wrong_ret' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:827:9
     │    
@@ -902,16 +710,6 @@ Because in the expression's type:
     Differs from the expected type:  'false' | 'true' | ['a' | 'b']
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun(('a' | 'b') -> ['a'] | 'true' | 'wrong_ret') is not compatible with fun(('a' | 'b') -> boolean() | ['a' | 'b'])
-  because
-  ['a'] | 'true' | 'wrong_ret' is not compatible with boolean() | ['a' | 'b']
-  because
-  'wrong_ret' is not compatible with boolean() | ['a' | 'b']
-  because
-  'wrong_ret' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:829:20
     │
@@ -928,12 +726,6 @@ Because in the expression's type:
   Context expects type: 'false' | 'true' | ['a' | 'b']
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-  'wrong_ret' is not compatible with boolean() | ['a' | 'b']
-  because
-  'wrong_ret' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:837:9
     │    
@@ -951,15 +743,6 @@ Because in the expression's type:
     Differs from the expected type:  'false' | 'true' | [Item]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((dynamic()) -> {'true', 'a'} | 'true') is not compatible with fun((Item) -> boolean() | [Item])
-  because
-  {'true', 'a'} | 'true' is not compatible with boolean() | [Item]
-  because
-  {'true', 'a'} is not compatible with boolean() | [Item]
-  expected union does not contain any tuple type of size 2
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:837:20
     │
@@ -976,10 +759,6 @@ Because in the expression's type:
   Context expects type: 'false' | 'true' | [dynamic()]
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-expected union does not contain any tuple type of size 2
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:839:9
     │
@@ -995,12 +774,6 @@ Because in the expression's type:
   Here the type is:     'not_a_queue'
   Context expects type: {[Item], [Item]}
 
------------------------------- Detailed message ------------------------------
-
-  'not_a_queue' is not compatible with queue:queue(Item)
-  because
-  'not_a_queue' is not compatible with {[Item], [Item]}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:839:9
     │
@@ -1016,12 +789,6 @@ Because in the expression's type:
   Here the type is:     'not_a_queue'
   Context expects type: {[dynamic()], [dynamic()]}
 
------------------------------- Detailed message ------------------------------
-
-  'not_a_queue' is not compatible with queue:queue(dynamic())
-  because
-  'not_a_queue' is not compatible with {[dynamic()], [dynamic()]}
-
 error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
     ┌─ check/src/custom.erl:846:9
     │  
@@ -1053,15 +820,6 @@ Because in the expression's type:
     Differs from the expected type:  'false' | 'true' | ['a' | 'b']
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun(('a' | 'b') -> ['a'] | 'false' | {'true', 'a'}) is not compatible with fun(('a' | 'b') -> boolean() | ['a' | 'b'])
-  because
-  ['a'] | 'false' | {'true', 'a'} is not compatible with boolean() | ['a' | 'b']
-  because
-  {'true', 'a'} is not compatible with boolean() | ['a' | 'b']
-  expected union does not contain any tuple type of size 2
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:857:20
     │
@@ -1078,10 +836,6 @@ Because in the expression's type:
   Context expects type: 'false' | 'true' | ['a' | 'b']
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-expected union does not contain any tuple type of size 2
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:873:9
     │    
@@ -1104,16 +858,6 @@ Because in the expression's type:
     Differs from the expected type:  'false' | 'true' | ['a' | 'b']
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun(('a' | 'b') -> ['a'] | 'wrong_ret') is not compatible with fun(('a' | 'b') -> boolean() | ['a' | 'b'])
-  because
-  ['a'] | 'wrong_ret' is not compatible with boolean() | ['a' | 'b']
-  because
-  'wrong_ret' is not compatible with boolean() | ['a' | 'b']
-  because
-  'wrong_ret' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:881:17
     │
@@ -1130,14 +874,6 @@ Because in the expression's type:
   However the following candidate: 'wrong_ret'
   Differs from the expected type:  'false' | 'true' | ['a' | 'b']
 
------------------------------- Detailed message ------------------------------
-
-  ['a'] | 'wrong_ret' is not compatible with boolean() | ['a' | 'b']
-  because
-  'wrong_ret' is not compatible with boolean() | ['a' | 'b']
-  because
-  'wrong_ret' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:891:9
     │
@@ -1156,14 +892,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((string()) -> atom()) is not compatible with fun((dynamic()) -> boolean() | [dynamic()])
-  because
-  atom() is not compatible with boolean() | [dynamic()]
-  because
-  atom() is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:891:9
     │
@@ -1182,14 +910,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((string()) -> atom()) is not compatible with fun(('a' | 'b') -> boolean() | ['a' | 'b'])
-  because
-  atom() is not compatible with boolean() | ['a' | 'b']
-  because
-  atom() is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:900:9
     │
@@ -1207,12 +927,6 @@ Because in the expression's type:
     Context expects type: boolean() | [atom()]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((atom()) -> boolean() | [atom()])
-  because
-  string() is not compatible with boolean() | [atom()]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:900:9
     │
@@ -1230,12 +944,6 @@ Because in the expression's type:
     Context expects type: boolean() | [dynamic(atom())]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((dynamic(atom())) -> boolean() | [dynamic(atom())])
-  because
-  string() is not compatible with boolean() | [dynamic(atom())]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:909:9
     │
@@ -1253,12 +961,6 @@ Because in the expression's type:
     Context expects type: boolean() | [atom()]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((atom()) -> boolean() | [atom()])
-  because
-  string() is not compatible with boolean() | [atom()]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:909:9
     │
@@ -1276,12 +978,6 @@ Because in the expression's type:
     Context expects type: boolean() | [dynamic(atom())]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((dynamic(atom())) -> boolean() | [dynamic(atom())])
-  because
-  string() is not compatible with boolean() | [dynamic(atom())]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:919:9
     │
@@ -1299,12 +995,6 @@ Because in the expression's type:
     Context expects type: boolean() | [atom()]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((atom()) -> boolean() | [atom()])
-  because
-  string() is not compatible with boolean() | [atom()]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:919:9
     │
@@ -1322,12 +1012,6 @@ Because in the expression's type:
     Context expects type: boolean() | [dynamic(atom())]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((dynamic(atom())) -> boolean() | [dynamic(atom())])
-  because
-  string() is not compatible with boolean() | [dynamic(atom())]
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ check/src/custom.erl:925:1
     │  
@@ -1356,12 +1040,6 @@ Because in the expression's type:
     Context expects type: boolean() | [atom()]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((atom()) -> boolean() | [atom()])
-  because
-  string() is not compatible with boolean() | [atom()]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:927:9
     │
@@ -1379,12 +1057,6 @@ Because in the expression's type:
     Context expects type: boolean() | [dynamic(atom())]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((dynamic(atom())) -> boolean() | [dynamic(atom())])
-  because
-  string() is not compatible with boolean() | [dynamic(atom())]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:955:5
     │  
@@ -1434,12 +1106,6 @@ Because in the expression's type:
     Context expects type: tuple()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  ['non_tuple'] is not compatible with [tuple()]
-  because
-  'non_tuple' is not compatible with tuple()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:975:5
     │  
@@ -1540,14 +1206,6 @@ Because in the expression's type:
     Differs from the expected type:  number()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  ['a' | number()] is not compatible with [number()]
-  because
-  'a' | number() is not compatible with number()
-  because
-  'a' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1042:15
      │
@@ -1592,31 +1250,17 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      ┌─ check/src/custom.erl:1100:5
      │
 1100 │     proplists:get_value(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('k', L).
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L).
 Expression has type:   term()
 Context expected type: pid() | 'undefined'
-     │     
-
-  term() is not compatible with pid() | 'undefined'
-  because
-  term() is not compatible with pid()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1106:5
      │
 1106 │     proplists:get_value(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('k', L).
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L).
 Expression has type:   term()
 Context expected type: pid() | 'undefined' | 'v'
-     │     
-
-  term() is not compatible with pid() | 'undefined' | 'v'
-  because
-  term() is not compatible with pid()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1111:5
@@ -1630,31 +1274,17 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      ┌─ check/src/custom.erl:1117:5
      │
 1117 │     proplists:get_value(k, L, 3).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('k', L, 3).
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L, 3).
 Expression has type:   term()
 Context expected type: pid() | number()
-     │     
-
-  term() is not compatible with pid() | number()
-  because
-  term() is not compatible with pid()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1123:5
      │
 1123 │     proplists:get_value(k, L, my_default).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('k', L, 'my_default').
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L, 'my_default').
 Expression has type:   term()
 Context expected type: 'v1' | 'v2' | 'my_default'
-     │     
-
-  term() is not compatible with 'v1' | 'v2' | 'my_default'
-  because
-  term() is not compatible with 'v1'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1129:5
@@ -1722,14 +1352,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with [pid() | 'default']
-  because
-  term() is not compatible with pid() | 'default'
-  because
-  term() is not compatible with pid()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1166:5
      │
@@ -1748,14 +1370,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with [pid() | 'default' | 'v']
-  because
-  term() is not compatible with pid() | 'default' | 'v'
-  because
-  term() is not compatible with pid()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1171:5
      │
@@ -1773,12 +1387,6 @@ Because in the expression's type:
     Context expects type: pid()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with [pid()]
-  because
-  term() is not compatible with pid()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1176:5
      │
@@ -1846,12 +1454,6 @@ Because in the expression's type:
     Context expects type: 'c'
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with ['c']
-  because
-  term() is not compatible with 'c'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1197:5
      │
@@ -1870,14 +1472,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with ['a' | 'b' | 'c']
-  because
-  term() is not compatible with 'a' | 'b' | 'c'
-  because
-  term() is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1202:24
      │
@@ -1903,41 +1497,21 @@ Because in the expression's type:
     Context expects type: 'a'
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with ['a']
-  because
-  term() is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1215:5
      │
 1215 │     proplists:get_value(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('k', L).
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L).
 Expression has type:   term()
 Context expected type: 'a' | pid()
-     │     
-
-  term() is not compatible with 'a' | pid()
-  because
-  term() is not compatible with 'a'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1220:5
      │
 1220 │     proplists:get_value(k, b).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('k', 'b').
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', 'b').
 Expression has type:   term()
 Context expected type: 'a' | pid()
-     │     
-
-  term() is not compatible with 'a' | pid()
-  because
-  term() is not compatible with 'a'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1220:28
@@ -1987,12 +1561,6 @@ Because in the expression's type:
   However the following candidate: tuple()
   Differs from the expected type:  'none'
 
------------------------------- Detailed message ------------------------------
-
-  'none' | tuple() is not compatible with 'none'
-  because
-  tuple() is not compatible with 'none'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1252:29
      │
@@ -2065,17 +1633,6 @@ Because in the expression's type:
     ]
   , [term()]}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {[[term()]], [term()]} is not compatible with {[plist('a', 'b')], plist('a', 'b')}
-  because
-  [[term()]] is not compatible with [plist('a', 'b')]
-  because
-  [term()] is not compatible with plist('a', 'b')
-  because
-  [term()] is not compatible with ['a' | {'a', 'b'}]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1315:21
      │
@@ -2120,46 +1677,25 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      ┌─ check/src/custom.erl:1363:5
      │
 1363 │     proplists:get_value(a, [a]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('a', ['a']).
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('a', ['a']).
 Expression has type:   term()
 Context expected type: 'true' | 'undefined'
-     │     
-
-  term() is not compatible with 'true' | 'undefined'
-  because
-  term() is not compatible with 'true'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1368:5
      │
 1368 │     proplists:get_value(X, [a]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value(X, ['a']).
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value(X, ['a']).
 Expression has type:   term()
 Context expected type: 'true' | 'undefined'
-     │     
-
-  term() is not compatible with 'true' | 'undefined'
-  because
-  term() is not compatible with 'true'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1373:5
      │
 1373 │     proplists:get_value(a, [a], b).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('a', ['a'], 'b').
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('a', ['a'], 'b').
 Expression has type:   term()
 Context expected type: 'true' | 'b'
-     │     
-
-  term() is not compatible with 'true' | 'b'
-  because
-  term() is not compatible with 'true'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1416:5
@@ -2194,12 +1730,6 @@ Because in the expression's type:
     Context expects type: tuple()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [tuple()]
-  because
-  number() is not compatible with tuple()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1448:5
      │    
@@ -2222,14 +1752,6 @@ Because in the expression's type:
     Differs from the expected type:  number()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [string() | number()] is not compatible with [number()]
-  because
-  string() | number() is not compatible with number()
-  because
-  string() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1482:5
      │
@@ -2373,17 +1895,6 @@ Because in the expression's type:
     , A}
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [{A, B} | {B, A}] is not compatible with [{A, B}]
-  because
-  {A, B} | {B, A} is not compatible with {A, B}
-  because
-  at tuple index 1:
-  {B, A} is not compatible with {A, B}
-  because
-  B is not compatible with A
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1757:5
      │    
@@ -2404,10 +1915,6 @@ Because in the expression's type:
   Context expects type: #{...}
   The expected map has no corresponding key for: a.
 
------------------------------- Detailed message ------------------------------
-
-key `a` is declared in the former but not in the latter and the latter map has no default association
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1769:18
      │
@@ -2451,10 +1958,6 @@ Because in the expression's type:
   Context expects type: #{b := ..., ...}
   The type of the expression is missing the following required keys: b.
 
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1826:5
      │    
@@ -2472,10 +1975,6 @@ Because in the expression's type:
   Context expects type: #{b := ..., ...}
   The type of the expression is missing the following required keys: b.
 
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1827:12
      │
@@ -2501,10 +2000,6 @@ Because in the expression's type:
   Context expects type: #{b := ..., ...}
   The type of the expression is missing the following required keys: b.
 
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1854:5
      │
@@ -2525,16 +2020,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      ┌─ check/src/custom.erl:1916:23
      │
 1916 │     custom_overloaded(X).
-     │                       ^
-     │                       │
-     │                       X.
+     │                       ^ X.
 Expression has type:   term()
 Context expected type: atom() | binary()
-     │                       
-
-  term() is not compatible with atom() | binary()
-  because
-  term() is not compatible with atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1939:5
@@ -2554,15 +2042,6 @@ Because in the expression's type:
     Differs from the expected type:  number()
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {atom(), number() | pid()} is not compatible with {atom(), number()}
-  because
-  number() | pid() is not compatible with number()
-  because
-  pid() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2041:5
      │
@@ -2578,14 +2057,6 @@ Because in the expression's type:
   Here the type is:     string() | binary()
   Context expects type: string()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2046:5
      │
@@ -2601,14 +2072,6 @@ Because in the expression's type:
   Here the type is:     string() | binary()
   Context expects type: string()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2051:5
      │
@@ -2624,14 +2087,6 @@ Because in the expression's type:
   Here the type is:     string() | binary()
   Context expects type: string()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2066:5
      │
@@ -2648,14 +2103,6 @@ Because in the expression's type:
   However the following candidate: string()
   Differs from the expected type:  binary()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with binary()
-  because
-  string() | binary() is not compatible with binary()
-  because
-  string() is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2081:19
      │
@@ -2674,16 +2121,6 @@ Because in the expression's type:
     Differs from the expected type:  string() | atom() | file:deep_list() | binary()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [binary() | pid()] is not compatible with [file:name_all()]
-  because
-  binary() | pid() is not compatible with file:name_all()
-  because
-  binary() | pid() is not compatible with string() | atom() | file:deep_list() | binary()
-  because
-  pid() is not compatible with string() | atom() | file:deep_list() | binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2086:5
      │
@@ -2699,14 +2136,6 @@ Because in the expression's type:
   Here the type is:     string() | binary()
   Context expects type: string()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2091:5
      │
@@ -2722,14 +2151,6 @@ Because in the expression's type:
   Here the type is:     string() | binary()
   Context expects type: string()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2096:5
      │
@@ -2745,14 +2166,6 @@ Because in the expression's type:
   Here the type is:     string() | binary()
   Context expects type: string()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2111:5
      │
@@ -2769,14 +2182,6 @@ Because in the expression's type:
   However the following candidate: string()
   Differs from the expected type:  binary()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with binary()
-  because
-  string() | binary() is not compatible with binary()
-  because
-  string() is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2121:25
      │
@@ -2793,14 +2198,6 @@ Because in the expression's type:
   Context expects type: string() | atom() | file:deep_list() | binary()
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-  pid() is not compatible with file:name_all()
-  because
-  pid() is not compatible with string() | atom() | file:deep_list() | binary()
-  because
-  pid() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2150:5
      │    
@@ -2822,17 +2219,6 @@ Because in the expression's type:
     ]
   , [atom() | number()]}
 
------------------------------- Detailed message ------------------------------
-
-  queue:queue(atom() | number()) is not compatible with queue:queue(number())
-  because
-  {[atom() | number()], [atom() | number()]} is not compatible with queue:queue(number())
-  because
-  at tuple index 1:
-  {[atom() | number()], [atom() | number()]} is not compatible with {[number()], [number()]}
-  because
-  [atom() | number()] is not compatible with [number()]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2191:5
      │
@@ -2851,15 +2237,6 @@ Because in the expression's type:
   Context expects type: #{count := ..., ...}
   The type of the expression is missing the following required keys: count.
 
------------------------------- Detailed message ------------------------------
-
-  #{count := number(), module := 'foo'} | #{module := 'foo'} is not compatible with state1()
-  because
-  #{count := number(), module := 'foo'} | #{module := 'foo'} is not compatible with #{count := number(), module := atom()}
-  because
-  #{module := 'foo'} is not compatible with #{count := number(), module := atom()}
-  key `count` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2223:13
      │
@@ -2884,10 +2261,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., ...}
   The type of the expression is missing the following required keys: a.
 
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2320:5
      │    
@@ -2908,10 +2281,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., b := ..., ...}
   The type of the expression is missing the following required keys: a, b.
 
------------------------------- Detailed message ------------------------------
-
-keys `a`, `b` are declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2342:5
      │    
@@ -2932,13 +2301,6 @@ Because in the expression's type:
     Context expects type: atom()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{atom() => binary()} is not compatible with #{atom() => atom()}
-  the default associations are not compatible
-  because
-  binary() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2354:23
      │
@@ -2955,12 +2317,6 @@ Because in the expression's type:
   Context expects type: 'false' | 'true' | {'true', term()}
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-  'err' is not compatible with boolean() | {'true', term()}
-  because
-  'err' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2362:5
      │    
@@ -2979,13 +2335,6 @@ Because in the expression's type:
     Context expects type: atom()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{atom() => binary()} is not compatible with #{atom() => atom()}
-  the default associations are not compatible
-  because
-  binary() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2363:45
      │
@@ -3026,12 +2375,6 @@ Because in the expression's type:
   Context expects type: iolist() | binary()
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-  atom() is not compatible with iodata() | unicode:charlist()
-  because
-  atom() is not compatible with iolist()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2386:5
      │
@@ -3060,17 +2403,6 @@ Because in the expression's type:
     }
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [{'return', 'something'}] is not compatible with [{'newline', 'cr' | 'lf' | 'any' | 'crlf' | 'anycrlf'} | 'notempty_atstart' | 'noteol' | 'bsr_unicode' | 'notbol' | 'global' | {'match_limit_recursion', number()} | 'bsr_anycrlf' | re:compile_option() | {'match_limit', number()} | {'offset', number()} | 'notempty' | {'return', 'iodata' | 'list' | 'binary'} | 'anchored']
-  because
-  {'return', 'something'} is not compatible with {'newline', 'cr' | 'lf' | 'any' | 'crlf' | 'anycrlf'} | 'notempty_atstart' | 'noteol' | 'bsr_unicode' | 'notbol' | 'global' | {'match_limit_recursion', number()} | 'bsr_anycrlf' | re:compile_option() | {'match_limit', number()} | {'offset', number()} | 'notempty' | {'return', 'iodata' | 'list' | 'binary'} | 'anchored'
-  because
-  at tuple index 2:
-  {'return', 'something'} is not compatible with {'return', 'iodata' | 'list' | 'binary'}
-  because
-  'something' is not compatible with 'iodata' | 'list' | 'binary'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2506:5
      │
@@ -3090,15 +2422,6 @@ Because in the expression's type:
     ]
   , [atom()]}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {[number()], [atom()]} is not compatible with {[atom()], [number()]}
-  because
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2518:5
      │
@@ -3120,18 +2443,6 @@ Because in the expression's type:
     ]
   , [{term(), atom()}]}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {[{term(), number()}], [{term(), atom()}]} is not compatible with {[{term(), atom()}], [{term(), number()}]}
-  because
-  [{term(), number()}] is not compatible with [{term(), atom()}]
-  because
-  at tuple index 2:
-  {term(), number()} is not compatible with {term(), atom()}
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2536:5
      │
@@ -3153,18 +2464,6 @@ Because in the expression's type:
     ]
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {[{'ok', atom()}], [{'ok', atom()} | {'error', term()}]} is not compatible with {[{'ok', atom()}], [{'error', term()}]}
-  because
-  [{'ok', atom()} | {'error', term()}] is not compatible with [{'error', term()}]
-  because
-  {'ok', atom()} | {'error', term()} is not compatible with {'error', term()}
-  because
-  at tuple index 1:
-  {'ok', atom()} is not compatible with {'error', term()}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2576:33
      │
@@ -3181,10 +2480,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., ...}
   The type of the expression is missing the following required keys: a.
 
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2586:33
      │
@@ -3202,15 +2497,6 @@ Because in the expression's type:
     Context expects type: 'true'
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{a => number()} is not compatible with #{a => 'true'}
-  because
-  at key `a`:
-  #{a => number()} is not compatible with #{a => 'true'}
-  because
-  number() is not compatible with 'true'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2596:33
      │
@@ -3227,10 +2513,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., ...}
   The type of the expression is missing the following required keys: a.
 
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2709:40
      │
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-28.pretty
index ec107b3c14..5220990b8f 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-28.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-28.pretty
@@ -37,12 +37,6 @@ Because in the expression's type:
   However the following candidate: [dynamic()]
   Differs from the expected type:  tuple()
 
------------------------------- Detailed message ------------------------------
-
-  {atom(), string()} | [dynamic()] is not compatible with tuple()
-  because
-  [dynamic()] is not compatible with tuple()
-
 error: index_out_of_bounds (See https://fb.me/eqwalizer_errors#index_out_of_bounds)
    ┌─ check/src/custom.erl:48:5
    │
@@ -74,12 +68,6 @@ Because in the expression's type:
   However the following candidate: number()
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  atom() | number() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/custom.erl:68:5
    │
@@ -96,12 +84,6 @@ Because in the expression's type:
   However the following candidate: number()
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  dynamic() | number() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ check/src/custom.erl:86:5
    │
@@ -118,12 +100,6 @@ Because in the expression's type:
   However the following candidate: string()
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  'foo' | 'ok' | 'error' | number() | string() is not compatible with atom()
-  because
-  string() is not compatible with atom()
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
    ┌─ check/src/custom.erl:91:1
    │  
@@ -202,12 +178,6 @@ Because in the expression's type:
   However the following candidate: number()
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  number() | atom() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:200:5
     │
@@ -224,12 +194,6 @@ Because in the expression's type:
   However the following candidate: number()
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  number() | atom() is not compatible with atom()
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:206:5
     │    
@@ -249,15 +213,6 @@ Because in the expression's type:
     Differs from the expected type:  number()
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {atom(), 'undefined' | number()} is not compatible with {atom(), number()}
-  because
-  'undefined' | number() is not compatible with number()
-  because
-  'undefined' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:221:27
     │
@@ -274,14 +229,6 @@ Because in the expression's type:
   However the following candidate: 'c_v'
   Differs from the expected type:  'a_v' | 'b_v'
 
------------------------------- Detailed message ------------------------------
-
-  'a_v' | 'c_v' is not compatible with 'a_v' | 'b_v'
-  because
-  'c_v' is not compatible with 'a_v' | 'b_v'
-  because
-  'c_v' is not compatible with 'a_v'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:233:27
     │
@@ -298,14 +245,6 @@ Because in the expression's type:
   However the following candidate: 'c_v'
   Differs from the expected type:  'a_v' | 'b_v' | 'undefined'
 
------------------------------- Detailed message ------------------------------
-
-  'undefined' | 'a_v' | 'c_v' is not compatible with 'a_v' | 'b_v' | 'undefined'
-  because
-  'c_v' is not compatible with 'a_v' | 'b_v' | 'undefined'
-  because
-  'c_v' is not compatible with 'a_v'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:309:5
     │
@@ -362,28 +301,13 @@ Because in the expression's type:
   However the following candidate: 'a'
   Differs from the expected type:  #{term() => term()} | maps:iterator()
 
------------------------------- Detailed message ------------------------------
-
-  #{K => V} | 'a' is not compatible with #{term() => term()} | maps:iterator()
-  because
-  'a' is not compatible with #{term() => term()} | maps:iterator()
-  because
-  'a' is not compatible with #{term() => term()}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:425:20
     │
 425 │     maps:filter(F, non_kv),
-    │                    ^^^^^^
-    │                    │
-    │                    'non_kv'.
+    │                    ^^^^^^ 'non_kv'.
 Expression has type:   'non_kv'
 Context expected type: #{term() => term()} | maps:iterator()
-    │                    
-
-  'non_kv' is not compatible with #{term() => term()} | maps:iterator()
-  because
-  'non_kv' is not compatible with #{term() => term()}
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:454:5
@@ -403,13 +327,6 @@ Because in the expression's type:
     Context expects type: boolean()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{number() => pid()} is not compatible with #{number() => boolean()}
-  the default associations are not compatible
-  because
-  pid() is not compatible with boolean()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:474:14
     │
@@ -451,29 +368,13 @@ Because in the expression's type:
     Context expects type: 'a'
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{a := boolean(), b := boolean()} is not compatible with #{a => 'a', b => 'b'}
-  because
-  at key `a`:
-  #{a := boolean(), b := boolean()} is not compatible with #{a => 'a', b => 'b'}
-  because
-  boolean() is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:503:17
     │
 503 │     maps:map(F, non_kv),
-    │                 ^^^^^^
-    │                 │
-    │                 'non_kv'.
+    │                 ^^^^^^ 'non_kv'.
 Expression has type:   'non_kv'
 Context expected type: #{term() => term()} | maps:iterator()
-    │                 
-
-  'non_kv' is not compatible with #{term() => term()} | maps:iterator()
-  because
-  'non_kv' is not compatible with #{term() => term()}
 
 error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
     ┌─ check/src/custom.erl:538:9
@@ -502,14 +403,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [[[]]] is not compatible with [number() | 'a' | 'b']
-  because
-  [[]] is not compatible with number() | 'a' | 'b'
-  because
-  [[]] is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:545:28
     │
@@ -531,14 +424,6 @@ Because in the expression's type:
     ]
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [[[[]]]] is not compatible with [[[]]]
-  because
-  [[[]]] is not compatible with [[]]
-  because
-  [[]] is not compatible with []
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:552:5
     │  
@@ -555,16 +440,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
     ┌─ check/src/custom.erl:555:9
     │
 555 │         non_kv
-    │         ^^^^^^
-    │         │
-    │         'non_kv'.
+    │         ^^^^^^ 'non_kv'.
 Expression has type:   'non_kv'
 Context expected type: #{term() => term()} | maps:iterator()
-    │         
-
-  'non_kv' is not compatible with #{term() => term()} | maps:iterator()
-  because
-  'non_kv' is not compatible with #{term() => term()}
 
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ check/src/custom.erl:560:1
@@ -606,12 +484,6 @@ Because in the expression's type:
   However the following candidate: []
   Differs from the expected type:  atom()
 
------------------------------- Detailed message ------------------------------
-
-  [] | atom() is not compatible with atom()
-  because
-  [] is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:601:9
     │
@@ -682,30 +554,13 @@ Because in the expression's type:
     Differs from the expected type:  binary()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [number() | binary() | atom()] is not compatible with [binary()] | [number()] | [atom()]
-  because
-  [number() | binary() | atom()] is not compatible with [binary()]
-  because
-  number() | binary() | atom() is not compatible with binary()
-  because
-  number() is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:671:41
     │
 671 │ maps_to_list_7_neg(Num) -> maps:to_list(Num).
-    │                                         ^^^
-    │                                         │
-    │                                         Num.
+    │                                         ^^^ Num.
 Expression has type:   number()
 Context expected type: #{term() => term()} | maps:iterator()
-    │                                         
-
-  number() is not compatible with #{term() => term()} | maps:iterator()
-  because
-  number() is not compatible with #{term() => term()}
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:675:25
@@ -723,13 +578,6 @@ Because in the expression's type:
   Context expects type: #{...} (no default association)
   The expected map has no default association while the type of the expression has one.
 
------------------------------- Detailed message ------------------------------
-
-  #{'b' | 'a' | 'c' => number() | string() | atom()} is not compatible with #{a => string(), b => number(), c => atom()}
-  key a is not present in the former map but is incompatible with its default association
-  because
-  number() | string() | atom() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:679:25
     │
@@ -746,13 +594,6 @@ Because in the expression's type:
   Context expects type: #{...} (no default association)
   The expected map has no default association while the type of the expression has one.
 
------------------------------- Detailed message ------------------------------
-
-  #{'b' | 'a' | 'c' => number() | string() | atom()} is not compatible with #{a => string(), b => number() | boolean(), c => atom()}
-  key a is not present in the former map but is incompatible with its default association
-  because
-  number() | string() | atom() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:683:25
     │
@@ -769,10 +610,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., b := ..., ...}
   The type of the expression is missing the following required keys: a, b.
 
------------------------------- Detailed message ------------------------------
-
-keys `a`, `b` are declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:697:44
     │
@@ -797,13 +634,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., b := ..., ...}
   The type of the expression is missing the following required keys: a, b.
 
------------------------------- Detailed message ------------------------------
-
-  #{'a' | 'b' => atom() | number()} is not compatible with #{a := atom(), b := number()} | #{a := atom()}
-  because
-  #{'a' | 'b' => atom() | number()} is not compatible with #{a := atom(), b := number()}
-  keys `a`, `b` are declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:721:9
     │
@@ -822,14 +652,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((binary()) -> [number()]) is not compatible with fun((number()) -> boolean() | {'true', term()})
-  because
-  [number()] is not compatible with boolean() | {'true', term()}
-  because
-  [number()] is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:739:20
     │
@@ -846,12 +668,6 @@ Because in the expression's type:
   Context expects type: 'false' | 'true' | {'true', term()}
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-  'wrong_ret' is not compatible with boolean() | {'true', term()}
-  because
-  'wrong_ret' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:749:9
     │
@@ -876,14 +692,6 @@ Because in the expression's type:
   However the following candidate: 'wrong_ret'
   Differs from the expected type:  'false' | 'true' | {'true', term()}
 
------------------------------- Detailed message ------------------------------
-
-  {'true', 'a'} | 'wrong_ret' is not compatible with boolean() | {'true', term()}
-  because
-  'wrong_ret' is not compatible with boolean() | {'true', term()}
-  because
-  'wrong_ret' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:827:9
     │    
@@ -902,16 +710,6 @@ Because in the expression's type:
     Differs from the expected type:  'false' | 'true' | ['a' | 'b']
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun(('a' | 'b') -> ['a'] | 'true' | 'wrong_ret') is not compatible with fun(('a' | 'b') -> boolean() | ['a' | 'b'])
-  because
-  ['a'] | 'true' | 'wrong_ret' is not compatible with boolean() | ['a' | 'b']
-  because
-  'wrong_ret' is not compatible with boolean() | ['a' | 'b']
-  because
-  'wrong_ret' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:829:20
     │
@@ -928,12 +726,6 @@ Because in the expression's type:
   Context expects type: 'false' | 'true' | ['a' | 'b']
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-  'wrong_ret' is not compatible with boolean() | ['a' | 'b']
-  because
-  'wrong_ret' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:837:9
     │    
@@ -951,15 +743,6 @@ Because in the expression's type:
     Differs from the expected type:  'false' | 'true' | [Item]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((dynamic()) -> {'true', 'a'} | 'true') is not compatible with fun((Item) -> boolean() | [Item])
-  because
-  {'true', 'a'} | 'true' is not compatible with boolean() | [Item]
-  because
-  {'true', 'a'} is not compatible with boolean() | [Item]
-  expected union does not contain any tuple type of size 2
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:837:20
     │
@@ -976,10 +759,6 @@ Because in the expression's type:
   Context expects type: 'false' | 'true' | [dynamic()]
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-expected union does not contain any tuple type of size 2
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:839:9
     │
@@ -995,12 +774,6 @@ Because in the expression's type:
   Here the type is:     'not_a_queue'
   Context expects type: {[Item], [Item]}
 
------------------------------- Detailed message ------------------------------
-
-  'not_a_queue' is not compatible with queue:queue(Item)
-  because
-  'not_a_queue' is not compatible with {[Item], [Item]}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:839:9
     │
@@ -1016,12 +789,6 @@ Because in the expression's type:
   Here the type is:     'not_a_queue'
   Context expects type: {[dynamic()], [dynamic()]}
 
------------------------------- Detailed message ------------------------------
-
-  'not_a_queue' is not compatible with queue:queue(dynamic())
-  because
-  'not_a_queue' is not compatible with {[dynamic()], [dynamic()]}
-
 error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
     ┌─ check/src/custom.erl:846:9
     │  
@@ -1053,15 +820,6 @@ Because in the expression's type:
     Differs from the expected type:  'false' | 'true' | ['a' | 'b']
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun(('a' | 'b') -> ['a'] | 'false' | {'true', 'a'}) is not compatible with fun(('a' | 'b') -> boolean() | ['a' | 'b'])
-  because
-  ['a'] | 'false' | {'true', 'a'} is not compatible with boolean() | ['a' | 'b']
-  because
-  {'true', 'a'} is not compatible with boolean() | ['a' | 'b']
-  expected union does not contain any tuple type of size 2
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:857:20
     │
@@ -1078,10 +836,6 @@ Because in the expression's type:
   Context expects type: 'false' | 'true' | ['a' | 'b']
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-expected union does not contain any tuple type of size 2
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:873:9
     │    
@@ -1104,16 +858,6 @@ Because in the expression's type:
     Differs from the expected type:  'false' | 'true' | ['a' | 'b']
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun(('a' | 'b') -> ['a'] | 'wrong_ret') is not compatible with fun(('a' | 'b') -> boolean() | ['a' | 'b'])
-  because
-  ['a'] | 'wrong_ret' is not compatible with boolean() | ['a' | 'b']
-  because
-  'wrong_ret' is not compatible with boolean() | ['a' | 'b']
-  because
-  'wrong_ret' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:881:17
     │
@@ -1130,14 +874,6 @@ Because in the expression's type:
   However the following candidate: 'wrong_ret'
   Differs from the expected type:  'false' | 'true' | ['a' | 'b']
 
------------------------------- Detailed message ------------------------------
-
-  ['a'] | 'wrong_ret' is not compatible with boolean() | ['a' | 'b']
-  because
-  'wrong_ret' is not compatible with boolean() | ['a' | 'b']
-  because
-  'wrong_ret' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:891:9
     │
@@ -1156,14 +892,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((string()) -> atom()) is not compatible with fun((dynamic()) -> boolean() | [dynamic()])
-  because
-  atom() is not compatible with boolean() | [dynamic()]
-  because
-  atom() is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:891:9
     │
@@ -1182,14 +910,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((string()) -> atom()) is not compatible with fun(('a' | 'b') -> boolean() | ['a' | 'b'])
-  because
-  atom() is not compatible with boolean() | ['a' | 'b']
-  because
-  atom() is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:900:9
     │
@@ -1207,12 +927,6 @@ Because in the expression's type:
     Context expects type: boolean() | [atom()]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((atom()) -> boolean() | [atom()])
-  because
-  string() is not compatible with boolean() | [atom()]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:900:9
     │
@@ -1230,12 +944,6 @@ Because in the expression's type:
     Context expects type: boolean() | [dynamic(atom())]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((dynamic(atom())) -> boolean() | [dynamic(atom())])
-  because
-  string() is not compatible with boolean() | [dynamic(atom())]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:909:9
     │
@@ -1253,12 +961,6 @@ Because in the expression's type:
     Context expects type: boolean() | [atom()]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((atom()) -> boolean() | [atom()])
-  because
-  string() is not compatible with boolean() | [atom()]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:909:9
     │
@@ -1276,12 +978,6 @@ Because in the expression's type:
     Context expects type: boolean() | [dynamic(atom())]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((dynamic(atom())) -> boolean() | [dynamic(atom())])
-  because
-  string() is not compatible with boolean() | [dynamic(atom())]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:919:9
     │
@@ -1299,12 +995,6 @@ Because in the expression's type:
     Context expects type: boolean() | [atom()]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((atom()) -> boolean() | [atom()])
-  because
-  string() is not compatible with boolean() | [atom()]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:919:9
     │
@@ -1322,12 +1012,6 @@ Because in the expression's type:
     Context expects type: boolean() | [dynamic(atom())]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((dynamic(atom())) -> boolean() | [dynamic(atom())])
-  because
-  string() is not compatible with boolean() | [dynamic(atom())]
-
 error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
     ┌─ check/src/custom.erl:925:1
     │  
@@ -1356,12 +1040,6 @@ Because in the expression's type:
     Context expects type: boolean() | [atom()]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((atom()) -> boolean() | [atom()])
-  because
-  string() is not compatible with boolean() | [atom()]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:927:9
     │
@@ -1379,12 +1057,6 @@ Because in the expression's type:
     Context expects type: boolean() | [dynamic(atom())]
   )
 
------------------------------- Detailed message ------------------------------
-
-  fun((atom()) -> string()) is not compatible with fun((dynamic(atom())) -> boolean() | [dynamic(atom())])
-  because
-  string() is not compatible with boolean() | [dynamic(atom())]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:955:5
     │  
@@ -1434,12 +1106,6 @@ Because in the expression's type:
     Context expects type: tuple()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  ['non_tuple'] is not compatible with [tuple()]
-  because
-  'non_tuple' is not compatible with tuple()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
     ┌─ check/src/custom.erl:975:5
     │  
@@ -1540,14 +1206,6 @@ Because in the expression's type:
     Differs from the expected type:  number()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  ['a' | number()] is not compatible with [number()]
-  because
-  'a' | number() is not compatible with number()
-  because
-  'a' is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1042:15
      │
@@ -1592,31 +1250,17 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      ┌─ check/src/custom.erl:1100:5
      │
 1100 │     proplists:get_value(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('k', L).
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L).
 Expression has type:   term()
 Context expected type: pid() | 'undefined'
-     │     
-
-  term() is not compatible with pid() | 'undefined'
-  because
-  term() is not compatible with pid()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1106:5
      │
 1106 │     proplists:get_value(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('k', L).
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L).
 Expression has type:   term()
 Context expected type: pid() | 'undefined' | 'v'
-     │     
-
-  term() is not compatible with pid() | 'undefined' | 'v'
-  because
-  term() is not compatible with pid()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1111:5
@@ -1630,31 +1274,17 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      ┌─ check/src/custom.erl:1117:5
      │
 1117 │     proplists:get_value(k, L, 3).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('k', L, 3).
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L, 3).
 Expression has type:   term()
 Context expected type: pid() | number()
-     │     
-
-  term() is not compatible with pid() | number()
-  because
-  term() is not compatible with pid()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1123:5
      │
 1123 │     proplists:get_value(k, L, my_default).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('k', L, 'my_default').
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L, 'my_default').
 Expression has type:   term()
 Context expected type: 'v1' | 'v2' | 'my_default'
-     │     
-
-  term() is not compatible with 'v1' | 'v2' | 'my_default'
-  because
-  term() is not compatible with 'v1'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1129:5
@@ -1722,14 +1352,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with [pid() | 'default']
-  because
-  term() is not compatible with pid() | 'default'
-  because
-  term() is not compatible with pid()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1166:5
      │
@@ -1748,14 +1370,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with [pid() | 'default' | 'v']
-  because
-  term() is not compatible with pid() | 'default' | 'v'
-  because
-  term() is not compatible with pid()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1171:5
      │
@@ -1773,12 +1387,6 @@ Because in the expression's type:
     Context expects type: pid()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with [pid()]
-  because
-  term() is not compatible with pid()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1176:5
      │
@@ -1846,12 +1454,6 @@ Because in the expression's type:
     Context expects type: 'c'
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with ['c']
-  because
-  term() is not compatible with 'c'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1197:5
      │
@@ -1870,14 +1472,6 @@ Because in the expression's type:
     No candidate matches in the expected union.
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with ['a' | 'b' | 'c']
-  because
-  term() is not compatible with 'a' | 'b' | 'c'
-  because
-  term() is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1202:24
      │
@@ -1903,41 +1497,21 @@ Because in the expression's type:
     Context expects type: 'a'
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [term()] is not compatible with ['a']
-  because
-  term() is not compatible with 'a'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1215:5
      │
 1215 │     proplists:get_value(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('k', L).
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L).
 Expression has type:   term()
 Context expected type: 'a' | pid()
-     │     
-
-  term() is not compatible with 'a' | pid()
-  because
-  term() is not compatible with 'a'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1220:5
      │
 1220 │     proplists:get_value(k, b).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('k', 'b').
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', 'b').
 Expression has type:   term()
 Context expected type: 'a' | pid()
-     │     
-
-  term() is not compatible with 'a' | pid()
-  because
-  term() is not compatible with 'a'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1220:28
@@ -1987,12 +1561,6 @@ Because in the expression's type:
   However the following candidate: tuple()
   Differs from the expected type:  'none'
 
------------------------------- Detailed message ------------------------------
-
-  'none' | tuple() is not compatible with 'none'
-  because
-  tuple() is not compatible with 'none'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1252:29
      │
@@ -2065,17 +1633,6 @@ Because in the expression's type:
     ]
   , [term()]}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {[[term()]], [term()]} is not compatible with {[plist('a', 'b')], plist('a', 'b')}
-  because
-  [[term()]] is not compatible with [plist('a', 'b')]
-  because
-  [term()] is not compatible with plist('a', 'b')
-  because
-  [term()] is not compatible with ['a' | {'a', 'b'}]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1315:21
      │
@@ -2120,46 +1677,25 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      ┌─ check/src/custom.erl:1363:5
      │
 1363 │     proplists:get_value(a, [a]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('a', ['a']).
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('a', ['a']).
 Expression has type:   term()
 Context expected type: 'true' | 'undefined'
-     │     
-
-  term() is not compatible with 'true' | 'undefined'
-  because
-  term() is not compatible with 'true'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1368:5
      │
 1368 │     proplists:get_value(X, [a]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value(X, ['a']).
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value(X, ['a']).
 Expression has type:   term()
 Context expected type: 'true' | 'undefined'
-     │     
-
-  term() is not compatible with 'true' | 'undefined'
-  because
-  term() is not compatible with 'true'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1373:5
      │
 1373 │     proplists:get_value(a, [a], b).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_value('a', ['a'], 'b').
+     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('a', ['a'], 'b').
 Expression has type:   term()
 Context expected type: 'true' | 'b'
-     │     
-
-  term() is not compatible with 'true' | 'b'
-  because
-  term() is not compatible with 'true'
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1416:5
@@ -2194,12 +1730,6 @@ Because in the expression's type:
     Context expects type: tuple()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [number()] is not compatible with [tuple()]
-  because
-  number() is not compatible with tuple()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1448:5
      │    
@@ -2222,14 +1752,6 @@ Because in the expression's type:
     Differs from the expected type:  number()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [string() | number()] is not compatible with [number()]
-  because
-  string() | number() is not compatible with number()
-  because
-  string() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1482:5
      │
@@ -2373,17 +1895,6 @@ Because in the expression's type:
     , A}
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [{A, B} | {B, A}] is not compatible with [{A, B}]
-  because
-  {A, B} | {B, A} is not compatible with {A, B}
-  because
-  at tuple index 1:
-  {B, A} is not compatible with {A, B}
-  because
-  B is not compatible with A
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1757:5
      │    
@@ -2404,10 +1915,6 @@ Because in the expression's type:
   Context expects type: #{...}
   The expected map has no corresponding key for: a.
 
------------------------------- Detailed message ------------------------------
-
-key `a` is declared in the former but not in the latter and the latter map has no default association
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1769:18
      │
@@ -2451,10 +1958,6 @@ Because in the expression's type:
   Context expects type: #{b := ..., ...}
   The type of the expression is missing the following required keys: b.
 
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1826:5
      │    
@@ -2472,10 +1975,6 @@ Because in the expression's type:
   Context expects type: #{b := ..., ...}
   The type of the expression is missing the following required keys: b.
 
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1827:12
      │
@@ -2501,10 +2000,6 @@ Because in the expression's type:
   Context expects type: #{b := ..., ...}
   The type of the expression is missing the following required keys: b.
 
------------------------------- Detailed message ------------------------------
-
-key `b` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1854:5
      │
@@ -2525,16 +2020,9 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
      ┌─ check/src/custom.erl:1916:23
      │
 1916 │     custom_overloaded(X).
-     │                       ^
-     │                       │
-     │                       X.
+     │                       ^ X.
 Expression has type:   term()
 Context expected type: atom() | binary()
-     │                       
-
-  term() is not compatible with atom() | binary()
-  because
-  term() is not compatible with atom()
 
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:1939:5
@@ -2554,15 +2042,6 @@ Because in the expression's type:
     Differs from the expected type:  number()
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {atom(), number() | pid()} is not compatible with {atom(), number()}
-  because
-  number() | pid() is not compatible with number()
-  because
-  pid() is not compatible with number()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2041:5
      │
@@ -2578,14 +2057,6 @@ Because in the expression's type:
   Here the type is:     string() | binary()
   Context expects type: string()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2046:5
      │
@@ -2601,14 +2072,6 @@ Because in the expression's type:
   Here the type is:     string() | binary()
   Context expects type: string()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2051:5
      │
@@ -2624,14 +2087,6 @@ Because in the expression's type:
   Here the type is:     string() | binary()
   Context expects type: string()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2066:5
      │
@@ -2648,14 +2103,6 @@ Because in the expression's type:
   However the following candidate: string()
   Differs from the expected type:  binary()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with binary()
-  because
-  string() | binary() is not compatible with binary()
-  because
-  string() is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2081:19
      │
@@ -2674,16 +2121,6 @@ Because in the expression's type:
     Differs from the expected type:  string() | atom() | file:deep_list() | binary()
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [binary() | pid()] is not compatible with [file:name_all()]
-  because
-  binary() | pid() is not compatible with file:name_all()
-  because
-  binary() | pid() is not compatible with string() | atom() | file:deep_list() | binary()
-  because
-  pid() is not compatible with string() | atom() | file:deep_list() | binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2086:5
      │
@@ -2699,14 +2136,6 @@ Because in the expression's type:
   Here the type is:     string() | binary()
   Context expects type: string()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2091:5
      │
@@ -2722,14 +2151,6 @@ Because in the expression's type:
   Here the type is:     string() | binary()
   Context expects type: string()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2096:5
      │
@@ -2745,14 +2166,6 @@ Because in the expression's type:
   Here the type is:     string() | binary()
   Context expects type: string()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with file:filename()
-  because
-  string() | binary() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2111:5
      │
@@ -2769,14 +2182,6 @@ Because in the expression's type:
   However the following candidate: string()
   Differs from the expected type:  binary()
 
------------------------------- Detailed message ------------------------------
-
-  file:filename_all() is not compatible with binary()
-  because
-  string() | binary() is not compatible with binary()
-  because
-  string() is not compatible with binary()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2121:25
      │
@@ -2793,14 +2198,6 @@ Because in the expression's type:
   Context expects type: string() | atom() | file:deep_list() | binary()
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-  pid() is not compatible with file:name_all()
-  because
-  pid() is not compatible with string() | atom() | file:deep_list() | binary()
-  because
-  pid() is not compatible with string()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2150:5
      │    
@@ -2822,17 +2219,6 @@ Because in the expression's type:
     ]
   , [atom() | number()]}
 
------------------------------- Detailed message ------------------------------
-
-  queue:queue(atom() | number()) is not compatible with queue:queue(number())
-  because
-  {[atom() | number()], [atom() | number()]} is not compatible with queue:queue(number())
-  because
-  at tuple index 1:
-  {[atom() | number()], [atom() | number()]} is not compatible with {[number()], [number()]}
-  because
-  [atom() | number()] is not compatible with [number()]
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2191:5
      │
@@ -2851,15 +2237,6 @@ Because in the expression's type:
   Context expects type: #{count := ..., ...}
   The type of the expression is missing the following required keys: count.
 
------------------------------- Detailed message ------------------------------
-
-  #{count := number(), module := 'foo'} | #{module := 'foo'} is not compatible with state1()
-  because
-  #{count := number(), module := 'foo'} | #{module := 'foo'} is not compatible with #{count := number(), module := atom()}
-  because
-  #{module := 'foo'} is not compatible with #{count := number(), module := atom()}
-  key `count` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2223:13
      │
@@ -2884,10 +2261,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., ...}
   The type of the expression is missing the following required keys: a.
 
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2320:5
      │    
@@ -2908,10 +2281,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., b := ..., ...}
   The type of the expression is missing the following required keys: a, b.
 
------------------------------- Detailed message ------------------------------
-
-keys `a`, `b` are declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2342:5
      │    
@@ -2932,13 +2301,6 @@ Because in the expression's type:
     Context expects type: atom()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{atom() => binary()} is not compatible with #{atom() => atom()}
-  the default associations are not compatible
-  because
-  binary() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2354:23
      │
@@ -2955,12 +2317,6 @@ Because in the expression's type:
   Context expects type: 'false' | 'true' | {'true', term()}
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-  'err' is not compatible with boolean() | {'true', term()}
-  because
-  'err' is not compatible with 'false'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2362:5
      │    
@@ -2979,13 +2335,6 @@ Because in the expression's type:
     Context expects type: atom()
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{atom() => binary()} is not compatible with #{atom() => atom()}
-  the default associations are not compatible
-  because
-  binary() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2363:45
      │
@@ -3026,12 +2375,6 @@ Because in the expression's type:
   Context expects type: iolist() | binary()
   No candidate matches in the expected union.
 
------------------------------- Detailed message ------------------------------
-
-  atom() is not compatible with iodata() | unicode:charlist()
-  because
-  atom() is not compatible with iolist()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2386:5
      │
@@ -3060,17 +2403,6 @@ Because in the expression's type:
     }
   ]
 
------------------------------- Detailed message ------------------------------
-
-  [{'return', 'something'}] is not compatible with ['notempty_atstart' | 'noteol' | 'notbol' | 'global' | {'match_limit_recursion', number()} | re:compile_option() | {'match_limit', number()} | {'offset', number()} | 'notempty' | {'return', 'iodata' | 'list' | 'binary'} | 'anchored']
-  because
-  {'return', 'something'} is not compatible with 'notempty_atstart' | 'noteol' | 'notbol' | 'global' | {'match_limit_recursion', number()} | re:compile_option() | {'match_limit', number()} | {'offset', number()} | 'notempty' | {'return', 'iodata' | 'list' | 'binary'} | 'anchored'
-  because
-  at tuple index 2:
-  {'return', 'something'} is not compatible with {'return', 'iodata' | 'list' | 'binary'}
-  because
-  'something' is not compatible with 'iodata' | 'list' | 'binary'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2506:5
      │
@@ -3090,15 +2422,6 @@ Because in the expression's type:
     ]
   , [atom()]}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {[number()], [atom()]} is not compatible with {[atom()], [number()]}
-  because
-  [number()] is not compatible with [atom()]
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2518:5
      │
@@ -3120,18 +2443,6 @@ Because in the expression's type:
     ]
   , [{term(), atom()}]}
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 1:
-  {[{term(), number()}], [{term(), atom()}]} is not compatible with {[{term(), atom()}], [{term(), number()}]}
-  because
-  [{term(), number()}] is not compatible with [{term(), atom()}]
-  because
-  at tuple index 2:
-  {term(), number()} is not compatible with {term(), atom()}
-  because
-  number() is not compatible with atom()
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2536:5
      │
@@ -3153,18 +2464,6 @@ Because in the expression's type:
     ]
   }
 
------------------------------- Detailed message ------------------------------
-
-  at tuple index 2:
-  {[{'ok', atom()}], [{'ok', atom()} | {'error', term()}]} is not compatible with {[{'ok', atom()}], [{'error', term()}]}
-  because
-  [{'ok', atom()} | {'error', term()}] is not compatible with [{'error', term()}]
-  because
-  {'ok', atom()} | {'error', term()} is not compatible with {'error', term()}
-  because
-  at tuple index 1:
-  {'ok', atom()} is not compatible with {'error', term()}
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2576:33
      │
@@ -3181,10 +2480,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., ...}
   The type of the expression is missing the following required keys: a.
 
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2586:33
      │
@@ -3202,15 +2497,6 @@ Because in the expression's type:
     Context expects type: 'true'
   , ... }
 
------------------------------- Detailed message ------------------------------
-
-  #{a => number()} is not compatible with #{a => 'true'}
-  because
-  at key `a`:
-  #{a => number()} is not compatible with #{a => 'true'}
-  because
-  number() is not compatible with 'true'
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2596:33
      │
@@ -3227,10 +2513,6 @@ Because in the expression's type:
   Context expects type: #{a := ..., ...}
   The type of the expression is missing the following required keys: a.
 
------------------------------- Detailed message ------------------------------
-
-key `a` is declared as required in the latter but not in the former
-
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
      ┌─ check/src/custom.erl:2709:40
      │

From 2d693f3578bb26a063be967f757aaa4f1bb2924f Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 10 Dec 2025 08:59:12 -0800
Subject: [PATCH 344/394] BE: restore expected test result to generate a panic

Summary:
As title.

Note that this is still failing on GH.

Reviewed By: robertoaloi

Differential Revision: D88751685

fbshipit-source-id: 4050a9f2094ac7c46395f0f05a7f77dfad9a583b
---
 crates/elp/src/bin/main.rs                                     | 1 +
 crates/elp/src/resources/test/hierarchical_config/basic.stdout | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 2ecb900759..fc707eda47 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -2175,6 +2175,7 @@ mod tests {
 
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
+    #[should_panic] // Support for hierarchical config is not implemented yet
     fn lint_hierarchical_config_basic(buck: bool) {
         simple_snapshot_sorted(
             args_vec!["lint", "--read-config"],
diff --git a/crates/elp/src/resources/test/hierarchical_config/basic.stdout b/crates/elp/src/resources/test/hierarchical_config/basic.stdout
index b0ccc8796b..de8cb63308 100644
--- a/crates/elp/src/resources/test/hierarchical_config/basic.stdout
+++ b/crates/elp/src/resources/test/hierarchical_config/basic.stdout
@@ -1,6 +1,5 @@
 Diagnostics reported:
 Reporting all diagnostics codes
-app_a/src/app_a.erl:4:9-4:16::[Warning] [W0002] Unused macro (MACRO_B)
 app_a/src/app_a.erl:6:1-6:5::[Warning] [L1230] function main/0 is unused
 app_b/src/app_b.erl:4:9-4:16::[Warning] [W0002] Unused macro (MACRO_B)
-app_b/src/app_b.erl:6:1-6:5::[Warning] [L1230] function main/0 is unused
\ No newline at end of file
+app_b/src/app_b.erl:6:1-6:5::[Warning] [L1230] function main/0 is unused

From 0930edd69319ef39636401a84591f4632d25af51 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Thu, 11 Dec 2025 05:22:57 -0800
Subject: [PATCH 345/394] BE: report malformed test fixture

Summary:
A declarative test fixture can have multiple files in it, in which case each has a metadata line giving the file name. But we have not been checking if it is omitted from the first file, leading to confusing behaviour when writing tests.

This diff updates test fixture parsing to panic in that case, with an appropriate message.

Reviewed By: TD5

Differential Revision: D88947477

fbshipit-source-id: 7ef7151fafb44d087b1da25c55454f20899ca67f
---
 crates/project_model/src/test_fixture.rs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/crates/project_model/src/test_fixture.rs b/crates/project_model/src/test_fixture.rs
index ac60d3b7c2..f121e20d88 100644
--- a/crates/project_model/src/test_fixture.rs
+++ b/crates/project_model/src/test_fixture.rs
@@ -277,6 +277,12 @@ impl FixtureWithProjectMeta {
 
                 if let Some(entry) = res.last_mut() {
                     entry.text.push_str(line);
+                } else if line.chars().any(|c| !c.is_whitespace()) {
+                    panic!(
+                        "Fixture has content before the first file marker (`//- /path/to/file.erl`). \
+                         Did you forget to add a file marker at the beginning?\n\
+                         The offending line: {line:?}"
+                    );
                 }
             }
         }
@@ -838,6 +844,19 @@ mod tests {
     use crate::test_fixture::extract_tags;
     use crate::test_fixture::remove_annotations;
 
+    #[test]
+    #[should_panic(expected = "Fixture has content before the first file marker")]
+    fn parse_fixture_panics_on_content_before_first_file_marker() {
+        FixtureWithProjectMeta::parse(
+            r#"
+        -module(main).
+        foo() -> ok.
+        //- /src/erl_eval.erl
+        -module(erl_eval).
+        "#,
+        );
+    }
+
     #[test]
     #[should_panic]
     fn parse_fixture_checks_further_indented_metadata() {

From 290b931170a197007f294e981bcf77c18f6a3a5f Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Thu, 11 Dec 2025 06:21:28 -0800
Subject: [PATCH 346/394] BE: validate test fixture

Summary:
A common mistake when writing a declarative test fixture is to have a syntax error in it.

This diff adds `ChangeFixture::validate` to check for these, and panic if found, e.g.

```
thread 'tests::validate_fixture_with_parse_error' panicked at crates/ide_db/src/lib.rs:462:17:
Fixture validation failed: syntax errors found in test fixture

File: /src/test.erl
Errors: [Missing(")", 19..19)]
Content:
-module(test).
foo( -> ok.

Parse Tree:
SourceFile {
    syntax: SOURCE_FILE@0..27
      MODULE_ATTRIBUTE@0..14
        ANON_DASH@0..1 "-"
        ANON_MODULE@1..7 "module"
        ANON_LPAREN@7..8 "("
        ATOM@8..12
          ATOM@8..12 "test"
        ANON_RPAREN@12..13 ")"
        ANON_DOT@13..14 "."
      WHITESPACE@14..15 "\n"
      FUN_DECL@15..26
        FUNCTION_CLAUSE@15..25
          ATOM@15..18
            ATOM@15..18 "foo"
          EXPR_ARGS@18..19
            ANON_LPAREN@18..19 "("
          WHITESPACE@19..20 " "
          CLAUSE_BODY@20..25
            ANON_DASH_GT@20..22 "->"
            WHITESPACE@22..23 " "
            ATOM@23..25
              ATOM@23..25 "ok"
        ANON_DOT@25..26 "."
      WHITESPACE@26..27 "\n"
    ,
}
 ---
If this is expected, add `//- expect_parse_errors` to the start of the fixture
```

A subsequent diff will apply it to the code base

Reviewed By: TD5

Differential Revision: D88948352

fbshipit-source-id: 532275075bb338191594966bb3292986442cead6
---
 crates/base_db/src/fixture.rs | 53 +++++++++++++++++++++++++++++++++++
 crates/ide_db/src/lib.rs      | 13 +++++++++
 2 files changed, 66 insertions(+)

diff --git a/crates/base_db/src/fixture.rs b/crates/base_db/src/fixture.rs
index d6d2205ce9..0e770f539e 100644
--- a/crates/base_db/src/fixture.rs
+++ b/crates/base_db/src/fixture.rs
@@ -405,6 +405,59 @@ impl ChangeFixture {
             .get(&VfsPath::from(path.clone()))
             .cloned()
     }
+
+    /// Validate all files in the fixture for syntax errors.
+    /// Panics with context if any syntax errors are found.
+    #[track_caller]
+    pub fn validate<DB: SourceDatabaseExt>(&self, db: &DB) {
+        let mut errors_found = Vec::new();
+
+        for file_id in &self.files {
+            let parse = db.parse(*file_id);
+            let errors = parse.errors();
+
+            if !errors.is_empty() {
+                let path = self
+                    .files_by_path
+                    .iter()
+                    .find_map(|(vfs_path, id)| {
+                        if id == file_id {
+                            Some(
+                                vfs_path
+                                    .as_path()
+                                    .map(|p| p.to_string())
+                                    .unwrap_or_else(|| format!("{:?}", vfs_path)),
+                            )
+                        } else {
+                            None
+                        }
+                    })
+                    .unwrap_or_else(|| format!("FileId({:?})", file_id));
+
+                let file_text = SourceDatabaseExt::file_text(db, *file_id);
+                let tree = parse.tree();
+                errors_found.push((path, file_text.to_string(), errors.to_vec(), tree));
+            }
+        }
+
+        if !errors_found.is_empty() {
+            let mut message =
+                String::from("Fixture validation failed: syntax errors found in test fixture\n\n");
+
+            for (path, text, errors, tree) in errors_found {
+                message.push_str(&format!("File: {}\n", path));
+                message.push_str(&format!("Errors: {:?}\n", errors));
+                message.push_str(&format!("Content:\n{}\n", text));
+                message.push_str(&format!("Parse Tree:\n{:#?}\n", tree));
+                message.push_str("---\n");
+            }
+            message.push_str(
+                "If this is expected, add `//- expect_parse_errors` to the start of the fixture\n",
+            );
+
+            panic!("{}", message);
+        }
+    }
 }
 
 fn inc_file_id(file_id: &mut FileId) {
diff --git a/crates/ide_db/src/lib.rs b/crates/ide_db/src/lib.rs
index a00ea1f0d9..9b64d09b31 100644
--- a/crates/ide_db/src/lib.rs
+++ b/crates/ide_db/src/lib.rs
@@ -448,4 +448,17 @@ mod tests {
         let position = fixture.position();
         debug_assert_eq!(db.clamp_offset(position.file_id, 2000.into()), 15.into())
     }
+
+    #[test]
+    #[should_panic(expected = "Fixture validation failed: syntax errors found in test fixture")]
+    fn validate_fixture_with_parse_error() {
+        let fixture = r#"
+//- /src/test.erl
+-module(test).
+foo( -> ok.
+"#;
+
+        let (db, fixture) = RootDatabase::with_fixture(fixture);
+        fixture.validate(&db);
+    }
 }

From 4bfedaee9ad90fb146f0008b0abd10156cdd7f0b Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Thu, 11 Dec 2025 06:21:28 -0800
Subject: [PATCH 347/394] BE: validate all test fixtures

Summary:
The previous diff added the ability to validate a test fixture for parse errors, with an override mechanism if they are expected.

This diff enables the validation for all fixture parsing, and fixes all the resulting errors.

Reviewed By: TD5

Differential Revision: D88948727

fbshipit-source-id: c7e584f3e63c5ad095b9602eed56b469a73392d2
---
 crates/base_db/src/fixture.rs                 |  9 +++++
 crates/elp/src/bin/glean.rs                   |  8 ++---
 crates/hir/src/body/scope.rs                  |  2 +-
 crates/hir/src/body/tests.rs                  | 14 ++++++--
 crates/hir/src/body/tree_print.rs             |  6 ++--
 crates/hir/src/fold.rs                        |  2 ++
 crates/hir/src/form_list/tests.rs             |  1 +
 crates/ide/src/diagnostics.rs                 |  8 ++++-
 crates/ide/src/diagnostics_collection.rs      |  1 +
 crates/ide/src/expand_macro.rs                |  6 ++--
 crates/ide/src/inlay_hints/param_name.rs      |  1 +
 crates/ide/src/runnables.rs                   |  2 +-
 crates/ide/src/signature_help.rs              | 12 +++++++
 crates/ide/src/tests.rs                       |  1 +
 crates/ide_completion/src/attributes.rs       |  9 +++++
 crates/ide_completion/src/ctx.rs              | 35 +++++++++++++++++++
 crates/ide_completion/src/export_functions.rs |  2 ++
 crates/ide_completion/src/export_types.rs     |  1 +
 crates/ide_completion/src/functions.rs        | 23 ++++++++++++
 crates/ide_completion/src/keywords.rs         |  7 ++++
 crates/ide_completion/src/macros.rs           |  3 ++
 crates/ide_completion/src/maps.rs             | 13 +++++--
 crates/ide_completion/src/modules.rs          |  1 +
 crates/ide_completion/src/records.rs          | 10 ++++++
 crates/ide_completion/src/spec.rs             |  2 ++
 crates/ide_completion/src/types.rs            |  5 +++
 crates/ide_completion/src/vars.rs             |  4 +++
 crates/ide_ssr/src/tests.rs                   |  8 ++---
 crates/project_model/src/test_fixture.rs      |  9 +++++
 29 files changed, 185 insertions(+), 20 deletions(-)

diff --git a/crates/base_db/src/fixture.rs b/crates/base_db/src/fixture.rs
index 0e770f539e..cd1328d14d 100644
--- a/crates/base_db/src/fixture.rs
+++ b/crates/base_db/src/fixture.rs
@@ -87,6 +87,7 @@ pub trait WithFixture: Default + SourceDatabaseExt + 'static {
         let (fixture, change) = ChangeFixture::parse(fixture_str);
         let mut db = Self::default();
         change.apply(&mut db, &|path| fixture.resolve_file_id(path));
+        fixture.validate(&db);
         (db, fixture)
     }
 }
@@ -101,6 +102,7 @@ pub struct ChangeFixture {
     pub diagnostics_enabled: DiagnosticsEnabled,
     pub tags: FxHashMap<FileId, Vec<(TextRange, Option<String>)>>,
     pub annotations: FxHashMap<FileId, Vec<(TextRange, String)>>,
+    pub expect_parse_errors: bool,
 }
 
 struct Builder {
@@ -172,6 +174,7 @@ impl ChangeFixture {
         let FixtureWithProjectMeta {
             fixture,
             mut diagnostics_enabled,
+            expect_parse_errors,
         } = fixture_with_meta.clone();
 
         let builder = Builder::new(diagnostics_enabled.clone());
@@ -344,6 +347,7 @@ impl ChangeFixture {
                 diagnostics_enabled,
                 tags,
                 annotations,
+                expect_parse_errors,
             },
             change,
             project,
@@ -408,8 +412,13 @@ impl ChangeFixture {
 
     /// Validate all files in the fixture for syntax errors.
     /// Panics with context if any syntax errors are found.
+    /// Skips validation if `expect_parse_errors` is set to true.
     #[track_caller]
     pub fn validate<DB: SourceDatabaseExt>(&self, db: &DB) {
+        if self.expect_parse_errors {
+            return;
+        }
+
         let mut errors_found = Vec::new();
 
         for file_id in &self.files {
diff --git a/crates/elp/src/bin/glean.rs b/crates/elp/src/bin/glean.rs
index c31d45dc9e..2a45e450f2 100644
--- a/crates/elp/src/bin/glean.rs
+++ b/crates/elp/src/bin/glean.rs
@@ -2335,10 +2335,10 @@ mod tests {
     fn xref_types_test() {
         let spec = r#"
         //- /glean/app_glean/src/glean_module81.erl
-        -type small() :: #{non_neg_integer() | infinity}.
+        -type small() ::  {non_neg_integer() | infinity}.
 
         //- /glean/app_glean/src/glean_module8.erl
-        -type huuuge() :: #{non_neg_integer() | infinity}.
+        -type huuuge() ::  {non_neg_integer() | infinity}.
         -spec baz(
             A :: huuuge(),
         %%       ^^^^^^ glean_module8/huuuge/0
@@ -2393,10 +2393,10 @@ mod tests {
     fn xref_types_v2_test() {
         let spec = r#"
         //- /glean/app_glean/src/glean_module81.erl
-        -type small() :: #{non_neg_integer() | infinity}.
+        -type small() ::  {non_neg_integer() | infinity}.
 
         //- /glean/app_glean/src/glean_module8.erl
-        -type huuuge() :: #{non_neg_integer() | infinity}.
+        -type huuuge() ::  {non_neg_integer() | infinity}.
         -spec baz(
             A :: huuuge(),
         %%       ^^^^^^ glean_module8.erl/type/huuuge/0
diff --git a/crates/hir/src/body/scope.rs b/crates/hir/src/body/scope.rs
index dd1da23e94..4ac4e366d8 100644
--- a/crates/hir/src/body/scope.rs
+++ b/crates/hir/src/body/scope.rs
@@ -865,7 +865,7 @@ mod tests {
             f() ->
               As = [1,2,3],
               Bs = [4,5,6],
-              [{X,Y}~ || X <- As && Y <- Bs]
+              [{X,Y, ~} || X <- As && Y <- Bs]
               .
             ",
             &["Y", "X", "As", "Bs"],
diff --git a/crates/hir/src/body/tests.rs b/crates/hir/src/body/tests.rs
index c616df812d..eab603a76d 100644
--- a/crates/hir/src/body/tests.rs
+++ b/crates/hir/src/body/tests.rs
@@ -448,6 +448,7 @@ foo(#record.field) -> #record.field.
 fn record() {
     check(
         r#"
+//- expect_parse_errors
 foo1(#record{field = 1}) -> #record{field = A + B}.
 foo2(#record{field}) -> #record{field = }.
 "#,
@@ -473,6 +474,7 @@ foo2(#record{field}) -> #record{field = }.
 fn record_update() {
     check(
         r#"
+//- expect_parse_errors
 foo1() -> Expr#record{field = undefined}.
 foo2() -> Expr#record{field = ok, missing = }.
 "#,
@@ -557,7 +559,7 @@ fn case() {
         r#"
 foo() ->
     case 1 + 2 of
-        X when X andalso true; X <= 100, X >= 5 -> ok;
+        X when X andalso true; X =< 100, X >= 5 -> ok;
         _ -> error
     end.
 "#,
@@ -566,7 +568,7 @@ foo() ->
                 case (1 + 2) of
                     X when
                         (X andalso true);
-                        (X < 100),
+                        (X =< 100),
                         (X >= 5)
                     ->
                         ok;
@@ -836,6 +838,7 @@ foo() ->
 fn parens() {
     check(
         r#"
+//- expect_parse_errors
 foo((ok), ()) ->
     (ok),
     ().
@@ -995,6 +998,7 @@ foo(fun() -> ok end) -> ok.
 fn invalid_comprehension() {
     check(
         r#"
+//- expect_parse_errors
 foo(<<Byte || Byte <- List>>, [Byte || Byte <- List]]) -> ok.
 "#,
         expect![[r#"
@@ -1392,6 +1396,7 @@ fn call_type_erlang_bif() {
 fn record_type() {
     check(
         r#"
+//- expect_parse_errors
 -type foo1() :: #record{}.
 -type foo2(B) :: #record{a :: integer(), b :: B}.
 -type foo3() :: #record{a ::}.
@@ -1529,6 +1534,7 @@ fn record_definition() {
 fn simple_term() {
     check(
         r#"
+//- expect_parse_errors
 -foo(ok).
 -missing_value().
 "#,
@@ -2693,6 +2699,7 @@ fn verbatim_binary_sigil_in_type() {
     // Note: \~ gets replaced by ~ in the fixture parsing
     check(
         r#"
+        //- expect_parse_errors
         -type foo() :: \~B"ab\"c\"\d").
         -type bar() :: "hello").
         "#,
@@ -2723,6 +2730,7 @@ fn verbatim_binary_sigil_in_term() {
 fn lowering_with_error_nodes() {
     check(
         r#"
+         //- expect_parse_errors
             f(1a) -> ok begin 1 end.
         "#,
         expect![[r#"
@@ -2989,8 +2997,10 @@ fn tree_print_record() {
 
 #[test]
 fn tree_print_attribute() {
+    // TODO: fix wild attribute parsing, T246546041, to remove expect_parse_errors
     check_ast(
         r#"
+        //- expect_parse_errors
          -wild(foo, []).
          -compile({inline, [foo/1]}).
          -compile({a/a, 1/1}).
diff --git a/crates/hir/src/body/tree_print.rs b/crates/hir/src/body/tree_print.rs
index 4aa6591d84..d6b956690f 100644
--- a/crates/hir/src/body/tree_print.rs
+++ b/crates/hir/src/body/tree_print.rs
@@ -2340,7 +2340,7 @@ mod tests {
             r#"
              foo() ->
                  case 1 + 2 of
-                     X when X andalso true; X <= 100, X >= 5 -> ok;
+                     X when X andalso true; X =< 100, X >= 5 -> ok;
                      _ -> error
                  end.
             "#,
@@ -2381,7 +2381,7 @@ mod tests {
                                                 rhs
                                                     Expr<8>:Literal(Integer(100))
                                                 op
-                                                    CompOp(Ord { ordering: Less, strict: true }),
+                                                    CompOp(Ord { ordering: Less, strict: false }),
                                             },
                                             Expr<12>:Expr::BinaryOp {
                                                 lhs
@@ -3114,6 +3114,7 @@ mod tests {
     fn type_record() {
         check(
             r#"
+            //- expect_parse_errors
             -type foo1() :: #record{}.
             -type foo2(B) :: #record{a :: integer(), b :: B}.
             -type foo3() :: #record{a ::}.
@@ -3498,6 +3499,7 @@ mod tests {
     fn top_level_forms() {
         check(
             r#"
+            //- expect_parse_errors
              -module(main).
              bug
              -compile([export_all]).
diff --git a/crates/hir/src/fold.rs b/crates/hir/src/fold.rs
index 78cd442592..56ea3f56ae 100644
--- a/crates/hir/src/fold.rs
+++ b/crates/hir/src/fold.rs
@@ -2212,7 +2212,9 @@ bar() ->
 
     #[test]
     fn traverse_attribute() {
+        // TODO: fix wild attribute parsing, T246546041, to remove expect_parse_errors
         let fixture_str = r#"
+               //- expect_parse_errors
                -module(foo).
                -wild(r1, {f1, f~oo}).
                "#;
diff --git a/crates/hir/src/form_list/tests.rs b/crates/hir/src/form_list/tests.rs
index 00a5ec4020..79f542fd0d 100644
--- a/crates/hir/src/form_list/tests.rs
+++ b/crates/hir/src/form_list/tests.rs
@@ -318,6 +318,7 @@ fn export() {
 fn import() {
     check(
         r#"
+//- expect_parse_errors
 -import(, []).
 -import(foo, []).
 -import(foo, [foo/1]).
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index f9373e25b4..e3aa185b19 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -3189,6 +3189,7 @@ mod tests {
     fn syntax_error() {
         check_diagnostics(
             r#"
+//- expect_parse_errors
 -module(main).
 foo() -> XX 3.0.
     %%   ^^ error: P1711: Syntax Error
@@ -3366,6 +3367,7 @@ main(X) ->
     #[test]
     fn label_syntax_error_not_function() {
         let fixture_str = r#"
+  //- expect_parse_errors
     -module(main).
     -record(person, {(name + XXX)}).
   %%                 ^^^^^^^ error: P1711: Syntax Error
@@ -3381,7 +3383,7 @@ main(X) ->
         expect![[r#"
             Some(
                 Range(
-                    24..56,
+                    5..45,
                 ),
             )
         "#]]
@@ -3540,6 +3542,7 @@ main(X) ->
             config,
             &extra_diags,
             r#"
+             //- expect_parse_errors
              -module(main).
 
              -export([foo/0,bar/0]).
@@ -3577,6 +3580,7 @@ main(X) ->
         check_diagnostics(
             r#"
              //- erlang_service
+             //- expect_parse_errors
              //- /src/a_mod.erl app:app_a
              -module(a_mod).
              -export([foo/0]).
@@ -3595,6 +3599,7 @@ main(X) ->
         check_diagnostics(
             r#"
              //- erlang_service
+             //- expect_parse_errors
              //- native
              //- /src/a_mod.erl app:app_a
              -module(a_mod).
@@ -3673,6 +3678,7 @@ main(X) ->
     fn test_nested_syntax_errors() {
         check_diagnostics(
             r#"
+            //- expect_parse_errors
             -module(main).
             run() ->
                 ExitCode =
diff --git a/crates/ide/src/diagnostics_collection.rs b/crates/ide/src/diagnostics_collection.rs
index 4abe143dd9..fe1fc759aa 100644
--- a/crates/ide/src/diagnostics_collection.rs
+++ b/crates/ide/src/diagnostics_collection.rs
@@ -415,6 +415,7 @@ mod tests {
             config,
             &extra_diags,
             r#"
+             //- expect_parse_errors
              -module(main).
 
              -export([foo/0,bar/0]).
diff --git a/crates/ide/src/expand_macro.rs b/crates/ide/src/expand_macro.rs
index 95735a904d..a5a6f759fc 100644
--- a/crates/ide/src/expand_macro.rs
+++ b/crates/ide/src/expand_macro.rs
@@ -83,7 +83,7 @@ mod tests {
         check(
             r#"
 -module(foo).
--bar() -> ?L~INE.
+bar() -> ?L~INE.
 "#,
             expect![[r#"
                 LINE
@@ -97,7 +97,7 @@ mod tests {
         check(
             r#"
 -module(foo).
--bar() -> ?F~ILE.
+bar() -> ?F~ILE.
 "#,
             expect![[r#"
                 FILE
@@ -420,7 +420,7 @@ baz() ->
                             maps:get(type, ExpectedQr, missing_expected_type);
                         _ ->
                             Type
-                    end,
+                    end
 ).
 baz() ->
     ?asser~tQrs(AliceWID, ?WA_QR_TYPE_MESSAGE, []),
diff --git a/crates/ide/src/inlay_hints/param_name.rs b/crates/ide/src/inlay_hints/param_name.rs
index cf16198dfe..88a95e86d7 100644
--- a/crates/ide/src/inlay_hints/param_name.rs
+++ b/crates/ide/src/inlay_hints/param_name.rs
@@ -259,6 +259,7 @@ main() ->
     fn param_hints_variables_missing_param() {
         check_params(
             r#"
+//- expect_parse_errors
 -module(main).~
 -compile(export_all).
 sum(A, B) -> A + B.
diff --git a/crates/ide/src/runnables.rs b/crates/ide/src/runnables.rs
index 4b2348f610..0aa731c8c9 100644
--- a/crates/ide/src/runnables.rs
+++ b/crates/ide/src/runnables.rs
@@ -243,7 +243,7 @@ mod tests {
  //- /my_app/src/runnables.erl
     ~
     -module(runnables).
-    -export([all/]).
+    -export([all/0]).
     main() ->
       ok.
     "#,
diff --git a/crates/ide/src/signature_help.rs b/crates/ide/src/signature_help.rs
index fba6d12d73..d09ec201f8 100644
--- a/crates/ide/src/signature_help.rs
+++ b/crates/ide/src/signature_help.rs
@@ -311,6 +311,7 @@ mod tests {
     fn test_fn_signature_local_two_args() {
         check(
             r#"
+//- expect_parse_errors
 -module(main).
 
 -spec add(integer(), integer()) -> integer().
@@ -343,6 +344,7 @@ main() ->
         );
         check(
             r#"
+//- expect_parse_errors
 -module(main).
 
 -spec add(integer(), integer()) -> integer().
@@ -375,6 +377,7 @@ main() ->
         );
         check(
             r#"
+//- expect_parse_errors
 -module(main).
 
 -spec add(integer(), integer()) -> integer().
@@ -411,6 +414,7 @@ main() ->
     fn test_fn_signature_remote_two_args() {
         check(
             r#"
+//- expect_parse_errors
 //- /one.erl
 -module(one).
 
@@ -449,6 +453,7 @@ main() ->
         );
         check(
             r#"
+//- expect_parse_errors
 //- /one.erl
 -module(one).
 
@@ -487,6 +492,7 @@ main() ->
         );
         check(
             r#"
+//- expect_parse_errors
 //- /one.erl
 -module(one).
 
@@ -529,6 +535,7 @@ main() ->
     fn test_fn_signature_quoted_remote_two_args() {
         check(
             r#"
+//- expect_parse_errors
 //- /Elixir.One.erl
 -module('Elixir.One').
 
@@ -576,6 +583,7 @@ main() ->
     fn test_fn_signature_unclosed_call() {
         check(
             r#"
+//- expect_parse_errors
 -module(main).
 
 -compile(export_all).
@@ -626,6 +634,7 @@ main() ->
     fn test_fn_signature_doc() {
         check(
             r#"
+//- expect_parse_errors
 -module(main).
 
 -compile(export_all).
@@ -685,6 +694,7 @@ main() ->
         if supports_eep59_doc_attributes() {
             check(
                 r#"
+//- expect_parse_errors
 -module(main).
 
 -compile(export_all).
@@ -753,6 +763,7 @@ main() ->
     fn test_fn_signature_local_imported() {
         check(
             r#"
+//- expect_parse_errors
 //- /one.erl
 -module(one).
 -compile(export_all).
@@ -794,6 +805,7 @@ main() ->
     fn test_fn_signature_spec_arg_names() {
         check(
             r#"
+//- expect_parse_errors
 //- /one.erl
 -module(one).
 -compile(export_all).
diff --git a/crates/ide/src/tests.rs b/crates/ide/src/tests.rs
index 86f0a57555..f1a9065e01 100644
--- a/crates/ide/src/tests.rs
+++ b/crates/ide/src/tests.rs
@@ -695,6 +695,7 @@ mod test {
     fn filtered_diagnostics_passes_syntax_errors() {
         check_filtered_diagnostics(
             r#"
+            //- expect_parse_errors
             %%<^^^^^^^^^^^^ 💡 error: L1201: no module definition
             foo() ->
                bug bug.
diff --git a/crates/ide_completion/src/attributes.rs b/crates/ide_completion/src/attributes.rs
index fc97832d30..f381df147d 100644
--- a/crates/ide_completion/src/attributes.rs
+++ b/crates/ide_completion/src/attributes.rs
@@ -166,6 +166,7 @@ mod test {
     fn test_error_recovery() {
         check(
             r#"
+            //- expect_parse_errors
             //- /src/sample.erl
             -module(sample1).
             % U.S. English
@@ -180,6 +181,7 @@ mod test {
 
         check(
             r#"
+            //- expect_parse_errors
             //- /src/sample.erl
             -module(sample1).
             % U.K. English
@@ -197,6 +199,7 @@ mod test {
     fn test_typing_attribute() {
         check(
             r#"
+        //- expect_parse_errors
         -module(sample).
         -typ~
         "#,
@@ -211,6 +214,7 @@ mod test {
     fn test_module_attribute() {
         check(
             r#"
+        //- expect_parse_errors
         -mod~
         "#,
             None,
@@ -224,6 +228,7 @@ mod test {
     fn test_module_attribute_hyphen() {
         check(
             r#"
+        //- expect_parse_errors
         //- /src/my-module.erl
         -mod~
         "#,
@@ -238,6 +243,7 @@ mod test {
     fn test_module_attribute_at() {
         check(
             r#"
+        //- expect_parse_errors
         //- /src/my@module.erl
         -mod~
         "#,
@@ -252,6 +258,7 @@ mod test {
     fn test_module_attribute_underscore() {
         check(
             r#"
+        //- expect_parse_errors
         //- /src/my_module.erl
         -mod~
         "#,
@@ -266,6 +273,7 @@ mod test {
     fn test_module_attribute_uppercase() {
         check(
             r#"
+        //- expect_parse_errors
         //- /src/Module.erl
         -mod~
         "#,
@@ -280,6 +288,7 @@ mod test {
     fn test_module_attribute_uppercase_middle() {
         check(
             r#"
+        //- expect_parse_errors
         //- /src/moDule.erl
         -mod~
         "#,
diff --git a/crates/ide_completion/src/ctx.rs b/crates/ide_completion/src/ctx.rs
index 22e385e3fa..0d9381e7ec 100644
--- a/crates/ide_completion/src/ctx.rs
+++ b/crates/ide_completion/src/ctx.rs
@@ -281,6 +281,7 @@ mod ctx_tests {
     fn expr_ctx() {
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         test() ->
             ~X.
@@ -290,6 +291,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         test() ->
             case 1 of.
@@ -301,6 +303,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         test() ->
             fun(_) -> ~X end.
@@ -310,6 +313,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         test() ->
             try 1
@@ -353,6 +357,7 @@ mod ctx_tests {
     fn ctx_pattern() {
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         test(Y, X) ->
             ~Y = X.
@@ -362,6 +367,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         test(X) ->
             case rand:uniform(1) of
@@ -373,6 +379,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         test(X) ->
             fun(X~) -> 1 end.
@@ -382,6 +389,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         test() ->
             receive
@@ -393,6 +401,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         test() ->
             try [1]
@@ -407,6 +416,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         test(X) ->
             if
@@ -429,6 +439,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         test(Y, X) ->
             try ok of
@@ -440,6 +451,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         test(Y, X) ->
             try ok of
@@ -457,6 +469,7 @@ mod ctx_tests {
     fn ctx_pattern_error_recovery_wip() {
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         test(Y, X) ->
             try ok of
@@ -469,6 +482,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         test(Y, X) ->
             try ok of
@@ -485,6 +499,7 @@ mod ctx_tests {
     fn test_type_param_ctx() {
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         -type ty(s~) :: ok.
         "#),
@@ -496,6 +511,7 @@ mod ctx_tests {
     fn test_export_ctx() {
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         -export([
             f~
@@ -509,6 +525,7 @@ mod ctx_tests {
     fn test_export_type_ctx() {
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         -export_type([
             t~
@@ -522,6 +539,7 @@ mod ctx_tests {
     fn test_spec_ctx() {
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         -spec t~
         table() -> ok.
@@ -535,6 +553,7 @@ mod ctx_tests {
     fn test_type_ctx() {
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         -spec test() -> ~
         test() -> ok.
@@ -544,6 +563,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         -spec test() -> o~k
         test() -> ok.
@@ -553,6 +573,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         -spec test(o~) -> ok.
         test() -> ok.
@@ -562,6 +583,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         -record(foo, {field1, field2 :: X~}).
         "#),
@@ -570,6 +592,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         -opaque test() :: ~.
         "#),
@@ -578,6 +601,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         -nominal test() :: ~.
         "#),
@@ -586,6 +610,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         -type test() :: m~
         "#),
@@ -594,6 +619,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         -spec test() -> ~ok.
         "#),
@@ -605,6 +631,7 @@ mod ctx_tests {
     fn test_ctx_error_recovery() {
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         test() ->
             ~
@@ -614,6 +641,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         test() ->
             X + ~
@@ -623,6 +651,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         test() ->
             X + ~.
@@ -632,6 +661,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         test() ->
             case rand:uniform(1) of
@@ -643,6 +673,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         test() ->
             (erlang:term_to_binary(~
@@ -653,6 +684,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         test() ->
             (erlang:term_to_binary(~.
@@ -663,6 +695,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         -type ty() :: ~
         "#),
@@ -671,6 +704,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         -type ty() :: l~.
         "#),
@@ -679,6 +713,7 @@ mod ctx_tests {
 
         assert_eq!(
             ctx(r#"
+        //- expect_parse_errors
         -module(sample).
         -record(rec, {field = lists:map(fun(X) -> X + 1 end, [1, ~])}).
         "#),
diff --git a/crates/ide_completion/src/export_functions.rs b/crates/ide_completion/src/export_functions.rs
index f362ea830a..ef803eb9ab 100644
--- a/crates/ide_completion/src/export_functions.rs
+++ b/crates/ide_completion/src/export_functions.rs
@@ -83,6 +83,7 @@ mod test {
 
         check(
             r#"
+        //- expect_parse_errors
         -module(sample).
         -export([
             foo~
@@ -106,6 +107,7 @@ mod test {
 
         check(
             r#"
+        //- expect_parse_errors
         -module(sample).
         -export([
             function_a/0,
diff --git a/crates/ide_completion/src/export_types.rs b/crates/ide_completion/src/export_types.rs
index 9e80828b66..c21a37339e 100644
--- a/crates/ide_completion/src/export_types.rs
+++ b/crates/ide_completion/src/export_types.rs
@@ -79,6 +79,7 @@ mod test {
 
         check(
             r#"
+        //- expect_parse_errors
         -module(sample).
         -export_type([
             foo~
diff --git a/crates/ide_completion/src/functions.rs b/crates/ide_completion/src/functions.rs
index 4ce641d0e9..eab033765f 100644
--- a/crates/ide_completion/src/functions.rs
+++ b/crates/ide_completion/src/functions.rs
@@ -243,6 +243,7 @@ mod test {
 
         check(
             r#"
+    //- expect_parse_errors
     //- /src/sample1.erl
     -module(sample1).
     local() ->
@@ -265,6 +266,7 @@ mod test {
 
         check(
             r#"
+    //- expect_parse_errors
     //- /src/sample1.erl
     -module(sample1).
     local() ->
@@ -338,6 +340,7 @@ mod test {
 
         check(
             r#"
+    //- expect_parse_errors
     //- /src/sample1.erl
     -module(sample1).
     local() ->
@@ -360,6 +363,7 @@ mod test {
 
         check(
             r#"
+    //- expect_parse_errors
     //- /src/sample1.erl
     -module(sample1).
     local() ->
@@ -379,12 +383,14 @@ mod test {
                 {label:foon/2, kind:Function, contents:Snippet("foon(${1:A}, ${2:B})"), position:Some(FilePosition { file_id: FileId(1), offset: 86 })}"#]],
         );
     }
+
     #[test]
     fn test_remote_calls_deprecated() {
         assert!(serde_json::to_string(&lsp_types::CompletionItemKind::MODULE).unwrap() == "9");
 
         check(
             r#"
+    //- expect_parse_errors
     //- /src/sample1.erl
     -module(sample1).
     local() ->
@@ -413,6 +419,7 @@ mod test {
 
         check(
             r#"
+    //- expect_parse_errors
     //- /src/sample1.erl
     -module(sample1).
     local() ->
@@ -441,6 +448,7 @@ mod test {
 
         check(
             r#"
+    //- expect_parse_errors
     //- /src/sample1.erl
     -module(sample1).
     local() ->
@@ -466,6 +474,7 @@ mod test {
 
         check(
             r#"
+    //- expect_parse_errors
     //- /src/sample1.erl
     -module(sample1).
     local() ->
@@ -584,6 +593,7 @@ mod test {
     fn test_remote_fun_exprs_with_trigger() {
         check(
             r#"
+    //- expect_parse_errors
     //- /src/sample1.erl
     -module(sample1).
     main(_) ->
@@ -607,6 +617,7 @@ mod test {
     fn test_local_fun_exprs_with_trigger() {
         check(
             r#"
+    //- expect_parse_errors
     //- /src/sample1.erl
     -module(sample1).
     foo() -> ok.
@@ -622,6 +633,7 @@ mod test {
     fn test_local_fun_exprs_no_trigger() {
         check(
             r#"
+    //- expect_parse_errors
     //- /src/sample1.erl
     -module(sample1).
     foo() -> ok.
@@ -637,6 +649,7 @@ mod test {
     fn function_error_recovery() {
         check(
             r#"
+    //- expect_parse_errors
     -module(sample1).
     foo() ->
         b~
@@ -650,6 +663,7 @@ mod test {
         );
         check(
             r#"
+    //- expect_parse_errors
     //- /src/sample1.erl
     -module(sample1).
     local() ->
@@ -668,6 +682,7 @@ mod test {
     fn test_local_and_remote() {
         check(
             r#"
+    //- expect_parse_errors
     //- /src/sample1.erl
     -module(sample1).
     samba() -> ok.
@@ -688,6 +703,7 @@ mod test {
     fn test_remote_call_broken_case() {
         check(
             r#"
+    //- expect_parse_errors
     //- /src/sample1.erl
     -module(sample1).
     test() ->
@@ -709,6 +725,7 @@ mod test {
     fn test_local_call_broken_case() {
         check(
             r#"
+    //- expect_parse_errors
     //- /src/sample1.erl
     -module(sample1).
     foo() -> ok.
@@ -802,6 +819,7 @@ mod test {
 
         check(
             r#"
+    //- expect_parse_errors
     //- /src/sample1.erl
     -module(sample1).
     local() ->
@@ -820,6 +838,7 @@ mod test {
         );
         check(
             r#"
+//- expect_parse_errors
 //- /src/sample1.erl
 -module(sample1).
 local() ->
@@ -839,6 +858,7 @@ foo(X, Y) -> ok.
         );
         check(
             r#"
+//- expect_parse_errors
 //- /src/sample1.erl
 -module(sample1).
 local() ->
@@ -902,6 +922,7 @@ foo(X, Y) -> ok.
     fn test_remote_call_same_module_macro_prefix() {
         check(
             r#"
+    //- expect_parse_errors
     -module(main).
     -export([main/0, do_not_use_me/0]).
     -deprecated({do_not_use_me, 0, "Because I said so"}).
@@ -922,6 +943,7 @@ foo(X, Y) -> ok.
     fn test_in_dialyzer_attribute() {
         check(
             r#"
+    //- expect_parse_errors
     -module(main).
     -export([
         foo/1,
@@ -942,6 +964,7 @@ foo(X, Y) -> ok.
     fn test_quoted_local_call() {
         check(
             r#"
+    //- expect_parse_errors
     -module(sample).
     test() ->
         fo~(something).
diff --git a/crates/ide_completion/src/keywords.rs b/crates/ide_completion/src/keywords.rs
index 734afc80a5..dc60ae8158 100644
--- a/crates/ide_completion/src/keywords.rs
+++ b/crates/ide_completion/src/keywords.rs
@@ -141,6 +141,7 @@ mod test {
     fn test_no_keywords() {
         check(
             r#"
+    //- expect_parse_errors
     -module(sample).
     test(X) ->
         a~
@@ -150,6 +151,7 @@ mod test {
         );
         check(
             r#"
+    //- expect_parse_errors
     -module(sample).
     test(~X) ->
         X.
@@ -160,6 +162,7 @@ mod test {
 
         check(
             r#"
+    //- expect_parse_errors
     -module(m~).
     "#,
             None,
@@ -168,6 +171,7 @@ mod test {
 
         check(
             r#"
+    //- expect_parse_errors
     -module(m).
     -~
     "#,
@@ -177,6 +181,7 @@ mod test {
 
         check(
             r#"
+    //- expect_parse_errors
     -module(m).
     -type foo() :: ~.
     "#,
@@ -191,6 +196,7 @@ mod test {
     fn test_keywords_error_recovery() {
         check(
             r#"
+    //- expect_parse_errors
     -module(sample).
     test(X) ->
         X ~
@@ -234,6 +240,7 @@ mod test {
 
         check(
             r#"
+    //- expect_parse_errors
     -module(sample).
     test(X) ->
         ~
diff --git a/crates/ide_completion/src/macros.rs b/crates/ide_completion/src/macros.rs
index 3c4b77cfad..e86cf3ba93 100644
--- a/crates/ide_completion/src/macros.rs
+++ b/crates/ide_completion/src/macros.rs
@@ -253,6 +253,7 @@ mod test {
 
         check(
             r#"
+    //- expect_parse_errors
     -module(sample1).
     -define(FOO, 1).
     -define(FOO(), 1).
@@ -271,6 +272,7 @@ mod test {
 
         check(
             r#"
+    //- expect_parse_errors
     -module(sample1).
     -define(FOO, 1).
     -define(BAR, 1).
@@ -282,6 +284,7 @@ mod test {
 
         check(
             r#"
+    //- expect_parse_errors
     -module(sample1).
     -define(FOO, ok).
     -define(BAR, 1).
diff --git a/crates/ide_completion/src/maps.rs b/crates/ide_completion/src/maps.rs
index 4371793356..e232a7d8bc 100644
--- a/crates/ide_completion/src/maps.rs
+++ b/crates/ide_completion/src/maps.rs
@@ -214,6 +214,7 @@ mod test {
     fn test_local_type() {
         check(
             r#"
+         //- expect_parse_errors
          -module(test_local_type).
          -type my_map() :: #{field1 := integer(), field2 => boolean()}.
          foo(X) -> #~
@@ -229,6 +230,7 @@ mod test {
     fn test_included_type() {
         check(
             r#"
+         //- expect_parse_errors
          //- /include/test_included_type.hrl include_path:/include
          -type my_included_map() :: #{field1 := integer(), field2 => integer()}.
          //- /src/test_included_type.erl
@@ -250,6 +252,7 @@ mod test {
     fn test_empty_map_type() {
         check(
             r#"
+         //- expect_parse_errors
          -module(test_empty_map_type).
          -type my_map() :: #{}.
          foo(X) -> #~
@@ -265,6 +268,7 @@ mod test {
     fn test_arity_1_map_type() {
         check(
             r#"
+         //- expect_parse_errors
          -module(test_arity_1_map_type).
          -type my_map() :: #{field1 := true }.
          foo(X) -> #~
@@ -280,6 +284,7 @@ mod test {
     fn test_mixed_map_and_record_types() {
         check(
             r#"
+         //- expect_parse_errors
          -module(test_mixed_map_and_record_types).
          -type my_map() :: #{field1 := true }.
          -record(my_record, {field1}).
@@ -297,6 +302,7 @@ mod test {
     fn test_nested_map_type() {
         check(
             r#"
+         //- expect_parse_errors
          -module(test_nested_map_type).
          -type my_map() :: #{field1 := true, field2 => false}.
          -type my_nested_map() :: #{field1 := #{field1 => my_map()}}.
@@ -315,11 +321,12 @@ mod test {
     fn test_type_from_spec() {
         check(
             r#"
+         //- expect_parse_errors
          //- /src/one.erl
          -module(one).
          -type my_map(X) :: #{field1 := X}.
          -export_type([my_map/0]).
-         
+
          //- /src/two.erl
          -module(two).
          -spec foo(one:my_map(integer())) -> one:my_map(integer()).
@@ -338,11 +345,12 @@ mod test {
     fn test_type_from_unowned_spec() {
         check(
             r#"
+         //- expect_parse_errors
          //- /src/one.erl
          -module(one).
          -type my_map(X) :: #{field1 := X}.
          -export_type([my_map/0]).
-         
+
          //- /src/two.erl
          -module(two).
          -spec foo(one:my_map(integer())) -> one:my_map(integer()).
@@ -359,6 +367,7 @@ mod test {
     fn test_local_type_in_function_argument() {
         check(
             r#"
+         //- expect_parse_errors
          -module(test_local_type).
          -type my_map() :: #{field1 := integer(), field2 => boolean()}.
          foo(#~
diff --git a/crates/ide_completion/src/modules.rs b/crates/ide_completion/src/modules.rs
index 820d04cfe8..3823339f78 100644
--- a/crates/ide_completion/src/modules.rs
+++ b/crates/ide_completion/src/modules.rs
@@ -132,6 +132,7 @@ foo() ->
 
         check(
             r#"
+    //- expect_parse_errors
     //- /src/sample1.erl
     -module(sample1).
     -export([
diff --git a/crates/ide_completion/src/records.rs b/crates/ide_completion/src/records.rs
index cf8e0abc7c..d66e054423 100644
--- a/crates/ide_completion/src/records.rs
+++ b/crates/ide_completion/src/records.rs
@@ -320,6 +320,7 @@ mod test {
     fn test_record_name() {
         check(
             r#"
+        //- expect_parse_errors
         -module(sample).
         -record(this_record, {field1=1, field2=2}).
         -record(that_record, {}).
@@ -334,6 +335,7 @@ mod test {
 
         check(
             r#"
+        //- expect_parse_errors
         -module(sample).
         -record(this_record, {field1=1, field2=2}).
         -record(that_record, {}).
@@ -353,6 +355,7 @@ mod test {
         // Irregular names are quoted.
         check(
             r#"
+        //- expect_parse_errors
         -module(sample).
         -record('this.record', {field1=1, field2=2}).
         -record('that$record', {}).
@@ -369,6 +372,7 @@ mod test {
     fn test_record_error_recovery() {
         check(
             r#"
+        //- expect_parse_errors
         -module(sample).
         -record(rec, {field1=1, field2=2}).
         foo(X) -> #rec{field1 = 1, field2~.
@@ -381,6 +385,7 @@ mod test {
 
         check(
             r#"
+        //- expect_parse_errors
         -module(sample).
         -record(rec, {field1=1, field2=2}).
         foo(X) -> X#rec{field1 = 1, field2~.
@@ -393,6 +398,7 @@ mod test {
 
         check(
             r#"
+        //- expect_parse_errors
         -module(sample).
         -record(rec, {field1=1, field2=2}).
         foo(X) -> case ok of
@@ -404,6 +410,7 @@ mod test {
 
         check(
             r#"
+        //- expect_parse_errors
         -module(sample).
         -record(rec, {field1=1, field2=2}).
         foo(X) -> case ok of
@@ -417,6 +424,7 @@ mod test {
 
         check(
             r#"
+        //- expect_parse_errors
         -module(sample).
         -record(rec, {field1=1, field2=2}).
         foo(X) -> case ok of
@@ -433,6 +441,7 @@ mod test {
     fn test_record_name_in_function_signature() {
         check(
             r#"
+        //- expect_parse_errors
         -module(sample).
         -record(this_record, {field1=1, field2=2}).
         -record(that_record, {}).
@@ -450,6 +459,7 @@ mod test {
     fn test_record_field_in_function_signature() {
         check(
             r#"
+        //- expect_parse_errors
         -module(sample).
         -record(rec, {field1, field2, other}).
         foo(#rec{fie~
diff --git a/crates/ide_completion/src/spec.rs b/crates/ide_completion/src/spec.rs
index 6a0061e914..cc853af865 100644
--- a/crates/ide_completion/src/spec.rs
+++ b/crates/ide_completion/src/spec.rs
@@ -109,6 +109,7 @@ mod test {
 
         check(
             r#"
+        //- expect_parse_errors
         -module(sample).
 
         frog() -> ok.
@@ -129,6 +130,7 @@ mod test {
 
         check(
             r#"
+        //- expect_parse_errors
         -module(sample).
 
         frog(A, B) -> {A, B}.
diff --git a/crates/ide_completion/src/types.rs b/crates/ide_completion/src/types.rs
index 3800a97b5c..e232ab2944 100644
--- a/crates/ide_completion/src/types.rs
+++ b/crates/ide_completion/src/types.rs
@@ -169,6 +169,7 @@ mod test {
 
         check(
             r#"
+        //- expect_parse_errors
         //- /src/sample.erl
         -module(sample).
         -type alias() :: ok.
@@ -197,6 +198,7 @@ mod test {
 
         check(
             r#"
+        //- expect_parse_errors
         //- /src/sample.erl
         -module(sample).
         -type alias() :: ok.
@@ -225,6 +227,7 @@ mod test {
 
         check(
             r#"
+        //- expect_parse_errors
         //- /src/sample.erl
         -module(sample).
         -spec foo() -> sample2:~.
@@ -248,6 +251,7 @@ mod test {
         // something reasonable (show nothing)
         check(
             r#"
+        //- expect_parse_errors
         //- /src/sample.erl
         -module(sample).
         -spec foo() -> sample~:.
@@ -263,6 +267,7 @@ mod test {
 
         check(
             r#"
+        //- expect_parse_errors
         //- /src/sample.erl
         -module(sample).
         -spec foo() -> sample~:.
diff --git a/crates/ide_completion/src/vars.rs b/crates/ide_completion/src/vars.rs
index 65740d56a4..5544475ed3 100644
--- a/crates/ide_completion/src/vars.rs
+++ b/crates/ide_completion/src/vars.rs
@@ -100,6 +100,7 @@ mod test {
     fn test_local_variables_1() {
         check(
             r#"
+    //- expect_parse_errors
     //- /src/sample1.erl
     -module(sample1).
     test(AnArg1,Blah) ->
@@ -117,6 +118,7 @@ mod test {
     fn test_local_variables_limit_to_current_function() {
         check(
             r#"
+    //- expect_parse_errors
     //- /src/sample1.erl
     -module(sample1).
     another(AnArgNotMatched) ->
@@ -142,6 +144,7 @@ mod test {
     fn test_local_variables_none_if_space() {
         check(
             r#"
+    //- expect_parse_errors
     //- /src/sample1.erl
     -module(sample1).
     test(AnArg1,Blah) ->
@@ -157,6 +160,7 @@ mod test {
     fn test_local_variables_no_duplicates() {
         check(
             r#"
+    //- expect_parse_errors
     //- /src/sample1.erl
     -module(sample1).
     handle_update(Config, Contents) ->
diff --git a/crates/ide_ssr/src/tests.rs b/crates/ide_ssr/src/tests.rs
index 108680853e..881a5ac123 100644
--- a/crates/ide_ssr/src/tests.rs
+++ b/crates/ide_ssr/src/tests.rs
@@ -1288,7 +1288,7 @@ fn ssr_do_not_match_pattern_missing() {
         r#"
          g() ->
              <<$",$\\,194,181,$A,$">> =
-                 ~b"""
+                   """
                    "\\µA"
                    """.
          "#,
@@ -1327,7 +1327,7 @@ fn ssr_comments_in_match() {
                     <<{ % preceding comment
                         3},
                         { 3 % following comment
-                        >>.
+                        }>>.
                 "#;
     let strategy = Strategy {
         macros: MacroStrategy::Expand,
@@ -1536,7 +1536,7 @@ fn ssr_predicates_on_match_expr_pat() {
                 %-compile({"str", var, atom}).
                 %-type foo(V) :: {"str", V, atom}.
                 foo({"hello", Var, atom}) -> {"str", Var, aa}.
-                
+
                 "#;
     let strategy = Strategy {
         macros: MacroStrategy::Expand,
@@ -1636,7 +1636,7 @@ fn ssr_predicates_on_match_type() {
     let pattern = "ssr: {_@V, _@A}.";
     let code = r#"
                 -type foo(V) :: {V, atom}.
-                
+
                 "#;
     let strategy = Strategy {
         macros: MacroStrategy::Expand,
diff --git a/crates/project_model/src/test_fixture.rs b/crates/project_model/src/test_fixture.rs
index f121e20d88..140baec0ee 100644
--- a/crates/project_model/src/test_fixture.rs
+++ b/crates/project_model/src/test_fixture.rs
@@ -187,6 +187,7 @@ impl DiagnosticsEnabled {
 pub struct FixtureWithProjectMeta {
     pub fixture: Vec<Fixture>,
     pub diagnostics_enabled: DiagnosticsEnabled,
+    pub expect_parse_errors: bool,
 }
 
 impl FixtureWithProjectMeta {
@@ -204,6 +205,7 @@ impl FixtureWithProjectMeta {
         let mut fixture = fixture.as_str();
         let mut res: Vec<Fixture> = Vec::new();
         let mut diagnostics_enabled = DiagnosticsEnabled::default();
+        let mut expect_parse_errors = false;
 
         // ---------------------------------------
         // Each of the following is optional, but they must always
@@ -232,6 +234,12 @@ impl FixtureWithProjectMeta {
             fixture = remain;
         }
 
+        if let Some(meta) = fixture.strip_prefix("//- expect_parse_errors") {
+            let (_meta, remain) = meta.split_once('\n').unwrap();
+            expect_parse_errors = true;
+            fixture = remain;
+        }
+
         if let Some(meta) = fixture.strip_prefix("//- native") {
             let (_meta, remain) = meta.split_once('\n').unwrap();
             diagnostics_enabled.use_native = true;
@@ -304,6 +312,7 @@ impl FixtureWithProjectMeta {
         FixtureWithProjectMeta {
             fixture: res,
             diagnostics_enabled,
+            expect_parse_errors,
         }
     }
 

From 7b0b29ae21218ca444e8b57fdbec209312a43e40 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 11 Dec 2025 06:36:45 -0800
Subject: [PATCH 348/394] Temporarily ignore hierarchical_config tests

Summary:
The test is supposed to panic (and does so) when run with both Buck2 and rebar3.
Unfortunately, we are currently disabling the Buck2 tests on GitHub, which has the unfortunate consequence of not letting the test fail as expected, effectively breaking CI.

Temporarily ignore the test.

Reviewed By: alanz

Differential Revision: D88950046

fbshipit-source-id: edabc83ce2b533fa95075078feac624343c198ad
---
 crates/elp/src/bin/main.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index fc707eda47..48fc5cc621 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -2175,7 +2175,11 @@ mod tests {
 
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
-    #[should_panic] // Support for hierarchical config is not implemented yet
+    // We cannot use `should_panic` for this test, since the OSS CI runs with the `buck` feature disabled.
+    // When this happens the test is translated into a no-op, which does not panic.
+    // TODO(T248259687): Switch to should_panic once Buck2 is available on GitHub.
+    //                   Or remove the ignore once hierarchical support is implemented.
+    #[ignore] // Support for hierarchical config is not implemented yet
     fn lint_hierarchical_config_basic(buck: bool) {
         simple_snapshot_sorted(
             args_vec!["lint", "--read-config"],

From babf61214c206f063911391aa6a4d1667106def4 Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Thu, 11 Dec 2025 07:25:42 -0800
Subject: [PATCH 349/394] Bad occurrence typing with maps:foreach -- repro

Summary: Occurrence typing doesn't take place in `maps:foreach` (and several other custom functions). Repro.

Reviewed By: michalmuskala

Differential Revision: D88949717

fbshipit-source-id: d6225a708f0c632d914c4ca38b1d789a3b077311
---
 .../eqwater/eqwater_maps.pretty                | 18 +++++++++++++++++-
 .../eqwater/src/eqwater_maps.erl               | 10 ++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps.pretty b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps.pretty
index 037e6b14a6..b5f637ead3 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/eqwater/eqwater_maps.pretty
@@ -70,4 +70,20 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
 Expression has type:   #{a := dynamic(), dynamic() => dynamic()}
 Context expected type: 'err'
 
-5 ERRORS
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+   ┌─ eqwater/src/eqwater_maps.erl:70:29
+   │
+70 │     (_, #{a := V}) -> is_ok(V)
+   │                             ^
+   │                             │
+   │                             V.
+Expression has type:   'ok' | 'err'
+Context expected type: 'ok'
+   │                             
+
+Because in the expression's type:
+  Here the type is a union type with some valid candidates: 'ok'
+  However the following candidate: 'err'
+  Differs from the expected type:  'ok'
+
+6 ERRORS
diff --git a/test_projects/eqwalizer_tests/eqwater/src/eqwater_maps.erl b/test_projects/eqwalizer_tests/eqwater/src/eqwater_maps.erl
index 78ae852b8a..68d938f790 100644
--- a/test_projects/eqwalizer_tests/eqwater/src/eqwater_maps.erl
+++ b/test_projects/eqwalizer_tests/eqwater/src/eqwater_maps.erl
@@ -59,3 +59,13 @@ map_occ_08_neg(_) -> err.
 map_occ_09(#{a := undefined}) -> 1;
 map_occ_09(#{a := Map}) -> Map#{2 => 2};
 map_occ_09(_) -> 3.
+
+-spec is_ok(ok) -> ok.
+is_ok(ok) -> ok.
+
+-spec map_occ_foreach_neg(#{term() => #{a => ok | err}}) -> ok.
+map_occ_foreach_neg(M) ->
+  maps:foreach(fun
+    (_, #{a := err}) -> ok;
+    (_, #{a := V}) -> is_ok(V)
+  end, M).

From 0085fba772989aff5049d846d3988667cdd5fbc1 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 12 Dec 2025 01:38:41 -0800
Subject: [PATCH 350/394] Add `--severity` argument to `elp parse-elp` to limit
 output

Summary: As title.

Reviewed By: TD5

Differential Revision: D88963207

fbshipit-source-id: a8cc5ddfedcfa8063537e586ac086c8a0caac465
---
 crates/elp/src/bin/args.rs                    | 30 ++++++++++++++++
 crates/elp/src/bin/elp_parse_cli.rs           | 36 +++++++++++++++++++
 crates/elp/src/bin/main.rs                    | 18 ++++++++++
 .../parse_all_diagnostics_error.stdout        |  5 +++
 .../src/resources/test/parse_elp_help.stdout  |  3 +-
 5 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 crates/elp/src/resources/test/diagnostics/parse_all_diagnostics_error.stdout

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index 0f057ce1e6..db3bc33df2 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -72,6 +72,17 @@ pub struct ParseAllElp {
     /// Report system memory usage and other statistics
     #[bpaf(long("report-system-stats"))]
     pub report_system_stats: bool,
+    /// Minimum severity level to report. Valid values: error, warning, weak_warning, information
+    #[bpaf(
+        argument("SEVERITY"),
+        complete(severity_completer),
+        fallback(None),
+        guard(
+            severity_guard,
+            "Please use error, warning, weak_warning, or information"
+        )
+    )]
+    pub severity: Option<String>,
 }
 
 #[derive(Clone, Debug, Bpaf)]
@@ -783,6 +794,25 @@ fn format_guard(format: &Option<String>) -> bool {
     }
 }
 
+fn severity_completer(_: &Option<String>) -> Vec<(String, Option<String>)> {
+    vec![
+        ("error".to_string(), None),
+        ("warning".to_string(), None),
+        ("weak_warning".to_string(), None),
+        ("information".to_string(), None),
+    ]
+}
+
+fn severity_guard(severity: &Option<String>) -> bool {
+    match severity {
+        None => true,
+        Some(s) if s == "error" || s == "warning" || s == "weak_warning" || s == "information" => {
+            true
+        }
+        _ => false,
+    }
+}
+
 fn macros_completer(_: &Option<String>) -> Vec<(String, Option<String>)> {
     vec![
         ("expand".to_string(), None),
diff --git a/crates/elp/src/bin/elp_parse_cli.rs b/crates/elp/src/bin/elp_parse_cli.rs
index 16d4675d7d..3e57d69b17 100644
--- a/crates/elp/src/bin/elp_parse_cli.rs
+++ b/crates/elp/src/bin/elp_parse_cli.rs
@@ -57,6 +57,35 @@ use crate::args::ParseAllElp;
 use crate::reporting;
 use crate::reporting::print_memory_usage;
 
+fn parse_severity(severity: &str) -> Option<diagnostics::Severity> {
+    match severity {
+        "error" => Some(diagnostics::Severity::Error),
+        "warning" => Some(diagnostics::Severity::Warning),
+        "weak_warning" => Some(diagnostics::Severity::WeakWarning),
+        "information" => Some(diagnostics::Severity::Information),
+        _ => None,
+    }
+}
+
+fn severity_rank(severity: diagnostics::Severity) -> u8 {
+    match severity {
+        diagnostics::Severity::Error => 1,
+        diagnostics::Severity::Warning => 2,
+        diagnostics::Severity::WeakWarning => 3,
+        diagnostics::Severity::Information => 4,
+    }
+}
+
+fn meets_severity_threshold(
+    diag_severity: diagnostics::Severity,
+    min_severity: Option<diagnostics::Severity>,
+) -> bool {
+    match min_severity {
+        None => true,
+        Some(min) => severity_rank(diag_severity) <= severity_rank(min),
+    }
+}
+
 #[derive(Debug)]
 struct ParseResult {
     name: String,
@@ -162,6 +191,10 @@ pub fn parse_all(
         }
         res.sort_by(|a, b| a.name.cmp(&b.name));
         let mut err_in_diag = false;
+        let min_severity = args
+            .severity
+            .as_ref()
+            .and_then(|s| parse_severity(s.as_str()));
         for diags in res {
             let mut combined: Vec<diagnostics::Diagnostic> =
                 diags.diagnostics.diagnostics_for(diags.file_id);
@@ -172,6 +205,9 @@ pub fn parse_all(
                 let line_index = db.file_line_index(diags.file_id);
                 combined.sort_by(|a, b| a.range.start().cmp(&b.range.start()));
                 for diag in combined {
+                    if !meets_severity_threshold(diag.severity, min_severity) {
+                        continue;
+                    }
                     if args.is_format_json() {
                         err_in_diag = true;
                         let vfs_path = loaded.vfs.file_path(diags.file_id);
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 48fc5cc621..e1d26e3e7e 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -671,6 +671,24 @@ mod tests {
         );
     }
 
+    #[test_case(false ; "rebar")]
+    #[test_case(true  ; "buck")]
+    fn parse_all_diagnostics_severity(buck: bool) {
+        simple_snapshot_expect_error(
+            args_vec![
+                "parse-elp",
+                "--module",
+                "diagnostics",
+                "--severity",
+                "error"
+            ],
+            "diagnostics",
+            expect_file!("../resources/test/diagnostics/parse_all_diagnostics_error.stdout"),
+            buck,
+            None,
+        );
+    }
+
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
     fn parse_elp_file_attribute(buck: bool) {
diff --git a/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics_error.stdout b/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics_error.stdout
new file mode 100644
index 0000000000..ca3ca245ab
--- /dev/null
+++ b/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics_error.stdout
@@ -0,0 +1,5 @@
+module specified: diagnostics
+Diagnostics reported in 1 modules:
+  diagnostics: 6
+      3:0-3:35::[Error] [L0000] Issue in included file
+      5:30-5:44::[Error] [L1295] type undefined_type/0 undefined
diff --git a/crates/elp/src/resources/test/parse_elp_help.stdout b/crates/elp/src/resources/test/parse_elp_help.stdout
index 1457aed5c5..75cc38354e 100644
--- a/crates/elp/src/resources/test/parse_elp_help.stdout
+++ b/crates/elp/src/resources/test/parse_elp_help.stdout
@@ -1,4 +1,4 @@
-Usage: [--project PROJECT] [--module MODULE] [--file ARG] [--to TO] [--no-diags] [--experimental] [--as PROFILE] [--dump-includes] [--rebar] [--include-generated] [--serial] [--use-cli-severity] [[--format FORMAT]] [--report-system-stats]
+Usage: [--project PROJECT] [--module MODULE] [--file ARG] [--to TO] [--no-diags] [--experimental] [--as PROFILE] [--dump-includes] [--rebar] [--include-generated] [--serial] [--use-cli-severity] [[--format FORMAT]] [--report-system-stats] [[--severity SEVERITY]]
 
 Available options:
         --project <PROJECT>    Path to directory with project, or to a JSON file (defaults to `.`)
@@ -15,4 +15,5 @@ Available options:
         --use-cli-severity     If specified, use the provided CLI severity mapping instead of the default one
         --format <FORMAT>      Show diagnostics in JSON format
         --report-system-stats  Report system memory usage and other statistics
+        --severity <SEVERITY>  Minimum severity level to report. Valid values: error, warning, weak_warning, information
     -h, --help                 Prints help information

From a16af7e9e29c234045961e3139129a8c03af9282 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 12 Dec 2025 02:19:15 -0800
Subject: [PATCH 351/394] Update emacs eglot instructions

Summary: Add a stanza to set the config so we get semantic highlighting of `dynamic()`, and types on hover.

Reviewed By: michalmuskala

Differential Revision: D88957646

fbshipit-source-id: 5be4d69fdcf02999b840081baae076b85f9a9260
---
 website/docs/get-started/editors/emacs.md | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/website/docs/get-started/editors/emacs.md b/website/docs/get-started/editors/emacs.md
index 072e6902da..fab357f4a4 100644
--- a/website/docs/get-started/editors/emacs.md
+++ b/website/docs/get-started/editors/emacs.md
@@ -37,9 +37,8 @@ additional configuration options.
 
 ### Semantic tokens
 
-Semantic token support has been added to eglot, but is not yet in the
-released version. But it is possible to install the updated version
-of eglot.
+Semantic token support has been added to eglot, but is not yet in the released
+version. But it is possible to install the updated version of eglot.
 
 To do so, add
 
@@ -52,8 +51,14 @@ to your `init.el`, then run `M-x eglot-upgrade-eglot`
 Once upgraded, add the following to the `(use-package` entry for `eglot`
 
 ```elisp
-  (setq eglot-semantic-token-modifiers '
-    ("bound" "exported_function" "exported_type" "deprecated_function" "type_dynamic"))
+(setq-default eglot-workspace-configuration
+                ;; Run `elp config` to see that options can be used here
+                ;; Use `eglot-show-workspace-configuration` to see what is sent
+                '(:elp (:highlightDynamic (:enable t)
+                        :typesOnHover (:enable t) ))
+
+                eglot-semantic-token-modifiers
+                '("bound" "exported_function" "exported_type" "deprecated_function" "type_dynamic"))
 
   ;; Each face name arises as a template from the modifiers as
   ;; "eglot-semantic-%s-face"
@@ -92,7 +97,6 @@ Once upgraded, add the following to the `(use-package` entry for `eglot`
         (eglot--widening (font-lock-flush)))))
 ```
 
-
 ## lsp-mode
 
 Install the `lsp-mode` package, which is a generic Emacs client for LSP servers.

From 553c90d63143c82057d4888b40109ec9dca2f329 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 12 Dec 2025 03:02:33 -0800
Subject: [PATCH 352/394] Bump OSS VS Code extension to 0.47.0

Summary:
Due to some [most likely transient infra issues](https://github.com/WhatsApp/erlang-language-platform/actions/runs/20137940955), the latest release was only partially published.

Bump the extension to trigger a new release.

Reviewed By: alanz

Differential Revision: D89024759

fbshipit-source-id: fce412fee451eb72246c121706108af3ac34d414
---
 editors/code/package-lock.json | 4 ++--
 editors/code/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 1adcc191a7..6309d4c81e 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "erlang-language-platform",
-  "version": "0.46.0",
+  "version": "0.47.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "erlang-language-platform",
-      "version": "0.46.0",
+      "version": "0.47.0",
       "hasInstallScript": true,
       "license": "Apache2",
       "devDependencies": {
diff --git a/editors/code/package.json b/editors/code/package.json
index ebf55e7c86..eb7ced3148 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -4,7 +4,7 @@
   "description": "Erlang Language Support for VS Code, by WhatsApp.",
   "author": "Meta Platforms, Inc",
   "license": "Apache2",
-  "version": "0.46.0",
+  "version": "0.47.0",
   "icon": "images/elp-logo-color.png",
   "homepage": "https://whatsapp.github.io/erlang-language-platform/",
   "repository": {

From 887d287c9491c7058e48df140e959a0f02b10ec9 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 12 Dec 2025 03:56:28 -0800
Subject: [PATCH 353/394] tweak `elp parse-elp --severity` output

Summary:
Apply the severity filter to the results before printing any information about them.

This prevents printing a module name that has no errors in it, and gives a correct count in the module diagnostic summary

Reviewed By: TD5

Differential Revision: D89043311

fbshipit-source-id: aa0c813314f32ca9c23d753c598974a1eb605390
---
 crates/elp/src/bin/elp_parse_cli.rs           | 21 ++++++++++++-------
 .../parse_all_diagnostics_error.stdout        |  2 +-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/crates/elp/src/bin/elp_parse_cli.rs b/crates/elp/src/bin/elp_parse_cli.rs
index 3e57d69b17..770ab60456 100644
--- a/crates/elp/src/bin/elp_parse_cli.rs
+++ b/crates/elp/src/bin/elp_parse_cli.rs
@@ -176,6 +176,19 @@ pub fn parse_all(
     let memory_end = MemoryUsage::now();
     let memory_used = memory_end - memory_start;
 
+    let min_severity = args
+        .severity
+        .as_ref()
+        .and_then(|s| parse_severity(s.as_str()));
+
+    res.retain(|parse_result| {
+        parse_result
+            .diagnostics
+            .diagnostics_for(parse_result.file_id)
+            .iter()
+            .any(|diag| meets_severity_threshold(diag.severity, min_severity))
+    });
+
     if res.is_empty() {
         if args.is_format_normal() {
             writeln!(cli, "No errors reported")?;
@@ -191,13 +204,10 @@ pub fn parse_all(
         }
         res.sort_by(|a, b| a.name.cmp(&b.name));
         let mut err_in_diag = false;
-        let min_severity = args
-            .severity
-            .as_ref()
-            .and_then(|s| parse_severity(s.as_str()));
         for diags in res {
             let mut combined: Vec<diagnostics::Diagnostic> =
                 diags.diagnostics.diagnostics_for(diags.file_id);
+            combined.retain(|diag| meets_severity_threshold(diag.severity, min_severity));
             if args.is_format_normal() {
                 writeln!(cli, "  {}: {}", diags.name, combined.len())?;
             }
@@ -205,9 +215,6 @@ pub fn parse_all(
                 let line_index = db.file_line_index(diags.file_id);
                 combined.sort_by(|a, b| a.range.start().cmp(&b.range.start()));
                 for diag in combined {
-                    if !meets_severity_threshold(diag.severity, min_severity) {
-                        continue;
-                    }
                     if args.is_format_json() {
                         err_in_diag = true;
                         let vfs_path = loaded.vfs.file_path(diags.file_id);
diff --git a/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics_error.stdout b/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics_error.stdout
index ca3ca245ab..3af8bfb086 100644
--- a/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics_error.stdout
+++ b/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics_error.stdout
@@ -1,5 +1,5 @@
 module specified: diagnostics
 Diagnostics reported in 1 modules:
-  diagnostics: 6
+  diagnostics: 2
       3:0-3:35::[Error] [L0000] Issue in included file
       5:30-5:44::[Error] [L1295] type undefined_type/0 undefined

From eb5e0abbf8a19f764fc93f1293872da87b74ee7f Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 12 Dec 2025 04:22:36 -0800
Subject: [PATCH 354/394] Install Buck2 in OSS CI workflow

Summary: In preparation for enabling Buck2 tests on GitHub, we install the Buck2 binary.

Reviewed By: michalmuskala

Differential Revision: D89038926

fbshipit-source-id: 7e37c7e9ec143391e10eba8597df2b2aa9d55d0f
---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cf3834b5ad..2fcdf48405 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -97,6 +97,8 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y crossbuild-essential-arm64
+      - name: Install Buck2
+        uses: dtolnay/install-buck2@latest
       - id: setup-erlang
         uses: ./.github/actions/setup-erlang
         with:

From 2bd3d57d021262cc9e00552c2004be5de05e42e0 Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Fri, 12 Dec 2025 06:08:41 -0800
Subject: [PATCH 355/394] Clean-up old error messages

Summary:
Use new error message generation for callback type errors, add corresponding test

Cleanup old error message generation

Reviewed By: TD5

Differential Revision: D88941623

fbshipit-source-id: 262c2031c7d19ad2528ef63a5d73d146fd84d408
---
 .../check/callbacks3_neg-OTP-26.pretty        | 27 ++++++++++++++-----
 .../check/callbacks3_neg-OTP-27.pretty        | 27 ++++++++++++++-----
 .../check/callbacks3_neg-OTP-28.pretty        | 26 +++++++++++++-----
 .../check/src/callbacks3_neg.erl              |  7 ++++-
 4 files changed, 65 insertions(+), 22 deletions(-)

diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-26.pretty
index 63be36e638..6cb2012096 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-26.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-26.pretty
@@ -1,14 +1,27 @@
 error: incorrect_return_type_in_cb_implementation (See https://fb.me/eqwalizer_errors#incorrect_return_type_in_cb_implementation)
-   ┌─ check/src/callbacks3_neg.erl:12:1
+   ┌─ check/src/callbacks3_neg.erl:13:1
    │
-12 │ -behavior(gen_server).
+13 │ -behavior(gen_server).
+   │ ^^^^^^^^^^^^^^^^^^^^^ Incorrect return type for implementation of gen_server:handle_cast/2.
+Expected: {'noreply', term()} | {'noreply', term(), timeout() | 'hibernate' | {'continue', term()}} | {'stop', term(), term()}
+Got:      'wrong_ret'
+
+error: incorrect_return_type_in_cb_implementation (See https://fb.me/eqwalizer_errors#incorrect_return_type_in_cb_implementation)
+   ┌─ check/src/callbacks3_neg.erl:13:1
+   │
+13 │ -behavior(gen_server).
    │ ^^^^^^^^^^^^^^^^^^^^^
    │ │
-   │ Incorrect return type for implementation of gen_server:handle_cast/2. Expected: {'noreply', term()} | {'noreply', term(), timeout() | 'hibernate' | {'continue', term()}} | {'stop', term(), term()}, Got: 'wrong_ret'.
+   │ Incorrect return type for implementation of gen_server:handle_info/2.
+Expected: {'noreply', term()} | {'noreply', term(), timeout() | 'hibernate' | {'continue', term()}} | {'stop', term(), term()}
+Got:      {'noreply', 'ok', 'wrong_atom'}
    │ 
 
-  'wrong_ret' is not compatible with {'noreply', term()} | {'noreply', term(), timeout() | 'hibernate' | {'continue', term()}} | {'stop', term(), term()}
-  because
-  'wrong_ret' is not compatible with {'noreply', term()}
+Because in the expression's type:
+  { 'noreply', 'ok', 
+    Here the type is:     'wrong_atom'
+    Context expects type: 'infinity' | number() | 'hibernate' | {'continue', term()}
+    No candidate matches in the expected union.
+  }
 
-1 ERROR
+2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-27.pretty
index 63be36e638..6cb2012096 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-27.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-27.pretty
@@ -1,14 +1,27 @@
 error: incorrect_return_type_in_cb_implementation (See https://fb.me/eqwalizer_errors#incorrect_return_type_in_cb_implementation)
-   ┌─ check/src/callbacks3_neg.erl:12:1
+   ┌─ check/src/callbacks3_neg.erl:13:1
    │
-12 │ -behavior(gen_server).
+13 │ -behavior(gen_server).
+   │ ^^^^^^^^^^^^^^^^^^^^^ Incorrect return type for implementation of gen_server:handle_cast/2.
+Expected: {'noreply', term()} | {'noreply', term(), timeout() | 'hibernate' | {'continue', term()}} | {'stop', term(), term()}
+Got:      'wrong_ret'
+
+error: incorrect_return_type_in_cb_implementation (See https://fb.me/eqwalizer_errors#incorrect_return_type_in_cb_implementation)
+   ┌─ check/src/callbacks3_neg.erl:13:1
+   │
+13 │ -behavior(gen_server).
    │ ^^^^^^^^^^^^^^^^^^^^^
    │ │
-   │ Incorrect return type for implementation of gen_server:handle_cast/2. Expected: {'noreply', term()} | {'noreply', term(), timeout() | 'hibernate' | {'continue', term()}} | {'stop', term(), term()}, Got: 'wrong_ret'.
+   │ Incorrect return type for implementation of gen_server:handle_info/2.
+Expected: {'noreply', term()} | {'noreply', term(), timeout() | 'hibernate' | {'continue', term()}} | {'stop', term(), term()}
+Got:      {'noreply', 'ok', 'wrong_atom'}
    │ 
 
-  'wrong_ret' is not compatible with {'noreply', term()} | {'noreply', term(), timeout() | 'hibernate' | {'continue', term()}} | {'stop', term(), term()}
-  because
-  'wrong_ret' is not compatible with {'noreply', term()}
+Because in the expression's type:
+  { 'noreply', 'ok', 
+    Here the type is:     'wrong_atom'
+    Context expects type: 'infinity' | number() | 'hibernate' | {'continue', term()}
+    No candidate matches in the expected union.
+  }
 
-1 ERROR
+2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-28.pretty
index a24c7a6a48..849039f298 100644
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-28.pretty
+++ b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-28.pretty
@@ -1,14 +1,26 @@
 error: incorrect_return_type_in_cb_implementation (See https://fb.me/eqwalizer_errors#incorrect_return_type_in_cb_implementation)
-   ┌─ check/src/callbacks3_neg.erl:12:1
+   ┌─ check/src/callbacks3_neg.erl:13:1
    │
-12 │ -behavior(gen_server).
+13 │ -behavior(gen_server).
+   │ ^^^^^^^^^^^^^^^^^^^^^ Incorrect return type for implementation of gen_server:handle_cast/2.
+Expected: {'noreply', term()} | {'noreply', term(), gen_server:action()} | {'stop', term(), term()}
+Got:      'wrong_ret'
+
+error: incorrect_return_type_in_cb_implementation (See https://fb.me/eqwalizer_errors#incorrect_return_type_in_cb_implementation)
+   ┌─ check/src/callbacks3_neg.erl:13:1
+   │
+13 │ -behavior(gen_server).
    │ ^^^^^^^^^^^^^^^^^^^^^
    │ │
-   │ Incorrect return type for implementation of gen_server:handle_cast/2. Expected: {'noreply', term()} | {'noreply', term(), gen_server:action()} | {'stop', term(), term()}, Got: 'wrong_ret'.
+   │ Incorrect return type for implementation of gen_server:handle_info/2.
+Expected: {'noreply', term()} | {'noreply', term(), gen_server:action()} | {'stop', term(), term()}
+Got:      {'noreply', 'ok', 'wrong_atom'}
    │ 
 
-  'wrong_ret' is not compatible with {'noreply', term()} | {'noreply', term(), gen_server:action()} | {'stop', term(), term()}
-  because
-  'wrong_ret' is not compatible with {'noreply', term()}
+Because in the expression's type:
+  { 'noreply', 'ok', 
+    Here the type is:     'wrong_atom'
+    Context expects type: gen_server:action()
+  }
 
-1 ERROR
+2 ERRORS
diff --git a/test_projects/eqwalizer_tests/check/src/callbacks3_neg.erl b/test_projects/eqwalizer_tests/check/src/callbacks3_neg.erl
index 8152487669..f904f0e718 100644
--- a/test_projects/eqwalizer_tests/check/src/callbacks3_neg.erl
+++ b/test_projects/eqwalizer_tests/check/src/callbacks3_neg.erl
@@ -7,7 +7,8 @@
 -export([
     init/1,
     handle_call/3,
-    handle_cast/2
+    handle_cast/2,
+    handle_info/2
 ]).
 -behavior(gen_server).
 
@@ -19,3 +20,7 @@ handle_call(_, _From, State) ->
 -spec handle_cast(ok, ok) -> wrong_ret.
 handle_cast(_, _) ->
     wrong_ret.
+
+-spec handle_info(ok, ok) -> {noreply, ok, wrong_atom}.
+handle_info(_, _) ->
+    {noreply, ok, wrong_atom}.

From b525eac0eaca72daeee43ba3ed32a432a8a83847 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 12 Dec 2025 06:17:31 -0800
Subject: [PATCH 356/394] Pass range to fixes callback

Summary: It is common for the `fixes` callback to act on the original match range. By making the matched range available to the callback, we avoid manually including the range in the linter-specific context.

Reviewed By: alanz

Differential Revision: D89048282

fbshipit-source-id: 01faa9842f04c34efb14a7d803cf5317794ea321
---
 crates/ide/src/diagnostics.rs                   |  3 ++-
 .../ide/src/diagnostics/boolean_precedence.rs   | 15 +++++++--------
 crates/ide/src/diagnostics/edoc.rs              |  8 ++------
 .../src/diagnostics/macro_precedence_suprise.rs | 14 ++++++--------
 .../missing_compile_warn_missing_spec.rs        |  6 ++----
 .../ide/src/diagnostics/misspelled_attribute.rs |  7 +++----
 .../ide/src/diagnostics/undocumented_module.rs  | 17 ++++++++++-------
 crates/ide/src/diagnostics/unused_include.rs    |  1 +
 crates/ide/src/diagnostics/unused_macro.rs      |  8 +++++++-
 9 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index e3aa185b19..9852303132 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -865,6 +865,7 @@ pub(crate) trait GenericLinter: Linter {
     fn fixes(
         &self,
         _context: &Self::Context,
+        _range: TextRange,
         _sema: &Semantic,
         _file_id: FileId,
     ) -> Option<Vec<Assist>> {
@@ -898,7 +899,7 @@ impl<T: GenericLinter> GenericDiagnostics for T {
         if let Some(matches) = self.matches(sema, file_id) {
             for matched in matches {
                 let message = self.match_description(&matched.context);
-                let fixes = self.fixes(&matched.context, sema, file_id);
+                let fixes = self.fixes(&matched.context, matched.range, sema, file_id);
                 let tag = self.tag(&matched.context);
                 let mut d = Diagnostic::new(self.id(), message, matched.range)
                     .with_fixes(fixes)
diff --git a/crates/ide/src/diagnostics/boolean_precedence.rs b/crates/ide/src/diagnostics/boolean_precedence.rs
index 21e374a4f5..f8f7851f8a 100644
--- a/crates/ide/src/diagnostics/boolean_precedence.rs
+++ b/crates/ide/src/diagnostics/boolean_precedence.rs
@@ -66,7 +66,6 @@ impl Linter for BooleanPrecedenceLinter {
 
 #[derive(Debug, Clone, PartialEq, Eq, Default)]
 pub struct Context {
-    range: TextRange,
     preceding_ws_range: TextRange,
     op: Op,
     lhs_complex: bool,
@@ -101,6 +100,7 @@ impl GenericLinter for BooleanPrecedenceLinter {
     fn fixes(
         &self,
         context: &Self::Context,
+        range: TextRange,
         _sema: &Semantic,
         file_id: FileId,
     ) -> Option<Vec<Assist>> {
@@ -109,36 +109,36 @@ impl GenericLinter for BooleanPrecedenceLinter {
         // Add "replace with preferred operator" fix
         let assist_message = format!("Replace '{}' with '{}'", context.op, context.op.preferred());
         let edit = TextEdit::replace(
-            context.op.range(context.range, context.preceding_ws_range),
+            context.op.range(range, context.preceding_ws_range),
             context.op.preferred().to_string(),
         );
         fixes.push(fix(
             "replace_boolean_operator",
             &assist_message,
             SourceChange::from_text_edit(file_id, edit),
-            context.range,
+            range,
         ));
 
         // Add "add parens" fixes if applicable
         if context.lhs_complex {
-            fixes.push(parens_fix("LHS", file_id, context));
+            fixes.push(parens_fix("LHS", file_id, context, range));
         }
         if context.rhs_complex {
-            fixes.push(parens_fix("RHS", file_id, context));
+            fixes.push(parens_fix("RHS", file_id, context, range));
         }
 
         Some(fixes)
     }
 }
 
-fn parens_fix(side: &str, file_id: FileId, context: &Context) -> Assist {
+fn parens_fix(side: &str, file_id: FileId, context: &Context, range: TextRange) -> Assist {
     let assist_message = format!("Add parens to {side}");
     let edit = add_parens_edit(&context.add_parens_range);
     fix(
         "replace_boolean_operator_add_parens",
         &assist_message,
         SourceChange::from_text_edit(file_id, edit),
-        context.range,
+        range,
     )
 }
 
@@ -231,7 +231,6 @@ fn collect_match(
             matches.push(GenericLinterMatchContext {
                 range,
                 context: Context {
-                    range,
                     preceding_ws_range,
                     op: binop,
                     lhs_complex,
diff --git a/crates/ide/src/diagnostics/edoc.rs b/crates/ide/src/diagnostics/edoc.rs
index ead44d7331..052c85d57f 100644
--- a/crates/ide/src/diagnostics/edoc.rs
+++ b/crates/ide/src/diagnostics/edoc.rs
@@ -56,7 +56,6 @@ impl Linter for EdocLinter {
 pub struct Context {
     header_ptr: Option<InFileAstPtr<ast::Form>>,
     doc_start: TextSize,
-    range: TextRange,
 }
 
 impl GenericLinter for EdocLinter {
@@ -77,7 +76,6 @@ impl GenericLinter for EdocLinter {
                             context: Context {
                                 header_ptr: Some(*header_ptr),
                                 doc_start,
-                                range: doc.range,
                             },
                         });
                     }
@@ -88,7 +86,6 @@ impl GenericLinter for EdocLinter {
                             context: Context {
                                 header_ptr: Some(*header_ptr),
                                 doc_start,
-                                range: equiv.range,
                             },
                         });
                     }
@@ -99,7 +96,6 @@ impl GenericLinter for EdocLinter {
                             context: Context {
                                 header_ptr: Some(*header_ptr),
                                 doc_start,
-                                range: deprecated.range,
                             },
                         });
                     }
@@ -111,7 +107,6 @@ impl GenericLinter for EdocLinter {
                         context: Context {
                             header_ptr: Some(*header_ptr),
                             doc_start,
-                            range: hidden.range,
                         },
                     });
                 }
@@ -123,6 +118,7 @@ impl GenericLinter for EdocLinter {
     fn fixes(
         &self,
         context: &Self::Context,
+        range: TextRange,
         sema: &Semantic,
         file_id: FileId,
     ) -> Option<Vec<Assist>> {
@@ -134,7 +130,7 @@ impl GenericLinter for EdocLinter {
             file_id,
             header,
             context.doc_start,
-            context.range,
+            range,
         )])
     }
 }
diff --git a/crates/ide/src/diagnostics/macro_precedence_suprise.rs b/crates/ide/src/diagnostics/macro_precedence_suprise.rs
index 838ddb3d9c..6cd5fe2429 100644
--- a/crates/ide/src/diagnostics/macro_precedence_suprise.rs
+++ b/crates/ide/src/diagnostics/macro_precedence_suprise.rs
@@ -35,9 +35,7 @@ use crate::diagnostics::Linter;
 use crate::fix;
 
 #[derive(Debug, Default, Clone, PartialEq)]
-pub(crate) struct MacroPrecedenceContext {
-    range: TextRange,
-}
+pub(crate) struct MacroPrecedenceContext;
 
 pub(crate) struct MacroPrecedenceSupriseLinter;
 
@@ -96,10 +94,9 @@ impl GenericLinter for MacroPrecedenceSupriseLinter {
                             {
                                 let range = ast.range();
                                 if range.file_id == file_id {
-                                    let context = MacroPrecedenceContext { range: range.range };
                                     res.push(GenericLinterMatchContext {
                                         range: range.range,
-                                        context,
+                                        context: MacroPrecedenceContext,
                                     });
                                 }
                             }
@@ -113,16 +110,17 @@ impl GenericLinter for MacroPrecedenceSupriseLinter {
 
     fn fixes(
         &self,
-        context: &Self::Context,
+        _context: &Self::Context,
+        range: TextRange,
         _sema: &Semantic,
         file_id: FileId,
     ) -> Option<Vec<Assist>> {
-        let edit = add_parens_edit(&context.range);
+        let edit = add_parens_edit(&range);
         let fix = fix(
             "macro_precedence_add_parens",
             "Add parens to macro call",
             SourceChange::from_text_edit(file_id, edit),
-            context.range,
+            range,
         );
         Some(vec![fix])
     }
diff --git a/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs b/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs
index b1f24eb60f..dd0b677dce 100644
--- a/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs
+++ b/crates/ide/src/diagnostics/missing_compile_warn_missing_spec.rs
@@ -75,7 +75,6 @@ impl Linter for MissingCompileWarnMissingSpec {
 pub struct Context {
     found: Found,
     compile_option_id: Option<CompileOptionId>,
-    target_range: TextRange,
 }
 
 impl GenericLinter for MissingCompileWarnMissingSpec {
@@ -94,7 +93,6 @@ impl GenericLinter for MissingCompileWarnMissingSpec {
                 context: Context {
                     found: Found::No,
                     compile_option_id: None,
-                    target_range: DIAGNOSTIC_WHOLE_FILE_RANGE,
                 },
             });
         }
@@ -149,7 +147,6 @@ impl GenericLinter for MissingCompileWarnMissingSpec {
                     context: Context {
                         found: what.0,
                         compile_option_id: what.1,
-                        target_range: range,
                     },
                 });
             }
@@ -160,6 +157,7 @@ impl GenericLinter for MissingCompileWarnMissingSpec {
     fn fixes(
         &self,
         context: &Self::Context,
+        range: TextRange,
         sema: &Semantic,
         file_id: FileId,
     ) -> Option<Vec<elp_ide_assists::Assist>> {
@@ -184,7 +182,7 @@ impl GenericLinter for MissingCompileWarnMissingSpec {
             "add_warn_missing_spec_all",
             "Add compile option 'warn_missing_spec_all'",
             edit,
-            context.target_range,
+            range,
         )])
     }
 }
diff --git a/crates/ide/src/diagnostics/misspelled_attribute.rs b/crates/ide/src/diagnostics/misspelled_attribute.rs
index f328f57b20..15ad1dd9d8 100644
--- a/crates/ide/src/diagnostics/misspelled_attribute.rs
+++ b/crates/ide/src/diagnostics/misspelled_attribute.rs
@@ -55,7 +55,6 @@ impl Linter for MisspelledAttributeLinter {
 
 #[derive(Debug, Clone, PartialEq, Eq, Default)]
 pub struct Context {
-    range: TextRange,
     attr_name: String,
     suggested_rename: String,
 }
@@ -88,7 +87,6 @@ impl GenericLinter for MisspelledAttributeLinter {
                     res.push(GenericLinterMatchContext {
                         range: attr_name_range,
                         context: Context {
-                            range: attr_name_range,
                             attr_name: attr.name.to_string(),
                             suggested_rename: suggested_rename.to_string(),
                         },
@@ -110,16 +108,17 @@ impl GenericLinter for MisspelledAttributeLinter {
     fn fixes(
         &self,
         context: &Self::Context,
+        range: TextRange,
         _sema: &Semantic,
         file_id: FileId,
     ) -> Option<Vec<Assist>> {
-        let edit = TextEdit::replace(context.range, context.suggested_rename.clone());
+        let edit = TextEdit::replace(range, context.suggested_rename.clone());
         let msg = format!("Change to '{}'", context.suggested_rename);
         Some(vec![fix(
             "fix_misspelled_attribute",
             &msg,
             SourceChange::from_text_edit(file_id, edit),
-            context.range,
+            range,
         )])
     }
 }
diff --git a/crates/ide/src/diagnostics/undocumented_module.rs b/crates/ide/src/diagnostics/undocumented_module.rs
index eeb4caf7b1..1b2c80cfc9 100644
--- a/crates/ide/src/diagnostics/undocumented_module.rs
+++ b/crates/ide/src/diagnostics/undocumented_module.rs
@@ -48,9 +48,7 @@ impl Linter for UndocumentedModuleLinter {
 }
 
 #[derive(Debug, Default, Clone, PartialEq, Eq)]
-pub struct Context {
-    module_name_range: TextRange,
-}
+pub struct Context;
 
 impl GenericLinter for UndocumentedModuleLinter {
     type Context = Context;
@@ -71,16 +69,21 @@ impl GenericLinter for UndocumentedModuleLinter {
         if module_has_no_docs {
             let module_name = module_attribute.name()?;
             let module_name_range = module_name.syntax().text_range();
-            let context = Context { module_name_range };
             res.push(GenericLinterMatchContext {
                 range: module_name_range,
-                context,
+                context: Context,
             });
         }
         Some(res)
     }
 
-    fn fixes(&self, context: &Context, sema: &Semantic, file_id: FileId) -> Option<Vec<Assist>> {
+    fn fixes(
+        &self,
+        _context: &Context,
+        range: TextRange,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<Assist>> {
         let insert_offset = helpers::moduledoc_insert_offset(sema, file_id)?;
         let mut builder = SourceChangeBuilder::new(file_id);
         builder.insert(insert_offset, "-moduledoc false.\n");
@@ -89,7 +92,7 @@ impl GenericLinter for UndocumentedModuleLinter {
             "add_moduledoc_false",
             "Add `-moduledoc false.` attribute",
             source_change,
-            context.module_name_range,
+            range,
         );
         Some(vec![fix])
     }
diff --git a/crates/ide/src/diagnostics/unused_include.rs b/crates/ide/src/diagnostics/unused_include.rs
index eed17b3c5c..eb26bcd923 100644
--- a/crates/ide/src/diagnostics/unused_include.rs
+++ b/crates/ide/src/diagnostics/unused_include.rs
@@ -137,6 +137,7 @@ impl GenericLinter for UnusedIncludeLinter {
     fn fixes(
         &self,
         context: &Self::Context,
+        _range: TextRange,
         _sema: &Semantic,
         file_id: FileId,
     ) -> Option<Vec<Assist>> {
diff --git a/crates/ide/src/diagnostics/unused_macro.rs b/crates/ide/src/diagnostics/unused_macro.rs
index 089371f85b..6ea8756b91 100644
--- a/crates/ide/src/diagnostics/unused_macro.rs
+++ b/crates/ide/src/diagnostics/unused_macro.rs
@@ -88,7 +88,13 @@ impl GenericLinter for UnusedMacroLinter {
         Some(DiagnosticTag::Unused)
     }
 
-    fn fixes(&self, context: &Context, _sema: &Semantic, file_id: FileId) -> Option<Vec<Assist>> {
+    fn fixes(
+        &self,
+        context: &Context,
+        _range: TextRange,
+        _sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<Assist>> {
         Some(vec![delete_unused_macro(
             file_id,
             context.delete_range,

From 166770cc92c3db50613b6d2a1ba9acf13e240307 Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Mon, 15 Dec 2025 03:16:34 -0800
Subject: [PATCH 357/394] Remove logic for --include-tests, opt-in tests

Summary:
Remove all logic related to `--include-tests` in ELP for eqWAlizer.

Enable eqWAlizer on tests by default.

Reviewed By: michalmuskala

Differential Revision: D89049936

fbshipit-source-id: b3702ddcc8cdb9a3ced65ec6855918ea37b2a072
---
 crates/elp/src/bin/args.rs                      |  8 --------
 crates/elp/src/bin/eqwalizer_cli.rs             | 17 ++++-------------
 crates/elp/src/bin/glean.rs                     |  2 +-
 crates/elp/src/bin/reporting.rs                 | 11 ++---------
 crates/elp/src/bin/shell.rs                     | 10 ++--------
 crates/elp/src/convert.rs                       |  9 +--------
 .../src/resources/test/eqwalize_all_help.stdout |  3 +--
 .../elp/src/resources/test/eqwalize_app.stdout  |  3 +--
 .../resources/test/eqwalize_target_help.stdout  |  3 +--
 .../eqwalize_all_bail_on_error_failure.pretty   | 10 +++++++++-
 .../standard/eqwalize_all_diagnostics.jsonl     |  1 +
 .../standard/eqwalize_all_diagnostics.pretty    | 10 +++++++++-
 .../standard/eqwalize_all_diagnostics_gen.jsonl |  1 +
 .../eqwalize_app_diagnostics_gen_rebar.pretty   | 10 +++++++++-
 .../eqwalize_app_diagnostics_rebar.pretty       | 10 +++++++++-
 crates/elp/src/server.rs                        |  2 +-
 crates/elp/src/snapshot.rs                      |  4 ++--
 crates/elp/tests/slow-tests/buck_tests.rs       |  2 +-
 crates/ide/src/lib.rs                           |  8 ++++----
 crates/ide_db/src/eqwalizer.rs                  | 14 +++++---------
 crates/ide_db/src/lib.rs                        |  2 +-
 21 files changed, 65 insertions(+), 75 deletions(-)

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index db3bc33df2..2d97f50562 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -155,8 +155,6 @@ pub struct EqwalizeAll {
     /// Also eqwalize opted-in generated modules from project (deprecated)
     #[bpaf(hide)]
     pub include_generated: bool,
-    /// Also eqwalize test modules from project
-    pub include_tests: bool,
     /// Exit with a non-zero status code if any errors are found
     pub bail_on_error: bool,
     /// Print statistics when done
@@ -173,8 +171,6 @@ pub struct EqwalizeTarget {
     /// Also eqwalize opted-in generated modules from application (deprecated)
     #[bpaf(hide)]
     pub include_generated: bool,
-    /// Also eqwalize test modules from project
-    pub include_tests: bool,
     /// Exit with a non-zero status code if any errors are found
     pub bail_on_error: bool,
     /// target, like //erl/chatd/...
@@ -193,8 +189,6 @@ pub struct EqwalizeApp {
     /// Also eqwalize opted-in generated modules from project (deprecated)
     #[bpaf(hide)]
     pub include_generated: bool,
-    /// Also eqwalize test modules from project
-    pub include_tests: bool,
     /// Run with rebar
     pub rebar: bool,
     /// Exit with a non-zero status code if any errors are found
@@ -217,8 +211,6 @@ pub struct EqwalizeStats {
     /// Also eqwalize opted-in generated modules from project (deprecated)
     #[bpaf(hide)]
     pub include_generated: bool,
-    /// Also eqwalize test modules from project
-    pub include_tests: bool,
     /// If specified, use the provided CLI severity mapping instead of the default one
     pub use_cli_severity: bool,
 }
diff --git a/crates/elp/src/bin/eqwalizer_cli.rs b/crates/elp/src/bin/eqwalizer_cli.rs
index a91bcdd869..141b2157d0 100644
--- a/crates/elp/src/bin/eqwalizer_cli.rs
+++ b/crates/elp/src/bin/eqwalizer_cli.rs
@@ -186,10 +186,7 @@ pub fn do_eqwalize_all(
         .par_bridge()
         .progress_with(pb.clone())
         .map_with(analysis.clone(), |analysis, (name, _source, file_id)| {
-            if analysis
-                .should_eqwalize(file_id, args.include_tests)
-                .unwrap()
-                && !otp_file_to_ignore(analysis, file_id)
+            if analysis.should_eqwalize(file_id).unwrap() && !otp_file_to_ignore(analysis, file_id)
             {
                 if args.stats {
                     add_stat(name.to_string());
@@ -269,9 +266,7 @@ pub fn do_eqwalize_app(
         .iter_own()
         .filter_map(|(_name, _source, file_id)| {
             if analysis.file_app_name(file_id).ok()? == Some(AppName(args.app.clone()))
-                && analysis
-                    .should_eqwalize(file_id, args.include_tests)
-                    .unwrap()
+                && analysis.should_eqwalize(file_id).unwrap()
                 && !otp_file_to_ignore(analysis, file_id)
             {
                 Some(file_id)
@@ -339,9 +334,7 @@ pub fn eqwalize_target(
                 let vfs_path = VfsPath::from(src.clone());
                 if let Some((file_id, _)) = loaded.vfs.file_id(&vfs_path) {
                     at_least_one_found = true;
-                    if analysis
-                        .should_eqwalize(file_id, args.include_tests)
-                        .unwrap()
+                    if analysis.should_eqwalize(file_id).unwrap()
                         && !otp_file_to_ignore(analysis, file_id)
                     {
                         file_ids.push(file_id);
@@ -408,9 +401,7 @@ pub fn eqwalize_stats(
         .par_bridge()
         .progress_with(pb.clone())
         .map_with(analysis.clone(), |analysis, (name, _source, file_id)| {
-            if analysis
-                .should_eqwalize(file_id, args.include_tests)
-                .expect("cancelled")
+            if analysis.should_eqwalize(file_id).expect("cancelled")
                 && !otp_file_to_ignore(analysis, file_id)
             {
                 analysis
diff --git a/crates/elp/src/bin/glean.rs b/crates/elp/src/bin/glean.rs
index 2a45e450f2..bfd4757106 100644
--- a/crates/elp/src/bin/glean.rs
+++ b/crates/elp/src/bin/glean.rs
@@ -1560,7 +1560,7 @@ impl GleanIndexer {
         vars: FxHashMap<&Location, &String>,
     ) -> Vec<VarDecl> {
         let mut result = vec![];
-        if !db.is_eqwalizer_enabled(file_id, false) {
+        if !db.is_eqwalizer_enabled(file_id) {
             return result;
         }
         let module_diagnostics = db.eqwalizer_diagnostics_by_project(project_id, vec![file_id]);
diff --git a/crates/elp/src/bin/reporting.rs b/crates/elp/src/bin/reporting.rs
index fe38287629..7ab10459fe 100644
--- a/crates/elp/src/bin/reporting.rs
+++ b/crates/elp/src/bin/reporting.rs
@@ -227,9 +227,6 @@ impl Reporter for JsonReporter<'_> {
         diagnostics: &[EqwalizerDiagnostic],
     ) -> Result<()> {
         let line_index = self.analysis.line_index(file_id)?;
-        // Pass include_Tests = false so that errors for tests files that are not opted-in are tagged as
-        // arc_types::Severity::Disabled and don't break CI.
-        let eqwalizer_enabled = self.analysis.is_eqwalizer_enabled(file_id, false).unwrap();
         let file_path = &self.loaded.vfs.file_path(file_id);
         let root_path = &self
             .analysis
@@ -238,12 +235,8 @@ impl Reporter for JsonReporter<'_> {
             .root_dir;
         let relative_path = get_relative_path(root_path, file_path);
         for diagnostic in diagnostics {
-            let diagnostic = convert::eqwalizer_to_arc_diagnostic(
-                diagnostic,
-                &line_index,
-                relative_path,
-                eqwalizer_enabled,
-            );
+            let diagnostic =
+                convert::eqwalizer_to_arc_diagnostic(diagnostic, &line_index, relative_path);
             let diagnostic = serde_json::to_string(&diagnostic)?;
             writeln!(self.cli, "{diagnostic}")?;
         }
diff --git a/crates/elp/src/bin/shell.rs b/crates/elp/src/bin/shell.rs
index 84ab218710..13ff79ed36 100644
--- a/crates/elp/src/bin/shell.rs
+++ b/crates/elp/src/bin/shell.rs
@@ -157,10 +157,9 @@ impl ShellCommand {
                 }
                 "eqwalize-app" => {
                     let include_generated = options.contains(&"--include-generated");
-                    let include_tests = options.contains(&"--include-tests");
                     if let Some(other) = options
                         .into_iter()
-                        .find(|&opt| opt != "--include-generated" && opt != "--include-tests")
+                        .find(|&opt| opt != "--include-generated")
                     {
                         return Err(ShellError::UnexpectedOption(
                             "eqwalize-app".into(),
@@ -177,7 +176,6 @@ impl ShellCommand {
                             rebar,
                             app: app.into(),
                             include_generated,
-                            include_tests,
                             bail_on_error: false,
                         })));
                     }
@@ -185,10 +183,9 @@ impl ShellCommand {
                 }
                 "eqwalize-all" => {
                     let include_generated = options.contains(&"--include-generated");
-                    let include_tests = options.contains(&"--include-tests");
                     if let Some(other) = options
                         .into_iter()
-                        .find(|&opt| opt != "--include-generated" && opt != "--include-tests")
+                        .find(|&opt| opt != "--include-generated")
                     {
                         return Err(ShellError::UnexpectedOption(
                             "eqwalize-all".into(),
@@ -204,7 +201,6 @@ impl ShellCommand {
                         rebar,
                         format: None,
                         include_generated,
-                        include_tests,
                         bail_on_error: false,
                         stats: false,
                         list_modules: false,
@@ -226,10 +222,8 @@ COMMANDS:
     eqwalize <modules>         Eqwalize specified modules
         --clause-coverage      Use experimental clause coverage checker
     eqwalize-all               Eqwalize all modules in the current project
-        --include-tests        Also eqwalize test modules from project
         --clause-coverage      Use experimental clause coverage checker
     eqwalize-app <app>         Eqwalize all modules in specified application
-        --include-tests        Also eqwalize test modules from project
         --clause-coverage      Use experimental clause coverage checker
 ";
 
diff --git a/crates/elp/src/convert.rs b/crates/elp/src/convert.rs
index 3715353c11..c8db07a5d0 100644
--- a/crates/elp/src/convert.rs
+++ b/crates/elp/src/convert.rs
@@ -126,18 +126,11 @@ pub fn eqwalizer_to_arc_diagnostic(
     d: &EqwalizerDiagnostic,
     line_index: &LineIndex,
     relative_path: &Path,
-    eqwalizer_enabled: bool,
 ) -> arc_types::Diagnostic {
     let pos = position(line_index, d.range.start());
     let line_num = pos.line + 1;
     let character = Some(pos.character + 1);
-    let severity = if eqwalizer_enabled {
-        arc_types::Severity::Error
-    } else {
-        // We use Severity::Disabled so that diagnostics are reported in cont lint
-        // but not in CI.
-        arc_types::Severity::Disabled
-    };
+    let severity = arc_types::Severity::Error;
     // formatting: https://fburl.com/max_wiki_link_to_phabricator_rich_text
     let explanation = match &d.explanation {
         Some(s) => format!("```\n{s}\n```"),
diff --git a/crates/elp/src/resources/test/eqwalize_all_help.stdout b/crates/elp/src/resources/test/eqwalize_all_help.stdout
index 43f66a0a3a..67497c4000 100644
--- a/crates/elp/src/resources/test/eqwalize_all_help.stdout
+++ b/crates/elp/src/resources/test/eqwalize_all_help.stdout
@@ -1,11 +1,10 @@
-Usage: [--project PROJECT] [--as PROFILE] [[--format FORMAT]] [--rebar] [--include-tests] [--bail-on-error] [--stats] [--list-modules]
+Usage: [--project PROJECT] [--as PROFILE] [[--format FORMAT]] [--rebar] [--bail-on-error] [--stats] [--list-modules]
 
 Available options:
         --project <PROJECT>  Path to directory with project, or to a JSON file (defaults to `.`)
         --as <PROFILE>       Rebar3 profile to pickup (default is test)
         --format <FORMAT>    Show diagnostics in JSON format
         --rebar              Run with rebar
-        --include-tests      Also eqwalize test modules from project
         --bail-on-error      Exit with a non-zero status code if any errors are found
         --stats              Print statistics when done
         --list-modules       When printing statistics, include the list of modules parsed
diff --git a/crates/elp/src/resources/test/eqwalize_app.stdout b/crates/elp/src/resources/test/eqwalize_app.stdout
index eaf1d3126a..bb128f249a 100644
--- a/crates/elp/src/resources/test/eqwalize_app.stdout
+++ b/crates/elp/src/resources/test/eqwalize_app.stdout
@@ -1,4 +1,4 @@
-Usage: [--project PROJECT] [--as PROFILE] [--include-tests] [--rebar] [--bail-on-error] <APP>
+Usage: [--project PROJECT] [--as PROFILE] [--rebar] [--bail-on-error] <APP>
 
 Available positional items:
     <APP>  app name
@@ -6,7 +6,6 @@ Available positional items:
 Available options:
         --project <PROJECT>  Path to directory with project, or to a JSON file (defaults to `.`)
         --as <PROFILE>       Rebar3 profile to pickup (default is test)
-        --include-tests      Also eqwalize test modules from project
         --rebar              Run with rebar
         --bail-on-error      Exit with a non-zero status code if any errors are found
     -h, --help               Prints help information
diff --git a/crates/elp/src/resources/test/eqwalize_target_help.stdout b/crates/elp/src/resources/test/eqwalize_target_help.stdout
index eec74e4938..e9a01166dd 100644
--- a/crates/elp/src/resources/test/eqwalize_target_help.stdout
+++ b/crates/elp/src/resources/test/eqwalize_target_help.stdout
@@ -1,10 +1,9 @@
-Usage: [--project PROJECT] [--include-tests] [--bail-on-error] <TARGET>
+Usage: [--project PROJECT] [--bail-on-error] <TARGET>
 
 Available positional items:
     <TARGET>  target, like //erl/chatd/...
 
 Available options:
         --project <PROJECT>  Path to directory with project, or to a JSON file (defaults to `.`)
-        --include-tests      Also eqwalize test modules from project
         --bail-on-error      Exit with a non-zero status code if any errors are found
     -h, --help               Prints help information
diff --git a/crates/elp/src/resources/test/standard/eqwalize_all_bail_on_error_failure.pretty b/crates/elp/src/resources/test/standard/eqwalize_all_bail_on_error_failure.pretty
index bfbe45f508..1d868bbbc6 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_all_bail_on_error_failure.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_all_bail_on_error_failure.pretty
@@ -192,6 +192,14 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
 Expression has type:   'wrong_ret'
 Context expected type: 'error'
 
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+  ┌─ app_a/test/app_a_test_helpers_not_opted_in.erl:5:11
+  │
+5 │ fail() -> error.
+  │           ^^^^^ 'error'.
+Expression has type:   'error'
+Context expected type: 'ok'
+
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ app_b/src/app_b.erl:16:5
    │
@@ -200,4 +208,4 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
 Expression has type:   [T]
 Context expected type: T
 
-20 ERRORS
+21 ERRORS
diff --git a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.jsonl b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.jsonl
index 8636389098..b311705d68 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.jsonl
+++ b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.jsonl
@@ -17,4 +17,5 @@
 {"path":"app_a/src/app_a_mod2.erl","line":22,"char":1,"code":"ELP","severity":"error","name":"eqWAlizer: type_alias_is_non_productive","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nrecursive type invalid/0 is not productive\n```\n\n> [docs on `type_alias_is_non_productive`](https://fb.me/eqwalizer_errors#type_alias_is_non_productive)","docPath":null}
 {"path":"app_a/src/app_a_mod2.erl","line":31,"char":9,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/test/app_a_test_helpers.erl","line":6,"char":11,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'wrong_ret'","replacement":null,"description":"```lang=error,counterexample\n`'wrong_ret'`.\n\nExpression has type:   'wrong_ret'\nContext expected type: 'error'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/test/app_a_test_helpers_not_opted_in.erl","line":5,"char":11,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_b/src/app_b.erl","line":16,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"L","replacement":null,"description":"```lang=error,counterexample\n`L`.\n\nExpression has type:   [T]\nContext expected type: T\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
diff --git a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.pretty b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.pretty
index bfbe45f508..1d868bbbc6 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics.pretty
@@ -192,6 +192,14 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
 Expression has type:   'wrong_ret'
 Context expected type: 'error'
 
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+  ┌─ app_a/test/app_a_test_helpers_not_opted_in.erl:5:11
+  │
+5 │ fail() -> error.
+  │           ^^^^^ 'error'.
+Expression has type:   'error'
+Context expected type: 'ok'
+
 error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
    ┌─ app_b/src/app_b.erl:16:5
    │
@@ -200,4 +208,4 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
 Expression has type:   [T]
 Context expected type: T
 
-20 ERRORS
+21 ERRORS
diff --git a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics_gen.jsonl b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics_gen.jsonl
index 8636389098..b311705d68 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics_gen.jsonl
+++ b/crates/elp/src/resources/test/standard/eqwalize_all_diagnostics_gen.jsonl
@@ -17,4 +17,5 @@
 {"path":"app_a/src/app_a_mod2.erl","line":22,"char":1,"code":"ELP","severity":"error","name":"eqWAlizer: type_alias_is_non_productive","original":null,"replacement":null,"description":"```lang=error,counterexample\n\nrecursive type invalid/0 is not productive\n```\n\n> [docs on `type_alias_is_non_productive`](https://fb.me/eqwalizer_errors#type_alias_is_non_productive)","docPath":null}
 {"path":"app_a/src/app_a_mod2.erl","line":31,"char":9,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'an_atom'","replacement":null,"description":"```lang=error,counterexample\n`'an_atom'`.\n\nExpression has type:   'an_atom'\nContext expected type: number()\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_a/test/app_a_test_helpers.erl","line":6,"char":11,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'wrong_ret'","replacement":null,"description":"```lang=error,counterexample\n`'wrong_ret'`.\n\nExpression has type:   'wrong_ret'\nContext expected type: 'error'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
+{"path":"app_a/test/app_a_test_helpers_not_opted_in.erl","line":5,"char":11,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"'error'","replacement":null,"description":"```lang=error,counterexample\n`'error'`.\n\nExpression has type:   'error'\nContext expected type: 'ok'\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
 {"path":"app_b/src/app_b.erl","line":16,"char":5,"code":"ELP","severity":"error","name":"eqWAlizer: incompatible_types","original":"L","replacement":null,"description":"```lang=error,counterexample\n`L`.\n\nExpression has type:   [T]\nContext expected type: T\n```\n\n> [docs on `incompatible_types`](https://fb.me/eqwalizer_errors#incompatible_types)","docPath":null}
diff --git a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen_rebar.pretty b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen_rebar.pretty
index 67d78913b6..043aa00af0 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen_rebar.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_gen_rebar.pretty
@@ -192,4 +192,12 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
 Expression has type:   'wrong_ret'
 Context expected type: 'error'
 
-19 ERRORS
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+  ┌─ app_a/test/app_a_test_helpers_not_opted_in.erl:5:11
+  │
+5 │ fail() -> error.
+  │           ^^^^^ 'error'.
+Expression has type:   'error'
+Context expected type: 'ok'
+
+20 ERRORS
diff --git a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_rebar.pretty b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_rebar.pretty
index 67d78913b6..043aa00af0 100644
--- a/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_rebar.pretty
+++ b/crates/elp/src/resources/test/standard/eqwalize_app_diagnostics_rebar.pretty
@@ -192,4 +192,12 @@ error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types
 Expression has type:   'wrong_ret'
 Context expected type: 'error'
 
-19 ERRORS
+error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
+  ┌─ app_a/test/app_a_test_helpers_not_opted_in.erl:5:11
+  │
+5 │ fail() -> error.
+  │           ^^^^^ 'error'.
+Expression has type:   'error'
+Context expected type: 'ok'
+
+20 ERRORS
diff --git a/crates/elp/src/server.rs b/crates/elp/src/server.rs
index 65c75a1bbc..98890640bc 100644
--- a/crates/elp/src/server.rs
+++ b/crates/elp/src/server.rs
@@ -2073,7 +2073,7 @@ impl Server {
             };
 
             for (_, _, file_id) in module_index.iter_own() {
-                match snapshot.analysis.should_eqwalize(file_id, false) {
+                match snapshot.analysis.should_eqwalize(file_id) {
                     Ok(true) => {
                         files.push(file_id);
                     }
diff --git a/crates/elp/src/snapshot.rs b/crates/elp/src/snapshot.rs
index e79251f73a..9aa3e7eeb4 100644
--- a/crates/elp/src/snapshot.rs
+++ b/crates/elp/src/snapshot.rs
@@ -193,7 +193,7 @@ impl Snapshot {
     ) -> Result<()> {
         let _ = self.analysis.def_map(file_id)?;
         if optimize_for_eqwalizer {
-            let should_eqwalize = self.analysis.should_eqwalize(file_id, false)?;
+            let should_eqwalize = self.analysis.should_eqwalize(file_id)?;
             if should_eqwalize {
                 let _ = self.analysis.module_ast(file_id)?;
             }
@@ -242,7 +242,7 @@ impl Snapshot {
         let file_ids: Vec<FileId> = module_index
             .iter_own()
             .filter_map(|(_, _, file_id)| {
-                if let Ok(true) = self.analysis.should_eqwalize(file_id, false) {
+                if let Ok(true) = self.analysis.should_eqwalize(file_id) {
                     Some(file_id)
                 } else {
                     None
diff --git a/crates/elp/tests/slow-tests/buck_tests.rs b/crates/elp/tests/slow-tests/buck_tests.rs
index e76fdb8bad..76540e2515 100644
--- a/crates/elp/tests/slow-tests/buck_tests.rs
+++ b/crates/elp/tests/slow-tests/buck_tests.rs
@@ -65,7 +65,7 @@ mod tests {
             let ast = analysis.module_ast(file_id).unwrap();
             assert_eq!(ast.errors, vec![]);
             let eq_enabled = analysis
-                .is_eqwalizer_enabled(file_id, false)
+                .is_eqwalizer_enabled(file_id)
                 .unwrap_or_else(|_| panic!("Failed to check if eqwalizer enabled for {module}"));
             assert_eq!(eq_enabled, eqwalizer_enabled);
             let project_data = analysis.project_data(file_id).unwrap();
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index dcaff6de70..009edd4684 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -251,9 +251,9 @@ impl Analysis {
         })
     }
 
-    pub fn should_eqwalize(&self, file_id: FileId, include_tests: bool) -> Cancellable<bool> {
+    pub fn should_eqwalize(&self, file_id: FileId) -> Cancellable<bool> {
         let is_in_app = self.file_app_type(file_id).ok() == Some(Some(AppType::App));
-        Ok(is_in_app && self.is_eqwalizer_enabled(file_id, include_tests)?)
+        Ok(is_in_app && self.is_eqwalizer_enabled(file_id)?)
     }
 
     /// Computes the set of eqwalizer diagnostics for the given files,
@@ -383,8 +383,8 @@ impl Analysis {
     /// - the app (the module belongs to) has `.eqwalizer` marker in the roof
     /// - or the module has `-typing([eqwalizer]).` pragma
     /// - or the whole project has `enable_all=true` in its `.elp.toml` file
-    pub fn is_eqwalizer_enabled(&self, file_id: FileId, include_tests: bool) -> Cancellable<bool> {
-        self.with_db(|db| db.is_eqwalizer_enabled(file_id, include_tests))
+    pub fn is_eqwalizer_enabled(&self, file_id: FileId) -> Cancellable<bool> {
+        self.with_db(|db| db.is_eqwalizer_enabled(file_id))
     }
 
     /// ETF for the module's abstract forms
diff --git a/crates/ide_db/src/eqwalizer.rs b/crates/ide_db/src/eqwalizer.rs
index 4deed79778..fca577bb21 100644
--- a/crates/ide_db/src/eqwalizer.rs
+++ b/crates/ide_db/src/eqwalizer.rs
@@ -12,7 +12,6 @@ use std::sync::Arc;
 
 use elp_base_db::FileId;
 use elp_base_db::FileRange;
-use elp_base_db::FileSource;
 use elp_base_db::ModuleName;
 use elp_base_db::ProjectId;
 use elp_base_db::SourceDatabase;
@@ -89,7 +88,7 @@ pub trait EqwalizerDatabase:
     fn types_for_file(&self, file_id: FileId) -> Option<Arc<Vec<(Pos, Type)>>>;
     fn has_eqwalizer_module_marker(&self, file_id: FileId) -> bool;
     fn has_eqwalizer_ignore_marker(&self, file_id: FileId) -> bool;
-    fn is_eqwalizer_enabled(&self, file_id: FileId, include_tests: bool) -> bool;
+    fn is_eqwalizer_enabled(&self, file_id: FileId) -> bool;
 }
 
 pub fn eqwalizer_diagnostics_by_project(
@@ -114,7 +113,7 @@ fn type_at_position(
     db: &dyn EqwalizerDatabase,
     range: FileRange,
 ) -> Option<Arc<(eqwalizer::types::Type, FileRange)>> {
-    if !db.is_eqwalizer_enabled(range.file_id, false) {
+    if !db.is_eqwalizer_enabled(range.file_id) {
         return None;
     }
     let project_id = db.file_app_data(range.file_id)?.project_id;
@@ -149,7 +148,7 @@ fn type_at_position(
 }
 
 fn types_for_file(db: &dyn EqwalizerDatabase, file_id: FileId) -> Option<Arc<Vec<(Pos, Type)>>> {
-    if !db.is_eqwalizer_enabled(file_id, false) {
+    if !db.is_eqwalizer_enabled(file_id) {
         return None;
     }
     let project_id = db.file_app_data(file_id)?.project_id;
@@ -162,7 +161,7 @@ fn types_for_file(db: &dyn EqwalizerDatabase, file_id: FileId) -> Option<Arc<Vec
     None
 }
 
-fn is_eqwalizer_enabled(db: &dyn EqwalizerDatabase, file_id: FileId, include_tests: bool) -> bool {
+fn is_eqwalizer_enabled(db: &dyn EqwalizerDatabase, file_id: FileId) -> bool {
     if !otp_supported_by_eqwalizer() {
         return false;
     }
@@ -178,11 +177,8 @@ fn is_eqwalizer_enabled(db: &dyn EqwalizerDatabase, file_id: FileId, include_tes
     let project = db.project_data(project_id);
     let eqwalizer_config = &project.eqwalizer_config;
     let module_index = db.module_index(project_id);
-    let is_src = module_index.file_source_for_file(file_id) == Some(FileSource::Src);
-    let is_test_opted_in = db.is_test_suite_or_test_helper(file_id) == Some(true) && include_tests;
     let global_opt_in = eqwalizer_config.enable_all;
-    let opt_in =
-        (global_opt_in && (is_src || is_test_opted_in)) || db.has_eqwalizer_module_marker(file_id);
+    let opt_in = global_opt_in || db.has_eqwalizer_module_marker(file_id);
     let ignored_in_config = if let Some(module_name) = module_index.module_for_file(file_id) {
         eqwalizer_config
             .ignore_modules_compiled_patterns
diff --git a/crates/ide_db/src/lib.rs b/crates/ide_db/src/lib.rs
index 9b64d09b31..30a67cfa24 100644
--- a/crates/ide_db/src/lib.rs
+++ b/crates/ide_db/src/lib.rs
@@ -385,7 +385,7 @@ impl TypedSemantic for RootDatabase {
 
         let project_id = app_data.project_id;
 
-        let eqwalizer_enabled = self.is_eqwalizer_enabled(file_id, false);
+        let eqwalizer_enabled = self.is_eqwalizer_enabled(file_id);
         if !eqwalizer_enabled {
             return Some(vec![]);
         }

From d2da476882e325c0d431a1623dc4f5e7710e91b9 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 16 Dec 2025 02:03:43 -0800
Subject: [PATCH 358/394] Add test project for code gen

Summary:
ELP using buck is able to trigger rules that generate code, and load this generated code as part of the project.

This diff brings in a test project with an example of this process, for ensuring our support is sold.

Reviewed By: robertoaloi

Differential Revision: D88953198

fbshipit-source-id: b92cf86b556f5465b2a528895b4e56852630f82e
---
 test_projects/codegen_test/.elp.toml          |   8 +
 test_projects/codegen_test/README.md          | 139 ++++++++++++++++++
 .../app_a/src/codegen_test.app.src            |  14 ++
 .../codegen_test/app_a/src/example_usage.erl  |  51 +++++++
 .../app_a/test/codegen_test_SUITE.erl         |  77 ++++++++++
 .../generated/example_service_client.erl      |  37 +++++
 .../generated/example_service_types.erl       |  55 +++++++
 .../generated/example_service_types.hrl       |  27 ++++
 .../templates/example_service_client.erl      |  38 +++++
 .../templates/example_service_types.erl       |  56 +++++++
 .../templates/example_service_types.hrl       |  28 ++++
 11 files changed, 530 insertions(+)
 create mode 100644 test_projects/codegen_test/.elp.toml
 create mode 100644 test_projects/codegen_test/README.md
 create mode 100644 test_projects/codegen_test/app_a/src/codegen_test.app.src
 create mode 100644 test_projects/codegen_test/app_a/src/example_usage.erl
 create mode 100644 test_projects/codegen_test/app_a/test/codegen_test_SUITE.erl
 create mode 100644 test_projects/codegen_test/generated/example_service_client.erl
 create mode 100644 test_projects/codegen_test/generated/example_service_types.erl
 create mode 100644 test_projects/codegen_test/generated/example_service_types.hrl
 create mode 100644 test_projects/codegen_test/templates/example_service_client.erl
 create mode 100644 test_projects/codegen_test/templates/example_service_types.erl
 create mode 100644 test_projects/codegen_test/templates/example_service_types.hrl

diff --git a/test_projects/codegen_test/.elp.toml b/test_projects/codegen_test/.elp.toml
new file mode 100644
index 0000000000..f0f166bcf8
--- /dev/null
+++ b/test_projects/codegen_test/.elp.toml
@@ -0,0 +1,8 @@
+[buck]
+enabled = true
+build_deps = true
+included_targets = [ "fbcode//whatsapp/elp/test_projects/codegen_test:codegen_test_app" ]
+source_root = "whatsapp/elp/test_projects/codegen_test"
+
+[eqwalizer]
+enable_all = true
diff --git a/test_projects/codegen_test/README.md b/test_projects/codegen_test/README.md
new file mode 100644
index 0000000000..1af599454c
--- /dev/null
+++ b/test_projects/codegen_test/README.md
@@ -0,0 +1,139 @@
+# Code Generation Test Project
+
+This test project demonstrates Buck2-based code generation for Erlang
+applications using `buck_genrule`.
+
+## Project Structure
+
+```
+codegen_test/
+├── .elp.toml                      # ELP configuration
+├── BUCK                           # Buck build configuration with genrule
+├── README.md                      # This file
+├── templates/                     # Erlang template files (input)
+│   ├── example_service_types.erl  # Type definitions template
+│   ├── example_service_client.erl # Client stubs template
+│   └── example_service_types.hrl  # Header file template
+├── generated/                     # Pre-generated code (for reference)
+│   ├── example_service_types.erl  # Generated type module
+│   ├── example_service_client.erl # Generated client stubs
+│   └── example_service_types.hrl  # Generated header file
+└── app_a/
+    ├── src/
+    │   ├── codegen_test.app.src   # Application metadata
+    │   └── example_usage.erl      # Example using generated code
+    └── test/
+        └── codegen_test_SUITE.erl # Test suite
+```
+
+## How It Works
+
+### 1. Template Files
+
+The templates directory contains well-formed Erlang files that serve as input to
+the code generation process. These are complete, valid Erlang files that are
+copied to the output directory during the build.
+
+### 2. Code Generation
+
+The code is generated automatically during the build process using a
+`buck_genrule`:
+
+```python
+buck_genrule(
+    name = "example_service_types_erl",
+    srcs = [
+        "templates/example_service_types.erl",
+    ],
+    outs = {
+        "example_service_types.erl": ["example_service_types.erl"],
+    },
+    bash = "cp $SRCDIR/templates/example_service_types.erl $OUT/example_service_types.erl",
+    cmd_exe = "copy %SRCDIR%\\templates\\example_service_types.erl %OUT%\\example_service_types.erl",
+)
+```
+
+The genrule:
+
+- Takes the template file as input (`srcs`)
+- Defines named outputs using `outs` parameter (creates subtargets for each
+  file)
+- Uses `cp` (bash) or `copy` (cmd_exe) to copy template files to `$OUT`
+- Outputs files to `$OUT` directory in `buck-out/`
+
+### 3. Build Integration
+
+The `BUCK` file references the generated files using subtarget syntax:
+
+```python
+erlang_app(
+    name = "example_service_generated",
+    srcs = [
+        ":example_service_types_erl[example_service_types.erl]",
+        ":example_service_client_erl[example_service_client.erl]",
+    ],
+    includes = [
+        ":example_service_types_hrl[example_service_types.hrl]",
+    ],
+)
+```
+
+When Buck builds the application:
+
+1. The genrule runs first, copying the template Erlang files to the output
+2. The generated files are placed in
+   `buck-out/v2/gen/.../example_service_types_erl/`
+3. The `erlang_app` consumes these files via subtarget references (`[filename]`
+   syntax)
+4. The files are copied to the application's build directory in `buck-out/`
+
+### 4. Using Generated Code
+
+Application code includes the generated header and uses the types:
+
+```erlang
+-module(example_usage).
+-include("example_service_types.hrl").
+
+create_sample_user() ->
+    #user_info{
+        user_id = <<"user_123">>,
+        username = <<"john_doe">>,
+        age = 25,
+        is_active = true
+    }.
+
+get_user_by_id(UserId) ->
+    example_service_client:get_user(UserId).
+```
+
+## Building and Testing
+
+```bash
+# Build just the code generation step
+buck2 build fbcode//whatsapp/elp/test_projects/codegen_test:example_service_types_erl
+
+# Build the application (automatically runs code generation)
+buck2 build fbcode//whatsapp/elp/test_projects/codegen_test:codegen_test_app
+
+# Run tests
+buck2 test fbcode//whatsapp/elp/test_projects/codegen_test:codegen_test_SUITE
+
+# View generated files in buck-out
+find buck-out -path "*codegen_test*" -name "example_service_*.erl"
+```
+
+## Test Coverage
+
+The test suite (`app_a/test/codegen_test_SUITE.erl`) verifies:
+
+- Generated record types work correctly
+- Generated client functions are callable
+- Record fields have correct types and defaults
+- Integration with application code
+
+All tests pass:
+
+```
+Tests finished: Pass 3. Fail 0. Fatal 0. Skip 0. Build failure 0
+```
diff --git a/test_projects/codegen_test/app_a/src/codegen_test.app.src b/test_projects/codegen_test/app_a/src/codegen_test.app.src
new file mode 100644
index 0000000000..7a38d49a24
--- /dev/null
+++ b/test_projects/codegen_test/app_a/src/codegen_test.app.src
@@ -0,0 +1,14 @@
+{application, codegen_test,
+ [{description, "Test application demonstrating code generation"},
+  {vsn, "1.0.0"},
+  {registered, []},
+  {applications,
+   [kernel,
+    stdlib,
+    example_service_generated
+   ]},
+  {env,[]},
+  {modules, []},
+  {licenses, ["Apache 2.0"]},
+  {links, []}
+ ]}.
diff --git a/test_projects/codegen_test/app_a/src/example_usage.erl b/test_projects/codegen_test/app_a/src/example_usage.erl
new file mode 100644
index 0000000000..a624c2089b
--- /dev/null
+++ b/test_projects/codegen_test/app_a/src/example_usage.erl
@@ -0,0 +1,51 @@
+-module(example_usage).
+-compile([warn_missing_spec_all]).
+-moduledoc """
+Example module that demonstrates using generated code.
+This module uses the types and client functions generated from
+the example_service.schema file.
+""".
+
+%% Include the generated header file
+-include_lib("example_service_generated/include/example_service_types.hrl").
+
+%% API exports
+-export([
+    create_sample_user/0,
+    create_query_request/1,
+    get_user_by_id/1
+]).
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+
+-doc """
+Creates a sample user_info record using generated types
+""".
+-spec create_sample_user() -> #user_info{}.
+create_sample_user() ->
+    #user_info{
+        user_id = <<"user_123">>,
+        username = <<"john_doe">>,
+        age = 25,
+        is_active = true
+    }.
+
+-doc """
+Creates a query_request record
+""".
+-spec create_query_request(binary()) -> #query_request{}.
+create_query_request(QueryId) ->
+    #query_request{
+        query_id = QueryId,
+        filters = [{age, greater_than, 18}]
+    }.
+
+-doc """
+Uses the generated client to get user information
+""".
+-spec get_user_by_id(binary()) -> {ok, term()} | {error, term()}.
+get_user_by_id(UserId) ->
+    %% This calls the generated client function
+    example_service_client:get_user(UserId).
diff --git a/test_projects/codegen_test/app_a/test/codegen_test_SUITE.erl b/test_projects/codegen_test/app_a/test/codegen_test_SUITE.erl
new file mode 100644
index 0000000000..797c3c58f3
--- /dev/null
+++ b/test_projects/codegen_test/app_a/test/codegen_test_SUITE.erl
@@ -0,0 +1,77 @@
+%%%-------------------------------------------------------------------
+%%% @doc
+%%% Test suite for code generation functionality
+%%% @end
+%%%-------------------------------------------------------------------
+-module(codegen_test_SUITE).
+
+-include_lib("stdlib/include/assert.hrl").
+-include("example_service_types.hrl").
+
+%% CT callbacks
+-export([all/0, init_per_suite/1, end_per_suite/1]).
+
+%% Test cases
+-export([
+    test_generated_types/1,
+    test_generated_client/1,
+    test_user_record_creation/1
+]).
+
+%%%===================================================================
+%%% CT Callbacks
+%%%===================================================================
+
+all() ->
+    [
+        test_generated_types,
+        test_generated_client,
+        test_user_record_creation
+    ].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+%%%===================================================================
+%%% Test Cases
+%%%===================================================================
+
+test_generated_types(_Config) ->
+    %% Test that we can create a user_info record
+    User = #user_info{
+        user_id = <<"test_123">>,
+        username = <<"testuser">>,
+        age = 30,
+        is_active = true
+    },
+
+    %% Verify the record fields
+    ?assertEqual(<<"test_123">>, User#user_info.user_id),
+    ?assertEqual(<<"testuser">>, User#user_info.username),
+    ?assertEqual(30, User#user_info.age),
+    ?assertEqual(true, User#user_info.is_active),
+
+    ok.
+
+test_generated_client(_Config) ->
+    %% Test that the generated client module exists and can be called
+    Result = example_service_client:get_user(<<"user_123">>),
+
+    %% The generated stub returns {ok, generated_response}
+    ?assertMatch({ok, _}, Result),
+
+    ok.
+
+test_user_record_creation(_Config) ->
+    %% Test the example_usage module
+    User = example_usage:create_sample_user(),
+
+    %% Verify it's a valid user_info record
+    ?assertMatch(#user_info{}, User),
+    ?assertEqual(<<"user_123">>, User#user_info.user_id),
+    ?assertEqual(25, User#user_info.age),
+
+    ok.
diff --git a/test_projects/codegen_test/generated/example_service_client.erl b/test_projects/codegen_test/generated/example_service_client.erl
new file mode 100644
index 0000000000..6b38c39425
--- /dev/null
+++ b/test_projects/codegen_test/generated/example_service_client.erl
@@ -0,0 +1,37 @@
+%%%-------------------------------------------------------------------
+%%% @doc
+%%% Auto-generated client for example_service
+%%% DO NOT EDIT - Generated by generate_erlang.sh
+%%% @end
+%%%-------------------------------------------------------------------
+-module(example_service_client).
+
+-include("example_service_types.hrl").
+
+%% API exports
+-export([get_user/1]).
+-export([query_users/1]).
+-export([update_user/2]).
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+
+
+%% @doc Retrieves user information by user ID
+-spec get_user(term()) -> {ok, term()} | {error, term()}.
+get_user(_UserId) ->
+    %% Auto-generated client stub
+    {ok, generated_response}.
+
+%% @doc Queries users with given filters
+-spec query_users(term()) -> {ok, term()} | {error, term()}.
+query_users(_Request) ->
+    %% Auto-generated client stub
+    {ok, generated_response}.
+
+%% @doc Updates user information
+-spec update_user(term(), term()) -> {ok, term()} | {error, term()}.
+update_user(_UserId, _UserInfo) ->
+    %% Auto-generated client stub
+    {ok, generated_response}.
diff --git a/test_projects/codegen_test/generated/example_service_types.erl b/test_projects/codegen_test/generated/example_service_types.erl
new file mode 100644
index 0000000000..3f89adcba9
--- /dev/null
+++ b/test_projects/codegen_test/generated/example_service_types.erl
@@ -0,0 +1,55 @@
+%%%-------------------------------------------------------------------
+%%% @doc
+%%% Auto-generated type definitions for example_service
+%%% DO NOT EDIT - Generated by generate_erlang.sh
+%%% @end
+%%%-------------------------------------------------------------------
+-module(example_service_types).
+
+%% API exports
+-export([new_user_info/0]).
+-export([new_query_request/0]).
+-export([new_query_response/0]).
+-export([get_version/0]).
+
+%% Type exports
+-export_type([user_info/0]).
+-export_type([query_request/0]).
+-export_type([query_response/0]).
+
+%% Record definitions
+-record(user_info, {user_id = <<>>, username = <<>>, age = 0, is_active = false}).
+-record(query_request, {query_id = <<>>, filters = []}).
+-record(query_response, {results = [], count = 0}).
+
+%% Type definitions
+-type user_info() :: #user_info{}.
+-type query_request() :: #query_request{}.
+-type query_response() :: #query_response{}.
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+
+%% @doc Returns the schema version
+-spec get_version() -> binary().
+get_version() ->
+    <<"1.0.0">>.
+
+
+%% @doc Creates a new user_info record
+-spec new_user_info() -> #user_info{}.
+new_user_info() ->
+    #user_info{}.
+
+
+%% @doc Creates a new query_request record
+-spec new_query_request() -> #query_request{}.
+new_query_request() ->
+    #query_request{}.
+
+
+%% @doc Creates a new query_response record
+-spec new_query_response() -> #query_response{}.
+new_query_response() ->
+    #query_response{}.
diff --git a/test_projects/codegen_test/generated/example_service_types.hrl b/test_projects/codegen_test/generated/example_service_types.hrl
new file mode 100644
index 0000000000..4c957a0906
--- /dev/null
+++ b/test_projects/codegen_test/generated/example_service_types.hrl
@@ -0,0 +1,27 @@
+%%%-------------------------------------------------------------------
+%%% @doc
+%%% Auto-generated header file for example_service
+%%% DO NOT EDIT - Generated by generate_erlang.sh
+%%% @end
+%%%-------------------------------------------------------------------
+
+
+-record(user_info, {
+
+    user_id = <<>> :: binary(),
+    username = <<>> :: binary(),
+    age = 0 :: integer(),
+    is_active = false :: boolean()
+}).
+
+-record(query_request, {
+
+    query_id = <<>> :: binary(),
+    filters = [] :: list()
+}).
+
+-record(query_response, {
+
+    results = [] :: list(),
+    count = 0 :: integer()
+}).
diff --git a/test_projects/codegen_test/templates/example_service_client.erl b/test_projects/codegen_test/templates/example_service_client.erl
new file mode 100644
index 0000000000..ab30a89f74
--- /dev/null
+++ b/test_projects/codegen_test/templates/example_service_client.erl
@@ -0,0 +1,38 @@
+%%%-------------------------------------------------------------------
+%%% @doc
+%%% Auto-generated client for example_service
+%%% DO NOT EDIT - Generated by generate_erlang.sh
+%%% @end
+%%%-------------------------------------------------------------------
+-module(example_service_client).
+
+-include("example_service_types.hrl").
+
+%% API exports
+-export([get_user/1]).
+-export([query_users/1]).
+-export([update_user/2]).
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+
+
+%% @doc Retrieves user information by user ID
+-spec get_user(term()) -> {ok, term()} | {error, term()}.
+get_user(_UserId) ->
+    %% Auto-generated client stub
+    {ok, generated_response}.
+
+%% @doc Queries users with given filters
+-spec query_users(term()) -> {ok, term()} | {error, term()}.
+query_users(_Request) ->
+    %% Auto-generated client stub
+    {ok, generated_response}.
+
+%% @doc Updates user information
+-spec update_user(term(), term()) -> {ok, term()} | {error, term()}.
+update_user(_UserId, _UserInfo) ->
+    %% Auto-generated client stub
+    {ok, generated_response}.
+
diff --git a/test_projects/codegen_test/templates/example_service_types.erl b/test_projects/codegen_test/templates/example_service_types.erl
new file mode 100644
index 0000000000..833df167c6
--- /dev/null
+++ b/test_projects/codegen_test/templates/example_service_types.erl
@@ -0,0 +1,56 @@
+%%%-------------------------------------------------------------------
+%%% @doc
+%%% Auto-generated type definitions for example_service
+%%% DO NOT EDIT - Generated by generate_erlang.sh
+%%% @end
+%%%-------------------------------------------------------------------
+-module(example_service_types).
+
+%% API exports
+-export([new_user_info/0]).
+-export([new_query_request/0]).
+-export([new_query_response/0]).
+-export([get_version/0]).
+
+%% Type exports
+-export_type([user_info/0]).
+-export_type([query_request/0]).
+-export_type([query_response/0]).
+
+%% Record definitions
+-record(user_info, {user_id = <<>>, username = <<>>, age = 0, is_active = false}).
+-record(query_request, {query_id = <<>>, filters = []}).
+-record(query_response, {results = [], count = 0}).
+
+%% Type definitions
+-type user_info() :: #user_info{}.
+-type query_request() :: #query_request{}.
+-type query_response() :: #query_response{}.
+
+%%%===================================================================
+%%% API
+%%%===================================================================
+
+%% @doc Returns the schema version
+-spec get_version() -> binary().
+get_version() ->
+    <<"1.0.0">>.
+
+
+%% @doc Creates a new user_info record
+-spec new_user_info() -> #user_info{}.
+new_user_info() ->
+    #user_info{}.
+
+
+%% @doc Creates a new query_request record
+-spec new_query_request() -> #query_request{}.
+new_query_request() ->
+    #query_request{}.
+
+
+%% @doc Creates a new query_response record
+-spec new_query_response() -> #query_response{}.
+new_query_response() ->
+    #query_response{}.
+
diff --git a/test_projects/codegen_test/templates/example_service_types.hrl b/test_projects/codegen_test/templates/example_service_types.hrl
new file mode 100644
index 0000000000..88a2e7aed2
--- /dev/null
+++ b/test_projects/codegen_test/templates/example_service_types.hrl
@@ -0,0 +1,28 @@
+%%%-------------------------------------------------------------------
+%%% @doc
+%%% Auto-generated header file for example_service
+%%% DO NOT EDIT - Generated by generate_erlang.sh
+%%% @end
+%%%-------------------------------------------------------------------
+
+
+-record(user_info, {
+
+    user_id = <<>> :: binary(),
+    username = <<>> :: binary(),
+    age = 0 :: integer(),
+    is_active = false :: boolean()
+}).
+
+-record(query_request, {
+
+    query_id = <<>> :: binary(),
+    filters = [] :: list()
+}).
+
+-record(query_response, {
+
+    results = [] :: list(),
+    count = 0 :: integer()
+}).
+

From ba4505e981affde892245bd946fce7fb1beba01e Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 16 Dec 2025 08:56:01 -0800
Subject: [PATCH 359/394] Do not run application_env linter on test suites

Reviewed By: alanz, TheGeorge, michalmuskala

Differential Revision: D89287769

fbshipit-source-id: 29618250ee6d75ede850603cb60c5e4d77e3ff06
---
 crates/ide/src/diagnostics/application_env.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/ide/src/diagnostics/application_env.rs b/crates/ide/src/diagnostics/application_env.rs
index 1e4fe7c4cf..be22f581f5 100644
--- a/crates/ide/src/diagnostics/application_env.rs
+++ b/crates/ide/src/diagnostics/application_env.rs
@@ -36,7 +36,7 @@ pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
     conditions: DiagnosticConditions {
         experimental: false,
         include_generated: true,
-        include_tests: true,
+        include_tests: false,
         default_disabled: false,
     },
     checker: &|diags, sema, file_id, _ext| {

From 271a52c37cd77c27c51641d61efbae006888ba61 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Tue, 16 Dec 2025 09:08:25 -0800
Subject: [PATCH 360/394] honour `--include-generated` for `elp ssr`

Summary: As title

Reviewed By: michalmuskala, TD5

Differential Revision: D89292307

fbshipit-source-id: cbde669d57276b2aaa2c7365906e3ed86f15aec5
---
 crates/elp/src/bin/main.rs                    | 30 +++++++++++++++++++
 crates/elp/src/bin/ssr_cli.rs                 |  3 ++
 .../diagnostics/ssr_exclude_generated.stdout  |  2 ++
 .../diagnostics/ssr_include_generated.stdout  |  5 ++++
 4 files changed, 40 insertions(+)
 create mode 100644 crates/elp/src/resources/test/diagnostics/ssr_exclude_generated.stdout
 create mode 100644 crates/elp/src/resources/test/diagnostics/ssr_include_generated.stdout

diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index e1d26e3e7e..c9b2db945a 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -2191,6 +2191,36 @@ mod tests {
         )
     }
 
+    #[test_case(false ; "rebar")]
+    #[test_case(true  ; "buck")]
+    fn ssr_exclude_generated_by_default(buck: bool) {
+        simple_snapshot(
+            args_vec!["ssr", "--module", "erlang_diagnostics_errors_gen", "ok"],
+            "diagnostics",
+            expect_file!("../resources/test/diagnostics/ssr_exclude_generated.stdout"),
+            buck,
+            None,
+        );
+    }
+
+    #[test_case(false ; "rebar")]
+    #[test_case(true  ; "buck")]
+    fn ssr_include_generated_when_requested(buck: bool) {
+        simple_snapshot(
+            args_vec![
+                "ssr",
+                "--module",
+                "erlang_diagnostics_errors_gen",
+                "--include-generated",
+                "ok"
+            ],
+            "diagnostics",
+            expect_file!("../resources/test/diagnostics/ssr_include_generated.stdout"),
+            buck,
+            None,
+        );
+    }
+
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
     // We cannot use `should_panic` for this test, since the OSS CI runs with the `buck` feature disabled.
diff --git a/crates/elp/src/bin/ssr_cli.rs b/crates/elp/src/bin/ssr_cli.rs
index f5729034b2..36f26d4554 100644
--- a/crates/elp/src/bin/ssr_cli.rs
+++ b/crates/elp/src/bin/ssr_cli.rs
@@ -401,6 +401,9 @@ fn do_parse_one(
     name: &str,
     args: &Ssr,
 ) -> Result<Option<(String, FileId, Vec<diagnostics::Diagnostic>)>> {
+    if !args.include_generated && db.is_generated(file_id)? {
+        return Ok(None);
+    }
     if !args.include_tests && db.is_test_suite_or_test_helper(file_id)?.unwrap_or(false) {
         return Ok(None);
     }
diff --git a/crates/elp/src/resources/test/diagnostics/ssr_exclude_generated.stdout b/crates/elp/src/resources/test/diagnostics/ssr_exclude_generated.stdout
new file mode 100644
index 0000000000..1cef26124c
--- /dev/null
+++ b/crates/elp/src/resources/test/diagnostics/ssr_exclude_generated.stdout
@@ -0,0 +1,2 @@
+module specified: erlang_diagnostics_errors_gen
+No matches found
diff --git a/crates/elp/src/resources/test/diagnostics/ssr_include_generated.stdout b/crates/elp/src/resources/test/diagnostics/ssr_include_generated.stdout
new file mode 100644
index 0000000000..2b88b6e10c
--- /dev/null
+++ b/crates/elp/src/resources/test/diagnostics/ssr_include_generated.stdout
@@ -0,0 +1,5 @@
+module specified: erlang_diagnostics_errors_gen
+  erlang_diagnostics_errors_gen: 1
+      6:5-6:7::[WeakWarning] [ad-hoc: ssr-match] SSR pattern matched: ssr: ok.
+
+Matches found in 1 modules

From 858b8e64ab85f60b39029d8113cefc5e29b5c9d1 Mon Sep 17 00:00:00 2001
From: Facebook Community Bot <facebook-github-bot@users.noreply.github.com>
Date: Tue, 16 Dec 2025 10:54:56 -0800
Subject: [PATCH 361/394] Re-sync with internal repository (#143)

The internal and external repositories are out of sync. This Pull Request attempts to brings them back in sync by patching the GitHub repository. Please carefully review this patch. You must disable ShipIt for your project in order to merge this pull request. DO NOT IMPORT this pull request. Instead, merge it directly on GitHub using the MERGE BUTTON. Re-enable ShipIt after merging.

fbshipit-source-id: a4e36831ac3939cb9a4881ca077b5f8c0d421104
---
 .cargo/config.toml                            |  4 ++--
 .vscode/tasks.json                            | 12 +++++-----
 crates/base_db/src/lib.rs                     |  4 ++--
 crates/elp/src/arc_types.rs                   |  4 ++--
 crates/elp/src/bin/glean.rs                   | 12 +++++-----
 crates/elp/src/bin/main.rs                    |  4 ++--
 crates/elp/src/config.rs                      |  4 ++--
 crates/elp/src/lib.rs                         |  4 ++--
 crates/elp/src/server/setup.rs                |  4 ++--
 crates/hir/src/lib.rs                         |  2 +-
 crates/hir/src/name.rs                        |  2 +-
 crates/hir/src/sema.rs                        |  2 +-
 crates/hir/src/sema/to_def.rs                 |  6 ++---
 crates/ide/src/annotations.rs                 |  8 +++----
 crates/ide/src/diagnostics.rs                 |  8 +++----
 crates/ide/src/diagnostics/application_env.rs |  4 ++--
 .../ide/src/diagnostics/atoms_exhaustion.rs   | 14 +++++------
 .../ide/src/diagnostics/debugging_function.rs |  4 ++--
 .../src/diagnostics/deprecated_function.rs    |  4 ++--
 .../src/diagnostics/unexported_function.rs    |  6 ++---
 .../ide/src/diagnostics/unspecific_include.rs |  4 ++--
 crates/ide/src/doc_links.rs                   |  8 +++----
 crates/ide/src/lib.rs                         |  2 +-
 crates/ide_completion/src/lib.rs              |  4 ++--
 crates/ide_db/src/diagnostic_code.rs          | 24 +++++++++----------
 crates/ide_db/src/lib.rs                      |  2 +-
 crates/project_model/src/buck.rs              |  2 +-
 erlang_service/src/elp_lint.erl               |  8 +++----
 28 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 7e4e7a0f90..eb89fa1e55 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,8 +1,8 @@
 [alias]
 xtask = "run --package xtask --"
 
-# @fb-only
-# @fb-only
+# @fb-only: [build]
+# @fb-only: target-dir = "../../../buck-out/elp"
 
 [profile.release]
 codegen-units = 1
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 51f0340659..7572a84e98 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -4,7 +4,7 @@
         {
             "label": "ELP: build (debug)",
             "type": "shell",
-            // @fb-only
+            // @fb-only: "command": "./meta/cargo.sh build",
             "command": "cargo build", // @oss-only
             "group": {
                 "kind": "build",
@@ -19,7 +19,7 @@
         {
             "label": "ELP: build (release)",
             "type": "shell",
-            // @fb-only
+            // @fb-only: "command": "./meta/cargo.sh build --release",
             "command": "cargo build --release", // @oss-only
             "group": {
                 "kind": "build",
@@ -34,7 +34,7 @@
         {
             "label": "ELP: build (release-thin)",
             "type": "shell",
-            // @fb-only
+            // @fb-only: "command": "./meta/cargo.sh build --profile release-thin --bins",
             "command": "cargo build --profile release-thin --bins", // @oss-only
             "group": {
                 "kind": "build",
@@ -49,7 +49,7 @@
         {
             "label": "ELP: run clippy on workspace",
             "type": "shell",
-            // @fb-only
+            // @fb-only: "command": "./meta/clippy.sh --workspace --tests",
             "command": "cargo clippy --workspace --tests", // @oss-only
             "group": {
                 "kind": "build",
@@ -64,7 +64,7 @@
         {
             "label": "ELP: run clippy on workspace, apply fixes",
             "type": "shell",
-            // @fb-only
+            // @fb-only: "command": "./meta/clippy.sh --workspace --tests --fix",
             "command": "cargo clippy --workspace --tests --fix", // @oss-only
             "group": {
                 "kind": "build",
@@ -79,7 +79,7 @@
         {
             "label": "ELP: run tests on workspace",
             "type": "shell",
-            // @fb-only
+            // @fb-only: "command": "./meta/cargo.sh test --workspace",
             "command": "cargo test --workspace", // @oss-only
             "group": {
                 "kind": "build",
diff --git a/crates/base_db/src/lib.rs b/crates/base_db/src/lib.rs
index 6b3757ff43..0cd8df74c9 100644
--- a/crates/base_db/src/lib.rs
+++ b/crates/base_db/src/lib.rs
@@ -32,7 +32,7 @@ mod module_index;
 // Public API
 
 pub mod fixture;
-// @fb-only
+// @fb-only: mod meta_only;
 pub mod test_utils;
 pub use change::Change;
 pub use elp_project_model::AppType;
@@ -476,7 +476,7 @@ static ref IGNORED_SOURCES: Vec<Regex> = {
     let regexes: Vec<Vec<Regex>> = vec![
         vec![Regex::new(r"^.*_SUITE_data/.+$").unwrap()],
         //ignore sources goes here
-        // @fb-only
+        // @fb-only: meta_only::ignored_sources_regexes()
     ];
     regexes.into_iter().flatten().collect::<Vec<Regex>>()
    };
diff --git a/crates/elp/src/arc_types.rs b/crates/elp/src/arc_types.rs
index c113311661..374dcdba2f 100644
--- a/crates/elp/src/arc_types.rs
+++ b/crates/elp/src/arc_types.rs
@@ -8,8 +8,8 @@
  * above-listed licenses.
  */
 
-// @fb-only
-// @fb-only
+// @fb-only: /// Types as defined in https://www.internalfb.com/intern/wiki/Linting/adding-linters/#flow-type
+// @fb-only: /// and https://www.internalfb.com/code/fbsource/[1238f73dac0efd4009443fee6a345a680dc9401b]/whatsapp/server/erl/tools/lint/arcanist.py?lines=17
 use std::path::Path;
 
 use serde::Serialize;
diff --git a/crates/elp/src/bin/glean.rs b/crates/elp/src/bin/glean.rs
index bfd4757106..cb420261d2 100644
--- a/crates/elp/src/bin/glean.rs
+++ b/crates/elp/src/bin/glean.rs
@@ -84,7 +84,7 @@ const REC_ARITY: u32 = 99;
 const HEADER_ARITY: u32 = 100;
 const FACTS_FILE: &str = "facts.json";
 
-// @fb-only
+// @fb-only: mod meta_only;
 
 #[derive(Serialize, Debug, Eq, Hash, PartialEq, Clone)]
 struct GleanFileId(u32);
@@ -994,7 +994,7 @@ impl GleanIndexer {
                 .filter(|text| !text.is_empty())
         });
 
-        // @fb-only
+        // @fb-only: let exdoc_link = elp_ide::meta_only::exdoc_links::module_exdoc_link(&module, &sema);
         let exdoc_link: Option<String> = None; // @oss-only
 
         ModuleFact::new(
@@ -1532,7 +1532,7 @@ impl GleanIndexer {
             }) => {
                 let def = macro_def.as_ref()?;
                 let mut resolved = Self::resolve_macro_v2(sema, def, source_file, ctx)?;
-                // @fb-only
+                // @fb-only: meta_only::resolve_macro_expansion(sema, *expansion, ctx, &mut resolved);
                 Some(resolved)
             }
             hir::AnyExpr::Pat(Pat::MacroCall { macro_def, .. })
@@ -1875,9 +1875,9 @@ impl GleanIndexer {
         let source_file = sema.parse(file_id);
         let range = Self::find_range(sema, ctx, &source_file, &expr_source)?;
 
-        // @fb-only
-        // @fb-only
-        // @fb-only
+        // @fb-only: use elp_ide::meta_only::wam_links;
+        // @fb-only: let wam_ctx = wam_links::WamEventCtx::new(sema.db.upcast());
+        // @fb-only: let wam_url = wam_ctx.build_wam_link(name).map(|link| link.url());
         let wam_url = None; // @oss-only
 
         Some(XRef {
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index c9b2db945a..ac2fc901fa 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -40,7 +40,7 @@ mod erlang_service_cli;
 mod explain_cli;
 mod glean;
 mod lint_cli;
-// @fb-only
+// @fb-only: mod meta_only;
 mod reporting;
 mod shell;
 mod ssr_cli;
@@ -110,7 +110,7 @@ fn setup_cli_telemetry(args: &Args) {
         }
         _ => {
             // Initialize CLI telemetry, if used
-            // @fb-only
+            // @fb-only: meta_only::initialize_telemetry();
         }
     }
 }
diff --git a/crates/elp/src/config.rs b/crates/elp/src/config.rs
index 2637eae5a2..681a022261 100644
--- a/crates/elp/src/config.rs
+++ b/crates/elp/src/config.rs
@@ -30,7 +30,7 @@ use serde::de::DeserializeOwned;
 use serde_json::json;
 
 use crate::from_json;
-// @fb-only
+// @fb-only: use crate::meta_only;
 
 // Defines the server-side configuration of ELP. We generate *parts*
 // of VS Code's `package.json` config from this.
@@ -180,7 +180,7 @@ impl Config {
             return;
         }
         self.data = ConfigData::from_json(json);
-        // @fb-only
+        // @fb-only: meta_only::harmonise_gks(self);
     }
 
     pub fn update_gks(&mut self, json: serde_json::Value) {
diff --git a/crates/elp/src/lib.rs b/crates/elp/src/lib.rs
index 0e9a2e28e6..f462141e39 100644
--- a/crates/elp/src/lib.rs
+++ b/crates/elp/src/lib.rs
@@ -37,7 +37,7 @@ pub mod line_endings;
 pub mod lsp_ext;
 mod mem_docs;
 pub mod memory_usage;
-// @fb-only
+// @fb-only: mod meta_only;
 mod op_queue;
 mod project_loader;
 pub mod reload;
@@ -108,7 +108,7 @@ pub fn otp_file_to_ignore(db: &Analysis, file_id: FileId) -> bool {
                  "redbug_dtop",
                  ]
                 .iter()
-                // @fb-only
+                // @fb-only: .chain(meta_only::FILES_TO_IGNORE.iter())
                 .map(SmolStr::new)
                 .collect();
     }
diff --git a/crates/elp/src/server/setup.rs b/crates/elp/src/server/setup.rs
index 8dba975e73..4b8615e07c 100644
--- a/crates/elp/src/server/setup.rs
+++ b/crates/elp/src/server/setup.rs
@@ -33,7 +33,7 @@ use super::FILE_WATCH_LOGGER_NAME;
 use super::logger::LspLogger;
 use crate::config::Config;
 use crate::from_json;
-// @fb-only
+// @fb-only: use crate::meta_only::get_log_dir;
 use crate::server::Handle;
 use crate::server::LOGGER_NAME;
 use crate::server::Server;
@@ -126,7 +126,7 @@ impl ServerSetup {
 
         // Set up a logger for tracking down why we are seeing stale
         // results when branches are switched, as per T218973130
-        // @fb-only
+        // @fb-only: let log_dir = get_log_dir();
         let log_dir = format!("{}/elp", std::env::temp_dir().display()); // @oss-only
         let _ = fs::create_dir_all(&log_dir);
         let log_file = format!(
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 1ec75fd25e..35585ef702 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -155,7 +155,7 @@ pub use name::MacroName;
 pub use name::Name;
 pub use name::NameArity;
 pub use name::known;
-// @fb-only
+// @fb-only: pub use name::meta_only;
 pub use sema::AtomDef;
 pub use sema::CallDef;
 pub use sema::DefinitionOrReference;
diff --git a/crates/hir/src/name.rs b/crates/hir/src/name.rs
index 00ce2f89f1..f94f139d38 100644
--- a/crates/hir/src/name.rs
+++ b/crates/hir/src/name.rs
@@ -10,7 +10,7 @@
 
 //! See [`Name`].
 
-// @fb-only
+// @fb-only: pub mod meta_only;
 
 use std::borrow::Cow;
 use std::collections::HashSet;
diff --git a/crates/hir/src/sema.rs b/crates/hir/src/sema.rs
index 78a7db7c3c..7d1b416a63 100644
--- a/crates/hir/src/sema.rs
+++ b/crates/hir/src/sema.rs
@@ -102,7 +102,7 @@ use crate::resolver::Resolution;
 use crate::resolver::Resolver;
 
 mod find;
-// @fb-only
+// @fb-only: pub mod meta_only;
 pub mod to_def;
 
 pub struct ModuleIter(Arc<ModuleIndex>);
diff --git a/crates/hir/src/sema/to_def.rs b/crates/hir/src/sema/to_def.rs
index 5918054fc5..0c8eba227e 100644
--- a/crates/hir/src/sema/to_def.rs
+++ b/crates/hir/src/sema/to_def.rs
@@ -42,7 +42,7 @@ use crate::macro_exp;
 use crate::macro_exp::BuiltInMacro;
 use crate::macro_exp::MacroExpCtx;
 use crate::resolver::Resolver;
-// @fb-only
+// @fb-only: use crate::sema::meta_only;
 
 pub trait ToDef: Clone {
     type Def;
@@ -567,7 +567,7 @@ pub fn resolve_call_target(
             let fn_name: Name = sema.db.lookup_atom(body[*name].as_atom()?);
             let mo =
                 None; // @oss-only
-                // @fb-only
+                // @fb-only: meta_only::resolve_handle_call_target(sema, arity, file_id, &module_name, &fn_name);
             if let Some(r) = mo {
                 r
             } else {
@@ -890,7 +890,7 @@ lazy_static! {
     static ref DYNAMIC_CALL_PATTERNS: FxHashMap<PatternKey, DynamicCallPattern> = {
         let mut patterns = FxHashMap::default();
         add_dynamic_call_patterns(&mut patterns);
-        // @fb-only
+        // @fb-only: meta_only::add_dynamic_call_patterns(&mut patterns);
         patterns
     };
 }
diff --git a/crates/ide/src/annotations.rs b/crates/ide/src/annotations.rs
index 6cbdd3469c..d0ae18c158 100644
--- a/crates/ide/src/annotations.rs
+++ b/crates/ide/src/annotations.rs
@@ -17,7 +17,7 @@ use elp_syntax::TextRange;
 use fxhash::FxHashMap;
 use fxhash::FxHashSet;
 
-// @fb-only
+// @fb-only: use crate::meta_only;
 use crate::runnables::Runnable;
 use crate::runnables::runnables;
 
@@ -57,11 +57,11 @@ pub struct Link {
 }
 
 #[rustfmt::skip]
-// @fb-only
+// @fb-only: pub(crate) fn annotations(db: &RootDatabase, file_id: FileId) -> Vec<Annotation> {
 pub(crate) fn annotations(_db: &RootDatabase, _file_id: FileId) -> Vec<Annotation> { // @oss-only
-    // @fb-only
+    // @fb-only: let mut annotations = Vec::default();
     let annotations = Vec::default(); // @oss-only
-    // @fb-only
+    // @fb-only: meta_only::annotations(db, file_id, &mut annotations);
     annotations
 }
 
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 9852303132..093ba35986 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -117,7 +117,7 @@ mod macro_precedence_suprise;
 mod map_find_to_syntax;
 mod map_insertion_to_syntax;
 mod meck;
-// @fb-only
+// @fb-only: mod meta_only;
 mod missing_compile_warn_missing_spec;
 mod missing_module;
 mod missing_separator;
@@ -1525,7 +1525,7 @@ pub fn native_diagnostics(
         config
             .lints_from_config
             .get_diagnostics(&mut res, &sema, file_id);
-        // @fb-only
+        // @fb-only: meta_only::diagnostics(&mut res, &sema, file_id, file_kind, config);
         syntax_diagnostics(&sema, &parse, &mut res, file_id);
         diagnostics_from_descriptors(
             &mut res,
@@ -1715,7 +1715,7 @@ pub(crate) fn linters() -> Vec<DiagnosticLinter> {
     );
 
     // Add meta-only linters
-    // @fb-only
+    // @fb-only: all_linters.extend(meta_only::linters());
 
     all_linters
 }
@@ -2593,7 +2593,7 @@ pub fn ct_diagnostics(
         CommonTestInfo::Result { all, groups } => {
             let testcases = common_test::runnable_names(&sema, file_id, all, groups).ok();
             common_test::unreachable_test(&mut res, &sema, file_id, &testcases);
-            // @fb-only
+            // @fb-only: meta_only::ct_diagnostics(&mut res, &sema, file_id, testcases);
         }
         CommonTestInfo::EvalError(_error) => {
             // The error currently does not contain anything useful, so we ignore it
diff --git a/crates/ide/src/diagnostics/application_env.rs b/crates/ide/src/diagnostics/application_env.rs
index be22f581f5..615b7801f9 100644
--- a/crates/ide/src/diagnostics/application_env.rs
+++ b/crates/ide/src/diagnostics/application_env.rs
@@ -28,7 +28,7 @@ use crate::codemod_helpers::CheckCallCtx;
 use crate::codemod_helpers::FunctionMatch;
 use crate::codemod_helpers::MatchCtx;
 use crate::codemod_helpers::find_call_in_function;
-// @fb-only
+// @fb-only: use crate::diagnostics;
 use crate::diagnostics::DiagnosticCode;
 use crate::diagnostics::Severity;
 
@@ -108,7 +108,7 @@ fn check_function(diags: &mut Vec<Diagnostic>, sema: &Semantic, def: &FunctionDe
                 vec![2, 3],
                 BadEnvCallAction::AppArg(0),
             ),
-            // @fb-only
+            // @fb-only: diagnostics::meta_only::application_env_bad_matches(),
         ]
         .into_iter()
         .flatten()
diff --git a/crates/ide/src/diagnostics/atoms_exhaustion.rs b/crates/ide/src/diagnostics/atoms_exhaustion.rs
index 4708e35b1f..56a43a50ca 100644
--- a/crates/ide/src/diagnostics/atoms_exhaustion.rs
+++ b/crates/ide/src/diagnostics/atoms_exhaustion.rs
@@ -13,7 +13,7 @@ use hir::Semantic;
 
 use crate::FunctionMatch;
 use crate::codemod_helpers::CheckCallCtx;
-// @fb-only
+// @fb-only: use crate::diagnostics;
 use crate::diagnostics::DiagnosticCode;
 use crate::diagnostics::FunctionCallLinter;
 use crate::diagnostics::Linter;
@@ -35,9 +35,9 @@ impl Linter for AtomsExhaustionLinter {
         false
     }
     #[rustfmt::skip]
-    // @fb-only
+    // @fb-only: fn should_process_file_id(&self, sema: &Semantic, file_id: FileId) -> bool {
     fn should_process_file_id(&self, _sema: &Semantic, _file_id: FileId) -> bool { // @oss-only
-        // @fb-only
+        // @fb-only: diagnostics::meta_only::is_relevant_file(sema.db.upcast(), file_id)
         true // @oss-only
     }
 }
@@ -56,16 +56,16 @@ impl FunctionCallLinter for AtomsExhaustionLinter {
                 // FunctionMatch::mfa("erlang", "binary_to_term", 2),
             ]
             .into_iter()
-            // @fb-only
+            // @fb-only: .chain(diagnostics::meta_only::atoms_exhaustion_matches().into_iter())
             .collect::<Vec<_>>()
         ]
     }
 
     fn check_match(&self, context: &CheckCallCtx<'_, ()>) -> Option<Self::Context> {
         #[rustfmt::skip]
-        // @fb-only
-        // @fb-only
-            // @fb-only
+        // @fb-only: let sema = context.in_clause.sema;
+        // @fb-only: let is_safe =
+            // @fb-only: diagnostics::meta_only::atoms_exhaustion_is_safe(sema, context.in_clause, context.parents);
         let is_safe = false; // @oss-only
         if !is_safe {
             match context.args.as_slice() {
diff --git a/crates/ide/src/diagnostics/debugging_function.rs b/crates/ide/src/diagnostics/debugging_function.rs
index 94c3d11364..1f0099781d 100644
--- a/crates/ide/src/diagnostics/debugging_function.rs
+++ b/crates/ide/src/diagnostics/debugging_function.rs
@@ -22,7 +22,7 @@ use crate::diagnostics::DiagnosticCode;
 use crate::diagnostics::FunctionCallLinter;
 use crate::diagnostics::Linter;
 use crate::diagnostics::Severity;
-// @fb-only
+// @fb-only: use crate::diagnostics::meta_only;
 use crate::lazy_function_matches;
 
 pub(crate) struct NoDebuggingFunctionLinter;
@@ -52,7 +52,7 @@ impl FunctionCallLinter for NoDebuggingFunctionLinter {
         lazy_function_matches![
             vec![FunctionMatch::m("redbug")]
                 .into_iter()
-                // @fb-only
+                // @fb-only: .chain(meta_only::debugging_function_matches().into_iter())
                 .collect::<Vec<_>>()
         ]
     }
diff --git a/crates/ide/src/diagnostics/deprecated_function.rs b/crates/ide/src/diagnostics/deprecated_function.rs
index 540edfcca3..469c327eb7 100644
--- a/crates/ide/src/diagnostics/deprecated_function.rs
+++ b/crates/ide/src/diagnostics/deprecated_function.rs
@@ -41,7 +41,7 @@ use super::DiagnosticDescriptor;
 use super::Severity;
 use crate::codemod_helpers::FunctionMatch;
 use crate::codemod_helpers::FunctionMatcher;
-// @fb-only
+// @fb-only: use crate::diagnostics;
 use crate::fix;
 
 pub(crate) static DESCRIPTOR: DiagnosticDescriptor = DiagnosticDescriptor {
@@ -88,7 +88,7 @@ fn deprecated_function(diagnostics: &mut Vec<Diagnostic>, sema: &Semantic, file_
     lazy_static! {
         static ref DEPRECATED_FUNCTIONS: Vec<(FunctionMatch, DeprecationDetails)> = {
             let matches: Vec<Vec<(FunctionMatch, DeprecationDetails)>>  = vec![
-                // @fb-only
+                // @fb-only: diagnostics::meta_only::deprecated_function_matches(),
             ];
             matches.into_iter()
         .flatten()
diff --git a/crates/ide/src/diagnostics/unexported_function.rs b/crates/ide/src/diagnostics/unexported_function.rs
index 7aae73a9f1..2e1ebf7f54 100644
--- a/crates/ide/src/diagnostics/unexported_function.rs
+++ b/crates/ide/src/diagnostics/unexported_function.rs
@@ -27,7 +27,7 @@ use crate::codemod_helpers::CheckCallCtx;
 use crate::codemod_helpers::MatchCtx;
 use crate::diagnostics::FunctionCallLinter;
 use crate::diagnostics::Linter;
-// @fb-only
+// @fb-only: use crate::diagnostics::meta_only;
 use crate::fix;
 use crate::lazy_function_matches;
 
@@ -45,9 +45,9 @@ impl Linter for UnexportedFunctionLinter {
     }
     #[rustfmt::skip]
     fn should_process_file_id(&self, _sema: &Semantic, _file_id: FileId) -> bool { // @oss-only
-    // @fb-only
+    // @fb-only: fn should_process_file_id(&self, sema: &Semantic, file_id: FileId) -> bool {
         true // @oss-only
-        // @fb-only
+        // @fb-only: meta_only::should_check_for_unexported(sema, file_id)
     }
 }
 
diff --git a/crates/ide/src/diagnostics/unspecific_include.rs b/crates/ide/src/diagnostics/unspecific_include.rs
index f7405c798a..431740c085 100644
--- a/crates/ide/src/diagnostics/unspecific_include.rs
+++ b/crates/ide/src/diagnostics/unspecific_include.rs
@@ -152,7 +152,7 @@ fn replace_include_path(
 #[cfg(test)]
 mod tests {
     use elp_ide_db::DiagnosticCode;
-    // @fb-only
+    // @fb-only: use elp_ide_db::meta_only::MetaOnlyDiagnosticCode;
     use expect_test::Expect;
     use expect_test::expect;
 
@@ -173,7 +173,7 @@ mod tests {
     #[track_caller]
     fn check_fix(fixture_before: &str, fixture_after: Expect) {
         let config = DiagnosticsConfig::default()
-            // @fb-only
+            // @fb-only: .disable(DiagnosticCode::MetaOnly(MetaOnlyDiagnosticCode::MalformedInclude))
             .disable(DiagnosticCode::UnusedInclude);
         tests::check_fix_with_config(config, fixture_before, fixture_after)
     }
diff --git a/crates/ide/src/doc_links.rs b/crates/ide/src/doc_links.rs
index d13befe8bb..6a85ab3dc3 100644
--- a/crates/ide/src/doc_links.rs
+++ b/crates/ide/src/doc_links.rs
@@ -15,9 +15,9 @@ use elp_syntax::AstNode;
 use hir::InFile;
 use hir::Semantic;
 
-// @fb-only
+// @fb-only: use crate::meta_only::exdoc_links;
 
-// @fb-only
+// @fb-only: mod meta_only;
 mod otp_links;
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -40,10 +40,10 @@ pub(crate) fn external_docs(db: &RootDatabase, position: &FilePosition) -> Optio
     if let Some(class) = SymbolClass::classify(&sema, in_file_token.clone()) {
         class.iter().for_each(|def| {
             otp_links::links(&mut doc_links, &sema, &def);
-            // @fb-only
+            // @fb-only: exdoc_links::links(&mut doc_links, &sema, &def);
         });
     }
-    // @fb-only
+    // @fb-only: meta_only::links(&mut doc_links, node, position);
     Some(doc_links)
 }
 
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index 009edd4684..ad5c1bb680 100644
--- a/crates/ide/src/lib.rs
+++ b/crates/ide/src/lib.rs
@@ -110,7 +110,7 @@ pub mod diagnostics;
 pub mod diagnostics_collection;
 pub mod diff;
 mod highlight_related;
-// @fb-only
+// @fb-only: pub mod meta_only;
 
 pub use annotations::Annotation;
 pub use annotations::AnnotationKind;
diff --git a/crates/ide_completion/src/lib.rs b/crates/ide_completion/src/lib.rs
index 71b4ff02c0..f41aecdd67 100644
--- a/crates/ide_completion/src/lib.rs
+++ b/crates/ide_completion/src/lib.rs
@@ -40,7 +40,7 @@ mod helpers;
 mod keywords;
 mod macros;
 mod maps;
-// @fb-only
+// @fb-only: mod meta_only;
 mod modules;
 mod records;
 mod spec;
@@ -176,7 +176,7 @@ pub fn completions(
         }
         CtxKind::Other => {
             let _ = attributes::add_completions(&mut acc, ctx)
-                // @fb-only
+                // @fb-only: || meta_only::add_completions(&mut acc, ctx)
                 || vars::add_completions(&mut acc, ctx)
                 || maps::add_completions(&mut acc, ctx)
                 || records::add_completions(&mut acc, ctx);
diff --git a/crates/ide_db/src/diagnostic_code.rs b/crates/ide_db/src/diagnostic_code.rs
index 957caecb09..e9d21cadca 100644
--- a/crates/ide_db/src/diagnostic_code.rs
+++ b/crates/ide_db/src/diagnostic_code.rs
@@ -20,9 +20,9 @@ use serde::de;
 use strum::IntoEnumIterator;
 use strum_macros::EnumIter;
 
-// @fb-only
+// @fb-only: use crate::meta_only::MetaOnlyDiagnosticCode;
 
-// @fb-only
+// @fb-only: pub const BASE_URL: &str = crate::meta_only::BASE_URL;
 pub const BASE_URL: &str = "https://whatsapp.github.io/erlang-language-platform/docs"; // @oss-only
 
 #[derive(Clone, Debug, PartialEq, Eq, Hash, EnumIter)]
@@ -100,7 +100,7 @@ pub enum DiagnosticCode {
     Eqwalizer(String),
     // Used for ad-hoc diagnostics via lints/codemods
     AdHoc(String),
-    // @fb-only
+    // @fb-only: MetaOnly(MetaOnlyDiagnosticCode),
 }
 
 // These namespaces map the error codes returned by the Erlang Service.
@@ -116,7 +116,7 @@ pub enum Namespace {
     Parser,
     EDoc,
     WhatsApp,
-    // @fb-only
+    // @fb-only: MetaOnly,
 }
 
 impl fmt::Display for Namespace {
@@ -131,7 +131,7 @@ impl fmt::Display for Namespace {
             Namespace::Parser => "p",
             Namespace::EDoc => "o",
             Namespace::WhatsApp => "w",
-            // @fb-only
+            // @fb-only: Namespace::MetaOnly => "meta_only",
         };
         write!(f, "{namespace}")
     }
@@ -164,7 +164,7 @@ impl Namespace {
     pub fn supports_doc_path(&self) -> bool {
         match self {
             Namespace::WhatsApp => true,
-            // @fb-only
+            // @fb-only: Namespace::MetaOnly => true,
             _ => false,
         }
     }
@@ -259,7 +259,7 @@ impl DiagnosticCode {
             DiagnosticCode::ErlangService(c) => c.to_string(),
             DiagnosticCode::Eqwalizer(c) => format!("eqwalizer: {c}"),
             DiagnosticCode::AdHoc(c) => format!("ad-hoc: {c}"),
-            // @fb-only
+            // @fb-only: DiagnosticCode::MetaOnly(c) => c.as_code(),
         }
     }
 
@@ -360,7 +360,7 @@ impl DiagnosticCode {
             DiagnosticCode::ErlangService(c) => c.to_string(),
             DiagnosticCode::Eqwalizer(c) => c.to_string(),
             DiagnosticCode::AdHoc(c) => format!("ad-hoc: {c}"),
-            // @fb-only
+            // @fb-only: DiagnosticCode::MetaOnly(c) => c.as_label(),
         }
     }
 
@@ -371,7 +371,7 @@ impl DiagnosticCode {
     pub fn maybe_from_string(s: &str) -> Option<DiagnosticCode> {
         DIAGNOSTIC_CODE_LOOKUPS
             .get(s).cloned()
-            // @fb-only
+            // @fb-only: .or_else(|| MetaOnlyDiagnosticCode::from_str(s).ok().map(DiagnosticCode::MetaOnly))
             .or_else( ||
                 // Look for ErlangService and AdHoc
                 if let Some(code) = Self::is_adhoc(s) {
@@ -388,7 +388,7 @@ impl DiagnosticCode {
         match self {
             DiagnosticCode::DefaultCodeForEnumIter => None,
             DiagnosticCode::AdHoc(_) => None,
-            // @fb-only
+            // @fb-only: DiagnosticCode::MetaOnly(_) => Some(Namespace::MetaOnly),
             DiagnosticCode::ErlangService(code) => Namespace::from_str(code).ok(),
             _ => Namespace::from_str(&self.as_code()).ok(),
         }
@@ -397,7 +397,7 @@ impl DiagnosticCode {
     pub fn supports_doc_path(&self) -> bool {
         match self {
             DiagnosticCode::DefaultCodeForEnumIter => false,
-            // @fb-only
+            // @fb-only: DiagnosticCode::MetaOnly(MetaOnlyDiagnosticCode::DefaultCodeForEnumIter) => false,
             _ => true,
         }
     }
@@ -541,7 +541,7 @@ impl DiagnosticCode {
             DiagnosticCode::ErlangService(_) => false,
             DiagnosticCode::Eqwalizer(_) => false,
             DiagnosticCode::AdHoc(_) => false,
-            // @fb-only
+            // @fb-only: DiagnosticCode::MetaOnly(code) => code.allows_fixme_comment(),
         }
     }
 
diff --git a/crates/ide_db/src/lib.rs b/crates/ide_db/src/lib.rs
index 30a67cfa24..aecfd86473 100644
--- a/crates/ide_db/src/lib.rs
+++ b/crates/ide_db/src/lib.rs
@@ -57,7 +57,7 @@ pub mod docs;
 pub mod eqwalizer;
 mod erl_ast;
 mod line_index;
-// @fb-only
+// @fb-only: pub mod meta_only;
 pub mod metadata;
 mod search;
 pub mod text_edit;
diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 013f3cbc87..3658a6d783 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -1623,7 +1623,7 @@ mod tests {
     }
 
     // TODO: enable when buck is properly set up on github project
-    // @fb-only
+    // @fb-only: const BUCK_TESTS_ENABLED: bool = true;
     const BUCK_TESTS_ENABLED: bool = false; // @oss-only
 
     #[track_caller]
diff --git a/erlang_service/src/elp_lint.erl b/erlang_service/src/elp_lint.erl
index 609e8c0712..31d2c70248 100644
--- a/erlang_service/src/elp_lint.erl
+++ b/erlang_service/src/elp_lint.erl
@@ -4372,14 +4372,14 @@ is_format_function(io, fwrite) -> true;
 is_format_function(io, format) -> true;
 is_format_function(io_lib, fwrite) -> true;
 is_format_function(io_lib, format) -> true;
-% @fb-only
-% @fb-only
+% @fb-only: is_format_function(wa_log, send_if) -> true;
+% @fb-only: is_format_function(wa_string, format) -> true;
 is_format_function(M, F) when is_atom(M), is_atom(F) -> false.
 
 %% check_format_1([Arg]) -> ok | {warn,Level,Format,[Arg]}.
 
-% @fb-only
-% @fb-only
+% @fb-only[end= ]: format_args(wa_log, send_if, [_Level, _Meta, _Opts, Format, Args]) -> [Format, Args];
+% @fb-only[end= ]: format_args(wa_string, format, [Format, Args, _Options]) -> [Format, Args];
 format_args(_M, _F, As) ->
     As.
 

From b2ea905e7f748f4f1f5ca154d242ffccaadcf82a Mon Sep 17 00:00:00 2001
From: Open Source Bot <generatedunixname499836121@fb.com>
Date: Tue, 16 Dec 2025 11:27:09 -0800
Subject: [PATCH 362/394] Updating hashes

Summary:
GitHub commits:

https://github.com/facebook/buck2-prelude/commit/020284a6e874592d03667b4320932b3b772ef578
https://github.com/facebook/facebook-for-woocommerce/commit/261ff05851ee8ec2322780a957569d67af460c5c
https://github.com/facebook/fb303/commit/acdd3baf0a4f2a5e4a192d238724a84e72ed4e02
https://github.com/facebook/fbthrift/commit/b435fe91fa611b9d111755bcbef00a989c4cfcf6
https://github.com/facebook/folly/commit/a75b46bbbc8c8660a9dc416661a5531a96a85772
https://github.com/facebook/mvfst/commit/427330df232ec9c2e791334a599acef3ef915f3c
https://github.com/facebook/proxygen/commit/fd2a5c46a7704e515215fa4ffdd3ab9593f3cc4b
https://github.com/facebook/wangle/commit/e95090adb4e12129b6a87f596070dfa10390695e
https://github.com/facebookexperimental/edencommon/commit/c28a0922492b3f79997dff67de4f2df371f25bdb
https://github.com/facebookexperimental/rust-shed/commit/fab1e58dfd3eb1e09411173b4e3f61e21d85733a
https://github.com/facebookincubator/Facebook-Pixel-for-Wordpress/commit/848ddcedb294e05292c321d8393a5d39ef698ea8
https://github.com/facebookincubator/fizz/commit/270d39b2c34abd4916092e0ef1cec4d520f63a28
https://github.com/facebookincubator/llm_orchestrator/commit/65b11fc09069dbdaa9cd77eafc1ac4e4dd44ea1c
https://github.com/whatsapp/eqwalizer/commit/0f514eb3893fa7070835c83ecb49fbea31b0426d

Reviewed By: pranavcivi

fbshipit-source-id: 0c3453ad24a874db08fbc66cc4945f70c64d25d0
---
 eqwalizer | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eqwalizer b/eqwalizer
index a835ce03b0..0f514eb389 160000
--- a/eqwalizer
+++ b/eqwalizer
@@ -1 +1 @@
-Subproject commit a835ce03b0308a9869af964e35a24466b49cda51
+Subproject commit 0f514eb3893fa7070835c83ecb49fbea31b0426d

From d4e14636b4570e9e06f91e29873ba6dcef18bd2a Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 16 Dec 2025 15:30:53 -0800
Subject: [PATCH 363/394] Do not run selected linters on tests by default

Differential Revision: D89302965

fbshipit-source-id: 9b5c1d3c6402a6fea9f3fd5a6d93c2e49acba51e
---
 crates/ide/src/diagnostics/no_error_logger.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crates/ide/src/diagnostics/no_error_logger.rs b/crates/ide/src/diagnostics/no_error_logger.rs
index d587d3f3c7..46f3d15e3e 100644
--- a/crates/ide/src/diagnostics/no_error_logger.rs
+++ b/crates/ide/src/diagnostics/no_error_logger.rs
@@ -29,6 +29,9 @@ impl Linter for NoErrorLoggerLinter {
     fn severity(&self, _sema: &Semantic, _file_id: FileId) -> Severity {
         Severity::Error
     }
+    fn should_process_test_files(&self) -> bool {
+        false
+    }
 }
 
 impl FunctionCallLinter for NoErrorLoggerLinter {

From 37b7c5e28e4be59eefa04ec51e81359e3dcbf9b2 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Wed, 17 Dec 2025 01:18:32 -0800
Subject: [PATCH 364/394] Introduce top-level test directory

Reviewed By: michalmuskala

Differential Revision: D89272460

fbshipit-source-id: 91eb93d7df55a1ca64fe2b05e21097daca3b6d33
---
 crates/elp/src/bin/main.rs                    | 32 +++++++++----------
 .../test/xref/unavailable_type.stdout         |  4 +--
 crates/elp/tests/slow-tests/buck_tests.rs     |  4 +--
 crates/elp/tests/slow-tests/main.rs           | 16 +++++-----
 crates/ide/src/diagnostics.rs                 |  2 +-
 crates/project_model/src/buck.rs              | 22 ++++++-------
 .../test_projects}/.gitignore                 |  0
 .../test_projects}/README.md                  |  0
 test/test_projects/buck_bad_config/.elp.toml  |  8 +++++
 .../buck_bad_config/src/bad_app.erl           |  0
 test/test_projects/buck_tests/.elp.toml       |  9 ++++++
 .../test_projects}/buck_tests/TARGETS.v2_     |  0
 .../buck_tests/test_elp/TARGETS.v2_           | 10 +++---
 .../buck_tests/test_elp/include/test_elp.hrl  |  0
 .../buck_tests/test_elp/src/test_elp.app.src  |  0
 .../buck_tests/test_elp/src/test_elp.erl      |  0
 .../test_elp/test/test_elp_SUITE.erl          |  0
 .../handle_update_test1.json                  |  0
 .../handle_update_test2.json                  |  0
 .../test_elp_SUITE_data/untracked_header.hrl  |  0
 .../test_elp_SUITE_data/untracked_module.erl  |  0
 .../test_elp/test/test_elp_test_utils.erl     |  0
 .../test_elp/test/test_elp_test_utils.hrl     |  0
 .../test_elp_direct_dep/TARGETS.v2_           |  4 +--
 .../include/test_elp_direct_dep.hrl           |  0
 .../src/test_elp_direct_dep.erl               |  0
 .../src/test_elp_direct_dep_private.hrl       |  0
 .../test_elp_flat_inside_target/TARGETS.v2_   |  0
 .../test_elp_flat_inside_target.erl           |  0
 .../test_elp_flat_inside_target.hrl           |  0
 .../test_elp_flat_outside_target.erl          |  0
 .../test_elp_flat_outside_target.hrl          |  0
 .../test_elp_ignored/test_elp_ignored.erl     |  0
 .../include/test_elp_no_private_headers.hrl   |  0
 .../src/test_elp_no_private_headers.erl       |  0
 .../src/test_elp_no_headers.erl               |  0
 .../test_elp_transitive_dep/TARGETS.v2_       |  0
 .../include/test_elp_transitive_dep.hrl       |  0
 .../src/test_elp_transitive_dep.erl           |  0
 .../src/test_elp_transitive_dep_private.hrl   |  0
 test/test_projects/buck_tests_2/.elp.toml     | 12 +++++++
 .../auto_gen_a/include/auto_gen_a.hrl         |  0
 .../auto_gen_a/out/pretend_generated.erl      |  0
 .../auto_gen/auto_gen_a/src/auto_gen_a.erl    |  0
 .../check_include/src/top_includer.erl        |  0
 .../include/include_with_bug.hrl              |  0
 .../include/top_includer.hrl                  |  0
 .../include/separate_include.hrl              |  0
 .../generated/out/generated_header.hrl        |  0
 .../buck_tests_2/util/app_a/include/junk.hrl  |  0
 .../buck_tests_2/util/app_a/src/app_a.erl     |  0
 test/test_projects/codegen_test/.elp.toml     |  8 +++++
 .../test_projects}/codegen_test/README.md     |  6 ++--
 .../app_a/src/codegen_test.app.src            |  0
 .../codegen_test/app_a/src/example_usage.erl  |  0
 .../app_a/test/codegen_test_SUITE.erl         |  0
 .../generated/example_service_client.erl      |  0
 .../generated/example_service_types.erl       |  0
 .../generated/example_service_types.hrl       |  0
 .../templates/example_service_client.erl      |  0
 .../templates/example_service_types.erl       |  0
 .../templates/example_service_types.hrl       |  0
 .../custom_build_tool/.elp.toml               |  0
 .../apps/app_a/include/app_a.hrl              |  0
 .../apps/app_a/src/app_a.erl                  |  0
 .../apps/app_b/src/app_b.erl                  |  0
 test/test_projects/diagnostics/.elp.toml      |  8 +++++
 .../test_projects}/diagnostics/README.md      |  0
 .../diagnostics/app_a/extra/app_a.erl         |  0
 .../diagnostics/app_a/include/app_a.hrl       |  0
 .../app_a/include/broken_diagnostics.hrl      |  0
 .../diagnostics/app_a/include/diagnostics.hrl |  0
 .../diagnostics/app_a/src/app_a.app.src       |  0
 .../diagnostics/app_a/src/app_a.erl           |  0
 .../app_a/src/broken_parse_trans.erl          |  0
 .../diagnostics/app_a/src/cascading.erl       |  0
 .../diagnostics/app_a/src/crlf.erl            |  0
 .../diagnostics/app_a/src/diagnostics.erl     |  0
 .../diagnostics/app_a/src/diagnostics.escript |  0
 .../app_a/src/diagnostics_errors.escript      |  0
 .../app_a/src/diagnostics_warnings.escript    |  0
 .../src/erlang_diagnostics_errors_gen.erl     |  0
 .../diagnostics/app_a/src/file_attribute.erl  |  0
 .../diagnostics/app_a/src/lint_recursive.erl  |  0
 .../diagnostics/app_a/src/lints.erl           |  0
 .../app_a/src/otp27_docstrings.erl            |  0
 .../diagnostics/app_a/src/otp27_sigils.erl    |  0
 .../diagnostics/app_a/src/otp_7655.erl        |  0
 .../app_a/src/parse_error_a_cascade.erl       |  0
 .../diagnostics/app_a/src/suppressed.erl      |  0
 .../diagnostics/app_a/src/syntax.erl          |  0
 .../diagnostics/app_a/test/app_a_SUITE.erl    |  0
 .../diagnostics/erlang_ls.config              |  0
 .../test_projects}/diagnostics/rebar.config   |  0
 .../diagnostics/test_build_info.json          |  0
 test/test_projects/end_to_end/.elp.toml       |  7 ++++
 .../assist_examples/src/add_doc.erl           |  0
 .../src/assist_examples.app.src               |  0
 .../assist_examples/src/code_completion.erl   |  0
 .../assist_examples/src/extract_function.erl  |  0
 .../assist_examples/src/head_mismatch.erl     |  0
 .../configerator/source/whatsapp/my_caf.erl   |  0
 .../end_to_end/definitions/README.md          |  0
 .../definitions/src/definitions.app.src       |  0
 .../end_to_end/definitions/src/local_def.erl  |  0
 .../end_to_end/docs/src/docs.app.src          |  0
 .../end_to_end/docs/src/docs.erl              |  0
 .../end_to_end/erlang_ls.config               |  0
 .../end_to_end/fixtures/erlang-stacktrace.txt |  0
 .../test_projects}/end_to_end/hover/README.md |  0
 .../end_to_end/hover/src/doc_examples.erl     |  0
 .../end_to_end/hover/src/hover.app.src        |  0
 .../test_projects}/end_to_end/rebar.config    |  0
 .../end_to_end/single_errors/README.md        |  0
 .../single_errors/src/as_you_type.erl         |  0
 .../src/compiler_diagnostics.erl              |  0
 .../single_errors/src/single_errors.app.src   |  0
 .../single_errors/src/spec_mismatch.erl       |  0
 .../single_errors/src/spec_mismatch.erl.2     |  0
 .../single_errors/src/types_on_hover.erl      |  0
 .../single_errors/src/unused_macro.erl        |  0
 .../eqwalizer/src/eqwalizer.app.src           |  0
 .../eqwalizer/src/eqwalizer_specs.erl         |  0
 .../test_projects/eqwalizer_callers/.elp.toml |  5 +++
 .../eqwalizer_callers/.gitignore              |  0
 .../eqwalizer_callers/app_a/include/app_a.hrl |  0
 .../eqwalizer_callers/app_a/src/app_a.app.src |  0
 .../eqwalizer_callers/app_a/src/app_a.erl     |  0
 .../eqwalizer_callers/app_a/src/app_b.erl     |  0
 .../app_a/test/app_a_SUITE.erl                |  0
 .../eqwalizer_callers/rebar.config            |  0
 .../eqwalizer_ignore_modules/.elp.toml        |  0
 .../apps/app_a/include/app_a.hrl              |  0
 .../apps/app_a/src/another_module_a.erl       |  0
 .../apps/app_a/src/app_a.erl                  |  0
 .../apps/app_b/src/app_b.erl                  |  0
 test/test_projects/eqwalizer_tests/.elp.toml  |  8 +++++
 .../test_projects}/eqwalizer_tests/.gitignore |  0
 .../eqwalizer_tests/.rebar.root               |  0
 .../check/include/my_header.hrl               |  0
 .../check/src/any_fun_type.erl                |  0
 .../eqwalizer_tests/check/src/apply_none.erl  |  0
 .../eqwalizer_tests/check/src/approx.erl      |  0
 .../eqwalizer_tests/check/src/as_pat.erl      |  0
 .../check/src/auto_imports.erl                |  0
 .../eqwalizer_tests/check/src/behave.erl      |  0
 .../eqwalizer_tests/check/src/binaries.erl    |  0
 .../eqwalizer_tests/check/src/booleans.erl    |  0
 .../check/src/callbacks1_pos.erl              |  0
 .../check/src/callbacks3_neg.erl              |  0
 .../check/src/callbacks4_neg.erl              |  0
 .../check/src/callbacks5_neg.erl              |  0
 .../check/src/callbacks6_neg.erl              |  0
 .../check/src/callbacks7_overload_pos.erl     |  0
 .../check/src/case_predicates.erl             |  0
 .../eqwalizer_tests/check/src/check.app.src   |  0
 .../check/src/compiler_macro.erl              |  0
 .../check/src/complex_maps.erl                |  0
 .../check/src/comprehensions.erl              |  0
 .../check/src/contravariant.erl               |  0
 .../eqwalizer_tests/check/src/custom.erl      |  0
 .../check/src/detached_specs1.erl             |  0
 .../check/src/detached_specs2.erl             |  0
 .../eqwalizer_tests/check/src/dyn_calls.erl   |  0
 .../check/src/dyn_remote_funs.erl             |  0
 .../check/src/dynamic_callbacks_1.erl         |  0
 .../check/src/dynamic_callbacks_2.erl         |  0
 .../check/src/dynamic_calls.erl               |  0
 .../check/src/dynamic_catch.erl               |  0
 .../eqwalizer_tests/check/src/dynamic_fun.erl |  0
 .../check/src/dynamic_generics.erl            |  0
 .../check/src/dynamic_local_funs.erl          |  0
 .../check/src/dynamic_receive.erl             |  0
 .../check/src/dynamic_refine.erl              |  0
 .../check/src/dynamic_try_catch.erl           |  0
 .../eqwalizer_tests/check/src/elab_clause.erl |  0
 .../check/src/error_messages.erl              |  0
 .../check/src/fancy_generics.erl              |  0
 .../eqwalizer_tests/check/src/format.erl      |  0
 .../eqwalizer_tests/check/src/fun_stats.erl   |  0
 .../eqwalizer_tests/check/src/fun_stats2.erl  |  0
 .../eqwalizer_tests/check/src/funs.erl        |  0
 .../eqwalizer_tests/check/src/funs2.erl       |  0
 .../check/src/funs_uncommon.erl               |  0
 .../check/src/generic_fun_application.erl     |  0
 .../check/src/generics_with_unions.erl        |  0
 .../check/src/gradual_bounded.erl             |  0
 .../check/src/gradual_complex_types.erl       |  0
 .../check/src/gradual_custom.erl              |  0
 .../check/src/gradual_lambdas.erl             |  0
 .../check/src/gradual_maybe.erl               |  0
 .../check/src/gradual_misc.erl                |  0
 .../check/src/gradual_overloaded.erl          |  0
 .../check/src/gradual_regression_01.erl       |  0
 .../check/src/gradual_untyped.erl             |  0
 .../check/src/guard_b_connections.erl         |  0
 .../eqwalizer_tests/check/src/guards.erl      |  0
 .../check/src/guards_logic.erl                |  0
 .../check/src/guards_simple.erl               |  0
 .../eqwalizer_tests/check/src/hints.erl       |  0
 .../eqwalizer_tests/check/src/index1.erl      |  0
 .../eqwalizer_tests/check/src/index2.erl      |  0
 .../eqwalizer_tests/check/src/iolists.erl     |  0
 .../eqwalizer_tests/check/src/kp_01.erl       |  0
 .../eqwalizer_tests/check/src/kp_02.erl       |  0
 .../eqwalizer_tests/check/src/lists_tests.erl |  0
 .../eqwalizer_tests/check/src/misc.erl        |  0
 .../eqwalizer_tests/check/src/misc_lib.erl    |  0
 .../check/src/my_behaviour.erl                |  0
 .../check/src/my_gradual_behaviour.erl        |  0
 .../eqwalizer_tests/check/src/my_header.erl   |  0
 .../eqwalizer_tests/check/src/neg.erl         |  0
 .../check/src/nested1/misc_nested1.erl        |  0
 .../src/nested1/nested2/misc_nested2.erl      |  0
 .../eqwalizer_tests/check/src/nowarn.erl      |  0
 .../check/src/number_comparisons.erl          |  0
 .../eqwalizer_tests/check/src/numbers.erl     |  0
 .../eqwalizer_tests/check/src/opaque.erl      |  0
 .../eqwalizer_tests/check/src/other.erl       |  0
 .../eqwalizer_tests/check/src/otp28.erl       |  0
 .../eqwalizer_tests/check/src/otp_opaques.erl |  0
 .../eqwalizer_tests/check/src/overloaded.erl  |  0
 .../check/src/overloaded_specs_union.erl      |  0
 .../check/src/parametricity.erl               |  0
 .../eqwalizer_tests/check/src/pats.erl        |  0
 .../eqwalizer_tests/check/src/pinned.erl      |  0
 .../eqwalizer_tests/check/src/pos.erl         |  0
 .../eqwalizer_tests/check/src/records.erl     |  0
 .../check/src/recursive_aliases.erl           |  0
 .../eqwalizer_tests/check/src/refine.erl      |  0
 .../eqwalizer_tests/check/src/scoping.erl     |  0
 .../eqwalizer_tests/check/src/skip.erl        |  0
 .../check/src/static_maybe.erl                |  0
 .../check/src/strict_complex_types.erl        |  0
 .../eqwalizer_tests/check/src/strict_fun.erl  |  0
 .../check/src/strict_receive.erl              |  0
 .../eqwalizer_tests/check/src/subtype_neg.erl |  0
 .../eqwalizer_tests/check/src/subtype_pos.erl |  0
 .../eqwalizer_tests/check/src/t_maps.erl      |  0
 .../check/src/tagged_tuples.erl               |  0
 .../eqwalizer_tests/check/src/test.erl        |  0
 .../eqwalizer_tests/check/src/tries.erl       |  0
 .../eqwalizer_tests/check/src/tuple_union.erl |  0
 .../check/src/type_aliases.erl                |  0
 .../check/src/type_asserts.erl                |  0
 .../check/src/type_predicates.erl             |  0
 .../eqwalizer_tests/check/src/united_fun.erl  |  0
 .../eqwalizer_tests/check/src/unspecced.erl   |  0
 .../check/src/use_dynamic_gradual.erl         |  0
 .../check/src/use_dynamic_strict.erl          |  0
 .../eqwalizer_tests/check/src/vars1.erl       |  0
 .../eqwalizer_tests/check/src/vars2.erl       |  0
 .../check/test/check_SUITE.erl                |  0
 .../debug/include/debug_header.hrl            |  0
 .../eqwalizer_tests/debug/src/attributes.erl  |  0
 .../eqwalizer_tests/debug/src/debug.app.src   |  0
 .../debug/src/debug_header.erl                |  0
 .../eqwalizer_tests/debug/src/expand.erl      |  0
 .../eqwalizer_tests/debug/src/expr1.erl       |  0
 .../eqwalizer_tests/debug/src/expr2.erl       |  0
 .../eqwalizer_tests/debug/src/records_wip.erl |  0
 .../eqwalizer_tests/debug/src/types1.erl      |  0
 .../eqwalizer_tests/debug/src/types2.erl      |  0
 .../eqwalizer_tests/debug/src/wip_maps.erl    |  0
 .../eqwalizer_tests/elm_core/src/basics.erl   |  0
 .../elm_core/src/elm_core.app.src             |  0
 .../eqwalizer_tests/elm_core/src/list.erl     |  0
 .../eqwalizer_tests/elm_core/src/map.erl      |  0
 .../eqwalizer_tests/elm_core/src/map_ffi.erl  |  0
 .../eqwalizer_tests/elm_core/src/maybe.erl    |  0
 .../eqwalizer_tests/elm_core/src/result.erl   |  0
 .../eqwalizer_tests/elm_core/src/tuple.erl    |  0
 .../eqwalizer/include/eqwalizer.hrl           |  0
 .../eqwalizer/src/eqwalizer.app.src           |  0
 .../eqwalizer/src/eqwalizer.erl               |  0
 .../eqwalizer/src/eqwalizer_specs.erl         |  0
 .../src/eqwalizer_build_info_prv.erl          |  0
 .../src/eqwalizer_rebar3.app.src              |  0
 .../eqwalizer_rebar3/src/eqwalizer_rebar3.erl |  0
 .../eqwalizer_tests/eqwater/readme.md         |  0
 .../eqwater/src/deep_tuples.erl               |  0
 .../eqwater/src/eqwater.app.src               |  0
 .../eqwalizer_tests/eqwater/src/eqwater.erl   |  0
 .../eqwater/src/eqwater_aliases.erl           |  0
 .../eqwater/src/eqwater_generics.erl          |  0
 .../eqwater/src/eqwater_lists.erl             |  0
 .../eqwater/src/eqwater_maps.erl              |  0
 .../eqwater/src/eqwater_records.erl           |  0
 .../eqwater/src/eqwater_sound.erl             |  0
 .../eqwater/src/unlimited_refinement.erl      |  0
 .../fault_tolerance/.eqwalizer                |  0
 .../src/fault_tolerance.app.src               |  0
 .../fault_tolerance/src/fault_tolerance.erl   |  0
 .../eqwalizer_tests/options/src/bad_maps.erl  |  0
 .../options/src/dynamic_lambdas.erl           |  0
 .../options/src/options.app.src               |  0
 .../src/overloaded_specs_dynamic_result.erl   |  0
 .../options/src/redundant_guards.erl          |  0
 .../options/src/uncovered_clauses.erl         |  0
 .../eqwalizer_tests/rebar.config              |  0
 .../hierarchical_config/.elp.toml             |  5 +++
 .../hierarchical_config/.elp_lint.toml        |  0
 .../hierarchical_config/app_a/.elp_lint.toml  |  0
 .../app_a/src/app_a.app.src                   |  0
 .../hierarchical_config/app_a/src/app_a.erl   |  0
 .../app_b/src/app_b.app.src                   |  0
 .../hierarchical_config/app_b/src/app_b.erl   |  0
 .../hierarchical_config/rebar.config          |  0
 test/test_projects/in_place_tests/.elp.toml   |  5 +++
 .../test_projects}/in_place_tests/README.md   |  0
 .../in_place_tests/app_a/extra/app_a.erl      |  0
 .../in_place_tests/app_a/include/app_a.hrl    |  0
 .../app_a/include/broken_diagnostics.hrl      |  0
 .../app_a/include/diagnostics.hrl             |  0
 .../in_place_tests/app_a/src/app_a.app.src    |  0
 .../in_place_tests/app_a/src/app_a.erl        |  0
 .../in_place_tests/app_a/src/lints.erl        |  0
 .../in_place_tests/app_a/test/app_a_SUITE.erl |  0
 .../in_place_tests/erlang_ls.config           |  0
 .../in_place_tests/rebar.config               |  0
 .../include_lib_dependency_test/.elp.toml     |  5 +++
 .../external_app/include/external_header.hrl  |  0
 .../external_app/src/external_app.app.src     |  0
 .../external_app/src/external_app.erl         |  0
 .../extra_app/include/extra_header.hrl        |  0
 .../extra_app/src/extra_app.app.src           |  0
 .../extra_app/src/extra_app.erl               |  0
 .../main_app/src/main_app.app.src             |  0
 .../main_app/src/main_app.erl                 |  0
 .../normal_dep/include/assert.hrl             |  0
 .../normal_dep/src/normal_dep.app.src         |  0
 .../normal_dep/src/normal_dep.erl             |  0
 .../include_lib_dependency_test/rebar.config  |  0
 test/test_projects/linter/.elp.toml           |  5 +++
 .../test_projects}/linter/.elp_lint.toml      |  0
 .../test_projects}/linter/.gitignore          |  0
 .../linter/app_a/include/app_a.hrl            |  0
 .../linter/app_a/src/app_a.app.src            |  0
 .../test_projects}/linter/app_a/src/app_a.erl |  0
 .../linter/app_a/src/app_a_edoc.erl           |  0
 .../linter/app_a/src/app_a_ssr.erl            |  0
 .../linter/app_a/src/app_a_unused_param.erl   |  0
 .../app_a/src/custom_function_matches.erl     |  0
 .../app_a/src/expression_updates_literal.erl  |  0
 .../linter/app_a/src/spelling.erl             |  0
 .../linter/app_a/test/app_a_SUITE.erl         |  0
 .../linter/app_a/test/app_a_test_helpers.erl  |  0
 .../test/app_a_test_helpers_not_opted_in.erl  |  0
 .../test/app_a_unreachable_test_SUITE.erl     |  0
 .../app_a/test/app_test_helpers_no_errors.erl |  0
 .../linter/app_b/src/app_b.app.src            |  0
 .../test_projects}/linter/app_b/src/app_b.erl |  0
 .../linter/app_b/src/app_b_unused_param.erl   |  0
 .../test_projects}/linter/elp_lint_adhoc.toml |  0
 .../elp_lint_custom_function_matches.toml     |  0
 .../linter/elp_lint_ssr_adhoc.toml            |  0
 .../linter/elp_lint_ssr_adhoc_parse_fail.toml |  0
 .../test_projects}/linter/elp_lint_test1.toml |  0
 .../test_projects}/linter/elp_lint_test2.toml |  0
 .../linter/elp_lint_test_ignore.toml          |  0
 .../linter/elp_lint_warnings_as_errors.toml   |  0
 .../test_projects}/linter/rebar.config        |  0
 .../test_projects/linter_bad_config/.elp.toml |  5 +++
 .../linter_bad_config/.elp_lint.toml          |  0
 .../linter_bad_config/.gitignore              |  0
 .../linter_bad_config/app_a/include/app_a.hrl |  0
 .../linter_bad_config/app_a/src/app_a.app.src |  0
 .../linter_bad_config/app_a/src/app_a.erl     |  0
 .../linter_bad_config/linter/.elp.toml        |  5 +++
 .../linter_bad_config/linter/.elp_lint.toml   |  0
 .../linter_bad_config/linter/.gitignore       |  0
 .../linter/app_a/include/app_a.hrl            |  0
 .../linter/app_a/src/app_a.app.src            |  0
 .../linter/app_a/src/app_a.erl                |  0
 .../linter/app_a/src/app_a_unused_param.erl   |  0
 .../linter/app_a/test/app_a_SUITE.erl         |  0
 .../linter/app_a/test/app_a_test_helpers.erl  |  0
 .../test/app_a_test_helpers_not_opted_in.erl  |  0
 .../app_a/test/app_test_helpers_no_errors.erl |  0
 .../linter/app_b/src/app_b.app.src            |  0
 .../linter/app_b/src/app_b.erl                |  0
 .../linter/app_b/src/app_b_unused_param.erl   |  0
 .../linter_bad_config/linter/rebar.config     |  0
 .../linter_bad_config/rebar.config            |  0
 test/test_projects/parse_error/.elp.toml      |  8 +++++
 .../test_projects}/parse_error/.gitignore     |  0
 .../test_projects}/parse_error/.rebar.root    |  0
 .../eqwalizer/src/eqwalizer.app.src           |  0
 .../parse_error/eqwalizer/src/eqwalizer.erl   |  0
 .../eqwalizer/src/eqwalizer_specs.erl         |  0
 .../parse_error_a/src/parse_error_a.app.src   |  0
 .../parse_error_a/src/parse_error_a.erl       |  0
 .../parse_error_a/src/parse_error_a_bad.erl   |  0
 .../src/parse_error_a_reference_bad.erl       |  0
 .../src/parse_error_a_syntax_error.erl        |  0
 .../parse_error_a/src/parse_error_a_worst.erl |  0
 .../test_projects}/parse_error/rebar.config   |  0
 test/test_projects/standard/.elp.toml         |  5 +++
 .../test_projects}/standard/.gitignore        |  0
 .../test_projects}/standard/.rebar.root       |  0
 .../test_projects}/standard/app_a/.eqwalizer  |  0
 .../standard/app_a/extra/app_a.erl            |  0
 .../standard/app_a/include/app_a.hrl          |  0
 .../standard/app_a/src/app_a.app.src          |  0
 .../standard/app_a/src/app_a.erl              |  0
 .../app_a/src/app_a_errors_generated.erl      |  0
 .../standard/app_a/src/app_a_fixme.erl        |  0
 .../standard/app_a/src/app_a_ignored.erl      |  0
 .../standard/app_a/src/app_a_lists.erl        |  0
 .../standard/app_a/src/app_a_mod2.erl         |  0
 .../standard/app_a/src/app_a_no_errors.erl    |  0
 .../app_a/src/app_a_no_errors_generated.erl   |  0
 .../app_a/src/app_a_no_errors_opted_in.erl    |  0
 .../standard/app_a/test/app_a_SUITE.erl       |  0
 .../app_a/test/app_a_test_helpers.erl         |  0
 .../test/app_a_test_helpers_not_opted_in.erl  |  0
 .../app_a/test/app_test_helpers_no_errors.erl |  0
 .../standard/app_b/src/app_b.app.src          |  0
 .../standard/app_b/src/app_b.erl              |  0
 .../standard/eqwalizer/src/eqwalizer.app.src  |  0
 .../standard/eqwalizer/src/eqwalizer.erl      |  0
 .../eqwalizer/src/eqwalizer_specs.erl         |  0
 .../test_projects}/standard/erlang_ls.config  |  0
 .../test_projects}/standard/rebar.config      |  0
 test/test_projects/xref/.elp.toml             |  5 +++
 .../xref/app_a/src/unavailable_type.erl       |  0
 .../test_projects}/xref/app_b/src/app_b.erl   |  0
 .../test_projects}/xref/app_c/src/app_c.erl   |  0
 .../xref/elp_lint_unavailable_type.toml       |  0
 test_projects/buck_bad_config/.elp.toml       |  8 -----
 test_projects/buck_tests/.elp.toml            |  9 ------
 test_projects/buck_tests_2/.elp.toml          | 12 -------
 test_projects/codegen_test/.elp.toml          |  8 -----
 test_projects/diagnostics/.elp.toml           |  8 -----
 test_projects/end_to_end/.elp.toml            |  7 ----
 test_projects/eqwalizer_callers/.elp.toml     |  5 ---
 test_projects/eqwalizer_tests/.elp.toml       |  8 -----
 test_projects/hierarchical_config/.elp.toml   |  5 ---
 test_projects/in_place_tests/.elp.toml        |  5 ---
 .../include_lib_dependency_test/.elp.toml     |  5 ---
 test_projects/linter/.elp.toml                |  5 ---
 test_projects/linter_bad_config/.elp.toml     |  5 ---
 .../linter_bad_config/linter/.elp.toml        |  5 ---
 test_projects/parse_error/.elp.toml           |  8 -----
 test_projects/standard/.elp.toml              |  5 ---
 test_projects/xref/.elp.toml                  |  5 ---
 446 files changed, 163 insertions(+), 163 deletions(-)
 rename {test_projects => test/test_projects}/.gitignore (100%)
 rename {test_projects => test/test_projects}/README.md (100%)
 create mode 100644 test/test_projects/buck_bad_config/.elp.toml
 rename {test_projects => test/test_projects}/buck_bad_config/src/bad_app.erl (100%)
 create mode 100644 test/test_projects/buck_tests/.elp.toml
 rename {test_projects => test/test_projects}/buck_tests/TARGETS.v2_ (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp/TARGETS.v2_ (76%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp/include/test_elp.hrl (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp/src/test_elp.app.src (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp/src/test_elp.erl (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp/test/test_elp_SUITE.erl (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp/test/test_elp_SUITE_data/handle_update_test1.json (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp/test/test_elp_SUITE_data/handle_update_test2.json (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp/test/test_elp_SUITE_data/untracked_header.hrl (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp/test/test_elp_SUITE_data/untracked_module.erl (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp/test/test_elp_test_utils.erl (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp/test/test_elp_test_utils.hrl (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp_direct_dep/TARGETS.v2_ (61%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp_direct_dep/include/test_elp_direct_dep.hrl (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp_direct_dep/src/test_elp_direct_dep.erl (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp_direct_dep/src/test_elp_direct_dep_private.hrl (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp_flat_inside_target/TARGETS.v2_ (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp_flat_inside_target/test_elp_flat_inside_target.erl (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp_flat_inside_target/test_elp_flat_inside_target.hrl (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp_flat_outside_target/test_elp_flat_outside_target.erl (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp_flat_outside_target/test_elp_flat_outside_target.hrl (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp_ignored/test_elp_ignored.erl (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp_no_private_headers/include/test_elp_no_private_headers.hrl (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp_no_private_headers/src/test_elp_no_private_headers.erl (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp_no_public_headers/src/test_elp_no_headers.erl (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp_transitive_dep/TARGETS.v2_ (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp_transitive_dep/include/test_elp_transitive_dep.hrl (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp_transitive_dep/src/test_elp_transitive_dep.erl (100%)
 rename {test_projects => test/test_projects}/buck_tests/test_elp_transitive_dep/src/test_elp_transitive_dep_private.hrl (100%)
 create mode 100644 test/test_projects/buck_tests_2/.elp.toml
 rename {test_projects => test/test_projects}/buck_tests_2/auto_gen/auto_gen_a/include/auto_gen_a.hrl (100%)
 rename {test_projects => test/test_projects}/buck_tests_2/auto_gen/auto_gen_a/out/pretend_generated.erl (100%)
 rename {test_projects => test/test_projects}/buck_tests_2/auto_gen/auto_gen_a/src/auto_gen_a.erl (100%)
 rename {test_projects => test/test_projects}/buck_tests_2/check_include/src/top_includer.erl (100%)
 rename {test_projects => test/test_projects}/buck_tests_2/check_include_separate_1/include/include_with_bug.hrl (100%)
 rename {test_projects => test/test_projects}/buck_tests_2/check_include_separate_1/include/top_includer.hrl (100%)
 rename {test_projects => test/test_projects}/buck_tests_2/check_include_separate_2/include/separate_include.hrl (100%)
 rename {test_projects => test/test_projects}/buck_tests_2/generated/out/generated_header.hrl (100%)
 rename {test_projects => test/test_projects}/buck_tests_2/util/app_a/include/junk.hrl (100%)
 rename {test_projects => test/test_projects}/buck_tests_2/util/app_a/src/app_a.erl (100%)
 create mode 100644 test/test_projects/codegen_test/.elp.toml
 rename {test_projects => test/test_projects}/codegen_test/README.md (93%)
 rename {test_projects => test/test_projects}/codegen_test/app_a/src/codegen_test.app.src (100%)
 rename {test_projects => test/test_projects}/codegen_test/app_a/src/example_usage.erl (100%)
 rename {test_projects => test/test_projects}/codegen_test/app_a/test/codegen_test_SUITE.erl (100%)
 rename {test_projects => test/test_projects}/codegen_test/generated/example_service_client.erl (100%)
 rename {test_projects => test/test_projects}/codegen_test/generated/example_service_types.erl (100%)
 rename {test_projects => test/test_projects}/codegen_test/generated/example_service_types.hrl (100%)
 rename {test_projects => test/test_projects}/codegen_test/templates/example_service_client.erl (100%)
 rename {test_projects => test/test_projects}/codegen_test/templates/example_service_types.erl (100%)
 rename {test_projects => test/test_projects}/codegen_test/templates/example_service_types.hrl (100%)
 rename {test_projects => test/test_projects}/custom_build_tool/.elp.toml (100%)
 rename {test_projects => test/test_projects}/custom_build_tool/apps/app_a/include/app_a.hrl (100%)
 rename {test_projects => test/test_projects}/custom_build_tool/apps/app_a/src/app_a.erl (100%)
 rename {test_projects => test/test_projects}/custom_build_tool/apps/app_b/src/app_b.erl (100%)
 create mode 100644 test/test_projects/diagnostics/.elp.toml
 rename {test_projects => test/test_projects}/diagnostics/README.md (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/extra/app_a.erl (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/include/app_a.hrl (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/include/broken_diagnostics.hrl (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/include/diagnostics.hrl (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/src/app_a.app.src (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/src/app_a.erl (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/src/broken_parse_trans.erl (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/src/cascading.erl (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/src/crlf.erl (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/src/diagnostics.erl (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/src/diagnostics.escript (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/src/diagnostics_errors.escript (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/src/diagnostics_warnings.escript (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/src/erlang_diagnostics_errors_gen.erl (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/src/file_attribute.erl (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/src/lint_recursive.erl (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/src/lints.erl (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/src/otp27_docstrings.erl (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/src/otp27_sigils.erl (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/src/otp_7655.erl (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/src/parse_error_a_cascade.erl (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/src/suppressed.erl (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/src/syntax.erl (100%)
 rename {test_projects => test/test_projects}/diagnostics/app_a/test/app_a_SUITE.erl (100%)
 rename {test_projects => test/test_projects}/diagnostics/erlang_ls.config (100%)
 rename {test_projects => test/test_projects}/diagnostics/rebar.config (100%)
 rename {test_projects => test/test_projects}/diagnostics/test_build_info.json (100%)
 create mode 100644 test/test_projects/end_to_end/.elp.toml
 rename {test_projects => test/test_projects}/end_to_end/assist_examples/src/add_doc.erl (100%)
 rename {test_projects => test/test_projects}/end_to_end/assist_examples/src/assist_examples.app.src (100%)
 rename {test_projects => test/test_projects}/end_to_end/assist_examples/src/code_completion.erl (100%)
 rename {test_projects => test/test_projects}/end_to_end/assist_examples/src/extract_function.erl (100%)
 rename {test_projects => test/test_projects}/end_to_end/assist_examples/src/head_mismatch.erl (100%)
 rename {test_projects => test/test_projects}/end_to_end/caf/configerator/source/whatsapp/my_caf.erl (100%)
 rename {test_projects => test/test_projects}/end_to_end/definitions/README.md (100%)
 rename {test_projects => test/test_projects}/end_to_end/definitions/src/definitions.app.src (100%)
 rename {test_projects => test/test_projects}/end_to_end/definitions/src/local_def.erl (100%)
 rename {test_projects => test/test_projects}/end_to_end/docs/src/docs.app.src (100%)
 rename {test_projects => test/test_projects}/end_to_end/docs/src/docs.erl (100%)
 rename {test_projects => test/test_projects}/end_to_end/erlang_ls.config (100%)
 rename {test_projects => test/test_projects}/end_to_end/fixtures/erlang-stacktrace.txt (100%)
 rename {test_projects => test/test_projects}/end_to_end/hover/README.md (100%)
 rename {test_projects => test/test_projects}/end_to_end/hover/src/doc_examples.erl (100%)
 rename {test_projects => test/test_projects}/end_to_end/hover/src/hover.app.src (100%)
 rename {test_projects => test/test_projects}/end_to_end/rebar.config (100%)
 rename {test_projects => test/test_projects}/end_to_end/single_errors/README.md (100%)
 rename {test_projects => test/test_projects}/end_to_end/single_errors/src/as_you_type.erl (100%)
 rename {test_projects => test/test_projects}/end_to_end/single_errors/src/compiler_diagnostics.erl (100%)
 rename {test_projects => test/test_projects}/end_to_end/single_errors/src/single_errors.app.src (100%)
 rename {test_projects => test/test_projects}/end_to_end/single_errors/src/spec_mismatch.erl (100%)
 rename {test_projects => test/test_projects}/end_to_end/single_errors/src/spec_mismatch.erl.2 (100%)
 rename {test_projects => test/test_projects}/end_to_end/single_errors/src/types_on_hover.erl (100%)
 rename {test_projects => test/test_projects}/end_to_end/single_errors/src/unused_macro.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer/src/eqwalizer.app.src (100%)
 rename {test_projects => test/test_projects}/eqwalizer/src/eqwalizer_specs.erl (100%)
 create mode 100644 test/test_projects/eqwalizer_callers/.elp.toml
 rename {test_projects => test/test_projects}/eqwalizer_callers/.gitignore (100%)
 rename {test_projects => test/test_projects}/eqwalizer_callers/app_a/include/app_a.hrl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_callers/app_a/src/app_a.app.src (100%)
 rename {test_projects => test/test_projects}/eqwalizer_callers/app_a/src/app_a.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_callers/app_a/src/app_b.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_callers/app_a/test/app_a_SUITE.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_callers/rebar.config (100%)
 rename {test_projects => test/test_projects}/eqwalizer_ignore_modules/.elp.toml (100%)
 rename {test_projects => test/test_projects}/eqwalizer_ignore_modules/apps/app_a/include/app_a.hrl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_ignore_modules/apps/app_a/src/another_module_a.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_ignore_modules/apps/app_a/src/app_a.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_ignore_modules/apps/app_b/src/app_b.erl (100%)
 create mode 100644 test/test_projects/eqwalizer_tests/.elp.toml
 rename {test_projects => test/test_projects}/eqwalizer_tests/.gitignore (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/.rebar.root (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/include/my_header.hrl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/any_fun_type.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/apply_none.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/approx.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/as_pat.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/auto_imports.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/behave.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/binaries.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/booleans.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/callbacks1_pos.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/callbacks3_neg.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/callbacks4_neg.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/callbacks5_neg.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/callbacks6_neg.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/callbacks7_overload_pos.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/case_predicates.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/check.app.src (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/compiler_macro.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/complex_maps.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/comprehensions.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/contravariant.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/custom.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/detached_specs1.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/detached_specs2.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/dyn_calls.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/dyn_remote_funs.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/dynamic_callbacks_1.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/dynamic_callbacks_2.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/dynamic_calls.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/dynamic_catch.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/dynamic_fun.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/dynamic_generics.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/dynamic_local_funs.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/dynamic_receive.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/dynamic_refine.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/dynamic_try_catch.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/elab_clause.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/error_messages.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/fancy_generics.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/format.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/fun_stats.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/fun_stats2.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/funs.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/funs2.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/funs_uncommon.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/generic_fun_application.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/generics_with_unions.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/gradual_bounded.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/gradual_complex_types.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/gradual_custom.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/gradual_lambdas.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/gradual_maybe.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/gradual_misc.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/gradual_overloaded.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/gradual_regression_01.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/gradual_untyped.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/guard_b_connections.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/guards.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/guards_logic.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/guards_simple.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/hints.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/index1.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/index2.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/iolists.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/kp_01.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/kp_02.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/lists_tests.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/misc.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/misc_lib.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/my_behaviour.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/my_gradual_behaviour.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/my_header.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/neg.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/nested1/misc_nested1.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/nested1/nested2/misc_nested2.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/nowarn.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/number_comparisons.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/numbers.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/opaque.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/other.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/otp28.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/otp_opaques.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/overloaded.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/overloaded_specs_union.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/parametricity.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/pats.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/pinned.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/pos.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/records.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/recursive_aliases.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/refine.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/scoping.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/skip.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/static_maybe.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/strict_complex_types.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/strict_fun.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/strict_receive.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/subtype_neg.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/subtype_pos.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/t_maps.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/tagged_tuples.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/test.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/tries.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/tuple_union.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/type_aliases.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/type_asserts.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/type_predicates.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/united_fun.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/unspecced.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/use_dynamic_gradual.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/use_dynamic_strict.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/vars1.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/src/vars2.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/check/test/check_SUITE.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/debug/include/debug_header.hrl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/debug/src/attributes.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/debug/src/debug.app.src (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/debug/src/debug_header.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/debug/src/expand.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/debug/src/expr1.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/debug/src/expr2.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/debug/src/records_wip.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/debug/src/types1.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/debug/src/types2.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/debug/src/wip_maps.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/elm_core/src/basics.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/elm_core/src/elm_core.app.src (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/elm_core/src/list.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/elm_core/src/map.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/elm_core/src/map_ffi.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/elm_core/src/maybe.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/elm_core/src/result.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/elm_core/src/tuple.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/eqwalizer/include/eqwalizer.hrl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/eqwalizer/src/eqwalizer.app.src (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/eqwalizer/src/eqwalizer.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/eqwalizer/src/eqwalizer_specs.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/eqwalizer_rebar3/src/eqwalizer_build_info_prv.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/eqwalizer_rebar3/src/eqwalizer_rebar3.app.src (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/eqwalizer_rebar3/src/eqwalizer_rebar3.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/eqwater/readme.md (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/eqwater/src/deep_tuples.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/eqwater/src/eqwater.app.src (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/eqwater/src/eqwater.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/eqwater/src/eqwater_aliases.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/eqwater/src/eqwater_generics.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/eqwater/src/eqwater_lists.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/eqwater/src/eqwater_maps.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/eqwater/src/eqwater_records.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/eqwater/src/eqwater_sound.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/eqwater/src/unlimited_refinement.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/fault_tolerance/.eqwalizer (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/fault_tolerance/src/fault_tolerance.app.src (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/fault_tolerance/src/fault_tolerance.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/options/src/bad_maps.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/options/src/dynamic_lambdas.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/options/src/options.app.src (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/options/src/overloaded_specs_dynamic_result.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/options/src/redundant_guards.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/options/src/uncovered_clauses.erl (100%)
 rename {test_projects => test/test_projects}/eqwalizer_tests/rebar.config (100%)
 create mode 100644 test/test_projects/hierarchical_config/.elp.toml
 rename {test_projects => test/test_projects}/hierarchical_config/.elp_lint.toml (100%)
 rename {test_projects => test/test_projects}/hierarchical_config/app_a/.elp_lint.toml (100%)
 rename {test_projects => test/test_projects}/hierarchical_config/app_a/src/app_a.app.src (100%)
 rename {test_projects => test/test_projects}/hierarchical_config/app_a/src/app_a.erl (100%)
 rename {test_projects => test/test_projects}/hierarchical_config/app_b/src/app_b.app.src (100%)
 rename {test_projects => test/test_projects}/hierarchical_config/app_b/src/app_b.erl (100%)
 rename {test_projects => test/test_projects}/hierarchical_config/rebar.config (100%)
 create mode 100644 test/test_projects/in_place_tests/.elp.toml
 rename {test_projects => test/test_projects}/in_place_tests/README.md (100%)
 rename {test_projects => test/test_projects}/in_place_tests/app_a/extra/app_a.erl (100%)
 rename {test_projects => test/test_projects}/in_place_tests/app_a/include/app_a.hrl (100%)
 rename {test_projects => test/test_projects}/in_place_tests/app_a/include/broken_diagnostics.hrl (100%)
 rename {test_projects => test/test_projects}/in_place_tests/app_a/include/diagnostics.hrl (100%)
 rename {test_projects => test/test_projects}/in_place_tests/app_a/src/app_a.app.src (100%)
 rename {test_projects => test/test_projects}/in_place_tests/app_a/src/app_a.erl (100%)
 rename {test_projects => test/test_projects}/in_place_tests/app_a/src/lints.erl (100%)
 rename {test_projects => test/test_projects}/in_place_tests/app_a/test/app_a_SUITE.erl (100%)
 rename {test_projects => test/test_projects}/in_place_tests/erlang_ls.config (100%)
 rename {test_projects => test/test_projects}/in_place_tests/rebar.config (100%)
 create mode 100644 test/test_projects/include_lib_dependency_test/.elp.toml
 rename {test_projects => test/test_projects}/include_lib_dependency_test/external_app/include/external_header.hrl (100%)
 rename {test_projects => test/test_projects}/include_lib_dependency_test/external_app/src/external_app.app.src (100%)
 rename {test_projects => test/test_projects}/include_lib_dependency_test/external_app/src/external_app.erl (100%)
 rename {test_projects => test/test_projects}/include_lib_dependency_test/extra_app/include/extra_header.hrl (100%)
 rename {test_projects => test/test_projects}/include_lib_dependency_test/extra_app/src/extra_app.app.src (100%)
 rename {test_projects => test/test_projects}/include_lib_dependency_test/extra_app/src/extra_app.erl (100%)
 rename {test_projects => test/test_projects}/include_lib_dependency_test/main_app/src/main_app.app.src (100%)
 rename {test_projects => test/test_projects}/include_lib_dependency_test/main_app/src/main_app.erl (100%)
 rename {test_projects => test/test_projects}/include_lib_dependency_test/normal_dep/include/assert.hrl (100%)
 rename {test_projects => test/test_projects}/include_lib_dependency_test/normal_dep/src/normal_dep.app.src (100%)
 rename {test_projects => test/test_projects}/include_lib_dependency_test/normal_dep/src/normal_dep.erl (100%)
 rename {test_projects => test/test_projects}/include_lib_dependency_test/rebar.config (100%)
 create mode 100644 test/test_projects/linter/.elp.toml
 rename {test_projects => test/test_projects}/linter/.elp_lint.toml (100%)
 rename {test_projects => test/test_projects}/linter/.gitignore (100%)
 rename {test_projects => test/test_projects}/linter/app_a/include/app_a.hrl (100%)
 rename {test_projects => test/test_projects}/linter/app_a/src/app_a.app.src (100%)
 rename {test_projects => test/test_projects}/linter/app_a/src/app_a.erl (100%)
 rename {test_projects => test/test_projects}/linter/app_a/src/app_a_edoc.erl (100%)
 rename {test_projects => test/test_projects}/linter/app_a/src/app_a_ssr.erl (100%)
 rename {test_projects => test/test_projects}/linter/app_a/src/app_a_unused_param.erl (100%)
 rename {test_projects => test/test_projects}/linter/app_a/src/custom_function_matches.erl (100%)
 rename {test_projects => test/test_projects}/linter/app_a/src/expression_updates_literal.erl (100%)
 rename {test_projects => test/test_projects}/linter/app_a/src/spelling.erl (100%)
 rename {test_projects => test/test_projects}/linter/app_a/test/app_a_SUITE.erl (100%)
 rename {test_projects => test/test_projects}/linter/app_a/test/app_a_test_helpers.erl (100%)
 rename {test_projects => test/test_projects}/linter/app_a/test/app_a_test_helpers_not_opted_in.erl (100%)
 rename {test_projects => test/test_projects}/linter/app_a/test/app_a_unreachable_test_SUITE.erl (100%)
 rename {test_projects => test/test_projects}/linter/app_a/test/app_test_helpers_no_errors.erl (100%)
 rename {test_projects => test/test_projects}/linter/app_b/src/app_b.app.src (100%)
 rename {test_projects => test/test_projects}/linter/app_b/src/app_b.erl (100%)
 rename {test_projects => test/test_projects}/linter/app_b/src/app_b_unused_param.erl (100%)
 rename {test_projects => test/test_projects}/linter/elp_lint_adhoc.toml (100%)
 rename {test_projects => test/test_projects}/linter/elp_lint_custom_function_matches.toml (100%)
 rename {test_projects => test/test_projects}/linter/elp_lint_ssr_adhoc.toml (100%)
 rename {test_projects => test/test_projects}/linter/elp_lint_ssr_adhoc_parse_fail.toml (100%)
 rename {test_projects => test/test_projects}/linter/elp_lint_test1.toml (100%)
 rename {test_projects => test/test_projects}/linter/elp_lint_test2.toml (100%)
 rename {test_projects => test/test_projects}/linter/elp_lint_test_ignore.toml (100%)
 rename {test_projects => test/test_projects}/linter/elp_lint_warnings_as_errors.toml (100%)
 rename {test_projects => test/test_projects}/linter/rebar.config (100%)
 create mode 100644 test/test_projects/linter_bad_config/.elp.toml
 rename {test_projects => test/test_projects}/linter_bad_config/.elp_lint.toml (100%)
 rename {test_projects => test/test_projects}/linter_bad_config/.gitignore (100%)
 rename {test_projects => test/test_projects}/linter_bad_config/app_a/include/app_a.hrl (100%)
 rename {test_projects => test/test_projects}/linter_bad_config/app_a/src/app_a.app.src (100%)
 rename {test_projects => test/test_projects}/linter_bad_config/app_a/src/app_a.erl (100%)
 create mode 100644 test/test_projects/linter_bad_config/linter/.elp.toml
 rename {test_projects => test/test_projects}/linter_bad_config/linter/.elp_lint.toml (100%)
 rename {test_projects => test/test_projects}/linter_bad_config/linter/.gitignore (100%)
 rename {test_projects => test/test_projects}/linter_bad_config/linter/app_a/include/app_a.hrl (100%)
 rename {test_projects => test/test_projects}/linter_bad_config/linter/app_a/src/app_a.app.src (100%)
 rename {test_projects => test/test_projects}/linter_bad_config/linter/app_a/src/app_a.erl (100%)
 rename {test_projects => test/test_projects}/linter_bad_config/linter/app_a/src/app_a_unused_param.erl (100%)
 rename {test_projects => test/test_projects}/linter_bad_config/linter/app_a/test/app_a_SUITE.erl (100%)
 rename {test_projects => test/test_projects}/linter_bad_config/linter/app_a/test/app_a_test_helpers.erl (100%)
 rename {test_projects => test/test_projects}/linter_bad_config/linter/app_a/test/app_a_test_helpers_not_opted_in.erl (100%)
 rename {test_projects => test/test_projects}/linter_bad_config/linter/app_a/test/app_test_helpers_no_errors.erl (100%)
 rename {test_projects => test/test_projects}/linter_bad_config/linter/app_b/src/app_b.app.src (100%)
 rename {test_projects => test/test_projects}/linter_bad_config/linter/app_b/src/app_b.erl (100%)
 rename {test_projects => test/test_projects}/linter_bad_config/linter/app_b/src/app_b_unused_param.erl (100%)
 rename {test_projects => test/test_projects}/linter_bad_config/linter/rebar.config (100%)
 rename {test_projects => test/test_projects}/linter_bad_config/rebar.config (100%)
 create mode 100644 test/test_projects/parse_error/.elp.toml
 rename {test_projects => test/test_projects}/parse_error/.gitignore (100%)
 rename {test_projects => test/test_projects}/parse_error/.rebar.root (100%)
 rename {test_projects => test/test_projects}/parse_error/eqwalizer/src/eqwalizer.app.src (100%)
 rename {test_projects => test/test_projects}/parse_error/eqwalizer/src/eqwalizer.erl (100%)
 rename {test_projects => test/test_projects}/parse_error/eqwalizer/src/eqwalizer_specs.erl (100%)
 rename {test_projects => test/test_projects}/parse_error/parse_error_a/src/parse_error_a.app.src (100%)
 rename {test_projects => test/test_projects}/parse_error/parse_error_a/src/parse_error_a.erl (100%)
 rename {test_projects => test/test_projects}/parse_error/parse_error_a/src/parse_error_a_bad.erl (100%)
 rename {test_projects => test/test_projects}/parse_error/parse_error_a/src/parse_error_a_reference_bad.erl (100%)
 rename {test_projects => test/test_projects}/parse_error/parse_error_a/src/parse_error_a_syntax_error.erl (100%)
 rename {test_projects => test/test_projects}/parse_error/parse_error_a/src/parse_error_a_worst.erl (100%)
 rename {test_projects => test/test_projects}/parse_error/rebar.config (100%)
 create mode 100644 test/test_projects/standard/.elp.toml
 rename {test_projects => test/test_projects}/standard/.gitignore (100%)
 rename {test_projects => test/test_projects}/standard/.rebar.root (100%)
 rename {test_projects => test/test_projects}/standard/app_a/.eqwalizer (100%)
 rename {test_projects => test/test_projects}/standard/app_a/extra/app_a.erl (100%)
 rename {test_projects => test/test_projects}/standard/app_a/include/app_a.hrl (100%)
 rename {test_projects => test/test_projects}/standard/app_a/src/app_a.app.src (100%)
 rename {test_projects => test/test_projects}/standard/app_a/src/app_a.erl (100%)
 rename {test_projects => test/test_projects}/standard/app_a/src/app_a_errors_generated.erl (100%)
 rename {test_projects => test/test_projects}/standard/app_a/src/app_a_fixme.erl (100%)
 rename {test_projects => test/test_projects}/standard/app_a/src/app_a_ignored.erl (100%)
 rename {test_projects => test/test_projects}/standard/app_a/src/app_a_lists.erl (100%)
 rename {test_projects => test/test_projects}/standard/app_a/src/app_a_mod2.erl (100%)
 rename {test_projects => test/test_projects}/standard/app_a/src/app_a_no_errors.erl (100%)
 rename {test_projects => test/test_projects}/standard/app_a/src/app_a_no_errors_generated.erl (100%)
 rename {test_projects => test/test_projects}/standard/app_a/src/app_a_no_errors_opted_in.erl (100%)
 rename {test_projects => test/test_projects}/standard/app_a/test/app_a_SUITE.erl (100%)
 rename {test_projects => test/test_projects}/standard/app_a/test/app_a_test_helpers.erl (100%)
 rename {test_projects => test/test_projects}/standard/app_a/test/app_a_test_helpers_not_opted_in.erl (100%)
 rename {test_projects => test/test_projects}/standard/app_a/test/app_test_helpers_no_errors.erl (100%)
 rename {test_projects => test/test_projects}/standard/app_b/src/app_b.app.src (100%)
 rename {test_projects => test/test_projects}/standard/app_b/src/app_b.erl (100%)
 rename {test_projects => test/test_projects}/standard/eqwalizer/src/eqwalizer.app.src (100%)
 rename {test_projects => test/test_projects}/standard/eqwalizer/src/eqwalizer.erl (100%)
 rename {test_projects => test/test_projects}/standard/eqwalizer/src/eqwalizer_specs.erl (100%)
 rename {test_projects => test/test_projects}/standard/erlang_ls.config (100%)
 rename {test_projects => test/test_projects}/standard/rebar.config (100%)
 create mode 100644 test/test_projects/xref/.elp.toml
 rename {test_projects => test/test_projects}/xref/app_a/src/unavailable_type.erl (100%)
 rename {test_projects => test/test_projects}/xref/app_b/src/app_b.erl (100%)
 rename {test_projects => test/test_projects}/xref/app_c/src/app_c.erl (100%)
 rename {test_projects => test/test_projects}/xref/elp_lint_unavailable_type.toml (100%)
 delete mode 100644 test_projects/buck_bad_config/.elp.toml
 delete mode 100644 test_projects/buck_tests/.elp.toml
 delete mode 100644 test_projects/buck_tests_2/.elp.toml
 delete mode 100644 test_projects/codegen_test/.elp.toml
 delete mode 100644 test_projects/diagnostics/.elp.toml
 delete mode 100644 test_projects/end_to_end/.elp.toml
 delete mode 100644 test_projects/eqwalizer_callers/.elp.toml
 delete mode 100644 test_projects/eqwalizer_tests/.elp.toml
 delete mode 100644 test_projects/hierarchical_config/.elp.toml
 delete mode 100644 test_projects/in_place_tests/.elp.toml
 delete mode 100644 test_projects/include_lib_dependency_test/.elp.toml
 delete mode 100644 test_projects/linter/.elp.toml
 delete mode 100644 test_projects/linter_bad_config/.elp.toml
 delete mode 100644 test_projects/linter_bad_config/linter/.elp.toml
 delete mode 100644 test_projects/parse_error/.elp.toml
 delete mode 100644 test_projects/standard/.elp.toml
 delete mode 100644 test_projects/xref/.elp.toml

diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index ac2fc901fa..38ef3c3880 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -288,7 +288,7 @@ mod tests {
         let (_stdout, stderr, code) = elp(args_vec![
             "parse-all",
             "--project",
-            "../../test_projects/standard",
+            "../../test/test_projects/standard",
             "--to",
             tmp.path(),
         ]);
@@ -306,7 +306,7 @@ mod tests {
 
     fn parse_all_complete(project: &str) -> Result<i32> {
         // Just check the command returns.
-        let project_path = format!("../../test_projects/{project}");
+        let project_path = format!("../../test/test_projects/{project}");
         let tmp = Builder::new().prefix("elp_parse_all_").tempdir().unwrap();
         let (_stdout, _stderr, code) = elp(args_vec![
             "parse-all",
@@ -606,7 +606,7 @@ mod tests {
             simple_snapshot(
                 args_vec![
                     "eqwalize-target",
-                    "//whatsapp/elp/test_projects/standard:app_a",
+                    "//whatsapp/elp/test/test_projects/standard:app_a",
                 ],
                 "standard",
                 expect_file!("../resources/test/standard/eqwalize_target_diagnostics.pretty"),
@@ -1444,7 +1444,7 @@ mod tests {
                 "lint",
                 "--experimental",
                 "--config-file",
-                "../../test_projects/linter/does_not_exist.toml"
+                "../../test/test_projects/linter/does_not_exist.toml"
             ],
             "linter",
             expect_file!("../resources/test/linter/parse_elp_lint_custom_config_invalid_output.stdout"),
@@ -1456,7 +1456,7 @@ mod tests {
             &[],
             false,
             Some(expect![[r#"
-                unable to read "../../test_projects/linter/does_not_exist.toml": No such file or directory (os error 2)
+                unable to read "../../test/test_projects/linter/does_not_exist.toml": No such file or directory (os error 2)
             "#]]),
         )
         .expect("bad test");
@@ -1472,7 +1472,7 @@ mod tests {
                 "lint",
                 "--experimental",
                 "--config-file",
-                "../../test_projects/linter/elp_lint_test1.toml"
+                "../../test/test_projects/linter/elp_lint_test1.toml"
             ],
             "linter",
             expect_file!("../resources/test/linter/parse_elp_lint_custom_config_output.stdout"),
@@ -1498,7 +1498,7 @@ mod tests {
                 "lint",
                 "--experimental",
                 "--config-file",
-                "../../test_projects/linter/elp_lint_adhoc.toml",
+                "../../test/test_projects/linter/elp_lint_adhoc.toml",
                 "--module",
                 "app_b",
                 "--apply-fix",
@@ -1529,7 +1529,7 @@ mod tests {
                 "--diagnostic-ignore",
                 "W0011",
                 "--config-file",
-                "../../test_projects/linter/elp_lint_test_ignore.toml"
+                "../../test/test_projects/linter/elp_lint_test_ignore.toml"
             ],
             "linter",
             expect_file!("../resources/test/linter/parse_elp_lint_ignore.stdout"),
@@ -1573,7 +1573,7 @@ mod tests {
             &[],
             false,
             Some(expect![[r#"
-                failed to read "../../test_projects/linter_bad_config/.elp_lint.toml":expected a right bracket, found an identifier at line 6 column 4
+                failed to read "../../test/test_projects/linter_bad_config/.elp_lint.toml":expected a right bracket, found an identifier at line 6 column 4
             "#]]),
         )
         .expect("bad test");
@@ -1625,7 +1625,7 @@ mod tests {
             args_vec![
                 "lint",
                 "--config-file",
-                "../../test_projects/linter/elp_lint_test2.toml"
+                "../../test/test_projects/linter/elp_lint_test2.toml"
             ],
             "linter",
             expect_file!("../resources/test/linter/parse_elp_lint_explicit_enable_output.stdout"),
@@ -1943,7 +1943,7 @@ mod tests {
                 "lint",
                 "--no-stream"
                 "--config-file",
-                "../../test_projects/linter/elp_lint_warnings_as_errors.toml"
+                "../../test/test_projects/linter/elp_lint_warnings_as_errors.toml"
             ],
             "linter",
             expect_file!("../resources/test/linter/warnings_as_errors.stdout"),
@@ -1958,7 +1958,7 @@ mod tests {
             args_vec![
                 "lint",
                 "--config-file",
-                "../../test_projects/linter/elp_lint_custom_function_matches.toml",
+                "../../test/test_projects/linter/elp_lint_custom_function_matches.toml",
                 "--module",
                 "custom_function_matches"
             ],
@@ -1975,7 +1975,7 @@ mod tests {
             args_vec![
                 "lint",
                 "--config-file",
-                "../../test_projects/xref/elp_lint_unavailable_type.toml",
+                "../../test/test_projects/xref/elp_lint_unavailable_type.toml",
                 "--module",
                 "unavailable_type"
             ],
@@ -1992,7 +1992,7 @@ mod tests {
             args_vec![
                 "lint",
                 "--config-file",
-                "../../test_projects/linter/elp_lint_ssr_adhoc.toml",
+                "../../test/test_projects/linter/elp_lint_ssr_adhoc.toml",
             ],
             "linter",
             expect_file!("../resources/test/linter/ssr_ad_hoc.stdout"),
@@ -2007,7 +2007,7 @@ mod tests {
             args_vec![
                 "lint",
                 "--config-file",
-                "../../test_projects/linter/elp_lint_ssr_adhoc_parse_fail.toml",
+                "../../test/test_projects/linter/elp_lint_ssr_adhoc_parse_fail.toml",
             ],
             "linter",
             expect_file!("../resources/test/linter/ssr_ad_hoc_parse_fail.stdout"),
@@ -3099,7 +3099,7 @@ mod tests {
     }
 
     fn project_path(project: &str) -> String {
-        format!("../../test_projects/{project}")
+        format!("../../test/test_projects/{project}")
     }
 
     fn strip_ansi_codes(s: &str) -> String {
diff --git a/crates/elp/src/resources/test/xref/unavailable_type.stdout b/crates/elp/src/resources/test/xref/unavailable_type.stdout
index 7064c359ff..b6338343c0 100644
--- a/crates/elp/src/resources/test/xref/unavailable_type.stdout
+++ b/crates/elp/src/resources/test/xref/unavailable_type.stdout
@@ -1,5 +1,5 @@
 Reporting all diagnostics codes
 module specified: unavailable_type
 Diagnostics reported:
-app_a/src/unavailable_type.erl:10:43-10:58::[Warning] [W0059] The type 'app_c:my_type_c/0' is defined in application 'app_c', but the application is not a dependency of 'app_a' (defined in 'fbcode//whatsapp/elp/test_projects/xref:app_a').
-app_a/src/unavailable_type.erl:6:16-6:31::[Warning] [W0059] The type 'app_c:my_type_c/0' is defined in application 'app_c', but the application is not a dependency of 'app_a' (defined in 'fbcode//whatsapp/elp/test_projects/xref:app_a').
+app_a/src/unavailable_type.erl:10:43-10:58::[Warning] [W0059] The type 'app_c:my_type_c/0' is defined in application 'app_c', but the application is not a dependency of 'app_a' (defined in 'fbcode//whatsapp/elp/test/test_projects/xref:app_a').
+app_a/src/unavailable_type.erl:6:16-6:31::[Warning] [W0059] The type 'app_c:my_type_c/0' is defined in application 'app_c', but the application is not a dependency of 'app_a' (defined in 'fbcode//whatsapp/elp/test/test_projects/xref:app_a').
diff --git a/crates/elp/tests/slow-tests/buck_tests.rs b/crates/elp/tests/slow-tests/buck_tests.rs
index 76540e2515..91f2b234d9 100644
--- a/crates/elp/tests/slow-tests/buck_tests.rs
+++ b/crates/elp/tests/slow-tests/buck_tests.rs
@@ -31,7 +31,7 @@ mod tests {
     #[test]
     #[ignore]
     fn test_success_case() {
-        let path_str = "../../test_projects/buck_tests";
+        let path_str = "../../test/test_projects/buck_tests";
         let path: PathBuf = path_str.into();
         let cli = Fake::default();
 
@@ -76,7 +76,7 @@ mod tests {
     #[test]
     #[ignore]
     fn test_load_buck_targets() {
-        let path_str = "../../test_projects/buck_tests";
+        let path_str = "../../test/test_projects/buck_tests";
         let path: PathBuf = path_str.into();
 
         let (elp_config, buck_config) =
diff --git a/crates/elp/tests/slow-tests/main.rs b/crates/elp/tests/slow-tests/main.rs
index 60167593fd..e256ce2c62 100644
--- a/crates/elp/tests/slow-tests/main.rs
+++ b/crates/elp/tests/slow-tests/main.rs
@@ -36,7 +36,7 @@ use crate::support::diagnostic_project;
 fn test_run_mock_lsp() {
     if cfg!(feature = "buck") {
         let workspace_root = AbsPathBuf::assert(
-            Utf8Path::new(env!("CARGO_WORKSPACE_DIR")).join("test_projects/end_to_end"),
+            Utf8Path::new(env!("CARGO_WORKSPACE_DIR")).join("test/test_projects/end_to_end"),
         );
 
         // Sanity check
@@ -70,7 +70,7 @@ fn test_run_mock_lsp() {
                             }
                           ],
                           "textDocument": {
-                            "uri": "file:///[..]/test_projects/end_to_end/assist_examples/src/head_mismatch.erl",
+                            "uri": "file:///[..]/test/test_projects/end_to_end/assist_examples/src/head_mismatch.erl",
                             "version": 0
                           }
                         }
@@ -99,7 +99,7 @@ fn test_run_mock_lsp() {
                             }
                           ],
                           "textDocument": {
-                            "uri": "file:///[..]/test_projects/end_to_end/assist_examples/src/head_mismatch.erl",
+                            "uri": "file:///[..]/test/test_projects/end_to_end/assist_examples/src/head_mismatch.erl",
                             "version": 0
                           }
                         }
@@ -128,7 +128,7 @@ fn test_run_mock_lsp() {
                             }
                           ],
                           "textDocument": {
-                            "uri": "file:///[..]/test_projects/end_to_end/assist_examples/src/head_mismatch.erl",
+                            "uri": "file:///[..]/test/test_projects/end_to_end/assist_examples/src/head_mismatch.erl",
                             "version": 0
                           }
                         }
@@ -157,7 +157,7 @@ fn test_run_mock_lsp() {
                             }
                           ],
                           "textDocument": {
-                            "uri": "file:///[..]/test_projects/end_to_end/assist_examples/src/head_mismatch.erl",
+                            "uri": "file:///[..]/test/test_projects/end_to_end/assist_examples/src/head_mismatch.erl",
                             "version": 0
                           }
                         }
@@ -175,7 +175,7 @@ fn test_run_mock_lsp() {
 fn test_e2e_eqwalizer_module() {
     if cfg!(feature = "buck") {
         let workspace_root = AbsPathBuf::assert(
-            Utf8Path::new(env!("CARGO_WORKSPACE_DIR")).join("test_projects/standard"),
+            Utf8Path::new(env!("CARGO_WORKSPACE_DIR")).join("test/test_projects/standard"),
         );
 
         // Sanity check
@@ -321,7 +321,7 @@ fn test_e2e_eqwalizer_module() {
                       "source": "eqWAlizer"
                     }
                   ],
-                  "uri": "file:///[..]/test_projects/standard/app_a/src/app_a.erl",
+                  "uri": "file:///[..]/test/test_projects/standard/app_a/src/app_a.erl",
                   "version": 0
                 }"#]],
         );
@@ -334,7 +334,7 @@ fn test_e2e_eqwalizer_module() {
 // #[test]
 // fn test_e2e_eqwalizer_header() {
 //     let workspace_root =
-//         AbsPathBuf::assert(Path::new(env!("CARGO_WORKSPACE_DIR")).join("test_projects/standard"));
+//         AbsPathBuf::assert(Path::new(env!("CARGO_WORKSPACE_DIR")).join("test/test_projects/standard"));
 
 //     // Sanity check
 //     assert!(std::fs::metadata(&workspace_root).is_ok());
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 093ba35986..733347bfcb 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -3564,7 +3564,7 @@ main(X) ->
     #[test]
     fn group_related_diagnostics_elp_only() {
         // Demonstrate that ELP does not pick up a syntax error in the
-        // spec, same code as in test_projects/diagnostics/app_a/src/syntax.erl
+        // spec, same code as in test/test_projects/diagnostics/app_a/src/syntax.erl
         check_diagnostics(
             r#"
              -module(main).
diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 3658a6d783..bb3ec38b5f 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -1655,7 +1655,7 @@ mod tests {
                 .arg("--")
                 .args(generated_args)
                 .arg("--included_targets")
-                .arg("fbcode//whatsapp/elp/test_projects/buck_tests_2/auto_gen/...")
+                .arg("fbcode//whatsapp/elp/test/test_projects/buck_tests_2/auto_gen/...")
                 .output()
                 .unwrap();
             if !output.status.success() {
@@ -1679,15 +1679,15 @@ mod tests {
                 false,
                 expect![[r#"
                 {
-                  "fbcode//whatsapp/elp/test_projects/buck_tests_2/auto_gen/auto_gen_a:auto_gen_a": {
+                  "fbcode//whatsapp/elp/test/test_projects/buck_tests_2/auto_gen/auto_gen_a:auto_gen_a": {
                     "name": "auto_gen_a",
                     "app_name": null,
                     "suite": null,
                     "srcs": [
-                      "/[..]/test_projects/buck_tests_2/auto_gen/auto_gen_a/src/auto_gen_a.erl"
+                      "/[..]/test/test_projects/buck_tests_2/auto_gen/auto_gen_a/src/auto_gen_a.erl"
                     ],
                     "includes": [
-                      "/[..]/test_projects/buck_tests_2/auto_gen/auto_gen_a/include"
+                      "/[..]/test/test_projects/buck_tests_2/auto_gen/auto_gen_a/include"
                     ],
                     "labels": [
                       "user_application"
@@ -1697,7 +1697,7 @@ mod tests {
                     "included_apps": [],
                     "origin": "app"
                   },
-                  "fbcode//whatsapp/elp/test_projects/buck_tests_2/auto_gen/auto_gen_a:generated_srcs": {
+                  "fbcode//whatsapp/elp/test/test_projects/buck_tests_2/auto_gen/auto_gen_a:generated_srcs": {
                     "name": "generated_srcs",
                     "app_name": null,
                     "suite": null,
@@ -1842,21 +1842,21 @@ mod tests {
     fn build_info_buck_bxl_generated_query() {
         if BUCK_TESTS_ENABLED {
             // Note that there is now a value for `srcs` in the
-            // "fbcode//whatsapp/elp/test_projects/buck_tests_2/auto_gen/auto_gen_a:generated_srcs"
+            // "fbcode//whatsapp/elp/test/test_projects/buck_tests_2/auto_gen/auto_gen_a:generated_srcs"
             // target
             check_buck_bxl_query(
                 true,
                 expect![[r#"
                     {
-                      "fbcode//whatsapp/elp/test_projects/buck_tests_2/auto_gen/auto_gen_a:auto_gen_a": {
+                      "fbcode//whatsapp/elp/test/test_projects/buck_tests_2/auto_gen/auto_gen_a:auto_gen_a": {
                         "name": "auto_gen_a",
                         "app_name": null,
                         "suite": null,
                         "srcs": [
-                          "/[..]/test_projects/buck_tests_2/auto_gen/auto_gen_a/src/auto_gen_a.erl"
+                          "/[..]/test/test_projects/buck_tests_2/auto_gen/auto_gen_a/src/auto_gen_a.erl"
                         ],
                         "includes": [
-                          "/[..]/test_projects/buck_tests_2/auto_gen/auto_gen_a/include"
+                          "/[..]/test/test_projects/buck_tests_2/auto_gen/auto_gen_a/include"
                         ],
                         "labels": [
                           "user_application"
@@ -1866,12 +1866,12 @@ mod tests {
                         "included_apps": [],
                         "origin": "app"
                       },
-                      "fbcode//whatsapp/elp/test_projects/buck_tests_2/auto_gen/auto_gen_a:generated_srcs": {
+                      "fbcode//whatsapp/elp/test/test_projects/buck_tests_2/auto_gen/auto_gen_a:generated_srcs": {
                         "name": "generated_srcs",
                         "app_name": null,
                         "suite": null,
                         "srcs": [
-                          "/[..]/test_projects/buck_tests_2/auto_gen/auto_gen_a/out/pretend_generated.erl"
+                          "/[..]/test/test_projects/buck_tests_2/auto_gen/auto_gen_a/out/pretend_generated.erl"
                         ],
                         "includes": [],
                         "labels": [
diff --git a/test_projects/.gitignore b/test/test_projects/.gitignore
similarity index 100%
rename from test_projects/.gitignore
rename to test/test_projects/.gitignore
diff --git a/test_projects/README.md b/test/test_projects/README.md
similarity index 100%
rename from test_projects/README.md
rename to test/test_projects/README.md
diff --git a/test/test_projects/buck_bad_config/.elp.toml b/test/test_projects/buck_bad_config/.elp.toml
new file mode 100644
index 0000000000..a4d80e289f
--- /dev/null
+++ b/test/test_projects/buck_bad_config/.elp.toml
@@ -0,0 +1,8 @@
+[buck]
+enabled = true
+build_deps = false
+included_targets = [ "fbcode//whatsapp/elp/test/test_projects/buck_bad_config/..." ]
+source_root = "whatsapp/elp/test/test_projects/buck_bad_config"
+
+[eqwalizer]
+enable_all = false
diff --git a/test_projects/buck_bad_config/src/bad_app.erl b/test/test_projects/buck_bad_config/src/bad_app.erl
similarity index 100%
rename from test_projects/buck_bad_config/src/bad_app.erl
rename to test/test_projects/buck_bad_config/src/bad_app.erl
diff --git a/test/test_projects/buck_tests/.elp.toml b/test/test_projects/buck_tests/.elp.toml
new file mode 100644
index 0000000000..0fbba8f0d6
--- /dev/null
+++ b/test/test_projects/buck_tests/.elp.toml
@@ -0,0 +1,9 @@
+[buck]
+enabled = true
+build_deps = false
+included_targets = [ "fbcode//whatsapp/elp/test/test_projects/buck_tests/..." ]
+excluded_targets = [ "fbcode//whatsapp/elp/test/test_projects/buck_tests:test_elp_ignored" ]
+source_root = "whatsapp/elp/test/test_projects/buck_tests"
+
+[eqwalizer]
+enable_all = false
diff --git a/test_projects/buck_tests/TARGETS.v2_ b/test/test_projects/buck_tests/TARGETS.v2_
similarity index 100%
rename from test_projects/buck_tests/TARGETS.v2_
rename to test/test_projects/buck_tests/TARGETS.v2_
diff --git a/test_projects/buck_tests/test_elp/TARGETS.v2_ b/test/test_projects/buck_tests/test_elp/TARGETS.v2_
similarity index 76%
rename from test_projects/buck_tests/test_elp/TARGETS.v2_
rename to test/test_projects/buck_tests/test_elp/TARGETS.v2_
index 83089813da..528f2dbc2a 100644
--- a/test_projects/buck_tests/test_elp/TARGETS.v2_
+++ b/test/test_projects/buck_tests/test_elp/TARGETS.v2_
@@ -7,11 +7,11 @@ erlang_application(
     ]),
     app_src = "src/test_elp.app.src",
     applications = [
-        "//whatsapp/elp/test_projects/buck_tests/test_elp_direct_dep:test_elp_direct_dep",
-        "//whatsapp/elp/test_projects/buck_tests:test_elp_no_private_headers",
-        "//whatsapp/elp/test_projects/buck_tests:test_elp_no_public_headers",
-        "//whatsapp/elp/test_projects/buck_tests:test_elp_flat_outside_target",
-        "//whatsapp/elp/test_projects/buck_tests/test_elp_flat_inside_target:test_elp_flat_inside_target",
+        "//whatsapp/elp/test/test_projects/buck_tests/test_elp_direct_dep:test_elp_direct_dep",
+        "//whatsapp/elp/test/test_projects/buck_tests:test_elp_no_private_headers",
+        "//whatsapp/elp/test/test_projects/buck_tests:test_elp_no_public_headers",
+        "//whatsapp/elp/test/test_projects/buck_tests:test_elp_flat_outside_target",
+        "//whatsapp/elp/test/test_projects/buck_tests/test_elp_flat_inside_target:test_elp_flat_inside_target",
     ],
     includes = glob(["include/*.hrl"]),
     version = "1.0.0",
diff --git a/test_projects/buck_tests/test_elp/include/test_elp.hrl b/test/test_projects/buck_tests/test_elp/include/test_elp.hrl
similarity index 100%
rename from test_projects/buck_tests/test_elp/include/test_elp.hrl
rename to test/test_projects/buck_tests/test_elp/include/test_elp.hrl
diff --git a/test_projects/buck_tests/test_elp/src/test_elp.app.src b/test/test_projects/buck_tests/test_elp/src/test_elp.app.src
similarity index 100%
rename from test_projects/buck_tests/test_elp/src/test_elp.app.src
rename to test/test_projects/buck_tests/test_elp/src/test_elp.app.src
diff --git a/test_projects/buck_tests/test_elp/src/test_elp.erl b/test/test_projects/buck_tests/test_elp/src/test_elp.erl
similarity index 100%
rename from test_projects/buck_tests/test_elp/src/test_elp.erl
rename to test/test_projects/buck_tests/test_elp/src/test_elp.erl
diff --git a/test_projects/buck_tests/test_elp/test/test_elp_SUITE.erl b/test/test_projects/buck_tests/test_elp/test/test_elp_SUITE.erl
similarity index 100%
rename from test_projects/buck_tests/test_elp/test/test_elp_SUITE.erl
rename to test/test_projects/buck_tests/test_elp/test/test_elp_SUITE.erl
diff --git a/test_projects/buck_tests/test_elp/test/test_elp_SUITE_data/handle_update_test1.json b/test/test_projects/buck_tests/test_elp/test/test_elp_SUITE_data/handle_update_test1.json
similarity index 100%
rename from test_projects/buck_tests/test_elp/test/test_elp_SUITE_data/handle_update_test1.json
rename to test/test_projects/buck_tests/test_elp/test/test_elp_SUITE_data/handle_update_test1.json
diff --git a/test_projects/buck_tests/test_elp/test/test_elp_SUITE_data/handle_update_test2.json b/test/test_projects/buck_tests/test_elp/test/test_elp_SUITE_data/handle_update_test2.json
similarity index 100%
rename from test_projects/buck_tests/test_elp/test/test_elp_SUITE_data/handle_update_test2.json
rename to test/test_projects/buck_tests/test_elp/test/test_elp_SUITE_data/handle_update_test2.json
diff --git a/test_projects/buck_tests/test_elp/test/test_elp_SUITE_data/untracked_header.hrl b/test/test_projects/buck_tests/test_elp/test/test_elp_SUITE_data/untracked_header.hrl
similarity index 100%
rename from test_projects/buck_tests/test_elp/test/test_elp_SUITE_data/untracked_header.hrl
rename to test/test_projects/buck_tests/test_elp/test/test_elp_SUITE_data/untracked_header.hrl
diff --git a/test_projects/buck_tests/test_elp/test/test_elp_SUITE_data/untracked_module.erl b/test/test_projects/buck_tests/test_elp/test/test_elp_SUITE_data/untracked_module.erl
similarity index 100%
rename from test_projects/buck_tests/test_elp/test/test_elp_SUITE_data/untracked_module.erl
rename to test/test_projects/buck_tests/test_elp/test/test_elp_SUITE_data/untracked_module.erl
diff --git a/test_projects/buck_tests/test_elp/test/test_elp_test_utils.erl b/test/test_projects/buck_tests/test_elp/test/test_elp_test_utils.erl
similarity index 100%
rename from test_projects/buck_tests/test_elp/test/test_elp_test_utils.erl
rename to test/test_projects/buck_tests/test_elp/test/test_elp_test_utils.erl
diff --git a/test_projects/buck_tests/test_elp/test/test_elp_test_utils.hrl b/test/test_projects/buck_tests/test_elp/test/test_elp_test_utils.hrl
similarity index 100%
rename from test_projects/buck_tests/test_elp/test/test_elp_test_utils.hrl
rename to test/test_projects/buck_tests/test_elp/test/test_elp_test_utils.hrl
diff --git a/test_projects/buck_tests/test_elp_direct_dep/TARGETS.v2_ b/test/test_projects/buck_tests/test_elp_direct_dep/TARGETS.v2_
similarity index 61%
rename from test_projects/buck_tests/test_elp_direct_dep/TARGETS.v2_
rename to test/test_projects/buck_tests/test_elp_direct_dep/TARGETS.v2_
index d0fea8149b..dd46a58842 100644
--- a/test_projects/buck_tests/test_elp_direct_dep/TARGETS.v2_
+++ b/test/test_projects/buck_tests/test_elp_direct_dep/TARGETS.v2_
@@ -5,10 +5,10 @@ erlang_application(
         "src/*.hrl",
     ]),
     applications = [
-        "//whatsapp/elp/test_projects/buck_tests/test_elp_transitive_dep:test_elp_transitive_dep",
+        "//whatsapp/elp/test/test_projects/buck_tests/test_elp_transitive_dep:test_elp_transitive_dep",
     ],
     extra_includes = [
-        "//whatsapp/elp/test_projects/buck_tests/test_elp:test_elp",
+        "//whatsapp/elp/test/test_projects/buck_tests/test_elp:test_elp",
     ],
     includes = glob(["include/*.hrl"]),
     version = "1.0.0",
diff --git a/test_projects/buck_tests/test_elp_direct_dep/include/test_elp_direct_dep.hrl b/test/test_projects/buck_tests/test_elp_direct_dep/include/test_elp_direct_dep.hrl
similarity index 100%
rename from test_projects/buck_tests/test_elp_direct_dep/include/test_elp_direct_dep.hrl
rename to test/test_projects/buck_tests/test_elp_direct_dep/include/test_elp_direct_dep.hrl
diff --git a/test_projects/buck_tests/test_elp_direct_dep/src/test_elp_direct_dep.erl b/test/test_projects/buck_tests/test_elp_direct_dep/src/test_elp_direct_dep.erl
similarity index 100%
rename from test_projects/buck_tests/test_elp_direct_dep/src/test_elp_direct_dep.erl
rename to test/test_projects/buck_tests/test_elp_direct_dep/src/test_elp_direct_dep.erl
diff --git a/test_projects/buck_tests/test_elp_direct_dep/src/test_elp_direct_dep_private.hrl b/test/test_projects/buck_tests/test_elp_direct_dep/src/test_elp_direct_dep_private.hrl
similarity index 100%
rename from test_projects/buck_tests/test_elp_direct_dep/src/test_elp_direct_dep_private.hrl
rename to test/test_projects/buck_tests/test_elp_direct_dep/src/test_elp_direct_dep_private.hrl
diff --git a/test_projects/buck_tests/test_elp_flat_inside_target/TARGETS.v2_ b/test/test_projects/buck_tests/test_elp_flat_inside_target/TARGETS.v2_
similarity index 100%
rename from test_projects/buck_tests/test_elp_flat_inside_target/TARGETS.v2_
rename to test/test_projects/buck_tests/test_elp_flat_inside_target/TARGETS.v2_
diff --git a/test_projects/buck_tests/test_elp_flat_inside_target/test_elp_flat_inside_target.erl b/test/test_projects/buck_tests/test_elp_flat_inside_target/test_elp_flat_inside_target.erl
similarity index 100%
rename from test_projects/buck_tests/test_elp_flat_inside_target/test_elp_flat_inside_target.erl
rename to test/test_projects/buck_tests/test_elp_flat_inside_target/test_elp_flat_inside_target.erl
diff --git a/test_projects/buck_tests/test_elp_flat_inside_target/test_elp_flat_inside_target.hrl b/test/test_projects/buck_tests/test_elp_flat_inside_target/test_elp_flat_inside_target.hrl
similarity index 100%
rename from test_projects/buck_tests/test_elp_flat_inside_target/test_elp_flat_inside_target.hrl
rename to test/test_projects/buck_tests/test_elp_flat_inside_target/test_elp_flat_inside_target.hrl
diff --git a/test_projects/buck_tests/test_elp_flat_outside_target/test_elp_flat_outside_target.erl b/test/test_projects/buck_tests/test_elp_flat_outside_target/test_elp_flat_outside_target.erl
similarity index 100%
rename from test_projects/buck_tests/test_elp_flat_outside_target/test_elp_flat_outside_target.erl
rename to test/test_projects/buck_tests/test_elp_flat_outside_target/test_elp_flat_outside_target.erl
diff --git a/test_projects/buck_tests/test_elp_flat_outside_target/test_elp_flat_outside_target.hrl b/test/test_projects/buck_tests/test_elp_flat_outside_target/test_elp_flat_outside_target.hrl
similarity index 100%
rename from test_projects/buck_tests/test_elp_flat_outside_target/test_elp_flat_outside_target.hrl
rename to test/test_projects/buck_tests/test_elp_flat_outside_target/test_elp_flat_outside_target.hrl
diff --git a/test_projects/buck_tests/test_elp_ignored/test_elp_ignored.erl b/test/test_projects/buck_tests/test_elp_ignored/test_elp_ignored.erl
similarity index 100%
rename from test_projects/buck_tests/test_elp_ignored/test_elp_ignored.erl
rename to test/test_projects/buck_tests/test_elp_ignored/test_elp_ignored.erl
diff --git a/test_projects/buck_tests/test_elp_no_private_headers/include/test_elp_no_private_headers.hrl b/test/test_projects/buck_tests/test_elp_no_private_headers/include/test_elp_no_private_headers.hrl
similarity index 100%
rename from test_projects/buck_tests/test_elp_no_private_headers/include/test_elp_no_private_headers.hrl
rename to test/test_projects/buck_tests/test_elp_no_private_headers/include/test_elp_no_private_headers.hrl
diff --git a/test_projects/buck_tests/test_elp_no_private_headers/src/test_elp_no_private_headers.erl b/test/test_projects/buck_tests/test_elp_no_private_headers/src/test_elp_no_private_headers.erl
similarity index 100%
rename from test_projects/buck_tests/test_elp_no_private_headers/src/test_elp_no_private_headers.erl
rename to test/test_projects/buck_tests/test_elp_no_private_headers/src/test_elp_no_private_headers.erl
diff --git a/test_projects/buck_tests/test_elp_no_public_headers/src/test_elp_no_headers.erl b/test/test_projects/buck_tests/test_elp_no_public_headers/src/test_elp_no_headers.erl
similarity index 100%
rename from test_projects/buck_tests/test_elp_no_public_headers/src/test_elp_no_headers.erl
rename to test/test_projects/buck_tests/test_elp_no_public_headers/src/test_elp_no_headers.erl
diff --git a/test_projects/buck_tests/test_elp_transitive_dep/TARGETS.v2_ b/test/test_projects/buck_tests/test_elp_transitive_dep/TARGETS.v2_
similarity index 100%
rename from test_projects/buck_tests/test_elp_transitive_dep/TARGETS.v2_
rename to test/test_projects/buck_tests/test_elp_transitive_dep/TARGETS.v2_
diff --git a/test_projects/buck_tests/test_elp_transitive_dep/include/test_elp_transitive_dep.hrl b/test/test_projects/buck_tests/test_elp_transitive_dep/include/test_elp_transitive_dep.hrl
similarity index 100%
rename from test_projects/buck_tests/test_elp_transitive_dep/include/test_elp_transitive_dep.hrl
rename to test/test_projects/buck_tests/test_elp_transitive_dep/include/test_elp_transitive_dep.hrl
diff --git a/test_projects/buck_tests/test_elp_transitive_dep/src/test_elp_transitive_dep.erl b/test/test_projects/buck_tests/test_elp_transitive_dep/src/test_elp_transitive_dep.erl
similarity index 100%
rename from test_projects/buck_tests/test_elp_transitive_dep/src/test_elp_transitive_dep.erl
rename to test/test_projects/buck_tests/test_elp_transitive_dep/src/test_elp_transitive_dep.erl
diff --git a/test_projects/buck_tests/test_elp_transitive_dep/src/test_elp_transitive_dep_private.hrl b/test/test_projects/buck_tests/test_elp_transitive_dep/src/test_elp_transitive_dep_private.hrl
similarity index 100%
rename from test_projects/buck_tests/test_elp_transitive_dep/src/test_elp_transitive_dep_private.hrl
rename to test/test_projects/buck_tests/test_elp_transitive_dep/src/test_elp_transitive_dep_private.hrl
diff --git a/test/test_projects/buck_tests_2/.elp.toml b/test/test_projects/buck_tests_2/.elp.toml
new file mode 100644
index 0000000000..102f44c3f5
--- /dev/null
+++ b/test/test_projects/buck_tests_2/.elp.toml
@@ -0,0 +1,12 @@
+[buck]
+enabled = true
+build_deps = false
+included_targets = [
+    "fbcode//whatsapp/elp/test/test_projects/buck_tests_2/util/app_a/...",
+    "fbcode//whatsapp/elp/test/test_projects/buck_tests_2:check_include"
+    ]
+excluded_targets = [ "fbcode//whatsapp/elp/test/test_projects/buck_tests_2:test_elp_ignored" ]
+source_root = "whatsapp/elp/test/test_projects/buck_tests_2"
+
+[eqwalizer]
+enable_all = false
diff --git a/test_projects/buck_tests_2/auto_gen/auto_gen_a/include/auto_gen_a.hrl b/test/test_projects/buck_tests_2/auto_gen/auto_gen_a/include/auto_gen_a.hrl
similarity index 100%
rename from test_projects/buck_tests_2/auto_gen/auto_gen_a/include/auto_gen_a.hrl
rename to test/test_projects/buck_tests_2/auto_gen/auto_gen_a/include/auto_gen_a.hrl
diff --git a/test_projects/buck_tests_2/auto_gen/auto_gen_a/out/pretend_generated.erl b/test/test_projects/buck_tests_2/auto_gen/auto_gen_a/out/pretend_generated.erl
similarity index 100%
rename from test_projects/buck_tests_2/auto_gen/auto_gen_a/out/pretend_generated.erl
rename to test/test_projects/buck_tests_2/auto_gen/auto_gen_a/out/pretend_generated.erl
diff --git a/test_projects/buck_tests_2/auto_gen/auto_gen_a/src/auto_gen_a.erl b/test/test_projects/buck_tests_2/auto_gen/auto_gen_a/src/auto_gen_a.erl
similarity index 100%
rename from test_projects/buck_tests_2/auto_gen/auto_gen_a/src/auto_gen_a.erl
rename to test/test_projects/buck_tests_2/auto_gen/auto_gen_a/src/auto_gen_a.erl
diff --git a/test_projects/buck_tests_2/check_include/src/top_includer.erl b/test/test_projects/buck_tests_2/check_include/src/top_includer.erl
similarity index 100%
rename from test_projects/buck_tests_2/check_include/src/top_includer.erl
rename to test/test_projects/buck_tests_2/check_include/src/top_includer.erl
diff --git a/test_projects/buck_tests_2/check_include_separate_1/include/include_with_bug.hrl b/test/test_projects/buck_tests_2/check_include_separate_1/include/include_with_bug.hrl
similarity index 100%
rename from test_projects/buck_tests_2/check_include_separate_1/include/include_with_bug.hrl
rename to test/test_projects/buck_tests_2/check_include_separate_1/include/include_with_bug.hrl
diff --git a/test_projects/buck_tests_2/check_include_separate_1/include/top_includer.hrl b/test/test_projects/buck_tests_2/check_include_separate_1/include/top_includer.hrl
similarity index 100%
rename from test_projects/buck_tests_2/check_include_separate_1/include/top_includer.hrl
rename to test/test_projects/buck_tests_2/check_include_separate_1/include/top_includer.hrl
diff --git a/test_projects/buck_tests_2/check_include_separate_2/include/separate_include.hrl b/test/test_projects/buck_tests_2/check_include_separate_2/include/separate_include.hrl
similarity index 100%
rename from test_projects/buck_tests_2/check_include_separate_2/include/separate_include.hrl
rename to test/test_projects/buck_tests_2/check_include_separate_2/include/separate_include.hrl
diff --git a/test_projects/buck_tests_2/generated/out/generated_header.hrl b/test/test_projects/buck_tests_2/generated/out/generated_header.hrl
similarity index 100%
rename from test_projects/buck_tests_2/generated/out/generated_header.hrl
rename to test/test_projects/buck_tests_2/generated/out/generated_header.hrl
diff --git a/test_projects/buck_tests_2/util/app_a/include/junk.hrl b/test/test_projects/buck_tests_2/util/app_a/include/junk.hrl
similarity index 100%
rename from test_projects/buck_tests_2/util/app_a/include/junk.hrl
rename to test/test_projects/buck_tests_2/util/app_a/include/junk.hrl
diff --git a/test_projects/buck_tests_2/util/app_a/src/app_a.erl b/test/test_projects/buck_tests_2/util/app_a/src/app_a.erl
similarity index 100%
rename from test_projects/buck_tests_2/util/app_a/src/app_a.erl
rename to test/test_projects/buck_tests_2/util/app_a/src/app_a.erl
diff --git a/test/test_projects/codegen_test/.elp.toml b/test/test_projects/codegen_test/.elp.toml
new file mode 100644
index 0000000000..52ec390ccb
--- /dev/null
+++ b/test/test_projects/codegen_test/.elp.toml
@@ -0,0 +1,8 @@
+[buck]
+enabled = true
+build_deps = true
+included_targets = [ "fbcode//whatsapp/elp/test/test_projects/codegen_test:codegen_test_app" ]
+source_root = "whatsapp/elp/test/test_projects/codegen_test"
+
+[eqwalizer]
+enable_all = true
diff --git a/test_projects/codegen_test/README.md b/test/test_projects/codegen_test/README.md
similarity index 93%
rename from test_projects/codegen_test/README.md
rename to test/test_projects/codegen_test/README.md
index 1af599454c..061fb1914c 100644
--- a/test_projects/codegen_test/README.md
+++ b/test/test_projects/codegen_test/README.md
@@ -111,13 +111,13 @@ get_user_by_id(UserId) ->
 
 ```bash
 # Build just the code generation step
-buck2 build fbcode//whatsapp/elp/test_projects/codegen_test:example_service_types_erl
+buck2 build fbcode//whatsapp/elp/test/test_projects/codegen_test:example_service_types_erl
 
 # Build the application (automatically runs code generation)
-buck2 build fbcode//whatsapp/elp/test_projects/codegen_test:codegen_test_app
+buck2 build fbcode//whatsapp/elp/test/test_projects/codegen_test:codegen_test_app
 
 # Run tests
-buck2 test fbcode//whatsapp/elp/test_projects/codegen_test:codegen_test_SUITE
+buck2 test fbcode//whatsapp/elp/test/test_projects/codegen_test:codegen_test_SUITE
 
 # View generated files in buck-out
 find buck-out -path "*codegen_test*" -name "example_service_*.erl"
diff --git a/test_projects/codegen_test/app_a/src/codegen_test.app.src b/test/test_projects/codegen_test/app_a/src/codegen_test.app.src
similarity index 100%
rename from test_projects/codegen_test/app_a/src/codegen_test.app.src
rename to test/test_projects/codegen_test/app_a/src/codegen_test.app.src
diff --git a/test_projects/codegen_test/app_a/src/example_usage.erl b/test/test_projects/codegen_test/app_a/src/example_usage.erl
similarity index 100%
rename from test_projects/codegen_test/app_a/src/example_usage.erl
rename to test/test_projects/codegen_test/app_a/src/example_usage.erl
diff --git a/test_projects/codegen_test/app_a/test/codegen_test_SUITE.erl b/test/test_projects/codegen_test/app_a/test/codegen_test_SUITE.erl
similarity index 100%
rename from test_projects/codegen_test/app_a/test/codegen_test_SUITE.erl
rename to test/test_projects/codegen_test/app_a/test/codegen_test_SUITE.erl
diff --git a/test_projects/codegen_test/generated/example_service_client.erl b/test/test_projects/codegen_test/generated/example_service_client.erl
similarity index 100%
rename from test_projects/codegen_test/generated/example_service_client.erl
rename to test/test_projects/codegen_test/generated/example_service_client.erl
diff --git a/test_projects/codegen_test/generated/example_service_types.erl b/test/test_projects/codegen_test/generated/example_service_types.erl
similarity index 100%
rename from test_projects/codegen_test/generated/example_service_types.erl
rename to test/test_projects/codegen_test/generated/example_service_types.erl
diff --git a/test_projects/codegen_test/generated/example_service_types.hrl b/test/test_projects/codegen_test/generated/example_service_types.hrl
similarity index 100%
rename from test_projects/codegen_test/generated/example_service_types.hrl
rename to test/test_projects/codegen_test/generated/example_service_types.hrl
diff --git a/test_projects/codegen_test/templates/example_service_client.erl b/test/test_projects/codegen_test/templates/example_service_client.erl
similarity index 100%
rename from test_projects/codegen_test/templates/example_service_client.erl
rename to test/test_projects/codegen_test/templates/example_service_client.erl
diff --git a/test_projects/codegen_test/templates/example_service_types.erl b/test/test_projects/codegen_test/templates/example_service_types.erl
similarity index 100%
rename from test_projects/codegen_test/templates/example_service_types.erl
rename to test/test_projects/codegen_test/templates/example_service_types.erl
diff --git a/test_projects/codegen_test/templates/example_service_types.hrl b/test/test_projects/codegen_test/templates/example_service_types.hrl
similarity index 100%
rename from test_projects/codegen_test/templates/example_service_types.hrl
rename to test/test_projects/codegen_test/templates/example_service_types.hrl
diff --git a/test_projects/custom_build_tool/.elp.toml b/test/test_projects/custom_build_tool/.elp.toml
similarity index 100%
rename from test_projects/custom_build_tool/.elp.toml
rename to test/test_projects/custom_build_tool/.elp.toml
diff --git a/test_projects/custom_build_tool/apps/app_a/include/app_a.hrl b/test/test_projects/custom_build_tool/apps/app_a/include/app_a.hrl
similarity index 100%
rename from test_projects/custom_build_tool/apps/app_a/include/app_a.hrl
rename to test/test_projects/custom_build_tool/apps/app_a/include/app_a.hrl
diff --git a/test_projects/custom_build_tool/apps/app_a/src/app_a.erl b/test/test_projects/custom_build_tool/apps/app_a/src/app_a.erl
similarity index 100%
rename from test_projects/custom_build_tool/apps/app_a/src/app_a.erl
rename to test/test_projects/custom_build_tool/apps/app_a/src/app_a.erl
diff --git a/test_projects/custom_build_tool/apps/app_b/src/app_b.erl b/test/test_projects/custom_build_tool/apps/app_b/src/app_b.erl
similarity index 100%
rename from test_projects/custom_build_tool/apps/app_b/src/app_b.erl
rename to test/test_projects/custom_build_tool/apps/app_b/src/app_b.erl
diff --git a/test/test_projects/diagnostics/.elp.toml b/test/test_projects/diagnostics/.elp.toml
new file mode 100644
index 0000000000..44c9516105
--- /dev/null
+++ b/test/test_projects/diagnostics/.elp.toml
@@ -0,0 +1,8 @@
+[buck]
+enabled = true
+build_deps = false
+included_targets = [ "fbcode//whatsapp/elp/test/test_projects/diagnostics/..." ]
+source_root = "whatsapp/elp/test/test_projects/diagnostics"
+
+[eqwalizer]
+enable_all = false
diff --git a/test_projects/diagnostics/README.md b/test/test_projects/diagnostics/README.md
similarity index 100%
rename from test_projects/diagnostics/README.md
rename to test/test_projects/diagnostics/README.md
diff --git a/test_projects/diagnostics/app_a/extra/app_a.erl b/test/test_projects/diagnostics/app_a/extra/app_a.erl
similarity index 100%
rename from test_projects/diagnostics/app_a/extra/app_a.erl
rename to test/test_projects/diagnostics/app_a/extra/app_a.erl
diff --git a/test_projects/diagnostics/app_a/include/app_a.hrl b/test/test_projects/diagnostics/app_a/include/app_a.hrl
similarity index 100%
rename from test_projects/diagnostics/app_a/include/app_a.hrl
rename to test/test_projects/diagnostics/app_a/include/app_a.hrl
diff --git a/test_projects/diagnostics/app_a/include/broken_diagnostics.hrl b/test/test_projects/diagnostics/app_a/include/broken_diagnostics.hrl
similarity index 100%
rename from test_projects/diagnostics/app_a/include/broken_diagnostics.hrl
rename to test/test_projects/diagnostics/app_a/include/broken_diagnostics.hrl
diff --git a/test_projects/diagnostics/app_a/include/diagnostics.hrl b/test/test_projects/diagnostics/app_a/include/diagnostics.hrl
similarity index 100%
rename from test_projects/diagnostics/app_a/include/diagnostics.hrl
rename to test/test_projects/diagnostics/app_a/include/diagnostics.hrl
diff --git a/test_projects/diagnostics/app_a/src/app_a.app.src b/test/test_projects/diagnostics/app_a/src/app_a.app.src
similarity index 100%
rename from test_projects/diagnostics/app_a/src/app_a.app.src
rename to test/test_projects/diagnostics/app_a/src/app_a.app.src
diff --git a/test_projects/diagnostics/app_a/src/app_a.erl b/test/test_projects/diagnostics/app_a/src/app_a.erl
similarity index 100%
rename from test_projects/diagnostics/app_a/src/app_a.erl
rename to test/test_projects/diagnostics/app_a/src/app_a.erl
diff --git a/test_projects/diagnostics/app_a/src/broken_parse_trans.erl b/test/test_projects/diagnostics/app_a/src/broken_parse_trans.erl
similarity index 100%
rename from test_projects/diagnostics/app_a/src/broken_parse_trans.erl
rename to test/test_projects/diagnostics/app_a/src/broken_parse_trans.erl
diff --git a/test_projects/diagnostics/app_a/src/cascading.erl b/test/test_projects/diagnostics/app_a/src/cascading.erl
similarity index 100%
rename from test_projects/diagnostics/app_a/src/cascading.erl
rename to test/test_projects/diagnostics/app_a/src/cascading.erl
diff --git a/test_projects/diagnostics/app_a/src/crlf.erl b/test/test_projects/diagnostics/app_a/src/crlf.erl
similarity index 100%
rename from test_projects/diagnostics/app_a/src/crlf.erl
rename to test/test_projects/diagnostics/app_a/src/crlf.erl
diff --git a/test_projects/diagnostics/app_a/src/diagnostics.erl b/test/test_projects/diagnostics/app_a/src/diagnostics.erl
similarity index 100%
rename from test_projects/diagnostics/app_a/src/diagnostics.erl
rename to test/test_projects/diagnostics/app_a/src/diagnostics.erl
diff --git a/test_projects/diagnostics/app_a/src/diagnostics.escript b/test/test_projects/diagnostics/app_a/src/diagnostics.escript
similarity index 100%
rename from test_projects/diagnostics/app_a/src/diagnostics.escript
rename to test/test_projects/diagnostics/app_a/src/diagnostics.escript
diff --git a/test_projects/diagnostics/app_a/src/diagnostics_errors.escript b/test/test_projects/diagnostics/app_a/src/diagnostics_errors.escript
similarity index 100%
rename from test_projects/diagnostics/app_a/src/diagnostics_errors.escript
rename to test/test_projects/diagnostics/app_a/src/diagnostics_errors.escript
diff --git a/test_projects/diagnostics/app_a/src/diagnostics_warnings.escript b/test/test_projects/diagnostics/app_a/src/diagnostics_warnings.escript
similarity index 100%
rename from test_projects/diagnostics/app_a/src/diagnostics_warnings.escript
rename to test/test_projects/diagnostics/app_a/src/diagnostics_warnings.escript
diff --git a/test_projects/diagnostics/app_a/src/erlang_diagnostics_errors_gen.erl b/test/test_projects/diagnostics/app_a/src/erlang_diagnostics_errors_gen.erl
similarity index 100%
rename from test_projects/diagnostics/app_a/src/erlang_diagnostics_errors_gen.erl
rename to test/test_projects/diagnostics/app_a/src/erlang_diagnostics_errors_gen.erl
diff --git a/test_projects/diagnostics/app_a/src/file_attribute.erl b/test/test_projects/diagnostics/app_a/src/file_attribute.erl
similarity index 100%
rename from test_projects/diagnostics/app_a/src/file_attribute.erl
rename to test/test_projects/diagnostics/app_a/src/file_attribute.erl
diff --git a/test_projects/diagnostics/app_a/src/lint_recursive.erl b/test/test_projects/diagnostics/app_a/src/lint_recursive.erl
similarity index 100%
rename from test_projects/diagnostics/app_a/src/lint_recursive.erl
rename to test/test_projects/diagnostics/app_a/src/lint_recursive.erl
diff --git a/test_projects/diagnostics/app_a/src/lints.erl b/test/test_projects/diagnostics/app_a/src/lints.erl
similarity index 100%
rename from test_projects/diagnostics/app_a/src/lints.erl
rename to test/test_projects/diagnostics/app_a/src/lints.erl
diff --git a/test_projects/diagnostics/app_a/src/otp27_docstrings.erl b/test/test_projects/diagnostics/app_a/src/otp27_docstrings.erl
similarity index 100%
rename from test_projects/diagnostics/app_a/src/otp27_docstrings.erl
rename to test/test_projects/diagnostics/app_a/src/otp27_docstrings.erl
diff --git a/test_projects/diagnostics/app_a/src/otp27_sigils.erl b/test/test_projects/diagnostics/app_a/src/otp27_sigils.erl
similarity index 100%
rename from test_projects/diagnostics/app_a/src/otp27_sigils.erl
rename to test/test_projects/diagnostics/app_a/src/otp27_sigils.erl
diff --git a/test_projects/diagnostics/app_a/src/otp_7655.erl b/test/test_projects/diagnostics/app_a/src/otp_7655.erl
similarity index 100%
rename from test_projects/diagnostics/app_a/src/otp_7655.erl
rename to test/test_projects/diagnostics/app_a/src/otp_7655.erl
diff --git a/test_projects/diagnostics/app_a/src/parse_error_a_cascade.erl b/test/test_projects/diagnostics/app_a/src/parse_error_a_cascade.erl
similarity index 100%
rename from test_projects/diagnostics/app_a/src/parse_error_a_cascade.erl
rename to test/test_projects/diagnostics/app_a/src/parse_error_a_cascade.erl
diff --git a/test_projects/diagnostics/app_a/src/suppressed.erl b/test/test_projects/diagnostics/app_a/src/suppressed.erl
similarity index 100%
rename from test_projects/diagnostics/app_a/src/suppressed.erl
rename to test/test_projects/diagnostics/app_a/src/suppressed.erl
diff --git a/test_projects/diagnostics/app_a/src/syntax.erl b/test/test_projects/diagnostics/app_a/src/syntax.erl
similarity index 100%
rename from test_projects/diagnostics/app_a/src/syntax.erl
rename to test/test_projects/diagnostics/app_a/src/syntax.erl
diff --git a/test_projects/diagnostics/app_a/test/app_a_SUITE.erl b/test/test_projects/diagnostics/app_a/test/app_a_SUITE.erl
similarity index 100%
rename from test_projects/diagnostics/app_a/test/app_a_SUITE.erl
rename to test/test_projects/diagnostics/app_a/test/app_a_SUITE.erl
diff --git a/test_projects/diagnostics/erlang_ls.config b/test/test_projects/diagnostics/erlang_ls.config
similarity index 100%
rename from test_projects/diagnostics/erlang_ls.config
rename to test/test_projects/diagnostics/erlang_ls.config
diff --git a/test_projects/diagnostics/rebar.config b/test/test_projects/diagnostics/rebar.config
similarity index 100%
rename from test_projects/diagnostics/rebar.config
rename to test/test_projects/diagnostics/rebar.config
diff --git a/test_projects/diagnostics/test_build_info.json b/test/test_projects/diagnostics/test_build_info.json
similarity index 100%
rename from test_projects/diagnostics/test_build_info.json
rename to test/test_projects/diagnostics/test_build_info.json
diff --git a/test/test_projects/end_to_end/.elp.toml b/test/test_projects/end_to_end/.elp.toml
new file mode 100644
index 0000000000..4d685a40c7
--- /dev/null
+++ b/test/test_projects/end_to_end/.elp.toml
@@ -0,0 +1,7 @@
+[buck]
+enabled = true
+build_deps = false
+included_targets = ["fbcode//whatsapp/elp/test/test_projects/end_to_end/..."]
+
+[eqwalizer]
+enable_all = false
diff --git a/test_projects/end_to_end/assist_examples/src/add_doc.erl b/test/test_projects/end_to_end/assist_examples/src/add_doc.erl
similarity index 100%
rename from test_projects/end_to_end/assist_examples/src/add_doc.erl
rename to test/test_projects/end_to_end/assist_examples/src/add_doc.erl
diff --git a/test_projects/end_to_end/assist_examples/src/assist_examples.app.src b/test/test_projects/end_to_end/assist_examples/src/assist_examples.app.src
similarity index 100%
rename from test_projects/end_to_end/assist_examples/src/assist_examples.app.src
rename to test/test_projects/end_to_end/assist_examples/src/assist_examples.app.src
diff --git a/test_projects/end_to_end/assist_examples/src/code_completion.erl b/test/test_projects/end_to_end/assist_examples/src/code_completion.erl
similarity index 100%
rename from test_projects/end_to_end/assist_examples/src/code_completion.erl
rename to test/test_projects/end_to_end/assist_examples/src/code_completion.erl
diff --git a/test_projects/end_to_end/assist_examples/src/extract_function.erl b/test/test_projects/end_to_end/assist_examples/src/extract_function.erl
similarity index 100%
rename from test_projects/end_to_end/assist_examples/src/extract_function.erl
rename to test/test_projects/end_to_end/assist_examples/src/extract_function.erl
diff --git a/test_projects/end_to_end/assist_examples/src/head_mismatch.erl b/test/test_projects/end_to_end/assist_examples/src/head_mismatch.erl
similarity index 100%
rename from test_projects/end_to_end/assist_examples/src/head_mismatch.erl
rename to test/test_projects/end_to_end/assist_examples/src/head_mismatch.erl
diff --git a/test_projects/end_to_end/caf/configerator/source/whatsapp/my_caf.erl b/test/test_projects/end_to_end/caf/configerator/source/whatsapp/my_caf.erl
similarity index 100%
rename from test_projects/end_to_end/caf/configerator/source/whatsapp/my_caf.erl
rename to test/test_projects/end_to_end/caf/configerator/source/whatsapp/my_caf.erl
diff --git a/test_projects/end_to_end/definitions/README.md b/test/test_projects/end_to_end/definitions/README.md
similarity index 100%
rename from test_projects/end_to_end/definitions/README.md
rename to test/test_projects/end_to_end/definitions/README.md
diff --git a/test_projects/end_to_end/definitions/src/definitions.app.src b/test/test_projects/end_to_end/definitions/src/definitions.app.src
similarity index 100%
rename from test_projects/end_to_end/definitions/src/definitions.app.src
rename to test/test_projects/end_to_end/definitions/src/definitions.app.src
diff --git a/test_projects/end_to_end/definitions/src/local_def.erl b/test/test_projects/end_to_end/definitions/src/local_def.erl
similarity index 100%
rename from test_projects/end_to_end/definitions/src/local_def.erl
rename to test/test_projects/end_to_end/definitions/src/local_def.erl
diff --git a/test_projects/end_to_end/docs/src/docs.app.src b/test/test_projects/end_to_end/docs/src/docs.app.src
similarity index 100%
rename from test_projects/end_to_end/docs/src/docs.app.src
rename to test/test_projects/end_to_end/docs/src/docs.app.src
diff --git a/test_projects/end_to_end/docs/src/docs.erl b/test/test_projects/end_to_end/docs/src/docs.erl
similarity index 100%
rename from test_projects/end_to_end/docs/src/docs.erl
rename to test/test_projects/end_to_end/docs/src/docs.erl
diff --git a/test_projects/end_to_end/erlang_ls.config b/test/test_projects/end_to_end/erlang_ls.config
similarity index 100%
rename from test_projects/end_to_end/erlang_ls.config
rename to test/test_projects/end_to_end/erlang_ls.config
diff --git a/test_projects/end_to_end/fixtures/erlang-stacktrace.txt b/test/test_projects/end_to_end/fixtures/erlang-stacktrace.txt
similarity index 100%
rename from test_projects/end_to_end/fixtures/erlang-stacktrace.txt
rename to test/test_projects/end_to_end/fixtures/erlang-stacktrace.txt
diff --git a/test_projects/end_to_end/hover/README.md b/test/test_projects/end_to_end/hover/README.md
similarity index 100%
rename from test_projects/end_to_end/hover/README.md
rename to test/test_projects/end_to_end/hover/README.md
diff --git a/test_projects/end_to_end/hover/src/doc_examples.erl b/test/test_projects/end_to_end/hover/src/doc_examples.erl
similarity index 100%
rename from test_projects/end_to_end/hover/src/doc_examples.erl
rename to test/test_projects/end_to_end/hover/src/doc_examples.erl
diff --git a/test_projects/end_to_end/hover/src/hover.app.src b/test/test_projects/end_to_end/hover/src/hover.app.src
similarity index 100%
rename from test_projects/end_to_end/hover/src/hover.app.src
rename to test/test_projects/end_to_end/hover/src/hover.app.src
diff --git a/test_projects/end_to_end/rebar.config b/test/test_projects/end_to_end/rebar.config
similarity index 100%
rename from test_projects/end_to_end/rebar.config
rename to test/test_projects/end_to_end/rebar.config
diff --git a/test_projects/end_to_end/single_errors/README.md b/test/test_projects/end_to_end/single_errors/README.md
similarity index 100%
rename from test_projects/end_to_end/single_errors/README.md
rename to test/test_projects/end_to_end/single_errors/README.md
diff --git a/test_projects/end_to_end/single_errors/src/as_you_type.erl b/test/test_projects/end_to_end/single_errors/src/as_you_type.erl
similarity index 100%
rename from test_projects/end_to_end/single_errors/src/as_you_type.erl
rename to test/test_projects/end_to_end/single_errors/src/as_you_type.erl
diff --git a/test_projects/end_to_end/single_errors/src/compiler_diagnostics.erl b/test/test_projects/end_to_end/single_errors/src/compiler_diagnostics.erl
similarity index 100%
rename from test_projects/end_to_end/single_errors/src/compiler_diagnostics.erl
rename to test/test_projects/end_to_end/single_errors/src/compiler_diagnostics.erl
diff --git a/test_projects/end_to_end/single_errors/src/single_errors.app.src b/test/test_projects/end_to_end/single_errors/src/single_errors.app.src
similarity index 100%
rename from test_projects/end_to_end/single_errors/src/single_errors.app.src
rename to test/test_projects/end_to_end/single_errors/src/single_errors.app.src
diff --git a/test_projects/end_to_end/single_errors/src/spec_mismatch.erl b/test/test_projects/end_to_end/single_errors/src/spec_mismatch.erl
similarity index 100%
rename from test_projects/end_to_end/single_errors/src/spec_mismatch.erl
rename to test/test_projects/end_to_end/single_errors/src/spec_mismatch.erl
diff --git a/test_projects/end_to_end/single_errors/src/spec_mismatch.erl.2 b/test/test_projects/end_to_end/single_errors/src/spec_mismatch.erl.2
similarity index 100%
rename from test_projects/end_to_end/single_errors/src/spec_mismatch.erl.2
rename to test/test_projects/end_to_end/single_errors/src/spec_mismatch.erl.2
diff --git a/test_projects/end_to_end/single_errors/src/types_on_hover.erl b/test/test_projects/end_to_end/single_errors/src/types_on_hover.erl
similarity index 100%
rename from test_projects/end_to_end/single_errors/src/types_on_hover.erl
rename to test/test_projects/end_to_end/single_errors/src/types_on_hover.erl
diff --git a/test_projects/end_to_end/single_errors/src/unused_macro.erl b/test/test_projects/end_to_end/single_errors/src/unused_macro.erl
similarity index 100%
rename from test_projects/end_to_end/single_errors/src/unused_macro.erl
rename to test/test_projects/end_to_end/single_errors/src/unused_macro.erl
diff --git a/test_projects/eqwalizer/src/eqwalizer.app.src b/test/test_projects/eqwalizer/src/eqwalizer.app.src
similarity index 100%
rename from test_projects/eqwalizer/src/eqwalizer.app.src
rename to test/test_projects/eqwalizer/src/eqwalizer.app.src
diff --git a/test_projects/eqwalizer/src/eqwalizer_specs.erl b/test/test_projects/eqwalizer/src/eqwalizer_specs.erl
similarity index 100%
rename from test_projects/eqwalizer/src/eqwalizer_specs.erl
rename to test/test_projects/eqwalizer/src/eqwalizer_specs.erl
diff --git a/test/test_projects/eqwalizer_callers/.elp.toml b/test/test_projects/eqwalizer_callers/.elp.toml
new file mode 100644
index 0000000000..b0c2b55a5b
--- /dev/null
+++ b/test/test_projects/eqwalizer_callers/.elp.toml
@@ -0,0 +1,5 @@
+[buck]
+enabled = true
+build_deps = false
+included_targets = [ "fbcode//whatsapp/elp/test/test_projects/eqwalizer_callers/..." ]
+source_root = "whatsapp/elp/test/test_projects/eqwalizer_callers"
diff --git a/test_projects/eqwalizer_callers/.gitignore b/test/test_projects/eqwalizer_callers/.gitignore
similarity index 100%
rename from test_projects/eqwalizer_callers/.gitignore
rename to test/test_projects/eqwalizer_callers/.gitignore
diff --git a/test_projects/eqwalizer_callers/app_a/include/app_a.hrl b/test/test_projects/eqwalizer_callers/app_a/include/app_a.hrl
similarity index 100%
rename from test_projects/eqwalizer_callers/app_a/include/app_a.hrl
rename to test/test_projects/eqwalizer_callers/app_a/include/app_a.hrl
diff --git a/test_projects/eqwalizer_callers/app_a/src/app_a.app.src b/test/test_projects/eqwalizer_callers/app_a/src/app_a.app.src
similarity index 100%
rename from test_projects/eqwalizer_callers/app_a/src/app_a.app.src
rename to test/test_projects/eqwalizer_callers/app_a/src/app_a.app.src
diff --git a/test_projects/eqwalizer_callers/app_a/src/app_a.erl b/test/test_projects/eqwalizer_callers/app_a/src/app_a.erl
similarity index 100%
rename from test_projects/eqwalizer_callers/app_a/src/app_a.erl
rename to test/test_projects/eqwalizer_callers/app_a/src/app_a.erl
diff --git a/test_projects/eqwalizer_callers/app_a/src/app_b.erl b/test/test_projects/eqwalizer_callers/app_a/src/app_b.erl
similarity index 100%
rename from test_projects/eqwalizer_callers/app_a/src/app_b.erl
rename to test/test_projects/eqwalizer_callers/app_a/src/app_b.erl
diff --git a/test_projects/eqwalizer_callers/app_a/test/app_a_SUITE.erl b/test/test_projects/eqwalizer_callers/app_a/test/app_a_SUITE.erl
similarity index 100%
rename from test_projects/eqwalizer_callers/app_a/test/app_a_SUITE.erl
rename to test/test_projects/eqwalizer_callers/app_a/test/app_a_SUITE.erl
diff --git a/test_projects/eqwalizer_callers/rebar.config b/test/test_projects/eqwalizer_callers/rebar.config
similarity index 100%
rename from test_projects/eqwalizer_callers/rebar.config
rename to test/test_projects/eqwalizer_callers/rebar.config
diff --git a/test_projects/eqwalizer_ignore_modules/.elp.toml b/test/test_projects/eqwalizer_ignore_modules/.elp.toml
similarity index 100%
rename from test_projects/eqwalizer_ignore_modules/.elp.toml
rename to test/test_projects/eqwalizer_ignore_modules/.elp.toml
diff --git a/test_projects/eqwalizer_ignore_modules/apps/app_a/include/app_a.hrl b/test/test_projects/eqwalizer_ignore_modules/apps/app_a/include/app_a.hrl
similarity index 100%
rename from test_projects/eqwalizer_ignore_modules/apps/app_a/include/app_a.hrl
rename to test/test_projects/eqwalizer_ignore_modules/apps/app_a/include/app_a.hrl
diff --git a/test_projects/eqwalizer_ignore_modules/apps/app_a/src/another_module_a.erl b/test/test_projects/eqwalizer_ignore_modules/apps/app_a/src/another_module_a.erl
similarity index 100%
rename from test_projects/eqwalizer_ignore_modules/apps/app_a/src/another_module_a.erl
rename to test/test_projects/eqwalizer_ignore_modules/apps/app_a/src/another_module_a.erl
diff --git a/test_projects/eqwalizer_ignore_modules/apps/app_a/src/app_a.erl b/test/test_projects/eqwalizer_ignore_modules/apps/app_a/src/app_a.erl
similarity index 100%
rename from test_projects/eqwalizer_ignore_modules/apps/app_a/src/app_a.erl
rename to test/test_projects/eqwalizer_ignore_modules/apps/app_a/src/app_a.erl
diff --git a/test_projects/eqwalizer_ignore_modules/apps/app_b/src/app_b.erl b/test/test_projects/eqwalizer_ignore_modules/apps/app_b/src/app_b.erl
similarity index 100%
rename from test_projects/eqwalizer_ignore_modules/apps/app_b/src/app_b.erl
rename to test/test_projects/eqwalizer_ignore_modules/apps/app_b/src/app_b.erl
diff --git a/test/test_projects/eqwalizer_tests/.elp.toml b/test/test_projects/eqwalizer_tests/.elp.toml
new file mode 100644
index 0000000000..9586666619
--- /dev/null
+++ b/test/test_projects/eqwalizer_tests/.elp.toml
@@ -0,0 +1,8 @@
+[buck]
+enabled = true
+build_deps = false
+included_targets = [ "fbcode//whatsapp/elp/test/test_projects/eqwalizer_tests/..." ]
+source_root = "whatsapp/elp/test/test_projects/eqwalizer_tests"
+
+[eqwalizer]
+enable_all = true
diff --git a/test_projects/eqwalizer_tests/.gitignore b/test/test_projects/eqwalizer_tests/.gitignore
similarity index 100%
rename from test_projects/eqwalizer_tests/.gitignore
rename to test/test_projects/eqwalizer_tests/.gitignore
diff --git a/test_projects/eqwalizer_tests/.rebar.root b/test/test_projects/eqwalizer_tests/.rebar.root
similarity index 100%
rename from test_projects/eqwalizer_tests/.rebar.root
rename to test/test_projects/eqwalizer_tests/.rebar.root
diff --git a/test_projects/eqwalizer_tests/check/include/my_header.hrl b/test/test_projects/eqwalizer_tests/check/include/my_header.hrl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/include/my_header.hrl
rename to test/test_projects/eqwalizer_tests/check/include/my_header.hrl
diff --git a/test_projects/eqwalizer_tests/check/src/any_fun_type.erl b/test/test_projects/eqwalizer_tests/check/src/any_fun_type.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/any_fun_type.erl
rename to test/test_projects/eqwalizer_tests/check/src/any_fun_type.erl
diff --git a/test_projects/eqwalizer_tests/check/src/apply_none.erl b/test/test_projects/eqwalizer_tests/check/src/apply_none.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/apply_none.erl
rename to test/test_projects/eqwalizer_tests/check/src/apply_none.erl
diff --git a/test_projects/eqwalizer_tests/check/src/approx.erl b/test/test_projects/eqwalizer_tests/check/src/approx.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/approx.erl
rename to test/test_projects/eqwalizer_tests/check/src/approx.erl
diff --git a/test_projects/eqwalizer_tests/check/src/as_pat.erl b/test/test_projects/eqwalizer_tests/check/src/as_pat.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/as_pat.erl
rename to test/test_projects/eqwalizer_tests/check/src/as_pat.erl
diff --git a/test_projects/eqwalizer_tests/check/src/auto_imports.erl b/test/test_projects/eqwalizer_tests/check/src/auto_imports.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/auto_imports.erl
rename to test/test_projects/eqwalizer_tests/check/src/auto_imports.erl
diff --git a/test_projects/eqwalizer_tests/check/src/behave.erl b/test/test_projects/eqwalizer_tests/check/src/behave.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/behave.erl
rename to test/test_projects/eqwalizer_tests/check/src/behave.erl
diff --git a/test_projects/eqwalizer_tests/check/src/binaries.erl b/test/test_projects/eqwalizer_tests/check/src/binaries.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/binaries.erl
rename to test/test_projects/eqwalizer_tests/check/src/binaries.erl
diff --git a/test_projects/eqwalizer_tests/check/src/booleans.erl b/test/test_projects/eqwalizer_tests/check/src/booleans.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/booleans.erl
rename to test/test_projects/eqwalizer_tests/check/src/booleans.erl
diff --git a/test_projects/eqwalizer_tests/check/src/callbacks1_pos.erl b/test/test_projects/eqwalizer_tests/check/src/callbacks1_pos.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/callbacks1_pos.erl
rename to test/test_projects/eqwalizer_tests/check/src/callbacks1_pos.erl
diff --git a/test_projects/eqwalizer_tests/check/src/callbacks3_neg.erl b/test/test_projects/eqwalizer_tests/check/src/callbacks3_neg.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/callbacks3_neg.erl
rename to test/test_projects/eqwalizer_tests/check/src/callbacks3_neg.erl
diff --git a/test_projects/eqwalizer_tests/check/src/callbacks4_neg.erl b/test/test_projects/eqwalizer_tests/check/src/callbacks4_neg.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/callbacks4_neg.erl
rename to test/test_projects/eqwalizer_tests/check/src/callbacks4_neg.erl
diff --git a/test_projects/eqwalizer_tests/check/src/callbacks5_neg.erl b/test/test_projects/eqwalizer_tests/check/src/callbacks5_neg.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/callbacks5_neg.erl
rename to test/test_projects/eqwalizer_tests/check/src/callbacks5_neg.erl
diff --git a/test_projects/eqwalizer_tests/check/src/callbacks6_neg.erl b/test/test_projects/eqwalizer_tests/check/src/callbacks6_neg.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/callbacks6_neg.erl
rename to test/test_projects/eqwalizer_tests/check/src/callbacks6_neg.erl
diff --git a/test_projects/eqwalizer_tests/check/src/callbacks7_overload_pos.erl b/test/test_projects/eqwalizer_tests/check/src/callbacks7_overload_pos.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/callbacks7_overload_pos.erl
rename to test/test_projects/eqwalizer_tests/check/src/callbacks7_overload_pos.erl
diff --git a/test_projects/eqwalizer_tests/check/src/case_predicates.erl b/test/test_projects/eqwalizer_tests/check/src/case_predicates.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/case_predicates.erl
rename to test/test_projects/eqwalizer_tests/check/src/case_predicates.erl
diff --git a/test_projects/eqwalizer_tests/check/src/check.app.src b/test/test_projects/eqwalizer_tests/check/src/check.app.src
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/check.app.src
rename to test/test_projects/eqwalizer_tests/check/src/check.app.src
diff --git a/test_projects/eqwalizer_tests/check/src/compiler_macro.erl b/test/test_projects/eqwalizer_tests/check/src/compiler_macro.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/compiler_macro.erl
rename to test/test_projects/eqwalizer_tests/check/src/compiler_macro.erl
diff --git a/test_projects/eqwalizer_tests/check/src/complex_maps.erl b/test/test_projects/eqwalizer_tests/check/src/complex_maps.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/complex_maps.erl
rename to test/test_projects/eqwalizer_tests/check/src/complex_maps.erl
diff --git a/test_projects/eqwalizer_tests/check/src/comprehensions.erl b/test/test_projects/eqwalizer_tests/check/src/comprehensions.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/comprehensions.erl
rename to test/test_projects/eqwalizer_tests/check/src/comprehensions.erl
diff --git a/test_projects/eqwalizer_tests/check/src/contravariant.erl b/test/test_projects/eqwalizer_tests/check/src/contravariant.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/contravariant.erl
rename to test/test_projects/eqwalizer_tests/check/src/contravariant.erl
diff --git a/test_projects/eqwalizer_tests/check/src/custom.erl b/test/test_projects/eqwalizer_tests/check/src/custom.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/custom.erl
rename to test/test_projects/eqwalizer_tests/check/src/custom.erl
diff --git a/test_projects/eqwalizer_tests/check/src/detached_specs1.erl b/test/test_projects/eqwalizer_tests/check/src/detached_specs1.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/detached_specs1.erl
rename to test/test_projects/eqwalizer_tests/check/src/detached_specs1.erl
diff --git a/test_projects/eqwalizer_tests/check/src/detached_specs2.erl b/test/test_projects/eqwalizer_tests/check/src/detached_specs2.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/detached_specs2.erl
rename to test/test_projects/eqwalizer_tests/check/src/detached_specs2.erl
diff --git a/test_projects/eqwalizer_tests/check/src/dyn_calls.erl b/test/test_projects/eqwalizer_tests/check/src/dyn_calls.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/dyn_calls.erl
rename to test/test_projects/eqwalizer_tests/check/src/dyn_calls.erl
diff --git a/test_projects/eqwalizer_tests/check/src/dyn_remote_funs.erl b/test/test_projects/eqwalizer_tests/check/src/dyn_remote_funs.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/dyn_remote_funs.erl
rename to test/test_projects/eqwalizer_tests/check/src/dyn_remote_funs.erl
diff --git a/test_projects/eqwalizer_tests/check/src/dynamic_callbacks_1.erl b/test/test_projects/eqwalizer_tests/check/src/dynamic_callbacks_1.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/dynamic_callbacks_1.erl
rename to test/test_projects/eqwalizer_tests/check/src/dynamic_callbacks_1.erl
diff --git a/test_projects/eqwalizer_tests/check/src/dynamic_callbacks_2.erl b/test/test_projects/eqwalizer_tests/check/src/dynamic_callbacks_2.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/dynamic_callbacks_2.erl
rename to test/test_projects/eqwalizer_tests/check/src/dynamic_callbacks_2.erl
diff --git a/test_projects/eqwalizer_tests/check/src/dynamic_calls.erl b/test/test_projects/eqwalizer_tests/check/src/dynamic_calls.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/dynamic_calls.erl
rename to test/test_projects/eqwalizer_tests/check/src/dynamic_calls.erl
diff --git a/test_projects/eqwalizer_tests/check/src/dynamic_catch.erl b/test/test_projects/eqwalizer_tests/check/src/dynamic_catch.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/dynamic_catch.erl
rename to test/test_projects/eqwalizer_tests/check/src/dynamic_catch.erl
diff --git a/test_projects/eqwalizer_tests/check/src/dynamic_fun.erl b/test/test_projects/eqwalizer_tests/check/src/dynamic_fun.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/dynamic_fun.erl
rename to test/test_projects/eqwalizer_tests/check/src/dynamic_fun.erl
diff --git a/test_projects/eqwalizer_tests/check/src/dynamic_generics.erl b/test/test_projects/eqwalizer_tests/check/src/dynamic_generics.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/dynamic_generics.erl
rename to test/test_projects/eqwalizer_tests/check/src/dynamic_generics.erl
diff --git a/test_projects/eqwalizer_tests/check/src/dynamic_local_funs.erl b/test/test_projects/eqwalizer_tests/check/src/dynamic_local_funs.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/dynamic_local_funs.erl
rename to test/test_projects/eqwalizer_tests/check/src/dynamic_local_funs.erl
diff --git a/test_projects/eqwalizer_tests/check/src/dynamic_receive.erl b/test/test_projects/eqwalizer_tests/check/src/dynamic_receive.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/dynamic_receive.erl
rename to test/test_projects/eqwalizer_tests/check/src/dynamic_receive.erl
diff --git a/test_projects/eqwalizer_tests/check/src/dynamic_refine.erl b/test/test_projects/eqwalizer_tests/check/src/dynamic_refine.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/dynamic_refine.erl
rename to test/test_projects/eqwalizer_tests/check/src/dynamic_refine.erl
diff --git a/test_projects/eqwalizer_tests/check/src/dynamic_try_catch.erl b/test/test_projects/eqwalizer_tests/check/src/dynamic_try_catch.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/dynamic_try_catch.erl
rename to test/test_projects/eqwalizer_tests/check/src/dynamic_try_catch.erl
diff --git a/test_projects/eqwalizer_tests/check/src/elab_clause.erl b/test/test_projects/eqwalizer_tests/check/src/elab_clause.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/elab_clause.erl
rename to test/test_projects/eqwalizer_tests/check/src/elab_clause.erl
diff --git a/test_projects/eqwalizer_tests/check/src/error_messages.erl b/test/test_projects/eqwalizer_tests/check/src/error_messages.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/error_messages.erl
rename to test/test_projects/eqwalizer_tests/check/src/error_messages.erl
diff --git a/test_projects/eqwalizer_tests/check/src/fancy_generics.erl b/test/test_projects/eqwalizer_tests/check/src/fancy_generics.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/fancy_generics.erl
rename to test/test_projects/eqwalizer_tests/check/src/fancy_generics.erl
diff --git a/test_projects/eqwalizer_tests/check/src/format.erl b/test/test_projects/eqwalizer_tests/check/src/format.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/format.erl
rename to test/test_projects/eqwalizer_tests/check/src/format.erl
diff --git a/test_projects/eqwalizer_tests/check/src/fun_stats.erl b/test/test_projects/eqwalizer_tests/check/src/fun_stats.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/fun_stats.erl
rename to test/test_projects/eqwalizer_tests/check/src/fun_stats.erl
diff --git a/test_projects/eqwalizer_tests/check/src/fun_stats2.erl b/test/test_projects/eqwalizer_tests/check/src/fun_stats2.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/fun_stats2.erl
rename to test/test_projects/eqwalizer_tests/check/src/fun_stats2.erl
diff --git a/test_projects/eqwalizer_tests/check/src/funs.erl b/test/test_projects/eqwalizer_tests/check/src/funs.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/funs.erl
rename to test/test_projects/eqwalizer_tests/check/src/funs.erl
diff --git a/test_projects/eqwalizer_tests/check/src/funs2.erl b/test/test_projects/eqwalizer_tests/check/src/funs2.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/funs2.erl
rename to test/test_projects/eqwalizer_tests/check/src/funs2.erl
diff --git a/test_projects/eqwalizer_tests/check/src/funs_uncommon.erl b/test/test_projects/eqwalizer_tests/check/src/funs_uncommon.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/funs_uncommon.erl
rename to test/test_projects/eqwalizer_tests/check/src/funs_uncommon.erl
diff --git a/test_projects/eqwalizer_tests/check/src/generic_fun_application.erl b/test/test_projects/eqwalizer_tests/check/src/generic_fun_application.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/generic_fun_application.erl
rename to test/test_projects/eqwalizer_tests/check/src/generic_fun_application.erl
diff --git a/test_projects/eqwalizer_tests/check/src/generics_with_unions.erl b/test/test_projects/eqwalizer_tests/check/src/generics_with_unions.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/generics_with_unions.erl
rename to test/test_projects/eqwalizer_tests/check/src/generics_with_unions.erl
diff --git a/test_projects/eqwalizer_tests/check/src/gradual_bounded.erl b/test/test_projects/eqwalizer_tests/check/src/gradual_bounded.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/gradual_bounded.erl
rename to test/test_projects/eqwalizer_tests/check/src/gradual_bounded.erl
diff --git a/test_projects/eqwalizer_tests/check/src/gradual_complex_types.erl b/test/test_projects/eqwalizer_tests/check/src/gradual_complex_types.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/gradual_complex_types.erl
rename to test/test_projects/eqwalizer_tests/check/src/gradual_complex_types.erl
diff --git a/test_projects/eqwalizer_tests/check/src/gradual_custom.erl b/test/test_projects/eqwalizer_tests/check/src/gradual_custom.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/gradual_custom.erl
rename to test/test_projects/eqwalizer_tests/check/src/gradual_custom.erl
diff --git a/test_projects/eqwalizer_tests/check/src/gradual_lambdas.erl b/test/test_projects/eqwalizer_tests/check/src/gradual_lambdas.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/gradual_lambdas.erl
rename to test/test_projects/eqwalizer_tests/check/src/gradual_lambdas.erl
diff --git a/test_projects/eqwalizer_tests/check/src/gradual_maybe.erl b/test/test_projects/eqwalizer_tests/check/src/gradual_maybe.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/gradual_maybe.erl
rename to test/test_projects/eqwalizer_tests/check/src/gradual_maybe.erl
diff --git a/test_projects/eqwalizer_tests/check/src/gradual_misc.erl b/test/test_projects/eqwalizer_tests/check/src/gradual_misc.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/gradual_misc.erl
rename to test/test_projects/eqwalizer_tests/check/src/gradual_misc.erl
diff --git a/test_projects/eqwalizer_tests/check/src/gradual_overloaded.erl b/test/test_projects/eqwalizer_tests/check/src/gradual_overloaded.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/gradual_overloaded.erl
rename to test/test_projects/eqwalizer_tests/check/src/gradual_overloaded.erl
diff --git a/test_projects/eqwalizer_tests/check/src/gradual_regression_01.erl b/test/test_projects/eqwalizer_tests/check/src/gradual_regression_01.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/gradual_regression_01.erl
rename to test/test_projects/eqwalizer_tests/check/src/gradual_regression_01.erl
diff --git a/test_projects/eqwalizer_tests/check/src/gradual_untyped.erl b/test/test_projects/eqwalizer_tests/check/src/gradual_untyped.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/gradual_untyped.erl
rename to test/test_projects/eqwalizer_tests/check/src/gradual_untyped.erl
diff --git a/test_projects/eqwalizer_tests/check/src/guard_b_connections.erl b/test/test_projects/eqwalizer_tests/check/src/guard_b_connections.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/guard_b_connections.erl
rename to test/test_projects/eqwalizer_tests/check/src/guard_b_connections.erl
diff --git a/test_projects/eqwalizer_tests/check/src/guards.erl b/test/test_projects/eqwalizer_tests/check/src/guards.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/guards.erl
rename to test/test_projects/eqwalizer_tests/check/src/guards.erl
diff --git a/test_projects/eqwalizer_tests/check/src/guards_logic.erl b/test/test_projects/eqwalizer_tests/check/src/guards_logic.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/guards_logic.erl
rename to test/test_projects/eqwalizer_tests/check/src/guards_logic.erl
diff --git a/test_projects/eqwalizer_tests/check/src/guards_simple.erl b/test/test_projects/eqwalizer_tests/check/src/guards_simple.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/guards_simple.erl
rename to test/test_projects/eqwalizer_tests/check/src/guards_simple.erl
diff --git a/test_projects/eqwalizer_tests/check/src/hints.erl b/test/test_projects/eqwalizer_tests/check/src/hints.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/hints.erl
rename to test/test_projects/eqwalizer_tests/check/src/hints.erl
diff --git a/test_projects/eqwalizer_tests/check/src/index1.erl b/test/test_projects/eqwalizer_tests/check/src/index1.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/index1.erl
rename to test/test_projects/eqwalizer_tests/check/src/index1.erl
diff --git a/test_projects/eqwalizer_tests/check/src/index2.erl b/test/test_projects/eqwalizer_tests/check/src/index2.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/index2.erl
rename to test/test_projects/eqwalizer_tests/check/src/index2.erl
diff --git a/test_projects/eqwalizer_tests/check/src/iolists.erl b/test/test_projects/eqwalizer_tests/check/src/iolists.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/iolists.erl
rename to test/test_projects/eqwalizer_tests/check/src/iolists.erl
diff --git a/test_projects/eqwalizer_tests/check/src/kp_01.erl b/test/test_projects/eqwalizer_tests/check/src/kp_01.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/kp_01.erl
rename to test/test_projects/eqwalizer_tests/check/src/kp_01.erl
diff --git a/test_projects/eqwalizer_tests/check/src/kp_02.erl b/test/test_projects/eqwalizer_tests/check/src/kp_02.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/kp_02.erl
rename to test/test_projects/eqwalizer_tests/check/src/kp_02.erl
diff --git a/test_projects/eqwalizer_tests/check/src/lists_tests.erl b/test/test_projects/eqwalizer_tests/check/src/lists_tests.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/lists_tests.erl
rename to test/test_projects/eqwalizer_tests/check/src/lists_tests.erl
diff --git a/test_projects/eqwalizer_tests/check/src/misc.erl b/test/test_projects/eqwalizer_tests/check/src/misc.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/misc.erl
rename to test/test_projects/eqwalizer_tests/check/src/misc.erl
diff --git a/test_projects/eqwalizer_tests/check/src/misc_lib.erl b/test/test_projects/eqwalizer_tests/check/src/misc_lib.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/misc_lib.erl
rename to test/test_projects/eqwalizer_tests/check/src/misc_lib.erl
diff --git a/test_projects/eqwalizer_tests/check/src/my_behaviour.erl b/test/test_projects/eqwalizer_tests/check/src/my_behaviour.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/my_behaviour.erl
rename to test/test_projects/eqwalizer_tests/check/src/my_behaviour.erl
diff --git a/test_projects/eqwalizer_tests/check/src/my_gradual_behaviour.erl b/test/test_projects/eqwalizer_tests/check/src/my_gradual_behaviour.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/my_gradual_behaviour.erl
rename to test/test_projects/eqwalizer_tests/check/src/my_gradual_behaviour.erl
diff --git a/test_projects/eqwalizer_tests/check/src/my_header.erl b/test/test_projects/eqwalizer_tests/check/src/my_header.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/my_header.erl
rename to test/test_projects/eqwalizer_tests/check/src/my_header.erl
diff --git a/test_projects/eqwalizer_tests/check/src/neg.erl b/test/test_projects/eqwalizer_tests/check/src/neg.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/neg.erl
rename to test/test_projects/eqwalizer_tests/check/src/neg.erl
diff --git a/test_projects/eqwalizer_tests/check/src/nested1/misc_nested1.erl b/test/test_projects/eqwalizer_tests/check/src/nested1/misc_nested1.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/nested1/misc_nested1.erl
rename to test/test_projects/eqwalizer_tests/check/src/nested1/misc_nested1.erl
diff --git a/test_projects/eqwalizer_tests/check/src/nested1/nested2/misc_nested2.erl b/test/test_projects/eqwalizer_tests/check/src/nested1/nested2/misc_nested2.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/nested1/nested2/misc_nested2.erl
rename to test/test_projects/eqwalizer_tests/check/src/nested1/nested2/misc_nested2.erl
diff --git a/test_projects/eqwalizer_tests/check/src/nowarn.erl b/test/test_projects/eqwalizer_tests/check/src/nowarn.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/nowarn.erl
rename to test/test_projects/eqwalizer_tests/check/src/nowarn.erl
diff --git a/test_projects/eqwalizer_tests/check/src/number_comparisons.erl b/test/test_projects/eqwalizer_tests/check/src/number_comparisons.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/number_comparisons.erl
rename to test/test_projects/eqwalizer_tests/check/src/number_comparisons.erl
diff --git a/test_projects/eqwalizer_tests/check/src/numbers.erl b/test/test_projects/eqwalizer_tests/check/src/numbers.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/numbers.erl
rename to test/test_projects/eqwalizer_tests/check/src/numbers.erl
diff --git a/test_projects/eqwalizer_tests/check/src/opaque.erl b/test/test_projects/eqwalizer_tests/check/src/opaque.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/opaque.erl
rename to test/test_projects/eqwalizer_tests/check/src/opaque.erl
diff --git a/test_projects/eqwalizer_tests/check/src/other.erl b/test/test_projects/eqwalizer_tests/check/src/other.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/other.erl
rename to test/test_projects/eqwalizer_tests/check/src/other.erl
diff --git a/test_projects/eqwalizer_tests/check/src/otp28.erl b/test/test_projects/eqwalizer_tests/check/src/otp28.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/otp28.erl
rename to test/test_projects/eqwalizer_tests/check/src/otp28.erl
diff --git a/test_projects/eqwalizer_tests/check/src/otp_opaques.erl b/test/test_projects/eqwalizer_tests/check/src/otp_opaques.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/otp_opaques.erl
rename to test/test_projects/eqwalizer_tests/check/src/otp_opaques.erl
diff --git a/test_projects/eqwalizer_tests/check/src/overloaded.erl b/test/test_projects/eqwalizer_tests/check/src/overloaded.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/overloaded.erl
rename to test/test_projects/eqwalizer_tests/check/src/overloaded.erl
diff --git a/test_projects/eqwalizer_tests/check/src/overloaded_specs_union.erl b/test/test_projects/eqwalizer_tests/check/src/overloaded_specs_union.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/overloaded_specs_union.erl
rename to test/test_projects/eqwalizer_tests/check/src/overloaded_specs_union.erl
diff --git a/test_projects/eqwalizer_tests/check/src/parametricity.erl b/test/test_projects/eqwalizer_tests/check/src/parametricity.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/parametricity.erl
rename to test/test_projects/eqwalizer_tests/check/src/parametricity.erl
diff --git a/test_projects/eqwalizer_tests/check/src/pats.erl b/test/test_projects/eqwalizer_tests/check/src/pats.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/pats.erl
rename to test/test_projects/eqwalizer_tests/check/src/pats.erl
diff --git a/test_projects/eqwalizer_tests/check/src/pinned.erl b/test/test_projects/eqwalizer_tests/check/src/pinned.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/pinned.erl
rename to test/test_projects/eqwalizer_tests/check/src/pinned.erl
diff --git a/test_projects/eqwalizer_tests/check/src/pos.erl b/test/test_projects/eqwalizer_tests/check/src/pos.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/pos.erl
rename to test/test_projects/eqwalizer_tests/check/src/pos.erl
diff --git a/test_projects/eqwalizer_tests/check/src/records.erl b/test/test_projects/eqwalizer_tests/check/src/records.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/records.erl
rename to test/test_projects/eqwalizer_tests/check/src/records.erl
diff --git a/test_projects/eqwalizer_tests/check/src/recursive_aliases.erl b/test/test_projects/eqwalizer_tests/check/src/recursive_aliases.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/recursive_aliases.erl
rename to test/test_projects/eqwalizer_tests/check/src/recursive_aliases.erl
diff --git a/test_projects/eqwalizer_tests/check/src/refine.erl b/test/test_projects/eqwalizer_tests/check/src/refine.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/refine.erl
rename to test/test_projects/eqwalizer_tests/check/src/refine.erl
diff --git a/test_projects/eqwalizer_tests/check/src/scoping.erl b/test/test_projects/eqwalizer_tests/check/src/scoping.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/scoping.erl
rename to test/test_projects/eqwalizer_tests/check/src/scoping.erl
diff --git a/test_projects/eqwalizer_tests/check/src/skip.erl b/test/test_projects/eqwalizer_tests/check/src/skip.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/skip.erl
rename to test/test_projects/eqwalizer_tests/check/src/skip.erl
diff --git a/test_projects/eqwalizer_tests/check/src/static_maybe.erl b/test/test_projects/eqwalizer_tests/check/src/static_maybe.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/static_maybe.erl
rename to test/test_projects/eqwalizer_tests/check/src/static_maybe.erl
diff --git a/test_projects/eqwalizer_tests/check/src/strict_complex_types.erl b/test/test_projects/eqwalizer_tests/check/src/strict_complex_types.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/strict_complex_types.erl
rename to test/test_projects/eqwalizer_tests/check/src/strict_complex_types.erl
diff --git a/test_projects/eqwalizer_tests/check/src/strict_fun.erl b/test/test_projects/eqwalizer_tests/check/src/strict_fun.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/strict_fun.erl
rename to test/test_projects/eqwalizer_tests/check/src/strict_fun.erl
diff --git a/test_projects/eqwalizer_tests/check/src/strict_receive.erl b/test/test_projects/eqwalizer_tests/check/src/strict_receive.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/strict_receive.erl
rename to test/test_projects/eqwalizer_tests/check/src/strict_receive.erl
diff --git a/test_projects/eqwalizer_tests/check/src/subtype_neg.erl b/test/test_projects/eqwalizer_tests/check/src/subtype_neg.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/subtype_neg.erl
rename to test/test_projects/eqwalizer_tests/check/src/subtype_neg.erl
diff --git a/test_projects/eqwalizer_tests/check/src/subtype_pos.erl b/test/test_projects/eqwalizer_tests/check/src/subtype_pos.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/subtype_pos.erl
rename to test/test_projects/eqwalizer_tests/check/src/subtype_pos.erl
diff --git a/test_projects/eqwalizer_tests/check/src/t_maps.erl b/test/test_projects/eqwalizer_tests/check/src/t_maps.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/t_maps.erl
rename to test/test_projects/eqwalizer_tests/check/src/t_maps.erl
diff --git a/test_projects/eqwalizer_tests/check/src/tagged_tuples.erl b/test/test_projects/eqwalizer_tests/check/src/tagged_tuples.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/tagged_tuples.erl
rename to test/test_projects/eqwalizer_tests/check/src/tagged_tuples.erl
diff --git a/test_projects/eqwalizer_tests/check/src/test.erl b/test/test_projects/eqwalizer_tests/check/src/test.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/test.erl
rename to test/test_projects/eqwalizer_tests/check/src/test.erl
diff --git a/test_projects/eqwalizer_tests/check/src/tries.erl b/test/test_projects/eqwalizer_tests/check/src/tries.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/tries.erl
rename to test/test_projects/eqwalizer_tests/check/src/tries.erl
diff --git a/test_projects/eqwalizer_tests/check/src/tuple_union.erl b/test/test_projects/eqwalizer_tests/check/src/tuple_union.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/tuple_union.erl
rename to test/test_projects/eqwalizer_tests/check/src/tuple_union.erl
diff --git a/test_projects/eqwalizer_tests/check/src/type_aliases.erl b/test/test_projects/eqwalizer_tests/check/src/type_aliases.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/type_aliases.erl
rename to test/test_projects/eqwalizer_tests/check/src/type_aliases.erl
diff --git a/test_projects/eqwalizer_tests/check/src/type_asserts.erl b/test/test_projects/eqwalizer_tests/check/src/type_asserts.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/type_asserts.erl
rename to test/test_projects/eqwalizer_tests/check/src/type_asserts.erl
diff --git a/test_projects/eqwalizer_tests/check/src/type_predicates.erl b/test/test_projects/eqwalizer_tests/check/src/type_predicates.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/type_predicates.erl
rename to test/test_projects/eqwalizer_tests/check/src/type_predicates.erl
diff --git a/test_projects/eqwalizer_tests/check/src/united_fun.erl b/test/test_projects/eqwalizer_tests/check/src/united_fun.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/united_fun.erl
rename to test/test_projects/eqwalizer_tests/check/src/united_fun.erl
diff --git a/test_projects/eqwalizer_tests/check/src/unspecced.erl b/test/test_projects/eqwalizer_tests/check/src/unspecced.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/unspecced.erl
rename to test/test_projects/eqwalizer_tests/check/src/unspecced.erl
diff --git a/test_projects/eqwalizer_tests/check/src/use_dynamic_gradual.erl b/test/test_projects/eqwalizer_tests/check/src/use_dynamic_gradual.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/use_dynamic_gradual.erl
rename to test/test_projects/eqwalizer_tests/check/src/use_dynamic_gradual.erl
diff --git a/test_projects/eqwalizer_tests/check/src/use_dynamic_strict.erl b/test/test_projects/eqwalizer_tests/check/src/use_dynamic_strict.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/use_dynamic_strict.erl
rename to test/test_projects/eqwalizer_tests/check/src/use_dynamic_strict.erl
diff --git a/test_projects/eqwalizer_tests/check/src/vars1.erl b/test/test_projects/eqwalizer_tests/check/src/vars1.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/vars1.erl
rename to test/test_projects/eqwalizer_tests/check/src/vars1.erl
diff --git a/test_projects/eqwalizer_tests/check/src/vars2.erl b/test/test_projects/eqwalizer_tests/check/src/vars2.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/src/vars2.erl
rename to test/test_projects/eqwalizer_tests/check/src/vars2.erl
diff --git a/test_projects/eqwalizer_tests/check/test/check_SUITE.erl b/test/test_projects/eqwalizer_tests/check/test/check_SUITE.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/check/test/check_SUITE.erl
rename to test/test_projects/eqwalizer_tests/check/test/check_SUITE.erl
diff --git a/test_projects/eqwalizer_tests/debug/include/debug_header.hrl b/test/test_projects/eqwalizer_tests/debug/include/debug_header.hrl
similarity index 100%
rename from test_projects/eqwalizer_tests/debug/include/debug_header.hrl
rename to test/test_projects/eqwalizer_tests/debug/include/debug_header.hrl
diff --git a/test_projects/eqwalizer_tests/debug/src/attributes.erl b/test/test_projects/eqwalizer_tests/debug/src/attributes.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/debug/src/attributes.erl
rename to test/test_projects/eqwalizer_tests/debug/src/attributes.erl
diff --git a/test_projects/eqwalizer_tests/debug/src/debug.app.src b/test/test_projects/eqwalizer_tests/debug/src/debug.app.src
similarity index 100%
rename from test_projects/eqwalizer_tests/debug/src/debug.app.src
rename to test/test_projects/eqwalizer_tests/debug/src/debug.app.src
diff --git a/test_projects/eqwalizer_tests/debug/src/debug_header.erl b/test/test_projects/eqwalizer_tests/debug/src/debug_header.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/debug/src/debug_header.erl
rename to test/test_projects/eqwalizer_tests/debug/src/debug_header.erl
diff --git a/test_projects/eqwalizer_tests/debug/src/expand.erl b/test/test_projects/eqwalizer_tests/debug/src/expand.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/debug/src/expand.erl
rename to test/test_projects/eqwalizer_tests/debug/src/expand.erl
diff --git a/test_projects/eqwalizer_tests/debug/src/expr1.erl b/test/test_projects/eqwalizer_tests/debug/src/expr1.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/debug/src/expr1.erl
rename to test/test_projects/eqwalizer_tests/debug/src/expr1.erl
diff --git a/test_projects/eqwalizer_tests/debug/src/expr2.erl b/test/test_projects/eqwalizer_tests/debug/src/expr2.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/debug/src/expr2.erl
rename to test/test_projects/eqwalizer_tests/debug/src/expr2.erl
diff --git a/test_projects/eqwalizer_tests/debug/src/records_wip.erl b/test/test_projects/eqwalizer_tests/debug/src/records_wip.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/debug/src/records_wip.erl
rename to test/test_projects/eqwalizer_tests/debug/src/records_wip.erl
diff --git a/test_projects/eqwalizer_tests/debug/src/types1.erl b/test/test_projects/eqwalizer_tests/debug/src/types1.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/debug/src/types1.erl
rename to test/test_projects/eqwalizer_tests/debug/src/types1.erl
diff --git a/test_projects/eqwalizer_tests/debug/src/types2.erl b/test/test_projects/eqwalizer_tests/debug/src/types2.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/debug/src/types2.erl
rename to test/test_projects/eqwalizer_tests/debug/src/types2.erl
diff --git a/test_projects/eqwalizer_tests/debug/src/wip_maps.erl b/test/test_projects/eqwalizer_tests/debug/src/wip_maps.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/debug/src/wip_maps.erl
rename to test/test_projects/eqwalizer_tests/debug/src/wip_maps.erl
diff --git a/test_projects/eqwalizer_tests/elm_core/src/basics.erl b/test/test_projects/eqwalizer_tests/elm_core/src/basics.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/elm_core/src/basics.erl
rename to test/test_projects/eqwalizer_tests/elm_core/src/basics.erl
diff --git a/test_projects/eqwalizer_tests/elm_core/src/elm_core.app.src b/test/test_projects/eqwalizer_tests/elm_core/src/elm_core.app.src
similarity index 100%
rename from test_projects/eqwalizer_tests/elm_core/src/elm_core.app.src
rename to test/test_projects/eqwalizer_tests/elm_core/src/elm_core.app.src
diff --git a/test_projects/eqwalizer_tests/elm_core/src/list.erl b/test/test_projects/eqwalizer_tests/elm_core/src/list.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/elm_core/src/list.erl
rename to test/test_projects/eqwalizer_tests/elm_core/src/list.erl
diff --git a/test_projects/eqwalizer_tests/elm_core/src/map.erl b/test/test_projects/eqwalizer_tests/elm_core/src/map.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/elm_core/src/map.erl
rename to test/test_projects/eqwalizer_tests/elm_core/src/map.erl
diff --git a/test_projects/eqwalizer_tests/elm_core/src/map_ffi.erl b/test/test_projects/eqwalizer_tests/elm_core/src/map_ffi.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/elm_core/src/map_ffi.erl
rename to test/test_projects/eqwalizer_tests/elm_core/src/map_ffi.erl
diff --git a/test_projects/eqwalizer_tests/elm_core/src/maybe.erl b/test/test_projects/eqwalizer_tests/elm_core/src/maybe.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/elm_core/src/maybe.erl
rename to test/test_projects/eqwalizer_tests/elm_core/src/maybe.erl
diff --git a/test_projects/eqwalizer_tests/elm_core/src/result.erl b/test/test_projects/eqwalizer_tests/elm_core/src/result.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/elm_core/src/result.erl
rename to test/test_projects/eqwalizer_tests/elm_core/src/result.erl
diff --git a/test_projects/eqwalizer_tests/elm_core/src/tuple.erl b/test/test_projects/eqwalizer_tests/elm_core/src/tuple.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/elm_core/src/tuple.erl
rename to test/test_projects/eqwalizer_tests/elm_core/src/tuple.erl
diff --git a/test_projects/eqwalizer_tests/eqwalizer/include/eqwalizer.hrl b/test/test_projects/eqwalizer_tests/eqwalizer/include/eqwalizer.hrl
similarity index 100%
rename from test_projects/eqwalizer_tests/eqwalizer/include/eqwalizer.hrl
rename to test/test_projects/eqwalizer_tests/eqwalizer/include/eqwalizer.hrl
diff --git a/test_projects/eqwalizer_tests/eqwalizer/src/eqwalizer.app.src b/test/test_projects/eqwalizer_tests/eqwalizer/src/eqwalizer.app.src
similarity index 100%
rename from test_projects/eqwalizer_tests/eqwalizer/src/eqwalizer.app.src
rename to test/test_projects/eqwalizer_tests/eqwalizer/src/eqwalizer.app.src
diff --git a/test_projects/eqwalizer_tests/eqwalizer/src/eqwalizer.erl b/test/test_projects/eqwalizer_tests/eqwalizer/src/eqwalizer.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/eqwalizer/src/eqwalizer.erl
rename to test/test_projects/eqwalizer_tests/eqwalizer/src/eqwalizer.erl
diff --git a/test_projects/eqwalizer_tests/eqwalizer/src/eqwalizer_specs.erl b/test/test_projects/eqwalizer_tests/eqwalizer/src/eqwalizer_specs.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/eqwalizer/src/eqwalizer_specs.erl
rename to test/test_projects/eqwalizer_tests/eqwalizer/src/eqwalizer_specs.erl
diff --git a/test_projects/eqwalizer_tests/eqwalizer_rebar3/src/eqwalizer_build_info_prv.erl b/test/test_projects/eqwalizer_tests/eqwalizer_rebar3/src/eqwalizer_build_info_prv.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/eqwalizer_rebar3/src/eqwalizer_build_info_prv.erl
rename to test/test_projects/eqwalizer_tests/eqwalizer_rebar3/src/eqwalizer_build_info_prv.erl
diff --git a/test_projects/eqwalizer_tests/eqwalizer_rebar3/src/eqwalizer_rebar3.app.src b/test/test_projects/eqwalizer_tests/eqwalizer_rebar3/src/eqwalizer_rebar3.app.src
similarity index 100%
rename from test_projects/eqwalizer_tests/eqwalizer_rebar3/src/eqwalizer_rebar3.app.src
rename to test/test_projects/eqwalizer_tests/eqwalizer_rebar3/src/eqwalizer_rebar3.app.src
diff --git a/test_projects/eqwalizer_tests/eqwalizer_rebar3/src/eqwalizer_rebar3.erl b/test/test_projects/eqwalizer_tests/eqwalizer_rebar3/src/eqwalizer_rebar3.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/eqwalizer_rebar3/src/eqwalizer_rebar3.erl
rename to test/test_projects/eqwalizer_tests/eqwalizer_rebar3/src/eqwalizer_rebar3.erl
diff --git a/test_projects/eqwalizer_tests/eqwater/readme.md b/test/test_projects/eqwalizer_tests/eqwater/readme.md
similarity index 100%
rename from test_projects/eqwalizer_tests/eqwater/readme.md
rename to test/test_projects/eqwalizer_tests/eqwater/readme.md
diff --git a/test_projects/eqwalizer_tests/eqwater/src/deep_tuples.erl b/test/test_projects/eqwalizer_tests/eqwater/src/deep_tuples.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/eqwater/src/deep_tuples.erl
rename to test/test_projects/eqwalizer_tests/eqwater/src/deep_tuples.erl
diff --git a/test_projects/eqwalizer_tests/eqwater/src/eqwater.app.src b/test/test_projects/eqwalizer_tests/eqwater/src/eqwater.app.src
similarity index 100%
rename from test_projects/eqwalizer_tests/eqwater/src/eqwater.app.src
rename to test/test_projects/eqwalizer_tests/eqwater/src/eqwater.app.src
diff --git a/test_projects/eqwalizer_tests/eqwater/src/eqwater.erl b/test/test_projects/eqwalizer_tests/eqwater/src/eqwater.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/eqwater/src/eqwater.erl
rename to test/test_projects/eqwalizer_tests/eqwater/src/eqwater.erl
diff --git a/test_projects/eqwalizer_tests/eqwater/src/eqwater_aliases.erl b/test/test_projects/eqwalizer_tests/eqwater/src/eqwater_aliases.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/eqwater/src/eqwater_aliases.erl
rename to test/test_projects/eqwalizer_tests/eqwater/src/eqwater_aliases.erl
diff --git a/test_projects/eqwalizer_tests/eqwater/src/eqwater_generics.erl b/test/test_projects/eqwalizer_tests/eqwater/src/eqwater_generics.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/eqwater/src/eqwater_generics.erl
rename to test/test_projects/eqwalizer_tests/eqwater/src/eqwater_generics.erl
diff --git a/test_projects/eqwalizer_tests/eqwater/src/eqwater_lists.erl b/test/test_projects/eqwalizer_tests/eqwater/src/eqwater_lists.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/eqwater/src/eqwater_lists.erl
rename to test/test_projects/eqwalizer_tests/eqwater/src/eqwater_lists.erl
diff --git a/test_projects/eqwalizer_tests/eqwater/src/eqwater_maps.erl b/test/test_projects/eqwalizer_tests/eqwater/src/eqwater_maps.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/eqwater/src/eqwater_maps.erl
rename to test/test_projects/eqwalizer_tests/eqwater/src/eqwater_maps.erl
diff --git a/test_projects/eqwalizer_tests/eqwater/src/eqwater_records.erl b/test/test_projects/eqwalizer_tests/eqwater/src/eqwater_records.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/eqwater/src/eqwater_records.erl
rename to test/test_projects/eqwalizer_tests/eqwater/src/eqwater_records.erl
diff --git a/test_projects/eqwalizer_tests/eqwater/src/eqwater_sound.erl b/test/test_projects/eqwalizer_tests/eqwater/src/eqwater_sound.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/eqwater/src/eqwater_sound.erl
rename to test/test_projects/eqwalizer_tests/eqwater/src/eqwater_sound.erl
diff --git a/test_projects/eqwalizer_tests/eqwater/src/unlimited_refinement.erl b/test/test_projects/eqwalizer_tests/eqwater/src/unlimited_refinement.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/eqwater/src/unlimited_refinement.erl
rename to test/test_projects/eqwalizer_tests/eqwater/src/unlimited_refinement.erl
diff --git a/test_projects/eqwalizer_tests/fault_tolerance/.eqwalizer b/test/test_projects/eqwalizer_tests/fault_tolerance/.eqwalizer
similarity index 100%
rename from test_projects/eqwalizer_tests/fault_tolerance/.eqwalizer
rename to test/test_projects/eqwalizer_tests/fault_tolerance/.eqwalizer
diff --git a/test_projects/eqwalizer_tests/fault_tolerance/src/fault_tolerance.app.src b/test/test_projects/eqwalizer_tests/fault_tolerance/src/fault_tolerance.app.src
similarity index 100%
rename from test_projects/eqwalizer_tests/fault_tolerance/src/fault_tolerance.app.src
rename to test/test_projects/eqwalizer_tests/fault_tolerance/src/fault_tolerance.app.src
diff --git a/test_projects/eqwalizer_tests/fault_tolerance/src/fault_tolerance.erl b/test/test_projects/eqwalizer_tests/fault_tolerance/src/fault_tolerance.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/fault_tolerance/src/fault_tolerance.erl
rename to test/test_projects/eqwalizer_tests/fault_tolerance/src/fault_tolerance.erl
diff --git a/test_projects/eqwalizer_tests/options/src/bad_maps.erl b/test/test_projects/eqwalizer_tests/options/src/bad_maps.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/options/src/bad_maps.erl
rename to test/test_projects/eqwalizer_tests/options/src/bad_maps.erl
diff --git a/test_projects/eqwalizer_tests/options/src/dynamic_lambdas.erl b/test/test_projects/eqwalizer_tests/options/src/dynamic_lambdas.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/options/src/dynamic_lambdas.erl
rename to test/test_projects/eqwalizer_tests/options/src/dynamic_lambdas.erl
diff --git a/test_projects/eqwalizer_tests/options/src/options.app.src b/test/test_projects/eqwalizer_tests/options/src/options.app.src
similarity index 100%
rename from test_projects/eqwalizer_tests/options/src/options.app.src
rename to test/test_projects/eqwalizer_tests/options/src/options.app.src
diff --git a/test_projects/eqwalizer_tests/options/src/overloaded_specs_dynamic_result.erl b/test/test_projects/eqwalizer_tests/options/src/overloaded_specs_dynamic_result.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/options/src/overloaded_specs_dynamic_result.erl
rename to test/test_projects/eqwalizer_tests/options/src/overloaded_specs_dynamic_result.erl
diff --git a/test_projects/eqwalizer_tests/options/src/redundant_guards.erl b/test/test_projects/eqwalizer_tests/options/src/redundant_guards.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/options/src/redundant_guards.erl
rename to test/test_projects/eqwalizer_tests/options/src/redundant_guards.erl
diff --git a/test_projects/eqwalizer_tests/options/src/uncovered_clauses.erl b/test/test_projects/eqwalizer_tests/options/src/uncovered_clauses.erl
similarity index 100%
rename from test_projects/eqwalizer_tests/options/src/uncovered_clauses.erl
rename to test/test_projects/eqwalizer_tests/options/src/uncovered_clauses.erl
diff --git a/test_projects/eqwalizer_tests/rebar.config b/test/test_projects/eqwalizer_tests/rebar.config
similarity index 100%
rename from test_projects/eqwalizer_tests/rebar.config
rename to test/test_projects/eqwalizer_tests/rebar.config
diff --git a/test/test_projects/hierarchical_config/.elp.toml b/test/test_projects/hierarchical_config/.elp.toml
new file mode 100644
index 0000000000..a650134c9f
--- /dev/null
+++ b/test/test_projects/hierarchical_config/.elp.toml
@@ -0,0 +1,5 @@
+[buck]
+enabled = true
+build_deps = false
+included_targets = [ "fbcode//whatsapp/elp/test/test_projects/hierarchical_config/..." ]
+source_root = "whatsapp/elp/test/test_projects/hierarchical_config"
diff --git a/test_projects/hierarchical_config/.elp_lint.toml b/test/test_projects/hierarchical_config/.elp_lint.toml
similarity index 100%
rename from test_projects/hierarchical_config/.elp_lint.toml
rename to test/test_projects/hierarchical_config/.elp_lint.toml
diff --git a/test_projects/hierarchical_config/app_a/.elp_lint.toml b/test/test_projects/hierarchical_config/app_a/.elp_lint.toml
similarity index 100%
rename from test_projects/hierarchical_config/app_a/.elp_lint.toml
rename to test/test_projects/hierarchical_config/app_a/.elp_lint.toml
diff --git a/test_projects/hierarchical_config/app_a/src/app_a.app.src b/test/test_projects/hierarchical_config/app_a/src/app_a.app.src
similarity index 100%
rename from test_projects/hierarchical_config/app_a/src/app_a.app.src
rename to test/test_projects/hierarchical_config/app_a/src/app_a.app.src
diff --git a/test_projects/hierarchical_config/app_a/src/app_a.erl b/test/test_projects/hierarchical_config/app_a/src/app_a.erl
similarity index 100%
rename from test_projects/hierarchical_config/app_a/src/app_a.erl
rename to test/test_projects/hierarchical_config/app_a/src/app_a.erl
diff --git a/test_projects/hierarchical_config/app_b/src/app_b.app.src b/test/test_projects/hierarchical_config/app_b/src/app_b.app.src
similarity index 100%
rename from test_projects/hierarchical_config/app_b/src/app_b.app.src
rename to test/test_projects/hierarchical_config/app_b/src/app_b.app.src
diff --git a/test_projects/hierarchical_config/app_b/src/app_b.erl b/test/test_projects/hierarchical_config/app_b/src/app_b.erl
similarity index 100%
rename from test_projects/hierarchical_config/app_b/src/app_b.erl
rename to test/test_projects/hierarchical_config/app_b/src/app_b.erl
diff --git a/test_projects/hierarchical_config/rebar.config b/test/test_projects/hierarchical_config/rebar.config
similarity index 100%
rename from test_projects/hierarchical_config/rebar.config
rename to test/test_projects/hierarchical_config/rebar.config
diff --git a/test/test_projects/in_place_tests/.elp.toml b/test/test_projects/in_place_tests/.elp.toml
new file mode 100644
index 0000000000..64140d2852
--- /dev/null
+++ b/test/test_projects/in_place_tests/.elp.toml
@@ -0,0 +1,5 @@
+[buck]
+enabled = true
+build_deps = false
+included_targets = [ "fbcode//whatsapp/elp/test/test_projects/in_place_tests/..." ]
+source_root = "whatsapp/elp/test/test_projects/in_place_tests"
diff --git a/test_projects/in_place_tests/README.md b/test/test_projects/in_place_tests/README.md
similarity index 100%
rename from test_projects/in_place_tests/README.md
rename to test/test_projects/in_place_tests/README.md
diff --git a/test_projects/in_place_tests/app_a/extra/app_a.erl b/test/test_projects/in_place_tests/app_a/extra/app_a.erl
similarity index 100%
rename from test_projects/in_place_tests/app_a/extra/app_a.erl
rename to test/test_projects/in_place_tests/app_a/extra/app_a.erl
diff --git a/test_projects/in_place_tests/app_a/include/app_a.hrl b/test/test_projects/in_place_tests/app_a/include/app_a.hrl
similarity index 100%
rename from test_projects/in_place_tests/app_a/include/app_a.hrl
rename to test/test_projects/in_place_tests/app_a/include/app_a.hrl
diff --git a/test_projects/in_place_tests/app_a/include/broken_diagnostics.hrl b/test/test_projects/in_place_tests/app_a/include/broken_diagnostics.hrl
similarity index 100%
rename from test_projects/in_place_tests/app_a/include/broken_diagnostics.hrl
rename to test/test_projects/in_place_tests/app_a/include/broken_diagnostics.hrl
diff --git a/test_projects/in_place_tests/app_a/include/diagnostics.hrl b/test/test_projects/in_place_tests/app_a/include/diagnostics.hrl
similarity index 100%
rename from test_projects/in_place_tests/app_a/include/diagnostics.hrl
rename to test/test_projects/in_place_tests/app_a/include/diagnostics.hrl
diff --git a/test_projects/in_place_tests/app_a/src/app_a.app.src b/test/test_projects/in_place_tests/app_a/src/app_a.app.src
similarity index 100%
rename from test_projects/in_place_tests/app_a/src/app_a.app.src
rename to test/test_projects/in_place_tests/app_a/src/app_a.app.src
diff --git a/test_projects/in_place_tests/app_a/src/app_a.erl b/test/test_projects/in_place_tests/app_a/src/app_a.erl
similarity index 100%
rename from test_projects/in_place_tests/app_a/src/app_a.erl
rename to test/test_projects/in_place_tests/app_a/src/app_a.erl
diff --git a/test_projects/in_place_tests/app_a/src/lints.erl b/test/test_projects/in_place_tests/app_a/src/lints.erl
similarity index 100%
rename from test_projects/in_place_tests/app_a/src/lints.erl
rename to test/test_projects/in_place_tests/app_a/src/lints.erl
diff --git a/test_projects/in_place_tests/app_a/test/app_a_SUITE.erl b/test/test_projects/in_place_tests/app_a/test/app_a_SUITE.erl
similarity index 100%
rename from test_projects/in_place_tests/app_a/test/app_a_SUITE.erl
rename to test/test_projects/in_place_tests/app_a/test/app_a_SUITE.erl
diff --git a/test_projects/in_place_tests/erlang_ls.config b/test/test_projects/in_place_tests/erlang_ls.config
similarity index 100%
rename from test_projects/in_place_tests/erlang_ls.config
rename to test/test_projects/in_place_tests/erlang_ls.config
diff --git a/test_projects/in_place_tests/rebar.config b/test/test_projects/in_place_tests/rebar.config
similarity index 100%
rename from test_projects/in_place_tests/rebar.config
rename to test/test_projects/in_place_tests/rebar.config
diff --git a/test/test_projects/include_lib_dependency_test/.elp.toml b/test/test_projects/include_lib_dependency_test/.elp.toml
new file mode 100644
index 0000000000..02b5b7d244
--- /dev/null
+++ b/test/test_projects/include_lib_dependency_test/.elp.toml
@@ -0,0 +1,5 @@
+[buck]
+enabled = true
+build_deps = false
+included_targets = [ "fbcode//whatsapp/elp/test/test_projects/include_lib_dependency_test/..." ]
+source_root = "whatsapp/elp/test/test_projects/include_lib_dependency_test"
diff --git a/test_projects/include_lib_dependency_test/external_app/include/external_header.hrl b/test/test_projects/include_lib_dependency_test/external_app/include/external_header.hrl
similarity index 100%
rename from test_projects/include_lib_dependency_test/external_app/include/external_header.hrl
rename to test/test_projects/include_lib_dependency_test/external_app/include/external_header.hrl
diff --git a/test_projects/include_lib_dependency_test/external_app/src/external_app.app.src b/test/test_projects/include_lib_dependency_test/external_app/src/external_app.app.src
similarity index 100%
rename from test_projects/include_lib_dependency_test/external_app/src/external_app.app.src
rename to test/test_projects/include_lib_dependency_test/external_app/src/external_app.app.src
diff --git a/test_projects/include_lib_dependency_test/external_app/src/external_app.erl b/test/test_projects/include_lib_dependency_test/external_app/src/external_app.erl
similarity index 100%
rename from test_projects/include_lib_dependency_test/external_app/src/external_app.erl
rename to test/test_projects/include_lib_dependency_test/external_app/src/external_app.erl
diff --git a/test_projects/include_lib_dependency_test/extra_app/include/extra_header.hrl b/test/test_projects/include_lib_dependency_test/extra_app/include/extra_header.hrl
similarity index 100%
rename from test_projects/include_lib_dependency_test/extra_app/include/extra_header.hrl
rename to test/test_projects/include_lib_dependency_test/extra_app/include/extra_header.hrl
diff --git a/test_projects/include_lib_dependency_test/extra_app/src/extra_app.app.src b/test/test_projects/include_lib_dependency_test/extra_app/src/extra_app.app.src
similarity index 100%
rename from test_projects/include_lib_dependency_test/extra_app/src/extra_app.app.src
rename to test/test_projects/include_lib_dependency_test/extra_app/src/extra_app.app.src
diff --git a/test_projects/include_lib_dependency_test/extra_app/src/extra_app.erl b/test/test_projects/include_lib_dependency_test/extra_app/src/extra_app.erl
similarity index 100%
rename from test_projects/include_lib_dependency_test/extra_app/src/extra_app.erl
rename to test/test_projects/include_lib_dependency_test/extra_app/src/extra_app.erl
diff --git a/test_projects/include_lib_dependency_test/main_app/src/main_app.app.src b/test/test_projects/include_lib_dependency_test/main_app/src/main_app.app.src
similarity index 100%
rename from test_projects/include_lib_dependency_test/main_app/src/main_app.app.src
rename to test/test_projects/include_lib_dependency_test/main_app/src/main_app.app.src
diff --git a/test_projects/include_lib_dependency_test/main_app/src/main_app.erl b/test/test_projects/include_lib_dependency_test/main_app/src/main_app.erl
similarity index 100%
rename from test_projects/include_lib_dependency_test/main_app/src/main_app.erl
rename to test/test_projects/include_lib_dependency_test/main_app/src/main_app.erl
diff --git a/test_projects/include_lib_dependency_test/normal_dep/include/assert.hrl b/test/test_projects/include_lib_dependency_test/normal_dep/include/assert.hrl
similarity index 100%
rename from test_projects/include_lib_dependency_test/normal_dep/include/assert.hrl
rename to test/test_projects/include_lib_dependency_test/normal_dep/include/assert.hrl
diff --git a/test_projects/include_lib_dependency_test/normal_dep/src/normal_dep.app.src b/test/test_projects/include_lib_dependency_test/normal_dep/src/normal_dep.app.src
similarity index 100%
rename from test_projects/include_lib_dependency_test/normal_dep/src/normal_dep.app.src
rename to test/test_projects/include_lib_dependency_test/normal_dep/src/normal_dep.app.src
diff --git a/test_projects/include_lib_dependency_test/normal_dep/src/normal_dep.erl b/test/test_projects/include_lib_dependency_test/normal_dep/src/normal_dep.erl
similarity index 100%
rename from test_projects/include_lib_dependency_test/normal_dep/src/normal_dep.erl
rename to test/test_projects/include_lib_dependency_test/normal_dep/src/normal_dep.erl
diff --git a/test_projects/include_lib_dependency_test/rebar.config b/test/test_projects/include_lib_dependency_test/rebar.config
similarity index 100%
rename from test_projects/include_lib_dependency_test/rebar.config
rename to test/test_projects/include_lib_dependency_test/rebar.config
diff --git a/test/test_projects/linter/.elp.toml b/test/test_projects/linter/.elp.toml
new file mode 100644
index 0000000000..bc8b86088c
--- /dev/null
+++ b/test/test_projects/linter/.elp.toml
@@ -0,0 +1,5 @@
+[buck]
+enabled = true
+build_deps = false
+included_targets = [ "fbcode//whatsapp/elp/test/test_projects/linter/..." ]
+source_root = "whatsapp/elp/test/test_projects/linter"
diff --git a/test_projects/linter/.elp_lint.toml b/test/test_projects/linter/.elp_lint.toml
similarity index 100%
rename from test_projects/linter/.elp_lint.toml
rename to test/test_projects/linter/.elp_lint.toml
diff --git a/test_projects/linter/.gitignore b/test/test_projects/linter/.gitignore
similarity index 100%
rename from test_projects/linter/.gitignore
rename to test/test_projects/linter/.gitignore
diff --git a/test_projects/linter/app_a/include/app_a.hrl b/test/test_projects/linter/app_a/include/app_a.hrl
similarity index 100%
rename from test_projects/linter/app_a/include/app_a.hrl
rename to test/test_projects/linter/app_a/include/app_a.hrl
diff --git a/test_projects/linter/app_a/src/app_a.app.src b/test/test_projects/linter/app_a/src/app_a.app.src
similarity index 100%
rename from test_projects/linter/app_a/src/app_a.app.src
rename to test/test_projects/linter/app_a/src/app_a.app.src
diff --git a/test_projects/linter/app_a/src/app_a.erl b/test/test_projects/linter/app_a/src/app_a.erl
similarity index 100%
rename from test_projects/linter/app_a/src/app_a.erl
rename to test/test_projects/linter/app_a/src/app_a.erl
diff --git a/test_projects/linter/app_a/src/app_a_edoc.erl b/test/test_projects/linter/app_a/src/app_a_edoc.erl
similarity index 100%
rename from test_projects/linter/app_a/src/app_a_edoc.erl
rename to test/test_projects/linter/app_a/src/app_a_edoc.erl
diff --git a/test_projects/linter/app_a/src/app_a_ssr.erl b/test/test_projects/linter/app_a/src/app_a_ssr.erl
similarity index 100%
rename from test_projects/linter/app_a/src/app_a_ssr.erl
rename to test/test_projects/linter/app_a/src/app_a_ssr.erl
diff --git a/test_projects/linter/app_a/src/app_a_unused_param.erl b/test/test_projects/linter/app_a/src/app_a_unused_param.erl
similarity index 100%
rename from test_projects/linter/app_a/src/app_a_unused_param.erl
rename to test/test_projects/linter/app_a/src/app_a_unused_param.erl
diff --git a/test_projects/linter/app_a/src/custom_function_matches.erl b/test/test_projects/linter/app_a/src/custom_function_matches.erl
similarity index 100%
rename from test_projects/linter/app_a/src/custom_function_matches.erl
rename to test/test_projects/linter/app_a/src/custom_function_matches.erl
diff --git a/test_projects/linter/app_a/src/expression_updates_literal.erl b/test/test_projects/linter/app_a/src/expression_updates_literal.erl
similarity index 100%
rename from test_projects/linter/app_a/src/expression_updates_literal.erl
rename to test/test_projects/linter/app_a/src/expression_updates_literal.erl
diff --git a/test_projects/linter/app_a/src/spelling.erl b/test/test_projects/linter/app_a/src/spelling.erl
similarity index 100%
rename from test_projects/linter/app_a/src/spelling.erl
rename to test/test_projects/linter/app_a/src/spelling.erl
diff --git a/test_projects/linter/app_a/test/app_a_SUITE.erl b/test/test_projects/linter/app_a/test/app_a_SUITE.erl
similarity index 100%
rename from test_projects/linter/app_a/test/app_a_SUITE.erl
rename to test/test_projects/linter/app_a/test/app_a_SUITE.erl
diff --git a/test_projects/linter/app_a/test/app_a_test_helpers.erl b/test/test_projects/linter/app_a/test/app_a_test_helpers.erl
similarity index 100%
rename from test_projects/linter/app_a/test/app_a_test_helpers.erl
rename to test/test_projects/linter/app_a/test/app_a_test_helpers.erl
diff --git a/test_projects/linter/app_a/test/app_a_test_helpers_not_opted_in.erl b/test/test_projects/linter/app_a/test/app_a_test_helpers_not_opted_in.erl
similarity index 100%
rename from test_projects/linter/app_a/test/app_a_test_helpers_not_opted_in.erl
rename to test/test_projects/linter/app_a/test/app_a_test_helpers_not_opted_in.erl
diff --git a/test_projects/linter/app_a/test/app_a_unreachable_test_SUITE.erl b/test/test_projects/linter/app_a/test/app_a_unreachable_test_SUITE.erl
similarity index 100%
rename from test_projects/linter/app_a/test/app_a_unreachable_test_SUITE.erl
rename to test/test_projects/linter/app_a/test/app_a_unreachable_test_SUITE.erl
diff --git a/test_projects/linter/app_a/test/app_test_helpers_no_errors.erl b/test/test_projects/linter/app_a/test/app_test_helpers_no_errors.erl
similarity index 100%
rename from test_projects/linter/app_a/test/app_test_helpers_no_errors.erl
rename to test/test_projects/linter/app_a/test/app_test_helpers_no_errors.erl
diff --git a/test_projects/linter/app_b/src/app_b.app.src b/test/test_projects/linter/app_b/src/app_b.app.src
similarity index 100%
rename from test_projects/linter/app_b/src/app_b.app.src
rename to test/test_projects/linter/app_b/src/app_b.app.src
diff --git a/test_projects/linter/app_b/src/app_b.erl b/test/test_projects/linter/app_b/src/app_b.erl
similarity index 100%
rename from test_projects/linter/app_b/src/app_b.erl
rename to test/test_projects/linter/app_b/src/app_b.erl
diff --git a/test_projects/linter/app_b/src/app_b_unused_param.erl b/test/test_projects/linter/app_b/src/app_b_unused_param.erl
similarity index 100%
rename from test_projects/linter/app_b/src/app_b_unused_param.erl
rename to test/test_projects/linter/app_b/src/app_b_unused_param.erl
diff --git a/test_projects/linter/elp_lint_adhoc.toml b/test/test_projects/linter/elp_lint_adhoc.toml
similarity index 100%
rename from test_projects/linter/elp_lint_adhoc.toml
rename to test/test_projects/linter/elp_lint_adhoc.toml
diff --git a/test_projects/linter/elp_lint_custom_function_matches.toml b/test/test_projects/linter/elp_lint_custom_function_matches.toml
similarity index 100%
rename from test_projects/linter/elp_lint_custom_function_matches.toml
rename to test/test_projects/linter/elp_lint_custom_function_matches.toml
diff --git a/test_projects/linter/elp_lint_ssr_adhoc.toml b/test/test_projects/linter/elp_lint_ssr_adhoc.toml
similarity index 100%
rename from test_projects/linter/elp_lint_ssr_adhoc.toml
rename to test/test_projects/linter/elp_lint_ssr_adhoc.toml
diff --git a/test_projects/linter/elp_lint_ssr_adhoc_parse_fail.toml b/test/test_projects/linter/elp_lint_ssr_adhoc_parse_fail.toml
similarity index 100%
rename from test_projects/linter/elp_lint_ssr_adhoc_parse_fail.toml
rename to test/test_projects/linter/elp_lint_ssr_adhoc_parse_fail.toml
diff --git a/test_projects/linter/elp_lint_test1.toml b/test/test_projects/linter/elp_lint_test1.toml
similarity index 100%
rename from test_projects/linter/elp_lint_test1.toml
rename to test/test_projects/linter/elp_lint_test1.toml
diff --git a/test_projects/linter/elp_lint_test2.toml b/test/test_projects/linter/elp_lint_test2.toml
similarity index 100%
rename from test_projects/linter/elp_lint_test2.toml
rename to test/test_projects/linter/elp_lint_test2.toml
diff --git a/test_projects/linter/elp_lint_test_ignore.toml b/test/test_projects/linter/elp_lint_test_ignore.toml
similarity index 100%
rename from test_projects/linter/elp_lint_test_ignore.toml
rename to test/test_projects/linter/elp_lint_test_ignore.toml
diff --git a/test_projects/linter/elp_lint_warnings_as_errors.toml b/test/test_projects/linter/elp_lint_warnings_as_errors.toml
similarity index 100%
rename from test_projects/linter/elp_lint_warnings_as_errors.toml
rename to test/test_projects/linter/elp_lint_warnings_as_errors.toml
diff --git a/test_projects/linter/rebar.config b/test/test_projects/linter/rebar.config
similarity index 100%
rename from test_projects/linter/rebar.config
rename to test/test_projects/linter/rebar.config
diff --git a/test/test_projects/linter_bad_config/.elp.toml b/test/test_projects/linter_bad_config/.elp.toml
new file mode 100644
index 0000000000..bc8b86088c
--- /dev/null
+++ b/test/test_projects/linter_bad_config/.elp.toml
@@ -0,0 +1,5 @@
+[buck]
+enabled = true
+build_deps = false
+included_targets = [ "fbcode//whatsapp/elp/test/test_projects/linter/..." ]
+source_root = "whatsapp/elp/test/test_projects/linter"
diff --git a/test_projects/linter_bad_config/.elp_lint.toml b/test/test_projects/linter_bad_config/.elp_lint.toml
similarity index 100%
rename from test_projects/linter_bad_config/.elp_lint.toml
rename to test/test_projects/linter_bad_config/.elp_lint.toml
diff --git a/test_projects/linter_bad_config/.gitignore b/test/test_projects/linter_bad_config/.gitignore
similarity index 100%
rename from test_projects/linter_bad_config/.gitignore
rename to test/test_projects/linter_bad_config/.gitignore
diff --git a/test_projects/linter_bad_config/app_a/include/app_a.hrl b/test/test_projects/linter_bad_config/app_a/include/app_a.hrl
similarity index 100%
rename from test_projects/linter_bad_config/app_a/include/app_a.hrl
rename to test/test_projects/linter_bad_config/app_a/include/app_a.hrl
diff --git a/test_projects/linter_bad_config/app_a/src/app_a.app.src b/test/test_projects/linter_bad_config/app_a/src/app_a.app.src
similarity index 100%
rename from test_projects/linter_bad_config/app_a/src/app_a.app.src
rename to test/test_projects/linter_bad_config/app_a/src/app_a.app.src
diff --git a/test_projects/linter_bad_config/app_a/src/app_a.erl b/test/test_projects/linter_bad_config/app_a/src/app_a.erl
similarity index 100%
rename from test_projects/linter_bad_config/app_a/src/app_a.erl
rename to test/test_projects/linter_bad_config/app_a/src/app_a.erl
diff --git a/test/test_projects/linter_bad_config/linter/.elp.toml b/test/test_projects/linter_bad_config/linter/.elp.toml
new file mode 100644
index 0000000000..bc8b86088c
--- /dev/null
+++ b/test/test_projects/linter_bad_config/linter/.elp.toml
@@ -0,0 +1,5 @@
+[buck]
+enabled = true
+build_deps = false
+included_targets = [ "fbcode//whatsapp/elp/test/test_projects/linter/..." ]
+source_root = "whatsapp/elp/test/test_projects/linter"
diff --git a/test_projects/linter_bad_config/linter/.elp_lint.toml b/test/test_projects/linter_bad_config/linter/.elp_lint.toml
similarity index 100%
rename from test_projects/linter_bad_config/linter/.elp_lint.toml
rename to test/test_projects/linter_bad_config/linter/.elp_lint.toml
diff --git a/test_projects/linter_bad_config/linter/.gitignore b/test/test_projects/linter_bad_config/linter/.gitignore
similarity index 100%
rename from test_projects/linter_bad_config/linter/.gitignore
rename to test/test_projects/linter_bad_config/linter/.gitignore
diff --git a/test_projects/linter_bad_config/linter/app_a/include/app_a.hrl b/test/test_projects/linter_bad_config/linter/app_a/include/app_a.hrl
similarity index 100%
rename from test_projects/linter_bad_config/linter/app_a/include/app_a.hrl
rename to test/test_projects/linter_bad_config/linter/app_a/include/app_a.hrl
diff --git a/test_projects/linter_bad_config/linter/app_a/src/app_a.app.src b/test/test_projects/linter_bad_config/linter/app_a/src/app_a.app.src
similarity index 100%
rename from test_projects/linter_bad_config/linter/app_a/src/app_a.app.src
rename to test/test_projects/linter_bad_config/linter/app_a/src/app_a.app.src
diff --git a/test_projects/linter_bad_config/linter/app_a/src/app_a.erl b/test/test_projects/linter_bad_config/linter/app_a/src/app_a.erl
similarity index 100%
rename from test_projects/linter_bad_config/linter/app_a/src/app_a.erl
rename to test/test_projects/linter_bad_config/linter/app_a/src/app_a.erl
diff --git a/test_projects/linter_bad_config/linter/app_a/src/app_a_unused_param.erl b/test/test_projects/linter_bad_config/linter/app_a/src/app_a_unused_param.erl
similarity index 100%
rename from test_projects/linter_bad_config/linter/app_a/src/app_a_unused_param.erl
rename to test/test_projects/linter_bad_config/linter/app_a/src/app_a_unused_param.erl
diff --git a/test_projects/linter_bad_config/linter/app_a/test/app_a_SUITE.erl b/test/test_projects/linter_bad_config/linter/app_a/test/app_a_SUITE.erl
similarity index 100%
rename from test_projects/linter_bad_config/linter/app_a/test/app_a_SUITE.erl
rename to test/test_projects/linter_bad_config/linter/app_a/test/app_a_SUITE.erl
diff --git a/test_projects/linter_bad_config/linter/app_a/test/app_a_test_helpers.erl b/test/test_projects/linter_bad_config/linter/app_a/test/app_a_test_helpers.erl
similarity index 100%
rename from test_projects/linter_bad_config/linter/app_a/test/app_a_test_helpers.erl
rename to test/test_projects/linter_bad_config/linter/app_a/test/app_a_test_helpers.erl
diff --git a/test_projects/linter_bad_config/linter/app_a/test/app_a_test_helpers_not_opted_in.erl b/test/test_projects/linter_bad_config/linter/app_a/test/app_a_test_helpers_not_opted_in.erl
similarity index 100%
rename from test_projects/linter_bad_config/linter/app_a/test/app_a_test_helpers_not_opted_in.erl
rename to test/test_projects/linter_bad_config/linter/app_a/test/app_a_test_helpers_not_opted_in.erl
diff --git a/test_projects/linter_bad_config/linter/app_a/test/app_test_helpers_no_errors.erl b/test/test_projects/linter_bad_config/linter/app_a/test/app_test_helpers_no_errors.erl
similarity index 100%
rename from test_projects/linter_bad_config/linter/app_a/test/app_test_helpers_no_errors.erl
rename to test/test_projects/linter_bad_config/linter/app_a/test/app_test_helpers_no_errors.erl
diff --git a/test_projects/linter_bad_config/linter/app_b/src/app_b.app.src b/test/test_projects/linter_bad_config/linter/app_b/src/app_b.app.src
similarity index 100%
rename from test_projects/linter_bad_config/linter/app_b/src/app_b.app.src
rename to test/test_projects/linter_bad_config/linter/app_b/src/app_b.app.src
diff --git a/test_projects/linter_bad_config/linter/app_b/src/app_b.erl b/test/test_projects/linter_bad_config/linter/app_b/src/app_b.erl
similarity index 100%
rename from test_projects/linter_bad_config/linter/app_b/src/app_b.erl
rename to test/test_projects/linter_bad_config/linter/app_b/src/app_b.erl
diff --git a/test_projects/linter_bad_config/linter/app_b/src/app_b_unused_param.erl b/test/test_projects/linter_bad_config/linter/app_b/src/app_b_unused_param.erl
similarity index 100%
rename from test_projects/linter_bad_config/linter/app_b/src/app_b_unused_param.erl
rename to test/test_projects/linter_bad_config/linter/app_b/src/app_b_unused_param.erl
diff --git a/test_projects/linter_bad_config/linter/rebar.config b/test/test_projects/linter_bad_config/linter/rebar.config
similarity index 100%
rename from test_projects/linter_bad_config/linter/rebar.config
rename to test/test_projects/linter_bad_config/linter/rebar.config
diff --git a/test_projects/linter_bad_config/rebar.config b/test/test_projects/linter_bad_config/rebar.config
similarity index 100%
rename from test_projects/linter_bad_config/rebar.config
rename to test/test_projects/linter_bad_config/rebar.config
diff --git a/test/test_projects/parse_error/.elp.toml b/test/test_projects/parse_error/.elp.toml
new file mode 100644
index 0000000000..a38e24f657
--- /dev/null
+++ b/test/test_projects/parse_error/.elp.toml
@@ -0,0 +1,8 @@
+[buck]
+enabled = true
+build_deps = false
+included_targets = [ "fbcode//whatsapp/elp/test/test_projects/parse_error/..." ]
+source_root = "whatsapp/elp/test/test_projects/parse_error"
+
+[eqwalizer]
+enable_all = false
diff --git a/test_projects/parse_error/.gitignore b/test/test_projects/parse_error/.gitignore
similarity index 100%
rename from test_projects/parse_error/.gitignore
rename to test/test_projects/parse_error/.gitignore
diff --git a/test_projects/parse_error/.rebar.root b/test/test_projects/parse_error/.rebar.root
similarity index 100%
rename from test_projects/parse_error/.rebar.root
rename to test/test_projects/parse_error/.rebar.root
diff --git a/test_projects/parse_error/eqwalizer/src/eqwalizer.app.src b/test/test_projects/parse_error/eqwalizer/src/eqwalizer.app.src
similarity index 100%
rename from test_projects/parse_error/eqwalizer/src/eqwalizer.app.src
rename to test/test_projects/parse_error/eqwalizer/src/eqwalizer.app.src
diff --git a/test_projects/parse_error/eqwalizer/src/eqwalizer.erl b/test/test_projects/parse_error/eqwalizer/src/eqwalizer.erl
similarity index 100%
rename from test_projects/parse_error/eqwalizer/src/eqwalizer.erl
rename to test/test_projects/parse_error/eqwalizer/src/eqwalizer.erl
diff --git a/test_projects/parse_error/eqwalizer/src/eqwalizer_specs.erl b/test/test_projects/parse_error/eqwalizer/src/eqwalizer_specs.erl
similarity index 100%
rename from test_projects/parse_error/eqwalizer/src/eqwalizer_specs.erl
rename to test/test_projects/parse_error/eqwalizer/src/eqwalizer_specs.erl
diff --git a/test_projects/parse_error/parse_error_a/src/parse_error_a.app.src b/test/test_projects/parse_error/parse_error_a/src/parse_error_a.app.src
similarity index 100%
rename from test_projects/parse_error/parse_error_a/src/parse_error_a.app.src
rename to test/test_projects/parse_error/parse_error_a/src/parse_error_a.app.src
diff --git a/test_projects/parse_error/parse_error_a/src/parse_error_a.erl b/test/test_projects/parse_error/parse_error_a/src/parse_error_a.erl
similarity index 100%
rename from test_projects/parse_error/parse_error_a/src/parse_error_a.erl
rename to test/test_projects/parse_error/parse_error_a/src/parse_error_a.erl
diff --git a/test_projects/parse_error/parse_error_a/src/parse_error_a_bad.erl b/test/test_projects/parse_error/parse_error_a/src/parse_error_a_bad.erl
similarity index 100%
rename from test_projects/parse_error/parse_error_a/src/parse_error_a_bad.erl
rename to test/test_projects/parse_error/parse_error_a/src/parse_error_a_bad.erl
diff --git a/test_projects/parse_error/parse_error_a/src/parse_error_a_reference_bad.erl b/test/test_projects/parse_error/parse_error_a/src/parse_error_a_reference_bad.erl
similarity index 100%
rename from test_projects/parse_error/parse_error_a/src/parse_error_a_reference_bad.erl
rename to test/test_projects/parse_error/parse_error_a/src/parse_error_a_reference_bad.erl
diff --git a/test_projects/parse_error/parse_error_a/src/parse_error_a_syntax_error.erl b/test/test_projects/parse_error/parse_error_a/src/parse_error_a_syntax_error.erl
similarity index 100%
rename from test_projects/parse_error/parse_error_a/src/parse_error_a_syntax_error.erl
rename to test/test_projects/parse_error/parse_error_a/src/parse_error_a_syntax_error.erl
diff --git a/test_projects/parse_error/parse_error_a/src/parse_error_a_worst.erl b/test/test_projects/parse_error/parse_error_a/src/parse_error_a_worst.erl
similarity index 100%
rename from test_projects/parse_error/parse_error_a/src/parse_error_a_worst.erl
rename to test/test_projects/parse_error/parse_error_a/src/parse_error_a_worst.erl
diff --git a/test_projects/parse_error/rebar.config b/test/test_projects/parse_error/rebar.config
similarity index 100%
rename from test_projects/parse_error/rebar.config
rename to test/test_projects/parse_error/rebar.config
diff --git a/test/test_projects/standard/.elp.toml b/test/test_projects/standard/.elp.toml
new file mode 100644
index 0000000000..29b2e051a4
--- /dev/null
+++ b/test/test_projects/standard/.elp.toml
@@ -0,0 +1,5 @@
+[buck]
+enabled = true
+build_deps = false
+included_targets = [ "fbcode//whatsapp/elp/test/test_projects/standard/..." ]
+source_root = "whatsapp/elp/test/test_projects/standard"
diff --git a/test_projects/standard/.gitignore b/test/test_projects/standard/.gitignore
similarity index 100%
rename from test_projects/standard/.gitignore
rename to test/test_projects/standard/.gitignore
diff --git a/test_projects/standard/.rebar.root b/test/test_projects/standard/.rebar.root
similarity index 100%
rename from test_projects/standard/.rebar.root
rename to test/test_projects/standard/.rebar.root
diff --git a/test_projects/standard/app_a/.eqwalizer b/test/test_projects/standard/app_a/.eqwalizer
similarity index 100%
rename from test_projects/standard/app_a/.eqwalizer
rename to test/test_projects/standard/app_a/.eqwalizer
diff --git a/test_projects/standard/app_a/extra/app_a.erl b/test/test_projects/standard/app_a/extra/app_a.erl
similarity index 100%
rename from test_projects/standard/app_a/extra/app_a.erl
rename to test/test_projects/standard/app_a/extra/app_a.erl
diff --git a/test_projects/standard/app_a/include/app_a.hrl b/test/test_projects/standard/app_a/include/app_a.hrl
similarity index 100%
rename from test_projects/standard/app_a/include/app_a.hrl
rename to test/test_projects/standard/app_a/include/app_a.hrl
diff --git a/test_projects/standard/app_a/src/app_a.app.src b/test/test_projects/standard/app_a/src/app_a.app.src
similarity index 100%
rename from test_projects/standard/app_a/src/app_a.app.src
rename to test/test_projects/standard/app_a/src/app_a.app.src
diff --git a/test_projects/standard/app_a/src/app_a.erl b/test/test_projects/standard/app_a/src/app_a.erl
similarity index 100%
rename from test_projects/standard/app_a/src/app_a.erl
rename to test/test_projects/standard/app_a/src/app_a.erl
diff --git a/test_projects/standard/app_a/src/app_a_errors_generated.erl b/test/test_projects/standard/app_a/src/app_a_errors_generated.erl
similarity index 100%
rename from test_projects/standard/app_a/src/app_a_errors_generated.erl
rename to test/test_projects/standard/app_a/src/app_a_errors_generated.erl
diff --git a/test_projects/standard/app_a/src/app_a_fixme.erl b/test/test_projects/standard/app_a/src/app_a_fixme.erl
similarity index 100%
rename from test_projects/standard/app_a/src/app_a_fixme.erl
rename to test/test_projects/standard/app_a/src/app_a_fixme.erl
diff --git a/test_projects/standard/app_a/src/app_a_ignored.erl b/test/test_projects/standard/app_a/src/app_a_ignored.erl
similarity index 100%
rename from test_projects/standard/app_a/src/app_a_ignored.erl
rename to test/test_projects/standard/app_a/src/app_a_ignored.erl
diff --git a/test_projects/standard/app_a/src/app_a_lists.erl b/test/test_projects/standard/app_a/src/app_a_lists.erl
similarity index 100%
rename from test_projects/standard/app_a/src/app_a_lists.erl
rename to test/test_projects/standard/app_a/src/app_a_lists.erl
diff --git a/test_projects/standard/app_a/src/app_a_mod2.erl b/test/test_projects/standard/app_a/src/app_a_mod2.erl
similarity index 100%
rename from test_projects/standard/app_a/src/app_a_mod2.erl
rename to test/test_projects/standard/app_a/src/app_a_mod2.erl
diff --git a/test_projects/standard/app_a/src/app_a_no_errors.erl b/test/test_projects/standard/app_a/src/app_a_no_errors.erl
similarity index 100%
rename from test_projects/standard/app_a/src/app_a_no_errors.erl
rename to test/test_projects/standard/app_a/src/app_a_no_errors.erl
diff --git a/test_projects/standard/app_a/src/app_a_no_errors_generated.erl b/test/test_projects/standard/app_a/src/app_a_no_errors_generated.erl
similarity index 100%
rename from test_projects/standard/app_a/src/app_a_no_errors_generated.erl
rename to test/test_projects/standard/app_a/src/app_a_no_errors_generated.erl
diff --git a/test_projects/standard/app_a/src/app_a_no_errors_opted_in.erl b/test/test_projects/standard/app_a/src/app_a_no_errors_opted_in.erl
similarity index 100%
rename from test_projects/standard/app_a/src/app_a_no_errors_opted_in.erl
rename to test/test_projects/standard/app_a/src/app_a_no_errors_opted_in.erl
diff --git a/test_projects/standard/app_a/test/app_a_SUITE.erl b/test/test_projects/standard/app_a/test/app_a_SUITE.erl
similarity index 100%
rename from test_projects/standard/app_a/test/app_a_SUITE.erl
rename to test/test_projects/standard/app_a/test/app_a_SUITE.erl
diff --git a/test_projects/standard/app_a/test/app_a_test_helpers.erl b/test/test_projects/standard/app_a/test/app_a_test_helpers.erl
similarity index 100%
rename from test_projects/standard/app_a/test/app_a_test_helpers.erl
rename to test/test_projects/standard/app_a/test/app_a_test_helpers.erl
diff --git a/test_projects/standard/app_a/test/app_a_test_helpers_not_opted_in.erl b/test/test_projects/standard/app_a/test/app_a_test_helpers_not_opted_in.erl
similarity index 100%
rename from test_projects/standard/app_a/test/app_a_test_helpers_not_opted_in.erl
rename to test/test_projects/standard/app_a/test/app_a_test_helpers_not_opted_in.erl
diff --git a/test_projects/standard/app_a/test/app_test_helpers_no_errors.erl b/test/test_projects/standard/app_a/test/app_test_helpers_no_errors.erl
similarity index 100%
rename from test_projects/standard/app_a/test/app_test_helpers_no_errors.erl
rename to test/test_projects/standard/app_a/test/app_test_helpers_no_errors.erl
diff --git a/test_projects/standard/app_b/src/app_b.app.src b/test/test_projects/standard/app_b/src/app_b.app.src
similarity index 100%
rename from test_projects/standard/app_b/src/app_b.app.src
rename to test/test_projects/standard/app_b/src/app_b.app.src
diff --git a/test_projects/standard/app_b/src/app_b.erl b/test/test_projects/standard/app_b/src/app_b.erl
similarity index 100%
rename from test_projects/standard/app_b/src/app_b.erl
rename to test/test_projects/standard/app_b/src/app_b.erl
diff --git a/test_projects/standard/eqwalizer/src/eqwalizer.app.src b/test/test_projects/standard/eqwalizer/src/eqwalizer.app.src
similarity index 100%
rename from test_projects/standard/eqwalizer/src/eqwalizer.app.src
rename to test/test_projects/standard/eqwalizer/src/eqwalizer.app.src
diff --git a/test_projects/standard/eqwalizer/src/eqwalizer.erl b/test/test_projects/standard/eqwalizer/src/eqwalizer.erl
similarity index 100%
rename from test_projects/standard/eqwalizer/src/eqwalizer.erl
rename to test/test_projects/standard/eqwalizer/src/eqwalizer.erl
diff --git a/test_projects/standard/eqwalizer/src/eqwalizer_specs.erl b/test/test_projects/standard/eqwalizer/src/eqwalizer_specs.erl
similarity index 100%
rename from test_projects/standard/eqwalizer/src/eqwalizer_specs.erl
rename to test/test_projects/standard/eqwalizer/src/eqwalizer_specs.erl
diff --git a/test_projects/standard/erlang_ls.config b/test/test_projects/standard/erlang_ls.config
similarity index 100%
rename from test_projects/standard/erlang_ls.config
rename to test/test_projects/standard/erlang_ls.config
diff --git a/test_projects/standard/rebar.config b/test/test_projects/standard/rebar.config
similarity index 100%
rename from test_projects/standard/rebar.config
rename to test/test_projects/standard/rebar.config
diff --git a/test/test_projects/xref/.elp.toml b/test/test_projects/xref/.elp.toml
new file mode 100644
index 0000000000..0b684fba14
--- /dev/null
+++ b/test/test_projects/xref/.elp.toml
@@ -0,0 +1,5 @@
+[buck]
+enabled = true
+build_deps = false
+included_targets = [ "fbcode//whatsapp/elp/test/test_projects/xref/..." ]
+source_root = "whatsapp/elp/test/test_projects/xref"
diff --git a/test_projects/xref/app_a/src/unavailable_type.erl b/test/test_projects/xref/app_a/src/unavailable_type.erl
similarity index 100%
rename from test_projects/xref/app_a/src/unavailable_type.erl
rename to test/test_projects/xref/app_a/src/unavailable_type.erl
diff --git a/test_projects/xref/app_b/src/app_b.erl b/test/test_projects/xref/app_b/src/app_b.erl
similarity index 100%
rename from test_projects/xref/app_b/src/app_b.erl
rename to test/test_projects/xref/app_b/src/app_b.erl
diff --git a/test_projects/xref/app_c/src/app_c.erl b/test/test_projects/xref/app_c/src/app_c.erl
similarity index 100%
rename from test_projects/xref/app_c/src/app_c.erl
rename to test/test_projects/xref/app_c/src/app_c.erl
diff --git a/test_projects/xref/elp_lint_unavailable_type.toml b/test/test_projects/xref/elp_lint_unavailable_type.toml
similarity index 100%
rename from test_projects/xref/elp_lint_unavailable_type.toml
rename to test/test_projects/xref/elp_lint_unavailable_type.toml
diff --git a/test_projects/buck_bad_config/.elp.toml b/test_projects/buck_bad_config/.elp.toml
deleted file mode 100644
index a891a3dfc5..0000000000
--- a/test_projects/buck_bad_config/.elp.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[buck]
-enabled = true
-build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test_projects/buck_bad_config/..." ]
-source_root = "whatsapp/elp/test_projects/buck_bad_config"
-
-[eqwalizer]
-enable_all = false
diff --git a/test_projects/buck_tests/.elp.toml b/test_projects/buck_tests/.elp.toml
deleted file mode 100644
index acb0799975..0000000000
--- a/test_projects/buck_tests/.elp.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[buck]
-enabled = true
-build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test_projects/buck_tests/..." ]
-excluded_targets = [ "fbcode//whatsapp/elp/test_projects/buck_tests:test_elp_ignored" ]
-source_root = "whatsapp/elp/test_projects/buck_tests"
-
-[eqwalizer]
-enable_all = false
diff --git a/test_projects/buck_tests_2/.elp.toml b/test_projects/buck_tests_2/.elp.toml
deleted file mode 100644
index 35f02a72f3..0000000000
--- a/test_projects/buck_tests_2/.elp.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[buck]
-enabled = true
-build_deps = false
-included_targets = [
-    "fbcode//whatsapp/elp/test_projects/buck_tests_2/util/app_a/...",
-    "fbcode//whatsapp/elp/test_projects/buck_tests_2:check_include"
-    ]
-excluded_targets = [ "fbcode//whatsapp/elp/test_projects/buck_tests_2:test_elp_ignored" ]
-source_root = "whatsapp/elp/test_projects/buck_tests_2"
-
-[eqwalizer]
-enable_all = false
diff --git a/test_projects/codegen_test/.elp.toml b/test_projects/codegen_test/.elp.toml
deleted file mode 100644
index f0f166bcf8..0000000000
--- a/test_projects/codegen_test/.elp.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[buck]
-enabled = true
-build_deps = true
-included_targets = [ "fbcode//whatsapp/elp/test_projects/codegen_test:codegen_test_app" ]
-source_root = "whatsapp/elp/test_projects/codegen_test"
-
-[eqwalizer]
-enable_all = true
diff --git a/test_projects/diagnostics/.elp.toml b/test_projects/diagnostics/.elp.toml
deleted file mode 100644
index e5ee70c992..0000000000
--- a/test_projects/diagnostics/.elp.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[buck]
-enabled = true
-build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test_projects/diagnostics/..." ]
-source_root = "whatsapp/elp/test_projects/diagnostics"
-
-[eqwalizer]
-enable_all = false
diff --git a/test_projects/end_to_end/.elp.toml b/test_projects/end_to_end/.elp.toml
deleted file mode 100644
index f015956e45..0000000000
--- a/test_projects/end_to_end/.elp.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[buck]
-enabled = true
-build_deps = false
-included_targets = ["fbcode//whatsapp/elp/test_projects/end_to_end/..."]
-
-[eqwalizer]
-enable_all = false
diff --git a/test_projects/eqwalizer_callers/.elp.toml b/test_projects/eqwalizer_callers/.elp.toml
deleted file mode 100644
index f4b7f6f6ac..0000000000
--- a/test_projects/eqwalizer_callers/.elp.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[buck]
-enabled = true
-build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test_projects/eqwalizer_callers/..." ]
-source_root = "whatsapp/elp/test_projects/eqwalizer_callers"
diff --git a/test_projects/eqwalizer_tests/.elp.toml b/test_projects/eqwalizer_tests/.elp.toml
deleted file mode 100644
index ed5c60502f..0000000000
--- a/test_projects/eqwalizer_tests/.elp.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[buck]
-enabled = true
-build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test_projects/eqwalizer_tests/..." ]
-source_root = "whatsapp/elp/test_projects/eqwalizer_tests"
-
-[eqwalizer]
-enable_all = true
diff --git a/test_projects/hierarchical_config/.elp.toml b/test_projects/hierarchical_config/.elp.toml
deleted file mode 100644
index 1033c181ee..0000000000
--- a/test_projects/hierarchical_config/.elp.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[buck]
-enabled = true
-build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test_projects/hierarchical_config/..." ]
-source_root = "whatsapp/elp/test_projects/hierarchical_config"
diff --git a/test_projects/in_place_tests/.elp.toml b/test_projects/in_place_tests/.elp.toml
deleted file mode 100644
index b6c251f03c..0000000000
--- a/test_projects/in_place_tests/.elp.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[buck]
-enabled = true
-build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test_projects/in_place_tests/..." ]
-source_root = "whatsapp/elp/test_projects/in_place_tests"
diff --git a/test_projects/include_lib_dependency_test/.elp.toml b/test_projects/include_lib_dependency_test/.elp.toml
deleted file mode 100644
index 65e106a9e2..0000000000
--- a/test_projects/include_lib_dependency_test/.elp.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[buck]
-enabled = true
-build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test_projects/include_lib_dependency_test/..." ]
-source_root = "whatsapp/elp/test_projects/include_lib_dependency_test"
diff --git a/test_projects/linter/.elp.toml b/test_projects/linter/.elp.toml
deleted file mode 100644
index a887ab835c..0000000000
--- a/test_projects/linter/.elp.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[buck]
-enabled = true
-build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test_projects/linter/..." ]
-source_root = "whatsapp/elp/test_projects/linter"
diff --git a/test_projects/linter_bad_config/.elp.toml b/test_projects/linter_bad_config/.elp.toml
deleted file mode 100644
index a887ab835c..0000000000
--- a/test_projects/linter_bad_config/.elp.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[buck]
-enabled = true
-build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test_projects/linter/..." ]
-source_root = "whatsapp/elp/test_projects/linter"
diff --git a/test_projects/linter_bad_config/linter/.elp.toml b/test_projects/linter_bad_config/linter/.elp.toml
deleted file mode 100644
index a887ab835c..0000000000
--- a/test_projects/linter_bad_config/linter/.elp.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[buck]
-enabled = true
-build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test_projects/linter/..." ]
-source_root = "whatsapp/elp/test_projects/linter"
diff --git a/test_projects/parse_error/.elp.toml b/test_projects/parse_error/.elp.toml
deleted file mode 100644
index bf2c1ad580..0000000000
--- a/test_projects/parse_error/.elp.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[buck]
-enabled = true
-build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test_projects/parse_error/..." ]
-source_root = "whatsapp/elp/test_projects/parse_error"
-
-[eqwalizer]
-enable_all = false
diff --git a/test_projects/standard/.elp.toml b/test_projects/standard/.elp.toml
deleted file mode 100644
index 09ff5a4d5a..0000000000
--- a/test_projects/standard/.elp.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[buck]
-enabled = true
-build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test_projects/standard/..." ]
-source_root = "whatsapp/elp/test_projects/standard"
diff --git a/test_projects/xref/.elp.toml b/test_projects/xref/.elp.toml
deleted file mode 100644
index afda912287..0000000000
--- a/test_projects/xref/.elp.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-[buck]
-enabled = true
-build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test_projects/xref/..." ]
-source_root = "whatsapp/elp/test_projects/xref"

From 271065da03c111d0725de341b387df7183731b02 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 17 Dec 2025 01:32:35 -0800
Subject: [PATCH 365/394] BE: for a fold, track the macro definition for
 ctx.in_macro

Summary:
When folding with visible macros, we keep track of a macro stack, so we can decide how to process diagnostics within the body of a macro expansion.

To date we have simply stored the `HirIdx` of the macro call, so it can be retrieved and examined by anything that needs it.

But the thing we need when processing a macro is in fact what definition was expanded.  This diff adds it to the information stored for easy access.

It will be used in a subsequent diff.

Reviewed By: TD5

Differential Revision: D89269840

fbshipit-source-id: 7ed6212b658de91cdd3e20701edb51161966e8fa
---
 crates/hir/src/fold.rs                        | 45 +++++++++++--------
 crates/ide/src/codemod_helpers.rs             |  4 +-
 .../src/diagnostics/deprecated_function.rs    |  4 +-
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/crates/hir/src/fold.rs b/crates/hir/src/fold.rs
index 56ea3f56ae..59b12be6fd 100644
--- a/crates/hir/src/fold.rs
+++ b/crates/hir/src/fold.rs
@@ -339,7 +339,7 @@ pub enum ParentId {
 
 #[derive(Debug)]
 pub struct AnyCallBackCtx<'a> {
-    pub in_macro: Option<HirIdx>,
+    pub in_macro: Option<(HirIdx, Option<InFile<DefineId>>)>,
     pub parents: &'a Vec<ParentId>,
     pub item_id: AnyExprId,
     pub item: AnyExpr,
@@ -426,7 +426,7 @@ pub struct FoldCtx<'a, T> {
     body_origin: BodyOrigin,
     body: &'a FoldBody<'a>,
     strategy: Strategy,
-    macro_stack: Vec<HirIdx>,
+    macro_stack: Vec<(HirIdx, Option<InFile<DefineId>>)>,
     parents: Vec<ParentId>,
     callback: AnyCallBack<'a, T>,
 }
@@ -594,7 +594,7 @@ impl<'a, T> FoldCtx<'a, T> {
             .do_fold_pat(pat_id, initial)
     }
 
-    fn in_macro(&self) -> Option<HirIdx> {
+    fn in_macro(&self) -> Option<(HirIdx, Option<InFile<DefineId>>)> {
         self.macro_stack.first().copied()
     }
 
@@ -752,16 +752,19 @@ impl<'a, T> FoldCtx<'a, T> {
             crate::Expr::MacroCall {
                 expansion,
                 args,
-                macro_def: _,
+                macro_def,
                 macro_name: _,
             } => {
                 if self.strategy.macros == MacroStrategy::DoNotExpand {
                     self.do_fold_exprs(args, acc)
                 } else {
-                    self.macro_stack.push(HirIdx {
-                        body_origin: self.body_origin,
-                        idx: AnyExprId::Expr(expr_id),
-                    });
+                    self.macro_stack.push((
+                        HirIdx {
+                            body_origin: self.body_origin,
+                            idx: AnyExprId::Expr(expr_id),
+                        },
+                        *macro_def,
+                    ));
                     let e = self.do_fold_expr(*expansion, acc);
                     self.macro_stack.pop();
                     e
@@ -950,16 +953,19 @@ impl<'a, T> FoldCtx<'a, T> {
             crate::Pat::MacroCall {
                 expansion,
                 args,
-                macro_def: _,
+                macro_def,
                 macro_name: _,
             } => {
                 if self.strategy.macros == MacroStrategy::DoNotExpand {
                     self.do_fold_exprs(args, acc)
                 } else {
-                    self.macro_stack.push(HirIdx {
-                        body_origin: self.body_origin,
-                        idx: AnyExprId::Pat(pat_id),
-                    });
+                    self.macro_stack.push((
+                        HirIdx {
+                            body_origin: self.body_origin,
+                            idx: AnyExprId::Pat(pat_id),
+                        },
+                        *macro_def,
+                    ));
                     let e = self.do_fold_pat(*expansion, acc);
                     self.macro_stack.pop();
                     e
@@ -1165,16 +1171,19 @@ impl<'a, T> FoldCtx<'a, T> {
             TypeExpr::MacroCall {
                 expansion,
                 args,
-                macro_def: _,
+                macro_def,
                 macro_name: _,
             } => {
                 if self.strategy.macros == MacroStrategy::DoNotExpand {
                     self.do_fold_exprs(args, acc)
                 } else {
-                    self.macro_stack.push(HirIdx {
-                        body_origin: self.body_origin,
-                        idx: AnyExprId::TypeExpr(type_expr_id),
-                    });
+                    self.macro_stack.push((
+                        HirIdx {
+                            body_origin: self.body_origin,
+                            idx: AnyExprId::TypeExpr(type_expr_id),
+                        },
+                        *macro_def,
+                    ));
                     let e = self.do_fold_type_expr(*expansion, acc);
                     self.macro_stack.pop();
                     e
diff --git a/crates/ide/src/codemod_helpers.rs b/crates/ide/src/codemod_helpers.rs
index e06ceafd61..2ecd21e82c 100644
--- a/crates/ide/src/codemod_helpers.rs
+++ b/crates/ide/src/codemod_helpers.rs
@@ -573,8 +573,8 @@ pub(crate) fn find_call_in_function<CallCtx, MakeCtx, Res>(
                 };
                 if let Some(extra) = check_call(context) {
                     // Got one.
-                    let call_expr_id = if let Some(expr_id) = ctx.in_macro {
-                        expr_id.idx
+                    let call_expr_id = if let Some((hir_idx, _macro_def)) = ctx.in_macro {
+                        hir_idx.idx
                     } else {
                         ctx.item_id
                     };
diff --git a/crates/ide/src/diagnostics/deprecated_function.rs b/crates/ide/src/diagnostics/deprecated_function.rs
index 469c327eb7..b353d824d2 100644
--- a/crates/ide/src/diagnostics/deprecated_function.rs
+++ b/crates/ide/src/diagnostics/deprecated_function.rs
@@ -134,8 +134,8 @@ fn check_function(
                     );
                     let details = match_result.map(|(_match, details)| details.clone());
                     if target_def.deprecated || match_result.is_some() {
-                        let expr_id = if let Some(expr_id) = ctx.in_macro {
-                            expr_id.idx
+                        let expr_id = if let Some((hir_idx, _macro_def)) = ctx.in_macro {
+                            hir_idx.idx
                         } else {
                             ctx.item_id
                         };

From 4a83d0eddece5c60bcbf035087784c9319514693 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 17 Dec 2025 01:32:35 -0800
Subject: [PATCH 366/394] BE: extract `bound_vars_by_function` as a method for
 `sema`

Summary:
The `mutable_variable` diagnostic processed bound variables organised by function.

We intend doing the same for more bound variable diagnostics, so as a precursor extract this a method we can call on `Semantic`

Reviewed By: TD5

Differential Revision: D89270590

fbshipit-source-id: 95a520d45e900c0a5c97fd8163cbaedbc15ca840
---
 crates/hir/src/sema.rs                        | 22 +++++++++++++++++++
 .../ide/src/diagnostics/mutable_variable.rs   | 20 +----------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/crates/hir/src/sema.rs b/crates/hir/src/sema.rs
index 7d1b416a63..68577d2a2e 100644
--- a/crates/hir/src/sema.rs
+++ b/crates/hir/src/sema.rs
@@ -1006,6 +1006,28 @@ impl Semantic<'_> {
     // Folds end
     // -----------------------------------------------------------------
 
+    pub fn bound_vars_by_function(
+        &self,
+        file_id: FileId,
+    ) -> FxHashMap<FunctionClauseId, FxHashSet<PatId>> {
+        let bound_vars = self.bound_vars_in_pattern_diagnostic(file_id);
+        let mut bound_vars_by_function: FxHashMap<FunctionClauseId, FxHashSet<PatId>> =
+            FxHashMap::default();
+        bound_vars.iter().for_each(|(function_id, pat_id, _var)| {
+            bound_vars_by_function
+                .entry(function_id.value)
+                .and_modify(|vars| {
+                    vars.insert(*pat_id);
+                })
+                .or_insert_with(|| {
+                    let mut vars = FxHashSet::default();
+                    vars.insert(*pat_id);
+                    vars
+                });
+        });
+        bound_vars_by_function
+    }
+
     pub fn bound_vars_in_pattern_diagnostic(
         &self,
         file_id: FileId,
diff --git a/crates/ide/src/diagnostics/mutable_variable.rs b/crates/ide/src/diagnostics/mutable_variable.rs
index 52fe32eccf..6878c90d57 100644
--- a/crates/ide/src/diagnostics/mutable_variable.rs
+++ b/crates/ide/src/diagnostics/mutable_variable.rs
@@ -27,12 +27,8 @@
 //
 
 use elp_ide_db::elp_base_db::FileId;
-use fxhash::FxHashMap;
-use fxhash::FxHashSet;
 use hir::AnyExpr;
 use hir::Expr;
-use hir::FunctionClauseId;
-use hir::PatId;
 use hir::Semantic;
 use hir::Strategy;
 use hir::fold::MacroStrategy;
@@ -60,21 +56,7 @@ fn mutable_variable_bug(
     sema: &Semantic,
     file_id: FileId,
 ) -> Option<()> {
-    let mut bound_vars_by_function: FxHashMap<FunctionClauseId, FxHashSet<&PatId>> =
-        FxHashMap::default();
-    let bound_vars = sema.bound_vars_in_pattern_diagnostic(file_id);
-    bound_vars.iter().for_each(|(function_id, pat_id, _var)| {
-        bound_vars_by_function
-            .entry(function_id.value)
-            .and_modify(|vars| {
-                vars.insert(pat_id);
-            })
-            .or_insert_with(|| {
-                let mut vars = FxHashSet::default();
-                vars.insert(pat_id);
-                vars
-            });
-    });
+    let bound_vars_by_function = sema.bound_vars_by_function(file_id);
     sema.def_map(file_id)
         .get_function_clauses()
         .for_each(|(_, def)| {

From 8ff602f1c3efb9324be46b767e44a36e67bfc880 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 17 Dec 2025 06:00:04 -0800
Subject: [PATCH 367/394] 1/n rename module, basics

Summary:
This diff stack introduces rename for a module. As this is a complex operation, it will be done in steps.

The first one is to put the basics in place
- check the new name is valid
- Improve rename test fixture to cope with added and renamed files

Reviewed By: robertoaloi

Differential Revision: D87860388

fbshipit-source-id: 1a240a5e0e5e61d5c128bca0423744f001b7b68d
---
 crates/elp/src/snapshot.rs  |  10 +++
 crates/elp/src/to_proto.rs  | 108 ++++++++++++++++++++++++++++----
 crates/ide/src/rename.rs    | 120 +++++++++++++++++++++++++++++++++++-
 crates/ide_db/src/rename.rs |  57 ++++++++++++++++-
 4 files changed, 282 insertions(+), 13 deletions(-)

diff --git a/crates/elp/src/snapshot.rs b/crates/elp/src/snapshot.rs
index 9aa3e7eeb4..69ea6b97e0 100644
--- a/crates/elp/src/snapshot.rs
+++ b/crates/elp/src/snapshot.rs
@@ -36,9 +36,11 @@ use parking_lot::Mutex;
 use parking_lot::RwLock;
 use serde::Deserialize;
 use serde::Serialize;
+use vfs::AnchoredPathBuf;
 
 use crate::config::Config;
 use crate::convert;
+use crate::convert::url_from_abs_path;
 use crate::line_endings::LineEndings;
 use crate::mem_docs::MemDocs;
 use crate::server::EqwalizerTypes;
@@ -186,6 +188,14 @@ impl Snapshot {
         self.line_ending_map.read()[&id]
     }
 
+    pub(crate) fn anchored_path(&self, path: &AnchoredPathBuf) -> Option<Url> {
+        let mut base = self.vfs.read().file_path(path.anchor).clone();
+        base.pop();
+        let path = base.join(&path.path)?;
+        let path = path.as_path()?;
+        Some(url_from_abs_path(path))
+    }
+
     pub fn update_cache_for_file(
         &self,
         file_id: FileId,
diff --git a/crates/elp/src/to_proto.rs b/crates/elp/src/to_proto.rs
index 70d316d5c6..8ce887d742 100644
--- a/crates/elp/src/to_proto.rs
+++ b/crates/elp/src/to_proto.rs
@@ -10,6 +10,7 @@
 
 //! Conversion of rust-analyzer specific types to lsp_types equivalents.
 
+use std::mem;
 use std::sync::atomic::AtomicU32;
 use std::sync::atomic::Ordering;
 
@@ -47,6 +48,7 @@ use elp_ide::elp_ide_db::elp_base_db::FileId;
 use elp_ide::elp_ide_db::elp_base_db::FilePosition;
 use elp_ide::elp_ide_db::elp_base_db::FileRange;
 use elp_ide::elp_ide_db::rename::RenameError;
+use elp_ide::elp_ide_db::source_change::FileSystemEdit;
 use elp_ide::elp_ide_db::source_change::SourceChange;
 use elp_ide_db::text_edit::Indel;
 use elp_ide_db::text_edit::TextEdit;
@@ -142,23 +144,107 @@ pub(crate) fn text_document_edit(
     })
 }
 
+pub(crate) fn text_document_ops(
+    snap: &Snapshot,
+    file_system_edit: FileSystemEdit,
+) -> Cancellable<Vec<lsp_types::DocumentChangeOperation>> {
+    let mut ops = Vec::new();
+    match file_system_edit {
+        FileSystemEdit::CreateFile {
+            dst,
+            initial_contents,
+        } => {
+            if let Some(uri) = snap.anchored_path(&dst) {
+                let create_file = lsp_types::ResourceOp::Create(lsp_types::CreateFile {
+                    uri: uri.clone(),
+                    options: None,
+                    annotation_id: None,
+                });
+                ops.push(lsp_types::DocumentChangeOperation::Op(create_file));
+                if !initial_contents.is_empty() {
+                    let text_document =
+                        lsp_types::OptionalVersionedTextDocumentIdentifier { uri, version: None };
+                    let text_edit = lsp_types::TextEdit {
+                        range: lsp_types::Range::default(),
+                        new_text: initial_contents,
+                    };
+                    let edit_file = lsp_types::TextDocumentEdit {
+                        text_document,
+                        edits: vec![lsp_types::OneOf::Left(text_edit)],
+                    };
+                    ops.push(lsp_types::DocumentChangeOperation::Edit(edit_file));
+                }
+            } else {
+                log::warn!("create file failed: {:?}", dst);
+            }
+        }
+        FileSystemEdit::MoveFile { src, dst } => {
+            if let Some(new_uri) = snap.anchored_path(&dst) {
+                let old_uri = snap.file_id_to_url(src);
+                let rename_file = lsp_types::RenameFile {
+                    old_uri,
+                    new_uri,
+                    options: None,
+                    annotation_id: None,
+                };
+                ops.push(lsp_types::DocumentChangeOperation::Op(
+                    lsp_types::ResourceOp::Rename(rename_file),
+                ))
+            } else {
+                log::warn!("rename file failed: {:?} -> {:?}", src, dst);
+            }
+        }
+    }
+    Ok(ops)
+}
+
 pub(crate) fn workspace_edit(
     snap: &Snapshot,
-    source_change: SourceChange,
+    mut source_change: SourceChange,
 ) -> Result<lsp_types::WorkspaceEdit> {
-    let mut edits: Vec<_> = vec![];
-    for (file_id, edit) in source_change.source_file_edits {
-        // let edit = snippet_text_document_edit(snap, source_change.is_snippet, file_id, edit)?;
-        let edit = text_document_edit(snap, file_id, edit)?;
-        edits.push(lsp_types::TextDocumentEdit {
-            text_document: edit.text_document,
-            edits: edit.edits.into_iter().collect(),
-        });
+    let mut document_changes: Vec<lsp_types::DocumentChangeOperation> = Vec::new();
+
+    // This is copying RA's order of operations, first file creates,
+    // then edits, then file moves.
+
+    // This allows us to apply edits to the file once it has
+    // moved. Except we have no FileId at that point
+    for op in &mut source_change.file_system_edits {
+        if let FileSystemEdit::CreateFile {
+            dst,
+            initial_contents,
+        } = op
+        {
+            // replace with a placeholder to avoid cloning the edit
+            let op = FileSystemEdit::CreateFile {
+                dst: dst.clone(),
+                initial_contents: mem::take(initial_contents),
+            };
+            let ops = text_document_ops(snap, op)?;
+            document_changes.extend_from_slice(&ops);
+        }
     }
-    let document_changes = lsp_types::DocumentChanges::Edits(edits);
+
+    for (file_id, edit) in source_change.source_file_edits {
+        let edit = text_document_edit(snap, file_id, edit)?;
+        document_changes.push(lsp_types::DocumentChangeOperation::Edit(
+            lsp_types::TextDocumentEdit {
+                text_document: edit.text_document,
+                edits: edit.edits.into_iter().collect(),
+            },
+        ));
+    }
+
+    for op in source_change.file_system_edits {
+        if !matches!(op, FileSystemEdit::CreateFile { .. }) {
+            let ops = text_document_ops(snap, op)?;
+            document_changes.extend_from_slice(&ops);
+        }
+    }
+
     let workspace_edit = lsp_types::WorkspaceEdit {
         changes: None,
-        document_changes: Some(document_changes),
+        document_changes: Some(lsp_types::DocumentChanges::Operations(document_changes)),
         change_annotations: None,
     };
     Ok(workspace_edit)
diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index 0cedbe1d90..8164f0d2db 100644
--- a/crates/ide/src/rename.rs
+++ b/crates/ide/src/rename.rs
@@ -195,8 +195,13 @@ pub fn rename_var(
 #[cfg(test)]
 pub(crate) mod tests {
     use elp_ide_db::RootDatabase;
+    use elp_ide_db::elp_base_db::AnchoredPathBuf;
+    use elp_ide_db::elp_base_db::FileId;
+    use elp_ide_db::elp_base_db::VfsPath;
     use elp_ide_db::elp_base_db::assert_eq_text;
+    use elp_ide_db::elp_base_db::fixture::ChangeFixture;
     use elp_ide_db::elp_base_db::fixture::WithFixture as _;
+    use elp_ide_db::source_change::FileSystemEdit;
     use elp_ide_db::text_edit::TextEdit;
     use elp_project_model::test_fixture::trim_indent;
     use elp_syntax::AstNode;
@@ -207,12 +212,16 @@ pub(crate) mod tests {
     use hir::Semantic;
 
     use super::rename_var;
+    use crate::AnalysisHost;
     use crate::fixture;
 
     #[track_caller]
     pub(crate) fn check_rename(new_name: &str, fixture_before: &str, fixture_after_str: &str) {
         let fixture_after_str = &trim_indent(fixture_after_str);
-        let analysis_after = fixture::multi_file(fixture_after_str);
+
+        let (db_after, fixture_after) = RootDatabase::with_fixture(fixture_after_str);
+        let host_after = AnalysisHost { db: db_after };
+        let analysis_after = host_after.analysis();
 
         let (analysis, position, _) = fixture::position(fixture_before);
         let rename_result = analysis
@@ -232,6 +241,37 @@ pub(crate) mod tests {
                     let expected = analysis_after.file_text(file_id).unwrap().to_string();
                     assert_eq_text!(&*expected, &*result);
                 }
+                for op in source_change.file_system_edits {
+                    match op {
+                        FileSystemEdit::CreateFile {
+                            dst,
+                            initial_contents,
+                        } => {
+                            let new_file =
+                                find_new_file_id(&fixture_after, &dst).unwrap_or_else(|| {
+                                    panic!(
+                                        "Fixture after:could not find file created as '{}'",
+                                        &dst.path
+                                    )
+                                });
+                            let actual = analysis_after.file_text(*new_file.1).unwrap().to_string();
+                            let expected = initial_contents;
+                            assert_eq_text!(&*expected, &*actual);
+                        }
+                        FileSystemEdit::MoveFile { src, dst } => {
+                            let new_file =
+                                find_new_file_id(&fixture_after, &dst).unwrap_or_else(|| {
+                                    panic!(
+                                        "Fixture after:could not find file renamed to '{}'",
+                                        &dst.path
+                                    )
+                                });
+                            let actual = analysis_after.file_text(*new_file.1).unwrap().to_string();
+                            let expected = analysis.file_text(src).unwrap().to_string();
+                            assert_eq_text!(&*expected, &*actual);
+                        }
+                    }
+                }
             }
             Err(err) => {
                 if fixture_after_str.starts_with("error:") {
@@ -247,6 +287,16 @@ pub(crate) mod tests {
         };
     }
 
+    fn find_new_file_id<'a>(
+        fixture_after: &'a ChangeFixture,
+        dst: &'a AnchoredPathBuf,
+    ) -> Option<(&'a VfsPath, &'a FileId)> {
+        fixture_after
+            .files_by_path
+            .iter()
+            .find(|(name, _)| name.as_path().unwrap().to_string().ends_with(&dst.path))
+    }
+
     #[test]
     fn test_rename_var_1() {
         check_rename("Y", r#"main() -> I~ = 1."#, r#"main() -> Y = 1."#);
@@ -1135,6 +1185,74 @@ pub(crate) mod tests {
         );
     }
 
+    // ---------------------------------
+    // Renaming modules
+
+    #[test]
+    fn rename_module_fails_name_exists() {
+        check_rename(
+            "main_2",
+            r#"
+            //- /app_a/src/main.erl
+            -module(ma~in).
+            //- /app_a_/src/main_2.erl
+            -module(main_2).
+             "#,
+            r#"error: module 'main_2' already exists"#,
+        );
+    }
+
+    #[test]
+    fn rename_module_fails_bad_name_1() {
+        check_rename(
+            "Main",
+            r#"
+            //- /app_a/src/main.erl
+            -module(ma~in).
+            //- /app_a_/src/main_2.erl
+            -module(main_2).
+             "#,
+            r#"error: Invalid new module name: 'Main'"#,
+        );
+    }
+
+    #[test]
+    fn rename_module_simple() {
+        check_rename(
+            "main_2",
+            r#"
+            //- /app_a/src/main.erl
+            -module(ma~in).
+             "#,
+            r#"
+            //- /app_a/src/main_2.erl
+            -module(main).
+             "#,
+        );
+    }
+
+    #[test]
+    fn rename_module_with_usage() {
+        check_rename(
+            "main_2",
+            r#"
+            //- /app_a/src/main_2.erl
+            -module(main_2).
+            -export([foo/0]).
+            foo() -> ok.
+            //- /app_a/src/main.erl
+            -module(ma~in).
+            -export([foo/0]).
+            foo() -> ok.
+            //- /app_a/src/other.erl
+            -module(other).
+            -export([bar/0]).
+            bar() -> main:foo().
+             "#,
+            r#"error: module 'main_2' already exists"#,
+        );
+    }
+
     // ---------------------------------
 
     #[track_caller]
diff --git a/crates/ide_db/src/rename.rs b/crates/ide_db/src/rename.rs
index 889569ca4e..7e44d0bf34 100644
--- a/crates/ide_db/src/rename.rs
+++ b/crates/ide_db/src/rename.rs
@@ -15,8 +15,10 @@
 use std::fmt;
 use std::iter::once;
 
+use elp_base_db::AnchoredPathBuf;
 use elp_base_db::FileId;
 use elp_base_db::FileRange;
+use elp_base_db::ModuleName;
 use elp_syntax::AstNode;
 use elp_syntax::ast;
 use elp_syntax::ast::in_erlang_module;
@@ -26,6 +28,7 @@ use hir::Semantic;
 use crate::SymbolDefinition;
 use crate::helpers::get_call;
 use crate::search::NameLike;
+use crate::source_change::FileSystemEdit;
 use crate::source_change::SourceChange;
 use crate::text_edit::TextEdit;
 
@@ -106,6 +109,18 @@ pub fn is_valid_type_name(new_name: &String) -> bool {
     false
 }
 
+// Delegate checking module name validity to the parser
+pub fn is_valid_module_name(new_name: &String) -> bool {
+    let parse = ast::SourceFile::parse_text(format!("-module({}).", new_name).as_str());
+    match parse.tree().forms().next() {
+        Some(ast::Form::ModuleAttribute(ma)) => match ma.name() {
+            Some(ast::Name::Atom(atom)) => atom.syntax().text().to_string() == *new_name,
+            _ => false,
+        },
+        _ => false,
+    }
+}
+
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum SafetyChecks {
     Yes,
@@ -122,7 +137,10 @@ impl SymbolDefinition {
     ) -> RenameResult<SourceChange> {
         match self.clone() {
             SymbolDefinition::Module(_) => {
-                rename_error!("Cannot rename module")
+                if safety_check == SafetyChecks::Yes && !is_valid_module_name(new_name) {
+                    rename_error!("Invalid new module name: '{}'", new_name);
+                }
+                self.rename_module(sema, new_name, safety_check)
             }
             SymbolDefinition::Function(fun) => {
                 if safety_check == SafetyChecks::Yes && !is_valid_function_name(new_name) {
@@ -382,6 +400,43 @@ impl SymbolDefinition {
             }
         }
     }
+
+    fn rename_module(
+        &self,
+        sema: &Semantic,
+        new_name: &str,
+        safety_check: SafetyChecks,
+    ) -> RenameResult<SourceChange> {
+        let file_id = self.file().file_id;
+        if let Some(project_id) = sema.db.file_project_id(file_id) {
+            let module_index = sema.db.module_index(project_id);
+            if safety_check == SafetyChecks::Yes {
+                let new_name_module = ModuleName::new(new_name);
+                if module_index
+                    .all_modules()
+                    .iter()
+                    .any(|name| name == &new_name_module)
+                {
+                    rename_error!("module '{}' already exists", new_name);
+                }
+            }
+
+            // RA based version
+            let mut source_change = SourceChange::default();
+            let anchor = file_id;
+
+            let path = format!("{new_name}.erl");
+            let dst = AnchoredPathBuf { anchor, path };
+            source_change.push_file_system_edit(FileSystemEdit::MoveFile { src: anchor, dst });
+
+            Ok(source_change)
+        } else {
+            rename_error!(
+                "Could not find project for '{:?}'",
+                self.file().name(sema.db.upcast())
+            )
+        }
+    }
 }
 
 fn source_edit_from_usages(

From a0e076cb1762bff8cdbf5e69b158b3d77be9d58d Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 17 Dec 2025 06:00:04 -0800
Subject: [PATCH 368/394] 2/n: rename module: simple rename works

Summary: First case, just rename the module

Reviewed By: robertoaloi

Differential Revision: D87860412

fbshipit-source-id: 0427f09bd2176778e0280b0f45f9331fa279f778
---
 crates/ide/src/rename.rs    |  6 +++---
 crates/ide_db/src/rename.rs | 22 +++++++++++++++++++++-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index 8164f0d2db..bebd439216 100644
--- a/crates/ide/src/rename.rs
+++ b/crates/ide/src/rename.rs
@@ -288,10 +288,10 @@ pub(crate) mod tests {
     }
 
     fn find_new_file_id<'a>(
-        fixture_after: &'a ChangeFixture,
+        fixture: &'a ChangeFixture,
         dst: &'a AnchoredPathBuf,
     ) -> Option<(&'a VfsPath, &'a FileId)> {
-        fixture_after
+        fixture
             .files_by_path
             .iter()
             .find(|(name, _)| name.as_path().unwrap().to_string().ends_with(&dst.path))
@@ -1226,7 +1226,7 @@ pub(crate) mod tests {
              "#,
             r#"
             //- /app_a/src/main_2.erl
-            -module(main).
+            -module(main_2).
              "#,
         );
     }
diff --git a/crates/ide_db/src/rename.rs b/crates/ide_db/src/rename.rs
index 7e44d0bf34..141055565f 100644
--- a/crates/ide_db/src/rename.rs
+++ b/crates/ide_db/src/rename.rs
@@ -421,13 +421,33 @@ impl SymbolDefinition {
                 }
             }
 
+            let mut renamed_module_edits: Vec<TextEdit> = Vec::new();
+
+            let form_list = sema.form_list(file_id);
+            if let Some(module_attribute) = form_list.module_attribute() {
+                let ast = module_attribute.form_id.get_ast(sema.db, file_id);
+                if let Some(name) = ast.name() {
+                    let range = name.syntax().text_range();
+                    let mut builder = TextEdit::builder();
+                    builder.replace(range, new_name.to_string());
+                    renamed_module_edits.push(builder.finish());
+                }
+            }
+
             // RA based version
             let mut source_change = SourceChange::default();
             let anchor = file_id;
 
             let path = format!("{new_name}.erl");
             let dst = AnchoredPathBuf { anchor, path };
-            source_change.push_file_system_edit(FileSystemEdit::MoveFile { src: anchor, dst });
+            let mut initial_contents = sema.db.file_text(anchor).to_string();
+            for edit in renamed_module_edits {
+                edit.apply(&mut initial_contents);
+            }
+            source_change.push_file_system_edit(FileSystemEdit::CreateFile {
+                dst,
+                initial_contents,
+            });
 
             Ok(source_change)
         } else {

From 56e66e2cd561519a580650a118d65362266eef18 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 17 Dec 2025 06:00:04 -0800
Subject: [PATCH 369/394] 3/n: rename module: renaming function references

Summary:
Rename references to functions exported from a module when the module is renamed.

This requires fleshing out the infrastructure to deal with deleting files too.

Reviewed By: robertoaloi

Differential Revision: D87860436

fbshipit-source-id: b4d04eb0cfc6448a407fa8c3202ef3e4e088b7e8
---
 crates/ide/src/rename.rs    | 34 ++++++++++++++++----
 crates/ide_db/src/rename.rs | 64 ++++++++++++++++++++++++++++++++-----
 2 files changed, 83 insertions(+), 15 deletions(-)

diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index bebd439216..cb7c66292c 100644
--- a/crates/ide/src/rename.rs
+++ b/crates/ide/src/rename.rs
@@ -194,6 +194,7 @@ pub fn rename_var(
 
 #[cfg(test)]
 pub(crate) mod tests {
+
     use elp_ide_db::RootDatabase;
     use elp_ide_db::elp_base_db::AnchoredPathBuf;
     use elp_ide_db::elp_base_db::FileId;
@@ -207,6 +208,7 @@ pub(crate) mod tests {
     use elp_syntax::AstNode;
     use elp_syntax::algo;
     use elp_syntax::ast;
+    use fxhash::FxHashSet;
     use hir::AnyExprId;
     use hir::InFile;
     use hir::Semantic;
@@ -219,19 +221,26 @@ pub(crate) mod tests {
     pub(crate) fn check_rename(new_name: &str, fixture_before: &str, fixture_after_str: &str) {
         let fixture_after_str = &trim_indent(fixture_after_str);
 
+        let (db_before, fixture) = RootDatabase::with_fixture(fixture_before);
+        let host_before = AnalysisHost { db: db_before };
+        let analysis = host_before.analysis();
+        let position = fixture.position();
+
         let (db_after, fixture_after) = RootDatabase::with_fixture(fixture_after_str);
         let host_after = AnalysisHost { db: db_after };
         let analysis_after = host_after.analysis();
 
-        let (analysis, position, _) = fixture::position(fixture_before);
         let rename_result = analysis
             .rename(position, new_name)
             .unwrap_or_else(|err| panic!("Rename to '{new_name}' was cancelled: {err}"));
         match rename_result {
             Ok(source_change) => {
+                let mut file_ids: FxHashSet<FileId> = FxHashSet::default();
                 for edit in source_change.source_file_edits {
                     let mut text_edit_builder = TextEdit::builder();
                     let file_id = edit.0;
+                    // New and old file_id are the same
+                    file_ids.insert(file_id);
                     for indel in edit.1.into_iter() {
                         text_edit_builder.replace(indel.delete, indel.insert);
                     }
@@ -242,6 +251,8 @@ pub(crate) mod tests {
                     assert_eq_text!(&*expected, &*result);
                 }
                 for op in source_change.file_system_edits {
+                    let expected;
+                    let new_file_id;
                     match op {
                         FileSystemEdit::CreateFile {
                             dst,
@@ -254,9 +265,8 @@ pub(crate) mod tests {
                                         &dst.path
                                     )
                                 });
-                            let actual = analysis_after.file_text(*new_file.1).unwrap().to_string();
-                            let expected = initial_contents;
-                            assert_eq_text!(&*expected, &*actual);
+                            new_file_id = *new_file.1;
+                            expected = initial_contents;
                         }
                         FileSystemEdit::MoveFile { src, dst } => {
                             let new_file =
@@ -266,11 +276,21 @@ pub(crate) mod tests {
                                         &dst.path
                                     )
                                 });
-                            let actual = analysis_after.file_text(*new_file.1).unwrap().to_string();
-                            let expected = analysis.file_text(src).unwrap().to_string();
-                            assert_eq_text!(&*expected, &*actual);
+                            new_file_id = *new_file.1;
+                            expected = analysis.file_text(src).unwrap().to_string();
                         }
                     }
+                    file_ids.insert(new_file_id);
+                    let actual = analysis_after.file_text(new_file_id).unwrap().to_string();
+                    assert_eq_text!(&*expected, &*actual);
+                }
+                // Check the balance of the expectations in the new fixture.
+                for file_id in &fixture_after.files {
+                    if !file_ids.contains(file_id) {
+                        let actual = analysis_after.file_text(*file_id).unwrap().to_string();
+                        let expected = analysis.file_text(*file_id).unwrap().to_string();
+                        assert_eq_text!(&*expected, &*actual);
+                    }
                 }
             }
             Err(err) => {
diff --git a/crates/ide_db/src/rename.rs b/crates/ide_db/src/rename.rs
index 141055565f..2ad0cd8ff6 100644
--- a/crates/ide_db/src/rename.rs
+++ b/crates/ide_db/src/rename.rs
@@ -31,6 +31,7 @@ use crate::search::NameLike;
 use crate::source_change::FileSystemEdit;
 use crate::source_change::SourceChange;
 use crate::text_edit::TextEdit;
+use crate::text_edit::TextEditBuilder;
 
 pub type RenameResult<T> = Result<T, RenameError>;
 
@@ -421,8 +422,25 @@ impl SymbolDefinition {
                 }
             }
 
-            let mut renamed_module_edits: Vec<TextEdit> = Vec::new();
+            let mut source_change = SourceChange::default();
+            // Step 1, rename all references
+            let def_map = sema.def_map(file_id);
+            // process anything that could be used. functions, types, ??
+            def_map.get_functions().for_each(|(_name, f)| {
+                if f.exported {
+                    let usages = SymbolDefinition::Function(f.clone()).usages(sema).all();
+                    usages.iter().for_each(|(usage_file_id, refs)| {
+                        if usage_file_id != file_id
+                            && let Some(edit) = rename_call_module_in_refs(refs, new_name)
+                        {
+                            source_change.insert_source_edit(usage_file_id, edit);
+                        };
+                    });
+                }
+            });
 
+            // Make changes in the module being renamed
+            let mut renamed_module_edit: TextEdit = TextEdit::default();
             let form_list = sema.form_list(file_id);
             if let Some(module_attribute) = form_list.module_attribute() {
                 let ast = module_attribute.form_id.get_ast(sema.db, file_id);
@@ -430,20 +448,29 @@ impl SymbolDefinition {
                     let range = name.syntax().text_range();
                     let mut builder = TextEdit::builder();
                     builder.replace(range, new_name.to_string());
-                    renamed_module_edits.push(builder.finish());
+                    renamed_module_edit
+                        .union(builder.finish())
+                        .expect("Could not combine TextEdits");
                 }
+                def_map.get_functions().for_each(|(_name, f)| {
+                    let usages = SymbolDefinition::Function(f.clone()).usages(sema).all();
+                    usages.iter().for_each(|(usage_file_id, refs)| {
+                        if usage_file_id == file_id
+                            && let Some(edit) = rename_call_module_in_refs(refs, new_name)
+                        {
+                            renamed_module_edit
+                                .union(edit)
+                                .expect("Could not combine TextEdits");
+                        }
+                    });
+                });
             }
 
-            // RA based version
-            let mut source_change = SourceChange::default();
             let anchor = file_id;
-
             let path = format!("{new_name}.erl");
             let dst = AnchoredPathBuf { anchor, path };
             let mut initial_contents = sema.db.file_text(anchor).to_string();
-            for edit in renamed_module_edits {
-                edit.apply(&mut initial_contents);
-            }
+            renamed_module_edit.apply(&mut initial_contents);
             source_change.push_file_system_edit(FileSystemEdit::CreateFile {
                 dst,
                 initial_contents,
@@ -459,6 +486,27 @@ impl SymbolDefinition {
     }
 }
 
+fn rename_call_module_in_refs(refs: &[NameLike], new_name: &str) -> Option<TextEdit> {
+    let mut builder = TextEdit::builder();
+    for usage in refs {
+        let _ = rename_call_module_in_ref(usage, &mut builder, new_name);
+    }
+    Some(builder.finish())
+}
+
+fn rename_call_module_in_ref(
+    usage: &NameLike,
+    builder: &mut TextEditBuilder,
+    new_name: &str,
+) -> Option<()> {
+    let call = get_call(usage.syntax())?;
+    let _: () = if let Some(ast::Expr::Remote(remote)) = call.expr() {
+        let module = remote.module()?.module()?;
+        builder.replace(module.syntax().text_range(), new_name.to_string());
+    };
+    Some(())
+}
+
 fn source_edit_from_usages(
     source_change: &mut SourceChange,
     usages: Vec<(FileId, &[NameLike])>,

From bef3dd15f26cbe6ff3d1c07a3598c37e9faff112 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 17 Dec 2025 06:00:04 -0800
Subject: [PATCH 370/394] 4/n: rename module: exported type references

Summary: When renaming a module, rename all references to types within it

Reviewed By: robertoaloi

Differential Revision: D87860496

fbshipit-source-id: 2ac6bc52cecaef6802fcf9f181b638f81c556d67
---
 crates/ide/src/rename.rs    | 47 +++++++++++++++++++++---
 crates/ide_db/src/rename.rs | 71 ++++++++++++++++++++++++++++---------
 2 files changed, 97 insertions(+), 21 deletions(-)

diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index cb7c66292c..a7d963d77f 100644
--- a/crates/ide/src/rename.rs
+++ b/crates/ide/src/rename.rs
@@ -288,7 +288,11 @@ pub(crate) mod tests {
                 for file_id in &fixture_after.files {
                     if !file_ids.contains(file_id) {
                         let actual = analysis_after.file_text(*file_id).unwrap().to_string();
-                        let expected = analysis.file_text(*file_id).unwrap().to_string();
+                        let expected = if fixture.files.contains(file_id) {
+                            analysis.file_text(*file_id).unwrap().to_string()
+                        } else {
+                            format!("File {:?} not present in original fixture", file_id)
+                        };
                         assert_eq_text!(&*expected, &*actual);
                     }
                 }
@@ -1261,18 +1265,51 @@ pub(crate) mod tests {
             -export([foo/0]).
             foo() -> ok.
             //- /app_a/src/main.erl
-            -module(ma~in).
-            -export([foo/0]).
-            foo() -> ok.
+              -module(ma~in).
+              -export([foo/0]).
+              foo() -> ok.
+              bar() -> main:foo().
+              baz() -> main:bar().
+
             //- /app_a/src/other.erl
             -module(other).
             -export([bar/0]).
             bar() -> main:foo().
-             "#,
+            "#,
             r#"error: module 'main_2' already exists"#,
         );
     }
 
+    #[test]
+    fn rename_module_with_usage_type() {
+        // TODO: check for compile errors in the fixture
+        check_rename(
+            "main_3",
+            r#"
+            //- /app_a/src/main.erl
+              -module(ma~in).
+              -export_type([foo/0]).
+              -type foo() :: ok.
+            //- /app_a/src/other.erl
+              -module(other).
+              -export([bar/0]).
+              -spec bar() -> main:foo().
+              bar() -> ok.
+             "#,
+            r#"
+            //- /app_a/src/main_3.erl
+              -module(main_3).
+              -export_type([foo/0]).
+              -type foo() :: ok.
+            //- /app_a/src/other.erl
+              -module(other).
+              -export([bar/0]).
+              -spec bar() -> main_3:foo().
+              bar() -> ok.
+             "#,
+        );
+    }
+
     // ---------------------------------
 
     #[track_caller]
diff --git a/crates/ide_db/src/rename.rs b/crates/ide_db/src/rename.rs
index 2ad0cd8ff6..ab6829be3d 100644
--- a/crates/ide_db/src/rename.rs
+++ b/crates/ide_db/src/rename.rs
@@ -429,13 +429,13 @@ impl SymbolDefinition {
             def_map.get_functions().for_each(|(_name, f)| {
                 if f.exported {
                     let usages = SymbolDefinition::Function(f.clone()).usages(sema).all();
-                    usages.iter().for_each(|(usage_file_id, refs)| {
-                        if usage_file_id != file_id
-                            && let Some(edit) = rename_call_module_in_refs(refs, new_name)
-                        {
-                            source_change.insert_source_edit(usage_file_id, edit);
-                        };
-                    });
+                    rename_remote_module_call_refs(usages, file_id, new_name, &mut source_change);
+                }
+            });
+            def_map.get_types().iter().for_each(|(_name, t)| {
+                if t.exported {
+                    let usages = SymbolDefinition::Type(t.clone()).usages(sema).all();
+                    rename_remote_module_call_refs(usages, file_id, new_name, &mut source_change);
                 }
             });
 
@@ -454,15 +454,21 @@ impl SymbolDefinition {
                 }
                 def_map.get_functions().for_each(|(_name, f)| {
                     let usages = SymbolDefinition::Function(f.clone()).usages(sema).all();
-                    usages.iter().for_each(|(usage_file_id, refs)| {
-                        if usage_file_id == file_id
-                            && let Some(edit) = rename_call_module_in_refs(refs, new_name)
-                        {
-                            renamed_module_edit
-                                .union(edit)
-                                .expect("Could not combine TextEdits");
-                        }
-                    });
+                    rename_own_module_call_refs(
+                        usages,
+                        file_id,
+                        new_name,
+                        &mut renamed_module_edit,
+                    );
+                });
+                def_map.get_types().iter().for_each(|(_name, t)| {
+                    let usages = SymbolDefinition::Type(t.clone()).usages(sema).all();
+                    rename_own_module_call_refs(
+                        usages,
+                        file_id,
+                        new_name,
+                        &mut renamed_module_edit,
+                    );
                 });
             }
 
@@ -486,6 +492,38 @@ impl SymbolDefinition {
     }
 }
 
+fn rename_remote_module_call_refs(
+    usages: crate::UsageSearchResult,
+    file_id: FileId,
+    new_name: &str,
+    source_change: &mut SourceChange,
+) {
+    usages.iter().for_each(|(usage_file_id, refs)| {
+        if usage_file_id != file_id
+            && let Some(edit) = rename_call_module_in_refs(refs, new_name)
+        {
+            source_change.insert_source_edit(usage_file_id, edit);
+        };
+    });
+}
+
+fn rename_own_module_call_refs(
+    usages: crate::UsageSearchResult,
+    file_id: FileId,
+    new_name: &str,
+    renamed_module_edit: &mut TextEdit,
+) {
+    usages.iter().for_each(|(usage_file_id, refs)| {
+        if usage_file_id == file_id
+            && let Some(edit) = rename_call_module_in_refs(refs, new_name)
+        {
+            renamed_module_edit
+                .union(edit)
+                .expect("Could not combine TextEdits");
+        }
+    });
+}
+
 fn rename_call_module_in_refs(refs: &[NameLike], new_name: &str) -> Option<TextEdit> {
     let mut builder = TextEdit::builder();
     for usage in refs {
@@ -500,6 +538,7 @@ fn rename_call_module_in_ref(
     new_name: &str,
 ) -> Option<()> {
     let call = get_call(usage.syntax())?;
+    // Note: `ast` uses the same syntax for a function call and a type
     let _: () = if let Some(ast::Expr::Remote(remote)) = call.expr() {
         let module = remote.module()?.module()?;
         builder.replace(module.syntax().text_range(), new_name.to_string());

From 8997372e1a02e0b292b6121a5d7ce630df5db149 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 17 Dec 2025 06:00:04 -0800
Subject: [PATCH 371/394] 5/n: rename module: move original file

Summary:
The final step in renaming a module.  Move the old file, and apply the needed edits to it.

This diff also simplifies the mechanics of the rename, to be more general and in line with other renames, by iterating over usages of the module, rather than ad-hoc checks for things that may be needed.

It is still ad-hoc, in the sense that it only looks for call-like things at the moment (fully qualified calls and types). Other usages will come in later diffs

Reviewed By: robertoaloi

Differential Revision: D87861050

fbshipit-source-id: d393638b310a257f51151fc3caf1b1445c856700
---
 crates/elp/src/to_proto.rs         | 39 ++++++++++-------
 crates/ide/src/rename.rs           | 70 ++++++++++++++++++++++++++++--
 crates/ide_db/src/helpers.rs       | 13 +++---
 crates/ide_db/src/rename.rs        | 40 ++++++-----------
 crates/ide_db/src/source_change.rs | 58 ++++++++++++++++++++++++-
 5 files changed, 169 insertions(+), 51 deletions(-)

diff --git a/crates/elp/src/to_proto.rs b/crates/elp/src/to_proto.rs
index 8ce887d742..3e5b1fd1e1 100644
--- a/crates/elp/src/to_proto.rs
+++ b/crates/elp/src/to_proto.rs
@@ -123,9 +123,9 @@ pub(crate) fn optional_versioned_text_document_identifier(
 pub(crate) fn text_document_edit(
     snap: &Snapshot,
     file_id: FileId,
+    text_document: lsp_types::OptionalVersionedTextDocumentIdentifier,
     edit: TextEdit,
 ) -> Result<lsp_types::TextDocumentEdit> {
-    let text_document = optional_versioned_text_document_identifier(snap, file_id);
     let line_index = snap.analysis.line_index(file_id)?;
     let line_endings = snap.line_endings(file_id);
     let edits: Vec<lsp_types::OneOf<lsp_types::TextEdit, lsp_types::AnnotatedTextEdit>> = edit
@@ -133,11 +133,6 @@ pub(crate) fn text_document_edit(
         .map(|it| lsp_types::OneOf::Left(text_edit(&line_index, line_endings, it)))
         .collect();
 
-    // if snap.analysis.is_library_file(file_id)? && snap.config.change_annotation_support() {
-    //     for edit in &mut edits {
-    //         edit.annotation_id = Some(outside_workspace_annotation_id())
-    //     }
-    // }
     Ok(lsp_types::TextDocumentEdit {
         text_document,
         edits,
@@ -225,8 +220,16 @@ pub(crate) fn workspace_edit(
         }
     }
 
+    for op in source_change.file_system_edits {
+        if !matches!(op, FileSystemEdit::CreateFile { .. }) {
+            let ops = text_document_ops(snap, op)?;
+            document_changes.extend_from_slice(&ops);
+        }
+    }
+
     for (file_id, edit) in source_change.source_file_edits {
-        let edit = text_document_edit(snap, file_id, edit)?;
+        let text_document = optional_versioned_text_document_identifier(snap, file_id);
+        let edit = text_document_edit(snap, file_id, text_document, edit)?;
         document_changes.push(lsp_types::DocumentChangeOperation::Edit(
             lsp_types::TextDocumentEdit {
                 text_document: edit.text_document,
@@ -235,10 +238,20 @@ pub(crate) fn workspace_edit(
         ));
     }
 
-    for op in source_change.file_system_edits {
-        if !matches!(op, FileSystemEdit::CreateFile { .. }) {
-            let ops = text_document_ops(snap, op)?;
-            document_changes.extend_from_slice(&ops);
+    // Edits on renamed files.  The LineIndex from the original can be used.
+    for (file_ref, edit) in source_change.new_file_edits {
+        if let Some(uri) = snap.anchored_path(&file_ref.clone().into()) {
+            let version = snap.url_file_version(&uri);
+            let text_document = lsp_types::OptionalVersionedTextDocumentIdentifier { uri, version };
+            let edit = text_document_edit(snap, file_ref.anchor, text_document, edit)?;
+            document_changes.push(lsp_types::DocumentChangeOperation::Edit(
+                lsp_types::TextDocumentEdit {
+                    text_document: edit.text_document,
+                    edits: edit.edits.into_iter().collect(),
+                },
+            ));
+        } else {
+            log::warn!("new file edit failed: {:?}", file_ref);
         }
     }
 
@@ -268,10 +281,6 @@ pub(crate) fn code_action(
 ) -> Result<lsp_types::CodeActionOrCommand> {
     let mut res = lsp_types::CodeAction {
         title: assist.label.to_string(),
-        // group: assist
-        //     .group
-        //     .filter(|_| snap.config.code_action_group())
-        //     .map(|gr| gr.0),
         kind: Some(code_action_kind(assist.id.1)),
         edit: None,
         is_preferred: None,
diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index a7d963d77f..884556585c 100644
--- a/crates/ide/src/rename.rs
+++ b/crates/ide/src/rename.rs
@@ -267,8 +267,10 @@ pub(crate) mod tests {
                                 });
                             new_file_id = *new_file.1;
                             expected = initial_contents;
+                            let actual = analysis_after.file_text(new_file_id).unwrap().to_string();
+                            assert_eq_text!(&*expected, &*actual);
                         }
-                        FileSystemEdit::MoveFile { src, dst } => {
+                        FileSystemEdit::MoveFile { src: _, dst } => {
                             let new_file =
                                 find_new_file_id(&fixture_after, &dst).unwrap_or_else(|| {
                                     panic!(
@@ -277,12 +279,40 @@ pub(crate) mod tests {
                                     )
                                 });
                             new_file_id = *new_file.1;
-                            expected = analysis.file_text(src).unwrap().to_string();
+                            // We simply record the new file id for checking in `fixture_after``.
+                            // The expected value will be updated by the new_file_edits below,
+                            // and the result asserted there
                         }
                     }
                     file_ids.insert(new_file_id);
-                    let actual = analysis_after.file_text(new_file_id).unwrap().to_string();
-                    assert_eq_text!(&*expected, &*actual);
+                }
+                for (dst, op) in source_change.new_file_edits {
+                    // When renaming a module, we move the original file, then apply fixup edits
+                    // to the new file
+                    let anchored_dst = AnchoredPathBuf {
+                        anchor: dst.anchor,
+                        path: dst.path,
+                    };
+                    let new_file =
+                        find_new_file_id(&fixture_after, &anchored_dst).unwrap_or_else(|| {
+                            panic!(
+                                "Fixture after:could not find file created as '{}'",
+                                &anchored_dst.path
+                            )
+                        });
+
+                    let mut text_edit_builder = TextEdit::builder();
+                    let file_id = *new_file.1;
+                    // New and old file_id are the same
+                    file_ids.insert(file_id);
+                    for indel in op.iter() {
+                        text_edit_builder.replace(indel.delete, indel.insert.to_string());
+                    }
+                    let mut result = analysis.file_text(file_id).unwrap().to_string();
+                    let edit = text_edit_builder.finish();
+                    edit.apply(&mut result);
+                    let expected = analysis_after.file_text(file_id).unwrap().to_string();
+                    assert_eq_text!(&*expected, &*result);
                 }
                 // Check the balance of the expectations in the new fixture.
                 for file_id in &fixture_after.files {
@@ -1310,6 +1340,38 @@ pub(crate) mod tests {
         );
     }
 
+    #[test]
+    fn rename_module_with_usage_record() {
+        check_rename(
+            "main_3",
+            r#"
+            //- /app_a/src/main.erl
+              -module(ma~in).
+              -export_type([foo/0]).
+              -type foo() :: ok.
+            //- /app_a/src/other.erl
+              -module(other).
+              -export([bar/0]).
+              -spec bar() -> main:foo().
+              bar() -> ok.
+              -record(main, {field :: main:foo()}).
+             "#,
+            //------------------
+            r#"
+            //- /app_a/src/main_3.erl
+              -module(main_3).
+              -export_type([foo/0]).
+              -type foo() :: ok.
+            //- /app_a/src/other.erl
+              -module(other).
+              -export([bar/0]).
+              -spec bar() -> main_3:foo().
+              bar() -> ok.
+              -record(main, {field :: main_3:foo()}).
+             "#,
+        );
+    }
+
     // ---------------------------------
 
     #[track_caller]
diff --git a/crates/ide_db/src/helpers.rs b/crates/ide_db/src/helpers.rs
index c92be86f5f..0b26a23b6a 100644
--- a/crates/ide_db/src/helpers.rs
+++ b/crates/ide_db/src/helpers.rs
@@ -43,12 +43,15 @@ pub fn pick_best_token(
     tokens.max_by_key(move |t| f(t.kind()))
 }
 
+/// Given a syntax node, check it it is immediately enclosed in a call,
+/// which can represent a function call or a type.
+/// For a remote call, the node can be the module or the function name.
+/// In the former case, there is an extra level of nesting, so we need
+/// to check up to 3 steps up
 pub fn get_call(syntax: &SyntaxNode) -> Option<ast::Call> {
-    if let Some(call) = ast::Call::cast(syntax.parent()?) {
-        Some(call)
-    } else {
-        ast::Call::cast(syntax.parent()?.parent()?)
-    }
+    ast::Call::cast(syntax.parent()?)
+        .or_else(|| ast::Call::cast(syntax.parent()?.parent()?))
+        .or_else(|| ast::Call::cast(syntax.parent()?.parent()?.parent()?))
 }
 
 /// Find the first position at the top of the file to add a new
diff --git a/crates/ide_db/src/rename.rs b/crates/ide_db/src/rename.rs
index ab6829be3d..40273d6577 100644
--- a/crates/ide_db/src/rename.rs
+++ b/crates/ide_db/src/rename.rs
@@ -141,7 +141,7 @@ impl SymbolDefinition {
                 if safety_check == SafetyChecks::Yes && !is_valid_module_name(new_name) {
                     rename_error!("Invalid new module name: '{}'", new_name);
                 }
-                self.rename_module(sema, new_name, safety_check)
+                self.rename_reference(sema, new_name, parens_needed_in_context, safety_check)
             }
             SymbolDefinition::Function(fun) => {
                 if safety_check == SafetyChecks::Yes && !is_valid_function_name(new_name) {
@@ -394,6 +394,7 @@ impl SymbolDefinition {
                 );
                 Ok(source_change)
             }
+            SymbolDefinition::Module(_module) => self.rename_module(sema, new_name, safety_check),
             // Note: This is basically an internal error, this function is called from
             // SymbolDefinition::rename which already weeds them out
             _ => {
@@ -424,22 +425,10 @@ impl SymbolDefinition {
 
             let mut source_change = SourceChange::default();
             // Step 1, rename all references
-            let def_map = sema.def_map(file_id);
-            // process anything that could be used. functions, types, ??
-            def_map.get_functions().for_each(|(_name, f)| {
-                if f.exported {
-                    let usages = SymbolDefinition::Function(f.clone()).usages(sema).all();
-                    rename_remote_module_call_refs(usages, file_id, new_name, &mut source_change);
-                }
-            });
-            def_map.get_types().iter().for_each(|(_name, t)| {
-                if t.exported {
-                    let usages = SymbolDefinition::Type(t.clone()).usages(sema).all();
-                    rename_remote_module_call_refs(usages, file_id, new_name, &mut source_change);
-                }
-            });
+            let usages = self.clone().usages(sema).all();
+            rename_remote_module_call_refs(usages, file_id, new_name, &mut source_change);
 
-            // Make changes in the module being renamed
+            // Step 2: Make changes in the module being renamed
             let mut renamed_module_edit: TextEdit = TextEdit::default();
             let form_list = sema.form_list(file_id);
             if let Some(module_attribute) = form_list.module_attribute() {
@@ -452,6 +441,7 @@ impl SymbolDefinition {
                         .union(builder.finish())
                         .expect("Could not combine TextEdits");
                 }
+                let def_map = sema.def_map(file_id);
                 def_map.get_functions().for_each(|(_name, f)| {
                     let usages = SymbolDefinition::Function(f.clone()).usages(sema).all();
                     rename_own_module_call_refs(
@@ -475,13 +465,8 @@ impl SymbolDefinition {
             let anchor = file_id;
             let path = format!("{new_name}.erl");
             let dst = AnchoredPathBuf { anchor, path };
-            let mut initial_contents = sema.db.file_text(anchor).to_string();
-            renamed_module_edit.apply(&mut initial_contents);
-            source_change.push_file_system_edit(FileSystemEdit::CreateFile {
-                dst,
-                initial_contents,
-            });
-
+            source_change.insert_new_source_edit(dst.clone().into(), renamed_module_edit);
+            source_change.push_file_system_edit(FileSystemEdit::MoveFile { src: anchor, dst });
             Ok(source_change)
         } else {
             rename_error!(
@@ -500,7 +485,7 @@ fn rename_remote_module_call_refs(
 ) {
     usages.iter().for_each(|(usage_file_id, refs)| {
         if usage_file_id != file_id
-            && let Some(edit) = rename_call_module_in_refs(refs, new_name)
+            && let Some(edit) = rename_module_in_refs(refs, new_name)
         {
             source_change.insert_source_edit(usage_file_id, edit);
         };
@@ -515,7 +500,7 @@ fn rename_own_module_call_refs(
 ) {
     usages.iter().for_each(|(usage_file_id, refs)| {
         if usage_file_id == file_id
-            && let Some(edit) = rename_call_module_in_refs(refs, new_name)
+            && let Some(edit) = rename_module_in_refs(refs, new_name)
         {
             renamed_module_edit
                 .union(edit)
@@ -524,9 +509,12 @@ fn rename_own_module_call_refs(
     });
 }
 
-fn rename_call_module_in_refs(refs: &[NameLike], new_name: &str) -> Option<TextEdit> {
+fn rename_module_in_refs(refs: &[NameLike], new_name: &str) -> Option<TextEdit> {
     let mut builder = TextEdit::builder();
     for usage in refs {
+        // Note: we cannot blindly replace all occurrences of an
+        // atom that happens to be a module name
+        // We will flesh out other usages as we need them
         let _ = rename_call_module_in_ref(usage, &mut builder, new_name);
     }
     Some(builder.finish())
diff --git a/crates/ide_db/src/source_change.rs b/crates/ide_db/src/source_change.rs
index e4afbd8742..60b62279fe 100644
--- a/crates/ide_db/src/source_change.rs
+++ b/crates/ide_db/src/source_change.rs
@@ -30,9 +30,36 @@ use crate::text_edit::TextEdit;
 use crate::text_edit::TextEditBuilder;
 use crate::tree_diff::diff;
 
+#[derive(PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Debug)]
+pub struct HashableAnchoredPathBuf {
+    /// File that this path is relative to.
+    pub anchor: FileId,
+    /// Path relative to `anchor`'s containing directory.
+    pub path: String,
+}
+
+impl From<AnchoredPathBuf> for HashableAnchoredPathBuf {
+    fn from(value: AnchoredPathBuf) -> Self {
+        HashableAnchoredPathBuf {
+            anchor: value.anchor,
+            path: value.path,
+        }
+    }
+}
+
+impl From<HashableAnchoredPathBuf> for AnchoredPathBuf {
+    fn from(value: HashableAnchoredPathBuf) -> Self {
+        AnchoredPathBuf {
+            anchor: value.anchor,
+            path: value.path,
+        }
+    }
+}
+
 #[derive(Default, Debug, Clone)]
 pub struct SourceChange {
     pub source_file_edits: FxHashMap<FileId, TextEdit>,
+    pub new_file_edits: FxHashMap<HashableAnchoredPathBuf, TextEdit>,
     pub file_system_edits: Vec<FileSystemEdit>,
     pub is_snippet: bool,
 }
@@ -46,6 +73,7 @@ impl SourceChange {
     ) -> Self {
         SourceChange {
             source_file_edits,
+            new_file_edits: FxHashMap::default(),
             file_system_edits,
             is_snippet: false,
         }
@@ -74,6 +102,22 @@ impl SourceChange {
         }
     }
 
+    /// Inserts a [`TextEdit`] for the given [`AnchoredPathBuf`]. This properly handles merging existing
+    /// edits for a file if some already exist.
+    pub fn insert_new_source_edit(&mut self, file_id: HashableAnchoredPathBuf, edit: TextEdit) {
+        match self.new_file_edits.entry(file_id) {
+            Entry::Occupied(mut entry) => {
+                never!(
+                    entry.get_mut().union(edit).is_err(),
+                    "overlapping edits for same file"
+                );
+            }
+            Entry::Vacant(entry) => {
+                entry.insert(edit);
+            }
+        }
+    }
+
     pub fn push_file_system_edit(&mut self, edit: FileSystemEdit) {
         self.file_system_edits.push(edit);
     }
@@ -85,12 +129,15 @@ impl SourceChange {
     pub fn merge(mut self, other: SourceChange) -> SourceChange {
         self.extend(other.source_file_edits);
         self.extend(other.file_system_edits);
+        self.extend(other.new_file_edits);
         self.is_snippet |= other.is_snippet;
         self
     }
 
     pub fn is_empty(&self) -> bool {
-        self.source_file_edits.is_empty() && self.file_system_edits.is_empty()
+        self.source_file_edits.is_empty()
+            && self.file_system_edits.is_empty()
+            && self.new_file_edits.is_empty()
     }
 
     pub fn text_range(&self, file_id: FileId) -> Option<TextRange> {
@@ -116,10 +163,18 @@ impl Extend<FileSystemEdit> for SourceChange {
     }
 }
 
+impl Extend<(HashableAnchoredPathBuf, TextEdit)> for SourceChange {
+    fn extend<T: IntoIterator<Item = (HashableAnchoredPathBuf, TextEdit)>>(&mut self, iter: T) {
+        iter.into_iter()
+            .for_each(|(file_id, edit)| self.insert_new_source_edit(file_id, edit));
+    }
+}
+
 impl From<FxHashMap<FileId, TextEdit>> for SourceChange {
     fn from(source_file_edits: FxHashMap<FileId, TextEdit>) -> SourceChange {
         SourceChange {
             source_file_edits,
+            new_file_edits: FxHashMap::default(),
             file_system_edits: Vec::new(),
             is_snippet: false,
         }
@@ -265,6 +320,7 @@ impl From<FileSystemEdit> for SourceChange {
     fn from(edit: FileSystemEdit) -> SourceChange {
         SourceChange {
             source_file_edits: Default::default(),
+            new_file_edits: Default::default(),
             file_system_edits: vec![edit],
             is_snippet: false,
         }

From 9015d80659bdcea35dd3ac5b7148fccfaaf644ef Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 17 Dec 2025 06:00:04 -0800
Subject: [PATCH 372/394] 6/n: rename module: external fun reference

Summary: A module name can occur in an external fun. Rename it too.

Reviewed By: robertoaloi

Differential Revision: D88849514

fbshipit-source-id: e715628a6fbfe419cd56761fe62b43d3b68ecde4
---
 crates/ide/src/rename.rs     | 33 +++++++++++++++++++++++++++++++++
 crates/ide_db/src/helpers.rs |  8 ++++++++
 crates/ide_db/src/rename.rs  | 13 +++++++++++++
 3 files changed, 54 insertions(+)

diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index 884556585c..992573c770 100644
--- a/crates/ide/src/rename.rs
+++ b/crates/ide/src/rename.rs
@@ -1372,6 +1372,39 @@ pub(crate) mod tests {
         );
     }
 
+    #[test]
+    fn rename_module_with_usage_fun() {
+        check_rename(
+            "main_3",
+            r#"
+            //- /app_a/src/main.erl
+              -module(ma~in).
+              -export([foo/1]).
+              foo(X) -> {X}.
+            //- /app_a/src/other.erl
+              -module(other).
+              -export([bar/1]).
+              -spec bar(term()) -> ok.
+              bar(UStrings) ->
+                Jobs = [{fun main:foo/1, [U], []} || U <- UStrings],
+                ok.
+             "#,
+            r#"
+            //- /app_a/src/main_3.erl
+              -module(main_3).
+              -export([foo/1]).
+              foo(X) -> {X}.
+            //- /app_a/src/other.erl
+              -module(other).
+              -export([bar/1]).
+              -spec bar(term()) -> ok.
+              bar(UStrings) ->
+                Jobs = [{fun main_3:foo/1, [U], []} || U <- UStrings],
+                ok.
+             "#,
+        );
+    }
+
     // ---------------------------------
 
     #[track_caller]
diff --git a/crates/ide_db/src/helpers.rs b/crates/ide_db/src/helpers.rs
index 0b26a23b6a..038b41f0be 100644
--- a/crates/ide_db/src/helpers.rs
+++ b/crates/ide_db/src/helpers.rs
@@ -54,6 +54,14 @@ pub fn get_call(syntax: &SyntaxNode) -> Option<ast::Call> {
         .or_else(|| ast::Call::cast(syntax.parent()?.parent()?.parent()?))
 }
 
+pub fn get_external_fun(syntax: &SyntaxNode) -> Option<ast::ExternalFun> {
+    if let Some(external_fun) = ast::ExternalFun::cast(syntax.parent()?) {
+        Some(external_fun)
+    } else {
+        ast::ExternalFun::cast(syntax.parent()?.parent()?)
+    }
+}
+
 /// Find the first position at the top of the file to add a new
 /// form. It will be just after the module attribute, if there is one.
 pub fn top_insert_position(form_list: &FormList, source: &SourceFile) -> TextSize {
diff --git a/crates/ide_db/src/rename.rs b/crates/ide_db/src/rename.rs
index 40273d6577..31c9b551b6 100644
--- a/crates/ide_db/src/rename.rs
+++ b/crates/ide_db/src/rename.rs
@@ -27,6 +27,7 @@ use hir::Semantic;
 
 use crate::SymbolDefinition;
 use crate::helpers::get_call;
+use crate::helpers::get_external_fun;
 use crate::search::NameLike;
 use crate::source_change::FileSystemEdit;
 use crate::source_change::SourceChange;
@@ -516,6 +517,7 @@ fn rename_module_in_refs(refs: &[NameLike], new_name: &str) -> Option<TextEdit>
         // atom that happens to be a module name
         // We will flesh out other usages as we need them
         let _ = rename_call_module_in_ref(usage, &mut builder, new_name);
+        let _ = rename_external_fun_module_in_ref(usage, &mut builder, new_name);
     }
     Some(builder.finish())
 }
@@ -534,6 +536,17 @@ fn rename_call_module_in_ref(
     Some(())
 }
 
+fn rename_external_fun_module_in_ref(
+    usage: &NameLike,
+    builder: &mut TextEditBuilder,
+    new_name: &str,
+) -> Option<()> {
+    let external_fun = get_external_fun(usage.syntax())?;
+    let module = external_fun.module()?;
+    builder.replace(module.name()?.syntax().text_range(), new_name.to_string());
+    Some(())
+}
+
 fn source_edit_from_usages(
     source_change: &mut SourceChange,
     usages: Vec<(FileId, &[NameLike])>,

From 83d5b4dfd0902bacf67b3ecdb0edc0205e1d2e16 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 17 Dec 2025 06:00:04 -0800
Subject: [PATCH 373/394] 7/n: rename module: check module name in a call

Summary:
When identifying a call from a reference, we start from the ast token for the module name, and ascend the ast until we find a call.

But up to now we have not checked that the module we started from is the module part of the call MFA.

This diff adds that check.

Reviewed By: robertoaloi

Differential Revision: D88934411

fbshipit-source-id: 81a57520ec834210fcea8fd6920653cc45f9890c
---
 crates/ide/src/rename.rs    | 69 +++++++++++++++++++++++++++++++++++++
 crates/ide_db/src/rename.rs | 13 ++++---
 crates/ide_db/src/search.rs |  2 +-
 3 files changed, 79 insertions(+), 5 deletions(-)

diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index 992573c770..01d26b0f87 100644
--- a/crates/ide/src/rename.rs
+++ b/crates/ide/src/rename.rs
@@ -1372,6 +1372,42 @@ pub(crate) mod tests {
         );
     }
 
+    #[test]
+    fn rename_module_with_usage_fun_arg() {
+        check_rename(
+            "main_3",
+            r#"
+            //- /app_a/src/main.erl
+              -module(ma~in).
+              -export_type([foo/0]).
+              -type foo() :: ok.
+            //- /app_a/src/other.erl
+              -module(other).
+              -export([bar/0]).
+              -spec bar() -> main:foo().
+              bar() ->
+               meck:new(main, [passthrough]),
+               ok.
+              -record(main, {field :: main:foo()}).
+             "#,
+            //------------------
+            r#"
+            //- /app_a/src/main_3.erl
+              -module(main_3).
+              -export_type([foo/0]).
+              -type foo() :: ok.
+            //- /app_a/src/other.erl
+              -module(other).
+              -export([bar/0]).
+              -spec bar() -> main_3:foo().
+              bar() ->
+               meck:new(main, [passthrough]),
+               ok.
+              -record(main, {field :: main_3:foo()}).
+             "#,
+        );
+    }
+
     #[test]
     fn rename_module_with_usage_fun() {
         check_rename(
@@ -1405,6 +1441,39 @@ pub(crate) mod tests {
         );
     }
 
+    #[test]
+    fn rename_module_with_usage_fun_as_module() {
+        check_rename(
+            "main_3",
+            r#"
+            //- /app_a/src/main.erl
+              -module(ma~in).
+              -export([main/1]).
+              main(X) -> {X}.
+            //- /app_a/src/other.erl
+              -module(other).
+              -export([bar/1]).
+              -spec bar(term()) -> ok.
+              bar(UStrings) ->
+                Jobs = [{fun main:main/1, [U], []} || U <- UStrings],
+                ok.
+             "#,
+            r#"
+            //- /app_a/src/main_3.erl
+              -module(main_3).
+              -export([main/1]).
+              main(X) -> {X}.
+            //- /app_a/src/other.erl
+              -module(other).
+              -export([bar/1]).
+              -spec bar(term()) -> ok.
+              bar(UStrings) ->
+                Jobs = [{fun main_3:main/1, [U], []} || U <- UStrings],
+                ok.
+             "#,
+        );
+    }
+
     // ---------------------------------
 
     #[track_caller]
diff --git a/crates/ide_db/src/rename.rs b/crates/ide_db/src/rename.rs
index 31c9b551b6..a22e2b0acf 100644
--- a/crates/ide_db/src/rename.rs
+++ b/crates/ide_db/src/rename.rs
@@ -529,10 +529,15 @@ fn rename_call_module_in_ref(
 ) -> Option<()> {
     let call = get_call(usage.syntax())?;
     // Note: `ast` uses the same syntax for a function call and a type
-    let _: () = if let Some(ast::Expr::Remote(remote)) = call.expr() {
-        let module = remote.module()?.module()?;
-        builder.replace(module.syntax().text_range(), new_name.to_string());
-    };
+    if let Some(ast::Expr::Remote(remote)) = call.expr() {
+        let module = remote.module()?;
+        if let Some(ast::ExprMax::Atom(atom)) = module.module()
+            && let NameLike::Name(ast::Name::Atom(name_atom)) = usage
+            && atom.syntax() == name_atom.syntax()
+        {
+            builder.replace(atom.syntax().text_range(), new_name.to_string());
+        }
+    }
     Some(())
 }
 
diff --git a/crates/ide_db/src/search.rs b/crates/ide_db/src/search.rs
index 20b4f050b4..1e66598359 100644
--- a/crates/ide_db/src/search.rs
+++ b/crates/ide_db/src/search.rs
@@ -325,7 +325,7 @@ impl<'a> FindUsages<'a> {
 
 /// Represents possible ast reference points -
 /// a string for header, or ast::Name for everything else
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum NameLike {
     Name(ast::Name),
     String(ast::String),

From cc0a9c26d50e7038008e0ad587dcf6e0144297ef Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 17 Dec 2025 06:00:04 -0800
Subject: [PATCH 374/394] 8/n: rename module: well known function arguments

Summary:
Certain functions are known to take a module name as an argument.  We already have a list of those that correspond to referencing a function as an MFA, in `to_def.rs`.  We extend this with some other examples, and check for renaming them too as part of the module rename.

The list is currently incommplete, and can be filled out based on usage. A future diff may look at ways of generating it from `-spec` information.

Reviewed By: robertoaloi

Differential Revision: D88943301

fbshipit-source-id: 05c67a108b1dc5b64f4353872427361fd039171f
---
 crates/hir/src/sema/to_def.rs | 177 +++++++++++++++++++++++++++++++++-
 crates/ide/src/rename.rs      |   8 +-
 crates/ide_db/src/rename.rs   |  72 ++++++++++++--
 3 files changed, 247 insertions(+), 10 deletions(-)

diff --git a/crates/hir/src/sema/to_def.rs b/crates/hir/src/sema/to_def.rs
index 0c8eba227e..01d17278a2 100644
--- a/crates/hir/src/sema/to_def.rs
+++ b/crates/hir/src/sema/to_def.rs
@@ -885,7 +885,155 @@ fn add_dynamic_call_patterns(patterns: &mut FxHashMap<PatternKey, DynamicCallPat
     );
 }
 
-// Lazy static initialization for the patterns map
+/// Specifies what forms a module argument can take.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum ModuleArgType {
+    /// The argument must be a single module atom (e.g., `apply(Mod, Fun, Args)`)
+    Atom,
+    /// The argument must be a list of module atoms (e.g., some batch operations)
+    List,
+    /// The argument can be either a single module atom or a list of modules
+    /// (e.g., `meck:new(Mod | [Mod], Opts)`)
+    AtomOrList,
+}
+
+/// Pattern for matching module argument positions in function calls.
+/// Used by rename operations to identify which argument contains a module name.
+#[derive(Debug, Clone, Copy)]
+pub struct ModuleArgPattern {
+    /// Index of the argument containing the module name (0-based)
+    pub index: usize,
+    /// The type of the module argument (atom, list, or either)
+    pub arg_type: ModuleArgType,
+}
+
+impl ModuleArgPattern {
+    /// Creates a pattern where the argument is a single module atom.
+    pub const fn atom(index: usize) -> Self {
+        Self {
+            index,
+            arg_type: ModuleArgType::Atom,
+        }
+    }
+
+    /// Creates a pattern where the argument is a list of module atoms.
+    pub const fn list(index: usize) -> Self {
+        Self {
+            index,
+            arg_type: ModuleArgType::List,
+        }
+    }
+
+    /// Creates a pattern where the argument can be either a single atom or a list.
+    pub const fn atom_or_list(index: usize) -> Self {
+        Self {
+            index,
+            arg_type: ModuleArgType::AtomOrList,
+        }
+    }
+
+    /// Returns true if this pattern accepts a single atom.
+    pub const fn accepts_atom(&self) -> bool {
+        matches!(
+            self.arg_type,
+            ModuleArgType::Atom | ModuleArgType::AtomOrList
+        )
+    }
+
+    /// Returns true if this pattern accepts a list of atoms.
+    pub const fn accepts_list(&self) -> bool {
+        matches!(
+            self.arg_type,
+            ModuleArgType::List | ModuleArgType::AtomOrList
+        )
+    }
+}
+
+fn add_module_argument_patterns(patterns: &mut FxHashMap<PatternKey, ModuleArgPattern>) {
+    // Each entry follows the format:
+    // (module, function, arity) -> ModuleArgPattern
+    //
+    // Where:
+    // module:           Module name (Some("meck"), Some("application"), etc.)
+    // function:         Function name as string literal (e.g., "new", "get_env")
+    // arity:            Number of arguments this function pattern expects
+    // ModuleArgPattern: Contains the argument index and the expected type
+    //
+    // All indexes are 0-based.
+
+    // meck - mocking library
+    // meck:new/2 accepts either a single module atom or a list of modules
+    patterns.insert((Some("meck"), "called", 3), ModuleArgPattern::atom(0));
+    patterns.insert((Some("meck"), "called", 4), ModuleArgPattern::atom(0));
+    patterns.insert((Some("meck"), "capture", 5), ModuleArgPattern::atom(1));
+    patterns.insert((Some("meck"), "capture", 6), ModuleArgPattern::atom(1));
+    patterns.insert(
+        (Some("meck"), "delete", 3),
+        ModuleArgPattern::atom_or_list(0),
+    );
+    patterns.insert(
+        (Some("meck"), "delete", 4),
+        ModuleArgPattern::atom_or_list(0),
+    );
+    patterns.insert(
+        (Some("meck"), "expect", 3),
+        ModuleArgPattern::atom_or_list(0),
+    );
+    patterns.insert(
+        (Some("meck"), "expect", 4),
+        ModuleArgPattern::atom_or_list(0),
+    );
+    patterns.insert(
+        (Some("meck"), "expects", 2),
+        ModuleArgPattern::atom_or_list(0),
+    );
+    patterns.insert((Some("meck"), "history", 1), ModuleArgPattern::atom(0));
+    patterns.insert((Some("meck"), "history", 2), ModuleArgPattern::atom(0));
+    patterns.insert((Some("meck"), "loop", 4), ModuleArgPattern::atom_or_list(0));
+    patterns.insert((Some("meck"), "new", 1), ModuleArgPattern::atom_or_list(0));
+    patterns.insert((Some("meck"), "new", 2), ModuleArgPattern::atom_or_list(0));
+    patterns.insert((Some("meck"), "num_calls", 3), ModuleArgPattern::atom(0));
+    patterns.insert((Some("meck"), "num_calls", 4), ModuleArgPattern::atom(0));
+    patterns.insert(
+        (Some("meck"), "reset", 1),
+        ModuleArgPattern::atom_or_list(0),
+    );
+    patterns.insert(
+        (Some("meck"), "sequence", 4),
+        ModuleArgPattern::atom_or_list(0),
+    );
+    patterns.insert(
+        (Some("meck"), "unload", 1),
+        ModuleArgPattern::atom_or_list(0),
+    );
+    patterns.insert(
+        (Some("meck"), "validate", 1),
+        ModuleArgPattern::atom_or_list(0),
+    );
+    patterns.insert((Some("meck"), "wait", 4), ModuleArgPattern::atom(0));
+    patterns.insert((Some("meck"), "wait", 5), ModuleArgPattern::atom(1));
+    patterns.insert((Some("meck"), "wait", 6), ModuleArgPattern::atom(1));
+
+    // code module - module loading and management
+    // These functions from the Erlang stdlib take module() as their argument
+    patterns.insert((Some("code"), "load_file", 1), ModuleArgPattern::atom(0));
+    patterns.insert(
+        (Some("code"), "ensure_loaded", 1),
+        ModuleArgPattern::atom(0),
+    );
+    patterns.insert((Some("code"), "delete", 1), ModuleArgPattern::atom(0));
+    patterns.insert((Some("code"), "purge", 1), ModuleArgPattern::atom(0));
+    patterns.insert((Some("code"), "soft_purge", 1), ModuleArgPattern::atom(0));
+    patterns.insert((Some("code"), "is_loaded", 1), ModuleArgPattern::atom(0));
+    patterns.insert(
+        (Some("code"), "get_object_code", 1),
+        ModuleArgPattern::atom(0),
+    );
+    patterns.insert((Some("code"), "module_md5", 1), ModuleArgPattern::atom(0));
+    patterns.insert((Some("code"), "is_sticky", 1), ModuleArgPattern::atom(0));
+}
+
+// Lazy static initialization for the patterns maps
 lazy_static! {
     static ref DYNAMIC_CALL_PATTERNS: FxHashMap<PatternKey, DynamicCallPattern> = {
         let mut patterns = FxHashMap::default();
@@ -893,12 +1041,39 @@ lazy_static! {
         // @fb-only: meta_only::add_dynamic_call_patterns(&mut patterns);
         patterns
     };
+    static ref MODULE_ARGUMENT_PATTERNS: FxHashMap<PatternKey, ModuleArgPattern> = {
+        let mut patterns = FxHashMap::default();
+        add_module_argument_patterns(&mut patterns);
+        // @fb-only: meta_only::add_module_argument_patterns(&mut patterns);
+        patterns
+    };
+    /// Combined patterns for module argument positions.
+    /// Merges dynamic call patterns (that have module_arg_index) with simple module argument patterns.
+    /// Used by rename operations where we only care about the module argument position.
+    static ref COMBINED_MODULE_ARG_PATTERNS: FxHashMap<PatternKey, ModuleArgPattern> = {
+        let mut patterns: FxHashMap<PatternKey, ModuleArgPattern> = FxHashMap::default();
+        // Add module_arg_index from dynamic call patterns (where present)
+        for (key, pattern) in DYNAMIC_CALL_PATTERNS.iter() {
+            if let Some(module_idx) = pattern.module_arg_index {
+                patterns.insert(*key, ModuleArgPattern::atom(module_idx));
+            }
+        }
+        // Add from simple module argument patterns
+        for (key, module_arg_pattern) in MODULE_ARGUMENT_PATTERNS.iter() {
+            patterns.insert(*key, *module_arg_pattern);
+        }
+        patterns
+    };
 }
 
 fn get_dynamic_call_patterns() -> &'static FxHashMap<PatternKey, DynamicCallPattern> {
     &DYNAMIC_CALL_PATTERNS
 }
 
+pub fn get_module_arg_patterns() -> &'static FxHashMap<PatternKey, ModuleArgPattern> {
+    &COMBINED_MODULE_ARG_PATTERNS
+}
+
 fn look_for_dynamic_call(
     sema: &Semantic,
     file_id: FileId,
diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index 01d26b0f87..92e5125063 100644
--- a/crates/ide/src/rename.rs
+++ b/crates/ide/src/rename.rs
@@ -1387,6 +1387,9 @@ pub(crate) mod tests {
               -spec bar() -> main:foo().
               bar() ->
                meck:new(main, [passthrough]),
+               meck:new([other, main] , [passthrough]),
+               meck:unload(main),
+               apply(main, foo, []),
                ok.
               -record(main, {field :: main:foo()}).
              "#,
@@ -1401,7 +1404,10 @@ pub(crate) mod tests {
               -export([bar/0]).
               -spec bar() -> main_3:foo().
               bar() ->
-               meck:new(main, [passthrough]),
+               meck:new(main_3, [passthrough]),
+               meck:new([other, main_3] , [passthrough]),
+               meck:unload(main_3),
+               apply(main_3, foo, []),
                ok.
               -record(main, {field :: main_3:foo()}).
              "#,
diff --git a/crates/ide_db/src/rename.rs b/crates/ide_db/src/rename.rs
index a22e2b0acf..e9ec7d96f1 100644
--- a/crates/ide_db/src/rename.rs
+++ b/crates/ide_db/src/rename.rs
@@ -528,16 +528,72 @@ fn rename_call_module_in_ref(
     new_name: &str,
 ) -> Option<()> {
     let call = get_call(usage.syntax())?;
-    // Note: `ast` uses the same syntax for a function call and a type
-    if let Some(ast::Expr::Remote(remote)) = call.expr() {
-        let module = remote.module()?;
-        if let Some(ast::ExprMax::Atom(atom)) = module.module()
-            && let NameLike::Name(ast::Name::Atom(name_atom)) = usage
-            && atom.syntax() == name_atom.syntax()
-        {
-            builder.replace(atom.syntax().text_range(), new_name.to_string());
+    // We can only rename an atom usage
+    let usage_atom = match usage {
+        NameLike::Name(ast::Name::Atom(atom)) => atom,
+        _ => return Some(()),
+    };
+
+    // First check if this is the module part of a remote call (e.g., module:function())
+    if let Some(ast::Expr::Remote(remote)) = call.expr()
+        && let Some(module) = remote.module()
+        && let Some(ast::ExprMax::Atom(mod_atom)) = module.module()
+        && mod_atom.syntax() == usage_atom.syntax()
+    {
+        builder.replace(usage_atom.syntax().text_range(), new_name.to_string());
+        return Some(());
+    }
+
+    // Check if this is a known function call that takes a module as an argument
+    // Extract function name and optional module name based on call type
+    let (module_name, function_name) = match call.expr()? {
+        ast::Expr::Remote(remote) => {
+            let module = remote.module()?;
+            let mod_atom = match module.module()? {
+                ast::ExprMax::Atom(atom) => atom,
+                _ => return Some(()),
+            };
+            let fun_atom = match remote.fun()? {
+                ast::ExprMax::Atom(atom) => atom,
+                _ => return Some(()),
+            };
+            (Some(mod_atom.text()?), fun_atom.text()?)
+        }
+        ast::Expr::ExprMax(ast::ExprMax::Atom(fun_atom)) => (None, fun_atom.text()?),
+        _ => return Some(()),
+    };
+
+    let args = call.args()?;
+    let args_vec: Vec<_> = args.args().collect();
+    let arity = args_vec.len();
+    let pattern_key = (module_name.as_deref(), function_name.as_str(), arity);
+
+    // Use combined patterns that merge dynamic call patterns and module argument patterns
+    let combined_patterns = hir::sema::to_def::get_module_arg_patterns();
+    if let Some(pattern) = combined_patterns.get(&pattern_key)
+        && let Some(arg) = args_vec.get(pattern.index)
+    {
+        match arg {
+            ast::Expr::ExprMax(ast::ExprMax::Atom(arg_atom))
+                if pattern.accepts_atom() && arg_atom.syntax() == usage_atom.syntax() =>
+            {
+                builder.replace(usage_atom.syntax().text_range(), new_name.to_string());
+            }
+            ast::Expr::ExprMax(ast::ExprMax::List(list)) if pattern.accepts_list() => {
+                // Handle list of modules (e.g., meck:new([mod1, mod2], Options))
+                for expr in list.exprs() {
+                    if let ast::Expr::ExprMax(ast::ExprMax::Atom(list_atom)) = expr
+                        && list_atom.syntax() == usage_atom.syntax()
+                    {
+                        builder.replace(usage_atom.syntax().text_range(), new_name.to_string());
+                        break;
+                    }
+                }
+            }
+            _ => {}
         }
     }
+
     Some(())
 }
 

From 91a0d968dbcef5f6b05426f50d518946d450564f Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 17 Dec 2025 06:00:04 -0800
Subject: [PATCH 375/394] 9/n: rename module: remote calls in original module

Summary:
Simplify the rename module logic to use the standard approach, find usages, rename each of them.

And in the process ensure that remote calls in the module being renamed are also renamed.

Reviewed By: robertoaloi

Differential Revision: D88947976

fbshipit-source-id: c703be8392b7ac634ced2c45d8553d33882d460b
---
 crates/ide/src/rename.rs    | 35 ++++++++++++++++++++-
 crates/ide_db/src/rename.rs | 61 +++++++++++--------------------------
 2 files changed, 52 insertions(+), 44 deletions(-)

diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index 92e5125063..4a7b566bcf 100644
--- a/crates/ide/src/rename.rs
+++ b/crates/ide/src/rename.rs
@@ -1286,7 +1286,7 @@ pub(crate) mod tests {
     }
 
     #[test]
-    fn rename_module_with_usage() {
+    fn rename_module_fails_dup_name() {
         check_rename(
             "main_2",
             r#"
@@ -1310,6 +1310,39 @@ pub(crate) mod tests {
         );
     }
 
+    #[test]
+    fn rename_module_with_usage_internal() {
+        check_rename(
+            "main_2",
+            r#"
+            //- /app_a/src/main.erl
+              -module(ma~in).
+              -export([foo/0]).
+              foo() -> ok.
+              bar() -> main:foo().
+              baz() -> main:bar().
+
+            //- /app_a/src/other.erl
+            -module(other).
+            -export([bar/0]).
+            bar() -> main:foo().
+            "#,
+            //------------------
+            r#"
+            //- /app_a/src/main_2.erl
+              -module(main_2).
+              -export([foo/0]).
+              foo() -> ok.
+              bar() -> main_2:foo().
+              baz() -> main_2:bar().
+
+            //- /app_a/src/other.erl
+            -module(other).
+            -export([bar/0]).
+            bar() -> main_2:foo().
+            "#,
+        );
+    }
     #[test]
     fn rename_module_with_usage_type() {
         // TODO: check for compile errors in the fixture
diff --git a/crates/ide_db/src/rename.rs b/crates/ide_db/src/rename.rs
index e9ec7d96f1..bd5a49f8cf 100644
--- a/crates/ide_db/src/rename.rs
+++ b/crates/ide_db/src/rename.rs
@@ -427,10 +427,16 @@ impl SymbolDefinition {
             let mut source_change = SourceChange::default();
             // Step 1, rename all references
             let usages = self.clone().usages(sema).all();
-            rename_remote_module_call_refs(usages, file_id, new_name, &mut source_change);
-
-            // Step 2: Make changes in the module being renamed
             let mut renamed_module_edit: TextEdit = TextEdit::default();
+            rename_remote_module_call_refs(
+                usages,
+                file_id,
+                new_name,
+                &mut source_change,
+                &mut renamed_module_edit,
+            );
+
+            // Step 2: Rename the module attribute in the module being renamed
             let form_list = sema.form_list(file_id);
             if let Some(module_attribute) = form_list.module_attribute() {
                 let ast = module_attribute.form_id.get_ast(sema.db, file_id);
@@ -442,25 +448,6 @@ impl SymbolDefinition {
                         .union(builder.finish())
                         .expect("Could not combine TextEdits");
                 }
-                let def_map = sema.def_map(file_id);
-                def_map.get_functions().for_each(|(_name, f)| {
-                    let usages = SymbolDefinition::Function(f.clone()).usages(sema).all();
-                    rename_own_module_call_refs(
-                        usages,
-                        file_id,
-                        new_name,
-                        &mut renamed_module_edit,
-                    );
-                });
-                def_map.get_types().iter().for_each(|(_name, t)| {
-                    let usages = SymbolDefinition::Type(t.clone()).usages(sema).all();
-                    rename_own_module_call_refs(
-                        usages,
-                        file_id,
-                        new_name,
-                        &mut renamed_module_edit,
-                    );
-                });
             }
 
             let anchor = file_id;
@@ -483,30 +470,18 @@ fn rename_remote_module_call_refs(
     file_id: FileId,
     new_name: &str,
     source_change: &mut SourceChange,
-) {
-    usages.iter().for_each(|(usage_file_id, refs)| {
-        if usage_file_id != file_id
-            && let Some(edit) = rename_module_in_refs(refs, new_name)
-        {
-            source_change.insert_source_edit(usage_file_id, edit);
-        };
-    });
-}
-
-fn rename_own_module_call_refs(
-    usages: crate::UsageSearchResult,
-    file_id: FileId,
-    new_name: &str,
     renamed_module_edit: &mut TextEdit,
 ) {
     usages.iter().for_each(|(usage_file_id, refs)| {
-        if usage_file_id == file_id
-            && let Some(edit) = rename_module_in_refs(refs, new_name)
-        {
-            renamed_module_edit
-                .union(edit)
-                .expect("Could not combine TextEdits");
-        }
+        if let Some(edit) = rename_module_in_refs(refs, new_name) {
+            if usage_file_id == file_id {
+                renamed_module_edit
+                    .union(edit)
+                    .expect("Could not combine TextEdits");
+            } else {
+                source_change.insert_source_edit(usage_file_id, edit);
+            }
+        };
     });
 }
 

From 4a051d1af88ebb2ae80d31f85fba061a10c7e098 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 17 Dec 2025 06:00:04 -0800
Subject: [PATCH 376/394] 10/n: rename module: in defines RHS

Summary: Add a test demonstrating that the module rename happens in `.hrl` files too

Reviewed By: TheGeorge

Differential Revision: D89053579

fbshipit-source-id: f999484c08a5c33c76986156c10a2f6a7d34fc52
---
 crates/ide/src/rename.rs | 46 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/crates/ide/src/rename.rs b/crates/ide/src/rename.rs
index 4a7b566bcf..ee5bfb7219 100644
--- a/crates/ide/src/rename.rs
+++ b/crates/ide/src/rename.rs
@@ -1513,6 +1513,52 @@ pub(crate) mod tests {
         );
     }
 
+    #[test]
+    fn rename_module_with_usage_define() {
+        check_rename(
+            "main_3",
+            r#"
+            //- /app_a/src/main.erl
+              -module(ma~in).
+              -export([foo/1]).
+              foo(X) -> {X}.
+
+            //- /app_a/src/definer.hrl
+              -define(FOO(X), main:foo(X)).
+
+            //- /app_a/src/other.erl
+              -module(other).
+              -include("definer.hrl").
+              -export([bar/0]).
+              -spec bar(term()) -> ok.
+              bar(U) ->
+                main:foo(U),
+                ?FOO(U),
+                ok.
+             "#,
+            //------------------
+            r#"
+            //- /app_a/src/main_3.erl
+              -module(main_3).
+              -export([foo/1]).
+              foo(X) -> {X}.
+
+            //- /app_a/src/definer.hrl
+              -define(FOO(X), main_3:foo(X)).
+
+            //- /app_a/src/other.erl
+              -module(other).
+              -include("definer.hrl").
+              -export([bar/0]).
+              -spec bar(term()) -> ok.
+              bar(U) ->
+                main_3:foo(U),
+                ?FOO(U),
+                ok.
+             "#,
+        );
+    }
+
     // ---------------------------------
 
     #[track_caller]

From 7057624c7339b554d099a2e4f38bcc72b3d33a0e Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Wed, 17 Dec 2025 06:36:56 -0800
Subject: [PATCH 377/394] `elp lint`: print diagnostics in the case we are not
 streaming and not applying a fix

Summary:
Fix two bugs for `--no-stream` for `elp lint`

1. args.skip_stream_print() now skips if either the flag is set, or `--apply-fixes` is set
2. When we are not streaming, and also not applyiing fixes, print the diagnostics

Reviewed By: robertoaloi

Differential Revision: D89369072

fbshipit-source-id: 2279aca861fb09c5b33adb0000e3a58821026064
---
 crates/elp/src/bin/args.rs                    |   2 +-
 crates/elp/src/bin/lint_cli.rs                |  81 ++++++++---
 crates/elp/src/bin/main.rs                    |  12 ++
 .../test/diagnostics/lint_no_stream.stdout    | 135 ++++++++++++++++++
 .../parse_elp_lint_ignore_apps_b.stdout       |   2 +-
 5 files changed, 207 insertions(+), 25 deletions(-)
 create mode 100644 crates/elp/src/resources/test/diagnostics/lint_no_stream.stdout

diff --git a/crates/elp/src/bin/args.rs b/crates/elp/src/bin/args.rs
index 2d97f50562..c9790e9314 100644
--- a/crates/elp/src/bin/args.rs
+++ b/crates/elp/src/bin/args.rs
@@ -911,7 +911,7 @@ impl Lint {
 
     /// To prevent flaky test results we allow disabling streaming when applying fixes
     pub fn skip_stream_print(&self) -> bool {
-        self.apply_fix && self.no_stream
+        self.apply_fix || self.no_stream
     }
 }
 
diff --git a/crates/elp/src/bin/lint_cli.rs b/crates/elp/src/bin/lint_cli.rs
index f7ac4ff114..241a3d4481 100644
--- a/crates/elp/src/bin/lint_cli.rs
+++ b/crates/elp/src/bin/lint_cli.rs
@@ -295,7 +295,7 @@ pub fn do_codemod(
     let res;
     let streamed_err_in_diag;
     let mut any_diagnostics_printed = false;
-    let initial_diags = {
+    let mut initial_diags = {
         // We put this in its own block so that analysis is
         // freed before we apply lints. To apply lints
         // recursively, we need to update the underlying
@@ -394,30 +394,54 @@ pub fn do_codemod(
     let mut err_in_diag = streamed_err_in_diag;
     // At this point, the analysis variable from above is dropped
 
-    // Print "No diagnostics reported" if no diagnostics were found after filtering
-    if !any_diagnostics_printed {
-        if args.is_format_normal() {
-            writeln!(cli, "No diagnostics reported")?;
+    // When streaming is disabled (--no-stream) and we're not applying fixes,
+    // we need to print diagnostics now since they weren't printed during streaming
+    if args.no_stream && !args.apply_fix && !initial_diags.is_empty() {
+        let analysis = loaded.analysis();
+        let mut module_count = 0;
+        initial_diags.sort_by(|(a, _, _), (b, _, _)| a.cmp(b));
+        for result in &initial_diags {
+            let printed = print_diagnostic_result(
+                cli,
+                &analysis,
+                diagnostics_config,
+                args,
+                loaded,
+                &args.module,
+                &mut err_in_diag,
+                &mut module_count,
+                result,
+            )?;
+            any_diagnostics_printed = any_diagnostics_printed || printed;
         }
-    } else {
-        if args.apply_fix && diagnostics_config.enabled.all_enabled() {
+    }
+
+    // Handle apply_fix case separately since it needs to filter diagnostics anyway
+    if args.apply_fix {
+        if diagnostics_config.enabled.all_enabled() {
             bail!(
                 "We cannot apply fixes if all diagnostics enabled. Perhaps provide --diagnostic-filter"
             );
         }
-        if args.apply_fix && !diagnostics_config.enabled.all_enabled() {
-            let mut initial_diags = {
-                let analysis = loaded.analysis();
-                filter_diagnostics(
-                    &analysis,
-                    &args.module,
-                    Some(&diagnostics_config.enabled),
-                    &initial_diags,
-                    &FxHashSet::default(),
-                )?
-            };
+
+        let mut filtered_diags = {
+            let analysis = loaded.analysis();
+            filter_diagnostics(
+                &analysis,
+                &args.module,
+                Some(&diagnostics_config.enabled),
+                &initial_diags,
+                &FxHashSet::default(),
+            )?
+        };
+
+        if filtered_diags.is_empty() {
+            if args.is_format_normal() {
+                writeln!(cli, "No diagnostics reported")?;
+            }
+        } else {
             if args.skip_stream_print() {
-                initial_diags.sort_by(|(a, _, _), (b, _, _)| a.cmp(b));
+                filtered_diags.sort_by(|(a, _, _), (b, _, _)| a.cmp(b));
                 let module_count: &mut i32 = &mut 0;
                 let has_diagnostics: &mut bool = &mut false;
                 if args.is_format_json() {
@@ -428,7 +452,7 @@ pub fn do_codemod(
                         &mut err_in_diag,
                         module_count,
                         has_diagnostics,
-                        &initial_diags,
+                        &filtered_diags,
                     )?;
                 } else {
                     {
@@ -442,7 +466,7 @@ pub fn do_codemod(
                             &mut err_in_diag,
                             module_count,
                             has_diagnostics,
-                            &initial_diags,
+                            &filtered_diags,
                         )?;
                         // Analysis is dropped here
                     }
@@ -456,7 +480,7 @@ pub fn do_codemod(
                 &mut loaded.vfs,
                 args,
                 &mut changed_files,
-                initial_diags,
+                filtered_diags,
             );
             // We handle the fix application result here, so
             // the overall status of whether error-severity
@@ -468,8 +492,19 @@ pub fn do_codemod(
                     writeln!(cli, "Apply fix failed: {err:#}").ok();
                 }
             };
+
+            if err_in_diag {
+                bail!("Errors found")
+            }
         }
-        if err_in_diag {
+    } else {
+        // Non-apply-fix case: rely on any_diagnostics_printed which is set
+        // correctly based on filtered diagnostics during streaming/batch printing
+        if !any_diagnostics_printed {
+            if args.is_format_normal() {
+                writeln!(cli, "No diagnostics reported")?;
+            }
+        } else if err_in_diag {
             bail!("Errors found")
         }
     }
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 38ef3c3880..7a649f0c4a 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -1591,6 +1591,18 @@ mod tests {
         );
     }
 
+    #[test_case(false ; "rebar")]
+    #[test_case(true  ; "buck")]
+    fn lint_no_stream_produces_output(buck: bool) {
+        simple_snapshot_expect_error(
+            args_vec!["lint", "--no-stream"],
+            "diagnostics",
+            expect_file!("../resources/test/diagnostics/lint_no_stream.stdout"),
+            buck,
+            None,
+        );
+    }
+
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
     fn lint_no_diagnostics_filter_all_enabled_json(buck: bool) {
diff --git a/crates/elp/src/resources/test/diagnostics/lint_no_stream.stdout b/crates/elp/src/resources/test/diagnostics/lint_no_stream.stdout
new file mode 100644
index 0000000000..b1c2f07150
--- /dev/null
+++ b/crates/elp/src/resources/test/diagnostics/lint_no_stream.stdout
@@ -0,0 +1,135 @@
+Reporting all diagnostics codes
+Diagnostics reported:
+app_a/src/app_a.erl:52:3-52:23::[Warning] [W0006] this statement has no effect
+app_a/src/app_a.erl:3:10-3:21::[WeakWarning] [W0037] Unspecific include.
+app_a/src/app_a.erl:27:3-27:9::[Warning] [W0017] Function 'foo:ok/0' is undefined.
+app_a/src/app_a.erl:28:4-28:11::[Warning] [W0017] Function 'mod:foo/0' is undefined.
+app_a/src/app_a.erl:72:4-72:11::[Warning] [W0017] Function 'foo:bar/2' is undefined.
+app_a/src/app_a.erl:37:11-37:28::[Warning] [W0017] Function 'mod_name:fun_name/2' is undefined.
+app_a/src/app_a.erl:58:11-58:24::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
+app_a/src/app_a.erl:4:1-4:41::[Warning] [W0020] Unused file: inets/include/httpd.hrl
+app_a/src/app_a.erl:39:7-39:28::[Error] [L1267] variable 'A' shadowed in 'named fun'
+app_a/src/app_a.erl:55:32-55:35::[Error] [L1295] type uri/0 undefined
+app_a/src/app_a.erl:56:20-56:26::[Error] [L1295] type binary/1 undefined
+app_a/src/app_a.erl:72:3-72:34::[Error] [L1252] record record undefined
+app_a/src/app_a.erl:75:5-75:16::[Error] [L1252] record record undefined
+app_a/src/app_a.erl:35:1-35:2::[Warning] [L1230] function g/1 is unused
+app_a/src/app_a.erl:35:3-35:4::[Warning] [L1268] variable 'A' is unused
+app_a/src/app_a.erl:36:3-36:4::[Warning] [L1268] variable 'F' is unused
+app_a/src/app_a.erl:37:3-37:4::[Warning] [L1268] variable 'G' is unused
+app_a/src/app_a.erl:38:3-38:4::[Warning] [L1268] variable 'H' is unused
+app_a/src/app_a.erl:39:3-39:4::[Warning] [L1268] variable 'I' is unused
+app_a/src/app_a.erl:39:7-39:28::[Warning] [L1268] variable 'A' is unused
+app_a/src/app_a.erl:41:1-41:2::[Warning] [L1230] function h/0 is unused
+app_a/src/app_a.erl:45:1-45:2::[Warning] [L1230] function i/0 is unused
+app_a/src/app_a.erl:50:1-50:2::[Warning] [L1230] function j/2 is unused
+app_a/src/app_a.erl:50:15-50:16::[Warning] [L1268] variable 'A' is unused
+app_a/src/app_a.erl:50:23-50:24::[Warning] [L1268] variable 'B' is unused
+app_a/src/app_a.erl:55:1-55:46::[Warning] [L1296] type session(_) is unused
+app_a/src/app_a.erl:55:1-55:46::[Warning] [L1313] opaque type session(_) is not exported
+app_a/src/app_a.erl:56:7-56:13::[Warning] [L1296] type source(_) is unused
+app_a/src/app_a.erl:58:1-58:4::[Warning] [L1230] function map/2 is unused
+app_a/src/app_a.erl:60:1-60:9::[Warning] [L1230] function with_dot/0 is unused
+app_a/src/app_a.erl:62:1-62:9::[Warning] [L1230] function lang_dir/1 is unused
+app_a/src/app_a.erl:66:1-66:7::[Warning] [L1230] function escape/1 is unused
+app_a/src/app_a.erl:66:13-66:17::[Warning] [L1268] variable 'T' is unused
+app_a/src/app_a.erl:67:9-67:25::[Warning] [L1260] record all_configs_file is unused
+app_a/src/app_a.erl:71:1-71:2::[Warning] [L1230] function k/0 is unused
+app_a/src/app_a.erl:74:1-74:2::[Warning] [L1230] function l/1 is unused
+app_a/src/app_a.erl:77:1-77:2::[Warning] [L1230] function m/0 is unused
+app_a/src/broken_parse_trans.erl:10:21-10:22::[Error] [L1256] field b undefined in record a
+app_a/src/broken_parse_trans.erl:10:32-10:33::[Error] [L1262] variable 'B' is unbound
+app_a/src/cascading.erl:9:5-9:6::[Error] [W0004] Missing ')'
+        3:10-3:15: function foo/0 undefined
+        6:10-6:15: function foo/0 undefined
+        8:7-8:10: spec for undefined function foo/0
+app_a/src/diagnostics.erl:3:10-3:27::[WeakWarning] [W0037] Unspecific include.
+app_a/src/diagnostics.erl:4:10-4:34::[WeakWarning] [W0037] Unspecific include.
+app_a/src/diagnostics.erl:4:1-4:36::[Error] [L0000] Issue in included file
+        [app_a/include/broken_diagnostics.hrl] 1:8-1:15: P1702: bad attribute
+        [app_a/include/broken_diagnostics.hrl] 3:6-3:15: P1702: bad attribute
+app_a/src/diagnostics.erl:6:31-6:45::[Error] [L1295] type undefined_type/0 undefined
+app_a/src/diagnostics.erl:7:1-7:5::[Warning] [L1230] function main/1 is unused
+app_a/src/diagnostics.erl:10:1-10:4::[Warning] [L1230] function foo/0 is unused
+app_a/src/lint_recursive.erl:23:5-23:14::[Warning] [W0006] this statement has no effect
+app_a/src/lint_recursive.erl:6:5-6:7::[Warning] [W0006] this statement has no effect
+app_a/src/lint_recursive.erl:14:5-14:12::[Warning] [L1268] variable 'Config1' is unused
+app_a/src/lint_recursive.erl:19:5-19:12::[Warning] [L1268] variable 'Config1' is unused
+app_a/src/lints.erl:5:1-5:14::[Error] [P1700] head mismatch 'head_mismatcX' vs 'head_mismatch'
+        4:1-4:14: Mismatched clause name
+app_a/src/lints.erl:4:22-4:23::[Warning] [W0018] Unexpected ';'
+app_a/src/lints.erl:2:10-2:25::[Error] [L1227] function head_mismatch/1 undefined
+app_a/src/otp27_docstrings.erl:34:9-34:24::[Warning] [W0002] Unused macro (THIS_IS_THE_END)
+app_a/src/otp27_sigils.erl:11:6-11:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:12:5-12:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:13:5-13:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:14:5-14:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:15:5-15:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:17:6-17:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:18:5-18:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:19:5-19:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:20:5-20:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:21:5-21:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:23:6-23:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:24:5-24:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:25:5-25:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:26:5-26:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:27:5-27:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:29:6-29:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:30:5-30:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:31:5-31:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:32:5-32:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:33:5-33:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:35:6-35:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:36:5-36:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:37:5-37:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:38:5-38:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:39:5-39:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:41:6-41:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:42:5-42:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:43:5-43:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:44:5-44:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:45:5-45:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:47:6-47:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:48:5-48:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:49:5-49:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:50:5-50:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:51:5-51:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:53:6-53:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:53:6-53:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:54:5-54:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:54:5-54:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:55:5-55:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:55:5-55:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:56:5-56:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:57:5-57:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:59:6-59:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:60:5-60:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:61:5-61:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:62:5-62:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:63:5-63:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:65:6-65:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:66:5-66:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:67:5-67:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:68:5-68:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:69:5-69:24::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:76:5-79:8::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:76:5-79:8::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:80:5-84:9::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:80:5-84:9::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:85:5-89:10::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:85:5-89:10::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:90:5-94:11::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:95:5-99:12::[Warning] [W0006] this statement has no effect
+app_a/src/otp27_sigils.erl:102:5-102:24::[WeakWarning] [W0051] Binary string can be written using sigil syntax.
+app_a/src/otp27_sigils.erl:128:9-128:24::[Warning] [W0002] Unused macro (THIS_IS_THE_END)
+app_a/src/otp27_sigils.erl:112:4-112:5::[Error] [P1711] syntax error before: X
+        4:15-4:18: function g/0 undefined
+        74:7-74:8: spec for undefined function g/0
+app_a/src/otp27_sigils.erl:71:5-71:6::[Warning] [L1268] variable 'X' is unused
+app_a/src/otp_7655.erl:5:1-5:28::[Error] [L1201] no module definition
+app_a/src/parse_error_a_cascade.erl:10:20-11:1::[Error] [W0004] Missing 'atom'
+        6:6-6:11: function bar/0 undefined
+app_a/src/suppressed.erl:8:5-8:9::[Warning] [L1268] variable 'Life' is unused
+app_a/src/syntax.erl:5:46-5:47::[Error] [P1711] syntax error before: ')'
+app_a/src/syntax.erl:11:9-11:10::[Error] [W0004] Missing ')'
diff --git a/crates/elp/src/resources/test/linter/parse_elp_lint_ignore_apps_b.stdout b/crates/elp/src/resources/test/linter/parse_elp_lint_ignore_apps_b.stdout
index 3d59c453e3..5a42009118 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_lint_ignore_apps_b.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_lint_ignore_apps_b.stdout
@@ -1,3 +1,3 @@
 Diagnostics reported:
-app_a/src/app_a_unused_param.erl:5:5-5:6::[Warning] [W0010] this variable is unused
 app_a/src/app_a.erl:9:6-9:7::[Warning] [W0010] this variable is unused
+app_a/src/app_a_unused_param.erl:5:5-5:6::[Warning] [W0010] this variable is unused

From 79c33480c54371f105433f0b5374cb9f6f6e143c Mon Sep 17 00:00:00 2001
From: Victor Lanvin <vlanvin@meta.com>
Date: Wed, 17 Dec 2025 08:54:32 -0800
Subject: [PATCH 378/394] Support for OTP version specific tests

Summary:
Remove the tag `OTPVersionDependent` which created one expected result per OTP version per snapshot.

Instead, use `OTPXXOnly` (where `XX` is a version number), that skips checks for OTP versions that are not `XX`.

In practice, it's used as `OTP27Only` for now.

Reviewed By: michalmuskala, TD5

Differential Revision: D89378687

fbshipit-source-id: 0421622d825ac4e8f393d32529c01eb17577b5e5
---
 crates/elp/src/bin/main.rs                    |   47 +-
 .../check/callbacks3_neg-OTP-27.pretty        |   27 -
 .../check/callbacks3_neg-OTP-28.pretty        |   26 -
 ...eg-OTP-26.pretty => callbacks3_neg.pretty} |    0
 .../check/custom-OTP-27.pretty                | 2540 -----------------
 .../check/custom-OTP-28.pretty                | 2540 -----------------
 .../{custom-OTP-26.pretty => custom.pretty}   |    0
 .../check/src/callbacks3_neg.erl              |    2 +-
 .../eqwalizer_tests/check/src/custom.erl      |    2 +-
 9 files changed, 26 insertions(+), 5158 deletions(-)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{callbacks3_neg-OTP-26.pretty => callbacks3_neg.pretty} (100%)
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty
 delete mode 100644 crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-28.pretty
 rename crates/elp/src/resources/test/eqwalizer_tests/check/{custom-OTP-26.pretty => custom.pretty} (100%)

diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 7a649f0c4a..e7ed9051a9 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -443,33 +443,34 @@ mod tests {
                             })
                             .unwrap();
 
+                        let exp_path = expect_file!(format!(
+                            "../resources/test/{}/{}/{}.pretty",
+                            project,
+                            app,
+                            module.as_str(),
+                        ));
+                        let (stdout, _) = cli.to_strings();
+
                         let otp_version = OTP_VERSION.as_ref().expect("MISSING OTP VERSION");
                         let otp_version_regex =
-                            regex::bytes::Regex::new(&format!("{}OTPVersionDependent", "@"))
-                                .unwrap();
+                            regex::bytes::Regex::new(&format!("{}OTP([0-9]+)Only", "@")).unwrap();
                         let contents = analysis.file_text(file_id).unwrap();
-                        let otp_version_dependent = otp_version_regex
-                            .is_match(&contents.as_bytes()[0..(2001.min(contents.len()))]);
-                        let exp_path = {
-                            if otp_version_dependent {
-                                expect_file!(format!(
-                                    "../resources/test/{}/{}/{}-OTP-{}.pretty",
-                                    project,
-                                    app,
-                                    module.as_str(),
-                                    otp_version,
-                                ))
-                            } else {
-                                expect_file!(format!(
-                                    "../resources/test/{}/{}/{}.pretty",
-                                    project,
-                                    app,
-                                    module.as_str(),
-                                ))
+                        let otp_version_capture = otp_version_regex
+                            .captures(&contents.as_bytes()[0..(2001.min(contents.len()))]);
+                        if let Some((_, [otp_version_only])) =
+                            otp_version_capture.map(|cap| cap.extract())
+                        {
+                            if otp_version_only == otp_version.as_bytes() {
+                                assert_normalised_file(
+                                    exp_path,
+                                    &stdout,
+                                    project_path.into(),
+                                    false,
+                                );
                             }
-                        };
-                        let (stdout, _) = cli.to_strings();
-                        assert_normalised_file(exp_path, &stdout, project_path.into(), false);
+                        } else {
+                            assert_normalised_file(exp_path, &stdout, project_path.into(), false);
+                        }
                     }
                 }
                 EqwalizerDiagnostics::NoAst { module } => {
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-27.pretty
deleted file mode 100644
index 6cb2012096..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-27.pretty
+++ /dev/null
@@ -1,27 +0,0 @@
-error: incorrect_return_type_in_cb_implementation (See https://fb.me/eqwalizer_errors#incorrect_return_type_in_cb_implementation)
-   ┌─ check/src/callbacks3_neg.erl:13:1
-   │
-13 │ -behavior(gen_server).
-   │ ^^^^^^^^^^^^^^^^^^^^^ Incorrect return type for implementation of gen_server:handle_cast/2.
-Expected: {'noreply', term()} | {'noreply', term(), timeout() | 'hibernate' | {'continue', term()}} | {'stop', term(), term()}
-Got:      'wrong_ret'
-
-error: incorrect_return_type_in_cb_implementation (See https://fb.me/eqwalizer_errors#incorrect_return_type_in_cb_implementation)
-   ┌─ check/src/callbacks3_neg.erl:13:1
-   │
-13 │ -behavior(gen_server).
-   │ ^^^^^^^^^^^^^^^^^^^^^
-   │ │
-   │ Incorrect return type for implementation of gen_server:handle_info/2.
-Expected: {'noreply', term()} | {'noreply', term(), timeout() | 'hibernate' | {'continue', term()}} | {'stop', term(), term()}
-Got:      {'noreply', 'ok', 'wrong_atom'}
-   │ 
-
-Because in the expression's type:
-  { 'noreply', 'ok', 
-    Here the type is:     'wrong_atom'
-    Context expects type: 'infinity' | number() | 'hibernate' | {'continue', term()}
-    No candidate matches in the expected union.
-  }
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-28.pretty
deleted file mode 100644
index 849039f298..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-28.pretty
+++ /dev/null
@@ -1,26 +0,0 @@
-error: incorrect_return_type_in_cb_implementation (See https://fb.me/eqwalizer_errors#incorrect_return_type_in_cb_implementation)
-   ┌─ check/src/callbacks3_neg.erl:13:1
-   │
-13 │ -behavior(gen_server).
-   │ ^^^^^^^^^^^^^^^^^^^^^ Incorrect return type for implementation of gen_server:handle_cast/2.
-Expected: {'noreply', term()} | {'noreply', term(), gen_server:action()} | {'stop', term(), term()}
-Got:      'wrong_ret'
-
-error: incorrect_return_type_in_cb_implementation (See https://fb.me/eqwalizer_errors#incorrect_return_type_in_cb_implementation)
-   ┌─ check/src/callbacks3_neg.erl:13:1
-   │
-13 │ -behavior(gen_server).
-   │ ^^^^^^^^^^^^^^^^^^^^^
-   │ │
-   │ Incorrect return type for implementation of gen_server:handle_info/2.
-Expected: {'noreply', term()} | {'noreply', term(), gen_server:action()} | {'stop', term(), term()}
-Got:      {'noreply', 'ok', 'wrong_atom'}
-   │ 
-
-Because in the expression's type:
-  { 'noreply', 'ok', 
-    Here the type is:     'wrong_atom'
-    Context expects type: gen_server:action()
-  }
-
-2 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/callbacks3_neg.pretty
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty
deleted file mode 100644
index efc8c47aa0..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-27.pretty
+++ /dev/null
@@ -1,2540 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/custom.erl:26:5
-   │
-26 │     element(4, Tup).
-   │     ^^^^^^^^^^^^^^^ erlang:element(4, Tup).
-Expression has type:   #{dynamic() => dynamic()}
-Context expected type: atom()
-
-error: index_out_of_bounds (See https://fb.me/eqwalizer_errors#index_out_of_bounds)
-   ┌─ check/src/custom.erl:30:5
-   │
-30 │     element(42, Tup).
-   │     ^^^^^^^^^^^^^^^^ 42.
-Tried to access element 42 of a tuple with 3 elements
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/custom.erl:40:5
-   │
-40 │     element(2, Tup).
-   │     ^^^^^^^^^^^^^^^ erlang:element(2, Tup).
-Expression has type:   number() | string() | atom()
-Context expected type: #{dynamic() => dynamic()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/custom.erl:44:16
-   │
-44 │     element(2, Tup).
-   │                ^^^
-   │                │
-   │                Tup.
-Expression has type:   {atom(), string()} | [dynamic()]
-Context expected type: tuple()
-   │                
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: {atom(), string()}
-  However the following candidate: [dynamic()]
-  Differs from the expected type:  tuple()
-
-error: index_out_of_bounds (See https://fb.me/eqwalizer_errors#index_out_of_bounds)
-   ┌─ check/src/custom.erl:48:5
-   │
-48 │     element(42, Tup).
-   │     ^^^^^^^^^^^^^^^^ 42.
-Tried to access element 42 of a tuple with 2 elements
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/custom.erl:54:5
-   │
-54 │     element(N, Tup).
-   │     ^^^^^^^^^^^^^^^ erlang:element(N, Tup).
-Expression has type:   atom() | number() | string()
-Context expected type: #{dynamic() => dynamic()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/custom.erl:58:5
-   │
-58 │     element(N, Tup).
-   │     ^^^^^^^^^^^^^^^
-   │     │
-   │     erlang:element(N, Tup).
-Expression has type:   atom() | number()
-Context expected type: atom()
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: number()
-  Differs from the expected type:  atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/custom.erl:68:5
-   │
-68 │     element(1, Tup).
-   │     ^^^^^^^^^^^^^^^
-   │     │
-   │     erlang:element(1, Tup).
-Expression has type:   dynamic() | number()
-Context expected type: atom()
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dynamic()
-  However the following candidate: number()
-  Differs from the expected type:  atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/custom.erl:86:5
-   │
-86 │     element(N, Rec).
-   │     ^^^^^^^^^^^^^^^
-   │     │
-   │     erlang:element(N, Rec).
-Expression has type:   'foo' | 'ok' | 'error' | number() | string()
-Context expected type: atom()
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'error' | 'foo' | 'ok'
-  However the following candidate: string()
-  Differs from the expected type:  atom()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/custom.erl:91:1
-   │  
-91 │ ╭ element_2_none_1(Tup) ->
-92 │ │     element(42, Tup).
-   │ ╰────────────────────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/custom.erl:95:1
-   │  
-95 │ ╭ element_2_none_2(N, Tup) ->
-96 │ │     element(N, Tup).
-   │ ╰───────────────────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:108:5
-    │
-108 │     maps:get(K, M).
-    │     ^^^^^^^^^^^^^^ maps:get(K, M).
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:128:5
-    │
-128 │     Res.
-    │     ^^^ Res.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:154:12
-    │
-154 │     get(a, M).
-    │            ^ M.
-Expression has type:   term()
-Context expected type: #{term() => term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:160:23
-    │
-160 │     Res = maps:get(a, M),
-    │                       ^ M.
-Expression has type:   term()
-Context expected type: #{term() => term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:167:17
-    │
-167 │     maps:get(a, M, false).
-    │                 ^ M.
-Expression has type:   term()
-Context expected type: #{term() => term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:173:23
-    │
-173 │     Res = maps:get(a, M, false),
-    │                       ^ M.
-Expression has type:   term()
-Context expected type: #{term() => term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:193:5
-    │
-193 │     maps:get(K, M, 0).
-    │     ^^^^^^^^^^^^^^^^^
-    │     │
-    │     maps:get(K, M, 0).
-Expression has type:   number() | atom()
-Context expected type: atom()
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: number()
-  Differs from the expected type:  atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:200:5
-    │
-200 │     Res.
-    │     ^^^
-    │     │
-    │     Res.
-Expression has type:   number() | atom()
-Context expected type: atom()
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: number()
-  Differs from the expected type:  atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:206:5
-    │    
-206 │ ╭ ╭     {
-207 │ │ │         maps:get(a, M, undefined),
-208 │ │ │         maps:get(n, M, undefined)
-209 │ │ │     }.
-    │ ╰─│─────^ {maps:get('a', M, 'undefined'), maps:get('n', M, 'undefined')}.
-Expression has type:   {atom(), 'undefined' | number()}
-Context expected type: {atom(), number()}
-    │   ╰─────' 
-
-Because in the expression's type:
-  { atom(), 
-    Here the type is a union type with some valid candidates: number()
-    However the following candidate: 'undefined'
-    Differs from the expected type:  number()
-  }
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:221:27
-    │
-221 │ map_get_2_17_neg(V, M) -> maps:get(V, M).
-    │                           ^^^^^^^^^^^^^^
-    │                           │
-    │                           maps:get(V, M).
-Expression has type:   'a_v' | 'c_v'
-Context expected type: 'a_v' | 'b_v'
-    │                           
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'a_v'
-  However the following candidate: 'c_v'
-  Differs from the expected type:  'a_v' | 'b_v'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:233:27
-    │
-233 │ map_get_3_19_neg(V, M) -> maps:get(V, M, undefined).
-    │                           ^^^^^^^^^^^^^^^^^^^^^^^^^
-    │                           │
-    │                           maps:get(V, M, 'undefined').
-Expression has type:   'undefined' | 'a_v' | 'c_v'
-Context expected type: 'a_v' | 'b_v' | 'undefined'
-    │                           
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'undefined' | 'a_v'
-  However the following candidate: 'c_v'
-  Differs from the expected type:  'a_v' | 'b_v' | 'undefined'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:309:5
-    │
-309 │     Res.
-    │     ^^^ Res.
-Expression has type:   {'value', #{}} | 'false'
-Context expected type: 'nok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:363:23
-    │
-363 │         fun (_, _) -> self() end,
-    │                       ^^^^^^ erlang:self().
-Expression has type:   pid()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:382:17
-    │
-382 │     maps:filter(F, M).
-    │                 ^ F.
-Expression has type:   fun(() -> pid())
-Context expected type: fun((number(), 'a' | 'b') -> boolean())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:389:17
-    │
-389 │     maps:filter(F, M).
-    │                 ^
-    │                 │
-    │                 F.
-Expression has type:   fun((fun((T) -> boolean()), [T]) -> [T]) with 1 type parameter
-Context expected type: fun((number(), 'a' | 'b') -> boolean()) with 0 type parameters
-    │                 
-
-Because in the expression's type:
-  Here the type is:     fun()/2 with 1 type parameter
-  Context expects type: fun((number(), 'a' | 'b') -> boolean()) with 0 type parameters
-  The number of type parameters doesn't match.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:413:37
-    │
-413 │     maps:filter(fun erlang:'=:='/2, X).
-    │                                     ^
-    │                                     │
-    │                                     X.
-Expression has type:   #{K => V} | 'a'
-Context expected type: #{term() => term()} | maps:iterator()
-    │                                     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #{K => V}
-  However the following candidate: 'a'
-  Differs from the expected type:  #{term() => term()} | maps:iterator()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:425:20
-    │
-425 │     maps:filter(F, non_kv),
-    │                    ^^^^^^ 'non_kv'.
-Expression has type:   'non_kv'
-Context expected type: #{term() => term()} | maps:iterator()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:454:5
-    │    
-454 │ ╭ ╭     maps:map(
-455 │ │ │         fun (_, _) -> self() end,
-456 │ │ │         M
-457 │ │ │     ).
-    │ ╰─│─────^ maps:map(fun, M).
-Expression has type:   #{number() => pid()}
-Context expected type: #{number() => boolean()}
-    │   ╰─────' 
-
-Because in the expression's type:
-  #{ number() =>
-    Here the type is:     pid()
-    Context expects type: boolean()
-  , ... }
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:474:14
-    │
-474 │     maps:map(F, M).
-    │              ^ F.
-Expression has type:   fun(() -> pid())
-Context expected type: fun((number(), 'a' | 'b') -> term())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:481:14
-    │
-481 │     maps:map(F, M).
-    │              ^
-    │              │
-    │              F.
-Expression has type:   fun((fun((A) -> B), [A]) -> [B]) with 2 type parameters
-Context expected type: fun((number(), 'a' | 'b') -> term()) with 0 type parameters
-    │              
-
-Because in the expression's type:
-  Here the type is:     fun((fun((A) -> B), [A]) -> [B]) with 2 type parameters
-  Context expects type: fun((number(), 'a' | 'b') -> term()) with 0 type parameters
-  The number of type parameters doesn't match.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:497:5
-    │
-497 │     maps:map(F, M).
-    │     ^^^^^^^^^^^^^^
-    │     │
-    │     maps:map(F, M).
-Expression has type:   #{a := boolean(), b := boolean()}
-Context expected type: #{a => 'a', b => 'b'}
-    │     
-
-Because in the expression's type:
-  #{ a =>
-    Here the type is:     boolean()
-    Context expects type: 'a'
-  , ... }
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:503:17
-    │
-503 │     maps:map(F, non_kv),
-    │                 ^^^^^^ 'non_kv'.
-Expression has type:   'non_kv'
-Context expected type: #{term() => term()} | maps:iterator()
-
-error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
-    ┌─ check/src/custom.erl:538:9
-    │
-538 │         fun (K, V) -> [K, V] end, [], M).
-    │         ^^^^^^^^^^^^^^^^^^^^^^^^ fun.
-fun with arity 2 used as fun with 3 arguments
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:544:5
-    │    
-544 │ ╭ ╭     maps:fold(
-545 │ │ │         fun (_, _, Acc) -> [Acc] end,
-546 │ │ │         [],
-547 │ │ │         M
-548 │ │ │     ).
-    │ ╰─│─────^ maps:fold(fun, [], M).
-Expression has type:   [[[]]]
-Context expected type: [number() | 'a' | 'b']
-    │   ╰─────' 
-
-Because in the expression's type:
-  [
-    Here the type is:     [[]]
-    Context expects type: number() | 'a' | 'b'
-    No candidate matches in the expected union.
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:545:28
-    │
-545 │         fun (_, _, Acc) -> [Acc] end,
-    │                            ^^^^^
-    │                            │
-    │                            [Acc].
-Expression has type:   [[[[]]]]
-Context expected type: [[[]]]
-    │                            
-
-Because in the expression's type:
-  [
-    [
-      [
-        Here the type is:     []
-        Context expects type: none()
-      ]
-    ]
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:552:5
-    │  
-552 │ ╭     maps:fold(
-553 │ │         fun (_, _, Acc) -> Acc end,
-554 │ │         [],
-555 │ │         non_kv
-556 │ │     ).
-    │ ╰─────^ maps:fold(fun, [], 'non_kv').
-Expression has type:   []
-Context expected type: 'nok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:555:9
-    │
-555 │         non_kv
-    │         ^^^^^^ 'non_kv'.
-Expression has type:   'non_kv'
-Context expected type: #{term() => term()} | maps:iterator()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/custom.erl:560:1
-    │  
-560 │ ╭ maps_fold_3_6(None) ->
-561 │ │     maps:fold(
-562 │ │         None,
-563 │ │         #{},
-564 │ │         #{1 => 1}
-565 │ │     ).
-    │ ╰─────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/custom.erl:568:1
-    │  
-568 │ ╭ maps_fold_3_7(None) ->
-569 │ │     maps:fold(
-570 │ │         None,
-571 │ │         None,
-572 │ │         None
-573 │ │     ).
-    │ ╰─────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:578:5
-    │    
-578 │ ╭ ╭     maps:fold(
-579 │ │ │         fun (_K, A, _Acc) -> A end,
-580 │ │ │         [],
-581 │ │ │         M
-582 │ │ │     ).
-    │ ╰─│─────^ maps:fold(fun, [], M).
-Expression has type:   [] | atom()
-Context expected type: atom()
-    │   ╰─────' 
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: []
-  Differs from the expected type:  atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:601:9
-    │
-601 │         fun folder_bad/3,
-    │         ^^^^^^^^^^^^^^^^
-    │         │
-    │         folder_bad/3.
-Expression has type:   fun((term(), term(), Acc) -> [Acc]) with 1 type parameter
-Context expected type: fun((number(), 'a', []) -> term()) with 0 type parameters
-    │         
-
-Because in the expression's type:
-  Here the type is:     fun((term(), term(), Acc) -> [Acc]) with 1 type parameter
-  Context expects type: fun((number(), 'a', []) -> term()) with 0 type parameters
-  The number of type parameters doesn't match.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:601:9
-    │
-601 │         fun folder_bad/3,
-    │         ^^^^^^^^^^^^^^^^
-    │         │
-    │         folder_bad/3.
-Expression has type:   fun((term(), term(), Acc) -> [Acc]) with 1 type parameter
-Context expected type: fun((number(), 'a', [] | dynamic()) -> term()) with 0 type parameters
-    │         
-
-Because in the expression's type:
-  Here the type is:     fun((term(), term(), Acc) -> [Acc]) with 1 type parameter
-  Context expects type: fun()/3 with 0 type parameters
-  The number of type parameters doesn't match.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:601:9
-    │
-601 │         fun folder_bad/3,
-    │         ^^^^^^^^^^^^^^^^
-    │         │
-    │         folder_bad/3.
-Expression has type:   fun((term(), term(), Acc) -> [Acc]) with 1 type parameter
-Context expected type: fun((number(), 'a', [] | dynamic()) -> [] | dynamic()) with 0 type parameters
-    │         
-
-Because in the expression's type:
-  Here the type is:     fun((term(), term(), Acc) -> [Acc]) with 1 type parameter
-  Context expects type: fun()/3 with 0 type parameters
-  The number of type parameters doesn't match.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:636:5
-    │    
-636 │ ╭ ╭     maps:fold(
-637 │ │ │         fun
-638 │ │ │             (_K, {i, I}, Acc) ->
-639 │ │ │                 [I | Acc];
-    · │ │
-646 │ │ │         M
-647 │ │ │     ).
-    │ ╰─│─────^ maps:fold(fun, [], M).
-Expression has type:   [number() | binary() | atom()]
-Context expected type: [binary()] | [number()] | [atom()]
-    │   ╰─────' 
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: binary()
-    However the following candidate: number()
-    Differs from the expected type:  binary()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:671:41
-    │
-671 │ maps_to_list_7_neg(Num) -> maps:to_list(Num).
-    │                                         ^^^ Num.
-Expression has type:   number()
-Context expected type: #{term() => term()} | maps:iterator()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:675:25
-    │
-675 │ maps_merge_1(M1, M2) -> maps:merge(M1, M2).
-    │                         ^^^^^^^^^^^^^^^^^^
-    │                         │
-    │                         maps:merge(M1, M2).
-Expression has type:   #{'b' | 'a' | 'c' => number() | string() | atom()}
-Context expected type: #{a => string(), b => number(), c => atom()}
-    │                         
-
-Because in the expression's type:
-  Here the type is:     #{'b' | 'a' | 'c' => number() | string() | atom()}
-  Context expects type: #{...} (no default association)
-  The expected map has no default association while the type of the expression has one.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:679:25
-    │
-679 │ maps_merge_2(M1, M2) -> maps:merge(M1, M2).
-    │                         ^^^^^^^^^^^^^^^^^^
-    │                         │
-    │                         maps:merge(M1, M2).
-Expression has type:   #{'b' | 'a' | 'c' => number() | string() | atom()}
-Context expected type: #{a => string(), b => number() | boolean(), c => atom()}
-    │                         
-
-Because in the expression's type:
-  Here the type is:     #{'b' | 'a' | 'c' => number() | string() | atom()}
-  Context expects type: #{...} (no default association)
-  The expected map has no default association while the type of the expression has one.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:683:25
-    │
-683 │ maps_merge_3(M1, M2) -> maps:merge(M1, M2).
-    │                         ^^^^^^^^^^^^^^^^^^
-    │                         │
-    │                         maps:merge(M1, M2).
-Expression has type:   #{'b' | 'a' | 'c' => number() | string() | atom()}
-Context expected type: #{a := string(), b := boolean(), c => atom()}
-    │                         
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{a := ..., b := ..., ...}
-  The type of the expression is missing the following required keys: a, b.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:697:44
-    │
-697 │ maps_merge_7_neg(M1, M2) -> maps:merge(M1, M2).
-    │                                            ^^ M2.
-Expression has type:   number()
-Context expected type: #{a => binary()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:701:25
-    │
-701 │ maps_merge_8(M1, M2) -> maps:merge(M1, M2).
-    │                         ^^^^^^^^^^^^^^^^^^
-    │                         │
-    │                         maps:merge(M1, M2).
-Expression has type:   #{'a' | 'b' => atom() | number()}
-Context expected type: #{a := atom(), b := number()} | #{a := atom()}
-    │                         
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{a := ..., b := ..., ...}
-  The type of the expression is missing the following required keys: a, b.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:721:9
-    │
-721 │         fun erlang:binary_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:binary_to_list/1.
-Expression has type:   fun((binary()) -> [number()])
-Context expected type: fun((number()) -> boolean() | {'true', term()})
-    │         
-
-Because in the expression's type:
-  fun((binary()) ->
-    Here the type is:     [number()]
-    Context expects type: 'false' | 'true' | {'true', term()}
-    No candidate matches in the expected union.
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:739:20
-    │
-739 │             (3) -> wrong_ret end,
-    │                    ^^^^^^^^^
-    │                    │
-    │                    'wrong_ret'.
-Expression has type:   'wrong_ret'
-Context expected type: boolean() | {'true', term()}
-    │                    
-
-Because in the expression's type:
-  Here the type is:     'wrong_ret'
-  Context expects type: 'false' | 'true' | {'true', term()}
-  No candidate matches in the expected union.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:749:9
-    │
-749 │         not_a_list
-    │         ^^^^^^^^^^ 'not_a_list'.
-Expression has type:   'not_a_list'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:791:17
-    │
-791 │                 Res
-    │                 ^^^
-    │                 │
-    │                 Res.
-Expression has type:   {'true', 'a'} | 'wrong_ret'
-Context expected type: boolean() | {'true', term()}
-    │                 
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: {'true', 'a'}
-  However the following candidate: 'wrong_ret'
-  Differs from the expected type:  'false' | 'true' | {'true', term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:827:9
-    │    
-827 │ ╭ ╭         fun (a) -> [a];
-828 │ │ │             (b) -> true;
-829 │ │ │             (c) -> wrong_ret end,
-    │ ╰─│────────────────────────────────^ fun.
-Expression has type:   fun(('a' | 'b') -> ['a'] | 'true' | 'wrong_ret')
-Context expected type: fun(('a' | 'b') -> boolean() | ['a' | 'b'])
-    │   ╰────────────────────────────────' 
-
-Because in the expression's type:
-  fun(('a' | 'b') ->
-    Here the type is a union type with some valid candidates: ['a'] | 'true'
-    However the following candidate: 'wrong_ret'
-    Differs from the expected type:  'false' | 'true' | ['a' | 'b']
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:829:20
-    │
-829 │             (c) -> wrong_ret end,
-    │                    ^^^^^^^^^
-    │                    │
-    │                    'wrong_ret'.
-Expression has type:   'wrong_ret'
-Context expected type: boolean() | ['a' | 'b']
-    │                    
-
-Because in the expression's type:
-  Here the type is:     'wrong_ret'
-  Context expects type: 'false' | 'true' | ['a' | 'b']
-  No candidate matches in the expected union.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:837:9
-    │    
-837 │ ╭ ╭         fun (1) -> {true, a};
-838 │ │ │             (2) -> true end,
-    │ ╰─│───────────────────────────^ fun.
-Expression has type:   fun((dynamic()) -> {'true', 'a'} | 'true')
-Context expected type: fun((Item) -> boolean() | [Item])
-    │   ╰───────────────────────────' 
-
-Because in the expression's type:
-  fun((dynamic()) ->
-    Here the type is a union type with some valid candidates: 'true'
-    However the following candidate: {'true', 'a'}
-    Differs from the expected type:  'false' | 'true' | [Item]
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:837:20
-    │
-837 │         fun (1) -> {true, a};
-    │                    ^^^^^^^^^
-    │                    │
-    │                    {'true', 'a'}.
-Expression has type:   {'true', 'a'}
-Context expected type: boolean() | [dynamic()]
-    │                    
-
-Because in the expression's type:
-  Here the type is:     {'true', 'a'}
-  Context expects type: 'false' | 'true' | [dynamic()]
-  No candidate matches in the expected union.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:839:9
-    │
-839 │         not_a_queue
-    │         ^^^^^^^^^^^
-    │         │
-    │         'not_a_queue'.
-Expression has type:   'not_a_queue'
-Context expected type: queue:queue(Item)
-    │         
-
-Because in the expression's type:
-  Here the type is:     'not_a_queue'
-  Context expects type: {[Item], [Item]}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:839:9
-    │
-839 │         not_a_queue
-    │         ^^^^^^^^^^^
-    │         │
-    │         'not_a_queue'.
-Expression has type:   'not_a_queue'
-Context expected type: queue:queue(dynamic())
-    │         
-
-Because in the expression's type:
-  Here the type is:     'not_a_queue'
-  Context expects type: {[dynamic()], [dynamic()]}
-
-error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
-    ┌─ check/src/custom.erl:846:9
-    │  
-846 │ ╭         fun (wrong, arity) ->
-847 │ │             [a]
-848 │ │         end,
-    │ ╰───────────^ fun.
-fun with arity 2 used as fun with 1 arguments
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:857:9
-    │    
-857 │ ╭ ╭         fun (1) -> {true, a};
-858 │ │ │             (X) -> case X of
-859 │ │ │                        true ->
-860 │ │ │                            [a];
-    · │ │
-863 │ │ │                    end
-864 │ │ │         end,
-    │ ╰─│───────────^ fun.
-Expression has type:   fun(('a' | 'b') -> ['a'] | 'false' | {'true', 'a'})
-Context expected type: fun(('a' | 'b') -> boolean() | ['a' | 'b'])
-    │   ╰───────────' 
-
-Because in the expression's type:
-  fun(('a' | 'b') ->
-    Here the type is a union type with some valid candidates: ['a'] | 'false'
-    However the following candidate: {'true', 'a'}
-    Differs from the expected type:  'false' | 'true' | ['a' | 'b']
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:857:20
-    │
-857 │         fun (1) -> {true, a};
-    │                    ^^^^^^^^^
-    │                    │
-    │                    {'true', 'a'}.
-Expression has type:   {'true', 'a'}
-Context expected type: boolean() | ['a' | 'b']
-    │                    
-
-Because in the expression's type:
-  Here the type is:     {'true', 'a'}
-  Context expects type: 'false' | 'true' | ['a' | 'b']
-  No candidate matches in the expected union.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:873:9
-    │    
-873 │ ╭ ╭         fun (a) -> [a];
-874 │ │ │             (X) ->
-875 │ │ │                 Res = case X of
-876 │ │ │                           true ->
-    · │ │
-881 │ │ │                 Res
-882 │ │ │         end,
-    │ ╰─│───────────^ fun.
-Expression has type:   fun(('a' | 'b') -> ['a'] | 'wrong_ret')
-Context expected type: fun(('a' | 'b') -> boolean() | ['a' | 'b'])
-    │   ╰───────────' 
-
-Because in the expression's type:
-  fun(('a' | 'b') ->
-    Here the type is a union type with some valid candidates: ['a']
-    However the following candidate: 'wrong_ret'
-    Differs from the expected type:  'false' | 'true' | ['a' | 'b']
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:881:17
-    │
-881 │                 Res
-    │                 ^^^
-    │                 │
-    │                 Res.
-Expression has type:   ['a'] | 'wrong_ret'
-Context expected type: boolean() | ['a' | 'b']
-    │                 
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: ['a']
-  However the following candidate: 'wrong_ret'
-  Differs from the expected type:  'false' | 'true' | ['a' | 'b']
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:891:9
-    │
-891 │         fun list_to_atom/1,
-    │         ^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:list_to_atom/1.
-Expression has type:   fun((string()) -> atom())
-Context expected type: fun((dynamic()) -> boolean() | [dynamic()])
-    │         
-
-Because in the expression's type:
-  fun((string()) ->
-    Here the type is:     atom()
-    Context expects type: 'false' | 'true' | [dynamic()]
-    No candidate matches in the expected union.
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:891:9
-    │
-891 │         fun list_to_atom/1,
-    │         ^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:list_to_atom/1.
-Expression has type:   fun((string()) -> atom())
-Context expected type: fun(('a' | 'b') -> boolean() | ['a' | 'b'])
-    │         
-
-Because in the expression's type:
-  fun((string()) ->
-    Here the type is:     atom()
-    Context expects type: 'false' | 'true' | ['a' | 'b']
-    No candidate matches in the expected union.
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:900:9
-    │
-900 │         fun atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((atom()) -> boolean() | [atom()])
-    │         
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     string()
-    Context expects type: boolean() | [atom()]
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:900:9
-    │
-900 │         fun atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((dynamic(atom())) -> boolean() | [dynamic(atom())])
-    │         
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     string()
-    Context expects type: boolean() | [dynamic(atom())]
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:909:9
-    │
-909 │         fun atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((atom()) -> boolean() | [atom()])
-    │         
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     string()
-    Context expects type: boolean() | [atom()]
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:909:9
-    │
-909 │         fun atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((dynamic(atom())) -> boolean() | [dynamic(atom())])
-    │         
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     string()
-    Context expects type: boolean() | [dynamic(atom())]
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:919:9
-    │
-919 │         fun atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((atom()) -> boolean() | [atom()])
-    │         
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     string()
-    Context expects type: boolean() | [atom()]
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:919:9
-    │
-919 │         fun atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((dynamic(atom())) -> boolean() | [dynamic(atom())])
-    │         
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     string()
-    Context expects type: boolean() | [dynamic(atom())]
-  )
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/custom.erl:925:1
-    │  
-925 │ ╭ queue_filter_13_neg(Q) ->
-926 │ │     queue:filter(
-927 │ │         fun atom_to_list/1,
-928 │ │         Q
-929 │ │     ),
-930 │ │     ok.
-    │ ╰──────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:927:9
-    │
-927 │         fun atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((atom()) -> boolean() | [atom()])
-    │         
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     string()
-    Context expects type: boolean() | [atom()]
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:927:9
-    │
-927 │         fun atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((dynamic(atom())) -> boolean() | [dynamic(atom())])
-    │         
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     string()
-    Context expects type: boolean() | [dynamic(atom())]
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:955:5
-    │  
-955 │ ╭     lists:keystore(
-956 │ │         a, 1,
-957 │ │         [{foo, b}, {c, d}],
-958 │ │         non_tuple
-959 │ │     ).
-    │ ╰─────^ lists:keystore('a', 1, [{'foo', 'b'}, {'c', 'd'}], 'non_tuple').
-Expression has type:   [{'foo', 'b'} | {'c', 'd'} | dynamic()]
-Context expected type: 'nok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:958:9
-    │
-958 │         non_tuple
-    │         ^^^^^^^^^ 'non_tuple'.
-Expression has type:   'non_tuple'
-Context expected type: tuple()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:966:5
-    │  
-966 │ ╭     lists:keystore(
-967 │ │         a, 1,
-968 │ │         [non_tuple],
-969 │ │         {replacement}
-970 │ │     ).
-    │ ╰─────^ lists:keystore('a', 1, ['non_tuple'], {'replacement'}).
-Expression has type:   [dynamic() | {'replacement'}]
-Context expected type: 'nok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:968:9
-    │
-968 │         [non_tuple],
-    │         ^^^^^^^^^^^
-    │         │
-    │         ['non_tuple'].
-Expression has type:   ['non_tuple']
-Context expected type: [tuple()]
-    │         
-
-Because in the expression's type:
-  [
-    Here the type is:     'non_tuple'
-    Context expects type: tuple()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:975:5
-    │  
-975 │ ╭     lists:keystore(
-976 │ │         a, 1,
-977 │ │         non_list,
-978 │ │         {replacement}
-979 │ │     ).
-    │ ╰─────^ lists:keystore('a', 1, 'non_list', {'replacement'}).
-Expression has type:   [dynamic() | {'replacement'}]
-Context expected type: 'nok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:977:9
-    │
-977 │         non_list,
-    │         ^^^^^^^^ 'non_list'.
-Expression has type:   'non_list'
-Context expected type: [tuple()]
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/custom.erl:983:1
-    │  
-983 │ ╭ keystore_7(None) ->
-984 │ │     lists:keystore(
-985 │ │         a, 1,
-986 │ │         None,
-987 │ │         {replacement}
-988 │ │     ).
-    │ ╰─────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/custom.erl:991:1
-    │  
-991 │ ╭ keystore_8(None) ->
-992 │ │     lists:keystore(
-993 │ │         a, 1,
-994 │ │         None,
-995 │ │         None
-996 │ │     ).
-    │ ╰─────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1011:25
-     │
-1011 │     lists:keytake(a, 1, non_tup),
-     │                         ^^^^^^^ 'non_tup'.
-Expression has type:   'non_tup'
-Context expected type: [Tuple]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1011:25
-     │
-1011 │     lists:keytake(a, 1, non_tup),
-     │                         ^^^^^^^ 'non_tup'.
-Expression has type:   'non_tup'
-Context expected type: [dynamic()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1016:25
-     │
-1016 │     lists:keytake(a, 1, non_list),
-     │                         ^^^^^^^^ 'non_list'.
-Expression has type:   'non_list'
-Context expected type: [Tuple]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1016:25
-     │
-1016 │     lists:keytake(a, 1, non_list),
-     │                         ^^^^^^^^ 'non_list'.
-Expression has type:   'non_list'
-Context expected type: [dynamic()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1021:22
-     │
-1021 │     lists:keytake(a, non_num, []),
-     │                      ^^^^^^^ 'non_num'.
-Expression has type:   'non_num'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1038:15
-     │
-1038 │     lists:sum([a, 1]).
-     │               ^^^^^^
-     │               │
-     │               ['a', 1].
-Expression has type:   ['a' | number()]
-Context expected type: [number()]
-     │               
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: number()
-    However the following candidate: 'a'
-    Differs from the expected type:  number()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1042:15
-     │
-1042 │     lists:sum(not_a_list).
-     │               ^^^^^^^^^^ 'not_a_list'.
-Expression has type:   'not_a_list'
-Context expected type: [number()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1062:15
-     │
-1062 │     lists:max(not_a_list).
-     │               ^^^^^^^^^^ 'not_a_list'.
-Expression has type:   'not_a_list'
-Context expected type: [T]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1062:15
-     │
-1062 │     lists:max(not_a_list).
-     │               ^^^^^^^^^^ 'not_a_list'.
-Expression has type:   'not_a_list'
-Context expected type: [dynamic()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1082:15
-     │
-1082 │     lists:min(not_a_list).
-     │               ^^^^^^^^^^ 'not_a_list'.
-Expression has type:   'not_a_list'
-Context expected type: [T]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1082:15
-     │
-1082 │     lists:min(not_a_list).
-     │               ^^^^^^^^^^ 'not_a_list'.
-Expression has type:   'not_a_list'
-Context expected type: [dynamic()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1100:5
-     │
-1100 │     proplists:get_value(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L).
-Expression has type:   term()
-Context expected type: pid() | 'undefined'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1106:5
-     │
-1106 │     proplists:get_value(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L).
-Expression has type:   term()
-Context expected type: pid() | 'undefined' | 'v'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1111:5
-     │
-1111 │     proplists:get_value(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L).
-Expression has type:   term()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1117:5
-     │
-1117 │     proplists:get_value(k, L, 3).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L, 3).
-Expression has type:   term()
-Context expected type: pid() | number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1123:5
-     │
-1123 │     proplists:get_value(k, L, my_default).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L, 'my_default').
-Expression has type:   term()
-Context expected type: 'v1' | 'v2' | 'my_default'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1129:5
-     │
-1129 │     proplists:get_value(k, L, my_default).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L, 'my_default').
-Expression has type:   term()
-Context expected type: 'v'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1134:28
-     │
-1134 │     proplists:get_value(k, b).
-     │                            ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1139:5
-     │
-1139 │     proplists:get_value(k, []).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', []).
-Expression has type:   term()
-Context expected type: 'default'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1144:1
-     │
-1144 │ proplists:get_value(k, [], my_default).
-     │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', [], 'my_default').
-Expression has type:   term()
-Context expected type: 'my_default'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1149:28
-     │
-1149 │     proplists:get_value(k, b, my_default).
-     │                            ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1154:5
-     │
-1154 │     proplists:get_bool(b, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_bool('b', L).
-Expression has type:   boolean()
-Context expected type: 'true'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1160:5
-     │
-1160 │     proplists:get_all_values(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_all_values('k', L).
-Expression has type:   [term()]
-Context expected type: [pid() | 'default']
-     │     
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: pid() | 'default'
-    No candidate matches in the expected union.
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1166:5
-     │
-1166 │     proplists:get_all_values(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_all_values('k', L).
-Expression has type:   [term()]
-Context expected type: [pid() | 'default' | 'v']
-     │     
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: pid() | 'default' | 'v'
-    No candidate matches in the expected union.
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1171:5
-     │
-1171 │     proplists:get_all_values(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_all_values('k', L).
-Expression has type:   [term()]
-Context expected type: [pid()]
-     │     
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: pid()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1176:5
-     │
-1176 │     proplists:get_all_values(k, []).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_all_values('k', []).
-Expression has type:   [term()]
-Context expected type: []
-     │     
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: none()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1181:5
-     │
-1181 │     proplists:get_all_values(k, b).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_all_values('k', 'b').
-Expression has type:   [term()]
-Context expected type: []
-     │     
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: none()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1181:33
-     │
-1181 │     proplists:get_all_values(k, b).
-     │                                 ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1186:27
-     │
-1186 │     proplists:get_bool(b, b).
-     │                           ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1191:5
-     │
-1191 │     proplists:get_keys(L).
-     │     ^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_keys(L).
-Expression has type:   [term()]
-Context expected type: ['c']
-     │     
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: 'c'
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1197:5
-     │
-1197 │     proplists:get_keys(L).
-     │     ^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_keys(L).
-Expression has type:   [term()]
-Context expected type: ['a' | 'b' | 'c']
-     │     
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: 'a' | 'b' | 'c'
-    No candidate matches in the expected union.
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1202:24
-     │
-1202 │     proplists:get_keys(a).
-     │                        ^ 'a'.
-Expression has type:   'a'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1207:5
-     │    
-1207 │ ╭ ╭     proplists:get_keys(
-1208 │ │ │         [{a, b, c}]
-1209 │ │ │     ).
-     │ ╰─│─────^ proplists:get_keys([{'a', 'b', 'c'}]).
-Expression has type:   [term()]
-Context expected type: ['a']
-     │   ╰─────' 
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: 'a'
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1215:5
-     │
-1215 │     proplists:get_value(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L).
-Expression has type:   term()
-Context expected type: 'a' | pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1220:5
-     │
-1220 │     proplists:get_value(k, b).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', 'b').
-Expression has type:   term()
-Context expected type: 'a' | pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1220:28
-     │
-1220 │     proplists:get_value(k, b).
-     │                            ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1225:1
-     │
-1225 │ proplists:lookup(self(), [a, {b, true}]).
-     │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │ │
-     │ proplists:lookup(erlang:self(), ['a', {'b', 'true'}]).
-Expression has type:   'none' | tuple()
-Context expected type: {'b', 'true'}
-     │ 
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: tuple()
-  However the following candidate: 'none'
-  Differs from the expected type:  {'b', 'true'}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1229:25
-     │
-1229 │     proplists:lookup(a, b).
-     │                         ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1239:5
-     │
-1239 │     proplists:lookup(k, []).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:lookup('k', []).
-Expression has type:   'none' | tuple()
-Context expected type: 'none'
-     │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'none'
-  However the following candidate: tuple()
-  Differs from the expected type:  'none'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1252:29
-     │
-1252 │     proplists:lookup_all(a, b).
-     │                             ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1265:5
-     │    
-1265 │ ╭ ╭     proplists:lookup_all(
-1266 │ │ │         self(),
-1267 │ │ │         []
-1268 │ │ │     ).
-     │ ╰─│─────^ proplists:lookup_all(erlang:self(), []).
-Expression has type:   [tuple()]
-Context expected type: []
-     │   ╰─────' 
-
-Because in the expression's type:
-  [
-    Here the type is:     tuple()
-    Context expects type: none()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1291:34
-     │
-1291 │     proplists:is_defined(self(), b).
-     │                                  ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1295:25
-     │
-1295 │     proplists:delete(k, b).
-     │                         ^ 'b'.
-Expression has type:   'b'
-Context expected type: [A]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1295:25
-     │
-1295 │     proplists:delete(k, b).
-     │                         ^ 'b'.
-Expression has type:   'b'
-Context expected type: [dynamic()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1311:5
-     │
-1311 │     proplists:split(L, Ks).
-     │     ^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:split(L, Ks).
-Expression has type:   {[[term()]], [term()]}
-Context expected type: {[plist('a', 'b')], plist('a', 'b')}
-     │     
-
-Because in the expression's type:
-  { 
-    [
-      [
-        Here the type is:     term()
-        Context expects type: 'a' | {'a', 'b'}
-        No candidate matches in the expected union.
-      ]
-    ]
-  , [term()]}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1315:21
-     │
-1315 │     proplists:split(b, []).
-     │                     ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1319:25
-     │
-1319 │     proplists:split([], b).
-     │                         ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1324:22
-     │
-1324 │     proplists:to_map(b).
-     │                      ^ 'b'.
-Expression has type:   'b'
-Context expected type: [atom() | {term(), term()} | term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1358:24
-     │
-1358 │     proplists:from_map(b).
-     │                        ^ 'b'.
-Expression has type:   'b'
-Context expected type: #{K => V}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1358:24
-     │
-1358 │     proplists:from_map(b).
-     │                        ^ 'b'.
-Expression has type:   'b'
-Context expected type: #{dynamic() => dynamic()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1363:5
-     │
-1363 │     proplists:get_value(a, [a]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('a', ['a']).
-Expression has type:   term()
-Context expected type: 'true' | 'undefined'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1368:5
-     │
-1368 │     proplists:get_value(X, [a]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value(X, ['a']).
-Expression has type:   term()
-Context expected type: 'true' | 'undefined'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1373:5
-     │
-1373 │     proplists:get_value(a, [a], b).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('a', ['a'], 'b').
-Expression has type:   term()
-Context expected type: 'true' | 'b'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1416:5
-     │
-1416 │     file:consult(some_file).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^ file:consult('some_file').
-Expression has type:   {'ok', [dynamic()]} | {'error', {number(), atom(), term()} | 'terminated' | 'badarg' | file:posix() | 'system_limit'}
-Context expected type: 'nok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1428:5
-     │
-1428 │     lists:keysort(2, [{a, c}, {b, d}]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lists:keysort(2, [{'a', 'c'}, {'b', 'd'}]).
-Expression has type:   [{'a', 'c'} | {'b', 'd'}]
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1432:22
-     │
-1432 │     lists:keysort(1, [3]).
-     │                      ^^^
-     │                      │
-     │                      [3].
-Expression has type:   [number()]
-Context expected type: [tuple()]
-     │                      
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: tuple()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1448:5
-     │    
-1448 │ ╭ ╭     lists:filtermap(
-1449 │ │ │         fun(X) when X div 2 =:= 0 ->
-1450 │ │ │             {true, integer_to_list(X)};
-1451 │ │ │         (X) ->
-     · │ │
-1454 │ │ │         [1, 2, 3, 4]
-1455 │ │ │     ).
-     │ ╰─│─────^ lists:filtermap(fun, [1, 2, 3, 4]).
-Expression has type:   [string() | number()]
-Context expected type: [number()]
-     │   ╰─────' 
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: number()
-    However the following candidate: string()
-    Differs from the expected type:  number()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1482:5
-     │
-1482 │     erlang:min(X, Y).
-     │     ^^^^^^^^^^^^^^^^ erlang:min(X, Y).
-Expression has type:   number()
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1497:5
-     │
-1497 │     erlang:max(X, Y).
-     │     ^^^^^^^^^^^^^^^^ erlang:max(X, Y).
-Expression has type:   atom() | number()
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1523:9
-     │
-1523 │     abs(Atom).
-     │         ^^^^ Atom.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1536:31
-     │
-1536 │ seq3_4_wip_neg() -> lists:seq(a, 2, 1).
-     │                               ^ 'a'.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1539:30
-     │
-1539 │ seq3_5_neg() -> lists:seq(1, a, 1).
-     │                              ^ 'a'.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1542:33
-     │
-1542 │ seq3_6_neg() -> lists:seq(1, 2, a).
-     │                                 ^ 'a'.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1570:31
-     │
-1570 │ seq2_4_wip_neg() -> lists:seq(a, 2).
-     │                               ^ 'a'.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1573:30
-     │
-1573 │ seq2_5_neg() -> lists:seq(1, a).
-     │                              ^ 'a'.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1622:5
-     │  
-1622 │ ╭     timer:tc(
-1623 │ │         fun() ->
-1624 │ │             err
-1625 │ │         end
-1626 │ │     ).
-     │ ╰─────^ timer:tc(fun).
-Expression has type:   {number(), 'err'}
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1635:5
-     │
-1635 │     ets:lookup(tab, Any).
-     │     ^^^^^^^^^^^^^^^^^^^^ ets:lookup('tab', Any).
-Expression has type:   [dynamic()]
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1639:5
-     │
-1639 │     ets:lookup("not atom", Any).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ ets:lookup(string_lit, Any).
-Expression has type:   [dynamic()]
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1639:16
-     │
-1639 │     ets:lookup("not atom", Any).
-     │                ^^^^^^^^^^ string_lit.
-Expression has type:   string()
-Context expected type: ets:tab()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1663:18
-     │
-1663 │     ets:tab2list("not atom").
-     │                  ^^^^^^^^^^ string_lit.
-Expression has type:   string()
-Context expected type: ets:tab()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1702:23
-     │
-1702 │     lists:flatten([], 1).
-     │                       ^ 1.
-Expression has type:   number()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1711:19
-     │
-1711 │     lists:flatten(3).
-     │                   ^ 3.
-Expression has type:   number()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1724:8
-     │
-1724 │     -> lists:flatten(X).
-     │        ^^^^^^^^^^^^^^^^
-     │        │
-     │        lists:flatten(X).
-Expression has type:   [{A, B} | {B, A}]
-Context expected type: [{A, B}]
-     │        
-
-Because in the expression's type:
-  [
-    { 
-      Here the type is:     B
-      Context expects type: A
-    , A}
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1757:5
-     │    
-1757 │ ╭ ╭     maps:without(
-1758 │ │ │         [a, c, DOrE],
-1759 │ │ │         #{
-1760 │ │ │             a => ka,
-     · │ │
-1764 │ │ │         }
-1765 │ │ │     ).
-     │ ╰─│─────^ maps:without(['a', 'c', DOrE], #{..}).
-Expression has type:   #{a => 'ka', b => atom(), c => pid(), d => 'kd'}
-Context expected type: #{b => atom()}
-     │   ╰─────' 
-
-Because in the expression's type:
-  Here the type is:     #{a => ...}
-  Context expects type: #{...}
-  The expected map has no corresponding key for: a.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1769:18
-     │
-1769 │     maps:without(non_list, #{}).
-     │                  ^^^^^^^^ 'non_list'.
-Expression has type:   'non_list'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1773:22
-     │
-1773 │     maps:without([], non_map).
-     │                      ^^^^^^^ 'non_map'.
-Expression has type:   'non_map'
-Context expected type: #{term() => term()}
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-     ┌─ check/src/custom.erl:1808:1
-     │  
-1808 │ ╭ maps_without_12_neg(None) ->
-1809 │ │     maps:without(
-1810 │ │         [a, b],
-1811 │ │         None
-1812 │ │     ).
-     │ ╰─────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1818:5
-     │    
-1818 │ ╭ ╭     maps:without(
-1819 │ │ │         Keys,
-1820 │ │ │         #{a => self(), b => self()}
-1821 │ │ │     ).
-     │ ╰─│─────^ maps:without(Keys, #{..}).
-Expression has type:   #{a => pid(), b => pid()}
-Context expected type: #{b := pid()}
-     │   ╰─────' 
-
-Because in the expression's type:
-  Here the type is:     #{b => ..., ...}
-  Context expects type: #{b := ..., ...}
-  The type of the expression is missing the following required keys: b.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1826:5
-     │    
-1826 │ ╭ ╭     maps:without(
-1827 │ │ │         [a | improper_tail],
-1828 │ │ │         #{a => self(), b => self()}
-1829 │ │ │     ).
-     │ ╰─│─────^ maps:without(['a' | 'improper_tail'], #{..}).
-Expression has type:   #{a => pid(), b => pid()}
-Context expected type: #{b := pid()}
-     │   ╰─────' 
-
-Because in the expression's type:
-  Here the type is:     #{b => ..., ...}
-  Context expects type: #{b := ..., ...}
-  The type of the expression is missing the following required keys: b.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1827:12
-     │
-1827 │         [a | improper_tail],
-     │            ^^^^^^^^^^^^^^^^ 'improper_tail'.
-Expression has type:   'improper_tail'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1837:5
-     │    
-1837 │ ╭ ╭     maps:without(
-1838 │ │ │         Keys,
-1839 │ │ │         #{a => ka, b => self()}
-1840 │ │ │     ).
-     │ ╰─│─────^ maps:without(Keys, #{..}).
-Expression has type:   #{a => 'ka', b => pid()}
-Context expected type: #{b := pid()}
-     │   ╰─────' 
-
-Because in the expression's type:
-  Here the type is:     #{b => ..., ...}
-  Context expects type: #{b := ..., ...}
-  The type of the expression is missing the following required keys: b.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1854:5
-     │
-1854 │     maps:without([a, b], M).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     maps:without(['a', 'b'], M).
-Expression has type:   #{c := 'cv', d := 'dv'} | #{c := 'cv', e => 'ev'}
-Context expected type: #{c := atom()}
-     │     
-
-Because in the expression's type:
-  Here the type is:     #{d := ...}
-  Context expects type: #{...}
-  The expected map has no corresponding key for: d.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1916:23
-     │
-1916 │     custom_overloaded(X).
-     │                       ^ X.
-Expression has type:   term()
-Context expected type: atom() | binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1939:5
-     │
-1939 │     {A, N}.
-     │     ^^^^^^
-     │     │
-     │     {A, N}.
-Expression has type:   {atom(), number() | pid()}
-Context expected type: {atom(), number()}
-     │     
-
-Because in the expression's type:
-  { atom(), 
-    Here the type is a union type with some valid candidates: number()
-    However the following candidate: pid()
-    Differs from the expected type:  number()
-  }
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2041:5
-     │
-2041 │     filename:join(["server", "erl"]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     filename:join([string_lit, string_lit]).
-Expression has type:   file:filename_all()
-Context expected type: file:filename()
-     │     
-
-Because in the expression's type:
-  Here the type is:     string() | binary()
-  Context expects type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2046:5
-     │
-2046 │     filename:join(["server", <<>>]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     filename:join([string_lit, <<..>>]).
-Expression has type:   file:filename_all()
-Context expected type: file:filename()
-     │     
-
-Because in the expression's type:
-  Here the type is:     string() | binary()
-  Context expects type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2051:5
-     │
-2051 │     filename:join([<<>>, ""]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     filename:join([<<..>>, string_lit]).
-Expression has type:   file:filename_all()
-Context expected type: file:filename()
-     │     
-
-Because in the expression's type:
-  Here the type is:     string() | binary()
-  Context expects type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2066:5
-     │
-2066 │     filename:join([<<>>, <<>>]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     filename:join([<<..>>, <<..>>]).
-Expression has type:   file:filename_all()
-Context expected type: binary()
-     │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: string()
-  Differs from the expected type:  binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2081:19
-     │
-2081 │     filename:join([<<>>, self()]).
-     │                   ^^^^^^^^^^^^^^
-     │                   │
-     │                   [<<..>>, erlang:self()].
-Expression has type:   [binary() | pid()]
-Context expected type: [file:name_all()]
-     │                   
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: binary()
-    However the following candidate: pid()
-    Differs from the expected type:  string() | atom() | file:deep_list() | binary()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2086:5
-     │
-2086 │     filename:join("server", "erl").
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     filename:join(string_lit, string_lit).
-Expression has type:   file:filename_all()
-Context expected type: file:filename()
-     │     
-
-Because in the expression's type:
-  Here the type is:     string() | binary()
-  Context expects type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2091:5
-     │
-2091 │     filename:join("server", <<>>).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     filename:join(string_lit, <<..>>).
-Expression has type:   file:filename_all()
-Context expected type: file:filename()
-     │     
-
-Because in the expression's type:
-  Here the type is:     string() | binary()
-  Context expects type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2096:5
-     │
-2096 │     filename:join(<<>>, "").
-     │     ^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     filename:join(<<..>>, string_lit).
-Expression has type:   file:filename_all()
-Context expected type: file:filename()
-     │     
-
-Because in the expression's type:
-  Here the type is:     string() | binary()
-  Context expects type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2111:5
-     │
-2111 │     filename:join(atom, <<>>).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     filename:join('atom', <<..>>).
-Expression has type:   file:filename_all()
-Context expected type: binary()
-     │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: string()
-  Differs from the expected type:  binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2121:25
-     │
-2121 │     filename:join(<<>>, self()).
-     │                         ^^^^^^
-     │                         │
-     │                         erlang:self().
-Expression has type:   pid()
-Context expected type: file:name_all()
-     │                         
-
-Because in the expression's type:
-  Here the type is:     pid()
-  Context expects type: string() | atom() | file:deep_list() | binary()
-  No candidate matches in the expected union.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2150:5
-     │    
-2150 │ ╭ ╭     queue:filter(
-2151 │ │ │         fun my_filter1/1,
-2152 │ │ │         Q
-2153 │ │ │     ).
-     │ ╰─│─────^ queue:filter(my_filter1/1, Q).
-Expression has type:   queue:queue(atom() | number())
-Context expected type: queue:queue(number())
-     │   ╰─────' 
-
-Because in the expression's type:
-  { 
-    [
-      Here the type is a union type with some valid candidates: number()
-      However the following candidate: atom()
-      Differs from the expected type:  number()
-    ]
-  , [atom() | number()]}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2191:5
-     │
-2191 │     M3.
-     │     ^^
-     │     │
-     │     M3.
-Expression has type:   #{count := number(), module := 'foo'} | #{module := 'foo'}
-Context expected type: state1()
-     │     
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: #{count := number(), module := 'foo'}
-  However, the following candidate doesn't match:
-  Here the type is:     #{...}
-  Context expects type: #{count := ..., ...}
-  The type of the expression is missing the following required keys: count.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2223:13
-     │
-2223 │             Atom + Sum
-     │             ^^^^ Atom.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2279:5
-     │
-2279 │     maps:remove(A, M).
-     │     ^^^^^^^^^^^^^^^^^
-     │     │
-     │     maps:remove(A, M).
-Expression has type:   #{a => number()}
-Context expected type: #{a := number()}
-     │     
-
-Because in the expression's type:
-  Here the type is:     #{a => ..., ...}
-  Context expects type: #{a := ..., ...}
-  The type of the expression is missing the following required keys: a.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2320:5
-     │    
-2320 │ ╭ ╭     maps:filtermap(
-2321 │ │ │         fun
-2322 │ │ │             (a, V) -> true;
-2323 │ │ │             (b, V) -> {true, atom_to_binary(V)};
-     · │ │
-2326 │ │ │         M
-2327 │ │ │     ).
-     │ ╰─│─────^ maps:filtermap(fun, M).
-Expression has type:   #{a => atom() | binary(), b => atom() | binary(), c => atom() | binary()}
-Context expected type: #{a := atom(), b := binary()}
-     │   ╰─────' 
-
-Because in the expression's type:
-  Here the type is:     #{a => ..., b => ..., ...}
-  Context expects type: #{a := ..., b := ..., ...}
-  The type of the expression is missing the following required keys: a, b.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2342:5
-     │    
-2342 │ ╭ ╭     maps:filtermap(
-2343 │ │ │         fun (_, V) ->
-2344 │ │ │             {true, atom_to_binary(V)}
-2345 │ │ │         end,
-2346 │ │ │         M
-2347 │ │ │     ).
-     │ ╰─│─────^ maps:filtermap(fun, M).
-Expression has type:   #{atom() => binary()}
-Context expected type: #{atom() => atom()}
-     │   ╰─────' 
-
-Because in the expression's type:
-  #{ atom() =>
-    Here the type is:     binary()
-    Context expects type: atom()
-  , ... }
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2354:23
-     │
-2354 │         fun (_, _) -> err end,
-     │                       ^^^
-     │                       │
-     │                       'err'.
-Expression has type:   'err'
-Context expected type: boolean() | {'true', term()}
-     │                       
-
-Because in the expression's type:
-  Here the type is:     'err'
-  Context expects type: 'false' | 'true' | {'true', term()}
-  No candidate matches in the expected union.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2362:5
-     │    
-2362 │ ╭ ╭     maps:filtermap(
-2363 │ │ │         fun (_, V) -> {true, atom_to_binary(V)} end,
-2364 │ │ │         M
-2365 │ │ │     ).
-     │ ╰─│─────^ maps:filtermap(fun, M).
-Expression has type:   #{atom() => binary()}
-Context expected type: #{atom() => atom()}
-     │   ╰─────' 
-
-Because in the expression's type:
-  #{ atom() =>
-    Here the type is:     binary()
-    Context expects type: atom()
-  , ... }
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2363:45
-     │
-2363 │         fun (_, V) -> {true, atom_to_binary(V)} end,
-     │                                             ^ V.
-Expression has type:   binary()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2377:5
-     │
-2377 │     re:replace(Subj, "+", "-", [{return, binary}]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ re:replace(Subj, string_lit, string_lit, [{'return', 'binary'}]).
-Expression has type:   binary()
-Context expected type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2381:5
-     │
-2381 │     re:replace(Subj, "+", "-", [{return, list}]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ re:replace(Subj, string_lit, string_lit, [{'return', 'list'}]).
-Expression has type:   string()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2385:22
-     │
-2385 │     Res = re:replace(Subj, "+", "-", [{return, list}]),
-     │                      ^^^^
-     │                      │
-     │                      Subj.
-Expression has type:   atom()
-Context expected type: iodata() | unicode:charlist()
-     │                      
-
-Because in the expression's type:
-  Here the type is:     atom()
-  Context expects type: iolist() | binary()
-  No candidate matches in the expected union.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2386:5
-     │
-2386 │     Res.
-     │     ^^^ Res.
-Expression has type:   string()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2390:38
-     │
-2390 │     Res = re:replace(Subj, "+", "-", [{return, something}]),
-     │                                      ^^^^^^^^^^^^^^^^^^^^^
-     │                                      │
-     │                                      [{'return', 'something'}].
-Expression has type:   [{'return', 'something'}]
-Context expected type: [{'newline', 'cr' | 'lf' | 'any' | 'crlf' | 'anycrlf'} | 'notempty_atstart' | 'noteol' | 'bsr_unicode' | 'notbol' | 'global' | {'match_limit_recursion', number()} | 'bsr_anycrlf' | re:compile_option() | {'match_limit', number()} | {'offset', number()} | 'notempty' | {'return', 'iodata' | 'list' | 'binary'} | 'anchored']
-     │                                      
-
-Because in the expression's type:
-  [
-    { 'return', 
-      Here the type is:     'something'
-      Context expects type: 'iodata' | 'list' | 'binary'
-      No candidate matches in the expected union.
-    }
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2506:5
-     │
-2506 │     lists:partition(fun is_number/1, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     lists:partition(fun, L).
-Expression has type:   {[number()], [atom()]}
-Context expected type: {[atom()], [number()]}
-     │     
-
-Because in the expression's type:
-  { 
-    [
-      Here the type is:     number()
-      Context expects type: atom()
-    ]
-  , [atom()]}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2518:5
-     │
-2518 │     lists:partition(fun({_Term, V}) -> is_number(V) end, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     lists:partition(fun, L).
-Expression has type:   {[{term(), number()}], [{term(), atom()}]}
-Context expected type: {[{term(), atom()}], [{term(), number()}]}
-     │     
-
-Because in the expression's type:
-  { 
-    [
-      { term(), 
-        Here the type is:     number()
-        Context expects type: atom()
-      }
-    ]
-  , [{term(), atom()}]}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2536:5
-     │
-2536 │     lists:partition(fun({ok, _}) -> true; (_) -> false end, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     lists:partition(fun, L).
-Expression has type:   {[{'ok', atom()}], [{'ok', atom()} | {'error', term()}]}
-Context expected type: {[{'ok', atom()}], [{'error', term()}]}
-     │     
-
-Because in the expression's type:
-  { [{'ok', atom()}], 
-    [
-      { 
-        Here the type is:     'ok'
-        Context expects type: 'error'
-      , atom()}
-    ]
-  }
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2576:33
-     │
-2576 │ maps_intersect_2_neg(M1, M2) -> maps:intersect(M1, M2).
-     │                                 ^^^^^^^^^^^^^^^^^^^^^^
-     │                                 │
-     │                                 maps:intersect(M1, M2).
-Expression has type:   #{a => number()}
-Context expected type: #{a := number()}
-     │                                 
-
-Because in the expression's type:
-  Here the type is:     #{a => ..., ...}
-  Context expects type: #{a := ..., ...}
-  The type of the expression is missing the following required keys: a.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2586:33
-     │
-2586 │ maps_intersect_4_neg(M1, M2) -> maps:intersect(M1, M2).
-     │                                 ^^^^^^^^^^^^^^^^^^^^^^
-     │                                 │
-     │                                 maps:intersect(M1, M2).
-Expression has type:   #{a => number()}
-Context expected type: #{a => 'true'}
-     │                                 
-
-Because in the expression's type:
-  #{ a =>
-    Here the type is:     number()
-    Context expects type: 'true'
-  , ... }
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2596:33
-     │
-2596 │ maps_intersect_6_neg(M1, M2) -> maps:intersect(M1, M2).
-     │                                 ^^^^^^^^^^^^^^^^^^^^^^
-     │                                 │
-     │                                 maps:intersect(M1, M2).
-Expression has type:   #{a => number()}
-Context expected type: #{a := number()}
-     │                                 
-
-Because in the expression's type:
-  Here the type is:     #{a => ..., ...}
-  Context expects type: #{a := ..., ...}
-  The type of the expression is missing the following required keys: a.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2709:40
-     │
-2709 │             (foo, A) -> binary_to_atom(A);
-     │                                        ^ A.
-Expression has type:   atom()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2710:40
-     │
-2710 │             (bar, B) -> atom_to_binary(B);
-     │                                        ^ B.
-Expression has type:   binary()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2711:50
-     │
-2711 │             ({foo, bar}, I) -> binary_to_integer(I);
-     │                                                  ^ I.
-Expression has type:   number()
-Context expected type: binary()
-
-202 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-28.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-28.pretty
deleted file mode 100644
index 5220990b8f..0000000000
--- a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-28.pretty
+++ /dev/null
@@ -1,2540 +0,0 @@
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/custom.erl:26:5
-   │
-26 │     element(4, Tup).
-   │     ^^^^^^^^^^^^^^^ erlang:element(4, Tup).
-Expression has type:   #{dynamic() => dynamic()}
-Context expected type: atom()
-
-error: index_out_of_bounds (See https://fb.me/eqwalizer_errors#index_out_of_bounds)
-   ┌─ check/src/custom.erl:30:5
-   │
-30 │     element(42, Tup).
-   │     ^^^^^^^^^^^^^^^^ 42.
-Tried to access element 42 of a tuple with 3 elements
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/custom.erl:40:5
-   │
-40 │     element(2, Tup).
-   │     ^^^^^^^^^^^^^^^ erlang:element(2, Tup).
-Expression has type:   number() | string() | atom()
-Context expected type: #{dynamic() => dynamic()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/custom.erl:44:16
-   │
-44 │     element(2, Tup).
-   │                ^^^
-   │                │
-   │                Tup.
-Expression has type:   {atom(), string()} | [dynamic()]
-Context expected type: tuple()
-   │                
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: {atom(), string()}
-  However the following candidate: [dynamic()]
-  Differs from the expected type:  tuple()
-
-error: index_out_of_bounds (See https://fb.me/eqwalizer_errors#index_out_of_bounds)
-   ┌─ check/src/custom.erl:48:5
-   │
-48 │     element(42, Tup).
-   │     ^^^^^^^^^^^^^^^^ 42.
-Tried to access element 42 of a tuple with 2 elements
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/custom.erl:54:5
-   │
-54 │     element(N, Tup).
-   │     ^^^^^^^^^^^^^^^ erlang:element(N, Tup).
-Expression has type:   atom() | number() | string()
-Context expected type: #{dynamic() => dynamic()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/custom.erl:58:5
-   │
-58 │     element(N, Tup).
-   │     ^^^^^^^^^^^^^^^
-   │     │
-   │     erlang:element(N, Tup).
-Expression has type:   atom() | number()
-Context expected type: atom()
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: number()
-  Differs from the expected type:  atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/custom.erl:68:5
-   │
-68 │     element(1, Tup).
-   │     ^^^^^^^^^^^^^^^
-   │     │
-   │     erlang:element(1, Tup).
-Expression has type:   dynamic() | number()
-Context expected type: atom()
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: dynamic()
-  However the following candidate: number()
-  Differs from the expected type:  atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-   ┌─ check/src/custom.erl:86:5
-   │
-86 │     element(N, Rec).
-   │     ^^^^^^^^^^^^^^^
-   │     │
-   │     erlang:element(N, Rec).
-Expression has type:   'foo' | 'ok' | 'error' | number() | string()
-Context expected type: atom()
-   │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'error' | 'foo' | 'ok'
-  However the following candidate: string()
-  Differs from the expected type:  atom()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/custom.erl:91:1
-   │  
-91 │ ╭ element_2_none_1(Tup) ->
-92 │ │     element(42, Tup).
-   │ ╰────────────────────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-   ┌─ check/src/custom.erl:95:1
-   │  
-95 │ ╭ element_2_none_2(N, Tup) ->
-96 │ │     element(N, Tup).
-   │ ╰───────────────────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:108:5
-    │
-108 │     maps:get(K, M).
-    │     ^^^^^^^^^^^^^^ maps:get(K, M).
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:128:5
-    │
-128 │     Res.
-    │     ^^^ Res.
-Expression has type:   number()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:154:12
-    │
-154 │     get(a, M).
-    │            ^ M.
-Expression has type:   term()
-Context expected type: #{term() => term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:160:23
-    │
-160 │     Res = maps:get(a, M),
-    │                       ^ M.
-Expression has type:   term()
-Context expected type: #{term() => term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:167:17
-    │
-167 │     maps:get(a, M, false).
-    │                 ^ M.
-Expression has type:   term()
-Context expected type: #{term() => term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:173:23
-    │
-173 │     Res = maps:get(a, M, false),
-    │                       ^ M.
-Expression has type:   term()
-Context expected type: #{term() => term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:193:5
-    │
-193 │     maps:get(K, M, 0).
-    │     ^^^^^^^^^^^^^^^^^
-    │     │
-    │     maps:get(K, M, 0).
-Expression has type:   number() | atom()
-Context expected type: atom()
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: number()
-  Differs from the expected type:  atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:200:5
-    │
-200 │     Res.
-    │     ^^^
-    │     │
-    │     Res.
-Expression has type:   number() | atom()
-Context expected type: atom()
-    │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: number()
-  Differs from the expected type:  atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:206:5
-    │    
-206 │ ╭ ╭     {
-207 │ │ │         maps:get(a, M, undefined),
-208 │ │ │         maps:get(n, M, undefined)
-209 │ │ │     }.
-    │ ╰─│─────^ {maps:get('a', M, 'undefined'), maps:get('n', M, 'undefined')}.
-Expression has type:   {atom(), 'undefined' | number()}
-Context expected type: {atom(), number()}
-    │   ╰─────' 
-
-Because in the expression's type:
-  { atom(), 
-    Here the type is a union type with some valid candidates: number()
-    However the following candidate: 'undefined'
-    Differs from the expected type:  number()
-  }
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:221:27
-    │
-221 │ map_get_2_17_neg(V, M) -> maps:get(V, M).
-    │                           ^^^^^^^^^^^^^^
-    │                           │
-    │                           maps:get(V, M).
-Expression has type:   'a_v' | 'c_v'
-Context expected type: 'a_v' | 'b_v'
-    │                           
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'a_v'
-  However the following candidate: 'c_v'
-  Differs from the expected type:  'a_v' | 'b_v'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:233:27
-    │
-233 │ map_get_3_19_neg(V, M) -> maps:get(V, M, undefined).
-    │                           ^^^^^^^^^^^^^^^^^^^^^^^^^
-    │                           │
-    │                           maps:get(V, M, 'undefined').
-Expression has type:   'undefined' | 'a_v' | 'c_v'
-Context expected type: 'a_v' | 'b_v' | 'undefined'
-    │                           
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'undefined' | 'a_v'
-  However the following candidate: 'c_v'
-  Differs from the expected type:  'a_v' | 'b_v' | 'undefined'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:309:5
-    │
-309 │     Res.
-    │     ^^^ Res.
-Expression has type:   {'value', #{}} | 'false'
-Context expected type: 'nok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:363:23
-    │
-363 │         fun (_, _) -> self() end,
-    │                       ^^^^^^ erlang:self().
-Expression has type:   pid()
-Context expected type: boolean()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:382:17
-    │
-382 │     maps:filter(F, M).
-    │                 ^ F.
-Expression has type:   fun(() -> pid())
-Context expected type: fun((number(), 'a' | 'b') -> boolean())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:389:17
-    │
-389 │     maps:filter(F, M).
-    │                 ^
-    │                 │
-    │                 F.
-Expression has type:   fun((fun((T) -> boolean()), [T]) -> [T]) with 1 type parameter
-Context expected type: fun((number(), 'a' | 'b') -> boolean()) with 0 type parameters
-    │                 
-
-Because in the expression's type:
-  Here the type is:     fun()/2 with 1 type parameter
-  Context expects type: fun((number(), 'a' | 'b') -> boolean()) with 0 type parameters
-  The number of type parameters doesn't match.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:413:37
-    │
-413 │     maps:filter(fun erlang:'=:='/2, X).
-    │                                     ^
-    │                                     │
-    │                                     X.
-Expression has type:   #{K => V} | 'a'
-Context expected type: #{term() => term()} | maps:iterator()
-    │                                     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: #{K => V}
-  However the following candidate: 'a'
-  Differs from the expected type:  #{term() => term()} | maps:iterator()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:425:20
-    │
-425 │     maps:filter(F, non_kv),
-    │                    ^^^^^^ 'non_kv'.
-Expression has type:   'non_kv'
-Context expected type: #{term() => term()} | maps:iterator()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:454:5
-    │    
-454 │ ╭ ╭     maps:map(
-455 │ │ │         fun (_, _) -> self() end,
-456 │ │ │         M
-457 │ │ │     ).
-    │ ╰─│─────^ maps:map(fun, M).
-Expression has type:   #{number() => pid()}
-Context expected type: #{number() => boolean()}
-    │   ╰─────' 
-
-Because in the expression's type:
-  #{ number() =>
-    Here the type is:     pid()
-    Context expects type: boolean()
-  , ... }
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:474:14
-    │
-474 │     maps:map(F, M).
-    │              ^ F.
-Expression has type:   fun(() -> pid())
-Context expected type: fun((number(), 'a' | 'b') -> term())
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:481:14
-    │
-481 │     maps:map(F, M).
-    │              ^
-    │              │
-    │              F.
-Expression has type:   fun((fun((A) -> B), [A]) -> [B]) with 2 type parameters
-Context expected type: fun((number(), 'a' | 'b') -> term()) with 0 type parameters
-    │              
-
-Because in the expression's type:
-  Here the type is:     fun((fun((A) -> B), [A]) -> [B]) with 2 type parameters
-  Context expects type: fun((number(), 'a' | 'b') -> term()) with 0 type parameters
-  The number of type parameters doesn't match.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:497:5
-    │
-497 │     maps:map(F, M).
-    │     ^^^^^^^^^^^^^^
-    │     │
-    │     maps:map(F, M).
-Expression has type:   #{a := boolean(), b := boolean()}
-Context expected type: #{a => 'a', b => 'b'}
-    │     
-
-Because in the expression's type:
-  #{ a =>
-    Here the type is:     boolean()
-    Context expects type: 'a'
-  , ... }
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:503:17
-    │
-503 │     maps:map(F, non_kv),
-    │                 ^^^^^^ 'non_kv'.
-Expression has type:   'non_kv'
-Context expected type: #{term() => term()} | maps:iterator()
-
-error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
-    ┌─ check/src/custom.erl:538:9
-    │
-538 │         fun (K, V) -> [K, V] end, [], M).
-    │         ^^^^^^^^^^^^^^^^^^^^^^^^ fun.
-fun with arity 2 used as fun with 3 arguments
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:544:5
-    │    
-544 │ ╭ ╭     maps:fold(
-545 │ │ │         fun (_, _, Acc) -> [Acc] end,
-546 │ │ │         [],
-547 │ │ │         M
-548 │ │ │     ).
-    │ ╰─│─────^ maps:fold(fun, [], M).
-Expression has type:   [[[]]]
-Context expected type: [number() | 'a' | 'b']
-    │   ╰─────' 
-
-Because in the expression's type:
-  [
-    Here the type is:     [[]]
-    Context expects type: number() | 'a' | 'b'
-    No candidate matches in the expected union.
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:545:28
-    │
-545 │         fun (_, _, Acc) -> [Acc] end,
-    │                            ^^^^^
-    │                            │
-    │                            [Acc].
-Expression has type:   [[[[]]]]
-Context expected type: [[[]]]
-    │                            
-
-Because in the expression's type:
-  [
-    [
-      [
-        Here the type is:     []
-        Context expects type: none()
-      ]
-    ]
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:552:5
-    │  
-552 │ ╭     maps:fold(
-553 │ │         fun (_, _, Acc) -> Acc end,
-554 │ │         [],
-555 │ │         non_kv
-556 │ │     ).
-    │ ╰─────^ maps:fold(fun, [], 'non_kv').
-Expression has type:   []
-Context expected type: 'nok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:555:9
-    │
-555 │         non_kv
-    │         ^^^^^^ 'non_kv'.
-Expression has type:   'non_kv'
-Context expected type: #{term() => term()} | maps:iterator()
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/custom.erl:560:1
-    │  
-560 │ ╭ maps_fold_3_6(None) ->
-561 │ │     maps:fold(
-562 │ │         None,
-563 │ │         #{},
-564 │ │         #{1 => 1}
-565 │ │     ).
-    │ ╰─────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/custom.erl:568:1
-    │  
-568 │ ╭ maps_fold_3_7(None) ->
-569 │ │     maps:fold(
-570 │ │         None,
-571 │ │         None,
-572 │ │         None
-573 │ │     ).
-    │ ╰─────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:578:5
-    │    
-578 │ ╭ ╭     maps:fold(
-579 │ │ │         fun (_K, A, _Acc) -> A end,
-580 │ │ │         [],
-581 │ │ │         M
-582 │ │ │     ).
-    │ ╰─│─────^ maps:fold(fun, [], M).
-Expression has type:   [] | atom()
-Context expected type: atom()
-    │   ╰─────' 
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: atom()
-  However the following candidate: []
-  Differs from the expected type:  atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:601:9
-    │
-601 │         fun folder_bad/3,
-    │         ^^^^^^^^^^^^^^^^
-    │         │
-    │         folder_bad/3.
-Expression has type:   fun((term(), term(), Acc) -> [Acc]) with 1 type parameter
-Context expected type: fun((number(), 'a', []) -> term()) with 0 type parameters
-    │         
-
-Because in the expression's type:
-  Here the type is:     fun((term(), term(), Acc) -> [Acc]) with 1 type parameter
-  Context expects type: fun((number(), 'a', []) -> term()) with 0 type parameters
-  The number of type parameters doesn't match.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:601:9
-    │
-601 │         fun folder_bad/3,
-    │         ^^^^^^^^^^^^^^^^
-    │         │
-    │         folder_bad/3.
-Expression has type:   fun((term(), term(), Acc) -> [Acc]) with 1 type parameter
-Context expected type: fun((number(), 'a', [] | dynamic()) -> term()) with 0 type parameters
-    │         
-
-Because in the expression's type:
-  Here the type is:     fun((term(), term(), Acc) -> [Acc]) with 1 type parameter
-  Context expects type: fun()/3 with 0 type parameters
-  The number of type parameters doesn't match.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:601:9
-    │
-601 │         fun folder_bad/3,
-    │         ^^^^^^^^^^^^^^^^
-    │         │
-    │         folder_bad/3.
-Expression has type:   fun((term(), term(), Acc) -> [Acc]) with 1 type parameter
-Context expected type: fun((number(), 'a', [] | dynamic()) -> [] | dynamic()) with 0 type parameters
-    │         
-
-Because in the expression's type:
-  Here the type is:     fun((term(), term(), Acc) -> [Acc]) with 1 type parameter
-  Context expects type: fun()/3 with 0 type parameters
-  The number of type parameters doesn't match.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:636:5
-    │    
-636 │ ╭ ╭     maps:fold(
-637 │ │ │         fun
-638 │ │ │             (_K, {i, I}, Acc) ->
-639 │ │ │                 [I | Acc];
-    · │ │
-646 │ │ │         M
-647 │ │ │     ).
-    │ ╰─│─────^ maps:fold(fun, [], M).
-Expression has type:   [number() | binary() | atom()]
-Context expected type: [binary()] | [number()] | [atom()]
-    │   ╰─────' 
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: binary()
-    However the following candidate: number()
-    Differs from the expected type:  binary()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:671:41
-    │
-671 │ maps_to_list_7_neg(Num) -> maps:to_list(Num).
-    │                                         ^^^ Num.
-Expression has type:   number()
-Context expected type: #{term() => term()} | maps:iterator()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:675:25
-    │
-675 │ maps_merge_1(M1, M2) -> maps:merge(M1, M2).
-    │                         ^^^^^^^^^^^^^^^^^^
-    │                         │
-    │                         maps:merge(M1, M2).
-Expression has type:   #{'b' | 'a' | 'c' => number() | string() | atom()}
-Context expected type: #{a => string(), b => number(), c => atom()}
-    │                         
-
-Because in the expression's type:
-  Here the type is:     #{'b' | 'a' | 'c' => number() | string() | atom()}
-  Context expects type: #{...} (no default association)
-  The expected map has no default association while the type of the expression has one.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:679:25
-    │
-679 │ maps_merge_2(M1, M2) -> maps:merge(M1, M2).
-    │                         ^^^^^^^^^^^^^^^^^^
-    │                         │
-    │                         maps:merge(M1, M2).
-Expression has type:   #{'b' | 'a' | 'c' => number() | string() | atom()}
-Context expected type: #{a => string(), b => number() | boolean(), c => atom()}
-    │                         
-
-Because in the expression's type:
-  Here the type is:     #{'b' | 'a' | 'c' => number() | string() | atom()}
-  Context expects type: #{...} (no default association)
-  The expected map has no default association while the type of the expression has one.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:683:25
-    │
-683 │ maps_merge_3(M1, M2) -> maps:merge(M1, M2).
-    │                         ^^^^^^^^^^^^^^^^^^
-    │                         │
-    │                         maps:merge(M1, M2).
-Expression has type:   #{'b' | 'a' | 'c' => number() | string() | atom()}
-Context expected type: #{a := string(), b := boolean(), c => atom()}
-    │                         
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{a := ..., b := ..., ...}
-  The type of the expression is missing the following required keys: a, b.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:697:44
-    │
-697 │ maps_merge_7_neg(M1, M2) -> maps:merge(M1, M2).
-    │                                            ^^ M2.
-Expression has type:   number()
-Context expected type: #{a => binary()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:701:25
-    │
-701 │ maps_merge_8(M1, M2) -> maps:merge(M1, M2).
-    │                         ^^^^^^^^^^^^^^^^^^
-    │                         │
-    │                         maps:merge(M1, M2).
-Expression has type:   #{'a' | 'b' => atom() | number()}
-Context expected type: #{a := atom(), b := number()} | #{a := atom()}
-    │                         
-
-Because in the expression's type:
-  Here the type is:     #{...}
-  Context expects type: #{a := ..., b := ..., ...}
-  The type of the expression is missing the following required keys: a, b.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:721:9
-    │
-721 │         fun erlang:binary_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:binary_to_list/1.
-Expression has type:   fun((binary()) -> [number()])
-Context expected type: fun((number()) -> boolean() | {'true', term()})
-    │         
-
-Because in the expression's type:
-  fun((binary()) ->
-    Here the type is:     [number()]
-    Context expects type: 'false' | 'true' | {'true', term()}
-    No candidate matches in the expected union.
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:739:20
-    │
-739 │             (3) -> wrong_ret end,
-    │                    ^^^^^^^^^
-    │                    │
-    │                    'wrong_ret'.
-Expression has type:   'wrong_ret'
-Context expected type: boolean() | {'true', term()}
-    │                    
-
-Because in the expression's type:
-  Here the type is:     'wrong_ret'
-  Context expects type: 'false' | 'true' | {'true', term()}
-  No candidate matches in the expected union.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:749:9
-    │
-749 │         not_a_list
-    │         ^^^^^^^^^^ 'not_a_list'.
-Expression has type:   'not_a_list'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:791:17
-    │
-791 │                 Res
-    │                 ^^^
-    │                 │
-    │                 Res.
-Expression has type:   {'true', 'a'} | 'wrong_ret'
-Context expected type: boolean() | {'true', term()}
-    │                 
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: {'true', 'a'}
-  However the following candidate: 'wrong_ret'
-  Differs from the expected type:  'false' | 'true' | {'true', term()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:827:9
-    │    
-827 │ ╭ ╭         fun (a) -> [a];
-828 │ │ │             (b) -> true;
-829 │ │ │             (c) -> wrong_ret end,
-    │ ╰─│────────────────────────────────^ fun.
-Expression has type:   fun(('a' | 'b') -> ['a'] | 'true' | 'wrong_ret')
-Context expected type: fun(('a' | 'b') -> boolean() | ['a' | 'b'])
-    │   ╰────────────────────────────────' 
-
-Because in the expression's type:
-  fun(('a' | 'b') ->
-    Here the type is a union type with some valid candidates: ['a'] | 'true'
-    However the following candidate: 'wrong_ret'
-    Differs from the expected type:  'false' | 'true' | ['a' | 'b']
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:829:20
-    │
-829 │             (c) -> wrong_ret end,
-    │                    ^^^^^^^^^
-    │                    │
-    │                    'wrong_ret'.
-Expression has type:   'wrong_ret'
-Context expected type: boolean() | ['a' | 'b']
-    │                    
-
-Because in the expression's type:
-  Here the type is:     'wrong_ret'
-  Context expects type: 'false' | 'true' | ['a' | 'b']
-  No candidate matches in the expected union.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:837:9
-    │    
-837 │ ╭ ╭         fun (1) -> {true, a};
-838 │ │ │             (2) -> true end,
-    │ ╰─│───────────────────────────^ fun.
-Expression has type:   fun((dynamic()) -> {'true', 'a'} | 'true')
-Context expected type: fun((Item) -> boolean() | [Item])
-    │   ╰───────────────────────────' 
-
-Because in the expression's type:
-  fun((dynamic()) ->
-    Here the type is a union type with some valid candidates: 'true'
-    However the following candidate: {'true', 'a'}
-    Differs from the expected type:  'false' | 'true' | [Item]
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:837:20
-    │
-837 │         fun (1) -> {true, a};
-    │                    ^^^^^^^^^
-    │                    │
-    │                    {'true', 'a'}.
-Expression has type:   {'true', 'a'}
-Context expected type: boolean() | [dynamic()]
-    │                    
-
-Because in the expression's type:
-  Here the type is:     {'true', 'a'}
-  Context expects type: 'false' | 'true' | [dynamic()]
-  No candidate matches in the expected union.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:839:9
-    │
-839 │         not_a_queue
-    │         ^^^^^^^^^^^
-    │         │
-    │         'not_a_queue'.
-Expression has type:   'not_a_queue'
-Context expected type: queue:queue(Item)
-    │         
-
-Because in the expression's type:
-  Here the type is:     'not_a_queue'
-  Context expects type: {[Item], [Item]}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:839:9
-    │
-839 │         not_a_queue
-    │         ^^^^^^^^^^^
-    │         │
-    │         'not_a_queue'.
-Expression has type:   'not_a_queue'
-Context expected type: queue:queue(dynamic())
-    │         
-
-Because in the expression's type:
-  Here the type is:     'not_a_queue'
-  Context expects type: {[dynamic()], [dynamic()]}
-
-error: fun_arity_mismatch (See https://fb.me/eqwalizer_errors#fun_arity_mismatch)
-    ┌─ check/src/custom.erl:846:9
-    │  
-846 │ ╭         fun (wrong, arity) ->
-847 │ │             [a]
-848 │ │         end,
-    │ ╰───────────^ fun.
-fun with arity 2 used as fun with 1 arguments
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:857:9
-    │    
-857 │ ╭ ╭         fun (1) -> {true, a};
-858 │ │ │             (X) -> case X of
-859 │ │ │                        true ->
-860 │ │ │                            [a];
-    · │ │
-863 │ │ │                    end
-864 │ │ │         end,
-    │ ╰─│───────────^ fun.
-Expression has type:   fun(('a' | 'b') -> ['a'] | 'false' | {'true', 'a'})
-Context expected type: fun(('a' | 'b') -> boolean() | ['a' | 'b'])
-    │   ╰───────────' 
-
-Because in the expression's type:
-  fun(('a' | 'b') ->
-    Here the type is a union type with some valid candidates: ['a'] | 'false'
-    However the following candidate: {'true', 'a'}
-    Differs from the expected type:  'false' | 'true' | ['a' | 'b']
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:857:20
-    │
-857 │         fun (1) -> {true, a};
-    │                    ^^^^^^^^^
-    │                    │
-    │                    {'true', 'a'}.
-Expression has type:   {'true', 'a'}
-Context expected type: boolean() | ['a' | 'b']
-    │                    
-
-Because in the expression's type:
-  Here the type is:     {'true', 'a'}
-  Context expects type: 'false' | 'true' | ['a' | 'b']
-  No candidate matches in the expected union.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:873:9
-    │    
-873 │ ╭ ╭         fun (a) -> [a];
-874 │ │ │             (X) ->
-875 │ │ │                 Res = case X of
-876 │ │ │                           true ->
-    · │ │
-881 │ │ │                 Res
-882 │ │ │         end,
-    │ ╰─│───────────^ fun.
-Expression has type:   fun(('a' | 'b') -> ['a'] | 'wrong_ret')
-Context expected type: fun(('a' | 'b') -> boolean() | ['a' | 'b'])
-    │   ╰───────────' 
-
-Because in the expression's type:
-  fun(('a' | 'b') ->
-    Here the type is a union type with some valid candidates: ['a']
-    However the following candidate: 'wrong_ret'
-    Differs from the expected type:  'false' | 'true' | ['a' | 'b']
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:881:17
-    │
-881 │                 Res
-    │                 ^^^
-    │                 │
-    │                 Res.
-Expression has type:   ['a'] | 'wrong_ret'
-Context expected type: boolean() | ['a' | 'b']
-    │                 
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: ['a']
-  However the following candidate: 'wrong_ret'
-  Differs from the expected type:  'false' | 'true' | ['a' | 'b']
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:891:9
-    │
-891 │         fun list_to_atom/1,
-    │         ^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:list_to_atom/1.
-Expression has type:   fun((string()) -> atom())
-Context expected type: fun((dynamic()) -> boolean() | [dynamic()])
-    │         
-
-Because in the expression's type:
-  fun((string()) ->
-    Here the type is:     atom()
-    Context expects type: 'false' | 'true' | [dynamic()]
-    No candidate matches in the expected union.
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:891:9
-    │
-891 │         fun list_to_atom/1,
-    │         ^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:list_to_atom/1.
-Expression has type:   fun((string()) -> atom())
-Context expected type: fun(('a' | 'b') -> boolean() | ['a' | 'b'])
-    │         
-
-Because in the expression's type:
-  fun((string()) ->
-    Here the type is:     atom()
-    Context expects type: 'false' | 'true' | ['a' | 'b']
-    No candidate matches in the expected union.
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:900:9
-    │
-900 │         fun atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((atom()) -> boolean() | [atom()])
-    │         
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     string()
-    Context expects type: boolean() | [atom()]
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:900:9
-    │
-900 │         fun atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((dynamic(atom())) -> boolean() | [dynamic(atom())])
-    │         
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     string()
-    Context expects type: boolean() | [dynamic(atom())]
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:909:9
-    │
-909 │         fun atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((atom()) -> boolean() | [atom()])
-    │         
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     string()
-    Context expects type: boolean() | [atom()]
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:909:9
-    │
-909 │         fun atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((dynamic(atom())) -> boolean() | [dynamic(atom())])
-    │         
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     string()
-    Context expects type: boolean() | [dynamic(atom())]
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:919:9
-    │
-919 │         fun atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((atom()) -> boolean() | [atom()])
-    │         
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     string()
-    Context expects type: boolean() | [atom()]
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:919:9
-    │
-919 │         fun atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((dynamic(atom())) -> boolean() | [dynamic(atom())])
-    │         
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     string()
-    Context expects type: boolean() | [dynamic(atom())]
-  )
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/custom.erl:925:1
-    │  
-925 │ ╭ queue_filter_13_neg(Q) ->
-926 │ │     queue:filter(
-927 │ │         fun atom_to_list/1,
-928 │ │         Q
-929 │ │     ),
-930 │ │     ok.
-    │ ╰──────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:927:9
-    │
-927 │         fun atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((atom()) -> boolean() | [atom()])
-    │         
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     string()
-    Context expects type: boolean() | [atom()]
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:927:9
-    │
-927 │         fun atom_to_list/1,
-    │         ^^^^^^^^^^^^^^^^^^
-    │         │
-    │         erlang:atom_to_list/1.
-Expression has type:   fun((atom()) -> string())
-Context expected type: fun((dynamic(atom())) -> boolean() | [dynamic(atom())])
-    │         
-
-Because in the expression's type:
-  fun((atom()) ->
-    Here the type is:     string()
-    Context expects type: boolean() | [dynamic(atom())]
-  )
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:955:5
-    │  
-955 │ ╭     lists:keystore(
-956 │ │         a, 1,
-957 │ │         [{foo, b}, {c, d}],
-958 │ │         non_tuple
-959 │ │     ).
-    │ ╰─────^ lists:keystore('a', 1, [{'foo', 'b'}, {'c', 'd'}], 'non_tuple').
-Expression has type:   [{'foo', 'b'} | {'c', 'd'} | dynamic()]
-Context expected type: 'nok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:958:9
-    │
-958 │         non_tuple
-    │         ^^^^^^^^^ 'non_tuple'.
-Expression has type:   'non_tuple'
-Context expected type: tuple()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:966:5
-    │  
-966 │ ╭     lists:keystore(
-967 │ │         a, 1,
-968 │ │         [non_tuple],
-969 │ │         {replacement}
-970 │ │     ).
-    │ ╰─────^ lists:keystore('a', 1, ['non_tuple'], {'replacement'}).
-Expression has type:   [dynamic() | {'replacement'}]
-Context expected type: 'nok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:968:9
-    │
-968 │         [non_tuple],
-    │         ^^^^^^^^^^^
-    │         │
-    │         ['non_tuple'].
-Expression has type:   ['non_tuple']
-Context expected type: [tuple()]
-    │         
-
-Because in the expression's type:
-  [
-    Here the type is:     'non_tuple'
-    Context expects type: tuple()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:975:5
-    │  
-975 │ ╭     lists:keystore(
-976 │ │         a, 1,
-977 │ │         non_list,
-978 │ │         {replacement}
-979 │ │     ).
-    │ ╰─────^ lists:keystore('a', 1, 'non_list', {'replacement'}).
-Expression has type:   [dynamic() | {'replacement'}]
-Context expected type: 'nok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-    ┌─ check/src/custom.erl:977:9
-    │
-977 │         non_list,
-    │         ^^^^^^^^ 'non_list'.
-Expression has type:   'non_list'
-Context expected type: [tuple()]
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/custom.erl:983:1
-    │  
-983 │ ╭ keystore_7(None) ->
-984 │ │     lists:keystore(
-985 │ │         a, 1,
-986 │ │         None,
-987 │ │         {replacement}
-988 │ │     ).
-    │ ╰─────^ Clause is not covered by spec
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-    ┌─ check/src/custom.erl:991:1
-    │  
-991 │ ╭ keystore_8(None) ->
-992 │ │     lists:keystore(
-993 │ │         a, 1,
-994 │ │         None,
-995 │ │         None
-996 │ │     ).
-    │ ╰─────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1011:25
-     │
-1011 │     lists:keytake(a, 1, non_tup),
-     │                         ^^^^^^^ 'non_tup'.
-Expression has type:   'non_tup'
-Context expected type: [Tuple]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1011:25
-     │
-1011 │     lists:keytake(a, 1, non_tup),
-     │                         ^^^^^^^ 'non_tup'.
-Expression has type:   'non_tup'
-Context expected type: [dynamic()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1016:25
-     │
-1016 │     lists:keytake(a, 1, non_list),
-     │                         ^^^^^^^^ 'non_list'.
-Expression has type:   'non_list'
-Context expected type: [Tuple]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1016:25
-     │
-1016 │     lists:keytake(a, 1, non_list),
-     │                         ^^^^^^^^ 'non_list'.
-Expression has type:   'non_list'
-Context expected type: [dynamic()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1021:22
-     │
-1021 │     lists:keytake(a, non_num, []),
-     │                      ^^^^^^^ 'non_num'.
-Expression has type:   'non_num'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1038:15
-     │
-1038 │     lists:sum([a, 1]).
-     │               ^^^^^^
-     │               │
-     │               ['a', 1].
-Expression has type:   ['a' | number()]
-Context expected type: [number()]
-     │               
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: number()
-    However the following candidate: 'a'
-    Differs from the expected type:  number()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1042:15
-     │
-1042 │     lists:sum(not_a_list).
-     │               ^^^^^^^^^^ 'not_a_list'.
-Expression has type:   'not_a_list'
-Context expected type: [number()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1062:15
-     │
-1062 │     lists:max(not_a_list).
-     │               ^^^^^^^^^^ 'not_a_list'.
-Expression has type:   'not_a_list'
-Context expected type: [T]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1062:15
-     │
-1062 │     lists:max(not_a_list).
-     │               ^^^^^^^^^^ 'not_a_list'.
-Expression has type:   'not_a_list'
-Context expected type: [dynamic()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1082:15
-     │
-1082 │     lists:min(not_a_list).
-     │               ^^^^^^^^^^ 'not_a_list'.
-Expression has type:   'not_a_list'
-Context expected type: [T]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1082:15
-     │
-1082 │     lists:min(not_a_list).
-     │               ^^^^^^^^^^ 'not_a_list'.
-Expression has type:   'not_a_list'
-Context expected type: [dynamic()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1100:5
-     │
-1100 │     proplists:get_value(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L).
-Expression has type:   term()
-Context expected type: pid() | 'undefined'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1106:5
-     │
-1106 │     proplists:get_value(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L).
-Expression has type:   term()
-Context expected type: pid() | 'undefined' | 'v'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1111:5
-     │
-1111 │     proplists:get_value(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L).
-Expression has type:   term()
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1117:5
-     │
-1117 │     proplists:get_value(k, L, 3).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L, 3).
-Expression has type:   term()
-Context expected type: pid() | number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1123:5
-     │
-1123 │     proplists:get_value(k, L, my_default).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L, 'my_default').
-Expression has type:   term()
-Context expected type: 'v1' | 'v2' | 'my_default'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1129:5
-     │
-1129 │     proplists:get_value(k, L, my_default).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L, 'my_default').
-Expression has type:   term()
-Context expected type: 'v'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1134:28
-     │
-1134 │     proplists:get_value(k, b).
-     │                            ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1139:5
-     │
-1139 │     proplists:get_value(k, []).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', []).
-Expression has type:   term()
-Context expected type: 'default'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1144:1
-     │
-1144 │ proplists:get_value(k, [], my_default).
-     │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', [], 'my_default').
-Expression has type:   term()
-Context expected type: 'my_default'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1149:28
-     │
-1149 │     proplists:get_value(k, b, my_default).
-     │                            ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1154:5
-     │
-1154 │     proplists:get_bool(b, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_bool('b', L).
-Expression has type:   boolean()
-Context expected type: 'true'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1160:5
-     │
-1160 │     proplists:get_all_values(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_all_values('k', L).
-Expression has type:   [term()]
-Context expected type: [pid() | 'default']
-     │     
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: pid() | 'default'
-    No candidate matches in the expected union.
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1166:5
-     │
-1166 │     proplists:get_all_values(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_all_values('k', L).
-Expression has type:   [term()]
-Context expected type: [pid() | 'default' | 'v']
-     │     
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: pid() | 'default' | 'v'
-    No candidate matches in the expected union.
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1171:5
-     │
-1171 │     proplists:get_all_values(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_all_values('k', L).
-Expression has type:   [term()]
-Context expected type: [pid()]
-     │     
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: pid()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1176:5
-     │
-1176 │     proplists:get_all_values(k, []).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_all_values('k', []).
-Expression has type:   [term()]
-Context expected type: []
-     │     
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: none()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1181:5
-     │
-1181 │     proplists:get_all_values(k, b).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_all_values('k', 'b').
-Expression has type:   [term()]
-Context expected type: []
-     │     
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: none()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1181:33
-     │
-1181 │     proplists:get_all_values(k, b).
-     │                                 ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1186:27
-     │
-1186 │     proplists:get_bool(b, b).
-     │                           ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1191:5
-     │
-1191 │     proplists:get_keys(L).
-     │     ^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_keys(L).
-Expression has type:   [term()]
-Context expected type: ['c']
-     │     
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: 'c'
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1197:5
-     │
-1197 │     proplists:get_keys(L).
-     │     ^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:get_keys(L).
-Expression has type:   [term()]
-Context expected type: ['a' | 'b' | 'c']
-     │     
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: 'a' | 'b' | 'c'
-    No candidate matches in the expected union.
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1202:24
-     │
-1202 │     proplists:get_keys(a).
-     │                        ^ 'a'.
-Expression has type:   'a'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1207:5
-     │    
-1207 │ ╭ ╭     proplists:get_keys(
-1208 │ │ │         [{a, b, c}]
-1209 │ │ │     ).
-     │ ╰─│─────^ proplists:get_keys([{'a', 'b', 'c'}]).
-Expression has type:   [term()]
-Context expected type: ['a']
-     │   ╰─────' 
-
-Because in the expression's type:
-  [
-    Here the type is:     term()
-    Context expects type: 'a'
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1215:5
-     │
-1215 │     proplists:get_value(k, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', L).
-Expression has type:   term()
-Context expected type: 'a' | pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1220:5
-     │
-1220 │     proplists:get_value(k, b).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('k', 'b').
-Expression has type:   term()
-Context expected type: 'a' | pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1220:28
-     │
-1220 │     proplists:get_value(k, b).
-     │                            ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1225:1
-     │
-1225 │ proplists:lookup(self(), [a, {b, true}]).
-     │ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │ │
-     │ proplists:lookup(erlang:self(), ['a', {'b', 'true'}]).
-Expression has type:   'none' | tuple()
-Context expected type: {'b', 'true'}
-     │ 
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: tuple()
-  However the following candidate: 'none'
-  Differs from the expected type:  {'b', 'true'}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1229:25
-     │
-1229 │     proplists:lookup(a, b).
-     │                         ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1239:5
-     │
-1239 │     proplists:lookup(k, []).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:lookup('k', []).
-Expression has type:   'none' | tuple()
-Context expected type: 'none'
-     │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: 'none'
-  However the following candidate: tuple()
-  Differs from the expected type:  'none'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1252:29
-     │
-1252 │     proplists:lookup_all(a, b).
-     │                             ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1265:5
-     │    
-1265 │ ╭ ╭     proplists:lookup_all(
-1266 │ │ │         self(),
-1267 │ │ │         []
-1268 │ │ │     ).
-     │ ╰─│─────^ proplists:lookup_all(erlang:self(), []).
-Expression has type:   [tuple()]
-Context expected type: []
-     │   ╰─────' 
-
-Because in the expression's type:
-  [
-    Here the type is:     tuple()
-    Context expects type: none()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1291:34
-     │
-1291 │     proplists:is_defined(self(), b).
-     │                                  ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1295:25
-     │
-1295 │     proplists:delete(k, b).
-     │                         ^ 'b'.
-Expression has type:   'b'
-Context expected type: [A]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1295:25
-     │
-1295 │     proplists:delete(k, b).
-     │                         ^ 'b'.
-Expression has type:   'b'
-Context expected type: [dynamic()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1311:5
-     │
-1311 │     proplists:split(L, Ks).
-     │     ^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     proplists:split(L, Ks).
-Expression has type:   {[[term()]], [term()]}
-Context expected type: {[plist('a', 'b')], plist('a', 'b')}
-     │     
-
-Because in the expression's type:
-  { 
-    [
-      [
-        Here the type is:     term()
-        Context expects type: 'a' | {'a', 'b'}
-        No candidate matches in the expected union.
-      ]
-    ]
-  , [term()]}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1315:21
-     │
-1315 │     proplists:split(b, []).
-     │                     ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1319:25
-     │
-1319 │     proplists:split([], b).
-     │                         ^ 'b'.
-Expression has type:   'b'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1324:22
-     │
-1324 │     proplists:to_map(b).
-     │                      ^ 'b'.
-Expression has type:   'b'
-Context expected type: [atom() | {term(), term()} | term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1358:24
-     │
-1358 │     proplists:from_map(b).
-     │                        ^ 'b'.
-Expression has type:   'b'
-Context expected type: #{K => V}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1358:24
-     │
-1358 │     proplists:from_map(b).
-     │                        ^ 'b'.
-Expression has type:   'b'
-Context expected type: #{dynamic() => dynamic()}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1363:5
-     │
-1363 │     proplists:get_value(a, [a]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('a', ['a']).
-Expression has type:   term()
-Context expected type: 'true' | 'undefined'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1368:5
-     │
-1368 │     proplists:get_value(X, [a]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value(X, ['a']).
-Expression has type:   term()
-Context expected type: 'true' | 'undefined'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1373:5
-     │
-1373 │     proplists:get_value(a, [a], b).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ proplists:get_value('a', ['a'], 'b').
-Expression has type:   term()
-Context expected type: 'true' | 'b'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1416:5
-     │
-1416 │     file:consult(some_file).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^ file:consult('some_file').
-Expression has type:   {'ok', [dynamic()]} | {'error', {number(), atom(), term()} | 'terminated' | 'badarg' | file:posix() | 'system_limit'}
-Context expected type: 'nok'
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1428:5
-     │
-1428 │     lists:keysort(2, [{a, c}, {b, d}]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lists:keysort(2, [{'a', 'c'}, {'b', 'd'}]).
-Expression has type:   [{'a', 'c'} | {'b', 'd'}]
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1432:22
-     │
-1432 │     lists:keysort(1, [3]).
-     │                      ^^^
-     │                      │
-     │                      [3].
-Expression has type:   [number()]
-Context expected type: [tuple()]
-     │                      
-
-Because in the expression's type:
-  [
-    Here the type is:     number()
-    Context expects type: tuple()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1448:5
-     │    
-1448 │ ╭ ╭     lists:filtermap(
-1449 │ │ │         fun(X) when X div 2 =:= 0 ->
-1450 │ │ │             {true, integer_to_list(X)};
-1451 │ │ │         (X) ->
-     · │ │
-1454 │ │ │         [1, 2, 3, 4]
-1455 │ │ │     ).
-     │ ╰─│─────^ lists:filtermap(fun, [1, 2, 3, 4]).
-Expression has type:   [string() | number()]
-Context expected type: [number()]
-     │   ╰─────' 
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: number()
-    However the following candidate: string()
-    Differs from the expected type:  number()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1482:5
-     │
-1482 │     erlang:min(X, Y).
-     │     ^^^^^^^^^^^^^^^^ erlang:min(X, Y).
-Expression has type:   number()
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1497:5
-     │
-1497 │     erlang:max(X, Y).
-     │     ^^^^^^^^^^^^^^^^ erlang:max(X, Y).
-Expression has type:   atom() | number()
-Context expected type: none()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1523:9
-     │
-1523 │     abs(Atom).
-     │         ^^^^ Atom.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1536:31
-     │
-1536 │ seq3_4_wip_neg() -> lists:seq(a, 2, 1).
-     │                               ^ 'a'.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1539:30
-     │
-1539 │ seq3_5_neg() -> lists:seq(1, a, 1).
-     │                              ^ 'a'.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1542:33
-     │
-1542 │ seq3_6_neg() -> lists:seq(1, 2, a).
-     │                                 ^ 'a'.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1570:31
-     │
-1570 │ seq2_4_wip_neg() -> lists:seq(a, 2).
-     │                               ^ 'a'.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1573:30
-     │
-1573 │ seq2_5_neg() -> lists:seq(1, a).
-     │                              ^ 'a'.
-Expression has type:   'a'
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1622:5
-     │  
-1622 │ ╭     timer:tc(
-1623 │ │         fun() ->
-1624 │ │             err
-1625 │ │         end
-1626 │ │     ).
-     │ ╰─────^ timer:tc(fun).
-Expression has type:   {number(), 'err'}
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1635:5
-     │
-1635 │     ets:lookup(tab, Any).
-     │     ^^^^^^^^^^^^^^^^^^^^ ets:lookup('tab', Any).
-Expression has type:   [dynamic()]
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1639:5
-     │
-1639 │     ets:lookup("not atom", Any).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ ets:lookup(string_lit, Any).
-Expression has type:   [dynamic()]
-Context expected type: pid()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1639:16
-     │
-1639 │     ets:lookup("not atom", Any).
-     │                ^^^^^^^^^^ string_lit.
-Expression has type:   string()
-Context expected type: ets:tab()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1663:18
-     │
-1663 │     ets:tab2list("not atom").
-     │                  ^^^^^^^^^^ string_lit.
-Expression has type:   string()
-Context expected type: ets:tab()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1702:23
-     │
-1702 │     lists:flatten([], 1).
-     │                       ^ 1.
-Expression has type:   number()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1711:19
-     │
-1711 │     lists:flatten(3).
-     │                   ^ 3.
-Expression has type:   number()
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1724:8
-     │
-1724 │     -> lists:flatten(X).
-     │        ^^^^^^^^^^^^^^^^
-     │        │
-     │        lists:flatten(X).
-Expression has type:   [{A, B} | {B, A}]
-Context expected type: [{A, B}]
-     │        
-
-Because in the expression's type:
-  [
-    { 
-      Here the type is:     B
-      Context expects type: A
-    , A}
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1757:5
-     │    
-1757 │ ╭ ╭     maps:without(
-1758 │ │ │         [a, c, DOrE],
-1759 │ │ │         #{
-1760 │ │ │             a => ka,
-     · │ │
-1764 │ │ │         }
-1765 │ │ │     ).
-     │ ╰─│─────^ maps:without(['a', 'c', DOrE], #{..}).
-Expression has type:   #{a => 'ka', b => atom(), c => pid(), d => 'kd'}
-Context expected type: #{b => atom()}
-     │   ╰─────' 
-
-Because in the expression's type:
-  Here the type is:     #{a => ...}
-  Context expects type: #{...}
-  The expected map has no corresponding key for: a.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1769:18
-     │
-1769 │     maps:without(non_list, #{}).
-     │                  ^^^^^^^^ 'non_list'.
-Expression has type:   'non_list'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1773:22
-     │
-1773 │     maps:without([], non_map).
-     │                      ^^^^^^^ 'non_map'.
-Expression has type:   'non_map'
-Context expected type: #{term() => term()}
-
-error: clause_not_covered (See https://fb.me/eqwalizer_errors#clause_not_covered)
-     ┌─ check/src/custom.erl:1808:1
-     │  
-1808 │ ╭ maps_without_12_neg(None) ->
-1809 │ │     maps:without(
-1810 │ │         [a, b],
-1811 │ │         None
-1812 │ │     ).
-     │ ╰─────^ Clause is not covered by spec
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1818:5
-     │    
-1818 │ ╭ ╭     maps:without(
-1819 │ │ │         Keys,
-1820 │ │ │         #{a => self(), b => self()}
-1821 │ │ │     ).
-     │ ╰─│─────^ maps:without(Keys, #{..}).
-Expression has type:   #{a => pid(), b => pid()}
-Context expected type: #{b := pid()}
-     │   ╰─────' 
-
-Because in the expression's type:
-  Here the type is:     #{b => ..., ...}
-  Context expects type: #{b := ..., ...}
-  The type of the expression is missing the following required keys: b.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1826:5
-     │    
-1826 │ ╭ ╭     maps:without(
-1827 │ │ │         [a | improper_tail],
-1828 │ │ │         #{a => self(), b => self()}
-1829 │ │ │     ).
-     │ ╰─│─────^ maps:without(['a' | 'improper_tail'], #{..}).
-Expression has type:   #{a => pid(), b => pid()}
-Context expected type: #{b := pid()}
-     │   ╰─────' 
-
-Because in the expression's type:
-  Here the type is:     #{b => ..., ...}
-  Context expects type: #{b := ..., ...}
-  The type of the expression is missing the following required keys: b.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1827:12
-     │
-1827 │         [a | improper_tail],
-     │            ^^^^^^^^^^^^^^^^ 'improper_tail'.
-Expression has type:   'improper_tail'
-Context expected type: [term()]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1837:5
-     │    
-1837 │ ╭ ╭     maps:without(
-1838 │ │ │         Keys,
-1839 │ │ │         #{a => ka, b => self()}
-1840 │ │ │     ).
-     │ ╰─│─────^ maps:without(Keys, #{..}).
-Expression has type:   #{a => 'ka', b => pid()}
-Context expected type: #{b := pid()}
-     │   ╰─────' 
-
-Because in the expression's type:
-  Here the type is:     #{b => ..., ...}
-  Context expects type: #{b := ..., ...}
-  The type of the expression is missing the following required keys: b.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1854:5
-     │
-1854 │     maps:without([a, b], M).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     maps:without(['a', 'b'], M).
-Expression has type:   #{c := 'cv', d := 'dv'} | #{c := 'cv', e => 'ev'}
-Context expected type: #{c := atom()}
-     │     
-
-Because in the expression's type:
-  Here the type is:     #{d := ...}
-  Context expects type: #{...}
-  The expected map has no corresponding key for: d.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1916:23
-     │
-1916 │     custom_overloaded(X).
-     │                       ^ X.
-Expression has type:   term()
-Context expected type: atom() | binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:1939:5
-     │
-1939 │     {A, N}.
-     │     ^^^^^^
-     │     │
-     │     {A, N}.
-Expression has type:   {atom(), number() | pid()}
-Context expected type: {atom(), number()}
-     │     
-
-Because in the expression's type:
-  { atom(), 
-    Here the type is a union type with some valid candidates: number()
-    However the following candidate: pid()
-    Differs from the expected type:  number()
-  }
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2041:5
-     │
-2041 │     filename:join(["server", "erl"]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     filename:join([string_lit, string_lit]).
-Expression has type:   file:filename_all()
-Context expected type: file:filename()
-     │     
-
-Because in the expression's type:
-  Here the type is:     string() | binary()
-  Context expects type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2046:5
-     │
-2046 │     filename:join(["server", <<>>]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     filename:join([string_lit, <<..>>]).
-Expression has type:   file:filename_all()
-Context expected type: file:filename()
-     │     
-
-Because in the expression's type:
-  Here the type is:     string() | binary()
-  Context expects type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2051:5
-     │
-2051 │     filename:join([<<>>, ""]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     filename:join([<<..>>, string_lit]).
-Expression has type:   file:filename_all()
-Context expected type: file:filename()
-     │     
-
-Because in the expression's type:
-  Here the type is:     string() | binary()
-  Context expects type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2066:5
-     │
-2066 │     filename:join([<<>>, <<>>]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     filename:join([<<..>>, <<..>>]).
-Expression has type:   file:filename_all()
-Context expected type: binary()
-     │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: string()
-  Differs from the expected type:  binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2081:19
-     │
-2081 │     filename:join([<<>>, self()]).
-     │                   ^^^^^^^^^^^^^^
-     │                   │
-     │                   [<<..>>, erlang:self()].
-Expression has type:   [binary() | pid()]
-Context expected type: [file:name_all()]
-     │                   
-
-Because in the expression's type:
-  [
-    Here the type is a union type with some valid candidates: binary()
-    However the following candidate: pid()
-    Differs from the expected type:  string() | atom() | file:deep_list() | binary()
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2086:5
-     │
-2086 │     filename:join("server", "erl").
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     filename:join(string_lit, string_lit).
-Expression has type:   file:filename_all()
-Context expected type: file:filename()
-     │     
-
-Because in the expression's type:
-  Here the type is:     string() | binary()
-  Context expects type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2091:5
-     │
-2091 │     filename:join("server", <<>>).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     filename:join(string_lit, <<..>>).
-Expression has type:   file:filename_all()
-Context expected type: file:filename()
-     │     
-
-Because in the expression's type:
-  Here the type is:     string() | binary()
-  Context expects type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2096:5
-     │
-2096 │     filename:join(<<>>, "").
-     │     ^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     filename:join(<<..>>, string_lit).
-Expression has type:   file:filename_all()
-Context expected type: file:filename()
-     │     
-
-Because in the expression's type:
-  Here the type is:     string() | binary()
-  Context expects type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2111:5
-     │
-2111 │     filename:join(atom, <<>>).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     filename:join('atom', <<..>>).
-Expression has type:   file:filename_all()
-Context expected type: binary()
-     │     
-
-Because in the expression's type:
-  Here the type is a union type with some valid candidates: binary()
-  However the following candidate: string()
-  Differs from the expected type:  binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2121:25
-     │
-2121 │     filename:join(<<>>, self()).
-     │                         ^^^^^^
-     │                         │
-     │                         erlang:self().
-Expression has type:   pid()
-Context expected type: file:name_all()
-     │                         
-
-Because in the expression's type:
-  Here the type is:     pid()
-  Context expects type: string() | atom() | file:deep_list() | binary()
-  No candidate matches in the expected union.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2150:5
-     │    
-2150 │ ╭ ╭     queue:filter(
-2151 │ │ │         fun my_filter1/1,
-2152 │ │ │         Q
-2153 │ │ │     ).
-     │ ╰─│─────^ queue:filter(my_filter1/1, Q).
-Expression has type:   queue:queue(atom() | number())
-Context expected type: queue:queue(number())
-     │   ╰─────' 
-
-Because in the expression's type:
-  { 
-    [
-      Here the type is a union type with some valid candidates: number()
-      However the following candidate: atom()
-      Differs from the expected type:  number()
-    ]
-  , [atom() | number()]}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2191:5
-     │
-2191 │     M3.
-     │     ^^
-     │     │
-     │     M3.
-Expression has type:   #{count := number(), module := 'foo'} | #{module := 'foo'}
-Context expected type: state1()
-     │     
-
-Because in the expression's type:
-  The type is a union type with some valid candidates: #{count := number(), module := 'foo'}
-  However, the following candidate doesn't match:
-  Here the type is:     #{...}
-  Context expects type: #{count := ..., ...}
-  The type of the expression is missing the following required keys: count.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2223:13
-     │
-2223 │             Atom + Sum
-     │             ^^^^ Atom.
-Expression has type:   atom()
-Context expected type: number()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2279:5
-     │
-2279 │     maps:remove(A, M).
-     │     ^^^^^^^^^^^^^^^^^
-     │     │
-     │     maps:remove(A, M).
-Expression has type:   #{a => number()}
-Context expected type: #{a := number()}
-     │     
-
-Because in the expression's type:
-  Here the type is:     #{a => ..., ...}
-  Context expects type: #{a := ..., ...}
-  The type of the expression is missing the following required keys: a.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2320:5
-     │    
-2320 │ ╭ ╭     maps:filtermap(
-2321 │ │ │         fun
-2322 │ │ │             (a, V) -> true;
-2323 │ │ │             (b, V) -> {true, atom_to_binary(V)};
-     · │ │
-2326 │ │ │         M
-2327 │ │ │     ).
-     │ ╰─│─────^ maps:filtermap(fun, M).
-Expression has type:   #{a => atom() | binary(), b => atom() | binary(), c => atom() | binary()}
-Context expected type: #{a := atom(), b := binary()}
-     │   ╰─────' 
-
-Because in the expression's type:
-  Here the type is:     #{a => ..., b => ..., ...}
-  Context expects type: #{a := ..., b := ..., ...}
-  The type of the expression is missing the following required keys: a, b.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2342:5
-     │    
-2342 │ ╭ ╭     maps:filtermap(
-2343 │ │ │         fun (_, V) ->
-2344 │ │ │             {true, atom_to_binary(V)}
-2345 │ │ │         end,
-2346 │ │ │         M
-2347 │ │ │     ).
-     │ ╰─│─────^ maps:filtermap(fun, M).
-Expression has type:   #{atom() => binary()}
-Context expected type: #{atom() => atom()}
-     │   ╰─────' 
-
-Because in the expression's type:
-  #{ atom() =>
-    Here the type is:     binary()
-    Context expects type: atom()
-  , ... }
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2354:23
-     │
-2354 │         fun (_, _) -> err end,
-     │                       ^^^
-     │                       │
-     │                       'err'.
-Expression has type:   'err'
-Context expected type: boolean() | {'true', term()}
-     │                       
-
-Because in the expression's type:
-  Here the type is:     'err'
-  Context expects type: 'false' | 'true' | {'true', term()}
-  No candidate matches in the expected union.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2362:5
-     │    
-2362 │ ╭ ╭     maps:filtermap(
-2363 │ │ │         fun (_, V) -> {true, atom_to_binary(V)} end,
-2364 │ │ │         M
-2365 │ │ │     ).
-     │ ╰─│─────^ maps:filtermap(fun, M).
-Expression has type:   #{atom() => binary()}
-Context expected type: #{atom() => atom()}
-     │   ╰─────' 
-
-Because in the expression's type:
-  #{ atom() =>
-    Here the type is:     binary()
-    Context expects type: atom()
-  , ... }
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2363:45
-     │
-2363 │         fun (_, V) -> {true, atom_to_binary(V)} end,
-     │                                             ^ V.
-Expression has type:   binary()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2377:5
-     │
-2377 │     re:replace(Subj, "+", "-", [{return, binary}]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ re:replace(Subj, string_lit, string_lit, [{'return', 'binary'}]).
-Expression has type:   binary()
-Context expected type: string()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2381:5
-     │
-2381 │     re:replace(Subj, "+", "-", [{return, list}]).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ re:replace(Subj, string_lit, string_lit, [{'return', 'list'}]).
-Expression has type:   string()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2385:22
-     │
-2385 │     Res = re:replace(Subj, "+", "-", [{return, list}]),
-     │                      ^^^^
-     │                      │
-     │                      Subj.
-Expression has type:   atom()
-Context expected type: iodata() | unicode:charlist()
-     │                      
-
-Because in the expression's type:
-  Here the type is:     atom()
-  Context expects type: iolist() | binary()
-  No candidate matches in the expected union.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2386:5
-     │
-2386 │     Res.
-     │     ^^^ Res.
-Expression has type:   string()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2390:38
-     │
-2390 │     Res = re:replace(Subj, "+", "-", [{return, something}]),
-     │                                      ^^^^^^^^^^^^^^^^^^^^^
-     │                                      │
-     │                                      [{'return', 'something'}].
-Expression has type:   [{'return', 'something'}]
-Context expected type: ['notempty_atstart' | 'noteol' | 'notbol' | 'global' | {'match_limit_recursion', number()} | re:compile_option() | {'match_limit', number()} | {'offset', number()} | 'notempty' | {'return', 'iodata' | 'list' | 'binary'} | 'anchored']
-     │                                      
-
-Because in the expression's type:
-  [
-    { 'return', 
-      Here the type is:     'something'
-      Context expects type: 'iodata' | 'list' | 'binary'
-      No candidate matches in the expected union.
-    }
-  ]
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2506:5
-     │
-2506 │     lists:partition(fun is_number/1, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     lists:partition(fun, L).
-Expression has type:   {[number()], [atom()]}
-Context expected type: {[atom()], [number()]}
-     │     
-
-Because in the expression's type:
-  { 
-    [
-      Here the type is:     number()
-      Context expects type: atom()
-    ]
-  , [atom()]}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2518:5
-     │
-2518 │     lists:partition(fun({_Term, V}) -> is_number(V) end, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     lists:partition(fun, L).
-Expression has type:   {[{term(), number()}], [{term(), atom()}]}
-Context expected type: {[{term(), atom()}], [{term(), number()}]}
-     │     
-
-Because in the expression's type:
-  { 
-    [
-      { term(), 
-        Here the type is:     number()
-        Context expects type: atom()
-      }
-    ]
-  , [{term(), atom()}]}
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2536:5
-     │
-2536 │     lists:partition(fun({ok, _}) -> true; (_) -> false end, L).
-     │     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-     │     │
-     │     lists:partition(fun, L).
-Expression has type:   {[{'ok', atom()}], [{'ok', atom()} | {'error', term()}]}
-Context expected type: {[{'ok', atom()}], [{'error', term()}]}
-     │     
-
-Because in the expression's type:
-  { [{'ok', atom()}], 
-    [
-      { 
-        Here the type is:     'ok'
-        Context expects type: 'error'
-      , atom()}
-    ]
-  }
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2576:33
-     │
-2576 │ maps_intersect_2_neg(M1, M2) -> maps:intersect(M1, M2).
-     │                                 ^^^^^^^^^^^^^^^^^^^^^^
-     │                                 │
-     │                                 maps:intersect(M1, M2).
-Expression has type:   #{a => number()}
-Context expected type: #{a := number()}
-     │                                 
-
-Because in the expression's type:
-  Here the type is:     #{a => ..., ...}
-  Context expects type: #{a := ..., ...}
-  The type of the expression is missing the following required keys: a.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2586:33
-     │
-2586 │ maps_intersect_4_neg(M1, M2) -> maps:intersect(M1, M2).
-     │                                 ^^^^^^^^^^^^^^^^^^^^^^
-     │                                 │
-     │                                 maps:intersect(M1, M2).
-Expression has type:   #{a => number()}
-Context expected type: #{a => 'true'}
-     │                                 
-
-Because in the expression's type:
-  #{ a =>
-    Here the type is:     number()
-    Context expects type: 'true'
-  , ... }
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2596:33
-     │
-2596 │ maps_intersect_6_neg(M1, M2) -> maps:intersect(M1, M2).
-     │                                 ^^^^^^^^^^^^^^^^^^^^^^
-     │                                 │
-     │                                 maps:intersect(M1, M2).
-Expression has type:   #{a => number()}
-Context expected type: #{a := number()}
-     │                                 
-
-Because in the expression's type:
-  Here the type is:     #{a => ..., ...}
-  Context expects type: #{a := ..., ...}
-  The type of the expression is missing the following required keys: a.
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2709:40
-     │
-2709 │             (foo, A) -> binary_to_atom(A);
-     │                                        ^ A.
-Expression has type:   atom()
-Context expected type: binary()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2710:40
-     │
-2710 │             (bar, B) -> atom_to_binary(B);
-     │                                        ^ B.
-Expression has type:   binary()
-Context expected type: atom()
-
-error: incompatible_types (See https://fb.me/eqwalizer_errors#incompatible_types)
-     ┌─ check/src/custom.erl:2711:50
-     │
-2711 │             ({foo, bar}, I) -> binary_to_integer(I);
-     │                                                  ^ I.
-Expression has type:   number()
-Context expected type: binary()
-
-202 ERRORS
diff --git a/crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-26.pretty b/crates/elp/src/resources/test/eqwalizer_tests/check/custom.pretty
similarity index 100%
rename from crates/elp/src/resources/test/eqwalizer_tests/check/custom-OTP-26.pretty
rename to crates/elp/src/resources/test/eqwalizer_tests/check/custom.pretty
diff --git a/test/test_projects/eqwalizer_tests/check/src/callbacks3_neg.erl b/test/test_projects/eqwalizer_tests/check/src/callbacks3_neg.erl
index f904f0e718..854feec923 100644
--- a/test/test_projects/eqwalizer_tests/check/src/callbacks3_neg.erl
+++ b/test/test_projects/eqwalizer_tests/check/src/callbacks3_neg.erl
@@ -3,7 +3,7 @@
 %%% This source code is licensed under the Apache 2.0 license found in
 %%% the LICENSE file in the root directory of this source tree.
 
--module(callbacks3_neg). % @OTPVersionDependent
+-module(callbacks3_neg). % @OTP27Only
 -export([
     init/1,
     handle_call/3,
diff --git a/test/test_projects/eqwalizer_tests/check/src/custom.erl b/test/test_projects/eqwalizer_tests/check/src/custom.erl
index 911bfa3a0a..b6910b0fc7 100644
--- a/test/test_projects/eqwalizer_tests/check/src/custom.erl
+++ b/test/test_projects/eqwalizer_tests/check/src/custom.erl
@@ -3,7 +3,7 @@
 %%% This source code is licensed under the Apache 2.0 license found in
 %%% the LICENSE file in the root directory of this source tree.
 
--module(custom). % @OTPVersionDependent
+-module(custom). % @OTP27Only
 
 -import(maps, [get/2, get/3]).
 -compile([export_all, nowarn_export_all]).

From fa0504304371ad27f99045b6d7e022a5dccc3511 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alan.zimm@gmail.com>
Date: Wed, 17 Dec 2025 09:53:03 -0800
Subject: [PATCH 379/394] Allow project discovery for OTP (#141)

Summary:
Some clients, such as emacs eglot, do their own project discovery when a new file is opened, even from the target of a go to definition.

They then launch a fresh ELP server if they determine a different project root.

In the ELP server setup we preconfigure the OTP project root as known, but with a project manifest of None. This means go to def into an OTP file ends up with an uninitialized project in the new server.

This diff makes it so that if the project root is known, but has no project manifest, we do discovery on that root.

Pull Request resolved: https://github.com/whatsapp/erlang-language-platform/pull/141

Reviewed By: robertoaloi

Differential Revision: D89169465

Pulled By: alanz

fbshipit-source-id: db180d67df98fd1f1fd61a53a93f9adfa9e93ebd
---
 crates/elp/src/project_loader.rs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/crates/elp/src/project_loader.rs b/crates/elp/src/project_loader.rs
index 103353e5db..0f13139201 100644
--- a/crates/elp/src/project_loader.rs
+++ b/crates/elp/src/project_loader.rs
@@ -100,8 +100,11 @@ impl ProjectLoader {
     ) -> Option<(ElpConfig, Result<ProjectManifest>, ProjectManifest)> {
         let mut path_it = path;
         loop {
-            if self.project_roots.contains_key(path_it) {
-                return None;
+            if let Some(value) = self.project_roots.get(path_it) {
+                return match value {
+                    None => Some(self.load_manifest(path_it)),
+                    Some(_) => None,
+                };
             }
             match path_it.parent() {
                 Some(parent) => path_it = parent,

From 54dd1089ed841440dd9709c2fc76b971e85719f4 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 18 Dec 2025 03:37:42 -0800
Subject: [PATCH 380/394] Do not run the old_edoc_syntax linter against test
 files by default

Summary:
Documentation is generally not produced for test files, so do not run the `old_edoc_syntax` linter for tests. If not, edoc references in tests should be converted to plain comments, not to `-moduledoc` or `-doc` attributes.

This behaviour can always be overwritten by setting the `severity` or the `include_tests` properties of the linter via config.

Reviewed By: alanz

Differential Revision: D89374552

fbshipit-source-id: 8a4299fcbd16a82f62efbc14f47fef46cd08fbc0
---
 crates/ide/src/diagnostics/edoc.rs | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/crates/ide/src/diagnostics/edoc.rs b/crates/ide/src/diagnostics/edoc.rs
index 052c85d57f..622a20fe13 100644
--- a/crates/ide/src/diagnostics/edoc.rs
+++ b/crates/ide/src/diagnostics/edoc.rs
@@ -31,7 +31,6 @@ use super::DiagnosticCode;
 use super::GenericLinter;
 use super::GenericLinterMatchContext;
 use super::Linter;
-use super::Severity;
 
 pub(crate) struct EdocLinter;
 
@@ -44,11 +43,8 @@ impl Linter for EdocLinter {
         "EDoc style comments are deprecated. Please use Markdown instead."
     }
 
-    fn severity(&self, sema: &Semantic, file_id: FileId) -> Severity {
-        match sema.db.is_test_suite_or_test_helper(file_id) {
-            Some(true) => Severity::WeakWarning,
-            _ => Severity::Warning,
-        }
+    fn should_process_test_files(&self) -> bool {
+        false
     }
 }
 
@@ -298,22 +294,6 @@ mod tests {
         )
     }
 
-    #[test]
-    fn test_function_doc_in_test_file() {
-        check_diagnostics(
-            r#"
-    //- /test/main_SUITE.erl extra:test
-    -module(main_SUITE).
-    %% @doc This is the main function documentation.
-    %% ^^^^ 💡 weak: W0038: EDoc style comments are deprecated. Please use Markdown instead.
-    main() ->
-      dep().
-
-    dep() -> ok.
-        "#,
-        )
-    }
-
     #[test]
     fn test_function_doc_different_arities() {
         check_diagnostics(

From 439ebade1bd580b67402572c20a81524746e3bd0 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 18 Dec 2025 03:37:42 -0800
Subject: [PATCH 381/394] Rename edoc linter into old_edoc_syntax

Summary: The old name was too generic, and could be mis-interepreted as an EDoc linter (a linter that verifies EDoc syntax). By aligning the name of the linter with the actual diagnostic code, we make the intention more clear. No functional change.

Reviewed By: alanz

Differential Revision: D89374941

fbshipit-source-id: bf8518ed9602bdceca2fcbf3ddb00990f56af529
---
 crates/ide/src/diagnostics.rs                             | 4 ++--
 .../ide/src/diagnostics/{edoc.rs => old_edoc_syntax.rs}   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename crates/ide/src/diagnostics/{edoc.rs => old_edoc_syntax.rs} (99%)

diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 733347bfcb..5341d77da7 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -102,7 +102,6 @@ mod debugging_function;
 mod dependent_header;
 mod deprecated_function;
 mod duplicate_module;
-mod edoc;
 mod effect_free_statement;
 mod equality_check_with_unnecessary_operator;
 mod eqwalizer_assists;
@@ -131,6 +130,7 @@ mod no_garbage_collect;
 mod no_nowarn_suppressions;
 mod no_size;
 mod nonstandard_integer_formatting;
+mod old_edoc_syntax;
 mod record_tuple_match;
 mod redundant_assignment;
 mod replace_call;
@@ -1682,7 +1682,7 @@ const GENERIC_LINTERS: &[&dyn GenericDiagnostics] = &[
     &duplicate_module::LINTER,
     &no_nowarn_suppressions::LINTER,
     &macro_precedence_suprise::LINTER,
-    &edoc::LINTER,
+    &old_edoc_syntax::LINTER,
     &missing_module::LINTER,
     &unused_include::LINTER,
     &misspelled_attribute::LINTER,
diff --git a/crates/ide/src/diagnostics/edoc.rs b/crates/ide/src/diagnostics/old_edoc_syntax.rs
similarity index 99%
rename from crates/ide/src/diagnostics/edoc.rs
rename to crates/ide/src/diagnostics/old_edoc_syntax.rs
index 622a20fe13..e8524b6e6e 100644
--- a/crates/ide/src/diagnostics/edoc.rs
+++ b/crates/ide/src/diagnostics/old_edoc_syntax.rs
@@ -32,9 +32,9 @@ use super::GenericLinter;
 use super::GenericLinterMatchContext;
 use super::Linter;
 
-pub(crate) struct EdocLinter;
+pub(crate) struct OldEdocSyntaxLinter;
 
-impl Linter for EdocLinter {
+impl Linter for OldEdocSyntaxLinter {
     fn id(&self) -> DiagnosticCode {
         DiagnosticCode::OldEdocSyntax
     }
@@ -54,7 +54,7 @@ pub struct Context {
     doc_start: TextSize,
 }
 
-impl GenericLinter for EdocLinter {
+impl GenericLinter for OldEdocSyntaxLinter {
     type Context = Context;
 
     fn matches(
@@ -131,7 +131,7 @@ impl GenericLinter for EdocLinter {
     }
 }
 
-pub static LINTER: EdocLinter = EdocLinter;
+pub static LINTER: OldEdocSyntaxLinter = OldEdocSyntaxLinter;
 
 fn old_edoc_syntax_fix(
     sema: &Semantic,

From 3804bd17062700a0fb575796083fbc0d2a140fc5 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 18 Dec 2025 03:37:42 -0800
Subject: [PATCH 382/394] Enable undefined_function linter in CI (prod only)

Summary:
The linter is enabled by default in ELP, and warnings appear in the IDE.
But the same linter is not explicitly added to the CI configuration, so warnings are not reported on diffs or in Contlint.

This diff enables the linter, aligning the IDE and the CI experience. It also makes it possible to track violations via ContLint.

We exclude known false positives via config.

Ideally, we would like to report undefined functions in all files, but there are too many false positives in test files to do so.
This is often due to mocked modules and test suite cleverness. We can revisit this decision in the future. See T249044930 for details.

We disable the linter for tests both in the default value (for the future) and the config (so we don't need to wait for a ELP release to land this change).

Reviewed By: alanz

Differential Revision: D89393641

fbshipit-source-id: bfb9ac760ba79566301087033af95bb805fdeaa0
---
 crates/ide/src/diagnostics/undefined_function.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/crates/ide/src/diagnostics/undefined_function.rs b/crates/ide/src/diagnostics/undefined_function.rs
index 189edf06f5..52fa2cfa3c 100644
--- a/crates/ide/src/diagnostics/undefined_function.rs
+++ b/crates/ide/src/diagnostics/undefined_function.rs
@@ -43,6 +43,13 @@ impl Linter for UndefinedFunctionLinter {
     fn should_process_generated_files(&self) -> bool {
         true
     }
+    // Ideally, we would like to report undefined functions in all files, but
+    // there are too many false positives in test files to do so.
+    // This is often due to mocked modules and test suite cleverness.
+    // We can revisit this decision in the future. See T249044930.
+    fn should_process_test_files(&self) -> bool {
+        false
+    }
 }
 
 impl FunctionCallLinter for UndefinedFunctionLinter {

From d7b1c561ad05e3ddc8b00b2b9c6969ee7e6d2b69 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Thu, 18 Dec 2025 05:36:31 -0800
Subject: [PATCH 383/394] Fix GH CI for OTP 26

Summary: As title.

Reviewed By: robertoaloi

Differential Revision: D89461312

fbshipit-source-id: 3c0c75da6ccd00735d3f444b123b0bab222d0980
---
 crates/elp/src/bin/main.rs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index e7ed9051a9..3391fe2c63 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -1595,13 +1595,15 @@ mod tests {
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
     fn lint_no_stream_produces_output(buck: bool) {
-        simple_snapshot_expect_error(
-            args_vec!["lint", "--no-stream"],
-            "diagnostics",
-            expect_file!("../resources/test/diagnostics/lint_no_stream.stdout"),
-            buck,
-            None,
-        );
+        if otp::supports_eep66_sigils() {
+            simple_snapshot_expect_error(
+                args_vec!["lint", "--no-stream"],
+                "diagnostics",
+                expect_file!("../resources/test/diagnostics/lint_no_stream.stdout"),
+                buck,
+                None,
+            );
+        }
     }
 
     #[test_case(false ; "rebar")]

From ce0125dec900b669378cda2670af5c3b7d7761e8 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Thu, 18 Dec 2025 07:05:33 -0800
Subject: [PATCH 384/394] 1/n: bound var in match: detect problem

Summary:
In non-test Erlang code, the following is almost always intended as assignment of a value to the LHS variable

```
Var = expr()
```

It is actually a match, and may fail if `Var` is already bound, and the new value differs from the old.

This diff introduces a diagnostic to warn of this case.

Reviewed By: robertoaloi

Differential Revision: D89374198

fbshipit-source-id: 19dcee50ad6e71d0a606a0eb6cf548b7194d61e6
---
 .../test/diagnostics/lint_no_stream.stdout    |   3 +
 .../diagnostics/parse_all_diagnostics1.stdout |   3 +-
 .../parse_all_diagnostics_json.stdout         |   1 +
 .../diagnostics/parse_otp27_docstrings.jsonl  |   4 +-
 ...e_elp_no_lint_specified_json_output.stdout |   2 +
 .../parse_elp_no_lint_specified_output.stdout |   2 +
 .../test/linter/warnings_as_errors.stdout     |   2 +
 crates/hir/src/lib.rs                         |   4 +
 crates/ide/src/diagnostics.rs                 |   2 +
 crates/ide/src/diagnostics/bound_variable.rs  | 178 ++++++++++++++++++
 crates/ide/src/tests.rs                       |   1 +
 crates/ide_db/src/diagnostic_code.rs          |   4 +
 website/docs/erlang-error-index/w/W0060.md    |  48 +++++
 13 files changed, 252 insertions(+), 2 deletions(-)
 create mode 100644 crates/ide/src/diagnostics/bound_variable.rs
 create mode 100644 website/docs/erlang-error-index/w/W0060.md

diff --git a/crates/elp/src/resources/test/diagnostics/lint_no_stream.stdout b/crates/elp/src/resources/test/diagnostics/lint_no_stream.stdout
index b1c2f07150..eef1c92c6d 100644
--- a/crates/elp/src/resources/test/diagnostics/lint_no_stream.stdout
+++ b/crates/elp/src/resources/test/diagnostics/lint_no_stream.stdout
@@ -45,6 +45,7 @@ app_a/src/cascading.erl:9:5-9:6::[Error] [W0004] Missing ')'
         8:7-8:10: spec for undefined function foo/0
 app_a/src/diagnostics.erl:3:10-3:27::[WeakWarning] [W0037] Unspecific include.
 app_a/src/diagnostics.erl:4:10-4:34::[WeakWarning] [W0037] Unspecific include.
+app_a/src/diagnostics.erl:12:8-12:12::[Warning] [W0060] Match on a bound variable
 app_a/src/diagnostics.erl:4:1-4:36::[Error] [L0000] Issue in included file
         [app_a/include/broken_diagnostics.hrl] 1:8-1:15: P1702: bad attribute
         [app_a/include/broken_diagnostics.hrl] 3:6-3:15: P1702: bad attribute
@@ -60,6 +61,8 @@ app_a/src/lints.erl:5:1-5:14::[Error] [P1700] head mismatch 'head_mismatcX' vs '
 app_a/src/lints.erl:4:22-4:23::[Warning] [W0018] Unexpected ';'
 app_a/src/lints.erl:2:10-2:25::[Error] [L1227] function head_mismatch/1 undefined
 app_a/src/otp27_docstrings.erl:34:9-34:24::[Warning] [W0002] Unused macro (THIS_IS_THE_END)
+app_a/src/otp27_docstrings.erl:24:5-24:6::[Warning] [W0060] Match on a bound variable
+app_a/src/otp27_docstrings.erl:30:5-30:6::[Warning] [W0060] Match on a bound variable
 app_a/src/otp27_sigils.erl:11:6-11:24::[Warning] [W0006] this statement has no effect
 app_a/src/otp27_sigils.erl:12:5-12:24::[Warning] [W0006] this statement has no effect
 app_a/src/otp27_sigils.erl:13:5-13:24::[Warning] [W0006] this statement has no effect
diff --git a/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics1.stdout b/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics1.stdout
index 7fe610f781..4b0a155055 100644
--- a/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics1.stdout
+++ b/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics1.stdout
@@ -1,9 +1,10 @@
 module specified: diagnostics
 Diagnostics reported in 1 modules:
-  diagnostics: 6
+  diagnostics: 7
       2:9-2:26::[Hint] [W0037] Unspecific include.
       3:0-3:35::[Error] [L0000] Issue in included file
       3:9-3:33::[Hint] [W0037] Unspecific include.
       5:30-5:44::[Error] [L1295] type undefined_type/0 undefined
       6:0-6:4::[Warning] [L1230] function main/1 is unused
       9:0-9:3::[Warning] [L1230] function foo/0 is unused
+      11:7-11:11::[Warning] [W0060] Match on a bound variable
diff --git a/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics_json.stdout b/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics_json.stdout
index 0c3e5ae9a3..ede82c7c5f 100644
--- a/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics_json.stdout
+++ b/crates/elp/src/resources/test/diagnostics/parse_all_diagnostics_json.stdout
@@ -4,3 +4,4 @@
 {"path":"app_a/src/diagnostics.erl","line":6,"char":31,"code":"ELP","severity":"error","name":"L1295 (L1295)","original":null,"replacement":null,"description":"type undefined_type/0 undefined\n\nFor more information see: /erlang-error-index/l/L1295","docPath":null}
 {"path":"app_a/src/diagnostics.erl","line":7,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function main/1 is unused\n\nFor more information see: /erlang-error-index/l/L1230","docPath":null}
 {"path":"app_a/src/diagnostics.erl","line":10,"char":1,"code":"ELP","severity":"warning","name":"L1230 (L1230)","original":null,"replacement":null,"description":"function foo/0 is unused\n\nFor more information see: /erlang-error-index/l/L1230","docPath":null}
+{"path":"app_a/src/diagnostics.erl","line":12,"char":8,"code":"ELP","severity":"warning","name":"W0060 (bound_var_in_lhs)","original":null,"replacement":null,"description":"Match on a bound variable\n\nFor more information see: /erlang-error-index/w/W0060","docPath":"website/docs/erlang-error-index/w/W0060.md"}
diff --git a/crates/elp/src/resources/test/diagnostics/parse_otp27_docstrings.jsonl b/crates/elp/src/resources/test/diagnostics/parse_otp27_docstrings.jsonl
index 5e286c673f..c34c9037db 100644
--- a/crates/elp/src/resources/test/diagnostics/parse_otp27_docstrings.jsonl
+++ b/crates/elp/src/resources/test/diagnostics/parse_otp27_docstrings.jsonl
@@ -1,4 +1,6 @@
 module specified: otp27_docstrings
 Diagnostics reported in 1 modules:
-  otp27_docstrings: 1
+  otp27_docstrings: 3
+      23:4-23:5::[Warning] [W0060] Match on a bound variable
+      29:4-29:5::[Warning] [W0060] Match on a bound variable
       33:8-33:23::[Warning] [W0002] Unused macro (THIS_IS_THE_END)
diff --git a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
index 6e07ea2bba..7b6a1e705c 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_json_output.stdout
@@ -5,6 +5,8 @@
 {"path":"app_a/src/app_a.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"W0011 (application_get_env)","original":null,"replacement":null,"description":"module `app_a` belongs to app `app_a`, but reads env for `misc`\n\nFor more information see: /erlang-error-index/w/W0011","docPath":"website/docs/erlang-error-index/w/W0011.md"}
 {"path":"app_a/src/app_a.erl","line":8,"char":7,"code":"ELP","severity":"warning","name":"W0018 (unexpected_semi_or_dot)","original":null,"replacement":null,"description":"Unexpected ';'\n\nFor more information see: /erlang-error-index/w/W0018","docPath":"website/docs/erlang-error-index/w/W0018.md"}
 {"path":"app_a/src/app_a.erl","line":9,"char":1,"code":"ELP","severity":"error","name":"P1700 (head_mismatch)","original":null,"replacement":null,"description":"head mismatch 'fooX' vs 'food'\n\nFor more information see: /erlang-error-index/p/P1700","docPath":null}
+{"path":"app_a/src/app_a_ssr.erl","line":7,"char":6,"code":"ELP","severity":"warning","name":"W0060 (bound_var_in_lhs)","original":null,"replacement":null,"description":"Match on a bound variable\n\nFor more information see: /erlang-error-index/w/W0060","docPath":"website/docs/erlang-error-index/w/W0060.md"}
+{"path":"app_a/src/app_a_ssr.erl","line":8,"char":6,"code":"ELP","severity":"warning","name":"W0060 (bound_var_in_lhs)","original":null,"replacement":null,"description":"Match on a bound variable\n\nFor more information see: /erlang-error-index/w/W0060","docPath":"website/docs/erlang-error-index/w/W0060.md"}
 {"path":"app_a/src/app_a_unused_param.erl","line":5,"char":5,"code":"ELP","severity":"warning","name":"L1268 (L1268)","original":null,"replacement":null,"description":"variable 'X' is unused\n\nFor more information see: /erlang-error-index/l/L1268","docPath":null}
 {"path":"app_a/src/custom_function_matches.erl","line":13,"char":5,"code":"ELP","severity":"warning","name":"W0017 (undefined_function)","original":null,"replacement":null,"description":"Function 'excluded:function/0' is undefined.\n\nFor more information see: /erlang-error-index/w/W0017","docPath":"website/docs/erlang-error-index/w/W0017.md"}
 {"path":"app_a/src/custom_function_matches.erl","line":14,"char":5,"code":"ELP","severity":"warning","name":"W0017 (undefined_function)","original":null,"replacement":null,"description":"Function 'not_excluded:function/0' is undefined.\n\nFor more information see: /erlang-error-index/w/W0017","docPath":"website/docs/erlang-error-index/w/W0017.md"}
diff --git a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
index 9f7a5405b4..5bcd503e10 100644
--- a/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
+++ b/crates/elp/src/resources/test/linter/parse_elp_no_lint_specified_output.stdout
@@ -8,6 +8,8 @@ app_a/src/app_a.erl:20:1-20:4::[Warning] [L1230] function bat/2 is unused
 app_a/src/app_a.erl:5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
 app_a/src/app_a.erl:8:7-8:8::[Warning] [W0018] Unexpected ';'
 app_a/src/app_a.erl:9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
+app_a/src/app_a_ssr.erl:7:6-7:7::[Warning] [W0060] Match on a bound variable
+app_a/src/app_a_ssr.erl:8:6-8:7::[Warning] [W0060] Match on a bound variable
 app_a/src/app_a_unused_param.erl:5:5-5:6::[Warning] [L1268] variable 'X' is unused
 app_a/src/custom_function_matches.erl:13:5-13:22::[Warning] [W0017] Function 'excluded:function/0' is undefined.
 app_a/src/custom_function_matches.erl:14:5-14:26::[Warning] [W0017] Function 'not_excluded:function/0' is undefined.
diff --git a/crates/elp/src/resources/test/linter/warnings_as_errors.stdout b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
index 00d8506230..01007e94c4 100644
--- a/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
+++ b/crates/elp/src/resources/test/linter/warnings_as_errors.stdout
@@ -8,6 +8,8 @@ app_a/src/app_a.erl:20:1-20:4::[Error] [L1230] function bat/2 is unused
 app_a/src/app_a.erl:5:5-5:35::[Warning] [W0011] module `app_a` belongs to app `app_a`, but reads env for `misc`
 app_a/src/app_a.erl:8:7-8:8::[Warning] [W0018] Unexpected ';'
 app_a/src/app_a.erl:9:1-9:5::[Error] [P1700] head mismatch 'fooX' vs 'food'
+app_a/src/app_a_ssr.erl:7:6-7:7::[Warning] [W0060] Match on a bound variable
+app_a/src/app_a_ssr.erl:8:6-8:7::[Warning] [W0060] Match on a bound variable
 app_a/src/app_a_unused_param.erl:5:5-5:6::[Error] [L1268] variable 'X' is unused
 app_a/src/custom_function_matches.erl:13:5-13:22::[Warning] [W0017] Function 'excluded:function/0' is undefined.
 app_a/src/custom_function_matches.erl:14:5-14:26::[Warning] [W0017] Function 'not_excluded:function/0' is undefined.
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 35585ef702..751a2f4907 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -232,6 +232,10 @@ impl HirIdx {
         }
     }
 
+    pub fn file_id(&self) -> FileId {
+        self.body_origin.file_id()
+    }
+
     /// This function is used to print a representation of the HIR AST
     /// corresponding to the given `HirIdx`.  It is used for debugging
     /// and testing.
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 5341d77da7..7b23da4461 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -96,6 +96,7 @@ mod application_env;
 mod atoms_exhaustion;
 mod binary_string_to_sigil;
 mod boolean_precedence;
+mod bound_variable;
 mod could_be_a_string_literal;
 mod cross_node_eval;
 mod debugging_function;
@@ -1687,6 +1688,7 @@ const GENERIC_LINTERS: &[&dyn GenericDiagnostics] = &[
     &unused_include::LINTER,
     &misspelled_attribute::LINTER,
     &boolean_precedence::LINTER,
+    &bound_variable::LINTER,
 ];
 
 /// Unified registry for all types of linters
diff --git a/crates/ide/src/diagnostics/bound_variable.rs b/crates/ide/src/diagnostics/bound_variable.rs
new file mode 100644
index 0000000000..92f0edadfa
--- /dev/null
+++ b/crates/ide/src/diagnostics/bound_variable.rs
@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is dual-licensed under either the MIT license found in the
+ * LICENSE-MIT file in the root directory of this source tree or the Apache
+ * License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+ * of this source tree. You may select, at your option, one of the
+ * above-listed licenses.
+ */
+
+// Diagnostic: bound_variable
+//
+// Return a warning if the LHS of a match already contains a bound variable.
+//
+
+use elp_ide_db::elp_base_db::FileId;
+use hir::AnyExpr;
+use hir::Expr;
+use hir::Semantic;
+use hir::Strategy;
+use hir::fold::MacroStrategy;
+use hir::fold::ParenStrategy;
+
+use crate::diagnostics::DiagnosticCode;
+use crate::diagnostics::GenericLinter;
+use crate::diagnostics::GenericLinterMatchContext;
+use crate::diagnostics::Linter;
+
+pub(crate) struct BoundVariableLinter;
+
+impl Linter for BoundVariableLinter {
+    fn id(&self) -> DiagnosticCode {
+        DiagnosticCode::BoundVarInLhs
+    }
+
+    fn description(&self) -> &'static str {
+        "Match on a bound variable"
+    }
+}
+
+impl GenericLinter for BoundVariableLinter {
+    type Context = ();
+
+    fn matches(
+        &self,
+        sema: &Semantic,
+        file_id: FileId,
+    ) -> Option<Vec<GenericLinterMatchContext<Self::Context>>> {
+        let bound_vars_by_function = sema.bound_vars_by_function(file_id);
+        let mut res = Vec::new();
+        sema.def_map(file_id)
+            .get_function_clauses()
+            .for_each(|(_, def)| {
+                if def.file.file_id == file_id
+                    && let Some(bound_vars) = bound_vars_by_function.get(&def.function_clause_id)
+                {
+                    let in_clause = def.in_clause(sema, def);
+                    in_clause.fold_clause(
+                        Strategy {
+                            macros: MacroStrategy::ExpandButIncludeMacroCall,
+                            parens: ParenStrategy::InvisibleParens,
+                        },
+                        (),
+                        &mut |acc, ctx| {
+                            if let AnyExpr::Expr(Expr::Match { lhs, rhs: _ }) = ctx.item
+                                && bound_vars.contains(&lhs)
+                                && let Some(range) = in_clause.range_for_pat(lhs)
+                                && range.file_id == def.file.file_id
+                                && ctx.in_macro.is_none()
+                            {
+                                res.push(GenericLinterMatchContext {
+                                    range: range.range,
+                                    context: (),
+                                });
+                            };
+                            acc
+                        },
+                    );
+                }
+            });
+
+        Some(res)
+    }
+}
+
+pub static LINTER: BoundVariableLinter = BoundVariableLinter;
+
+#[cfg(test)]
+mod test {
+    use elp_ide_db::DiagnosticCode;
+    use expect_test::Expect;
+
+    use crate::diagnostics::DiagnosticsConfig;
+    use crate::tests::check_diagnostics_with_config;
+    use crate::tests::check_fix_with_config;
+
+    #[track_caller]
+    pub(crate) fn check_diagnostics(fixture: &str) {
+        let config = DiagnosticsConfig::default().disable(DiagnosticCode::UndefinedFunction);
+        check_diagnostics_with_config(config, fixture)
+    }
+
+    #[track_caller]
+    pub(crate) fn check_fix(fixture_before: &str, fixture_after: Expect) {
+        let config = DiagnosticsConfig::default().disable(DiagnosticCode::UndefinedFunction);
+        check_fix_with_config(config, fixture_before, fixture_after)
+    }
+    #[test]
+    fn bound_variable() {
+        check_diagnostics(
+            r#"
+             //- /src/bound.erl
+             -module(bound).
+
+             foo() ->
+                 AA = bar(),
+                 AA = bar().
+              %% ^^ 💡 warning: W0060: Match on a bound variable
+
+            "#,
+        )
+    }
+
+    #[test]
+    fn bound_variable_not_reported_in_case() {
+        check_diagnostics(
+            r#"
+             //- /src/bound.erl
+             -module(bound).
+
+             foo(Val) ->
+                 case Val of
+                    undefined -> ok;
+                    Val when is_list(Val) -> ok
+                 end.
+
+            "#,
+        )
+    }
+
+    #[test]
+    fn bound_variable_not_reported_in_macro() {
+        check_diagnostics(
+            r#"
+             //- /src/bound.erl
+             -module(bound).
+             -include("inc.hrl").
+
+             foo(Val) ->
+                 ?A_MACRO(Val).
+             //- /src/inc.hrl
+             -define(A_MACRO(X), X=X).
+            "#,
+        )
+    }
+
+    #[test]
+    fn bound_variable_ignore_fix() {
+        check_fix(
+            r#"
+             //- /src/bound.erl
+             -module(bound).
+
+             foo() ->
+                 AA = bar(),
+                 A~A = bar().
+            "#,
+            expect_test::expect![[r#"
+                -module(bound).
+
+                foo() ->
+                    AA = bar(),
+                    % elp:ignore W0060 (bound_var_in_lhs)
+                    AA = bar().
+            "#]],
+        )
+    }
+}
diff --git a/crates/ide/src/tests.rs b/crates/ide/src/tests.rs
index f1a9065e01..55e9494e48 100644
--- a/crates/ide/src/tests.rs
+++ b/crates/ide/src/tests.rs
@@ -378,6 +378,7 @@ pub(crate) fn check_diagnostics(fixture: &str) {
         .disable(DiagnosticCode::UnspecificInclude)
         .disable(DiagnosticCode::BinaryStringToSigil)
         .disable(DiagnosticCode::HirUnresolvedMacro)
+        .disable(DiagnosticCode::BoundVarInLhs)
         .disable(DiagnosticCode::HirUnresolvedInclude);
     check_diagnostics_with_config(config, fixture)
 }
diff --git a/crates/ide_db/src/diagnostic_code.rs b/crates/ide_db/src/diagnostic_code.rs
index e9d21cadca..ec1e1d76cf 100644
--- a/crates/ide_db/src/diagnostic_code.rs
+++ b/crates/ide_db/src/diagnostic_code.rs
@@ -93,6 +93,7 @@ pub enum DiagnosticCode {
     ListsReverseAppend,
     HirUnresolvedMacro,
     HirUnresolvedInclude,
+    BoundVarInLhs,
 
     // Wrapper for erlang service diagnostic codes
     ErlangService(String),
@@ -256,6 +257,7 @@ impl DiagnosticCode {
             DiagnosticCode::HirUnresolvedMacro => "W0057".to_string(),
             DiagnosticCode::HirUnresolvedInclude => "W0058".to_string(),
             DiagnosticCode::UnavailableType => "W0059".to_string(),
+            DiagnosticCode::BoundVarInLhs => "W0060".to_string(),
             DiagnosticCode::ErlangService(c) => c.to_string(),
             DiagnosticCode::Eqwalizer(c) => format!("eqwalizer: {c}"),
             DiagnosticCode::AdHoc(c) => format!("ad-hoc: {c}"),
@@ -271,6 +273,7 @@ impl DiagnosticCode {
             DiagnosticCode::HeadMismatch => "head_mismatch".to_string(),
             DiagnosticCode::SyntaxError => "syntax_error".to_string(),
             DiagnosticCode::BoundVarInPattern => "bound_var_in_pattern".to_string(),
+            DiagnosticCode::BoundVarInLhs => "bound_var_in_lhs".to_string(),
             DiagnosticCode::ModuleMismatch => "module_mismatch".to_string(),
             DiagnosticCode::UnusedMacro => "unused_macro".to_string(),
             DiagnosticCode::UnusedRecordField => "unused_record_field".to_string(),
@@ -486,6 +489,7 @@ impl DiagnosticCode {
             DiagnosticCode::ModuleMismatch => false,
             DiagnosticCode::UnusedInclude => false,
             DiagnosticCode::BoundVarInPattern => false,
+            DiagnosticCode::BoundVarInLhs => false,
             DiagnosticCode::UnusedMacro => false,
             DiagnosticCode::UnusedRecordField => false,
             DiagnosticCode::MutableVarBug => false,
diff --git a/website/docs/erlang-error-index/w/W0060.md b/website/docs/erlang-error-index/w/W0060.md
new file mode 100644
index 0000000000..91b972dacf
--- /dev/null
+++ b/website/docs/erlang-error-index/w/W0060.md
@@ -0,0 +1,48 @@
+---
+sidebar_position: 60
+---
+
+# W0060 - Bound Variable in LHS
+
+## Error
+
+```erlang
+handle_request(Message) ->
+  Message = next_action().
+%% ^^^^^^^ 💡 warning: W0060: Match on a bound variable
+```
+
+## Explanation
+
+This diagnostic flags cases where a variable that is already bound appears on the left-hand side (LHS) of a match expression. This can be problematic if the binding is not intentional and can lead to subtle bugs.
+
+Consider the following code snippet:
+
+```erlang showLineNumbers
+foo() ->
+    AA = foo(),
+    AA = bar().
+```
+
+The pattern on line `3` will only match if and only if the result of the call to `bar/0` is the same as the call to `foo/0`. This behaviour could be intentional or not. If not, it can easily lead to bugs.
+
+An alternative, more explicit, way to express that behaviour - when intentional - could be:
+
+```erlang showLineNumbers
+foo() ->
+    AA = foo(),
+    BB = bar(),
+    AA = BB.
+```
+
+Or using an assertion:
+
+```erlang showLineNumbers
+foo() ->
+    AA = foo(),
+    ?assertEqual(AA, bar()).
+```
+
+## Semantic highlighting
+
+Note that we also have semantic highlighting of the more general case, where a bound variable appears in any pattern.

From b12cf72c7e2e4e04e92ad8aba957ee5ca86fe10d Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 18 Dec 2025 14:47:07 -0800
Subject: [PATCH 385/394] Standalone Buck2 setup for test_projects

Summary: We want to enable Buck2 tests on GitHub. This requires a bit of groundwork.

Reviewed By: michalmuskala

Differential Revision: D88959148

fbshipit-source-id: e5f88f561e061635aae05c4e3bc22382771a8908
---
 crates/elp/src/bin/main.rs                    | 119 +++++++++---------
 .../test/xref/unavailable_type.stdout         |   4 +-
 crates/project_model/src/buck.rs              |  81 +++++++-----
 test/test_projects/.buckconfig                |  24 ++++
 test/test_projects/.buckroot                  |   0
 test/test_projects/buck_bad_config/.elp.toml  |   4 +-
 test/test_projects/buck_tests/.elp.toml       |   6 +-
 .../buck_tests/test_elp/TARGETS.v2_           |  10 +-
 .../test_elp_direct_dep/TARGETS.v2_           |   4 +-
 test/test_projects/buck_tests_2/.elp.toml     |   8 +-
 test/test_projects/diagnostics/.elp.toml      |   4 +-
 test/test_projects/end_to_end/.elp.toml       |   2 +-
 .../test_projects/eqwalizer_callers/.elp.toml |   4 +-
 test/test_projects/eqwalizer_tests/.elp.toml  |   4 +-
 .../hierarchical_config/.elp.toml             |   4 +-
 test/test_projects/in_place_tests/.elp.toml   |   4 +-
 .../include_lib_dependency_test/.elp.toml     |   4 +-
 test/test_projects/linter/.elp.toml           |   4 +-
 .../test_projects/linter_bad_config/.elp.toml |   4 +-
 .../linter_bad_config/linter/.elp.toml        |   4 +-
 test/test_projects/parse_error/.elp.toml      |   4 +-
 test/test_projects/standard/.elp.toml         |   4 +-
 test/test_projects/xref/.elp.toml             |   4 +-
 23 files changed, 180 insertions(+), 130 deletions(-)
 create mode 100644 test/test_projects/.buckconfig
 create mode 100644 test/test_projects/.buckroot

diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 3391fe2c63..df99eff987 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -605,10 +605,7 @@ mod tests {
     fn eqwalize_target_diagnostics_match_snapshot_pretty() {
         if cfg!(feature = "buck") {
             simple_snapshot(
-                args_vec![
-                    "eqwalize-target",
-                    "//whatsapp/elp/test/test_projects/standard:app_a",
-                ],
+                args_vec!["eqwalize-target", "//standard:app_a",],
                 "standard",
                 expect_file!("../resources/test/standard/eqwalize_target_diagnostics.pretty"),
                 true,
@@ -985,38 +982,13 @@ mod tests {
                 Some(AbsPathBuf::assert(Utf8PathBuf::from_path_buf(abs).unwrap()));
             let content = normalise_prelude_path(content, buck_config);
 
+            let content = sort_json(&content);
+
             expect![[r#"
                 {
                   "apps": [
                     {
-                      "name": "test_exec",
-                      "dir": "/[prelude]//erlang/common_test/test_exec/src",
-                      "src_dirs": [
-                        ""
-                      ],
-                      "extra_src_dirs": [],
-                      "include_dirs": [],
-                      "macros": {}
-                    },
-                    {
-                      "name": "diagnostics_app_a",
-                      "dir": "app_a",
-                      "src_dirs": [
-                        "src"
-                      ],
-                      "extra_src_dirs": [],
-                      "include_dirs": [
-                        "include"
-                      ],
-                      "macros": {
-                        "COMMON_TEST": "true",
-                        "TEST": "true"
-                      }
-                    },
-                    {
-                      "name": "app_a_SUITE",
                       "dir": "app_a/test",
-                      "src_dirs": [],
                       "extra_src_dirs": [
                         ""
                       ],
@@ -1024,61 +996,88 @@ mod tests {
                       "macros": {
                         "COMMON_TEST": "true",
                         "TEST": "true"
-                      }
+                      },
+                      "name": "app_a_SUITE",
+                      "src_dirs": []
                     },
                     {
-                      "name": "common",
-                      "dir": "/[prelude]//erlang/common_test/common",
+                      "dir": "/[prelude]//erlang/common_test/test_exec/src",
+                      "extra_src_dirs": [],
+                      "include_dirs": [],
+                      "macros": {},
+                      "name": "test_exec",
                       "src_dirs": [
-                        "src"
-                      ],
+                        ""
+                      ]
+                    },
+                    {
+                      "dir": "/[prelude]//erlang/common_test/common",
                       "extra_src_dirs": [],
                       "include_dirs": [
                         "include"
                       ],
-                      "macros": {}
+                      "macros": {},
+                      "name": "common",
+                      "src_dirs": [
+                        "src"
+                      ]
                     },
                     {
-                      "name": "cth_hooks",
                       "dir": "/[prelude]//erlang/common_test/cth_hooks/src",
-                      "src_dirs": [
-                        ""
-                      ],
                       "extra_src_dirs": [],
                       "include_dirs": [
                         ""
                       ],
-                      "macros": {}
+                      "macros": {},
+                      "name": "cth_hooks",
+                      "src_dirs": [
+                        ""
+                      ]
                     },
                     {
-                      "name": "buck2_shell_utils",
                       "dir": "/[prelude]//erlang/shell/src",
-                      "src_dirs": [
-                        ""
-                      ],
                       "extra_src_dirs": [],
                       "include_dirs": [],
-                      "macros": {}
+                      "macros": {},
+                      "name": "buck2_shell_utils",
+                      "src_dirs": [
+                        ""
+                      ]
+                    },
+                    {
+                      "dir": "app_a",
+                      "extra_src_dirs": [],
+                      "include_dirs": [
+                        "include"
+                      ],
+                      "macros": {
+                        "COMMON_TEST": "true",
+                        "TEST": "true"
+                      },
+                      "name": "diagnostics_app_a",
+                      "src_dirs": [
+                        "src"
+                      ]
                     },
                     {
-                      "name": "test_binary",
                       "dir": "/[prelude]//erlang/common_test/test_binary/src",
-                      "src_dirs": [
-                        ""
-                      ],
                       "extra_src_dirs": [],
                       "include_dirs": [],
-                      "macros": {}
+                      "macros": {},
+                      "name": "test_binary",
+                      "src_dirs": [
+                        ""
+                      ]
                     },
                     {
-                      "name": "test_cli_lib",
                       "dir": "/[prelude]//erlang/common_test/test_cli_lib/src",
-                      "src_dirs": [
-                        ""
-                      ],
                       "extra_src_dirs": [],
                       "include_dirs": [],
-                      "macros": {}
+                      "macros": {},
+                      "name": "test_cli_lib",
+                      "src_dirs": [
+                        ""
+                      ]
                     }
                   ],
                   "deps": []
@@ -1093,6 +1092,12 @@ mod tests {
         content.replace(prelude_cell, "/[prelude]/")
     }
 
+    fn sort_json(content: &str) -> String {
+        let mut json: serde_json::Value = serde_json::from_str(content).unwrap();
+        json.sort_all_objects();
+        serde_json::to_string_pretty(&json).unwrap()
+    }
+
     #[test]
     #[ignore]
     fn build_info_json_buck_bxl_generated() {
diff --git a/crates/elp/src/resources/test/xref/unavailable_type.stdout b/crates/elp/src/resources/test/xref/unavailable_type.stdout
index b6338343c0..688be17de3 100644
--- a/crates/elp/src/resources/test/xref/unavailable_type.stdout
+++ b/crates/elp/src/resources/test/xref/unavailable_type.stdout
@@ -1,5 +1,5 @@
 Reporting all diagnostics codes
 module specified: unavailable_type
 Diagnostics reported:
-app_a/src/unavailable_type.erl:10:43-10:58::[Warning] [W0059] The type 'app_c:my_type_c/0' is defined in application 'app_c', but the application is not a dependency of 'app_a' (defined in 'fbcode//whatsapp/elp/test/test_projects/xref:app_a').
-app_a/src/unavailable_type.erl:6:16-6:31::[Warning] [W0059] The type 'app_c:my_type_c/0' is defined in application 'app_c', but the application is not a dependency of 'app_a' (defined in 'fbcode//whatsapp/elp/test/test_projects/xref:app_a').
+app_a/src/unavailable_type.erl:10:43-10:58::[Warning] [W0059] The type 'app_c:my_type_c/0' is defined in application 'app_c', but the application is not a dependency of 'app_a' (defined in 'root//xref:app_a').
+app_a/src/unavailable_type.erl:6:16-6:31::[Warning] [W0059] The type 'app_c:my_type_c/0' is defined in application 'app_c', but the application is not a dependency of 'app_a' (defined in 'root//xref:app_a').
diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index bb3ec38b5f..96fc1eac89 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -58,6 +58,7 @@ lazy_static! {
 }
 
 const ERL_EXT: &str = "erl";
+const BUCK_ISOLATION_DIR: &str = "lsp";
 
 #[derive(
     Debug,
@@ -108,7 +109,7 @@ impl BuckConfig {
         cmd.env_remove("RUST_BACKTRACE")
             .env_remove("RUST_LIB_BACKTRACE");
         cmd.arg("--isolation-dir");
-        cmd.arg("lsp");
+        cmd.arg(BUCK_ISOLATION_DIR);
         cmd.current_dir(self.buck_root());
         CommandProxy::new(guard, cmd)
     }
@@ -1362,36 +1363,56 @@ fn include_path_from_file(path: &AbsPath) -> AbsPathBuf {
     }
 }
 
+fn check_buck_output_success(mut command: CommandProxy<'_>) -> Result<String> {
+    let output = command.output()?;
+    if output.status.success() {
+        return String::from_utf8(output.stdout)
+            .map_err(|e| anyhow::anyhow!("Invalid UTF-8 in stdout for `{command}`: {e}"));
+    }
+    let reason = match output.status.code() {
+        Some(code) => format!("Exited with status code: {code}"),
+        None => "Process terminated by signal".to_string(),
+    };
+    let details = String::from_utf8(output.stderr).unwrap_or_default();
+    bail!("Command `{command}` failed. Reason: {reason}. Details: {details}");
+}
+
 /// This is used in tests
 pub fn get_prelude_cell(buck_config: &BuckConfig) -> Result<String> {
-    let output = buck_config
-        .buck_command()
+    let mut command = buck_config.buck_command();
+    command
         .arg("audit")
         .arg("cell")
         .arg("prelude")
-        .output()?;
-    if !output.status.success() {
-        let reason = match output.status.code() {
-            Some(code) => format!("Exited with status code: {code}"),
-            None => "Process terminated by signal".to_string(),
-        };
-        let details = match String::from_utf8(output.stderr) {
-            Ok(err) => err,
-            Err(_) => "".to_string(),
-        };
-        bail!("Error evaluating Buck2 query Reason: {reason}. Details: {details}",);
-    }
-    let raw_output = String::from_utf8(output.stdout)?;
+        .arg("--json");
+    let raw_output = check_buck_output_success(command)?;
 
-    lazy_static! {
-        static ref RE: Regex = Regex::new(r"^prelude: ([^\s]+)").unwrap();
+    let json: serde_json::Value = serde_json::from_str(&raw_output)?;
+    let prelude_path = json
+        .get("prelude")
+        .and_then(|v| v.as_str())
+        .ok_or_else(|| anyhow::anyhow!("Could not find prelude path in Buck2 output"))?
+        .to_string();
+
+    if Path::new(&prelude_path).exists() {
+        Ok(prelude_path)
+    } else {
+        get_prelude_cell_bundled(buck_config)
     }
-    let string = RE
-        .captures_iter(&raw_output)
-        .next()
-        .map(|c| c[1].to_string())
-        .unwrap();
-    Ok(string)
+}
+
+fn get_prelude_cell_bundled(buck_config: &BuckConfig) -> Result<String> {
+    let mut command = buck_config.buck_command();
+    command.arg("root");
+    let root = check_buck_output_success(command)?;
+    let root = root.trim();
+    let bundled_prelude_path = Path::new(&root)
+        .join("buck-out")
+        .join(BUCK_ISOLATION_DIR)
+        .join("external_cells")
+        .join("bundled")
+        .join("prelude");
+    Ok(bundled_prelude_path.to_string_lossy().to_string())
 }
 
 #[cfg(test)]
@@ -1655,7 +1676,7 @@ mod tests {
                 .arg("--")
                 .args(generated_args)
                 .arg("--included_targets")
-                .arg("fbcode//whatsapp/elp/test/test_projects/buck_tests_2/auto_gen/...")
+                .arg("root//buck_tests_2/auto_gen/...")
                 .output()
                 .unwrap();
             if !output.status.success() {
@@ -1679,7 +1700,7 @@ mod tests {
                 false,
                 expect![[r#"
                 {
-                  "fbcode//whatsapp/elp/test/test_projects/buck_tests_2/auto_gen/auto_gen_a:auto_gen_a": {
+                  "root//buck_tests_2/auto_gen/auto_gen_a:auto_gen_a": {
                     "name": "auto_gen_a",
                     "app_name": null,
                     "suite": null,
@@ -1697,7 +1718,7 @@ mod tests {
                     "included_apps": [],
                     "origin": "app"
                   },
-                  "fbcode//whatsapp/elp/test/test_projects/buck_tests_2/auto_gen/auto_gen_a:generated_srcs": {
+                  "root//buck_tests_2/auto_gen/auto_gen_a:generated_srcs": {
                     "name": "generated_srcs",
                     "app_name": null,
                     "suite": null,
@@ -1842,13 +1863,13 @@ mod tests {
     fn build_info_buck_bxl_generated_query() {
         if BUCK_TESTS_ENABLED {
             // Note that there is now a value for `srcs` in the
-            // "fbcode//whatsapp/elp/test/test_projects/buck_tests_2/auto_gen/auto_gen_a:generated_srcs"
+            // "root//buck_tests_2/auto_gen/auto_gen_a:generated_srcs"
             // target
             check_buck_bxl_query(
                 true,
                 expect![[r#"
                     {
-                      "fbcode//whatsapp/elp/test/test_projects/buck_tests_2/auto_gen/auto_gen_a:auto_gen_a": {
+                      "root//buck_tests_2/auto_gen/auto_gen_a:auto_gen_a": {
                         "name": "auto_gen_a",
                         "app_name": null,
                         "suite": null,
@@ -1866,7 +1887,7 @@ mod tests {
                         "included_apps": [],
                         "origin": "app"
                       },
-                      "fbcode//whatsapp/elp/test/test_projects/buck_tests_2/auto_gen/auto_gen_a:generated_srcs": {
+                      "root//buck_tests_2/auto_gen/auto_gen_a:generated_srcs": {
                         "name": "generated_srcs",
                         "app_name": null,
                         "suite": null,
diff --git a/test/test_projects/.buckconfig b/test/test_projects/.buckconfig
new file mode 100644
index 0000000000..f14e564a7d
--- /dev/null
+++ b/test/test_projects/.buckconfig
@@ -0,0 +1,24 @@
+[cells]
+  root = .
+  prelude = prelude
+  toolchains = toolchains
+  none = none
+
+[cell_aliases]
+  config = prelude
+  ovr_config = prelude
+  fbcode = none
+  fbsource = none
+  fbcode_macros = none
+  buck = none
+
+[external_cells]
+  prelude = bundled
+
+[parser]
+  target_platform_detector_spec = target:root//...->prelude//platforms:default \
+    target:prelude//...->prelude//platforms:default \
+    target:toolchains//...->prelude//platforms:default
+
+[build]
+  execution_platforms = prelude//platforms:default
diff --git a/test/test_projects/.buckroot b/test/test_projects/.buckroot
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/test_projects/buck_bad_config/.elp.toml b/test/test_projects/buck_bad_config/.elp.toml
index a4d80e289f..963072284c 100644
--- a/test/test_projects/buck_bad_config/.elp.toml
+++ b/test/test_projects/buck_bad_config/.elp.toml
@@ -1,8 +1,8 @@
 [buck]
 enabled = true
 build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test/test_projects/buck_bad_config/..." ]
-source_root = "whatsapp/elp/test/test_projects/buck_bad_config"
+included_targets = [ "root//buck_bad_config/..." ]
+source_root = "buck_bad_config"
 
 [eqwalizer]
 enable_all = false
diff --git a/test/test_projects/buck_tests/.elp.toml b/test/test_projects/buck_tests/.elp.toml
index 0fbba8f0d6..b38d6f043f 100644
--- a/test/test_projects/buck_tests/.elp.toml
+++ b/test/test_projects/buck_tests/.elp.toml
@@ -1,9 +1,9 @@
 [buck]
 enabled = true
 build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test/test_projects/buck_tests/..." ]
-excluded_targets = [ "fbcode//whatsapp/elp/test/test_projects/buck_tests:test_elp_ignored" ]
-source_root = "whatsapp/elp/test/test_projects/buck_tests"
+included_targets = [ "root//buck_tests/..." ]
+excluded_targets = [ "buck_tests:test_elp_ignored" ]
+source_root = "buck_tests"
 
 [eqwalizer]
 enable_all = false
diff --git a/test/test_projects/buck_tests/test_elp/TARGETS.v2_ b/test/test_projects/buck_tests/test_elp/TARGETS.v2_
index 528f2dbc2a..7e5bd95db5 100644
--- a/test/test_projects/buck_tests/test_elp/TARGETS.v2_
+++ b/test/test_projects/buck_tests/test_elp/TARGETS.v2_
@@ -7,11 +7,11 @@ erlang_application(
     ]),
     app_src = "src/test_elp.app.src",
     applications = [
-        "//whatsapp/elp/test/test_projects/buck_tests/test_elp_direct_dep:test_elp_direct_dep",
-        "//whatsapp/elp/test/test_projects/buck_tests:test_elp_no_private_headers",
-        "//whatsapp/elp/test/test_projects/buck_tests:test_elp_no_public_headers",
-        "//whatsapp/elp/test/test_projects/buck_tests:test_elp_flat_outside_target",
-        "//whatsapp/elp/test/test_projects/buck_tests/test_elp_flat_inside_target:test_elp_flat_inside_target",
+        "//buck_tests/test_elp_direct_dep:test_elp_direct_dep",
+        "//buck_tests:test_elp_no_private_headers",
+        "//buck_tests:test_elp_no_public_headers",
+        "//buck_tests:test_elp_flat_outside_target",
+        "//buck_tests/test_elp_flat_inside_target:test_elp_flat_inside_target",
     ],
     includes = glob(["include/*.hrl"]),
     version = "1.0.0",
diff --git a/test/test_projects/buck_tests/test_elp_direct_dep/TARGETS.v2_ b/test/test_projects/buck_tests/test_elp_direct_dep/TARGETS.v2_
index dd46a58842..a752b99087 100644
--- a/test/test_projects/buck_tests/test_elp_direct_dep/TARGETS.v2_
+++ b/test/test_projects/buck_tests/test_elp_direct_dep/TARGETS.v2_
@@ -5,10 +5,10 @@ erlang_application(
         "src/*.hrl",
     ]),
     applications = [
-        "//whatsapp/elp/test/test_projects/buck_tests/test_elp_transitive_dep:test_elp_transitive_dep",
+        "//buck_tests/test_elp_transitive_dep:test_elp_transitive_dep",
     ],
     extra_includes = [
-        "//whatsapp/elp/test/test_projects/buck_tests/test_elp:test_elp",
+        "//buck_tests/test_elp:test_elp",
     ],
     includes = glob(["include/*.hrl"]),
     version = "1.0.0",
diff --git a/test/test_projects/buck_tests_2/.elp.toml b/test/test_projects/buck_tests_2/.elp.toml
index 102f44c3f5..e71eb6a819 100644
--- a/test/test_projects/buck_tests_2/.elp.toml
+++ b/test/test_projects/buck_tests_2/.elp.toml
@@ -2,11 +2,11 @@
 enabled = true
 build_deps = false
 included_targets = [
-    "fbcode//whatsapp/elp/test/test_projects/buck_tests_2/util/app_a/...",
-    "fbcode//whatsapp/elp/test/test_projects/buck_tests_2:check_include"
+    "root//buck_tests_2/util/app_a/...",
+    "root//buck_tests_2:check_include"
     ]
-excluded_targets = [ "fbcode//whatsapp/elp/test/test_projects/buck_tests_2:test_elp_ignored" ]
-source_root = "whatsapp/elp/test/test_projects/buck_tests_2"
+excluded_targets = [ "root//buck_tests_2:test_elp_ignored" ]
+source_root = "buck_tests_2"
 
 [eqwalizer]
 enable_all = false
diff --git a/test/test_projects/diagnostics/.elp.toml b/test/test_projects/diagnostics/.elp.toml
index 44c9516105..504ef547af 100644
--- a/test/test_projects/diagnostics/.elp.toml
+++ b/test/test_projects/diagnostics/.elp.toml
@@ -1,8 +1,8 @@
 [buck]
 enabled = true
 build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test/test_projects/diagnostics/..." ]
-source_root = "whatsapp/elp/test/test_projects/diagnostics"
+included_targets = [ "root//diagnostics/..." ]
+source_root = "diagnostics"
 
 [eqwalizer]
 enable_all = false
diff --git a/test/test_projects/end_to_end/.elp.toml b/test/test_projects/end_to_end/.elp.toml
index 4d685a40c7..acbcd6146f 100644
--- a/test/test_projects/end_to_end/.elp.toml
+++ b/test/test_projects/end_to_end/.elp.toml
@@ -1,7 +1,7 @@
 [buck]
 enabled = true
 build_deps = false
-included_targets = ["fbcode//whatsapp/elp/test/test_projects/end_to_end/..."]
+included_targets = ["root//end_to_end/..."]
 
 [eqwalizer]
 enable_all = false
diff --git a/test/test_projects/eqwalizer_callers/.elp.toml b/test/test_projects/eqwalizer_callers/.elp.toml
index b0c2b55a5b..68476bcf2e 100644
--- a/test/test_projects/eqwalizer_callers/.elp.toml
+++ b/test/test_projects/eqwalizer_callers/.elp.toml
@@ -1,5 +1,5 @@
 [buck]
 enabled = true
 build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test/test_projects/eqwalizer_callers/..." ]
-source_root = "whatsapp/elp/test/test_projects/eqwalizer_callers"
+included_targets = [ "root//eqwalizer_callers/..." ]
+source_root = "eqwalizer_callers"
diff --git a/test/test_projects/eqwalizer_tests/.elp.toml b/test/test_projects/eqwalizer_tests/.elp.toml
index 9586666619..5dac3aa6a6 100644
--- a/test/test_projects/eqwalizer_tests/.elp.toml
+++ b/test/test_projects/eqwalizer_tests/.elp.toml
@@ -1,8 +1,8 @@
 [buck]
 enabled = true
 build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test/test_projects/eqwalizer_tests/..." ]
-source_root = "whatsapp/elp/test/test_projects/eqwalizer_tests"
+included_targets = [ "root//eqwalizer_tests/..." ]
+source_root = "eqwalizer_tests"
 
 [eqwalizer]
 enable_all = true
diff --git a/test/test_projects/hierarchical_config/.elp.toml b/test/test_projects/hierarchical_config/.elp.toml
index a650134c9f..e4d04eb6e0 100644
--- a/test/test_projects/hierarchical_config/.elp.toml
+++ b/test/test_projects/hierarchical_config/.elp.toml
@@ -1,5 +1,5 @@
 [buck]
 enabled = true
 build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test/test_projects/hierarchical_config/..." ]
-source_root = "whatsapp/elp/test/test_projects/hierarchical_config"
+included_targets = [ "root//hierarchical_config/..." ]
+source_root = "hierarchical_config"
diff --git a/test/test_projects/in_place_tests/.elp.toml b/test/test_projects/in_place_tests/.elp.toml
index 64140d2852..70edcc3f03 100644
--- a/test/test_projects/in_place_tests/.elp.toml
+++ b/test/test_projects/in_place_tests/.elp.toml
@@ -1,5 +1,5 @@
 [buck]
 enabled = true
 build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test/test_projects/in_place_tests/..." ]
-source_root = "whatsapp/elp/test/test_projects/in_place_tests"
+included_targets = [ "root//in_place_tests/..." ]
+source_root = "in_place_tests"
diff --git a/test/test_projects/include_lib_dependency_test/.elp.toml b/test/test_projects/include_lib_dependency_test/.elp.toml
index 02b5b7d244..9d1c859339 100644
--- a/test/test_projects/include_lib_dependency_test/.elp.toml
+++ b/test/test_projects/include_lib_dependency_test/.elp.toml
@@ -1,5 +1,5 @@
 [buck]
 enabled = true
 build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test/test_projects/include_lib_dependency_test/..." ]
-source_root = "whatsapp/elp/test/test_projects/include_lib_dependency_test"
+included_targets = [ "root//include_lib_dependency_test/..." ]
+source_root = "include_lib_dependency_test"
diff --git a/test/test_projects/linter/.elp.toml b/test/test_projects/linter/.elp.toml
index bc8b86088c..4820625b2d 100644
--- a/test/test_projects/linter/.elp.toml
+++ b/test/test_projects/linter/.elp.toml
@@ -1,5 +1,5 @@
 [buck]
 enabled = true
 build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test/test_projects/linter/..." ]
-source_root = "whatsapp/elp/test/test_projects/linter"
+included_targets = [ "root//linter/..." ]
+source_root = "linter"
diff --git a/test/test_projects/linter_bad_config/.elp.toml b/test/test_projects/linter_bad_config/.elp.toml
index bc8b86088c..4820625b2d 100644
--- a/test/test_projects/linter_bad_config/.elp.toml
+++ b/test/test_projects/linter_bad_config/.elp.toml
@@ -1,5 +1,5 @@
 [buck]
 enabled = true
 build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test/test_projects/linter/..." ]
-source_root = "whatsapp/elp/test/test_projects/linter"
+included_targets = [ "root//linter/..." ]
+source_root = "linter"
diff --git a/test/test_projects/linter_bad_config/linter/.elp.toml b/test/test_projects/linter_bad_config/linter/.elp.toml
index bc8b86088c..4820625b2d 100644
--- a/test/test_projects/linter_bad_config/linter/.elp.toml
+++ b/test/test_projects/linter_bad_config/linter/.elp.toml
@@ -1,5 +1,5 @@
 [buck]
 enabled = true
 build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test/test_projects/linter/..." ]
-source_root = "whatsapp/elp/test/test_projects/linter"
+included_targets = [ "root//linter/..." ]
+source_root = "linter"
diff --git a/test/test_projects/parse_error/.elp.toml b/test/test_projects/parse_error/.elp.toml
index a38e24f657..1a06a42f0d 100644
--- a/test/test_projects/parse_error/.elp.toml
+++ b/test/test_projects/parse_error/.elp.toml
@@ -1,8 +1,8 @@
 [buck]
 enabled = true
 build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test/test_projects/parse_error/..." ]
-source_root = "whatsapp/elp/test/test_projects/parse_error"
+included_targets = [ "root//parse_error/..." ]
+source_root = "parse_error"
 
 [eqwalizer]
 enable_all = false
diff --git a/test/test_projects/standard/.elp.toml b/test/test_projects/standard/.elp.toml
index 29b2e051a4..f5e2ac1943 100644
--- a/test/test_projects/standard/.elp.toml
+++ b/test/test_projects/standard/.elp.toml
@@ -1,5 +1,5 @@
 [buck]
 enabled = true
 build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test/test_projects/standard/..." ]
-source_root = "whatsapp/elp/test/test_projects/standard"
+included_targets = [ "root//standard/..." ]
+source_root = "standard"
diff --git a/test/test_projects/xref/.elp.toml b/test/test_projects/xref/.elp.toml
index 0b684fba14..87c2f17334 100644
--- a/test/test_projects/xref/.elp.toml
+++ b/test/test_projects/xref/.elp.toml
@@ -1,5 +1,5 @@
 [buck]
 enabled = true
 build_deps = false
-included_targets = [ "fbcode//whatsapp/elp/test/test_projects/xref/..." ]
-source_root = "whatsapp/elp/test/test_projects/xref"
+included_targets = [ "root//xref/..." ]
+source_root = "xref"

From 8b4c5335271fab6ecbe9642d4db7c392092783bb Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Thu, 18 Dec 2025 23:41:12 -0800
Subject: [PATCH 386/394] Convert EDoc syntax to plain comments in
 codegen_test_SUITE

Summary:
Convert old EDoc style syntax (%%% doc, end) in test suite to plain
comments. EDoc documentation is unnecessary in test suites.

Differential Revision: D89526339

fbshipit-source-id: 0111f2ded79a7e802d29b95d6b79889e0a55af32
---
 .../codegen_test/app_a/test/codegen_test_SUITE.erl            | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/test_projects/codegen_test/app_a/test/codegen_test_SUITE.erl b/test/test_projects/codegen_test/app_a/test/codegen_test_SUITE.erl
index 797c3c58f3..3c0135dcee 100644
--- a/test/test_projects/codegen_test/app_a/test/codegen_test_SUITE.erl
+++ b/test/test_projects/codegen_test/app_a/test/codegen_test_SUITE.erl
@@ -1,8 +1,4 @@
-%%%-------------------------------------------------------------------
-%%% @doc
 %%% Test suite for code generation functionality
-%%% @end
-%%%-------------------------------------------------------------------
 -module(codegen_test_SUITE).
 
 -include_lib("stdlib/include/assert.hrl").

From 8cb6ac76207aa6af0def85c2cb17a4cb1226ec63 Mon Sep 17 00:00:00 2001
From: Facebook Community Bot <facebook-github-bot@users.noreply.github.com>
Date: Fri, 19 Dec 2025 02:51:11 -0800
Subject: [PATCH 387/394] Re-sync with internal repository (#144)

The internal and external repositories are out of sync. This Pull Request attempts to brings them back in sync by patching the GitHub repository. Please carefully review this patch. You must disable ShipIt for your project in order to merge this pull request. DO NOT IMPORT this pull request. Instead, merge it directly on GitHub using the MERGE BUTTON. Re-enable ShipIt after merging.

fbshipit-source-id: 39bc64c1a96888b1034f7807ced9b7b2365df04e
---
 test/test_projects/buck_bad_config/BUCK       | 14 ++++
 test/test_projects/buck_tests_2/BUCK          | 41 ++++++++++
 .../buck_tests_2/auto_gen/auto_gen_a/BUCK     | 25 ++++++
 .../test_projects/buck_tests_2/generated/BUCK | 12 +++
 .../buck_tests_2/util/app_a/BUCK              | 16 ++++
 test/test_projects/codegen_test/BUCK          | 78 +++++++++++++++++++
 test/test_projects/diagnostics/BUCK           | 20 +++++
 .../end_to_end/assist_examples/BUCK           | 14 ++++
 .../test_projects/end_to_end/definitions/BUCK | 14 ++++
 test/test_projects/end_to_end/docs/BUCK       | 16 ++++
 test/test_projects/end_to_end/hover/BUCK      | 14 ++++
 .../end_to_end/single_errors/BUCK             | 14 ++++
 test/test_projects/eqwalizer_callers/BUCK     | 19 +++++
 test/test_projects/eqwalizer_tests/BUCK       | 77 ++++++++++++++++++
 test/test_projects/hierarchical_config/BUCK   | 23 ++++++
 test/test_projects/in_place_tests/BUCK        | 19 +++++
 .../include_lib_dependency_test/BUCK          | 43 ++++++++++
 test/test_projects/linter/BUCK                | 41 ++++++++++
 test/test_projects/linter_bad_config/BUCK     | 12 +++
 .../linter_bad_config/linter/BUCK             | 41 ++++++++++
 test/test_projects/parse_error/BUCK           |  9 +++
 test/test_projects/standard/BUCK              | 49 ++++++++++++
 test/test_projects/toolchains/BUCK            |  5 ++
 test/test_projects/xref/BUCK                  | 25 ++++++
 24 files changed, 641 insertions(+)
 create mode 100644 test/test_projects/buck_bad_config/BUCK
 create mode 100644 test/test_projects/buck_tests_2/BUCK
 create mode 100644 test/test_projects/buck_tests_2/auto_gen/auto_gen_a/BUCK
 create mode 100644 test/test_projects/buck_tests_2/generated/BUCK
 create mode 100644 test/test_projects/buck_tests_2/util/app_a/BUCK
 create mode 100644 test/test_projects/codegen_test/BUCK
 create mode 100644 test/test_projects/diagnostics/BUCK
 create mode 100644 test/test_projects/end_to_end/assist_examples/BUCK
 create mode 100644 test/test_projects/end_to_end/definitions/BUCK
 create mode 100644 test/test_projects/end_to_end/docs/BUCK
 create mode 100644 test/test_projects/end_to_end/hover/BUCK
 create mode 100644 test/test_projects/end_to_end/single_errors/BUCK
 create mode 100644 test/test_projects/eqwalizer_callers/BUCK
 create mode 100644 test/test_projects/eqwalizer_tests/BUCK
 create mode 100644 test/test_projects/hierarchical_config/BUCK
 create mode 100644 test/test_projects/in_place_tests/BUCK
 create mode 100644 test/test_projects/include_lib_dependency_test/BUCK
 create mode 100644 test/test_projects/linter/BUCK
 create mode 100644 test/test_projects/linter_bad_config/BUCK
 create mode 100644 test/test_projects/linter_bad_config/linter/BUCK
 create mode 100644 test/test_projects/parse_error/BUCK
 create mode 100644 test/test_projects/standard/BUCK
 create mode 100644 test/test_projects/toolchains/BUCK
 create mode 100644 test/test_projects/xref/BUCK

diff --git a/test/test_projects/buck_bad_config/BUCK b/test/test_projects/buck_bad_config/BUCK
new file mode 100644
index 0000000000..498c769dac
--- /dev/null
+++ b/test/test_projects/buck_bad_config/BUCK
@@ -0,0 +1,14 @@
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "bad_app",
+    srcs = glob(["src/*.erl"]),
+    applications = [
+        "root//buck_bad_config/non_existent:missing",
+    ],
+    includes = glob(
+        ["include/*.hrl"],
+        exclude = ["include/junk.hrl"],
+    ),
+    version = "1.0.0",
+)
diff --git a/test/test_projects/buck_tests_2/BUCK b/test/test_projects/buck_tests_2/BUCK
new file mode 100644
index 0000000000..b01fdb868c
--- /dev/null
+++ b/test/test_projects/buck_tests_2/BUCK
@@ -0,0 +1,41 @@
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "check_include",
+    srcs = [
+        "check_include/src/top_includer.erl",
+    ],
+    applications = [
+        "common_test",
+        "stdlib",
+        "root//buck_tests_2:check_include_separate_1",
+        "root//buck_tests_2:check_include_separate_2",
+    ],
+    includes = [],
+    labels = [],
+    resources = [],
+)
+
+erlang_application(
+    name = "check_include_separate_1",
+    srcs = glob([
+        "src/*.erl",
+    ]),
+    applications = [
+    ],
+    includes = [
+        "check_include_separate_1/include/top_includer.hrl",
+    ],
+    resources = [],
+)
+
+erlang_application(
+    name = "check_include_separate_2",
+    srcs = glob([
+        "src/*.erl",
+    ]),
+    applications = [
+    ],
+    includes = glob(["check_include_separate_2/include/*.hrl"]),
+    resources = [],
+)
diff --git a/test/test_projects/buck_tests_2/auto_gen/auto_gen_a/BUCK b/test/test_projects/buck_tests_2/auto_gen/auto_gen_a/BUCK
new file mode 100644
index 0000000000..f021317020
--- /dev/null
+++ b/test/test_projects/buck_tests_2/auto_gen/auto_gen_a/BUCK
@@ -0,0 +1,25 @@
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "auto_gen_a",
+    srcs = glob([
+        "src/*.erl",
+        "src/*.hrl",
+    ]),
+    includes = glob(["include/*.hrl"]),
+    visibility = ["//buck_tests_2/..."],
+)
+
+erlang_application(
+    name = "generated_srcs",
+    srcs = [
+        ":generated.erl",
+    ],
+    labels = ["generated"],
+    visibility = ["//buck_tests_2/..."],
+)
+
+export_file(
+    name = "generated.erl",
+    src = "out/pretend_generated.erl",
+)
diff --git a/test/test_projects/buck_tests_2/generated/BUCK b/test/test_projects/buck_tests_2/generated/BUCK
new file mode 100644
index 0000000000..8eec40830b
--- /dev/null
+++ b/test/test_projects/buck_tests_2/generated/BUCK
@@ -0,0 +1,12 @@
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "generated_headers",
+    includes = [
+        "out/generated_header.hrl",
+    ],
+    labels = ["generated"],
+    visibility = [
+        "PUBLIC",
+    ],
+)
diff --git a/test/test_projects/buck_tests_2/util/app_a/BUCK b/test/test_projects/buck_tests_2/util/app_a/BUCK
new file mode 100644
index 0000000000..4231c1c6e8
--- /dev/null
+++ b/test/test_projects/buck_tests_2/util/app_a/BUCK
@@ -0,0 +1,16 @@
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "app_a_target",
+    srcs = glob(["src/*.erl"]),
+    app_name = "app_a",
+    applications = [
+        "root//buck_tests_2/auto_gen/auto_gen_a:auto_gen_a",
+        "root//buck_tests_2/generated:generated_headers",
+    ],
+    includes = glob(
+        ["include/*.hrl"],
+        exclude = ["include/junk.hrl"],
+    ),
+    version = "1.0.0",
+)
diff --git a/test/test_projects/codegen_test/BUCK b/test/test_projects/codegen_test/BUCK
new file mode 100644
index 0000000000..3530fca2ff
--- /dev/null
+++ b/test/test_projects/codegen_test/BUCK
@@ -0,0 +1,78 @@
+load("@fbcode_macros//build_defs:native_rules.bzl", "buck_genrule")
+
+oncall("vscode_erlang")
+
+# Code generation rule - generates Erlang modules from template files
+buck_genrule(
+    name = "example_service_types_erl",
+    srcs = [
+        "templates/example_service_types.erl",
+    ],
+    outs = {
+        "example_service_types.erl": ["example_service_types.erl"],
+    },
+    bash = "cp $SRCDIR/templates/example_service_types.erl $OUT/example_service_types.erl",
+    cmd_exe = "copy %SRCDIR%\\templates\\example_service_types.erl %OUT%\\example_service_types.erl",
+)
+
+buck_genrule(
+    name = "example_service_client_erl",
+    srcs = [
+        "templates/example_service_client.erl",
+    ],
+    outs = {
+        "example_service_client.erl": ["example_service_client.erl"],
+    },
+    bash = "cp $SRCDIR/templates/example_service_client.erl $OUT/example_service_client.erl",
+    cmd_exe = "copy %SRCDIR%\\templates\\example_service_client.erl %OUT%\\example_service_client.erl",
+)
+
+buck_genrule(
+    name = "example_service_types_hrl",
+    srcs = [
+        "templates/example_service_types.hrl",
+    ],
+    outs = {
+        "example_service_types.hrl": ["example_service_types.hrl"],
+    },
+    bash = "cp $SRCDIR/templates/example_service_types.hrl $OUT/example_service_types.hrl",
+    cmd_exe = "copy %SRCDIR%\\templates\\example_service_types.hrl %OUT%\\example_service_types.hrl",
+)
+
+# Erlang library containing only the generated code
+erlang_app(
+    name = "example_service_generated",
+    srcs = [
+        # Include generated Erlang modules from genrule output
+        ":example_service_types_erl[example_service_types.erl]",
+        ":example_service_client_erl[example_service_client.erl]",
+    ],
+    includes = [
+        # Include generated header files from genrule output
+        ":example_service_types_hrl[example_service_types.hrl]",
+    ],
+)
+
+# Erlang application that uses the generated code (non-generated files only)
+erlang_application(
+    name = "codegen_test_app",
+    srcs = glob(["app_a/src/*.erl"]),
+    app_name = "codegen_test",
+    app_src = "app_a/src/codegen_test.app.src",
+    applications = [
+        "kernel",
+        "stdlib",
+        ":example_service_generated",
+    ],
+    includes = glob(["app_a/include/*.hrl"]),
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+# Test to verify the generated code works
+erlang_tests(
+    suites = [
+        "app_a/test/codegen_test_SUITE.erl",
+    ],
+    deps = [":codegen_test_app"],
+)
diff --git a/test/test_projects/diagnostics/BUCK b/test/test_projects/diagnostics/BUCK
new file mode 100644
index 0000000000..19c15e5acf
--- /dev/null
+++ b/test/test_projects/diagnostics/BUCK
@@ -0,0 +1,20 @@
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "diagnostics_app_a_target",
+    srcs = glob(["app_a/src/*.erl"]),
+    app_name = "diagnostics_app_a",
+    app_src = "app_a/src/app_a.app.src",
+    applications = [
+    ],
+    includes = glob(["app_a/include/*.hrl"]),
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_tests(
+    suites = [
+        "app_a/test/app_a_SUITE.erl",
+    ],
+    deps = [":diagnostics_app_a_target"],
+)
diff --git a/test/test_projects/end_to_end/assist_examples/BUCK b/test/test_projects/end_to_end/assist_examples/BUCK
new file mode 100644
index 0000000000..60d39de125
--- /dev/null
+++ b/test/test_projects/end_to_end/assist_examples/BUCK
@@ -0,0 +1,14 @@
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "assist_examples",
+    srcs = glob([
+        "src/*.erl",
+    ]),
+    app_src = "src/assist_examples.app.src",
+    applications = [],
+    includes = [],
+    labels = ["user_application"],
+    version = "1.0.0",
+    visibility = ["PUBLIC"],
+)
diff --git a/test/test_projects/end_to_end/definitions/BUCK b/test/test_projects/end_to_end/definitions/BUCK
new file mode 100644
index 0000000000..c9e6b204f4
--- /dev/null
+++ b/test/test_projects/end_to_end/definitions/BUCK
@@ -0,0 +1,14 @@
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "definitions",
+    srcs = glob([
+        "src/*.erl",
+    ]),
+    app_src = "src/definitions.app.src",
+    applications = [],
+    includes = [],
+    labels = ["user_application"],
+    version = "1.0.0",
+    visibility = ["PUBLIC"],
+)
diff --git a/test/test_projects/end_to_end/docs/BUCK b/test/test_projects/end_to_end/docs/BUCK
new file mode 100644
index 0000000000..7429863b6e
--- /dev/null
+++ b/test/test_projects/end_to_end/docs/BUCK
@@ -0,0 +1,16 @@
+load("@waserver//buck2/whatsapp:erlang.bzl", "erlang_application")
+
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "docs",
+    srcs = glob([
+        "src/*.erl",
+    ]),
+    app_src = "src/docs.app.src",
+    applications = [],
+    includes = [],
+    labels = ["user_application"],
+    version = "1.0.0",
+    visibility = ["PUBLIC"],
+)
diff --git a/test/test_projects/end_to_end/hover/BUCK b/test/test_projects/end_to_end/hover/BUCK
new file mode 100644
index 0000000000..7732dc473e
--- /dev/null
+++ b/test/test_projects/end_to_end/hover/BUCK
@@ -0,0 +1,14 @@
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "hover",
+    srcs = glob([
+        "src/*.erl",
+    ]),
+    app_src = "src/hover.app.src",
+    applications = [],
+    includes = [],
+    labels = ["user_application"],
+    version = "1.0.0",
+    visibility = ["PUBLIC"],
+)
diff --git a/test/test_projects/end_to_end/single_errors/BUCK b/test/test_projects/end_to_end/single_errors/BUCK
new file mode 100644
index 0000000000..a8f6e478b0
--- /dev/null
+++ b/test/test_projects/end_to_end/single_errors/BUCK
@@ -0,0 +1,14 @@
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "single_errors",
+    srcs = glob([
+        "src/*.erl",
+    ]),
+    app_src = "src/single_errors.app.src",
+    applications = [],
+    includes = [],
+    labels = ["user_application"],
+    version = "1.0.0",
+    visibility = ["PUBLIC"],
+)
diff --git a/test/test_projects/eqwalizer_callers/BUCK b/test/test_projects/eqwalizer_callers/BUCK
new file mode 100644
index 0000000000..32012a0dc0
--- /dev/null
+++ b/test/test_projects/eqwalizer_callers/BUCK
@@ -0,0 +1,19 @@
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "app_a",
+    srcs = glob(["app_a/src/*.erl"]),
+    app_src = "app_a/src/app_a.app.src",
+    applications = [
+    ],
+    includes = glob(["app_a/include/*.hrl"]),
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_tests(
+    suites = [
+        "app_a/test/app_a_SUITE.erl",
+    ],
+    deps = [":app_a"],
+)
diff --git a/test/test_projects/eqwalizer_tests/BUCK b/test/test_projects/eqwalizer_tests/BUCK
new file mode 100644
index 0000000000..0817873cb0
--- /dev/null
+++ b/test/test_projects/eqwalizer_tests/BUCK
@@ -0,0 +1,77 @@
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "check",
+    srcs = glob(["check/src/**/*.erl"]),
+    applications = [":eqwalizer"],
+    includes = glob([
+        "check/include/*.hrl",
+        "eqwalizer/include/*.hrl",
+    ]),
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_application(
+    name = "check_gradual",
+    srcs = glob(["check_gradual/src/*.erl"]),
+    applications = [":eqwalizer"],
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_tests(
+    suites = [
+        "check/test/check_SUITE.erl",
+    ],
+    deps = [":check"],
+)
+
+erlang_application(
+    name = "debug",
+    srcs = glob(["debug/src/*.erl"]),
+    applications = [":eqwalizer"],
+    includes = glob(["debug/include/*.hrl"]),
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_application(
+    name = "elm_core",
+    srcs = glob(["elm_core/src/*.erl"]),
+    applications = [":eqwalizer"],
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_application(
+    name = "eqwater",
+    srcs = glob(["eqwater/src/*.erl"]),
+    applications = [":eqwalizer"],
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_application(
+    name = "fault_tolerance",
+    srcs = glob(["fault_tolerance/src/*.erl"]),
+    applications = [":eqwalizer"],
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_application(
+    name = "options",
+    srcs = glob(["options/src/*.erl"]),
+    applications = [":eqwalizer"],
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_application(
+    name = "eqwalizer",
+    srcs = glob(["eqwalizer/src/*.erl"]),
+    includes = glob(["eqwalizer/include/*.hrl"]),
+    labels = ["user_application"],
+    version = "1.0.0",
+)
diff --git a/test/test_projects/hierarchical_config/BUCK b/test/test_projects/hierarchical_config/BUCK
new file mode 100644
index 0000000000..bc78a42d57
--- /dev/null
+++ b/test/test_projects/hierarchical_config/BUCK
@@ -0,0 +1,23 @@
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "app_a",
+    srcs = glob(["app_a/src/*.erl"]),
+    app_src = "app_a/src/app_a.app.src",
+    applications = [
+    ],
+    includes = glob(["app_a/include/*.hrl"]),
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_application(
+    name = "app_b",
+    srcs = glob(["app_b/src/*.erl"]),
+    app_src = "app_b/src/app_b.app.src",
+    applications = [
+    ],
+    includes = glob(["app_b/include/*.hrl"]),
+    labels = ["user_application"],
+    version = "1.0.0",
+)
diff --git a/test/test_projects/in_place_tests/BUCK b/test/test_projects/in_place_tests/BUCK
new file mode 100644
index 0000000000..f4f354e7ee
--- /dev/null
+++ b/test/test_projects/in_place_tests/BUCK
@@ -0,0 +1,19 @@
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "in_place_tests_app_a",
+    srcs = glob(["app_a/src/*.erl"]),
+    app_src = "app_a/src/app_a.app.src",
+    applications = [
+    ],
+    includes = glob(["app_a/include/*.hrl"]),
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_tests(
+    suites = [
+        "app_a/test/app_a_SUITE.erl",
+    ],
+    deps = [":in_place_tests_app_a"],
+)
diff --git a/test/test_projects/include_lib_dependency_test/BUCK b/test/test_projects/include_lib_dependency_test/BUCK
new file mode 100644
index 0000000000..54b81c47b5
--- /dev/null
+++ b/test/test_projects/include_lib_dependency_test/BUCK
@@ -0,0 +1,43 @@
+oncall("vscode_erlang")
+
+# Main application that will try to include_lib from an app it doesn't depend on
+erlang_application(
+    name = "main_app",
+    srcs = glob(["main_app/src/*.erl"]),
+    app_src = "main_app/src/main_app.app.src",
+    applications = [
+        # Note: deliberately NOT including :external_app as a dependency
+        "root//include_lib_dependency_test:normal_dep",
+    ],
+    extra_includes = ["root//include_lib_dependency_test:extra_app"],
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+# External application that main_app will try to include_lib from
+erlang_application(
+    name = "external_app",
+    srcs = glob(["external_app/src/*.erl"]),
+    app_src = "external_app/src/external_app.app.src",
+    includes = glob(["external_app/include/*.hrl"]),
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_application(
+    name = "extra_app",
+    srcs = glob(["extra_app/src/*.erl"]),
+    app_src = "extra_app/src/extra_app.app.src",
+    includes = glob(["extra_app/include/*.hrl"]),
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_application(
+    name = "normal_dep",
+    srcs = glob(["normal_dep/src/*.erl"]),
+    app_src = "normal_dep/src/normal_dep.app.src",
+    includes = glob(["normal_dep/include/*.hrl"]),
+    labels = ["user_application"],
+    version = "1.0.0",
+)
diff --git a/test/test_projects/linter/BUCK b/test/test_projects/linter/BUCK
new file mode 100644
index 0000000000..2db8750582
--- /dev/null
+++ b/test/test_projects/linter/BUCK
@@ -0,0 +1,41 @@
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "app_a",
+    srcs = glob(["app_a/src/*.erl"]),
+    app_src = "app_a/src/app_a.app.src",
+    applications = [
+    ],
+    includes = glob(["app_a/include/*.hrl"]),
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_application(
+    name = "app_b",
+    srcs = glob(["app_b/src/*.erl"]),
+    app_src = "app_b/src/app_b.app.src",
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_tests(
+    suites = [
+        "app_a/test/app_a_SUITE.erl",
+    ],
+    deps = [":app_a"],
+)
+
+erlang_application(
+    name = "app_a_test_utils",
+    srcs = [
+        "app_a/test/app_a_test_helpers.erl",
+        "app_a/test/app_a_test_helpers_not_opted_in.erl",
+        "app_a/test/app_test_helpers_no_errors.erl",
+    ],
+    applications = [":app_a"],
+    labels = [
+        "test_application",
+        "test_utils",
+    ],
+)
diff --git a/test/test_projects/linter_bad_config/BUCK b/test/test_projects/linter_bad_config/BUCK
new file mode 100644
index 0000000000..a0817a6ad6
--- /dev/null
+++ b/test/test_projects/linter_bad_config/BUCK
@@ -0,0 +1,12 @@
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "app_a",
+    srcs = glob(["app_a/src/*.erl"]),
+    app_src = "app_a/src/app_a.app.src",
+    applications = [
+    ],
+    includes = glob(["app_a/include/*.hrl"]),
+    labels = ["user_application"],
+    version = "1.0.0",
+)
diff --git a/test/test_projects/linter_bad_config/linter/BUCK b/test/test_projects/linter_bad_config/linter/BUCK
new file mode 100644
index 0000000000..2db8750582
--- /dev/null
+++ b/test/test_projects/linter_bad_config/linter/BUCK
@@ -0,0 +1,41 @@
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "app_a",
+    srcs = glob(["app_a/src/*.erl"]),
+    app_src = "app_a/src/app_a.app.src",
+    applications = [
+    ],
+    includes = glob(["app_a/include/*.hrl"]),
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_application(
+    name = "app_b",
+    srcs = glob(["app_b/src/*.erl"]),
+    app_src = "app_b/src/app_b.app.src",
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_tests(
+    suites = [
+        "app_a/test/app_a_SUITE.erl",
+    ],
+    deps = [":app_a"],
+)
+
+erlang_application(
+    name = "app_a_test_utils",
+    srcs = [
+        "app_a/test/app_a_test_helpers.erl",
+        "app_a/test/app_a_test_helpers_not_opted_in.erl",
+        "app_a/test/app_test_helpers_no_errors.erl",
+    ],
+    applications = [":app_a"],
+    labels = [
+        "test_application",
+        "test_utils",
+    ],
+)
diff --git a/test/test_projects/parse_error/BUCK b/test/test_projects/parse_error/BUCK
new file mode 100644
index 0000000000..ed65c267d0
--- /dev/null
+++ b/test/test_projects/parse_error/BUCK
@@ -0,0 +1,9 @@
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "elp_test_parse_a",
+    srcs = glob(["parse_error_a/src/*.erl"]),
+    app_src = "parse_error_a/src/parse_error_a.app.src",
+    labels = ["user_application"],
+    version = "1.0.0",
+)
diff --git a/test/test_projects/standard/BUCK b/test/test_projects/standard/BUCK
new file mode 100644
index 0000000000..3f1e9ee947
--- /dev/null
+++ b/test/test_projects/standard/BUCK
@@ -0,0 +1,49 @@
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "app_a",
+    srcs = glob(["app_a/src/*.erl"]),
+    app_src = "app_a/src/app_a.app.src",
+    applications = [
+    ],
+    includes = glob(["app_a/include/*.hrl"]),
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_application(
+    name = "elp_test_standard_app_b",
+    srcs = glob(["app_b/src/*.erl"]),
+    app_src = "app_b/src/app_b.app.src",
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_application(
+    name = "elp_test_eqwalizer",
+    srcs = glob(["eqwalizer/src/*.erl"]),
+    app_src = "eqwalizer/src/eqwalizer.app.src",
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_tests(
+    suites = [
+        "app_a/test/app_a_SUITE.erl",
+    ],
+    deps = [":app_a"],
+)
+
+erlang_application(
+    name = "app_a_test_utils",
+    srcs = [
+        "app_a/test/app_a_test_helpers.erl",
+        "app_a/test/app_a_test_helpers_not_opted_in.erl",
+        "app_a/test/app_test_helpers_no_errors.erl",
+    ],
+    applications = [":app_a"],
+    labels = [
+        "test_application",
+        "test_utils",
+    ],
+)
diff --git a/test/test_projects/toolchains/BUCK b/test/test_projects/toolchains/BUCK
new file mode 100644
index 0000000000..770ac61f67
--- /dev/null
+++ b/test/test_projects/toolchains/BUCK
@@ -0,0 +1,5 @@
+load("@prelude//toolchains:demo.bzl", "system_demo_toolchains")
+
+oncall("vscode_erlang")
+
+system_demo_toolchains()
diff --git a/test/test_projects/xref/BUCK b/test/test_projects/xref/BUCK
new file mode 100644
index 0000000000..bf44968f02
--- /dev/null
+++ b/test/test_projects/xref/BUCK
@@ -0,0 +1,25 @@
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "app_a",
+    srcs = glob(["app_a/src/*.erl"]),
+    applications = [
+        ":app_b",
+    ],
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_application(
+    name = "app_b",
+    srcs = glob(["app_b/src/*.erl"]),
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_application(
+    name = "app_c",
+    srcs = glob(["app_c/src/*.erl"]),
+    labels = ["user_application"],
+    version = "1.0.0",
+)

From 8e82f1cee4f54dbd3f7fc60a6a4185eb914775a0 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 19 Dec 2025 04:09:00 -0800
Subject: [PATCH 388/394] Fix codegen_test test project for new buck root

Summary: As title

Reviewed By: TheGeorge

Differential Revision: D89543670

fbshipit-source-id: 8d4a417a58950ad9f9d8877839561f407d0e9cc0
---
 test/test_projects/codegen_test/.elp.toml |  7 +++----
 test/test_projects/codegen_test/BUCK      | 17 ++++++-----------
 test/test_projects/codegen_test/README.md | 11 +++++------
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/test/test_projects/codegen_test/.elp.toml b/test/test_projects/codegen_test/.elp.toml
index 52ec390ccb..f21fe1bc73 100644
--- a/test/test_projects/codegen_test/.elp.toml
+++ b/test/test_projects/codegen_test/.elp.toml
@@ -1,8 +1,7 @@
 [buck]
 enabled = true
-build_deps = true
-included_targets = [ "fbcode//whatsapp/elp/test/test_projects/codegen_test:codegen_test_app" ]
-source_root = "whatsapp/elp/test/test_projects/codegen_test"
+build_deps = false
+included_targets = ["root//codegen_test/..."]
 
 [eqwalizer]
-enable_all = true
+enable_all = false
diff --git a/test/test_projects/codegen_test/BUCK b/test/test_projects/codegen_test/BUCK
index 3530fca2ff..1df5f86eba 100644
--- a/test/test_projects/codegen_test/BUCK
+++ b/test/test_projects/codegen_test/BUCK
@@ -1,9 +1,7 @@
-load("@fbcode_macros//build_defs:native_rules.bzl", "buck_genrule")
-
 oncall("vscode_erlang")
 
 # Code generation rule - generates Erlang modules from template files
-buck_genrule(
+genrule(
     name = "example_service_types_erl",
     srcs = [
         "templates/example_service_types.erl",
@@ -11,11 +9,10 @@ buck_genrule(
     outs = {
         "example_service_types.erl": ["example_service_types.erl"],
     },
-    bash = "cp $SRCDIR/templates/example_service_types.erl $OUT/example_service_types.erl",
-    cmd_exe = "copy %SRCDIR%\\templates\\example_service_types.erl %OUT%\\example_service_types.erl",
+    cmd = "cp $SRCDIR/templates/example_service_types.erl $OUT/example_service_types.erl",
 )
 
-buck_genrule(
+genrule(
     name = "example_service_client_erl",
     srcs = [
         "templates/example_service_client.erl",
@@ -23,11 +20,10 @@ buck_genrule(
     outs = {
         "example_service_client.erl": ["example_service_client.erl"],
     },
-    bash = "cp $SRCDIR/templates/example_service_client.erl $OUT/example_service_client.erl",
-    cmd_exe = "copy %SRCDIR%\\templates\\example_service_client.erl %OUT%\\example_service_client.erl",
+    cmd = "cp $SRCDIR/templates/example_service_client.erl $OUT/example_service_client.erl",
 )
 
-buck_genrule(
+genrule(
     name = "example_service_types_hrl",
     srcs = [
         "templates/example_service_types.hrl",
@@ -35,8 +31,7 @@ buck_genrule(
     outs = {
         "example_service_types.hrl": ["example_service_types.hrl"],
     },
-    bash = "cp $SRCDIR/templates/example_service_types.hrl $OUT/example_service_types.hrl",
-    cmd_exe = "copy %SRCDIR%\\templates\\example_service_types.hrl %OUT%\\example_service_types.hrl",
+    cmd = "cp $SRCDIR/templates/example_service_types.hrl $OUT/example_service_types.hrl",
 )
 
 # Erlang library containing only the generated code
diff --git a/test/test_projects/codegen_test/README.md b/test/test_projects/codegen_test/README.md
index 061fb1914c..1f73475d9d 100644
--- a/test/test_projects/codegen_test/README.md
+++ b/test/test_projects/codegen_test/README.md
@@ -1,7 +1,7 @@
 # Code Generation Test Project
 
 This test project demonstrates Buck2-based code generation for Erlang
-applications using `buck_genrule`.
+applications using `genrule`.
 
 ## Project Structure
 
@@ -37,10 +37,10 @@ copied to the output directory during the build.
 ### 2. Code Generation
 
 The code is generated automatically during the build process using a
-`buck_genrule`:
+`genrule`:
 
 ```python
-buck_genrule(
+genrule(
     name = "example_service_types_erl",
     srcs = [
         "templates/example_service_types.erl",
@@ -48,8 +48,7 @@ buck_genrule(
     outs = {
         "example_service_types.erl": ["example_service_types.erl"],
     },
-    bash = "cp $SRCDIR/templates/example_service_types.erl $OUT/example_service_types.erl",
-    cmd_exe = "copy %SRCDIR%\\templates\\example_service_types.erl %OUT%\\example_service_types.erl",
+    cmd = "cp $SRCDIR/templates/example_service_types.erl $OUT/example_service_types.erl",
 )
 ```
 
@@ -58,7 +57,7 @@ The genrule:
 - Takes the template file as input (`srcs`)
 - Defines named outputs using `outs` parameter (creates subtargets for each
   file)
-- Uses `cp` (bash) or `copy` (cmd_exe) to copy template files to `$OUT`
+- Uses `cp` command to copy template files to `$OUT`
 - Outputs files to `$OUT` directory in `buck-out/`
 
 ### 3. Build Integration

From fc09ff94fdda5a6c9fbb3d49764dcd0c7767e76b Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 19 Dec 2025 07:43:01 -0800
Subject: [PATCH 389/394] Enable buck2 tests on GitHub

Summary:
The test projects are now standalone, so the Buck2 tests can be enabled in CI.

Two major fixes to the tests:

* Use the project directory to calculate the project root (there's no `.buckconfig` for the ELP crate as a whole in OSS)
* Fix expectations for the Buck2 errors (no URL in OSS)

Reviewed By: alanz

Differential Revision: D89547047

fbshipit-source-id: 76fa8bcc1fadabbeb9ea59245d36d2aacd98a023
---
 .github/workflows/ci.yml                            |  2 +-
 crates/elp/src/bin/main.rs                          | 13 +++++++++----
 .../buck_bad_config/bxl_error_message_oss.stdout    |  1 +
 crates/project_model/src/buck.rs                    |  4 +---
 4 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 crates/elp/src/resources/test/buck_bad_config/bxl_error_message_oss.stdout

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2fcdf48405..e9980283f2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -137,7 +137,7 @@ jobs:
       - name: Test elp
         # Do not run the tests in case of cross-compilation or on Windows
         if: matrix.platform-arch != 'macos-latest-arm' && matrix.os != 'windows'
-        run: 'cargo test --no-default-features --workspace --target ${{ matrix.target }}'
+        run: 'cargo test --workspace --target ${{ matrix.target }}'
       - name: Build elp (No Windows)
         if: matrix.os != 'windows'
         run: 'cargo build --release  --target ${{ matrix.target }} --config target.aarch64-unknown-linux-gnu.linker=\"aarch64-linux-gnu-gcc\"'
diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index df99eff987..721632fc01 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -970,7 +970,9 @@ mod tests {
             assert!(tmp_file.clone().exists());
             let content = fs::read_to_string(tmp_file).unwrap();
             let mut buck_config = BuckConfig::default();
-            buck_config.buck_root = Some(AbsPathBuf::assert_utf8(current_dir().unwrap()));
+            buck_config.buck_root = Some(AbsPathBuf::assert_utf8(
+                current_dir().unwrap().join(path_str.clone()),
+            ));
             let prelude_cell = get_prelude_cell(&buck_config).expect("could not get prelude");
             let prelude_cell = prelude_cell.strip_prefix("/").unwrap();
             let content = content.replace(prelude_cell, "/[prelude]/");
@@ -1111,7 +1113,7 @@ mod tests {
                 "--to",
                 tmp_file.clone(),
                 "--project",
-                path_str
+                path_str.clone()
             ];
             let (stdout, stderr, code) = elp(args);
             assert_eq!(
@@ -1126,7 +1128,9 @@ mod tests {
             assert!(tmp_file.clone().exists());
             let content = fs::read_to_string(tmp_file).unwrap();
             let mut buck_config = BuckConfig::default();
-            buck_config.buck_root = Some(AbsPathBuf::assert_utf8(current_dir().unwrap()));
+            buck_config.buck_root = Some(AbsPathBuf::assert_utf8(
+                current_dir().unwrap().join(path_str.clone()),
+            ));
             let prelude_cell = get_prelude_cell(&buck_config).expect("could not get prelude");
             let prelude_cell = prelude_cell.strip_prefix("/").unwrap();
             let content = content.replace(prelude_cell, "/[prelude]/");
@@ -1948,7 +1952,8 @@ mod tests {
             simple_snapshot_expect_stderror(
                 args_vec!["lint",],
                 "buck_bad_config",
-                expect_file!("../resources/test/buck_bad_config/bxl_error_message.stdout"),
+                // @fb-only: expect_file!("../resources/test/buck_bad_config/bxl_error_message.stdout"),
+                expect_file!("../resources/test/buck_bad_config/bxl_error_message_oss.stdout"), // @oss-only
                 true,
                 None,
                 true,
diff --git a/crates/elp/src/resources/test/buck_bad_config/bxl_error_message_oss.stdout b/crates/elp/src/resources/test/buck_bad_config/bxl_error_message_oss.stdout
new file mode 100644
index 0000000000..f5225605a5
--- /dev/null
+++ b/crates/elp/src/resources/test/buck_bad_config/bxl_error_message_oss.stdout
@@ -0,0 +1 @@
+Project Initialisation Failed: invalid or missing buck 2 configuration
diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 96fc1eac89..32c6dcccb8 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -1643,9 +1643,7 @@ mod tests {
         assert_eq!(expected, actual)
     }
 
-    // TODO: enable when buck is properly set up on github project
-    // @fb-only: const BUCK_TESTS_ENABLED: bool = true;
-    const BUCK_TESTS_ENABLED: bool = false; // @oss-only
+    const BUCK_TESTS_ENABLED: bool = true;
 
     #[track_caller]
     fn check_buck_bxl_query(build_generated: bool, expect: Expect) {

From 220acfd4f7cfa318c3207db8e5bdefa01eaffccc Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alanzimm@meta.com>
Date: Fri, 19 Dec 2025 08:49:54 -0800
Subject: [PATCH 390/394] Back out "Allow project discovery for OTP"

Summary: It breaks navigation to stdlib

Reviewed By: TD5

Differential Revision: D89552844

fbshipit-source-id: 676af5f520d9189f98828b4364b0b1665531b245
---
 crates/elp/src/project_loader.rs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/crates/elp/src/project_loader.rs b/crates/elp/src/project_loader.rs
index 0f13139201..103353e5db 100644
--- a/crates/elp/src/project_loader.rs
+++ b/crates/elp/src/project_loader.rs
@@ -100,11 +100,8 @@ impl ProjectLoader {
     ) -> Option<(ElpConfig, Result<ProjectManifest>, ProjectManifest)> {
         let mut path_it = path;
         loop {
-            if let Some(value) = self.project_roots.get(path_it) {
-                return match value {
-                    None => Some(self.load_manifest(path_it)),
-                    Some(_) => None,
-                };
+            if self.project_roots.contains_key(path_it) {
+                return None;
             }
             match path_it.parent() {
                 Some(parent) => path_it = parent,

From 5c7cfae09d3a89e430cc69a88371939dc2acad42 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 19 Dec 2025 08:58:10 -0800
Subject: [PATCH 391/394] Only enable Buck2 project model tests if feature is
 enabled

Summary:
We already have a feature to understand if Buck2 is enabled or not. Let's use that one instead of a constant.

This change has no effect anyway since the only two use cases are currently marked as "ignored".

Also remove the extra check inside the helper (we already do it in both tests).

Reviewed By: alanz

Differential Revision: D89549782

fbshipit-source-id: 82e5bbf00c463dca3f4937d2d2a12d16aebc3c19
---
 crates/project_model/src/buck.rs | 84 +++++++++++++++-----------------
 1 file changed, 40 insertions(+), 44 deletions(-)

diff --git a/crates/project_model/src/buck.rs b/crates/project_model/src/buck.rs
index 32c6dcccb8..45c6b7f732 100644
--- a/crates/project_model/src/buck.rs
+++ b/crates/project_model/src/buck.rs
@@ -1643,57 +1643,53 @@ mod tests {
         assert_eq!(expected, actual)
     }
 
-    const BUCK_TESTS_ENABLED: bool = true;
-
     #[track_caller]
     fn check_buck_bxl_query(build_generated: bool, expect: Expect) {
-        if BUCK_TESTS_ENABLED {
-            let buck_root = to_abs_path_buf(&std::env::current_dir().unwrap()).unwrap();
-            // We only need buck_config to get the buck command, everything but the buck root is ignored.
-            let buck_config = BuckConfig {
-                config_path: None,
-                buck_root: Some(buck_root),
-                enabled: true,
-                deps_target: None,
-                deps_targets: vec![],
-                build_deps: false,
-                included_targets: vec![],
-                excluded_targets: vec![],
-                source_root: None,
-                test_application_labels: vec!["test_application".to_string()],
-            };
-            let generated_args = if build_generated {
-                vec!["--build_generated_code", "true"]
-            } else {
-                vec![]
-            };
-            let output = buck_config
-                .buck_command()
-                .arg("bxl")
-                .arg("prelude//erlang/elp.bxl:elp_config")
-                .arg("--")
-                .args(generated_args)
-                .arg("--included_targets")
-                .arg("root//buck_tests_2/auto_gen/...")
-                .output()
-                .unwrap();
-            if !output.status.success() {
-                panic!("{output:#?}");
-            }
-            let string = String::from_utf8(output.stdout).unwrap();
-            let prelude_cell = get_prelude_cell(&buck_config).expect("could not get prelude");
-            let string = string.replace(&prelude_cell, "/[prelude]/");
-
-            let to_replace = env!("CARGO_WORKSPACE_DIR");
-            let string = string.replace(to_replace, "/[..]/");
-            expect.assert_eq(&string);
+        let buck_root = to_abs_path_buf(&std::env::current_dir().unwrap()).unwrap();
+        // We only need buck_config to get the buck command, everything but the buck root is ignored.
+        let buck_config = BuckConfig {
+            config_path: None,
+            buck_root: Some(buck_root),
+            enabled: true,
+            deps_target: None,
+            deps_targets: vec![],
+            build_deps: false,
+            included_targets: vec![],
+            excluded_targets: vec![],
+            source_root: None,
+            test_application_labels: vec!["test_application".to_string()],
+        };
+        let generated_args = if build_generated {
+            vec!["--build_generated_code", "true"]
+        } else {
+            vec![]
+        };
+        let output = buck_config
+            .buck_command()
+            .arg("bxl")
+            .arg("prelude//erlang/elp.bxl:elp_config")
+            .arg("--")
+            .args(generated_args)
+            .arg("--included_targets")
+            .arg("root//buck_tests_2/auto_gen/...")
+            .output()
+            .unwrap();
+        if !output.status.success() {
+            panic!("{output:#?}");
         }
+        let string = String::from_utf8(output.stdout).unwrap();
+        let prelude_cell = get_prelude_cell(&buck_config).expect("could not get prelude");
+        let string = string.replace(&prelude_cell, "/[prelude]/");
+
+        let to_replace = env!("CARGO_WORKSPACE_DIR");
+        let string = string.replace(to_replace, "/[..]/");
+        expect.assert_eq(&string);
     }
 
     #[test]
     #[ignore]
     fn build_info_buck_bxl_query() {
-        if BUCK_TESTS_ENABLED {
+        if cfg!(feature = "buck") {
             check_buck_bxl_query(
                 false,
                 expect![[r#"
@@ -1859,7 +1855,7 @@ mod tests {
     #[test]
     #[ignore]
     fn build_info_buck_bxl_generated_query() {
-        if BUCK_TESTS_ENABLED {
+        if cfg!(feature = "buck") {
             // Note that there is now a value for `srcs` in the
             // "root//buck_tests_2/auto_gen/auto_gen_a:generated_srcs"
             // target

From 6456f325c3a338169e4eed4d0a156db5baf1491f Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Fri, 19 Dec 2025 08:58:10 -0800
Subject: [PATCH 392/394] Ignore buck-out in test_projects

Summary: So that version control systems do not try to publish the directory.

Reviewed By: alanz

Differential Revision: D89550389

fbshipit-source-id: d60646ddd4e8f0ae443673dac3c49efbac60dba7
---
 test/test_projects/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/test_projects/.gitignore b/test/test_projects/.gitignore
index b34578734c..2672c17cc4 100644
--- a/test/test_projects/.gitignore
+++ b/test/test_projects/.gitignore
@@ -3,3 +3,4 @@
 *wa.build_info
 *_build/
 *rebar.lock
+buck-out/

From 4bba415bc1d863764c564ea8545aae98dcf02403 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Mon, 22 Dec 2025 09:17:24 -0800
Subject: [PATCH 393/394] Fix diagnostic name

Summary: Missed during the original rename.

Reviewed By: alanz

Differential Revision: D89460380

fbshipit-source-id: 60446aa3f505d635ad5ddc842b2d420c24f0a9d2
---
 crates/ide/src/diagnostics/old_edoc_syntax.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/ide/src/diagnostics/old_edoc_syntax.rs b/crates/ide/src/diagnostics/old_edoc_syntax.rs
index e8524b6e6e..da4c3f2430 100644
--- a/crates/ide/src/diagnostics/old_edoc_syntax.rs
+++ b/crates/ide/src/diagnostics/old_edoc_syntax.rs
@@ -8,7 +8,7 @@
  * above-listed licenses.
  */
 
-// Diagnostic: edoc
+// Diagnostic: old_edoc_syntax
 
 use elp_ide_assists::Assist;
 use elp_ide_assists::helpers;

From 7a4eccf14dbf3df942e9d01e0eb0f74d419fbb32 Mon Sep 17 00:00:00 2001
From: Roberto Aloi <robertoaloi@meta.com>
Date: Tue, 23 Dec 2025 03:53:02 -0800
Subject: [PATCH 394/394] Add support for linter-specific excluded_apps

Summary:
We may want to disable a linter for a certain set of applications. This diff introduces such a mechanism:

```
[linters.my_linter]
exclude_apps = ["app_a", "app_2"]
```

Reviewed By: alanz

Differential Revision: D89658976

fbshipit-source-id: 78e1cf13ec22f1bf7ed1b6df6892cdad5ca2dfe5
---
 crates/elp/src/bin/main.rs                    |  12 ++
 .../resources/test/linter_config/basic.stdout |   5 +
 crates/ide/src/diagnostics.rs                 | 119 ++++++++++++++++--
 test/test_projects/linter_config/.elp.toml    |   5 +
 .../linter_config/.elp_lint.toml              |   5 +
 test/test_projects/linter_config/BUCK         |  25 ++++
 .../linter_config/app_a/src/app_a.app.src     |   3 +
 .../linter_config/app_a/src/app_a.erl         |   4 +
 .../linter_config/app_b/src/app_b.app.src     |   3 +
 .../linter_config/app_b/src/app_b.erl         |   4 +
 .../linter_config/app_c/src/app_c.app.src     |   3 +
 .../linter_config/app_c/src/app_c.erl         |   4 +
 test/test_projects/linter_config/rebar.config |   9 ++
 13 files changed, 188 insertions(+), 13 deletions(-)
 create mode 100644 crates/elp/src/resources/test/linter_config/basic.stdout
 create mode 100644 test/test_projects/linter_config/.elp.toml
 create mode 100644 test/test_projects/linter_config/.elp_lint.toml
 create mode 100644 test/test_projects/linter_config/BUCK
 create mode 100644 test/test_projects/linter_config/app_a/src/app_a.app.src
 create mode 100644 test/test_projects/linter_config/app_a/src/app_a.erl
 create mode 100644 test/test_projects/linter_config/app_b/src/app_b.app.src
 create mode 100644 test/test_projects/linter_config/app_b/src/app_b.erl
 create mode 100644 test/test_projects/linter_config/app_c/src/app_c.app.src
 create mode 100644 test/test_projects/linter_config/app_c/src/app_c.erl
 create mode 100644 test/test_projects/linter_config/rebar.config

diff --git a/crates/elp/src/bin/main.rs b/crates/elp/src/bin/main.rs
index 721632fc01..56535e4492 100644
--- a/crates/elp/src/bin/main.rs
+++ b/crates/elp/src/bin/main.rs
@@ -2263,6 +2263,18 @@ mod tests {
         );
     }
 
+    #[test_case(false ; "rebar")]
+    #[test_case(true  ; "buck")]
+    fn lint_linter_config_basic(buck: bool) {
+        simple_snapshot_sorted(
+            args_vec!["lint", "--read-config", "--no-stream"],
+            "linter_config",
+            expect_file!("../resources/test/linter_config/basic.stdout"),
+            buck,
+            None,
+        );
+    }
+
     #[test_case(false ; "rebar")]
     #[test_case(true  ; "buck")]
     fn eqwalizer_tests_check(buck: bool) {
diff --git a/crates/elp/src/resources/test/linter_config/basic.stdout b/crates/elp/src/resources/test/linter_config/basic.stdout
new file mode 100644
index 0000000000..946fd7dc9a
--- /dev/null
+++ b/crates/elp/src/resources/test/linter_config/basic.stdout
@@ -0,0 +1,5 @@
+Diagnostics reported:
+Reporting all diagnostics codes
+app_a/src/app_a.erl:3:9-3:16::[Warning] [W0002] Unused macro (MACRO_A)
+app_a/src/app_a.erl:4:9-4:14::[Warning] [L1260] record rec_a is unused
+app_b/src/app_b.erl:3:9-3:16::[Warning] [W0002] Unused macro (MACRO_B)
\ No newline at end of file
diff --git a/crates/ide/src/diagnostics.rs b/crates/ide/src/diagnostics.rs
index 7b23da4461..eb6bae611b 100644
--- a/crates/ide/src/diagnostics.rs
+++ b/crates/ide/src/diagnostics.rs
@@ -50,6 +50,7 @@ use elp_ide_db::text_edit::TextEdit;
 use elp_ide_ssr::Match;
 use elp_ide_ssr::SsrSearchScope;
 use elp_ide_ssr::match_pattern;
+use elp_project_model::AppName;
 use elp_syntax::NodeOrToken;
 use elp_syntax::Parse;
 use elp_syntax::SourceFile;
@@ -550,12 +551,37 @@ pub(crate) trait Linter {
     }
 }
 
+fn should_process_app(
+    app_name: &Option<AppName>,
+    config: &DiagnosticsConfig,
+    diagnostic_code: &DiagnosticCode,
+) -> bool {
+    let app = match app_name {
+        Some(app) => app.to_string(),
+        None => return true,
+    };
+
+    if let Some(lint_config) = config.lint_config.as_ref()
+        && let Some(linter_config) = lint_config.linters.get(diagnostic_code)
+        && let Some(ref excluded) = linter_config.exclude_apps
+        && excluded.contains(&app)
+    {
+        return false;
+    }
+
+    true
+}
+
 fn should_run(
     linter: &dyn Linter,
     config: &DiagnosticsConfig,
+    app_name: &Option<AppName>,
     is_generated: bool,
     is_test: bool,
 ) -> bool {
+    if !should_process_app(app_name, config, &linter.id()) {
+        return false;
+    }
     let is_enabled = if let Some(lint_config) = config.lint_config.as_ref() {
         lint_config
             .get_is_enabled_override(&linter.id())
@@ -1218,6 +1244,16 @@ impl LintConfig {
         self.linters.get(diagnostic_code)?.experimental
     }
 
+    /// Get the exclude_apps override for a linter based on its diagnostic code.
+    pub fn get_exclude_apps_override(
+        &self,
+        diagnostic_code: &DiagnosticCode,
+    ) -> Option<Vec<String>> {
+        self.linters
+            .get(diagnostic_code)
+            .and_then(|c| c.exclude_apps.clone())
+    }
+
     pub fn get_function_call_linter_config(
         &self,
         diagnostic_code: &DiagnosticCode,
@@ -1341,6 +1377,7 @@ pub struct LinterConfig {
     pub include_tests: Option<bool>,
     pub include_generated: Option<bool>,
     pub experimental: Option<bool>,
+    pub exclude_apps: Option<Vec<String>>,
     #[serde(flatten)]
     pub config: Option<LinterTraitConfig>,
 }
@@ -1361,6 +1398,7 @@ impl LinterConfig {
             include_tests: other.include_tests.or(self.include_tests),
             include_generated: other.include_generated.or(self.include_generated),
             experimental: other.experimental.or(self.experimental),
+            exclude_apps: other.exclude_apps.or(self.exclude_apps),
             config: merged_config,
         }
     }
@@ -1555,6 +1593,7 @@ pub fn native_diagnostics(
     } else {
         FxHashMap::default()
     };
+    let app_name = db.file_app_name(file_id);
     let metadata = db.elp_metadata(file_id);
     // TODO: can we  ever disable DiagnosticCode::SyntaxError?
     //       In which case we must check labeled_syntax_errors
@@ -1563,6 +1602,7 @@ pub fn native_diagnostics(
             && (config.experimental && d.has_category(Category::Experimental)
                 || !d.has_category(Category::Experimental))
             && !d.should_be_suppressed(&metadata, config)
+            && should_process_app(&app_name, config, &d.code)
     });
 
     LabeledDiagnostics {
@@ -1613,20 +1653,20 @@ pub fn diagnostics_from_descriptors(
         .db
         .is_test_suite_or_test_helper(file_id)
         .unwrap_or(false);
+    let app_name = sema.db.file_app_name(file_id);
     descriptors.iter().for_each(|descriptor| {
         if descriptor.conditions.enabled(config, is_generated, is_test) {
-            if descriptor.conditions.default_disabled {
-                // Filter the returned diagnostics to ensure they are
-                // enabled
-                let mut diags: Vec<Diagnostic> = Vec::default();
-                (descriptor.checker)(&mut diags, sema, file_id, file_kind);
-                for diag in diags {
-                    if config.enabled.contains(&diag.code) {
-                        res.push(diag);
-                    }
+            let mut diags: Vec<Diagnostic> = Vec::default();
+            (descriptor.checker)(&mut diags, sema, file_id, file_kind);
+            for diag in diags {
+                // Check if this diagnostic is enabled (for default_disabled descriptors)
+                // and if the app is not excluded for this diagnostic code
+                let is_enabled =
+                    !descriptor.conditions.default_disabled || config.enabled.contains(&diag.code);
+                let app_allowed = should_process_app(&app_name, config, &diag.code);
+                if is_enabled && app_allowed {
+                    res.push(diag);
                 }
-            } else {
-                (descriptor.checker)(res, sema, file_id, file_kind);
             }
         }
     });
@@ -1734,11 +1774,12 @@ fn diagnostics_from_linters(
         .db
         .is_test_suite_or_test_helper(file_id)
         .unwrap_or(false);
+    let app_name = sema.db.file_app_name(file_id);
 
     for l in linters {
         let linter = l.as_linter();
         if linter.should_process_file_id(sema, file_id)
-            && should_run(linter, config, is_generated, is_test)
+            && should_run(linter, config, &app_name, is_generated, is_test)
         {
             let severity = if let Some(lint_config) = config.lint_config.as_ref() {
                 lint_config
@@ -2300,11 +2341,14 @@ pub fn erlang_service_diagnostics(
             diags
         };
 
+        let app_name = db.file_app_name(file_id);
         let metadata = db.elp_metadata(file_id);
         let diags = diags
             .into_iter()
             .filter(|(_file_id, d)| {
-                !d.should_be_suppressed(&metadata, config) && !config.disabled.contains(&d.code)
+                !d.should_be_suppressed(&metadata, config)
+                    && !config.disabled.contains(&d.code)
+                    && should_process_app(&app_name, config, &d.code)
             })
             .map(|(file_id, d)| {
                 (
@@ -3995,6 +4039,7 @@ main(X) ->
                 include_tests: None,
                 include_generated: None,
                 experimental: None,
+                exclude_apps: None,
                 config: None,
             },
         );
@@ -4037,6 +4082,7 @@ main(X) ->
                 include_tests: Some(true),
                 include_generated: None,
                 experimental: None,
+                exclude_apps: None,
                 config: None,
             },
         );
@@ -4078,6 +4124,7 @@ main(X) ->
                 include_tests: None,
                 include_generated: Some(true),
                 experimental: None,
+                exclude_apps: None,
                 config: None,
             },
         );
@@ -4120,6 +4167,7 @@ main(X) ->
                 include_tests: None,
                 include_generated: None,
                 experimental: Some(true),
+                exclude_apps: None,
                 config: None,
             },
         );
@@ -4164,6 +4212,7 @@ main(X) ->
                 include_tests: None,
                 include_generated: None,
                 experimental: None,
+                exclude_apps: None,
                 config: None,
             },
         );
@@ -4194,6 +4243,47 @@ main(X) ->
         );
     }
 
+    #[test]
+    fn test_linter_exclude_apps_override() {
+        let mut lint_config = LintConfig::default();
+        lint_config.linters.insert(
+            DiagnosticCode::NoGarbageCollect,
+            LinterConfig {
+                is_enabled: Some(false),
+                severity: None,
+                include_tests: None,
+                include_generated: None,
+                experimental: None,
+                exclude_apps: Some(vec!["my_app".to_string()]),
+                config: None,
+            },
+        );
+
+        let config = DiagnosticsConfig::default()
+            .configure_diagnostics(
+                &lint_config,
+                &Some("no_garbage_collect".to_string()),
+                &None,
+                FallBackToAll::No,
+            )
+            .unwrap();
+        check_diagnostics_with_config(
+            config,
+            r#"
+            //- /src/main.erl app:my_app
+            -module(main).
+            -export([warning/0]).
+
+            warning() ->
+                erlang:garbage_collect().
+            //- /opt/lib/stdlib-3.17/src/erlang.erl otp_app:/opt/lib/stdlib-3.17
+            -module(erlang).
+            -export([garbage_collect/0]).
+            garbage_collect() -> ok.
+            "#,
+        );
+    }
+
     #[test]
     fn no_unused_macro_in_macro_rhs_for_function_name() {
         let config = DiagnosticsConfig::default()
@@ -4241,6 +4331,7 @@ main(X) ->
                 include_tests: None,
                 include_generated: None,
                 experimental: None,
+                exclude_apps: None,
                 config: Some(LinterTraitConfig::FunctionCallLinterConfig(
                     FunctionCallLinterConfig {
                         include: Some(vec![FunctionMatch::mf("mod_a", "func_a")]),
@@ -4273,6 +4364,7 @@ main(X) ->
                 include_tests: Some(true),
                 include_generated: None,
                 experimental: None,
+                exclude_apps: None,
                 config: Some(LinterTraitConfig::FunctionCallLinterConfig(
                     FunctionCallLinterConfig {
                         include: Some(vec![FunctionMatch::mf("mod_b", "func_b")]),
@@ -4290,6 +4382,7 @@ main(X) ->
                 include_tests: None,
                 include_generated: Some(true),
                 experimental: None,
+                exclude_apps: None,
                 config: None,
             },
         );
diff --git a/test/test_projects/linter_config/.elp.toml b/test/test_projects/linter_config/.elp.toml
new file mode 100644
index 0000000000..c490cc155e
--- /dev/null
+++ b/test/test_projects/linter_config/.elp.toml
@@ -0,0 +1,5 @@
+[buck]
+enabled = true
+build_deps = false
+included_targets = [ "root//linter_config/..." ]
+source_root = "linter_config"
diff --git a/test/test_projects/linter_config/.elp_lint.toml b/test/test_projects/linter_config/.elp_lint.toml
new file mode 100644
index 0000000000..47886dd507
--- /dev/null
+++ b/test/test_projects/linter_config/.elp_lint.toml
@@ -0,0 +1,5 @@
+[linters.L1260] # Unused record, produced by the Erlang Service
+exclude_apps = ["app_b", "app_c"]
+
+[linters.unused_macro]
+exclude_apps = ["app_c"]
diff --git a/test/test_projects/linter_config/BUCK b/test/test_projects/linter_config/BUCK
new file mode 100644
index 0000000000..c1101daea2
--- /dev/null
+++ b/test/test_projects/linter_config/BUCK
@@ -0,0 +1,25 @@
+oncall("vscode_erlang")
+
+erlang_application(
+    name = "app_a",
+    srcs = glob(["app_a/src/*.erl"]),
+    app_src = "app_a/src/app_a.app.src",
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_application(
+    name = "app_b",
+    srcs = glob(["app_b/src/*.erl"]),
+    app_src = "app_b/src/app_b.app.src",
+    labels = ["user_application"],
+    version = "1.0.0",
+)
+
+erlang_application(
+    name = "app_c",
+    srcs = glob(["app_c/src/*.erl"]),
+    app_src = "app_c/src/app_c.app.src",
+    labels = ["user_application"],
+    version = "1.0.0",
+)
diff --git a/test/test_projects/linter_config/app_a/src/app_a.app.src b/test/test_projects/linter_config/app_a/src/app_a.app.src
new file mode 100644
index 0000000000..1381435a46
--- /dev/null
+++ b/test/test_projects/linter_config/app_a/src/app_a.app.src
@@ -0,0 +1,3 @@
+{application, app_a,
+  [{description, "example app A"}, {vsn, "inplace"}, {applications, [kernel, stdlib]}]
+}.
diff --git a/test/test_projects/linter_config/app_a/src/app_a.erl b/test/test_projects/linter_config/app_a/src/app_a.erl
new file mode 100644
index 0000000000..c374c0b518
--- /dev/null
+++ b/test/test_projects/linter_config/app_a/src/app_a.erl
@@ -0,0 +1,4 @@
+-module(app_a).
+
+-define(MACRO_A, a).
+-record(rec_a, {a :: atom()}).
diff --git a/test/test_projects/linter_config/app_b/src/app_b.app.src b/test/test_projects/linter_config/app_b/src/app_b.app.src
new file mode 100644
index 0000000000..4112b4129f
--- /dev/null
+++ b/test/test_projects/linter_config/app_b/src/app_b.app.src
@@ -0,0 +1,3 @@
+{application, app_b,
+  [{description, "example app B"}, {vsn, "inplace"}, {applications, [kernel, stdlib]}]
+}.
diff --git a/test/test_projects/linter_config/app_b/src/app_b.erl b/test/test_projects/linter_config/app_b/src/app_b.erl
new file mode 100644
index 0000000000..ca7ecf985b
--- /dev/null
+++ b/test/test_projects/linter_config/app_b/src/app_b.erl
@@ -0,0 +1,4 @@
+-module(app_b).
+
+-define(MACRO_B, b).
+-record(rec_b, {b :: atom()}).
diff --git a/test/test_projects/linter_config/app_c/src/app_c.app.src b/test/test_projects/linter_config/app_c/src/app_c.app.src
new file mode 100644
index 0000000000..c278bbce23
--- /dev/null
+++ b/test/test_projects/linter_config/app_c/src/app_c.app.src
@@ -0,0 +1,3 @@
+{application, app_c,
+  [{description, "example app C"}, {vsn, "inplace"}, {applications, [kernel, stdlib]}]
+}.
diff --git a/test/test_projects/linter_config/app_c/src/app_c.erl b/test/test_projects/linter_config/app_c/src/app_c.erl
new file mode 100644
index 0000000000..57573554b6
--- /dev/null
+++ b/test/test_projects/linter_config/app_c/src/app_c.erl
@@ -0,0 +1,4 @@
+-module(app_c).
+
+-define(MACRO_C, c).
+-record(rec_c, {c :: atom()}).
diff --git a/test/test_projects/linter_config/rebar.config b/test/test_projects/linter_config/rebar.config
new file mode 100644
index 0000000000..d508bd24de
--- /dev/null
+++ b/test/test_projects/linter_config/rebar.config
@@ -0,0 +1,9 @@
+{checkouts_dir, ["."]}.
+{project_app_dirs, [
+    "app_a",
+    "app_b",
+    "app_c"
+]}.
+
+{erl_opts, [debug_info]}.
+{deps, []}.