From c000f3395593ced890a9d892d313044fa36df608 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Thu, 26 Sep 2019 17:28:16 +0300 Subject: [PATCH] New J2K: make initial generating code formatting better --- .../copy/ConvertTextJavaCopyPasteProcessor.kt | 14 +- .../jetbrains/kotlin/nj2k/NewCodeBuilder.kt | 319 ++++++++++-------- .../annotations/annotationArrayArgument.kt | 5 +- .../newJ2k/annotations/annotationDefault.kt | 3 +- .../annotations/annotationInterface1.kt | 4 +- .../annotations/annotationInterface2.kt | 3 +- .../annotations/annotationInterface3.kt | 5 +- .../annotations/annotationInterface4.kt | 3 +- .../newJ2k/annotations/annotationUsages.kt | 5 +- .../annotationsFromPropertyAccessors.kt | 5 +- .../newJ2k/annotations/javaClassArgument.kt | 3 +- .../annotations/javaClassArrayArgument.kt | 3 +- .../newJ2k/annotations/jetbrainsNotNull.kt | 4 +- nj2k/testData/newJ2k/annotations/kt-31726.kt | 2 +- .../primaryConstructorAnnotation.kt | 3 +- .../newJ2k/annotations/suppressWarnings.kt | 6 +- .../newJ2k/assertStatement/assertNotNull.kt | 1 - .../assignmentAsExpression.kt | 1 - .../assignmentExpression/assignmentsChain.kt | 8 - .../assignmentsChainWithParenthesis.kt | 10 +- .../declarationAssignmentsChain.kt | 9 +- .../binaryExpression/lhsObjectPlusString.kt | 1 - .../newJ2k/binaryExpression/orWithNewLine.kt | 3 - nj2k/testData/newJ2k/blocks/Blocks.kt | 2 - .../callChainExpression/libraryFieldCall.kt | 1 - .../callChainExpression/libraryMethodCall.kt | 2 - .../libraryMethodCallFromInstance.kt | 3 - nj2k/testData/newJ2k/class/abstractClass.kt | 1 - .../newJ2k/class/abstractClassShape.kt | 1 + nj2k/testData/newJ2k/class/innerEnum.kt | 4 +- nj2k/testData/newJ2k/class/utilityClass5.kt | 1 - .../newJ2k/comments/commentInsideCall.kt | 10 +- nj2k/testData/newJ2k/comments/comments.kt | 13 +- nj2k/testData/newJ2k/comments/comments2.kt | 4 +- .../comments/commentsForConstructors.kt | 32 +- .../comments/removeNoInspectionComment.kt | 1 - .../newJ2k/conditionalExpression/multiline.kt | 5 +- .../newJ2k/constructors/allCallsPrimary.kt | 1 - nj2k/testData/newJ2k/constructors/chain.kt | 1 - .../constructors/constructorAnnotations.kt | 3 +- .../fieldsInitializedFromParams8.kt | 2 +- .../newJ2k/constructors/identifier.kt | 1 + .../lineBreaksBetweenParameters.kt | 3 +- .../constructors/methodCallInFactoryFun.kt | 4 +- .../testData/newJ2k/constructors/noPrimary.kt | 2 - .../newJ2k/constructors/parameterDefaults1.kt | 3 +- .../newJ2k/constructors/parameterDefaults2.kt | 4 +- .../newJ2k/constructors/parameterDefaults3.kt | 1 - .../constructors/privateConstructors.kt | 3 +- .../constructors/qualifiedRefInFactoryFun.kt | 1 + .../secondaryConstructorWithDefaultValues.kt | 1 - .../secondaryConstructorsInInnerClass.kt | 15 +- .../secondaryConstructorsInNestedClass.kt | 15 +- .../secondaryConstructorsVisibility.kt | 8 - .../staticFieldRefInFactoryFun.kt | 1 - .../newJ2k/detectProperties/AnonymousClass.kt | 1 + .../AssignFieldInsideSetter.kt | 1 + .../AssignFieldInsideSetter2.kt | 1 - .../detectProperties/CannotDropOnlySetter.kt | 3 +- .../newJ2k/detectProperties/Comments.kt | 4 +- .../detectProperties/CyclicInheritance.kt | 1 + .../newJ2k/detectProperties/DataClass.kt | 1 + .../detectProperties/DropGetterAndSetter.kt | 3 +- .../newJ2k/detectProperties/FalseGetter.kt | 3 +- .../newJ2k/detectProperties/FalseSetter.kt | 3 +- .../detectProperties/GetterTypeNotMatch.kt | 1 - .../detectProperties/GetterWithSideEffect1.kt | 1 - .../detectProperties/GetterWithSideEffect2.kt | 1 - .../detectProperties/GetterWithSideEffect3.kt | 3 +- .../detectProperties/GetterWithSideEffect4.kt | 3 +- .../detectProperties/GetterWithSideEffect5.kt | 3 +- .../detectProperties/InCompanionObject.kt | 4 +- .../newJ2k/detectProperties/InInterface.kt | 2 + .../newJ2k/detectProperties/InObject.kt | 3 +- .../newJ2k/detectProperties/IsPrefix.kt | 1 + .../newJ2k/detectProperties/Overrides.kt | 1 + .../PropertyAndFieldConflicts.kt | 1 - .../detectProperties/SetterWithSideEffect1.kt | 3 +- .../detectProperties/SetterWithSideEffect2.kt | 3 +- .../detectProperties/SetterWithSideEffect3.kt | 3 +- .../detectProperties/SetterWithSideEffect4.kt | 1 + .../detectProperties/SetterWithSideEffect5.kt | 1 + .../detectProperties/SetterWithSideEffect6.kt | 3 +- .../commentInInitStatement.kt | 3 +- .../newJ2k/detectProperties/kt-31700.kt | 3 +- .../deprecatedDocTagWithMultiLineMessage.kt | 9 +- nj2k/testData/newJ2k/enum/colorEnum.kt | 1 + nj2k/testData/newJ2k/enum/companionObject.kt | 7 +- .../newJ2k/enum/constantsWithBody1.kt | 6 +- .../newJ2k/enum/constantsWithBody2.kt | 5 +- .../newJ2k/enum/enumConstantIsNotNull.kt | 5 +- .../fieldsWithPrimaryPrivateConstructor.kt | 1 + nj2k/testData/newJ2k/equals/EqOperator.kt | 7 +- nj2k/testData/newJ2k/equals/Equals1.kt | 1 - nj2k/testData/newJ2k/equals/ObjectsEquals.kt | 1 - nj2k/testData/newJ2k/field/conversion.kt | 2 - nj2k/testData/newJ2k/field/valWithInit.kt | 1 - nj2k/testData/newJ2k/field/varWithInit.kt | 1 - .../field/volatileTransientAndStrictFp.kt | 2 - nj2k/testData/newJ2k/for/nameConflict1.kt | 3 +- nj2k/testData/newJ2k/for/nameConflict2.kt | 3 +- nj2k/testData/newJ2k/for/nameConflict3.kt | 4 +- nj2k/testData/newJ2k/for/nameConflict4.kt | 3 +- nj2k/testData/newJ2k/for/nameConflict5.kt | 3 +- .../foreachStatement/foreachWithoutBody.kt | 1 - .../formatting/lineBreaksBetweenArguments.kt | 3 +- .../nonStaticMembersWithComments.kt | 18 +- .../staticAndNonStaticMembersWithComments.kt | 10 +- .../formatting/staticMembersWithComments.kt | 19 +- .../function/externalKtFunctionalInterface.kt | 4 +- .../function/java8MRKFunctionExpectedType.kt | 4 - .../function/lineBreaksBetweenParameters.kt | 1 - .../testData/newJ2k/function/nativeMethods.kt | 5 +- .../newJ2k/function/overrideObject2.kt | 1 - .../newJ2k/identifier/finalFieldReference.kt | 4 +- nj2k/testData/newJ2k/ifStatement/elseIf.kt | 8 +- .../newJ2k/ifStatement/ifWithoutThen.kt | 1 - nj2k/testData/newJ2k/ifStatement/multiLine.kt | 3 +- .../classOneExtendsBaseWithZeroParams.kt | 3 +- nj2k/testData/newJ2k/issues/comments.kt | 25 +- nj2k/testData/newJ2k/issues/kt-1074.kt | 3 +- nj2k/testData/newJ2k/issues/kt-17379.kt | 6 +- nj2k/testData/newJ2k/issues/kt-19652.kt | 3 +- nj2k/testData/newJ2k/issues/kt-31818.kt | 3 +- nj2k/testData/newJ2k/issues/kt-543.kt | 1 - nj2k/testData/newJ2k/issues/kt-792.kt | 1 - nj2k/testData/newJ2k/issues/kt-807.kt | 3 +- nj2k/testData/newJ2k/issues/kt-809.kt | 1 - nj2k/testData/newJ2k/issues/kt-824-isDir.kt | 3 +- nj2k/testData/newJ2k/issues/kt-828.kt | 1 - nj2k/testData/newJ2k/issues/kt-836.kt | 3 +- nj2k/testData/newJ2k/issues/kt-837.kt | 1 + nj2k/testData/newJ2k/issues/kt-851.kt | 1 - nj2k/testData/newJ2k/issues/kt-852.kt | 5 +- nj2k/testData/newJ2k/issues/kt-899.kt | 19 +- nj2k/testData/newJ2k/issues/kt-9997.kt | 15 - .../newJ2k/issues/operationsWithChar.kt | 5 - .../CorrectNullabilityDetected.kt | 6 +- .../testData/newJ2k/literalExpression/char.kt | 1 - .../literalExpression/dollarInsideString.kt | 2 - .../newJ2k/literalExpression/endsWithDFL.kt | 2 - .../literalExpression/exponentDouble.kt | 10 +- .../newJ2k/literalExpression/exponentFloat.kt | 12 +- .../newJ2k/literalExpression/trueOrFalse.kt | 1 - .../conflictJavaMethodCall.kt | 3 +- .../parameterToReceiver.kt | 1 + .../specialBuiltinMembers.kt | 5 +- .../methodCallExpression/stringMethods.kt | 3 +- .../newJ2k/methodCallExpression/systemOut.kt | 3 +- .../newJ2k/mutableCollections/Overrides.kt | 3 +- .../newClassExpression/classWithParam.kt | 1 - .../newClassExpression/classWithParams.kt | 1 - .../newClassExpression/javaLangObject.kt | 6 +- .../newJ2k/newClassExpression/lineBreaks.kt | 3 +- .../newClassExpression/newAnonymousClass2.kt | 1 - .../newClassExpression/newClassByFullName.kt | 1 - .../nullability/FieldAssignedWithNull.kt | 1 - .../nullability/FieldComparedWithNull.kt | 1 - .../nullability/FieldComparedWithNull2.kt | 2 +- .../nullability/FieldInitializedWithNull.kt | 1 - .../newJ2k/nullability/IndirectOverride.kt | 1 - .../nullability/MethodInvokedWithNullArg.kt | 1 - .../MethodInvokedWithTernaryNullArg.kt | 1 - .../newJ2k/nullability/NullableIntNoCrash.kt | 1 - .../nullability/VariableComparedWithNull.kt | 1 - .../newJ2k/nullability/notNullCast.kt | 2 - nj2k/testData/newJ2k/overloads/Abstract.kt | 3 +- .../protected/onlyProtectedConstructor.kt | 3 +- .../newJ2k/protected/severalInheritors.kt | 7 +- nj2k/testData/newJ2k/protected/usages.kt | 9 +- .../testData/newJ2k/settings/openByDefault.kt | 3 +- .../specifyLocalVariableTypeByDefault.kt | 1 - .../specifyLocalVariableTypeByDefaultInFor.kt | 1 - .../staticMembers/PrivateStaticMembers.kt | 2 - .../staticMembers/PrivateStaticMethods2.kt | 1 - .../staticMembers/PrivateStaticMethods3.kt | 1 - .../StaticQualifiedByInheritor.kt | 2 +- .../newJ2k/strings/formattedString.kt | 2 - nj2k/testData/newJ2k/switch/caseWithBlock.kt | 2 - nj2k/testData/newJ2k/switch/emptySwitch.kt | 2 - .../newJ2k/switch/fallDownWithBlocks.kt | 1 - nj2k/testData/newJ2k/switch/kt-539.kt | 1 - nj2k/testData/newJ2k/switch/nestedSwitch.kt | 1 - nj2k/testData/newJ2k/switch/nondefault.kt | 1 - .../trait/interfaceWithMethodDeclaration.kt | 1 + .../newJ2k/tryWithResource/WithCatch.kt | 1 - .../newJ2k/tryWithResource/WithCatches.kt | 1 - .../newJ2k/tryWithResource/WithFinally.kt | 3 +- ...rametrizationWithTwoBoundsWithExtending.kt | 2 +- ...rametrizationWithTwoBoundsWithExtending.kt | 2 +- .../newJ2k/whileStatement/whileWithoutBody.kt | 3 +- ...tNewJavaToKotlinConverterSingleFileTest.kt | 5 +- 192 files changed, 396 insertions(+), 625 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertTextJavaCopyPasteProcessor.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertTextJavaCopyPasteProcessor.kt index 9e458c3ddc3..26ea8842ce5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertTextJavaCopyPasteProcessor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/ConvertTextJavaCopyPasteProcessor.kt @@ -33,10 +33,12 @@ import com.intellij.util.LocalTimeCounter import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.asJava.toLightClass import org.jetbrains.kotlin.idea.KotlinFileType +import org.jetbrains.kotlin.idea.core.util.range import org.jetbrains.kotlin.idea.editor.KotlinEditorOptions import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.idea.util.projectStructure.module import org.jetbrains.kotlin.j2k.ConversionType +import org.jetbrains.kotlin.j2k.J2kConverterExtension import org.jetbrains.kotlin.j2k.logJ2kConversionStatistics import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* @@ -140,11 +142,19 @@ class ConvertTextJavaCopyPasteProcessor : CopyPastePostProcessor + postProcessor.insertImport(targetFile, fqName) + } + } + + runPostProcessing(project, targetFile, newBounds.range, convertedResult.converterContext, useNewJ2k) conversionPerformed = true } diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/NewCodeBuilder.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/NewCodeBuilder.kt index d1a10a64a11..af6c1e92f7b 100644 --- a/nj2k/src/org/jetbrains/kotlin/nj2k/NewCodeBuilder.kt +++ b/nj2k/src/org/jetbrains/kotlin/nj2k/NewCodeBuilder.kt @@ -10,14 +10,12 @@ import org.jetbrains.kotlin.nj2k.symbols.* import org.jetbrains.kotlin.nj2k.tree.* import org.jetbrains.kotlin.nj2k.tree.visitors.JKVisitorWithCommentsPrinting import org.jetbrains.kotlin.nj2k.types.* -import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.utils.addToStdlib.safeAs class NewCodeBuilder(context: NewJ2kConverterContext) { private val elementInfoStorage = context.elementsInfoStorage - private val builder = StringBuilder() - private val printer = JKPrinter(builder, elementInfoStorage) + private val printer = JKPrinter(elementInfoStorage) private fun classKindString(kind: JKClass.ClassKind): String = when (kind) { JKClass.ClassKind.ANNOTATION -> "annotation class" @@ -57,7 +55,7 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { override fun printLeftNonCodeElements(element: JKFormattingOwner) { val text = element.trailingComments.createText() - printer.printWithNoIndent(text) + printer.print(text) val addNewLine = element.hasTrailingLineBreak || element is JKDeclaration && element.trailingComments.isNotEmpty() // add new line between comment & declaration @@ -69,7 +67,7 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { override fun printRightNonCodeElements(element: JKFormattingOwner) { val text = element.leadingComments.createText() - printer.printWithNoIndent(text) + printer.print(text) val addNewLine = element.hasLeadingLineBreak || text.hasNoLineBreakAfterSingleLineComment() if (addNewLine) printer.println() @@ -77,13 +75,13 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { private fun renderTokenElement(tokenElement: JKTokenElement) { printLeftNonCodeElements(tokenElement) - printer.printWithNoIndent(tokenElement.text) + printer.print(tokenElement.text) printRightNonCodeElements(tokenElement) } override fun visitModifierElementRaw(modifierElement: JKModifierElement) { if (modifierElement.modifier != Modality.FINAL) { - printer.printWithNoIndent(modifierElement.modifier.text) + printer.print(modifierElement.modifier.text) } } @@ -91,7 +89,7 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { val extraTypeBounds = typeParameterList.typeParameters .filter { it.upperBounds.size > 1 } if (extraTypeBounds.isNotEmpty()) { - printer.printWithNoIndent(" where ") + printer.print(" where ") val typeParametersWithBoudnds = extraTypeBounds.flatMap { typeParameter -> typeParameter.upperBounds.map { bound -> @@ -100,7 +98,7 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { } printer.renderList(typeParametersWithBoudnds) { (name, bound) -> name.accept(this) - printer.printWithNoIndent(" : ") + printer.print(" : ") bound.accept(this) } } @@ -115,17 +113,17 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { } override fun visitKtTryExpressionRaw(ktTryExpression: JKKtTryExpression) { - printer.printWithNoIndent("try ") + printer.print("try ") ktTryExpression.tryBlock.accept(this) ktTryExpression.catchSections.forEach { it.accept(this) } if (ktTryExpression.finallyBlock != JKBodyStub) { - printer.printWithNoIndent("finally ") + printer.print("finally ") ktTryExpression.finallyBlock.accept(this) } } override fun visitKtTryCatchSectionRaw(ktTryCatchSection: JKKtTryCatchSection) { - printer.printWithNoIndent("catch ") + printer.print("catch ") printer.par { ktTryCatchSection.parameter.accept(this) } @@ -133,29 +131,29 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { } override fun visitForInStatementRaw(forInStatement: JKForInStatement) { - printer.printWithNoIndent("for (") + printer.print("for (") forInStatement.declaration.accept(this) - printer.printWithNoIndent(" in ") + printer.print(" in ") forInStatement.iterationExpression.accept(this) - printer.printWithNoIndent(") ") + printer.print(") ") if (forInStatement.body.isEmpty()) { - printer.printWithNoIndent(";") + printer.print(";") } else { forInStatement.body.accept(this) } } override fun visitKtThrowExpressionRaw(ktThrowExpression: JKKtThrowExpression) { - printer.printWithNoIndent("throw ") + printer.print("throw ") ktThrowExpression.exception.accept(this) } override fun visitDoWhileStatementRaw(doWhileStatement: JKDoWhileStatement) { - printer.printWithNoIndent("do ") + printer.print("do ") doWhileStatement.body.accept(this) - printer.printWithNoIndent(" while (") + printer.print(" while (") doWhileStatement.condition.accept(this) - printer.printWithNoIndent(")") + printer.print(")") } override fun visitClassAccessExpressionRaw(classAccessExpression: JKClassAccessExpression) { @@ -172,9 +170,10 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { override fun visitPackageDeclarationRaw(packageDeclaration: JKPackageDeclaration) { - printer.printWithNoIndent("package ") + printer.print("package ") val packageNameEscaped = packageDeclaration.name.value.escapedAsQualifiedName() - printer.printlnWithNoIndent(packageNameEscaped) + printer.print(packageNameEscaped) + printer.println() } override fun visitImportListRaw(importList: JKImportList) { @@ -182,14 +181,15 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { } override fun visitImportStatementRaw(importStatement: JKImportStatement) { - printer.printWithNoIndent("import ") + printer.print("import ") val importNameEscaped = importStatement.name.value.escapedAsQualifiedName() - printer.printlnWithNoIndent(importNameEscaped) + printer.print(importNameEscaped) + printer.println() } override fun visitBreakStatementRaw(breakStatement: JKBreakStatement) { - printer.printWithNoIndent("break") + printer.print("break") breakStatement.label.accept(this) } @@ -209,7 +209,7 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { } else { modifierElement.accept(this) } - printer.printWithNoIndent(" ") + printer.print(" ") } } @@ -219,18 +219,18 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { printer.println() } renderModifiersList(klass) - builder.append(" ") + printer.print(" ") printer.print(classKindString(klass.classKind)) - builder.append(" ") + printer.print(" ") klass.name.accept(this) klass.typeParameterList.accept(this) - printer.printWithNoIndent(" ") + printer.print(" ") val primaryConstructor = klass.primaryConstructor() primaryConstructor?.accept(this) if (klass.inheritance.present()) { - printer.printWithNoIndent(" : ") + printer.print(" : ") klass.inheritance.accept(this) } @@ -257,13 +257,13 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { if (delegationCall != null) { printer.par { delegationCall.arguments.accept(this) } } else if (!superType.isInterface() && primaryConstructor != null) { - printer.printWithNoIndent("()") + printer.print("()") } } } if (implementTypes.isNotEmpty() && extendTypes.size == 1) { - printer.printWithNoIndent(", ") + printer.print(", ") } printer.renderList(implementTypes) { printer.renderType(it, null) } } @@ -289,14 +289,14 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { } renderModifiersList(field) - printer.printWithNoIndent(" ") + printer.print(" ") field.name.accept(this) if (field.type.present()) { - printer.printWithNoIndent(":") + printer.print(":") field.type.accept(this) } if (field.initializer !is JKStubExpression) { - printer.printWithNoIndent(" = ") + printer.print(" = ") field.initializer.accept(this) } } @@ -315,7 +315,6 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { override fun visitKtInitDeclarationRaw(ktInitDeclaration: JKKtInitDeclaration) { if (ktInitDeclaration.block.statements.isNotEmpty()) { - printer.println() printer.print("init ") ktInitDeclaration.block.accept(this) } @@ -324,17 +323,17 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { override fun visitIsExpressionRaw(isExpression: JKIsExpression) { isExpression.expression.accept(this) - printer.printWithNoIndent(" is ") + printer.print(" is ") isExpression.type.accept(this) } override fun visitParameterRaw(parameter: JKParameter) { renderModifiersList(parameter) - printer.printWithNoIndent(" ") + printer.print(" ") parameter.annotationList.accept(this) - printer.printWithNoIndent(" ") + printer.print(" ") if (parameter.isVarArgs) { - printer.printWithNoIndent("vararg ") + printer.print("vararg ") } if (parameter.parent is JKKtPrimaryConstructor && (parameter.parent?.parent?.parent as? JKClass)?.classKind == JKClass.ClassKind.ANNOTATION @@ -343,11 +342,11 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { } parameter.name.accept(this) if (parameter.type.present() && parameter.type.type !is JKContextType) { - printer.printWithNoIndent(":") + printer.print(":") parameter.type.accept(this) } if (parameter.initializer !is JKStubExpression) { - printer.printWithNoIndent(" = ") + printer.print(" = ") parameter.initializer.accept(this) } } @@ -363,23 +362,22 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { override fun visitForLoopVariableRaw(forLoopVariable: JKForLoopVariable) { forLoopVariable.name.accept(this) if (forLoopVariable.type.present() && forLoopVariable.type.type !is JKContextType) { - printer.printWithNoIndent(": ") + printer.print(": ") forLoopVariable.type.accept(this) } } override fun visitMethodRaw(method: JKMethod) { - printer.printIndent() if (method.annotationList.annotations.isNotEmpty()) { method.annotationList.accept(this) - printer.printlnWithNoIndent(" ") + printer.print(" ") } renderModifiersList(method) - printer.printWithNoIndent(" fun ") + printer.print(" fun ") method.typeParameterList.accept(this) elementInfoStorage.getOrCreateInfoForElement(method).let { - printer.printWithNoIndent(it.render()) + printer.print(it.render()) } method.name.accept(this) renderTokenElement(method.leftParen) @@ -387,35 +385,35 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { it.accept(this) } renderTokenElement(method.rightParen) - printer.printWithNoIndent(": ") + printer.print(": ") method.returnType.accept(this) renderExtraTypeParametersUpperBounds(method.typeParameterList) method.block.accept(this) } override fun visitIfElseExpressionRaw(ifElseExpression: JKIfElseExpression) { - printer.printWithNoIndent("if (") + printer.print("if (") ifElseExpression.condition.accept(this) - printer.printWithNoIndent(")") + printer.print(")") ifElseExpression.thenBranch.accept(this) if (ifElseExpression.elseBranch !is JKStubExpression) { - printer.printWithNoIndent(" else ") + printer.print(" else ") ifElseExpression.elseBranch.accept(this) } } override fun visitIfElseStatementRaw(ifElseStatement: JKIfElseStatement) { - printer.printWithNoIndent("if (") + printer.print("if (") ifElseStatement.condition.accept(this) - printer.printWithNoIndent(")") + printer.print(")") if (ifElseStatement.thenBranch.isEmpty()) { - printer.printWithNoIndent(";") + printer.print(";") } else { ifElseStatement.thenBranch.accept(this) } if (!ifElseStatement.elseBranch.isEmpty()) { - printer.printWithNoIndent(" else ") + printer.print(" else ") ifElseStatement.elseBranch.accept(this) } } @@ -423,9 +421,9 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { override fun visitBinaryExpressionRaw(binaryExpression: JKBinaryExpression) { binaryExpression.left.accept(this) - printer.printWithNoIndent(" ") - printer.printWithNoIndent(binaryExpression.operator.token.text) - printer.printWithNoIndent(" ") + printer.print(" ") + printer.print(binaryExpression.operator.token.text) + printer.print(" ") binaryExpression.right.accept(this) } @@ -442,34 +440,34 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { override fun visitTypeParameterRaw(typeParameter: JKTypeParameter) { typeParameter.name.accept(this) if (typeParameter.upperBounds.size == 1) { - printer.printWithNoIndent(" : ") + printer.print(" : ") typeParameter.upperBounds.single().accept(this) } } override fun visitLiteralExpressionRaw(literalExpression: JKLiteralExpression) { - printer.printWithNoIndent(literalExpression.literal) + printer.print(literalExpression.literal) } override fun visitPrefixExpressionRaw(prefixExpression: JKPrefixExpression) { - printer.printWithNoIndent(prefixExpression.operator.token.text) + printer.print(prefixExpression.operator.token.text) prefixExpression.expression.accept(this) } override fun visitThisExpressionRaw(thisExpression: JKThisExpression) { - printer.printWithNoIndent("this") + printer.print("this") thisExpression.qualifierLabel.accept(this) } override fun visitSuperExpressionRaw(superExpression: JKSuperExpression) { - printer.printWithNoIndent("super") + printer.print("super") superExpression.qualifierLabel.accept(this) } override fun visitContinueStatementRaw(continueStatement: JKContinueStatement) { - printer.printWithNoIndent("continue") + printer.print("continue") continueStatement.label.accept(this) - printer.printWithNoIndent(" ") + printer.print(" ") } override fun visitLabelEmptyRaw(labelEmpty: JKLabelEmpty) { @@ -477,31 +475,31 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { } override fun visitLabelTextRaw(labelText: JKLabelText) { - printer.printWithNoIndent("@") + printer.print("@") labelText.label.accept(this) - printer.printWithNoIndent(" ") + printer.print(" ") } override fun visitLabeledExpressionRaw(labeledExpression: JKLabeledExpression) { for (label in labeledExpression.labels) { label.accept(this) - printer.printWithNoIndent("@") + printer.print("@") } labeledExpression.statement.accept(this) } override fun visitNameIdentifierRaw(nameIdentifier: JKNameIdentifier) { - printer.printWithNoIndent(nameIdentifier.value.escaped()) + printer.print(nameIdentifier.value.escaped()) } override fun visitPostfixExpressionRaw(postfixExpression: JKPostfixExpression) { postfixExpression.expression.accept(this) - printer.printWithNoIndent(postfixExpression.operator.token.text) + printer.print(postfixExpression.operator.token.text) } override fun visitQualifiedExpressionRaw(qualifiedExpression: JKQualifiedExpression) { qualifiedExpression.receiver.accept(this) - printer.printWithNoIndent(".") + printer.print(".") qualifiedExpression.selector.accept(this) } @@ -516,7 +514,7 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { override fun visitNamedArgumentRaw(namedArgument: JKNamedArgument) { namedArgument.name.accept(this) - printer.printWithNoIndent(" = ") + printer.print(" = ") namedArgument.value.accept(this) } @@ -552,34 +550,34 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { override fun visitTypeCastExpressionRaw(typeCastExpression: JKTypeCastExpression) { typeCastExpression.expression.accept(this) - printer.printWithNoIndent(" as ") + printer.print(" as ") typeCastExpression.type.accept(this) } override fun visitWhileStatementRaw(whileStatement: JKWhileStatement) { - printer.print("while(") + printer.print("while (") whileStatement.condition.accept(this) - printer.printWithNoIndent(")") + printer.print(")") if (whileStatement.body.isEmpty()) { - printer.printWithNoIndent(";") + printer.print(";") } else { whileStatement.body.accept(this) } } override fun visitLocalVariableRaw(localVariable: JKLocalVariable) { - printer.printWithNoIndent(" ") + printer.print(" ") localVariable.annotationList.accept(this) - printer.printWithNoIndent(" ") + printer.print(" ") renderModifiersList(localVariable) - printer.printWithNoIndent(" ") + printer.print(" ") localVariable.name.accept(this) if (localVariable.type.present() && localVariable.type.type != JKContextType) { - printer.printWithNoIndent(": ") + printer.print(": ") localVariable.type.accept(this) } if (localVariable.initializer !is JKStubExpression) { - printer.printWithNoIndent(" = ") + printer.print(" = ") localVariable.initializer.accept(this) } } @@ -594,13 +592,13 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { ktConvertedFromForLoopSyntheticWhileStatement: JKKtConvertedFromForLoopSyntheticWhileStatement ) { ktConvertedFromForLoopSyntheticWhileStatement.variableDeclaration.accept(this) - printer.printlnWithNoIndent() + printer.println() ktConvertedFromForLoopSyntheticWhileStatement.whileStatement.accept(this) } override fun visitNewExpressionRaw(newExpression: JKNewExpression) { if (newExpression.isAnonymousClass) { - printer.printWithNoIndent("object : ") + printer.print("object : ") } printer.renderSymbol(newExpression.classSymbol, newExpression) newExpression.typeArgumentList.accept(this) @@ -615,24 +613,31 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { } override fun visitKtItExpressionRaw(ktItExpression: JKKtItExpression) { - printer.printWithNoIndent("it") + printer.print("it") } override fun visitClassBodyRaw(classBody: JKClassBody) { val declarationsToPrint = classBody.declarations.filterNot { it is JKKtPrimaryConstructor } renderTokenElement(classBody.leftBrace) - val enumConstants = declarationsToPrint.filterIsInstance() - val otherDeclarations = declarationsToPrint.filterNot { it is JKEnumConstant } - renderEnumConstants(enumConstants) - if ((classBody.parent as? JKClass)?.classKind == JKClass.ClassKind.ENUM - && otherDeclarations.isNotEmpty() - ) { - printer.printlnWithNoIndent(";") - } - if (enumConstants.isNotEmpty() && otherDeclarations.isNotEmpty()) { + if (declarationsToPrint.isNotEmpty()) { + printer.indented { + printer.println() + val enumConstants = declarationsToPrint.filterIsInstance() + val otherDeclarations = declarationsToPrint.filterNot { it is JKEnumConstant } + renderEnumConstants(enumConstants) + if ((classBody.parent as? JKClass)?.classKind == JKClass.ClassKind.ENUM + && otherDeclarations.isNotEmpty() + ) { + printer.print(";") + printer.println() + } + if (enumConstants.isNotEmpty() && otherDeclarations.isNotEmpty()) { + printer.println() + } + renderNonEnumClassDeclarations(otherDeclarations) + } printer.println() } - renderNonEnumClassDeclarations(otherDeclarations) renderTokenElement(classBody.rightBrace) } @@ -642,8 +647,14 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { override fun visitBlockRaw(block: JKBlock) { renderTokenElement(block.leftBrace) - printer.renderList(block.statements, { printer.println() }) { - it.accept(this) + if (block.statements.isNotEmpty()) { + printer.indented { + printer.println() + printer.renderList(block.statements, { printer.println() }) { + it.accept(this) + } + } + printer.println() } renderTokenElement(block.rightBrace) } @@ -675,13 +686,13 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { override fun visitMethodReferenceExpressionRaw(methodReferenceExpression: JKMethodReferenceExpression) { methodReferenceExpression.qualifier.accept(this) - printer.printWithNoIndent("::") + printer.print("::") val needFqName = methodReferenceExpression.qualifier is JKStubExpression val displayName = if (needFqName) methodReferenceExpression.identifier.getDisplayName() else methodReferenceExpression.identifier.name - printer.printWithNoIndent(displayName.escapedAsQualifiedName()) + printer.print(displayName.escapedAsQualifiedName()) } @@ -709,7 +720,7 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { printer.print(" constructor") renderParameterList(constructor.parameters) if (constructor.delegationCall !is JKStubExpression) { - builder.append(" : ") + printer.print(" : ") constructor.delegationCall.accept(this) } constructor.block.accept(this) @@ -717,9 +728,9 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { override fun visitKtPrimaryConstructorRaw(ktPrimaryConstructor: JKKtPrimaryConstructor) { ktPrimaryConstructor.annotationList.accept(this) - printer.printWithNoIndent(" ") + printer.print(" ") renderModifiersList(ktPrimaryConstructor) - printer.printWithNoIndent(" constructor ") + printer.print(" constructor ") if (ktPrimaryConstructor.parameters.isNotEmpty()) { renderParameterList(ktPrimaryConstructor.parameters) } else { @@ -734,9 +745,9 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { if (lambdaExpression.statement.statements.size > 1) printer.println() lambdaExpression.parameters.firstOrNull()?.accept(this) - lambdaExpression.parameters.asSequence().drop(1).forEach { printer.printWithNoIndent(", "); it.accept(this) } + lambdaExpression.parameters.asSequence().drop(1).forEach { printer.print(", "); it.accept(this) } if (lambdaExpression.parameters.isNotEmpty()) { - printer.printWithNoIndent(" -> ") + printer.print(" -> ") } val statement = lambdaExpression.statement @@ -751,7 +762,7 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { } if (lambdaExpression.functionalType.present()) { printer.renderType(lambdaExpression.functionalType.type, lambdaExpression) - printer.printWithNoIndent(" ") + printer.print(" ") printer.par(ParenthesisKind.ROUND, printLambda) } else { printLambda() @@ -764,34 +775,34 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { override fun visitKtAssignmentStatementRaw(ktAssignmentStatement: JKKtAssignmentStatement) { ktAssignmentStatement.field.accept(this) - printer.printWithNoIndent(" ") - printer.printWithNoIndent(ktAssignmentStatement.token.text) - printer.printWithNoIndent(" ") + printer.print(" ") + printer.print(ktAssignmentStatement.token.text) + printer.print(" ") ktAssignmentStatement.expression.accept(this) } override fun visitAssignmentChainAlsoLinkRaw(assignmentChainAlsoLink: JKAssignmentChainAlsoLink) { assignmentChainAlsoLink.receiver.accept(this) - printer.printWithNoIndent(".also({ ") + printer.print(".also({ ") assignmentChainAlsoLink.assignmentStatement.accept(this) - printer.printWithNoIndent(" })") + printer.print(" })") } override fun visitAssignmentChainLetLinkRaw(assignmentChainLetLink: JKAssignmentChainLetLink) { assignmentChainLetLink.receiver.accept(this) - printer.printWithNoIndent(".let({ ") + printer.print(".let({ ") assignmentChainLetLink.assignmentStatement.accept(this) - printer.printWithNoIndent("; ") + printer.print("; ") assignmentChainLetLink.field.accept(this) - printer.printWithNoIndent(" })") + printer.print(" })") } override fun visitKtWhenStatementRaw(ktWhenStatement: JKKtWhenStatement) { - printer.printWithNoIndent("when(") + printer.print("when(") ktWhenStatement.expression.accept(this) - printer.printWithNoIndent(")") + printer.print(")") printer.block() { - printer.renderList(ktWhenStatement.cases, { printer.printlnWithNoIndent() }) { + printer.renderList(ktWhenStatement.cases, { printer.println() }) { it.accept(this) } } @@ -804,8 +815,8 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { } override fun visitAnnotationRaw(annotation: JKAnnotation) { - printer.printWithNoIndent("@") - printer.printWithNoIndent(annotation.classSymbol.fqName.escapedAsQualifiedName()) + printer.print("@") + printer.print(annotation.classSymbol.fqName.escapedAsQualifiedName()) if (annotation.arguments.isNotEmpty()) { printer.par { printer.renderList(annotation.arguments) { it.accept(this) } @@ -825,14 +836,14 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { override fun visitClassLiteralExpressionRaw(classLiteralExpression: JKClassLiteralExpression) { if (classLiteralExpression.literalType == JKClassLiteralExpression.ClassLiteralType.JAVA_VOID_TYPE) { - printer.printWithNoIndent("Void.TYPE") + printer.print("Void.TYPE") } else { printer.renderType(classLiteralExpression.classType.type, classLiteralExpression) - printer.printWithNoIndent("::") + printer.print("::") when (classLiteralExpression.literalType) { - JKClassLiteralExpression.ClassLiteralType.KOTLIN_CLASS -> printer.printWithNoIndent("class") - JKClassLiteralExpression.ClassLiteralType.JAVA_CLASS -> printer.printWithNoIndent("class.java") - JKClassLiteralExpression.ClassLiteralType.JAVA_PRIMITIVE_CLASS -> printer.printWithNoIndent("class.javaPrimitiveType") + JKClassLiteralExpression.ClassLiteralType.KOTLIN_CLASS -> printer.print("class") + JKClassLiteralExpression.ClassLiteralType.JAVA_CLASS -> printer.print("class.java") + JKClassLiteralExpression.ClassLiteralType.JAVA_PRIMITIVE_CLASS -> printer.print("class.javaPrimitiveType") JKClassLiteralExpression.ClassLiteralType.JAVA_VOID_TYPE -> { } } @@ -843,12 +854,12 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { printer.renderList(ktWhenCase.labels, ", ") { it.accept(this) } - printer.printWithNoIndent(" -> ") + printer.print(" -> ") ktWhenCase.statement.accept(this) } override fun visitKtElseWhenLabelRaw(ktElseWhenLabel: JKKtElseWhenLabel) { - printer.printWithNoIndent("else") + printer.print("else") } override fun visitKtValueWhenLabelRaw(ktValueWhenLabel: JKKtValueWhenLabel) { @@ -859,28 +870,48 @@ class NewCodeBuilder(context: NewJ2kConverterContext) { fun printCodeOut(root: JKTreeElement): String { Visitor().also { root.accept(it) } - return builder.toString().replace("\r\n", "\n") + return printer.toString().replace("\r\n", "\n") } } enum class ParenthesisKind(val open: String, val close: String) { ROUND("(", ")"), - SQUARE("[", "]"), CURVED("{", "}"), - CURVED_MULTILINE("{\n", "}\n"), - INLINE_COMMENT("/*", "*/"), ANGLE("<", ">") } private class JKPrinter( - stringBuilder: StringBuilder, private val elementInfoStorage: JKElementInfoStorage -) : Printer(stringBuilder) { +) { + private val stringBuilder: StringBuilder = StringBuilder() + private var currentIndent = 0; + private val indentSymbol = " ".repeat(4) + + private var lastSymbolIsLineBreak = false + + override fun toString(): String = stringBuilder.toString() + + fun print(value: String) { + if (value.isNotEmpty()) { + lastSymbolIsLineBreak = false + } + stringBuilder.append(value) + } + + fun println() { + if (lastSymbolIsLineBreak) return + stringBuilder.append('\n') + repeat(currentIndent) { + stringBuilder.append(indentSymbol) + } + lastSymbolIsLineBreak = true + } + inline fun indented(block: () -> Unit) { - this.pushIndent() + currentIndent++ block() - this.popIndent() + currentIndent-- } inline fun block(crossinline body: () -> Unit) { @@ -890,9 +921,9 @@ private class JKPrinter( } inline fun par(kind: ParenthesisKind = ParenthesisKind.ROUND, body: () -> Unit) { - printWithNoIndent(kind.open) + this.print(kind.open) body() - printWithNoIndent(kind.close) + this.print(kind.close) } private fun JKSymbol.needFqName(): Boolean { @@ -901,7 +932,7 @@ private class JKPrinter( } private fun JKType.renderTypeInfo() { - print(elementInfoStorage.getOrCreateInfoForElement(this).render()) + this@JKPrinter.print(elementInfoStorage.getOrCreateInfoForElement(this).render()) } fun renderType(type: JKType, owner: JKTreeElement?) { @@ -913,7 +944,7 @@ private class JKPrinter( } is JKStarProjectionType -> { type.renderTypeInfo() - print("Any?") + this.print("Any?") } } return @@ -925,17 +956,17 @@ private class JKPrinter( } is JKContextType -> return is JKStarProjectionType -> - printWithNoIndent("*") + this.print("*") is JKTypeParameterType -> - printWithNoIndent(type.identifier.name) + this.print(type.identifier.name) is JKVarianceTypeParameterType -> { when (type.variance) { - JKVarianceTypeParameterType.Variance.IN -> printWithNoIndent("in ") - JKVarianceTypeParameterType.Variance.OUT -> printWithNoIndent("out ") + JKVarianceTypeParameterType.Variance.IN -> this.print("in ") + JKVarianceTypeParameterType.Variance.OUT -> this.print("out ") } renderType(type.boundType, null) } - else -> printWithNoIndent("Unit /* TODO: ${type::class} */") + else -> this.print("Unit /* TODO: ${type::class} */") } if (type is JKParametrizedType && type.parameters.isNotEmpty()) { par(ParenthesisKind.ANGLE) { @@ -948,18 +979,18 @@ private class JKPrinter( && owner?.safeAs()?.functionalType?.type != type || type.nullability == Nullability.Nullable) ) { - printWithNoIndent("?") + this.print("?") } } fun renderSymbol(symbol: JKSymbol, owner: JKTreeElement?) { val needFqName = symbol.needFqName() && owner?.isSelectorOfQualifiedExpression() != true val displayName = if (needFqName) symbol.getDisplayName() else symbol.name - printWithNoIndent(displayName.escapedAsQualifiedName()) + this.print(displayName.escapedAsQualifiedName()) } inline fun renderList(list: List, separator: String = ", ", renderElement: (T) -> Unit) = - renderList(list, { printWithNoIndent(separator) }, renderElement) + renderList(list, { this.print(separator) }, renderElement) inline fun renderList(list: List, separator: () -> Unit, renderElement: (T) -> Unit) { val (head, tail) = list.headTail() diff --git a/nj2k/testData/newJ2k/annotations/annotationArrayArgument.kt b/nj2k/testData/newJ2k/annotations/annotationArrayArgument.kt index 542f60b3033..fa1f7c61151 100644 --- a/nj2k/testData/newJ2k/annotations/annotationArrayArgument.kt +++ b/nj2k/testData/newJ2k/annotations/annotationArrayArgument.kt @@ -1,11 +1,8 @@ import kotlin.reflect.KClass annotation class Ann(vararg val value: Inner, val test1: Array = [InnerParam(C::class)]) - annotation class Inner - annotation class InnerParam(val value: KClass<*>) - @Ann(value = [Inner(), Inner()], test1 = [InnerParam(C::class)]) class C @@ -16,4 +13,4 @@ class D class E @Ann(value = [Inner()], test1 = [InnerParam(value = C::class)]) -class F \ No newline at end of file +class F \ No newline at end of file diff --git a/nj2k/testData/newJ2k/annotations/annotationDefault.kt b/nj2k/testData/newJ2k/annotations/annotationDefault.kt index e6d6de42913..0d7a0b78b09 100644 --- a/nj2k/testData/newJ2k/annotations/annotationDefault.kt +++ b/nj2k/testData/newJ2k/annotations/annotationDefault.kt @@ -1,6 +1,5 @@ import kotlin.reflect.KClass annotation class Ann(val i: Int = 1, val i2: IntArray = [1], val i3: IntArray = [1], val klass: KClass<*> = A::class, val klass2: Array> = [A::class], val klass3: Array> = [A::class], val ann: Inner = Inner(), val ann2: Array = [Inner()], val ann3: Array = [Inner(), Inner()]) - class A -annotation class Inner +annotation class Inner \ No newline at end of file diff --git a/nj2k/testData/newJ2k/annotations/annotationInterface1.kt b/nj2k/testData/newJ2k/annotations/annotationInterface1.kt index e33b17a5db4..223b81ef08c 100644 --- a/nj2k/testData/newJ2k/annotations/annotationInterface1.kt +++ b/nj2k/testData/newJ2k/annotations/annotationInterface1.kt @@ -1,4 +1,4 @@ -internal annotation class Anon(val stringArray: Array, val intArray: IntArray, // string +internal annotation class Anon(val stringArray: Array, val intArray: IntArray, // string val string: String) @Anon(string = "a", stringArray = ["a", "b"], intArray = [1, 2]) @@ -9,4 +9,4 @@ internal annotation class I internal annotation class J @Target -internal annotation class K +internal annotation class K \ No newline at end of file diff --git a/nj2k/testData/newJ2k/annotations/annotationInterface2.kt b/nj2k/testData/newJ2k/annotations/annotationInterface2.kt index 5fcb773203c..67e78c2d409 100644 --- a/nj2k/testData/newJ2k/annotations/annotationInterface2.kt +++ b/nj2k/testData/newJ2k/annotations/annotationInterface2.kt @@ -1,4 +1,3 @@ internal annotation class Anon(val s: String = "a", val stringArray: Array = ["a", "b"], val intArray: IntArray) - @Anon(intArray = [1, 2]) -internal class A +internal class A \ No newline at end of file diff --git a/nj2k/testData/newJ2k/annotations/annotationInterface3.kt b/nj2k/testData/newJ2k/annotations/annotationInterface3.kt index 776d1164e23..2f3df7bd0ec 100644 --- a/nj2k/testData/newJ2k/annotations/annotationInterface3.kt +++ b/nj2k/testData/newJ2k/annotations/annotationInterface3.kt @@ -1,5 +1,8 @@ internal annotation class Anon(val value: String) { - enum class E { A, B } + enum class E { + A, B + } + companion object { var field = E.A } diff --git a/nj2k/testData/newJ2k/annotations/annotationInterface4.kt b/nj2k/testData/newJ2k/annotations/annotationInterface4.kt index a8e967dd4d0..13157a8496b 100644 --- a/nj2k/testData/newJ2k/annotations/annotationInterface4.kt +++ b/nj2k/testData/newJ2k/annotations/annotationInterface4.kt @@ -1,5 +1,4 @@ internal annotation class Anon(vararg val value: String, val x: Int = 1) - @Anon("a", "b") internal interface I1 @@ -10,4 +9,4 @@ internal interface I2 internal interface I3 @Anon(value = ["c", "d"]) -internal interface I4 +internal interface I4 \ No newline at end of file diff --git a/nj2k/testData/newJ2k/annotations/annotationUsages.kt b/nj2k/testData/newJ2k/annotations/annotationUsages.kt index 8c78a8c80e5..ddd43f8b561 100644 --- a/nj2k/testData/newJ2k/annotations/annotationUsages.kt +++ b/nj2k/testData/newJ2k/annotations/annotationUsages.kt @@ -23,13 +23,10 @@ internal class C { @Anon5(1) @Deprecated("") private val field1 = 0 - @Anon5(1) private val field2 = 0 - @Anon5(1) var field3 = 0 - @Anon5(1) var field4 = 0 @@ -41,4 +38,4 @@ internal class C { @Anon5(1) fun bar() { } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/annotations/annotationsFromPropertyAccessors.kt b/nj2k/testData/newJ2k/annotations/annotationsFromPropertyAccessors.kt index 020d24099ea..ed1eb8df756 100644 --- a/nj2k/testData/newJ2k/annotations/annotationsFromPropertyAccessors.kt +++ b/nj2k/testData/newJ2k/annotations/annotationsFromPropertyAccessors.kt @@ -1,8 +1,7 @@ internal annotation class An(val value: String) - - class Test { @get:An(value = "get") @set:An(value = "set") var id = 0 -} + +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/annotations/javaClassArgument.kt b/nj2k/testData/newJ2k/annotations/javaClassArgument.kt index 25e2b5366eb..6aef972f666 100644 --- a/nj2k/testData/newJ2k/annotations/javaClassArgument.kt +++ b/nj2k/testData/newJ2k/annotations/javaClassArgument.kt @@ -1,6 +1,5 @@ import kotlin.reflect.KClass internal annotation class Ann(val value: KClass<*>, val other: KClass<*>) - @Ann(other = String::class, value = Any::class) -internal class C \ No newline at end of file +internal class C \ No newline at end of file diff --git a/nj2k/testData/newJ2k/annotations/javaClassArrayArgument.kt b/nj2k/testData/newJ2k/annotations/javaClassArrayArgument.kt index 50d51e8be32..15f3fbba4e0 100644 --- a/nj2k/testData/newJ2k/annotations/javaClassArrayArgument.kt +++ b/nj2k/testData/newJ2k/annotations/javaClassArrayArgument.kt @@ -1,9 +1,8 @@ import kotlin.reflect.KClass internal annotation class Ann(vararg val value: KClass<*>) - @Ann(String::class, Any::class) internal class C @Ann -internal class D \ No newline at end of file +internal class D \ No newline at end of file diff --git a/nj2k/testData/newJ2k/annotations/jetbrainsNotNull.kt b/nj2k/testData/newJ2k/annotations/jetbrainsNotNull.kt index d0b198676fa..4eca4deb21c 100644 --- a/nj2k/testData/newJ2k/annotations/jetbrainsNotNull.kt +++ b/nj2k/testData/newJ2k/annotations/jetbrainsNotNull.kt @@ -5,9 +5,7 @@ package test class Test(str: String) { internal var myStr = "String2" - fun sout(str: String) { - // UNNECESSARY_NOT_NULL_ASSERTION heuristic does not work any more, instead we can skip generating !! altogether - + fun sout(str: String) { // UNNECESSARY_NOT_NULL_ASSERTION heuristic does not work any more, instead we can skip generating !! altogether println(str) } diff --git a/nj2k/testData/newJ2k/annotations/kt-31726.kt b/nj2k/testData/newJ2k/annotations/kt-31726.kt index 2f9f707bd89..4a2164ddacb 100644 --- a/nj2k/testData/newJ2k/annotations/kt-31726.kt +++ b/nj2k/testData/newJ2k/annotations/kt-31726.kt @@ -2,7 +2,7 @@ import javaApi.SpecialExternal //Annotation class: annotation class Special(val names: Array //array is used -) //Class with annotation: +) //Class with annotation: @Special(names = ["name1"]) class JClass diff --git a/nj2k/testData/newJ2k/annotations/primaryConstructorAnnotation.kt b/nj2k/testData/newJ2k/annotations/primaryConstructorAnnotation.kt index e65bcd70d68..3b07bee73e5 100644 --- a/nj2k/testData/newJ2k/annotations/primaryConstructorAnnotation.kt +++ b/nj2k/testData/newJ2k/annotations/primaryConstructorAnnotation.kt @@ -1,2 +1 @@ -internal class C @Deprecated("") -constructor() +internal class C @Deprecated("") constructor() \ No newline at end of file diff --git a/nj2k/testData/newJ2k/annotations/suppressWarnings.kt b/nj2k/testData/newJ2k/annotations/suppressWarnings.kt index b13499802ec..af66b46bb68 100644 --- a/nj2k/testData/newJ2k/annotations/suppressWarnings.kt +++ b/nj2k/testData/newJ2k/annotations/suppressWarnings.kt @@ -1,8 +1,4 @@ class A { - var b = 0 - - fun a(i: Int) { - - } + fun a(i: Int) {} } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/assertStatement/assertNotNull.kt b/nj2k/testData/newJ2k/assertStatement/assertNotNull.kt index bc0a465253c..8a7bf0b36b3 100644 --- a/nj2k/testData/newJ2k/assertStatement/assertNotNull.kt +++ b/nj2k/testData/newJ2k/assertStatement/assertNotNull.kt @@ -1,7 +1,6 @@ internal abstract class C { fun foo() { val s1 = f()!! - val s2 = g() ?: error("g should not return null") val h = s2.hashCode() } diff --git a/nj2k/testData/newJ2k/assignmentExpression/assignmentAsExpression.kt b/nj2k/testData/newJ2k/assignmentExpression/assignmentAsExpression.kt index 2057ab20c90..e087c7bcdbf 100644 --- a/nj2k/testData/newJ2k/assignmentExpression/assignmentAsExpression.kt +++ b/nj2k/testData/newJ2k/assignmentExpression/assignmentAsExpression.kt @@ -1,7 +1,6 @@ class AssignmentAsExpression { private var field = 0 private var field2 = 0 - fun assign(value: Int) { field = value val v = field diff --git a/nj2k/testData/newJ2k/assignmentExpression/assignmentsChain.kt b/nj2k/testData/newJ2k/assignmentExpression/assignmentsChain.kt index 584c996d951..91e94a6862f 100644 --- a/nj2k/testData/newJ2k/assignmentExpression/assignmentsChain.kt +++ b/nj2k/testData/newJ2k/assignmentExpression/assignmentsChain.kt @@ -11,21 +11,13 @@ internal object Test { b += c a = b //----- - - a = b //----- - - a += b //----- - - b = c a += b //----- - - b += c a = b } diff --git a/nj2k/testData/newJ2k/assignmentExpression/assignmentsChainWithParenthesis.kt b/nj2k/testData/newJ2k/assignmentExpression/assignmentsChainWithParenthesis.kt index 55d993a5822..26b20bc82c1 100644 --- a/nj2k/testData/newJ2k/assignmentExpression/assignmentsChainWithParenthesis.kt +++ b/nj2k/testData/newJ2k/assignmentExpression/assignmentsChainWithParenthesis.kt @@ -10,21 +10,13 @@ internal object Test { b += c a = b //----- - - a = b //----- - - a += b //----- - - b = c a += b //----- - - a = c.let { b += it; b } } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/assignmentExpression/declarationAssignmentsChain.kt b/nj2k/testData/newJ2k/assignmentExpression/declarationAssignmentsChain.kt index 8286302a29b..c8c0ab1330b 100644 --- a/nj2k/testData/newJ2k/assignmentExpression/declarationAssignmentsChain.kt +++ b/nj2k/testData/newJ2k/assignmentExpression/declarationAssignmentsChain.kt @@ -7,27 +7,20 @@ internal object Test { var d = 0 val e = 0 //----- - d *= e c = d b += c a = b val f = a -//----- + //----- val g = a //----- - - a = b val h = a //----- - - a += b val i = a //----- - - b = c a += b val j = a diff --git a/nj2k/testData/newJ2k/binaryExpression/lhsObjectPlusString.kt b/nj2k/testData/newJ2k/binaryExpression/lhsObjectPlusString.kt index 2a6dd50d11b..0c8a5df919f 100644 --- a/nj2k/testData/newJ2k/binaryExpression/lhsObjectPlusString.kt +++ b/nj2k/testData/newJ2k/binaryExpression/lhsObjectPlusString.kt @@ -15,7 +15,6 @@ class Test { } companion object { - @JvmStatic fun main(args: Array) { val p = Test().toString() + "123" diff --git a/nj2k/testData/newJ2k/binaryExpression/orWithNewLine.kt b/nj2k/testData/newJ2k/binaryExpression/orWithNewLine.kt index c20174c0565..0a103ddb0b7 100644 --- a/nj2k/testData/newJ2k/binaryExpression/orWithNewLine.kt +++ b/nj2k/testData/newJ2k/binaryExpression/orWithNewLine.kt @@ -17,10 +17,7 @@ object A { * 2 * 3) val DIV = (1 - / 2 - - / 3) val PERC = (1 % 2 diff --git a/nj2k/testData/newJ2k/blocks/Blocks.kt b/nj2k/testData/newJ2k/blocks/Blocks.kt index 963a45f381b..41175536253 100644 --- a/nj2k/testData/newJ2k/blocks/Blocks.kt +++ b/nj2k/testData/newJ2k/blocks/Blocks.kt @@ -4,11 +4,9 @@ fun foo() { val a = 1 bar(a) } - run { val a = 2 bar(a) } - run { bar(3) } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/callChainExpression/libraryFieldCall.kt b/nj2k/testData/newJ2k/callChainExpression/libraryFieldCall.kt index d21ce423275..c1565c89e2b 100644 --- a/nj2k/testData/newJ2k/callChainExpression/libraryFieldCall.kt +++ b/nj2k/testData/newJ2k/callChainExpression/libraryFieldCall.kt @@ -6,7 +6,6 @@ internal object Library { internal class User { fun main() { - Library.ourOut!!.print(1) } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/callChainExpression/libraryMethodCall.kt b/nj2k/testData/newJ2k/callChainExpression/libraryMethodCall.kt index 1e5249dd228..f79f7fafab2 100644 --- a/nj2k/testData/newJ2k/callChainExpression/libraryMethodCall.kt +++ b/nj2k/testData/newJ2k/callChainExpression/libraryMethodCall.kt @@ -1,9 +1,7 @@ internal object Library { fun call() {} - val string: String get() = "" - } internal class User { diff --git a/nj2k/testData/newJ2k/callChainExpression/libraryMethodCallFromInstance.kt b/nj2k/testData/newJ2k/callChainExpression/libraryMethodCallFromInstance.kt index 4431816509a..52cbe85b34d 100644 --- a/nj2k/testData/newJ2k/callChainExpression/libraryMethodCallFromInstance.kt +++ b/nj2k/testData/newJ2k/callChainExpression/libraryMethodCallFromInstance.kt @@ -1,9 +1,7 @@ internal class Library { fun call() {} - val string: String get() = "" - } internal class User { @@ -11,7 +9,6 @@ internal class User { val lib = Library() lib.call() lib.string.isEmpty() - Library().call() Library().string.isEmpty() } diff --git a/nj2k/testData/newJ2k/class/abstractClass.kt b/nj2k/testData/newJ2k/class/abstractClass.kt index cb9ecf0ccde..f84610d979e 100644 --- a/nj2k/testData/newJ2k/class/abstractClass.kt +++ b/nj2k/testData/newJ2k/class/abstractClass.kt @@ -1,6 +1,5 @@ internal abstract class A { internal abstract fun callme() - fun callmetoo() { print("This is a concrete method.") } diff --git a/nj2k/testData/newJ2k/class/abstractClassShape.kt b/nj2k/testData/newJ2k/class/abstractClassShape.kt index eb513353890..7576fdf2c99 100644 --- a/nj2k/testData/newJ2k/class/abstractClassShape.kt +++ b/nj2k/testData/newJ2k/class/abstractClassShape.kt @@ -1,4 +1,5 @@ internal abstract class Shape { var color: String? = null + abstract fun area(): Double } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/class/innerEnum.kt b/nj2k/testData/newJ2k/class/innerEnum.kt index 25ba8f727a3..116ca6b6397 100644 --- a/nj2k/testData/newJ2k/class/innerEnum.kt +++ b/nj2k/testData/newJ2k/class/innerEnum.kt @@ -1,7 +1,5 @@ internal class A { internal enum class E { - A, - B, - C + A, B, C } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/class/utilityClass5.kt b/nj2k/testData/newJ2k/class/utilityClass5.kt index 761b8f65cfd..30dfb7265d5 100644 --- a/nj2k/testData/newJ2k/class/utilityClass5.kt +++ b/nj2k/testData/newJ2k/class/utilityClass5.kt @@ -3,7 +3,6 @@ object Util { internal const val protectedStr = "" internal const val packageStr = "" private const val privateStr = "" - fun publicMethod() {} internal fun protectedMethod() {} internal fun packageMethod() {} diff --git a/nj2k/testData/newJ2k/comments/commentInsideCall.kt b/nj2k/testData/newJ2k/comments/commentInsideCall.kt index 8e8813e967c..80e95aacf06 100644 --- a/nj2k/testData/newJ2k/comments/commentInsideCall.kt +++ b/nj2k/testData/newJ2k/comments/commentInsideCall.kt @@ -3,13 +3,9 @@ package test object Test { @JvmStatic fun main(args: Array) { - println() - // Comment - - foo() - // Comment1 - - // Comment2 + println() // Comment + foo() // Comment1 +// Comment2 .indexOf("s") } diff --git a/nj2k/testData/newJ2k/comments/comments.kt b/nj2k/testData/newJ2k/comments/comments.kt index 825936b6a81..b011acace83 100644 --- a/nj2k/testData/newJ2k/comments/comments.kt +++ b/nj2k/testData/newJ2k/comments/comments.kt @@ -2,27 +2,20 @@ package foo // we use package 'foo' - // imports: - // we need ArrayList // let's declare a class: internal class A /* just a sample name*/ : Runnable /* let's implement Runnable */ { - fun foo /* again a sample name */(p: Int /* parameter p */, c: Char /* parameter c */) { - // let's print something: + fun foo /* again a sample name */(p: Int /* parameter p */, c: Char /* parameter c */) { // let's print something: println("1") // print 1 println("2") // print 2 - println("3") // print 3 - // end of printing - if (p > 0) { // do this only when p > 0 - // we print 4 and return +// we print 4 and return println("3") return // do not continue } - // some code to be added } -} // end of class A \ No newline at end of file +} // end of class A diff --git a/nj2k/testData/newJ2k/comments/comments2.kt b/nj2k/testData/newJ2k/comments/comments2.kt index a926a79dd1f..a596c4e82fb 100644 --- a/nj2k/testData/newJ2k/comments/comments2.kt +++ b/nj2k/testData/newJ2k/comments/comments2.kt @@ -26,7 +26,7 @@ internal class A { */ fun foo(param1: String?, param2: String?, param3: String?) {} - companion object { /*it's public*/ /*and static*/ /*and final*/ - const val C = 1 + companion object { + /*it's public*/ /*and static*/ /*and final*/ const val C = 1 } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/comments/commentsForConstructors.kt b/nj2k/testData/newJ2k/comments/commentsForConstructors.kt index 8d9e264c652..a91b79dc045 100644 --- a/nj2k/testData/newJ2k/comments/commentsForConstructors.kt +++ b/nj2k/testData/newJ2k/comments/commentsForConstructors.kt @@ -1,34 +1,32 @@ -internal class A // end of primary constructor body +internal class A // this is a primary constructor +// this is a secondary constructor 1 +// end of primary constructor body @JvmOverloads constructor(p: Int = 1) { private val v = 1 // this is a secondary constructor 2 constructor(s: String) : this(s.length) {} // end of secondary constructor 2 body - // this is a primary constructor - // this is a secondary constructor 1 - - // end of secondary constructor 1 body } -internal class B // end of constructor body +internal class B // this constructor will disappear +// end of constructor body (private val x: Int) { fun foo() {} - // this constructor will disappear } -internal class CtorComment { - var myA = "a" -/* - * The magic of comments - */ - // single line magic comments - -} - -internal class CtorComment2 /* +internal class CtorComment /* + * The magic of comments + */ +// single line magic comments +{ + var myA = "a" + +} + +internal class CtorComment2 /* * The magic of comments */ // single line magic comments diff --git a/nj2k/testData/newJ2k/comments/removeNoInspectionComment.kt b/nj2k/testData/newJ2k/comments/removeNoInspectionComment.kt index c83ebf5e314..156c52531d2 100644 --- a/nj2k/testData/newJ2k/comments/removeNoInspectionComment.kt +++ b/nj2k/testData/newJ2k/comments/removeNoInspectionComment.kt @@ -1,6 +1,5 @@ class Check { fun a() { - val d = String() as Int } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/conditionalExpression/multiline.kt b/nj2k/testData/newJ2k/conditionalExpression/multiline.kt index 2f5f828b244..3a29246886c 100644 --- a/nj2k/testData/newJ2k/conditionalExpression/multiline.kt +++ b/nj2k/testData/newJ2k/conditionalExpression/multiline.kt @@ -1,6 +1,3 @@ fun foo(b: Boolean) { - if (b) - println("true") - else - println("false") + if (b) println("true") else println("false") } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/constructors/allCallsPrimary.kt b/nj2k/testData/newJ2k/constructors/allCallsPrimary.kt index c33ca4ae82b..3ef662e45e1 100644 --- a/nj2k/testData/newJ2k/constructors/allCallsPrimary.kt +++ b/nj2k/testData/newJ2k/constructors/allCallsPrimary.kt @@ -1,7 +1,6 @@ package pack internal class C @JvmOverloads constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0) - object User { fun main() { val c1 = C(100, 100, 100) diff --git a/nj2k/testData/newJ2k/constructors/chain.kt b/nj2k/testData/newJ2k/constructors/chain.kt index e6d2be69384..f854ad58240 100644 --- a/nj2k/testData/newJ2k/constructors/chain.kt +++ b/nj2k/testData/newJ2k/constructors/chain.kt @@ -1,5 +1,4 @@ internal class C(arg1: Int, arg2: Int, arg3: Int) { - constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) { println() } diff --git a/nj2k/testData/newJ2k/constructors/constructorAnnotations.kt b/nj2k/testData/newJ2k/constructors/constructorAnnotations.kt index e90f3a8a82e..5dadf377acc 100644 --- a/nj2k/testData/newJ2k/constructors/constructorAnnotations.kt +++ b/nj2k/testData/newJ2k/constructors/constructorAnnotations.kt @@ -6,7 +6,8 @@ internal class A @Anon5(10) constructor(private val a: Int, private val b: Int) @Deprecated("") constructor(a: Int) : this(a, 1) { } + } internal class B @Anon5(11) constructor() -internal class C @Anon5(12) private constructor() \ No newline at end of file +internal class C @Anon5(12) private constructor() \ No newline at end of file diff --git a/nj2k/testData/newJ2k/constructors/fieldsInitializedFromParams8.kt b/nj2k/testData/newJ2k/constructors/fieldsInitializedFromParams8.kt index f10e368f5dc..babedcbbff8 100644 --- a/nj2k/testData/newJ2k/constructors/fieldsInitializedFromParams8.kt +++ b/nj2k/testData/newJ2k/constructors/fieldsInitializedFromParams8.kt @@ -1,2 +1,2 @@ internal open class Base(o: Any?, l: Int) -internal class C(private val string: String) : Base(string, string.length) \ No newline at end of file +internal class C(private val string: String) : Base(string, string.length) \ No newline at end of file diff --git a/nj2k/testData/newJ2k/constructors/identifier.kt b/nj2k/testData/newJ2k/constructors/identifier.kt index c663b1475ee..9e095285563 100644 --- a/nj2k/testData/newJ2k/constructors/identifier.kt +++ b/nj2k/testData/newJ2k/constructors/identifier.kt @@ -17,6 +17,7 @@ class Identifier { myHasDollar = hasDollar myNullable = isNullable } + } object User { diff --git a/nj2k/testData/newJ2k/constructors/lineBreaksBetweenParameters.kt b/nj2k/testData/newJ2k/constructors/lineBreaksBetweenParameters.kt index 0a6d3da32eb..e1fdefe5d0e 100644 --- a/nj2k/testData/newJ2k/constructors/lineBreaksBetweenParameters.kt +++ b/nj2k/testData/newJ2k/constructors/lineBreaksBetweenParameters.kt @@ -1,7 +1,6 @@ internal class C1(arg1: Int, arg2: Int, arg3: Int) { - constructor(x: Int, y: Int) : this(x, x + y, 0) { } @@ -9,4 +8,4 @@ internal class C1(arg1: Int, internal class C2(private val arg1: Int, private val arg2: Int, - arg3: Int) + arg3: Int) \ No newline at end of file diff --git a/nj2k/testData/newJ2k/constructors/methodCallInFactoryFun.kt b/nj2k/testData/newJ2k/constructors/methodCallInFactoryFun.kt index c187168a4da..54e18e55c4e 100644 --- a/nj2k/testData/newJ2k/constructors/methodCallInFactoryFun.kt +++ b/nj2k/testData/newJ2k/constructors/methodCallInFactoryFun.kt @@ -1,5 +1,4 @@ internal class C(private val arg1: Int, private val arg2: Int, private val arg3: Int) { - fun foo(p: Int): Int { return p } @@ -17,4 +16,5 @@ internal class C(private val arg1: Int, private val arg2: Int, private val arg3: return 0 } } -} + +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/constructors/noPrimary.kt b/nj2k/testData/newJ2k/constructors/noPrimary.kt index bd651a1925c..f5054b3d33c 100644 --- a/nj2k/testData/newJ2k/constructors/noPrimary.kt +++ b/nj2k/testData/newJ2k/constructors/noPrimary.kt @@ -1,8 +1,6 @@ internal open class Base - internal class C : Base { constructor(arg1: Int, arg2: Int, arg3: Int) {} - constructor(arg1: Int, arg2: Int) : this(arg1, arg2, 0) { println() } diff --git a/nj2k/testData/newJ2k/constructors/parameterDefaults1.kt b/nj2k/testData/newJ2k/constructors/parameterDefaults1.kt index 75a7900f63c..f61fa5cf507 100644 --- a/nj2k/testData/newJ2k/constructors/parameterDefaults1.kt +++ b/nj2k/testData/newJ2k/constructors/parameterDefaults1.kt @@ -1,6 +1,5 @@ package pack internal class C @JvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) { - constructor(a: Int) : this(a, 0, 0, 0, 1) {} -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/constructors/parameterDefaults2.kt b/nj2k/testData/newJ2k/constructors/parameterDefaults2.kt index 52f6a3bb9a3..2b9aa044424 100644 --- a/nj2k/testData/newJ2k/constructors/parameterDefaults2.kt +++ b/nj2k/testData/newJ2k/constructors/parameterDefaults2.kt @@ -1,8 +1,6 @@ package pack internal class C @JvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) { - constructor(a1: Int, b1: Int, c1: Int) : this(a1, b1, c1, 0, 0) {} - constructor(b: Byte) : this(b.toInt(), 0, 0, 0, 0) {} -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/constructors/parameterDefaults3.kt b/nj2k/testData/newJ2k/constructors/parameterDefaults3.kt index 2fdf7ad418f..ad5c554d3a0 100644 --- a/nj2k/testData/newJ2k/constructors/parameterDefaults3.kt +++ b/nj2k/testData/newJ2k/constructors/parameterDefaults3.kt @@ -1,6 +1,5 @@ package pack internal class C @JvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) { - constructor(a: Int, b: Int, c: Int) : this(b, a, c, 0, 0) {} } diff --git a/nj2k/testData/newJ2k/constructors/privateConstructors.kt b/nj2k/testData/newJ2k/constructors/privateConstructors.kt index 85c9e46f054..60e399674d7 100644 --- a/nj2k/testData/newJ2k/constructors/privateConstructors.kt +++ b/nj2k/testData/newJ2k/constructors/privateConstructors.kt @@ -1,4 +1,3 @@ internal class C private constructor(arg1: Int, arg2: Int, arg3: Int = 0) { - constructor(arg1: Int) : this(arg1, 0, 0) {} -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/constructors/qualifiedRefInFactoryFun.kt b/nj2k/testData/newJ2k/constructors/qualifiedRefInFactoryFun.kt index daea028a06d..9c39f654620 100644 --- a/nj2k/testData/newJ2k/constructors/qualifiedRefInFactoryFun.kt +++ b/nj2k/testData/newJ2k/constructors/qualifiedRefInFactoryFun.kt @@ -3,6 +3,7 @@ internal class C(private val arg1: Int, private val arg2: Int, private val arg3: constructor(arg1: Int, arg2: Int, other: C) : this(arg1, arg2, 0) { println(this.arg1 + other.arg2) } + } internal class User { diff --git a/nj2k/testData/newJ2k/constructors/secondaryConstructorWithDefaultValues.kt b/nj2k/testData/newJ2k/constructors/secondaryConstructorWithDefaultValues.kt index 51a8e60348a..9a8a7c730ce 100644 --- a/nj2k/testData/newJ2k/constructors/secondaryConstructorWithDefaultValues.kt +++ b/nj2k/testData/newJ2k/constructors/secondaryConstructorWithDefaultValues.kt @@ -3,7 +3,6 @@ internal class A { private var x = 0 constructor() {} - @JvmOverloads constructor(p: Int, s: String, x: Int = 1) { this.s = s diff --git a/nj2k/testData/newJ2k/constructors/secondaryConstructorsInInnerClass.kt b/nj2k/testData/newJ2k/constructors/secondaryConstructorsInInnerClass.kt index 16638c5a930..4fa780f1c57 100644 --- a/nj2k/testData/newJ2k/constructors/secondaryConstructorsInInnerClass.kt +++ b/nj2k/testData/newJ2k/constructors/secondaryConstructorsInInnerClass.kt @@ -1,38 +1,25 @@ internal class Outer { private inner class Inner1() { - constructor(a: Int) : this() {} - protected constructor(c: Char) : this() {} - private constructor(b: Boolean) : this() {} } protected inner class Inner2() { - constructor(a: Int) : this() {} - protected constructor(c: Char) : this() {} - private constructor(b: Boolean) : this() {} - } internal inner class Inner3() { - constructor(a: Int) : this() {} - protected constructor(c: Char) : this() {} - private constructor(b: Boolean) : this() {} } inner class Inner4() { - constructor(a: Int) : this() {} - protected constructor(c: Char) : this() {} - private constructor(b: Boolean) : this() {} } @@ -42,4 +29,4 @@ internal class Outer { val inner3 = Inner3(3) val inner4 = Inner4(4) } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/constructors/secondaryConstructorsInNestedClass.kt b/nj2k/testData/newJ2k/constructors/secondaryConstructorsInNestedClass.kt index 01d5a9b070c..08ec3ae17c5 100644 --- a/nj2k/testData/newJ2k/constructors/secondaryConstructorsInNestedClass.kt +++ b/nj2k/testData/newJ2k/constructors/secondaryConstructorsInNestedClass.kt @@ -8,39 +8,26 @@ internal object Outer { } private class Nested1() { - constructor(a: Int) : this() {} - protected constructor(c: Char) : this() {} - private constructor(b: Boolean) : this() {} } protected class Nested2() { - constructor(a: Int) : this() {} - protected constructor(c: Char) : this() {} - private constructor(b: Boolean) : this() {} - } internal class Nested3() { - constructor(a: Int) : this() {} - protected constructor(c: Char) : this() {} - private constructor(b: Boolean) : this() {} } class Nested4() { - constructor(a: Int) : this() {} - protected constructor(c: Char) : this() {} - private constructor(b: Boolean) : this() {} } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/constructors/secondaryConstructorsVisibility.kt b/nj2k/testData/newJ2k/constructors/secondaryConstructorsVisibility.kt index eb8eccf718d..ad60d2b0ece 100644 --- a/nj2k/testData/newJ2k/constructors/secondaryConstructorsVisibility.kt +++ b/nj2k/testData/newJ2k/constructors/secondaryConstructorsVisibility.kt @@ -1,21 +1,13 @@ internal class A() { - constructor(a: Int) : this() {} - protected constructor(c: Char) : this() {} - constructor(f: Float) : this() {} - private constructor(d: Double) : this() {} } class B() { - constructor(a: Int) : this() {} - protected constructor(c: Char) : this() {} - internal constructor(f: Float) : this() {} - private constructor(d: Double) : this() {} } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/constructors/staticFieldRefInFactoryFun.kt b/nj2k/testData/newJ2k/constructors/staticFieldRefInFactoryFun.kt index e8d6d887cf0..44351826869 100644 --- a/nj2k/testData/newJ2k/constructors/staticFieldRefInFactoryFun.kt +++ b/nj2k/testData/newJ2k/constructors/staticFieldRefInFactoryFun.kt @@ -1,5 +1,4 @@ internal class C() { - constructor(p: Int) : this() { println(staticField1 + staticField2) } diff --git a/nj2k/testData/newJ2k/detectProperties/AnonymousClass.kt b/nj2k/testData/newJ2k/detectProperties/AnonymousClass.kt index 3e19d72ce03..924b51c5b40 100644 --- a/nj2k/testData/newJ2k/detectProperties/AnonymousClass.kt +++ b/nj2k/testData/newJ2k/detectProperties/AnonymousClass.kt @@ -2,6 +2,7 @@ class X { internal fun foo() { val runnable: Runnable = object : Runnable { var value = 10 + override fun run() { println(value) } diff --git a/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter.kt b/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter.kt index 8c136abc90c..871dfe809fd 100644 --- a/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter.kt +++ b/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter.kt @@ -1,4 +1,5 @@ class C { var x: String? = null internal set + } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter2.kt b/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter2.kt index d7231027588..e7cf3ab19ad 100644 --- a/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter2.kt +++ b/nj2k/testData/newJ2k/detectProperties/AssignFieldInsideSetter2.kt @@ -1,7 +1,6 @@ class C { private var x = "" internal var other: C? = null - fun getX(): String { return x } diff --git a/nj2k/testData/newJ2k/detectProperties/CannotDropOnlySetter.kt b/nj2k/testData/newJ2k/detectProperties/CannotDropOnlySetter.kt index c4da7fdfde8..7c242641008 100644 --- a/nj2k/testData/newJ2k/detectProperties/CannotDropOnlySetter.kt +++ b/nj2k/testData/newJ2k/detectProperties/CannotDropOnlySetter.kt @@ -1,7 +1,6 @@ class AAA { private var x = 42 - fun setX(x: Int) { this.x = x } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/Comments.kt b/nj2k/testData/newJ2k/detectProperties/Comments.kt index 1135a9f02de..baf5a932e4c 100644 --- a/nj2k/testData/newJ2k/detectProperties/Comments.kt +++ b/nj2k/testData/newJ2k/detectProperties/Comments.kt @@ -1,11 +1,12 @@ internal class A(// comment for field2 setter // comment for field2 getter var field2 // comment for field2 - : Int) { // Comment for field1 + : Int) { /** * Comment for field1 setter */ // Comment for field1 getter + // Comment for field1 var field1 = 0 // comment for field3 setter // comment for field3 getter @@ -21,5 +22,4 @@ internal class A(// comment for field2 setter get() = 1 set(value) {} - } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/CyclicInheritance.kt b/nj2k/testData/newJ2k/detectProperties/CyclicInheritance.kt index 6df31715afe..73bac0edb8f 100644 --- a/nj2k/testData/newJ2k/detectProperties/CyclicInheritance.kt +++ b/nj2k/testData/newJ2k/detectProperties/CyclicInheritance.kt @@ -4,6 +4,7 @@ internal interface I { val isSomething1: Boolean val isSomething2: Boolean? val isSomething3: Int + fun isSomething4(): Boolean fun setSomething4(value: Boolean) fun isSomething5(): Boolean diff --git a/nj2k/testData/newJ2k/detectProperties/DataClass.kt b/nj2k/testData/newJ2k/detectProperties/DataClass.kt index 4d7ddfbec5f..e3e98dd4064 100644 --- a/nj2k/testData/newJ2k/detectProperties/DataClass.kt +++ b/nj2k/testData/newJ2k/detectProperties/DataClass.kt @@ -1,4 +1,5 @@ class Test(var id: String, val name: String, val age: Int) { + init { println(age) } diff --git a/nj2k/testData/newJ2k/detectProperties/DropGetterAndSetter.kt b/nj2k/testData/newJ2k/detectProperties/DropGetterAndSetter.kt index 977e1db6790..52675c6b81d 100644 --- a/nj2k/testData/newJ2k/detectProperties/DropGetterAndSetter.kt +++ b/nj2k/testData/newJ2k/detectProperties/DropGetterAndSetter.kt @@ -1,3 +1,4 @@ class AAA { var x = 42 -} + +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/FalseGetter.kt b/nj2k/testData/newJ2k/detectProperties/FalseGetter.kt index 3ed4c9937d6..f348820603e 100644 --- a/nj2k/testData/newJ2k/detectProperties/FalseGetter.kt +++ b/nj2k/testData/newJ2k/detectProperties/FalseGetter.kt @@ -1,7 +1,6 @@ class AAA { private val x = 42 private val other = AAA() - fun getX(): Int { return other.x } @@ -9,4 +8,4 @@ class AAA { fun issue(): Boolean { return true } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/FalseSetter.kt b/nj2k/testData/newJ2k/detectProperties/FalseSetter.kt index c5d9872ce25..06b157fe242 100644 --- a/nj2k/testData/newJ2k/detectProperties/FalseSetter.kt +++ b/nj2k/testData/newJ2k/detectProperties/FalseSetter.kt @@ -3,4 +3,5 @@ class AAA { set(x) { field += x } -} + +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/GetterTypeNotMatch.kt b/nj2k/testData/newJ2k/detectProperties/GetterTypeNotMatch.kt index 6e46fd17961..e5ca756c8f7 100644 --- a/nj2k/testData/newJ2k/detectProperties/GetterTypeNotMatch.kt +++ b/nj2k/testData/newJ2k/detectProperties/GetterTypeNotMatch.kt @@ -1,6 +1,5 @@ internal class A { private val s: String? = null - val value: Any? get() = s } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect1.kt b/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect1.kt index 0577106bb5a..8abd21e7496 100644 --- a/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect1.kt +++ b/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect1.kt @@ -1,6 +1,5 @@ class C { private var myX = "" - var x: String get() { println("getter invoked") diff --git a/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect2.kt b/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect2.kt index 1f29f00e24a..59baf9bc351 100644 --- a/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect2.kt +++ b/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect2.kt @@ -1,6 +1,5 @@ class C { private var x = "" - fun getX(): String { println("getter invoked") return x diff --git a/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect3.kt b/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect3.kt index 433b9281cc1..6d583230452 100644 --- a/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect3.kt +++ b/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect3.kt @@ -1,6 +1,5 @@ class C { var x = "" - fun getX(): String { println("getter invoked") return x @@ -9,4 +8,4 @@ class C { fun setX(x: String) { this.x = x } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect4.kt b/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect4.kt index de42ff80f32..b85560fe77b 100644 --- a/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect4.kt +++ b/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect4.kt @@ -4,4 +4,5 @@ class C { println("getter invoked") return field } -} + +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect5.kt b/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect5.kt index de42ff80f32..b85560fe77b 100644 --- a/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect5.kt +++ b/nj2k/testData/newJ2k/detectProperties/GetterWithSideEffect5.kt @@ -4,4 +4,5 @@ class C { println("getter invoked") return field } -} + +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/InCompanionObject.kt b/nj2k/testData/newJ2k/detectProperties/InCompanionObject.kt index 162875603a6..d0f20867ad2 100644 --- a/nj2k/testData/newJ2k/detectProperties/InCompanionObject.kt +++ b/nj2k/testData/newJ2k/detectProperties/InCompanionObject.kt @@ -4,7 +4,7 @@ class AAA { } companion object { - var x = 42 + } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/InInterface.kt b/nj2k/testData/newJ2k/detectProperties/InInterface.kt index 149b9cac50b..314384ac03b 100644 --- a/nj2k/testData/newJ2k/detectProperties/InInterface.kt +++ b/nj2k/testData/newJ2k/detectProperties/InInterface.kt @@ -1,9 +1,11 @@ internal interface I { val something1: Int var something2: Int + fun setSomething3(value: Int) fun getSomething4(): Int fun setSomething4(value: String?) val something5: Int + fun setSomething5(value: Int): Int } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/InObject.kt b/nj2k/testData/newJ2k/detectProperties/InObject.kt index a039d9b9b22..02018283dac 100644 --- a/nj2k/testData/newJ2k/detectProperties/InObject.kt +++ b/nj2k/testData/newJ2k/detectProperties/InObject.kt @@ -5,8 +5,9 @@ object AAA { set(z) { Other.z = z } + } internal object Other { var z = 0 -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/IsPrefix.kt b/nj2k/testData/newJ2k/detectProperties/IsPrefix.kt index c163da19458..3121cc7d9a3 100644 --- a/nj2k/testData/newJ2k/detectProperties/IsPrefix.kt +++ b/nj2k/testData/newJ2k/detectProperties/IsPrefix.kt @@ -2,6 +2,7 @@ internal interface I { val isSomething1: Boolean val isSomething2: Boolean? val isSomething3: Int + fun isSomething4(): Boolean fun setSomething4(value: Boolean) fun isSomething5(): Boolean diff --git a/nj2k/testData/newJ2k/detectProperties/Overrides.kt b/nj2k/testData/newJ2k/detectProperties/Overrides.kt index 4df2d83f0ac..b993f68c8cd 100644 --- a/nj2k/testData/newJ2k/detectProperties/Overrides.kt +++ b/nj2k/testData/newJ2k/detectProperties/Overrides.kt @@ -2,6 +2,7 @@ internal interface I { val something1: Int val something2: Int var something3: Int + fun getSomething4(): Int fun setSomething4(value: Int) fun getSomething5(): Int diff --git a/nj2k/testData/newJ2k/detectProperties/PropertyAndFieldConflicts.kt b/nj2k/testData/newJ2k/detectProperties/PropertyAndFieldConflicts.kt index 76182ba63ee..e17c89f6686 100644 --- a/nj2k/testData/newJ2k/detectProperties/PropertyAndFieldConflicts.kt +++ b/nj2k/testData/newJ2k/detectProperties/PropertyAndFieldConflicts.kt @@ -3,7 +3,6 @@ internal class C { private val bbb = 0 private val ccc = 0 private val ddd = 0 - fun getAaa(): Int { return bbb } diff --git a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect1.kt b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect1.kt index f1913abcb86..939b8fd3ce8 100644 --- a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect1.kt +++ b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect1.kt @@ -1,6 +1,5 @@ class C { private var myX = "" - var x: String get() = myX set(x) { @@ -11,4 +10,4 @@ class C { internal fun foo() { myX = "a" } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect2.kt b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect2.kt index cb356a939bc..b0bdc2a8c70 100644 --- a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect2.kt +++ b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect2.kt @@ -1,6 +1,5 @@ class C { private var x = "" - fun getX(): String { return x } @@ -13,4 +12,4 @@ class C { internal fun foo() { x = "a" } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect3.kt b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect3.kt index 3f0265232b3..d05ac401a24 100644 --- a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect3.kt +++ b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect3.kt @@ -1,6 +1,5 @@ class C { protected var x = "" - fun getX(): String { return x } @@ -9,4 +8,4 @@ class C { println("setter invoked") this.x = x } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect4.kt b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect4.kt index 4ced9917081..83ba7524e2c 100644 --- a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect4.kt +++ b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect4.kt @@ -4,4 +4,5 @@ class C { println("setter invoked") field = value } + } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect5.kt b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect5.kt index a2adae89393..2ef5b5b1802 100644 --- a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect5.kt +++ b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect5.kt @@ -4,4 +4,5 @@ class C { println("setter invoked") field = x } + } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect6.kt b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect6.kt index 531904f9405..7c428b01431 100644 --- a/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect6.kt +++ b/nj2k/testData/newJ2k/detectProperties/SetterWithSideEffect6.kt @@ -4,4 +4,5 @@ class C { println("old value: " + this.x) field = x } -} + +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/commentInInitStatement.kt b/nj2k/testData/newJ2k/detectProperties/commentInInitStatement.kt index 352f70e3af1..d6a250fae3f 100644 --- a/nj2k/testData/newJ2k/detectProperties/commentInInitStatement.kt +++ b/nj2k/testData/newJ2k/detectProperties/commentInInitStatement.kt @@ -1,2 +1,3 @@ -class Nya /*comment before*/ /* comment after*/ // and after again +class Nya /*comment before*/ +/* comment after*/ // and after again (/*1*/ /*3*/ /*4*/private val i: Int) \ No newline at end of file diff --git a/nj2k/testData/newJ2k/detectProperties/kt-31700.kt b/nj2k/testData/newJ2k/detectProperties/kt-31700.kt index 694c0db4b04..a104fde7c59 100644 --- a/nj2k/testData/newJ2k/detectProperties/kt-31700.kt +++ b/nj2k/testData/newJ2k/detectProperties/kt-31700.kt @@ -1,9 +1,8 @@ //Interface interface Parent { val x: Unit -} +} //Subclass -//Subclass class Child : Parent { override val x: Unit get() {} } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/docComments/deprecatedDocTagWithMultiLineMessage.kt b/nj2k/testData/newJ2k/docComments/deprecatedDocTagWithMultiLineMessage.kt index 44c6c6832b9..73cf3aef438 100644 --- a/nj2k/testData/newJ2k/docComments/deprecatedDocTagWithMultiLineMessage.kt +++ b/nj2k/testData/newJ2k/docComments/deprecatedDocTagWithMultiLineMessage.kt @@ -1,7 +1,2 @@ -@Deprecated("Ph'nglui mglw'nafh\n" + - " Cthulhu R'lyeh wgah'nagl fhtagn.\n" + - " 'In His House at R'lyeh\n" + - " Dead Cthulhu waits dreaming,\n" + - " yet He shall rise and His kingdom\n" + - " shall cover the Earth.'") -class TestDeprecatedInJavadocWithMultilineMessage \ No newline at end of file +@Deprecated("Ph'nglui mglw'nafh\n" + " Cthulhu R'lyeh wgah'nagl fhtagn.\n" + " 'In His House at R'lyeh\n" + " Dead Cthulhu waits dreaming,\n" + " yet He shall rise and His kingdom\n" + " shall cover the Earth.'") +class TestDeprecatedInJavadocWithMultilineMessage \ No newline at end of file diff --git a/nj2k/testData/newJ2k/enum/colorEnum.kt b/nj2k/testData/newJ2k/enum/colorEnum.kt index aa8a3ccd97a..d1a77bbb75e 100644 --- a/nj2k/testData/newJ2k/enum/colorEnum.kt +++ b/nj2k/testData/newJ2k/enum/colorEnum.kt @@ -2,4 +2,5 @@ package demo internal enum class MyEnum(val color: Int) { RED(10), BLUE(20); + } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/enum/companionObject.kt b/nj2k/testData/newJ2k/enum/companionObject.kt index 38f09359dc6..98ced8a5b3b 100644 --- a/nj2k/testData/newJ2k/enum/companionObject.kt +++ b/nj2k/testData/newJ2k/enum/companionObject.kt @@ -1,10 +1,7 @@ enum class TestEnum { - A, - B; - + A, B; companion object { - fun parse(): TestEnum { return A } @@ -15,4 +12,4 @@ internal class Go { fun fn() { val x = TestEnum.parse() } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/enum/constantsWithBody1.kt b/nj2k/testData/newJ2k/enum/constantsWithBody1.kt index 7e428f7df34..7bf6a66e9b9 100644 --- a/nj2k/testData/newJ2k/enum/constantsWithBody1.kt +++ b/nj2k/testData/newJ2k/enum/constantsWithBody1.kt @@ -1,9 +1,7 @@ enum class E { - A, - - B { + A, B { override fun bar() {} }; internal open fun bar() {} -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/enum/constantsWithBody2.kt b/nj2k/testData/newJ2k/enum/constantsWithBody2.kt index 0560fb95b48..d4eb0b09cb9 100644 --- a/nj2k/testData/newJ2k/enum/constantsWithBody2.kt +++ b/nj2k/testData/newJ2k/enum/constantsWithBody2.kt @@ -5,12 +5,11 @@ enum class E(private val p: Int) { foo(p) } }, - B(2) { override fun bar() {} }; internal fun foo(p: Int) {} - internal abstract fun bar() -} + +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/enum/enumConstantIsNotNull.kt b/nj2k/testData/newJ2k/enum/enumConstantIsNotNull.kt index 4fcec9928db..6301268257b 100644 --- a/nj2k/testData/newJ2k/enum/enumConstantIsNotNull.kt +++ b/nj2k/testData/newJ2k/enum/enumConstantIsNotNull.kt @@ -1,4 +1,7 @@ -internal enum class E { FOO } +internal enum class E { + FOO +} + internal object A { @JvmStatic fun main(args: Array) { diff --git a/nj2k/testData/newJ2k/enum/fieldsWithPrimaryPrivateConstructor.kt b/nj2k/testData/newJ2k/enum/fieldsWithPrimaryPrivateConstructor.kt index 78c3a817106..1723d34059f 100644 --- a/nj2k/testData/newJ2k/enum/fieldsWithPrimaryPrivateConstructor.kt +++ b/nj2k/testData/newJ2k/enum/fieldsWithPrimaryPrivateConstructor.kt @@ -1,3 +1,4 @@ internal enum class Color(val code: Int) { WHITE(21), BLACK(22), RED(23), YELLOW(24), BLUE(25); + } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/equals/EqOperator.kt b/nj2k/testData/newJ2k/equals/EqOperator.kt index d51fcd408ac..a44b495cd52 100644 --- a/nj2k/testData/newJ2k/equals/EqOperator.kt +++ b/nj2k/testData/newJ2k/equals/EqOperator.kt @@ -1,9 +1,6 @@ internal interface I - internal class C - internal class O - internal class E { override fun equals(o: Any?): Boolean { return super.equals(o) @@ -17,7 +14,6 @@ internal open class B { } internal class BB : B() - internal enum class EE { A, B, C } @@ -35,8 +31,7 @@ internal class X { if (bb1 === bb2) return if (arr1 == arr2) return if (ee1 == ee2 || ee1 == null) return - if (s1 !== s2) return if (c1 != c2) return } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/equals/Equals1.kt b/nj2k/testData/newJ2k/equals/Equals1.kt index 28173f0a78a..82688f4c371 100644 --- a/nj2k/testData/newJ2k/equals/Equals1.kt +++ b/nj2k/testData/newJ2k/equals/Equals1.kt @@ -1,5 +1,4 @@ internal interface I - internal class C { fun foo1(i1: I, i2: I): Boolean { return i1 == i2 diff --git a/nj2k/testData/newJ2k/equals/ObjectsEquals.kt b/nj2k/testData/newJ2k/equals/ObjectsEquals.kt index fa0efb69c46..ac97da30302 100644 --- a/nj2k/testData/newJ2k/equals/ObjectsEquals.kt +++ b/nj2k/testData/newJ2k/equals/ObjectsEquals.kt @@ -1,5 +1,4 @@ internal interface I - internal class C { fun foo1(i1: I?, i2: I?): Boolean { return i1 == i2 diff --git a/nj2k/testData/newJ2k/field/conversion.kt b/nj2k/testData/newJ2k/field/conversion.kt index 931f10e0d9d..cd616463e35 100644 --- a/nj2k/testData/newJ2k/field/conversion.kt +++ b/nj2k/testData/newJ2k/field/conversion.kt @@ -1,12 +1,10 @@ internal class A { private var i = byte.toInt() - fun foo() { i = 10 } companion object { - val byte: Byte get() = 0 } diff --git a/nj2k/testData/newJ2k/field/valWithInit.kt b/nj2k/testData/newJ2k/field/valWithInit.kt index 6317e562f74..9cb1c23b748 100644 --- a/nj2k/testData/newJ2k/field/valWithInit.kt +++ b/nj2k/testData/newJ2k/field/valWithInit.kt @@ -1,5 +1,4 @@ internal class Foo(a: Int, b: Int) - internal class C { val f = Foo(1, 2) } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/field/varWithInit.kt b/nj2k/testData/newJ2k/field/varWithInit.kt index 5f179a6e1ee..a66b08483ed 100644 --- a/nj2k/testData/newJ2k/field/varWithInit.kt +++ b/nj2k/testData/newJ2k/field/varWithInit.kt @@ -1,5 +1,4 @@ internal class Foo(a: Int, b: Int) - internal class C { var f = Foo(1, 2) } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/field/volatileTransientAndStrictFp.kt b/nj2k/testData/newJ2k/field/volatileTransientAndStrictFp.kt index 447477f100c..1b93d6de871 100644 --- a/nj2k/testData/newJ2k/field/volatileTransientAndStrictFp.kt +++ b/nj2k/testData/newJ2k/field/volatileTransientAndStrictFp.kt @@ -3,10 +3,8 @@ internal class A { @Deprecated("") @Volatile var field1 = 0 - @Transient var field2 = 1 - // Should work even for bad modifiers @Strictfp var field3 = 2.0 diff --git a/nj2k/testData/newJ2k/for/nameConflict1.kt b/nj2k/testData/newJ2k/for/nameConflict1.kt index b4ba39abad0..447c310b087 100644 --- a/nj2k/testData/newJ2k/for/nameConflict1.kt +++ b/nj2k/testData/newJ2k/for/nameConflict1.kt @@ -7,11 +7,10 @@ internal class A { i *= 2 } } - var i = 1 while (i < 2000) { println(i) i *= 2 } } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/for/nameConflict2.kt b/nj2k/testData/newJ2k/for/nameConflict2.kt index 11efb8eb8d0..5da4fc176ec 100644 --- a/nj2k/testData/newJ2k/for/nameConflict2.kt +++ b/nj2k/testData/newJ2k/for/nameConflict2.kt @@ -9,11 +9,10 @@ internal class A { j++ } } - var j = 1 while (j < 2000) { println(j) j *= 2 } } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/for/nameConflict3.kt b/nj2k/testData/newJ2k/for/nameConflict3.kt index 31ad77cfd33..aad88bd0c83 100644 --- a/nj2k/testData/newJ2k/for/nameConflict3.kt +++ b/nj2k/testData/newJ2k/for/nameConflict3.kt @@ -1,6 +1,5 @@ internal class A { var i = 1 - fun foo() { run { var i = 1 @@ -9,7 +8,6 @@ internal class A { i *= 2 } } - i = 10 } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/for/nameConflict4.kt b/nj2k/testData/newJ2k/for/nameConflict4.kt index 63bfc21cca0..4283aeab659 100644 --- a/nj2k/testData/newJ2k/for/nameConflict4.kt +++ b/nj2k/testData/newJ2k/for/nameConflict4.kt @@ -5,9 +5,8 @@ internal class A { println(i) i *= 2 } - if (p) { val i = 10 } } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/for/nameConflict5.kt b/nj2k/testData/newJ2k/for/nameConflict5.kt index b37b9744e2a..f898a9de9b3 100644 --- a/nj2k/testData/newJ2k/for/nameConflict5.kt +++ b/nj2k/testData/newJ2k/for/nameConflict5.kt @@ -3,11 +3,10 @@ internal class A { if (p) { val i = 10 } - var i = 1 while (i < 1000) { println(i) i *= 2 } } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/foreachStatement/foreachWithoutBody.kt b/nj2k/testData/newJ2k/foreachStatement/foreachWithoutBody.kt index 7e037899427..f60aadf219b 100644 --- a/nj2k/testData/newJ2k/foreachStatement/foreachWithoutBody.kt +++ b/nj2k/testData/newJ2k/foreachStatement/foreachWithoutBody.kt @@ -1,7 +1,6 @@ class A { fun aVoid() { val array = IntArray(10) - for (i in array); println("Done") } diff --git a/nj2k/testData/newJ2k/formatting/lineBreaksBetweenArguments.kt b/nj2k/testData/newJ2k/formatting/lineBreaksBetweenArguments.kt index af66aa1a53c..c98620e93de 100644 --- a/nj2k/testData/newJ2k/formatting/lineBreaksBetweenArguments.kt +++ b/nj2k/testData/newJ2k/formatting/lineBreaksBetweenArguments.kt @@ -1,10 +1,9 @@ internal class F { fun f1(p1: Int, p2: Int, p3: Int, p4: Int, vararg p5: Int) {} - fun f2(array: IntArray) { f1(1, 2, 3, 4, *array ) } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/formatting/nonStaticMembersWithComments.kt b/nj2k/testData/newJ2k/formatting/nonStaticMembersWithComments.kt index 4adc41f86c3..ebdaa650e98 100644 --- a/nj2k/testData/newJ2k/formatting/nonStaticMembersWithComments.kt +++ b/nj2k/testData/newJ2k/formatting/nonStaticMembersWithComments.kt @@ -1,22 +1,12 @@ internal class F { - //c1 - - /*c2*/ - +/*c2*/ fun f1() {} - //c3 - - - //c4 - - +//c4 fun f2() {} + var i = 0 - fun f3() {} - - //c5 - + fun f3() {} //c5 } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/formatting/staticAndNonStaticMembersWithComments.kt b/nj2k/testData/newJ2k/formatting/staticAndNonStaticMembersWithComments.kt index fbc8aafc0b5..c973fc780e5 100644 --- a/nj2k/testData/newJ2k/formatting/staticAndNonStaticMembersWithComments.kt +++ b/nj2k/testData/newJ2k/formatting/staticAndNonStaticMembersWithComments.kt @@ -1,12 +1,14 @@ -internal class F { //c3 - //c4 +internal class F { + //c3 +//c4 fun f2() {} fun f3() {} fun f4() {} - companion object { //c1 - /*c2*/ + companion object { + //c1 +/*c2*/ fun f1() {} var i = 0 diff --git a/nj2k/testData/newJ2k/formatting/staticMembersWithComments.kt b/nj2k/testData/newJ2k/formatting/staticMembersWithComments.kt index 0845bcad1fb..52bd7a387bd 100644 --- a/nj2k/testData/newJ2k/formatting/staticMembersWithComments.kt +++ b/nj2k/testData/newJ2k/formatting/staticMembersWithComments.kt @@ -1,19 +1,12 @@ -internal object F {//c1 - - /*c2*/ - +internal object F { + //c1 +/*c2*/ fun f1() {} - //c3 - - - //c4 - - +//c4 fun f2() {} - var i = 0 - fun f3() {} - //c5 + var i = 0 + fun f3() {} //c5 } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/function/externalKtFunctionalInterface.kt b/nj2k/testData/newJ2k/function/externalKtFunctionalInterface.kt index b62cc818d64..6449c66c4c0 100644 --- a/nj2k/testData/newJ2k/function/externalKtFunctionalInterface.kt +++ b/nj2k/testData/newJ2k/function/externalKtFunctionalInterface.kt @@ -8,9 +8,7 @@ internal class Test { return x.toDouble() } - fun nya(): Double { - //TODO explicitlly call apply here - + fun nya(): Double { //TODO explicitlly call apply here return foo(1, FunctionalI { x: Int -> this.toDouble(x) }) } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/function/java8MRKFunctionExpectedType.kt b/nj2k/testData/newJ2k/function/java8MRKFunctionExpectedType.kt index 4f6def97e7e..24c6cc70570 100644 --- a/nj2k/testData/newJ2k/function/java8MRKFunctionExpectedType.kt +++ b/nj2k/testData/newJ2k/function/java8MRKFunctionExpectedType.kt @@ -23,7 +23,6 @@ internal class Test { internal class Java8Class { private val field = Java8Class() - fun testStaticFunction() { val staticFunFromSameClass: Function0<*> = { staticFun() } staticFunFromSameClass.invoke() @@ -40,7 +39,6 @@ internal class Java8Class { val obj = Java8Class() val memberFunFromSameClass: Function0<*> = { obj.memberFun() } memberFunFromSameClass.invoke() - val anotherObj = Test() val memFunFromAnotherClass: Function0<*> = { anotherObj.memberFun() } memFunFromAnotherClass.invoke() @@ -71,7 +69,6 @@ internal class Java8Class { fun testOverloads() { val constructorWithoutParams = { Test.testOverloads() } constructorWithoutParams.invoke() - val constructorWithParam = { i: Int -> Test.testOverloads(i) } constructorWithParam.invoke(2) + 42 } @@ -87,7 +84,6 @@ internal class Java8Class { } companion object { - fun staticFun(): Int { return 1 } diff --git a/nj2k/testData/newJ2k/function/lineBreaksBetweenParameters.kt b/nj2k/testData/newJ2k/function/lineBreaksBetweenParameters.kt index 56dd17ab42d..f01965d887b 100644 --- a/nj2k/testData/newJ2k/function/lineBreaksBetweenParameters.kt +++ b/nj2k/testData/newJ2k/function/lineBreaksBetweenParameters.kt @@ -1,6 +1,5 @@ internal class C { fun foo1(p1: Int, p2: Int) {} - fun foo2( p1: Int, p2: Int) { diff --git a/nj2k/testData/newJ2k/function/nativeMethods.kt b/nj2k/testData/newJ2k/function/nativeMethods.kt index e56c38fc905..dff7a58e145 100644 --- a/nj2k/testData/newJ2k/function/nativeMethods.kt +++ b/nj2k/testData/newJ2k/function/nativeMethods.kt @@ -1,7 +1,4 @@ class Foo { private external fun nativeMethod() - - var bar: Int - external get - external set + var bar: Int external get external set } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/function/overrideObject2.kt b/nj2k/testData/newJ2k/function/overrideObject2.kt index b50dd4e791a..83b21bd6801 100644 --- a/nj2k/testData/newJ2k/function/overrideObject2.kt +++ b/nj2k/testData/newJ2k/function/overrideObject2.kt @@ -1,5 +1,4 @@ internal open class Base - internal class X : Base(), Cloneable { override fun hashCode(): Int { return super.hashCode() diff --git a/nj2k/testData/newJ2k/identifier/finalFieldReference.kt b/nj2k/testData/newJ2k/identifier/finalFieldReference.kt index 71767b10b8e..fb640dca49e 100644 --- a/nj2k/testData/newJ2k/identifier/finalFieldReference.kt +++ b/nj2k/testData/newJ2k/identifier/finalFieldReference.kt @@ -1,10 +1,8 @@ internal class `$$$$$` - internal open class `$` - internal class `$$`(val `$$$`: `$$$$$`) : `$`() { - fun `$$$$$$`(): `$$$$$` { return `$$$` } + } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/ifStatement/elseIf.kt b/nj2k/testData/newJ2k/ifStatement/elseIf.kt index 318da3fef2c..890bb48294b 100644 --- a/nj2k/testData/newJ2k/ifStatement/elseIf.kt +++ b/nj2k/testData/newJ2k/ifStatement/elseIf.kt @@ -1,11 +1,5 @@ fun foo() { - if (a) - println("a") - else if (b) - println("b") - else - println("else") - + if (a) println("a") else if (b) println("b") else println("else") if (c) { println("c") } else if (d) { diff --git a/nj2k/testData/newJ2k/ifStatement/ifWithoutThen.kt b/nj2k/testData/newJ2k/ifStatement/ifWithoutThen.kt index 9d25c4f45e6..d20770947d1 100644 --- a/nj2k/testData/newJ2k/ifStatement/ifWithoutThen.kt +++ b/nj2k/testData/newJ2k/ifStatement/ifWithoutThen.kt @@ -1,7 +1,6 @@ class A { fun aVoid() { val i = 0 - if (i > 10); println("Done") } diff --git a/nj2k/testData/newJ2k/ifStatement/multiLine.kt b/nj2k/testData/newJ2k/ifStatement/multiLine.kt index 958e4a4e3ed..73650ff4950 100644 --- a/nj2k/testData/newJ2k/ifStatement/multiLine.kt +++ b/nj2k/testData/newJ2k/ifStatement/multiLine.kt @@ -1,2 +1 @@ -if (true) - return 1 \ No newline at end of file +if (true) return 1 \ No newline at end of file diff --git a/nj2k/testData/newJ2k/inheritance/classOneExtendsBaseWithZeroParams.kt b/nj2k/testData/newJ2k/inheritance/classOneExtendsBaseWithZeroParams.kt index 87686be531d..e0681918303 100644 --- a/nj2k/testData/newJ2k/inheritance/classOneExtendsBaseWithZeroParams.kt +++ b/nj2k/testData/newJ2k/inheritance/classOneExtendsBaseWithZeroParams.kt @@ -1,3 +1,2 @@ internal open class Base - -internal class One : Base() \ No newline at end of file +internal class One : Base() \ No newline at end of file diff --git a/nj2k/testData/newJ2k/issues/comments.kt b/nj2k/testData/newJ2k/issues/comments.kt index d875e20ed07..cb3ccefecc5 100644 --- a/nj2k/testData/newJ2k/issues/comments.kt +++ b/nj2k/testData/newJ2k/issues/comments.kt @@ -2,12 +2,11 @@ /* This is a block comment */ -/*doc comment of class*/ -//one line comment of class +/*doc comment of class*/ //one line comment of class //another one /*another doc*/ -internal class C { // This is a class comment - +internal class C { + // This is a class comment /** * This is a field doc comment. */ @@ -26,34 +25,30 @@ internal class C { // This is a class comment var j = 0 //double c style - //comment before function +//comment before function fun f2() {} //double c style - //comment before field +//comment before field var k = 0 - //combination /** of */ - // +// /** * different */ - //comments +//comments fun f3() {} - //combination /** of */ - // +// /** * different */ - //comments +//comments var l = 0 - /*two*/ - /*comments*/ - /*line*/ + /*two*/ /*comments*/ /*line*/ var z = 0 } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/issues/kt-1074.kt b/nj2k/testData/newJ2k/issues/kt-1074.kt index 1ac7a27a8d7..5ca67d99507 100644 --- a/nj2k/testData/newJ2k/issues/kt-1074.kt +++ b/nj2k/testData/newJ2k/issues/kt-1074.kt @@ -2,7 +2,6 @@ package demo internal object Test { fun bar(a: Int) { - if (a < 0) - throw RuntimeException("a = $a") + if (a < 0) throw RuntimeException("a = $a") } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/issues/kt-17379.kt b/nj2k/testData/newJ2k/issues/kt-17379.kt index 883df44de7d..614c7e68cd8 100644 --- a/nj2k/testData/newJ2k/issues/kt-17379.kt +++ b/nj2k/testData/newJ2k/issues/kt-17379.kt @@ -7,14 +7,12 @@ internal class Test { val c = 2 val d = 4 val y = (a // polyadic expression case - + b // x2 - + c // x3 - + d) // x4 val z = (a // binary expression case + b) // x4 - val j = b + c + val j = b + + c } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/issues/kt-19652.kt b/nj2k/testData/newJ2k/issues/kt-19652.kt index f7fae04c85e..7bf0801ae47 100644 --- a/nj2k/testData/newJ2k/issues/kt-19652.kt +++ b/nj2k/testData/newJ2k/issues/kt-19652.kt @@ -1,8 +1,7 @@ import java.awt.image.AreaAveragingScaleFilter import java.awt.image.ImageConsumer -class TestInterfaceStaticFieldReference(width: Int, height: Int) : - AreaAveragingScaleFilter(width, height) { +class TestInterfaceStaticFieldReference(width: Int, height: Int) : AreaAveragingScaleFilter(width, height) { fun test() { println(ImageConsumer.TOPDOWNLEFTRIGHT) } diff --git a/nj2k/testData/newJ2k/issues/kt-31818.kt b/nj2k/testData/newJ2k/issues/kt-31818.kt index ed8340e6f99..6c5df720356 100644 --- a/nj2k/testData/newJ2k/issues/kt-31818.kt +++ b/nj2k/testData/newJ2k/issues/kt-31818.kt @@ -1,8 +1,7 @@ class ClassC - object Test { @JvmStatic fun main(args: Array) { var a: ClassC<*> } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/issues/kt-543.kt b/nj2k/testData/newJ2k/issues/kt-543.kt index d8660a44eb2..467d14e440c 100644 --- a/nj2k/testData/newJ2k/issues/kt-543.kt +++ b/nj2k/testData/newJ2k/issues/kt-543.kt @@ -2,7 +2,6 @@ package demo internal class Test { fun putInt(i: Int) {} - fun test() { val b: Byte = 10 putInt(b.toInt()) diff --git a/nj2k/testData/newJ2k/issues/kt-792.kt b/nj2k/testData/newJ2k/issues/kt-792.kt index 61cea59e10d..f849dc6a445 100644 --- a/nj2k/testData/newJ2k/issues/kt-792.kt +++ b/nj2k/testData/newJ2k/issues/kt-792.kt @@ -1,7 +1,6 @@ package demo internal class Test(i: Int) { - fun test() { val b: Byte = 10 Test(b.toInt()) diff --git a/nj2k/testData/newJ2k/issues/kt-807.kt b/nj2k/testData/newJ2k/issues/kt-807.kt index f4407133b15..1bb29e81aee 100644 --- a/nj2k/testData/newJ2k/issues/kt-807.kt +++ b/nj2k/testData/newJ2k/issues/kt-807.kt @@ -21,6 +21,5 @@ internal object FileRead { } catch (e: Exception) { System.err.println("Error: " + e.message) } - } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/issues/kt-809.kt b/nj2k/testData/newJ2k/issues/kt-809.kt index 82f97f14710..25d571a61e1 100644 --- a/nj2k/testData/newJ2k/issues/kt-809.kt +++ b/nj2k/testData/newJ2k/issues/kt-809.kt @@ -9,7 +9,6 @@ internal object One { } internal class IntContainer(i: Int) - internal class Test { fun putInt(i: Int) {} fun test() { diff --git a/nj2k/testData/newJ2k/issues/kt-824-isDir.kt b/nj2k/testData/newJ2k/issues/kt-824-isDir.kt index 5e8ff373a5a..8ada99b3163 100644 --- a/nj2k/testData/newJ2k/issues/kt-824-isDir.kt +++ b/nj2k/testData/newJ2k/issues/kt-824-isDir.kt @@ -13,7 +13,6 @@ object Test { val result = true return if (parent.isDirectory) { true - } else - false + } else false } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/issues/kt-828.kt b/nj2k/testData/newJ2k/issues/kt-828.kt index c43baa70a90..6c136ac0189 100644 --- a/nj2k/testData/newJ2k/issues/kt-828.kt +++ b/nj2k/testData/newJ2k/issues/kt-828.kt @@ -8,7 +8,6 @@ internal class Test { println(true or false) println(true xor false) println(!true) - println(true && false) println(true || false) } diff --git a/nj2k/testData/newJ2k/issues/kt-836.kt b/nj2k/testData/newJ2k/issues/kt-836.kt index 4bf3a164ed3..fd164bfb5dd 100644 --- a/nj2k/testData/newJ2k/issues/kt-836.kt +++ b/nj2k/testData/newJ2k/issues/kt-836.kt @@ -6,6 +6,7 @@ class Language(protected var code: String) : Serializable { override fun toString(): String { return code } + } internal open class Base { @@ -20,4 +21,4 @@ internal class Child : Base() { override fun toString(): String { return "Child" } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/issues/kt-837.kt b/nj2k/testData/newJ2k/issues/kt-837.kt index 9a1b8dcb8b0..21755fa6483 100644 --- a/nj2k/testData/newJ2k/issues/kt-837.kt +++ b/nj2k/testData/newJ2k/issues/kt-837.kt @@ -12,4 +12,5 @@ class Language(protected var code: String) : Serializable { var SWEDISH = Language("sv") private const val serialVersionUID = -2442762969929206780L } + } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/issues/kt-851.kt b/nj2k/testData/newJ2k/issues/kt-851.kt index 34fa7e5009b..2c856e03528 100644 --- a/nj2k/testData/newJ2k/issues/kt-851.kt +++ b/nj2k/testData/newJ2k/issues/kt-851.kt @@ -1,6 +1,5 @@ internal class Test { fun putInt(i: Int) {} - fun test() { val b: Byte = 10 putInt(b.toInt()) diff --git a/nj2k/testData/newJ2k/issues/kt-852.kt b/nj2k/testData/newJ2k/issues/kt-852.kt index 44f9d720f4c..76aa17c0cb4 100644 --- a/nj2k/testData/newJ2k/issues/kt-852.kt +++ b/nj2k/testData/newJ2k/issues/kt-852.kt @@ -5,10 +5,7 @@ internal class Test { val s1 = "" val s2 = "" val s3 = "" - if (s1.isEmpty() && s2.isEmpty()) - return "OK" - + if (s1.isEmpty() && s2.isEmpty()) return "OK" return if (s1.isEmpty() && s2.isEmpty() && s3.isEmpty()) "OOOK" else "" - } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/issues/kt-899.kt b/nj2k/testData/newJ2k/issues/kt-899.kt index 27c0466ca36..8ec21ab1f3e 100644 --- a/nj2k/testData/newJ2k/issues/kt-899.kt +++ b/nj2k/testData/newJ2k/issues/kt-899.kt @@ -1,40 +1,29 @@ internal class Test { fun printNumbers() { - for (i1 in 0..0) - println(i1) - + for (i1 in 0..0) println(i1) val b: Byte = 1 - for (i2 in 0 until b) - println(i2) - + for (i2 in 0 until b) println(i2) val s: Short = 1 - for (i3 in 0 until s) - println(i3) - + for (i3 in 0 until s) println(i3) val l = 1L - for (i4 in 0 until l) - println(i4) - + for (i4 in 0 until l) println(i4) val d = 1.0 var i5 = 0 while (i5 < d) { println(i5) i5++ } - val f = 1.0f var i6 = 0 while (i6 < f) { println(i6) i6++ } - val c = 1.toChar() var i7 = 0 while (i7 < c.toInt()) { println(i7) i7++ } - } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/issues/kt-9997.kt b/nj2k/testData/newJ2k/issues/kt-9997.kt index cb10647ef42..c8872826c9e 100644 --- a/nj2k/testData/newJ2k/issues/kt-9997.kt +++ b/nj2k/testData/newJ2k/issues/kt-9997.kt @@ -7,7 +7,6 @@ internal class A { val d = 1.0 val f = 1.0f val c = 1.toChar() - t(i == i) t(i == b.toInt()) t(i == s.toInt()) @@ -15,7 +14,6 @@ internal class A { t(i.toDouble() == d) t(i.toFloat() == f) t(i == c.toInt()) - t(b.toInt() == i) t(b == b) t(b.toShort() == s) @@ -23,7 +21,6 @@ internal class A { t(b.toDouble() == d) t(b.toFloat() == f) t(b == c.toByte()) - t(s.toInt() == i) t(s == b.toShort()) t(s == s) @@ -31,7 +28,6 @@ internal class A { t(s.toDouble() == d) t(s.toFloat() == f) t(s == c.toShort()) - t(l == i.toLong()) t(l == b.toLong()) t(l == s.toLong()) @@ -39,7 +35,6 @@ internal class A { t(l.toDouble() == d) t(l.toFloat() == f) t(l == c.toLong()) - t(d == i.toDouble()) t(d == b.toDouble()) t(d == s.toDouble()) @@ -47,7 +42,6 @@ internal class A { t(d == d) t(d == f.toDouble()) t(d == c.toDouble()) - t(f == i.toFloat()) t(f == b.toFloat()) t(f == s.toFloat()) @@ -55,7 +49,6 @@ internal class A { t(f.toDouble() == d) t(f == f) t(f == c.toFloat()) - t(c.toInt() == i) t(c.toByte() == b) t(c.toShort() == s) @@ -63,7 +56,6 @@ internal class A { t(c.toDouble() == d) t(c.toFloat() == f) t(c == c) - t(i.toDouble() != d) } @@ -75,7 +67,6 @@ internal class A { val d = 1.0 val f = 1.0f val c = 1.toChar() - t(i > i) t(i > b) t(i > s) @@ -83,7 +74,6 @@ internal class A { t(i > d) t(i > f) t(i > c.toInt()) - t(b > i) t(b > b) t(b > s) @@ -91,7 +81,6 @@ internal class A { t(b > d) t(b > f) t(b > c.toByte()) - t(s > i) t(s > b) t(s > s) @@ -99,7 +88,6 @@ internal class A { t(s > d) t(s > f) t(s > c.toShort()) - t(l > i) t(l > b) t(l > s) @@ -107,7 +95,6 @@ internal class A { t(l > d) t(l > f) t(l > c.toLong()) - t(d > i) t(d > b) t(d > s) @@ -115,7 +102,6 @@ internal class A { t(d > d) t(d > f) t(d > c.toDouble()) - t(f > i) t(f > b) t(f > s) @@ -123,7 +109,6 @@ internal class A { t(f > d) t(f > f) t(f > c.toFloat()) - t(c.toInt() > i) t(c.toByte() > b) t(c.toShort() > s) diff --git a/nj2k/testData/newJ2k/issues/operationsWithChar.kt b/nj2k/testData/newJ2k/issues/operationsWithChar.kt index e2edf5ee3f9..c6dad1f3e76 100644 --- a/nj2k/testData/newJ2k/issues/operationsWithChar.kt +++ b/nj2k/testData/newJ2k/issues/operationsWithChar.kt @@ -2,22 +2,18 @@ internal class Test { fun operationsWithChar() { val c = 1.toChar() val i = 1 - b(i > c.toInt()) b(i >= c.toInt()) b(i < c.toInt()) b(i <= c.toInt()) - b(c.toInt() > i) b(c.toInt() >= i) b(c.toInt() < i) b(c.toInt() <= i) - b(c.toInt() == i) b(c.toInt() != i) b(i == c.toInt()) b(i != c.toInt()) - i(i + c.toInt()) i(i - c.toInt()) i(i / c.toInt()) @@ -27,7 +23,6 @@ internal class Test { i(i and c.toInt()) i(i shl c.toInt()) i(i shr c.toInt()) - i(c.toInt() + i) i(c.toInt() - i) i(c.toInt() / i) diff --git a/nj2k/testData/newJ2k/kotlinApiAccess/CorrectNullabilityDetected.kt b/nj2k/testData/newJ2k/kotlinApiAccess/CorrectNullabilityDetected.kt index 653a77270ad..57ab87c7dd5 100644 --- a/nj2k/testData/newJ2k/kotlinApiAccess/CorrectNullabilityDetected.kt +++ b/nj2k/testData/newJ2k/kotlinApiAccess/CorrectNullabilityDetected.kt @@ -10,8 +10,10 @@ internal class A { fun foo(c: KotlinClass): Int { return (c.nullableProperty!!.length + c.property.length - + nullableStaticVar!! + staticVar - + nullableStaticFun(1)!! + staticFun(1) + + nullableStaticVar!! + + staticVar + + nullableStaticFun(1)!! + + staticFun(1) + nullableGlobalFunction("")!!.length + globalFunction("").length) } diff --git a/nj2k/testData/newJ2k/literalExpression/char.kt b/nj2k/testData/newJ2k/literalExpression/char.kt index 2cf034f6f04..6eb6d147e51 100644 --- a/nj2k/testData/newJ2k/literalExpression/char.kt +++ b/nj2k/testData/newJ2k/literalExpression/char.kt @@ -1,6 +1,5 @@ internal class Test { private val c = 0.toChar() - fun test() { val c1 = 'c' val c2 = 'C' diff --git a/nj2k/testData/newJ2k/literalExpression/dollarInsideString.kt b/nj2k/testData/newJ2k/literalExpression/dollarInsideString.kt index 42ffad87d19..47d1aaa12ba 100644 --- a/nj2k/testData/newJ2k/literalExpression/dollarInsideString.kt +++ b/nj2k/testData/newJ2k/literalExpression/dollarInsideString.kt @@ -4,10 +4,8 @@ internal class Test { fun test() { var name = "$$$$" name = name.replace("\\$[0-9]+".toRegex(), "\\$") - val c = '$' println(c) - val C = '$' println(C) } diff --git a/nj2k/testData/newJ2k/literalExpression/endsWithDFL.kt b/nj2k/testData/newJ2k/literalExpression/endsWithDFL.kt index 955f1ee6db8..8a05e56f2e0 100644 --- a/nj2k/testData/newJ2k/literalExpression/endsWithDFL.kt +++ b/nj2k/testData/newJ2k/literalExpression/endsWithDFL.kt @@ -3,7 +3,6 @@ internal class Test { val l1 = 10L val d1 = 10.0 val f1 = 10.0f - val l2 = 10L val d2 = 10.0 val f2 = 10.0f @@ -13,7 +12,6 @@ internal class Test { val l1 = 10L val d1 = 10.0 val f1 = 10.0f - val l2 = 10L val d2 = 10.0 val f2 = 10.0f diff --git a/nj2k/testData/newJ2k/literalExpression/exponentDouble.kt b/nj2k/testData/newJ2k/literalExpression/exponentDouble.kt index 8ce3a5ef7db..341d2b10023 100644 --- a/nj2k/testData/newJ2k/literalExpression/exponentDouble.kt +++ b/nj2k/testData/newJ2k/literalExpression/exponentDouble.kt @@ -1,9 +1,9 @@ class Exponent { private val doubles = doubleArrayOf( - 5e5, +5e5, -5e5, 5e+5, 5e-5, - 5E5, +5E5, -5E5, 5E+5, 5E-5, - 2.5e5, +2.5e5, -2.5e5, 2.5e+5, 2.5e-5, - 2.5E5, +2.5E5, -2.5E5, 2.5E+5, 2.5E-5, 5e5, 5e5, 5e5, 5e5, - 5e-6, 7e+8, 9e-1, 2e+3, 4e5, 6e7 + 5e5, +5e5, -5e5, 5e+5, 5e-5, + 5E5, +5E5, -5E5, 5E+5, 5E-5, + 2.5e5, +2.5e5, -2.5e5, 2.5e+5, 2.5e-5, + 2.5E5, +2.5E5, -2.5E5, 2.5E+5, 2.5E-5, 5e5, 5e5, 5e5, 5e5, + 5e-6, 7e+8, 9e-1, 2e+3, 4e5, 6e7 ) } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/literalExpression/exponentFloat.kt b/nj2k/testData/newJ2k/literalExpression/exponentFloat.kt index 5141c1b0dd1..9e5e9ecf6d4 100644 --- a/nj2k/testData/newJ2k/literalExpression/exponentFloat.kt +++ b/nj2k/testData/newJ2k/literalExpression/exponentFloat.kt @@ -1,10 +1,10 @@ class Exponent { private val floats = floatArrayOf( - 5e5f, +5e5f, -5e5f, 5e+5f, 5e-5f, - 5E5f, +5E5f, -5E5f, 5E+5f, 5E-5f, - 2.5e5f, +2.5e5f, -2.5e5f, 2.5e+5f, 2.5e-5f, - 2.5E5f, +2.5E5f, -2.5E5f, 2.5E+5f, 2.5E-5f, - 5e5f, 5e5f, - 5e-6f, 7e+8f, 9e-1f, 2e+3f, 4e5f, 6e7f + 5e5f, +5e5f, -5e5f, 5e+5f, 5e-5f, + 5E5f, +5E5f, -5E5f, 5E+5f, 5E-5f, + 2.5e5f, +2.5e5f, -2.5e5f, 2.5e+5f, 2.5e-5f, + 2.5E5f, +2.5E5f, -2.5E5f, 2.5E+5f, 2.5E-5f, + 5e5f, 5e5f, + 5e-6f, 7e+8f, 9e-1f, 2e+3f, 4e5f, 6e7f ) } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/literalExpression/trueOrFalse.kt b/nj2k/testData/newJ2k/literalExpression/trueOrFalse.kt index 1bc566a1c83..41ff551514f 100644 --- a/nj2k/testData/newJ2k/literalExpression/trueOrFalse.kt +++ b/nj2k/testData/newJ2k/literalExpression/trueOrFalse.kt @@ -2,7 +2,6 @@ internal class Test { fun test() { val t1 = true val t2 = true - val f1 = false val f2 = false } diff --git a/nj2k/testData/newJ2k/methodCallExpression/conflictJavaMethodCall.kt b/nj2k/testData/newJ2k/methodCallExpression/conflictJavaMethodCall.kt index f57a1b86ad2..662dde8a62a 100644 --- a/nj2k/testData/newJ2k/methodCallExpression/conflictJavaMethodCall.kt +++ b/nj2k/testData/newJ2k/methodCallExpression/conflictJavaMethodCall.kt @@ -1,5 +1,4 @@ // RUNTIME_WITH_FULL_JDK - class Test { internal fun m() { java.lang.Double.isFinite(2.0) @@ -7,4 +6,4 @@ class Test { java.lang.Float.isNaN(2.0f) java.lang.Float.isInfinite(2.0f) } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/methodCallExpression/parameterToReceiver.kt b/nj2k/testData/newJ2k/methodCallExpression/parameterToReceiver.kt index c329523e996..f4e56124e6d 100644 --- a/nj2k/testData/newJ2k/methodCallExpression/parameterToReceiver.kt +++ b/nj2k/testData/newJ2k/methodCallExpression/parameterToReceiver.kt @@ -1,5 +1,6 @@ import kotlinApi.extensionFunction + fun adjust(name: String?, maxLen: Int) { (1 + 1).toString() "a".split(("\\s+" + "\\s+").toRegex(), 2).toTypedArray() diff --git a/nj2k/testData/newJ2k/methodCallExpression/specialBuiltinMembers.kt b/nj2k/testData/newJ2k/methodCallExpression/specialBuiltinMembers.kt index e57342f4c22..fe8856cf003 100644 --- a/nj2k/testData/newJ2k/methodCallExpression/specialBuiltinMembers.kt +++ b/nj2k/testData/newJ2k/methodCallExpression/specialBuiltinMembers.kt @@ -1,4 +1,7 @@ -internal enum class E { A, B, C } +internal enum class E { + A, B, C +} + internal class A { fun foo(list: List, collection: Collection, map: Map) { val a = "".length diff --git a/nj2k/testData/newJ2k/methodCallExpression/stringMethods.kt b/nj2k/testData/newJ2k/methodCallExpression/stringMethods.kt index 2f7719b9808..b2a0288b3c5 100644 --- a/nj2k/testData/newJ2k/methodCallExpression/stringMethods.kt +++ b/nj2k/testData/newJ2k/methodCallExpression/stringMethods.kt @@ -118,7 +118,8 @@ internal class A { } fun unsupportedMethods() { - val s = "test string" /* TODO: + val s = "test string" + /* TODO: s.indexOf(32); s.indexOf(32, 2); s.lastIndexOf(32); diff --git a/nj2k/testData/newJ2k/methodCallExpression/systemOut.kt b/nj2k/testData/newJ2k/methodCallExpression/systemOut.kt index 7720c75c8a5..27abd390193 100644 --- a/nj2k/testData/newJ2k/methodCallExpression/systemOut.kt +++ b/nj2k/testData/newJ2k/methodCallExpression/systemOut.kt @@ -5,8 +5,7 @@ internal class A { println("1") print("1") print(1) - System.err.println() System.err.println(1) } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/mutableCollections/Overrides.kt b/nj2k/testData/newJ2k/mutableCollections/Overrides.kt index 39aa620872d..e1e084a5012 100644 --- a/nj2k/testData/newJ2k/mutableCollections/Overrides.kt +++ b/nj2k/testData/newJ2k/mutableCollections/Overrides.kt @@ -3,8 +3,7 @@ package javaApi import kotlinApi.KotlinClass abstract class C(field: Int) : KotlinClass(field) { - override fun foo(mutableCollection: MutableCollection, nullableCollection: Collection?): MutableList { return super.foo(mutableCollection, nullableCollection) } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/newClassExpression/classWithParam.kt b/nj2k/testData/newJ2k/newClassExpression/classWithParam.kt index e127fa03579..f42850ae4c2 100644 --- a/nj2k/testData/newJ2k/newClassExpression/classWithParam.kt +++ b/nj2k/testData/newJ2k/newClassExpression/classWithParam.kt @@ -1,5 +1,4 @@ internal class Foo(a: Int, b: Int) { - fun foo() { val f = Foo(1, 2) } diff --git a/nj2k/testData/newJ2k/newClassExpression/classWithParams.kt b/nj2k/testData/newJ2k/newClassExpression/classWithParams.kt index e127fa03579..f42850ae4c2 100644 --- a/nj2k/testData/newJ2k/newClassExpression/classWithParams.kt +++ b/nj2k/testData/newJ2k/newClassExpression/classWithParams.kt @@ -1,5 +1,4 @@ internal class Foo(a: Int, b: Int) { - fun foo() { val f = Foo(1, 2) } diff --git a/nj2k/testData/newJ2k/newClassExpression/javaLangObject.kt b/nj2k/testData/newJ2k/newClassExpression/javaLangObject.kt index 86eadd67e23..a917b7dd001 100644 --- a/nj2k/testData/newJ2k/newClassExpression/javaLangObject.kt +++ b/nj2k/testData/newJ2k/newClassExpression/javaLangObject.kt @@ -1,8 +1,6 @@ internal class C { fun foo() { - val o1: Any = object : Any() { - - } + val o1: Any = object : Any() {} val o2 = Any() } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/newClassExpression/lineBreaks.kt b/nj2k/testData/newJ2k/newClassExpression/lineBreaks.kt index 3790a35a9e0..0191ba7d5b5 100644 --- a/nj2k/testData/newJ2k/newClassExpression/lineBreaks.kt +++ b/nj2k/testData/newJ2k/newClassExpression/lineBreaks.kt @@ -1,9 +1,8 @@ internal class C(p1: Int, p2: Int, p3: Int) - internal class User { fun foo() { C(1, 2, 3) } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/newClassExpression/newAnonymousClass2.kt b/nj2k/testData/newJ2k/newClassExpression/newAnonymousClass2.kt index 94de6e0dfc2..6fd46f976e4 100644 --- a/nj2k/testData/newJ2k/newClassExpression/newAnonymousClass2.kt +++ b/nj2k/testData/newJ2k/newClassExpression/newAnonymousClass2.kt @@ -1,5 +1,4 @@ internal abstract class A - internal class C { fun foo() { val a: A = object : A() { diff --git a/nj2k/testData/newJ2k/newClassExpression/newClassByFullName.kt b/nj2k/testData/newJ2k/newClassExpression/newClassByFullName.kt index f6e8396b130..c9b1cbbc044 100644 --- a/nj2k/testData/newJ2k/newClassExpression/newClassByFullName.kt +++ b/nj2k/testData/newJ2k/newClassExpression/newClassByFullName.kt @@ -1,7 +1,6 @@ package org.test internal class Library - internal class User { fun main() { val lib = Library() diff --git a/nj2k/testData/newJ2k/nullability/FieldAssignedWithNull.kt b/nj2k/testData/newJ2k/nullability/FieldAssignedWithNull.kt index 8fe0726e49f..2435ddf531e 100644 --- a/nj2k/testData/newJ2k/nullability/FieldAssignedWithNull.kt +++ b/nj2k/testData/newJ2k/nullability/FieldAssignedWithNull.kt @@ -1,6 +1,5 @@ internal class C { private var s: String? = "" - fun foo() { s = null } diff --git a/nj2k/testData/newJ2k/nullability/FieldComparedWithNull.kt b/nj2k/testData/newJ2k/nullability/FieldComparedWithNull.kt index 9ab7e1bc62d..828a284bb83 100644 --- a/nj2k/testData/newJ2k/nullability/FieldComparedWithNull.kt +++ b/nj2k/testData/newJ2k/nullability/FieldComparedWithNull.kt @@ -1,7 +1,6 @@ // ERROR: Unresolved reference: x internal class C { private val s: String? = x() - fun foo() { if (s == null) { print("null") diff --git a/nj2k/testData/newJ2k/nullability/FieldComparedWithNull2.kt b/nj2k/testData/newJ2k/nullability/FieldComparedWithNull2.kt index 0e8d009e5ea..bd01fc0bbaa 100644 --- a/nj2k/testData/newJ2k/nullability/FieldComparedWithNull2.kt +++ b/nj2k/testData/newJ2k/nullability/FieldComparedWithNull2.kt @@ -1,8 +1,8 @@ internal class C(private val s: String?) { - fun foo() { if (s != null) { print("not null") } } + } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/nullability/FieldInitializedWithNull.kt b/nj2k/testData/newJ2k/nullability/FieldInitializedWithNull.kt index b19757913c8..e0c99fa0177 100644 --- a/nj2k/testData/newJ2k/nullability/FieldInitializedWithNull.kt +++ b/nj2k/testData/newJ2k/nullability/FieldInitializedWithNull.kt @@ -1,6 +1,5 @@ internal class C { private var s: String? = null - fun foo() { s = "x" } diff --git a/nj2k/testData/newJ2k/nullability/IndirectOverride.kt b/nj2k/testData/newJ2k/nullability/IndirectOverride.kt index d9fe13c73f0..f7fd52b44b1 100644 --- a/nj2k/testData/newJ2k/nullability/IndirectOverride.kt +++ b/nj2k/testData/newJ2k/nullability/IndirectOverride.kt @@ -2,7 +2,6 @@ import javaApi.Derived internal class C : Derived() { override fun foo(s: String?): String? { - return s } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/nullability/MethodInvokedWithNullArg.kt b/nj2k/testData/newJ2k/nullability/MethodInvokedWithNullArg.kt index a4bdcb960bc..3c7780a1c63 100644 --- a/nj2k/testData/newJ2k/nullability/MethodInvokedWithNullArg.kt +++ b/nj2k/testData/newJ2k/nullability/MethodInvokedWithNullArg.kt @@ -1,6 +1,5 @@ internal class C { private fun foo(s: String?) {} - fun bar() { foo(null) } diff --git a/nj2k/testData/newJ2k/nullability/MethodInvokedWithTernaryNullArg.kt b/nj2k/testData/newJ2k/nullability/MethodInvokedWithTernaryNullArg.kt index 4c5b7c16861..56cead0b220 100644 --- a/nj2k/testData/newJ2k/nullability/MethodInvokedWithTernaryNullArg.kt +++ b/nj2k/testData/newJ2k/nullability/MethodInvokedWithTernaryNullArg.kt @@ -1,6 +1,5 @@ internal class C { private fun foo(s: String?) {} - fun bar(b: Boolean) { foo(if (b) "a" else null) } diff --git a/nj2k/testData/newJ2k/nullability/NullableIntNoCrash.kt b/nj2k/testData/newJ2k/nullability/NullableIntNoCrash.kt index 65abe5509f8..01dc51408e5 100644 --- a/nj2k/testData/newJ2k/nullability/NullableIntNoCrash.kt +++ b/nj2k/testData/newJ2k/nullability/NullableIntNoCrash.kt @@ -1,6 +1,5 @@ internal class A { var field = foo() - fun foo(): Int { return 1 } diff --git a/nj2k/testData/newJ2k/nullability/VariableComparedWithNull.kt b/nj2k/testData/newJ2k/nullability/VariableComparedWithNull.kt index 0ec928942e5..156cce20623 100644 --- a/nj2k/testData/newJ2k/nullability/VariableComparedWithNull.kt +++ b/nj2k/testData/newJ2k/nullability/VariableComparedWithNull.kt @@ -1,5 +1,4 @@ // !specifyLocalVariableTypeByDefault: true - fun bar(): String? { return null } diff --git a/nj2k/testData/newJ2k/nullability/notNullCast.kt b/nj2k/testData/newJ2k/nullability/notNullCast.kt index 322fd4caaee..1eb64bc9fd1 100644 --- a/nj2k/testData/newJ2k/nullability/notNullCast.kt +++ b/nj2k/testData/newJ2k/nullability/notNullCast.kt @@ -1,6 +1,5 @@ class Passenger { open class PassParent - class PassChild : PassParent() fun provideNullable(p: Int): PassParent? { @@ -22,6 +21,5 @@ class Passenger { } fun accept1(p: PassChild?) {} - fun accept2(p: PassChild?) {} } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/overloads/Abstract.kt b/nj2k/testData/newJ2k/overloads/Abstract.kt index 1d2d4e72f73..40424a09df8 100644 --- a/nj2k/testData/newJ2k/overloads/Abstract.kt +++ b/nj2k/testData/newJ2k/overloads/Abstract.kt @@ -1,7 +1,6 @@ internal abstract class A { abstract fun foo(p: Int) - fun foo() { foo(1) } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/protected/onlyProtectedConstructor.kt b/nj2k/testData/newJ2k/protected/onlyProtectedConstructor.kt index 14d6ed954df..aacbf638c90 100644 --- a/nj2k/testData/newJ2k/protected/onlyProtectedConstructor.kt +++ b/nj2k/testData/newJ2k/protected/onlyProtectedConstructor.kt @@ -1,5 +1,4 @@ package test open class BaseProtectedConstructor protected constructor() - -internal class DerivedSamePackage : BaseProtectedConstructor() +internal class DerivedSamePackage : BaseProtectedConstructor() \ No newline at end of file diff --git a/nj2k/testData/newJ2k/protected/severalInheritors.kt b/nj2k/testData/newJ2k/protected/severalInheritors.kt index 8f73e1db1f0..d1642625af7 100644 --- a/nj2k/testData/newJ2k/protected/severalInheritors.kt +++ b/nj2k/testData/newJ2k/protected/severalInheritors.kt @@ -1,15 +1,12 @@ package test open class BaseProtectedConstructor { - protected fun foo() { - - } + protected fun foo() {} } internal open class MiddleSamePackage : BaseProtectedConstructor() - internal class DerivedSamePackage : MiddleSamePackage() { fun usage() { foo() } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/protected/usages.kt b/nj2k/testData/newJ2k/protected/usages.kt index bf8f8584638..c9c8a3e0e03 100644 --- a/nj2k/testData/newJ2k/protected/usages.kt +++ b/nj2k/testData/newJ2k/protected/usages.kt @@ -13,9 +13,10 @@ class BaseProtectedConstructor { internal class DerivedSamePackage { private val i = BaseProtectedConstructor().usageInPropertyInitializer() - companion object {init { - BaseProtectedConstructor().usageInStaticInit() - } + companion object { + init { + BaseProtectedConstructor().usageInStaticInit() + } } fun usage() { @@ -25,4 +26,4 @@ internal class DerivedSamePackage { init { BaseProtectedConstructor().usageInConstructor() } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/settings/openByDefault.kt b/nj2k/testData/newJ2k/settings/openByDefault.kt index 1d0ff34863e..aa29dcec04b 100644 --- a/nj2k/testData/newJ2k/settings/openByDefault.kt +++ b/nj2k/testData/newJ2k/settings/openByDefault.kt @@ -1,5 +1,4 @@ // !openByDefault: true - internal open class A { internal open fun foo1() {} private fun foo2() {} @@ -28,4 +27,4 @@ internal enum class E { fun foo(): Int { return 0 } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefault.kt b/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefault.kt index be5eba55c95..80335044c52 100644 --- a/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefault.kt +++ b/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefault.kt @@ -1,5 +1,4 @@ // !specifyLocalVariableTypeByDefault: true - fun foo() { val i = 1 val s = "" diff --git a/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.kt b/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.kt index 8a1331920a9..5d44610363c 100644 --- a/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.kt +++ b/nj2k/testData/newJ2k/settings/specifyLocalVariableTypeByDefaultInFor.kt @@ -1,5 +1,4 @@ // !specifyLocalVariableTypeByDefault: true - fun foo(list: List) { val array = IntArray(10) for (i: Int in 0..9) { diff --git a/nj2k/testData/newJ2k/staticMembers/PrivateStaticMembers.kt b/nj2k/testData/newJ2k/staticMembers/PrivateStaticMembers.kt index 7ae50a0303d..4d870b420fe 100644 --- a/nj2k/testData/newJ2k/staticMembers/PrivateStaticMembers.kt +++ b/nj2k/testData/newJ2k/staticMembers/PrivateStaticMembers.kt @@ -1,5 +1,4 @@ internal class A { - fun foo() { privateStatic1() privateStatic2() @@ -7,7 +6,6 @@ internal class A { companion object { private const val s = "abc" - private fun privateStatic1() {} private fun privateStatic2() {} } diff --git a/nj2k/testData/newJ2k/staticMembers/PrivateStaticMethods2.kt b/nj2k/testData/newJ2k/staticMembers/PrivateStaticMethods2.kt index 5abdaccf393..64b447fb515 100644 --- a/nj2k/testData/newJ2k/staticMembers/PrivateStaticMethods2.kt +++ b/nj2k/testData/newJ2k/staticMembers/PrivateStaticMethods2.kt @@ -5,7 +5,6 @@ internal class A { } companion object { - fun publicStatic() { privateStatic1() } diff --git a/nj2k/testData/newJ2k/staticMembers/PrivateStaticMethods3.kt b/nj2k/testData/newJ2k/staticMembers/PrivateStaticMethods3.kt index 043ad0f2fb7..f946bfd0104 100644 --- a/nj2k/testData/newJ2k/staticMembers/PrivateStaticMethods3.kt +++ b/nj2k/testData/newJ2k/staticMembers/PrivateStaticMethods3.kt @@ -10,7 +10,6 @@ internal class A { } companion object { - private fun privateStatic1() {} private fun privateStatic2() {} } diff --git a/nj2k/testData/newJ2k/staticMembers/StaticQualifiedByInheritor.kt b/nj2k/testData/newJ2k/staticMembers/StaticQualifiedByInheritor.kt index fc212d06f4d..35801ed089f 100644 --- a/nj2k/testData/newJ2k/staticMembers/StaticQualifiedByInheritor.kt +++ b/nj2k/testData/newJ2k/staticMembers/StaticQualifiedByInheritor.kt @@ -9,4 +9,4 @@ object User { fun test() { Base.foo() } -} +} \ No newline at end of file diff --git a/nj2k/testData/newJ2k/strings/formattedString.kt b/nj2k/testData/newJ2k/strings/formattedString.kt index 1da47ca4b27..03859a85f22 100644 --- a/nj2k/testData/newJ2k/strings/formattedString.kt +++ b/nj2k/testData/newJ2k/strings/formattedString.kt @@ -2,8 +2,6 @@ object A { const val TEXT1 = "text1.\n" + "text2\n" + "text3" - - const val TEXT2 = ("text1\n" + "text2\n" + "text3") diff --git a/nj2k/testData/newJ2k/switch/caseWithBlock.kt b/nj2k/testData/newJ2k/switch/caseWithBlock.kt index cc5b7f41d77..a35895dcd16 100644 --- a/nj2k/testData/newJ2k/switch/caseWithBlock.kt +++ b/nj2k/testData/newJ2k/switch/caseWithBlock.kt @@ -4,12 +4,10 @@ fun foo() { val x = 1 println(x) } - 2 -> { val x = 2 println(x) } - 3 -> { println(3) } diff --git a/nj2k/testData/newJ2k/switch/emptySwitch.kt b/nj2k/testData/newJ2k/switch/emptySwitch.kt index f7223e62b2e..fc2fa4ce51b 100644 --- a/nj2k/testData/newJ2k/switch/emptySwitch.kt +++ b/nj2k/testData/newJ2k/switch/emptySwitch.kt @@ -1,11 +1,9 @@ object NonDefault { @JvmStatic fun main(args: Array) { - val value = 3 val valueString = "" when (value) { - } println(valueString) } diff --git a/nj2k/testData/newJ2k/switch/fallDownWithBlocks.kt b/nj2k/testData/newJ2k/switch/fallDownWithBlocks.kt index 69ccb8c7f5b..78c183227ff 100644 --- a/nj2k/testData/newJ2k/switch/fallDownWithBlocks.kt +++ b/nj2k/testData/newJ2k/switch/fallDownWithBlocks.kt @@ -12,7 +12,6 @@ object C { print("2") } } - 2 -> { val a = 2 print("2") diff --git a/nj2k/testData/newJ2k/switch/kt-539.kt b/nj2k/testData/newJ2k/switch/kt-539.kt index b6d68c8edf1..76aca61d61d 100644 --- a/nj2k/testData/newJ2k/switch/kt-539.kt +++ b/nj2k/testData/newJ2k/switch/kt-539.kt @@ -3,7 +3,6 @@ package switch_demo object SwitchDemo { @JvmStatic fun main(args: Array) { - val month = 8 val monthString: String monthString = when (month) { diff --git a/nj2k/testData/newJ2k/switch/nestedSwitch.kt b/nj2k/testData/newJ2k/switch/nestedSwitch.kt index b501ad6e5bf..33d91f394f9 100644 --- a/nj2k/testData/newJ2k/switch/nestedSwitch.kt +++ b/nj2k/testData/newJ2k/switch/nestedSwitch.kt @@ -4,7 +4,6 @@ fun foo(i: Int, j: Int): String { 1 -> "0, 1" else -> "0, x" } - 1 -> "1, x" else -> "x, x" } diff --git a/nj2k/testData/newJ2k/switch/nondefault.kt b/nj2k/testData/newJ2k/switch/nondefault.kt index 7ebf10a36cc..ae2f6a4f09d 100644 --- a/nj2k/testData/newJ2k/switch/nondefault.kt +++ b/nj2k/testData/newJ2k/switch/nondefault.kt @@ -1,7 +1,6 @@ object NonDefault { @JvmStatic fun main(args: Array) { - val value = 3 var valueString = "" when (value) { diff --git a/nj2k/testData/newJ2k/trait/interfaceWithMethodDeclaration.kt b/nj2k/testData/newJ2k/trait/interfaceWithMethodDeclaration.kt index 795c3a23b54..2a017705a9b 100644 --- a/nj2k/testData/newJ2k/trait/interfaceWithMethodDeclaration.kt +++ b/nj2k/testData/newJ2k/trait/interfaceWithMethodDeclaration.kt @@ -1,4 +1,5 @@ internal interface INode { val tag: Tag? + fun toKotlin(): String? } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/tryWithResource/WithCatch.kt b/nj2k/testData/newJ2k/tryWithResource/WithCatch.kt index 6642cb6a8ad..640e1726bec 100644 --- a/nj2k/testData/newJ2k/tryWithResource/WithCatch.kt +++ b/nj2k/testData/newJ2k/tryWithResource/WithCatch.kt @@ -12,6 +12,5 @@ class C { } catch (e: IOException) { println(e) } - } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/tryWithResource/WithCatches.kt b/nj2k/testData/newJ2k/tryWithResource/WithCatches.kt index 541ceae690f..d8780c5b528 100644 --- a/nj2k/testData/newJ2k/tryWithResource/WithCatches.kt +++ b/nj2k/testData/newJ2k/tryWithResource/WithCatches.kt @@ -14,6 +14,5 @@ class C { } catch (e: Exception) { System.err.println(e) } - } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/tryWithResource/WithFinally.kt b/nj2k/testData/newJ2k/tryWithResource/WithFinally.kt index d74ab529dd3..a7f2417e7a7 100644 --- a/nj2k/testData/newJ2k/tryWithResource/WithFinally.kt +++ b/nj2k/testData/newJ2k/tryWithResource/WithFinally.kt @@ -10,8 +10,7 @@ class C { val c = stream.read() println(c) } - } finally { - // dispose something else + } finally { // dispose something else } } } \ No newline at end of file diff --git a/nj2k/testData/newJ2k/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt b/nj2k/testData/newJ2k/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt index 3170f947737..8e3eeae4456 100644 --- a/nj2k/testData/newJ2k/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt +++ b/nj2k/testData/newJ2k/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt @@ -1,4 +1,4 @@ internal interface INode internal interface Node internal open class A -internal class CC : A() where T : INode?, T : Comparable?, K : Node?, K : Collection? \ No newline at end of file +internal class CC : A() where T : INode?, T : Comparable?, K : Node?, K : Collection? \ No newline at end of file diff --git a/nj2k/testData/newJ2k/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt b/nj2k/testData/newJ2k/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt index 5e1679f7ee3..706a39adc09 100644 --- a/nj2k/testData/newJ2k/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt +++ b/nj2k/testData/newJ2k/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt @@ -1,3 +1,3 @@ internal interface INode internal open class A -internal class C : A() where T : INode?, T : Comparable? \ No newline at end of file +internal class C : A() where T : INode?, T : Comparable? \ No newline at end of file diff --git a/nj2k/testData/newJ2k/whileStatement/whileWithoutBody.kt b/nj2k/testData/newJ2k/whileStatement/whileWithoutBody.kt index 6c5e193e7ce..57b77d0d196 100644 --- a/nj2k/testData/newJ2k/whileStatement/whileWithoutBody.kt +++ b/nj2k/testData/newJ2k/whileStatement/whileWithoutBody.kt @@ -1,8 +1,7 @@ class A { fun aVoid() { var i = 0 - while (i++ < 10); println("Done") } -} +} \ No newline at end of file diff --git a/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinConverterSingleFileTest.kt b/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinConverterSingleFileTest.kt index 454223b2dd7..470f39368a1 100644 --- a/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinConverterSingleFileTest.kt +++ b/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinConverterSingleFileTest.kt @@ -28,10 +28,7 @@ abstract class AbstractNewJavaToKotlinConverterSingleFileTest : AbstractJavaToKo } override fun compareResults(expectedFile: File, actual: String) { - KotlinTestUtils.assertEqualsToFile(expectedFile, actual) { - val file = createKotlinFile(it) - file.dumpStructureText() - } + KotlinTestUtils.assertEqualsToFile(expectedFile, actual) } override fun setUp() {