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

Remove dependency of "descriptors" on Function/Condition/Processor

Browse Source
This commit is contained in:
Alexander Udalov
2014-08-14 12:34:43 +04:00
parent 5afe3c0e35
commit df554e7c53
12 changed files with 142 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/Importer.java
+4 -5
View File
@@ -16,9 +16,9 @@
package org.jetbrains.jet.lang.resolve;
import com.google.common.base.Predicate;
import com.google.common.collect.Lists;
import com.intellij.openapi.util.Pair;
import kotlin.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.PlatformToKotlinClassMap;
@@ -70,12 +70,11 @@ public interface Importer {
@NotNull DeclarationDescriptor descriptor,
@NotNull PlatformToKotlinClassMap platformToKotlinClassMap
) {
final Collection<ClassDescriptor> kotlinAnalogsForClassesInside = platformToKotlinClassMap.mapPlatformClassesInside(
descriptor);
final Collection<ClassDescriptor> kotlinAnalogsForClassesInside = platformToKotlinClassMap.mapPlatformClassesInside(descriptor);
if (kotlinAnalogsForClassesInside.isEmpty()) return scope;
return new FilteringScope(scope, new Predicate<DeclarationDescriptor>() {
return new FilteringScope(scope, new Function1<DeclarationDescriptor, Boolean>() {
@Override
public boolean apply(DeclarationDescriptor descriptor) {
public Boolean invoke(DeclarationDescriptor descriptor) {
for (ClassDescriptor kotlinAnalog : kotlinAnalogsForClassesInside) {
if (kotlinAnalog.getName().equals(descriptor.getName())) {
return false;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java
+12 -8
View File
@@ -16,11 +16,11 @@
package org.jetbrains.jet.lang.resolve.calls;
import com.google.common.base.Function;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.intellij.openapi.progress.ProgressIndicatorProvider;
import kotlin.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*;
@@ -31,9 +31,10 @@ import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo;
import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowValue;
import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowValueFactory;
import org.jetbrains.jet.lang.resolve.calls.context.*;
import org.jetbrains.jet.lang.resolve.calls.inference.*;
import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintPosition;
import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystem;
import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemImpl;
import org.jetbrains.jet.lang.resolve.calls.model.*;
import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResultsImpl;
import org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus;
import org.jetbrains.jet.lang.resolve.calls.tasks.ResolutionTask;
import org.jetbrains.jet.lang.resolve.calls.tasks.TaskPrioritizer;
@@ -45,7 +46,10 @@ import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import javax.inject.Inject;
import java.util.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import static org.jetbrains.jet.lang.diagnostics.Errors.PROJECTION_ON_NON_CLASS_TYPE_ARGUMENT;
import static org.jetbrains.jet.lang.diagnostics.Errors.SUPER_IS_NOT_AN_EXPRESSION;
@@ -317,13 +321,13 @@ public class CandidateResolver {
// Restore type variables before alpha-conversion
ConstraintSystem constraintSystemWithRightTypeParameters = constraintSystem.substituteTypeVariables(
new Function<TypeParameterDescriptor, TypeParameterDescriptor>() {
new Function1<TypeParameterDescriptor, TypeParameterDescriptor>() {
@Override
public TypeParameterDescriptor apply(@Nullable TypeParameterDescriptor typeParameterDescriptor) {
assert typeParameterDescriptor != null;
public TypeParameterDescriptor invoke(@NotNull TypeParameterDescriptor typeParameterDescriptor) {
return candidate.getTypeParameters().get(typeParameterDescriptor.getIndex());
}
});
}
);
candidateCall.setConstraintSystem(constraintSystemWithRightTypeParameters);
core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java
+3 -3
View File
@@ -16,7 +16,7 @@
package org.jetbrains.jet.lang.resolve;
import com.google.common.base.Predicate;
import kotlin.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*;
@@ -328,9 +328,9 @@ public class DescriptorUtils {
@NotNull
public static JetScope getStaticNestedClassesScope(@NotNull ClassDescriptor descriptor) {
JetScope innerClassesScope = descriptor.getUnsubstitutedInnerClassesScope();
return new FilteringScope(innerClassesScope, new Predicate<DeclarationDescriptor>() {
return new FilteringScope(innerClassesScope, new Function1<DeclarationDescriptor, Boolean>() {
@Override
public boolean apply(@Nullable DeclarationDescriptor descriptor) {
public Boolean invoke(DeclarationDescriptor descriptor) {
return descriptor instanceof ClassDescriptor && !((ClassDescriptor) descriptor).isInner();
}
});
core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java
+4 -7
View File
@@ -16,12 +16,11 @@
package org.jetbrains.jet.lang.resolve;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.intellij.util.containers.ContainerUtil;
import kotlin.Function1;
import kotlin.KotlinPackage;
import kotlin.Unit;
import kotlin.jvm.KotlinSignature;
import org.jetbrains.annotations.NotNull;
@@ -378,13 +377,11 @@ public class OverridingUtil {
@NotNull final ClassDescriptor current,
@NotNull Collection<CallableMemberDescriptor> toFilter
) {
return Collections2.filter(toFilter, new Predicate<CallableMemberDescriptor>() {
return KotlinPackage.filter(toFilter, new Function1<CallableMemberDescriptor, Boolean>() {
@Override
public boolean apply(@Nullable CallableMemberDescriptor descriptor) {
public Boolean invoke(CallableMemberDescriptor descriptor) {
//nested class could capture private member, so check for private visibility added
return descriptor != null &&
descriptor.getVisibility() != Visibilities.PRIVATE &&
Visibilities.isVisible(descriptor, current);
return descriptor.getVisibility() != Visibilities.PRIVATE && Visibilities.isVisible(descriptor, current);
}
});
}
core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintPosition.java
+4 -4
View File
@@ -18,8 +18,8 @@ package org.jetbrains.jet.lang.resolve.calls.inference;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.intellij.openapi.util.Condition;
import com.intellij.util.containers.ContainerUtil;
import kotlin.Function1;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import java.util.Collection;
@@ -65,9 +65,9 @@ public class ConstraintPosition {
}
private static boolean hasConstraint(@NotNull Collection<ConstraintPosition> positions, final boolean strong) {
return ContainerUtil.exists(positions, new Condition<ConstraintPosition>() {
return KotlinPackage.any(positions, new Function1<ConstraintPosition, Boolean>() {
@Override
public boolean value(ConstraintPosition constraintPosition) {
public Boolean invoke(ConstraintPosition constraintPosition) {
return constraintPosition.isStrong() == strong;
}
});
core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.java
+40 -37
View File
@@ -16,15 +16,11 @@
package org.jetbrains.jet.lang.resolve.calls.inference;
import com.google.common.base.Function;
import com.google.common.base.Functions;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.Conditions;
import com.intellij.util.containers.ContainerUtil;
import kotlin.Function1;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor;
@@ -33,6 +29,7 @@ import org.jetbrains.jet.lang.types.*;
import org.jetbrains.jet.lang.types.checker.TypeCheckingProcedure;
import org.jetbrains.jet.lang.types.checker.TypingConstraints;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.utils.UtilsPackage;
import java.util.Collection;
import java.util.List;
@@ -202,52 +199,58 @@ public class ConstraintSystemImpl implements ConstraintSystem {
@Override
@NotNull
public ConstraintSystem copy() {
return createNewConstraintSystemFromThis(Functions.<TypeParameterDescriptor>identity(),
new Function<TypeBoundsImpl, TypeBoundsImpl>() {
@Override
public TypeBoundsImpl apply(TypeBoundsImpl typeBounds) {
return typeBounds.copy();
}
},
Conditions.<ConstraintPosition>alwaysTrue());
return createNewConstraintSystemFromThis(
UtilsPackage.<TypeParameterDescriptor>identity(),
new Function1<TypeBoundsImpl, TypeBoundsImpl>() {
@Override
public TypeBoundsImpl invoke(TypeBoundsImpl typeBounds) {
return typeBounds.copy();
}
},
UtilsPackage.<ConstraintPosition>alwaysTrue()
);
}
@NotNull
public ConstraintSystem substituteTypeVariables(@NotNull Function<TypeParameterDescriptor, TypeParameterDescriptor> typeVariablesMap) {
return createNewConstraintSystemFromThis(typeVariablesMap,
// type bounds are proper types and don't contain other variables
Functions.<TypeBoundsImpl>identity(),
Conditions.<ConstraintPosition>alwaysTrue());
public ConstraintSystem substituteTypeVariables(@NotNull Function1<TypeParameterDescriptor, TypeParameterDescriptor> typeVariablesMap) {
return createNewConstraintSystemFromThis(
typeVariablesMap,
// type bounds are proper types and don't contain other variables
UtilsPackage.<TypeBoundsImpl>identity(),
UtilsPackage.<ConstraintPosition>alwaysTrue()
);
}
@NotNull
public ConstraintSystem filterConstraintsOut(@NotNull ConstraintPosition... excludePositions) {
final Set<ConstraintPosition> positions = Sets.newHashSet(excludePositions);
return filterConstraints(new Condition<ConstraintPosition>() {
return filterConstraints(new Function1<ConstraintPosition, Boolean>() {
@Override
public boolean value(ConstraintPosition constraintPosition) {
public Boolean invoke(ConstraintPosition constraintPosition) {
return !positions.contains(constraintPosition);
}
});
}
@NotNull
public ConstraintSystem filterConstraints(@NotNull final Condition<ConstraintPosition> condition) {
return createNewConstraintSystemFromThis(Functions.<TypeParameterDescriptor>identity(),
new Function<TypeBoundsImpl, TypeBoundsImpl>() {
@Override
public TypeBoundsImpl apply(TypeBoundsImpl typeBounds) {
return typeBounds.filter(condition);
}
},
condition);
private ConstraintSystem filterConstraints(@NotNull final Function1<ConstraintPosition, Boolean> condition) {
return createNewConstraintSystemFromThis(
UtilsPackage.<TypeParameterDescriptor>identity(),
new Function1<TypeBoundsImpl, TypeBoundsImpl>() {
@Override
public TypeBoundsImpl invoke(TypeBoundsImpl typeBounds) {
return typeBounds.filter(condition);
}
},
condition
);
}
@NotNull
public ConstraintSystem getSystemWithoutWeakConstraints() {
return filterConstraints(new Condition<ConstraintPosition>() {
return filterConstraints(new Function1<ConstraintPosition, Boolean>() {
@Override
public boolean value(ConstraintPosition constraintPosition) {
public Boolean invoke(ConstraintPosition constraintPosition) {
// 'isStrong' for compound means 'has some strong constraints'
// but for testing absence of weak constraints we need 'has only strong constraints' here
if (constraintPosition instanceof ConstraintPosition.CompoundConstraintPosition) {
@@ -262,20 +265,20 @@ public class ConstraintSystemImpl implements ConstraintSystem {
@NotNull
private ConstraintSystem createNewConstraintSystemFromThis(
@NotNull Function<TypeParameterDescriptor, TypeParameterDescriptor> substituteTypeVariable,
@NotNull Function<TypeBoundsImpl, TypeBoundsImpl> replaceTypeBounds,
@NotNull Condition<ConstraintPosition> filterConstraintPosition
@NotNull Function1<TypeParameterDescriptor, TypeParameterDescriptor> substituteTypeVariable,
@NotNull Function1<TypeBoundsImpl, TypeBoundsImpl> replaceTypeBounds,
@NotNull Function1<ConstraintPosition, Boolean> filterConstraintPosition
) {
ConstraintSystemImpl newSystem = new ConstraintSystemImpl();
for (Map.Entry<TypeParameterDescriptor, TypeBoundsImpl> entry : typeParameterBounds.entrySet()) {
TypeParameterDescriptor typeParameter = entry.getKey();
TypeBoundsImpl typeBounds = entry.getValue();
TypeParameterDescriptor newTypeParameter = substituteTypeVariable.apply(typeParameter);
TypeParameterDescriptor newTypeParameter = substituteTypeVariable.invoke(typeParameter);
assert newTypeParameter != null;
newSystem.typeParameterBounds.put(newTypeParameter, replaceTypeBounds.apply(typeBounds));
newSystem.typeParameterBounds.put(newTypeParameter, replaceTypeBounds.invoke(typeBounds));
}
newSystem.errorConstraintPositions.addAll(ContainerUtil.filter(errorConstraintPositions, filterConstraintPosition));
newSystem.errorConstraintPositions.addAll(KotlinPackage.filter(errorConstraintPositions, filterConstraintPosition));
//todo if 'filterConstraintPosition' is not trivial, it's incorrect to just copy 'hasErrorInConstrainingTypes'
newSystem.hasErrorInConstrainingTypes = hasErrorInConstrainingTypes;
return newSystem;
core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeBoundsImpl.java
+8 -7
View File
@@ -18,8 +18,9 @@ package org.jetbrains.jet.lang.resolve.calls.inference;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.intellij.openapi.util.Condition;
import com.intellij.util.containers.ContainerUtil;
import kotlin.Function1;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
@@ -113,12 +114,12 @@ public class TypeBoundsImpl implements TypeBounds {
}
@NotNull
public TypeBoundsImpl filter(@NotNull final Condition<ConstraintPosition> condition) {
public TypeBoundsImpl filter(@NotNull final Function1<ConstraintPosition, Boolean> condition) {
TypeBoundsImpl result = new TypeBoundsImpl(typeVariable, varianceOfPosition);
result.bounds.addAll(ContainerUtil.filter(bounds, new Condition<Bound>() {
result.bounds.addAll(KotlinPackage.filter(bounds, new Function1<Bound, Boolean>() {
@Override
public boolean value(Bound bound) {
return condition.value(bound.position);
public Boolean invoke(Bound bound) {
return condition.invoke(bound.position);
}
}));
return result;
@@ -149,9 +150,9 @@ public class TypeBoundsImpl implements TypeBounds {
if (bounds.isEmpty()) {
return Collections.emptyList();
}
boolean hasStrongBound = ContainerUtil.exists(bounds, new Condition<Bound>() {
boolean hasStrongBound = KotlinPackage.any(bounds, new Function1<Bound, Boolean>() {
@Override
public boolean value(Bound bound) {
public Boolean invoke(Bound bound) {
return bound.position.isStrong();
}
});
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java
+11 -11
View File
@@ -16,8 +16,8 @@
package org.jetbrains.jet.lang.resolve.scopes;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import kotlin.Function1;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
@@ -29,10 +29,10 @@ import java.util.Collection;
import java.util.List;
public class FilteringScope implements JetScope {
@NotNull private final JetScope workerScope;
@NotNull private final Predicate<DeclarationDescriptor> predicate;
private final JetScope workerScope;
private final Function1<DeclarationDescriptor, Boolean> predicate;
public FilteringScope(@NotNull JetScope workerScope, @NotNull Predicate<DeclarationDescriptor> predicate) {
public FilteringScope(@NotNull JetScope workerScope, @NotNull Function1<DeclarationDescriptor, Boolean> predicate) {
this.workerScope = workerScope;
this.predicate = predicate;
}
@@ -40,7 +40,7 @@ public class FilteringScope implements JetScope {
@NotNull
@Override
public Collection<FunctionDescriptor> getFunctions(@NotNull Name name) {
return Collections2.filter(workerScope.getFunctions(name), predicate);
return KotlinPackage.filter(workerScope.getFunctions(name), predicate);
}
@NotNull
@@ -51,7 +51,7 @@ public class FilteringScope implements JetScope {
@Nullable
private <D extends DeclarationDescriptor> D filterDescriptor(@Nullable D descriptor) {
return descriptor != null && predicate.apply(descriptor) ? descriptor : null;
return descriptor != null && predicate.invoke(descriptor) ? descriptor : null;
}
@Nullable
@@ -68,7 +68,7 @@ public class FilteringScope implements JetScope {
@NotNull
@Override
public Collection<VariableDescriptor> getProperties(@NotNull Name name) {
return Collections2.filter(workerScope.getProperties(name), predicate);
return KotlinPackage.filter(workerScope.getProperties(name), predicate);
}
@Override
@@ -79,7 +79,7 @@ public class FilteringScope implements JetScope {
@NotNull
@Override
public Collection<DeclarationDescriptor> getAllDescriptors() {
return Collections2.filter(workerScope.getAllDescriptors(), predicate);
return KotlinPackage.filter(workerScope.getAllDescriptors(), predicate);
}
@NotNull
@@ -91,13 +91,13 @@ public class FilteringScope implements JetScope {
@NotNull
@Override
public Collection<DeclarationDescriptor> getDeclarationsByLabel(@NotNull Name labelName) {
return Collections2.filter(workerScope.getDeclarationsByLabel(labelName), predicate);
return KotlinPackage.filter(workerScope.getDeclarationsByLabel(labelName), predicate);
}
@NotNull
@Override
public Collection<DeclarationDescriptor> getOwnDeclaredDescriptors() {
return Collections2.filter(workerScope.getOwnDeclaredDescriptors(), predicate);
return KotlinPackage.filter(workerScope.getOwnDeclaredDescriptors(), predicate);
}
@TestOnly
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.java
+6 -8
View File
@@ -16,9 +16,7 @@
package org.jetbrains.jet.lang.resolve.scopes;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.Collections2;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor;
@@ -31,8 +29,6 @@ import java.util.Collections;
import java.util.List;
public class InnerClassesScopeWrapper extends AbstractScopeAdapter {
private static final Predicate<Object> IS_CLASS = Predicates.instanceOf(ClassDescriptor.class);
private final JetScope actualScope;
public InnerClassesScopeWrapper(@NotNull JetScope actualScope) {
@@ -48,19 +44,21 @@ public class InnerClassesScopeWrapper extends AbstractScopeAdapter {
@Override
public ClassifierDescriptor getClassifier(@NotNull Name name) {
ClassifierDescriptor classifier = actualScope.getClassifier(name);
return IS_CLASS.apply(classifier) ? classifier : null;
return classifier instanceof ClassDescriptor ? classifier : null;
}
@NotNull
@Override
@SuppressWarnings("unchecked")
public Collection<DeclarationDescriptor> getDeclarationsByLabel(@NotNull Name labelName) {
return Collections2.filter(actualScope.getDeclarationsByLabel(labelName), IS_CLASS);
return (Collection) KotlinPackage.filterIsInstance(actualScope.getDeclarationsByLabel(labelName), ClassDescriptor.class);
}
@NotNull
@Override
@SuppressWarnings("unchecked")
public Collection<DeclarationDescriptor> getAllDescriptors() {
return Collections2.filter(actualScope.getAllDescriptors(), IS_CLASS);
return (Collection) KotlinPackage.filterIsInstance(actualScope.getAllDescriptors(), ClassDescriptor.class);
}
@NotNull
core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java
+12 -13
View File
@@ -16,14 +16,12 @@
package org.jetbrains.jet.lang.types;
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.intellij.util.Processor;
import kotlin.Function1;
import kotlin.KotlinPackage;
import kotlin.Unit;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
@@ -241,16 +239,16 @@ public class TypeUtils {
private static boolean unify(JetType withParameters, JetType expected) {
// T -> how T is used
final Map<TypeParameterDescriptor, Variance> parameters = Maps.newHashMap();
Processor<TypeParameterUsage> processor = new Processor<TypeParameterUsage>() {
Function1<TypeParameterUsage, Unit> processor = new Function1<TypeParameterUsage, Unit>() {
@Override
public boolean process(TypeParameterUsage parameterUsage) {
public Unit invoke(TypeParameterUsage parameterUsage) {
Variance howTheTypeIsUsedBefore = parameters.get(parameterUsage.typeParameterDescriptor);
if (howTheTypeIsUsedBefore == null) {
howTheTypeIsUsedBefore = Variance.INVARIANT;
}
parameters.put(parameterUsage.typeParameterDescriptor,
parameterUsage.howTheTypeParameterIsUsed.superpose(howTheTypeIsUsedBefore));
return true;
return Unit.INSTANCE$;
}
};
processAllTypeParameters(withParameters, Variance.INVARIANT, processor);
@@ -262,10 +260,10 @@ public class TypeUtils {
return constraintSystem.getStatus().isSuccessful();
}
private static void processAllTypeParameters(JetType type, Variance howThiTypeIsUsed, Processor<TypeParameterUsage> result) {
private static void processAllTypeParameters(JetType type, Variance howThisTypeIsUsed, Function1<TypeParameterUsage, Unit> result) {
ClassifierDescriptor descriptor = type.getConstructor().getDeclarationDescriptor();
if (descriptor instanceof TypeParameterDescriptor) {
result.process(new TypeParameterUsage((TypeParameterDescriptor)descriptor, howThiTypeIsUsed));
result.invoke(new TypeParameterUsage((TypeParameterDescriptor) descriptor, howThisTypeIsUsed));
}
for (TypeProjection projection : type.getArguments()) {
processAllTypeParameters(projection.getType(), projection.getProjectionKind(), result);
@@ -490,14 +488,15 @@ public class TypeUtils {
}
public static boolean dependsOnTypeParameters(@NotNull JetType type, @NotNull Collection<TypeParameterDescriptor> typeParameters) {
return dependsOnTypeConstructors(type, Collections2
.transform(typeParameters, new Function<TypeParameterDescriptor, TypeConstructor>() {
return dependsOnTypeConstructors(type, KotlinPackage.map(
typeParameters,
new Function1<TypeParameterDescriptor, TypeConstructor>() {
@Override
public TypeConstructor apply(@Nullable TypeParameterDescriptor typeParameterDescriptor) {
assert typeParameterDescriptor != null;
public TypeConstructor invoke(@NotNull TypeParameterDescriptor typeParameterDescriptor) {
return typeParameterDescriptor.getTypeConstructor();
}
}));
}
));
}
public static boolean dependsOnTypeConstructors(@NotNull JetType type, @NotNull Collection<TypeConstructor> typeParameterConstructors) {
core/descriptors/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
+11 -12
View File
@@ -19,7 +19,8 @@ package org.jetbrains.jet.renderer;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.Function;
import kotlin.Function1;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.descriptors.annotations.Annotated;
@@ -435,17 +436,15 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
@Override
public String visitArrayValue(ArrayValue value, Void data) {
return "{" +
StringUtil.join(
value.getValue(),
new Function<CompileTimeConstant<?>, String>() {
@Override
public String fun(CompileTimeConstant<?> constant) {
return renderConstant(constant);
}
},
", ") +
"}";
List<CompileTimeConstant<?>> elements = value.getValue();
if (elements.isEmpty()) return "{}";
List<String> renderedElements = KotlinPackage.map(elements, new Function1<CompileTimeConstant<?>, String>() {
@Override
public String invoke(CompileTimeConstant<?> constant) {
return renderConstant(constant);
}
});
return "{" + StringUtil.join(renderedElements, ", ") + "}";
}
@Override
core/util.runtime/src/org/jetbrains/jet/utils/functions.kt
+27
View File
@@ -0,0 +1,27 @@
/*
* Copyright 2010-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.jet.utils
private val IDENTITY: Function1<Any?, Any?> = { it }
suppress("UNCHECKED_CAST")
public fun <T> identity(): Function1<T, T> = IDENTITY as Function1<T, T>
private val ALWAYS_TRUE: Function1<Any?, Boolean> = { true }
public fun <T> alwaysTrue(): Function1<T, Boolean> = ALWAYS_TRUE