Code cleanup: unnecessary local variable applied
This commit is contained in:
@@ -44,8 +44,7 @@ class KtNameReferenceExpression : KtExpressionImplStub<KotlinNameReferenceExpres
|
||||
}
|
||||
|
||||
override fun getReferencedNameElement(): PsiElement {
|
||||
val element = findChildByType<PsiElement>(NAME_REFERENCE_EXPRESSIONS) ?: return this
|
||||
return element
|
||||
return findChildByType(NAME_REFERENCE_EXPRESSIONS) ?: this
|
||||
}
|
||||
|
||||
override fun getIdentifier(): PsiElement? {
|
||||
|
||||
@@ -274,9 +274,7 @@ class KtPsiFactory @JvmOverloads constructor(private val project: Project, val m
|
||||
val file = createFile(text)
|
||||
val declarations = file.declarations
|
||||
assert(declarations.size == 1) { "${declarations.size} declarations in $text" }
|
||||
@Suppress("UNCHECKED_CAST")
|
||||
val result = declarations.first() as TDeclaration
|
||||
return result
|
||||
return declarations.first() as TDeclaration
|
||||
}
|
||||
|
||||
fun createNameIdentifier(name: String): PsiElement {
|
||||
|
||||
@@ -108,11 +108,10 @@ fun KtSimpleNameExpression.getReceiverExpression(): KtExpression? {
|
||||
}
|
||||
parent is KtCallExpression -> {
|
||||
//This is in case `a().b()`
|
||||
val callExpression = parent
|
||||
val grandParent = callExpression.parent
|
||||
val grandParent = parent.parent
|
||||
if (grandParent is KtQualifiedExpression) {
|
||||
val parentsReceiver = grandParent.receiverExpression
|
||||
if (parentsReceiver != callExpression) {
|
||||
if (parentsReceiver != parent) {
|
||||
return parentsReceiver
|
||||
}
|
||||
}
|
||||
|
||||
+2
-6
@@ -44,7 +44,6 @@ import org.jetbrains.kotlin.types.KotlinType
|
||||
import org.jetbrains.kotlin.types.TypeUtils
|
||||
import org.jetbrains.kotlin.types.expressions.DataFlowAnalyzer
|
||||
import java.util.*
|
||||
import kotlin.collections.HashMap
|
||||
|
||||
|
||||
class KotlinToResolvedCallTransformer(
|
||||
@@ -112,7 +111,7 @@ class KotlinToResolvedCallTransformer(
|
||||
return this
|
||||
}
|
||||
|
||||
val resolvedCall = when (completedCall) {
|
||||
return when (completedCall) {
|
||||
is CompletedKotlinCall.Simple -> {
|
||||
NewResolvedCallImpl<D>(completedCall).runIfTraceNotNull(this::bindResolvedCall).runIfTraceNotNull(this::runArgumentsChecks)
|
||||
}
|
||||
@@ -127,8 +126,6 @@ class KotlinToResolvedCallTransformer(
|
||||
(resolvedCall as ResolvedCall<D>)
|
||||
}
|
||||
}
|
||||
|
||||
return resolvedCall
|
||||
}
|
||||
|
||||
private fun runCallCheckers(resolvedCall: ResolvedCall<*>, callCheckerContext: CallCheckerContext) {
|
||||
@@ -333,8 +330,7 @@ sealed class NewAbstractResolvedCall<D : CallableDescriptor>(): ResolvedCall<D>
|
||||
if (argumentToParameterMap == null) {
|
||||
argumentToParameterMap = argumentToParameterMap(resultingDescriptor, valueArguments)
|
||||
}
|
||||
val argumentMatch = argumentToParameterMap!![valueArgument] ?: return ArgumentUnmapped
|
||||
return argumentMatch
|
||||
return argumentToParameterMap!![valueArgument] ?: ArgumentUnmapped
|
||||
}
|
||||
|
||||
override fun getDataFlowInfoForArguments() = object : DataFlowInfoForArguments {
|
||||
|
||||
@@ -463,11 +463,10 @@ class PSICallResolver(
|
||||
val newDataFlowInfo = (lhsResult as? DoubleColonLHS.Expression)?.dataFlowInfo ?: startDataFlowInfo
|
||||
|
||||
// todo ChosenCallableReferenceDescriptor
|
||||
val argument = CallableReferenceKotlinCallArgumentImpl(valueArgument, startDataFlowInfo, newDataFlowInfo,
|
||||
ktExpression, argumentName, (lhsResult as? DoubleColonLHS.Type)?.type?.unwrap(),
|
||||
ConstraintStorage.Empty) // todo
|
||||
|
||||
return argument
|
||||
return CallableReferenceKotlinCallArgumentImpl(valueArgument, startDataFlowInfo, newDataFlowInfo,
|
||||
ktExpression, argumentName, (lhsResult as? DoubleColonLHS.Type)?.type?.unwrap(),
|
||||
ConstraintStorage.Empty)
|
||||
}
|
||||
|
||||
// valueArgument.getArgumentExpression()!! instead of ktExpression is hack -- type info should be stored also for parenthesized expression
|
||||
|
||||
+1
-2
@@ -161,10 +161,9 @@ class PatternMatchingTypingVisitor internal constructor(facade: ExpressionTyping
|
||||
|
||||
private fun wrapWhenEntryExpressionsAsSpecialCallArguments(expression: KtWhenExpression): List<KtExpression> {
|
||||
val psiFactory = KtPsiFactory(expression)
|
||||
val wrappedArgumentExpressions = expression.entries.mapNotNull { whenEntry ->
|
||||
return expression.entries.mapNotNull { whenEntry ->
|
||||
whenEntry.expression?.let { psiFactory.wrapInABlockWrapper(it) }
|
||||
}
|
||||
return wrappedArgumentExpressions
|
||||
}
|
||||
|
||||
private fun analyzeConditionsInWhenEntries(
|
||||
|
||||
Reference in New Issue
Block a user