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

[NI] Don't forget to report error about mixing different kinds of args

Browse Source 
Also use more safe way to report errors: only if there is corresponding PSI element. This is not very useful for compiler, but in IDE we can get synthetic calls with null psi arguments
This commit is contained in:
Mikhail Zarechenskiy
2017-11-14 11:37:50 +03:00
parent 2aa8ceb005
commit 13ee0f8eda
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/DiagnosticReporterByTrackingStrategy.kt
+11 -7
View File
@@ -104,25 +104,29 @@ class DiagnosticReporterByTrackingStrategy(
SmartCastDiagnostic::class.java -> reportSmartCast(diagnostic as SmartCastDiagnostic) SmartCastDiagnostic::class.java -> reportSmartCast(diagnostic as SmartCastDiagnostic)
UnstableSmartCast::class.java -> reportUnstableSmartCast(diagnostic as UnstableSmartCast) UnstableSmartCast::class.java -> reportUnstableSmartCast(diagnostic as UnstableSmartCast)
TooManyArguments::class.java -> { TooManyArguments::class.java -> {
val psiExpression = callArgument.psiExpression reportIfNonNull(callArgument.psiExpression) {
if (psiExpression != null) { trace.report(TOO_MANY_ARGUMENTS.on(it, (diagnostic as TooManyArguments).descriptor))
trace.report(TOO_MANY_ARGUMENTS.on(psiExpression, (diagnostic as TooManyArguments).descriptor))
} }
trace.markAsReported() trace.markAsReported()
} }
VarargArgumentOutsideParentheses::class.java -> VarargArgumentOutsideParentheses::class.java ->
trace.report(VARARG_OUTSIDE_PARENTHESES.on(callArgument.psiExpression!!)) reportIfNonNull(callArgument.psiExpression) { trace.report(VARARG_OUTSIDE_PARENTHESES.on(it)) }
SpreadArgumentToNonVarargParameter::class.java -> { SpreadArgumentToNonVarargParameter::class.java -> {
val spreadElement = callArgument.safeAs<ExpressionKotlinCallArgumentImpl>()?.valueArgument?.getSpreadElement() val spreadElement = callArgument.safeAs<ExpressionKotlinCallArgumentImpl>()?.valueArgument?.getSpreadElement()
if (spreadElement != null) { reportIfNonNull(spreadElement) { trace.report(NON_VARARG_SPREAD.on(it)) }
trace.report(NON_VARARG_SPREAD.on(spreadElement))
}
} }
MixingNamedAndPositionArguments::class.java ->
trace.report(MIXING_NAMED_AND_POSITIONED_ARGUMENTS.on(callArgument.psiCallArgument.valueArgument.asElement()))
} }
} }
private fun <T> reportIfNonNull(element: T?, report: (T) -> Unit) {
if (element != null) report(element)
}
override fun onCallArgumentName(callArgument: KotlinCallArgument, diagnostic: KotlinCallDiagnostic) { override fun onCallArgumentName(callArgument: KotlinCallArgument, diagnostic: KotlinCallDiagnostic) {
val nameReference = callArgument.psiCallArgument.valueArgument.getArgumentName()?.referenceExpression ?: val nameReference = callArgument.psiCallArgument.valueArgument.getArgumentName()?.referenceExpression ?:
error("Argument name should be not null for argument: $callArgument") error("Argument name should be not null for argument: $callArgument")