parseImportsLayout: trim spaces in entries

pinterest · Jan 10, 2023 · f12ab85 · f12ab85
1 parent 480dd87
commit f12ab85
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ### Fixed
 
+* Trim spaces in the `.editorconfig` property `ij_kotlin_imports_layout`'s entries ([#1770](https://github.com/pinterest/ktlint/pull/1770))
+
 ### Changed
 
 ## [0.48.1] - 2023-01-03

diff --git a/...otlin/com/pinterest/ktlint/ruleset/standard/internal/importordering/ImportLayoutParser.kt b/...otlin/com/pinterest/ktlint/ruleset/standard/internal/importordering/ImportLayoutParser.kt
@@ -8,7 +8,7 @@ internal const val ALIAS_CHAR = "^"
  * Adapted from https://github.com/JetBrains/intellij-kotlin/blob/73b5a484198f02518c9ece2fb453d27cead680fb/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinPackageEntryTableAccessor.kt#L27-L43
  */
 internal fun parseImportsLayout(importsLayout: String): List<PatternEntry> {
-    val importsList = importsLayout.split(",").onEach { it.trim() }
+    val importsList = importsLayout.split(",").map { it.trim() }
 
     if (importsList.first() == BLANK_LINE_CHAR || importsList.last() == BLANK_LINE_CHAR) {
         throw IllegalArgumentException("Blank lines are not supported in the beginning or end of import list")

diff --git a/...est/kotlin/com/pinterest/ktlint/ruleset/standard/importordering/ImportLayoutParserTest.kt b/...est/kotlin/com/pinterest/ktlint/ruleset/standard/importordering/ImportLayoutParserTest.kt
@@ -37,4 +37,10 @@ class ImportLayoutParserTest {
 
         assertThat(actual).isEqualTo(expected)
     }
+
+    @Test
+    fun `trims spaces in entries`() {
+        assertThat(parseImportsLayout("android.**,|,org.junit.**,|,^android.**,*,kotlin.io.Closeable.*,^"))
+            .isEqualTo(parseImportsLayout("android.**, |, org.junit.**, |, ^android.**, *, kotlin.io.Closeable.*, ^"))
+    }
 }