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

Feature/consistent codestyle 0.1.5 #556

Merged
merged 47 commits into from
Dec 3, 2020

Conversation

petertrr
Copy link
Member

@petertrr petertrr commented Nov 19, 2020

Currently blocked by #325 , #492, #550, #551, #480, #585, #490

It would be nice to do #574 to make fixing of tests simpler, but it can be done later and then run against current code once more.

Now only 800 errors are left.
Only 345 294 211 38 to go!

…codestyle-0.1.5

# Conflicts:
#	diktat-gradle-plugin/src/main/kotlin/org/cqfn/diktat/plugin/gradle/DiktatGradlePlugin.kt
#	diktat-maven-plugin/src/main/kotlin/org/cqfn/diktat/plugin/maven/DiktatBaseMojo.kt
#	diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/constants/Warnings.kt
#	diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/classes/SingleInitRule.kt
### What's done:
* Compilation fixes
### What's done:
* Fixes
@codecov
Copy link

codecov bot commented Nov 26, 2020

Codecov Report

Merging #556 (b41f425) into master (dc1ba8d) will increase coverage by 0.51%.
The diff coverage is 78.77%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #556      +/-   ##
============================================
+ Coverage     80.82%   81.33%   +0.51%     
- Complexity     1712     1720       +8     
============================================
  Files            87       87              
  Lines          4385     4548     +163     
  Branches       1351     1359       +8     
============================================
+ Hits           3544     3699     +155     
- Misses          298      306       +8     
  Partials        543      543              
Flag Coverage Δ Complexity Δ
unittests 81.33% <78.77%> (+0.51%) 0.00 <266.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> (ø)
...ktat/common/config/reader/ApplicationProperties.kt 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...lin/org/cqfn/diktat/plugin/maven/DiktatBaseMojo.kt 7.14% <0.00%> (ø) 2.00 <0.00> (ø)
...diktat/ruleset/constants/WarningsTableGenerator.kt 0.00% <0.00%> (ø) 0.00 <0.00> (ø)
...fn/diktat/ruleset/rules/StringConcatenationRule.kt 83.33% <0.00%> (ø) 15.00 <0.00> (ø)
...iktat/ruleset/rules/classes/AbstractClassesRule.kt 79.16% <ø> (ø) 10.00 <0.00> (ø)
...lin/org/cqfn/diktat/ruleset/utils/SequenceUtils.kt 100.00% <ø> (ø) 0.00 <0.00> (ø)
...tat/ruleset/utils/indentation/IndentationConfig.kt 85.71% <ø> (ø) 12.00 <0.00> (ø)
.../kotlin/org/cqfn/diktat/ruleset/utils/KdocUtils.kt 21.05% <25.00%> (ø) 0.00 <0.00> (?)
...main/kotlin/org/cqfn/diktat/plugin/gradle/Utils.kt 62.50% <28.57%> (ø) 0.00 <0.00> (ø)
... and 76 more

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 dc1ba8d...b41f425. Read the comment docs.

### What's done:
* Fixing code style
### What's done:
* Fixing code style
### What's done:
* Fixing code style in tests
### What's done:
* Fixing code style in tests
### What's done:
* Fixing code style
### What's done:
* Fixing code style in tests
### What's done:
* Fixing code style
### What's done:
* Fixing code style
### What's done:
* Fixing code style
### What's done:
* Fixing code style
…codestyle-0.1.5

# Conflicts:
#	diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/kdoc/KdocComments.kt
#	diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter2/KdocCommentsWarnTest.kt
### What's done:
* Fixing code style
### What's done:
* Fixing code style
* Update diktat-analysis.yml
### What's done:
* Fixing code style
### What's done:
* Fixing code style
### What's done:
* Fixing code style
…codestyle-0.1.5

# Conflicts:
#	diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/BracesInConditionalsAndLoopsRule.kt
#	diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/DiktatRuleSetProvider.kt
#	diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/PackageNaming.kt
### What's done:
* Fixes after merge
### What's done:
* Fixing code style
### What's done:
* Fixing code style
…codestyle-0.1.5

# Conflicts:
#	diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/kdoc/KdocMethods.kt
### What's done:
* Fixing code style
…codestyle-0.1.5

# Conflicts:
#	diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/NullChecksRule.kt
#	diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/chapter4/NullChecksRuleWarnTest.kt
### What's done:
* Fixing code style
### What's done:
* Fixing code style
### What's done:
* Fixing code style
### What's done:
* fixing AVOID_NULL_CHECKS
…codestyle-0.1.5

# Conflicts:
#	diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/files/WhiteSpaceRule.kt
### What's done:
* fixing code style
### What's done:
* fixing AVOID_NULL_CHECKS
### What's done:
* fixing code style
### What's done:
* detekt
### What's done:
* fixes
…codestyle-0.1.5

# Conflicts:
#	diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/EmptyBlock.kt
#	diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/IdentifierNaming.kt
### What's done:
* fixes after merge
### What's done:
* fixing code style
### What's done:
* Suppressed WRONG_NEWLINES
@petertrr petertrr marked this pull request as ready for review December 3, 2020 12:33
@petertrr petertrr requested a review from orchestr7 December 3, 2020 12:37
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 67ffa9c into master Dec 3, 2020
@petertrr petertrr deleted the feature/consistent-codestyle-0.1.5 branch December 3, 2020 12:40
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