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

Extract interface out of NameResolver

Browse Source
This commit is contained in:
Alexander Udalov
2015-09-16 23:36:48 +03:00
parent da68c4d9ee
commit 5477570066
7 changed files with 121 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/KotlinJavaScriptStubBuilder.kt
+2 -1
View File
@@ -30,6 +30,7 @@ import org.jetbrains.kotlin.idea.decompiler.textBuilder.DirectoryBasedKotlinJava
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.serialization.deserialization.NameResolver
import org.jetbrains.kotlin.serialization.deserialization.NameResolverImpl
import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializedResourcePaths
import org.jetbrains.kotlin.serialization.js.toClassData
import org.jetbrains.kotlin.serialization.js.toPackageData
@@ -57,7 +58,7 @@ public open class KotlinJavaScriptStubBuilder : ClsStubBuilder() {
val stringsFile = moduleDirectory.findFileByRelativePath(stringsFileName)
assert(stringsFile != null) { "strings file not found: $stringsFileName" }
val nameResolver = NameResolver.read(ByteArrayInputStream(stringsFile!!.contentsToByteArray(false)))
val nameResolver = NameResolverImpl.read(ByteArrayInputStream(stringsFile!!.contentsToByteArray(false)))
val components = createStubBuilderComponents(file, packageFqName, nameResolver)
if (isPackageHeader) {
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/KotlinJavaScriptDeserializerForDecompiler.kt
+1 -1
View File
@@ -38,7 +38,7 @@ public class KotlinJavaScriptDeserializerForDecompiler(
val stringsFileName = KotlinJavascriptSerializedResourcePaths.getStringTableFilePath(directoryPackageFqName)
val stringsFile = moduleDirectory.findFileByRelativePath(stringsFileName)
assert(stringsFile != null) { "strings file not found: $stringsFileName" }
NameResolver.read(ByteArrayInputStream(stringsFile!!.contentsToByteArray(false)))
NameResolverImpl.read(ByteArrayInputStream(stringsFile!!.contentsToByteArray(false)))
}
private val metaFileFinder = DirectoryBasedKotlinJavaScriptMetaFileFinder(packageDirectory, directoryPackageFqName, nameResolver)