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

Got rid of saving argument list in NONE_APPLICABLE diagnostic.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-04-20 20:43:18 +04:00
parent 466e669727
commit e4eb48e61a
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java
+2 -9
View File
@@ -29,7 +29,6 @@ import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1;
import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.diagnostics.Errors;
import org.jetbrains.jet.lang.diagnostics.rendering.*; import org.jetbrains.jet.lang.diagnostics.rendering.*;
import org.jetbrains.jet.lang.psi.JetValueArgument; import org.jetbrains.jet.lang.psi.JetValueArgument;
import org.jetbrains.jet.lang.psi.JetValueArgumentList;
import org.jetbrains.jet.lang.psi.ValueArgument; import org.jetbrains.jet.lang.psi.ValueArgument;
import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.FqName; import org.jetbrains.jet.lang.resolve.FqName;
@@ -136,8 +135,7 @@ public class IdeErrorMessages {
private static ValueParameterDescriptor findParameterByArgumentExpression( private static ValueParameterDescriptor findParameterByArgumentExpression(
ResolvedCall<? extends CallableDescriptor> call, ResolvedCall<? extends CallableDescriptor> call,
JetValueArgument argument) { JetValueArgument argument) {
for (Map.Entry<ValueParameterDescriptor, ResolvedValueArgument> entry : call.getValueArguments() for (Map.Entry<ValueParameterDescriptor, ResolvedValueArgument> entry : call.getValueArguments().entrySet()) {
.entrySet()) {
for (ValueArgument va : entry.getValue().getArguments()) { for (ValueArgument va : entry.getValue().getArguments()) {
if (va == argument) { if (va == argument) {
return entry.getKey(); return entry.getKey();
@@ -152,11 +150,6 @@ public class IdeErrorMessages {
if (call instanceof ResolvedCallImpl) { if (call instanceof ResolvedCallImpl) {
Collection<Diagnostic> diagnostics = ((ResolvedCallImpl)call).getTrace().getBindingContext().getDiagnostics(); Collection<Diagnostic> diagnostics = ((ResolvedCallImpl)call).getTrace().getBindingContext().getDiagnostics();
for (Diagnostic diagnostic : diagnostics) { for (Diagnostic diagnostic : diagnostics) {
//stringBuilder.append(DefaultErrorMessages.RENDERER.render(diagnostic));
PsiElement element = diagnostic.getPsiElement();
JetValueArgumentList argumentList = PsiTreeUtil.getParentOfType(element, JetValueArgumentList.class, false);
assert argumentList != null;
JetValueArgument argument = PsiTreeUtil.getParentOfType(element, JetValueArgument.class, false);
if (diagnostic.getFactory() == Errors.TOO_MANY_ARGUMENTS) { if (diagnostic.getFactory() == Errors.TOO_MANY_ARGUMENTS) {
parameters.add(null); parameters.add(null);
} else if (diagnostic.getFactory() == Errors.NO_VALUE_FOR_PARAMETER) { } else if (diagnostic.getFactory() == Errors.NO_VALUE_FOR_PARAMETER) {
@@ -164,8 +157,8 @@ public class IdeErrorMessages {
((DiagnosticWithParameters1<PsiElement, ValueParameterDescriptor>)diagnostic).getA(); ((DiagnosticWithParameters1<PsiElement, ValueParameterDescriptor>)diagnostic).getA();
parameters.add(parameter); parameters.add(parameter);
} else { } else {
JetValueArgument argument = PsiTreeUtil.getParentOfType(diagnostic.getPsiElement(), JetValueArgument.class, false);
if (argument != null) { if (argument != null) {
assert argument.getParent() == argumentList; // TODO check that this really can't happen
ValueParameterDescriptor parameter = findParameterByArgumentExpression(call, argument); ValueParameterDescriptor parameter = findParameterByArgumentExpression(call, argument);
if (parameter != null) { if (parameter != null) {
parameters.add(parameter); parameters.add(parameter);