Consider nested configs for settings reloading

astral-sh · Jul 9, 2024 · eeee047 · eeee047
1 parent 9041186
commit eeee047
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/crates/ruff_server/src/session/index.rs b/crates/ruff_server/src/session/index.rs
@@ -310,10 +310,8 @@ impl Index {
             return;
         };
 
-        // TODO: I think this does not correctly reload settings when using `extend` and the extended
-        //  setting isn't in a parent folder.
-        for (root, settings) in self.settings.range_mut(enclosing_folder.to_path_buf()..) {
-            if !root.starts_with(enclosing_folder) {
+        for (root, settings) in &mut self.settings {
+            if !enclosing_folder.starts_with(root) {
                 break;
             }