Keep linting even when seeing mixed indentation

realm · Jul 24, 2019 · da58c89 · da58c89
1 parent 8247665
commit da58c89
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/Source/SwiftLintFramework/Rules/Style/IndentationWidthRule.swift b/Source/SwiftLintFramework/Rules/Style/IndentationWidthRule.swift
@@ -9,7 +9,7 @@ public struct IndentationWidthRule: ConfigurationProviderRule, OptInRule {
 
         func spacesEquivalent(indentationWidth: Int) -> Int {
             switch self {
-            case let .tabs(tabs): return tabs & indentationWidth
+            case let .tabs(tabs): return tabs & indentationWidth // Fix
             case let .spaces(spaces): return spaces
             }
         }
@@ -67,8 +67,10 @@ public struct IndentationWidthRule: ConfigurationProviderRule, OptInRule {
             let tabCount = prefix.filter { $0 == "\t" }.count
             let spaceCount = prefix.filter { $0 == " " }.count
 
-            // Catch mixed indentation
+            // Determine indentation
+            let indentation: Indentation
             if tabCount != 0 && spaceCount != 0 {
+                // Catch mixed indentation
                 violations.append(
                     StyleViolation(
                         ruleDescription: IndentationWidthRule.description,
@@ -79,12 +81,15 @@ public struct IndentationWidthRule: ConfigurationProviderRule, OptInRule {
                     )
                 )
 
-                // Break as next line cannot be parsed without knowing this line's exact indentation
-                break
+                // Model this line's indentation using spaces (although it's tabs & spaces) to let parsing continue
+                indentation = .spaces(spaceCount + tabCount * configuration.indentationWidth)
+            } else if tabCount != 0 {
+                indentation = .tabs(tabCount)
+            } else {
+                indentation = .spaces(spaceCount)
             }
 
             // Catch indented first line
-            let indentation: Indentation = tabCount != 0 ? .tabs(tabCount) : .spaces(spaceCount)
             guard !previousLineIndentations.isEmpty else {
                 previousLineIndentations = [indentation]
 

diff --git a/Tests/SwiftLintFrameworkTests/IndentationWidthRuleTests.swift b/Tests/SwiftLintFrameworkTests/IndentationWidthRuleTests.swift
@@ -16,8 +16,9 @@ class IndentationWidthRuleTests: XCTestCase {
 
     /// It's not okay to indent using both tabs and spaces in one line.
     func testMixedTabSpaceIndentation() {
-        assert1Violation(in: "firstLine\n\t    secondLine")
-        assert1Violation(in: "firstLine\n    \tsecondLine")
+        // Expect 2 violations as secondLine is also indented by 8 spaces (which isn't valid)
+        assertViolations(in: "firstLine\n\t    secondLine", equals: 2)
+        assertViolations(in: "firstLine\n    \tsecondLine", equals: 2)
     }
 
     /// It's okay to keep the same indentation.