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

Drop DeserializedResolverUtils and it's usages

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-01-30 14:16:40 +03:00
parent 11ed783e1e
commit 945072a129
11 changed files with 32 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/LocalClassFinder.kt
+1 -3
View File
@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.load.kotlin.KotlinClassFinder
import org.jetbrains.kotlin.load.java.structure.JavaClass
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass
import org.jetbrains.kotlin.load.kotlin.DeserializedResolverUtils
import org.jetbrains.kotlin.idea.decompiler.isKotlinWithCompatibleAbiVersion
import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache
import com.intellij.openapi.vfs.VirtualFile
@@ -40,8 +39,7 @@ class LocalClassFinder(
if (classId.getPackageFqName() != directoryPackageFqName) {
return null
}
val segments = DeserializedResolverUtils.kotlinFqNameToJavaFqName(classId.getRelativeClassName()).pathSegments()
val targetName = segments.joinToString("$", postfix = ".class")
val targetName = classId.getRelativeClassName().pathSegments().joinToString("$", postfix = ".class")
val virtualFile = packageDirectory.findChild(targetName)
if (virtualFile != null && isKotlinWithCompatibleAbiVersion(virtualFile)) {
return KotlinBinaryClassCache.getKotlinBinaryClass(virtualFile)
idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/BuiltInsReferenceResolver.java
+1 -1
View File
@@ -57,8 +57,8 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.util.*;
import static org.jetbrains.kotlin.load.kotlin.DeserializedResolverUtils.getClassId;
import static org.jetbrains.kotlin.resolve.DescriptorUtils.unwrapFakeOverride;
import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getClassId;
import static org.jetbrains.kotlin.serialization.deserialization.DeserializationPackage.findClassAcrossModuleDependencies;
public class BuiltInsReferenceResolver extends AbstractProjectComponent {