Fixed red code when navigating to the source of println()

#KT-1757 in progress
This commit is contained in:
Evgeny Gerashchenko
2012-04-11 18:26:47 +04:00
parent 26b47c0180
commit 2f7e8a3800
2 changed files with 7 additions and 1 deletions
@@ -21,6 +21,7 @@ import com.intellij.lang.annotation.AnnotationHolder;
import com.intellij.lang.annotation.Annotator;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.psi.PsiElement;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.TokenSet;
@@ -60,6 +61,9 @@ public class DebugInfoAnnotator implements Annotator {
if (!isDebugInfoEnabled() || !JetPsiChecker.isErrorReportingEnabled()) {
return;
}
if (!ProjectFileIndex.SERVICE.getInstance(element.getProject()).isInContent(element.getContainingFile().getVirtualFile())) {
return;
}
if (element instanceof JetFile) {
JetFile file = (JetFile) element;
@@ -25,6 +25,7 @@ import com.intellij.lang.annotation.Annotator;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.colors.TextAttributesKey;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.MultiRangeReference;
import com.intellij.psi.PsiElement;
@@ -104,7 +105,8 @@ public class JetPsiChecker implements Annotator {
try {
BindingContext bindingContext = WholeProjectAnalyzerFacade.analyzeProjectWithCacheOnAFile(file).getBindingContext();
if (errorReportingEnabled) {
boolean isInContent = ProjectFileIndex.SERVICE.getInstance(element.getProject()).isInContent(file.getVirtualFile());
if (errorReportingEnabled && isInContent) {
Collection<Diagnostic> diagnostics = Sets.newLinkedHashSet(bindingContext.getDiagnostics());
Set<PsiElement> redeclarations = Sets.newHashSet();
for (Diagnostic diagnostic : diagnostics) {