From 16334c58aa35f0a20afb9ab60f27e82bc02c41d8 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 11 Sep 2013 21:12:44 +0400 Subject: [PATCH] Removed duplicating method. --- idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java | 12 ------------ .../plugin/run/JetJUnitConfigurationProducer.java | 2 +- .../jet/plugin/run/JetRunConfigurationProducer.java | 2 +- .../plugin/run/JetTestNgConfigurationProducer.java | 2 +- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java b/idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java index c469efb2990..86ca9193f04 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/JetPluginUtil.java @@ -104,18 +104,6 @@ public class JetPluginUtil { return includeLibrarySources ? index.isInSource(virtualFile) : index.isInSourceContent(virtualFile); } - public static boolean isInSource(@NotNull PsiElement element) { - PsiFile containingFile = element.getContainingFile(); - if (containingFile == null) { - return false; - } - VirtualFile virtualFile = containingFile.getVirtualFile(); - if (virtualFile == null) { - return false; - } - return ProjectFileIndex.SERVICE.getInstance(element.getProject()).isInSource(virtualFile); - } - @NotNull public static String getPluginVersion() { IdeaPluginDescriptor plugin = PluginManager.getPlugin(PluginId.getId("org.jetbrains.kotlin")); diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java b/idea/src/org/jetbrains/jet/plugin/run/JetJUnitConfigurationProducer.java index 74c77692bf5..02a45c04cd5 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.isInSource(leaf)) { + if (!JetPluginUtil.isInSourceContent(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 f97fbf87612..9f88cb26ad8 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.isInSource(file)) { + if (file == null || !JetPluginUtil.isInSourceContent(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 edbf0257a8d..c4a283d5583 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.isInSource(leaf)) { + if (!JetPluginUtil.isInSourceContent(leaf, true)) { return false; }