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

Refactoring: extract method

Browse Source
This commit is contained in:
Nikolay Krasko
2013-10-22 21:30:59 +04:00
parent ced0a90573
commit 75b4a0b1d3
1 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java
+25 -24
View File
@@ -128,6 +128,11 @@ public class JetPsiChecker implements Annotator, HighlightRangeExtension {
}
}
@Override
public boolean isForceHighlightParents(@NotNull PsiFile file) {
return file instanceof JetFile;
}
private static void registerDiagnosticAnnotations(
@NotNull PsiElement element, @NotNull Diagnostic diagnostic,
@NotNull AnnotationHolder holder, Ref<Boolean> isMarkedWithRedeclaration
@@ -145,17 +150,13 @@ public class JetPsiChecker implements Annotator, HighlightRangeExtension {
MultiRangeReference mrr = (MultiRangeReference)reference;
for (TextRange range : mrr.getRanges()) {
Annotation annotation = holder.createErrorAnnotation(range.shiftRight(referenceExpression.getTextOffset()), getDefaultMessage(diagnostic));
annotation.setTooltip(getMessage(diagnostic));
registerQuickFix(annotation, diagnostic);
annotation.setHighlightType(ProblemHighlightType.LIKE_UNKNOWN_SYMBOL);
setUpAnnotation(diagnostic, annotation, ProblemHighlightType.LIKE_UNKNOWN_SYMBOL);
}
}
else {
for (TextRange textRange : textRanges) {
Annotation annotation = holder.createErrorAnnotation(textRange, getDefaultMessage(diagnostic));
annotation.setTooltip(getMessage(diagnostic));
registerQuickFix(annotation, diagnostic);
annotation.setHighlightType(ProblemHighlightType.LIKE_UNKNOWN_SYMBOL);
setUpAnnotation(diagnostic, annotation, ProblemHighlightType.LIKE_UNKNOWN_SYMBOL);
}
}
@@ -174,34 +175,39 @@ public class JetPsiChecker implements Annotator, HighlightRangeExtension {
if (!isMarkedWithRedeclaration.get() && Errors.REDECLARATION_DIAGNOSTICS.contains(diagnostic.getFactory())) {
isMarkedWithRedeclaration.set(true);
Annotation annotation = holder.createErrorAnnotation(diagnostic.getTextRanges().get(0), "");
annotation.setTooltip(getMessage(diagnostic));
setUpAnnotation(diagnostic, annotation, null);
return;
}
// Generic annotation
for (TextRange textRange : textRanges) {
Annotation errorAnnotation = holder.createErrorAnnotation(textRange, getDefaultMessage(diagnostic));
errorAnnotation.setTooltip(getMessage(diagnostic));
registerQuickFix(errorAnnotation, diagnostic);
if (diagnostic.getFactory() == Errors.INVISIBLE_REFERENCE) {
errorAnnotation.setHighlightType(ProblemHighlightType.LIKE_UNKNOWN_SYMBOL);
}
setUpAnnotation(diagnostic, errorAnnotation,
diagnostic.getFactory() == Errors.INVISIBLE_REFERENCE
? ProblemHighlightType.LIKE_UNKNOWN_SYMBOL
: null);
}
}
else if (diagnostic.getSeverity() == Severity.WARNING) {
for (TextRange textRange : textRanges) {
Annotation annotation = holder.createWarningAnnotation(textRange, getDefaultMessage(diagnostic));
annotation.setTooltip(getMessage(diagnostic));
registerQuickFix(annotation, diagnostic);
if (Errors.UNUSED_ELEMENT_DIAGNOSTICS.contains(diagnostic.getFactory())) {
annotation.setHighlightType(ProblemHighlightType.LIKE_UNUSED_SYMBOL);
}
setUpAnnotation(diagnostic, annotation,
Errors.UNUSED_ELEMENT_DIAGNOSTICS.contains(diagnostic.getFactory())
? ProblemHighlightType.LIKE_UNUSED_SYMBOL
: null);
}
}
}
private static void setUpAnnotation(Diagnostic diagnostic, Annotation annotation, @Nullable ProblemHighlightType highlightType) {
annotation.setTooltip(getMessage(diagnostic));
registerQuickFix(annotation, diagnostic);
if (highlightType != null) {
annotation.setHighlightType(highlightType);
}
}
/*
* Add a quick fix if and return modified annotation.
*/
@@ -264,9 +270,4 @@ public class JetPsiChecker implements Annotator, HighlightRangeExtension {
}
return message;
}
@Override
public boolean isForceHighlightParents(@NotNull PsiFile file) {
return file instanceof JetFile;
}
}