Remove id from paths to instances in style warnings

kaitai-io · Sep 8, 2024 · 533c134 · 533c134
1 parent 049b464
commit 533c134
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/shared/src/main/scala/io/kaitai/struct/precompile/StyleCheckIds.scala b/shared/src/main/scala/io/kaitai/struct/precompile/StyleCheckIds.scala
@@ -44,11 +44,16 @@ class StyleCheckIds(specs: ClassSpecs) extends PrecompileStep {
       val existingName = sizeRefAttr.id.humanReadable
       val goodName = s"len_${attr.id.humanReadable}"
       if (existingName != goodName) {
+        // Add `id` for attributes in `seq`, do not add for instances
+        val path = attr match {
+          case _: AttrSpec => sizeRefAttr.path ++ List("id")
+          case _ => sizeRefAttr.path
+        }
         Some(StyleWarningSizeLen(
           goodName,
           existingName,
           attr.id.humanReadable,
-          ProblemCoords(path = Some(sizeRefAttr.path ++ List("id")))
+          ProblemCoords(path = Some(path))
         ))
       } else {
         None
@@ -61,11 +66,16 @@ class StyleCheckIds(specs: ClassSpecs) extends PrecompileStep {
       val existingName = repeatExprRefAttr.id.humanReadable
       val goodName = s"num_${attr.id.humanReadable}"
       if (existingName != goodName) {
+        // Add `id` for attributes in `seq`, do not add for instances
+        val path = attr match {
+          case _: AttrSpec => repeatExprRefAttr.path ++ List("id")
+          case _ => repeatExprRefAttr.path
+        }
         Some(StyleWarningRepeatExprNum(
           goodName,
           existingName,
           attr.id.humanReadable,
-          ProblemCoords(path = Some(repeatExprRefAttr.path ++ List("id")))
+          ProblemCoords(path = Some(path))
         ))
       } else {
         None