MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

external annotator is allowed to decide if it should handle file with error +review CR-IC

Browse Source
This commit is contained in:
Dmitry Semeniouta
2013-09-12 16:56:55 +04:00
parent d2de078405
commit 88a2716e2a
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/lang/annotation/ExternalAnnotator.java
+10 -1
View File
@@ -34,12 +34,21 @@ public abstract class ExternalAnnotator<InitialInfoType, AnnotationResultType> {
public InitialInfoType collectionInformation(@NotNull PsiFile file) {
return null;
}
/**
* @deprecated use {@link com.intellij.lang.annotation.ExternalAnnotator#collectInformation(PsiFile, Editor, boolean)}
*/
@Nullable
@Deprecated()
public InitialInfoType collectInformation(@NotNull PsiFile file, @NotNull Editor editor) {
return collectionInformation(file);
}
@Nullable
public InitialInfoType collectInformation(@NotNull PsiFile file, @NotNull Editor editor, boolean hasErrors) {
return hasErrors ? null : collectionInformation(file);
}
// Lengthy annotation goes here
@Nullable
public AnnotationResultType doAnnotate(InitialInfoType collectedInfo) {
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/ExternalToolPass.java
+4 -3
View File
@@ -94,12 +94,13 @@ public class ExternalToolPass extends TextEditorHighlightingPass {
if (!externalAnnotators.isEmpty()) {
DaemonCodeAnalyzerEx daemonCodeAnalyzer = DaemonCodeAnalyzerEx.getInstanceEx(myProject);
boolean errorFound = daemonCodeAnalyzer.getFileStatusMap().wasErrorFound(myDocument);
if (errorFound) return;
for(ExternalAnnotator externalAnnotator: externalAnnotators) {
externalAnnotator.annotate(psiRoot, myAnnotationHolder);
if (!errorFound) {
externalAnnotator.annotate(psiRoot, myAnnotationHolder);
}
final Object collectedInfo = externalAnnotator.collectInformation(psiRoot, myEditor);
final Object collectedInfo = externalAnnotator.collectInformation(psiRoot, myEditor, errorFound);
if (collectedInfo != null) {
myAnnotator2DataMap.put(externalAnnotator, new MyData(psiRoot, collectedInfo));
}