diff --git a/CHANGELOG.md b/CHANGELOG.md index 14785db556..98d8f77a5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,9 @@ This project adheres to [Semantic Versioning](https://semver.org/). ### Fixed +* Traversing directory hierarchy at Windows ([#1600](https://github.com/pinterest/ktlint/issues/1600)) +* Ant-style path pattern support ([#1601](https://github.com/pinterest/ktlint/issues/1601)) + ### Added ### Changed diff --git a/ktlint/src/main/kotlin/com/pinterest/ktlint/internal/FileUtils.kt b/ktlint/src/main/kotlin/com/pinterest/ktlint/internal/FileUtils.kt index 67baa7c638..7c4517c165 100644 --- a/ktlint/src/main/kotlin/com/pinterest/ktlint/internal/FileUtils.kt +++ b/ktlint/src/main/kotlin/com/pinterest/ktlint/internal/FileUtils.kt @@ -1,13 +1,11 @@ package com.pinterest.ktlint.internal -import ch.qos.logback.classic.Level import com.pinterest.ktlint.core.KtLint import com.pinterest.ktlint.core.LintError import com.pinterest.ktlint.core.RuleProvider import com.pinterest.ktlint.core.api.EditorConfigDefaults import com.pinterest.ktlint.core.api.EditorConfigOverride import com.pinterest.ktlint.core.initKtLintKLogger -import com.pinterest.ktlint.core.setDefaultLoggerModifier import java.io.File import java.nio.file.FileSystem import java.nio.file.FileVisitResult @@ -26,7 +24,6 @@ import mu.KotlinLogging import org.jetbrains.kotlin.util.prefixIfNot private val logger = KotlinLogging.logger {}.initKtLintKLogger() - .setDefaultLoggerModifier { Level.TRACE } // TODO: remove internal val workDir: String = File(".").canonicalPath @@ -145,7 +142,7 @@ internal fun FileSystem.fileSequence( return result.asSequence() } -internal fun FileSystem.expand( +private fun FileSystem.expand( patterns: List, rootDir: Path, ) =