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

Use ModuleInfo in VirtualFileFinder to add script dependencies in search scope

Browse Source 
Otherwise it prevent to inline functions from those dependencies during scratch compilation
This commit is contained in:
Natalia Selezneva
2018-12-05 09:37:18 +03:00
parent f3c828a17d
commit 254374c619
7 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/inlineCodegenUtils.kt
+1 -1
View File
@@ -149,7 +149,7 @@ internal fun getMethodNode(
}
internal fun findVirtualFile(state: GenerationState, classId: ClassId): VirtualFile? {
return VirtualFileFinder.getInstance(state.project).findVirtualFileWithHeader(classId)
return VirtualFileFinder.getInstance(state.project, state.module).findVirtualFileWithHeader(classId)
}
internal fun findVirtualFileImprecise(state: GenerationState, internalClassName: String): VirtualFile? {
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinderFactory.kt
+5
View File
@@ -16,12 +16,17 @@
package org.jetbrains.kotlin.cli.jvm.compiler
import com.intellij.openapi.project.Project
import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.cli.jvm.index.JvmDependenciesIndex
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder
import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory
// TODO: create different JvmDependenciesIndex instances for different sets of source roots to improve performance
class CliVirtualFileFinderFactory(private val index: JvmDependenciesIndex) : VirtualFileFinderFactory {
override fun create(scope: GlobalSearchScope): VirtualFileFinder = CliVirtualFileFinder(index, scope)
override fun create(project: Project, module: ModuleDescriptor): VirtualFileFinder =
CliVirtualFileFinder(index, GlobalSearchScope.allScope(project))
}
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileFinder.kt
+7 -1
View File
@@ -19,6 +19,8 @@ package org.jetbrains.kotlin.load.kotlin
import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.annotations.TestOnly
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.load.java.structure.JavaClass
import org.jetbrains.kotlin.load.java.structure.impl.VirtualFileBoundJavaClass
import org.jetbrains.kotlin.name.ClassId
@@ -51,7 +53,11 @@ abstract class VirtualFileFinder : KotlinClassFinder {
}
companion object SERVICE {
fun getInstance(project: Project, module: ModuleDescriptor): VirtualFileFinder =
VirtualFileFinderFactory.getInstance(project).create(project, module)
@TestOnly
fun getInstance(project: Project): VirtualFileFinder =
VirtualFileFinderFactory.getInstance(project).create(GlobalSearchScope.allScope(project))
VirtualFileFinderFactory.getInstance(project).create(GlobalSearchScope.allScope(project))
}
}
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileFinderFactory.kt
+2
View File
@@ -19,9 +19,11 @@ package org.jetbrains.kotlin.load.kotlin
import com.intellij.openapi.components.ServiceManager
import com.intellij.openapi.project.Project
import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
interface VirtualFileFinderFactory : MetadataFinderFactory {
override fun create(scope: GlobalSearchScope): VirtualFileFinder
override fun create(project: Project, module: ModuleDescriptor): VirtualFileFinder
companion object SERVICE {
fun getInstance(project: Project): VirtualFileFinderFactory =
compiler/frontend/src/org/jetbrains/kotlin/load/kotlin/MetadataFinderFactory.kt
+3
View File
@@ -16,9 +16,12 @@
package org.jetbrains.kotlin.load.kotlin
import com.intellij.openapi.project.Project
import com.intellij.psi.search.GlobalSearchScope
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.serialization.deserialization.KotlinMetadataFinder
interface MetadataFinderFactory {
fun create(scope: GlobalSearchScope): KotlinMetadataFinder
fun create(project: Project, module: ModuleDescriptor): KotlinMetadataFinder
}