Properly indent comments inside multi-line Elvis expressions #1545
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
### What's done:
* Now, EOL and block comments within multi-line Elvis expressions have the same
indentation level as the immediately following Elvis operator (`?:`), e.g.:
```kotlin
fun foo() {
findProperty("dockerNetwork") as String?
// https://docs.docker.com/compose/networking/
?: "default"
}
```
* This fixes #1532.
0x6675636b796f75676974687562
requested review from
nulls,
petertrr,
orchestr7 and
icemachined
Codecov Report
@@ Coverage Diff @@
## master #1545 +/- ##
============================================
+ Coverage 82.10% 82.11% +0.01%
Complexity 2311 2311
============================================
Files 112 112
Lines 7801 7835 +34
Branches 2015 2030 +15
============================================
+ Hits 6405 6434 +29
Misses 481 481
- Partials 915 920 +5
Flags with carried forward coverage won't be shown. Click here to find out more.
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/utils/AstNodeUtils.kt
Fixed
Show fixed
Hide fixed
sanyavertolet
approved these changes
Nov 7, 2022
diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/DataClassesRule.kt
Show resolved
Hide resolved
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.
What's done:
indentation level as the immediately following Elvis operator (
?:), e.g.: