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

Fix fq names of moved facade classes in imports and other code occurrences

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-12-25 11:07:04 +03:00
parent f9944e28b0
commit b71b336a69
66 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java
+1 -1
View File
@@ -22,7 +22,7 @@ import com.intellij.psi.PsiFile;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.io.DataOutputStream;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen;
import com.google.common.collect.Lists;
import com.intellij.util.ArrayUtil;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
+1 -1
View File
@@ -24,7 +24,7 @@ import com.intellij.psi.tree.IElementType;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Function;
import com.intellij.util.containers.Stack;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionReferenceGenerationStrategy.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.codegen;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.codegen.state.GenerationState;
compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.psi.PsiElement;
import com.intellij.util.ArrayUtil;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.Unit;
import kotlin.jvm.functions.Function0;
import kotlin.jvm.functions.Function1;
compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java
+1 -1
View File
@@ -19,8 +19,8 @@ package org.jetbrains.kotlin.codegen;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import kotlin.text.StringsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.codegen.binding.CalculatedClosure;
compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.codegen;
import com.intellij.psi.tree.IElementType;
import kotlin.ArraysKt;
import kotlin.collections.ArraysKt;
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.Contract;
compiler/backend/src/org/jetbrains/kotlin/codegen/context/ScriptContext.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.codegen.context;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.codegen.FieldInfo;
compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethods.java
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.codegen.intrinsics;
import com.google.common.collect.ImmutableList;
import kotlin.StringsKt;
import kotlin.text.StringsKt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen.state;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.Pair;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/PlainTextMessageRenderer.java
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.cli.common.messages;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.util.LineSeparator;
import kotlin.StringsKt;
import kotlin.text.StringsKt;
import org.fusesource.jansi.Ansi;
import org.fusesource.jansi.internal.CLibrary;
import org.jetbrains.annotations.NotNull;
compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassImpl.java
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.load.java.structure.impl;
import com.intellij.psi.*;
import com.intellij.psi.impl.PsiSubstitutorImpl;
import kotlin.ArraysKt;
import kotlin.collections.ArraysKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.load.java.structure.impl;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.load.java.structure.*;
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java
+2 -2
View File
@@ -36,8 +36,8 @@ import com.intellij.util.ConcurrencyUtil;
import com.intellij.util.Query;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.messages.MessageBus;
import kotlin.ArraysKt;
import kotlin.CollectionsKt;
import kotlin.collections.ArraysKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus;
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.resolve.jvm.kotlinSignature;
import com.google.common.collect.Lists;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowProcessor.java
+2 -2
View File
@@ -22,8 +22,8 @@ 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.ArraysKt;
import kotlin.CollectionsKt;
import kotlin.collections.ArraysKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function0;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.java
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.cfg.pseudocode;
import com.google.common.collect.*;
import com.intellij.util.containers.BidirectionalMap;
import kotlin.MapsKt;
import kotlin.collections.MapsKt;
import kotlin.jvm.functions.Function0;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java
+1 -1
View File
@@ -23,7 +23,7 @@ import com.intellij.openapi.fileTypes.FileType;
import com.intellij.psi.*;
import com.intellij.psi.stubs.StubElement;
import com.intellij.psi.util.PsiTreeUtil;
import kotlin.ArraysKt;
import kotlin.collections.ArraysKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/frontend/src/org/jetbrains/kotlin/resolve/CompileTimeConstantUtils.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.resolve;
import kotlin.SetsKt;
import kotlin.collections.SetsKt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java
+2 -2
View File
@@ -20,9 +20,9 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.intellij.psi.PsiElement;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.Pair;
import kotlin.SetsKt;
import kotlin.collections.SetsKt;
import kotlin.jvm.functions.Function0;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzerForTopLevel.java
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.resolve;
import com.intellij.psi.PsiElement;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.descriptors.PackageFragmentProvider;
import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider;
compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.resolve;
import com.google.common.collect.Maps;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.descriptors.*;
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintsUtil.java
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.resolve.calls.inference;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastManager.java
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.resolve.calls.smartcasts;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/DiagnosticsWithSuppression.java
+1 -1
View File
@@ -20,7 +20,7 @@ import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.ModificationTracker;
import com.intellij.psi.PsiElement;
import com.intellij.util.containers.FilteringIterator;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.kotlin.diagnostics.Diagnostic;
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java
+2 -2
View File
@@ -21,7 +21,7 @@ import com.google.common.collect.Collections2;
import com.google.common.collect.Lists;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiNameIdentifierOwner;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.Unit;
import kotlin.jvm.functions.Function0;
import kotlin.jvm.functions.Function1;
@@ -64,7 +64,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import static kotlin.CollectionsKt.firstOrNull;
import static kotlin.collections.CollectionsKt.firstOrNull;
import static org.jetbrains.kotlin.diagnostics.Errors.CYCLIC_INHERITANCE_HIERARCHY;
import static org.jetbrains.kotlin.diagnostics.Errors.TYPE_PARAMETERS_IN_ENUM;
import static org.jetbrains.kotlin.resolve.BindingContext.TYPE;
compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.resolve.lazy.descriptors;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.descriptors.SupertypeLoopChecker;
import org.jetbrains.kotlin.descriptors.impl.AbstractLazyTypeParameterDescriptor;
compiler/frontend/src/org/jetbrains/kotlin/types/CastDiagnosticsUtil.java
+1 -1
View File
@@ -20,7 +20,7 @@ import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap;
compiler/frontend/src/org/jetbrains/kotlin/types/CommonSupertypes.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.types;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java
+1 -1
View File
@@ -21,7 +21,7 @@ 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.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function0;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtWrappingLightClass.java
+1 -1
View File
@@ -28,7 +28,7 @@ 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.ArraysKt;
import kotlin.collections.ArraysKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.serialization;
import com.google.protobuf.MessageLite;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/tests/org/jetbrains/kotlin/checkers/AbstractDiagnosticsTest.java
+1 -1
View File
@@ -22,7 +22,7 @@ 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.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java
+1 -1
View File
@@ -28,7 +28,7 @@ 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.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java
+1 -1
View File
@@ -20,7 +20,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.Pair;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.codegen;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Processor;
compiler/tests/org/jetbrains/kotlin/codegen/InnerClassInfoGenTest.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.codegen;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.serialization.builtins;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.containers.ContainerUtil;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java
+2 -2
View File
@@ -39,8 +39,8 @@ import com.intellij.util.Function;
import com.intellij.util.Processor;
import com.intellij.util.containers.ContainerUtil;
import junit.framework.TestCase;
import kotlin.CollectionsKt;
import kotlin.SetsKt;
import kotlin.collections.CollectionsKt;
import kotlin.collections.SetsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
compiler/util/src/org/jetbrains/kotlin/utils/Interner.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.utils;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java
+1 -1
View File
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil;
import javax.inject.Inject;
import java.util.*;
import static kotlin.SetsKt.setOf;
import static kotlin.collections.SetsKt.setOf;
import static org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader.Kind.*;
public final class DeserializedDescriptorResolver {
core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
+3 -3
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.builtins;
import kotlin.SetsKt;
import kotlin.collections.SetsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -41,8 +41,8 @@ import org.jetbrains.kotlin.types.checker.KotlinTypeChecker;
import java.io.InputStream;
import java.util.*;
import static kotlin.CollectionsKt.*;
import static kotlin.SetsKt.setOf;
import static kotlin.collections.CollectionsKt.*;
import static kotlin.collections.SetsKt.setOf;
import static org.jetbrains.kotlin.builtins.PrimitiveType.*;
import static org.jetbrains.kotlin.resolve.DescriptorUtils.getFqName;
core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.descriptors;
import kotlin.SetsKt;
import kotlin.collections.SetsKt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.resolve.DescriptorUtils;
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.descriptors.impl;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
core/descriptors/src/org/jetbrains/kotlin/name/FqNameUnsafe.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.name;
import kotlin.ArraysKt;
import kotlin.collections.ArraysKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.resolve;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.Mutable;
core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java
+2 -2
View File
@@ -43,8 +43,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
import static kotlin.CollectionsKt.emptyList;
import static kotlin.CollectionsKt.joinToString;
import static kotlin.collections.CollectionsKt.emptyList;
import static kotlin.collections.CollectionsKt.joinToString;
public class ErrorUtils {
core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java
+1 -1
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.types;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java
+1 -1
View File
@@ -36,7 +36,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.Set;
import static kotlin.CollectionsKt.single;
import static kotlin.collections.CollectionsKt.single;
public class TestGenerator {
idea/src/org/jetbrains/kotlin/idea/configuration/ui/notifications/ConfigureKotlinNotification.java
+1 -1
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.idea.configuration.ui.NonConfiguredKotlinProjectComp
import javax.swing.event.HyperlinkEvent;
import java.util.Collection;
import static kotlin.CollectionsKt.first;
import static kotlin.collections.CollectionsKt.first;
public class ConfigureKotlinNotification extends Notification {
private static final String TITLE = "Configure Kotlin";
idea/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.java
+2 -2
View File
@@ -42,8 +42,8 @@ import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiPackage;
import com.intellij.refactoring.listeners.RefactoringElementAdapter;
import com.intellij.refactoring.listeners.RefactoringElementListener;
import kotlin.ArraysKt;
import kotlin.CollectionsKt;
import kotlin.collections.ArraysKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
idea/src/org/jetbrains/kotlin/idea/run/KotlinTestNgConfigurationProducer.java
+1 -1
View File
@@ -33,7 +33,7 @@ import com.intellij.psi.util.PsiTreeUtil;
import com.theoryinpractice.testng.configuration.TestNGConfiguration;
import com.theoryinpractice.testng.configuration.TestNGConfigurationProducer;
import com.theoryinpractice.testng.util.TestNGUtil;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.asJava.LightClassUtil;
idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.java
+2 -2
View File
@@ -33,8 +33,8 @@ import com.intellij.util.CommonProcessors;
import com.intellij.util.indexing.FileBasedIndex;
import com.intellij.util.indexing.ID;
import com.intellij.util.indexing.ScalarIndexExtension;
import kotlin.ArraysKt;
import kotlin.CollectionsKt;
import kotlin.collections.ArraysKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.java
+1 -1
View File
@@ -25,7 +25,7 @@ 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.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.KotlinDaemonAnalyzerTestCase;
idea/tests/org/jetbrains/kotlin/findUsages/AbstractFindUsagesTest.java
+1 -1
View File
@@ -47,7 +47,7 @@ import com.intellij.usages.rules.UsageFilteringRule;
import com.intellij.usages.rules.UsageGroupingRule;
import com.intellij.util.ArrayUtil;
import com.intellij.util.CommonProcessors;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
idea/tests/org/jetbrains/kotlin/idea/caches/resolve/CustomModuleInfoTest.kt
+1 -1
View File
@@ -28,7 +28,7 @@ public class CustomModuleInfoTest : KotlinLightCodeInsightFixtureTestCase() {
fun testModuleInfoForMembersOfLightClassForDecompiledFile() {
//NOTE: any class with methods from stdlib will do
val collectionsKtClass = JavaPsiFacade.getInstance(project).findClass("kotlin.CollectionsKt", GlobalSearchScope.allScope(project))!!
val collectionsKtClass = JavaPsiFacade.getInstance(project).findClass("kotlin.collections.CollectionsKt", GlobalSearchScope.allScope(project))!!
val classModuleInfo = collectionsKtClass.getModuleInfo()
Assert.assertTrue(classModuleInfo is LibraryInfo)
val methods = collectionsKtClass.methods
idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractPositionManagerTest.java
+2 -2
View File
@@ -32,8 +32,8 @@ import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.testFramework.LightProjectDescriptor;
import com.sun.jdi.Location;
import com.sun.jdi.ReferenceType;
import kotlin.SequencesKt;
import kotlin.StringsKt;
import kotlin.sequences.SequencesKt;
import kotlin.text.StringsKt;
import kotlin.Unit;
import kotlin.io.FilesKt;
import kotlin.jvm.functions.Function1;
idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoTest.java
+1 -1
View File
@@ -26,7 +26,7 @@ import com.intellij.lang.Language;
import com.intellij.openapi.editor.Editor;
import com.intellij.psi.PsiElement;
import com.intellij.testFramework.UsefulTestCase;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java
+2 -2
View File
@@ -35,8 +35,8 @@ import com.intellij.util.ArrayUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.ui.UIUtil;
import junit.framework.ComparisonFailure;
import kotlin.ArraysKt;
import kotlin.CollectionsKt;
import kotlin.collections.ArraysKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.KotlinFileType;
idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java
+2 -2
View File
@@ -37,8 +37,8 @@ import com.intellij.psi.stubs.StubUpdatingIndex;
import com.intellij.rt.execution.junit.FileComparisonFailure;
import com.intellij.util.ArrayUtil;
import com.intellij.util.indexing.FileBasedIndex;
import kotlin.CollectionsKt;
import kotlin.StringsKt;
import kotlin.collections.CollectionsKt;
import kotlin.text.StringsKt;
import kotlin.io.FilesKt;
import kotlin.jvm.functions.Function1;
import org.apache.commons.lang.SystemUtils;
js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java
+1 -1
View File
@@ -19,7 +19,7 @@ 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.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.Unit;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ManglingUtils.java
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.translate.utils;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.backend.common.CodegenUtil;
libraries/examples/kotlin-java-example/src/test/java/test/kotlin/jtests/ArraysTest.java
+2 -2
View File
@@ -7,8 +7,8 @@ import kotlin.jvm.functions.Function1;
import java.util.Collection;
import java.util.List;
import static kotlin.CollectionsKt.*;
import static kotlin.ArraysKt.*;
import static kotlin.collections.CollectionsKt.*;
import static kotlin.collections.ArraysKt.*;
/**
* Lets try using the Kotlin standard library from Java code
libraries/examples/kotlin-java-example/src/test/java/test/kotlin/jtests/CollectionTest.java
+1 -1
View File
@@ -6,7 +6,7 @@ import kotlin.jvm.functions.Function1;
import java.util.Collection;
import java.util.List;
import static kotlin.CollectionsKt.*;
import static kotlin.collections.CollectionsKt.*;
/**
* Lets try using the Kotlin standard library from Java code
libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.maven;
import com.intellij.util.ArrayUtil;
import kotlin.StringsKt;
import kotlin.text.StringsKt;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.LifecyclePhase;
libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java
+1 -1
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.maven;
import com.intellij.util.ArrayUtil;
import com.sampullara.cli.Args;
import kotlin.CollectionsKt;
import kotlin.collections.CollectionsKt;
import kotlin.jvm.functions.Function1;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;