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

Added semantic and debug highlighting in library sources.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2013-09-06 13:36:14 +04:00
parent 188e8b983e
commit 95adbeddd2
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java
+6 -3
View File
@@ -23,8 +23,6 @@ import com.intellij.ide.plugins.IdeaPluginDescriptor;
import com.intellij.ide.plugins.PluginManager; import com.intellij.ide.plugins.PluginManager;
import com.intellij.openapi.extensions.PluginId; import com.intellij.openapi.extensions.PluginId;
import com.intellij.openapi.module.Module; import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.module.ModuleUtil;
import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectFileIndex; import com.intellij.openapi.roots.ProjectFileIndex;
@@ -90,6 +88,10 @@ public class JetPluginUtil {
} }
public static boolean isInSourceContent(@NotNull PsiElement element) { public static boolean isInSourceContent(@NotNull PsiElement element) {
return isInSourceContent(element, true);
}
public static boolean isInSourceContent(@NotNull PsiElement element, boolean includeLibrarySources) {
PsiFile containingFile = element.getContainingFile(); PsiFile containingFile = element.getContainingFile();
if (containingFile == null) { if (containingFile == null) {
return false; return false;
@@ -98,7 +100,8 @@ public class JetPluginUtil {
if (virtualFile == null) { if (virtualFile == null) {
return false; return false;
} }
return ProjectFileIndex.SERVICE.getInstance(element.getProject()).isInSourceContent(virtualFile); ProjectFileIndex index = ProjectFileIndex.SERVICE.getInstance(element.getProject());
return includeLibrarySources ? index.isInSource(virtualFile) : index.isInSourceContent(virtualFile);
} }
public static boolean isInSource(@NotNull PsiElement element) { public static boolean isInSource(@NotNull PsiElement element) {
idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java
+1 -1
View File
@@ -115,7 +115,7 @@ public class JetPsiChecker implements Annotator {
try { try {
BindingContext bindingContext = AnalyzerFacadeWithCache.analyzeFileWithCache(file).getBindingContext(); BindingContext bindingContext = AnalyzerFacadeWithCache.analyzeFileWithCache(file).getBindingContext();
if (errorReportingEnabled) { if (errorReportingEnabled && JetPluginUtil.isInSourceContent(element, false)) {
Collection<Diagnostic> diagnostics = Sets.newLinkedHashSet(bindingContext.getDiagnostics()); Collection<Diagnostic> diagnostics = Sets.newLinkedHashSet(bindingContext.getDiagnostics());
Set<PsiElement> redeclarations = Sets.newHashSet(); Set<PsiElement> redeclarations = Sets.newHashSet();
for (Diagnostic diagnostic : diagnostics) { for (Diagnostic diagnostic : diagnostics) {