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

Temporary hack to migrate functions to package kotlin.jvm.functions

Browse Source 
Add a file in package 'kotlin.jvm.functions' to the project and replace
explicit imports of functions 'kotlin.Function{n}' to two imports 'kotlin.*'
and 'kotlin.jvm.functions.*', so that the codebase can be compiled both by the
old and by the new compiler
This commit is contained in:
Alexander Udalov
2015-04-23 22:00:04 +03:00
parent 7baa7a72e2
commit 738a84e259
123 changed files with 299 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java
+2 -1
View File
@@ -20,7 +20,8 @@ import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Sets;
import com.intellij.openapi.util.Pair;
import com.intellij.psi.tree.IElementType;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.Unit;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderOnDemand.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.jetbrains.kotlin.codegen;
import kotlin.Function0;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.storage.LockBasedStorageManager;
import org.jetbrains.kotlin.storage.NotNullLazyValue;
compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java
+2 -1
View File
@@ -18,7 +18,8 @@ package org.jetbrains.kotlin.codegen;
import com.google.common.collect.Lists;
import com.intellij.util.ArrayUtil;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.Unit;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
+2 -1
View File
@@ -24,7 +24,8 @@ import com.intellij.psi.tree.IElementType;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Function;
import com.intellij.util.containers.Stack;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import kotlin.Unit;
import org.jetbrains.annotations.NotNull;
compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
+2 -1
View File
@@ -21,7 +21,8 @@ import com.intellij.psi.PsiElement;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.backend.common.bridges.Bridge;
compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java
+2 -1
View File
@@ -20,7 +20,8 @@ import com.intellij.openapi.vfs.StandardFileSystems;
import com.intellij.openapi.vfs.VfsUtilCore;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializationBindings.java
+2 -1
View File
@@ -17,7 +17,8 @@
package org.jetbrains.kotlin.codegen;
import com.intellij.openapi.util.Pair;
import kotlin.Function3;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor;
compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+2 -1
View File
@@ -17,7 +17,8 @@
package org.jetbrains.kotlin.codegen;
import com.intellij.openapi.progress.ProcessCanceledException;
import kotlin.Function0;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.codegen.context.*;
compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java
+2 -1
View File
@@ -24,7 +24,8 @@ import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.ArrayUtil;
import com.intellij.util.SmartList;
import com.intellij.util.containers.ContainerUtil;
import kotlin.Function0;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.Mutable;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java
+2 -1
View File
@@ -17,7 +17,8 @@
package org.jetbrains.kotlin.codegen;
import com.intellij.util.ArrayUtil;
import kotlin.Function0;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.codegen.context.FieldOwnerContext;
import org.jetbrains.kotlin.codegen.state.GenerationState;
compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java
+2 -1
View File
@@ -17,7 +17,8 @@
package org.jetbrains.kotlin.codegen;
import com.intellij.util.ArrayUtil;
import kotlin.Function0;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.codegen.context.CodegenContext;
import org.jetbrains.kotlin.codegen.context.MethodContext;
compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java
+2 -1
View File
@@ -17,7 +17,8 @@
package org.jetbrains.kotlin.codegen;
import com.intellij.psi.tree.IElementType;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.Unit;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java
+2 -1
View File
@@ -20,7 +20,8 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.TokenSet;
import com.intellij.util.containers.Stack;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.cfg.WhenChecker;
compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.jetbrains.kotlin.codegen.context;
import kotlin.Function0;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.codegen.*;
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java
+2 -1
View File
@@ -18,7 +18,8 @@ package org.jetbrains.kotlin.codegen.inline;
import com.intellij.openapi.util.Pair;
import com.intellij.util.ArrayUtil;
import kotlin.Function0;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.codegen.AsmUtil;
import org.jetbrains.kotlin.codegen.ClassBuilder;
compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegenUtil.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.jetbrains.kotlin.codegen.when;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.codegen.ExpressionCodegen;
compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java
+2 -1
View File
@@ -22,7 +22,8 @@ import com.intellij.psi.PsiErrorElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiModifierListOwner;
import com.intellij.psi.util.PsiFormatUtil;
import kotlin.Function0;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.analyzer.AnalysisResult;
compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java
+4 -2
View File
@@ -24,8 +24,10 @@ import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.Function;
import com.intellij.util.SmartList;
import com.intellij.util.containers.ContainerUtil;
import kotlin.Function0;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.Unit;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java
+2 -1
View File
@@ -27,7 +27,8 @@ import com.intellij.openapi.vfs.VirtualFileManager;
import com.intellij.openapi.vfs.VirtualFileSystem;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.Unit;
import kotlin.io.IoPackage;
import org.jetbrains.annotations.NotNull;
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
+4 -2
View File
@@ -21,8 +21,10 @@ import com.google.common.collect.Maps;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.util.Disposer;
import com.intellij.util.ArrayUtil;
import kotlin.Function0;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.Unit;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassImpl.java
+2 -1
View File
@@ -18,7 +18,8 @@ package org.jetbrains.kotlin.load.java.structure.impl;
import com.intellij.psi.*;
import com.intellij.psi.impl.PsiSubstitutorImpl;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java
+2 -1
View File
@@ -18,7 +18,8 @@ package org.jetbrains.kotlin.load.java.structure.impl;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.load.java.structure.*;
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/FileBasedKotlinClass.java
+2 -1
View File
@@ -17,7 +17,8 @@
package org.jetbrains.kotlin.load.kotlin;
import com.intellij.openapi.util.Ref;
import kotlin.Function3;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.load.java.JvmAnnotationNames;
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java
+2 -1
View File
@@ -37,7 +37,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.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.name.ClassId;
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java
+2 -1
View File
@@ -21,7 +21,8 @@ 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.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java
+4 -2
View File
@@ -22,8 +22,10 @@ import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.SmartFMap;
import com.intellij.util.containers.ContainerUtil;
import kotlin.Function0;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java
+4 -2
View File
@@ -22,8 +22,10 @@ import com.google.common.collect.Sets;
import com.intellij.psi.PsiElement;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.PsiTreeUtil;
import kotlin.Function1;
import kotlin.Function3;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.Unit;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/frontend/src/org/jetbrains/kotlin/cfg/TailRecursionDetector.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.jetbrains.kotlin.cfg;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction;
import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult;
compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.java
+2 -1
View File
@@ -18,7 +18,8 @@ package org.jetbrains.kotlin.cfg.pseudocode;
import com.google.common.collect.*;
import com.intellij.util.containers.BidirectionalMap;
import kotlin.Function0;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java
+2 -1
View File
@@ -17,7 +17,8 @@
package org.jetbrains.kotlin.diagnostics.rendering;
import com.intellij.openapi.extensions.ExtensionPointName;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassBody.java
+2 -1
View File
@@ -20,7 +20,8 @@ import com.google.common.collect.Lists;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElement;
import com.intellij.psi.tree.TokenSet;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java
+2 -1
View File
@@ -26,7 +26,8 @@ import com.intellij.psi.PsiClassOwner;
import com.intellij.psi.PsiElementVisitor;
import com.intellij.psi.stubs.StubElement;
import com.intellij.psi.util.PsiTreeUtil;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationResolver.java
+2 -1
View File
@@ -18,7 +18,8 @@ package org.jetbrains.kotlin.resolve;
import com.google.common.collect.Lists;
import com.intellij.openapi.util.Pair;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java
+2 -1
View File
@@ -20,7 +20,8 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.intellij.psi.PsiElement;
import com.intellij.util.containers.Queue;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.descriptors.*;
compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.java
+2 -1
View File
@@ -19,7 +19,8 @@ package org.jetbrains.kotlin.resolve;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import kotlin.Function3;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java
+2 -1
View File
@@ -21,7 +21,8 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElement;
import kotlin.Function0;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java
+2 -1
View File
@@ -25,7 +25,8 @@ import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.LinkedMultiMap;
import com.intellij.util.containers.MultiMap;
import com.intellij.util.containers.hash.EqualityPolicy;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.Unit;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java
+2 -1
View File
@@ -19,7 +19,8 @@ package org.jetbrains.kotlin.resolve;
import com.google.common.base.Function;
import com.google.common.base.Functions;
import com.google.common.collect.Maps;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.descriptors.*;
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.java
+2 -1
View File
@@ -20,7 +20,8 @@ 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 kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastUtils.java
+2 -1
View File
@@ -18,7 +18,8 @@ package org.jetbrains.kotlin.resolve.calls.smartcasts;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTask.java
+2 -1
View File
@@ -17,7 +17,8 @@
package org.jetbrains.kotlin.resolve.calls.tasks;
import com.google.common.collect.Lists;
import kotlin.Function0;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.descriptors.CallableDescriptor;
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java
+2 -1
View File
@@ -20,7 +20,8 @@ import com.google.common.collect.Lists;
import com.intellij.openapi.project.Project;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.ReadOnly;
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ScopeProvider.java
+4 -2
View File
@@ -17,8 +17,10 @@
package org.jetbrains.kotlin.resolve.lazy;
import com.intellij.psi.PsiElement;
import kotlin.Function0;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.descriptors.PackageViewDescriptor;
import org.jetbrains.kotlin.name.FqName;
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractDeclarationProviderFactory.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.jetbrains.kotlin.resolve.lazy.declarations;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.name.FqName;
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java
+2 -1
View File
@@ -21,7 +21,8 @@ import com.google.common.collect.Collections2;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
import kotlin.Function0;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.name.FqName;
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java
+4 -2
View File
@@ -21,8 +21,10 @@ import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiNameIdentifierOwner;
import kotlin.Function0;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import kotlin.Unit;
import org.jetbrains.annotations.Mutable;
compiler/frontend/src/org/jetbrains/kotlin/storage/LazyResolveStorageManager.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.jetbrains.kotlin.storage;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.resolve.BindingTrace;
compiler/frontend/src/org/jetbrains/kotlin/types/DeferredType.java
+4 -2
View File
@@ -16,8 +16,10 @@
package org.jetbrains.kotlin.types;
import kotlin.Function0;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.resolve.BindingTrace;
import org.jetbrains.kotlin.storage.NotNullLazyValue;
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java
+4 -2
View File
@@ -21,8 +21,10 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.TokenSet;
import com.intellij.psi.util.PsiTreeUtil;
import kotlin.Function0;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/SlicedMap.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.jetbrains.kotlin.util.slicedMap;
import kotlin.Function3;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import java.util.Collection;
compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/SlicedMapImpl.java
+2 -1
View File
@@ -22,7 +22,8 @@ import com.google.common.collect.Multimap;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.UserDataHolder;
import gnu.trove.THashMap;
import kotlin.Function3;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import java.util.Collection;
compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/TrackingSlicedMap.java
+2 -1
View File
@@ -18,7 +18,8 @@ package org.jetbrains.kotlin.util.slicedMap;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import kotlin.Function3;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.kotlin.utils.Printer;
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java
+2 -1
View File
@@ -38,7 +38,8 @@ import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.testFramework.LightVirtualFile;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.Stack;
import kotlin.Function0;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.codegen.CompilationErrorHandler;
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java
+2 -1
View File
@@ -37,7 +37,8 @@ import com.intellij.psi.util.CachedValuesManager;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.IncorrectOperationException;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java
+2 -1
View File
@@ -28,7 +28,8 @@ import com.intellij.psi.scope.PsiScopeProcessor;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java
+2 -1
View File
@@ -33,7 +33,8 @@ import com.intellij.psi.stubs.StubElement;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.PathUtil;
import com.intellij.util.SmartList;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.jetbrains.kotlin.serialization;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
compiler/serialization/src/org/jetbrains/kotlin/serialization/Interner.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.jetbrains.kotlin.serialization;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/tests/org/jetbrains/kotlin/cfg/AbstractControlFlowTest.java
+2 -1
View File
@@ -16,7 +16,8 @@
package org.jetbrains.kotlin.cfg;
import kotlin.Function3;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeImpl;
compiler/tests/org/jetbrains/kotlin/cfg/AbstractDataFlowTest.java
+2 -1
View File
@@ -18,7 +18,8 @@ package org.jetbrains.kotlin.cfg;
import com.google.common.collect.Lists;
import com.intellij.openapi.util.text.StringUtil;
import kotlin.Function3;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeImpl;
import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction;
compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java
+2 -1
View File
@@ -18,7 +18,8 @@ package org.jetbrains.kotlin.cfg;
import com.google.common.collect.Sets;
import com.intellij.openapi.util.text.StringUtil;
import kotlin.Function3;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.analyzer.AnalysisResult;
compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java
+2 -1
View File
@@ -22,7 +22,8 @@ import com.google.common.collect.Sets;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java
+2 -1
View File
@@ -28,7 +28,8 @@ import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java
+2 -1
View File
@@ -26,7 +26,8 @@ import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import kotlin.text.Regex;
import kotlin.text.MatchResult;
compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java
+2 -1
View File
@@ -19,7 +19,8 @@ package org.jetbrains.kotlin.parsing;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import junit.framework.TestCase;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import org.jetbrains.annotations.NotNull;
import org.junit.Assert;
compiler/tests/org/jetbrains/kotlin/storage/StorageManagerTest.java
+4 -2
View File
@@ -17,8 +17,10 @@
package org.jetbrains.kotlin.storage;
import junit.framework.TestCase;
import kotlin.Function0;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.Unit;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java
+2 -1
View File
@@ -38,7 +38,8 @@ import com.intellij.util.Function;
import com.intellij.util.Processor;
import com.intellij.util.containers.ContainerUtil;
import junit.framework.TestCase;
import kotlin.Function1;
import kotlin.jvm.functions.*;
import kotlin.*;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;