Fix minor compile warnings

This commit is contained in:
Dmitry Gridin
2019-04-17 17:48:26 +07:00
parent 79793a4bda
commit 37c856290f
226 changed files with 618 additions and 479 deletions
@@ -22,8 +22,8 @@ import org.jetbrains.kotlin.diagnostics.rendering.DiagnosticParameterRenderer
import org.jetbrains.kotlin.diagnostics.rendering.RenderingContext
object RenderFirstLineOfElementText : DiagnosticParameterRenderer<PsiElement> {
override fun render(element: PsiElement, context: RenderingContext): String {
val text = element.text
override fun render(obj: PsiElement, renderingContext: RenderingContext): String {
val text = obj.text
val index = text.indexOf('\n')
return if (index == -1) text else text.substring(0, index) + "..."
}
@@ -32,10 +32,10 @@ object RenderFirstLineOfElementText : DiagnosticParameterRenderer<PsiElement> {
abstract class JsCallDataRenderer : DiagnosticParameterRenderer<JsCallData> {
protected abstract fun format(data: JsCallDataWithCode): String
override fun render(data: JsCallData, context: RenderingContext): String =
when (data) {
is JsCallDataWithCode -> format(data)
else -> data.message
override fun render(obj: JsCallData, renderingContext: RenderingContext): String =
when (obj) {
is JsCallDataWithCode -> format(obj)
else -> obj.message
}
}
@@ -39,7 +39,7 @@ class ScriptEngineV8 : ScriptEngine {
private fun getGlobalPropertyNames(): List<String> {
val v8Array = eval<V8Array>("Object.getOwnPropertyNames(this)")
val javaArray = V8ObjectUtils.toList(v8Array) as List<String>
@Suppress("UNCHECKED_CAST") val javaArray = V8ObjectUtils.toList(v8Array) as List<String>
v8Array.release()
return javaArray
}
@@ -46,7 +46,7 @@ import java.util.*
object ArrayFIF : CompositeFIF() {
@JvmField
val GET_INTRINSIC = intrinsify { callInfo, arguments, context ->
val GET_INTRINSIC = intrinsify { callInfo, arguments, _ ->
assert(arguments.size == 1) { "Array get expression must have one argument." }
val (indexExpression) = arguments
JsArrayAccess(callInfo.dispatchReceiver, indexExpression)
@@ -246,7 +246,7 @@ class CallArgumentTranslator private constructor(
val concatExpression = concatArgumentsIfNeeded(concatArguments, varargElementType, false)
concatExpression
} else {
val arg = ArrayFIF.unsignedPrimitiveToSigned(varargElementType)?.let {type ->
val arg = ArrayFIF.unsignedPrimitiveToSigned(varargElementType)?.let { _ ->
JsInvocation(JsNameRef("unbox", list[0]))
} ?: list[0]
JsAstUtils.invokeMethod(arg, "slice")
@@ -154,8 +154,15 @@ object CallableReferenceTranslator {
}
}
val getter = translateForPropertyAccessor(call, expression, descriptor, context, receiver, false) { context, call, _, receiverParam ->
CallTranslator.translateGet(context, call, receiverParam)
val getter = translateForPropertyAccessor(
call,
expression,
descriptor,
context,
receiver,
false
) { translationContext, resolvedCall, _, receiverParam ->
CallTranslator.translateGet(translationContext, resolvedCall, receiverParam)
}
val setter = if (isSetterVisible(descriptor, context)) {