Skip to content

Commit abb5bc6

Browse files
udalovudalov
committed
Simplify VirtualFileFinder and their factories' hierarchy
Since there's no JsVirtualFileFinder anymore, inline JvmVirtualFileFinder into VirtualFileFinder and drop "Jvm" prefix everywhere
1 parent ee0874a commit abb5bc6

File tree

21 files changed

+49
-94
lines changed

21 files changed

+49
-94
lines changed

‎compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import org.jetbrains.kotlin.fileClasses.FileClasses;
4040
import org.jetbrains.kotlin.fileClasses.JvmFileClassesProvider;
4141
import org.jetbrains.kotlin.load.java.JvmAbi;
42-
import org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinder;
42+
import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder;
4343
import org.jetbrains.kotlin.name.ClassId;
4444
import org.jetbrains.kotlin.name.FqName;
4545
import org.jetbrains.kotlin.name.Name;
@@ -179,7 +179,7 @@ public static void initDefaultSourceMappingIfNeeded(
179179

180180
@Nullable
181181
public static VirtualFile findVirtualFile(@NotNull GenerationState state, @NotNull ClassId classId) {
182-
return JvmVirtualFileFinder.SERVICE.getInstance(state.getProject()).findVirtualFileWithHeader(classId);
182+
return VirtualFileFinder.SERVICE.getInstance(state.getProject()).findVirtualFileWithHeader(classId);
183183
}
184184

185185
@Nullable

‎compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmCliVirtualFileFinder.kt renamed to ‎compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.serialization.deserialization.MetadataPackageFragmen
2929
import org.jetbrains.kotlin.utils.addToStdlib.check
3030
import java.io.InputStream
3131

32-
class JvmCliVirtualFileFinder(
32+
class CliVirtualFileFinder(
3333
private val index: JvmDependenciesIndex,
3434
private val scope: GlobalSearchScope
3535
) : VirtualFileKotlinClassFinder() {

‎compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JvmCliVirtualFileFinderFactory.kt renamed to ‎compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinderFactory.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ package org.jetbrains.kotlin.cli.jvm.compiler
1818

1919
import com.intellij.psi.search.GlobalSearchScope
2020
import org.jetbrains.kotlin.cli.jvm.index.JvmDependenciesIndex
21-
import org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinder
22-
import org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinderFactory
21+
import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder
22+
import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory
2323

2424
// TODO: create different JvmDependenciesIndex instances for different sets of source roots to improve performance
25-
class JvmCliVirtualFileFinderFactory(private val index: JvmDependenciesIndex) : JvmVirtualFileFinderFactory {
26-
override fun create(scope: GlobalSearchScope): JvmVirtualFileFinder = JvmCliVirtualFileFinder(index, scope)
25+
class CliVirtualFileFinderFactory(private val index: JvmDependenciesIndex) : VirtualFileFinderFactory {
26+
override fun create(scope: GlobalSearchScope): VirtualFileFinder = CliVirtualFileFinder(index, scope)
2727
}

‎compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ import org.jetbrains.kotlin.config.*
8686
import org.jetbrains.kotlin.extensions.DeclarationAttributeAltererExtension
8787
import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor
8888
import org.jetbrains.kotlin.idea.KotlinFileType
89-
import org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinderFactory
89+
import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory
9090
import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache
9191
import org.jetbrains.kotlin.load.kotlin.MetadataFinderFactory
9292
import org.jetbrains.kotlin.load.kotlin.ModuleVisibilityManager
@@ -175,9 +175,9 @@ class KotlinCoreEnvironment private constructor(
175175
(ServiceManager.getService(project, CoreJavaFileManager::class.java)
176176
as KotlinCliJavaFileManagerImpl).initIndex(rootsIndex)
177177

178-
val finderFactory = JvmCliVirtualFileFinderFactory(rootsIndex)
178+
val finderFactory = CliVirtualFileFinderFactory(rootsIndex)
179179
project.registerService(MetadataFinderFactory::class.java, finderFactory)
180-
project.registerService(JvmVirtualFileFinderFactory::class.java, finderFactory)
180+
project.registerService(VirtualFileFinderFactory::class.java, finderFactory)
181181

182182
ExpressionCodegenExtension.registerExtensionPoint(project)
183183
SyntheticResolveExtension.registerExtensionPoint(project)

‎compiler/frontend.java/src/org/jetbrains/kotlin/frontend/java/di/injection.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import org.jetbrains.kotlin.load.java.lazy.ModuleClassResolver
3737
import org.jetbrains.kotlin.load.java.sam.SamConversionResolverImpl
3838
import org.jetbrains.kotlin.load.java.sam.SamWithReceiverResolver
3939
import org.jetbrains.kotlin.load.kotlin.DeserializationComponentsForJava
40-
import org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinderFactory
40+
import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory
4141
import org.jetbrains.kotlin.platform.JvmBuiltIns
4242
import org.jetbrains.kotlin.resolve.*
4343
import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver
@@ -60,7 +60,7 @@ private fun StorageComponentContainer.configureJavaTopDownAnalysis(
6060
useImpl<JavaDescriptorResolver>()
6161
useImpl<DeserializationComponentsForJava>()
6262

63-
useInstance(JvmVirtualFileFinderFactory.SERVICE.getInstance(project).create(moduleContentScope))
63+
useInstance(VirtualFileFinderFactory.getInstance(project).create(moduleContentScope))
6464

6565
useImpl<FileScopeProviderImpl>()
6666

‎compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JvmVirtualFileFinderFactory.kt

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎compiler/frontend/src/org/jetbrains/kotlin/load/kotlin/VirtualFileFinder.kt renamed to ‎compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileFinder.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,16 @@
1616

1717
package org.jetbrains.kotlin.load.kotlin
1818

19+
import com.intellij.openapi.project.Project
1920
import com.intellij.openapi.vfs.VirtualFile
21+
import com.intellij.psi.search.GlobalSearchScope
2022
import org.jetbrains.kotlin.name.ClassId
2123

22-
interface VirtualFileFinder {
24+
interface VirtualFileFinder : KotlinClassFinder {
2325
fun findVirtualFileWithHeader(classId: ClassId): VirtualFile?
26+
27+
companion object SERVICE {
28+
fun getInstance(project: Project): VirtualFileFinder =
29+
VirtualFileFinderFactory.getInstance(project).create(GlobalSearchScope.allScope(project))
30+
}
2431
}

‎compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JvmVirtualFileFinder.kt renamed to ‎compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileFinderFactory.kt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ import com.intellij.openapi.components.ServiceManager
2020
import com.intellij.openapi.project.Project
2121
import com.intellij.psi.search.GlobalSearchScope
2222

23-
interface JvmVirtualFileFinder : VirtualFileFinder, KotlinClassFinder {
24-
object SERVICE {
25-
@JvmStatic fun getInstance(project: Project): JvmVirtualFileFinder =
26-
ServiceManager.getService(project, JvmVirtualFileFinderFactory::class.java).create(GlobalSearchScope.allScope(project))
23+
interface VirtualFileFinderFactory : MetadataFinderFactory {
24+
override fun create(scope: GlobalSearchScope): VirtualFileFinder
25+
26+
companion object SERVICE {
27+
fun getInstance(project: Project): VirtualFileFinderFactory =
28+
ServiceManager.getService(project, VirtualFileFinderFactory::class.java)
2729
}
2830
}

‎compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClassFinder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl
2121
import org.jetbrains.kotlin.name.ClassId
2222
import org.jetbrains.kotlin.utils.sure
2323

24-
abstract class VirtualFileKotlinClassFinder : JvmVirtualFileFinder {
24+
abstract class VirtualFileKotlinClassFinder : VirtualFileFinder {
2525
override fun findKotlinClass(classId: ClassId): KotlinJvmBinaryClass? {
2626
val file = findVirtualFileWithHeader(classId) ?: return null
2727
return KotlinBinaryClassCache.getKotlinBinaryClass(file)

‎compiler/frontend/src/org/jetbrains/kotlin/load/kotlin/VirtualFileFinderFactory.kt

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
2626
import org.jetbrains.kotlin.cli.jvm.config.JavaSourceRoot
2727
import org.jetbrains.kotlin.cli.jvm.index.JavaRoot
2828
import org.jetbrains.kotlin.cli.jvm.index.JvmDependenciesIndexImpl
29-
import org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinder
29+
import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder
3030
import org.jetbrains.kotlin.name.ClassId
3131
import org.jetbrains.kotlin.name.FqName
3232
import org.jetbrains.kotlin.test.ConfigurationKind
@@ -195,7 +195,7 @@ class KotlinCliJavaFileManagerTest : KotlinTestWithEnvironment() {
195195
File(fooPackageDir, "$className.java").writeText(text)
196196

197197
@Suppress("UNUSED_VARIABLE") // used to implicitly initialize classpath/index in the manager
198-
val coreJavaFileFinder = JvmVirtualFileFinder.SERVICE.getInstance(project)
198+
val coreJavaFileFinder = VirtualFileFinder.SERVICE.getInstance(project)
199199
val coreJavaFileManager = ServiceManager.getService(project, CoreJavaFileManager::class.java) as KotlinCliJavaFileManagerImpl
200200

201201
val root = environment.contentRootToVirtualFile(JavaSourceRoot(javaFilesDir!!, null))!!

‎compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.asJava.classes.KtLightClass
2222
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
2323
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
2424
import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl
25-
import org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinder
25+
import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder
2626
import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil
2727
import org.jetbrains.kotlin.test.ConfigurationKind
2828
import org.jetbrains.kotlin.test.KotlinTestUtils
@@ -59,7 +59,7 @@ class KotlinClassFinderTest : KotlinTestWithEnvironmentManagement() {
5959
assertNotNull(psiClass, "Psi class not found for $className")
6060
assertTrue(psiClass !is KtLightClass, "Kotlin light classes are not not expected")
6161

62-
val binaryClass = JvmVirtualFileFinder.SERVICE.getInstance(project).findKotlinClass(JavaClassImpl(psiClass!!))
62+
val binaryClass = VirtualFileFinder.SERVICE.getInstance(project).findKotlinClass(JavaClassImpl(psiClass!!))
6363
assertNotNull(binaryClass, "No binary class for $className")
6464

6565
assertEquals("test/A.B.C", binaryClass?.classId?.toString())

‎idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/fileFinders.kt renamed to ‎idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/IDEVirtualFileFinder.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,12 @@ import com.intellij.openapi.vfs.VirtualFile
2121
import com.intellij.psi.search.GlobalSearchScope
2222
import com.intellij.util.indexing.FileBasedIndex
2323
import com.intellij.util.indexing.ID
24-
import org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinder
2524
import org.jetbrains.kotlin.load.kotlin.VirtualFileKotlinClassFinder
2625
import org.jetbrains.kotlin.name.ClassId
2726
import org.jetbrains.kotlin.name.FqName
2827
import java.io.InputStream
2928

30-
class JvmIDEVirtualFileFinder(private val scope: GlobalSearchScope) : VirtualFileKotlinClassFinder(), JvmVirtualFileFinder {
29+
class IDEVirtualFileFinder(private val scope: GlobalSearchScope) : VirtualFileKotlinClassFinder() {
3130
override fun findMetadata(classId: ClassId): InputStream? {
3231
return findVirtualFileWithHeader(classId, KotlinMetadataFileIndex.KEY)?.inputStream
3332
}
@@ -55,6 +54,6 @@ class JvmIDEVirtualFileFinder(private val scope: GlobalSearchScope) : VirtualFil
5554
}
5655

5756
companion object {
58-
private val LOG = Logger.getInstance(JvmIDEVirtualFileFinder::class.java)
57+
private val LOG = Logger.getInstance(IDEVirtualFileFinder::class.java)
5958
}
6059
}

‎idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/factories.kt renamed to ‎idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/IDEVirtualFileFinderFactory.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
package org.jetbrains.kotlin.idea.vfilefinder
1818

1919
import com.intellij.psi.search.GlobalSearchScope
20-
import org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinder
21-
import org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinderFactory
20+
import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder
21+
import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory
2222

23-
class JvmIDEVirtualFileFinderFactory : JvmVirtualFileFinderFactory {
24-
override fun create(scope: GlobalSearchScope): JvmVirtualFileFinder = JvmIDEVirtualFileFinder(scope)
23+
class IDEVirtualFileFinderFactory : VirtualFileFinderFactory {
24+
override fun create(scope: GlobalSearchScope): VirtualFileFinder = IDEVirtualFileFinder(scope)
2525
}

‎idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/moduleMappingIndexes.kt renamed to ‎idea/idea-analysis/src/org/jetbrains/kotlin/idea/vfilefinder/KotlinModuleMappingIndex.kt

File renamed without changes.

‎idea/src/META-INF/plugin.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,10 @@
233233
serviceImplementation="org.jetbrains.kotlin.idea.caches.resolve.KotlinCacheServiceImpl"/>
234234

235235
<projectService serviceInterface="org.jetbrains.kotlin.load.kotlin.MetadataFinderFactory"
236-
serviceImplementation="org.jetbrains.kotlin.idea.vfilefinder.JvmIDEVirtualFileFinderFactory"/>
236+
serviceImplementation="org.jetbrains.kotlin.idea.vfilefinder.IDEVirtualFileFinderFactory"/>
237237

238-
<projectService serviceInterface="org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinderFactory"
239-
serviceImplementation="org.jetbrains.kotlin.idea.vfilefinder.JvmIDEVirtualFileFinderFactory"/>
238+
<projectService serviceInterface="org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory"
239+
serviceImplementation="org.jetbrains.kotlin.idea.vfilefinder.IDEVirtualFileFinderFactory"/>
240240

241241
<projectService serviceInterface="org.jetbrains.kotlin.load.kotlin.ModuleVisibilityManager"
242242
serviceImplementation="org.jetbrains.kotlin.idea.util.IdeModuleVisibilityManagerImpl"/>

‎idea/src/org/jetbrains/kotlin/idea/configuration/ConfigureKotlinInProjectUtils.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.idea.configuration.ui.notifications.ConfigureKotlinN
3030
import org.jetbrains.kotlin.idea.util.projectStructure.allModules
3131
import org.jetbrains.kotlin.idea.versions.getKotlinJvmRuntimeMarkerClass
3232
import org.jetbrains.kotlin.idea.versions.hasKotlinJsKjsmFile
33-
import org.jetbrains.kotlin.idea.vfilefinder.JvmIDEVirtualFileFinder
33+
import org.jetbrains.kotlin.idea.vfilefinder.IDEVirtualFileFinder
3434
import org.jetbrains.kotlin.utils.ifEmpty
3535

3636
data class RepositoryDescription(val id: String, val name: String, val url: String, val isSnapshot: Boolean)
@@ -147,7 +147,7 @@ fun hasKotlinJsRuntimeInScope(module: Module): Boolean {
147147
}
148148

149149
fun hasKotlinCommonRuntimeInScope(scope: GlobalSearchScope): Boolean {
150-
return JvmIDEVirtualFileFinder(scope).hasMetadataPackage(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME)
150+
return IDEVirtualFileFinder(scope).hasMetadataPackage(KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME)
151151
}
152152

153153
fun hasKotlinFilesOnlyInTests(module: Module): Boolean {

‎idea/src/org/jetbrains/kotlin/idea/debugger/NoStrataPositionManagerHelper.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import org.jetbrains.kotlin.idea.refactoring.toPsiFile
3838
import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
3939
import org.jetbrains.kotlin.idea.util.application.runReadAction
4040
import org.jetbrains.kotlin.lexer.KtTokens
41-
import org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinder
41+
import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder
4242
import org.jetbrains.kotlin.name.ClassId
4343
import org.jetbrains.kotlin.name.FqName
4444
import org.jetbrains.kotlin.name.Name
@@ -139,7 +139,7 @@ private fun readClassFileImpl(project: Project,
139139

140140
val classId = ClassId(jvmName.packageFqName, Name.identifier(fqNameWithInners.asString()))
141141

142-
val fileFinder = JvmVirtualFileFinder.SERVICE.getInstance(project)
142+
val fileFinder = VirtualFileFinder.getInstance(project)
143143
val classFile = fileFinder.findVirtualFileWithHeader(classId) ?: return null
144144
return classFile.contentsToByteArray()
145145
}

‎idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractPositionManagerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ private void performTest() {
143143
}
144144

145145
CompilerConfiguration configuration = KotlinTestUtils.newConfiguration(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK);
146-
// TODO: delete this once JvmIDEVirtualFileFinder supports loading .kotlin_builtins files
146+
// TODO: delete this once IDEVirtualFileFinder supports loading .kotlin_builtins files
147147
configuration.put(JVMConfigurationKeys.ADD_BUILT_INS_FROM_COMPILER_TO_DEPENDENCIES, true);
148148

149149
GenerationState state = GenerationUtils.compileFiles(

‎idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubConsistencyTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.idea.decompiler.classFile.KotlinClsStubBuilder
2222
import org.jetbrains.kotlin.idea.decompiler.classFile.buildDecompiledTextForClassFile
2323
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
2424
import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
25-
import org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinder
25+
import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder
2626
import org.jetbrains.kotlin.name.ClassId
2727
import org.jetbrains.kotlin.name.FqName
2828
import org.jetbrains.kotlin.psi.KtPsiFactory
@@ -31,7 +31,7 @@ import org.junit.Assert
3131

3232
class ClsStubConsistencyTest : KotlinLightCodeInsightFixtureTestCase() {
3333
private fun doTest(id: ClassId) {
34-
val packageFile = JvmVirtualFileFinder.SERVICE.getInstance(project).findVirtualFileWithHeader(id)
34+
val packageFile = VirtualFileFinder.SERVICE.getInstance(project).findVirtualFileWithHeader(id)
3535
?: throw AssertionError("File not found for id: $id")
3636
val decompiledText = buildDecompiledTextForClassFile(packageFile).text
3737
val fileWithDecompiledText = KtPsiFactory(project).createFile(decompiledText)

‎idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextConsistencyTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescrip
2929
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
3030
import org.jetbrains.kotlin.incremental.components.NoLookupLocation
3131
import org.jetbrains.kotlin.load.java.descriptors.isFromJvmPackagePart
32-
import org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinder
32+
import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder
3333
import org.jetbrains.kotlin.name.ClassId
3434
import org.jetbrains.kotlin.name.FqName
3535
import org.jetbrains.kotlin.resolve.BindingTraceContext
@@ -52,7 +52,7 @@ class DecompiledTextConsistencyTest : LightCodeInsightFixtureTestCase() {
5252
FqName("kotlin.collections.TypeAliasesKt") to null
5353
)) {
5454
val classId = ClassId.topLevel(packageFacadeFqName)
55-
val classFile = JvmVirtualFileFinder.SERVICE.getInstance(project).findVirtualFileWithHeader(classId)!!
55+
val classFile = VirtualFileFinder.SERVICE.getInstance(project).findVirtualFileWithHeader(classId)!!
5656

5757
val module = TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegration(
5858
project, listOf(), BindingTraceContext(), KotlinTestUtils.newConfiguration(), ::IDEPackagePartProvider

0 commit comments

Comments
 (0)