Skip to content

fix: vertical_whitespace_between_cases ignores comment separators#6654

Open
leno23 wants to merge 1 commit into
realm:mainfrom
leno23:fix/vertical-whitespace-between-cases-comments-6412
Open

fix: vertical_whitespace_between_cases ignores comment separators#6654
leno23 wants to merge 1 commit into
realm:mainfrom
leno23:fix/vertical-whitespace-between-cases-comments-6412

Conversation

@leno23
Copy link
Copy Markdown

@leno23 leno23 commented May 17, 2026

Summary

Fixes #6412. Since 0.63, vertical_whitespace_between_cases required a blank line before inline comments between switch cases even when both cases are one-liners on adjacent logical groups.

Changes

  • Skip the empty-line requirement when one-line cases are separated only by empty or comment-only lines
  • Add a non-triggering example matching the issue report

Test plan

  • swift test --filter VerticalWhitespaceBetweenCasesRuleGeneratedTests

Made with Cursor

Do not require a blank line between one-line switch cases when only
comments or empty lines appear between them.

Fixes realm#6412
@SwiftLintBot
Copy link
Copy Markdown

1 Warning
⚠️ This PR may need tests.
66 Messages
📖 Building this branch resulted in a binary size of 27639.21 KiB vs 27639.02 KiB when built on main (0% larger).
📖 Linting Aerial with this PR took 0.83 s vs 0.81 s on main (2% slower).
📖 Linting Alamofire with this PR took 1.12 s vs 1.11 s on main (0% slower).
📖 Linting Brave with this PR took 7.36 s vs 7.47 s on main (1% faster).
📖 Linting DuckDuckGo with this PR took 29.88 s vs 29.91 s on main (0% faster).
📖 Linting Firefox with this PR took 12.71 s vs 12.7 s on main (0% slower).
📖 Linting Kickstarter with this PR took 8.67 s vs 8.69 s on main (0% faster).
📖 Linting Moya with this PR took 0.44 s vs 0.46 s on main (4% faster).
📖 Linting NetNewsWire with this PR took 2.9 s vs 2.91 s on main (0% faster).
📖 Linting Nimble with this PR took 0.69 s vs 0.71 s on main (2% faster).
📖 Linting PocketCasts with this PR took 8.21 s vs 8.27 s on main (0% faster).
📖 Linting Quick with this PR took 0.47 s vs 0.46 s on main (2% slower).
📖 Linting Realm with this PR took 2.99 s vs 3.06 s on main (2% faster).
📖 Linting Sourcery with this PR took 1.89 s vs 1.89 s on main (0% slower).
📖 Linting Swift with this PR took 4.85 s vs 4.82 s on main (0% slower).
📖 Linting SwiftLintPerformanceTests with this PR took 0.36 s vs 0.35 s on main (2% slower).
📖 Linting VLC with this PR took 1.23 s vs 1.27 s on main (3% faster).
📖 Linting Wire with this PR took 19.33 s vs 19.4 s on main (0% faster).
📖 Linting WordPress with this PR took 13.07 s vs 13.04 s on main (0% slower).
📖 This PR fixed a violation in Brave: /ios/brave-ios/App/iOS/Delegates/AppState.swift:145:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in Brave: /ios/brave-ios/App/iOS/Delegates/AppState.swift:148:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in Brave: /ios/brave-ios/Sources/BraveVPN/BraveVPN.swift:109:7: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in Brave: /ios/brave-ios/Sources/Brave/Frontend/Browser/Search/InitialSearchEngines.swift:57:7: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /macOS/LocalPackages/AppKitExtensions/Sources/AppKitExtensions/NSEventExtension.swift:51:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /macOS/DuckDuckGo/Statistics/SubscriptionPixel.swift:166:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /macOS/DuckDuckGo/Statistics/SubscriptionPixel.swift:171:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /macOS/DuckDuckGo/Statistics/SubscriptionPixel.swift:176:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /macOS/DuckDuckGo/Statistics/SubscriptionPixel.swift:180:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /macOS/DuckDuckGo/Statistics/SubscriptionPixel.swift:187:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /macOS/DuckDuckGo/Statistics/SubscriptionPixel.swift:192:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /macOS/DuckDuckGo/Statistics/SubscriptionPixel.swift:197:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /macOS/DuckDuckGo/Statistics/SubscriptionPixel.swift:219:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /macOS/DuckDuckGo/Tab/UserScripts/Subscription/SubscriptionPagesUseSubscriptionFeature.swift:163:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /macOS/DuckDuckGo/NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift:44:13: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /macOS/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift:620:13: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /macOS/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift:624:13: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /macOS/DuckDuckGo/NetworkProtection/AppTargets/BothAppTargets/NetworkProtectionTunnelController.swift:626:13: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /iOS/Core/PixelEvent.swift:2986:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /iOS/Core/PixelEvent.swift:3052:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /iOS/DuckDuckGo/Subscription/Pixels/SubscriptionPixel.swift:45:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /iOS/DuckDuckGo/Subscription/Pixels/SubscriptionPixel.swift:52:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /iOS/DuckDuckGo/Subscription/UserScripts/SubscriptionPagesUseSubscriptionFeature.swift:242:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /SharedPackages/VPN/Sources/VPN/Diagnostics/NetworkProtectionError.swift:83:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /SharedPackages/VPN/Sources/VPN/Diagnostics/NetworkProtectionError.swift:95:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /SharedPackages/VPN/Sources/VPN/Diagnostics/NetworkProtectionError.swift:101:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /SharedPackages/VPN/Sources/VPN/Diagnostics/NetworkProtectionError.swift:108:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /SharedPackages/VPN/Sources/VPN/Diagnostics/NetworkProtectionError.swift:110:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /SharedPackages/VPN/Sources/VPN/Diagnostics/NetworkProtectionError.swift:113:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /SharedPackages/DataBrokerProtectionCore/Sources/DataBrokerProtectionCore/Pixels/DataBrokerProtectionSharedPixels.swift:225:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in DuckDuckGo: /SharedPackages/DataBrokerProtectionCore/Sources/DataBrokerProtectionCore/CCF/DataBrokerProtectionErrors.swift:157:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in Firefox: /firefox-ios/Storage/Rust/RustPlaces.swift:691:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in Firefox: /firefox-ios/Client/Frontend/InternalSchemeHandler/ErrorPageHelper.swift:119:5: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in Firefox: /firefox-ios/Client/Nimbus/OnboardingFeatureLayer/NimbusOnboardingFeatureLayerProtocol.swift:73:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in Firefox: /firefox-ios/Client/Nimbus/OnboardingFeatureLayer/NimbusOnboardingFeatureLayerProtocol.swift:77:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in Firefox: /BrowserKit/Sources/SummarizeKit/Backend/AppleIntelligence/FoundationModelsSummarizer.swift:100:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in Kickstarter: /Library/Sources/Library/Library/LocalizedString.swift:11:3: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in Kickstarter: /Library/Sources/Library/Library/LocalizedString.swift:13:3: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in Swift: /stdlib/public/core/CharacterProperties.swift:175:7: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in Swift: /stdlib/public/core/CharacterProperties.swift:177:7: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in Swift: /stdlib/public/core/CharacterProperties.swift:179:7: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in Swift: /stdlib/public/core/CharacterProperties.swift:181:7: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in Swift: /stdlib/public/core/CharacterProperties.swift:183:7: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in Wire: /wire-ios/Wire-iOS/Sources/Authentication/AuthenticationFlowStep.swift:90:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in Wire: /wire-ios/Wire-iOS/Sources/Authentication/AuthenticationFlowStep.swift:97:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in Wire: /wire-ios/Wire-iOS/Sources/Authentication/AuthenticationFlowStep.swift:107:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)
📖 This PR fixed a violation in Wire: /wire-ios/Wire-iOS/Sources/Authentication/AuthenticationFlowStep.swift:114:9: Warning: Include a single empty line between switch cases (vertical_whitespace_between_cases)

Generated by 🚫 Danger

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

vertical_whitespace_between_cases considers comments

2 participants