finish up check

libs/config/src/analyze/config.rs

@@ -119,12 +119,14 @@ fn external_missing_warn(
 }
 
 fn duplicate_properties(properties: &[Property]) -> Vec<Box<dyn Code>> {
-    let mut seen: HashMap<String, Vec<Ident>> = HashMap::new();
+    let mut seen: HashMap<String, Vec<(bool, Ident)>> = HashMap::new();
     duplicate_properties_inner("", properties, &mut seen);
     let mut errors: Vec<Box<dyn Code>> = Vec::new();
     for (_, idents) in seen {
-        if idents.len() > 1 {
-            errors.push(Box::new(DuplicateProperty::new(idents)));
+        if idents.len() > 1 && !idents.iter().all(|(class, _)| *class) {
+            errors.push(Box::new(DuplicateProperty::new(
+                idents.into_iter().map(|(_, i)| i).collect(),
+            )));
         }
     }
     errors
@@ -133,7 +135,7 @@ fn duplicate_properties(properties: &[Property]) -> Vec<Box<dyn Code>> {
 fn duplicate_properties_inner(
     scope: &str,
     properties: &[Property],
-    seen: &mut HashMap<String, Vec<Ident>>,
+    seen: &mut HashMap<String, Vec<(bool, Ident)>>,
 ) {
     for property in properties {
         match property {
@@ -145,12 +147,16 @@ fn duplicate_properties_inner(
                     properties,
                     seen,
                 );
+                let entry = seen
+                    .entry(format!("{}.{}", scope, name.value.to_lowercase()))
+                    .or_default();
+                entry.push((true, name.clone()));
             }
-            Property::Entry { name, .. } => {
+            Property::Entry { name, .. } | Property::MissingSemicolon(name, _) => {
                 let entry = seen
                     .entry(format!("{}.{}", scope, name.value.to_lowercase()))
                     .or_default();
-                entry.push(name.clone());
+                entry.push((false, name.clone()));
             }
             _ => (),
         }

libs/config/tests/errors/simple/source.hpp

@@ -3,16 +3,16 @@
 #define QPATHTO(x) QUOTE(PATHTO(x))
 
 class Test {
-    data = something;
+    outer = something;
     path = PATHTO(thing);
-    data = "nosemi"
-    class data {
-        data = "something";
+    outer = "nosemi"
+    class outer {
+        inner = "something";
     };
     class Child {
-        data = "something";
+        inner = "something";
     };
     class Child {
-        data = "something";
+        inner = "something";
     };
 };

libs/config/tests/errors/simple/stdout.ansi

@@ -1,9 +1,9 @@
 [CE1] Error: property's value could not be parsed.
-   ╭─[/source.hpp:6:12]
+   ╭─[/source.hpp:6:13]
    │
- 6 │     data = something;
-   │            ────┬────  
-   │                ╰────── invalid value
+ 6 │     outer = something;
+   │             ────┬────  
+   │                 ╰────── invalid value
    │ 
    │ Help: use quotes `"` around the value, or a QUOTE macro if it contains #define values
 ───╯
@@ -21,23 +21,38 @@
 ───╯
 
 [CE4] Error: property is missing a semicolon
-   ╭─[/source.hpp:8:20]
+   ╭─[/source.hpp:8:21]
    │
- 8 │     data = "nosemi"
-   │                    ┬  
-   │                    ╰── missing semicolon
+ 8 │     outer = "nosemi"
+   │                     ┬  
+   │                     ╰── missing semicolon
    │ 
    │ Help: add a semicolon `;` to the end of the property
 ───╯
 
+[CE3] Error: property was defined more than once
+   ╭─[/source.hpp:6:5]
+   │
+ 6 │     outer = something;
+   │     ──┬──  
+   │       ╰──── first defined here
+   │ 
+ 8 │     outer = "nosemi"
+   │     ──┬──  
+   │       ╰──── also defined here
+ 9 │     class outer {
+   │           ──┬──  
+   │             ╰──── also defined here
+───╯
+
 [CE3] Error: property was defined more than once
     ╭─[/source.hpp:13:9]
     │
- 13 │         data = "something";
-    │         ──┬─  
-    │           ╰─── first defined here
+ 13 │         inner = "something";
+    │         ──┬──  
+    │           ╰──── first defined here
     │ 
- 16 │         data = "something";
-    │         ──┬─  
-    │           ╰─── also defined here
+ 16 │         inner = "something";
+    │         ──┬──  
+    │           ╰──── also defined here
 ────╯