Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for issue #407 - no newline between consecutive braces in autocorrect mode #463

Merged
merged 6 commits into from
Oct 29, 2020

Conversation

petertrr
Copy link
Member

  • Fixed issue
  • Rearranged rules in DiktatRuleSetProvider
  • Added more smoke tests
  • Applied diktat code style

This pull request closes #407

### What's done:
* Rearranged rules in DiktatRuleSetProvider
### What's done:
* Code style
@codecov
Copy link

codecov bot commented Oct 27, 2020

Codecov Report

Merging #463 into master will increase coverage by 0.08%.
The diff coverage is 93.75%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #463      +/-   ##
============================================
+ Coverage     81.89%   81.98%   +0.08%     
- Complexity     1448     1451       +3     
============================================
  Files            70       70              
  Lines          3623     3624       +1     
  Branches       1158     1159       +1     
============================================
+ Hits           2967     2971       +4     
  Misses          202      202              
+ Partials        454      451       -3     
Flag Coverage Δ Complexity Δ
#unittests 81.98% <93.75%> (+0.08%) 1451.00 <2.00> (+3.00)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ Complexity Δ
...n/kotlin/org/cqfn/diktat/common/cli/CliArgument.kt 0.00% <ø> (ø) 0.00 <0.00> (ø)
...ktat/common/config/reader/ApplicationProperties.kt 0.00% <ø> (ø) 0.00 <0.00> (ø)
...t/common/config/reader/JsonResourceConfigReader.kt 45.45% <ø> (ø) 3.00 <0.00> (ø)
...fn/diktat/common/config/rules/RulesConfigReader.kt 35.71% <0.00%> (ø) 4.00 <0.00> (ø)
.../cqfn/diktat/ruleset/rules/BlockStructureBraces.kt 83.80% <ø> (ø) 53.00 <0.00> (ø)
...cqfn/diktat/ruleset/rules/DiktatRuleSetProvider.kt 96.92% <100.00%> (ø) 8.00 <0.00> (ø)
.../cqfn/diktat/ruleset/rules/WhenMustHaveElseRule.kt 83.33% <100.00%> (+0.47%) 14.00 <2.00> (ø)
...lin/org/cqfn/diktat/ruleset/rules/SmartCastRule.kt 63.79% <0.00%> (+0.86%) 36.00% <0.00%> (+2.00%)
.../ruleset/rules/BracesInConditionalsAndLoopsRule.kt 86.15% <0.00%> (+1.53%) 29.00% <0.00%> (ø%)
...cqfn/diktat/ruleset/rules/comments/CommentsRule.kt 97.95% <0.00%> (+2.04%) 19.00% <0.00%> (+1.00%)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2d9e88e...b96059b. Read the comment docs.

Copy link
Member

@orchestr7 orchestr7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@petertrr petertrr merged commit 6852628 into master Oct 29, 2020
@petertrr petertrr deleted the bugfix/newlines-braces#407 branch October 29, 2020 15:10
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.

No newlines between two consecutive }} after first run of diktat
2 participants