From 34f05761358a6bb015841975b2ba37a55bff4dfa Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 1 Apr 2017 00:23:37 +0300 Subject: [PATCH] Invoke "remove unnecessary final" intention in compiler modules --- .../tests/CodegenTestsOnAndroidRunner.java | 2 +- .../kotlin/android/tests/run/RunUtils.java | 8 +- .../kotlin/codegen/AnnotationCodegen.java | 16 +- .../org/jetbrains/kotlin/codegen/AsmUtil.java | 16 +- .../kotlin/codegen/ClassBuilderFactories.java | 2 +- .../kotlin/codegen/ClassFileFactory.java | 4 +- .../kotlin/codegen/ClosureCodegen.java | 6 +- .../kotlin/codegen/ExpressionCodegen.java | 175 +++++++++--------- .../kotlin/codegen/FunctionCodegen.java | 14 +- .../FunctionReferenceGenerationStrategy.java | 6 +- .../codegen/ImplementationBodyCodegen.java | 22 +-- .../kotlin/codegen/MemberCodegen.java | 12 +- .../kotlin/codegen/PackagePartCodegen.java | 4 +- .../kotlin/codegen/PropertyCodegen.java | 10 +- .../kotlin/codegen/ScriptCodegen.java | 2 +- .../inline/AnonymousObjectTransformer.java | 12 +- .../kotlin/codegen/inline/InlineCodegen.java | 18 +- .../codegen/inline/InlineCodegenUtil.java | 10 +- .../MaxStackFrameSizeAndLocalsCalculator.java | 2 +- .../RedundantBoxingMethodTransformer.java | 2 +- .../codegen/state/KotlinTypeMapper.java | 2 +- .../parser/com/sampullara/cli/Args.java | 2 +- .../jetbrains/kotlin/cli/js/K2JSCompiler.java | 4 +- .../jvm/compiler/CompileEnvironmentUtil.java | 10 +- .../java/sam/SingleAbstractMethodUtils.java | 8 +- .../load/kotlin/FileBasedKotlinClass.java | 20 +- .../resolve/jvm/KotlinJavaPsiFacade.java | 4 +- .../SignaturesPropagationData.java | 4 +- .../kotlin/cfg/pseudocode/PseudocodeUtil.java | 2 +- .../kotlin/checkers/CheckerTestUtil.java | 10 +- .../kotlin/checkers/DebugInfoUtil.java | 6 +- .../parsing/AbstractTokenStreamPredicate.java | 2 +- .../kotlin/parsing/KotlinParsing.java | 2 +- .../org/jetbrains/kotlin/psi/KtPsiUtil.java | 2 +- .../psi/stubs/elements/KtStubElementType.java | 2 +- .../kotlin/resolve/AnalyzingUtils.java | 2 +- .../kotlin/resolve/BindingContextUtils.java | 2 +- .../kotlin/resolve/BodyResolver.java | 32 ++-- .../kotlin/resolve/DescriptorResolver.java | 46 ++--- .../resolve/FunctionDescriptorUtil.java | 2 +- .../kotlin/resolve/calls/CallResolver.java | 24 +-- .../kotlin/resolve/calls/util/CallMaker.java | 4 +- .../resolve/lazy/LazyDeclarationResolver.java | 2 +- .../kotlin/resolve/lazy/ResolveSession.java | 2 +- .../FileBasedDeclarationProviderFactory.java | 2 +- .../lazy/descriptors/LazyClassDescriptor.java | 10 +- .../kotlin/types/BoundsSubstitutor.java | 4 +- .../kotlin/types/CommonSupertypes.java | 6 +- .../kotlin/types/TypeIntersector.java | 2 +- .../BasicExpressionTypingVisitor.java | 19 +- .../ControlStructureTypingUtils.java | 15 +- .../ControlStructureTypingVisitor.java | 4 +- .../types/expressions/DataFlowAnalyzer.java | 8 +- .../expressions/ExpressionTypingServices.java | 4 +- .../expressions/ExpressionTypingUtils.java | 4 +- .../ExpressionTypingVisitorDispatcher.java | 2 +- .../util/slicedMap/TrackingSlicedMap.java | 2 +- .../builder/ClsWrapperStubPsiFactory.java | 4 +- .../asJava/elements/KtLightParameter.java | 2 +- .../asJava/finder/JavaElementFinder.java | 6 +- .../InterceptionInstrumenter.java | 28 +-- .../kotlin/preloading/Preloader.java | 12 +- .../kotlin/resolve/scopes/ScopeUtils.java | 2 +- .../checkers/KotlinMultiFileTestWithJava.java | 2 +- .../codegen/AbstractBlackBoxCodegenTest.java | 2 +- .../AbstractCheckLocalVariablesTableTest.java | 4 +- .../codegen/AbstractLineNumberTest.java | 8 +- ...AbstractTopLevelMembersInvocationTest.java | 2 +- .../kotlin/codegen/CodegenTestCase.java | 2 +- .../jvm/compiler/AbstractLoadJavaTest.java | 4 +- .../jvm/compiler/ExpectedLoadErrorsUtil.java | 2 +- .../jvm/compiler/LoadDescriptorUtil.java | 2 +- ...stractAnnotationDescriptorResolveTest.java | 2 +- .../kotlin/test/KotlinTestUtils.java | 10 +- .../test/testFramework/KtUsefulTestCase.java | 2 +- .../kotlin/cfg/AbstractControlFlowTest.java | 2 +- .../kotlin/cfg/AbstractDataFlowTest.java | 10 +- .../kotlin/cfg/CFGraphToDotFilePrinter.java | 2 +- .../kotlin/checkers/CheckerTestUtilTest.java | 22 +-- .../jetbrains/kotlin/cli/AbstractCliTest.java | 2 +- .../GenerateNotNullAssertionsTest.java | 2 +- .../kotlin/codegen/InnerClassInfoGenTest.java | 4 +- .../kotlin/codegen/OuterClassGenTest.java | 2 +- .../kotlin/codegen/SourceInfoGenTest.java | 2 +- ...ompileKotlinAgainstCustomBinariesTest.java | 10 +- .../kotlin/storage/StorageManagerTest.java | 10 +- .../RecursiveDescriptorProcessorTest.java | 2 +- .../types/DefaultModalityModifiersTest.java | 2 +- .../kotlin/types/TypeSubstitutorTest.java | 2 +- .../tests/generator/SingleClassTestModel.java | 2 +- .../kotlin/js/patterns/PatternBuilder.java | 4 +- .../semantics/TranslatorTestCaseBuilder.java | 6 +- .../js/test/utils/DirectiveTestUtils.java | 2 +- .../kotlin/js/facade/MainCallParameters.java | 2 +- .../js/translate/context/StaticContext.java | 2 +- .../factories/PrimitiveUnaryOperationFIF.java | 2 +- 96 files changed, 407 insertions(+), 404 deletions(-) diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.java b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.java index a03b673216f..617c54ada1a 100644 --- a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.java +++ b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidRunner.java @@ -151,7 +151,7 @@ public class CodegenTestsOnAndroidRunner { for (int i = 0; i < testCases.getLength(); i++) { Element item = (Element) testCases.item(i); - final NodeList failure = item.getElementsByTagName("failure"); + NodeList failure = item.getElementsByTagName("failure"); String name = item.getAttribute("name"); String clazz = item.getAttribute("classname"); diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/run/RunUtils.java b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/run/RunUtils.java index de80340ce44..2cc662bd7c6 100644 --- a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/run/RunUtils.java +++ b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/run/RunUtils.java @@ -86,7 +86,7 @@ public class RunUtils { return run(settings); } - public static void executeOnSeparateThread(@NotNull final RunSettings settings) { + public static void executeOnSeparateThread(@NotNull RunSettings settings) { assert !settings.waitForEnd : "Use execute() instead"; Thread t = new Thread(new Runnable() { @Override @@ -98,10 +98,10 @@ public class RunUtils { t.start(); } - private static RunResult run(final RunSettings settings) { + private static RunResult run(RunSettings settings) { System.out.println("RUN COMMAND: " + settings); - final StringBuilder stdOut = new StringBuilder(); - final StringBuilder stdErr = new StringBuilder(); + StringBuilder stdOut = new StringBuilder(); + StringBuilder stdErr = new StringBuilder(); OSProcessHandler handler; try { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java index ea7b46873ed..fc3473c3a67 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java @@ -308,9 +308,9 @@ public abstract class AnnotationCodegen { } private void genCompileTimeValue( - @Nullable final String name, + @Nullable String name, @NotNull ConstantValue value, - @NotNull final AnnotationVisitor annotationVisitor + @NotNull AnnotationVisitor annotationVisitor ) { AnnotationArgumentVisitor argumentVisitor = new AnnotationArgumentVisitor() { @Override @@ -485,7 +485,7 @@ public abstract class AnnotationCodegen { abstract AnnotationVisitor visitAnnotation(String descr, boolean visible); public static AnnotationCodegen forClass( - final @NotNull ClassVisitor cv, + @NotNull ClassVisitor cv, @NotNull InnerClassConsumer innerClassConsumer, @NotNull KotlinTypeMapper mapper ) { @@ -499,7 +499,7 @@ public abstract class AnnotationCodegen { } public static AnnotationCodegen forMethod( - final @NotNull MethodVisitor mv, + @NotNull MethodVisitor mv, @NotNull InnerClassConsumer innerClassConsumer, @NotNull KotlinTypeMapper mapper ) { @@ -513,7 +513,7 @@ public abstract class AnnotationCodegen { } public static AnnotationCodegen forField( - final @NotNull FieldVisitor fv, + @NotNull FieldVisitor fv, @NotNull InnerClassConsumer innerClassConsumer, @NotNull KotlinTypeMapper mapper ) { @@ -527,8 +527,8 @@ public abstract class AnnotationCodegen { } public static AnnotationCodegen forParameter( - final int parameter, - final @NotNull MethodVisitor mv, + int parameter, + @NotNull MethodVisitor mv, @NotNull InnerClassConsumer innerClassConsumer, @NotNull KotlinTypeMapper mapper ) { @@ -542,7 +542,7 @@ public abstract class AnnotationCodegen { } public static AnnotationCodegen forAnnotationDefaultValue( - final @NotNull MethodVisitor mv, + @NotNull MethodVisitor mv, @NotNull InnerClassConsumer innerClassConsumer, @NotNull KotlinTypeMapper mapper ) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java index fc383013e99..c91104347d9 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java @@ -500,7 +500,7 @@ public class AsmUtil { v.invokevirtual("java/lang/StringBuilder", "append", "(" + type.getDescriptor() + ")Ljava/lang/StringBuilder;", false); } - public static StackValue genToString(final StackValue receiver, final Type receiverType) { + public static StackValue genToString(StackValue receiver, Type receiverType) { return StackValue.operation(JAVA_STRING_TYPE, new Function1() { @Override public Unit invoke(InstructionAdapter v) { @@ -563,12 +563,12 @@ public class AsmUtil { @NotNull public static StackValue genEqualsForExpressionsOnStack( - final @NotNull IElementType opToken, - final @NotNull StackValue left, - final @NotNull StackValue right + @NotNull IElementType opToken, + @NotNull StackValue left, + @NotNull StackValue right ) { - final Type leftType = left.type; - final Type rightType = right.type; + Type leftType = left.type; + Type rightType = right.type; if (isPrimitive(leftType) && leftType == rightType) { return StackValue.cmp(opToken, leftType, left, right); } @@ -686,8 +686,8 @@ public class AsmUtil { @NotNull public static StackValue genNotNullAssertions( @NotNull GenerationState state, - @NotNull final StackValue stackValue, - @Nullable final RuntimeAssertionInfo runtimeAssertionInfo + @NotNull StackValue stackValue, + @Nullable RuntimeAssertionInfo runtimeAssertionInfo ) { if (state.isCallAssertionsDisabled()) return stackValue; if (runtimeAssertionInfo == null || !runtimeAssertionInfo.getNeedNotNullAssertion()) return stackValue; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderFactories.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderFactories.java index 514053bef06..735bf6d87d6 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderFactories.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderFactories.java @@ -101,7 +101,7 @@ public class ClassBuilderFactories { } @NotNull - public static ClassBuilderFactory binaries(final boolean generateSourceRetentionAnnotations) { + public static ClassBuilderFactory binaries(boolean generateSourceRetentionAnnotations) { return new ClassBuilderFactory() { @NotNull @Override diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java index 61bd2fef038..630ea34ceda 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java @@ -94,7 +94,7 @@ public class ClassFileFactory implements OutputFileCollection { } private void writeModuleMappings() { - final JvmPackageTable.PackageTable.Builder builder = JvmPackageTable.PackageTable.newBuilder(); + JvmPackageTable.PackageTable.Builder builder = JvmPackageTable.PackageTable.newBuilder(); String outputFilePath = getMappingFileName(state.getModuleName()); for (PackageParts part : ClassFileUtilsKt.addCompiledPartsAndSort(partsGroupedByPackage.values(), state)) { @@ -182,7 +182,7 @@ public class ClassFileFactory implements OutputFileCollection { } private PackagePartRegistry buildNewPackagePartRegistry(@NotNull FqName packageFqName) { - final String packageFqNameAsString = packageFqName.asString(); + String packageFqNameAsString = packageFqName.asString(); return new PackagePartRegistry() { @Override public void addPart(@NotNull String partShortName, @Nullable String facadeShortName) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java index 9d1c5057554..cc161a4124d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java @@ -236,10 +236,10 @@ public class ClosureCodegen extends MemberCodegen { assert method != null : "No method for " + frontendFunDescriptor; v.getSerializationBindings().put(METHOD_FOR_FUNCTION, freeLambdaDescriptor, method); - final DescriptorSerializer serializer = + DescriptorSerializer serializer = DescriptorSerializer.createForLambda(new JvmSerializerExtension(v.getSerializationBindings(), state)); - final ProtoBuf.Function functionProto = serializer.functionProto(freeLambdaDescriptor).build(); + ProtoBuf.Function functionProto = serializer.functionProto(freeLambdaDescriptor).build(); WriteAnnotationUtilKt.writeKotlinMetadata(v, state, KotlinClassHeader.Kind.SYNTHETIC_CLASS, 0, new Function1() { @Override @@ -281,7 +281,7 @@ public class ClosureCodegen extends MemberCodegen { } @NotNull - public StackValue putInstanceOnStack(@NotNull final ExpressionCodegen codegen, @Nullable final StackValue functionReferenceReceiver) { + public StackValue putInstanceOnStack(@NotNull ExpressionCodegen codegen, @Nullable StackValue functionReferenceReceiver) { return StackValue.operation( functionReferenceTarget != null ? K_FUNCTION : asmType, new Function1() { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index 6a0cae2e595..e11f39491df 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -480,12 +480,12 @@ public class ExpressionCodegen extends KtVisitor impleme return generateIfExpression(expression, false); } - /* package */ StackValue generateIfExpression(@NotNull final KtIfExpression expression, final boolean isStatement) { - final Type asmType = isStatement ? Type.VOID_TYPE : expressionTypeForBranchingOperation(expression); - final StackValue condition = gen(expression.getCondition()); + /* package */ StackValue generateIfExpression(@NotNull KtIfExpression expression, boolean isStatement) { + Type asmType = isStatement ? Type.VOID_TYPE : expressionTypeForBranchingOperation(expression); + StackValue condition = gen(expression.getCondition()); - final KtExpression thenExpression = expression.getThen(); - final KtExpression elseExpression = expression.getElse(); + KtExpression thenExpression = expression.getThen(); + KtExpression elseExpression = expression.getElse(); if (isEmptyExpression(thenExpression)) { if (isEmptyExpression(elseExpression)) { @@ -522,7 +522,7 @@ public class ExpressionCodegen extends KtVisitor impleme } @Override - public StackValue visitWhileExpression(@NotNull final KtWhileExpression expression, StackValue receiver) { + public StackValue visitWhileExpression(@NotNull KtWhileExpression expression, StackValue receiver) { return StackValue.operation(Type.VOID_TYPE, new Function1() { @Override public Unit invoke(InstructionAdapter adapter) { @@ -553,7 +553,7 @@ public class ExpressionCodegen extends KtVisitor impleme } @Override - public StackValue visitDoWhileExpression(@NotNull final KtDoWhileExpression expression, StackValue receiver) { + public StackValue visitDoWhileExpression(@NotNull KtDoWhileExpression expression, StackValue receiver) { return StackValue.operation(Type.VOID_TYPE, new Function1() { @Override public Unit invoke(InstructionAdapter adapter) { @@ -611,7 +611,7 @@ public class ExpressionCodegen extends KtVisitor impleme } @Override - public StackValue visitForExpression(@NotNull final KtForExpression forExpression, StackValue receiver) { + public StackValue visitForExpression(@NotNull KtForExpression forExpression, StackValue receiver) { return StackValue.operation(Type.VOID_TYPE, new Function1() { @Override public Unit invoke(InstructionAdapter adapter) { @@ -765,7 +765,7 @@ public class ExpressionCodegen extends KtVisitor impleme } else { // E e = tmp.next() - final VariableDescriptor parameterDescriptor = bindingContext.get(VALUE_PARAMETER, loopParameter); + VariableDescriptor parameterDescriptor = bindingContext.get(VALUE_PARAMETER, loopParameter); loopParameterType = asmType(parameterDescriptor.getType()); loopParameterVar = myFrameMap.enter(parameterDescriptor, loopParameterType); scheduleLeaveVariable(new Runnable() { @@ -796,7 +796,7 @@ public class ExpressionCodegen extends KtVisitor impleme } private void generateDestructuringDeclaration(@NotNull KtDestructuringDeclaration destructuringDeclaration) { - final Label destructuringStartLabel = new Label(); + Label destructuringStartLabel = new Label(); List componentDescriptors = CollectionsKt.map( @@ -809,9 +809,9 @@ public class ExpressionCodegen extends KtVisitor impleme } ); - for (final VariableDescriptor componentDescriptor : CodegenUtilKt.filterOutDescriptorsWithSpecialNames(componentDescriptors)) { - @SuppressWarnings("ConstantConditions") final Type componentAsmType = asmType(componentDescriptor.getReturnType()); - final int componentVarIndex = myFrameMap.enter(componentDescriptor, componentAsmType); + for (VariableDescriptor componentDescriptor : CodegenUtilKt.filterOutDescriptorsWithSpecialNames(componentDescriptors)) { + @SuppressWarnings("ConstantConditions") Type componentAsmType = asmType(componentDescriptor.getReturnType()); + int componentVarIndex = myFrameMap.enter(componentDescriptor, componentAsmType); scheduleLeaveVariable(new Runnable() { @Override public void run() { @@ -844,7 +844,7 @@ public class ExpressionCodegen extends KtVisitor impleme leaveVariableTasks.add(runnable); } - protected int createLoopTempVariable(final Type type) { + protected int createLoopTempVariable(Type type) { int varIndex = myFrameMap.enterTemp(type); scheduleLeaveVariable(new Runnable() { @Override @@ -1367,7 +1367,7 @@ public class ExpressionCodegen extends KtVisitor impleme private StackValue generateBreakOrContinueExpression( @NotNull KtExpressionWithLabel expression, boolean isBreak, - final @NotNull Label afterBreakContinueLabel + @NotNull Label afterBreakContinueLabel ) { assert expression instanceof KtContinueExpression || expression instanceof KtBreakExpression; @@ -1389,7 +1389,7 @@ public class ExpressionCodegen extends KtVisitor impleme if (labelElement == null || loopBlockStackElement.targetLabel != null && labelElement.getReferencedName().equals(loopBlockStackElement.targetLabel.getReferencedName())) { - final Label label = isBreak ? loopBlockStackElement.breakLabel : loopBlockStackElement.continueLabel; + Label label = isBreak ? loopBlockStackElement.breakLabel : loopBlockStackElement.continueLabel; return StackValue.operation(Type.VOID_TYPE, new Function1() { @Override public Unit invoke(InstructionAdapter adapter) { @@ -1412,11 +1412,11 @@ public class ExpressionCodegen extends KtVisitor impleme } private StackValue generateSingleBranchIf( - final StackValue condition, - final KtIfExpression ifExpression, - final KtExpression expression, - final boolean inverse, - final boolean isStatement + StackValue condition, + KtIfExpression ifExpression, + KtExpression expression, + boolean inverse, + boolean isStatement ) { Type targetType = isStatement ? Type.VOID_TYPE : expressionType(ifExpression); return StackValue.operation(targetType, new Function1() { @@ -1476,7 +1476,7 @@ public class ExpressionCodegen extends KtVisitor impleme @Nullable public static ConstantValue getCompileTimeConstant( @NotNull KtExpression expression, - @NotNull final BindingContext bindingContext, + @NotNull BindingContext bindingContext, boolean takeUpConstValsAsConst, boolean shouldInlineConstVals ) { @@ -1486,7 +1486,7 @@ public class ExpressionCodegen extends KtVisitor impleme } if (!shouldInlineConstVals && !takeUpConstValsAsConst && compileTimeValue.getUsesVariableAsConstant()) { - final Ref containsNonInlinedVals = new Ref(false); + Ref containsNonInlinedVals = new Ref(false); KtVisitor constantChecker = new KtVisitor() { @Override public Object visitSimpleNameExpression(@NotNull KtSimpleNameExpression expression, Object data) { @@ -1528,7 +1528,7 @@ public class ExpressionCodegen extends KtVisitor impleme @Override public StackValue visitStringTemplateExpression(@NotNull KtStringTemplateExpression expression, StackValue receiver) { StringBuilder constantValue = new StringBuilder(""); - final KtStringTemplateEntry[] entries = expression.getEntries(); + KtStringTemplateEntry[] entries = expression.getEntries(); if (entries.length == 1 && entries[0] instanceof KtStringTemplateEntryWithExpression) { KtExpression expr = entries[0].getExpression(); @@ -1666,9 +1666,9 @@ public class ExpressionCodegen extends KtVisitor impleme @Override public StackValue visitObjectLiteralExpression(@NotNull KtObjectLiteralExpression expression, StackValue receiver) { - final ObjectLiteralResult objectLiteralResult = generateObjectLiteral(expression); - final ClassDescriptor classDescriptor = objectLiteralResult.classDescriptor; - final Type type = typeMapper.mapType(classDescriptor); + ObjectLiteralResult objectLiteralResult = generateObjectLiteral(expression); + ClassDescriptor classDescriptor = objectLiteralResult.classDescriptor; + Type type = typeMapper.mapType(classDescriptor); return StackValue.operation(type, new Function1() { @Override @@ -1824,11 +1824,11 @@ public class ExpressionCodegen extends KtVisitor impleme @NotNull List statements, boolean isStatement, @Nullable Label labelBeforeLastExpression, - @Nullable final Label labelBlockEnd + @Nullable Label labelBlockEnd ) { - final Label blockEnd = labelBlockEnd != null ? labelBlockEnd : new Label(); + Label blockEnd = labelBlockEnd != null ? labelBlockEnd : new Label(); - final List> leaveTasks = Lists.newArrayList(); + List> leaveTasks = Lists.newArrayList(); @Nullable StackValue blockResult = null; @@ -1984,18 +1984,18 @@ public class ExpressionCodegen extends KtVisitor impleme private void addLeaveTaskToRemoveLocalVariableFromFrameMap( @NotNull KtVariableDeclaration statement, - final Label blockEnd, + Label blockEnd, @NotNull List> leaveTasks ) { - final VariableDescriptor variableDescriptor = getVariableDescriptorNotNull(statement); + VariableDescriptor variableDescriptor = getVariableDescriptorNotNull(statement); // Do not modify local variables table for variables like _ in val (_, y) = pair // They always will have special name if (variableDescriptor.getName().isSpecial()) return; - final Type type = getVariableType(variableDescriptor); + Type type = getVariableType(variableDescriptor); - final Label scopeStart = new Label(); + Label scopeStart = new Label(); v.mark(scopeStart); leaveTasks.add(new Function() { @@ -2018,16 +2018,16 @@ public class ExpressionCodegen extends KtVisitor impleme } private void addLeaveTaskToRemoveNamedFunctionFromFrameMap( - @NotNull final KtNamedFunction statement, - final Label blockEnd, + @NotNull KtNamedFunction statement, + Label blockEnd, @NotNull List> leaveTasks ) { - final FunctionDescriptor functionDescriptor = (FunctionDescriptor) bindingContext.get(DECLARATION_TO_DESCRIPTOR, statement); + FunctionDescriptor functionDescriptor = (FunctionDescriptor) bindingContext.get(DECLARATION_TO_DESCRIPTOR, statement); assert functionDescriptor != null; - final Type type = asmTypeForAnonymousClass(bindingContext, functionDescriptor); + Type type = asmTypeForAnonymousClass(bindingContext, functionDescriptor); - final Label scopeStart = new Label(); + Label scopeStart = new Label(); v.mark(scopeStart); leaveTasks.add(new Function() { @@ -2159,7 +2159,7 @@ public class ExpressionCodegen extends KtVisitor impleme } @Override - public StackValue visitReturnExpression(@NotNull final KtReturnExpression expression, final StackValue receiver) { + public StackValue visitReturnExpression(@NotNull KtReturnExpression expression, StackValue receiver) { return StackValue.operation(Type.VOID_TYPE, new Function1() { @Override public Unit invoke(InstructionAdapter adapter) { @@ -2684,10 +2684,10 @@ public class ExpressionCodegen extends KtVisitor impleme @Nullable private StackValue genSamInterfaceValue( @NotNull KtExpression probablyParenthesizedExpression, - @NotNull final KtVisitor visitor + @NotNull KtVisitor visitor ) { - final KtExpression expression = KtPsiUtil.deparenthesize(probablyParenthesizedExpression); - final SamType samType = bindingContext.get(SAM_VALUE, probablyParenthesizedExpression); + KtExpression expression = KtPsiUtil.deparenthesize(probablyParenthesizedExpression); + SamType samType = bindingContext.get(SAM_VALUE, probablyParenthesizedExpression); if (samType == null || expression == null) return null; if (expression instanceof KtLambdaExpression) { @@ -2698,7 +2698,7 @@ public class ExpressionCodegen extends KtVisitor impleme return genClosure((KtNamedFunction) expression, samType); } - final Type asmType = + Type asmType = state.getSamWrapperClasses().getSamWrapperClass(samType, expression.getContainingKtFile(), this); return StackValue.operation(asmType, new Function1() { @@ -3391,8 +3391,8 @@ public class ExpressionCodegen extends KtVisitor impleme @NotNull KtElement element, @NotNull VariableDescriptor variableDescriptor, @NotNull VariableDescriptor target, - @Nullable final Type receiverAsmType, - @Nullable final StackValue receiverValue + @Nullable Type receiverAsmType, + @Nullable StackValue receiverValue ) { ClassDescriptor classDescriptor = CodegenBinding.anonymousClassForCallable(bindingContext, variableDescriptor); @@ -3420,9 +3420,9 @@ public class ExpressionCodegen extends KtVisitor impleme @NotNull public StackValue generateClassLiteralReference( - @NotNull final DoubleColonLHS lhs, - @Nullable final KtExpression receiverExpression, - final boolean wrapIntoKClass + @NotNull DoubleColonLHS lhs, + @Nullable KtExpression receiverExpression, + boolean wrapIntoKClass ) { return StackValue.operation(wrapIntoKClass ? K_CLASS_TYPE : JAVA_CLASS_TYPE, new Function1() { @Override @@ -3549,11 +3549,11 @@ public class ExpressionCodegen extends KtVisitor impleme } } - private StackValue generateIn(final StackValue leftValue, KtExpression rangeExpression, final KtSimpleNameExpression operationReference) { - final KtExpression deparenthesized = KtPsiUtil.deparenthesize(rangeExpression); + private StackValue generateIn(StackValue leftValue, KtExpression rangeExpression, KtSimpleNameExpression operationReference) { + KtExpression deparenthesized = KtPsiUtil.deparenthesize(rangeExpression); assert deparenthesized != null : "For with empty range expression"; - final boolean isInverted = operationReference.getReferencedNameElementType() == KtTokens.NOT_IN; + boolean isInverted = operationReference.getReferencedNameElementType() == KtTokens.NOT_IN; return StackValue.operation(Type.BOOLEAN_TYPE, new Function1() { @Override public Unit invoke(InstructionAdapter v) { @@ -3670,17 +3670,17 @@ public class ExpressionCodegen extends KtVisitor impleme /*tries to use IEEE 754 arithmetic*/ private StackValue genEqualsForExpressionsPreferIEEE754Arithmetic( - @Nullable final KtExpression left, - @Nullable final KtExpression right, - @NotNull final IElementType opToken, + @Nullable KtExpression left, + @Nullable KtExpression right, + @NotNull IElementType opToken, @NotNull Type leftType, @NotNull Type rightType, - @Nullable final StackValue pregeneratedLeft + @Nullable StackValue pregeneratedLeft ) { assert (opToken == KtTokens.EQEQ || opToken == KtTokens.EXCLEQ) : "Optoken should be '==' or '!=', but: " + opToken; - final TypeAndNullability left754Type = calcTypeForIEEE754ArithmeticIfNeeded(left); - final TypeAndNullability right754Type = calcTypeForIEEE754ArithmeticIfNeeded(right); + TypeAndNullability left754Type = calcTypeForIEEE754ArithmeticIfNeeded(left); + TypeAndNullability right754Type = calcTypeForIEEE754ArithmeticIfNeeded(right); if (left754Type != null && right754Type != null && left754Type.type.equals(right754Type.type)) { //check nullability cause there is some optimizations in codegen for non-nullable case if (left754Type.isNullable || right754Type.isNullable) { @@ -3849,17 +3849,16 @@ public class ExpressionCodegen extends KtVisitor impleme return StackValue.compareWithNull(gen(exp), (KtTokens.EQEQ == opToken || KtTokens.EQEQEQ == opToken) ? IFNONNULL : IFNULL); } - private StackValue generateElvis(@NotNull final KtBinaryExpression expression) { + private StackValue generateElvis(@NotNull KtBinaryExpression expression) { KtExpression left = expression.getLeft(); - final Type exprType = expressionType(expression); - final Type leftType = expressionType(left); - - final Label ifNull = new Label(); + Type exprType = expressionType(expression); + Type leftType = expressionType(left); + Label ifNull = new Label(); assert left != null : "left expression in elvis should be not null: " + expression.getText(); - final StackValue value = generateExpressionWithNullFallback(left, ifNull); + StackValue value = generateExpressionWithNullFallback(left, ifNull); if (isPrimitive(leftType)) { return value; @@ -3918,7 +3917,7 @@ public class ExpressionCodegen extends KtVisitor impleme return CodegenUtilKt.calcTypeForIEEE754ArithmeticIfNeeded(expression, bindingContext, context.getFunctionDescriptor()); } - private StackValue generateAssignmentExpression(final KtBinaryExpression expression) { + private StackValue generateAssignmentExpression(KtBinaryExpression expression) { return StackValue.operation(Type.VOID_TYPE, new Function1() { @Override public Unit invoke(InstructionAdapter adapter) { @@ -3932,7 +3931,7 @@ public class ExpressionCodegen extends KtVisitor impleme }); } - private StackValue generateAugmentedAssignment(final KtBinaryExpression expression) { + private StackValue generateAugmentedAssignment(KtBinaryExpression expression) { return StackValue.operation(Type.VOID_TYPE, new Function1() { @Override public Unit invoke(InstructionAdapter adapter) { @@ -4039,9 +4038,9 @@ public class ExpressionCodegen extends KtVisitor impleme } @Override - public StackValue visitPostfixExpression(@NotNull final KtPostfixExpression expression, StackValue receiver) { + public StackValue visitPostfixExpression(@NotNull KtPostfixExpression expression, StackValue receiver) { if (expression.getOperationReference().getReferencedNameElementType() == KtTokens.EXCLEXCL) { - final StackValue base = genQualified(receiver, expression.getBaseExpression()); + StackValue base = genQualified(receiver, expression.getBaseExpression()); if (isPrimitive(base.type)) { return base; } else { @@ -4062,19 +4061,19 @@ public class ExpressionCodegen extends KtVisitor impleme DeclarationDescriptor originalOperation = bindingContext.get(REFERENCE_TARGET, expression.getOperationReference()); String originalOperationName = originalOperation != null ? originalOperation.getName().asString() : null; - final ResolvedCall resolvedCall = CallUtilKt.getResolvedCallWithAssert(expression, bindingContext); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCallWithAssert(expression, bindingContext); DeclarationDescriptor op = resolvedCall.getResultingDescriptor(); if (!(op instanceof FunctionDescriptor) || originalOperation == null) { throw new UnsupportedOperationException("Don't know how to generate this postfix expression: " + originalOperationName + " " + op); } - final Type asmResultType = expressionType(expression); - final Type asmBaseType = expressionType(expression.getBaseExpression()); + Type asmResultType = expressionType(expression); + Type asmBaseType = expressionType(expression.getBaseExpression()); DeclarationDescriptor cls = op.getContainingDeclaration(); - final int increment; + int increment; if (originalOperationName.equals("inc")) { increment = 1; } @@ -4085,7 +4084,7 @@ public class ExpressionCodegen extends KtVisitor impleme throw new UnsupportedOperationException("Unsupported postfix operation: " + originalOperationName + " " + op); } - final boolean isPrimitiveNumberClassDescriptor = isPrimitiveNumberClassDescriptor(cls); + boolean isPrimitiveNumberClassDescriptor = isPrimitiveNumberClassDescriptor(cls); if (isPrimitiveNumberClassDescriptor && AsmUtil.isPrimitive(asmBaseType)) { KtExpression operand = expression.getBaseExpression(); // Optimization for j = i++, when j and i are Int without any smart cast: we just work with primitive int @@ -4255,7 +4254,7 @@ public class ExpressionCodegen extends KtVisitor impleme @NotNull private Type generateProvideDelegateCallForLocalVariable( @NotNull StackValue initializer, - final StackValue metadataValue, + StackValue metadataValue, ResolvedCall provideDelegateResolvedCall ) { StackValue provideDelegateReceiver = StackValue.onStack(initializer.type); @@ -4340,7 +4339,7 @@ public class ExpressionCodegen extends KtVisitor impleme } @NotNull - public StackValue generateConstructorCall(@NotNull final ResolvedCall resolvedCall, @NotNull final Type objectType) { + public StackValue generateConstructorCall(@NotNull ResolvedCall resolvedCall, @NotNull Type objectType) { return StackValue.functionCall(objectType, new Function1() { @Override public Unit invoke(InstructionAdapter v) { @@ -4374,13 +4373,13 @@ public class ExpressionCodegen extends KtVisitor impleme } public StackValue generateNewArray( - @NotNull KtCallExpression expression, @NotNull final KotlinType arrayType, @NotNull ResolvedCall resolvedCall + @NotNull KtCallExpression expression, @NotNull KotlinType arrayType, @NotNull ResolvedCall resolvedCall ) { List args = expression.getValueArguments(); assert args.size() == 1 || args.size() == 2 : "Unknown constructor called: " + args.size() + " arguments"; if (args.size() == 1) { - final KtExpression sizeExpression = args.get(0).getArgumentExpression(); + KtExpression sizeExpression = args.get(0).getArgumentExpression(); return StackValue.operation(typeMapper.mapType(arrayType), new Function1() { @Override public Unit invoke(InstructionAdapter v) { @@ -4481,7 +4480,7 @@ public class ExpressionCodegen extends KtVisitor impleme } @Override - public StackValue visitThrowExpression(@NotNull final KtThrowExpression expression, StackValue receiver) { + public StackValue visitThrowExpression(@NotNull KtThrowExpression expression, StackValue receiver) { return StackValue.operation(Type.VOID_TYPE, new Function1() { @Override public Unit invoke(InstructionAdapter adapter) { @@ -4510,13 +4509,13 @@ public class ExpressionCodegen extends KtVisitor impleme return generateTryExpression(expression, false); } - public StackValue generateTryExpression(final KtTryExpression expression, final boolean isStatement) { + public StackValue generateTryExpression(KtTryExpression expression, boolean isStatement) { /* The "returned" value of try expression with no finally is either the last expression in the try block or the last expression in the catch block (or blocks). */ - final Type expectedAsmType = isStatement ? Type.VOID_TYPE : expressionTypeForBranchingOperation(expression); + Type expectedAsmType = isStatement ? Type.VOID_TYPE : expressionTypeForBranchingOperation(expression); return StackValue.operation(expectedAsmType, new Function1() { @Override @@ -4662,12 +4661,12 @@ The "returned" value of try expression with no finally is either the last expres @Override public StackValue visitBinaryWithTypeRHSExpression(@NotNull KtBinaryExpressionWithTypeRHS expression, StackValue receiver) { KtExpression left = expression.getLeft(); - final IElementType opToken = expression.getOperationReference().getReferencedNameElementType(); + IElementType opToken = expression.getOperationReference().getReferencedNameElementType(); - final KotlinType rightType = bindingContext.get(TYPE, expression.getRight()); + KotlinType rightType = bindingContext.get(TYPE, expression.getRight()); assert rightType != null; - final StackValue value = genQualified(receiver, left); + StackValue value = genQualified(receiver, left); return StackValue.operation(boxType(asmType(rightType)), new Function1() { @Override @@ -4732,7 +4731,7 @@ The "returned" value of try expression with no finally is either the last expres return negated ? StackValue.not(value) : value; } - private StackValue generateIsCheck(final StackValue expressionToGen, final KotlinType kotlinType, final boolean leaveExpressionOnStack) { + private StackValue generateIsCheck(StackValue expressionToGen, KotlinType kotlinType, boolean leaveExpressionOnStack) { return StackValue.operation(Type.BOOLEAN_TYPE, new Function1() { @Override public Unit invoke(InstructionAdapter v) { @@ -4788,11 +4787,11 @@ The "returned" value of try expression with no finally is either the last expres return generateWhenExpression(expression, false); } - public StackValue generateWhenExpression(final KtWhenExpression expression, final boolean isStatement) { - final KtExpression expr = expression.getSubjectExpression(); - final Type subjectType = expressionType(expr); + public StackValue generateWhenExpression(KtWhenExpression expression, boolean isStatement) { + KtExpression expr = expression.getSubjectExpression(); + Type subjectType = expressionType(expr); - final Type resultType = isStatement ? Type.VOID_TYPE : expressionTypeForBranchingOperation(expression); + Type resultType = isStatement ? Type.VOID_TYPE : expressionTypeForBranchingOperation(expression); return StackValue.operation(resultType, new Function1() { @Override diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java index e3680213a86..7e233a45397 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java @@ -268,7 +268,7 @@ public class FunctionCodegen { } private void generateDelegateForDefaultImpl( - @NotNull final FunctionDescriptor functionDescriptor, + @NotNull FunctionDescriptor functionDescriptor, @Nullable PsiElement element ) { Method defaultImplMethod = typeMapper.mapAsmMethod(functionDescriptor, OwnerKind.DEFAULT_IMPLS); @@ -825,7 +825,7 @@ public class FunctionCodegen { } @NotNull - private static Function1 getSignatureMapper(final @NotNull KotlinTypeMapper typeMapper) { + private static Function1 getSignatureMapper(@NotNull KotlinTypeMapper typeMapper) { return new Function1() { @Override public Method invoke(FunctionDescriptor descriptor) { @@ -847,7 +847,7 @@ public class FunctionCodegen { } @NotNull - public static String[] getThrownExceptions(@NotNull FunctionDescriptor function, @NotNull final KotlinTypeMapper mapper) { + public static String[] getThrownExceptions(@NotNull FunctionDescriptor function, @NotNull KotlinTypeMapper mapper) { AnnotationDescriptor annotation = function.getAnnotations().findAnnotation(new FqName("kotlin.throws")); if (annotation == null) { annotation = function.getAnnotations().findAnnotation(new FqName("kotlin.jvm.Throws")); @@ -1234,11 +1234,11 @@ public class FunctionCodegen { } private void genDelegate( - @NotNull final FunctionDescriptor delegateFunction, - final FunctionDescriptor delegatedTo, + @NotNull FunctionDescriptor delegateFunction, + FunctionDescriptor delegatedTo, @NotNull JvmDeclarationOrigin declarationOrigin, - final ClassDescriptor toClass, - final StackValue field + ClassDescriptor toClass, + StackValue field ) { generateMethod( declarationOrigin, delegateFunction, diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionReferenceGenerationStrategy.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionReferenceGenerationStrategy.java index 72855e2c69f..d42beeb6d53 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionReferenceGenerationStrategy.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionReferenceGenerationStrategy.java @@ -78,10 +78,10 @@ public class FunctionReferenceGenerationStrategy extends FunctionGenerationStrat */ KtCallExpression fakeExpression = CodegenUtil.constructFakeFunctionCall(state.getProject(), referencedFunction); - final List fakeArguments = fakeExpression.getValueArguments(); + List fakeArguments = fakeExpression.getValueArguments(); - final ReceiverValue dispatchReceiver = computeAndSaveReceiver(signature, codegen, referencedFunction.getDispatchReceiverParameter()); - final ReceiverValue extensionReceiver = computeAndSaveReceiver(signature, codegen, referencedFunction.getExtensionReceiverParameter()); + ReceiverValue dispatchReceiver = computeAndSaveReceiver(signature, codegen, referencedFunction.getDispatchReceiverParameter()); + ReceiverValue extensionReceiver = computeAndSaveReceiver(signature, codegen, referencedFunction.getExtensionReceiverParameter()); computeAndSaveArguments(fakeArguments, codegen); ResolvedCall fakeResolvedCall = new DelegatingResolvedCall(resolvedCall) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index dca20c27420..67598ddd45f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -395,7 +395,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { private void generateToArray() { if (descriptor.getKind() == ClassKind.INTERFACE) return; - final KotlinBuiltIns builtIns = DescriptorUtilsKt.getBuiltIns(descriptor); + KotlinBuiltIns builtIns = DescriptorUtilsKt.getBuiltIns(descriptor); if (!isSubclass(descriptor, builtIns.getCollection())) return; if (CollectionsKt.any(DescriptorUtilsKt.getAllSuperclassesWithoutAny(descriptor), new Function1() { @@ -637,7 +637,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } @Override - public void generateComponentFunction(@NotNull FunctionDescriptor function, @NotNull final ValueParameterDescriptor parameter) { + public void generateComponentFunction(@NotNull FunctionDescriptor function, @NotNull ValueParameterDescriptor parameter) { PsiElement originalElement = DescriptorToSourceUtils.descriptorToDeclaration(parameter); functionCodegen.generateMethod(JvmDeclarationOriginKt.OtherOrigin(originalElement, function), function, new FunctionGenerationStrategy() { @Override @@ -665,10 +665,10 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { @Override public void generateCopyFunction( - @NotNull final FunctionDescriptor function, + @NotNull FunctionDescriptor function, @NotNull List constructorParameters ) { - final Type thisDescriptorType = typeMapper.mapType(descriptor); + Type thisDescriptorType = typeMapper.mapType(descriptor); functionCodegen.generateMethod(JvmDeclarationOriginKt.OtherOrigin(myClass, function), function, new FunctionGenerationStrategy() { @Override @@ -896,15 +896,15 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { StackValue.singleton(companionObject, typeMapper).store(instance, codegen.v, true); } - private void generatePrimaryConstructor(final DelegationFieldsInfo delegationFieldsInfo) { + private void generatePrimaryConstructor(DelegationFieldsInfo delegationFieldsInfo) { if (isInterface(descriptor) || isAnnotationClass(descriptor)) return; - final ClassConstructorDescriptor constructorDescriptor = descriptor.getUnsubstitutedPrimaryConstructor(); + ClassConstructorDescriptor constructorDescriptor = descriptor.getUnsubstitutedPrimaryConstructor(); if (constructorDescriptor == null) return; ConstructorContext constructorContext = context.intoConstructor(constructorDescriptor); - final KtPrimaryConstructor primaryConstructor = myClass.getPrimaryConstructor(); + KtPrimaryConstructor primaryConstructor = myClass.getPrimaryConstructor(); JvmDeclarationOrigin origin = JvmDeclarationOriginKt .OtherOrigin(primaryConstructor != null ? primaryConstructor : myClass.getPsiOrParent(), constructorDescriptor); functionCodegen.generateMethod(origin, constructorDescriptor, constructorContext, @@ -922,7 +922,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { new DefaultParameterValueSubstitutor(state).generatePrimaryConstructorOverloadsIfNeeded(constructorDescriptor, v, this, kind, myClass); } - private void generateSecondaryConstructor(@NotNull final ClassConstructorDescriptor constructorDescriptor) { + private void generateSecondaryConstructor(@NotNull ClassConstructorDescriptor constructorDescriptor) { if (!canHaveDeclaredConstructors(descriptor)) return; ConstructorContext constructorContext = context.intoConstructor(constructorDescriptor); @@ -994,7 +994,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } if (JvmAbi.isCompanionObjectWithBackingFieldsInOuter(descriptor)) { - final ImplementationBodyCodegen parentCodegen = (ImplementationBodyCodegen) getParentCodegen(); + ImplementationBodyCodegen parentCodegen = (ImplementationBodyCodegen) getParentCodegen(); generateInitializers(new Function0() { @Override public ExpressionCodegen invoke() { @@ -1063,7 +1063,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } } - private void generateInitializers(@NotNull final ExpressionCodegen codegen) { + private void generateInitializers(@NotNull ExpressionCodegen codegen) { generateInitializers(new Function0() { @Override public ExpressionCodegen invoke() { @@ -1306,7 +1306,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { CodegenUtilKt.reportTarget6InheritanceErrorIfNeeded(descriptor, myClass.getPsiOrParent(), restrictedInheritance, state); } - private void generateDelegationToDefaultImpl(@NotNull final FunctionDescriptor traitFun, @NotNull final FunctionDescriptor inheritedFun) { + private void generateDelegationToDefaultImpl(@NotNull FunctionDescriptor traitFun, @NotNull FunctionDescriptor inheritedFun) { functionCodegen.generateMethod( JvmDeclarationOriginKt.DelegationToDefaultImpls(descriptorToDeclaration(traitFun), traitFun), inheritedFun, diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java index ae1f58b48bb..4f051b8ffd6 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java @@ -691,8 +691,8 @@ public abstract class MemberCodegen accessorForCallableDescriptor) { if (accessorForCallableDescriptor instanceof FunctionDescriptor) { - final FunctionDescriptor accessor = (FunctionDescriptor) accessorForCallableDescriptor; - final FunctionDescriptor original = (FunctionDescriptor) accessorForCallableDescriptor.getCalleeDescriptor(); + FunctionDescriptor accessor = (FunctionDescriptor) accessorForCallableDescriptor; + FunctionDescriptor original = (FunctionDescriptor) accessorForCallableDescriptor.getCalleeDescriptor(); functionCodegen.generateMethod( Synthetic(null, original), accessor, new FunctionGenerationStrategy.CodegenBased(state) { @@ -708,8 +708,8 @@ public abstract class MemberCodegen { } } - final DescriptorSerializer serializer = + DescriptorSerializer serializer = DescriptorSerializer.createTopLevel(new JvmSerializerExtension(v.getSerializationBindings(), state)); - final ProtoBuf.Package packageProto = serializer.packagePartProto(element.getPackageFqName(), members).build(); + ProtoBuf.Package packageProto = serializer.packagePartProto(element.getPackageFqName(), members).build(); WriteAnnotationUtilKt.writeKotlinMetadata(v, state, KotlinClassHeader.Kind.FILE_FACADE, 0, new Function1() { @Override diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java index 967c65aaaed..5d50ad040e5 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java @@ -537,7 +537,7 @@ public class PropertyCodegen { @NotNull ExpressionCodegen codegen, @NotNull KotlinTypeMapper typeMapper, @NotNull ResolvedCall resolvedCall, - final int indexInPropertyMetadataArray, + int indexInPropertyMetadataArray, int propertyMetadataArgumentIndex ) { StackValue.Property receiver = codegen.intermediateValueForProperty(propertyDescriptor, true, null, StackValue.LOCAL_0); @@ -551,14 +551,14 @@ public class PropertyCodegen { @NotNull ExpressionCodegen codegen, @NotNull KotlinTypeMapper typeMapper, @NotNull ResolvedCall resolvedCall, - final int indexInPropertyMetadataArray, + int indexInPropertyMetadataArray, int propertyMetadataArgumentIndex, @Nullable StackValue receiver, @NotNull PropertyDescriptor propertyDescriptor ) { - final Type owner = JvmAbi.isPropertyWithBackingFieldInOuterClass(propertyDescriptor) ? - codegen.getState().getTypeMapper().mapOwner(propertyDescriptor) : - getDelegatedPropertyMetadataOwner(codegen, typeMapper); + Type owner = JvmAbi.isPropertyWithBackingFieldInOuterClass(propertyDescriptor) ? + codegen.getState().getTypeMapper().mapOwner(propertyDescriptor) : + getDelegatedPropertyMetadataOwner(codegen, typeMapper); codegen.tempVariables.put( resolvedCall.getCall().getValueArguments().get(propertyMetadataArgumentIndex).asElement(), diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java index efd571b54b4..8bac6c657c6 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java @@ -200,7 +200,7 @@ public class ScriptCodegen extends MemberCodegen { iv.putfield(classType.getInternalName(), context.getScriptFieldName(earlierScript), earlierClassType.getDescriptor()); } - final ExpressionCodegen codegen = new ExpressionCodegen(mv, frameMap, Type.VOID_TYPE, methodContext, state, this); + ExpressionCodegen codegen = new ExpressionCodegen(mv, frameMap, Type.VOID_TYPE, methodContext, state, this); generateInitializers(new Function0() { @Override diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java index ec22cccfb9b..d35cd8395a7 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java @@ -59,9 +59,9 @@ public class AnonymousObjectTransformer extends ObjectTransformer innerClassNodes = new ArrayList(); - final ClassBuilder classBuilder = createRemappingClassBuilderViaFactory(inliningContext); - final List methodsToTransform = new ArrayList(); + List innerClassNodes = new ArrayList(); + ClassBuilder classBuilder = createRemappingClassBuilderViaFactory(inliningContext); + List methodsToTransform = new ArrayList(); createClassReader().accept(new ClassVisitor(InlineCodegenUtil.API, classBuilder.getVisitor()) { @Override @@ -273,7 +273,7 @@ public class AnonymousObjectTransformer extends ObjectTransformer", constructorDescriptor, null, ArrayUtil.EMPTY_STRING_ARRAY ); - final Label newBodyStartLabel = new Label(); + Label newBodyStartLabel = new Label(); constructorVisitor.visitLabel(newBodyStartLabel); //initialize captured fields List newFieldsWithSkipped = TransformationUtilsKt.getNewFieldsToGenerate(allCapturedBuilder.listCaptured()); @@ -316,7 +316,7 @@ public class AnonymousObjectTransformer extends ObjectTransformer() { @Override @@ -454,7 +454,7 @@ public class InlineCodegen extends CallGenerator { result.getReifiedTypeParametersUsages().mergeAll(reificationResult); CallableMemberDescriptor descriptor = getLabelOwnerDescriptor(codegen.getContext()); - final Set labels = getDeclarationLabels(DescriptorToSourceUtils.descriptorToDeclaration(descriptor), descriptor); + Set labels = getDeclarationLabels(DescriptorToSourceUtils.descriptorToDeclaration(descriptor), descriptor); LabelOwner labelOwner = new LabelOwner() { @Override public boolean isMyLabel(@NotNull String name) { @@ -747,8 +747,8 @@ public class InlineCodegen extends CallGenerator { return true; } - private Runnable recordParameterValueInLocalVal(boolean delayedWritingToLocals, @NotNull final ParameterInfo... infos) { - final int[] index = new int[infos.length]; + private Runnable recordParameterValueInLocalVal(boolean delayedWritingToLocals, @NotNull ParameterInfo... infos) { + int[] index = new int[infos.length]; for (int i = 0; i < infos.length; i++) { ParameterInfo info = infos[i]; if (!info.isSkippedOrRemapped()) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java index 4e00f245613..b57fee6df37 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java @@ -91,14 +91,14 @@ public class InlineCodegenUtil { @Nullable public static SMAPAndMethodNode getMethodNode( byte[] classData, - final String methodName, - final String methodDescriptor, + String methodName, + String methodDescriptor, ClassId classId ) { ClassReader cr = new ClassReader(classData); - final MethodNode[] node = new MethodNode[1]; - final String[] debugInfo = new String[2]; - final int[] lines = new int[2]; + MethodNode[] node = new MethodNode[1]; + String[] debugInfo = new String[2]; + int[] lines = new int[2]; lines[0] = Integer.MAX_VALUE; lines[1] = Integer.MIN_VALUE; //noinspection PointlessBitwiseExpression diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MaxStackFrameSizeAndLocalsCalculator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MaxStackFrameSizeAndLocalsCalculator.java index befdb00f7ec..0f712e81dea 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MaxStackFrameSizeAndLocalsCalculator.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MaxStackFrameSizeAndLocalsCalculator.java @@ -429,7 +429,7 @@ public class MaxStackFrameSizeAndLocalsCalculator extends MaxLocalsCalculator { // Utility methods // ------------------------------------------------------------------------ - private LabelWrapper getLabelWrapper(final Label label) { + private LabelWrapper getLabelWrapper(Label label) { return ContainerUtil.getOrCreate(labelWrappersMap, label, new Factory() { @Override public LabelWrapper create() { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingMethodTransformer.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingMethodTransformer.java index 21d15c6bcf7..402ad464176 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingMethodTransformer.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/RedundantBoxingMethodTransformer.java @@ -126,7 +126,7 @@ public class RedundantBoxingMethodTransformer extends MethodTransformer { return needToRepeat; } - private static boolean isUnsafeToRemoveBoxingForConnectedValues(List usedValues, final Type unboxedType) { + private static boolean isUnsafeToRemoveBoxingForConnectedValues(List usedValues, Type unboxedType) { return CollectionsKt.any(usedValues, new Function1() { @Override public Boolean invoke(BasicValue input) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java index 87466a2c17f..c78a8c7d416 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/KotlinTypeMapper.java @@ -464,7 +464,7 @@ public class KotlinTypeMapper { @NotNull public Type mapType( @NotNull KotlinType kotlinType, - @Nullable final JvmSignatureWriter signatureVisitor, + @Nullable JvmSignatureWriter signatureVisitor, @NotNull TypeMappingMode mode ) { return TypeSignatureMappingKt.mapType( diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/parser/com/sampullara/cli/Args.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/parser/com/sampullara/cli/Args.java index 6d9ff44aa85..76514cff32a 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/parser/com/sampullara/cli/Args.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/parser/com/sampullara/cli/Args.java @@ -480,7 +480,7 @@ public class Args { * @param methodName the name of the one arg method taking a String as parameter that will be used to built a new value * @return null if the object could not be created, the value otherwise */ - public static ValueCreator byStaticMethodInvocation(final Class compatibleType, final String methodName) { + public static ValueCreator byStaticMethodInvocation(Class compatibleType, String methodName) { return new ValueCreator() { public Object createValue(Class type, String value) { Object v = null; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java index 4a72bdeeab6..2c41b4ebcba 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java @@ -94,7 +94,7 @@ public class K2JSCompiler extends CLICompiler { protected ExitCode doExecute( @NotNull K2JSCompilerArguments arguments, @NotNull CompilerConfiguration configuration, @NotNull Disposable rootDisposable ) { - final MessageCollector messageCollector = configuration.getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY); + MessageCollector messageCollector = configuration.getNotNull(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY); if (arguments.freeArgs.isEmpty()) { if (arguments.version) { @@ -242,7 +242,7 @@ public class K2JSCompiler extends CLICompiler { } private static AnalyzerWithCompilerReport analyzeAndReportErrors( - @NotNull MessageCollector messageCollector, @NotNull final List sources, @NotNull final JsConfig config + @NotNull MessageCollector messageCollector, @NotNull List sources, @NotNull JsConfig config ) { AnalyzerWithCompilerReport analyzerWithCompilerReport = new AnalyzerWithCompilerReport(messageCollector); analyzerWithCompilerReport.analyzeAndReport(sources, new AnalyzerWithCompilerReport.Analyzer() { diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java index 54ce316f539..e211b4fee0e 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java @@ -148,17 +148,17 @@ public class CompileEnvironmentUtil { @NotNull public static List getKtFiles( - @NotNull final Project project, + @NotNull Project project, @NotNull Collection sourceRoots, @NotNull CompilerConfiguration configuration, @NotNull Function1 reportError ) throws IOException { - final VirtualFileSystem localFileSystem = VirtualFileManager.getInstance().getFileSystem(StandardFileSystems.FILE_PROTOCOL); + VirtualFileSystem localFileSystem = VirtualFileManager.getInstance().getFileSystem(StandardFileSystems.FILE_PROTOCOL); - final Set processedFiles = Sets.newHashSet(); - final List result = Lists.newArrayList(); + Set processedFiles = Sets.newHashSet(); + List result = Lists.newArrayList(); - final PreprocessedFileCreator virtualFileCreator = new PreprocessedFileCreator(project); + PreprocessedFileCreator virtualFileCreator = new PreprocessedFileCreator(project); for (String sourceRootPath : sourceRoots) { if (sourceRootPath == null) { diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java index 01da737a6c8..c4339e8a5ca 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java @@ -229,8 +229,8 @@ public class SingleAbstractMethodUtils { } @NotNull - public static SamAdapterDescriptor createSamAdapterFunction(@NotNull final JavaMethodDescriptor original) { - final SamAdapterFunctionDescriptor result = new SamAdapterFunctionDescriptor(original); + public static SamAdapterDescriptor createSamAdapterFunction(@NotNull JavaMethodDescriptor original) { + SamAdapterFunctionDescriptor result = new SamAdapterFunctionDescriptor(original); return initSamAdapter(original, result, new FunctionInitializer() { @Override public void initialize( @@ -252,8 +252,8 @@ public class SingleAbstractMethodUtils { } @NotNull - public static SamAdapterDescriptor createSamAdapterConstructor(@NotNull final JavaClassConstructorDescriptor original) { - final SamAdapterClassConstructorDescriptor result = new SamAdapterClassConstructorDescriptor(original); + public static SamAdapterDescriptor createSamAdapterConstructor(@NotNull JavaClassConstructorDescriptor original) { + SamAdapterClassConstructorDescriptor result = new SamAdapterClassConstructorDescriptor(original); return initSamAdapter(original, result, new FunctionInitializer() { @Override public void initialize( diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/FileBasedKotlinClass.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/FileBasedKotlinClass.java index f071fc432fd..acfbbdbcf44 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/FileBasedKotlinClass.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/FileBasedKotlinClass.java @@ -89,10 +89,10 @@ public abstract class FileBasedKotlinClass implements KotlinJvmBinaryClass { @NotNull byte[] fileContents, @NotNull Function4 factory ) { - final ReadKotlinClassHeaderAnnotationVisitor readHeaderVisitor = new ReadKotlinClassHeaderAnnotationVisitor(); - final Ref classNameRef = Ref.create(); - final Ref classVersion = Ref.create(); - final InnerClassesInfo innerClasses = new InnerClassesInfo(); + ReadKotlinClassHeaderAnnotationVisitor readHeaderVisitor = new ReadKotlinClassHeaderAnnotationVisitor(); + Ref classNameRef = Ref.create(); + Ref classVersion = Ref.create(); + InnerClassesInfo innerClasses = new InnerClassesInfo(); new ClassReader(fileContents).accept(new ClassVisitor(ASM5) { @Override public void visit(int version, int access, @NotNull String name, String signature, String superName, String[] interfaces) { @@ -143,7 +143,7 @@ public abstract class FileBasedKotlinClass implements KotlinJvmBinaryClass { } @Override - public void loadClassAnnotations(@NotNull final AnnotationVisitor annotationVisitor, @Nullable byte[] cachedContents) { + public void loadClassAnnotations(@NotNull AnnotationVisitor annotationVisitor, @Nullable byte[] cachedContents) { byte[] fileContents = cachedContents != null ? cachedContents : getFileContents(); new ClassReader(fileContents).accept(new ClassVisitor(ASM5) { @Override @@ -168,7 +168,7 @@ public abstract class FileBasedKotlinClass implements KotlinJvmBinaryClass { @NotNull private static org.jetbrains.org.objectweb.asm.AnnotationVisitor convertAnnotationVisitor( - @NotNull final AnnotationArgumentVisitor v, @NotNull final InnerClassesInfo innerClasses + @NotNull AnnotationArgumentVisitor v, @NotNull InnerClassesInfo innerClasses ) { return new org.jetbrains.org.objectweb.asm.AnnotationVisitor(ASM5) { @Override @@ -178,7 +178,7 @@ public abstract class FileBasedKotlinClass implements KotlinJvmBinaryClass { @Override public org.jetbrains.org.objectweb.asm.AnnotationVisitor visitArray(String name) { - final AnnotationArrayArgumentVisitor arv = v.visitArray(Name.identifier(name)); + AnnotationArrayArgumentVisitor arv = v.visitArray(Name.identifier(name)); return arv == null ? null : new org.jetbrains.org.objectweb.asm.AnnotationVisitor(ASM5) { @Override public void visit(String name, @NotNull Object value) { @@ -216,12 +216,12 @@ public abstract class FileBasedKotlinClass implements KotlinJvmBinaryClass { } @Override - public void visitMembers(@NotNull final MemberVisitor memberVisitor, @Nullable byte[] cachedContents) { + public void visitMembers(@NotNull MemberVisitor memberVisitor, @Nullable byte[] cachedContents) { byte[] fileContents = cachedContents != null ? cachedContents : getFileContents(); new ClassReader(fileContents).accept(new ClassVisitor(ASM5) { @Override public FieldVisitor visitField(int access, @NotNull String name, @NotNull String desc, String signature, Object value) { - final AnnotationVisitor v = memberVisitor.visitField(Name.identifier(name), desc, value); + AnnotationVisitor v = memberVisitor.visitField(Name.identifier(name), desc, value); if (v == null) return null; return new FieldVisitor(ASM5) { @@ -239,7 +239,7 @@ public abstract class FileBasedKotlinClass implements KotlinJvmBinaryClass { @Override public MethodVisitor visitMethod(int access, @NotNull String name, @NotNull String desc, String signature, String[] exceptions) { - final MethodAnnotationVisitor v = memberVisitor.visitMethod(Name.identifier(name), desc); + MethodAnnotationVisitor v = memberVisitor.visitMethod(Name.identifier(name), desc); if (v == null) return null; return new MethodVisitor(ASM5) { diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java index 2773b7f9923..8bb07210425 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java @@ -76,7 +76,7 @@ public class KotlinJavaPsiFacade { emptyModifierList = new LightModifierList(PsiManager.getInstance(project), KotlinLanguage.INSTANCE); - final PsiModificationTracker modificationTracker = PsiManager.getInstance(project).getModificationTracker(); + PsiModificationTracker modificationTracker = PsiManager.getInstance(project).getModificationTracker(); MessageBus bus = project.getMessageBus(); bus.connect().subscribe(PsiModificationTracker.TOPIC, new PsiModificationTracker.Listener() { @@ -415,7 +415,7 @@ public class KotlinJavaPsiFacade { return false; } - private static boolean hasDirectoriesInScope(Query dirs, final GlobalSearchScope scope) { + private static boolean hasDirectoriesInScope(Query dirs, GlobalSearchScope scope) { CommonProcessors.FindProcessor findProcessor = new CommonProcessors.FindProcessor() { @Override protected boolean accept(VirtualFile file) { diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java index a15e7fbbeb7..9f57cf726cb 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java @@ -128,8 +128,8 @@ public class SignaturesPropagationData { boolean shouldBeExtension = checkIfShouldBeExtension(); - for (final ValueParameterDescriptor originalParam : parameters) { - final int originalIndex = originalParam.getIndex(); + for (ValueParameterDescriptor originalParam : parameters) { + int originalIndex = originalParam.getIndex(); List typesFromSuperMethods = ContainerUtil.map(superFunctions, new Function() { @Override diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java index eca8b70a581..4ce3e43ddd5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java @@ -42,7 +42,7 @@ import static org.jetbrains.kotlin.resolve.BindingContextUtils.variableDescripto public class PseudocodeUtil { @NotNull - public static Pseudocode generatePseudocode(@NotNull KtDeclaration declaration, @NotNull final BindingContext bindingContext) { + public static Pseudocode generatePseudocode(@NotNull KtDeclaration declaration, @NotNull BindingContext bindingContext) { BindingTrace mockTrace = new BindingTrace() { @NotNull @Override diff --git a/compiler/frontend/src/org/jetbrains/kotlin/checkers/CheckerTestUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/checkers/CheckerTestUtil.java index 60b0132508c..4bf57f29335 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/checkers/CheckerTestUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/checkers/CheckerTestUtil.java @@ -153,11 +153,11 @@ public class CheckerTestUtil { private static List getDebugInfoDiagnostics( @NotNull PsiElement root, @NotNull BindingContext bindingContext, - final boolean markDynamicCalls, - @Nullable final List dynamicCallDescriptors, - @Nullable final String platform + boolean markDynamicCalls, + @Nullable List dynamicCallDescriptors, + @Nullable String platform ) { - final List debugAnnotations = new ArrayList(); + List debugAnnotations = new ArrayList(); DebugInfoUtil.markDebugAnnotations(root, bindingContext, new DebugInfoUtil.DebugInfoReporter() { @Override @@ -297,7 +297,7 @@ public class CheckerTestUtil { Map actualDiagnostics = currentActual.getTextDiagnosticsMap(); List expectedDiagnostics = currentExpected.getDiagnostics(); - for (final TextDiagnostic expectedDiagnostic : expectedDiagnostics) { + for (TextDiagnostic expectedDiagnostic : expectedDiagnostics) { Map.Entry actualDiagnosticEntry = CollectionsKt.firstOrNull( actualDiagnostics.entrySet(), new Function1, Boolean>() { @Override diff --git a/compiler/frontend/src/org/jetbrains/kotlin/checkers/DebugInfoUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/checkers/DebugInfoUtil.java index c5f5c57c337..a32f76c77f4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/checkers/DebugInfoUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/checkers/DebugInfoUtil.java @@ -69,10 +69,10 @@ public class DebugInfoUtil { public static void markDebugAnnotations( @NotNull PsiElement root, - @NotNull final BindingContext bindingContext, - @NotNull final DebugInfoReporter debugInfoReporter + @NotNull BindingContext bindingContext, + @NotNull DebugInfoReporter debugInfoReporter ) { - final Map> markedWithErrorElements = Maps.newHashMap(); + Map> markedWithErrorElements = Maps.newHashMap(); for (Diagnostic diagnostic : bindingContext.getDiagnostics()) { DiagnosticFactory factory = diagnostic.getFactory(); if (Errors.UNRESOLVED_REFERENCE_DIAGNOSTICS.contains(diagnostic.getFactory())) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractTokenStreamPredicate.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractTokenStreamPredicate.java index 18d303f8180..5794c4ad822 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractTokenStreamPredicate.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractTokenStreamPredicate.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.parsing; public abstract class AbstractTokenStreamPredicate implements TokenStreamPredicate { @Override - public TokenStreamPredicate or(final TokenStreamPredicate other) { + public TokenStreamPredicate or(TokenStreamPredicate other) { return new AbstractTokenStreamPredicate() { @Override public boolean matching(boolean topLevel) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParsing.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParsing.java index a9827dc8d66..4065ebcde6a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParsing.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParsing.java @@ -64,7 +64,7 @@ public class KotlinParsing extends AbstractKotlinParsing { } private static KotlinParsing createForByClause(SemanticWhitespaceAwarePsiBuilder builder) { - final SemanticWhitespaceAwarePsiBuilderForByClause builderForByClause = new SemanticWhitespaceAwarePsiBuilderForByClause(builder); + SemanticWhitespaceAwarePsiBuilderForByClause builderForByClause = new SemanticWhitespaceAwarePsiBuilderForByClause(builder); KotlinParsing kotlinParsing = new KotlinParsing(builderForByClause); kotlinParsing.myExpressionParsing = new KotlinExpressionParsing(builderForByClause, kotlinParsing) { @Override diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java index 5cdc5fc0185..eb5e619d539 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtPsiUtil.java @@ -109,7 +109,7 @@ public class KtPsiUtil { @NotNull public static Set findRootExpressions(@NotNull Collection unreachableElements) { Set rootElements = new HashSet(); - final Set shadowedElements = new HashSet(); + Set shadowedElements = new HashSet(); KtVisitorVoid shadowAllChildren = new KtVisitorVoid() { @Override public void visitKtElement(@NotNull KtElement element) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtStubElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtStubElementType.java index 2ebb997bfe5..3f25dbbd162 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtStubElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/KtStubElementType.java @@ -47,7 +47,7 @@ public abstract class KtStubElementType arrayFactory; - public KtStubElementType(@NotNull @NonNls String debugName, @NotNull final Class psiClass, @NotNull Class stubClass) { + public KtStubElementType(@NotNull @NonNls String debugName, @NotNull Class psiClass, @NotNull Class stubClass) { super(debugName, KotlinLanguage.INSTANCE); try { byNodeConstructor = psiClass.getConstructor(ASTNode.class); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnalyzingUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnalyzingUtils.java index 51701d7bf6f..b468b661afb 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnalyzingUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnalyzingUtils.java @@ -51,7 +51,7 @@ public class AnalyzingUtils { } public static List getSyntaxErrorRanges(@NotNull PsiElement root) { - final List r = new ArrayList(); + List r = new ArrayList(); root.acceptChildren(new PsiErrorElementVisitor() { @Override public void visitErrorElement(@NotNull PsiErrorElement element) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.java index 60ee2626c83..6cfec345552 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.java @@ -230,7 +230,7 @@ public class BindingContextUtils { } static void addOwnDataTo( - @NotNull final BindingTrace trace, @Nullable final TraceEntryFilter filter, boolean commitDiagnostics, + @NotNull BindingTrace trace, @Nullable TraceEntryFilter filter, boolean commitDiagnostics, @NotNull MutableSlicedMap map, MutableDiagnosticsWithSuppression diagnostics ) { map.forEach(new Function3() { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java index a91057318d9..f815f62d596 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java @@ -140,10 +140,10 @@ public class BodyResolver { } public void resolveSecondaryConstructorBody( - @NotNull final DataFlowInfo outerDataFlowInfo, - @NotNull final BindingTrace trace, - @NotNull final KtSecondaryConstructor constructor, - @NotNull final ClassConstructorDescriptor descriptor, + @NotNull DataFlowInfo outerDataFlowInfo, + @NotNull BindingTrace trace, + @NotNull KtSecondaryConstructor constructor, + @NotNull ClassConstructorDescriptor descriptor, @NotNull LexicalScope declaringScope ) { ForceResolveUtil.forceResolveAllContents(descriptor.getAnnotations()); @@ -266,21 +266,21 @@ public class BodyResolver { } public void resolveSuperTypeEntryList( - @NotNull final DataFlowInfo outerDataFlowInfo, + @NotNull DataFlowInfo outerDataFlowInfo, @NotNull KtClassOrObject ktClass, - @NotNull final ClassDescriptor descriptor, - @Nullable final ConstructorDescriptor primaryConstructor, + @NotNull ClassDescriptor descriptor, + @Nullable ConstructorDescriptor primaryConstructor, @NotNull LexicalScope scopeForConstructorResolution, - @NotNull final LexicalScope scopeForMemberResolution + @NotNull LexicalScope scopeForMemberResolution ) { - final LexicalScope scopeForConstructor = + LexicalScope scopeForConstructor = primaryConstructor == null ? null : FunctionDescriptorUtil.getFunctionInnerScope(scopeForConstructorResolution, primaryConstructor, trace, overloadChecker); - final ExpressionTypingServices typeInferrer = expressionTypingServices; // TODO : flow + ExpressionTypingServices typeInferrer = expressionTypingServices; // TODO : flow - final Map supertypes = Maps.newLinkedHashMap(); - final ResolvedCall[] primaryConstructorDelegationCall = new ResolvedCall[1]; + Map supertypes = Maps.newLinkedHashMap(); + ResolvedCall[] primaryConstructorDelegationCall = new ResolvedCall[1]; KtVisitorVoid visitor = new KtVisitorVoid() { private void recordSupertype(KtTypeReference typeReference, KotlinType supertype) { if (supertype == null) return; @@ -633,7 +633,7 @@ public class BodyResolver { private static LexicalScope getPrimaryConstructorParametersScope( LexicalScope originalScope, - final ConstructorDescriptor unsubstitutedPrimaryConstructor + ConstructorDescriptor unsubstitutedPrimaryConstructor ) { return new LexicalScopeImpl(originalScope, unsubstitutedPrimaryConstructor, false, null, LexicalScopeKind.DEFAULT_VALUE, LocalRedeclarationChecker.DO_NOTHING.INSTANCE, @@ -736,7 +736,7 @@ public class BodyResolver { } } - private ObservableBindingTrace createFieldTrackingTrace(final PropertyDescriptor propertyDescriptor) { + private ObservableBindingTrace createFieldTrackingTrace(PropertyDescriptor propertyDescriptor) { return new ObservableBindingTrace(trace).addHandler( BindingContext.REFERENCE_TARGET, new ObservableBindingTrace.RecordHandler() { @@ -847,7 +847,7 @@ public class BodyResolver { if (functionDescriptor instanceof PropertyAccessorDescriptor && functionDescriptor.getExtensionReceiverParameter() == null) { PropertyAccessorDescriptor accessorDescriptor = (PropertyAccessorDescriptor) functionDescriptor; KtProperty property = (KtProperty) function.getParent(); - final SyntheticFieldDescriptor fieldDescriptor = new SyntheticFieldDescriptor(accessorDescriptor, property); + SyntheticFieldDescriptor fieldDescriptor = new SyntheticFieldDescriptor(accessorDescriptor, property); innerScope = new LexicalScopeImpl(innerScope, functionDescriptor, true, null, LexicalScopeKind.PROPERTY_ACCESSOR_BODY, LocalRedeclarationChecker.DO_NOTHING.INSTANCE, new Function1() { @@ -913,7 +913,7 @@ public class BodyResolver { return; } // +1 is a work around against new Queue(0).addLast(...) bug // stepan.koltsov@ 2011-11-21 - final Queue queue = new Queue(deferredTypes.size() + 1); + Queue queue = new Queue(deferredTypes.size() + 1); trace.addHandler(DEFERRED_TYPE, new ObservableBindingTrace.RecordHandler, Boolean>() { @Override public void handleRecord( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index 2c3d4bbfa47..a36aec03b13 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java @@ -295,9 +295,12 @@ public class DescriptorResolver { @NotNull public ValueParameterDescriptorImpl resolveValueParameterDescriptor( - @NotNull final LexicalScope scope, @NotNull final FunctionDescriptor owner, - @NotNull KtParameter valueParameter, int index, - @NotNull final KotlinType type, @NotNull final BindingTrace trace + @NotNull LexicalScope scope, + @NotNull FunctionDescriptor owner, + @NotNull KtParameter valueParameter, + int index, + @NotNull KotlinType type, + @NotNull BindingTrace trace ) { KotlinType varargElementType = null; KotlinType variableType = type; @@ -323,7 +326,7 @@ public class DescriptorResolver { } } - final KtDestructuringDeclaration destructuringDeclaration = valueParameter.getDestructuringDeclaration(); + KtDestructuringDeclaration destructuringDeclaration = valueParameter.getDestructuringDeclaration(); Function0> destructuringVariables; if (destructuringDeclaration != null) { @@ -436,11 +439,11 @@ public class DescriptorResolver { } private TypeParameterDescriptorImpl resolveTypeParameterForDescriptor( - final DeclarationDescriptor containingDescriptor, + DeclarationDescriptor containingDescriptor, LexicalScope scopeForAnnotationsResolve, - final KtTypeParameter typeParameter, + KtTypeParameter typeParameter, int index, - final BindingTrace trace + BindingTrace trace ) { if (typeParameter.getVariance() != Variance.INVARIANT) { trace.report(VARIANCE_ON_TYPE_PARAMETER_NOT_ALLOWED.on(typeParameter)); @@ -701,7 +704,7 @@ public class DescriptorResolver { @NotNull DeclarationDescriptor containingDeclaration, @NotNull LexicalScope scope, @NotNull KtTypeAlias typeAlias, - @NotNull final BindingTrace trace + @NotNull BindingTrace trace ) { if (!(containingDeclaration instanceof PackageFragmentDescriptor)) { trace.report(TOPLEVEL_TYPEALIASES_ONLY.on(typeAlias)); @@ -711,13 +714,13 @@ public class DescriptorResolver { Visibility visibility = resolveVisibilityFromModifiers(typeAlias, getDefaultVisibility(typeAlias, containingDeclaration)); Annotations allAnnotations = annotationResolver.resolveAnnotationsWithArguments(scope, modifierList, trace); - final Name name = KtPsiUtil.safeName(typeAlias.getName()); + Name name = KtPsiUtil.safeName(typeAlias.getName()); SourceElement sourceElement = KotlinSourceElementKt.toSourceElement(typeAlias); - final LazyTypeAliasDescriptor typeAliasDescriptor = LazyTypeAliasDescriptor.create( + LazyTypeAliasDescriptor typeAliasDescriptor = LazyTypeAliasDescriptor.create( storageManager, trace, containingDeclaration, allAnnotations, name, sourceElement, visibility); List typeParameterDescriptors; - final LexicalScope scopeWithTypeParameters; + LexicalScope scopeWithTypeParameters; { List typeParameters = typeAlias.getTypeParameters(); if (typeParameters.isEmpty()) { @@ -737,7 +740,7 @@ public class DescriptorResolver { } } - final KtTypeReference typeReference = typeAlias.getTypeReference(); + KtTypeReference typeReference = typeAlias.getTypeReference(); if (typeReference == null) { typeAliasDescriptor.initialize( typeParameterDescriptors, @@ -797,7 +800,7 @@ public class DescriptorResolver { @NotNull LexicalScope scopeForDeclarationResolution, @NotNull LexicalScope scopeForInitializerResolution, @NotNull KtProperty property, - @NotNull final BindingTrace trace, + @NotNull BindingTrace trace, @NotNull DataFlowInfo dataFlowInfo ) { KtModifierList modifierList = property.getModifierList(); @@ -810,7 +813,7 @@ public class DescriptorResolver { trace.getBindingContext(), containingDeclaration) : Modality.FINAL; - final AnnotationSplitter.PropertyWrapper wrapper = new AnnotationSplitter.PropertyWrapper(property); + AnnotationSplitter.PropertyWrapper wrapper = new AnnotationSplitter.PropertyWrapper(property); Annotations allAnnotations = annotationResolver.resolveAnnotationsWithoutArguments(scopeForDeclarationResolution, modifierList, trace); AnnotationSplitter annotationSplitter = @@ -1108,11 +1111,11 @@ public class DescriptorResolver { @NotNull /*package*/ KotlinType inferReturnTypeFromExpressionBody( - @NotNull final BindingTrace trace, - @NotNull final LexicalScope scope, - @NotNull final DataFlowInfo dataFlowInfo, - @NotNull final KtDeclarationWithBody function, - @NotNull final FunctionDescriptor functionDescriptor + @NotNull BindingTrace trace, + @NotNull LexicalScope scope, + @NotNull DataFlowInfo dataFlowInfo, + @NotNull KtDeclarationWithBody function, + @NotNull FunctionDescriptor functionDescriptor ) { return wrappedTypeFactory.createRecursionIntolerantDeferredType(trace, new Function0() { @Override @@ -1132,7 +1135,8 @@ public class DescriptorResolver { @NotNull ClassDescriptor classDescriptor, @NotNull ValueParameterDescriptor valueParameter, @NotNull LexicalScope scope, - @NotNull KtParameter parameter, final BindingTrace trace + @NotNull KtParameter parameter, + BindingTrace trace ) { KotlinType type = resolveParameterType(scope, parameter, trace); Name name = parameter.getNameAsSafeName(); @@ -1145,7 +1149,7 @@ public class DescriptorResolver { } } - final AnnotationSplitter.PropertyWrapper propertyWrapper = new AnnotationSplitter.PropertyWrapper(parameter); + AnnotationSplitter.PropertyWrapper propertyWrapper = new AnnotationSplitter.PropertyWrapper(parameter); Annotations allAnnotations = annotationResolver.resolveAnnotationsWithoutArguments(scope, parameter.getModifierList(), trace); AnnotationSplitter annotationSplitter = new AnnotationSplitter(storageManager, allAnnotations, new Function0>() { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorUtil.java index 245437bb253..ee1f188dc6e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorUtil.java @@ -63,7 +63,7 @@ public class FunctionDescriptorUtil { @NotNull public static LexicalScope getFunctionInnerScope( @NotNull LexicalScope outerScope, - @NotNull final FunctionDescriptor descriptor, + @NotNull FunctionDescriptor descriptor, @NotNull LocalRedeclarationChecker redeclarationChecker ) { ReceiverParameterDescriptor receiver = descriptor.getExtensionReceiverParameter(); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java index bc2741c624b..7dc3a4f332a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java @@ -176,10 +176,10 @@ public class CallResolver { @NotNull private OverloadResolutionResults computeTasksAndResolveCall( - @NotNull final BasicCallResolutionContext context, - @NotNull final Name name, - @NotNull final TracingStrategy tracing, - @NotNull final NewResolutionOldInference.ResolutionKind kind + @NotNull BasicCallResolutionContext context, + @NotNull Name name, + @NotNull TracingStrategy tracing, + @NotNull NewResolutionOldInference.ResolutionKind kind ) { return callResolvePerfCounter.time(new Function0>() { @Override @@ -204,9 +204,9 @@ public class CallResolver { @NotNull private OverloadResolutionResults computeTasksFromCandidatesAndResolvedCall( - @NotNull final BasicCallResolutionContext context, - @NotNull final Collection> candidates, - @NotNull final TracingStrategy tracing + @NotNull BasicCallResolutionContext context, + @NotNull Collection> candidates, + @NotNull TracingStrategy tracing ) { return callResolvePerfCounter.time(new Function0>() { @Override @@ -492,11 +492,11 @@ public class CallResolver { } public OverloadResolutionResults resolveCallWithKnownCandidate( - @NotNull final Call call, - @NotNull final TracingStrategy tracing, - @NotNull final ResolutionContext context, - @NotNull final ResolutionCandidate candidate, - @Nullable final MutableDataFlowInfoForArguments dataFlowInfoForArguments + @NotNull Call call, + @NotNull TracingStrategy tracing, + @NotNull ResolutionContext context, + @NotNull ResolutionCandidate candidate, + @Nullable MutableDataFlowInfoForArguments dataFlowInfoForArguments ) { return callResolvePerfCounter.time(new Function0>() { @Override 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 e22f0ecc5d6..42a8cdfe0a1 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 @@ -299,7 +299,7 @@ public class CallMaker { } @NotNull - public static Call makeConstructorCallForEnumEntryWithoutInitializer(@NotNull final KtSuperTypeCallEntry callElement) { + public static Call makeConstructorCallForEnumEntryWithoutInitializer(@NotNull KtSuperTypeCallEntry callElement) { return new Call() { @Nullable @Override @@ -370,7 +370,7 @@ public class CallMaker { } @NotNull - public static Call makeCall(@Nullable final Receiver explicitReceiver, @Nullable final ASTNode callOperationNode, @NotNull final KtCallElement callElement) { + public static Call makeCall(@Nullable Receiver explicitReceiver, @Nullable ASTNode callOperationNode, @NotNull KtCallElement callElement) { return new Call() { @Override public ASTNode getCallOperationNode() { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java index 8fe9a6a5fd1..af84ad89469 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java @@ -114,7 +114,7 @@ public class LazyDeclarationResolver { } @NotNull - private DeclarationDescriptor resolveToDescriptor(@NotNull KtDeclaration declaration, final boolean track) { + private DeclarationDescriptor resolveToDescriptor(@NotNull KtDeclaration declaration, boolean track) { DeclarationDescriptor result = declaration.accept(new KtVisitor() { @NotNull private LookupLocation lookupLocationFor(@NotNull KtDeclaration declaration, boolean isTopLevel) { 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 5c39f370497..f0bb21b20b8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java @@ -261,7 +261,7 @@ public class ResolveSession implements KotlinCodeAnalyzer, LazyClassContext { @Override @NotNull @ReadOnly - public Collection getTopLevelClassifierDescriptors(@NotNull FqName fqName, @NotNull final LookupLocation location) { + public Collection getTopLevelClassifierDescriptors(@NotNull FqName fqName, @NotNull LookupLocation location) { if (fqName.isRoot()) return Collections.emptyList(); PackageMemberDeclarationProvider provider = declarationProviderFactory.getPackageMemberDeclarationProvider(fqName.parent()); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java index fc12db91e45..ec4b9dc0473 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java @@ -42,7 +42,7 @@ public class FileBasedDeclarationProviderFactory extends AbstractDeclarationProv private final StorageManager storageManager; private final NotNullLazyValue index; - public FileBasedDeclarationProviderFactory(@NotNull StorageManager storageManager, @NotNull final Collection files) { + public FileBasedDeclarationProviderFactory(@NotNull StorageManager storageManager, @NotNull Collection files) { super(storageManager); this.storageManager = storageManager; this.index = storageManager.createLazyValue(new Function0() { 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 365698529d7..df6f6aedda9 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 @@ -110,10 +110,10 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes private final NotNullLazyValue> sealedSubclasses; public LazyClassDescriptor( - @NotNull final LazyClassContext c, + @NotNull LazyClassContext c, @NotNull DeclarationDescriptor containingDeclaration, @NotNull Name name, - @NotNull final KtClassLikeInfo classLikeInfo, + @NotNull KtClassLikeInfo classLikeInfo, boolean isExternal ) { super(c.getStorageManager(), containingDeclaration, name, @@ -140,7 +140,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes this.isCompanionObject = classLikeInfo instanceof KtObjectInfo && ((KtObjectInfo) classLikeInfo).isCompanionObject(); - final KtModifierList modifierList = classLikeInfo.getModifierList(); + KtModifierList modifierList = classLikeInfo.getModifierList(); if (kind.isSingleton()) { this.modality = storageManager.createLazyValue(new Function0() { @Override @@ -150,7 +150,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes }); } else { - final Modality defaultModality = kind == ClassKind.INTERFACE ? Modality.ABSTRACT : Modality.FINAL; + Modality defaultModality = kind == ClassKind.INTERFACE ? Modality.ABSTRACT : Modality.FINAL; this.modality = storageManager.createLazyValue(new Function0() { @Override public Modality invoke() { @@ -431,7 +431,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes @NotNull @ReadOnly public List getDescriptorsForExtraCompanionObjects() { - final KtObjectDeclaration allowedCompanionObject = getCompanionObjectIfAllowed(); + KtObjectDeclaration allowedCompanionObject = getCompanionObjectIfAllowed(); return CollectionsKt.map( CollectionsKt.filter( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/BoundsSubstitutor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/BoundsSubstitutor.java index 2a37e2ca1b1..f556fe86e72 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/BoundsSubstitutor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/BoundsSubstitutor.java @@ -75,7 +75,7 @@ public class BoundsSubstitutor { } @NotNull - private static List topologicallySortTypeParameters(@NotNull final List typeParameters) { + private static List topologicallySortTypeParameters(@NotNull List typeParameters) { // In the end, we want every parameter to have no references to those after it in the list // This gives us the reversed order: the one that refers to everybody else comes first List topOrder = DFS.topologicalOrder( @@ -98,7 +98,7 @@ public class BoundsSubstitutor { @NotNull private static List getTypeParametersFromUpperBounds( @NotNull TypeParameterDescriptor current, - @NotNull final List typeParameters + @NotNull List typeParameters ) { return DFS.dfs( current.getUpperBounds(), diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/CommonSupertypes.java b/compiler/frontend/src/org/jetbrains/kotlin/types/CommonSupertypes.java index a9443c6d139..c022b79d404 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/CommonSupertypes.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/CommonSupertypes.java @@ -67,7 +67,7 @@ public class CommonSupertypes { return max; } - private static int depth(@NotNull final KotlinType type) { + private static int depth(@NotNull KotlinType type) { return 1 + maxDepth(CollectionsKt.map(type.getArguments(), new Function1() { @Override public KotlinType invoke(TypeProjection projection) { @@ -331,8 +331,8 @@ public class CommonSupertypes { @NotNull public static List topologicallySortSuperclassesAndRecordAllInstances( @NotNull SimpleType type, - @NotNull final Map> constructorToAllInstances, - @NotNull final Set visited + @NotNull Map> constructorToAllInstances, + @NotNull Set visited ) { return DFS.dfs( Collections.singletonList(type), diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/TypeIntersector.java b/compiler/frontend/src/org/jetbrains/kotlin/types/TypeIntersector.java index 862a0391c64..35eee99f5eb 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/TypeIntersector.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/TypeIntersector.java @@ -173,7 +173,7 @@ public class TypeIntersector { private static boolean unify(KotlinType withParameters, KotlinType expected) { // T -> how T is used - final Map parameters = new HashMap(); + Map parameters = new HashMap(); Function1 processor = new Function1() { @Override public Unit invoke(TypeParameterUsage parameterUsage) { 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 dbfe8fe292f..bc519b7a829 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java @@ -714,10 +714,10 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { @Override public KotlinTypeInfo visitObjectLiteralExpression( - @NotNull final KtObjectLiteralExpression expression, - final ExpressionTypingContext context + @NotNull KtObjectLiteralExpression expression, + ExpressionTypingContext context ) { - final KotlinType[] result = new KotlinType[1]; + KotlinType[] result = new KotlinType[1]; TemporaryBindingTrace temporaryTrace = TemporaryBindingTrace.create(context.trace, "trace to resolve object literal expression", expression); ObservableBindingTrace.RecordHandler handler = @@ -727,7 +727,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { public void handleRecord( WritableSlice slice, PsiElement declaration, - final ClassDescriptor descriptor + ClassDescriptor descriptor ) { if (slice == CLASS && declaration == expression.getObjectDeclaration()) { KotlinType defaultType = components.wrappedTypeFactory.createRecursionIntolerantDeferredType( @@ -1160,8 +1160,8 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { KtBinaryExpression expression, ExpressionTypingContext context, KtSimpleNameExpression operationSign, - final KtExpression left, - final KtExpression right + KtExpression left, + KtExpression right ) { if (right == null || left == null) { ExpressionTypingUtils.getTypeInfoOrNullType(right, context, facade); @@ -1445,7 +1445,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { return true; } - private void ensureNonemptyIntersectionOfOperandTypes(KtBinaryExpression expression, final ExpressionTypingContext context) { + private void ensureNonemptyIntersectionOfOperandTypes(KtBinaryExpression expression, ExpressionTypingContext context) { KtExpression left = expression.getLeft(); if (left == null) return; @@ -1580,8 +1580,9 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { @NotNull KtStringTemplateExpression expression, ExpressionTypingContext contextWithExpectedType ) { - final ExpressionTypingContext context = contextWithExpectedType.replaceExpectedType(NO_EXPECTED_TYPE) - .replaceContextDependency(INDEPENDENT); + ExpressionTypingContext context = contextWithExpectedType + .replaceExpectedType(NO_EXPECTED_TYPE) + .replaceContextDependency(INDEPENDENT); checkLiteralPrefixAndSuffix(expression, context); 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 54966aa4477..31a9080fd83 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java @@ -191,7 +191,7 @@ public class ControlStructureTypingUtils { private static MutableDataFlowInfoForArguments createIndependentDataFlowInfoForArgumentsForCall( @NotNull DataFlowInfo initialDataFlowInfo, - final Map dataFlowInfoForArgumentsMap + Map dataFlowInfoForArgumentsMap ) { return new MutableDataFlowInfoForArguments(initialDataFlowInfo) { @@ -235,11 +235,11 @@ public class ControlStructureTypingUtils { } /*package*/ static Call createCallForSpecialConstruction( - @NotNull final KtExpression expression, - @NotNull final KtExpression calleeExpression, + @NotNull KtExpression expression, + @NotNull KtExpression calleeExpression, @NotNull List arguments ) { - final List valueArguments = Lists.newArrayList(); + List valueArguments = Lists.newArrayList(); for (KtExpression argument : arguments) { valueArguments.add(CallMaker.makeValueArgument(argument)); } @@ -314,9 +314,9 @@ public class ControlStructureTypingUtils { @NotNull private TracingStrategy createTracingForSpecialConstruction( - final @NotNull Call call, + @NotNull Call call, @NotNull String constructionName, - final @NotNull ExpressionTypingContext context + @NotNull ExpressionTypingContext context ) { class CheckTypeContext { public BindingTrace trace; @@ -333,8 +333,7 @@ public class ControlStructureTypingUtils { } } - final KtVisitor checkTypeVisitor = new KtVisitor() { - + KtVisitor checkTypeVisitor = new KtVisitor() { private boolean checkExpressionType(@NotNull KtExpression expression, CheckTypeContext c) { KotlinTypeInfo typeInfo = BindingContextUtils.getRecordedTypeInfo(expression, c.trace.getBindingContext()); if (typeInfo == null) return false; 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 827796ea304..863b40efc79 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java @@ -269,8 +269,8 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor { .replaceDataFlowInfo(dataFlowInfo); } - private boolean containsJumpOutOfLoop(@NotNull final KtExpression expression, final ExpressionTypingContext context) { - final boolean[] result = new boolean[1]; + private boolean containsJumpOutOfLoop(@NotNull KtExpression expression, ExpressionTypingContext context) { + boolean[] result = new boolean[1]; result[0] = false; //todo breaks in inline function literals expression.accept(new KtTreeVisitor>() { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowAnalyzer.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowAnalyzer.java index 34f5b265295..0ef8b54fe17 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowAnalyzer.java @@ -119,12 +119,12 @@ public class DataFlowAnalyzer { @NotNull public DataFlowInfo extractDataFlowInfoFromCondition( - @Nullable final KtExpression condition, - final boolean conditionValue, - final ExpressionTypingContext context + @Nullable KtExpression condition, + boolean conditionValue, + ExpressionTypingContext context ) { if (condition == null) return context.dataFlowInfo; - final Ref result = new Ref(null); + Ref result = new Ref(null); condition.accept(new KtVisitorVoid() { @Override public void visitIsExpression(@NotNull KtIsExpression expression) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java index 918084ae65a..8936b20dcb1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java @@ -99,12 +99,12 @@ public class ExpressionTypingServices { @NotNull public KotlinTypeInfo getTypeInfo( @NotNull LexicalScope scope, - @NotNull final KtExpression expression, + @NotNull KtExpression expression, @NotNull KotlinType expectedType, @NotNull DataFlowInfo dataFlowInfo, @NotNull BindingTrace trace, boolean isStatement, - @NotNull final KtExpression contextExpression, + @NotNull KtExpression contextExpression, @NotNull ContextDependency contextDependency ) { ExpressionTypingContext context = ExpressionTypingContext.newContext( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java index 816af014076..e9b002c9273 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java @@ -125,8 +125,8 @@ public class ExpressionTypingUtils { public static ObservableBindingTrace makeTraceInterceptingTypeMismatch( @NotNull BindingTrace trace, - @NotNull final KtElement expressionToWatch, - @NotNull final boolean[] mismatchFound + @NotNull KtElement expressionToWatch, + @NotNull boolean[] mismatchFound ) { return new ObservableBindingTrace(trace) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java index 14eb241cbf6..767e596d526 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java @@ -168,7 +168,7 @@ public abstract class ExpressionTypingVisitorDispatcher extends KtVisitor visitor) { + private KotlinTypeInfo getTypeInfo(@NotNull KtExpression expression, ExpressionTypingContext context, KtVisitor visitor) { return typeInfoPerfCounter.time(new Function0() { @Override public KotlinTypeInfo invoke() { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/TrackingSlicedMap.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/TrackingSlicedMap.java index a23418ad04d..d75013689d3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/TrackingSlicedMap.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/TrackingSlicedMap.java @@ -53,7 +53,7 @@ public class TrackingSlicedMap extends SlicedMapImpl { } @Override - public void forEach(@NotNull final Function3 f) { + public void forEach(@NotNull Function3 f) { super.forEach(new Function3() { @Override public Void invoke(WritableSlice slice, Object key, Object value) { diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/builder/ClsWrapperStubPsiFactory.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/builder/ClsWrapperStubPsiFactory.java index 990cea2fe28..1ce0a9f621a 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/builder/ClsWrapperStubPsiFactory.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/builder/ClsWrapperStubPsiFactory.java @@ -39,7 +39,7 @@ public class ClsWrapperStubPsiFactory extends StubPsiFactory { @Override public PsiClass createClass(@NotNull PsiClassStub stub) { - final PsiElement origin = getOriginalElement(stub); + PsiElement origin = getOriginalElement(stub); return new ClsClassImpl(stub) { @NotNull @Override @@ -80,7 +80,7 @@ public class ClsWrapperStubPsiFactory extends StubPsiFactory { @Override public PsiField createField(PsiFieldStub stub) { - final PsiElement origin = getOriginalElement(stub); + PsiElement origin = getOriginalElement(stub); if (origin == null) return delegate.createField(stub); if (stub.isEnumConstant()) { return new ClsEnumConstantImpl(stub) { diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightParameter.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightParameter.java index 15e9f56d838..a48d14aac7b 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightParameter.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtLightParameter.java @@ -46,7 +46,7 @@ public class KtLightParameter extends LightParameter implements KtLightDeclarati private final KtLightMethod method; private KtLightIdentifier lightIdentifier = null; - public KtLightParameter(final PsiParameter delegate, int index, KtLightMethod method) { + public KtLightParameter(PsiParameter delegate, int index, KtLightMethod method) { super(getName(delegate, index), delegate.getType(), method, KotlinLanguage.INSTANCE); this.delegate = delegate; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.java index 54fba87c17b..2efa2e90073 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.java @@ -174,7 +174,7 @@ public class JavaElementFinder extends PsiElementFinder implements KotlinFinderM @NotNull @Override - public PsiPackage[] getSubPackages(@NotNull PsiPackage psiPackage, @NotNull final GlobalSearchScope scope) { + public PsiPackage[] getSubPackages(@NotNull PsiPackage psiPackage, @NotNull GlobalSearchScope scope) { FqName packageFQN = new FqName(psiPackage.getQualifiedName()); Collection subpackages = lightClassGenerationSupport.getSubPackages(packageFQN, scope); @@ -218,7 +218,7 @@ public class JavaElementFinder extends PsiElementFinder implements KotlinFinderM @Override @Nullable - public Condition getPackageFilesFilter(@NotNull final PsiPackage psiPackage, @NotNull GlobalSearchScope scope) { + public Condition getPackageFilesFilter(@NotNull PsiPackage psiPackage, @NotNull GlobalSearchScope scope) { return new Condition() { @Override public boolean value(PsiFile input) { @@ -231,7 +231,7 @@ public class JavaElementFinder extends PsiElementFinder implements KotlinFinderM } @NotNull - public static Comparator byClasspathComparator(@NotNull final GlobalSearchScope searchScope) { + public static Comparator byClasspathComparator(@NotNull GlobalSearchScope searchScope) { return new Comparator() { @Override public int compare(@NotNull PsiElement o1, @NotNull PsiElement o2) { diff --git a/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/InterceptionInstrumenter.java b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/InterceptionInstrumenter.java index 88bd72717b7..bb60810ef9e 100644 --- a/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/InterceptionInstrumenter.java +++ b/compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/InterceptionInstrumenter.java @@ -54,7 +54,7 @@ public class InterceptionInstrumenter { } private void addHandlerClass(Class handlerClass) { - for (final Field field : handlerClass.getFields()) { + for (Field field : handlerClass.getFields()) { MethodInterceptor annotation = field.getAnnotation(MethodInterceptor.class); if (annotation == null) continue; @@ -71,7 +71,7 @@ public class InterceptionInstrumenter { throw new IllegalArgumentException("Interceptor is null: " + field); } - final Class interceptorClass = interceptor.getClass(); + Class interceptorClass = interceptor.getClass(); FieldData fieldData = getFieldData(field, interceptorClass); @@ -214,7 +214,7 @@ public class InterceptionInstrumenter { allArgsParameterIndex); } - private void addDumpTask(final Object interceptor, final Method method, final MethodInstrumenter instrumenter) { + private void addDumpTask(Object interceptor, Method method, MethodInstrumenter instrumenter) { dumpTasks.add(new DumpAction() { @Override public void dump(PrintStream out) { @@ -272,17 +272,17 @@ public class InterceptionInstrumenter { return name.substring(0, name.length() - suffix.length()); } - private byte[] instrument(byte[] classData, final List instrumenters) { - final ClassReader cr = new ClassReader(classData); + private byte[] instrument(byte[] classData, List instrumenters) { + ClassReader cr = new ClassReader(classData); ClassWriter cw = new ClassWriter(cr, 0); cr.accept(new ClassVisitor(ASM5, cw) { private final Map matchedMethods = new HashMap(); @Override public MethodVisitor visitMethod( - final int access, - final String name, - final String desc, + int access, + String name, + String desc, String signature, String[] exceptions ) { @@ -304,9 +304,9 @@ public class InterceptionInstrumenter { if (applicableInstrumenters.isEmpty()) return mv; boolean dumpByteCode = false; - final List normalReturnData = new ArrayList(); - final List enterData = new ArrayList(); - final List exceptionData = new ArrayList(); + List normalReturnData = new ArrayList(); + List enterData = new ArrayList(); + List exceptionData = new ArrayList(); for (MethodInstrumenter instrumenter : applicableInstrumenters) { enterData.addAll(instrumenter.getEnterData()); @@ -323,8 +323,8 @@ public class InterceptionInstrumenter { mv = getDumpingVisitorWrapper(mv, name, desc); } - final int maxStackDepth = getMaxStackDepth(name, desc, normalReturnData, enterData, exceptionData); - final boolean isConstructor = "".equals(name); + int maxStackDepth = getMaxStackDepth(name, desc, normalReturnData, enterData, exceptionData); + boolean isConstructor = "".equals(name); return new MethodVisitor(ASM5, mv) { @@ -430,7 +430,7 @@ public class InterceptionInstrumenter { } } - private TraceMethodVisitor getDumpingVisitorWrapper(MethodVisitor mv, final String methodName, final String methodDesc) { + private TraceMethodVisitor getDumpingVisitorWrapper(MethodVisitor mv, String methodName, String methodDesc) { return new TraceMethodVisitor(mv, new Textifier(ASM5) { @Override public void visitMethodEnd() { diff --git a/compiler/preloader/src/org/jetbrains/kotlin/preloading/Preloader.java b/compiler/preloader/src/org/jetbrains/kotlin/preloading/Preloader.java index 6cfc7f565f3..88cd7bb8de7 100644 --- a/compiler/preloader/src/org/jetbrains/kotlin/preloading/Preloader.java +++ b/compiler/preloader/src/org/jetbrains/kotlin/preloading/Preloader.java @@ -43,13 +43,13 @@ public class Preloader { } private static void run(String[] args) throws Exception { - final long startTime = System.nanoTime(); + long startTime = System.nanoTime(); - final Options options = parseOptions(args); + Options options = parseOptions(args); ClassLoader classLoader = createClassLoader(options); - final Handler handler = getHandler(options, classLoader); + Handler handler = getHandler(options, classLoader); ClassLoader preloaded = ClassPreloadingUtils.preloadClasses(options.classpath, options.estimate, classLoader, null, handler); Class mainClass = preloaded.loadClass(options.mainClass); @@ -147,10 +147,10 @@ public class Preloader { private static Handler getHandler(Options options, ClassLoader withInstrumenter) { if (!options.measure) return new Handler(); - final Instrumenter instrumenter = options.instrumenters.isEmpty() ? Instrumenter.DO_NOTHING : loadInstrumenter(withInstrumenter); + Instrumenter instrumenter = options.instrumenters.isEmpty() ? Instrumenter.DO_NOTHING : loadInstrumenter(withInstrumenter); - final int[] counter = new int[1]; - final int[] size = new int[1]; + int[] counter = new int[1]; + int[] size = new int[1]; return new Handler() { @Override public void beforeDefineClass(String name, int sizeInBytes) { diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/ScopeUtils.java b/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/ScopeUtils.java index 60d66b47eb4..26ea8d0b5a3 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/ScopeUtils.java +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/scopes/ScopeUtils.java @@ -30,7 +30,7 @@ public final class ScopeUtils { public static LexicalScope makeScopeForPropertyHeader( @NotNull LexicalScope parent, - @NotNull final PropertyDescriptor propertyDescriptor + @NotNull PropertyDescriptor propertyDescriptor ) { return new LexicalScopeImpl(parent, propertyDescriptor, false, null, LexicalScopeKind.PROPERTY_HEADER, // redeclaration on type parameters should be reported early, see: DescriptorResolver.resolvePropertyDescriptor() diff --git a/compiler/tests-common/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java b/compiler/tests-common/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java index d17c2669532..1eaa78584ad 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java +++ b/compiler/tests-common/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithJava.java @@ -106,7 +106,7 @@ public abstract class KotlinMultiFileTestWithJava extends KotlinTestWithEn String expectedText = KotlinTestUtils.doLoadFile(file); - final Map modules = new HashMap(); + Map modules = new HashMap(); List testFiles = KotlinTestUtils.createTestFiles(file.getName(), expectedText, new KotlinTestUtils.TestFileFactory() { diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java index cd3568d5cc0..6baf47e073c 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java +++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractBlackBoxCodegenTest.java @@ -80,7 +80,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase { @NotNull protected static List findJavaSourcesInDirectory(@NotNull File directory) { - final List javaFilePaths = new ArrayList(1); + List javaFilePaths = new ArrayList(1); FileUtil.processFilesRecursively(directory, new Processor() { @Override diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java index e0360084246..5d5a034ebfe 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java +++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java @@ -73,7 +73,7 @@ public abstract class AbstractCheckLocalVariablesTableTest extends TestCaseWithT String classAndMethod = parseClassAndMethodSignature(); String[] split = classAndMethod.split("\\."); assert split.length == 2 : "Exactly one dot is expected: " + classAndMethod; - final String classFileRegex = StringUtil.escapeToRegexp(split[0] + ".class").replace("\\*", ".+"); + String classFileRegex = StringUtil.escapeToRegexp(split[0] + ".class").replace("\\*", ".+"); String methodName = split[1]; OutputFile outputFile = ContainerUtil.find(outputFiles.asList(), new Condition() { @@ -144,7 +144,7 @@ public abstract class AbstractCheckLocalVariablesTableTest extends TestCaseWithT } @NotNull - private static List readLocalVariable(ClassReader cr, final String methodName) throws Exception { + private static List readLocalVariable(ClassReader cr, String methodName) throws Exception { class Visitor extends ClassVisitor { List readVariables = new ArrayList(); diff --git a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java index 82e96fd7d7b..d6ec4a2863f 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java +++ b/compiler/tests-common/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java @@ -167,8 +167,8 @@ public abstract class AbstractLineNumberTest extends TestCaseWithTmpdir { @NotNull private static List readTestFunLineNumbers(@NotNull ClassReader cr) { - final List