azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KT-37240 Deterministic order for webpack config patches

Browse Source 
Additional fix - only files with `js` extension processed (directories excluded)

`listFiles()` already contains 'is directory' check. Duplicated check removed
This commit is contained in:
Victor Turansky
2020-03-18 04:21:52 +03:00
committed by Ilya Goncharov
parent 8ffb63ca6b
commit 90c993334f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/utils.kt
+6 -5
View File
@@ -8,12 +8,13 @@ package org.jetbrains.kotlin.gradle.targets.js
import java.io.File import java.io.File
fun Appendable.appendConfigsFromDir(confDir: File) { fun Appendable.appendConfigsFromDir(confDir: File) {
if (!confDir.isDirectory) return val files = confDir.listFiles() ?: return
confDir.listFiles() files.asSequence()
?.toList() .filter { it.isFile }
?.filter { it.name.endsWith(".js") } .filter { it.name.endsWith(".js") }
?.forEach { .sortedBy { it.name }
.forEach {
appendln("// ${it.name}") appendln("// ${it.name}")
append(it.readText()) append(it.readText())
appendln() appendln()