From 78e278ec4c2a6c012897910d3829eb0ddead65ab Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 1 Apr 2017 02:39:10 +0300 Subject: [PATCH] Remove redundant type arguments for Java 8+ in compiler modules --- .../jetbrains/kotlin/codegen/FunctionCodegen.java | 6 +----- .../kotlin/codegen/ImplementationBodyCodegen.java | 2 +- .../org/jetbrains/kotlin/codegen/MemberCodegen.java | 9 +++++---- .../org/jetbrains/kotlin/codegen/ScriptCodegen.java | 2 +- .../kotlin/codegen/binding/MutableClosure.java | 4 ++-- .../kotlin/codegen/inline/InlineCodegen.java | 2 +- .../kotlin/codegen/inline/InliningContext.java | 2 +- .../kotlin/cli/common/modules/ModuleScriptData.java | 2 +- .../jetbrains/kotlin/checkers/CheckerTestUtil.java | 5 +---- .../kotlin/config/CompilerConfiguration.java | 4 ++-- .../org/jetbrains/kotlin/psi/KtCallExpression.java | 4 ++-- .../src/org/jetbrains/kotlin/psi/KtFile.java | 2 +- .../jetbrains/kotlin/psi/KtFunctionNotStubbed.java | 2 +- .../src/org/jetbrains/kotlin/psi/KtFunctionType.java | 2 +- .../org/jetbrains/kotlin/psi/KtNamedFunction.java | 2 +- .../src/org/jetbrains/kotlin/psi/KtNullableType.java | 5 ++--- .../src/org/jetbrains/kotlin/psi/KtUserType.java | 2 +- .../jetbrains/kotlin/resolve/DescriptorResolver.java | 9 +++++---- .../kotlin/resolve/calls/ArgumentTypeResolver.java | 9 ++++----- .../kotlin/resolve/calls/model/ResolvedCallImpl.java | 12 +++--------- .../calls/results/OverloadResolutionResultsImpl.java | 2 +- .../kotlin/resolve/calls/util/CallMaker.java | 6 +++--- .../constants/CompileTimeConstantChecker.java | 3 +-- .../kotlin/resolve/lazy/ResolveSession.java | 4 ++-- .../resolve/lazy/data/KtClassOrObjectInfo.java | 2 +- .../declarations/DeclarationProviderFactory.java | 3 +-- .../lazy/descriptors/LazyClassDescriptor.java | 8 +++----- .../descriptors/LazyTypeParameterDescriptor.java | 3 +-- .../org/jetbrains/kotlin/types/TypeIntersector.java | 2 +- .../expressions/BasicExpressionTypingVisitor.java | 2 +- .../expressions/ControlStructureTypingUtils.java | 2 +- .../expressions/ControlStructureTypingVisitor.java | 4 +--- .../types/expressions/ForLoopConventionsChecker.java | 4 ++-- .../types/expressions/OperatorConventions.java | 2 +- .../InterceptionInstrumenterAdaptor.java | 3 +-- .../AbstractCompileKotlinAgainstKotlinTest.java | 4 ++-- .../AbstractTopLevelMembersInvocationTest.java | 2 +- .../jetbrains/kotlin/codegen/CodegenTestCase.java | 2 +- .../jetbrains/kotlin/codegen/CodegenTestFiles.java | 2 +- .../kotlin/codegen/flags/AbstractWriteFlagsTest.java | 2 +- .../AbstractAnnotationDescriptorResolveTest.java | 12 +++++------- .../org/jetbrains/kotlin/test/KotlinTestUtils.java | 4 ++-- .../test/util/RecursiveDescriptorComparator.java | 6 +++--- .../codegen/GenerateNotNullAssertionsTest.java | 4 ++-- .../jetbrains/kotlin/codegen/OuterClassGenTest.java | 4 ++-- .../CompileKotlinAgainstCustomBinariesTest.java | 8 ++++---- .../tests/generator/SimpleTestClassModel.java | 6 +++--- .../tests/generator/SingleClassTestModel.java | 10 +++++----- .../jetbrains/kotlin/js/test/rhino/RhinoUtils.java | 2 +- .../jetbrains/kotlin/js/test/utils/CallCounter.java | 6 +++--- .../kotlin/js/test/utils/DirectiveTestUtils.java | 2 +- .../jetbrains/kotlin/js/translate/context/Namer.java | 2 +- .../initializer/ClassInitializerTranslator.java | 2 +- .../factories/PrimitiveBinaryOperationFIF.java | 2 +- .../operation/IntrinsicIncrementTranslator.java | 3 +-- .../kotlin/js/translate/test/JSTestGenerator.java | 10 +++++----- 56 files changed, 104 insertions(+), 128 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java index 92e63a73bdb..294fb8672db 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java @@ -208,11 +208,7 @@ public class FunctionCodegen { getThrownExceptions(functionDescriptor, typeMapper)); if (CodegenContextUtil.isImplClassOwner(owner)) { - v.getSerializationBindings().put( - METHOD_FOR_FUNCTION, - CodegenUtilKt.unwrapFrontendVersion(functionDescriptor), - asmMethod - ); + v.getSerializationBindings().put(METHOD_FOR_FUNCTION, CodegenUtilKt.unwrapFrontendVersion(functionDescriptor), asmMethod); } generateMethodAnnotations(functionDescriptor, asmMethod, mv); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index 90181bb8032..f9fd8200c2d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -1031,7 +1031,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } else if (constructor.hasBody() && !(constructor instanceof KtSecondaryConstructor && !((KtSecondaryConstructor) constructor).hasImplicitDelegationCall())) { KtBlockExpression bodyExpression = constructor.getBodyExpression(); - List statements = bodyExpression != null ? bodyExpression.getStatements() : Collections.emptyList(); + List statements = bodyExpression != null ? bodyExpression.getStatements() : Collections.emptyList(); if (!statements.isEmpty()) { codegen.markStartLineNumber(statements.iterator().next()); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java index 3f7dca36840..d50acf38e51 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java @@ -20,7 +20,6 @@ import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.psi.PsiElement; import kotlin.Unit; import kotlin.jvm.functions.Function0; -import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.backend.common.CodegenUtil; @@ -60,7 +59,10 @@ import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.KotlinType; -import org.jetbrains.org.objectweb.asm.*; +import org.jetbrains.org.objectweb.asm.Label; +import org.jetbrains.org.objectweb.asm.MethodVisitor; +import org.jetbrains.org.objectweb.asm.Opcodes; +import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import org.jetbrains.org.objectweb.asm.commons.Method; @@ -450,8 +452,7 @@ public abstract class MemberCodegen"), SYNTHESIZED, KotlinSourceElementKt.toSourceElement(element)); - clInit.initialize(null, null, Collections.emptyList(), - Collections.emptyList(), + clInit.initialize(null, null, Collections.emptyList(), Collections.emptyList(), DescriptorUtilsKt.getModule(descriptor).getBuiltIns().getUnitType(), null, Visibilities.PRIVATE); return clInit; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java index bacc071484e..9a5491f4f7c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java @@ -60,7 +60,7 @@ public class ScriptCodegen extends MemberCodegen { List earlierScripts = state.getReplSpecific().getEarlierScriptsForReplInterpreter(); ScriptContext scriptContext = parentContext.intoScript( scriptDescriptor, - earlierScripts == null ? Collections.emptyList() : earlierScripts, + earlierScripts == null ? Collections.emptyList() : earlierScripts, scriptDescriptor, state.getTypeMapper() ); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/MutableClosure.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/MutableClosure.java index d5394e97d09..43384eb012c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/MutableClosure.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/MutableClosure.java @@ -106,7 +106,7 @@ public final class MutableClosure implements CalculatedClosure { @NotNull @Override public Map getCaptureVariables() { - return captureVariables != null ? captureVariables : Collections.emptyMap(); + return captureVariables != null ? captureVariables : Collections.emptyMap(); } public void setCaptureReceiverType(@NotNull KotlinType type) { @@ -116,7 +116,7 @@ public final class MutableClosure implements CalculatedClosure { @NotNull @Override public List> getRecordedFields() { - return recordedFields != null ? recordedFields : Collections.>emptyList(); + return recordedFields != null ? recordedFields : Collections.emptyList(); } @Override diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java index 2a2373e3eb7..988ed0e974a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java @@ -590,7 +590,7 @@ public class InlineCodegen extends CallGenerator { strategy = new SuspendFunctionGenerationStrategy( state, - CoroutineCodegenUtilKt.unwrapInitialDescriptorForSuspendFunction(descriptor), + CoroutineCodegenUtilKt.unwrapInitialDescriptorForSuspendFunction(descriptor), (KtFunction) expression ); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.java index b9436ef8171..3e7ff243fce 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InliningContext.java @@ -61,7 +61,7 @@ public class InliningContext { @NotNull public InliningContext subInline(@NotNull NameGenerator generator) { - return subInline(generator, Collections.emptyMap(), isInliningLambda); + return subInline(generator, Collections.emptyMap(), isInliningLambda); } @NotNull diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleScriptData.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleScriptData.java index f35eed41e46..298d6e3bcdf 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleScriptData.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleScriptData.java @@ -23,7 +23,7 @@ import java.util.Collections; import java.util.List; public class ModuleScriptData { - public static final ModuleScriptData EMPTY = new ModuleScriptData(Collections.emptyList()); + public static final ModuleScriptData EMPTY = new ModuleScriptData(Collections.emptyList()); private final List modules; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/checkers/CheckerTestUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/checkers/CheckerTestUtil.java index 9bbeeb8b636..4e800fbf64b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/checkers/CheckerTestUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/checkers/CheckerTestUtil.java @@ -387,10 +387,7 @@ public class CheckerTestUtil { } public static StringBuffer addDiagnosticMarkersToText(@NotNull PsiFile psiFile, @NotNull Collection diagnostics) { - return addDiagnosticMarkersToText( - psiFile, diagnostics, Collections.emptyMap(), - PsiElement::getText - ); + return addDiagnosticMarkersToText(psiFile, diagnostics, Collections.emptyMap(), PsiElement::getText); } public static StringBuffer addDiagnosticMarkersToText( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/config/CompilerConfiguration.java b/compiler/frontend/src/org/jetbrains/kotlin/config/CompilerConfiguration.java index 6600731d4a9..de6c7d6695b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/config/CompilerConfiguration.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/config/CompilerConfiguration.java @@ -59,13 +59,13 @@ public class CompilerConfiguration { @NotNull public List getList(@NotNull CompilerConfigurationKey> key) { List data = get(key); - return data == null ? Collections.emptyList() : data; + return data == null ? Collections.emptyList() : data; } @NotNull public Map getMap(@NotNull CompilerConfigurationKey> key) { Map data = get(key); - return data == null ? Collections.emptyMap() : data; + return data == null ? Collections.emptyMap() : data; } public void put(@NotNull CompilerConfigurationKey key, @NotNull T value) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtCallExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtCallExpression.java index 3ab2b4d2589..d0eb767f28a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtCallExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtCallExpression.java @@ -68,7 +68,7 @@ public class KtCallExpression extends KtExpressionImpl implements KtCallElement, @NotNull public List getValueArguments() { KtValueArgumentList list = getValueArgumentList(); - List valueArgumentsInParentheses = list != null ? list.getArguments() : Collections.emptyList(); + List valueArgumentsInParentheses = list != null ? list.getArguments() : Collections.emptyList(); List functionLiteralArguments = getLambdaArguments(); if (functionLiteralArguments.isEmpty()) { return valueArgumentsInParentheses; @@ -83,6 +83,6 @@ public class KtCallExpression extends KtExpressionImpl implements KtCallElement, @NotNull public List getTypeArguments() { KtTypeArgumentList list = getTypeArgumentList(); - return list != null ? list.getArguments() : Collections.emptyList(); + return list != null ? list.getArguments() : Collections.emptyList(); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java index 799135ae97b..52d61ca2d5e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.java @@ -108,7 +108,7 @@ public class KtFile extends PsiFileBase implements KtDeclarationContainer, KtAnn @NotNull public List getImportDirectives() { KtImportList importList = getImportList(); - return importList != null ? importList.getImports() : Collections.emptyList(); + return importList != null ? importList.getImports() : Collections.emptyList(); } @Nullable diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFunctionNotStubbed.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFunctionNotStubbed.java index bbff9f136de..32d71cda59c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFunctionNotStubbed.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFunctionNotStubbed.java @@ -41,7 +41,7 @@ public abstract class KtFunctionNotStubbed extends KtTypeParameterListOwnerNotSt @NotNull public List getValueParameters() { KtParameterList list = getValueParameterList(); - return list != null ? list.getParameters() : Collections.emptyList(); + return list != null ? list.getParameters() : Collections.emptyList(); } @Override diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFunctionType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFunctionType.java index 192a18c1a54..bf3e78f3995 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFunctionType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFunctionType.java @@ -72,7 +72,7 @@ public class KtFunctionType extends KtElementImplStub getParameters() { KtParameterList list = getParameterList(); - return list != null ? list.getParameters() : Collections.emptyList(); + return list != null ? list.getParameters() : Collections.emptyList(); } @Nullable diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtNamedFunction.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtNamedFunction.java index ac248ad93c6..31520772c2e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtNamedFunction.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtNamedFunction.java @@ -115,7 +115,7 @@ public class KtNamedFunction extends KtTypeParameterListOwnerStub getValueParameters() { KtParameterList list = getValueParameterList(); - return list != null ? list.getParameters() : Collections.emptyList(); + return list != null ? list.getParameters() : Collections.emptyList(); } @Override diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtNullableType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtNullableType.java index 519dd730a1d..73cd20d46a8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtNullableType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtNullableType.java @@ -44,7 +44,7 @@ public class KtNullableType extends KtElementImplStub getTypeArgumentsAsTypes() { KtTypeElement innerType = getInnerType(); - return innerType == null ? Collections.emptyList() : innerType.getTypeArgumentsAsTypes(); + return innerType == null ? Collections.emptyList() : innerType.getTypeArgumentsAsTypes(); } @Override @@ -66,7 +66,6 @@ public class KtNullableType extends KtElementImplStub getAnnotationEntries() { KtModifierList modifierList = getModifierList(); - return modifierList != null ? modifierList.getAnnotationEntries() - : Collections.emptyList(); + return modifierList != null ? modifierList.getAnnotationEntries() : Collections.emptyList(); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtUserType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtUserType.java index 5bea5128077..8bdf27a8776 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtUserType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtUserType.java @@ -51,7 +51,7 @@ public class KtUserType extends KtElementImplStub implements public List getTypeArguments() { // TODO: empty elements in PSI KtTypeArgumentList typeArgumentList = getTypeArgumentList(); - return typeArgumentList == null ? Collections.emptyList() : typeArgumentList.getArguments(); + return typeArgumentList == null ? Collections.emptyList() : typeArgumentList.getArguments(); } @NotNull diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index c2031d8425c..fe6a77dd77a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java @@ -125,8 +125,8 @@ public class DescriptorResolver { BindingTrace trace ) { List supertypes = Lists.newArrayList(); - List delegationSpecifiers = correspondingClassOrObject == null ? Collections.emptyList() : - correspondingClassOrObject.getSuperTypeListEntries(); + List delegationSpecifiers = + correspondingClassOrObject == null ? Collections.emptyList() : correspondingClassOrObject.getSuperTypeListEntries(); Collection declaredSupertypes = resolveSuperTypeListEntries( scope, delegationSpecifiers, @@ -1151,8 +1151,9 @@ public class DescriptorResolver { false ); propertyWrapper.setDescriptor(propertyDescriptor); - propertyDescriptor.setType(type, Collections.emptyList(), - getDispatchReceiverParameterIfNeeded(classDescriptor), (ReceiverParameterDescriptor) null); + propertyDescriptor.setType( + type, Collections.emptyList(), getDispatchReceiverParameterIfNeeded(classDescriptor), (ReceiverParameterDescriptor) null + ); Annotations setterAnnotations = annotationSplitter.getAnnotationsForTarget(PROPERTY_SETTER); Annotations getterAnnotations = new CompositeAnnotations(CollectionsKt.listOf( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java index 0a9ae586bd1..cec9c630012 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java @@ -276,11 +276,11 @@ public class ArgumentTypeResolver { } if (expectedTypeIsUnknown) { - return functionPlaceholders.createFunctionPlaceholderType(Collections.emptyList(), false); + return functionPlaceholders.createFunctionPlaceholderType(Collections.emptyList(), false); } return FunctionTypesKt.createFunctionType( - builtIns, Annotations.Companion.getEMPTY(), null, Collections.emptyList(), null, TypeUtils.DONT_CARE + builtIns, Annotations.Companion.getEMPTY(), null, Collections.emptyList(), null, TypeUtils.DONT_CARE ); } @@ -308,10 +308,9 @@ public class ArgumentTypeResolver { boolean isFunctionLiteral = function instanceof KtFunctionLiteral; if (function.getValueParameterList() == null && isFunctionLiteral) { return expectedTypeIsUnknown - ? functionPlaceholders - .createFunctionPlaceholderType(Collections.emptyList(), /* hasDeclaredArguments = */ false) + ? functionPlaceholders.createFunctionPlaceholderType(Collections.emptyList(), /* hasDeclaredArguments = */ false) : FunctionTypesKt.createFunctionType( - builtIns, Annotations.Companion.getEMPTY(), null, Collections.emptyList(), null, DONT_CARE + builtIns, Annotations.Companion.getEMPTY(), null, Collections.emptyList(), null, DONT_CARE ); } List valueParameters = function.getValueParameters(); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java index 6cb4b7971d9..a4935cd76b9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java @@ -127,23 +127,17 @@ public class ResolvedCallImpl implements MutableRe @NotNull private static Map createValueArgumentsMap(CallableDescriptor descriptor) { - return descriptor.getValueParameters().isEmpty() - ? Collections.emptyMap() - : Maps.newLinkedHashMap(); + return descriptor.getValueParameters().isEmpty() ? Collections.emptyMap() : Maps.newLinkedHashMap(); } @NotNull private static Map createArgumentsToParameterMap(CallableDescriptor descriptor) { - return descriptor.getValueParameters().isEmpty() - ? Collections.emptyMap() - : Maps.newHashMap(); + return descriptor.getValueParameters().isEmpty() ? Collections.emptyMap() : Maps.newHashMap(); } @NotNull private static Map createTypeArgumentsMap(CallableDescriptor descriptor) { - return descriptor.getTypeParameters().isEmpty() - ? Collections.emptyMap() - : Maps.newLinkedHashMap(); + return descriptor.getTypeParameters().isEmpty() ? Collections.emptyMap() : Maps.newLinkedHashMap(); } @Override diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadResolutionResultsImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadResolutionResultsImpl.java index d8e5783b90e..92475945a92 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadResolutionResultsImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadResolutionResultsImpl.java @@ -35,7 +35,7 @@ public class OverloadResolutionResultsImpl impleme public static OverloadResolutionResultsImpl nameNotFound() { OverloadResolutionResultsImpl results = new OverloadResolutionResultsImpl<>( Code.NAME_NOT_FOUND, Collections.>emptyList()); - results.setAllCandidates(Collections.>emptyList()); + results.setAllCandidates(Collections.emptyList()); return results; } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/CallMaker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/CallMaker.java index 45e46499c81..36f12a4d7a0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/CallMaker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/CallMaker.java @@ -233,7 +233,7 @@ public class CallMaker { @NotNull public static Call makeCall(@NotNull ReceiverValue baseAsReceiver, KtUnaryExpression expression) { - return makeCall(expression, baseAsReceiver, null, expression.getOperationReference(), Collections.emptyList()); + return makeCall(expression, baseAsReceiver, null, expression.getOperationReference(), Collections.emptyList()); } @NotNull @@ -277,7 +277,7 @@ public class CallMaker { @NotNull public static Call makePropertyCall(@Nullable Receiver explicitReceiver, @Nullable ASTNode callOperationNode, @NotNull KtSimpleNameExpression nameExpression) { - return makeCallWithExpressions(nameExpression, explicitReceiver, callOperationNode, nameExpression, Collections.emptyList()); + return makeCallWithExpressions(nameExpression, explicitReceiver, callOperationNode, nameExpression, Collections.emptyList()); } @@ -446,6 +446,6 @@ public class CallMaker { @NotNull public static Call makeCall(@NotNull KtElement callElement, @NotNull ReceiverValue explicitReceiver) { - return new CallImpl(callElement, explicitReceiver, null, null, Collections.emptyList()); + return new CallImpl(callElement, explicitReceiver, null, null, Collections.emptyList()); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstantChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstantChecker.java index 0cdfa7574b7..7df9c273361 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstantChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstantChecker.java @@ -32,7 +32,6 @@ import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext; import org.jetbrains.kotlin.types.KotlinType; import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.types.checker.KotlinTypeChecker; -import org.jetbrains.kotlin.types.expressions.ExpressionTypingContext; import java.util.Set; @@ -40,7 +39,7 @@ import static org.jetbrains.kotlin.diagnostics.Errors.*; public class CompileTimeConstantChecker { private static final Set> errorsThatDependOnExpectedType = - Sets.>newHashSet(CONSTANT_EXPECTED_TYPE_MISMATCH, NULL_FOR_NONNULL_TYPE); + Sets.newHashSet(CONSTANT_EXPECTED_TYPE_MISMATCH, NULL_FOR_NONNULL_TYPE); private final KotlinBuiltIns builtIns; private final BindingTrace trace; 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 9396a40cd9d..90b1526c9e1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java @@ -171,7 +171,7 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext { @NotNull @Override public List getPackageFragments(@NotNull FqName fqName) { - return ContainerUtil.createMaybeSingletonList(getPackageFragment(fqName)); + return ContainerUtil.createMaybeSingletonList(getPackageFragment(fqName)); } @NotNull @@ -339,7 +339,7 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext { LazyPackageDescriptor rootPackage = getPackageFragment(FqName.ROOT); assert rootPackage != null : "Root package must be initialized"; - return collectAllPackages(Lists.newArrayList(), rootPackage); + return collectAllPackages(Lists.newArrayList(), rootPackage); } @NotNull diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassOrObjectInfo.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassOrObjectInfo.java index 3ab3dceb333..704a228e0a2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassOrObjectInfo.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/KtClassOrObjectInfo.java @@ -88,7 +88,7 @@ public abstract class KtClassOrObjectInfo implements @Override public List getDanglingAnnotations() { KtClassBody body = element.getBody(); - return body == null ? Collections.emptyList() : body.getDanglingAnnotations(); + return body == null ? Collections.emptyList() : body.getDanglingAnnotations(); } @NotNull diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactory.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactory.java index 207e5ad5ceb..4359f0d0713 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactory.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProviderFactory.java @@ -26,8 +26,7 @@ import org.jetbrains.kotlin.storage.LockBasedStorageManager; import java.util.Collections; public interface DeclarationProviderFactory { - DeclarationProviderFactory EMPTY = - new FileBasedDeclarationProviderFactory(LockBasedStorageManager.NO_LOCKS, Collections.emptyList()); + DeclarationProviderFactory EMPTY = new FileBasedDeclarationProviderFactory(LockBasedStorageManager.NO_LOCKS, Collections.emptyList()); @NotNull ClassMemberDeclarationProvider getClassMemberDeclarationProvider(@NotNull KtClassLikeInfo classLikeInfo); 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 1adc92245a1..33113238863 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 @@ -270,7 +270,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes CallableMemberDescriptor.Kind.SYNTHESIZED, SourceElement.NO_SOURCE ) { { - initialize(null, null, Collections.emptyList(), Collections.emptyList(), + initialize(null, null, Collections.emptyList(), Collections.emptyList(), null, Modality.FINAL, Visibilities.PRIVATE); } @@ -665,13 +665,11 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes KtClassOrObject classOrObject = declarationProvider.getOwnerInfo().getCorrespondingClassOrObject(); if (classOrObject == null) { - return Collections.singleton(c.getModuleDescriptor().getBuiltIns().getAnyType()); + return Collections.singleton(c.getModuleDescriptor().getBuiltIns().getAnyType()); } List allSupertypes = - c.getDescriptorResolver() - .resolveSupertypes(getScopeForClassHeaderResolution(), this, classOrObject, - c.getTrace()); + c.getDescriptorResolver().resolveSupertypes(getScopeForClassHeaderResolution(), this, classOrObject, c.getTrace()); return new ArrayList<>(CollectionsKt.filter(allSupertypes, VALID_SUPERTYPE)); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java index f866e2fd7f4..d91431232b6 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.resolve.lazy.descriptors; import kotlin.collections.CollectionsKt; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.descriptors.SupertypeLoopChecker; import org.jetbrains.kotlin.descriptors.impl.AbstractLazyTypeParameterDescriptor; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.lexer.KtTokens; @@ -93,7 +92,7 @@ public class LazyTypeParameterDescriptor extends AbstractLazyTypeParameterDescri return CollectionsKt.plus( typeParameter.getExtendsBound() != null ? Collections.singletonList(typeParameter.getExtendsBound()) - : Collections.emptyList(), + : Collections.emptyList(), getUpperBoundsFromWhereClause() ); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/TypeIntersector.java b/compiler/frontend/src/org/jetbrains/kotlin/types/TypeIntersector.java index b44931744c2..02c158fb279 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/TypeIntersector.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/TypeIntersector.java @@ -136,7 +136,7 @@ public class TypeIntersector { return KotlinTypeFactory.simpleType( Annotations.Companion.getEMPTY(), constructor, - Collections.emptyList(), + Collections.emptyList(), allNullable, constructor.createScopeForKotlinType() ); 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 285e0d6f7b8..12173063736 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java @@ -667,7 +667,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { KtExpression expression ) { BindingTrace trace = context.trace; - Call call = CallMaker.makeCall(expression, null, null, expression, Collections.emptyList()); + Call call = CallMaker.makeCall(expression, null, null, expression, Collections.emptyList()); ResolutionCandidate resolutionCandidate = ResolutionCandidate.create( call, descriptor, null, ExplicitReceiverKind.NO_EXPLICIT_RECEIVER, null); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java index 40ccbd7658e..084bd4a1a4a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java @@ -118,7 +118,7 @@ public class ControlStructureTypingUtils { TracingStrategy tracing = createTracingForSpecialConstruction(call, construct.getName(), context); TypeSubstitutor knownTypeParameterSubstitutor = createKnownTypeParameterSubstitutorForSpecialCall(construct, function, context.expectedType); ResolutionCandidate resolutionCandidate = - ResolutionCandidate.create(call, function, knownTypeParameterSubstitutor); + ResolutionCandidate.create(call, function, knownTypeParameterSubstitutor); OverloadResolutionResults results = callResolver.resolveCallWithKnownCandidate( call, tracing, context, resolutionCandidate, dataFlowInfoForArguments); assert results.isSingleResult() : "Not single result after resolving one known candidate"; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java index 45f7d430375..8bf5691fa5f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java @@ -304,9 +304,7 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor { newOuterLoops.add(loopExpression); return super.visitLoopExpression(loopExpression, newOuterLoops); } - }, expression instanceof KtLoopExpression - ? Lists.newArrayList((KtLoopExpression) expression) - : Lists.newArrayList()); + }, expression instanceof KtLoopExpression ? Lists.newArrayList((KtLoopExpression) expression) : Lists.newArrayList()); return result[0]; } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java index 13ea1b7dcf9..c0f2d9945e8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java @@ -60,7 +60,7 @@ public class ForLoopConventionsChecker { // Make a fake call loopRange.iterator(), and try to resolve it OverloadResolutionResults iteratorResolutionResults = fakeCallResolver.resolveFakeCall( context, loopRange, OperatorNameConventions.ITERATOR, loopRangeExpression, - loopRangeExpression, FakeCallKind.ITERATOR, Collections.emptyList() + loopRangeExpression, FakeCallKind.ITERATOR, Collections.emptyList() ); if (!iteratorResolutionResults.isSuccess()) return null; @@ -108,7 +108,7 @@ public class ForLoopConventionsChecker { ) { OverloadResolutionResults nextResolutionResults = fakeCallResolver.resolveFakeCall( context, new TransientReceiver(iteratorType), name, loopRangeExpression, loopRangeExpression, FakeCallKind.OTHER, - Collections.emptyList() + Collections.emptyList() ); if (nextResolutionResults.isAmbiguity()) { context.trace.report(ambiguity.on(loopRangeExpression, iteratorType)); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/OperatorConventions.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/OperatorConventions.java index 40e7055c0be..92e85207a3e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/OperatorConventions.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/OperatorConventions.java @@ -85,7 +85,7 @@ public class OperatorConventions { ImmutableSet.of(KtTokens.EQEQEQ, KtTokens.EXCLEQEQEQ); public static final ImmutableSet IN_OPERATIONS = - ImmutableSet.of(KtTokens.IN_KEYWORD, KtTokens.NOT_IN); + ImmutableSet.of(KtTokens.IN_KEYWORD, KtTokens.NOT_IN); public static final ImmutableBiMap ASSIGNMENT_OPERATIONS = ImmutableBiMap.builder() .put(KtTokens.MULTEQ, TIMES_ASSIGN) diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/InterceptionInstrumenterAdaptor.java b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/InterceptionInstrumenterAdaptor.java index 4f75e047f8a..31922d4d8e6 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/InterceptionInstrumenterAdaptor.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/InterceptionInstrumenterAdaptor.java @@ -20,11 +20,10 @@ import java.io.PrintStream; import java.util.Collections; public abstract class InterceptionInstrumenterAdaptor implements Instrumenter { - private final InterceptionInstrumenter instrumenter; public InterceptionInstrumenterAdaptor() { - this.instrumenter = new InterceptionInstrumenter(Collections.>singletonList(getClass())); + this.instrumenter = new InterceptionInstrumenter(Collections.singletonList(getClass())); } @Override diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java index 462d2d57d6e..51df42c38fa 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java +++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCompileKotlinAgainstKotlinTest.java @@ -106,7 +106,7 @@ public abstract class AbstractCompileKotlinAgainstKotlinTest extends CodegenTest CompilerConfiguration configuration = createConfiguration(ConfigurationKind.ALL, getJdkKind(files), Collections.singletonList(KotlinTestUtils.getAnnotationsJar()), - Collections.emptyList(), Collections.singletonList(testFile)); + Collections.emptyList(), Collections.singletonList(testFile)); KotlinCoreEnvironment environment = KotlinCoreEnvironment.createForTests( compileDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES); @@ -119,7 +119,7 @@ public abstract class AbstractCompileKotlinAgainstKotlinTest extends CodegenTest CompilerConfiguration configurationWithADirInClasspath = createConfiguration(ConfigurationKind.ALL, getJdkKind(files), Lists.newArrayList(KotlinTestUtils.getAnnotationsJar(), aDir), - Collections.emptyList(), Collections.singletonList(testFile)); + Collections.emptyList(), Collections.singletonList(testFile)); Disposable compileDisposable = createDisposable("compileB"); KotlinCoreEnvironment environment = KotlinCoreEnvironment.createForTests( diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java index 04de0b23f67..69e4bc61932 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java +++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java @@ -52,7 +52,7 @@ public abstract class AbstractTopLevelMembersInvocationTest extends AbstractByte File library = new File(root, LIBRARY); List classPath = library.exists() ? Collections.singletonList(MockLibraryUtil.compileLibraryToJar(library.getPath(), LIBRARY, false, false)) : - Collections.emptyList(); + Collections.emptyList(); assert !sourceFiles.isEmpty() : getTestName(true) + " should contain at least one .kt file"; Collections.sort(sourceFiles); diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestCase.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestCase.java index 41a75223410..f2cabc51329 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestCase.java +++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestCase.java @@ -89,7 +89,7 @@ public abstract class CodegenTestCase extends KtUsefulTestCase { @NotNull ConfigurationKind configurationKind, @Nullable File... javaSourceRoots ) { - createEnvironmentWithMockJdkAndIdeaAnnotations(configurationKind, Collections.emptyList(), javaSourceRoots); + createEnvironmentWithMockJdkAndIdeaAnnotations(configurationKind, Collections.emptyList(), javaSourceRoots); } @NotNull diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestFiles.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestFiles.java index 340dd3f0d94..74cda5234ee 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestFiles.java +++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/CodegenTestFiles.java @@ -79,7 +79,7 @@ public class CodegenTestFiles { @NotNull public static CodegenTestFiles create(@NotNull List ktFiles) { assert !ktFiles.isEmpty() : "List should have at least one file"; - return new CodegenTestFiles(ktFiles, Collections.>emptyList(), Collections.emptyList()); + return new CodegenTestFiles(ktFiles, Collections.emptyList(), Collections.emptyList()); } public static CodegenTestFiles create(Project project, String[] names) { diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java index cdf044a310e..e6748a28eea 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java +++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java @@ -57,7 +57,7 @@ public abstract class AbstractWriteFlagsTest extends CodegenTestCase { protected void doMultiFileTest( @NotNull File wholeFile, @NotNull List files, @Nullable File javaFilesDir ) throws Exception { - compile(files, null, ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, Collections.emptyList()); + compile(files, null, ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, Collections.emptyList()); String fileText = FileUtil.loadFile(wholeFile, true); diff --git a/compiler/tests-common/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java b/compiler/tests-common/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java index ed1598f06c0..b264c28fd3c 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java +++ b/compiler/tests-common/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java @@ -42,7 +42,6 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.KotlinTestWithEnvironment; -import org.jetbrains.kotlin.types.TypeProjection; import java.io.File; import java.io.IOException; @@ -173,7 +172,7 @@ public abstract class AbstractAnnotationDescriptorResolveTest extends KotlinTest @NotNull private static FunctionDescriptor getFunctionDescriptor(@NotNull ClassDescriptor classDescriptor, @NotNull String name) { Name functionName = Name.identifier(name); - MemberScope memberScope = classDescriptor.getMemberScope(Collections.emptyList()); + MemberScope memberScope = classDescriptor.getMemberScope(Collections.emptyList()); Collection functions = memberScope.getContributedFunctions(functionName, NoLookupLocation.FROM_TEST); assert functions.size() == 1 : "Failed to find function " + functionName + " in class" + "." + classDescriptor.getName(); return functions.iterator().next(); @@ -187,9 +186,8 @@ public abstract class AbstractAnnotationDescriptorResolveTest extends KotlinTest if (properties.isEmpty()) { for (DeclarationDescriptor descriptor : DescriptorUtils.getAllDescriptors(memberScope)) { if (descriptor instanceof ClassDescriptor) { - Collection classProperties = - ((ClassDescriptor) descriptor).getMemberScope(Collections.emptyList()) - .getContributedVariables(propertyName, NoLookupLocation.FROM_TEST); + Collection classProperties = ((ClassDescriptor) descriptor).getMemberScope(Collections.emptyList()) + .getContributedVariables(propertyName, NoLookupLocation.FROM_TEST); if (!classProperties.isEmpty()) { properties = classProperties; break; @@ -209,7 +207,7 @@ public abstract class AbstractAnnotationDescriptorResolveTest extends KotlinTest @NotNull private static PropertyDescriptor getPropertyDescriptor(@NotNull ClassDescriptor classDescriptor, @NotNull String name) { Name propertyName = Name.identifier(name); - MemberScope memberScope = classDescriptor.getMemberScope(Collections.emptyList()); + MemberScope memberScope = classDescriptor.getMemberScope(Collections.emptyList()); Collection properties = memberScope.getContributedVariables(propertyName, NoLookupLocation.FROM_TEST); assert properties.size() == 1 : "Failed to find property " + propertyName + " in class " + classDescriptor.getName(); return properties.iterator().next(); @@ -227,7 +225,7 @@ public abstract class AbstractAnnotationDescriptorResolveTest extends KotlinTest @NotNull private static ClassDescriptor getInnerClassDescriptor(@NotNull ClassDescriptor classDescriptor, @NotNull String name) { Name propertyName = Name.identifier(name); - MemberScope memberScope = classDescriptor.getMemberScope(Collections.emptyList()); + MemberScope memberScope = classDescriptor.getMemberScope(Collections.emptyList()); ClassifierDescriptor innerClass = memberScope.getContributedClassifier(propertyName, NoLookupLocation.FROM_TEST); assert innerClass instanceof ClassDescriptor : "Failed to find inner class " + propertyName + diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java index c1f50164fef..6ee9ec10ae1 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests-common/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -437,7 +437,7 @@ public class KotlinTestUtils { @NotNull TestJdkKind jdkKind, @NotNull File... extraClasspath ) { - return newConfiguration(configurationKind, jdkKind, Arrays.asList(extraClasspath), Collections.emptyList()); + return newConfiguration(configurationKind, jdkKind, Arrays.asList(extraClasspath), Collections.emptyList()); } @NotNull @@ -636,7 +636,7 @@ public class KotlinTestUtils { } if (isDirectiveDefined(expectedText, "WITH_COROUTINES")) { - M supportModule = hasModules ? factory.createModule("support", Collections.emptyList()) : null; + M supportModule = hasModules ? factory.createModule("support", Collections.emptyList()) : null; testFiles.add(factory.createFile(supportModule, "CoroutineUtil.kt", "import kotlin.coroutines.experimental.*\n" + diff --git a/compiler/tests-common/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java b/compiler/tests-common/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java index 3c72da4cf00..95894677274 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java +++ b/compiler/tests-common/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java @@ -128,18 +128,18 @@ public class RecursiveDescriptorComparator { if (!DescriptorUtils.getAllDescriptors(staticScope).isEmpty()) { printer.println(); printer.println("// Static members"); - appendSubDescriptors(descriptor, module, staticScope, Collections.emptyList(), printer); + appendSubDescriptors(descriptor, module, staticScope, Collections.emptyList(), printer); } } else if (descriptor instanceof PackageFragmentDescriptor) { appendSubDescriptors(descriptor, module, ((PackageFragmentDescriptor) descriptor).getMemberScope(), - Collections.emptyList(), printer); + Collections.emptyList(), printer); } else if (descriptor instanceof PackageViewDescriptor) { appendSubDescriptors(descriptor, module, getPackageScopeInModule((PackageViewDescriptor) descriptor, module), - Collections.emptyList(), printer); + Collections.emptyList(), printer); } if (!topLevel) { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java index 531c66a1fcb..8140bf106f0 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java @@ -66,8 +66,8 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase { private File compileJava0(@NotNull String fileName) { return CodegenTestUtil.compileJava( Collections.singletonList(KotlinTestUtils.getTestDataPathBase() + "/codegen/" + getPrefix() + "/" + fileName), - Collections.emptyList(), - Collections.emptyList() + Collections.emptyList(), + Collections.emptyList() ); } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java index 3caf7f8531f..f003446c6b3 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java @@ -157,8 +157,8 @@ public class OuterClassGenTest extends CodegenTestCase { private void doTest(@NotNull String classFqName, @NotNull String javaClassName, @NotNull String testDataFile) throws Exception { File javaOut = CodegenTestUtil.compileJava( Collections.singletonList(KotlinTestUtils.getTestDataPathBase() + "/codegen/" + getPrefix() + "/" + testDataFile + ".java"), - Collections.emptyList(), - Collections.emptyList() + Collections.emptyList(), + Collections.emptyList() ); String javaClassPath = javaClassName.replace('.', File.separatorChar) + ".class"; diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java index 6766026c7ae..bd58654e5c5 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java @@ -90,7 +90,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { @NotNull private File compileLibrary(@NotNull String sourcePath, @NotNull File... extraClassPath) { - return compileLibrary(sourcePath, Collections.emptyList(), extraClassPath); + return compileLibrary(sourcePath, Collections.emptyList(), extraClassPath); } private File compileLibrary(@NotNull String sourcePath, List additionalOptions, @NotNull File... extraClassPath) { @@ -212,7 +212,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { @NotNull File output, @NotNull File... classpath ) { - return compileKotlin(fileName, output, Collections.emptyList(), classpath); + return compileKotlin(fileName, output, Collections.emptyList(), classpath); } @NotNull @@ -301,7 +301,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { } private void doTestKotlinLibraryWithWrongMetadataVersionJs(@NotNull String libraryName, @NotNull String... additionalOptions) { - compileLibrary(new K2JSCompiler(), libraryName, new File(tmpdir, "library.js"), Collections.emptyList()); + compileLibrary(new K2JSCompiler(), libraryName, new File(tmpdir, "library.js"), Collections.emptyList()); File library = new File(tmpdir, "library.meta.js"); FilesKt.writeText(library, FilesKt.readText(library, Charsets.UTF_8).replace( @@ -327,7 +327,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { try { System.setProperty(TEST_IS_PRE_RELEASE_SYSTEM_PROPERTY, "true"); - compileLibrary(compiler, libraryName, destination, Collections.emptyList()); + compileLibrary(compiler, libraryName, destination, Collections.emptyList()); } finally { System.clearProperty(TEST_IS_PRE_RELEASE_SYSTEM_PROPERTY); diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.java index 4495dc35d03..fa1d7ff19e8 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.java +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.java @@ -139,9 +139,9 @@ public class SimpleTestClassModel implements TestClassModel { public Collection getMethods() { if (testMethods == null) { if (!rootFile.isDirectory()) { - testMethods = Collections.singletonList(new SimpleTestMethodModel(rootFile, rootFile, doTestMethodName, - filenamePattern, checkFilenameStartsLowerCase, - targetBackend)); + testMethods = Collections.singletonList(new SimpleTestMethodModel( + rootFile, rootFile, doTestMethodName, filenamePattern, checkFilenameStartsLowerCase, targetBackend + )); } else { List result = Lists.newArrayList(); diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generator/SingleClassTestModel.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SingleClassTestModel.java index ad74750362c..4faae61a4e8 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generator/SingleClassTestModel.java +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SingleClassTestModel.java @@ -88,17 +88,17 @@ public class SingleClassTestModel implements TestClassModel { ContainerUtil.sort(result, (o1, o2) -> StringUtil.compare(o1.getName(), o2.getName(), true)); - methods = Lists.newArrayList(result); + methods = Lists.newArrayList(result); } return methods; } @NotNull - protected Collection getTestMethodsFromFile(File file) { - return Collections.singletonList(new SimpleTestMethodModel(rootFile, file, doTestMethodName, - filenamePattern, checkFilenameStartsLowerCase, - targetBackend)); + private Collection getTestMethodsFromFile(File file) { + return Collections.singletonList(new SimpleTestMethodModel( + rootFile, file, doTestMethodName, filenamePattern, checkFilenameStartsLowerCase, targetBackend + )); } @Override diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java index d51ef0638a3..1499e66509d 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java @@ -125,7 +125,7 @@ public final class RhinoUtils { @Nullable Map variables, @NotNull EcmaVersion ecmaVersion) throws Exception { - runRhinoTest(fileNames, checker, variables, ecmaVersion, Collections.emptyList()); + runRhinoTest(fileNames, checker, variables, ecmaVersion, Collections.emptyList()); } public static void runRhinoTest(@NotNull List fileNames, diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/CallCounter.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/CallCounter.java index 6abd9dca5f2..5b728914733 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/CallCounter.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/CallCounter.java @@ -35,12 +35,12 @@ public class CallCounter extends RecursiveJsVisitor { @NotNull public static CallCounter countCalls(@NotNull JsNode node) { - return countCalls(node, Collections.emptySet()); + return countCalls(node, Collections.emptySet()); } @NotNull public static CallCounter countCalls(@NotNull JsNode node, @NotNull Set exceptFunctionNames) { - CallCounter visitor = new CallCounter(new HashSet<>(exceptFunctionNames), Collections.emptySet()); + CallCounter visitor = new CallCounter(new HashSet<>(exceptFunctionNames), Collections.emptySet()); node.accept(visitor); return visitor; @@ -48,7 +48,7 @@ public class CallCounter extends RecursiveJsVisitor { @NotNull public static CallCounter countCallsWithExcludedScopes(@NotNull JsNode node, @NotNull Set exceptScopes) { - CallCounter visitor = new CallCounter(Collections.emptySet(), new HashSet<>(exceptScopes)); + CallCounter visitor = new CallCounter(Collections.emptySet(), new HashSet<>(exceptScopes)); node.accept(visitor); return visitor; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java index cfd2018e577..31d01cdeb69 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java @@ -335,7 +335,7 @@ public class DirectiveTestUtils { public static void checkFunctionNotCalled(@NotNull JsNode node, @NotNull String functionName, @Nullable String exceptFunction) throws Exception { - Set excludedScopes = exceptFunction != null ? Collections.singleton(exceptFunction) : Collections.emptySet(); + Set excludedScopes = exceptFunction != null ? Collections.singleton(exceptFunction) : Collections.emptySet(); CallCounter counter = CallCounter.countCallsWithExcludedScopes(node, excludedScopes); int functionCalledCount = counter.getQualifiedCallsCount(functionName); diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java index a0d27f30661..0725ef68695 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java @@ -300,7 +300,7 @@ public final class Namer { @Nullable JsExpression argument, @NotNull TypeCheck metadata ) { - List arguments = argument != null ? Collections.singletonList(argument) : Collections.emptyList(); + List arguments = argument != null ? Collections.singletonList(argument) : Collections.emptyList(); return invokeFunctionAndSetTypeCheckMetadata(functionName, arguments, metadata); } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java index 639aa0515d0..a5b4c5bce2f 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java @@ -173,7 +173,7 @@ public final class ClassInitializerTranslator extends AbstractTranslator { private void mayBeAddCallToSuperMethod(JsFunction initializer) { if (classDeclaration.hasModifier(KtTokens.ENUM_KEYWORD)) { - addCallToSuperMethod(Collections.emptyList(), initializer); + addCallToSuperMethod(Collections.emptyList(), initializer); } else if (hasAncestorClass(bindingContext(), classDeclaration)) { ResolvedCall superCall = getSuperCall(bindingContext(), classDeclaration); diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java index e12c2f93ef8..7bbd8fe4fd0 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java @@ -314,7 +314,7 @@ public enum PrimitiveBinaryOperationFIF implements FunctionIntrinsicFactory { @NotNull @Override public JsExpression doApply(@NotNull JsExpression left, @NotNull JsExpression right, @NotNull TranslationContext context) { - return functionIntrinsic.doApply(left, TopLevelFIF.TO_STRING.apply(right, Collections.emptyList(), context), context); + return functionIntrinsic.doApply(left, TopLevelFIF.TO_STRING.apply(right, Collections.emptyList(), context), context); } } } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicIncrementTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicIncrementTranslator.java index 028a5c34039..729341eba83 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicIncrementTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicIncrementTranslator.java @@ -29,7 +29,6 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import java.util.Collections; - public final class IntrinsicIncrementTranslator extends IncrementTranslator { @NotNull private final ResolvedCall resolvedCall; @@ -44,6 +43,6 @@ public final class IntrinsicIncrementTranslator extends IncrementTranslator { protected JsExpression operationExpression(@NotNull TranslationContext context, @NotNull JsExpression receiver) { FunctionIntrinsic intrinsic = context.intrinsics().getFunctionIntrinsic(resolvedCall.getResultingDescriptor()); CallInfo callInfo = CallInfoKt.getCallInfo(context, resolvedCall, receiver); - return intrinsic.apply(callInfo, Collections.emptyList(), context); + return intrinsic.apply(callInfo, Collections.emptyList(), context); } } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTestGenerator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTestGenerator.java index 348ab40c490..4018086185a 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTestGenerator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTestGenerator.java @@ -16,12 +16,12 @@ package org.jetbrains.kotlin.js.translate.test; -import org.jetbrains.kotlin.js.backend.ast.JsExpression; -import org.jetbrains.kotlin.js.backend.ast.JsNew; -import org.jetbrains.kotlin.js.backend.ast.JsStringLiteral; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.js.backend.ast.JsExpression; +import org.jetbrains.kotlin.js.backend.ast.JsNew; +import org.jetbrains.kotlin.js.backend.ast.JsStringLiteral; import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.JetTestFunctionDetector; @@ -60,8 +60,8 @@ public final class JSTestGenerator { @NotNull ClassDescriptor classDescriptor, @NotNull JSTester tester) { JsExpression expression = ReferenceTranslator.translateAsValueReference(classDescriptor, context); JsNew testClass = new JsNew(expression); - JsExpression functionToTestCall = CallTranslator.INSTANCE.buildCall(context, functionDescriptor, - Collections.emptyList(), testClass); + JsExpression functionToTestCall = + CallTranslator.INSTANCE.buildCall(context, functionDescriptor, Collections.emptyList(), testClass); JsStringLiteral testName = context.program().getStringLiteral(classDescriptor.getName() + "." + functionDescriptor.getName()); tester.constructTestMethodInvocation(functionToTestCall, testName); }