From 58bf161bc9dd6e74de8cb61e3ae23f701feb5512 Mon Sep 17 00:00:00 2001
From: grandizzy <38490174+grandizzy@users.noreply.github.com>
Date: Wed, 6 Nov 2024 18:08:19 +0200
Subject: [PATCH] Revert "fix(remappings): check if remapping to add starts
 with existing remapping name (#9246)" (#9274)

This reverts commit 455ba9b1b736766232d84ba1790ac9ba6ca944de.
---
 crates/config/src/providers/remappings.rs | 10 +++---
 crates/forge/tests/cli/config.rs          | 38 -----------------------
 2 files changed, 4 insertions(+), 44 deletions(-)

diff --git a/crates/config/src/providers/remappings.rs b/crates/config/src/providers/remappings.rs
index 48e9c875f1ac..2e849bea4ecc 100644
--- a/crates/config/src/providers/remappings.rs
+++ b/crates/config/src/providers/remappings.rs
@@ -46,16 +46,14 @@ impl Remappings {
     }
 
     /// Push an element to the remappings vector, but only if it's not already present.
-    fn push(&mut self, remapping: Remapping) {
+    pub fn push(&mut self, remapping: Remapping) {
         if !self.remappings.iter().any(|existing| {
             // What we're doing here is filtering for ambiguous paths. For example, if we have
-            // @prb/=node_modules/@prb/ as existing, and
-            // @prb/math/=node_modules/@prb/math/src/  as the one being checked,
+            // @prb/math/=node_modules/@prb/math/src/ as existing, and
+            // @prb/=node_modules/@prb/  as the one being checked,
             // we want to keep the already existing one, which is the first one. This way we avoid
             // having to deal with ambiguous paths which is unwanted when autodetecting remappings.
-            // Remappings are added from root of the project down to libraries, so
-            // we want to exclude any conflicting remappings added from libraries.
-            remapping.name.starts_with(&existing.name) && existing.context == remapping.context
+            existing.name.starts_with(&remapping.name) && existing.context == remapping.context
         }) {
             self.remappings.push(remapping)
         }
diff --git a/crates/forge/tests/cli/config.rs b/crates/forge/tests/cli/config.rs
index f38dcf414a00..f6ec7c88eddf 100644
--- a/crates/forge/tests/cli/config.rs
+++ b/crates/forge/tests/cli/config.rs
@@ -595,44 +595,6 @@ forgetest_init!(can_prioritise_closer_lib_remappings, |prj, cmd| {
     );
 });
 
-// Test that remappings within root of the project have priority over remappings of sub-projects.
-// E.g. `@utils/libraries` mapping from library shouldn't be added if project already has `@utils`
-// remapping.
-// See <https://github.com/foundry-rs/foundry/issues/9146>
-forgetest_init!(test_root_remappings_priority, |prj, cmd| {
-    let mut config = cmd.config();
-    // Add `@utils/` remapping in project config.
-    config.remappings = vec![
-        Remapping::from_str("@utils/=src/").unwrap().into(),
-        Remapping::from_str("@another-utils/libraries/=src/").unwrap().into(),
-    ];
-    let proj_toml_file = prj.paths().root.join("foundry.toml");
-    pretty_err(&proj_toml_file, fs::write(&proj_toml_file, config.to_string_pretty().unwrap()));
-
-    // Create a new lib in the `lib` folder with conflicting `@utils/libraries` remapping.
-    // This should be filtered out from final remappings as root project already has `@utils/`.
-    let nested = prj.paths().libraries[0].join("dep1");
-    pretty_err(&nested, fs::create_dir_all(&nested));
-    let mut lib_config = Config::load_with_root(&nested);
-    lib_config.remappings = vec![
-        Remapping::from_str("@utils/libraries/=src/").unwrap().into(),
-        Remapping::from_str("@another-utils/=src/").unwrap().into(),
-    ];
-    let lib_toml_file = nested.join("foundry.toml");
-    pretty_err(&lib_toml_file, fs::write(&lib_toml_file, lib_config.to_string_pretty().unwrap()));
-
-    cmd.args(["remappings", "--pretty"]).assert_success().stdout_eq(str![[r#"
-Global:
-- @utils/=src/
-- @another-utils/libraries/=src/
-- @another-utils/=lib/dep1/src/
-- dep1/=lib/dep1/src/
-- forge-std/=lib/forge-std/src/
-
-
-"#]]);
-});
-
 // test to check that foundry.toml libs section updates on install
 forgetest!(can_update_libs_section, |prj, cmd| {
     cmd.git_init();