diff --git a/idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java b/idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java index 86ca9193f04..b61c437fedd 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java @@ -87,11 +87,11 @@ public class JetPluginUtil { return libraryScope == ((NamespaceDescriptor) declaration).getMemberScope(); } - public static boolean isInSourceContent(@NotNull PsiElement element) { - return isInSourceContent(element, true); + public static boolean isInSource(@NotNull PsiElement element) { + return isInSource(element, true); } - public static boolean isInSourceContent(@NotNull PsiElement element, boolean includeLibrarySources) { + public static boolean isInSource(@NotNull PsiElement element, boolean includeLibrarySources) { PsiFile containingFile = element.getContainingFile(); if (containingFile == null) { return false; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java index dd7d07a7090..11f3550b460 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java @@ -56,7 +56,7 @@ public class KotlinTypeHierarchyProvider extends JavaTypeHierarchyProvider { PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument()); if (!(file instanceof JetFile)) return null; - if (!JetPluginUtil.isInSourceContent(file)) return null; + if (!JetPluginUtil.isInSource(file)) return null; if (JetPluginUtil.isKtFileInGradleProjectInWrongFolder(file)) return null; PsiElement target = TargetElementUtilBase.findTargetElement(editor, TargetElementUtilBase.getInstance().getAllAccepted()); diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java b/idea/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java index e5d353901dd..2af5c3ae5c2 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java @@ -41,7 +41,7 @@ public class DebugInfoAnnotator implements Annotator { @Override public void annotate(@NotNull PsiElement element, @NotNull final AnnotationHolder holder) { if (!isDebugInfoEnabled() || - !JetPluginUtil.isInSourceContent(element) || + !JetPluginUtil.isInSource(element) || JetPluginUtil.isKtFileInGradleProjectInWrongFolder(element)) { return; } diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java b/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java index d0164f0c0e2..40be42a0bbe 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java @@ -89,7 +89,7 @@ public class DeclarationHintSupport extends AbstractProjectComponent { Editor editor = e.getEditor(); PsiFile psiFile = PsiDocumentManager.getInstance(myProject).getPsiFile(editor.getDocument()); if (psiFile == null || psiFile.getLanguage() != JetLanguage.INSTANCE || - !JetPluginUtil.isInSourceContent(psiFile) || + !JetPluginUtil.isInSource(psiFile) || JetPluginUtil.isKtFileInGradleProjectInWrongFolder(psiFile)) { return; } diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java index 235db508bae..f046de1f9e6 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java @@ -364,7 +364,7 @@ public class JetLineMarkerProvider implements LineMarkerProvider { public void collectSlowLineMarkers(@NotNull List elements, @NotNull Collection result) { if (elements.isEmpty() || DumbService.getInstance(elements.get(0).getProject()).isDumb() || - !JetPluginUtil.isInSourceContent(elements.get(0)) || + !JetPluginUtil.isInSource(elements.get(0)) || JetPluginUtil.isKtFileInGradleProjectInWrongFolder(elements.get(0))) { return; } diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java index e057ab3670f..1d3da3cc362 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java @@ -106,7 +106,7 @@ public class JetPsiChecker implements Annotator { try { BindingContext bindingContext = AnalyzerFacadeWithCache.analyzeFileWithCache(file).getBindingContext(); - if (JetPluginUtil.isInSourceContent(element, /* includeLibrarySources = */ false)) { + if (JetPluginUtil.isInSource(element, /* includeLibrarySources = */ false)) { Collection diagnostics = Sets.newLinkedHashSet(bindingContext.getDiagnostics()); Set redeclarations = Sets.newHashSet(); for (Diagnostic diagnostic : diagnostics) { diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java b/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java index 02a45c04cd5..632482b4d44 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java @@ -51,7 +51,7 @@ public class JetJUnitConfigurationProducer extends RuntimeConfigurationProducer protected RunnerAndConfigurationSettings createConfigurationByElement(Location location, ConfigurationContext context) { PsiElement leaf = location.getPsiElement(); - if (!JetPluginUtil.isInSourceContent(leaf, true)) { + if (!JetPluginUtil.isInSource(leaf, true)) { return null; } diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java index 9f88cb26ad8..cda2b930b6c 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java @@ -63,7 +63,7 @@ public class JetRunConfigurationProducer extends RuntimeConfigurationProducer im } JetFile file = getStartClassFile(location); - if (file == null || !JetPluginUtil.isInSourceContent(file, true)) { + if (file == null || !JetPluginUtil.isInSource(file, true)) { return null; } diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetTestNgConfigurationProducer.java b/idea/src/org/jetbrains/jet/plugin/run/JetTestNgConfigurationProducer.java index c4a283d5583..06329f4c3e2 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetTestNgConfigurationProducer.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetTestNgConfigurationProducer.java @@ -52,7 +52,7 @@ public class JetTestNgConfigurationProducer extends TestNGConfigurationProducer Project project = context.getProject(); PsiElement leaf = location.getPsiElement(); - if (!JetPluginUtil.isInSourceContent(leaf, true)) { + if (!JetPluginUtil.isInSource(leaf, true)) { return false; } diff --git a/idea/src/org/jetbrains/jet/plugin/search/KotlinReferencesSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/KotlinReferencesSearcher.java index fa8cebbf7e2..9867acbb048 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/KotlinReferencesSearcher.java +++ b/idea/src/org/jetbrains/jet/plugin/search/KotlinReferencesSearcher.java @@ -51,7 +51,7 @@ public class KotlinReferencesSearcher extends QueryExecutorBase consumer) { PsiElement element = queryParameters.getElementToSearch(); - if (!JetPluginUtil.isInSourceContent(element) || JetPluginUtil.isKtFileInGradleProjectInWrongFolder(element)) { + if (!JetPluginUtil.isInSource(element) || JetPluginUtil.isKtFileInGradleProjectInWrongFolder(element)) { return; } if (element instanceof JetClass) {