Introducing dependency kinds to prioritize package fragments

core/descriptors/src/org/jetbrains/jet/lang/descriptors/DependencyKind.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2010-2014 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.lang.descriptors;
+
+public enum DependencyKind {
+    // Using this class is supposed to be a temporary measure before we switch to full-blown support for module dependency ordering
+    SOURCES,
+    BUILT_INS,
+    BINARIES
+}

core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptorImpl.java

@@ -17,6 +17,7 @@
 package org.jetbrains.jet.lang.descriptors;
 
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.intellij.openapi.diagnostic.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -30,12 +31,13 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.types.TypeSubstitutor;
 
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 public class ModuleDescriptorImpl extends DeclarationDescriptorImpl implements ModuleDescriptor {
     private static final Logger LOG = Logger.getInstance(ModuleDescriptorImpl.class);
 
+
+    private final Map<DependencyKind, List<PackageFragmentProvider>> prioritizedFragmentProviders = Maps.newHashMap();
     private final List<PackageFragmentProvider> fragmentProviders = Lists.newArrayList();
     private final CompositePackageFragmentProvider packageFragmentProvider = new CompositePackageFragmentProvider(fragmentProviders);
     private final List<ImportPath> defaultImports;
@@ -54,11 +56,27 @@ public class ModuleDescriptorImpl extends DeclarationDescriptorImpl implements M
         this.platformToKotlinClassMap = platformToKotlinClassMap;
     }
 
-    public void addFragmentProvider(@NotNull PackageFragmentProvider provider) {
+    public void addFragmentProvider(@NotNull DependencyKind dependencyKind, @NotNull PackageFragmentProvider provider) {
         if (fragmentProviders.contains(provider)) {
             LOG.error("Trying to add already present fragment provider: " + provider);
         }
-        fragmentProviders.add(provider);
+        List<PackageFragmentProvider> providers = prioritizedFragmentProviders.get(dependencyKind);
+        if (providers == null) {
+            providers = new ArrayList<PackageFragmentProvider>(1);
+            prioritizedFragmentProviders.put(dependencyKind, providers);
+        }
+        providers.add(provider);
+        buildProvidersList();
+    }
+
+    private void buildProvidersList() {
+        fragmentProviders.clear();
+        for (DependencyKind dependencyKind : DependencyKind.values()) {
+            List<PackageFragmentProvider> providers = prioritizedFragmentProviders.get(dependencyKind);
+            if (providers != null) {
+                fragmentProviders.addAll(providers);
+            }
+        }
     }
 
     @Override

core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java

@@ -128,7 +128,7 @@ public class KotlinBuiltIns {
                                                        Collections.<ImportPath>emptyList(),
                                                        PlatformToKotlinClassMap.EMPTY);
         builtinsPackageFragment = new BuiltinsPackageFragment(new LockBasedStorageManager(), builtInsModule);
-        builtInsModule.addFragmentProvider(builtinsPackageFragment.getProvider());
+        builtInsModule.addFragmentProvider(DependencyKind.SOURCES, builtinsPackageFragment.getProvider());
 
         this.functionClassesSet = computeIndexedClasses("Function", FUNCTION_TRAIT_COUNT);
         this.extensionFunctionClassesSet = computeIndexedClasses("ExtensionFunction", FUNCTION_TRAIT_COUNT);