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 ordering issue #1390

Merged
merged 11 commits into from
Jun 22, 2022
Merged

Fix ordering issue #1390

merged 11 commits into from
Jun 22, 2022

Conversation

nulls
Copy link
Member

@nulls nulls commented Jun 22, 2022

What's done:

  • added ruleSetId to Rule.VisitorModifier.RunAfterRule
  • extracted ordering logic to OrderedRuleSet
  • removed all prefixes in rule_id

It closes #1378

Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

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

Found 13 potential problems in the proposed changes. Check the Files changed tab for more details.

Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

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

Found 13 potential problems in the proposed changes. Check the Files changed tab for more details.

Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

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

Found 13 potential problems in the proposed changes. Check the Files changed tab for more details.

@github-actions
Copy link
Contributor

github-actions bot commented Jun 22, 2022

JUnit Tests (macOS, EnricoMi/publish-unit-test-result-action@v1)

1 262 tests   1 247 ✔️  10m 16s ⏱️
   151 suites       15 💤
   151 files           0

Results for commit f9d2bd9.

♻️ This comment has been updated with latest results.

@github-actions
Copy link
Contributor

github-actions bot commented Jun 22, 2022

JUnit Tests (Windows, EnricoMi/publish-unit-test-result-action@v1)

1 262 tests   1 247 ✔️  8m 16s ⏱️
   151 suites       15 💤
   151 files           0

Results for commit f9d2bd9.

♻️ This comment has been updated with latest results.

Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

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

Found 15 potential problems in the proposed changes. Check the Files changed tab for more details.

Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

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

Found 15 potential problems in the proposed changes. Check the Files changed tab for more details.

@nulls nulls marked this pull request as ready for review June 22, 2022 08:47
Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

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

Found 17 potential problems in the proposed changes. Check the Files changed tab for more details.

Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

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

Found 15 potential problems in the proposed changes. Check the Files changed tab for more details.

Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

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

Found 13 potential problems in the proposed changes. Check the Files changed tab for more details.

Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

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

Found 15 potential problems in the proposed changes. Check the Files changed tab for more details.

@codecov
Copy link

codecov bot commented Jun 22, 2022

Codecov Report

Merging #1390 (f9d2bd9) into master (57af86c) will decrease coverage by 0.01%.
The diff coverage is 89.65%.

@@             Coverage Diff              @@
##             master    #1390      +/-   ##
============================================
- Coverage     83.30%   83.29%   -0.02%     
+ Complexity     2554     2552       -2     
============================================
  Files           107      107              
  Lines          7565     7571       +6     
  Branches       2090     2092       +2     
============================================
+ Hits           6302     6306       +4     
- Misses          373      374       +1     
- Partials        890      891       +1     
Flag Coverage Δ
unittests 83.29% <89.65%> (-0.02%) ⬇️

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

Impacted Files Coverage Δ
...g/cqfn/diktat/ruleset/rules/chapter1/FileNaming.kt 75.00% <ø> (ø)
.../diktat/ruleset/rules/chapter1/IdentifierNaming.kt 82.23% <ø> (ø)
...qfn/diktat/ruleset/rules/chapter1/PackageNaming.kt 89.07% <ø> (ø)
...at/ruleset/rules/chapter2/comments/CommentsRule.kt 87.50% <ø> (ø)
...leset/rules/chapter2/comments/HeaderCommentRule.kt 86.61% <ø> (ø)
.../ruleset/rules/chapter2/kdoc/CommentsFormatting.kt 74.09% <ø> (ø)
...diktat/ruleset/rules/chapter2/kdoc/KdocComments.kt 89.34% <ø> (ø)
...ktat/ruleset/rules/chapter2/kdoc/KdocFormatting.kt 84.11% <ø> (ø)
.../diktat/ruleset/rules/chapter2/kdoc/KdocMethods.kt 87.42% <ø> (ø)
...at/ruleset/rules/chapter3/AnnotationNewLineRule.kt 94.28% <ø> (ø)
... and 64 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 57af86c...f9d2bd9. Read the comment docs.

nulls added 10 commits June 22, 2022 13:18
- added ruleSetId to Rule.VisitorModifier.RunAfterRule
- extracted ordering logic to OrderedRuleSet
- removed all prefixes in rule_id
### What's done:
- added ruleSetId to Rule.VisitorModifier.RunAfterRule
- extracted ordering logic to OrderedRuleSet
- removed all prefixes in rule_id
@nulls nulls enabled auto-merge (squash) June 22, 2022 10:53
@nulls nulls disabled auto-merge June 22, 2022 10:54
@nulls nulls enabled auto-merge (squash) June 22, 2022 10:55
@nulls nulls merged commit 76033d4 into master Jun 22, 2022
@nulls nulls deleted the bugfix/ordering-rule-id branch June 22, 2022 14:22
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.

Ordering for 'zct-indentation'
3 participants