From 9b5f349e618a89261af8eb62261c1fb6b8a27009 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 24 Jun 2014 18:25:59 +0400 Subject: [PATCH] Drop JetFilesProvider#allPackageFiles() and sampleToAllFilesInModule() --- .../jet/cli/jvm/compiler/CliJetFilesProvider.java | 6 ------ .../jet/lang/resolve/java/JetFilesProvider.java | 15 --------------- .../plugin/project/PluginJetFilesProvider.java | 10 ++++------ 3 files changed, 4 insertions(+), 27 deletions(-) diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliJetFilesProvider.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliJetFilesProvider.java index 1af81807e41..ea7aa5911c5 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliJetFilesProvider.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliJetFilesProvider.java @@ -22,7 +22,6 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.JetFilesProvider; import java.util.ArrayList; -import java.util.Collection; import java.util.List; public class CliJetFilesProvider extends JetFilesProvider { @@ -32,11 +31,6 @@ public class CliJetFilesProvider extends JetFilesProvider { this.environment = environment; } - @Override - protected Collection sampleToAllFilesInModule(@NotNull JetFile file) { - return environment.getSourceFiles(); - } - @NotNull @Override public List allInScope(@NotNull GlobalSearchScope scope) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetFilesProvider.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetFilesProvider.java index fe0c03de9df..2b2b2c1deaa 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetFilesProvider.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetFilesProvider.java @@ -16,15 +16,11 @@ package org.jetbrains.jet.lang.resolve.java; -import com.google.common.base.Predicate; -import com.google.common.collect.Collections2; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; -import com.intellij.psi.PsiFile; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.psi.JetFile; -import org.jetbrains.jet.lang.resolve.name.FqName; import java.util.Collection; @@ -34,17 +30,6 @@ public abstract class JetFilesProvider { return ServiceManager.getService(project, JetFilesProvider.class); } - public final Collection allPackageFiles(@NotNull JetFile file) { - final FqName name = file.getPackageFqName(); - return Collections2.filter(sampleToAllFilesInModule(file), new Predicate() { - @Override - public boolean apply(PsiFile psiFile) { - return ((JetFile) psiFile).getPackageFqName().equals(name); - } - }); - } - - protected abstract Collection sampleToAllFilesInModule(@NotNull JetFile file); @NotNull public abstract Collection allInScope(@NotNull GlobalSearchScope scope); public abstract boolean isFileInScope(@NotNull JetFile file, @NotNull GlobalSearchScope scope); diff --git a/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java b/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java index 84c4c37a3de..0462b92a728 100644 --- a/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java @@ -43,7 +43,10 @@ import org.jetbrains.jet.lang.resolve.java.JetFilesProvider; import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.jet.plugin.JetPluginUtil; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; public class PluginJetFilesProvider extends JetFilesProvider { private final Project project; @@ -103,11 +106,6 @@ public class PluginJetFilesProvider extends JetFilesProvider { return files; } - @Override - protected Collection sampleToAllFilesInModule(@NotNull JetFile file) { - return allFilesInProject(file); - } - private boolean isKotlinSourceVirtualFile(@NotNull VirtualFile virtualFile) { return ProjectFileIndex.SERVICE.getInstance(project).isInSourceContent(virtualFile) && !JetPluginUtil.isKtFileInGradleProjectInWrongFolder(virtualFile, project);