azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop JetFilesProvider#allPackageFiles() and sampleToAllFilesInModule()

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-06-24 18:25:59 +04:00
parent 6e82a046e2
commit 9b5f349e61
3 changed files with 4 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliJetFilesProvider.java
-6
View File
@@ -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<JetFile> sampleToAllFilesInModule(@NotNull JetFile file) {
return environment.getSourceFiles();
}
@NotNull
@Override
public List<JetFile> allInScope(@NotNull GlobalSearchScope scope) {
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JetFilesProvider.java
-15
View File
@@ -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<JetFile> allPackageFiles(@NotNull JetFile file) {
final FqName name = file.getPackageFqName();
return Collections2.filter(sampleToAllFilesInModule(file), new Predicate<PsiFile>() {
@Override
public boolean apply(PsiFile psiFile) {
return ((JetFile) psiFile).getPackageFqName().equals(name);
}
});
}
protected abstract Collection<JetFile> sampleToAllFilesInModule(@NotNull JetFile file);
@NotNull
public abstract Collection<JetFile> allInScope(@NotNull GlobalSearchScope scope);
public abstract boolean isFileInScope(@NotNull JetFile file, @NotNull GlobalSearchScope scope);
idea/src/org/jetbrains/jet/plugin/project/PluginJetFilesProvider.java
+4 -6
View File
@@ -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<JetFile> sampleToAllFilesInModule(@NotNull JetFile file) {
return allFilesInProject(file);
}
private boolean isKotlinSourceVirtualFile(@NotNull VirtualFile virtualFile) {
return ProjectFileIndex.SERVICE.getInstance(project).isInSourceContent(virtualFile) &&
!JetPluginUtil.isKtFileInGradleProjectInWrongFolder(virtualFile, project);