From a6ac56ae5ae5f1c543267f179dd0b688a37f7ad8 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 9 Feb 2015 18:20:07 +0300 Subject: [PATCH] Sort source files in JetCoreEnvironment Is supposed to help make error situations more deterministic --- .../kotlin/cli/jvm/compiler/JetCoreEnvironment.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java index d148afd4662..90448ea819f 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java @@ -37,6 +37,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElementFinder; import com.intellij.psi.PsiManager; import com.intellij.psi.impl.file.impl.JavaFileManager; +import com.intellij.util.containers.ContainerUtil; import kotlin.Function1; import kotlin.Unit; import org.jetbrains.annotations.NotNull; @@ -244,6 +245,13 @@ public class JetCoreEnvironment { ) ); + ContainerUtil.sort(sourceFiles, new Comparator() { + @Override + public int compare(@NotNull JetFile o1, @NotNull JetFile o2) { + return o1.getVirtualFile().getPath().compareToIgnoreCase(o2.getVirtualFile().getPath()); + } + }); + JetScriptDefinitionProvider.getInstance(project).addScriptDefinitions( configuration.getList(CommonConfigurationKeys.SCRIPT_DEFINITIONS_KEY) );