revert named replacement

Author: SyMind

src/replace_source.rs

@@ -443,9 +443,6 @@ impl Stream for ReplaceSourceStream<'_> {
     let source_content_lines: RefCell<LinearMap<Option<SourceContent>>> =
       RefCell::new(LinearMap::default());
 
-    // if has named replacements, we need to map the name to the global name index
-    let has_named_replacements =
-      replacements.iter().any(|repl| repl.name.is_some());
     let name_mapping: RefCell<HashMap<&str, u32>> =
       RefCell::new(HashMap::default());
     let name_index_mapping: RefCell<LinearMap<u32>> =
@@ -590,13 +587,9 @@ impl Stream for ReplaceSourceStream<'_> {
                     source_index: original.source_index,
                     original_line: original.original_line,
                     original_column: original.original_column,
-                    name_index: if !has_named_replacements {
-                      original.name_index
-                    } else {
-                      original.name_index.and_then(|name_index| {
-                        name_index_mapping.borrow().get(&name_index).copied()
-                      })
-                    },
+                    name_index: original.name_index.and_then(|name_index| {
+                      name_index_mapping.borrow().get(&name_index).copied()
+                    }),
                   }
                 }),
               },
@@ -803,21 +796,17 @@ impl Stream for ReplaceSourceStream<'_> {
         on_source(source_index, source, source_content);
       },
       &mut |name_index, name| {
-        if !has_named_replacements {
-          on_name.borrow_mut()(name_index, name);
-        } else {
-          let mut name_mapping = name_mapping.borrow_mut();
-          let mut global_index = name_mapping.get(&name).copied();
-          if global_index.is_none() {
-            let len = name_mapping.len() as u32;
-            name_mapping.insert(name, len);
-            on_name.borrow_mut()(len, name);
-            global_index = Some(len);
-          }
-          name_index_mapping
-            .borrow_mut()
-            .insert(name_index, global_index.unwrap());
+        let mut name_mapping = name_mapping.borrow_mut();
+        let mut global_index = name_mapping.get(&name).copied();
+        if global_index.is_none() {
+          let len = name_mapping.len() as u32;
+          name_mapping.insert(name, len);
+          on_name.borrow_mut()(len, name);
+          global_index = Some(len);
         }
+        name_index_mapping
+          .borrow_mut()
+          .insert(name_index, global_index.unwrap());
       },
     );