Correct indentation when auto-fixing

magento · May 26, 2023 · 0f21272 · 0f21272
1 parent ca0ebae
commit 0f21272
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php b/Magento2/Sniffs/Html/HtmlClosingVoidTagsSniff.php
@@ -94,6 +94,11 @@ public function process(File $phpcsFile, $stackPtr): void
                         $original = $token['content'];
                         $replacement = str_replace(' />', '>', $original);
                         $replacement = str_replace('/>', '>', $replacement);
+
+                        if (preg_match('{^\s* />}', $original)) {
+                            $replacement = ' ' . $replacement;
+                        }
+
                         $phpcsFile->fixer->replaceToken($ptr, $replacement);
                     }
                 }

diff --git a/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php b/Magento2/Sniffs/Html/HtmlSelfClosingTagsSniff.php
@@ -84,6 +84,11 @@ public function process(File $phpcsFile, $stackPtr)
                         $original = $token['content'];
                         $replacement = str_replace(' />', '></' . $match[1] . '>', $original);
                         $replacement = str_replace('/>', '></' . $match[1] . '>', $replacement);
+
+                        if (preg_match('{^\s* />}', $original)) {
+                            $replacement = ' ' . $replacement;
+                        }
+
                         $phpcsFile->fixer->replaceToken($ptr, $replacement);
                     }
                 }

diff --git a/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed b/Magento2/Tests/Html/HtmlClosingVoidTagsUnitTest.inc.fixed
@@ -25,7 +25,7 @@
     <input type="text"
            id="multi-line-input"
            placeholder="Alert should be on last line"
-          >
+           >
     <input type="text"
            id="multi-line-input2"
            placeholder="Alert should be on last line">

diff --git a/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed b/Magento2/Tests/Html/HtmlSelfClosingTagsUnitTest.1.inc.fixed
@@ -40,7 +40,7 @@
         <label for="test_input"></label>
         <label
                for="multi-line-input"
-              ></label>
+               ></label>
         <label
                for="multi-line-input2"></label>
         <style type="text/css"></style>