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

Dropping package facades: remove unused imports from package facades

Browse Source 
(not cleaned up automatically)
This commit is contained in:
Dmitry Petrov
2015-10-16 11:02:48 +03:00
parent 74cd449d86
commit 670b49ec5e
60 changed files with 14 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
-4
View File
@@ -97,15 +97,11 @@ import static org.jetbrains.kotlin.codegen.AsmUtil.*;
import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.couldUseDirectAccessToProperty;
import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isJvmInterface;
import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.*;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
import static org.jetbrains.kotlin.resolve.BindingContext.*;
import static org.jetbrains.kotlin.resolve.BindingContextUtils.*;
import static org.jetbrains.kotlin.resolve.DescriptorUtils.*;
import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCall;
import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCallWithAssert;
import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*;
import static org.jetbrains.kotlin.resolve.jvm.annotations.AnnotationUtilKt.hasJvmFieldAnnotation;
import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin;
import static org.jetbrains.org.objectweb.asm.Opcodes.*;
public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implements LocalLookup {
compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionReferenceGenerationStrategy.java
-1
View File
@@ -35,7 +35,6 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
import java.util.*;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
import static org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue.NO_RECEIVER;
public class FunctionReferenceGenerationStrategy extends FunctionGenerationStrategy.CodegenBased<FunctionDescriptor> {
compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
-1
View File
@@ -84,7 +84,6 @@ import static org.jetbrains.kotlin.resolve.BindingContextUtils.getDelegationCons
import static org.jetbrains.kotlin.resolve.BindingContextUtils.getNotNull;
import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration;
import static org.jetbrains.kotlin.resolve.DescriptorUtils.*;
import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCall;
import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.JAVA_STRING_TYPE;
import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE;
import static org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.NO_ORIGIN;
compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+1 -2
View File
@@ -43,9 +43,9 @@ import org.jetbrains.kotlin.resolve.constants.ConstantValue;
import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator;
import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt;
import org.jetbrains.kotlin.resolve.jvm.AsmTypes;
import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt;
import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue;
import org.jetbrains.kotlin.resolve.scopes.receivers.TransientReceiver;
import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt;
import org.jetbrains.kotlin.resolve.source.KotlinSourceElementKt;
import org.jetbrains.kotlin.storage.LockBasedStorageManager;
import org.jetbrains.kotlin.storage.NotNullLazyValue;
@@ -63,7 +63,6 @@ import static org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive;
import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.SYNTHESIZED;
import static org.jetbrains.kotlin.resolve.BindingContext.VARIABLE;
import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.PROPERTY_METADATA_TYPE;
import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin;
import static org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.NO_ORIGIN;
import static org.jetbrains.org.objectweb.asm.Opcodes.*;
compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java
-1
View File
@@ -60,7 +60,6 @@ import static org.jetbrains.kotlin.codegen.serialization.JvmSerializationBinding
import static org.jetbrains.kotlin.resolve.DescriptorUtils.*;
import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.PROPERTY_METADATA_TYPE;
import static org.jetbrains.kotlin.resolve.jvm.annotations.AnnotationUtilKt.hasJvmFieldAnnotation;
import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin;
import static org.jetbrains.org.objectweb.asm.Opcodes.*;
public class PropertyCodegen {
compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java
-1
View File
@@ -41,7 +41,6 @@ import java.util.Collections;
import static org.jetbrains.kotlin.codegen.AsmUtil.*;
import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE;
import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin;
import static org.jetbrains.org.objectweb.asm.Opcodes.*;
public class SamWrapperCodegen {
compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java
-1
View File
@@ -41,7 +41,6 @@ import java.util.List;
import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.CLASS_FOR_SCRIPT;
import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.asmTypeForScriptDescriptor;
import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE;
import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin;
import static org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.NO_ORIGIN;
import static org.jetbrains.org.objectweb.asm.Opcodes.*;
compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java
-1
View File
@@ -35,7 +35,6 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
import java.util.List;
import static org.jetbrains.kotlin.resolve.BindingContext.TAIL_RECURSION_CALL;
import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCall;
public class TailRecursionCodegen {
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java
-2
View File
@@ -50,8 +50,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import static org.jetbrains.kotlin.context.ContextPackage.ContextForNewModule;
public enum TopDownAnalyzerFacadeForJVM {
INSTANCE;
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/AlternativeFieldSignatureData.java
-2
View File
@@ -28,8 +28,6 @@ import org.jetbrains.kotlin.types.JetType;
import java.util.HashMap;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class AlternativeFieldSignatureData extends ElementAlternativeSignatureData {
private JetType altReturnType;
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/AlternativeMethodSignatureData.java
-1
View File
@@ -46,7 +46,6 @@ import java.util.Set;
import static org.jetbrains.kotlin.load.java.components.TypeUsage.MEMBER_SIGNATURE_CONTRAVARIANT;
import static org.jetbrains.kotlin.load.java.components.TypeUsage.UPPER_BOUND;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt.getBuiltIns;
public class AlternativeMethodSignatureData extends ElementAlternativeSignatureData {
compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java
-1
View File
@@ -64,7 +64,6 @@ import java.util.*;
import static org.jetbrains.kotlin.cfg.JetControlFlowBuilder.PredefinedOperation.*;
import static org.jetbrains.kotlin.diagnostics.Errors.*;
import static org.jetbrains.kotlin.lexer.JetTokens.*;
import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCall;
public class JetControlFlowProcessor {
compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java
+6 -5
View File
@@ -30,7 +30,10 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
import org.jetbrains.kotlin.cfg.PseudocodeVariablesData.VariableControlFlowState;
import org.jetbrains.kotlin.cfg.PseudocodeVariablesData.VariableUseState;
import org.jetbrains.kotlin.cfg.pseudocode.*;
import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue;
import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode;
import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeUtil;
import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeUtilsKt;
import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction;
import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor;
import org.jetbrains.kotlin.cfg.pseudocode.instructions.JetElementInstruction;
@@ -66,10 +69,8 @@ import static org.jetbrains.kotlin.cfg.PseudocodeVariablesData.VariableUseState.
import static org.jetbrains.kotlin.cfg.TailRecursionKind.*;
import static org.jetbrains.kotlin.cfg.pseudocodeTraverser.TraversalOrder.FORWARD;
import static org.jetbrains.kotlin.diagnostics.Errors.*;
import static org.jetbrains.kotlin.resolve.BindingContext.CAPTURED_IN_CLOSURE;
import static org.jetbrains.kotlin.resolve.BindingContext.IS_UNINITIALIZED;
import static org.jetbrains.kotlin.resolve.BindingContext.TAIL_RECURSION_CALL;
import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCall;
import static org.jetbrains.kotlin.diagnostics.Errors.UNREACHABLE_CODE;
import static org.jetbrains.kotlin.resolve.BindingContext.*;
import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE;
import static org.jetbrains.kotlin.types.TypeUtils.noExpectedType;
compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportsFactory.java
-2
View File
@@ -27,8 +27,6 @@ import org.jetbrains.kotlin.resolve.ImportPath;
import java.util.Collection;
import java.util.Map;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class JetImportsFactory {
@NotNull private final Project project;
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallTransformer.java
-2
View File
@@ -52,8 +52,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
/**
* CallTransformer treats specially 'variable as function' call case, other cases keeps unchanged (base realization).
*
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java
-1
View File
@@ -49,7 +49,6 @@ import java.util.Collections;
import java.util.List;
import static org.jetbrains.kotlin.diagnostics.Errors.*;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
import static org.jetbrains.kotlin.resolve.BindingContext.*;
import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.INDEPENDENT;
import static org.jetbrains.kotlin.types.TypeUtils.*;
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java
-1
View File
@@ -41,7 +41,6 @@ import java.util.ArrayList;
import java.util.List;
import static org.jetbrains.kotlin.diagnostics.Errors.*;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
import static org.jetbrains.kotlin.resolve.BindingContext.PROCESSED;
public class ExpressionTypingUtils {
compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java
-2
View File
@@ -36,8 +36,6 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public abstract class AbstractJetParsingTest extends ParsingTestCase {
static {
System.setProperty("idea.platform.prefix", "Idea");
compiler/tests/org/jetbrains/kotlin/psi/JetPsiUtilTest.java
-2
View File
@@ -33,8 +33,6 @@ import java.util.Collection;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class JetPsiUtilTest extends JetLiteFixture {
public void testUnquotedIdentifier() {
Assert.assertEquals("", JetPsiUtil.unquoteIdentifier(""));
compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java
-1
View File
@@ -95,7 +95,6 @@ import java.util.regex.Pattern;
import static org.jetbrains.kotlin.cli.jvm.config.JVMConfigurationKeys.MODULE_NAME;
import static org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil.compileKotlinToDirAndGetAnalysisResult;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
import static org.jetbrains.kotlin.test.ConfigurationKind.ALL;
public class JetTestUtils {
compiler/tests/org/jetbrains/kotlin/types/BoundsSubstitutorTest.java
-2
View File
@@ -33,8 +33,6 @@ import org.jetbrains.kotlin.test.ConfigurationKind;
import java.util.Collection;
import java.util.Collections;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class BoundsSubstitutorTest extends KotlinTestWithEnvironment {
@Override
protected KotlinCoreEnvironment createEnvironment() {
compiler/tests/org/jetbrains/kotlin/types/JetDefaultModalityModifiersTest.java
+1 -2
View File
@@ -43,8 +43,7 @@ import org.jetbrains.kotlin.tests.di.InjectionKt;
import java.util.Collections;
import java.util.List;
import static org.jetbrains.kotlin.frontend.di.DiPackage.createLazyResolveSession;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
import static org.jetbrains.kotlin.frontend.di.InjectionKt.createLazyResolveSession;
public class JetDefaultModalityModifiersTest extends JetLiteFixture {
private final JetDefaultModalityModifiersTestCase tc = new JetDefaultModalityModifiersTestCase();
compiler/tests/org/jetbrains/kotlin/types/JetOverloadTest.java
-2
View File
@@ -32,8 +32,6 @@ import org.jetbrains.kotlin.test.JetLiteFixture;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.tests.di.InjectionKt;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class JetOverloadTest extends JetLiteFixture {
private final ModuleDescriptor root = JetTestUtils.createEmptyModule("<test_root>");
compiler/tests/org/jetbrains/kotlin/types/JetOverridingTest.java
-2
View File
@@ -31,8 +31,6 @@ import org.jetbrains.kotlin.test.JetLiteFixture;
import org.jetbrains.kotlin.test.JetTestUtils;
import org.jetbrains.kotlin.tests.di.InjectionKt;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class JetOverridingTest extends JetLiteFixture {
private final ModuleDescriptor root = JetTestUtils.createEmptyModule("<test_root>");
compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java
-2
View File
@@ -53,8 +53,6 @@ import java.io.File;
import java.io.IOException;
import java.util.*;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class JetTypeCheckerTest extends JetLiteFixture {
private KotlinBuiltIns builtIns;
compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java
-2
View File
@@ -54,8 +54,6 @@ import java.io.IOException;
import java.util.Collections;
import java.util.Map;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
@SuppressWarnings("unchecked")
public class TypeSubstitutorTest extends KotlinTestWithEnvironment {
private JetScope scope;
compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java
-2
View File
@@ -45,8 +45,6 @@ import org.jetbrains.kotlin.tests.di.InjectionKt;
import java.util.Map;
import java.util.Set;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class TypeUnifierTest extends JetLiteFixture {
private Set<TypeConstructor> variables;
idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java
-1
View File
@@ -35,7 +35,6 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import static org.jetbrains.kotlin.idea.highlighter.renderersUtil.RenderersUtilPackage.renderStrong;
import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.RECEIVER_POSITION;
import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.VALUE_PARAMETER_POSITION;
idea/src/org/jetbrains/kotlin/idea/actions/JetAddFunctionToClassifierAction.java
-2
View File
@@ -45,8 +45,6 @@ import javax.swing.*;
import java.util.ArrayList;
import java.util.List;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
/**
* Changes method signature to one of provided signatures.
* Based on {@link KotlinAddImportAction}
idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/MoveDeclarationsOutHelper.java
+1 -3
View File
@@ -28,8 +28,8 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.descriptors.VariableDescriptor;
import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils;
import org.jetbrains.kotlin.idea.util.ShortenReferences;
import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers;
import org.jetbrains.kotlin.idea.util.ShortenReferences;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.resolve.BindingContext;
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode;
@@ -38,8 +38,6 @@ import org.jetbrains.kotlin.types.JetType;
import java.util.ArrayList;
import java.util.List;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class MoveDeclarationsOutHelper {
public static PsiElement[] move(@NotNull PsiElement container, @NotNull PsiElement[] statements, boolean generateDefaultInitializers) {
idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinNotSurrounder.java
-2
View File
@@ -32,8 +32,6 @@ import org.jetbrains.kotlin.psi.JetPsiFactoryKt;
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode;
import org.jetbrains.kotlin.types.JetType;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class KotlinNotSurrounder extends KotlinExpressionSurrounder {
@Override
public String getTemplateDescription() {
idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinParenthesesSurrounder.java
-2
View File
@@ -27,8 +27,6 @@ import org.jetbrains.kotlin.psi.JetExpression;
import org.jetbrains.kotlin.psi.JetParenthesizedExpression;
import org.jetbrains.kotlin.psi.JetPsiFactoryKt;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class KotlinParenthesesSurrounder extends KotlinExpressionSurrounder {
@Override
public String getTemplateDescription() {
idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java
-2
View File
@@ -25,8 +25,6 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.JetBundle;
import org.jetbrains.kotlin.psi.*;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class KotlinStringTemplateSurrounder extends KotlinExpressionSurrounder {
@Override
public String getTemplateDescription() {
idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java
-2
View File
@@ -31,8 +31,6 @@ import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode;
import org.jetbrains.kotlin.types.JetType;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class KotlinWhenSurrounder extends KotlinExpressionSurrounder {
@Override
public String getTemplateDescription() {
idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java
-2
View File
@@ -27,8 +27,6 @@ import org.jetbrains.kotlin.idea.codeInsight.surroundWith.KotlinSurrounderUtils;
import org.jetbrains.kotlin.idea.codeInsight.surroundWith.MoveDeclarationsOutHelper;
import org.jetbrains.kotlin.psi.*;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class KotlinFunctionLiteralSurrounder extends KotlinStatementsSurrounder {
@Nullable
@Override
idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinIfSurrounderBase.java
-2
View File
@@ -31,8 +31,6 @@ import org.jetbrains.kotlin.psi.JetExpression;
import org.jetbrains.kotlin.psi.JetIfExpression;
import org.jetbrains.kotlin.psi.JetPsiFactoryKt;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public abstract class KotlinIfSurrounderBase extends KotlinStatementsSurrounder {
@Nullable
idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinTrySurrounderBase.java
-2
View File
@@ -27,8 +27,6 @@ import org.jetbrains.kotlin.idea.codeInsight.surroundWith.KotlinSurrounderUtils;
import org.jetbrains.kotlin.idea.codeInsight.surroundWith.MoveDeclarationsOutHelper;
import org.jetbrains.kotlin.psi.*;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public abstract class KotlinTrySurrounderBase extends KotlinStatementsSurrounder {
@Nullable
idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinUnwrappers.java
-2
View File
@@ -22,8 +22,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.psi.*;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class KotlinUnwrappers {
private KotlinUnwrappers() {
}
idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetExpressionMover.java
-2
View File
@@ -34,8 +34,6 @@ import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt;
import java.util.List;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class JetExpressionMover extends AbstractJetUpDownMover {
private static final Predicate<JetElement> IS_CALL_EXPRESSION = new Predicate<JetElement>() {
idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionBodyFix.java
-2
View File
@@ -32,8 +32,6 @@ import org.jetbrains.kotlin.psi.JetFunction;
import org.jetbrains.kotlin.psi.JetPsiFactory;
import org.jetbrains.kotlin.psi.JetPsiFactoryKt;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class AddFunctionBodyFix extends JetIntentionAction<JetFunction> {
public AddFunctionBodyFix(@NotNull JetFunction element) {
super(element);
idea/src/org/jetbrains/kotlin/idea/quickfix/AddStarProjectionsFix.java
-2
View File
@@ -32,8 +32,6 @@ import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.types.expressions.TypeReconstructionUtil;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public abstract class AddStarProjectionsFix extends JetIntentionAction<JetUserType> {
private final int argumentCount;
idea/src/org/jetbrains/kotlin/idea/quickfix/AddWhenElseBranchFix.java
-2
View File
@@ -30,8 +30,6 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.idea.JetBundle;
import org.jetbrains.kotlin.psi.*;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class AddWhenElseBranchFix extends JetIntentionAction<JetWhenExpression> {
private static final String ELSE_ENTRY_TEXT = "else -> {}";
idea/src/org/jetbrains/kotlin/idea/quickfix/CastExpressionFix.java
-2
View File
@@ -36,8 +36,6 @@ import org.jetbrains.kotlin.types.FlexibleTypesKt;
import org.jetbrains.kotlin.types.JetType;
import org.jetbrains.kotlin.types.checker.JetTypeChecker;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class CastExpressionFix extends JetIntentionAction<JetExpression> {
private final JetType type;
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeAccessorTypeFix.java
-2
View File
@@ -30,8 +30,6 @@ import org.jetbrains.kotlin.idea.util.ShortenReferences;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.types.JetType;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class ChangeAccessorTypeFix extends JetIntentionAction<JetPropertyAccessor> {
private JetType type;
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionLiteralReturnTypeFix.java
-1
View File
@@ -47,7 +47,6 @@ import java.util.LinkedList;
import java.util.List;
import static org.jetbrains.kotlin.idea.project.PlatformKt.getPlatform;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class ChangeFunctionLiteralReturnTypeFix extends JetIntentionAction<JetFunctionLiteralExpression> {
private final JetType type;
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java
-1
View File
@@ -52,7 +52,6 @@ import java.util.List;
import static org.jetbrains.kotlin.diagnostics.Errors.COMPONENT_FUNCTION_RETURN_TYPE_MISMATCH;
import static org.jetbrains.kotlin.idea.project.PlatformKt.getPlatform;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt.getBuiltIns;
public class ChangeFunctionReturnTypeFix extends JetIntentionAction<JetFunction> {
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeParameterTypeFix.java
+1 -3
View File
@@ -23,14 +23,12 @@ import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.JetBundle;
import org.jetbrains.kotlin.idea.util.ShortenReferences;
import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers;
import org.jetbrains.kotlin.idea.util.ShortenReferences;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.types.JetType;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class ChangeParameterTypeFix extends JetIntentionAction<JetParameter> {
private final JetType type;
private final String containingDeclarationName;
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToFunctionInvocationFix.java
-2
View File
@@ -26,8 +26,6 @@ import org.jetbrains.kotlin.psi.JetExpression;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.JetPsiFactoryKt;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class ChangeToFunctionInvocationFix extends JetIntentionAction<JetExpression> {
public ChangeToFunctionInvocationFix(@NotNull JetExpression element) {
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToPropertyNameFix.java
-2
View File
@@ -26,8 +26,6 @@ import org.jetbrains.kotlin.idea.JetBundle;
import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
import org.jetbrains.kotlin.psi.*;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class ChangeToPropertyNameFix extends JetIntentionAction<JetSimpleNameExpression> {
public ChangeToPropertyNameFix(@NotNull JetSimpleNameExpression element) {
super(element);
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToStarProjectionFix.java
-2
View File
@@ -27,8 +27,6 @@ import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.types.expressions.TypeReconstructionUtil;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class ChangeToStarProjectionFix extends JetIntentionAction<JetTypeElement> {
public ChangeToStarProjectionFix(@NotNull JetTypeElement element) {
super(element);
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeTypeFix.java
-2
View File
@@ -35,8 +35,6 @@ import org.jetbrains.kotlin.psi.JetPsiFactoryKt;
import org.jetbrains.kotlin.psi.JetTypeReference;
import org.jetbrains.kotlin.types.JetType;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class ChangeTypeFix extends JetIntentionAction<JetTypeReference> {
private final JetType type;
private final String renderedType;
idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java
-2
View File
@@ -47,8 +47,6 @@ import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class ChangeVariableTypeFix extends JetIntentionAction<JetVariableDeclaration> {
private final static Logger LOG = Logger.getInstance(ChangeVariableTypeFix.class);
idea/src/org/jetbrains/kotlin/idea/quickfix/MapPlatformClassToKotlinFix.java
-2
View File
@@ -46,8 +46,6 @@ import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.List;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class MapPlatformClassToKotlinFix extends JetIntentionAction<JetReferenceExpression> {
private static final String PRIMARY_USAGE = "PrimaryUsage";
private static final String OTHER_USAGE = "OtherUsage";
idea/src/org/jetbrains/kotlin/idea/quickfix/MoveWhenElseBranchFix.java
-2
View File
@@ -29,8 +29,6 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.idea.JetBundle;
import org.jetbrains.kotlin.psi.*;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class MoveWhenElseBranchFix extends JetIntentionAction<JetWhenExpression> {
public MoveWhenElseBranchFix(@NotNull JetWhenExpression element) {
super(element);
idea/src/org/jetbrains/kotlin/idea/quickfix/ReplaceOperationInBinaryExpressionFix.java
-2
View File
@@ -23,8 +23,6 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.JetBundle;
import org.jetbrains.kotlin.psi.*;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public abstract class ReplaceOperationInBinaryExpressionFix<T extends JetExpression> extends JetIntentionAction<T> {
private final String operation;
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetCallableParameterTableModel.java
-2
View File
@@ -30,8 +30,6 @@ import org.jetbrains.kotlin.psi.JetExpression;
import org.jetbrains.kotlin.psi.JetPsiFactory;
import org.jetbrains.kotlin.psi.JetPsiFactoryKt;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public abstract class JetCallableParameterTableModel extends ParameterTableModelBase<JetParameterInfo, ParameterTableModelItemBase<JetParameterInfo>> {
private final Project project;
private final JetMethodDescriptor methodDescriptor;
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.java
+4 -2
View File
@@ -35,7 +35,10 @@ import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils;
import org.jetbrains.kotlin.idea.codeInsight.shorten.ShortenWaitingSetKt;
import org.jetbrains.kotlin.idea.core.DescriptorUtilsKt;
import org.jetbrains.kotlin.idea.core.PsiModificationUtilsKt;
import org.jetbrains.kotlin.idea.refactoring.changeSignature.*;
import org.jetbrains.kotlin.idea.refactoring.changeSignature.ChangeSignatureUtilsKt;
import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo;
import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo;
import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetValVar;
import org.jetbrains.kotlin.idea.util.ShortenReferences;
import org.jetbrains.kotlin.idea.util.ShortenReferences.Options;
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
@@ -53,7 +56,6 @@ import org.jetbrains.kotlin.types.substitutions.SubstitutionUtilsKt;
import java.util.List;
import static org.jetbrains.kotlin.idea.core.refactoring.JetRefactoringUtilKt.createPrimaryConstructorIfAbsent;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class JetCallableDefinitionUsage<T extends PsiElement> extends JetUsageInfo<T> {
@NotNull
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.java
-2
View File
@@ -57,8 +57,6 @@ import org.jetbrains.kotlin.types.expressions.OperatorConventions;
import java.util.*;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class JetFunctionCallUsage extends JetUsageInfo<JetCallElement> {
private static final Comparator<Pair<JetElement, JetElement>>
REVERSED_TEXT_OFFSET_COMPARATOR = new Comparator<Pair<JetElement, JetElement>>() {
idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java
-2
View File
@@ -72,8 +72,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class KotlinInlineValHandler extends InlineActionHandler {
@Override
public boolean isEnabledForLanguage(Language l) {
idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java
-2
View File
@@ -72,8 +72,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.List;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase {
public static final String INTRODUCE_VARIABLE = JetRefactoringBundle.message("introduce.variable");