Fix using incorrect config file #1604
Merged
Conversation
This file contains 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
Generated by 🚫 Danger |
Codecov Report
@@ Coverage Diff @@
## master #1604 +/- ##
==========================================
- Coverage 88.2% 88.18% -0.02%
==========================================
Files 194 194
Lines 9680 9693 +13
==========================================
+ Hits 8538 8548 +10
- Misses 1142 1145 +3
Continue to review full report at Codecov.
|
marcelofabri
requested changes
Jun 13, 2017
marcelofabri
force-pushed
the
jp-custom-config
branch
from
49c4fc2 to
dbdc9f7
Compare
marcelofabri
approved these changes
Jun 13, 2017
|
I actually think this fix is wrong, or at least incomplete. It won't work if the specified config isn't in the root path (e.g. |
alvarhansen
added a commit
to alvarhansen/SwiftLint
that referenced
this pull request
May 7, 2019
Removes configuration “working directory” check as the configuration itself can reside in different directory. This check was introduced with PR realm#1604 for issue realm#1531. At the time it was necessary as SwiftLint did not support Configuration merging and this stopped overwriting the configuration. At the moment, if you load configuration from different path than root path **and** you also have configuration file in root path then it is skipped. Now that configuration merging is supported, it is more correct to merge them. Example where `Level3/.swiftlint.yml` is skipped: `swiftlint lint --config ../.swiftlint.yml --path Level3` ``` Level2 │ .swiftlint.yml │ └───Level3 │ │ .swiftlint.yml │ │ Level3.swift ``` Adds test for making sure that configuration that is out of working directory is merged with configuration from working directory. Adds test for realm#1531 to make sure regression won’t happen in the future.
alvarhansen
added a commit
to alvarhansen/SwiftLint
that referenced
this pull request
May 7, 2019
Removes configuration “working directory” check as the configuration itself can reside in different directory. This check was introduced with PR realm#1604 for issue realm#1531. At the time it was necessary as SwiftLint did not support Configuration merging and this stopped overwriting the configuration. At the moment, if you load configuration from different path than root path **and** you also have configuration file in root path then it is skipped. Now that configuration merging is supported, it is more correct to merge them. Example where `Level3/.swiftlint.yml` is skipped: `swiftlint lint --config ../.swiftlint.yml --path Level3` ``` Level2 │ .swiftlint.yml │ └───Level3 │ │ .swiftlint.yml │ │ Level3.swift ``` Adds test for making sure that configuration that is out of working directory is merged with configuration from working directory. Adds test for realm#1531 to make sure regression won’t happen in the future.
alvarhansen
added a commit
to alvarhansen/SwiftLint
that referenced
this pull request
May 7, 2019
Removes configuration “working directory” check as the configuration itself can reside in different directory. This check was introduced with PR realm#1604 for issue realm#1531. At the time it was necessary as SwiftLint did not support Configuration merging and this stopped overwriting the configuration. Replaced it with configuration file path check. At the moment, if you load configuration from different path than root path **and** you also have configuration file in root path then it is skipped. Now that configuration merging is supported, it is more correct to merge them. Example where `Level3/.swiftlint.yml` is skipped: `swiftlint lint --config ../.swiftlint.yml --path Level3` ``` Level2 │ .swiftlint.yml │ └───Level3 │ │ .swiftlint.yml │ │ Level3.swift ``` Adds test for making sure that configuration that is out of working directory is merged with configuration from working directory. Adds test for realm#1531 to make sure regression won’t happen in the future.
alvarhansen
added a commit
to alvarhansen/SwiftLint
that referenced
this pull request
May 7, 2019
Removes configuration “working directory” check as the configuration itself can reside in different directory. This check was introduced with PR realm#1604 for issue realm#1531. At the time it was necessary as SwiftLint did not support Configuration merging and this stopped overwriting the configuration. Replaced it with configuration file path check. At the moment, if you load configuration from different path than root path **and** you also have configuration file in root path then it is skipped. Now that configuration merging is supported, it is more correct to merge them. Example where `Level3/.swiftlint.yml` is skipped: `swiftlint lint --config ../.swiftlint.yml --path Level3` ``` Level2 │ .swiftlint.yml │ └───Level3 │ │ .swiftlint.yml │ │ Level3.swift ``` Adds test for making sure that configuration that is out of working directory is merged with configuration from working directory. Adds test for realm#1531 to make sure regression won’t happen in the future.
alvarhansen
added a commit
to alvarhansen/SwiftLint
that referenced
this pull request
May 7, 2019
Removes configuration “working directory” check as the configuration itself can reside in different directory. This check was introduced with PR realm#1604 for issue realm#1531. At the time it was necessary as SwiftLint did not support Configuration merging and this stopped overwriting the configuration. Replaced it with configuration file path check. At the moment, if you load configuration from different path than root path **and** you also have configuration file in root path then it is skipped. Now that configuration merging is supported, it is more correct to merge them. Example where `Level3/.swiftlint.yml` is skipped: `swiftlint lint --config ../.swiftlint.yml --path Level3` ``` Level2 │ .swiftlint.yml │ └───Level3 │ │ .swiftlint.yml │ │ Level3.swift ``` Adds test for making sure that configuration that is out of working directory is merged with configuration from working directory. Adds test for realm#1531 to make sure regression won’t happen in the future.
alvarhansen
added a commit
to alvarhansen/SwiftLint
that referenced
this pull request
Sep 19, 2019
Removes configuration “working directory” check as the configuration itself can reside in different directory. This check was introduced with PR realm#1604 for issue realm#1531. At the time it was necessary as SwiftLint did not support Configuration merging and this stopped overwriting the configuration. Replaced it with configuration file path check. At the moment, if you load configuration from different path than root path **and** you also have configuration file in root path then it is skipped. Now that configuration merging is supported, it is more correct to merge them. Example where `Level3/.swiftlint.yml` is skipped: `swiftlint lint --config ../.swiftlint.yml --path Level3` ``` Level2 │ .swiftlint.yml │ └───Level3 │ │ .swiftlint.yml │ │ Level3.swift ``` Adds test for making sure that configuration that is out of working directory is merged with configuration from working directory. Adds test for realm#1531 to make sure regression won’t happen in the future.
alvarhansen
added a commit
to alvarhansen/SwiftLint
that referenced
this pull request
Sep 20, 2019
Removes configuration “working directory” check as the configuration itself can reside in different directory. This check was introduced with PR realm#1604 for issue realm#1531. At the time it was necessary as SwiftLint did not support Configuration merging and this stopped overwriting the configuration. Replaced it with configuration file path check. At the moment, if you load configuration from different path than root path **and** you also have configuration file in root path then it is skipped. Now that configuration merging is supported, it is more correct to merge them. Example where `Level3/.swiftlint.yml` is skipped: `swiftlint lint --config ../.swiftlint.yml --path Level3` ``` Level2 │ .swiftlint.yml │ └───Level3 │ │ .swiftlint.yml │ │ Level3.swift ``` Adds test for making sure that configuration that is out of working directory is merged with configuration from working directory. Adds test for realm#1531 to make sure regression won’t happen in the future.
alvarhansen
added a commit
to alvarhansen/SwiftLint
that referenced
this pull request
Sep 20, 2019
Removes configuration “working directory” check as the configuration itself can reside in different directory. This check was introduced with PR realm#1604 for issue realm#1531. At the time it was necessary as SwiftLint did not support Configuration merging and this stopped overwriting the configuration. Replaced it with configuration file path check. At the moment, if you load configuration from different path than root path **and** you also have configuration file in root path then it is skipped. Now that configuration merging is supported, it is more correct to merge them. Example where `Level3/.swiftlint.yml` is skipped: `swiftlint lint --config ../.swiftlint.yml --path Level3` ``` Level2 │ .swiftlint.yml │ └───Level3 │ │ .swiftlint.yml │ │ Level3.swift ``` Adds test for making sure that configuration that is out of working directory is merged with configuration from working directory. Adds test for realm#1531 to make sure regression won’t happen in the future.
alvarhansen
added a commit
to alvarhansen/SwiftLint
that referenced
this pull request
Sep 20, 2019
Removes configuration “working directory” check as the configuration itself can reside in different directory. This check was introduced with PR realm#1604 for issue realm#1531. At the time it was necessary as SwiftLint did not support Configuration merging and this stopped overwriting the configuration. Replaced it with configuration file path check. At the moment, if you load configuration from different path than root path **and** you also have configuration file in root path then it is skipped. Now that configuration merging is supported, it is more correct to merge them. Example where `Level3/.swiftlint.yml` is skipped: `swiftlint lint --config ../.swiftlint.yml --path Level3` ``` Level2 │ .swiftlint.yml │ └───Level3 │ │ .swiftlint.yml │ │ Level3.swift ``` Adds test for making sure that configuration that is out of working directory is merged with configuration from working directory. Adds test for realm#1531 to make sure regression won’t happen in the future.
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
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.
Fixes #1531.