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

FileBasedDeclarationProviderFactory: stable order of files

Browse Source 
Fixes DiagnosticsTestGenerated#testScriptAndClassConflict
This commit is contained in:
Pavel V. Talanov
2015-11-26 15:17:20 +03:00
parent 4a1c3f02fd
commit 5a55ee332e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java
+2 -2
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.resolve.lazy.declarations;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.collect.Collections2; 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.Multimap;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function0;
@@ -36,7 +36,7 @@ import java.util.Set;
public class FileBasedDeclarationProviderFactory extends AbstractDeclarationProviderFactory { public class FileBasedDeclarationProviderFactory extends AbstractDeclarationProviderFactory {
private static class Index { private static class Index {
private final Multimap<FqName, KtFile> filesByPackage = HashMultimap.create(); private final Multimap<FqName, KtFile> filesByPackage = LinkedHashMultimap.create();
private final Set<FqName> declaredPackages = Sets.newHashSet(); private final Set<FqName> declaredPackages = Sets.newHashSet();
} }