-
Notifications
You must be signed in to change notification settings - Fork 509
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.
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
Add API for retrieving the list of files that will be accessed #1659
Merged
paul-dingemans
merged 10 commits into
pinterest:master
from
paul-dingemans:1446-expose-inout-paths
Sep 26, 2022
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
7c430f1
Add API for retrieving the list of files that will be accessed when l…
paul-dingemans 78aa4c3
Fix failing tests on WindowsOS
paul-dingemans fc13ea1
Fix failing tests on WindowsOS - inject tempDir in each method and fi…
paul-dingemans d762fac
Fix failing tests on WindowsOS
paul-dingemans 45570b5
Fix failing tests on WindowsOS - use dedicated cache to exclude inter…
paul-dingemans 7d5e633
Fix failing tests on WindowsOS
paul-dingemans 340abdd
Fix failing tests on WindowsOS
paul-dingemans cd9ec99
Add some dummy tests to find out what is happening on WindowsOS
paul-dingemans ecba879
Resolve against original path as the drive letter seems to get lost o…
paul-dingemans 3e622bf
cleanup
paul-dingemans File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
92 changes: 92 additions & 0 deletions
92
ktlint-core/src/main/kotlin/com/pinterest/ktlint/core/internal/EditorConfigFinder.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
package com.pinterest.ktlint.core.internal | ||
|
||
import com.pinterest.ktlint.core.initKtLintKLogger | ||
import java.nio.charset.StandardCharsets | ||
import java.nio.file.FileVisitResult | ||
import java.nio.file.Files | ||
import java.nio.file.Path | ||
import java.nio.file.SimpleFileVisitor | ||
import java.nio.file.attribute.BasicFileAttributes | ||
import kotlin.io.path.isDirectory | ||
import mu.KotlinLogging | ||
import org.ec4j.core.Resource | ||
import org.ec4j.core.ResourcePropertiesService | ||
import org.ec4j.core.model.Version | ||
import org.jetbrains.kotlin.konan.file.File | ||
|
||
private val logger = KotlinLogging.logger {}.initKtLintKLogger() | ||
|
||
internal class EditorConfigFinder { | ||
// Do not reuse the generic threadSafeEditorConfigCache to prevent that results are incorrect due to other calls to | ||
// KtLint that result in changing the cache | ||
private val editorConfigCache = ThreadSafeEditorConfigCache() | ||
|
||
/** | ||
* Finds all relevant ".editorconfig" files for the given path. | ||
*/ | ||
fun findEditorConfigs(path: Path): List<Path> { | ||
val result = mutableListOf<Path>() | ||
val normalizedPath = path.normalize().toAbsolutePath() | ||
if (path.isDirectory()) { | ||
result += findEditorConfigsInSubDirectories(normalizedPath) | ||
} | ||
result += findEditorConfigsInParentDirectories(normalizedPath) | ||
return result | ||
.map { | ||
// Resolve against original path as the drive letter seems to get lost on WindowsOs | ||
path.resolve(it) | ||
}.toList() | ||
} | ||
|
||
private fun findEditorConfigsInSubDirectories(path: Path): List<Path> { | ||
val result = mutableListOf<Path>() | ||
|
||
Files.walkFileTree( | ||
path, | ||
object : SimpleFileVisitor<Path>() { | ||
override fun visitFile( | ||
filePath: Path, | ||
fileAttrs: BasicFileAttributes, | ||
): FileVisitResult { | ||
if (filePath.File().name == ".editorconfig") { | ||
logger.trace { "- File: $filePath: add to list of accessed files" } | ||
result.add(filePath) | ||
} | ||
return FileVisitResult.CONTINUE | ||
} | ||
|
||
override fun preVisitDirectory( | ||
dirPath: Path, | ||
dirAttr: BasicFileAttributes, | ||
): FileVisitResult { | ||
return if (Files.isHidden(dirPath)) { | ||
logger.trace { "- Dir: $dirPath: Ignore" } | ||
FileVisitResult.SKIP_SUBTREE | ||
} else { | ||
logger.trace { "- Dir: $dirPath: Traverse" } | ||
FileVisitResult.CONTINUE | ||
} | ||
} | ||
}, | ||
) | ||
|
||
return result.toList() | ||
} | ||
|
||
private fun findEditorConfigsInParentDirectories(path: Path): List<Path> { | ||
// The logic to load parental ".editorconfig" files resides in the ec4j library. This library however uses a | ||
// cache provided by KtLint. As of this the list of parental ".editorconfig" files can be extracted from the | ||
// cache. | ||
createLoaderService().queryProperties(path.resource()) | ||
return editorConfigCache.getPaths() | ||
} | ||
|
||
private fun Path?.resource() = | ||
Resource.Resources.ofPath(this, StandardCharsets.UTF_8) | ||
|
||
private fun createLoaderService() = | ||
ResourcePropertiesService.builder() | ||
.cache(editorConfigCache) | ||
.loader(org.ec4j.core.EditorConfigLoader.of(Version.CURRENT)) | ||
.build() | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
163 changes: 163 additions & 0 deletions
163
ktlint-core/src/test/kotlin/com/pinterest/ktlint/core/internal/EditorConfigFinderTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,163 @@ | ||
package com.pinterest.ktlint.core.internal | ||
|
||
import java.nio.file.Files | ||
import java.nio.file.Path | ||
import java.nio.file.Paths | ||
import kotlin.io.path.absolutePathString | ||
import kotlin.io.path.writeText | ||
import org.assertj.core.api.Assertions.assertThat | ||
import org.junit.jupiter.api.Nested | ||
import org.junit.jupiter.api.Test | ||
import org.junit.jupiter.api.io.TempDir | ||
|
||
class EditorConfigFinderTest { | ||
@Nested | ||
inner class FindByFile { | ||
@Test | ||
fun `Given a kotlin file in a subdirectory and a root-editorconfig file in the same directory then get the path of that editorconfig file`( | ||
@TempDir | ||
tempDir: Path, | ||
) { | ||
val someSubDir = "some-project/src/main/kotlin" | ||
tempDir.createFile("$someSubDir/.editorconfig", "root=true") | ||
val kotlinFilePath = tempDir.createFile("$someSubDir/test.kt", "val foo = 42") | ||
|
||
val actual = EditorConfigFinder().findEditorConfigs(kotlinFilePath) | ||
|
||
assertThat(actual).contains( | ||
tempDir.plus("$someSubDir/.editorconfig"), | ||
) | ||
} | ||
|
||
@Test | ||
fun `Given a kotlin file in a subdirectory and a root-editorconfig file in a parent directory then get the path of that parent editorconfig file`( | ||
@TempDir | ||
tempDir: Path, | ||
) { | ||
val someProjectDirectory = "some-project" | ||
tempDir.createFile("$someProjectDirectory/.editorconfig", "root=true") | ||
val kotlinFilePath = tempDir.createFile("$someProjectDirectory/src/main/kotlin/test.kt", "val foo = 42") | ||
|
||
val actual = EditorConfigFinder().findEditorConfigs(kotlinFilePath) | ||
|
||
assertThat(actual).contains( | ||
tempDir.plus("$someProjectDirectory/.editorconfig"), | ||
) | ||
} | ||
|
||
@Test | ||
fun `Given a kotlin file in a subdirectory and a non-root-editorconfig file in that same directory and a root-editorconfig file in a parent directory then get the paths of both editorconfig files`( | ||
@TempDir | ||
tempDir: Path, | ||
) { | ||
val someProjectDirectory = "some-project" | ||
tempDir.createFile("$someProjectDirectory/.editorconfig", "root=true") | ||
tempDir.createFile("$someProjectDirectory/src/main/.editorconfig", "root=false") | ||
val kotlinFilePath = tempDir.createFile("$someProjectDirectory/src/main/kotlin/test.kt", "val foo = 42") | ||
|
||
val actual = EditorConfigFinder().findEditorConfigs(kotlinFilePath) | ||
|
||
assertThat(actual).contains( | ||
tempDir.plus("$someProjectDirectory/.editorconfig"), | ||
tempDir.plus("$someProjectDirectory/src/main/.editorconfig"), | ||
) | ||
} | ||
|
||
@Test | ||
fun `Given a kotlin file in a subdirectory and a root-editorconfig file in the parent directory and another root-editorconfig file in a great-parent directory then get the paths of editorconfig files excluding root-editorconfig once the first one is found`( | ||
@TempDir | ||
tempDir: Path, | ||
) { | ||
val someProjectDirectory = "some-project" | ||
tempDir.createFile("$someProjectDirectory/src/main/.editorconfig", "root=false") | ||
tempDir.createFile("$someProjectDirectory/src/.editorconfig", "root=true") | ||
tempDir.createFile("$someProjectDirectory/.editorconfig", "root=true") | ||
val kotlinFilePath = tempDir.createFile("$someProjectDirectory/src/main/kotlin/test.kt", "val foo = 42") | ||
|
||
val actual = EditorConfigFinder().findEditorConfigs(kotlinFilePath) | ||
|
||
assertThat(actual) | ||
.contains( | ||
tempDir.plus("$someProjectDirectory/src/main/.editorconfig"), | ||
tempDir.plus("$someProjectDirectory/src/.editorconfig"), | ||
).doesNotContain( | ||
tempDir.plus("$someProjectDirectory/.editorconfig"), | ||
) | ||
} | ||
} | ||
|
||
@Nested | ||
inner class FindByDirectory { | ||
@Test | ||
fun `Given a directory containing a root-editorconfig file and a subdirectory containing a editorconfig file then get the paths of both editorconfig files`( | ||
@TempDir | ||
tempDir: Path, | ||
) { | ||
val someDirectory = "some-project" | ||
tempDir.createFile("$someDirectory/.editorconfig", "root=true") | ||
tempDir.createFile("$someDirectory/src/main/kotlin/.editorconfig", "some-property=some-value") | ||
|
||
val actual = EditorConfigFinder().findEditorConfigs(tempDir.plus(someDirectory)) | ||
|
||
assertThat(actual).contains( | ||
tempDir.plus("$someDirectory/.editorconfig"), | ||
tempDir.plus("$someDirectory/src/main/kotlin/.editorconfig"), | ||
) | ||
} | ||
|
||
@Test | ||
fun `Given a subdirectory containing an editorconfig file and a sibling subdirectory contain a editorconfig file in a parent directory then get the path of all editorconfig file except of the sibling subdirectory`( | ||
@TempDir | ||
tempDir: Path, | ||
) { | ||
val someProjectDirectory = "some-project" | ||
tempDir.createFile("$someProjectDirectory/.editorconfig", "root=true") | ||
tempDir.createFile("$someProjectDirectory/src/main/kotlin/.editorconfig", "some-property=some-value") | ||
tempDir.createFile("$someProjectDirectory/src/test/kotlin/.editorconfig", "some-property=some-value") | ||
|
||
val actual = EditorConfigFinder().findEditorConfigs(tempDir.plus("$someProjectDirectory/src/main/kotlin")) | ||
|
||
assertThat(actual) | ||
.contains( | ||
tempDir.plus("$someProjectDirectory/.editorconfig"), | ||
tempDir.plus("$someProjectDirectory/src/main/kotlin/.editorconfig"), | ||
).doesNotContain( | ||
tempDir.plus("$someProjectDirectory/src/test/kotlin/.editorconfig"), | ||
) | ||
} | ||
|
||
@Test | ||
fun `Given a directory containing an editorconfig file and multiple subdirectores containing a editorconfig file then get the path of all editorconfig files`( | ||
@TempDir | ||
tempDir: Path, | ||
) { | ||
val someProjectDirectory = "some-project" | ||
tempDir.createFile("$someProjectDirectory/.editorconfig", "root=true") | ||
tempDir.createFile("$someProjectDirectory/src/main/kotlin/.editorconfig", "some-property=some-value") | ||
tempDir.createFile("$someProjectDirectory/src/test/kotlin/.editorconfig", "some-property=some-value") | ||
|
||
val actual = EditorConfigFinder().findEditorConfigs(tempDir.plus(someProjectDirectory)) | ||
|
||
assertThat(actual).contains( | ||
tempDir.plus("$someProjectDirectory/.editorconfig"), | ||
tempDir.plus("$someProjectDirectory/src/main/kotlin/.editorconfig"), | ||
tempDir.plus("$someProjectDirectory/src/test/kotlin/.editorconfig"), | ||
) | ||
} | ||
} | ||
|
||
private fun Path.createFile(fileName: String, content: String): Path { | ||
val dirPath = fileName.substringBeforeLast("/", "") | ||
Files.createDirectories(this.plus(dirPath)) | ||
return Files | ||
.createFile(this.plus(fileName)) | ||
.also { it.writeText(content) } | ||
} | ||
|
||
private fun Path.plus(subPath: String): Path = | ||
this | ||
.absolutePathString() | ||
.plus(this.fileSystem.separator) | ||
.plus(subPath) | ||
.let { Paths.get(it) } | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I started wondering if there shouldn't be a way to exclude searching in subdirectories 🤔 I initially thought of passing project root directory as the
path
, but that would result in traversing through all files and folders, includingbuild
,docs
orresources
directory, which would be wasteful.Gradle plugins would have to be smarter, and we'd have to figure out a way to identify the root folder for all directories containing Kotlin sources, which unfortunately I failed to do so :/ For Kotlin plugin we get SourceDirectorySet#getSrcDirTrees which would allow us to identify multiple root directories, but I'm unaware of a similar way to obtain such information for other plugins (for example, for Android Gradle Plugin).
Given all of the above, I started leaning towards ignoring subdirectories, for performance reasons (and I believe sharing common
editorconfig
settings for a compilation unit is a fairly common situation). Having the subdirectories' traversal optional,ktlint
consumers could switch to a more precise input calculation if they are able to identify a proper top-most path.Do you have any thoughts/ideas/advices here?
I can link my comment on the same topic: jeremymailen/kotlinter-gradle#265 (comment)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do you think the performance impact of scanning all subdirectories it too big? This call should be made only once. For testing KtLint I always run KtLint on a collection of open source projects which in total contain 2,800+ directories and more than 5,000+ files (both excluding files in
.git
andbuild
dirs) and the scanning is really fast.I have not encountered many use cases in which a project contains multiple
.editorconfig
files. But I think it would be really confusing for developers if the.editorconfig
file in the root of the project and its parents is treated differently from.editorconfig
files in subdirectories.As with all performance issues, my advice would be first to measure before deciding to optimize.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know. I haven't ever done any sort of file performance things. My assumption was that doing things takes more time that completely avoiding it 😛
From Gradle Plugin perspective, it's once per task invocation, so every time someone calls
./gradlew ktlintTask
.Sure, sounds reasonable 👍 I'll make sure to do extra profiling when switching to the new API 👍 Thanks for answering my doubts (and for finding time to work on the new api) 🙏