diff --git a/blink/internal/fixer/rules/priorities.go b/blink/internal/fixer/rules/priorities.go index e6c1691b79..ecf165eece 100644 --- a/blink/internal/fixer/rules/priorities.go +++ b/blink/internal/fixer/rules/priorities.go @@ -158,7 +158,7 @@ var fixerPriority = map[string]int{ "SingleClassElementPerStatementFixer": 56, "SingleImportPerStatementFixer": 1, "SingleLineAfterImportsFixer": -11, - "NoBlankLineBetweenImportsFixer": -50, + "NoBlankLineBetweenImportsFixer": -35, "SpaceAfterCommaHereNowDocFixer": 0, "ArrayOpenerAndCloserNewlineFixer": 34, "SingleLineCommentSpacingFixer": 1, diff --git a/packages/coding-standard/src/Fixer/Spacing/NoBlankLineBetweenImportsFixer.php b/packages/coding-standard/src/Fixer/Spacing/NoBlankLineBetweenImportsFixer.php index a250aa2ece..65d9ccd745 100644 --- a/packages/coding-standard/src/Fixer/Spacing/NoBlankLineBetweenImportsFixer.php +++ b/packages/coding-standard/src/Fixer/Spacing/NoBlankLineBetweenImportsFixer.php @@ -29,10 +29,10 @@ public function getDefinition(): FixerDefinitionInterface return new FixerDefinition(self::ERROR_MESSAGE, [new CodeSample("doTestFile($filePath); + } + + public static function provideData(): Iterator + { + return self::yieldFiles(__DIR__ . '/WithImportGroupsFixture'); + } + + public function provideConfig(): string + { + return __DIR__ . '/config/with_import_groups_rule.php'; + } +} diff --git a/packages/coding-standard/tests/Fixer/Spacing/NoBlankLineBetweenImportsFixer/WithImportGroupsFixture/add_blank_line_between_import_groups.php.inc b/packages/coding-standard/tests/Fixer/Spacing/NoBlankLineBetweenImportsFixer/WithImportGroupsFixture/add_blank_line_between_import_groups.php.inc new file mode 100644 index 0000000000..160d58255c --- /dev/null +++ b/packages/coding-standard/tests/Fixer/Spacing/NoBlankLineBetweenImportsFixer/WithImportGroupsFixture/add_blank_line_between_import_groups.php.inc @@ -0,0 +1,28 @@ + +----- + diff --git a/packages/coding-standard/tests/Fixer/Spacing/NoBlankLineBetweenImportsFixer/WithImportGroupsFixture/keep_blank_line_between_import_groups.php.inc b/packages/coding-standard/tests/Fixer/Spacing/NoBlankLineBetweenImportsFixer/WithImportGroupsFixture/keep_blank_line_between_import_groups.php.inc new file mode 100644 index 0000000000..946c716b0a --- /dev/null +++ b/packages/coding-standard/tests/Fixer/Spacing/NoBlankLineBetweenImportsFixer/WithImportGroupsFixture/keep_blank_line_between_import_groups.php.inc @@ -0,0 +1,30 @@ + +----- + diff --git a/packages/coding-standard/tests/Fixer/Spacing/NoBlankLineBetweenImportsFixer/config/with_import_groups_rule.php b/packages/coding-standard/tests/Fixer/Spacing/NoBlankLineBetweenImportsFixer/config/with_import_groups_rule.php new file mode 100644 index 0000000000..c992ea982b --- /dev/null +++ b/packages/coding-standard/tests/Fixer/Spacing/NoBlankLineBetweenImportsFixer/config/with_import_groups_rule.php @@ -0,0 +1,12 @@ +rule(BlankLineBetweenImportGroupsFixer::class); + $ecsConfig->rule(NoBlankLineBetweenImportsFixer::class); +};