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 Conflicting TOO_MANY_BLANK_LINES and BRACES_BLOCK_STRUCTURE_ERROR with empty block #797

Merged
merged 5 commits into from
Mar 15, 2021

Conversation

Cheshiriks
Copy link
Member

What's done:

… with empty block

### What's done:
* Fixed Conflicting TOO_MANY_BLANK_LINES and BRACES_BLOCK_STRUCTURE_ERROR with empty block in lambda
@Cheshiriks Cheshiriks force-pushed the bugfix/blank-lines-in-lambda branch from f0aeebc to 9544845 Compare March 11, 2021 14:50
@codecov
Copy link

codecov bot commented Mar 11, 2021

Codecov Report

Merging #797 (c6f0954) into master (4311ff5) will increase coverage by 0.01%.
The diff coverage is 86.66%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #797      +/-   ##
============================================
+ Coverage     80.91%   80.93%   +0.01%     
- Complexity     2204     2213       +9     
============================================
  Files            98       98              
  Lines          5670     5685      +15     
  Branches       1756     1763       +7     
============================================
+ Hits           4588     4601      +13     
  Misses          285      285              
- Partials        797      799       +2     
Flag Coverage Δ Complexity Δ
unittests 80.93% <86.66%> (+0.01%) 0.00 <1.00> (ø)

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

Impacted Files Coverage Δ Complexity Δ
...g/cqfn/diktat/ruleset/rules/chapter3/EmptyBlock.kt 71.42% <77.77%> (+1.73%) 16.00 <1.00> (+3.00)
...tat/ruleset/rules/chapter3/BlockStructureBraces.kt 82.05% <100.00%> (+0.47%) 55.00 <0.00> (+3.00)
...tat/ruleset/rules/chapter3/files/BlankLinesRule.kt 95.65% <100.00%> (+0.65%) 17.00 <0.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 4311ff5...c6f0954. Read the comment docs.

… with empty block

### What's done:
* Fixed Conflicting TOO_MANY_BLANK_LINES and BRACES_BLOCK_STRUCTURE_ERROR with empty block in lambda
@Cheshiriks Cheshiriks force-pushed the bugfix/blank-lines-in-lambda branch from 798a791 to 7a64998 Compare March 12, 2021 12:25
… with empty block

### What's done:
* Fixed Conflicting TOO_MANY_BLANK_LINES and BRACES_BLOCK_STRUCTURE_ERROR with empty block in lambda
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.

why is not fixed and merged yet, @Cheshiriks

… with empty block

### What's done:
* Fixed Conflicting TOO_MANY_BLANK_LINES and BRACES_BLOCK_STRUCTURE_ERROR with empty block in lambda
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

… with empty block

### What's done:
* Fixed Conflicting TOO_MANY_BLANK_LINES and BRACES_BLOCK_STRUCTURE_ERROR with empty block in lambda
@Cheshiriks Cheshiriks merged commit 1885386 into master Mar 15, 2021
@petertrr petertrr deleted the bugfix/blank-lines-in-lambda branch March 24, 2021 09:14
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.

Conflicting TOO_MANY_BLANK_LINES and BRACES_BLOCK_STRUCTURE_ERROR with empty block
3 participants