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

Make diktat consistent with own code style #404

Merged
merged 5 commits into from
Oct 15, 2020

Conversation

petertrr
Copy link
Member

diktat-common and diktat-test-framework pass code style check

### What's done:
* Code style
…code-style

# Conflicts:
#	diktat-test-framework/src/main/kotlin/org/cqfn/diktat/test/framework/config/TestFrameworkProperties.kt
### What's done:
* Code style
@codecov
Copy link

codecov bot commented Oct 15, 2020

Codecov Report

Merging #404 into master will increase coverage by 0.04%.
The diff coverage is 82.64%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #404      +/-   ##
============================================
+ Coverage     82.54%   82.59%   +0.04%     
  Complexity     1340     1340              
============================================
  Files            65       65              
  Lines          3249     3281      +32     
  Branches       1043     1049       +6     
============================================
+ Hits           2682     2710      +28     
  Misses          177      177              
- Partials        390      394       +4     
Flag Coverage Δ Complexity Δ
#unittests 82.59% <82.64%> (+0.04%) 1340.00 <53.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 <0.00> (ø)
...tlin/org/cqfn/diktat/ruleset/constants/Warnings.kt 97.11% <ø> (ø) 9.00 <0.00> (ø)
.../ruleset/rules/BracesInConditionalsAndLoopsRule.kt 84.61% <57.14%> (-4.68%) 29.00 <1.00> (ø)
...set/rules/calculations/AccurateCalculationsRule.kt 78.37% <81.03%> (ø) 45.00 <34.00> (ø)
.../cqfn/diktat/ruleset/rules/BlockStructureBraces.kt 83.80% <90.90%> (+0.80%) 53.00 <8.00> (ø)
...ktat/ruleset/rules/ClassLikeStructuresOrderRule.kt 85.55% <91.66%> (+2.22%) 40.00 <0.00> (ø)
...fn/diktat/common/config/rules/RulesConfigReader.kt 35.71% <100.00%> (ø) 4.00 <1.00> (ø)
...cqfn/diktat/ruleset/rules/AnnotationNewLineRule.kt 90.47% <100.00%> (ø) 15.00 <6.00> (ø)
...n/diktat/ruleset/rules/AvoidNestedFunctionsRule.kt 91.42% <100.00%> (+1.77%) 12.00 <3.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 266813f...239e4f2. Read the comment docs.

### What's done:
* Code style
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, thank you so much. Any issues found?

@petertrr
Copy link
Member Author

petertrr commented Oct 15, 2020

Lgtm, thank you so much. Any issues found?

Yes, I've opened #401, #405, #406, #407 during this and some issues for not bugs but ideas of improvements (#402, #403). And there are still a bunch of lint errors in diktat-rules..

@petertrr petertrr merged commit 3fa9105 into master Oct 15, 2020
@petertrr petertrr deleted the feature/consistent-code-style branch October 15, 2020 19:52
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.

2 participants