fix(debugger): don't panic on pc-ic / sourcemap mismatch (foundry-rs#…

…7991)
sambacha · May 24, 2024 · 10f1402 · 10f1402
1 parent a03fed9
commit 10f1402
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/crates/debugger/src/tui/draw.rs b/crates/debugger/src/tui/draw.rs
@@ -350,17 +350,18 @@ impl DebuggerContext<'_> {
                 } else {
                     contract_source.deployed_bytecode.bytecode.as_ref()?
                 };
-                let mut source_map = bytecode.source_map()?.ok()?;
+                let source_map = bytecode.source_map()?.ok()?;
 
                 let pc_ic_map = if is_create { create_map } else { rt_map };
                 let ic = pc_ic_map.get(pc)?;
-                let source_element = source_map.swap_remove(ic);
+                let source_element = source_map.get(ic)?;
                 // if the source element has an index, find the sourcemap for that index
                 source_element
                     .index
-                    .and_then(|index|
                     // if index matches current file_id, return current source code
-                    (index == file_id).then(|| (source_element.clone(), source_code)))
+                    .and_then(|index| {
+                        (index == file_id).then(|| (source_element.clone(), source_code))
+                    })
                     .or_else(|| {
                         // otherwise find the source code for the element's index
                         self.debugger