Disabling default patterns if the option --patterns-from-stdin is given
#1801
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
Instead, they will now only be added in `FileUtils.fileSequence()`. Better anyway to only add them in one place so it's easier to keep track of it and have a better overview.
paul-dingemans
requested changes
Jan 30, 2023
ktlint/src/main/kotlin/com/pinterest/ktlint/internal/KtlintCommandLine.kt
Show resolved
Hide resolved
ktlint/src/main/kotlin/com/pinterest/ktlint/internal/KtlintCommandLine.kt
Show resolved
Hide resolved
ktlint/src/main/kotlin/com/pinterest/ktlint/internal/FileUtils.kt
Outdated
Show resolved
Hide resolved
…lt-patterns-if-read-patterns-from-stdin' into pr/1801 # Conflicts: # CHANGELOG.md # ktlint/src/main/kotlin/com/pinterest/ktlint/internal/FileUtils.kt # ktlint/src/main/kotlin/com/pinterest/ktlint/internal/KtlintCommandLine.kt # ktlint/src/test/kotlin/com/pinterest/ktlint/SimpleCLITest.kt
…terns are now specified via the "patterns" parameter when needed.
|
This didn't work out as I expected. There is no need for the fileSequence to receive two different lists of patterns. I have modified your solution. Can you have a look at my changes? |
Yes, to be honest I also didn't like that solution, I just didn't know how to properly change I'd say like this it's ready to be merged. |
|
Merged. Tnx for the collaboration. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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.
Description
Simple change to not add the default patterns if the CLI option
--patterns-from-stdinis given.This PR fixes issue #1793.
Checklist
CHANGELOG.mdis updated