diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java index 0090e24d06c..e28c6f2c162 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java @@ -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; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderOnDemand.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderOnDemand.java index 02ca56c4bc9..a8193b693c1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderOnDemand.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderOnDemand.java @@ -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; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java index 00d59916e42..d914a54d45a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java @@ -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; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index 13165efe0c9..20b5a5a7494 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -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; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java index ffc855931bc..96392f92e71 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java @@ -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; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java index 660db46c628..c145c0880f9 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java @@ -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; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializationBindings.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializationBindings.java index 35c6c550854..b4ec2044856 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializationBindings.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializationBindings.java @@ -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; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java index b355b4094ed..e9d91c84bc1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java @@ -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.*; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java index 24ec6a75566..73918a559c3 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java @@ -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; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java index 5c7b9c0d92f..3f4601651ac 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java @@ -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; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java index a3dd41c6f4c..94c7de38df9 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java @@ -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; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java index c860d078e6d..90255122b85 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java @@ -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; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java index 91eca199be0..11293f13800 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java @@ -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; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java index 5430b876ef8..81f486d69b4 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java @@ -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.*; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java index b81ec3c3e4f..6d9f8f2deea 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java @@ -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; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegenUtil.java index eba9caf3e4b..a220b52b83e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegenUtil.java @@ -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; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java index 79adc22fcfe..8177bb909cc 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java @@ -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; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java index e46ad6a7fce..5aa16834684 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java @@ -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; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java index 1a60097c163..4e3ba3a3936 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java @@ -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; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java index f871ed2f644..856142cec30 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java @@ -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; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassImpl.java index 943db6edf7f..e99ebf8e879 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassImpl.java @@ -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; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java index 4b418f75dc7..d645ec84310 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java @@ -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.*; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/FileBasedKotlinClass.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/FileBasedKotlinClass.java index b0f6c2c5f7e..6bf78e8e995 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/FileBasedKotlinClass.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/FileBasedKotlinClass.java @@ -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; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java index 70d09e12f26..1f2013e5098 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java @@ -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; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java index 9d2adf882d6..8c83d904ec5 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java index d2cacdcdd3f..e1b0636f408 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java index 0e4225cafb4..ac5382e06cb 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/TailRecursionDetector.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/TailRecursionDetector.java index 40d944bca43..97f6e989b57 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/TailRecursionDetector.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/TailRecursionDetector.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.java index d9d30cb1ad7..b2679e6eed8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java index f397785ca6a..8ce8aa17842 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassBody.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassBody.java index 8d0333fab0d..33c570b473f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassBody.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassBody.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java index 17e7db9f593..6d4679614bb 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationResolver.java index 0e745c4bdb8..cd8a13a3e01 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationResolver.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java index e8146d6d5b8..994705284d0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java @@ -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.*; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.java index b45e7b9f3d7..1374f13f7c5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index 726dd77c7c3..bccbe1d6086 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java index 41d34a7b788..99c4fe03313 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java index 234043bf145..34434f8f7b3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java @@ -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.*; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.java index 4d2ef1dbb03..206e659b564 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastUtils.java index 24e818c6c09..d50c2950844 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastUtils.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTask.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTask.java index 0a0b8dc9910..b35afccf9e3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTask.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTask.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java index dc811feea19..876170cfe40 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ScopeProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ScopeProvider.java index 3f177d4bbdd..44f37a70896 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ScopeProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ScopeProvider.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractDeclarationProviderFactory.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractDeclarationProviderFactory.java index 5f97e56db6b..8d149ea62aa 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractDeclarationProviderFactory.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractDeclarationProviderFactory.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java index 7f00db122fe..9f3ae59172c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java index 6756f3a14fd..8ddbf157612 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/storage/LazyResolveStorageManager.java b/compiler/frontend/src/org/jetbrains/kotlin/storage/LazyResolveStorageManager.java index 84b7aff8674..aab1d37a899 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/storage/LazyResolveStorageManager.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/storage/LazyResolveStorageManager.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/DeferredType.java b/compiler/frontend/src/org/jetbrains/kotlin/types/DeferredType.java index 77d34657eeb..8cd960702aa 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/DeferredType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/DeferredType.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java index 9571e76edf7..63d39612f06 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/SlicedMap.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/SlicedMap.java index affc58d0c67..8c24d7b1d53 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/SlicedMap.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/SlicedMap.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/SlicedMapImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/SlicedMapImpl.java index 5c0cdf24253..546e5660694 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/SlicedMapImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/SlicedMapImpl.java @@ -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; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/TrackingSlicedMap.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/TrackingSlicedMap.java index 5da6902e2c0..11531ddaa5c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/TrackingSlicedMap.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/TrackingSlicedMap.java @@ -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; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java index 17c332a351d..d799a6877dc 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java @@ -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; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java index a4b53376456..73f6b406f6a 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java @@ -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; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java index e159be61633..af6e6cdfbdd 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java @@ -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; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java index df5d3495c90..0b139a897e0 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java @@ -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; diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java index 74cf8fa73f6..91fb43eb7eb 100644 --- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java +++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java @@ -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; diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/Interner.java b/compiler/serialization/src/org/jetbrains/kotlin/serialization/Interner.java index bad92821b79..92ed91020e6 100644 --- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/Interner.java +++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/Interner.java @@ -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; diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractControlFlowTest.java b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractControlFlowTest.java index 13e15c9e599..b90626c1bdd 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractControlFlowTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractControlFlowTest.java @@ -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; diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractDataFlowTest.java b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractDataFlowTest.java index 47b5d2ebf13..8b5877807b2 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractDataFlowTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractDataFlowTest.java @@ -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; diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java index 69b21b9d1af..7d84c99098e 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java @@ -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; diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java index e98f4ea1f2b..53e8298ae8d 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java @@ -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; diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java b/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java index 071b2a4559c..33ecbaab2c6 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java @@ -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; diff --git a/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java b/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java index eb6a0e33157..868f0809e27 100644 --- a/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java +++ b/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java @@ -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; diff --git a/compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java b/compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java index fd4a81063ca..88e77be569d 100644 --- a/compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java +++ b/compiler/tests/org/jetbrains/kotlin/parsing/JetCodeConformanceTest.java @@ -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; diff --git a/compiler/tests/org/jetbrains/kotlin/storage/StorageManagerTest.java b/compiler/tests/org/jetbrains/kotlin/storage/StorageManagerTest.java index 106d9bc40c5..a0a7642d2b0 100644 --- a/compiler/tests/org/jetbrains/kotlin/storage/StorageManagerTest.java +++ b/compiler/tests/org/jetbrains/kotlin/storage/StorageManagerTest.java @@ -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; diff --git a/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java b/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java index d233e20e8a9..4d1bcf6b327 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java @@ -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; diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java index f253d550d28..de66b1e1c4d 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java @@ -16,7 +16,8 @@ package org.jetbrains.kotlin.load.java.components; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java index f8ac9d28cb5..b88b58e8293 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java @@ -16,7 +16,8 @@ package org.jetbrains.kotlin.load.kotlin; -import kotlin.Function0; +import kotlin.jvm.functions.*; +import kotlin.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.ClassDescriptor; diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java index 86c2868d3d8..6d53b29d2d1 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java @@ -16,7 +16,8 @@ package org.jetbrains.kotlin.builtins; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java index 7185a69a15f..49d496a8416 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java @@ -16,7 +16,8 @@ package org.jetbrains.kotlin.descriptors.impl; -import kotlin.Function0; +import kotlin.jvm.functions.*; +import kotlin.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.name.Name; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java index eb607082c7f..c7ae5619a76 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java @@ -16,7 +16,8 @@ package org.jetbrains.kotlin.descriptors.impl; -import kotlin.Function0; +import kotlin.jvm.functions.*; +import kotlin.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java index a2b56c23665..6d90716fb19 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java @@ -16,8 +16,10 @@ package org.jetbrains.kotlin.descriptors.impl; -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.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererBuilder.java b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererBuilder.java index 34e9d4c83de..defefd57f4f 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererBuilder.java +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererBuilder.java @@ -16,7 +16,8 @@ package org.jetbrains.kotlin.renderer; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.name.FqName; diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java index 88cef9fd4ee..fac53648141 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java @@ -16,7 +16,8 @@ package org.jetbrains.kotlin.renderer; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java index c47f4438131..8078d48cb4e 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java @@ -16,7 +16,8 @@ package org.jetbrains.kotlin.resolve; -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; diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java index dd64f80974d..6e33cc56a7a 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java @@ -16,7 +16,8 @@ package org.jetbrains.kotlin.resolve; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.KotlinPackage; import kotlin.Unit; import kotlin.jvm.KotlinSignature; diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/CommonSupertypes.java b/core/descriptors/src/org/jetbrains/kotlin/types/CommonSupertypes.java index bb13a5fcc81..5255435f41c 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/CommonSupertypes.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/CommonSupertypes.java @@ -16,7 +16,8 @@ package org.jetbrains.kotlin.types; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java index e627df4508a..46c39185472 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java @@ -16,7 +16,8 @@ package org.jetbrains.kotlin.types; -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; diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java b/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java index d1de698e6c0..1df50397a0a 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java @@ -16,7 +16,8 @@ package org.jetbrains.kotlin.types; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.KotlinPackage; import kotlin.Unit; import org.jetbrains.annotations.NotNull; diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectProperties.java b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectProperties.java index df36559c784..b4e7bb165fc 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectProperties.java +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectProperties.java @@ -16,7 +16,8 @@ package kotlin.reflect.jvm.internal; -import kotlin.Function0; +import kotlin.jvm.functions.*; +import kotlin.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/util.runtime/src/kotlin/jvm/functions/_.kt b/core/util.runtime/src/kotlin/jvm/functions/_.kt new file mode 100644 index 00000000000..bc9a656ba77 --- /dev/null +++ b/core/util.runtime/src/kotlin/jvm/functions/_.kt @@ -0,0 +1,22 @@ +/* + * Copyright 2010-2015 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 kotlin.jvm.functions + +/** + * This is a hack to allow star import from the package [kotlin.jvm.functions] to allow to migrate functional types + */ +public object _ diff --git a/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java b/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java index 04578aa6006..7b40d09d825 100644 --- a/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java +++ b/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java @@ -16,8 +16,10 @@ package org.jetbrains.kotlin.storage; -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; diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/IdeDescriptorRenderers.java b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/IdeDescriptorRenderers.java index 3addc95f669..05ed6919d13 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/IdeDescriptorRenderers.java +++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/IdeDescriptorRenderers.java @@ -16,7 +16,8 @@ package org.jetbrains.kotlin.idea.util; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; import org.jetbrains.kotlin.renderer.NameShortness; diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java index 48f0c2a751e..49581c2b559 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java @@ -32,7 +32,8 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.stubs.PsiClassHolderFileStub; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.cls.ClsFormatException; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.java index d2a880dbdc4..94ee181c315 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.java @@ -21,7 +21,8 @@ import com.intellij.psi.util.CachedValue; import com.intellij.psi.util.CachedValueProvider; import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.util.PsiModificationTracker; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.stubindex.JetProbablyNothingFunctionShortNameIndex; diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetExpressionMover.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetExpressionMover.java index 39104a235af..8e60520c611 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetExpressionMover.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetExpressionMover.java @@ -24,7 +24,8 @@ import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.TextRange; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.core.refactoring.RefactoringPackage; diff --git a/idea/src/org/jetbrains/kotlin/idea/filters/JetExceptionFilter.java b/idea/src/org/jetbrains/kotlin/idea/filters/JetExceptionFilter.java index 46559f30067..bce395f351d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/filters/JetExceptionFilter.java +++ b/idea/src/org/jetbrains/kotlin/idea/filters/JetExceptionFilter.java @@ -23,7 +23,8 @@ import com.intellij.execution.filters.OpenFileHyperlinkInfo; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; 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.annotations.Nullable; diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/CustomLibraryDescriptorWithDeferredConfig.java b/idea/src/org/jetbrains/kotlin/idea/framework/CustomLibraryDescriptorWithDeferredConfig.java index 9e526fa2c67..927b42e2948 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/CustomLibraryDescriptorWithDeferredConfig.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/CustomLibraryDescriptorWithDeferredConfig.java @@ -31,7 +31,8 @@ import com.intellij.openapi.roots.ui.configuration.libraryEditor.LibraryEditor; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtils; diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/HierarchyUtils.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/HierarchyUtils.java index 5a28793fb28..cfc9166d604 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/HierarchyUtils.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/HierarchyUtils.java @@ -23,7 +23,8 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.util.ArrayUtil; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.util.ProjectRootsUtil; import org.jetbrains.kotlin.psi.*; diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallTreeStructure.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallTreeStructure.java index 0accad9dcb7..b09b22069e7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallTreeStructure.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallTreeStructure.java @@ -26,7 +26,8 @@ import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiReference; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.HashMap; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.asJava.LightClassUtil; diff --git a/idea/src/org/jetbrains/kotlin/idea/parameterInfo/JetFunctionParameterInfoHandler.java b/idea/src/org/jetbrains/kotlin/idea/parameterInfo/JetFunctionParameterInfoHandler.java index 110f08c5fba..d4ca6c5f70b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/parameterInfo/JetFunctionParameterInfoHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/parameterInfo/JetFunctionParameterInfoHandler.java @@ -30,7 +30,8 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.ui.Gray; import com.intellij.ui.JBColor; import com.intellij.util.ArrayUtil; -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; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionParametersFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionParametersFix.java index da81d38bfee..aec06773296 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionParametersFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionParametersFix.java @@ -23,7 +23,8 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.PsiReference; import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.psi.util.PsiTreeUtil; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.java index 8b05962609a..be8df10792e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralSignatureFix.java @@ -19,7 +19,8 @@ package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionParametersFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionParametersFix.java index 9c27a669997..ddf8ee3b825 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionParametersFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionParametersFix.java @@ -19,7 +19,8 @@ package org.jetbrains.kotlin.idea.quickfix; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.java index cc5329f535a..4ab7226e0f9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureProcessor.java @@ -28,7 +28,8 @@ import com.intellij.usageView.UsageInfo; import com.intellij.usageView.UsageViewDescriptor; import com.intellij.util.containers.HashSet; import com.intellij.util.containers.MultiMap; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.KotlinPackage; import kotlin.Pair; import org.jetbrains.annotations.NotNull; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java index 81ed3c045ed..76ef0455eff 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java @@ -39,7 +39,8 @@ import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashSet; import com.intellij.util.containers.MultiMap; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.KotlinPackage; import kotlin.Unit; import org.jetbrains.annotations.NotNull; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.java index 6cb159b1fc3..06ec4034043 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.java @@ -23,7 +23,8 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.containers.ContainerUtil; import gnu.trove.TIntArrayList; import gnu.trove.TIntProcedure; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.KotlinPackage; import kotlin.Pair; import kotlin.Unit; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java index 8bfd8633e4b..6af65e98f20 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java @@ -42,7 +42,8 @@ import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.refactoring.util.RefactoringMessageDialog; import com.intellij.util.Function; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.KotlinPackage; import kotlin.Pair; import org.jetbrains.annotations.NotNull; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java index 68e65689239..0ddf83162f6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java @@ -24,8 +24,10 @@ import com.intellij.ui.TitledSeparator; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; -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.kotlin.idea.JetFileType; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinParameterTablePanel.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinParameterTablePanel.java index 132c4a8834a..bb6a438e477 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinParameterTablePanel.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinParameterTablePanel.java @@ -25,7 +25,8 @@ import com.intellij.ui.table.JBTable; import com.intellij.util.Function; import com.intellij.util.ui.AbstractTableCellEditor; import com.intellij.util.ui.EditableModel; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.KotlinPackage; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java index b1ab70a611b..8627785bac7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java @@ -35,8 +35,10 @@ import com.intellij.psi.search.SearchScope; import com.intellij.refactoring.introduce.inplace.InplaceVariableIntroducer; import com.intellij.ui.NonFocusableCheckBox; import com.intellij.util.ui.PositionTracker; -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; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java index 336ea132fdb..2c0201fb845 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java @@ -30,7 +30,8 @@ import com.intellij.psi.PsiWhiteSpace; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.HelpID; import com.intellij.refactoring.introduce.inplace.OccurrencesChooser; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.KotlinPackage; import kotlin.Unit; import org.jetbrains.annotations.NotNull; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java index cf950cda473..e420f7ac095 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java @@ -49,8 +49,10 @@ import com.intellij.ui.ReferenceEditorComboWithBrowseButton; import com.intellij.util.IncorrectOperationException; import com.intellij.util.text.UniqueNameGenerator; import com.intellij.util.ui.UIUtil; -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; diff --git a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java index ddb749042fb..886c1592e2d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java +++ b/idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java @@ -36,7 +36,8 @@ import com.intellij.openapi.util.WriteExternalException; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiMethod; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.KotlinPackage; import org.jdom.Element; import org.jetbrains.annotations.NotNull; diff --git a/idea/src/org/jetbrains/kotlin/idea/util/DebuggerUtils.java b/idea/src/org/jetbrains/kotlin/idea/util/DebuggerUtils.java index 2b2c3be3fed..d2164c2efc6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/util/DebuggerUtils.java +++ b/idea/src/org/jetbrains/kotlin/idea/util/DebuggerUtils.java @@ -24,7 +24,8 @@ import com.intellij.openapi.roots.libraries.LibraryUtil; import com.intellij.psi.PsiElement; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiTreeUtil; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.KotlinPackage; import kotlin.Pair; import org.jetbrains.annotations.NotNull; diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/after/a/X.java b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/after/a/X.java index aadb4fa2a30..96eb0e128f2 100644 --- a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/after/a/X.java +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/after/a/X.java @@ -1,6 +1,7 @@ package a; -import kotlin.Function0; +import kotlin.jvm.functions.*; +import kotlin.*; public class X { private A outer; @@ -9,4 +10,4 @@ public class X { this.outer = outer; System.out.println(f.invoke()); } -} \ No newline at end of file +} diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/after/a/main.java b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/after/a/main.java index af2554f460e..b9561027dd5 100644 --- a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/after/a/main.java +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/after/a/main.java @@ -1,6 +1,7 @@ package a; -import kotlin.Function0; +import kotlin.jvm.functions.*; +import kotlin.*; public class A { -} \ No newline at end of file +} diff --git a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/before/a/main.java b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/before/a/main.java index 1755e2b24d4..49f1e8576ee 100644 --- a/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/before/a/main.java +++ b/idea/testData/refactoring/move/java/moveClass/moveInnerToTop/moveNestedClassToTopLevelInTheSamePackageAndAddOuterInstanceWithLambda/before/a/main.java @@ -1,6 +1,7 @@ package a; -import kotlin.Function0; +import kotlin.jvm.functions.*; +import kotlin.*; public class A { public class X { @@ -8,4 +9,4 @@ public class A { System.out.println(f.invoke()); } } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java index f1325156a3f..e2eb5989651 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java @@ -25,7 +25,8 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.ArrayUtil; import com.siyeh.ig.bugs.StaticCallOnSubclassInspection; import com.siyeh.ig.bugs.StaticFieldReferenceOnSubclassInspection; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.KotlinPackage; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.KotlinDaemonAnalyzerTestCase; diff --git a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java index acf605e2d81..d41dd4b3510 100644 --- a/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java +++ b/idea/tests/org/jetbrains/kotlin/findUsages/AbstractJetFindUsagesTest.java @@ -45,7 +45,8 @@ import com.intellij.usages.rules.UsageFilteringRule; import com.intellij.usages.rules.UsageGroupingRule; import com.intellij.util.ArrayUtil; import com.intellij.util.CommonProcessors; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.java b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.java index fb03276a079..cd827403ea8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractOverrideImplementTest.java @@ -27,7 +27,8 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.testFramework.LightProjectDescriptor; 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; diff --git a/idea/tests/org/jetbrains/kotlin/idea/filters/JetExceptionFilterTest.java b/idea/tests/org/jetbrains/kotlin/idea/filters/JetExceptionFilterTest.java index 0ea5a599edd..124be673d50 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/filters/JetExceptionFilterTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/filters/JetExceptionFilterTest.java @@ -28,7 +28,8 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.refactoring.MultiFileTestCase; import com.intellij.testFramework.PsiTestUtil; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.name.FqName; diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java index a23b5d30a44..38bdffb6e65 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java @@ -28,7 +28,8 @@ import com.intellij.refactoring.BaseRefactoringProcessor; import com.intellij.util.PathUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.Convertor; -import kotlin.Function0; +import kotlin.jvm.functions.*; +import kotlin.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils; import org.jetbrains.kotlin.idea.test.KotlinCodeInsightTestCase; diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java index b7e0e4a699a..952d4892840 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java @@ -26,7 +26,8 @@ import com.intellij.lang.Language; import com.intellij.openapi.editor.Editor; import com.intellij.psi.PsiElement; import com.intellij.testFramework.UsefulTestCase; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java index 5e7e5b27181..115a6cee32d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java @@ -28,7 +28,8 @@ import com.intellij.psi.PsiFile; import com.intellij.util.ArrayUtil; import com.intellij.util.ui.UIUtil; import junit.framework.ComparisonFailure; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils; diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiFileHighlightingTest.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiFileHighlightingTest.java index 28566513ef9..67c018d86c4 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiFileHighlightingTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiFileHighlightingTest.java @@ -28,7 +28,8 @@ import com.intellij.psi.impl.source.tree.TreeUtil; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.UsageSearchContext; import com.intellij.testFramework.ExpectedHighlightingData; -import kotlin.Function0; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.test.AstAccessControl; diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java index a04c8b08eb1..ffc3280cf10 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java @@ -17,7 +17,8 @@ package org.jetbrains.kotlin.idea.stubs; import com.intellij.openapi.util.io.FileUtil; -import kotlin.Function0; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; diff --git a/idea/tests/org/jetbrains/kotlin/test/ReferenceUtils.java b/idea/tests/org/jetbrains/kotlin/test/ReferenceUtils.java index f47b8d266b8..dc9de97a193 100644 --- a/idea/tests/org/jetbrains/kotlin/test/ReferenceUtils.java +++ b/idea/tests/org/jetbrains/kotlin/test/ReferenceUtils.java @@ -22,7 +22,8 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiPackage; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.PathUtil; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java b/js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java index 05331ea05f8..3a0b550cce7 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java @@ -19,7 +19,8 @@ package org.jetbrains.kotlin.js.config; import com.google.common.collect.Lists; import com.intellij.openapi.project.Project; import com.intellij.util.SmartList; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java index bfdab426712..41b3d0f28d1 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java @@ -24,8 +24,10 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; import com.intellij.util.PathUtil; import com.intellij.util.io.URLUtil; -import kotlin.Function1; -import kotlin.Function2; +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; diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java index 85a15d2345c..91535f22a62 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java @@ -19,7 +19,8 @@ package org.jetbrains.kotlin.js.inline; import com.google.dart.compiler.backend.js.ast.*; import com.google.dart.compiler.backend.js.ast.metadata.MetadataPackage; import com.intellij.psi.PsiElement; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableDescriptor; diff --git a/libraries/examples/kotlin-java-example/src/test/java/test/kotlin/jtests/CollectionTest.java b/libraries/examples/kotlin-java-example/src/test/java/test/kotlin/jtests/CollectionTest.java index c1502a3c1e3..e6e5798f3ce 100644 --- a/libraries/examples/kotlin-java-example/src/test/java/test/kotlin/jtests/CollectionTest.java +++ b/libraries/examples/kotlin-java-example/src/test/java/test/kotlin/jtests/CollectionTest.java @@ -4,7 +4,8 @@ import static kotlin.KotlinPackage.*; import static kotlin.util.UtilPackage.*; import junit.framework.TestCase; -import kotlin.Function1; +import kotlin.jvm.functions.*; +import kotlin.*; import java.util.Collection; import java.util.List;