Fix pw3_padded_arg_duplicates

BrettMayson · Nov 9, 2024 · 0c2bca2 · 0c2bca2
1 parent 7f055cd
commit 0c2bca2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/libs/preprocessor/src/processor/defines.rs b/libs/preprocessor/src/processor/defines.rs
@@ -2,7 +2,7 @@ use std::{collections::HashMap, sync::Arc};
 
 use hemtt_workspace::{
     position::Position,
-    reporting::{Output, Symbol, Token},
+    reporting::{Code, Output, Symbol, Token},
 };
 use peekmore::{PeekMore, PeekMoreIterator};
 
@@ -238,12 +238,18 @@ impl Processor {
                     {
                         for token in [value.first(), value.last()] {
                             if token.map_or(false, |t| t.symbol().is_whitespace()) {
-                                self.warnings.push(Arc::new(PaddedArg::new(
+                                let warning = PaddedArg::new(
                                     Box::new(
                                         (**token.expect("token exists from map_or check")).clone(),
                                     ),
                                     ident_string.clone(),
-                                )));
+                                );
+
+                                if !self.warnings.iter().any(|w| {
+                                    w.ident() == warning.ident() && w.token() == warning.token()
+                                }) {
+                                    self.warnings.push(Arc::new(warning));
+                                }
                             }
                         }
                     }

diff --git a/libs/preprocessor/tests/warnings.rs b/libs/preprocessor/tests/warnings.rs
@@ -35,11 +35,9 @@ fn check(dir: &str) {
                 .unwrap();
             let warning = config
                 .warnings()
-                .first()
-                .unwrap()
-                .diagnostic()
-                .unwrap()
-                .to_string(&WorkspaceFiles::new());
+                .iter()
+                .map(|w| w.diagnostic().unwrap().to_string(&WorkspaceFiles::new()))
+                .collect::<String>();
             if expected.is_empty() {
                 std::fs::write(folder.join("stderr.ansi"), warning.replace('\r', "")).unwrap();
             }
@@ -66,3 +64,4 @@ bootstrap!(pw1_redefine);
 bootstrap!(pw1_redefine_stack);
 bootstrap!(pw3_padded_arg);
 bootstrap!(pw3_padded_arg_duplicates);
+bootstrap!(pw3_padded_arg_inner);