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

Migration to Kotlin's imports #1659

Merged
merged 22 commits into from
Apr 12, 2023
Merged

Migration to Kotlin's imports #1659

merged 22 commits into from
Apr 12, 2023

Conversation

nulls
Copy link
Member

@nulls nulls commented Apr 7, 2023

What's done:

  • migrated to KtTokens, KtNodeTypes and KDocToken
  • removed dependency to ktlint in diktat-rules

It closes #1658

@github-actions
Copy link
Contributor

github-actions bot commented Apr 7, 2023 •
edited
Loading

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

   162 files  ±0     162 suites  ±0   7m 25s ⏱️ + 2m 36s
1 371 tests ±0  1 335 ✔️ ±0  36 💤 ±0  0 ❌ ±0 
2 750 runs  ±0  2 714 ✔️ ±0  36 💤 ±0  0 ❌ ±0 

Results for commit 7eb4546. ± Comparison against base commit cedf7e1.

♻️ This comment has been updated with latest results.

@github-actions
Copy link
Contributor

github-actions bot commented Apr 7, 2023 •
edited
Loading

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

   162 files  ±0     162 suites  ±0   9m 10s ⏱️ + 3m 33s
1 371 tests ±0  1 354 ✔️ ±0  17 💤 ±0  0 ❌ ±0 
2 750 runs  ±0  2 733 ✔️ ±0  17 💤 ±0  0 ❌ ±0 

Results for commit 7eb4546. ± Comparison against base commit cedf7e1.

♻️ This comment has been updated with latest results.

@nulls nulls self-assigned this Apr 7, 2023
@nulls nulls added this to the 2.0.0 milestone Apr 7, 2023
github-advanced-security[bot]
github-advanced-security bot found potential problems Apr 7, 2023
View reviewed changes
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.

ktlint found more than 10 potential problems in the proposed changes. Check the Files changed tab for more details.

@nulls nulls marked this pull request as ready for review April 10, 2023 11:26
@codecov
Copy link

codecov bot commented Apr 10, 2023 •
edited
Loading

Codecov Report

Merging #1659 (7eb4546) into master (cedf7e1) will decrease coverage by 0.08%.
The diff coverage is 69.74%.

@@             Coverage Diff              @@
##             master    #1659      +/-   ##
============================================
- Coverage     78.94%   78.86%   -0.08%     
+ Complexity     2318     2317       -1     
============================================
  Files           124      125       +1     
  Lines          8106     8139      +33     
  Branches       2044     2060      +16     
============================================
+ Hits           6399     6419      +20     
- Misses          810      812       +2     
- Partials        897      908      +11
Impacted Files Coverage Δ
...kotlin/org/cqfn/diktat/ruleset/rules/DiktatRule.kt 65.21% <0.00%> (ø)
...g/cqfn/diktat/ruleset/rules/chapter1/FileNaming.kt 17.85% <0.00%> (ø)
...qfn/diktat/ruleset/rules/chapter1/PackageNaming.kt 89.07% <ø> (ø)
...at/ruleset/rules/chapter3/AnnotationNewLineRule.kt 94.28% <ø> (ø)
...t/ruleset/rules/chapter3/BooleanExpressionsRule.kt 92.56% <ø> (ø)
...set/rules/chapter3/ClassLikeStructuresOrderRule.kt 84.17% <0.00%> (ø)
...ruleset/rules/chapter3/CollapseIfStatementsRule.kt 85.84% <0.00%> (ø)
...at/ruleset/rules/chapter3/ConsecutiveSpacesRule.kt 93.54% <ø> (ø)
...fn/diktat/ruleset/rules/chapter3/EnumsSeparated.kt 96.42% <ø> (ø)
...rules/chapter3/LongNumericalValuesSeparatedRule.kt 96.05% <ø> (ø)
... and 75 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@nulls nulls enabled auto-merge (squash) April 11, 2023 11:47
@nulls nulls merged commit 3bed4c1 into master Apr 12, 2023
@nulls nulls deleted the feature/ktlint-imports branch April 12, 2023 10:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@0x6675636b796f75676974687562 0x6675636b796f75676974687562 0x6675636b796f75676974687562 approved these changes

@kgevorkyan kgevorkyan Awaiting requested review from kgevorkyan

@icemachined icemachined Awaiting requested review from icemachined

@sanyavertolet sanyavertolet Awaiting requested review from sanyavertolet

@Cheshiriks Cheshiriks Awaiting requested review from Cheshiriks

@orchestr7 orchestr7 Awaiting requested review from orchestr7

Assignees

@nulls nulls

Labels
refactoring
Projects
None yet
Milestone
2.0.0
Development

Successfully merging this pull request may close these issues.

Migrate from KtLint's ElementType to Kotlin's KtTokens and KtNodeTypes
2 participants
@nulls @0x6675636b796f75676974687562