Fix TabAndSpaceSniff

Author: dereuromark

PSR2R/Sniffs/WhiteSpace/TabAndSpaceSniff.php

@@ -49,35 +49,32 @@ public function process(File $phpcsFile, int $stackPtr): void {
 		$tokens = $phpcsFile->getTokens();
 
 		$line = $tokens[$stackPtr]['line'];
-		if ($stackPtr > 0 && $tokens[$stackPtr - 1]['line'] !== $line) {
+		// Only check whitespace at the start of lines (indentation)
+		if ($stackPtr > 0 && $tokens[$stackPtr - 1]['line'] === $line) {
 			return;
 		}
 
-		if (strpos($tokens[$stackPtr]['content'], '  ') !== false) {
-			$error = 'Double space found';
-			$fix = $phpcsFile->addFixableError($error, $stackPtr, 'DoubleSpace');
+		$content = $tokens[$stackPtr]['orig_content'] ?? $tokens[$stackPtr]['content'];
+
+		// Check for space followed by tab (wrong order)
+		if (str_contains($content, ' ' . "\t")) {
+			$error = 'Space followed by tab found in indentation; use tabs only';
+			$fix = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeTab');
 			if ($fix) {
-				$phpcsFile->fixer->replaceToken($stackPtr, ' ');
+				// Replace space+tab patterns with just tabs
+				$phpcsFile->fixer->replaceToken($stackPtr, str_replace(" \t", "\t", $content));
 			}
 		}
-		if (strpos($tokens[$stackPtr]['content'], " \t") !== false) {
-			$error = 'Space and tab found';
-			$fix = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAndTab');
+
+		// Check for tab followed by space (mixed indentation)
+		if (str_contains($content, "\t ")) {
+			$error = 'Tab followed by space found in indentation; use tabs only';
+			$fix = $phpcsFile->addFixableError($error, $stackPtr, 'TabAndSpace');
 			if ($fix) {
-				$phpcsFile->fixer->replaceToken($stackPtr, ' ');
+				// Remove spaces after tabs at start of line
+				$phpcsFile->fixer->replaceToken($stackPtr, preg_replace('/^(\t+) +/', '$1', $content));
 			}
 		}
-		if (strpos($tokens[$stackPtr]['content'], "\t ") === false) {
-			return;
-		}
-
-		$error = 'Tab and space found';
-		$fix = $phpcsFile->addFixableError($error, $stackPtr, 'TabAndSpace');
-		if (!$fix) {
-			return;
-		}
-
-		$phpcsFile->fixer->replaceToken($stackPtr, ' ');
 	}
 
 }

tests/PSR2R/Sniffs/WhiteSpace/TabAndSpaceSniffTest.php

@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * MIT License
+ * For full license information, please view the LICENSE file that was distributed with this source code.
+ */
+
+namespace PSR2R\Test\PSR2R\Sniffs\WhiteSpace;
+
+use PSR2R\Sniffs\WhiteSpace\TabAndSpaceSniff;
+use PSR2R\Test\TestCase;
+
+class TabAndSpaceSniffTest extends TestCase {
+
+	/**
+	 * @return void
+	 */
+	public function testTabAndSpaceSniffer(): void {
+		$this->assertSnifferFindsErrors(new TabAndSpaceSniff(), 4);
+	}
+
+	/**
+	 * @return void
+	 */
+	public function testTabAndSpaceFixer(): void {
+		$this->assertSnifferCanFixErrors(new TabAndSpaceSniff());
+	}
+
+}

tests/_data/TabAndSpace/after.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Test;
+
+class TabAndSpaceTest {
+
+	public function testMethod() {
+		$correct = 1; // 2 tabs (correct)
+		$tabSpace = 2; // 2 tabs + 1 space (WRONG)
+		$spaceTabs = 3; // 1 space + 2 tabs (WRONG)
+		$tabSpaceSpace = 4; // 2 tabs + 2 spaces (WRONG)
+
+		if ($correct) {
+			$nested = true;
+			$nestedTabSpace = true; // WRONG
+		}
+	}
+
+}

tests/_data/TabAndSpace/before.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Test;
+
+class TabAndSpaceTest {
+
+	public function testMethod() {
+		$correct = 1; // 2 tabs (correct)
+		 $tabSpace = 2; // 2 tabs + 1 space (WRONG)
+ 		$spaceTabs = 3; // 1 space + 2 tabs (WRONG)
+		  $tabSpaceSpace = 4; // 2 tabs + 2 spaces (WRONG)
+
+		if ($correct) {
+			$nested = true;
+			 $nestedTabSpace = true; // WRONG
+		}
+	}
+
+}