Migrate to KtLint 0.48.2 #1571

0x6675636b796f75676974687562 · 2022-11-16T12:29:28Z

Extracted:

Cherry-picked from #1570
It closes #1543

…set ids (#1568) ### What's done: Additional rule set ids (available since KtLint 0.47) are now ignored, both via the `--disabled_rules` command-line argument, and via class path exclusions (Gradle plug-in). This change fixes behaviour described in #1559 with KtLint 0.47+.

@Suppress

### What's done: - Deprecated API usages removed (except for `DiktatBaseMojo`). - @Suppress("Deprecation") annotations removed (except for `DiktatBaseMojo`). - A part of #1543.

### What's done: * Common code extracted in preparation to add more integration tests.

github-actions · 2023-03-24T08:10:31Z

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

  162 files ±0   162 suites ±0 4m 38s ⏱️ -4s
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 7ec85c4. ± Comparison against base commit 4a9b71f.

This pull request removes 3 and adds 3 tests. Note that renamed tests count towards both.

org.cqfn.diktat.ktlint.KtLintRuleSetWrapperTest ‑ KtLint keeps order with RuleVisitorModifierRunAfterRule()
org.cqfn.diktat.ktlint.KtLintRuleSetWrapperTest ‑ check KtLintRuleSetWrapper with duplicate()
org.cqfn.diktat.ktlint.KtLintRuleSetWrapperTest ‑ check OrderedRule()

org.cqfn.diktat.ktlint.KtLintRuleWrapperTest ‑ KtLint keeps order with RuleVisitorModifierRunAfterRule()
org.cqfn.diktat.ktlint.KtLintRuleWrapperTest ‑ check KtLintRuleSetWrapper with duplicate()
org.cqfn.diktat.ktlint.KtLintRuleWrapperTest ‑ check OrderedRule()

♻️ This comment has been updated with latest results.

github-actions · 2023-03-24T08:12:47Z

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

  162 files ±0   162 suites ±0 10m 32s ⏱️ + 1m 45s
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 7ec85c4. ± Comparison against base commit 4a9b71f.

This pull request removes 3 and adds 3 tests. Note that renamed tests count towards both.

org.cqfn.diktat.ktlint.KtLintRuleSetWrapperTest ‑ KtLint keeps order with RuleVisitorModifierRunAfterRule()
org.cqfn.diktat.ktlint.KtLintRuleSetWrapperTest ‑ check KtLintRuleSetWrapper with duplicate()
org.cqfn.diktat.ktlint.KtLintRuleSetWrapperTest ‑ check OrderedRule()

org.cqfn.diktat.ktlint.KtLintRuleWrapperTest ‑ KtLint keeps order with RuleVisitorModifierRunAfterRule()
org.cqfn.diktat.ktlint.KtLintRuleWrapperTest ‑ check KtLintRuleSetWrapper with duplicate()
org.cqfn.diktat.ktlint.KtLintRuleWrapperTest ‑ check OrderedRule()

♻️ This comment has been updated with latest results.

### What's done: - updated `disabled_rules` - updated exclusion in gradle tasks It extracted from #1571 Co-authored-by: Andrey Shcheglov <andrewbass+saveourtool@gmail.com>

### What's done: - extracted to common place a common methods It extracted from #1571 Co-authored-by: Andrey Shcheglov <andrewbass+saveourtool@gmail.com>

diktat-ruleset/src/main/kotlin/org/cqfn/diktat/DiktatProcessCommand.kt

github-advanced-security

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

…g ktLintRuleEngine

nulls · 2023-04-07T07:37:28Z

@0x6675636b796f75676974687562 please look at changes after merging parts to master

codecov · 2023-04-07T11:44:18Z

Codecov Report

Merging #1571 (128cf9f) into master (4a9b71f) will increase coverage by 0.18%.
The diff coverage is 44.44%.

@@             Coverage Diff              @@
##             master    #1571      +/-   ##
============================================
+ Coverage     78.75%   78.94%   +0.18%     
+ Complexity     2320     2318       -2     
============================================
  Files           125      124       -1     
  Lines          8111     8106       -5     
  Branches       2047     2044       -3     
============================================
+ Hits           6388     6399      +11     
+ Misses          825      810      -15     
+ Partials        898      897       -1

Impacted Files	Coverage Δ
...rg/cqfn/diktat/ktlint/DiktatBaselineFactoryImpl.kt	`0.00% <0.00%> (ø)`
...g/cqfn/diktat/ktlint/DiktatProcessorFactoryImpl.kt	`0.00% <0.00%> (ø)`
...rg/cqfn/diktat/ktlint/DiktatReporterFactoryImpl.kt	`0.00% <ø> (ø)`
...cqfn/diktat/ruleset/rules/DiktatRuleSetProvider.kt	`97.50% <ø> (-0.03%)`	⬇️
...fn/diktat/ruleset/rules/chapter3/EnumsSeparated.kt	`96.42% <ø> (ø)`
...at/ruleset/rules/chapter3/files/IndentationRule.kt	`75.00% <ø> (ø)`
...diktat/ruleset/rules/DiktatRuleSetProviderV2Spi.kt	`0.00% <0.00%> (ø)`
...tlin/org/cqfn/diktat/ruleset/utils/AstNodeUtils.kt	`82.24% <83.33%> (+0.35%)`	⬆️
...kotlin/org/cqfn/diktat/ktlint/KtLintRuleWrapper.kt	`82.75% <100.00%> (+7.75%)`	⬆️

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

0x6675636b796f75676974687562

LGTM

0x6675636b796f75676974687562 and others added 2 commits November 16, 2022 12:13

Builder to run Diktat (#1562)

b8f4350

0x6675636b796f75676974687562 assigned 0x6675636b796f75676974687562 and nulls Nov 16, 2022

0x6675636b796f75676974687562 added this to the ktlint-wrapper milestone Nov 16, 2022

0x6675636b796f75676974687562 requested review from petertrr and orchestr7 November 16, 2022 12:30

0x6675636b796f75676974687562 and others added 9 commits November 18, 2022 13:30

Migrate to the new rule set API (#1570)

a2ba01a

### What's done: - Deprecated API usages removed (except for `DiktatBaseMojo`). - @Suppress("Deprecation") annotations removed (except for `DiktatBaseMojo`). - A part of #1543.

Add main for diktat.jar (#1566)

9a9e768

Migration is in progress

134a6e4

WIP

0597736

WIP #2

76ee541

WIP

78adb2a

reverted changes related to codegen

2f635b8

Extract common integration test code (#1629)

ea78576

### What's done: * Common code extracted in preparation to add more integration tests.

Merge remote-tracking branch 'origin/master' into feature/ktlint-wrapper

10359a0

nulls marked this pull request as ready for review March 24, 2023 10:09

nulls marked this pull request as draft March 24, 2023 10:09

nulls added a commit that referenced this pull request Mar 24, 2023

Disabled additional rules from KtLint

d71a7a0

### What's done: - updated `disabled_rules` - updated exclusion in gradle tasks It extracted from #1571 Co-authored-by: Andrey Shcheglov <andrewbass+saveourtool@gmail.com>

nulls mentioned this pull request Mar 24, 2023

Disabled additional rules from KtLint #1643

Merged

nulls added a commit that referenced this pull request Mar 24, 2023

Enchantments for tests

0c5a52a

### What's done: - extracted to common place a common methods It extracted from #1571 Co-authored-by: Andrey Shcheglov <andrewbass+saveourtool@gmail.com>

This was referenced Mar 24, 2023

Enhancements for tests #1644

Merged

Update Ktlint to v0.48.2 #1646

Closed

Merge branch 'feature/ktlint-0.48.2' into feature/ktlint-wrapper

f8eb5c7

github-advanced-security bot found potential problems Mar 27, 2023

View reviewed changes

diktat-ruleset/src/main/kotlin/org/cqfn/diktat/DiktatProcessCommand.kt Fixed Show fixed Hide fixed

diktat-ruleset/src/main/kotlin/org/cqfn/diktat/DiktatProcessCommand.kt Fixed Show fixed Hide fixed

nulls changed the title ~~Migrate to KtLint 0.47.1~~ Migrate to KtLint 0.48.2 Mar 27, 2023

nulls added 2 commits March 27, 2023 11:56

diktatFix

2ff1a1f

Merge branch 'master' into feature/ktlint-wrapper

c421595

github-advanced-security bot found potential problems Apr 5, 2023

View reviewed changes

nulls added 7 commits April 6, 2023 14:50

Merge remote-tracking branch 'origin/master' into feature/ktlint-wrapper

f369663

cleanup old code

9e02d9e

self review

18f9be5

Merge branch 'master' into feature/ktlint-wrapper

faf458f

fixed Baseline loading and Color importing in plain reporter + reusin…

7bd9a7a

…g ktLintRuleEngine

fixed condition in loading baseline

cb848c8

formatting

bc9b330

nulls marked this pull request as ready for review April 7, 2023 07:36

nulls requested review from kgevorkyan, icemachined, sanyavertolet and Cheshiriks April 7, 2023 07:36

nulls modified the milestones: ktlint-wrapper, 2.0.0 Apr 7, 2023

sanyavertolet approved these changes Apr 7, 2023

View reviewed changes

fixed file path

4630fc6

Cheshiriks approved these changes Apr 7, 2023

View reviewed changes

nulls added 4 commits April 7, 2023 12:44

fixed file path for snippets

57a1c34

fixed getting KtFile

6d59816

fixed Smoke tests

eb6406b

disabled ktlint's rule properly

7ec85c4

nulls added 2 commits April 7, 2023 15:03

temp directory for Unix in the same way as for Windows

6a4bfcf

fixed build_and_test.yml

128cf9f

0x6675636b796f75676974687562 commented Apr 7, 2023

View reviewed changes

nulls enabled auto-merge (squash) April 7, 2023 12:25

nulls merged commit 841df8a into master Apr 7, 2023

nulls deleted the feature/ktlint-wrapper branch June 6, 2023 10:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrate to KtLint 0.48.2 #1571

Migrate to KtLint 0.48.2 #1571

0x6675636b796f75676974687562 commented Nov 16, 2022 •

edited by nulls

Loading

github-actions bot commented Mar 24, 2023 •

edited

Loading

github-actions bot commented Mar 24, 2023 •

edited

Loading

github-advanced-security bot left a comment

nulls commented Apr 7, 2023

codecov bot commented Apr 7, 2023 •

edited

Loading

0x6675636b796f75676974687562 left a comment

Migrate to KtLint 0.48.2 #1571

Migrate to KtLint 0.48.2 #1571

Conversation

0x6675636b796f75676974687562 commented Nov 16, 2022 • edited by nulls Loading

github-actions bot commented Mar 24, 2023 • edited Loading

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

github-actions bot commented Mar 24, 2023 • edited Loading

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

github-advanced-security bot left a comment

Choose a reason for hiding this comment

nulls commented Apr 7, 2023

codecov bot commented Apr 7, 2023 • edited Loading

Codecov Report

0x6675636b796f75676974687562 left a comment

Choose a reason for hiding this comment

0x6675636b796f75676974687562 commented Nov 16, 2022 •

edited by nulls

Loading

github-actions bot commented Mar 24, 2023 •

edited

Loading

github-actions bot commented Mar 24, 2023 •

edited

Loading

codecov bot commented Apr 7, 2023 •

edited

Loading