Simplify getting class file path for functions from current module

This commit is contained in:
Alexey Tsvetkov
2015-09-04 15:04:08 +03:00
parent 08a11b627c
commit ed5dcf2182
4 changed files with 12 additions and 52 deletions
@@ -1,22 +0,0 @@
/*
* Copyright 2010-2015 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.load.kotlin.incremental
import org.jetbrains.kotlin.descriptors.SourceElement
import java.io.File
public class FileSourceElement(public val file: File) : SourceElement
@@ -21,10 +21,8 @@ import org.apache.log4j.Logger
import org.jetbrains.kotlin.descriptors.ModuleDescriptor
import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
import org.jetbrains.kotlin.descriptors.SourceElement
import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl
import org.jetbrains.kotlin.load.kotlin.ModuleMapping
import org.jetbrains.kotlin.load.kotlin.PackageClassUtils
import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils
import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache
import org.jetbrains.kotlin.modules.Module
@@ -44,7 +42,6 @@ import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
import org.jetbrains.kotlin.storage.NotNullLazyValue
import org.jetbrains.kotlin.storage.StorageManager
import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList
import java.io.File
import java.util.*
public class IncrementalPackageFragmentProvider(
@@ -100,14 +97,6 @@ public class IncrementalPackageFragmentProvider(
public val target: Module
get() = this@IncrementalPackageFragmentProvider.target
private val sourceElement: SourceElement by lazy {
val incrementalCache = this@IncrementalPackageFragmentProvider.incrementalCache
val classId = PackageClassUtils.getPackageClassId(fqName)
val className = JvmClassName.byClassId(classId)
val classFilePath = incrementalCache.getClassFilePath(className.internalName)
FileSourceElement(File(classFilePath))
}
val memberScope: NotNullLazyValue<JetScope> = storageManager.createLazyValue {
if (fqName !in fqNamesToLoad) {
JetScope.Empty
@@ -147,8 +136,6 @@ public class IncrementalPackageFragmentProvider(
}
}
override fun getSource(): SourceElement = sourceElement
override fun getMemberScope(): JetScope = memberScope()
private inner class IncrementalPackageScope(val packageData: PackageData) : DeserializedPackageMemberScope(