From 7bf84ec84cdf88a2a68bfa0e2a4c89a1f5eb8e8b Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 7 Oct 2014 23:49:44 +0400 Subject: [PATCH] Refactoring: rename method and hide information about gradle --- .../jet/plugin/highlighter/DebugInfoAnnotator.java | 2 +- .../jetbrains/jet/plugin/highlighter/JetPsiChecker.java | 2 +- .../org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt | 9 ++------- .../jetbrains/jet/plugin/hierarchy/HierarchyUtils.java | 2 +- .../plugin/hierarchy/KotlinTypeHierarchyProvider.java | 2 +- .../hierarchy/calls/KotlinCallHierarchyProvider.java | 2 +- .../jet/plugin/highlighter/DeclarationHintSupport.java | 2 +- .../jet/plugin/highlighter/JetLineMarkerProvider.java | 2 +- .../search/ideaExtensions/KotlinReferencesSearcher.java | 2 +- 9 files changed, 10 insertions(+), 15 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java index c3856448af1..e635dcd9d71 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java +++ b/idea/idea-analysis/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() || !ProjectRootsUtil.isInSourceWithGradleCheck(element)) { + if (!isDebugInfoEnabled() || !ProjectRootsUtil.isInSource(element)) { return; } diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java index 58f451e6186..d3ccb2e52a6 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java @@ -93,7 +93,7 @@ public class JetPsiChecker implements Annotator, HighlightRangeExtension { @Override public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) { - if (!(ProjectRootsUtil.isInSourceWithGradleCheck(element) || element.getContainingFile() instanceof JetCodeFragment)) return; + if (!(ProjectRootsUtil.isInSource(element) || element.getContainingFile() instanceof JetCodeFragment)) return; for (HighlightingVisitor visitor : getBeforeAnalysisVisitors(holder)) { element.accept(visitor); diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt index a65bce0f6be..324d1a1d2ac 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt @@ -27,11 +27,6 @@ import kotlin.platform.platformStatic import org.jetbrains.jet.plugin.util.application.runReadAction public object ProjectRootsUtil { - platformStatic - private fun isInSource(element: PsiElement): Boolean { - return isInSource(element, true) - } - platformStatic public fun isInSource(element: PsiElement, includeLibrarySources: Boolean): Boolean { return runReadAction { (): Boolean -> @@ -54,7 +49,7 @@ public object ProjectRootsUtil { } platformStatic - public fun isInSourceWithGradleCheck(element: PsiElement): Boolean { - return isInSource(element) && !JetModuleTypeManager.getInstance()!!.isKtFileInGradleProjectInWrongFolder(element) + public fun isInSource(element: PsiElement): Boolean { + return isInSource(element, true) } } diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/HierarchyUtils.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/HierarchyUtils.java index 2ff21696dfd..4c8586a7f91 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/HierarchyUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/HierarchyUtils.java @@ -60,7 +60,7 @@ public class HierarchyUtils { PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument()); if (file == null) return null; - if (!ProjectRootsUtil.isInSourceWithGradleCheck(file)) return null; + if (!ProjectRootsUtil.isInSource(file)) return null; return TargetElementUtilBase.findTargetElement(editor, TargetElementUtilBase.getInstance().getAllAccepted()); } diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java index 6a62a600d25..864b0f12cfd 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java @@ -54,7 +54,7 @@ public class KotlinTypeHierarchyProvider extends JavaTypeHierarchyProvider { PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument()); if (file == null) return null; - if (!ProjectRootsUtil.isInSourceWithGradleCheck(file)) return null; + if (!ProjectRootsUtil.isInSource(file)) return null; PsiElement target = TargetElementUtilBase.findTargetElement(editor, TargetElementUtilBase.getInstance().getAllAccepted()); diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyProvider.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyProvider.java index cab34854ae9..7c59a17f1de 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyProvider.java @@ -46,7 +46,7 @@ public class KotlinCallHierarchyProvider implements HierarchyProvider { PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument()); if (file == null) return null; - if (!ProjectRootsUtil.isInSourceWithGradleCheck(file)) return null; + if (!ProjectRootsUtil.isInSource(file)) return null; return TargetElementUtilBase.findTargetElement(editor, TargetElementUtilBase.getInstance().getAllAccepted()); } diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java b/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java index c17f72e2524..b7b9154453d 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java @@ -88,7 +88,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 || !ProjectRootsUtil.isInSourceWithGradleCheck(psiFile)) { + if (psiFile == null || psiFile.getLanguage() != JetLanguage.INSTANCE || !ProjectRootsUtil.isInSource(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 fb4d1c8feed..093f068fa2b 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java @@ -151,7 +151,7 @@ public class JetLineMarkerProvider implements LineMarkerProvider { PsiElement first = KotlinPackage.first(elements); if (DumbService.getInstance(first.getProject()).isDumb() || - !ProjectRootsUtil.isInSourceWithGradleCheck(elements.get(0))) { + !ProjectRootsUtil.isInSource(elements.get(0))) { return; } diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java index 5ed7f9b44a7..3a367686ea8 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java +++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java @@ -58,7 +58,7 @@ public class KotlinReferencesSearcher extends QueryExecutorBase