Refactoring: rename methods

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.isInSource(element)) {
+        if (!isDebugInfoEnabled() || !ProjectRootsUtil.isInProjectOrLibSource(element)) {
             return;
         }
 

idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java

@@ -39,7 +39,7 @@ public class DuplicateJvmSignatureAnnotator implements Annotator {
     @Override
     public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) {
         if (!(element instanceof JetFile) && !(element instanceof JetDeclaration)) return;
-        if (!ProjectRootsUtil.isInSource(element, false)) return;
+        if (!ProjectRootsUtil.isInProjectSource(element)) return;
 
         PsiFile file = element.getContainingFile();
         if (!(file instanceof JetFile) || TargetPlatformDetector.getPlatform((JetFile) file) != TargetPlatform.JVM) return;

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.isInSource(element) || element.getContainingFile() instanceof JetCodeFragment)) return;
+        if (!(ProjectRootsUtil.isInProjectOrLibSource(element) || element.getContainingFile() instanceof JetCodeFragment)) return;
 
         for (HighlightingVisitor visitor : getBeforeAnalysisVisitors(holder)) {
             element.accept(visitor);
@@ -116,7 +116,7 @@ public class JetPsiChecker implements Annotator, HighlightRangeExtension {
     }
 
     public static void annotateElement(PsiElement element, AnnotationHolder holder, Diagnostics diagnostics) {
-        if (ProjectRootsUtil.isInSource(element, /* includeLibrarySources = */ false) || element.getContainingFile() instanceof JetCodeFragment) {
+        if (ProjectRootsUtil.isInProjectSource(element) || element.getContainingFile() instanceof JetCodeFragment) {
             ElementAnnotator elementAnnotator = new ElementAnnotator(element, holder);
             for (Diagnostic diagnostic : diagnostics.forElement(element)) {
                 elementAnnotator.registerDiagnosticAnnotations(diagnostic);

idea/idea-analysis/src/org/jetbrains/jet/plugin/util/ProjectRootsUtil.kt

@@ -23,8 +23,7 @@ import org.jetbrains.jet.plugin.util.application.runReadAction
 import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope
 
 public object ProjectRootsUtil {
-    platformStatic
-    public fun isInSource(element: PsiElement, includeLibrarySources: Boolean): Boolean {
+    private fun isInSource(element: PsiElement, includeLibrarySources: Boolean): Boolean {
         return runReadAction { (): Boolean ->
             val containingFile = element.getContainingFile()
             if (containingFile == null) return@runReadAction false
@@ -39,7 +38,12 @@ public object ProjectRootsUtil {
     }
 
     platformStatic
-    public fun isInSource(element: PsiElement): Boolean {
+    public fun isInProjectSource(element: PsiElement): Boolean {
+        return isInSource(element, false)
+    }
+
+    platformStatic
+    public fun isInProjectOrLibSource(element: PsiElement): Boolean {
         return isInSource(element, true)
     }
 }

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.isInSource(file)) return null;
+            if (!ProjectRootsUtil.isInProjectOrLibSource(file)) return null;
 
             return TargetElementUtilBase.findTargetElement(editor, TargetElementUtilBase.getInstance().getAllAccepted());
         }

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.isInSource(file)) return null;
+            if (!ProjectRootsUtil.isInProjectOrLibSource(file)) return null;
 
             PsiElement target = TargetElementUtilBase.findTargetElement(editor, TargetElementUtilBase.getInstance().getAllAccepted());
 

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.isInSource(file)) return null;
+            if (!ProjectRootsUtil.isInProjectOrLibSource(file)) return null;
 
             return TargetElementUtilBase.findTargetElement(editor, TargetElementUtilBase.getInstance().getAllAccepted());
         }

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.isInSource(psiFile)) {
+            if (psiFile == null || psiFile.getLanguage() != JetLanguage.INSTANCE || !ProjectRootsUtil.isInProjectOrLibSource(psiFile)) {
                 return;
             }
 

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.isInSource(elements.get(0))) {
+            !ProjectRootsUtil.isInProjectOrLibSource(elements.get(0))) {
             return;
         }
 

idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java

@@ -79,7 +79,7 @@ public class KotlinBytecodeToolWindow extends JPanel implements Disposable {
             }
 
             JetFile file = location.getJetFile();
-            if (file == null || !ProjectRootsUtil.isInSource(file, false)) {
+            if (file == null || !ProjectRootsUtil.isInProjectSource(file)) {
                 return null;
             }
 

idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt

@@ -174,7 +174,7 @@ public class AutoImportFix(element: JetSimpleNameExpression) : JetHintAction<Jet
         val priority = when {
             declaration == null -> Priority.OTHER
             ModuleUtilCore.findModuleForPsiElement(declaration) == module -> Priority.MODULE
-            ProjectRootsUtil.isInSource(declaration, false) -> Priority.PROJECT
+            ProjectRootsUtil.isInProjectSource(declaration) -> Priority.PROJECT
             else -> Priority.OTHER
         }
 

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 (!ProjectRootsUtil.isInSource(leaf)) {
+        if (!ProjectRootsUtil.isInProjectOrLibSource(leaf)) {
             return null;
         }
 

idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java

@@ -78,7 +78,7 @@ public class JetRunConfigurationProducer extends RuntimeConfigurationProducer im
         if (ProjectStructureUtil.isJsKotlinModule(module)) return null;
 
         PsiFile psiFile = location.getPsiElement().getContainingFile();
-        if (!(psiFile instanceof JetFile && ProjectRootsUtil.isInSource(psiFile))) return null;
+        if (!(psiFile instanceof JetFile && ProjectRootsUtil.isInProjectOrLibSource(psiFile))) return null;
 
         JetFile jetFile = (JetFile) psiFile;
         final ResolveSessionForBodies session = ResolvePackage.getLazyResolveSession(jetFile);

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 (!ProjectRootsUtil.isInSource(leaf)) {
+        if (!ProjectRootsUtil.isInProjectOrLibSource(leaf)) {
             return false;
         }
 

idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinReferencesSearcher.java

@@ -58,7 +58,7 @@ public class KotlinReferencesSearcher extends QueryExecutorBase<PsiReference, Re
         PsiElement element = queryParameters.getElementToSearch();
 
         final PsiNamedElement unwrappedElement = AsJavaPackage.getNamedUnwrappedElement(element);
-        if (unwrappedElement == null || !ProjectRootsUtil.isInSource(unwrappedElement)) return;
+        if (unwrappedElement == null || !ProjectRootsUtil.isInProjectOrLibSource(unwrappedElement)) return;
 
         ApplicationManager.getApplication().runReadAction(
                 new Runnable() {