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

code review; adapted to IDEA API change (Predicate -> Condition)

Browse Source
This commit is contained in:
Dmitry Jemerov
2014-12-29 12:29:01 +01:00
parent 732c3fac2f
commit 553fd4dd12
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JavaElementFinder.java
+11 -10
View File
@@ -21,6 +21,7 @@ import com.google.common.collect.Collections2;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Condition;
import com.intellij.psi.*; import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValue;
@@ -28,7 +29,6 @@ import com.intellij.psi.util.CachedValueProvider;
import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.util.CachedValuesManager;
import com.intellij.psi.util.PsiModificationTracker; import com.intellij.psi.util.PsiModificationTracker;
import com.intellij.util.SmartList; import com.intellij.util.SmartList;
import com.intellij.util.containers.Predicate;
import com.intellij.util.containers.SLRUCache; import com.intellij.util.containers.SLRUCache;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
@@ -40,7 +40,9 @@ import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.NamePackage; import org.jetbrains.jet.lang.resolve.name.NamePackage;
import java.util.*; import java.util.Collection;
import java.util.List;
import java.util.Set;
public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacadeKotlinHacks.KotlinFinderMarker { public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacadeKotlinHacks.KotlinFinderMarker {
@@ -213,23 +215,22 @@ public class JavaElementFinder extends PsiElementFinder implements JavaPsiFacade
// implements a method added in 14.1 // implements a method added in 14.1
@NotNull @NotNull
public PsiFile[] getPackageFiles(@NotNull PsiPackage psiPackage, @NotNull GlobalSearchScope scope) { public PsiFile[] getPackageFiles(@NotNull PsiPackage psiPackage, @NotNull GlobalSearchScope scope) {
List<PsiFile> result = new ArrayList<PsiFile>();
FqName packageFQN = new FqName(psiPackage.getQualifiedName()); FqName packageFQN = new FqName(psiPackage.getQualifiedName());
result.addAll(lightClassGenerationSupport.findFilesForPackage(packageFQN, scope)); Collection<JetFile> result = lightClassGenerationSupport.findFilesForPackage(packageFQN, scope);
return result.toArray(new PsiFile[result.size()]); return result.toArray(new PsiFile[result.size()]);
} }
// implements a method added in IDEA 14.1 // implements a method added in IDEA 14.1
@SuppressWarnings({"UnusedDeclaration", "MethodMayBeStatic"}) @SuppressWarnings({"UnusedDeclaration", "MethodMayBeStatic"})
@Nullable @Nullable
public Predicate<PsiFile> getPackageFilesFilter(@NotNull final PsiPackage psiPackage, @NotNull GlobalSearchScope scope) { public Condition<PsiFile> getPackageFilesFilter(@NotNull final PsiPackage psiPackage, @NotNull GlobalSearchScope scope) {
return new Predicate<PsiFile>() { return new Condition<PsiFile>() {
@Override @Override
public boolean apply(@Nullable PsiFile input) { public boolean value(@Nullable PsiFile input) {
if (input instanceof JetFile && !(psiPackage.getQualifiedName().equals(((JetFile) input).getPackageFqName().asString()))) { if (!(input instanceof JetFile)) {
return false; return true;
} }
return true; return psiPackage.getQualifiedName().equals(((JetFile) input).getPackageFqName().asString());
} }
}; };
} }