From b828aaf733dcd3e15052cd4c1c8b18298746f2da Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Sat, 19 Jan 2013 08:57:52 -0800 Subject: [PATCH] Migrating to Kotlin M4: Most compilation errors outside AST fixed --- src/org/jetbrains/jet/j2k/Converter.kt | 90 +++++++++---------- .../jet/j2k/JavaToKotlinTranslator.java | 19 ++-- .../jetbrains/jet/j2k/ast/AnonymousClass.kt | 1 - .../jet/j2k/ast/ArrayInitializerExpression.kt | 4 +- .../ArrayWithoutInitializationExpression.kt | 1 - src/org/jetbrains/jet/j2k/ast/Block.kt | 1 - .../jet/j2k/ast/CallChainExpression.kt | 3 - src/org/jetbrains/jet/j2k/ast/Class.kt | 6 +- src/org/jetbrains/jet/j2k/ast/Constructor.kt | 2 - src/org/jetbrains/jet/j2k/ast/Enum.kt | 2 - src/org/jetbrains/jet/j2k/ast/EnumConstant.kt | 2 - .../jetbrains/jet/j2k/ast/ExpressionList.kt | 1 - src/org/jetbrains/jet/j2k/ast/Field.kt | 2 - src/org/jetbrains/jet/j2k/ast/File.kt | 6 +- src/org/jetbrains/jet/j2k/ast/Function.kt | 2 - src/org/jetbrains/jet/j2k/ast/Identifier.kt | 1 - src/org/jetbrains/jet/j2k/ast/Initializer.kt | 1 - .../jetbrains/jet/j2k/ast/LocalVariable.kt | 1 - src/org/jetbrains/jet/j2k/ast/Member.kt | 2 - .../jet/j2k/ast/MethodCallExpression.kt | 1 - .../jet/j2k/ast/NewClassExpression.kt | 5 +- src/org/jetbrains/jet/j2k/ast/Node.kt | 1 - .../jetbrains/jet/j2k/ast/ParameterList.kt | 1 - .../jet/j2k/ast/PolyadicExpression.kt | 1 - .../jetbrains/jet/j2k/ast/ReferenceElement.kt | 1 - src/org/jetbrains/jet/j2k/ast/Statements.kt | 1 - src/org/jetbrains/jet/j2k/ast/Trait.kt | 2 - .../jetbrains/jet/j2k/ast/TypeParameter.kt | 1 - src/org/jetbrains/jet/j2k/ast/Util.kt | 9 +- .../jetbrains/jet/j2k/ast/types/ClassType.kt | 4 +- .../jet/j2k/visitors/ClassVisitor.kt | 3 +- .../jet/j2k/visitors/ElementVisitor.kt | 1 - .../jet/j2k/visitors/ExpressionVisitor.kt | 9 +- ...ressionVisitorForDirectObjectInheritors.kt | 2 +- .../jet/j2k/visitors/StatementVisitor.kt | 30 +++---- .../jetbrains/jet/j2k/visitors/ThisVisitor.kt | 5 +- .../jetbrains/jet/j2k/visitors/TypeVisitor.kt | 3 +- .../ast/kotlinExclusion/file/kt-656.kt | 1 - .../file/fullQualifiedName.kt | 1 - .../file/genericClassInvocation.kt | 1 - .../file/newListAndNewMember.kt | 1 - tests/testData/ast/rawGenerics/file/kt-540.kt | 1 - 42 files changed, 93 insertions(+), 139 deletions(-) diff --git a/src/org/jetbrains/jet/j2k/Converter.kt b/src/org/jetbrains/jet/j2k/Converter.kt index b8e19a029eb..482a92f6b19 100644 --- a/src/org/jetbrains/jet/j2k/Converter.kt +++ b/src/org/jetbrains/jet/j2k/Converter.kt @@ -21,10 +21,10 @@ import java.text.MessageFormat import com.intellij.psi.util.PsiUtil public open class Converter() { - private var classIdentifiers: Set = hashSet() + private var classIdentifiers: MutableSet = Sets.newHashSet()!! private val dispatcher: Dispatcher = Dispatcher(this) private var methodReturnType: PsiType? = null - private val flags: Set? = Sets.newHashSet() + private val flags: MutableSet? = Sets.newHashSet() public open fun addFlag(flag: J2KConverterFlags): Boolean { return flags?.add(flag)!! } @@ -32,7 +32,7 @@ public open class Converter() { return flags?.contains(flag)!! } - public open fun setClassIdentifiers(identifiers: Set) { + public open fun setClassIdentifiers(identifiers: MutableSet) { classIdentifiers = identifiers } @@ -74,10 +74,10 @@ public open class Converter() { private fun fileToFile(javaFile: PsiJavaFile, additionalImports: List): File { val importList: PsiImportList? = javaFile.getImportList() - val imports: List = (if (importList == null) + val imports: MutableList = (if (importList == null) arrayList() else - importsToImportList(importList.getAllImportStatements())) + ArrayList(importsToImportList(importList.getAllImportStatements()))) for (i : String in additionalImports) imports.add(Import(i)) @@ -97,8 +97,8 @@ public open class Converter() { return AnonymousClass(this, getMembers(anonymousClass)) } - private fun getMembers(psiClass: PsiClass): List { - val members: List = arrayList() + private fun getMembers(psiClass: PsiClass): MutableList { + val members = ArrayList() val lbraceOffset = psiClass.getLBrace()?.getTextRange()?.getStartOffset() ?: 0 for (e : PsiElement? in psiClass.getChildren()) { val isDocComment = e?.getTextRange()?.getStartOffset() ?: 0 < lbraceOffset @@ -110,7 +110,7 @@ public open class Converter() { } private fun getDocComments(element: PsiElement): List { - val comments: List = arrayList() + val comments = ArrayList() val textOffset = element.getTextOffset() for (e : PsiElement? in element.getChildren()) { if (e is PsiComment && e.getTextRange()?.getStartOffset() ?: 0 < textOffset) { @@ -136,8 +136,8 @@ public open class Converter() { val implementsTypes: List = typesToNotNullableTypeList(psiClass.getImplementsListTypes()) val extendsTypes: List = typesToNotNullableTypeList(psiClass.getExtendsListTypes()) val name: Identifier = Identifier(psiClass.getName()!!) - val baseClassParams: List = arrayList() - val members: List = getMembers(psiClass) + val baseClassParams= ArrayList() + val members = getMembers(psiClass) val docComments = getDocComments(psiClass) val visitor: SuperVisitor = SuperVisitor() psiClass.accept(visitor) @@ -150,7 +150,7 @@ public open class Converter() { if (!psiClass.isEnum() && !psiClass.isInterface() && psiClass.getConstructors().size > 1 && getPrimaryConstructorForThisCase(psiClass) == null) { val finalOrWithEmptyInitializer: List = getFinalOrWithEmptyInitializer(fields) - val initializers: Map = HashMap() + val initializers = HashMap() for (m in members) { if (m is Constructor) { if (!m.isPrimary) { @@ -158,7 +158,7 @@ public open class Converter() { val init: String = getDefaultInitializer(fo) initializers.put(fo.identifier.toKotlin(), init) } - val newStatements: List = arrayList() + val newStatements = ArrayList() for (s in m.block!!.statements) { var isRemoved: Boolean = false if (s is AssignmentExpression) { @@ -209,7 +209,7 @@ public open class Converter() { return Initializer(blockToBlock(i.getBody(), true), modifiersListToModifiersSet(i.getModifierList())) } - private fun fieldsToFieldList(fields: Array, psiClass: PsiClass): List { + private fun fieldsToFieldList(fields: Array, psiClass: PsiClass): List { return fields.map { fieldToField(it!!, psiClass) } } @@ -283,7 +283,7 @@ public open class Converter() { } private fun createFunctionParameters(method: PsiMethod): ParameterList { - val result: List = arrayList() + val result = ArrayList() for (parameter : PsiParameter? in method.getParameterList().getParameters()) { result.add(Parameter(Identifier(parameter?.getName()!!), typeToType(parameter?.getType(), @@ -332,11 +332,11 @@ public open class Converter() { return blockToBlock(block, true) } - public open fun statementsToStatementList(statements: Array): List { + public open fun statementsToStatementList(statements: Array): List { return statements.filterNot { it is PsiWhiteSpace }.map { statementToStatement(it) } } - public open fun statementsToStatementList(statements: List): List { + public open fun statementsToStatementList(statements: List): List { return statements.filterNot { it is PsiWhiteSpace }.map { statementToStatement(it) } } @@ -349,8 +349,8 @@ public open class Converter() { return statementVisitor.getResult() } - public open fun expressionsToExpressionList(expressions: Array): List { - val result: List = arrayList() + public open fun expressionsToExpressionList(expressions: Array): List { + val result = ArrayList() for (e : PsiExpression? in expressions) result.add(expressionToExpression(e)) return result @@ -375,7 +375,7 @@ public open class Converter() { } public open fun elementsToElementList(elements: Array): List { - val result: List = arrayList() + val result = ArrayList() for(element in elements) { result.add(elementToElement(element)) } @@ -398,7 +398,7 @@ public open class Converter() { return typeVisitor.getResult() } - public open fun typesToTypeList(types: Array): List { + public open fun typesToTypeList(types: Array): List { return types.map { typeToType(it) } } @@ -412,14 +412,14 @@ public open class Converter() { } private fun typesToNotNullableTypeList(types: Array): List { - val result: List = arrayList() + val result = ArrayList() for(aType in types) { result.add(typeToType(aType).convertedToNotNull()) } return result } - public open fun parametersToParameterList(parameters: Array): List { + public open fun parametersToParameterList(parameters: Array): List { return parameters.map { parameterToParameter(it!!) } } @@ -431,13 +431,13 @@ public open class Converter() { public open fun argumentsToExpressionList(expression: PsiCallExpression): List { val argumentList: PsiExpressionList? = expression.getArgumentList() - val arguments: Array = (if (argumentList != null) + val arguments: Array = (if (argumentList != null) argumentList.getExpressions() else PsiExpression.EMPTY_ARRAY) - val result: List = ArrayList() + val result = ArrayList() val resolved: PsiMethod? = expression.resolveMethod() - val expectedTypes: List = ArrayList() + val expectedTypes = ArrayList() if (resolved != null) { for (p : PsiParameter? in resolved.getParameterList().getParameters()) expectedTypes.add(p?.getType()) @@ -503,7 +503,7 @@ public open class Converter() { } private fun getFinalOrWithEmptyInitializer(fields: List): List { - val result: List = arrayList() + val result = ArrayList() for (f : Field in fields) if (f.isVal() || f.initializer.toKotlin().isEmpty()) { result.add(f) @@ -517,7 +517,7 @@ public open class Converter() { } private fun createInitStatementsFromFields(fields: List): List { - val result: List = arrayList() + val result = ArrayList() for (f : Field in fields) { val identifierToKotlin: String? = f.identifier.toKotlin() result.add(DummyStringExpression(identifierToKotlin + " = " + "_" + identifierToKotlin)) @@ -612,7 +612,7 @@ public open class Converter() { } private fun isInheritFromObject(method: PsiMethod): Boolean { - var superSignatures: List? = method.getHierarchicalMethodSignature().getSuperSignatures() + var superSignatures: List = method.getHierarchicalMethodSignature().getSuperSignatures()!! for (s : HierarchicalMethodSignature? in superSignatures) { var containingClass: PsiClass? = s?.getMethod()?.getContainingClass() var qualifiedName: String? = (if (containingClass != null) @@ -644,8 +644,8 @@ public open class Converter() { return false } - private fun importsToImportList(imports: Array): List { - val result: List = arrayList() + private fun importsToImportList(imports: Array): List { + val result = ArrayList() for (i : PsiImportStatementBase? in imports) { if (i == null) continue val anImport: Import = importToImport(i) @@ -677,7 +677,7 @@ public open class Converter() { return Identifier(identifier.getText()!!) } - public open fun modifiersListToModifiersSet(modifierList: PsiModifierList?): Set { + public open fun modifiersListToModifiersSet(modifierList: PsiModifierList?): MutableSet { val modifiersSet: HashSet = hashSet() if (modifierList != null) { if (modifierList.hasExplicitModifier(PsiModifier.ABSTRACT)) @@ -710,7 +710,7 @@ public open class Converter() { return false } - val typeMap: Map = HashMap() + val typeMap = HashMap() typeMap.put(JAVA_LANG_BYTE, "byte") typeMap.put(JAVA_LANG_SHORT, "short") typeMap.put(JAVA_LANG_INTEGER, "int") @@ -727,8 +727,8 @@ public open class Converter() { } } -public open fun createMainFunction(file: PsiFile): String { - val classNamesWithMains: List?> = arrayList() +public fun createMainFunction(file: PsiFile): String { + val classNamesWithMains = ArrayList?>() for (c : PsiClass? in (file as PsiJavaFile).getClasses()) { var main: PsiMethod? = findMainMethod(c) if (main != null) { @@ -747,7 +747,7 @@ public open fun createMainFunction(file: PsiFile): String { private fun findMainMethod(aClass: PsiClass?): PsiMethod? { if (isMainClass(aClass)) { - val mainMethods: Array? = aClass?.findMethodsByName("main", false) + val mainMethods: Array? = aClass?.findMethodsByName("main", false) if (mainMethods != null) { return findMainMethod(mainMethods) } @@ -766,11 +766,11 @@ private fun isMainClass(psiClass: PsiClass?): Boolean { } -private fun findMainMethod(mainMethods: Array): PsiMethod? { +private fun findMainMethod(mainMethods: Array): PsiMethod? { return mainMethods.find { isMainMethod(it) } } -public open fun isMainMethod(method: PsiMethod?): Boolean { +public fun isMainMethod(method: PsiMethod?): Boolean { if (method == null || method.getContainingClass() == null) return false @@ -783,7 +783,7 @@ public open fun isMainMethod(method: PsiMethod?): Boolean { if (!method.hasModifierProperty(PsiModifier.PUBLIC)) return false - val parameters: Array? = method.getParameterList().getParameters() + val parameters: Array? = method.getParameterList().getParameters() if (parameters?.size!! != 1) return false @@ -795,12 +795,12 @@ public open fun isMainMethod(method: PsiMethod?): Boolean { return componentType?.equalsToText("java.lang.String")!! } -public open fun countWritingAccesses(element: PsiElement?, container: PsiElement?): Int { +public fun countWritingAccesses(element: PsiElement?, container: PsiElement?): Int { var counter: Int = 0 if (container != null) { val visitor: ReferenceCollector = ReferenceCollector() container.accept(visitor) - for (e : PsiReferenceExpression? in visitor.getCollectedReferences()) + for (e : PsiReferenceExpression in visitor.getCollectedReferences()) if (e?.isReferenceTo(element)!! && PsiUtil.isAccessedForWriting(e)) { counter++ } @@ -810,7 +810,7 @@ public open fun countWritingAccesses(element: PsiElement?, container: PsiElement } open class ReferenceCollector(): JavaRecursiveElementVisitor() { - private val myCollectedReferences: List = arrayList() + private val myCollectedReferences = ArrayList() public open fun getCollectedReferences(): List { return myCollectedReferences @@ -824,14 +824,14 @@ open class ReferenceCollector(): JavaRecursiveElementVisitor() { } } -public open fun isReadOnly(element: PsiElement?, container: PsiElement?): Boolean { +public fun isReadOnly(element: PsiElement?, container: PsiElement?): Boolean { return countWritingAccesses(element, container) == 0 } -public open fun isAnnotatedAsNotNull(modifierList: PsiModifierList?): Boolean { +public fun isAnnotatedAsNotNull(modifierList: PsiModifierList?): Boolean { if (modifierList != null) { - val annotations: Array? = modifierList.getAnnotations() - for (a : PsiAnnotation? in annotations) { + val annotations: Array = modifierList.getAnnotations() + for (a : PsiAnnotation in annotations) { val qualifiedName: String? = a?.getQualifiedName() if (qualifiedName != null && Converter.NOT_NULL_ANNOTATIONS.contains(qualifiedName)) { return true diff --git a/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.java b/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.java index c5c95a11a6b..88107de50cc 100644 --- a/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.java +++ b/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.java @@ -15,7 +15,8 @@ */ package org.jetbrains.jet.j2k; -import com.intellij.core.JavaCoreEnvironment; +import com.intellij.core.JavaCoreApplicationEnvironment; +import com.intellij.core.JavaCoreProjectEnvironment; import com.intellij.lang.java.JavaLanguage; import com.intellij.openapi.Disposable; import com.intellij.openapi.util.text.StringUtil; @@ -45,31 +46,33 @@ public class JavaToKotlinTranslator { @Nullable private static PsiFile createFile(@NotNull String text) { - JavaCoreEnvironment javaCoreEnvironment = setUpJavaCoreEnvironment(); + JavaCoreProjectEnvironment javaCoreEnvironment = setUpJavaCoreEnvironment(); return PsiFileFactory.getInstance(javaCoreEnvironment.getProject()).createFileFromText( "test.java", JavaLanguage.INSTANCE, text ); } @Nullable - static PsiFile createFile(@NotNull JavaCoreEnvironment javaCoreEnvironment, @NotNull String text) { + static PsiFile createFile(@NotNull JavaCoreProjectEnvironment javaCoreEnvironment, @NotNull String text) { return PsiFileFactory.getInstance(javaCoreEnvironment.getProject()).createFileFromText( "test.java", JavaLanguage.INSTANCE, text ); } @NotNull - static JavaCoreEnvironment setUpJavaCoreEnvironment() { - JavaCoreEnvironment javaCoreEnvironment = new JavaCoreEnvironment(new Disposable() { + static JavaCoreProjectEnvironment setUpJavaCoreEnvironment() { + Disposable parentDisposable = new Disposable() { @Override public void dispose() { } - }); + }; + JavaCoreApplicationEnvironment applicationEnvironment = new JavaCoreApplicationEnvironment(parentDisposable); + JavaCoreProjectEnvironment javaCoreEnvironment = new JavaCoreProjectEnvironment(parentDisposable, applicationEnvironment); - javaCoreEnvironment.addToClasspath(findRtJar()); + javaCoreEnvironment.addJarToClassPath(findRtJar()); File annotations = findAnnotations(); if (annotations != null && annotations.exists()) { - javaCoreEnvironment.addToClasspath(annotations); + javaCoreEnvironment.addJarToClassPath(annotations); } return javaCoreEnvironment; } diff --git a/src/org/jetbrains/jet/j2k/ast/AnonymousClass.kt b/src/org/jetbrains/jet/j2k/ast/AnonymousClass.kt index 65dd09b459d..6747f39aa52 100644 --- a/src/org/jetbrains/jet/j2k/ast/AnonymousClass.kt +++ b/src/org/jetbrains/jet/j2k/ast/AnonymousClass.kt @@ -3,7 +3,6 @@ package org.jetbrains.jet.j2k.ast import org.jetbrains.jet.j2k.Converter import org.jetbrains.jet.j2k.ast.types.Type import java.util.Collections -import java.util.List public open class AnonymousClass(converter : Converter, members : List) : Class(converter, diff --git a/src/org/jetbrains/jet/j2k/ast/ArrayInitializerExpression.kt b/src/org/jetbrains/jet/j2k/ast/ArrayInitializerExpression.kt index 4832e7138b6..ab8bd83b748 100644 --- a/src/org/jetbrains/jet/j2k/ast/ArrayInitializerExpression.kt +++ b/src/org/jetbrains/jet/j2k/ast/ArrayInitializerExpression.kt @@ -48,10 +48,10 @@ public open class ArrayInitializerExpression(val `type` : Type, val initializers class object { private open fun getConversion(afterReplace : String) : String { - if (afterReplace.contains("double").sure()) + if (afterReplace.contains("double")!!) return "." + OperatorConventions.DOUBLE + "()" - if (afterReplace.contains("float").sure()) + if (afterReplace.contains("float")!!) return "." + OperatorConventions.FLOAT + "()" return "" diff --git a/src/org/jetbrains/jet/j2k/ast/ArrayWithoutInitializationExpression.kt b/src/org/jetbrains/jet/j2k/ast/ArrayWithoutInitializationExpression.kt index caee5ec75e9..45f2ec42c9c 100644 --- a/src/org/jetbrains/jet/j2k/ast/ArrayWithoutInitializationExpression.kt +++ b/src/org/jetbrains/jet/j2k/ast/ArrayWithoutInitializationExpression.kt @@ -1,7 +1,6 @@ package org.jetbrains.jet.j2k.ast import org.jetbrains.jet.j2k.ast.types.ArrayType -import java.util.List import org.jetbrains.jet.j2k.ast.types.Type public open class ArrayWithoutInitializationExpression(val `type` : Type, val expressions : List) : Expression() { diff --git a/src/org/jetbrains/jet/j2k/ast/Block.kt b/src/org/jetbrains/jet/j2k/ast/Block.kt index 37a950fb356..e407d1f723b 100644 --- a/src/org/jetbrains/jet/j2k/ast/Block.kt +++ b/src/org/jetbrains/jet/j2k/ast/Block.kt @@ -1,7 +1,6 @@ package org.jetbrains.jet.j2k.ast import java.util.LinkedList -import java.util.List public open class Block(val statements: List, val notEmpty: Boolean = false): Statement() { public override fun isEmpty(): Boolean { diff --git a/src/org/jetbrains/jet/j2k/ast/CallChainExpression.kt b/src/org/jetbrains/jet/j2k/ast/CallChainExpression.kt index 270c746276b..22d411290c0 100644 --- a/src/org/jetbrains/jet/j2k/ast/CallChainExpression.kt +++ b/src/org/jetbrains/jet/j2k/ast/CallChainExpression.kt @@ -1,8 +1,5 @@ package org.jetbrains.jet.j2k.ast -import a.h.id - - public open class CallChainExpression(val expression : Expression, val identifier : Expression) : Expression() { public override fun isNullable() : Boolean { if (!expression.isEmpty() && expression.isNullable()) return true diff --git a/src/org/jetbrains/jet/j2k/ast/Class.kt b/src/org/jetbrains/jet/j2k/ast/Class.kt index 2c7babd6b2f..f6b043eebad 100644 --- a/src/org/jetbrains/jet/j2k/ast/Class.kt +++ b/src/org/jetbrains/jet/j2k/ast/Class.kt @@ -7,8 +7,6 @@ import org.jetbrains.jet.j2k.ast.types.ClassType import org.jetbrains.jet.j2k.ast.types.Type import java.util.HashSet import java.util.LinkedList -import java.util.List -import java.util.Set import java.util.ArrayList public open class Class(converter : Converter, @@ -60,12 +58,12 @@ public open class Class(converter : Converter, } private fun constructorToInit(f: Function): Function { - val modifiers : Set = HashSet(f.modifiers) + val modifiers = HashSet(f.modifiers) modifiers.add(Modifier.STATIC) val statements : List = f.block?.statements ?: arrayList() statements.add(ReturnStatement(Identifier("__"))) val block = Block(statements) - val constructorTypeParameters : List = arrayList() + val constructorTypeParameters = ArrayList() constructorTypeParameters.addAll(typeParameters) constructorTypeParameters.addAll(f.typeParameters) return Function(Identifier("init"), arrayList(), modifiers, ClassType(name, constructorTypeParameters, false), diff --git a/src/org/jetbrains/jet/j2k/ast/Constructor.kt b/src/org/jetbrains/jet/j2k/ast/Constructor.kt index 5fbeaf8ddce..bbdc4bba5bb 100644 --- a/src/org/jetbrains/jet/j2k/ast/Constructor.kt +++ b/src/org/jetbrains/jet/j2k/ast/Constructor.kt @@ -1,7 +1,5 @@ package org.jetbrains.jet.j2k.ast -import java.util.List -import java.util.Set import org.jetbrains.jet.j2k.ast.types.Type public open class Constructor(identifier : Identifier, diff --git a/src/org/jetbrains/jet/j2k/ast/Enum.kt b/src/org/jetbrains/jet/j2k/ast/Enum.kt index 090662bd925..a092991df7c 100644 --- a/src/org/jetbrains/jet/j2k/ast/Enum.kt +++ b/src/org/jetbrains/jet/j2k/ast/Enum.kt @@ -2,8 +2,6 @@ package org.jetbrains.jet.j2k.ast import org.jetbrains.jet.j2k.Converter import org.jetbrains.jet.j2k.ast.types.Type -import java.util.List -import java.util.Set public open class Enum(converter : Converter, name : Identifier, diff --git a/src/org/jetbrains/jet/j2k/ast/EnumConstant.kt b/src/org/jetbrains/jet/j2k/ast/EnumConstant.kt index d1b8d623832..ba38b6158cc 100644 --- a/src/org/jetbrains/jet/j2k/ast/EnumConstant.kt +++ b/src/org/jetbrains/jet/j2k/ast/EnumConstant.kt @@ -1,8 +1,6 @@ package org.jetbrains.jet.j2k.ast import org.jetbrains.jet.j2k.ast.types.Type -import java.util.Set -import java.util.List public open class EnumConstant(identifier : Identifier, docComments: List, diff --git a/src/org/jetbrains/jet/j2k/ast/ExpressionList.kt b/src/org/jetbrains/jet/j2k/ast/ExpressionList.kt index 945f251649e..2875e2d889c 100644 --- a/src/org/jetbrains/jet/j2k/ast/ExpressionList.kt +++ b/src/org/jetbrains/jet/j2k/ast/ExpressionList.kt @@ -1,7 +1,6 @@ package org.jetbrains.jet.j2k.ast import org.jetbrains.jet.j2k.ast.types.Type -import java.util.List public open class ExpressionList(val expressions: List): Expression() { public override fun toKotlin(): String = expressions.map { it.toKotlin() }.makeString(", ") diff --git a/src/org/jetbrains/jet/j2k/ast/Field.kt b/src/org/jetbrains/jet/j2k/ast/Field.kt index 402ca1bd6a0..37ab13a6d90 100644 --- a/src/org/jetbrains/jet/j2k/ast/Field.kt +++ b/src/org/jetbrains/jet/j2k/ast/Field.kt @@ -2,8 +2,6 @@ package org.jetbrains.jet.j2k.ast import org.jetbrains.jet.j2k.ast.types.Type import java.util.LinkedList -import java.util.List -import java.util.Set import org.jetbrains.jet.j2k.Converter public open class Field(val identifier : Identifier, diff --git a/src/org/jetbrains/jet/j2k/ast/File.kt b/src/org/jetbrains/jet/j2k/ast/File.kt index 09045d48673..3e542c9008e 100644 --- a/src/org/jetbrains/jet/j2k/ast/File.kt +++ b/src/org/jetbrains/jet/j2k/ast/File.kt @@ -1,10 +1,8 @@ package org.jetbrains.jet.j2k.ast -import java.util.List - public open class File(val packageName: String, - val imports: List, - val body: List, + val imports: MutableList, + val body: MutableList, val mainFunction: String): Node() { public override fun toKotlin(): String { diff --git a/src/org/jetbrains/jet/j2k/ast/Function.kt b/src/org/jetbrains/jet/j2k/ast/Function.kt index cfaae75e4ad..73ae61adeeb 100644 --- a/src/org/jetbrains/jet/j2k/ast/Function.kt +++ b/src/org/jetbrains/jet/j2k/ast/Function.kt @@ -1,8 +1,6 @@ package org.jetbrains.jet.j2k.ast import java.util.LinkedList -import java.util.List -import java.util.Set import org.jetbrains.jet.j2k.ast.types.Type public open class Function(val name : Identifier, diff --git a/src/org/jetbrains/jet/j2k/ast/Identifier.kt b/src/org/jetbrains/jet/j2k/ast/Identifier.kt index a39b456c336..2ff5c86c2b2 100644 --- a/src/org/jetbrains/jet/j2k/ast/Identifier.kt +++ b/src/org/jetbrains/jet/j2k/ast/Identifier.kt @@ -1,6 +1,5 @@ package org.jetbrains.jet.j2k.ast -import java.util.Set public open class Identifier(val name: String, diff --git a/src/org/jetbrains/jet/j2k/ast/Initializer.kt b/src/org/jetbrains/jet/j2k/ast/Initializer.kt index f36a1f554d0..f32d9d2c194 100644 --- a/src/org/jetbrains/jet/j2k/ast/Initializer.kt +++ b/src/org/jetbrains/jet/j2k/ast/Initializer.kt @@ -1,6 +1,5 @@ package org.jetbrains.jet.j2k.ast -import java.util.Set public open class Initializer(val block : Block, modifiers : Set) : Member(modifiers) { public override fun toKotlin() : String { diff --git a/src/org/jetbrains/jet/j2k/ast/LocalVariable.kt b/src/org/jetbrains/jet/j2k/ast/LocalVariable.kt index de762d2b249..74b5990f763 100644 --- a/src/org/jetbrains/jet/j2k/ast/LocalVariable.kt +++ b/src/org/jetbrains/jet/j2k/ast/LocalVariable.kt @@ -1,7 +1,6 @@ package org.jetbrains.jet.j2k.ast import org.jetbrains.jet.j2k.ast.types.Type -import java.util.Set public open class LocalVariable(val identifier: Identifier, val modifiersSet: Set, diff --git a/src/org/jetbrains/jet/j2k/ast/Member.kt b/src/org/jetbrains/jet/j2k/ast/Member.kt index bea7903977c..ca0cd0a5c1d 100644 --- a/src/org/jetbrains/jet/j2k/ast/Member.kt +++ b/src/org/jetbrains/jet/j2k/ast/Member.kt @@ -1,7 +1,5 @@ package org.jetbrains.jet.j2k.ast -import java.util.Set - public abstract class Member(val modifiers : Set) : Node() { open fun accessModifier() : Modifier? { return modifiers.find { m -> m == Modifier.PUBLIC || m == Modifier.PROTECTED || m == Modifier.PRIVATE } diff --git a/src/org/jetbrains/jet/j2k/ast/MethodCallExpression.kt b/src/org/jetbrains/jet/j2k/ast/MethodCallExpression.kt index 02aff9c301a..c90a35cdaa7 100644 --- a/src/org/jetbrains/jet/j2k/ast/MethodCallExpression.kt +++ b/src/org/jetbrains/jet/j2k/ast/MethodCallExpression.kt @@ -1,7 +1,6 @@ package org.jetbrains.jet.j2k.ast import org.jetbrains.jet.j2k.ast.types.Type -import java.util.List public open class MethodCallExpression(val methodCall: Expression, val arguments: List, diff --git a/src/org/jetbrains/jet/j2k/ast/NewClassExpression.kt b/src/org/jetbrains/jet/j2k/ast/NewClassExpression.kt index 80ce8e1e2a6..55551140634 100644 --- a/src/org/jetbrains/jet/j2k/ast/NewClassExpression.kt +++ b/src/org/jetbrains/jet/j2k/ast/NewClassExpression.kt @@ -1,18 +1,17 @@ package org.jetbrains.jet.j2k.ast import org.jetbrains.annotations.Nullable -import java.util.List public open class NewClassExpression(val name: Element, val arguments: List, val qualifier: Expression = Expression.EMPTY_EXPRESSION, val anonymousClass: AnonymousClass? = null): Expression() { public override fun toKotlin(): String { - val callOperator: String? = (if (qualifier.isNullable().sure()) + val callOperator: String? = (if (qualifier.isNullable()!!) "?." else ".") - val qualifier: String? = (if (qualifier.isEmpty().sure()) + val qualifier: String? = (if (qualifier.isEmpty()!!) "" else qualifier.toKotlin() + callOperator) diff --git a/src/org/jetbrains/jet/j2k/ast/Node.kt b/src/org/jetbrains/jet/j2k/ast/Node.kt index 6b857f74246..4e52c134ce1 100644 --- a/src/org/jetbrains/jet/j2k/ast/Node.kt +++ b/src/org/jetbrains/jet/j2k/ast/Node.kt @@ -1,6 +1,5 @@ package org.jetbrains.jet.j2k.ast -import java.util.Set public abstract class Node() { public abstract fun toKotlin(): String diff --git a/src/org/jetbrains/jet/j2k/ast/ParameterList.kt b/src/org/jetbrains/jet/j2k/ast/ParameterList.kt index 1fd1a982fbe..1d60838398f 100644 --- a/src/org/jetbrains/jet/j2k/ast/ParameterList.kt +++ b/src/org/jetbrains/jet/j2k/ast/ParameterList.kt @@ -1,6 +1,5 @@ package org.jetbrains.jet.j2k.ast -import java.util.List public open class ParameterList(val parameters : List) : Expression() { public override fun toKotlin() = parameters.map { it.toKotlin() }.makeString(", ") diff --git a/src/org/jetbrains/jet/j2k/ast/PolyadicExpression.kt b/src/org/jetbrains/jet/j2k/ast/PolyadicExpression.kt index d2e0a95eec3..133ab955168 100644 --- a/src/org/jetbrains/jet/j2k/ast/PolyadicExpression.kt +++ b/src/org/jetbrains/jet/j2k/ast/PolyadicExpression.kt @@ -1,6 +1,5 @@ package org.jetbrains.jet.j2k.ast -import java.util.List public open class PolyadicExpression(val expressions: List, val token: String): Expression() { public override fun toKotlin(): String { diff --git a/src/org/jetbrains/jet/j2k/ast/ReferenceElement.kt b/src/org/jetbrains/jet/j2k/ast/ReferenceElement.kt index 517896b2438..09004afafee 100644 --- a/src/org/jetbrains/jet/j2k/ast/ReferenceElement.kt +++ b/src/org/jetbrains/jet/j2k/ast/ReferenceElement.kt @@ -1,7 +1,6 @@ package org.jetbrains.jet.j2k.ast import org.jetbrains.jet.j2k.ast.types.Type -import java.util.List public open class ReferenceElement(val reference : Identifier, val types : List) : Element() { public override fun toKotlin() = reference.toKotlin() + types.toKotlin(", ", "<", ">") diff --git a/src/org/jetbrains/jet/j2k/ast/Statements.kt b/src/org/jetbrains/jet/j2k/ast/Statements.kt index 8ee4c839b89..4d220691240 100644 --- a/src/org/jetbrains/jet/j2k/ast/Statements.kt +++ b/src/org/jetbrains/jet/j2k/ast/Statements.kt @@ -1,6 +1,5 @@ package org.jetbrains.jet.j2k.ast -import java.util.List public abstract class Statement(): Element() { class object { diff --git a/src/org/jetbrains/jet/j2k/ast/Trait.kt b/src/org/jetbrains/jet/j2k/ast/Trait.kt index 7f330ee5960..2ed12e0f4dc 100644 --- a/src/org/jetbrains/jet/j2k/ast/Trait.kt +++ b/src/org/jetbrains/jet/j2k/ast/Trait.kt @@ -2,8 +2,6 @@ package org.jetbrains.jet.j2k.ast import org.jetbrains.jet.j2k.Converter import org.jetbrains.jet.j2k.ast.types.Type -import java.util.List -import java.util.Set public open class Trait(converter : Converter, name : Identifier, diff --git a/src/org/jetbrains/jet/j2k/ast/TypeParameter.kt b/src/org/jetbrains/jet/j2k/ast/TypeParameter.kt index 9c2932f2312..c62b9af0ebc 100644 --- a/src/org/jetbrains/jet/j2k/ast/TypeParameter.kt +++ b/src/org/jetbrains/jet/j2k/ast/TypeParameter.kt @@ -1,7 +1,6 @@ package org.jetbrains.jet.j2k.ast import org.jetbrains.jet.j2k.ast.types.Type -import java.util.List public open class TypeParameter(val name : Identifier, val extendsTypes : List) : Element() { public open fun hasWhere() : Boolean = extendsTypes.size() > 1 diff --git a/src/org/jetbrains/jet/j2k/ast/Util.kt b/src/org/jetbrains/jet/j2k/ast/Util.kt index 4e8b7656f06..2e339529cee 100644 --- a/src/org/jetbrains/jet/j2k/ast/Util.kt +++ b/src/org/jetbrains/jet/j2k/ast/Util.kt @@ -1,9 +1,6 @@ package org.jetbrains.jet.j2k.ast -import java.util.List -import java.util.Collection - -fun List.toKotlin(separator: String, prefix: String = "", suffix: String = ""): String { +fun List.toKotlin(separator: String, prefix: String = "", suffix: String = ""): String { val result = StringBuilder() if (size() > 0) { result.append(prefix) @@ -15,7 +12,7 @@ fun List.toKotlin(separator: String, prefix: String = "", suffix: Stri } result.append(suffix) } - return result.toString()!! + return result.toString() } fun Collection.toKotlin(separator: String = " "): String { @@ -24,7 +21,7 @@ fun Collection.toKotlin(separator: String = " "): String { result.append(x.name) result.append(separator) } - return result.toString()!! + return result.toString() } fun String.withPrefix(prefix: String) = if (isEmpty()) "" else prefix + this diff --git a/src/org/jetbrains/jet/j2k/ast/types/ClassType.kt b/src/org/jetbrains/jet/j2k/ast/types/ClassType.kt index 84209e3b387..40cbb8ebec0 100644 --- a/src/org/jetbrains/jet/j2k/ast/types/ClassType.kt +++ b/src/org/jetbrains/jet/j2k/ast/types/ClassType.kt @@ -3,12 +3,12 @@ package org.jetbrains.jet.j2k.ast.types import org.jetbrains.jet.j2k.ast.Element import org.jetbrains.jet.j2k.ast.Identifier import java.util.Collections -import java.util.List +import java.util.ArrayList public open class ClassType(val `type` : Identifier, val parameters : List, nullable : Boolean) : Type(nullable) { public override fun toKotlin() : String { // TODO change to map() when KT-2051 is fixed - val parametersToKotlin: List = arrayList() + val parametersToKotlin = ArrayList() for(val param in parameters) { parametersToKotlin.add(param.toKotlin()) } diff --git a/src/org/jetbrains/jet/j2k/visitors/ClassVisitor.kt b/src/org/jetbrains/jet/j2k/visitors/ClassVisitor.kt index ac0e4a3fcda..f782fb7022a 100644 --- a/src/org/jetbrains/jet/j2k/visitors/ClassVisitor.kt +++ b/src/org/jetbrains/jet/j2k/visitors/ClassVisitor.kt @@ -3,10 +3,9 @@ package org.jetbrains.jet.j2k.visitors import com.intellij.psi.JavaRecursiveElementVisitor import com.intellij.psi.PsiClass import java.util.HashSet -import java.util.Set public open class ClassVisitor(): JavaRecursiveElementVisitor() { - private val myClassIdentifiers: Set = HashSet() + private val myClassIdentifiers = HashSet() public open fun getClassIdentifiers(): Set { return HashSet(myClassIdentifiers) diff --git a/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.kt b/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.kt index 7cf3db8ccc7..92b0ce746e3 100644 --- a/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.kt +++ b/src/org/jetbrains/jet/j2k/visitors/ElementVisitor.kt @@ -4,7 +4,6 @@ import com.intellij.psi.* import org.jetbrains.jet.j2k.Converter import org.jetbrains.jet.j2k.ast.* import org.jetbrains.jet.j2k.ast.types.Type -import java.util.List import org.jetbrains.jet.j2k.isAnnotatedAsNotNull import org.jetbrains.jet.j2k.isDefinitelyNotNull diff --git a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt index 3ccce7ffadf..d33b953278f 100644 --- a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt +++ b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt @@ -10,7 +10,6 @@ import org.jetbrains.jet.j2k.ast.types.Type import org.jetbrains.jet.lang.types.expressions.OperatorConventions import java.util.ArrayList import java.util.Collections -import java.util.List import com.intellij.psi.CommonClassNames.* import com.intellij.psi.util.PsiTreeUtil @@ -160,10 +159,10 @@ public open class ExpressionVisitor(converter: Converter): StatementVisitor(conv var classReference: PsiJavaCodeReferenceElement? = expression?.getClassOrAnonymousClassReference() val isNotConvertedClass: Boolean = classReference != null && !getConverter().getClassIdentifiers().contains(classReference?.getQualifiedName()) var argumentList: PsiExpressionList? = expression?.getArgumentList() - var arguments: Array = (if (argumentList != null) + var arguments: Array = (if (argumentList != null) argumentList?.getExpressions()!! else - array()) + array()) if (constructor == null || Converter.isConstructorPrimary(constructor) || isNotConvertedClass) { return NewClassExpression(getConverter().elementToElement(classReference), @@ -288,8 +287,8 @@ public open class ExpressionVisitor(converter: Converter): StatementVisitor(conv } public override fun visitPolyadicExpression(expression: PsiPolyadicExpression?): Unit { - var parameters: List = ArrayList() - for (operand : PsiExpression? in expression?.getOperands()) { + var parameters = ArrayList() + for (operand : PsiExpression in expression?.getOperands()!!) { parameters.add(getConverter().expressionToExpression(operand, expression?.getType())) } myResult = PolyadicExpression(parameters, getOperatorString(expression?.getOperationTokenType()!!)) diff --git a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitorForDirectObjectInheritors.kt b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitorForDirectObjectInheritors.kt index 1e1593f6933..c4bf7ab64ef 100644 --- a/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitorForDirectObjectInheritors.kt +++ b/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitorForDirectObjectInheritors.kt @@ -17,7 +17,7 @@ public open class ExpressionVisitorForDirectObjectInheritors(converter: Converte myResult = MethodCallExpression.build(Identifier("this", false), "identityEquals", getConverter().argumentsToExpressionList(expression!!)) } else if (superMethodInvocation(methodExpression, "toString")) { - myResult = DummyStringExpression(String.format("getJavaClass<%s>.getName() + '@' + Integer.toHexString(hashCode())", + myResult = DummyStringExpression(java.lang.String.format("getJavaClass<%s>.getName() + '@' + Integer.toHexString(hashCode())", ExpressionVisitor.getClassName(methodExpression))!!) } else { diff --git a/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.kt b/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.kt index a8ab7803d01..9ce0e5058a0 100644 --- a/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.kt +++ b/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.kt @@ -8,8 +8,8 @@ import org.jetbrains.jet.j2k.ast.* import java.util.Arrays import java.util.Collections import java.util.LinkedList -import java.util.List import org.jetbrains.jet.j2k.countWritingAccesses +import java.util.ArrayList public open class StatementVisitor(converter: Converter): ElementVisitor(converter) { public override fun visitAssertStatement(statement: PsiAssertStatement?): Unit { @@ -97,7 +97,7 @@ public open class StatementVisitor(converter: Converter): ElementVisitor(convert getConverter().statementToStatement(body)) } else { - var forStatements: List = arrayList() + var forStatements = ArrayList() forStatements.add(getConverter().statementToStatement(initialization)) forStatements.add(WhileStatement(getConverter().expressionToExpression(condition), Block(arrayList(getConverter().statementToStatement(body), @@ -126,7 +126,7 @@ public open class StatementVisitor(converter: Converter): ElementVisitor(convert } public override fun visitSwitchLabelStatement(statement: PsiSwitchLabelStatement?): Unit { - myResult = (if (statement?.isDefaultCase().sure()) + myResult = (if (statement?.isDefaultCase()!!) DefaultSwitchLabelStatement() else SwitchLabelStatement(getConverter().expressionToExpression(statement?.getCaseValue()))) @@ -138,14 +138,14 @@ public open class StatementVisitor(converter: Converter): ElementVisitor(convert } private open fun switchBodyToCases(body: PsiCodeBlock?): List { - val cases: List> = splitToCases(body) - val allSwitchStatements: List = arrayList() + val cases: List> = splitToCases(body) + val allSwitchStatements = ArrayList() if (body != null) { // TODO Arrays.asList() for(s in body.getStatements()) allSwitchStatements.add(s) } - val result: List = arrayList() - var pendingLabels: List = arrayList() + val result = ArrayList() + var pendingLabels = ArrayList() var i: Int = 0 for (ls in cases) { // TODO assert {(ls?.size()).sure() > 0} @@ -154,9 +154,9 @@ public open class StatementVisitor(converter: Converter): ElementVisitor(convert // TODO assert("not a right index") {allSwitchStatements?.get(i) == label} if (ls.size() > 1) { pendingLabels.add(getConverter().statementToStatement(label)) - val slice: List = ls.subList(1, (ls.size())) + val slice: List = ls.subList(1, (ls.size())) if (!containsBreak(slice)) { - val statements = getConverter().statementsToStatementList(slice) + val statements = ArrayList(getConverter().statementsToStatementList(slice)) statements.addAll(getConverter().statementsToStatementList(getAllToNextBreak(allSwitchStatements, i + ls.size()))) result.add(CaseContainer(pendingLabels, statements)) pendingLabels = arrayList() @@ -184,7 +184,7 @@ public open class StatementVisitor(converter: Converter): ElementVisitor(convert } public override fun visitTryStatement(statement: PsiTryStatement?): Unit { - val catches: List = arrayList() + val catches = ArrayList() val catchBlocks = statement?.getCatchBlocks()!! val catchBlockParameters = statement?.getCatchBlockParameters()!! for (i in 0..catchBlocks.size - 1) { @@ -222,8 +222,8 @@ public open class StatementVisitor(converter: Converter): ElementVisitor(convert private fun containsBreak(slice: List) = slice.any { it is PsiBreakStatement } - private open fun getAllToNextBreak(allStatements: List, start: Int): List { - val result: List = arrayList() + private open fun getAllToNextBreak(allStatements: List, start: Int): List { + val result = ArrayList() for (i in start..allStatements.size() - 1) { val s = allStatements.get(i) if (s is PsiBreakStatement || s is PsiReturnStatement) { @@ -238,9 +238,9 @@ public open class StatementVisitor(converter: Converter): ElementVisitor(convert return result } - private open fun splitToCases(body: PsiCodeBlock?): List> { - val cases: List> = arrayList() - var currentCaseStatements: List = arrayList() + private open fun splitToCases(body: PsiCodeBlock?): List> { + val cases = ArrayList>() + var currentCaseStatements = ArrayList() var isFirst: Boolean = true if (body != null) { for (s in body.getChildren()) { diff --git a/src/org/jetbrains/jet/j2k/visitors/ThisVisitor.kt b/src/org/jetbrains/jet/j2k/visitors/ThisVisitor.kt index 13c29e60178..4b30bdb2cbe 100644 --- a/src/org/jetbrains/jet/j2k/visitors/ThisVisitor.kt +++ b/src/org/jetbrains/jet/j2k/visitors/ThisVisitor.kt @@ -2,14 +2,13 @@ package org.jetbrains.jet.j2k.visitors import com.intellij.psi.* import org.jetbrains.annotations.Nullable -import java.util.Set import java.util.LinkedHashSet public open class ThisVisitor(): JavaRecursiveElementVisitor() { - private val myResolvedConstructors: Set = LinkedHashSet() + private val myResolvedConstructors = LinkedHashSet() public override fun visitReferenceExpression(expression: PsiReferenceExpression?): Unit { - for (r : PsiReference? in expression?.getReferences()) { + for (r : PsiReference? in expression?.getReferences()!!) { if (r?.getCanonicalText() == "this") { val res: PsiElement? = r?.resolve() if (res is PsiMethod && res.isConstructor()) { diff --git a/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt b/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt index 9a1759912a1..dcc0cdf8934 100644 --- a/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt +++ b/src/org/jetbrains/jet/j2k/visitors/TypeVisitor.kt @@ -7,7 +7,6 @@ import org.jetbrains.jet.j2k.J2KConverterFlags import org.jetbrains.jet.j2k.ast.* import org.jetbrains.jet.j2k.ast.types.* import java.util.LinkedList -import java.util.List import com.intellij.openapi.util.text.StringUtil public open class TypeVisitor(private val myConverter : Converter) : PsiTypeVisitor() { @@ -79,7 +78,7 @@ public open class TypeVisitor(private val myConverter : Converter) : PsiTypeVisi } private fun createRawTypesForResolvedReference(classType : PsiClassType) : List { - val typeParams : List = LinkedList() + val typeParams = LinkedList() if (classType is PsiClassReferenceType) { val reference : PsiJavaCodeReferenceElement? = (classType as PsiClassReferenceType).getReference() val resolve : PsiElement? = reference?.resolve() diff --git a/tests/testData/ast/kotlinExclusion/file/kt-656.kt b/tests/testData/ast/kotlinExclusion/file/kt-656.kt index 41730ccc3c6..6def227ab25 100644 --- a/tests/testData/ast/kotlinExclusion/file/kt-656.kt +++ b/tests/testData/ast/kotlinExclusion/file/kt-656.kt @@ -1,5 +1,4 @@ package demo -import java.util.Iterator open class Test() : java.lang.Iterable { public override fun iterator() : java.util.Iterator? { return null diff --git a/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt b/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt index 76f45175c6e..8dd3c3ce459 100644 --- a/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt +++ b/tests/testData/ast/newClassExpression/file/fullQualifiedName.kt @@ -1,5 +1,4 @@ package test -import java.util.List open class User() { open fun main() : Unit { var list : List? = java.util.LinkedList() diff --git a/tests/testData/ast/newClassExpression/file/genericClassInvocation.kt b/tests/testData/ast/newClassExpression/file/genericClassInvocation.kt index 613584ee471..4d26ef6b445 100644 --- a/tests/testData/ast/newClassExpression/file/genericClassInvocation.kt +++ b/tests/testData/ast/newClassExpression/file/genericClassInvocation.kt @@ -1,4 +1,3 @@ -import java.util.List import java.util.LinkedList open class User() { open fun main() : Unit { diff --git a/tests/testData/ast/newClassExpression/file/newListAndNewMember.kt b/tests/testData/ast/newClassExpression/file/newListAndNewMember.kt index a81e9efb3ec..a4fa42c7670 100644 --- a/tests/testData/ast/newClassExpression/file/newListAndNewMember.kt +++ b/tests/testData/ast/newClassExpression/file/newListAndNewMember.kt @@ -1,5 +1,4 @@ package org.test -import java.util.List import java.util.LinkedList open class Member() { } diff --git a/tests/testData/ast/rawGenerics/file/kt-540.kt b/tests/testData/ast/rawGenerics/file/kt-540.kt index e5bc789c601..52f7d7421f0 100644 --- a/tests/testData/ast/rawGenerics/file/kt-540.kt +++ b/tests/testData/ast/rawGenerics/file/kt-540.kt @@ -1,5 +1,4 @@ package demo -import java.util.List import java.util.LinkedList open class Test() { open fun main() : Unit {