From e7897fe3f83bd4b292c41d181a8895b0cf7cdbb6 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Sun, 7 Apr 2024 22:34:54 +0900 Subject: [PATCH 01/10] Match ktlint_code_style with [Ktlint documentation](https://pinterest.github.io/ktlint/1.0.0/rules/code-styles/) --- .../glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java index 1790f9475c..8258d6179d 100644 --- a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java +++ b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java @@ -133,7 +133,7 @@ private static EditorConfigOverride createEditorConfigOverride(final List // The default style had been changed from intellij_idea to ktlint_official in version 1.0.0 if (!editorConfigOverrideMap.containsKey("ktlint_code_style")) { - editorConfigOverrideMap.put("ktlint_code_style", "intellij_idea"); + editorConfigOverrideMap.put("ktlint_code_style", "ktlint_official"); } // Create config properties based on provided property names and values From f25f4e373144cc145d7a51a1a5e4d82c98719eb6 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Sun, 7 Apr 2024 22:54:57 +0900 Subject: [PATCH 02/10] Add #2090 at CHANGES.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 22f14f2137..476ba2371d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -19,6 +19,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050)) * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057)) * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078)) +* Default `ktlint` editorconfig `ktlint_code_style` to `intellij_idea` -> `ktlint_official`. ([#2090](https://github.com/diffplug/spotless/pull/2090)) ### Removed * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945)) * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954)) From aee265b159f62ab2cd6c9fa5e1682ed1cbdc1edf Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Mon, 8 Apr 2024 12:21:31 +0900 Subject: [PATCH 03/10] Add change log. #2090 --- CHANGES.md | 3 ++- plugin-gradle/CHANGES.md | 2 ++ plugin-maven/CHANGES.md | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 476ba2371d..a8432e9e4e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -19,7 +19,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050)) * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057)) * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078)) -* Default `ktlint` editorconfig `ktlint_code_style` to `intellij_idea` -> `ktlint_official`. ([#2090](https://github.com/diffplug/spotless/pull/2090)) +* **BREAKING** default `ktlint` editorconfig `ktlint_code_style` changed from `intellij_idea` to `ktlint_official` to better match the ktlint docs. ([#2090](https://github.com/diffplug/spotless/pull/2090)) + - to keep the previous behavior of `intellij_idea`, you must set `ktlint_code_style = intellij_idea` in [.editconfig file](https://pinterest.github.io/ktlint/1.2.1/rules/code-styles/). ### Removed * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945)) * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954)) diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index 11e9f04fc3..3a65d0fe02 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -13,6 +13,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050)) * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057)) * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078)) +* **BREAKING** default `ktlint` editorconfig `ktlint_code_style` changed from `intellij_idea` to `ktlint_official` to better match the ktlint docs. ([#2090](https://github.com/diffplug/spotless/pull/2090)) + - to keep the previous behavior of `intellij_idea`, you must set `ktlint_code_style = intellij_idea` in [.editconfig file](https://pinterest.github.io/ktlint/1.2.1/rules/code-styles/). ### Added * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031)) * Add support for formatting and sorting Maven POMs ([#2082](https://github.com/diffplug/spotless/issues/2082)) diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index af419b1ad3..948007969f 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -12,6 +12,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * Bump default `shfmt` version to latest `3.7.0` -> `3.8.0`. ([#2050](https://github.com/diffplug/spotless/pull/2050)) * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057)) * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078)) +* **BREAKING** default `ktlint` editorconfig `ktlint_code_style` changed from `intellij_idea` to `ktlint_official` to better match the ktlint docs. ([#2090](https://github.com/diffplug/spotless/pull/2090)) + - to keep the previous behavior of `intellij_idea`, you must set `ktlint_code_style = intellij_idea` in [.editconfig file](https://pinterest.github.io/ktlint/1.2.1/rules/code-styles/). ### Added * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031)) * Skip execution in M2E (incremental) builds by default ([#1814](https://github.com/diffplug/spotless/issues/1814), [#2037](https://github.com/diffplug/spotless/issues/2037)) From 80b3558450d1ac745437e7fd4d7a3ec5853659af Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Mon, 8 Apr 2024 20:20:21 +0900 Subject: [PATCH 04/10] Remove editorConfigOverride setting. - If don't have ktlint_code_style, ```ktlint``` set it ```ktlint_official``` as default value. --- .../glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java index 8258d6179d..8336132ffa 100644 --- a/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java +++ b/lib/src/compatKtLint1Dot0Dot0/java/com/diffplug/spotless/glue/ktlint/compat/KtLintCompat1Dot0Dot0Adapter.java @@ -131,11 +131,6 @@ private static EditorConfigOverride createEditorConfigOverride(final List .distinct() .collect(Collectors.toMap(EditorConfigProperty::getName, property -> property)); - // The default style had been changed from intellij_idea to ktlint_official in version 1.0.0 - if (!editorConfigOverrideMap.containsKey("ktlint_code_style")) { - editorConfigOverrideMap.put("ktlint_code_style", "ktlint_official"); - } - // Create config properties based on provided property names and values @SuppressWarnings("unchecked") Pair, ?>[] properties = editorConfigOverrideMap.entrySet().stream() From e957c5ffb8532875bdce0548035a0c6a66b61691 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Mon, 8 Apr 2024 20:22:44 +0900 Subject: [PATCH 05/10] Add KDoc for KtlintTest. --- .../java/com/diffplug/spotless/maven/kotlin/KtlintTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java index fe5b0e1b57..d7022b869c 100644 --- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java +++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java @@ -22,6 +22,9 @@ import com.diffplug.spotless.ProcessRunner; import com.diffplug.spotless.maven.MavenIntegrationHarness; +/** + * Unit test for {@link Ktlint} + */ class KtlintTest extends MavenIntegrationHarness { @Test void testKtlint() throws Exception { From 7511f2ceab1dbcf5db6807d4aa1de45ba846bb68 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Mon, 8 Apr 2024 21:26:18 +0900 Subject: [PATCH 06/10] Create test function - writePomWithKotlinSteps_intellijIdea_intellijIdeaStyleKtlint - writePomWithKotlinSteps_default_officialStyleKtlint --- .../spotless/maven/kotlin/KtlintTest.java | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java index d7022b869c..9b0edf134c 100644 --- a/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java +++ b/plugin-maven/src/test/java/com/diffplug/spotless/maven/kotlin/KtlintTest.java @@ -37,7 +37,22 @@ void testKtlint() throws Exception { } @Test - void testKtlintEditorConfigOverride() throws Exception { + void writePomWithKotlinSteps_intellijIdea_intellijIdeaStyleKtlint() throws Exception { + writePomWithKotlinSteps("\n" + + " \n" + + " intellij_idea" + + " true\n" + + " true\n" + + " \n" + + ""); + + String path = "src/main/kotlin/Main.kt"; + setFile(path).toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty"); + mavenRunner().withArguments("spotless:apply").runNoError(); + assertFile(path).sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean"); + } + @Test + void writePomWithKotlinSteps_default_officialStyleKtlint() throws Exception { writePomWithKotlinSteps("\n" + " \n" + " true\n" + @@ -45,10 +60,7 @@ void testKtlintEditorConfigOverride() throws Exception { " \n" + ""); - String path = "src/main/kotlin/Main.kt"; - setFile(path).toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty"); - mavenRunner().withArguments("spotless:apply").runNoError(); - assertFile(path).sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean"); + checkKtlintOfficialStyle(); } @Test From aea4560f0f662e90d832b0d7236b5a904aa8e605 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Mon, 8 Apr 2024 21:34:36 +0900 Subject: [PATCH 07/10] Create test function - target_setAndUnset_intellijIdeaStyle - target_setAndUnset_defaultKtlintOfficialStyle --- .../spotless/KotlinGradleExtensionTest.java | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java index c607c36912..8fec7dcbb9 100644 --- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java +++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinGradleExtensionTest.java @@ -27,7 +27,7 @@ class KotlinGradleExtensionTest extends KotlinExtensionTest { @ParameterizedTest @ValueSource(booleans = {true, false}) - void testTarget(boolean useDefaultTarget) throws IOException { + void target_setAndUnset_intellijIdeaStyle(boolean useDefaultTarget) throws IOException { setFile("build.gradle").toLines( "plugins {", " id 'org.jetbrains.kotlin.jvm' version '1.6.21'", @@ -39,6 +39,7 @@ void testTarget(boolean useDefaultTarget) throws IOException { " " + (useDefaultTarget ? "" : "target \"*.kts\""), " ktlint().editorConfigOverride([", " ktlint_experimental: \"enabled\",", + " ktlint_code_style: \"intellij_idea\",", " ij_kotlin_allow_trailing_comma: true,", " ij_kotlin_allow_trailing_comma_on_call_site: true", " ])", @@ -55,4 +56,35 @@ void testTarget(boolean useDefaultTarget) throws IOException { assertFile("configuration.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean"); } } + + @ParameterizedTest + @ValueSource(booleans = {true, false}) + void target_setAndUnset_defaultKtlintOfficialStyle(boolean useDefaultTarget) throws IOException { + setFile("build.gradle").toLines( + "plugins {", + " id 'org.jetbrains.kotlin.jvm' version '1.6.21'", + " id 'com.diffplug.spotless'", + "}", + "repositories { mavenCentral() }", + "spotless {", + " kotlinGradle {", + " " + (useDefaultTarget ? "" : "target \"*.kts\""), + " ktlint().editorConfigOverride([", + " ktlint_experimental: \"enabled\",", + " ij_kotlin_allow_trailing_comma: true,", + " ij_kotlin_allow_trailing_comma_on_call_site: true", + " ])", + " }", + "}"); + setFile("configuration.gradle.kts").toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty"); + setFile("configuration.kts").toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty"); + gradleRunner().withArguments("spotlessApply").build(); + if (useDefaultTarget) { + assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.ktlintOfficial.clean"); + assertFile("configuration.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty"); + } else { + assertFile("configuration.gradle.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.ktlintOfficial.clean"); + assertFile("configuration.kts").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.ktlintOfficial.clean"); + } + } } From 942d5240735ef8754aab98407b7c455257e9cea8 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Mon, 8 Apr 2024 21:39:28 +0900 Subject: [PATCH 08/10] Add Kdoc for KotlinExtensionTest. --- .../java/com/diffplug/gradle/spotless/KotlinExtensionTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java index 1e96d34574..1fb459202b 100644 --- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java +++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java @@ -22,6 +22,9 @@ import org.junit.jupiter.api.Test; +/** + * Unit test for {@link KotlinExtension} + */ class KotlinExtensionTest extends GradleIntegrationHarness { private static final String HEADER = "// License Header"; private static final String HEADER_WITH_YEAR = "// License Header $YEAR"; From 667b31a0980cdb6de2acc7522ce6d54ac0e0eb33 Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Mon, 8 Apr 2024 21:44:15 +0900 Subject: [PATCH 09/10] Create test function - editorConfigOverride_setExperimental_intellijIdeaStyle - editorConfigOverride_setExperimental_defaultKtlintOfficialStyle --- .../gradle/spotless/KotlinExtensionTest.java | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java index 1fb459202b..576761a6c2 100644 --- a/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java +++ b/plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java @@ -71,7 +71,7 @@ void integrationKtfmtDropboxStyleWithPublicApi() throws IOException { } @Test - void withExperimentalEditorConfigOverride() throws IOException { + void editorConfigOverride_setExperimental_intellijIdeaStyle() throws IOException { setFile("build.gradle").toLines( "plugins {", " id 'org.jetbrains.kotlin.jvm' version '1.6.21'", @@ -82,6 +82,7 @@ void withExperimentalEditorConfigOverride() throws IOException { " kotlin {", " ktlint().editorConfigOverride([", " ktlint_experimental: \"enabled\",", + " ktlint_code_style : \"intellij_idea\",", " ij_kotlin_allow_trailing_comma: true,", " ij_kotlin_allow_trailing_comma_on_call_site: true", " ])", @@ -92,6 +93,28 @@ void withExperimentalEditorConfigOverride() throws IOException { assertFile("src/main/kotlin/Main.kt").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.clean"); } + @Test + void editorConfigOverride_setExperimental_defaultKtlintOfficialStyle() throws IOException { + setFile("build.gradle").toLines( + "plugins {", + " id 'org.jetbrains.kotlin.jvm' version '1.6.21'", + " id 'com.diffplug.spotless'", + "}", + "repositories { mavenCentral() }", + "spotless {", + " kotlin {", + " ktlint().editorConfigOverride([", + " ktlint_experimental: \"enabled\",", + " ij_kotlin_allow_trailing_comma: true,", + " ij_kotlin_allow_trailing_comma_on_call_site: true", + " ])", + " }", + "}"); + setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/experimentalEditorConfigOverride.dirty"); + gradleRunner().withArguments("spotlessApply").build(); + assertFile("src/main/kotlin/Main.kt").sameAsResource("kotlin/ktlint/experimentalEditorConfigOverride.ktlintOfficial.clean"); + } + @Test void testWithInvalidEditorConfigFile() throws IOException { String invalidPath = "invalid/path/to/.editorconfig".replace('/', File.separatorChar); From c372597a23f13ce916ba698dcfe59e0e40516aae Mon Sep 17 00:00:00 2001 From: Jaehwa Noh Date: Mon, 8 Apr 2024 22:08:00 +0900 Subject: [PATCH 10/10] Add more details. --- CHANGES.md | 3 ++- plugin-gradle/CHANGES.md | 3 ++- plugin-maven/CHANGES.md | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a8432e9e4e..1c13dc3b83 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -20,7 +20,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057)) * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078)) * **BREAKING** default `ktlint` editorconfig `ktlint_code_style` changed from `intellij_idea` to `ktlint_official` to better match the ktlint docs. ([#2090](https://github.com/diffplug/spotless/pull/2090)) - - to keep the previous behavior of `intellij_idea`, you must set `ktlint_code_style = intellij_idea` in [.editconfig file](https://pinterest.github.io/ktlint/1.2.1/rules/code-styles/). + - to keep the previous behavior of `intellij_idea`, you must set `ktlint_code_style = intellij_idea` in [.editconfig file](https://pinterest.github.io/ktlint/1.2.1/rules/code-styles/) or ```.editorConfigOverride( + mapOf("ktlint_code_style" to "intellij_idea"))``` ### Removed * **BREAKING** Remove `JarState.getMavenCoordinate(String prefix)`. ([#1945](https://github.com/diffplug/spotless/pull/1945)) * **BREAKING** Replace `PipeStepPair` with `FenceStep`. ([#1954](https://github.com/diffplug/spotless/pull/1954)) diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index 3a65d0fe02..115834934e 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -14,7 +14,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057)) * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078)) * **BREAKING** default `ktlint` editorconfig `ktlint_code_style` changed from `intellij_idea` to `ktlint_official` to better match the ktlint docs. ([#2090](https://github.com/diffplug/spotless/pull/2090)) - - to keep the previous behavior of `intellij_idea`, you must set `ktlint_code_style = intellij_idea` in [.editconfig file](https://pinterest.github.io/ktlint/1.2.1/rules/code-styles/). + - to keep the previous behavior of `intellij_idea`, you must set `ktlint_code_style = intellij_idea` in [.editconfig file](https://pinterest.github.io/ktlint/1.2.1/rules/code-styles/) or ```.editorConfigOverride( + mapOf("ktlint_code_style" to "intellij_idea"))``` ### Added * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031)) * Add support for formatting and sorting Maven POMs ([#2082](https://github.com/diffplug/spotless/issues/2082)) diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index 948007969f..01434d3ba7 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -13,7 +13,8 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format ( * Bump default `ktlint` version to latest `1.1.1` -> `1.2.1`. ([#2057](https://github.com/diffplug/spotless/pull/2057)) * Bump default `sortpom` version to latest `3.4.0` -> `3.4.1`. ([#2078](https://github.com/diffplug/spotless/pull/2078)) * **BREAKING** default `ktlint` editorconfig `ktlint_code_style` changed from `intellij_idea` to `ktlint_official` to better match the ktlint docs. ([#2090](https://github.com/diffplug/spotless/pull/2090)) - - to keep the previous behavior of `intellij_idea`, you must set `ktlint_code_style = intellij_idea` in [.editconfig file](https://pinterest.github.io/ktlint/1.2.1/rules/code-styles/). + - to keep the previous behavior of `intellij_idea`, you must set `ktlint_code_style = intellij_idea` in [.editconfig file](https://pinterest.github.io/ktlint/1.2.1/rules/code-styles/) or ```.editorConfigOverride( + mapOf("ktlint_code_style" to "intellij_idea"))``` ### Added * Respect `.editorconfig` settings for formatting shell via `shfmt` ([#2031](https://github.com/diffplug/spotless/pull/2031)) * Skip execution in M2E (incremental) builds by default ([#1814](https://github.com/diffplug/spotless/issues/1814), [#2037](https://github.com/diffplug/spotless/issues/2037))