Fix excluded paths in nested configurations - #6876
Open
catlover-bot wants to merge 1 commit into
Open
Conversation
Generated by 🚫 Danger |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fix
excludedpaths in nested configurations being resolved twice.Relative
excludedpaths are already resolved against the configuration file location during parsing.groupFileswas resolving those paths against the configuration root a second time, which could turnSubFolder/testFile.swiftintoSubFolder/SubFolder/testFile.swiftwhen SwiftLint was run from the parent directory.The fix uses the already-resolved
excludedPathsdirectly when determining whether a file should be skipped.Regression test
Added coverage with a nested configuration containing:
testFile.swift, which must be excludedincludedFile.swift, which must remain lintableThe regression test fails with the unmodified implementation because the excluded file remains lintable, and passes with this fix.
Validation
nestedConfigurationExcludesRelativePathregression test: passedmake spm_test: 1089 tests in 374 suites passedmake bazel_test: 18/18 test targets passedswift run swiftlint lint --strict: 0 violations in 709 filesmake: passedincludedFile.swiftwas lintedCloses #4765