IR: fix compiler warnings

This commit is contained in:
Alexander Udalov
2020-08-14 12:34:20 +02:00
parent be53467bee
commit a810dbb41b
34 changed files with 83 additions and 95 deletions
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.android.synthetic.res
import com.intellij.openapi.module.Module
import com.intellij.openapi.module.ModuleServiceManager
import com.intellij.openapi.project.Project
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.openapi.vfs.VirtualFileManager
@@ -145,7 +144,8 @@ abstract class AndroidLayoutXmlFileManager(val project: Project) {
companion object {
fun getInstance(module: Module): AndroidLayoutXmlFileManager? {
val service = ModuleServiceManager.getService(module, AndroidLayoutXmlFileManager::class.java)
@Suppress("DEPRECATION")
val service = com.intellij.openapi.module.ModuleServiceManager.getService(module, AndroidLayoutXmlFileManager::class.java)
return service ?: module.getComponent(AndroidLayoutXmlFileManager::class.java)
}
}
@@ -90,7 +90,7 @@ interface IrBuilderExtension {
irInvoke(
dispatchReceiver,
callee,
args = *valueArguments.toTypedArray(),
args = valueArguments.toTypedArray(),
typeHint = returnTypeHint
).also { call -> typeArguments.forEachIndexed(call::putTypeArgument) }
@@ -500,11 +500,10 @@ interface IrBuilderExtension {
property.type,
genericIndex = property.genericIndex
)
?.let { expr -> wrapWithNullableSerializerIfNeeded(property.module, property.type, expr, nullableSerClass) }
?.let { expr -> wrapWithNullableSerializerIfNeeded(property.type, expr, nullableSerClass) }
}
private fun IrBuilderWithScope.wrapWithNullableSerializerIfNeeded(
module: ModuleDescriptor,
type: KotlinType,
expression: IrExpression,
nullableSerializerClass: IrClassSymbol
@@ -582,7 +581,7 @@ interface IrBuilderExtension {
type.genericIndex,
genericGetter
) ?: return null
return wrapWithNullableSerializerIfNeeded(module, type, expr, nullableSerClass)
return wrapWithNullableSerializerIfNeeded(type, expr, nullableSerClass)
}
var serializerClass = serializerClassOriginal
@@ -661,7 +660,7 @@ interface IrBuilderExtension {
(genericType.constructor.declarationDescriptor as TypeParameterDescriptor).representativeUpperBound
)!!
}!!
wrapWithNullableSerializerIfNeeded(module, type, expr, nullableSerClass)
wrapWithNullableSerializerIfNeeded(type, expr, nullableSerClass)
}
)
)
@@ -22,7 +22,6 @@ import org.jetbrains.kotlin.js.backend.ast.JsNameRef
import org.jetbrains.kotlin.js.backend.ast.JsReturn
import org.jetbrains.kotlin.js.translate.context.TranslationContext
import org.jetbrains.kotlin.js.translate.declaration.DeclarationBodyVisitor
import org.jetbrains.kotlin.psi.KtPureClassOrObject
import org.jetbrains.kotlin.resolve.descriptorUtil.module
import org.jetbrains.kotlinx.serialization.compiler.backend.common.SerializableCompanionCodegen
import org.jetbrains.kotlinx.serialization.compiler.backend.common.findTypeSerializer
@@ -62,7 +61,7 @@ class SerializableCompanionJsTranslator(
}
companion object {
fun translate(declaration: KtPureClassOrObject, descriptor: ClassDescriptor, translator: DeclarationBodyVisitor, context: TranslationContext) {
fun translate(descriptor: ClassDescriptor, translator: DeclarationBodyVisitor, context: TranslationContext) {
val serializableClass = getSerializableClassDescriptorByCompanion(descriptor) ?: return
if (serializableClass.shouldHaveGeneratedMethodsInCompanion)
SerializableCompanionJsTranslator(descriptor, translator, context).generate()
@@ -26,7 +26,6 @@ import org.jetbrains.kotlin.js.backend.ast.*
import org.jetbrains.kotlin.js.resolve.diagnostics.findPsi
import org.jetbrains.kotlin.js.translate.context.Namer
import org.jetbrains.kotlin.js.translate.context.TranslationContext
import org.jetbrains.kotlin.js.translate.declaration.DeclarationBodyVisitor
import org.jetbrains.kotlin.js.translate.general.Translation
import org.jetbrains.kotlin.js.translate.utils.JsAstUtils
import org.jetbrains.kotlin.js.translate.utils.TranslationUtils
@@ -160,7 +159,6 @@ class SerializableJsTranslator(
fun translate(
declaration: KtPureClassOrObject,
serializableClass: ClassDescriptor,
translator: DeclarationBodyVisitor,
context: TranslationContext
) {
if (serializableClass.isInternalSerializable)
@@ -23,7 +23,6 @@ import org.jetbrains.kotlin.js.translate.utils.TranslationUtils
import org.jetbrains.kotlin.psi.KtExpression
import org.jetbrains.kotlin.psi.KtPureClassOrObject
import org.jetbrains.kotlin.resolve.descriptorUtil.getSuperClassNotAny
import org.jetbrains.kotlin.types.typeUtil.builtIns
import org.jetbrains.kotlinx.serialization.compiler.backend.common.SerializerCodegen
import org.jetbrains.kotlinx.serialization.compiler.backend.common.getSerialTypeInfo
import org.jetbrains.kotlinx.serialization.compiler.resolve.*
@@ -362,7 +361,6 @@ open class SerializerJsTranslator(
companion object {
fun translate(
declaration: KtPureClassOrObject,
descriptor: ClassDescriptor,
translator: DeclarationBodyVisitor,
context: TranslationContext
@@ -27,8 +27,8 @@ import org.jetbrains.kotlinx.serialization.compiler.backend.js.SerializerJsTrans
open class SerializationJsExtension: JsSyntheticTranslateExtension {
override fun generateClassSyntheticParts(declaration: KtPureClassOrObject, descriptor: ClassDescriptor, translator: DeclarationBodyVisitor, context: TranslationContext) {
SerializerJsTranslator.translate(declaration, descriptor, translator, context)
SerializableJsTranslator.translate(declaration, descriptor, translator, context)
SerializableCompanionJsTranslator.translate(declaration, descriptor, translator, context)
SerializerJsTranslator.translate(descriptor, translator, context)
SerializableJsTranslator.translate(declaration, descriptor, context)
SerializableCompanionJsTranslator.translate(descriptor, translator, context)
}
}