Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ Please also have a look at our

### Fixed

- Set line number when `RuleSet::addRule()` called with only column number set
(#1265)
- Ensure first rule added with `RuleSet::addRule()` has valid position (#1262)
- Don't render `rgb` colors with percentage values using hex notation (#803)

Expand Down
7 changes: 4 additions & 3 deletions src/RuleSet/RuleSet.php
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,16 @@ public function addRule(Rule $ruleToAdd, ?Rule $sibling = null): void
$ruleToAdd->setPosition($sibling->getLineNo(), $sibling->getColNo() - 1);
}
}
if ($ruleToAdd->getLineNo() === 0 && $ruleToAdd->getColNo() === 0) {
if ($ruleToAdd->getLineNumber() === null) {
//this node is added manually, give it the next best line
$columnNumber = $ruleToAdd->getColumnNumber() ?? 0;
$rules = $this->getRules();
$rulesCount = \count($rules);
if ($rulesCount > 0) {
$last = $rules[$rulesCount - 1];
$ruleToAdd->setPosition($last->getLineNo() + 1, 0);
$ruleToAdd->setPosition($last->getLineNo() + 1, $columnNumber);
} else {
$ruleToAdd->setPosition(1, 0);
$ruleToAdd->setPosition(1, $columnNumber);
}
} elseif ($ruleToAdd->getColumnNumber() === null) {
$ruleToAdd->setPosition($ruleToAdd->getLineNumber(), 0);
Expand Down
7 changes: 3 additions & 4 deletions tests/Unit/RuleSet/RuleSetTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -138,19 +138,18 @@ public function addRuleWithOnlyLineNumberAddsRuleAndSetsColumnNumberPreservingLi
*
* @param list<string> $initialPropertyNames
*/
public function addRuleWithOnlyColumnNumberAddsRuleAndSetsLineNumberPreservingColumnNumber(
public function addRuleWithOnlyColumnNumberAddsRuleAfterInitialRulesAndSetsLineNumberPreservingColumnNumber(
array $initialPropertyNames,
string $propertyNameToAdd
): void {
self::markTestSkipped('currently broken - does not preserve column number');

$ruleToAdd = new Rule($propertyNameToAdd);
$ruleToAdd->setPosition(null, 42);
$this->setRulesFromPropertyNames($initialPropertyNames);

$this->subject->addRule($ruleToAdd);

self::assertContains($ruleToAdd, $this->subject->getRules());
$rules = $this->subject->getRules();
self::assertSame($ruleToAdd, \end($rules));
self::assertIsInt($ruleToAdd->getLineNumber(), 'line number not set');
self::assertGreaterThanOrEqual(1, $ruleToAdd->getLineNumber(), 'line number not valid');
self::assertSame(42, $ruleToAdd->getColumnNumber(), 'column number not preserved');
Expand Down