From 5a55ee332e974da9b1d40740764e4474a67240b7 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 26 Nov 2015 15:17:20 +0300 Subject: [PATCH] FileBasedDeclarationProviderFactory: stable order of files Fixes DiagnosticsTestGenerated#testScriptAndClassConflict --- .../declarations/FileBasedDeclarationProviderFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java index 22c7da2e1ab..d4a562738f7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.resolve.lazy.declarations; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; -import com.google.common.collect.HashMultimap; +import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; import kotlin.jvm.functions.Function0; @@ -36,7 +36,7 @@ import java.util.Set; public class FileBasedDeclarationProviderFactory extends AbstractDeclarationProviderFactory { private static class Index { - private final Multimap filesByPackage = HashMultimap.create(); + private final Multimap filesByPackage = LinkedHashMultimap.create(); private final Set declaredPackages = Sets.newHashSet(); }