From c345ee27d8d426c2d80ee7aada8f20d1ffa0dc4c Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 20 Feb 2013 16:39:52 +0400 Subject: [PATCH] Got rid of getText() when reporting unresolved reference. --- .../src/org/jetbrains/jet/lang/diagnostics/Errors.java | 5 +++-- .../lang/diagnostics/rendering/DefaultErrorMessages.java | 4 ++-- .../org/jetbrains/jet/lang/resolve/DescriptorResolver.java | 2 +- .../jet/lang/resolve/QualifiedExpressionResolver.java | 2 +- .../org/jetbrains/jet/lang/resolve/calls/CallResolver.java | 2 +- .../resolve/calls/ValueArgumentsToParametersMapper.java | 2 +- .../jet/lang/resolve/calls/tasks/TracingStrategyImpl.java | 2 +- .../expressions/ExpressionTypingVisitorForStatements.java | 2 +- .../jetbrains/jet/lang/types/expressions/LabelResolver.java | 6 +++--- 9 files changed, 14 insertions(+), 13 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java index baae4363d64..bd02f00fc1f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java @@ -68,7 +68,8 @@ public interface Errors { DiagnosticFactory1 REDECLARATION = DiagnosticFactory1.create(ERROR, FOR_REDECLARATION); - DiagnosticFactory1 UNRESOLVED_REFERENCE = DiagnosticFactory1.create(ERROR, FOR_UNRESOLVED_REFERENCE); + DiagnosticFactory1 UNRESOLVED_REFERENCE = + DiagnosticFactory1.create(ERROR, FOR_UNRESOLVED_REFERENCE); //Elements with "INVISIBLE_REFERENCE" error are marked as unresolved, unlike elements with "INVISIBLE_MEMBER" error //"INVISIBLE_REFERENCE" is used for invisible classes references and references in import @@ -308,7 +309,7 @@ public interface Errors { DiagnosticFactory0 MIXING_NAMED_AND_POSITIONED_ARGUMENTS = DiagnosticFactory0.create(ERROR); DiagnosticFactory0 ARGUMENT_PASSED_TWICE = DiagnosticFactory0.create(ERROR); - DiagnosticFactory1 NAMED_PARAMETER_NOT_FOUND = + DiagnosticFactory1 NAMED_PARAMETER_NOT_FOUND = DiagnosticFactory1.create(ERROR, FOR_UNRESOLVED_REFERENCE); DiagnosticFactory0 VARARG_OUTSIDE_PARENTHESES = DiagnosticFactory0.create(ERROR); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java index 9dc7dac4680..30421426fd0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java @@ -53,7 +53,7 @@ public class DefaultErrorMessages { } }); - MAP.put(UNRESOLVED_REFERENCE, "Unresolved reference: {0}", TO_STRING); + MAP.put(UNRESOLVED_REFERENCE, "Unresolved reference: {0}", ELEMENT_TEXT); MAP.put(INVISIBLE_REFERENCE, "Cannot access ''{0}'': it is ''{1}'' in ''{2}''", NAME, TO_STRING, NAME); MAP.put(INVISIBLE_MEMBER, "Cannot access ''{0}'': it is ''{1}'' in ''{2}''", NAME, TO_STRING, NAME); @@ -109,7 +109,7 @@ public class DefaultErrorMessages { MAP.put(MIXING_NAMED_AND_POSITIONED_ARGUMENTS, "Mixing named and positioned arguments in not allowed"); MAP.put(ARGUMENT_PASSED_TWICE, "An argument is already passed for this parameter"); - MAP.put(NAMED_PARAMETER_NOT_FOUND, "Cannot find a parameter with this name: {0}", TO_STRING); + MAP.put(NAMED_PARAMETER_NOT_FOUND, "Cannot find a parameter with this name: {0}", ELEMENT_TEXT); MAP.put(VARARG_OUTSIDE_PARENTHESES, "Passing value as a vararg is only allowed inside a parenthesized argument list"); MAP.put(NON_VARARG_SPREAD, "The spread operator (*foo) may only be applied in a vararg position"); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java index 646ca3b696b..a9add87c124 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java @@ -616,7 +616,7 @@ public class DescriptorResolver { trace.record(BindingContext.REFERENCE_TARGET, subjectTypeParameterName, classifier); } else { - trace.report(UNRESOLVED_REFERENCE.on(subjectTypeParameterName, subjectTypeParameterName.getText())); + trace.report(UNRESOLVED_REFERENCE.on(subjectTypeParameterName, subjectTypeParameterName)); } } else { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java index 9ee22708098..fa5b9e6f543 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java @@ -359,7 +359,7 @@ public class QualifiedExpressionResolver { // Simple case of no descriptors if (descriptors.isEmpty()) { trace.record(BindingContext.RESOLUTION_SCOPE, referenceExpression, resolutionScope); - trace.report(UNRESOLVED_REFERENCE.on(referenceExpression, referenceExpression.getText())); + trace.report(UNRESOLVED_REFERENCE.on(referenceExpression, referenceExpression)); return; } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java index 6b3ede747e3..9c9f2c5a164 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java @@ -430,7 +430,7 @@ public class CallResolver { resolveFunctionArguments(context, resultsForFirstNonemptyCandidateSet); } else { - context.trace.report(UNRESOLVED_REFERENCE.on(reference, reference.getText())); + context.trace.report(UNRESOLVED_REFERENCE.on(reference, reference)); argumentTypeResolver.checkTypesWithNoCallee(context, RESOLVE_FUNCTION_ARGUMENTS); } return resultsForFirstNonemptyCandidateSet != null ? resultsForFirstNonemptyCandidateSet : OverloadResolutionResultsImpl.nameNotFound(); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ValueArgumentsToParametersMapper.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ValueArgumentsToParametersMapper.java index cd001181288..00a84bda45a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ValueArgumentsToParametersMapper.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ValueArgumentsToParametersMapper.java @@ -153,7 +153,7 @@ import static org.jetbrains.jet.lang.resolve.calls.ValueArgumentsToParametersMap JetSimpleNameExpression nameReference = argument.getArgumentName().getReferenceExpression(); ValueParameterDescriptor valueParameterDescriptor = parameterByName.get(nameReference.getReferencedNameAsName()); if (valueParameterDescriptor == null) { - report(NAMED_PARAMETER_NOT_FOUND.on(nameReference, nameReference.getText())); + report(NAMED_PARAMETER_NOT_FOUND.on(nameReference, nameReference)); unmappedArguments.add(argument); setStatus(WEAK_ERROR); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java index 567c709702e..70161a14d65 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java @@ -87,7 +87,7 @@ public class TracingStrategyImpl implements TracingStrategy { @Override public void unresolvedReference(@NotNull BindingTrace trace) { - trace.report(UNRESOLVED_REFERENCE.on(reference, reference.getText())); + trace.report(UNRESOLVED_REFERENCE.on(reference, reference)); } @Override diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java index 2e656f89c65..f83002a62f7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java @@ -217,7 +217,7 @@ public class ExpressionTypingVisitorForStatements extends ExpressionTypingVisito if (leftType == null) { dataFlowInfo = facade.getTypeInfo(right, context.replaceDataFlowInfo(dataFlowInfo)).getDataFlowInfo(); - context.trace.report(UNRESOLVED_REFERENCE.on(operationSign, operationSign.getText())); + context.trace.report(UNRESOLVED_REFERENCE.on(operationSign, operationSign)); temporaryBindingTrace.commit(); return JetTypeInfo.create(null, dataFlowInfo); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java index a2741ec732a..1dd91a4fffc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java @@ -111,7 +111,7 @@ public class LabelResolver { Stack stack = labeledElements.get(labelName); if (stack == null || stack.isEmpty()) { if (reportUnresolved) { - context.trace.report(UNRESOLVED_REFERENCE.on(labelExpression, labelExpression.getText())); + context.trace.report(UNRESOLVED_REFERENCE.on(labelExpression, labelExpression)); } return null; } @@ -174,11 +174,11 @@ public class LabelResolver { return LabeledReceiverResolutionResult.labelResolutionSuccess(thisReceiver); } else { - context.trace.report(UNRESOLVED_REFERENCE.on(targetLabel, targetLabel.getText())); + context.trace.report(UNRESOLVED_REFERENCE.on(targetLabel, targetLabel)); } } else { - context.trace.report(UNRESOLVED_REFERENCE.on(targetLabel, targetLabel.getText())); + context.trace.report(UNRESOLVED_REFERENCE.on(targetLabel, targetLabel)); } } else {