diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/MutableDataFlowInfoForArguments.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/MutableDataFlowInfoForArguments.java index 9f89dbcf905..273eb529af2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/MutableDataFlowInfoForArguments.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/MutableDataFlowInfoForArguments.java @@ -35,9 +35,7 @@ public interface MutableDataFlowInfoForArguments extends DataFlowInfoForArgument } @Override - public void updateInfo( - @NotNull ValueArgument valueArgument, @NotNull DataFlowInfo dataFlowInfo - ) { + public void updateInfo(@NotNull ValueArgument valueArgument, @NotNull DataFlowInfo dataFlowInfo) { throw new IllegalStateException(); } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/CompositePackageFragmentProvider.kt b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/CompositePackageFragmentProvider.kt index 760d2874ee7..cd9c52a5fa3 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/CompositePackageFragmentProvider.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/CompositePackageFragmentProvider.kt @@ -22,6 +22,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName import java.util.* import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.jet.utils.toReadOnlyList public class CompositePackageFragmentProvider(// can be modified from outside private val providers: List) : PackageFragmentProvider { @@ -31,8 +32,7 @@ public class CompositePackageFragmentProvider(// can be modified from outside for (provider in providers) { result.addAll(provider.getPackageFragments(fqName)) } - result.trimToSize() - return result + return result.toReadOnlyList() } override fun getSubPackagesOf(fqName: FqName, nameFilter: (Name) -> Boolean): Collection {