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.

Sign up for GitHub

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

Jump to bottom

Kotlin version #730

Merged
merged 17 commits into from
Feb 1, 2021
Merged

Kotlin version #730

merged 17 commits into from
Feb 1, 2021

Conversation

kentr0w
Copy link
Collaborator

@kentr0w kentr0w commented Jan 26, 2021

What's done:

Added parameter
closes #728

@kentr0w
Kotlin version
bb214e1 
### What's done:
   Added parameter
@kentr0w kentr0w added the enhancement New feature or request label Jan 26, 2021
@codecov
Copy link

codecov bot commented Jan 26, 2021 •
edited
Loading

Codecov Report

Merging #730 (e73c419) into master (5a4e738) will decrease coverage by 0.01%.
The diff coverage is 50.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #730      +/-   ##
============================================
- Coverage     79.97%   79.96%   -0.02%     
  Complexity     1967     1967              
============================================
  Files            94       94              
  Lines          5054     5066      +12     
  Branches       1620     1623       +3     
============================================
+ Hits           4042     4051       +9     
+ Misses          245      241       -4     
- Partials        767      774       +7
Flag Coverage Δ Complexity Δ
unittests 79.96% <50.00%> (-0.02%) 0.00 <1.00> (ø)

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

Impacted Files Coverage Δ Complexity Δ
...fn/diktat/common/config/rules/RulesConfigReader.kt 41.46% <30.00%> (+12.43%) 4.00 <0.00> (ø)
...uleset/rules/chapter6/classes/InlineClassesRule.kt 75.00% <100.00%> (+2.27%) 23.00 <1.00> (+1.00)
...tat/ruleset/rules/chapter3/BlockStructureBraces.kt 78.76% <0.00%> (-0.89%) 51.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 5a4e738...e73c419. Read the comment docs.

petertrr
petertrr requested changes Jan 26, 2021
View reviewed changes
diktat-analysis.yml Show resolved Hide resolved
diktat-analysis.yml Outdated Show resolved Hide resolved
diktat-common/src/main/kotlin/org/cqfn/diktat/common/config/rules/RulesConfigReader.kt Outdated Show resolved Hide resolved
@kentr0w
Kotlin version
8742958 
### What's done:
   Added default value
@kentr0w
Kotlin version
b08776a 
### What's done:
   Fixed after review
@kentr0w
Kotlin version
33e291a 
### What's done:
   Fixed after review
@kentr0w
Kotlin version
ce02a41 
### What's done:
   Fixed after review
@kentr0w
Kotlin version
7be2fa6 
### What's done:
   Fixed after review
petertrr
petertrr requested changes Jan 27, 2021
View reviewed changes
Copy link
Member

@petertrr petertrr left a comment

Choose a reason for hiding this comment

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

Looks good; we have merged rule about inline classes into master, please try to use your mechanism to enable that rules for kotlin >= 1.3 and add corresponding tests.

@kentr0w
Merge remote-tracking branch 'origin/master' into feature/kotlin-version
082228c
@kentr0w
Kotlin version
0f51cb9 
### What's done:
   Fixed after review
@kentr0w
Kotlin version
2ad371f 
### What's done:
   Fixed according our code-style
@kentr0w
Kotlin version
7a98e90 
### What's done:
   Fixed according our code-style
@kentr0w
Merge remote-tracking branch 'origin/master' into feature/kotlin-version
267d837 
# Conflicts:
#	diktat-analysis.yml
#	diktat-common/src/main/kotlin/org/cqfn/diktat/common/config/rules/RulesConfigReader.kt
#	diktat-rules/src/main/resources/diktat-analysis-huawei.yml
#	diktat-rules/src/main/resources/diktat-analysis.yml
petertrr
petertrr requested changes Jan 27, 2021
View reviewed changes
Copy link
Member

@petertrr petertrr left a comment

Choose a reason for hiding this comment

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

We should also check that we read value from config correctly, in some test where we read yaml. Smoke test or RulesConfigYamlTest.

...at-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/InlineClassesRule.kt Outdated Show resolved Hide resolved
...at-rules/src/main/kotlin/org/cqfn/diktat/ruleset/rules/chapter6/classes/InlineClassesRule.kt Outdated Show resolved Hide resolved
@kentr0w
Kotlin version
8f79d21 
### What's done:
   Fixed after review, added more tests
petertrr
petertrr requested changes Jan 28, 2021
View reviewed changes
Copy link
Member

@petertrr petertrr left a comment

Choose a reason for hiding this comment

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

almost there

diktat-common/src/main/kotlin/org/cqfn/diktat/common/config/rules/RulesConfigReader.kt Show resolved Hide resolved
diktat-common/src/main/kotlin/org/cqfn/diktat/common/config/rules/RulesConfigReader.kt Outdated Show resolved Hide resolved
diktat-analysis.yml Outdated Show resolved Hide resolved
@kentr0w
Kotlin version
65e34e5 
### What's done:
   Fixed after review
@kentr0w
Merge remote-tracking branch 'origin/master' into feature/kotlin-version
d7e29c0 
# Conflicts:
#	diktat-rules/src/main/kotlin/org/cqfn/diktat/ruleset/constants/Warnings.kt
@kentr0w
Kotlin version
f33ba07 
### What's done:
Fixed bugs accordign our code-style
petertrr
petertrr requested changes Feb 1, 2021
View reviewed changes
Copy link
Member

@petertrr petertrr left a comment

Choose a reason for hiding this comment

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

Please add tests to ConfigReaderTest and it'll be done.

diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/utils/RulesConfigYamlTest.kt Outdated Show resolved Hide resolved
diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/utils/RulesConfigYamlTest.kt Show resolved Hide resolved
diktat-common/src/main/kotlin/org/cqfn/diktat/common/config/rules/RulesConfigReader.kt Outdated Show resolved Hide resolved
diktat-rules/src/test/kotlin/org/cqfn/diktat/ruleset/utils/RulesConfigYamlTest.kt Show resolved Hide resolved
@kentr0w
Kotlin version
443ff01 
### What's done:
   Fixed after review
@kentr0w
Kotlin version
e73c419 
### What's done:
   Fixed according our code-style
@kentr0w kentr0w merged commit 3293e8d into master Feb 1, 2021
@kentr0w kentr0w deleted the feature/kotlin-version branch February 1, 2021 10:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petertrr petertrr petertrr approved these changes

@aktsay6 aktsay6 Awaiting requested review from aktsay6

Assignees
No one assigned
Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Support language version in diktat as a configuration property
2 participants
@kentr0w @petertrr