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

Replace KotlinPackage legacy facade with corresponding package parts.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-10-01 22:31:17 +03:00
parent 80e4ba8712
commit 90e5ee8a7e
64 changed files with 214 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassImpl.java
+4 -4
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.load.java.structure.impl;
import com.intellij.psi.*;
import com.intellij.psi.impl.PsiSubstitutorImpl;
import kotlin.KotlinPackage;
import kotlin.ArraysKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -98,7 +98,7 @@ public class JavaClassImpl extends JavaClassifierImpl<PsiClass> implements JavaC
@Override
@NotNull
public Collection<JavaMethod> getMethods() {
return methods(KotlinPackage.filter(getPsi().getMethods(), new Function1<PsiMethod, Boolean>() {
return methods(ArraysKt.filter(getPsi().getMethods(), new Function1<PsiMethod, Boolean>() {
@Override
public Boolean invoke(PsiMethod method) {
return !method.isConstructor();
@@ -110,7 +110,7 @@ public class JavaClassImpl extends JavaClassifierImpl<PsiClass> implements JavaC
@NotNull
public Collection<JavaField> getFields() {
// ex. Android plugin generates LightFields for resources started from '.' (.DS_Store file etc)
return fields(KotlinPackage.filter(getPsi().getFields(), new Function1<PsiField, Boolean>() {
return fields(ArraysKt.filter(getPsi().getFields(), new Function1<PsiField, Boolean>() {
@Override
public Boolean invoke(PsiField field) {
String name = field.getName();
@@ -122,7 +122,7 @@ public class JavaClassImpl extends JavaClassifierImpl<PsiClass> implements JavaC
@Override
@NotNull
public Collection<JavaConstructor> getConstructors() {
return constructors(KotlinPackage.filter(getPsi().getConstructors(), new Function1<PsiMethod, Boolean>() {
return constructors(ArraysKt.filter(getPsi().getConstructors(), new Function1<PsiMethod, Boolean>() {
@Override
public Boolean invoke(PsiMethod method) {
// See for example org.jetbrains.plugins.scala.lang.psi.light.ScFunctionWrapper,
compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java
+2 -2
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.load.java.structure.impl;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
import kotlin.KotlinPackage;
import kotlin.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.load.java.structure.*;
@@ -138,7 +138,7 @@ public class JavaElementCollectionFromPsiArrayUtil {
@NotNull
private static <Psi, Java> List<Java> convert(@NotNull Iterable<Psi> elements, @NotNull final Factory<Psi, Java> factory) {
if (!elements.iterator().hasNext()) return Collections.emptyList();
return KotlinPackage.map(elements, new Function1<Psi, Java>() {
return CollectionsKt.map(elements, new Function1<Psi, Java>() {
@Override
public Java invoke(Psi psi) {
return factory.create(psi);
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java
+4 -3
View File
@@ -36,7 +36,8 @@ import com.intellij.util.ConcurrencyUtil;
import com.intellij.util.Query;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.messages.MessageBus;
import kotlin.KotlinPackage;
import kotlin.ArraysKt;
import kotlin.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus;
@@ -153,7 +154,7 @@ public class KotlinJavaPsiFacade {
List<KotlinPsiElementFinderWrapper> elementFinders = new ArrayList<KotlinPsiElementFinderWrapper>();
elementFinders.add(new KotlinPsiElementFinderImpl(getProject()));
List<PsiElementFinder> nonKotlinFinders = KotlinPackage.filter(
List<PsiElementFinder> nonKotlinFinders = ArraysKt.filter(
getProject().getExtensions(PsiElementFinder.EP_NAME), new Function1<PsiElementFinder, Boolean>() {
@Override
public Boolean invoke(PsiElementFinder finder) {
@@ -161,7 +162,7 @@ public class KotlinJavaPsiFacade {
}
});
elementFinders.addAll(KotlinPackage.map(nonKotlinFinders, new Function1<PsiElementFinder, KotlinPsiElementFinderWrapper>() {
elementFinders.addAll(CollectionsKt.map(nonKotlinFinders, new Function1<PsiElementFinder, KotlinPsiElementFinderWrapper>() {
@Override
public KotlinPsiElementFinderWrapper invoke(PsiElementFinder finder) {
return wrap(finder);
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java
+3 -3
View File
@@ -21,7 +21,7 @@ import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import kotlin.KotlinPackage;
import kotlin.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -274,7 +274,7 @@ public class SignaturesPropagationData {
}
}
boolean hasStableParameterNames = KotlinPackage.any(superFunctions, new Function1<FunctionDescriptor, Boolean>() {
boolean hasStableParameterNames = CollectionsKt.any(superFunctions, new Function1<FunctionDescriptor, Boolean>() {
@Override
public Boolean invoke(FunctionDescriptor descriptor) {
return descriptor.hasStableParameterNames();
@@ -286,7 +286,7 @@ public class SignaturesPropagationData {
@NotNull
private static List<TypeAndVariance> convertToTypeVarianceList(@NotNull List<TypeAndName> list) {
return KotlinPackage.map(list, new Function1<TypeAndName, TypeAndVariance>() {
return CollectionsKt.map(list, new Function1<TypeAndName, TypeAndVariance>() {
@Override
public TypeAndVariance invoke(TypeAndName tvn) {
return new TypeAndVariance(tvn.type, INVARIANT);