Drop ModuleDescriptor.sourceKind, move this code to IDE modules

This information is only used in IDE and it can easily be computed there

compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt

@@ -28,7 +28,10 @@ import org.jetbrains.kotlin.container.ComponentProvider
 import org.jetbrains.kotlin.context.ModuleContext
 import org.jetbrains.kotlin.context.ProjectContext
 import org.jetbrains.kotlin.context.withModule
-import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.descriptors.ModuleDescriptor
+import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
+import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
+import org.jetbrains.kotlin.descriptors.PackagePartProvider
 import org.jetbrains.kotlin.descriptors.impl.LazyModuleDependencies
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.name.FqName
@@ -164,17 +167,14 @@ abstract class AnalyzerFacade<in P : PlatformAnalysisParameters> {
             delegateResolver: ResolverForProject<M> = EmptyResolverForProject(),
             packagePartProviderFactory: (M, ModuleContent) -> PackagePartProvider = { _, _ -> PackagePartProvider.Empty },
             firstDependency: M? = null,
-            modulePlatforms: (M) -> MultiTargetPlatform?,
+            modulePlatforms: (M) -> MultiTargetPlatform?
-            moduleSources: (M) -> SourceKind = { SourceKind.NONE }
     ): ResolverForProject<M> {
         val storageManager = projectContext.storageManager
         fun createResolverForProject(): ResolverForProjectImpl<M> {
             val descriptorByModule = HashMap<M, ModuleDescriptorImpl>()
-            modules.forEach {
+            modules.forEach { module ->
-                module ->
                 descriptorByModule[module] =
-                        ModuleDescriptorImpl(module.name, storageManager, builtIns(module),
+                        ModuleDescriptorImpl(module.name, storageManager, builtIns(module), modulePlatforms(module), module.capabilities)
-                                             modulePlatforms(module), moduleSources(module), module.capabilities)
             }
             return ResolverForProjectImpl(debugName, descriptorByModule, delegateResolver)
         }

compiler/tests-common/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.kt

@@ -32,7 +32,10 @@ import org.jetbrains.kotlin.context.ModuleContext
 import org.jetbrains.kotlin.context.SimpleGlobalContext
 import org.jetbrains.kotlin.context.withModule
 import org.jetbrains.kotlin.context.withProject
-import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
+import org.jetbrains.kotlin.descriptors.ModuleDescriptor
+import org.jetbrains.kotlin.descriptors.PackagePartProvider
+import org.jetbrains.kotlin.descriptors.PackageViewDescriptor
 import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.diagnostics.Diagnostic
@@ -468,10 +471,7 @@ abstract class AbstractDiagnosticsTest : BaseDiagnosticsTest() {
         val platform =
                 if (nameSuffix.isEmpty()) null
                 else if (nameSuffix == "common") MultiTargetPlatform.Common else MultiTargetPlatform.Specific(nameSuffix.toUpperCase())
-        return ModuleDescriptorImpl(
+        return ModuleDescriptorImpl(Name.special("<$moduleName>"), storageManager, JvmBuiltIns(storageManager), platform)
-                Name.special("<$moduleName>"), storageManager, JvmBuiltIns(storageManager),
-                platform, SourceKind.TEST
-        )
     }
 
     protected open fun createSealedModule(storageManager: StorageManager): ModuleDescriptorImpl =

core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt

@@ -26,8 +26,6 @@ interface ModuleDescriptor : DeclarationDescriptor {
 
     val builtIns: KotlinBuiltIns
 
-    val sourceKind: SourceKind
-
     fun shouldSeeInternalsOf(targetModule: ModuleDescriptor): Boolean
 
     override fun substitute(substitutor: TypeSubstitutor): ModuleDescriptor {

core/descriptors/src/org/jetbrains/kotlin/descriptors/SourceKind.kt

@@ -1,23 +0,0 @@
-/*
- * Copyright 2010-2016 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.kotlin.descriptors
-
-enum class SourceKind {
-    NONE,
-    PRODUCTION,
-    TEST
-}

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt

@@ -17,12 +17,13 @@
 package org.jetbrains.kotlin.descriptors.impl
 
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.descriptors.ModuleDescriptor
+import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
+import org.jetbrains.kotlin.descriptors.PackageViewDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
 import org.jetbrains.kotlin.resolve.MultiTargetPlatform
-import org.jetbrains.kotlin.resolve.getMultiTargetPlatform
 import org.jetbrains.kotlin.storage.StorageManager
 import org.jetbrains.kotlin.utils.sure
 import java.lang.IllegalArgumentException
@@ -33,7 +34,6 @@ class ModuleDescriptorImpl @JvmOverloads constructor(
         override val builtIns: KotlinBuiltIns,
         // May be null in compiler context, should be not-null in IDE context
         multiTargetPlatform: MultiTargetPlatform? = null,
-        override val sourceKind: SourceKind = SourceKind.NONE,
         capabilities: Map<ModuleDescriptor.Capability<*>, Any?> = emptyMap()
 ) : DeclarationDescriptorImpl(Annotations.EMPTY, moduleName), ModuleDescriptor {
     init {

core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java

@@ -46,16 +46,10 @@ import static kotlin.collections.CollectionsKt.emptyList;
 import static kotlin.collections.CollectionsKt.joinToString;
 
 public class ErrorUtils {
-
     private static final ModuleDescriptor ERROR_MODULE;
+
     static {
         ERROR_MODULE = new ModuleDescriptor() {
-            @NotNull
-            @Override
-            public SourceKind getSourceKind() {
-                return SourceKind.NONE;
-            }
-
             @Nullable
             @Override
             public <T> T getCapability(@NotNull Capability<T> capability) {

idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleDependencyMapper.kt

@@ -29,7 +29,6 @@ import org.jetbrains.kotlin.analyzer.ResolverForProject
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.context.GlobalContextImpl
 import org.jetbrains.kotlin.context.withProject
-import org.jetbrains.kotlin.descriptors.SourceKind
 import org.jetbrains.kotlin.idea.project.AnalyzerFacadeProvider
 import org.jetbrains.kotlin.idea.project.IdeaEnvironment
 import org.jetbrains.kotlin.idea.project.TargetPlatformDetector
@@ -87,15 +86,7 @@ fun createModuleResolverProvider(
                 modulePlatforms = { moduleInfo ->
                     val module = (moduleInfo as? ModuleSourceInfo)?.module
                     module?.let { TargetPlatformDetector.getPlatform(module).multiTargetPlatform }
-                },
-                moduleSources = { moduleInfo ->
-                    when (moduleInfo) {
-                        is ModuleProductionSourceInfo -> SourceKind.PRODUCTION
-                        is ModuleTestSourceInfo -> SourceKind.TEST
-                        else -> SourceKind.NONE
-                    }
                 }
-
         )
     }
 

idea/src/org/jetbrains/kotlin/idea/highlighter/markers/DeclaredHeaderMarker.kt

@@ -17,7 +17,10 @@
 package org.jetbrains.kotlin.idea.highlighter.markers
 
 import com.intellij.psi.NavigatablePsiElement
+import org.jetbrains.kotlin.analyzer.ModuleInfo
 import org.jetbrains.kotlin.descriptors.*
+import org.jetbrains.kotlin.idea.caches.resolve.ModuleProductionSourceInfo
+import org.jetbrains.kotlin.idea.caches.resolve.ModuleTestSourceInfo
 import org.jetbrains.kotlin.idea.caches.resolve.findModuleDescriptor
 import org.jetbrains.kotlin.idea.core.toDescriptor
 import org.jetbrains.kotlin.psi.KtDeclaration
@@ -26,9 +29,21 @@ import org.jetbrains.kotlin.resolve.MultiTargetPlatform
 import org.jetbrains.kotlin.resolve.checkers.HeaderImplDeclarationChecker
 import org.jetbrains.kotlin.resolve.getMultiTargetPlatform
 
-fun ModuleDescriptor.commonModuleOrNull() = allDependencyModules.filter {
+fun ModuleDescriptor.commonModuleOrNull(): ModuleDescriptor? {
-    it.getMultiTargetPlatform() == MultiTargetPlatform.Common && it.sourceKind == sourceKind
+    val sourceKind = sourceKind
-}.firstOrNull()
+    return allDependencyModules.firstOrNull { dependency ->
+        dependency.getMultiTargetPlatform() == MultiTargetPlatform.Common && dependency.sourceKind == sourceKind
+    }
+}
+
+private val ModuleDescriptor.sourceKind: SourceKind
+    get() = when (getCapability(ModuleInfo.Capability)) {
+        is ModuleProductionSourceInfo -> SourceKind.PRODUCTION
+        is ModuleTestSourceInfo -> SourceKind.TEST
+        else -> SourceKind.NONE
+    }
+
+private enum class SourceKind { NONE, PRODUCTION, TEST }
 
 fun ModuleDescriptor.hasDeclarationOf(descriptor: MemberDescriptor) = declarationOf(descriptor) != null