Fix: block comments should take column into account

bundle/regal/ast/comments.rego

@@ -56,21 +56,37 @@ ignore_directives[row] := rules if {
 # METADATA
 # description: |
 #   returns an array of partitions, i.e. arrays containing all comments
-#   grouped by their "blocks".
-comment_blocks(comments) := [partition |
-	rows := [row |
-		some comment in comments
-		row := util.to_location_object(comment.location).row
+#   grouped by their "blocks". only comments on the same column as the
+#   one before is considered to be part of a block.
+comment_blocks(comments) := blocks if {
+	row_partitions := [partition |
+		rows := [row |
+			some comment in comments
+			row := util.to_location_object(comment.location).row
+		]
+		breaks := _splits(rows)
+
+		some j, k in breaks
+		partition := array.slice(
+			comments,
+			breaks[j - 1] + 1,
+			k + 1,
+		)
 	]
-	breaks := _splits(rows)
 
-	some j, k in breaks
-	partition := array.slice(
-		comments,
-		breaks[j - 1] + 1,
-		k + 1,
-	)
-]
+	blocks := [block |
+		some row_partition in row_partitions
+		some block in {col: partition |
+			some comment in row_partition
+			col := util.to_location_object(comment.location).col
+
+			partition := [c |
+				some c in row_partition
+				util.to_location_object(c.location).col == col
+			]
+		}
+	]
+}
 
 _splits(xs) := array.concat(
 	array.concat(

bundle/regal/rules/style/detached-metadata/detached_metadata_test.rego

@@ -53,7 +53,7 @@ allow := true
 }
 
 test_success_attached_metadata if {
-	r := rule.report with input as ast.policy(`
+	r := rule.report with input as ast.with_rego_v1(`
 # METADATA
 # title: valid
 allow := true
@@ -62,9 +62,7 @@ allow := true
 }
 
 test_success_detached_document_scope_ok if {
-	r := rule.report with input as regal.parse_module("p.rego", `
-package p
-
+	r := rule.report with input as ast.with_rego_v1(`
 # METADATA
 # scope: document
 # description: allow allows
@@ -75,3 +73,12 @@ allow := true
 `)
 	r == set()
 }
+
+test_success_not_detached_by_comment_in_different_column if {
+	r := rule.report with input as ast.with_rego_v1(`
+# METADATA
+# title: allow
+allow := true # not in block
+`)
+	r == set()
+}