From 5b246aedb60e1799dafc6d31d5826689cc1f9427 Mon Sep 17 00:00:00 2001
From: Jake Hotson <jake.github@qzdesign.co.uk>
Date: Tue, 3 Jun 2025 14:33:48 +0100
Subject: [PATCH] [BUGFIX] Ensure non-negative column number in `RuleSet`

When inserting a `Rule` before a sibling, increment the column number of
other `Rule`s, instead of assigning a lower column number.

Part of #974.
---
 CHANGELOG.md                       |  2 ++
 src/RuleSet/RuleSet.php            | 15 ++++++++++++++-
 tests/Unit/RuleSet/RuleSetTest.php |  2 --
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 005255af..5255f87e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -105,6 +105,8 @@ Please also have a look at our
 
 ### Fixed
 
+- Ensure `RuleSet::addRule()` sets non-negative column number when sibling
+  provided (#1268)
 - Set line number when `RuleSet::addRule()` called with only column number set
   (#1265)
 - Ensure first rule added with `RuleSet::addRule()` has valid position (#1262)
diff --git a/src/RuleSet/RuleSet.php b/src/RuleSet/RuleSet.php
index d211277e..a1f26c66 100644
--- a/src/RuleSet/RuleSet.php
+++ b/src/RuleSet/RuleSet.php
@@ -107,7 +107,20 @@ public function addRule(Rule $ruleToAdd, ?Rule $sibling = null): void
             $siblingPosition = \array_search($sibling, $this->rules[$propertyName], true);
             if ($siblingPosition !== false) {
                 $position = $siblingPosition;
-                $ruleToAdd->setPosition($sibling->getLineNo(), $sibling->getColNo() - 1);
+                // Increment column number of all existing rules on same line, starting at sibling
+                $siblingLineNumber = $sibling->getLineNumber();
+                $siblingColumnNumber = $sibling->getColumnNumber();
+                foreach ($this->rules as $rulesForAProperty) {
+                    foreach ($rulesForAProperty as $rule) {
+                        if (
+                            $rule->getLineNumber() === $siblingLineNumber &&
+                            $rule->getColumnNumber() >= $siblingColumnNumber
+                        ) {
+                            $rule->setPosition($siblingLineNumber, $rule->getColumnNumber() + 1);
+                        }
+                    }
+                }
+                $ruleToAdd->setPosition($siblingLineNumber, $siblingColumnNumber);
             }
         }
         if ($ruleToAdd->getLineNumber() === null) {
diff --git a/tests/Unit/RuleSet/RuleSetTest.php b/tests/Unit/RuleSet/RuleSetTest.php
index 75aaf30b..5b2bfa7a 100644
--- a/tests/Unit/RuleSet/RuleSetTest.php
+++ b/tests/Unit/RuleSet/RuleSetTest.php
@@ -271,8 +271,6 @@ public function addRuleWithSiblingSetsValidColumnNumber(
         int $siblingIndex,
         string $propertyNameToAdd
     ): void {
-        self::markTestSkipped('tofix: sometimes a negative column number results');
-
         $ruleToAdd = new Rule($propertyNameToAdd);
         $this->setRulesFromPropertyNames($initialPropertyNames);
         $sibling = $this->subject->getRules()[$siblingIndex];