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

Fix sorting of source files before compilation.

Browse Source 
This should fix unstable generated JS between recompilations.
This commit is contained in:
Alexey Andreev
2017-04-10 16:24:08 +03:00
parent a35ad64454
commit e182290f54
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+4 -5
View File
@@ -106,7 +106,6 @@ import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider
import org.jetbrains.kotlin.script.KotlinScriptExternalImportsProvider import org.jetbrains.kotlin.script.KotlinScriptExternalImportsProvider
import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.PathUtil
import java.io.File import java.io.File
import java.util.*
class KotlinCoreEnvironment private constructor( class KotlinCoreEnvironment private constructor(
parentDisposable: Disposable, parentDisposable: Disposable,
@@ -141,7 +140,7 @@ class KotlinCoreEnvironment private constructor(
super.registerJavaPsiFacade() super.registerJavaPsiFacade()
} }
} }
private val sourceFiles = ArrayList<KtFile>() private val sourceFiles = mutableListOf<KtFile>()
private val rootsIndex: JvmDependenciesDynamicCompoundIndex private val rootsIndex: JvmDependenciesDynamicCompoundIndex
val configuration: CompilerConfiguration = configuration.copy() val configuration: CompilerConfiguration = configuration.copy()
@@ -172,11 +171,11 @@ class KotlinCoreEnvironment private constructor(
registerProjectServicesForCLI(projectEnvironment) registerProjectServicesForCLI(projectEnvironment)
registerProjectServices(projectEnvironment) registerProjectServices(projectEnvironment)
sourceFiles.addAll(CompileEnvironmentUtil.getKtFiles(project, getSourceRootsCheckingForDuplicates(), this.configuration, { sourceFiles += CompileEnvironmentUtil.getKtFiles(project, getSourceRootsCheckingForDuplicates(), this.configuration, {
message -> message ->
report(ERROR, message) report(ERROR, message)
})) })
sourceFiles.sortedWith(Comparator<KtFile> { o1, o2 -> o1.virtualFile.path.compareTo(o2.virtualFile.path, ignoreCase = true) }) sourceFiles.sortBy { it.virtualFile.path }
KotlinScriptDefinitionProvider.getInstance(project).let { scriptDefinitionProvider -> KotlinScriptDefinitionProvider.getInstance(project).let { scriptDefinitionProvider ->
scriptDefinitionProvider.setScriptDefinitions( scriptDefinitionProvider.setScriptDefinitions(