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

ErrorReporter is now Java-independent

Browse Source
This commit is contained in:
Andrey Breslav
2015-03-04 18:04:43 +03:00
parent 266485add3
commit 36bbd2c0e3
16 changed files with 55 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubBuilderContext.kt
+1 -1
View File
@@ -22,7 +22,7 @@ import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder
import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.kotlin.load.kotlin.KotlinClassFinder
import org.jetbrains.kotlin.load.java.components.ErrorReporter
import org.jetbrains.kotlin.serialization.deserialization.ErrorReporter
import org.jetbrains.kotlin.load.kotlin.AbstractBinaryClassAnnotationAndConstantLoader
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.storage.LockBasedStorageManager
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/textBuilder/LoggingErrorReporter.kt
+4 -4
View File
@@ -16,11 +16,11 @@
package org.jetbrains.kotlin.idea.decompiler.textBuilder
import org.jetbrains.kotlin.load.java.components.ErrorReporter
import org.jetbrains.kotlin.serialization.deserialization.ErrorReporter
import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass
import com.intellij.openapi.diagnostic.Logger
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.name.*
class LoggingErrorReporter(private val log: Logger) : ErrorReporter {
override fun reportLoadingError(message: String, exception: Exception?) {
@@ -35,7 +35,7 @@ class LoggingErrorReporter(private val log: Logger) : ErrorReporter {
log.error("Could not infer visibility for $descriptor")
}
override fun reportIncompatibleAbiVersion(kotlinClass: KotlinJvmBinaryClass, actualVersion: Int) {
log.error("Incompatible ABI version for class ${kotlinClass.getClassId()}, actual version: $actualVersion")
override fun reportIncompatibleAbiVersion(classId: ClassId, filePath: String, actualVersion: Int) {
log.error("Incompatible ABI version for class $classId, actual version: $actualVersion")
}
}