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

Made RedeclarationDiagnostic simpler.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-04-13 15:50:57 +04:00
parent 545e559d5b
commit 9f3f309625
2 changed files with 23 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/RedeclarationDiagnostic.java
+22 -27
View File
@@ -27,36 +27,31 @@ import java.util.List;
/**
* @author abreslav
*/
public interface RedeclarationDiagnostic extends Diagnostic {
String getName();
public class RedeclarationDiagnostic extends AbstractDiagnostic<PsiElement> {
private String name;
class SimpleRedeclarationDiagnostic extends AbstractDiagnostic<PsiElement> implements RedeclarationDiagnostic {
private String name;
public SimpleRedeclarationDiagnostic(@NotNull PsiElement psiElement, @NotNull String name, RedeclarationDiagnosticFactory factory) {
super(psiElement, factory, factory.severity);
this.name = name;
}
@NotNull
@Override
public RedeclarationDiagnosticFactory getFactory() {
return (RedeclarationDiagnosticFactory)super.getFactory();
}
@Override
public String getName() {
return name;
}
@NotNull
@Override
public List<TextRange> getTextRanges() {
return POSITION_REDECLARATION.mark(getPsiElement());
}
public RedeclarationDiagnostic(@NotNull PsiElement psiElement, @NotNull String name, RedeclarationDiagnosticFactory factory) {
super(psiElement, factory, factory.severity);
this.name = name;
}
PositioningStrategy<PsiElement> POSITION_REDECLARATION = new PositioningStrategy<PsiElement>() {
@NotNull
@Override
public RedeclarationDiagnosticFactory getFactory() {
return (RedeclarationDiagnosticFactory)super.getFactory();
}
public String getName() {
return name;
}
@NotNull
@Override
public List<TextRange> getTextRanges() {
return POSITION_REDECLARATION.mark(getPsiElement());
}
private static final PositioningStrategy<PsiElement> POSITION_REDECLARATION = new PositioningStrategy<PsiElement>() {
@NotNull
@Override
public List<TextRange> mark(@NotNull PsiElement element) {
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/RedeclarationDiagnosticFactory.java
+1 -6
View File
@@ -30,11 +30,6 @@ public class RedeclarationDiagnosticFactory extends AbstractDiagnosticFactory {
}
public RedeclarationDiagnostic on(@NotNull PsiElement duplicatingElement, @NotNull String name) {
return new RedeclarationDiagnostic.SimpleRedeclarationDiagnostic(duplicatingElement, name, this);
}
@Override
public String toString() {
return getName();
return new RedeclarationDiagnostic(duplicatingElement, name, this);
}
}