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

Removed RedeclarationDiagnostic class, since it's not very useful.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-04-13 16:19:16 +04:00
parent 4d05b6757c
commit 1501883ded
3 changed files with 6 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java
+6 -7
View File
@@ -182,9 +182,8 @@ public class JetPsiChecker implements Annotator {
return;
}
if (diagnostic instanceof RedeclarationDiagnostic) {
RedeclarationDiagnostic redeclarationDiagnostic = (RedeclarationDiagnostic)diagnostic;
registerQuickFix(markRedeclaration(redeclarations, redeclarationDiagnostic, holder), diagnostic);
if (diagnostic.getFactory() instanceof RedeclarationDiagnosticFactory) {
registerQuickFix(markRedeclaration(redeclarations, diagnostic, holder), diagnostic);
return;
}
@@ -249,11 +248,11 @@ public class JetPsiChecker implements Annotator {
@Nullable
private static Annotation markRedeclaration(@NotNull Set<PsiElement> redeclarations,
@NotNull RedeclarationDiagnostic diagnostic,
@NotNull Diagnostic redeclarationDiagnostic,
@NotNull AnnotationHolder holder) {
if (!redeclarations.add(diagnostic.getPsiElement())) return null;
List<TextRange> textRanges = diagnostic.getTextRanges();
if (!redeclarations.add(redeclarationDiagnostic.getPsiElement())) return null;
List<TextRange> textRanges = redeclarationDiagnostic.getTextRanges();
if (textRanges.isEmpty()) return null;
return holder.createErrorAnnotation(textRanges.get(0), getMessage(diagnostic));
return holder.createErrorAnnotation(textRanges.get(0), getMessage(redeclarationDiagnostic));
}
}