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

Refactoring: Remove misleading that code processes both redeclaration and shadowing

Browse Source 
NAME_SHADOWING is a warning so it has never been handled there
This commit is contained in:
Nikolay Krasko
2013-10-23 16:03:32 +04:00
parent e96c76b0d8
commit d6821ebfb6
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
-2
View File
@@ -565,8 +565,6 @@ public interface Errors {
UNRESOLVED_REFERENCE, NAMED_PARAMETER_NOT_FOUND, UNRESOLVED_REFERENCE_WRONG_RECEIVER);
ImmutableSet<? extends DiagnosticFactory> UNUSED_ELEMENT_DIAGNOSTICS = ImmutableSet.of(
UNUSED_VARIABLE, UNUSED_PARAMETER, ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE);
ImmutableSet<? extends DiagnosticFactory> REDECLARATION_DIAGNOSTICS = ImmutableSet.of(
REDECLARATION, NAME_SHADOWING);
ImmutableSet<? extends DiagnosticFactory> TYPE_INFERENCE_ERRORS = ImmutableSet.of(
TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER, TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS, TYPE_INFERENCE_TYPE_CONSTRUCTOR_MISMATCH,
TYPE_INFERENCE_UPPER_BOUND_VIOLATED, TYPE_INFERENCE_EXPECTED_TYPE_MISMATCH);
idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java
+3 -3
View File
@@ -133,8 +133,8 @@ public class JetPsiChecker implements Annotator, HighlightRangeExtension {
}
private static class ElementAnnotator {
@NotNull private final PsiElement element;
@NotNull private final AnnotationHolder holder;
private final PsiElement element;
private final AnnotationHolder holder;
private boolean isMarkedWithRedeclaration;
@@ -179,7 +179,7 @@ public class JetPsiChecker implements Annotator, HighlightRangeExtension {
return;
}
if (Errors.REDECLARATION_DIAGNOSTICS.contains(diagnostic.getFactory())) {
if (diagnostic.getFactory() == Errors.REDECLARATION) {
if (!isMarkedWithRedeclaration) {
isMarkedWithRedeclaration = true;
Annotation annotation = holder.createErrorAnnotation(diagnostic.getTextRanges().get(0), "");